Kolab Groupware OBS

cyrus-imapd.spec Changed

@@ -1,4 +1,8 @@
-#TODO: merge all sub-packages (except -devel) into cyrus-imapd, they are all required
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
 
 %global _name cyrus-imapd
 
@@ -11,22 +15,22 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{_name}
 
-%global real_version 2.4.17
+%global real_version 2.5
 #%%global snapshot_version git201204161439
 #%%global dot_snapshot_version .%{snapshot_version}
 
-%if 0%{?suse_version}
-%define with_systemd 1
-%endif
+##
+## Options
+##
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-%define with_systemd 1
-%endif
+%global with_mysql 0
+%global with_pgsql 0
+%global with_dav 0
 
 Name: cyrus-imapd
 Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version: 2.4.17
-Release: 2%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.cyrusimap.org
@@ -53,78 +57,105 @@
 ##
 ## Patches
 ##
-Patch1: http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
-# fedora/rhel specific, find current db lib, rhbz#461875
-Patch11: cyrus-imapd-2.3.12p2-current-db.patch
-# for c-i <= 2.4.12
-Patch12: cyrus-imapd-2.4.12-debugopt.patch
-Patch13: %{name}-2.3.16-002-strip-out-krb4.patch
-# PATCH-FIX-UPSTREAM cyrus-imapd-2.4.17_htmlstrip_no_return.patch
-Patch20: %{name}-2.4.17_htmlstrip_no_return.patch
-# Patches of which the status or upstream is unknown
-Patch903: %{name}-2.4.15-903-normalize-authorization-id.patch
-Patch905: cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch
+Patch0001: cyrus-imapd-2.5-autoconf-2.63.patch
+Patch0002: cyrus-imapd-2.5-lt-prereq.patch
+Patch0003: cyrus-imapd-2.5-with-dav-ifdefs.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+##
+## Build Requirements
+##
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: cyrus-sasl-devel
+
+%if 0%{?suse_version}
+BuildRequires: db-devel
+%else
+BuildRequires: db4-devel
+%endif
+
 BuildRequires: flex
+BuildRequires: gcc-c++
+
 %if 0%{?suse_version} >= 1310
 BuildRequires: groff-full
 %else
 BuildRequires: groff
 %endif
+
+%if 0%{?suse_version}
+BuildRequires: libjansson4-devel
+%else
+BuildRequires: jansson-devel
+%endif
 BuildRequires: krb5-devel
-%if 0%{?with_mysql} > 0
+
+%if 0%{?with_dav}
+BuildRequires: libical-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: libtool
+%endif
+
+BuildRequires: libuuid-devel
+
+%if 0%{?with_mysql}
 BuildRequires: mysql-devel
 %endif
+
+BuildRequires: net-snmp-devel
+%if 0%{?suse_version}
+BuildRequires: openldap2-devel
+%else
+BuildRequires: openldap-devel
+%endif
+
 BuildRequires: openssl-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: pkgconfig
-%if 0%{?with_pgsql} > 0
-BuildRequires: postgresql-devel
-%endif
-BuildRequires: net-snmp-devel
-BuildRequires: transfig
 
-%if 0%{?fedora} > 8
-BuildRequires: perl-devel
+%if 0%{?suse_version}
+BuildRequires: perl
 %else
-%if 0%{?rhel} >= 6
 BuildRequires: perl-devel
 %endif
+
+BuildRequires: pkgconfig
+
+%if 0%{?with_pgsql}
+BuildRequires: postgresql-devel
+%endif
+
+%if 0%{?with_dav}
+BuildRequires: sqlite-devel
 %endif
 
 %if 0%{?suse_version}
-BuildRequires: db-devel
-BuildRequires: openldap2-devel
 BuildRequires: tcpd-devel
-Requires: db-utils
-PreReq: /usr/sbin/groupadd
-PreReq: /usr/sbin/useradd
 %else
-BuildRequires: db4-devel
-BuildRequires: openldap-devel
-Requires: db4-utils
 BuildRequires: tcp_wrappers
 %endif
 
-Requires: %{name}-utils = %{version}-%{release}
-Requires: file
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: transfig
+BuildRequires: xapian-core-devel
 
 %if 0%{?suse_version}
-%if 0%{?with_systemd}
-PreReq: %fillup_prereq
-%else
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
+PreReq: /usr/sbin/groupadd
+PreReq: /usr/sbin/useradd
 %endif
+
+%if 0%{?suse_version}
+Requires: db-utils
+%else
+Requires: db4-utils
 %endif
 
+Requires: file
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
 Requires(post): coreutils
 Requires(post): e2fsprogs
 Requires(post): findutils
@@ -135,6 +166,7 @@
 
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
+PreReq: %fillup_prereq
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -144,12 +176,17 @@
 Requires(postun): systemd-units
 %endif
 %else
+%if 0%{?suse_version}
+PreReq: %fillup_prereq
+PreReq: %insserv_prereq
+%else
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(post): chkconfig
 Requires(post): initscripts
 Requires(postun): initscripts
 %endif
+%endif
 
 Obsoletes: %{name}-perl < %{version}-%{release}
 Provides: %{name}-perl = %{version}-%{release}
@@ -194,27 +231,28 @@
 
 %prep
 %setup -q -n %{_name}-%{real_version}%{?dot_snapshot_version}
-%patch1 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-
-%patch20 -p1
-
-%patch903 -p1
-%patch905 -p1
+#%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 
 # only to update config.* files
-automake -a -f -c || :
 aclocal -I cmulocal
-autoheader
-autoconf -f
+libtoolize --install
+automake --add-missing || autoreconf -v && automake --add-missing
+autoreconf -v
 
 # Modify docs master --> cyrus-master
 %{__perl} -pi -e "s@master$8$@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions
 %{__sed} -i -e 's|$^-$master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \
 man/master.8 doc/man.html
 
+%if 0%{?with_dav}
+# Modify docs httpd --> cyrus-httpd
+%{__perl} -pi -e "s@httpd$8$@cyrus-httpd(8)@" man/*5 man/*8 lib/imapoptions
+%{__sed} -i -e 's|$^-$httpd|\1cyrus-httpd|g;s|^httpd|cyrus-httpd|g;s|Httpd|Cyrus-httpd|g;s|HTTPD|CYRUS-HTTPD|g' \
+ man/httpd.8 doc/man.html
+%endif
+
 # Modify path in perl scripts
 find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@"
 
@@ -235,35 +273,40 @@
 %endif
 
 %{configure} \
- --enable-netscapehack \
+ --enable-event-notification \
+ --enable-gssapi \
 --enable-idled \
- --with-ldap=/usr \
- --with-snmp \
- --without-snmp \
 --enable-murder \
- --enable-replication \
+ --enable-netscapehack \
 --enable-nntp \
- --enable-gssapi \
+ --enable-replication \
+ --enable-xapian \
+%if 0%{?fedora} >= 20 || 0%{?rhel} || 0%{?suse_version}
 --with-bdb-incdir=%{_includedir}/db4 \
+%else
+ --with-bdb-incdir=%{_includedir}/libdb4 \
+%endif
 --with-cyrus-prefix=%{_cyrexecdir} \
 --with-extraident="Kolab-%{version}-%{release}" \
-%if 0%{?with_mysql} > 0
+%if 0%{?with_dav}
+ --with-http \
+%endif
+ --with-krbimpl=mit \
+ --with-ldap=/usr \
+%if 0%{?with_mysql}
 --with-mysql=%{_prefix} \
 --with-mysql-incdir=%{_includedir}/mysql/ \
 --with-mysql-libdir=%{_libdir}/mysql/ \
 %endif
 --with-perl=%{__perl} \
-%if 0%{?with_pgsql} > 0
+%if 0%{?with_pgsql}
 --with-pgsql=%{_includedir} \
 %endif
 --with-service-path=%{_cyrexecdir} \
- --with-syslogfacility=MAIL \
- --with-krbimpl=mit
+ --with-snmp \
+ --with-syslogfacility=MAIL
 
-%{__make} -C man -f Makefile.dist
-%{__make} -C doc -f Makefile.dist
 %{__make}
-%{__make} -C notifyd notifytest
 
 %install
 %{__rm} -rf %{buildroot}
@@ -271,21 +314,8 @@
 # Fix permissions on perl programs
 find . -type f -name "*.pl" -exec %{__chmod} 755 {} \;
 
-# This is needed to install the perl files correctly
-pushd perl/imap
- %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
-popd
-pushd perl/sieve/managesieve
- %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
-popd
-
 # Do what the regular make install does
-%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-%{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-
-%{__install} -m 755 imtest/imtest %{buildroot}%{_bindir}/
-%{__install} -m 755 notifyd/notifytest %{buildroot}%{_bindir}/
-%{__install} -m 755 perl/imap/cyradm %{buildroot}%{_bindir}/
+%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor
 
 # Install tools
 for tool in tools/* ; do
@@ -294,7 +324,7 @@
 
 # Create directories
 %{__install} -d \
- %{buildroot}%{_sysconfdir}/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
+ %{buildroot}%{_sysconfdir}/{logrotate.d,pam.d,cron.daily} \
 %{buildroot}%{_libdir}/sasl \
 %{buildroot}%{_var}/spool/imap \
 %{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
@@ -303,11 +333,6 @@
 %{buildroot}%{_sysconfdir}/pki/%{_name} \
 doc/contrib
 
-%if 0%{?suse_version}
-%{__install} -d \
- %{buildroot}%{_localstatedir}/adm/fillup-templates/
-%endif
-
 # Install additional files
 %{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
 %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/imapd.conf
@@ -323,8 +348,10 @@
 %{__install} -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/csync
 %{__install} -p -m 755 %{SOURCE13} %{buildroot}%{_sysconfdir}/cron.daily/%{_name}
 %if 0%{?suse_version}
+%{__install} -d %{buildroot}%{_localstatedir}/adm/fillup-templates/
 %{__install} -p -m 644 %{SOURCE22} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{_name}
 %else
+%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/
 %{__install} -p -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/sysconfig/%{_name}
 %endif
 
@@ -332,6 +359,7 @@
 %{__install} -p -D -m 644 %{SOURCE31} %{buildroot}%{_unitdir}/cyrus-imapd.service
 %{__install} -p -D -m 755 %{SOURCE32} %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
 %else
+%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d
 %{__install} -p -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name}
 %endif
 
@@ -363,12 +391,18 @@
 touch %{buildroot}%{ssl_pem_file}
 
 # Rename 'master' binary and manpage to avoid clash with postfix
-%{__mv} -f %{buildroot}%{_cyrexecdir}/master %{buildroot}%{_cyrexecdir}/cyrus-master
-%{__mv} -f %{buildroot}%{_mandir}/man8/master.8 %{buildroot}%{_mandir}/man8/cyrus-master.8
+%{__mv} -f %{buildroot}%{_cyrexecdir}/master %{buildroot}%{_cyrexecdir}/cyrus-master
+%{__mv} -f %{buildroot}%{_mandir}/man8/master.8 %{buildroot}%{_mandir}/man8/cyrus-master.8
+
+# Rename 'httpd' binary and manpage to avoid clash with apache httpd
+%if 0%{?with_dav}
+%{__mv} -f %{buildroot}%{_cyrexecdir}/httpd %{buildroot}%{_cyrexecdir}/cyrus-httpd
+%{__mv} -f %{buildroot}%{_mandir}/man8/httpd.8 %{buildroot}%{_mandir}/man8/cyrus-httpd.8
+%endif
 
 # Rename 'fetchnews' binary and manpage to avoid clash with leafnode
-%{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews %{buildroot}%{_cyrexecdir}/cyrfetchnews
-%{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8 %{buildroot}%{_mandir}/man8/cyrfetchnews.8
+%{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews %{buildroot}%{_cyrexecdir}/cyrfetchnews
+%{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8 %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 %{__perl} -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
 %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 
@@ -386,10 +420,11 @@
 %{__rm} -f %{buildroot}%{_cyrexecdir}/config2header*
 %{__rm} -f %{buildroot}%{_cyrexecdir}/config2man
 %{__rm} -f %{buildroot}%{_cyrexecdir}/pop3proxyd
-find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \;
-find %{buildroot} -name ".packlist" -exec %{__rm} -f {} \;
+find %{buildroot} -type f -name "perllocal.pod" -exec %{__rm} -vf {} \;
+find %{buildroot} -type f -name ".packlist" -exec %{__rm} -vf {} \;
+find %{buildroot} -type f -name ".gitignore" -exec %{__rm} -vf {} \;
 %{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
-find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec %{__rm} -f {} \;
+find %{buildroot}%{perl_vendorarch} -type f -name "*.bs" -exec %{__rm} -vf {} \;
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -400,7 +435,7 @@
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
 -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 
-%post
+%post -p /sbin/ldconfig
 CHATTRSYNC=0
 
 %if 0%{?suse_version}
@@ -426,6 +461,10 @@
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
 
+if ! -z "%{ssl_pem_file}" -a -z "$(cat %{ssl_pem_file})" ; then
+ %{__rm} -f "%{ssl_pem_file}" || :
+fi
+
 if ! -f %{ssl_pem_file} -a -d "%{_sysconfdir}/pki/tls/certs" ; then
 pushd %{_sysconfdir}/pki/tls/certs
 umask 077
@@ -469,7 +508,7 @@
 fi
 %endif
 
-%postun
+%postun -p /sbin/ldconfig
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
 %service_del_postun cyrus-imapd.service
@@ -508,13 +547,28 @@
 %config(noreplace) %{_sysconfdir}/pam.d/mupdate
 %config(noreplace) %{_sysconfdir}/pam.d/csync
 %config(noreplace) %{_sysconfdir}/pam.d/nntp
+%attr(0755,root,root) %{_bindir}/cyradm
+%{_bindir}/imtest
+%{_bindir}/installsieve
+%{_bindir}/lmtptest
+%{_bindir}/mupatetest
+%{_bindir}/nntptest
+%{_bindir}/pop3test
+%{_bindir}/sieveshell
+%{_bindir}/sivtest
+%{_bindir}/smpttest
+%{_bindir}/synctest
 %{_sysconfdir}/cron.daily/%{_name}
 %dir %{_cyrexecdir}
 %{_cyrexecdir}/arbitron
 %{_cyrexecdir}/arbitronsort.pl
 %{_cyrexecdir}/chk_cyrus
+%{_cyrexecdir}/compile_st.pl
 %{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/cyr_deny
 %{_cyrexecdir}/cyr_df
+%{_cyrexecdir}/cyr_info
+%{_cyrexecdir}/ctl_conversationsdb
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -525,17 +579,25 @@
 %{_cyrexecdir}/cyr_synclog
 %{_cyrexecdir}/cyr_userseen
 %{_cyrexecdir}/cyrdump
+%if 0%{?with_dav}
+%{_cyrexecdir}/cyrus-httpd
+%endif
 %{_cyrexecdir}/cyrus-master
 %{_cyrexecdir}/deliver
 %{_cyrexecdir}/dohash
+%{_cyrexecdir}/fixsearchpath.pl
 %{_cyrexecdir}/fud
+%{_cyrexecdir}/hammer_cyrusdb
 %{_cyrexecdir}/imapd
 %{_cyrexecdir}/ipurge
+%exclude %{_cyrexecdir}/jenkins-build.sh
 %{_cyrexecdir}/lmtpd
 %{_cyrexecdir}/lmtpproxyd
 %{_cyrexecdir}/masssievec
 %{_cyrexecdir}/mbexamine
 %{_cyrexecdir}/mbpath
+%{_cyrexecdir}/mbtool
+%{_cyrexecdir}/message_test
 %{_cyrexecdir}/migrate-metadata
 %{_cyrexecdir}/mkimap
 %{_cyrexecdir}/mknewsgroups
@@ -544,9 +606,11 @@
 %{_cyrexecdir}/quota
 %{_cyrexecdir}/reconstruct
 %{_cyrexecdir}/rehash
+%{_cyrexecdir}/search_test
 %{_cyrexecdir}/sievec
 %{_cyrexecdir}/sieved
 %{_cyrexecdir}/smmapd
+%{_cyrexecdir}/squat_dump
 %{_cyrexecdir}/squatter
 %{_cyrexecdir}/timsieved
 %{_cyrexecdir}/tls_prune
@@ -568,28 +632,23 @@
 %{_cyrexecdir}/ptexpire
 %{_cyrexecdir}/ptloader
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/socket
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
-%dir %{_datadir}/%{_name}
-%dir %{_datadir}/%{_name}/rpm
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
+%{_libdir}/*.so.*
 %{_datadir}/%{_name}/rpm/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%dir %{_sysconfdir}/pki/%{_name}
-%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
@@ -601,6 +660,9 @@
 %{perl_vendorarch}/Cyrus/IMAP.pm
 %dir %{perl_vendorarch}/Cyrus/SIEVE
 %{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
+%dir %{perl_vendorlib}/Cyrus/Annotator
+%{perl_vendorlib}/Cyrus/Annotator/Daemon.pm
+%{perl_vendorlib}/Cyrus/Annotator/Message.pm
 %dir %{perl_vendorarch}/auto
 %dir %{perl_vendorarch}/auto/Cyrus
 %dir %{perl_vendorarch}/auto/Cyrus/IMAP
@@ -608,20 +670,21 @@
 %dir %{perl_vendorarch}/auto/Cyrus/SIEVE
 %dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
 %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%{_mandir}/man3/Cyrus::IMAP::Admin.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP::Shell.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP::IMSP.3pm.gz
-%{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
-%attr(0755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%dir %{_sysconfdir}/pki/%{_name}
+%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 
 %files devel
 %defattr(0644,root,root,0755)
-%dir %{_includedir}/cyrus
-%{_includedir}/cyrus/*.h
-%{_libdir}/lib*.a
-%{_mandir}/man3/imclient.3*
+%files devel
+%defattr(0644,root,root,0755)
+%{_includedir}/cyrus
+%{_libdir}/pkgconfig/*cyrus*.pc
+%{_libdir}/*.so
+%{_libdir}/*.la
 
 %changelog
 * Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.17-2

cyrus-imapd-2.1.3-flock.patch Deleted

@@ -1,78 +0,0 @@
-diff -up cyrus-imapd-2.4.6/lib/lock_flock.c.flock cyrus-imapd-2.4.6/lib/lock_flock.c
---- cyrus-imapd-2.4.6/lib/lock_flock.c.flock	2010-12-20 14:15:49.000000000 +0100
-+++ cyrus-imapd-2.4.6/lib/lock_flock.c	2011-02-10 12:56:45.262786102 +0100
-@@ -52,6 +52,10 @@
- #endif
- 
- #include "cyr_lock.h"
-+#include <syslog.h>
-+
-+/* Locking timeout parameter */
-+#define MAXTIME 99
- 
- const char *lock_method_desc = "flock";
- 
-@@ -68,6 +72,18 @@ const char *lock_method_desc = "flock";
- * 'failaction' is provided, it is filled in with a pointer to a fixed
- * string naming the action that failed.
- *
-+ * Modified by jwade 4/16/2002 to work around seen file locking problem
-+ * Added locking timeout parameter to allow processes that are 
-+ * waiting for a lock to eventually time out
-+ *
-+ * Calls flock() in non-blocking fashion and then retries until a 
-+ * maximum delay is reached or the lock succeeds.
-+ * 
-+ * As written, uses a quadratic backoff on retries with MAXTIME being
-+ * the longest interval delay. Total delay time is the sum of the squares
-+ * of all integers whose square is less than MAXTIME. In the case of 
-+ * MAXTIME = 99 this is 0+1+4+9+16+25+36+49+64+81= 285 Seconds 
-+ * This time is arbitrary and can be adjusted
- */
- int lock_reopen(fd, filename, sbuf, failaction)
- int fd;
-@@ -78,17 +94,29 @@ const char **failaction;
- int r;
- struct stat sbuffile, sbufspare;
- int newfd;
-+ int delay=0, i=0;
- 
- if (!sbuf) sbuf = &sbufspare;
- 
-- for (;;) {
--	r = flock(fd, LOCK_EX);
-+ for(i=0,delay=0;;) {
-+	r = flock(fd, LOCK_EX|LOCK_NB);
- 	if (r == -1) {
--	 if (errno == EINTR) continue;
--	 if (failaction) *failaction = "locking";
-+	 if (errno == EINTR) {
-+ continue;
-+ }
-+ else if ((errno == EWOULDBLOCK) && (delay < MAXTIME)) {
-+ syslog(LOG_DEBUG, "lock: reopen-blocked sleeping for %d on interval %d (%d, %s)" , delay, i, fd, filename);
-+ sleep(delay);
-+ i++;
-+ delay = i*i;
-+ continue;
-+ }
-+	 if (failaction) {
-+ if (delay >= MAXTIME) *failaction = "locking_timeout";
-+ else *failaction = "locking";
-+ }
- 	 return -1;
- 	}
--
- 	fstat(fd, sbuf);
- 	r = stat(filename, &sbuffile);
- 	if (r == -1) {
-@@ -96,9 +124,7 @@ const char **failaction;
- 	 flock(fd, LOCK_UN);
- 	 return -1;
- 	}
--
- 	if (sbuf->st_ino == sbuffile.st_ino) return 0;
--
- 	newfd = open(filename, O_RDWR);
- 	if (newfd == -1) {
- 	 if (failaction) *failaction = "opening";

cyrus-imapd-2.3.12p2-current-db.patch Deleted

cyrus-imapd-2.3.16-002-strip-out-krb4.patch Deleted

@@ -1,39 +0,0 @@
-From 8e4a444ddf93984aa25ec4a1d860213af2a284ae Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Date: Tue, 3 Aug 2010 10:25:42 +0200
-Subject: PATCH 11/13 Strip out krb4
-
----
- imap/pop3d.c | 2 --
- imap/version.c | 2 +-
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/imap/pop3d.c b/imap/pop3d.c
-index ad3fdd5..3a2cb8b 100644
---- a/imap/pop3d.c
-+++ b/imap/pop3d.c
-@@ -93,8 +93,6 @@
- #include "statuscache.h"
- 
- #ifdef HAVE_KRB
--/* kerberos des is purported to conflict with OpenSSL DES */
--#define DES_DEFS
- #include <krb.h>
- 
- /* MIT's kpop authentication kludge */
-diff --git a/imap/version.c b/imap/version.c
-index 85223c2..d78a696 100644
---- a/imap/version.c
-+++ b/imap/version.c
-@@ -177,7 +177,7 @@ void id_response(struct protstream *pout)
- 	 "; lock = %s", lock_method_desc);
- snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	 "; nonblock = %s", nonblock_method_desc);
--#ifdef HAVE_KRB
-+#if 0
- snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	 " (%s)", krb4_version);
- #endif
--- 
-1.7.2
-

cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch Deleted

@@ -1,1230 +0,0 @@
-diff --git a/lib/imapoptions b/lib/imapoptions
-index 464de37..98e0341 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -483,6 +483,9 @@ Blank lines and lines beginning with ``#'' are ignored.
- { "ldap_mech", NULL, STRING }
- /* SASL mechanism for LDAP authentication */
- 
-+{ "ldap_user_attribute", NULL, STRING }
-+/* Specify LDAP attribute to use as canonical user id */
-+
- { "ldap_member_attribute", NULL, STRING }
- /* See ldap_member_method. */
- 
-diff --git a/ptclient/ldap.c b/ptclient/ldap.c
-index 7bd8664..b3507d1 100644
---- a/ptclient/ldap.c
-+++ b/ptclient/ldap.c
-@@ -91,7 +91,7 @@
- * This may not be restrictive enough.
- * Here are the reasons for the restrictions:
- *
-- * &	forbidden because of MUTF-7. (This could be fixed.)
-+ * & forbidden because of MUTF-7. (This could be fixed.)
- * : forbidden because it's special in /etc/passwd
- * / forbidden because it can't be used in a mailbox name
- * * % forbidden because they're IMAP magic in the LIST/LSUB commands
-@@ -158,6 +158,7 @@ typedef struct _ptsm {
- const char *tls_cert;
- const char *tls_key;
- int member_method;
-+ const char *user_attribute;
- const char *member_attribute;
- const char *member_filter;
- const char *member_base;
-@@ -182,41 +183,41 @@ typedef struct _ptsm {
- static t_ptsm *ptsm = NULL;
- 
- static int ptsmodule_interact(
--	LDAP *ld, 
--	unsigned flags __attribute__((unused)), 
--	void *def, 
--	void *inter)
-+ LDAP *ld,
-+ unsigned flags __attribute__((unused)),
-+ void *def,
-+ void *inter)
- {
--	sasl_interact_t *in = inter;
--	const char *p;
--	t_ptsm *ptsmdef = def;
--
--	for (;in->id != SASL_CB_LIST_END;in++) {
--		p = NULL;
--		switch(in->id) {
--			case SASL_CB_AUTHNAME:
--				if (ISSET(ptsmdef->id))
--					p = ptsmdef->id;
--				break;
--			case SASL_CB_USER:
--				if (ISSET(ptsmdef->authz))
--					p = ptsmdef->authz;
--				break;
--			case SASL_CB_GETREALM:
--				if (ISSET(ptsmdef->realm))
--					p = ptsmdef->realm;
--				break; 
--			case SASL_CB_PASS:
--				if (ISSET(ptsmdef->password))
--					p = ptsmdef->password;
--				break;
--		}
--
--		in->result = p ? p : "";
--		in->len = strlen(in->result);
--	}
--
--	return LDAP_SUCCESS;
-+ sasl_interact_t *in = inter;
-+ const char *p;
-+ t_ptsm *ptsmdef = def;
-+
-+ for (;in->id != SASL_CB_LIST_END;in++) {
-+ p = NULL;
-+ switch(in->id) {
-+ case SASL_CB_AUTHNAME:
-+ if (ISSET(ptsmdef->id))
-+ p = ptsmdef->id;
-+ break;
-+ case SASL_CB_USER:
-+ if (ISSET(ptsmdef->authz))
-+ p = ptsmdef->authz;
-+ break;
-+ case SASL_CB_GETREALM:
-+ if (ISSET(ptsmdef->realm))
-+ p = ptsmdef->realm;
-+ break;
-+ case SASL_CB_PASS:
-+ if (ISSET(ptsmdef->password))
-+ p = ptsmdef->password;
-+ break;
-+ }
-+
-+ in->result = p ? p : "";
-+ in->len = strlen(in->result);
-+ }
-+
-+ return LDAP_SUCCESS;
- }
- 
- /*
-@@ -259,11 +260,11 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
- switch (allowedchars*(unsigned char*) p) {
- case 0:
- return NULL;
-- 
-+
- case 2:
- sawalpha = 1;
- /* FALL THROUGH */
-- 
-+
- default:
- ;
- }
-@@ -275,149 +276,149 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
- }
- 
- 
--static int ptsmodule_connect(void) 
-+static int ptsmodule_connect(void)
- {
--	int rc = 0;
--
--	if (ptsm == NULL) // Sanity Check
--		return PTSM_FAIL;
--
--	if (ptsm->ld != NULL)
--		return PTSM_OK;
--
--	if (ISSET(ptsm->tls_cacert_file)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ptsm->tls_cacert_file);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cacert_dir)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, ptsm->tls_cacert_dir);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTDIR (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ptsm->tls_check_peer != 0) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ptsm->tls_check_peer);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_REQUIRE_CERT (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_ciphers)) {
--		/* set cipher suite, certificate and private key: */
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, ptsm->tls_ciphers);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CIPHER_SUITE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cert)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, ptsm->tls_cert);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_key)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ptsm->tls_key);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_KEYFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	rc = ldap_initialize(&ptsm->ld, ptsm->uri);
--	if (rc != LDAP_SUCCESS) {
--		syslog(LOG_ERR, "ldap_initialize failed (%s)", ptsm->uri);
--		return PTSM_FAIL;
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_PROTOCOL_VERSION, &(ptsm->version));
--	if (rc != LDAP_OPT_SUCCESS) {
--
--		if (ptsm->sasl ||
--		 ptsm->start_tls) {
--			syslog(LOG_ERR, "Failed to set LDAP_OPT_PROTOCOL_VERSION %d, required for ldap_start_tls and ldap_sasl.", ptsm->version);
--			ldap_unbind(ptsm->ld);
-+ int rc = 0;
-+
-+ if (ptsm == NULL) // Sanity Check
-+ return PTSM_FAIL;
-+
-+ if (ptsm->ld != NULL)
-+ return PTSM_OK;
-+
-+ if (ISSET(ptsm->tls_cacert_file)) {
-+ rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ptsm->tls_cacert_file);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTFILE (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ if (ISSET(ptsm->tls_cacert_dir)) {
-+ rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, ptsm->tls_cacert_dir);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTDIR (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ if (ptsm->tls_check_peer != 0) {
-+ rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ptsm->tls_check_peer);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_REQUIRE_CERT (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ if (ISSET(ptsm->tls_ciphers)) {
-+ /* set cipher suite, certificate and private key: */
-+ rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, ptsm->tls_ciphers);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CIPHER_SUITE (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ if (ISSET(ptsm->tls_cert)) {
-+ rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, ptsm->tls_cert);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CERTFILE (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ if (ISSET(ptsm->tls_key)) {
-+ rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ptsm->tls_key);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_KEYFILE (%s).", ldap_err2string (rc));
-+ }
-+ }
-+
-+ rc = ldap_initialize(&ptsm->ld, ptsm->uri);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog(LOG_ERR, "ldap_initialize failed (%s)", ptsm->uri);
-+ return PTSM_FAIL;
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_PROTOCOL_VERSION, &(ptsm->version));
-+ if (rc != LDAP_OPT_SUCCESS) {
-+
-+ if (ptsm->sasl ||
-+ ptsm->start_tls) {
-+ syslog(LOG_ERR, "Failed to set LDAP_OPT_PROTOCOL_VERSION %d, required for ldap_start_tls and ldap_sasl.", ptsm->version);
-+ ldap_unbind(ptsm->ld);
- ptsm->ld = NULL;
--			return PTSM_FAIL;
--		} else
--			syslog(LOG_WARNING, "Unable to set LDAP_OPT_PROTOCOL_VERSION %d.", ptsm->version);
--
--		ptsm->version = LDAP_VERSION2;
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_NETWORK_TIMEOUT, &(ptsm->timeout));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", ptsm->timeout.tv_sec, ptsm->timeout.tv_usec);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_TIMELIMIT, &(ptsm->time_limit));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_TIMELIMIT %d.", ptsm->time_limit);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_DEREF, &(ptsm->deref));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_DEREF %d.", ptsm->deref);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_REFERRALS, ptsm->referrals ? LDAP_OPT_ON : LDAP_OPT_OFF);
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_REFERRALS.");
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_SIZELIMIT, &(ptsm->size_limit));
--	if (rc != LDAP_OPT_SUCCESS)
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_SIZELIMIT %d.", ptsm->size_limit);
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_RESTART, ptsm->restart ? LDAP_OPT_ON : LDAP_OPT_OFF);
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_RESTART.");
--	}
--
--	if (ptsm->start_tls) {
--
--		rc = ldap_start_tls_s(ptsm->ld, NULL, NULL);
--		if (rc != LDAP_SUCCESS) {
--			syslog(LOG_ERR, "start tls failed (%s).", ldap_err2string(rc));
--			ldap_unbind(ptsm->ld);
-+ return PTSM_FAIL;
-+ } else
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_PROTOCOL_VERSION %d.", ptsm->version);
-+
-+ ptsm->version = LDAP_VERSION2;
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_NETWORK_TIMEOUT, &(ptsm->timeout));
-+ if (rc != LDAP_OPT_SUCCESS) {
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", ptsm->timeout.tv_sec, ptsm->timeout.tv_usec);
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_TIMELIMIT, &(ptsm->time_limit));
-+ if (rc != LDAP_OPT_SUCCESS) {
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_TIMELIMIT %d.", ptsm->time_limit);
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_DEREF, &(ptsm->deref));
-+ if (rc != LDAP_OPT_SUCCESS) {
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_DEREF %d.", ptsm->deref);
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_REFERRALS, ptsm->referrals ? LDAP_OPT_ON : LDAP_OPT_OFF);
-+ if (rc != LDAP_OPT_SUCCESS) {
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_REFERRALS.");
-+ }
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_SIZELIMIT, &(ptsm->size_limit));
-+ if (rc != LDAP_OPT_SUCCESS)
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_SIZELIMIT %d.", ptsm->size_limit);
-+
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_RESTART, ptsm->restart ? LDAP_OPT_ON : LDAP_OPT_OFF);
-+ if (rc != LDAP_OPT_SUCCESS) {
-+ syslog(LOG_WARNING, "Unable to set LDAP_OPT_RESTART.");
-+ }
-+
-+ if (ptsm->start_tls) {
-+
-+ rc = ldap_start_tls_s(ptsm->ld, NULL, NULL);
-+ if (rc != LDAP_SUCCESS) {
-+ syslog(LOG_ERR, "start tls failed (%s).", ldap_err2string(rc));
-+ ldap_unbind(ptsm->ld);
- ptsm->ld = NULL;
--			return PTSM_FAIL;
--		}
--	}
--	
--	if (ptsm->sasl) {
--
--		if (EMPTY(ptsm->mech))
--			ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_MECH, &(ptsm->mech));
--
--		if (EMPTY(ptsm->realm))
--			ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_REALM, &(ptsm->realm));
--
--		if (ISSET(ptsm->sasl_secprops)) {
--			rc = ldap_set_option(ptsm->ld, LDAP_OPT_X_SASL_SECPROPS, (void *) ptsm->sasl_secprops);
--			if( rc != LDAP_OPT_SUCCESS ) {
--				syslog(LOG_ERR, "Unable to set LDAP_OPT_X_SASL_SECPROPS.");
--				ldap_unbind(ptsm->ld);
-+ return PTSM_FAIL;
-+ }
-+ }
-+
-+ if (ptsm->sasl) {
-+
-+ if (EMPTY(ptsm->mech))
-+ ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_MECH, &(ptsm->mech));
-+
-+ if (EMPTY(ptsm->realm))
-+ ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_REALM, &(ptsm->realm));
-+
-+ if (ISSET(ptsm->sasl_secprops)) {
-+ rc = ldap_set_option(ptsm->ld, LDAP_OPT_X_SASL_SECPROPS, (void *) ptsm->sasl_secprops);
-+ if( rc != LDAP_OPT_SUCCESS ) {
-+ syslog(LOG_ERR, "Unable to set LDAP_OPT_X_SASL_SECPROPS.");
-+ ldap_unbind(ptsm->ld);
- ptsm->ld = NULL;
--				return PTSM_FAIL;
--			}
--		}
--
--		rc = ldap_sasl_interactive_bind_s(
--			ptsm->ld, 
--			ptsm->bind_dn,
--			ptsm->mech, 
--			NULL, 
--			NULL, 
--			LDAP_SASL_QUIET, 
--			ptsmodule_interact, 
--			ptsm);
--	} else
--		rc = ldap_simple_bind_s(ptsm->ld, ptsm->bind_dn, ptsm->password);
-+ return PTSM_FAIL;
-+ }
-+ }
-+
-+ rc = ldap_sasl_interactive_bind_s(
-+ ptsm->ld,
-+ ptsm->bind_dn,
-+ ptsm->mech,
-+ NULL,
-+ NULL,
-+ LDAP_SASL_QUIET,
-+ ptsmodule_interact,
-+ ptsm);
-+ } else
-+ rc = ldap_simple_bind_s(ptsm->ld, ptsm->bind_dn, ptsm->password);
- 
- if (rc != LDAP_SUCCESS) {
- syslog(LOG_ERR,
-@@ -425,14 +426,14 @@ static int ptsmodule_connect(void)
- ldap_unbind(ptsm->ld);
- ptsm->ld = NULL;
- return (rc == LDAP_SERVER_DOWN ? PTSM_RETRY : PTSM_FAIL);
--	}
-+ }
- 
--	return PTSM_OK;
-+ return PTSM_OK;
- }
- 
- /* API */
- 
--static void myinit(void) 
-+static void myinit(void)
- {
- const char *p = NULL;
- 
-@@ -444,7 +445,7 @@ static void myinit(void)
- fatal("xmalloc() failed", EC_CONFIG);
- }
- 
-- ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ? 
-+ ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ?
- config_getstring(IMAPOPT_LDAP_URI) : config_getstring(IMAPOPT_LDAP_SERVERS));
- ptsm->version = (config_getint(IMAPOPT_LDAP_VERSION) == 2 ? LDAP_VERSION2 : LDAP_VERSION3);
- ptsm->timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
-@@ -473,15 +474,15 @@ static void myinit(void)
- }
- ptsm->bind_dn = config_getstring(IMAPOPT_LDAP_BIND_DN);
- ptsm->sasl = config_getswitch(IMAPOPT_LDAP_SASL);
-- ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ? 
-+ ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ?
- config_getstring(IMAPOPT_LDAP_ID) : config_getstring(IMAPOPT_LDAP_SASL_AUTHC));
-- ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ? 
-+ ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ?
- config_getstring(IMAPOPT_LDAP_AUTHZ) : config_getstring(IMAPOPT_LDAP_SASL_AUTHZ));
-- ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ? 
-+ ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ?
- config_getstring(IMAPOPT_LDAP_MECH) : config_getstring(IMAPOPT_LDAP_SASL_MECH));
-- ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ? 
-+ ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ?
- config_getstring(IMAPOPT_LDAP_REALM) : config_getstring(IMAPOPT_LDAP_SASL_REALM));
-- ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ? 
-+ ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ?
- config_getstring(IMAPOPT_LDAP_PASSWORD) : config_getstring(IMAPOPT_LDAP_SASL_PASSWORD));
- ptsm->start_tls = config_getswitch(IMAPOPT_LDAP_START_TLS);
- ptsm->tls_check_peer = config_getswitch(IMAPOPT_LDAP_TLS_CHECK_PEER);
-@@ -508,6 +509,8 @@ static void myinit(void)
- ptsm->member_base = config_getstring(IMAPOPT_LDAP_MEMBER_BASE);
- ptsm->member_attribute = (config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) ?
- config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE));
-+ ptsm->user_attribute = (config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) ?
-+ config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE));
- p = config_getstring(IMAPOPT_LDAP_GROUP_SCOPE);
- if (!strcasecmp(p, "one")) {
- ptsm->group_scope = LDAP_SCOPE_ONELEVEL;
-@@ -521,10 +524,10 @@ static void myinit(void)
- ptsm->filter = config_getstring(IMAPOPT_LDAP_FILTER);
- ptsm->base = config_getstring(IMAPOPT_LDAP_BASE);
- 
--	if (ptsm->version != LDAP_VERSION3 && 
--	 (ptsm->sasl ||
--	 ptsm->start_tls))
--	 ptsm->version = LDAP_VERSION3;
-+ if (ptsm->version != LDAP_VERSION3 &&
-+ (ptsm->sasl ||
-+ ptsm->start_tls))
-+ ptsm->version = LDAP_VERSION3;
- 
- ptsm->ld = NULL;
- }
-@@ -533,98 +536,98 @@ static void myinit(void)
- * Note: calling function must free memory.
- */
- static int ptsmodule_escape(
--	const char *s, 
--	const unsigned int n, 
--	char **result) 
-+ const char *s,
-+ const unsigned int n,
-+ char **result)
- {
--	char *buf;
--	char *end, *ptr, *temp;
--
--	if (n > strlen(s)) // Sanity check, just in case
--		return PTSM_FAIL;
--
--	buf = xmalloc(n * 5 + 1);
--	if (buf == NULL) {
--		return PTSM_NOMEM;
--	}
--
--	buf0 = '\0';
--	ptr = (char *)s;
--	end = ptr + n;
--
--	while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
--
--		if (temp>ptr)
--			strncat(buf, ptr, temp-ptr);
--
--		switch (*temp) {
--			case '*':
--				strcat(buf, "\\2a");
--				break;
--			case '(':
--				strcat(buf, "\\28");
--				break;
--			case ')':
--				strcat(buf, "\\29");
--				break;
--			case '\\':
--				strcat(buf, "\\5c");
--				break;
--			case '\0':
--				strcat(buf, "\\00");
--				break;
--		}
--		ptr=temp+1;
--	}
--	if (ptr<end)
--		strncat(buf, ptr, end-ptr);
--
--	*result = buf;
--
--	return PTSM_OK;
-+ char *buf;
-+ char *end, *ptr, *temp;
-+
-+ if (n > strlen(s)) // Sanity check, just in case
-+ return PTSM_FAIL;
-+
-+ buf = xmalloc(n * 5 + 1);
-+ if (buf == NULL) {
-+ return PTSM_NOMEM;
-+ }
-+
-+ buf0 = '\0';
-+ ptr = (char *)s;
-+ end = ptr + n;
-+
-+ while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
-+
-+ if (temp>ptr)
-+ strncat(buf, ptr, temp-ptr);
-+
-+ switch (*temp) {
-+ case '*':
-+ strcat(buf, "\\2a");
-+ break;
-+ case '(':
-+ strcat(buf, "\\28");
-+ break;
-+ case ')':
-+ strcat(buf, "\\29");
-+ break;
-+ case '\\':
-+ strcat(buf, "\\5c");
-+ break;
-+ case '\0':
-+ strcat(buf, "\\00");
-+ break;
-+ }
-+ ptr=temp+1;
-+ }
-+ if (ptr<end)
-+ strncat(buf, ptr, end-ptr);
-+
-+ *result = buf;
-+
-+ return PTSM_OK;
- }
- 
- static int ptsmodule_tokenize_domains(
--	const char *d, 
--	int n, 
--	char **result)
-+ const char *d,
-+ int n,
-+ char **result)
- {
--	char *s, *s1;
--	char *lasts;
--	int nt, i, rc;
--
--	*result = NULL;
--
--	if (d == NULL || n < 1 || n > 9)
--		return PTSM_FAIL;
--
--	s = strdup(d);
--	if (s == NULL)
--		return PTSM_NOMEM;
--
--	for( nt=0, s1=s; *s1; s1++ )
--		if( *s1 == '.' ) nt++;
--	nt++;
--
--	if (n > nt) {
--		free(s);
--		return PTSM_FAIL;
--	}
--
--	i = nt - n;
--	s1 = (char *)strtok_r(s, ".", &lasts);
--	while(s1) {
--		if (i == 0) {
--			rc = ptsmodule_escape(s1, strlen(s1), result);
--			free(s);
--			return rc;
--		}
--		s1 = (char *)strtok_r(NULL, ".", &lasts);
--		i--;
--	}
--
--	free(s);
--	return PTSM_FAIL;
-+ char *s, *s1;
-+ char *lasts;
-+ int nt, i, rc;
-+
-+ *result = NULL;
-+
-+ if (d == NULL || n < 1 || n > 9)
-+ return PTSM_FAIL;
-+
-+ s = strdup(d);
-+ if (s == NULL)
-+ return PTSM_NOMEM;
-+
-+ for( nt=0, s1=s; *s1; s1++ )
-+ if( *s1 == '.' ) nt++;
-+ nt++;
-+
-+ if (n > nt) {
-+ free(s);
-+ return PTSM_FAIL;
-+ }
-+
-+ i = nt - n;
-+ s1 = (char *)strtok_r(s, ".", &lasts);
-+ while(s1) {
-+ if (i == 0) {
-+ rc = ptsmodule_escape(s1, strlen(s1), result);
-+ free(s);
-+ return rc;
-+ }
-+ s1 = (char *)strtok_r(NULL, ".", &lasts);
-+ i--;
-+ }
-+
-+ free(s);
-+ return PTSM_FAIL;
- }
- 
- #define PTSM_MAX(a,b) (a>b?a:b)
-@@ -642,137 +645,137 @@ static int ptsmodule_tokenize_domains(
- * Note: calling function must free memory.
- */
- static int ptsmodule_expand_tokens(
--	const char *pattern,
--	const char *username, 
--	const char *dn,
--	char **result) 
-+ const char *pattern,
-+ const char *username,
-+ const char *dn,
-+ char **result)
- {
--	char *buf; 
--	char *end, *ptr, *temp;
--	char *ebuf, *user;
--	char *domain;
--	int rc;
--
--	/* to permit multiple occurences of username and/or realm in filter */
--	/* and avoid memory overflow in filter build eg: (|(uid=%u)(userid=%u)) */
--	int percents, user_len, dn_len, maxparamlength;
--	
--	if (pattern == NULL) {
--		syslog(LOG_ERR, "filter pattern not setup");
--		return PTSM_FAIL;
--	}
--
--	/* find the longest param of username and realm, 
--	 do not worry about domain because it is always shorter 
--	 then username */
--	user_len=username ? strlen(username) : 0;
--	dn_len=dn ? strlen(dn) : 0;
--
--	maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
--
--	/* find the number of occurences of percent sign in filter */
--	for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
--		if( *buf == '%' ) percents++;
--	}
--
--	/* percents * 3 * maxparamlength because we need to account for
-+ char *buf;
-+ char *end, *ptr, *temp;
-+ char *ebuf, *user;
-+ char *domain;
-+ int rc;
-+
-+ /* to permit multiple occurences of username and/or realm in filter */
-+ /* and avoid memory overflow in filter build eg: (|(uid=%u)(userid=%u)) */
-+ int percents, user_len, dn_len, maxparamlength;
-+
-+ if (pattern == NULL) {
-+ syslog(LOG_ERR, "filter pattern not setup");
-+ return PTSM_FAIL;
-+ }
-+
-+ /* find the longest param of username and realm,
-+ do not worry about domain because it is always shorter
-+ then username */
-+ user_len=username ? strlen(username) : 0;
-+ dn_len=dn ? strlen(dn) : 0;
-+
-+ maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
-+
-+ /* find the number of occurences of percent sign in filter */
-+ for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
-+ if( *buf == '%' ) percents++;
-+ }
-+
-+ /* percents * 3 * maxparamlength because we need to account for
- * an entirely-escaped worst-case-length parameter */
--	buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
--	if(buf == NULL)
--		return PTSM_NOMEM;
--	buf0 = '\0';
--	
--	ptr = (char *)pattern;
--	end = ptr + strlen(ptr);
--
--	while ((temp=strchr(ptr,'%'))!=NULL ) {
--
--		if ((temp-ptr) > 0)
--			strncat(buf, ptr, temp-ptr);
--
--		if ((temp+1) >= end) {
--			syslog(LOG_DEBUG, "Incomplete lookup substitution format");
--			break;
--		}
--
--		switch (*(temp+1)) {
--			case '%':
--				strncat(buf,temp+1,1);
--				break;
--			case 'u':
--				if (ISSET(username)) {
--					rc=ptsmodule_escape(username, strlen(username), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Username not available.");
--				break;
--			case 'U':
--				if (ISSET(username)) {
--					
--					user = strchr(username, '@');
--					rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Username not available.");
--				break;
--			case '1':
--			case '2':
--			case '3':
--			case '4':
--			case '5':
--			case '6':
--			case '7':
--			case '8':
--			case '9':
--				if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
--					rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Domain tokens not available.");
--				break;
--			case 'R':
--			case 'd':
--				if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
--					rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
--					if (rc == PTSM_OK) {
--						if (*(temp+1) == 'R')
--							strcat(buf,"@");
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--					break;
--				} 
--				break;
--			case 'D':
--				if (ISSET(dn)) {
--					rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "dn not available.");
--				break;
--			default:
--				break;
--		}
--		ptr=temp+2;
--	}
--	if (temp<end)
--		strcat(buf, ptr);
--
--	*result = buf;
--
--	return PTSM_OK;
-+ buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
-+ if(buf == NULL)
-+ return PTSM_NOMEM;
-+ buf0 = '\0';
-+
-+ ptr = (char *)pattern;
-+ end = ptr + strlen(ptr);
-+
-+ while ((temp=strchr(ptr,'%'))!=NULL ) {
-+
-+ if ((temp-ptr) > 0)
-+ strncat(buf, ptr, temp-ptr);
-+
-+ if ((temp+1) >= end) {
-+ syslog(LOG_DEBUG, "Incomplete lookup substitution format");
-+ break;
-+ }
-+
-+ switch (*(temp+1)) {
-+ case '%':
-+ strncat(buf,temp+1,1);
-+ break;
-+ case 'u':
-+ if (ISSET(username)) {
-+ rc=ptsmodule_escape(username, strlen(username), &ebuf);
-+ if (rc == PTSM_OK) {
-+ strcat(buf,ebuf);
-+ free(ebuf);
-+ }
-+ } else
-+ syslog(LOG_DEBUG, "Username not available.");
-+ break;
-+ case 'U':
-+ if (ISSET(username)) {
-+
-+ user = strchr(username, '@');
-+ rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
-+ if (rc == PTSM_OK) {
-+ strcat(buf,ebuf);
-+ free(ebuf);
-+ }
-+ } else
-+ syslog(LOG_DEBUG, "Username not available.");
-+ break;
-+ case '1':
-+ case '2':
-+ case '3':
-+ case '4':
-+ case '5':
-+ case '6':
-+ case '7':
-+ case '8':
-+ case '9':
-+ if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
-+ rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
-+ if (rc == PTSM_OK) {
-+ strcat(buf,ebuf);
-+ free(ebuf);
-+ }
-+ } else
-+ syslog(LOG_DEBUG, "Domain tokens not available.");
-+ break;
-+ case 'R':
-+ case 'd':
-+ if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
-+ rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
-+ if (rc == PTSM_OK) {
-+ if (*(temp+1) == 'R')
-+ strcat(buf,"@");
-+ strcat(buf,ebuf);
-+ free(ebuf);
-+ }
-+ break;
-+ }
-+ break;
-+ case 'D':
-+ if (ISSET(dn)) {
-+ rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
-+ if (rc == PTSM_OK) {
-+ strcat(buf,ebuf);
-+ free(ebuf);
-+ }
-+ } else
-+ syslog(LOG_DEBUG, "dn not available.");
-+ break;
-+ default:
-+ break;
-+ }
-+ ptr=temp+2;
-+ }
-+ if (temp<end)
-+ strcat(buf, ptr);
-+
-+ *result = buf;
-+
-+ return PTSM_OK;
- }
- 
- 
-@@ -790,7 +793,7 @@ static int ptsmodule_get_dn(
- char *authzid;
- #endif
- char *base = NULL, *filter = NULL;
-- char *attrs = {NULL};
-+ char *attrs = {LDAP_NO_ATTRS,NULL}; //do not return all attrs!
- LDAPMessage *res;
- LDAPMessage *entry;
- char *attr, **vals;
-@@ -859,14 +862,14 @@ static int ptsmodule_get_dn(
- return PTSM_FAIL;
- }
- 
--	/*
--	 * We don't want to return the *first* entry found, we want to return
--	 * the *only* entry found.
--	 */
--	if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
--	 if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
--		*ret = ldap_get_dn(ptsm->ld, entry);
--	}
-+ /*
-+ * We don't want to return the *first* entry found, we want to return
-+ * the *only* entry found.
-+ */
-+ if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
-+ if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
-+ *ret = ldap_get_dn(ptsm->ld, entry);
-+ }
- 
- ldap_msgfree(res);
- res = NULL;
-@@ -879,16 +882,17 @@ static int ptsmodule_get_dn(
- static int ptsmodule_make_authstate_attribute(
- const char *canon_id,
- size_t size,
-- const char **reply, 
-+ const char **reply,
- int *dsize,
-- struct auth_state **newstate) 
-+ struct auth_state **newstate)
- {
- char *dn = NULL;
- LDAPMessage *res = NULL;
- LDAPMessage *entry = NULL;
- char **vals = NULL;
-+ char **rdn = NULL;
- int rc;
-- char *attrs = {(char *)ptsm->member_attribute,NULL};
-+ char *attrs = {(char *)ptsm->member_attribute,(char *)ptsm->user_attribute,NULL};
- 
- rc = ptsmodule_connect();
- if (rc != PTSM_OK) {
-@@ -915,37 +919,69 @@ static int ptsmodule_make_authstate_attribute(
- }
- 
- if ((entry = ldap_first_entry(ptsm->ld, res)) != NULL) {
--	int i, numvals;
--
--	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
--	if (vals != NULL) {
--	 numvals = ldap_count_values( vals );
--
--	 *dsize = sizeof(struct auth_state) +
--		 (numvals * sizeof(struct auth_ident));
--	 *newstate = xmalloc(*dsize);
--	 if (*newstate == NULL) {
--		*reply = "no memory";
--		rc = PTSM_FAIL;
--		goto done;
--	 }
--	 (*newstate)->ngroups = numvals;
--
--	 for (i = 0; i < numvals; i++) {
--		int j;
--		strcpy((*newstate)->groupsi.id, "group:");
--		for(j =0; j < strlen(valsi); j++) {
--		 if(Uisupper(valsij))
--		 valsij=tolower(valsij);
--		}
--		strlcat((*newstate)->groupsi.id, valsi, 
--		 sizeof((*newstate)->groupsi.id));
--		(*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
--	 }
--
--	 ldap_value_free(vals);
--	 vals = NULL;
--	}
-+ int i, numvals;
-+
-+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-+ if (vals != NULL) {
-+ numvals = ldap_count_values( vals );
-+
-+ *dsize = sizeof(struct auth_state) +
-+ (numvals * sizeof(struct auth_ident));
-+ *newstate = xmalloc(*dsize);
-+ if (*newstate == NULL) {
-+ *reply = "no memory";
-+ rc = PTSM_FAIL;
-+ goto done;
-+ }
-+
-+ (*newstate)->ngroups = numvals;
-+ (*newstate)->userid.id0 = '\0';
-+ for (i = 0; i < numvals; i++) {
-+ int j;
-+ strcpy((*newstate)->groupsi.id, "group:");
-+ rdn = ldap_explode_rdn(valsi,1);
-+ for (j = 0; j < strlen(rdn0); j++) {
-+ if (Uisupper(rdn0j))
-+ rdn0j=tolower(rdn0j);
-+ }
-+ strlcat((*newstate)->groupsi.id, rdn0,
-+ sizeof((*newstate)->groupsi.id));
-+ (*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
-+ }
-+
-+ ldap_value_free(rdn);
-+ ldap_value_free(vals);
-+ vals = NULL;
-+ }
-+
-+ if ((char *)ptsm->user_attribute) {
-+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->user_attribute);
-+ if (vals != NULL) {
-+ numvals = ldap_count_values( vals );
-+
-+ if (numvals==1) {
-+ if(!*newstate) {
-+ *dsize = sizeof(struct auth_state);
-+ *newstate = xmalloc(*dsize);
-+
-+ if (*newstate == NULL) {
-+ *reply = "no memory";
-+ rc = PTSM_FAIL;
-+ goto done;
-+ }
-+
-+ (*newstate)->ngroups = 0;
-+ }
-+
-+ size=strlen(vals0);
-+ strcpy((*newstate)->userid.id, ptsmodule_canonifyid(vals0,size));
-+ (*newstate)->userid.hash = strhash((*newstate)->userid.id);
-+ }
-+
-+ ldap_value_free(vals);
-+ vals = NULL;
-+ }
-+ }
- }
- 
- if(!*newstate) {
-@@ -957,11 +993,14 @@ static int ptsmodule_make_authstate_attribute(
- goto done;
- }
- (*newstate)->ngroups = 0;
-+ (*newstate)->userid.id0 = '\0';
- }
-- 
-+
- /* fill in the rest of our new state structure */
-- strcpy((*newstate)->userid.id, canon_id);
-- (*newstate)->userid.hash = strhash(canon_id);
-+ if ((*newstate)->userid.id0=='\0') {
-+ strcpy((*newstate)->userid.id, canon_id);
-+ (*newstate)->userid.hash = strhash(canon_id);
-+ }
- (*newstate)->mark = time(0);
- 
- rc = PTSM_OK;
-@@ -981,9 +1020,9 @@ done:;
- static int ptsmodule_make_authstate_filter(
- const char *canon_id,
- size_t size,
-- const char **reply, 
-+ const char **reply,
- int *dsize,
-- struct auth_state **newstate) 
-+ struct auth_state **newstate)
- {
- char *base = NULL, *filter = NULL;
- int rc;
-@@ -1053,32 +1092,32 @@ static int ptsmodule_make_authstate_filter(
- for (i = 0, entry = ldap_first_entry(ptsm->ld, res); entry != NULL;
- i++, entry = ldap_next_entry(ptsm->ld, entry)) {
- 
--	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
--	if (vals == NULL)
--	 continue;
-+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-+ if (vals == NULL)
-+ continue;
- 
--	if ( ldap_count_values( vals ) != 1 ) {
--	 *reply = "too many values";
--	 rc = PTSM_FAIL;
--	 ldap_value_free(vals);
--	 vals = NULL;
--	 goto done;
--	}
-+ if ( ldap_count_values( vals ) != 1 ) {
-+ *reply = "too many values";
-+ rc = PTSM_FAIL;
-+ ldap_value_free(vals);
-+ vals = NULL;
-+ goto done;
-+ }
- 
--	strcpy((*newstate)->groupsi.id, "group:");
-+ strcpy((*newstate)->groupsi.id, "group:");
- 
--	int j;
--	for(j =0; j < strlen(vals0); j++) {
--	 if(Uisupper(vals0j))
--	 vals0j=tolower(vals0j);
--	}
-+ int j;
-+ for(j =0; j < strlen(vals0); j++) {
-+ if(Uisupper(vals0j))
-+ vals0j=tolower(vals0j);
-+ }
- 
--	strlcat((*newstate)->groupsi.id, vals0, 
--	 sizeof((*newstate)->groupsi.id));
--	(*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
-+ strlcat((*newstate)->groupsi.id, vals0,
-+ sizeof((*newstate)->groupsi.id));
-+ (*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
- 
--	ldap_value_free(vals);
--	vals = NULL;
-+ ldap_value_free(vals);
-+ vals = NULL;
- }
- 
- rc = PTSM_OK;
-@@ -1100,9 +1139,9 @@ done:;
- static int ptsmodule_make_authstate_group(
- const char *canon_id,
- size_t size,
-- const char **reply, 
-+ const char **reply,
- int *dsize,
-- struct auth_state **newstate) 
-+ struct auth_state **newstate)
- {
- char *base = NULL, *filter = NULL;
- int rc;
-@@ -1184,8 +1223,8 @@ done:;
- static struct auth_state *myauthstate(
- const char *identifier,
- size_t size,
-- const char **reply, 
-- int *dsize) 
-+ const char **reply,
-+ int *dsize)
- {
- const char *canon_id;
- struct auth_state *newstate = NULL;
-@@ -1224,23 +1263,23 @@ retry:;
- 
- static void myinit(void)
- {
--	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
-+ fatal("PTS module (ldap) not compiled in", EC_CONFIG);
- }
- 
- static struct auth_state *myauthstate(
- const char *identifier __attribute__((unused)),
- size_t size __attribute__((unused)),
-- const char **reply __attribute__((unused)), 
-- int *dsize __attribute__((unused))) 
-+ const char **reply __attribute__((unused)),
-+ int *dsize __attribute__((unused)))
- {
--	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
-+ fatal("PTS module (ldap) not compiled in", EC_CONFIG);
- }
- 
- #endif /* HAVE_LDAP */
- 
--struct pts_module pts_ldap = 
-+struct pts_module pts_ldap =
- {
-- "ldap",		/* name */
-+ "ldap", /* name */
- 
- &myinit,
- &myauthstate,

cyrus-imapd-2.4.12-debugopt.patch Deleted

@@ -1,109 +0,0 @@
-diff -up cyrus-imapd-2.4.12/imap/global.c.debugopt cyrus-imapd-2.4.12/imap/global.c
---- cyrus-imapd-2.4.12/imap/global.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/global.c	2011-11-22 14:24:28.272416643 +0100
-@@ -157,6 +157,10 @@ int cyrus_init(const char *alt_config, c
- 	/* don't free the openlog() string! */
- }
- 
-+ /* allow debug logging */
-+ if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
- /* Look up default partition */
- config_defpartition = config_getstring(IMAPOPT_DEFAULTPARTITION);
- for (p = (char *)config_defpartition; p && *p; p++) {
-diff -up cyrus-imapd-2.4.12/imap/tls.c.debugopt cyrus-imapd-2.4.12/imap/tls.c
---- cyrus-imapd-2.4.12/imap/tls.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/tls.c	2011-11-22 14:24:28.272416643 +0100
-@@ -255,9 +255,9 @@ static DH *load_dh_param(const char *key
- 
- if (ret == NULL) {
- 	ret = get_dh1024();
--	syslog(LOG_NOTICE, "imapd:Loading hard-coded DH parameters");
-+	syslog(LOG_DEBUG, "imapd:Loading hard-coded DH parameters");
- } else {
--	syslog(LOG_NOTICE, "imapd:Loading DH parameters from file");
-+	syslog(LOG_DEBUG, "imapd:Loading DH parameters from file");
- }
- 
- if (bio != NULL) BIO_free(bio);
-diff -up cyrus-imapd-2.4.12/lib/imapoptions.debugopt cyrus-imapd-2.4.12/lib/imapoptions
---- cyrus-imapd-2.4.12/lib/imapoptions.debugopt	2011-11-22 14:24:28.265416615 +0100
-+++ cyrus-imapd-2.4.12/lib/imapoptions	2011-11-22 14:24:28.273416647 +0100
-@@ -388,6 +388,9 @@ Blank lines and lines beginning with ``#
- hashing done on configuration directories. This is recommended if
- one partition has a very bushy mailbox tree. */
- 
-+{ "debug", 0, SWITCH }
-+/* If enabled, allow syslog() to pass LOG_DEBUG messages. */
-+
- # Commented out - there's no such thing as "hostname_mechs", but we need
- # this for the man page
- # { "hostname_mechs", NULL, STRING }
-diff -up cyrus-imapd-2.4.12/lib/libconfig.c.debugopt cyrus-imapd-2.4.12/lib/libconfig.c
---- cyrus-imapd-2.4.12/lib/libconfig.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.c	2011-11-22 14:24:28.274416650 +0100
-@@ -84,6 +84,7 @@ int config_auditlog;
- unsigned config_maxword;
- unsigned config_maxquoted;
- int config_qosmarking;
-+int config_debug;
- 
- /* declared in each binary that uses libconfig */
- extern const int config_need_data;
-@@ -350,6 +351,9 @@ void config_read(const char *alt_config)
- 
- ival = config_getenum(IMAPOPT_QOSMARKING);
- config_qosmarking = qosival;
-+
-+ /* allow debug logging */
-+ config_debug = config_getswitch(IMAPOPT_DEBUG);
- }
- 
- #define GROWSIZE 4096
-diff -up cyrus-imapd-2.4.12/lib/libconfig.h.debugopt cyrus-imapd-2.4.12/lib/libconfig.h
---- cyrus-imapd-2.4.12/lib/libconfig.h.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.h	2011-11-22 14:24:28.274416650 +0100
-@@ -82,6 +82,7 @@ extern int config_auditlog;
- extern unsigned config_maxquoted;
- extern unsigned config_maxword;
- extern int config_qosmarking;
-+extern int config_debug;
- 
- /* config requirement flags */
- #define CONFIG_NEED_PARTITION_DATA (1<<0)
-diff -up cyrus-imapd-2.4.12/master/master.c.debugopt cyrus-imapd-2.4.12/master/master.c
---- cyrus-imapd-2.4.12/master/master.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/master.c	2011-11-22 14:30:47.243975974 +0100
-@@ -1984,7 +1984,7 @@ int main(int argc, char **argv)
- 	if(pidlock_fd != -1) close(pidlock_fd);
- }
- 
-- syslog(LOG_NOTICE, "process started");
-+ syslog(LOG_DEBUG, "process started");
- 
- #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
- /* initialize SNMP agent */
-@@ -2041,7 +2041,7 @@ int main(int argc, char **argv)
- init_janitor();
- 
- /* ok, we're going to start spawning like mad now */
-- syslog(LOG_NOTICE, "ready for work");
-+ syslog(LOG_DEBUG, "ready for work");
- 
- now = time(NULL);
- for (;;) {
-diff -up cyrus-imapd-2.4.12/master/masterconf.c.debugopt cyrus-imapd-2.4.12/master/masterconf.c
---- cyrus-imapd-2.4.12/master/masterconf.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/masterconf.c	2011-11-22 14:24:28.276416658 +0100
-@@ -99,6 +99,10 @@ int masterconf_init(const char *ident, c
- /* don't free the openlog() string! */
- }
- 
-+ /* drop debug messages locally */
-+ if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
- return 0;
- }
-

cyrus-imapd-2.4.15-903-normalize-authorization-id.patch Deleted

@@ -1,97 +0,0 @@
-diff --git a/imap/global.c b/imap/global.c
-index d2e5ba7..930d539 100644
---- a/imap/global.c
-+++ b/imap/global.c
-@@ -219,6 +219,8 @@ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
- 				  config_getswitch(IMAPOPT_UNIX_GROUP_ENABLE));
- 	libcyrus_config_setswitch(CYRUSOPT_USERNAME_TOLOWER,
- 				  config_getswitch(IMAPOPT_USERNAME_TOLOWER));
-+	libcyrus_config_setswitch(CYRUSOPT_NORMALIZEUID,
-+				  config_getswitch(IMAPOPT_NORMALIZEUID));
- 	libcyrus_config_setswitch(CYRUSOPT_SKIPLIST_UNSAFE,
- 				  config_getswitch(IMAPOPT_SKIPLIST_UNSAFE));
- 	libcyrus_config_setstring(CYRUSOPT_TEMP_PATH,
-diff --git a/lib/auth_unix.c b/lib/auth_unix.c
-index c1f0329..d7abf79 100644
---- a/lib/auth_unix.c
-+++ b/lib/auth_unix.c
-@@ -156,10 +156,12 @@ const char *identifier;
- size_t len;
- {
-     static char retbuf81;
-+    char backup81;
-     struct group *grp;
-     char sawalpha;
-     char *p;
-     int username_tolower = 0;
-+    int ic,rbc;
- 
-     if(!len) len = strlen(identifier);
-     if(len >= sizeof(retbuf)) return NULL;
-@@ -211,6 +213,22 @@ size_t len;
-     /* now we don't */
-     /* if (!sawalpha) return NULL;  */
- 
-+    if( (libcyrus_config_getswitch(CYRUSOPT_NORMALIZEUID) == 1) ) {
-+        strcpy(backup,retbuf);
-+       /* remove leading blanks */
-+       for(ic=0; isblank(backupic); ic++);
-+       for(rbc=0; backupic; ic++) {
-+            retbufrbc = ( isalpha(backupic) ?
-+                 tolower(backupic) : backupic );
-+            rbc++;
-+       }
-+       retbufrbc = '\0';
-+       /* remove trailing blanks */
-+       for(--rbc; isblank(retbufrbc); rbc--) {
-+            retbufrbc = '\0';
-+       }
-+    }
-+
-     return retbuf;
- }
- 
-diff --git a/lib/imapoptions b/lib/imapoptions
-index c049501..4d16fb5 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -1416,6 +1416,11 @@ product version in the capabilities */
-    the special use flag "\Drafts" added.  Later versions of Cyrus
-    have a much more flexible RFC 6154 compatible system.  */
- 
-+{ "normalizeuid", 0, SWITCH }
-+/* Lowercase uid and strip leading and trailing blanks. It is recommended
-+   to set this to yes, especially if OpenLDAP is used as authentication
-+   source. */
-+
- /*
- .SH SEE ALSO
- .PP
-diff --git a/lib/libcyr_cfg.c b/lib/libcyr_cfg.c
-index 688523c..b5c6008 100644
---- a/lib/libcyr_cfg.c
-+++ b/lib/libcyr_cfg.c
-@@ -158,6 +158,10 @@ struct cyrusopt_s cyrus_options = {
-       CFGVAL(long, 1),
-       CYRUS_OPT_SWITCH },
- 
-+    { CYRUSOPT_NORMALIZEUID,
-+      CFGVAL(long, 1),
-+      CYRUS_OPT_SWITCH },
-+
-     { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
- };
- 
-diff --git a/lib/libcyr_cfg.h b/lib/libcyr_cfg.h
-index 7bdca06..1afe95a 100644
---- a/lib/libcyr_cfg.h
-+++ b/lib/libcyr_cfg.h
-@@ -116,6 +116,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_USESSL,
-     /* Checkpoint after every recovery (OFF) */
-     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-

cyrus-imapd-2.4.17_htmlstrip_no_return.patch Deleted

cyrus-imapd-2.5-autoconf-2.63.patch Added

cyrus-imapd-2.5-lt-prereq.patch Added

cyrus-imapd-2.5-with-dav-ifdefs.patch Added

@@ -0,0 +1,262 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8b227ea..204dfab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1184,7 +1184,6 @@ dist_man_MANS = \
+ 	man/deliver.8 \
+ 	man/fetchnews.8 \
+ 	man/fud.8 \
+-	man/httpd.8 \
+ 	man/idled.8 \
+ 	man/imapd.8 \
+ 	man/ipurge.8 \
+@@ -1200,17 +1199,27 @@ dist_man_MANS = \
+ 	man/rmnews.8 \
+ 	man/smmapd.8 \
+ 	man/syncnews.8 \
+-	man/sync_client.8 \
+-	man/sync_reset.8 \
+-	man/sync_server.8 \
+ 	man/timsieved.8 \
+ 	man/tls_prune.8 \
+ 	man/unexpunge.8
+-if USE_SQUAT
++
++if SQUATTER
+ dist_man_MANS += \
+ 	man/squatter.8
+ endif
+ 
++if HTTPD
++dist_man_MANS += \
++	man/httpd.8
++endif
++
++if REPLICATION
++dist_man_MANS += \
++	man/sync_client.8 \
++	man/sync_reset.8 \
++	man/sync_server.8
++endif
++
+ master_master_SOURCES = \
+ 	master/cyrusMasterMIB.c \
+ 	master/cyrusMasterMIB.h \
+diff --git a/imap/mailbox.c b/imap/mailbox.c
+index f9ae70a..3baf44e 100644
+--- a/imap/mailbox.c
++++ b/imap/mailbox.c
+@@ -51,7 +51,9 @@
+ #elif defined(HAVE_STDINT_H)
+ # include <stdint.h>
+ #endif
++#ifdef WITH_DAV
+ #include <libical/vcc.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -81,8 +83,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "crc32.h"
+ #include "md5.h"
+ #include "exitcodes.h"
+@@ -2666,6 +2670,7 @@ out:
+ return r;
+ }
+ 
++#ifdef WITH_DAV
+ static int mailbox_update_carddav(struct mailbox *mailbox,
+ 				 struct index_record *old,
+ 				 struct index_record *new)
+@@ -2886,6 +2891,7 @@ static int mailbox_update_dav(struct mailbox *mailbox,
+ 	return mailbox_update_caldav(mailbox, old, new);
+ return 0;
+ }
++#endif //WITH_DAV
+ 
+ EXPORTED int mailbox_update_conversations(struct mailbox *mailbox,
+ 				 struct index_record *old,
+@@ -3112,8 +3118,10 @@ static int mailbox_update_indexes(struct mailbox *mailbox,
+ {
+ int r = 0;
+ 
++#ifdef WITH_DAV
+ r = mailbox_update_dav(mailbox, old, new);
+ if (r) return r;
++#endif
+ 
+ r = mailbox_update_conversations(mailbox, old, new);
+ 
+@@ -4238,6 +4246,7 @@ static int chkchildren(char *name,
+ return r;
+ }
+ 
++#ifdef WITH_DAV
+ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ {
+ struct index_record record;
+@@ -4257,6 +4266,7 @@ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ 
+ return 0;
+ }
++#endif
+ 
+ EXPORTED int mailbox_add_conversations(struct mailbox *mailbox)
+ {
+diff --git a/imap/mailbox.h b/imap/mailbox.h
+index 5d3ed01..fe0bf91 100644
+--- a/imap/mailbox.h
++++ b/imap/mailbox.h
+@@ -587,6 +587,8 @@ extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
+ extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force);
+ extern int mailbox_has_conversations(struct mailbox *mailbox);
+ 
++#ifdef WITH_DAV
+ extern int mailbox_add_dav(struct mailbox *mailbox);
++#endif
+ 
+ #endif /* INCLUDED_MAILBOX_H */
+diff --git a/imap/mboxevent.c b/imap/mboxevent.c
+index eabc462..13f0945 100644
+--- a/imap/mboxevent.c
++++ b/imap/mboxevent.c
+@@ -53,8 +53,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "exitcodes.h"
+ #include "imapurl.h"
+ #include "libconfig.h"
+@@ -131,9 +133,11 @@ static struct mboxevent event_template =
+ { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 },
++#ifdef WITH_DAV
+ { EVENT_MBTYPE, "vnd.cmu.mbtype", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_DAV_FILENAME, "vnd.cmu.davFilename", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_DAV_UID, "vnd.cmu.davUid", EVENT_PARAM_STRING, 0, 0 },
++#endif
+ /* always at end to let the parser to easily truncate this part */
+ { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
+@@ -374,8 +378,10 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+ 	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_SESSIONID;
+ case EVENT_MAILBOX_ID:
+ 	return (type & MAILBOX_EVENTS);
++#ifdef WITH_DAV
+ case EVENT_MBTYPE:
+ 	return (type & MAILBOX_EVENTS);
++#endif
+ case EVENT_MAX_MESSAGES:
+ 	return type & QUOTA_EVENTS;
+ case EVENT_MESSAGE_CONTENT:
+@@ -387,12 +393,14 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+ case EVENT_MESSAGE_CID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) &&
+ 	 (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
++#ifdef WITH_DAV
+ case EVENT_DAV_FILENAME:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVFILENAME) &&
+ 	 (type & EVENT_CALENDAR);
+ case EVENT_DAV_UID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVUID) &&
+ 	 (type & EVENT_CALENDAR);
++#endif
+ case EVENT_MESSAGES:
+ 	if (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN))
+ 	 return 1;
+@@ -738,6 +746,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 				 cacheitem_size(record, CACHE_BODYSTRUCTURE)));
+ }
+ 
++#ifdef WITH_DAV
+ /* add caldav items */
+ if ((mailbox->mbtype & (MBTYPES_DAV)) &&
+ 	(mboxevent_expected_param(event->type, EVENT_DAV_FILENAME) ||
+@@ -779,7 +788,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 	 }
+ 	}
+ }
+-
++#endif //WITH_DAV
+ }
+ 
+ void mboxevent_extract_copied_record(struct mboxevent *event,
+@@ -991,8 +1000,10 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event,
+ imapurl_toURL(url, &imapurl);
+ FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+ 
++#ifdef WITH_DAV
+ FILL_STRING_PARAM(event, EVENT_MBTYPE,
+ 	xstrdup(mboxlist_mbtype_to_string(mailbox->mbtype)));
++#endif
+ 
+ /* mailbox related events also require mailboxID */
+ if (event->type & MAILBOX_EVENTS) {
+diff --git a/imap/mboxevent.h b/imap/mboxevent.h
+index f56ad9e..2f1e022 100644
+--- a/imap/mboxevent.h
++++ b/imap/mboxevent.h
+@@ -113,9 +113,11 @@ enum event_param {
+ EVENT_USER,
+ EVENT_MESSAGE_SIZE,
+ EVENT_MESSAGE_CID,
++#ifdef WITH_DAV
+ EVENT_MBTYPE,
+ EVENT_DAV_FILENAME,
+ EVENT_DAV_UID,
++#endif
+ EVENT_ENVELOPE,
+ EVENT_BODYSTRUCTURE,
+ EVENT_CLIENT_ID,
+diff --git a/imap/sync_server.c b/imap/sync_server.c
+index 745b3cf..e51983d 100644
+--- a/imap/sync_server.c
++++ b/imap/sync_server.c
+@@ -74,9 +74,11 @@
+ #include "annotate.h"
+ #include "append.h"
+ #include "auth.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
+ #include "dav_db.h"
++#endif
+ #include "dlist.h"
+ #include "exitcodes.h"
+ #include "global.h"
+@@ -291,9 +293,11 @@ int service_init(int argc __attribute__((unused)),
+ 	statuscache_open();
+ }
+ 
++#ifdef WITH_DAV
+ dav_init();
+ caldav_init();
+ carddav_init();
++#endif
+ 
+ return 0;
+ }
+@@ -455,9 +459,11 @@ void shut_down(int code)
+ 
+ proc_cleanup();
+ 
++#ifdef WITH_DAV
+ carddav_done();
+ caldav_done();
+ dav_done();
++#endif
+ 
+ if (config_getswitch(IMAPOPT_STATUSCACHE)) {
+ 	statuscache_close();

cyrus-imapd-2.4.17.tar.gz/Makefile.in Deleted

@@ -1,202 +0,0 @@
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-SUBDIRS = man @PRE_SUBDIRS@ lib @SIEVE_SUBDIRS@ @SERVER_SUBDIRS@ \
-	imtest @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
-DISTSUBDIRS = doc
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INSTALL = @INSTALL@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-mandir = @mandir@
-
-YACC = @YACC@
-LEX = @LEX@
-COMPILE_ET = @COMPILE_ET@
-
-PACKAGE = cyrus-imapd
-VERSION = 2.4.17
-GIT_VERSION = $(VERSION).git$(shell date +'%Y%m%d%H%M')
-
-all:: xversion
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" all "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
-	done
-
-snapshot::
-	@echo "creating snapshot $(GIT_VERSION)"
-	@if \! -d snapshot ; then mkdir snapshot ; fi
-	@git archive --format=tar --prefix=$(PACKAGE)-$(GIT_VERSION)/ HEAD | tar -C snapshot/ -x -f -
-	@echo "/* $(PACKAGE) $(GIT_VERSION) */" > snapshot/$(PACKAGE)-$(GIT_VERSION)/xversion.h
-	@echo "#define _CYRUS_VERSION \"git$(VERSION)+`git log --pretty=oneline $(PACKAGE)-$(VERSION)..HEAD | wc -l`\"" >> snapshot/$(PACKAGE)-$(GIT_VERSION)/xversion.h
-	@echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty="%h %ci" -1 | cut -c 1-18`\"" >> snapshot/$(PACKAGE)-$(GIT_VERSION)/xversion.h
-	@touch snapshot/$(PACKAGE)-$(GIT_VERSION)/xversion
-	@cd snapshot/$(PACKAGE)-$(GIT_VERSION) ; sh SMakefile
-	@for d in $(SUBDIRS) $(DISTSUBDIRS); \
-	do \
-	(cd snapshot/$(PACKAGE)-$(GIT_VERSION)/$$d; \
-	if -f Makefile.dist ; then \
-	echo "### Making" snapshot "in" `pwd`; \
-	$(MAKE) $(MFLAGS) YACC='$(YACC)' LEX='$(LEX)' \
-	COMPILE_ET='$(COMPILE_ET)' -f Makefile.dist dist ; \
-	fi) || exit 1; \
-	done
-	@echo "creating tarfile"
-	tar -C snapshot -c -f - $(PACKAGE)-$(GIT_VERSION) | gzip -9 > $(PACKAGE)-$(GIT_VERSION).tar.gz
-	@rm -rf snapshot
-
-dist:: distgit
-	@echo "creating configure"
-	@cd dist/cyrus-imapd-$(VERSION) ; sh SMakefile
-	@for d in $(SUBDIRS) $(DISTSUBDIRS); \
-	do \
-	(cd dist/cyrus-imapd-$(VERSION)/$$d; \
-	if -f Makefile.dist ; then \
-	echo "### Making" dist "in" `pwd`; \
-	$(MAKE) $(MFLAGS) YACC='$(YACC)' LEX='$(LEX)' \
-	COMPILE_ET='$(COMPILE_ET)' -f Makefile.dist dist ; \
-	fi) || exit 1; \
-	done
-	@echo "creating tarfile"
-	@cd dist ; tar cf - cyrus-imapd-$(VERSION) | \
-	gzip -9 > ../cyrus-imapd-$(VERSION).tar.gz
-	rm -f distgit
-	rm -rf dist
-
-distgit:
-	if \! -d dist ; then mkdir dist ; fi
-	@echo "checking out the distribution from tag $(PACKAGE)-$(VERSION)"
-	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $(PACKAGE)-$(VERSION) | tar -C dist -x -f -
-	echo "/* Release $(PACKAGE)-$(VERSION) */" > dist/$(PACKAGE)-$(VERSION)/xversion.h
-	echo "#define _CYRUS_VERSION \"v$(VERSION)\"" >> dist/$(PACKAGE)-$(VERSION)/xversion.h
-	echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty=\"%h %ci\" -1 | cut -d\" \" -f1,2`\"" >> dist/$(PACKAGE)-$(VERSION)/xversion.h
-	touch dist/$(PACKAGE)-$(VERSION)/xversion
-	touch distgit
-
-xversion xversion.h:
-	@echo "/* Development version */" > xversion.h.tmp
-	@echo "#define _CYRUS_VERSION \"git$(VERSION)+`git log --pretty=oneline $(PACKAGE)-$(VERSION)..HEAD | wc -l`\"" >> xversion.h.tmp
-	@echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty=\"%h %ci\" -1 | cut -d\" \" -f1,2`\"" >> xversion.h.tmp
-	@cmp -s xversion.h.tmp xversion.h || mv xversion.h.tmp xversion.h
-	@rm -f xversion.h.tmp
-
-install::
-	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
-	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
-	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
-	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
-	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
-	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" install "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) install) || exit 1; \
-	done
-
-clean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) clean ;	\
-			echo "### Done with" `pwd`);		\
-	done
-
-distclean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) distclean ; \
-			echo "### Done with" `pwd`);		\
-	done
-	rm -f Makefile Makefile.bak \
-	 config.status config.log config.cache config.h
-
-depend::
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" depend "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) depend) || exit 1; \
-	done
-
-Makefile: Makefile.in config.status
-	$(SHELL) config.status
-config.status: configure
-	$(SHELL) config.status --recheck
-configure: configure.in
-	cd $(srcdir); rm -f config.cache; autoconf
-
-checkdepend::
-
-depend::
-	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ed -s Makefile < eddep
-	rm eddep
-	echo '' >> Makefile
-	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-	echo '# see make depend above' >> Makefile
-
-# DO NOT DELETE THIS LINE -- make depend uses it
-
-# The following rule ensures that "make depend" gets run at least
-# once before a "make all". The "depend" rule above removes
-# this rule from the Makefile the first time the "make depend"
-# has been run after the Makefile is generated by Configure
-
-checkdepend:: depend
-
-# IF YOU PUT STUFF HERE IT WILL GO AWAY
-# see make depend above

cyrus-imapd-2.4.17.tar.gz/SIEVE Deleted

cyrus-imapd-2.4.17.tar.gz/SIEVE/scripts Deleted

cyrus-imapd-2.4.17.tar.gz/SIEVE/scripts/sieveshell.pl Deleted

@@ -1,150 +0,0 @@
-use SIEVE::managesieve;
-use Getopt::Long;
-
-$ret = GetOptions("a|authname:s",
- "u|username:s",
-		 "r|realm:s",
-		 "e|exec:s"
- );
-if (!$ret || $#ARGV != 0) { 
- show_help();
- exit;
-}
-
-$acapserver = $ARGV0;
-
-$username = $opt_u;
-$authname = $opt_a;
-$realm = $opt_r;
-$exec = $opt_e;
-
-if (defined $exec) {
- $tmpfile = "/tmp/sieveshell.tmp";
- open (TMP,">$tmpfile") || die "Unable to open tmp file";
- print TMP $exec;
- close(TMP);
- open (TMP,"<$tmpfile") || die "Unable to open tmp file";
- unlink($tmpfile);
- $filehandle = *TMP;
-} else {
- $filehandle = *STDIN;
- $interactive = 1;
-}
-
-
-
-sub list_cb {
-
- my($name, $isactive) = @_ ;
- 
- print "$name ";
- if ($isactive == 1) {
- print " <- active script\n";
- } else {
- print "\n";
- }
-
-}
-
-sub prompt {
-
- my($type, $prompt) = @_ ;
-
- if (($type eq "username") && (defined $username)) {
- $username;
- return;
- } elsif (($type eq "authname") && (defined $authname)) {
- $authname;
- return;
- } elsif (($type eq "realm") && (defined $realm)) {
- $realm;
- return;
- }
-
- print "$prompt: ";
-
- $b = <STDIN>;
- chop($b);
- 
- $b;
-}
-
-sub show_help {
- print "Usage:\n";
- print " sieveshell -u username-a authname-r realm <server>\n";
- print "\n";
- print "help - this screen\n";
- print "list - list scripts on server\n";
- print "put <filename> - upload script to server (implicitly set active if no active script)\n";
- print "get <name> <filename> - get script. if no filename display to stdout\n";
- print "delete <name> - delete script.\n";
- print "activate <name> - set a script as the active script\n";
- print "quit - Quit\n";
-}
-
-# main code
-
-my $obj = sieve_get_handle($acapserver,"prompt","prompt","prompt","prompt");
-
-if (!defined $obj) {
- die "Unable to connect to server";
-}
-
-if ($interactive == 1) {
- print "> ";
-}
-
-while(<$filehandle>) {
-
- @words = split ' ',$_;
-
- if (($words0 eq "put") || ($words0 eq "p")) {
-
- $ret = sieve_put_file($obj, $words1);
- 
- if ($ret != 0) { print "Upload failed\n"; }
-
- } elsif (($words0 eq "list") || ($words0 eq "l") || ($words0 eq "ls")) {
- 
- $ret = sieve_list($obj, "list_cb");
-
- if ($ret != 0) { print "List command failed\n"; }
-
- } elsif (($words0 eq "activate") || ($words0 eq "a")) {
-
- $ret = sieve_activate($obj, $words1);
- if ($ret != 0) { print "Activate failed\n"; }
-
- } elsif (($words0 eq "delete") || ($words0 eq "d")) { 
-
- $ret = sieve_delete($obj, $words1);
- if ($ret != 0) { print "Delete failed\n"; }
-
- } elsif (($words0 eq "get") || ($words0 eq "g")) {
-
- $ret = sieve_get($obj, $words1, $str);
- if ($ret != 0) { 
- print "get failed\n"; 
- } else {
- if ($words2) {
-	open (OUTPUT,">$words2") || die "Unable to open $words2";
-	print OUTPUT $str;
-	close(OUTPUT);
- } else {
-	print $str;
- }
- }
-
- } elsif (($words0 eq "quit") || ($words0 eq "q")) {
- exit 0;
-
- } elsif (($words0 eq "help") || ($words0 eq "?")) {
- show_help();
- } else {
- print "Invalid command: $words0\n";
- } 
-
- if ($interactive == 1) {
- print "> ";
- }
-}

cyrus-imapd-2.4.17.tar.gz/aclocal.m4 Deleted

@@ -1,26 +0,0 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include(cmulocal/berkdb.m4)
-m4_include(cmulocal/bsd_sockets.m4)
-m4_include(cmulocal/c-attribute.m4)
-m4_include(cmulocal/c-fpic.m4)
-m4_include(cmulocal/common.m4)
-m4_include(cmulocal/cyrus.m4)
-m4_include(cmulocal/ipv6.m4)
-m4_include(cmulocal/libwrap.m4)
-m4_include(cmulocal/sasl2.m4)
-m4_include(cmulocal/sql.m4)
-m4_include(cmulocal/ucdsnmp.m4)
-m4_include(cmulocal/zlib.m4)

cyrus-imapd-2.4.17.tar.gz/autom4te.cache Deleted

cyrus-imapd-2.4.17.tar.gz/autom4te.cache/output.0 Deleted

@@ -1,12233 +0,0 @@
-@%:@! /bin/sh
-@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68.
-@%:@ 
-@%:@ 
-@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-@%:@ Foundation, Inc.
-@%:@ 
-@%:@ 
-@%:@ This configure script is free software; the Free Software Foundation
-@%:@ gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in @%:@(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in @%:@((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- 
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
- 
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in @%:@(
-	 /*)
-	 for as_base in sh bash ksh sh5; do
-	 # Try only shells that exist, to save several forks.
-	 as_shell=$as_dir/$as_base
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
-		 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
-	 done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in @%:@ ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-@%:@ as_fn_unset VAR
-@%:@ ---------------
-@%:@ Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-@%:@ as_fn_set_status STATUS
-@%:@ -----------------------
-@%:@ Set @S|@? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} @%:@ as_fn_set_status
-
-@%:@ as_fn_exit STATUS
-@%:@ -----------------
-@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} @%:@ as_fn_exit
-
-@%:@ as_fn_mkdir_p
-@%:@ -------------
-@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} @%:@ as_fn_mkdir_p
-@%:@ as_fn_append VAR VALUE
-@%:@ ----------------------
-@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-@%:@ advantage of any shell optimizations that allow amortized linear growth over
-@%:@ repeated appends, instead of the typical quadratic growth present in naive
-@%:@ implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-@%:@ as_fn_arith ARG...
-@%:@ ------------------
-@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across @S|@(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-@%:@ as_fn_error STATUS ERROR LINENO LOG_FD
-@%:@ ----------------------------------------
-@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} @%:@ as_fn_error
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /$LINENO/=
- ' <$as_myself |
- sed '
- s/$LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/$LINENO$^'$as_cr_alnum'_.*\n$$.*$/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
- # Don't try to exec as it changes $0, causing all sort of problems
- # (the dirname of $0 is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in @%:@(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIB@&t@OBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="imap/imapd.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-PERL_DEPSUBDIRS
-PERL_SUBDIRS
-IMAP_LIBS
-IMAP_COM_ERR_LIBS
-LIB_RT
-LIB_UCDSNMP
-SNMP_CONFIG
-LIB_WRAP
-SNMP_SUBDIRS
-PERL_CCCDLFLAGS
-PERL
-SASLFLAGS
-LIB_SASL
-DYNSASLFLAGS
-LIB_DYN_SASL
-GSSAPIBASE_LIBS
-GSSAPI_LIBS
-LIB_CRYPT
-COM_ERR_CPPFLAGS
-COM_ERR_LDFLAGS
-COM_ERR_LIBS
-COMPILE_ET
-IMAP_PROGS
-ZEPHYR_LIBS
-ZLIB
-CMU_LIB_SUBDIR
-OPENSSL_LIB
-OPENSSL_INC
-SERVER_SUBDIRS
-LDAP_LIBS
-LDAP_LDFLAGS
-LDAP_CPPFLAGS
-AFS_LDFLAGS
-AFS_LIBS
-cyrus_cv_sigveclib
-WITH_LOCK
-WITH_MAP
-WITH_GMTOFF
-WITH_NONBLOCK
-SIEVE_SUBDIRS
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-YFLAGS
-YACC
-SIEVE_CPPFLAGS
-SIEVE_LIBS
-SIEVE_OBJS
-CYRUSDB_OBJS
-BDB_LIB
-BDB_INC
-LOCALDEFS
-DEPLIBS
-EXTRA_SUBDIRS
-PRE_SUBDIRS
-IPV6_OBJS
-LIB_SOCKET
-LIB@&t@OBJS
-AWK
-EGREP
-GREP
-CPP
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-SET_MAKE
-RANLIB
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-cyrus_group
-cyrus_user
-service_path
-cyrus_prefix
-MAKEDEPEND
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_extraident
-with_login
-with_cyrus_prefix
-with_service_path
-with_cyrus_user
-with_cyrus_group
-with_bdb
-with_dbdir
-with_bdb_libdir
-with_bdb_incdir
-with_mysql
-with_mysql_libdir
-with_mysql_incdir
-with_pgsql
-with_pgsql_libdir
-with_pgsql_incdir
-with_sqlite
-with_sqlite_libdir
-with_sqlite_incdir
-enable_sieve
-enable_pcre
-with_lock
-enable_afs
-with_afs_libdir
-with_afs_incdir
-with_ldap
-enable_krb5afspts
-enable_server
-with_krb
-with_krbimpl
-enable_statickrb
-with_krbdes
-with_openssl
-with_egd_socket
-with_lib_subdir
-with_zlib
-with_zephyr
-with_pidfile
-enable_idled
-enable_nntp
-enable_murder
-enable_replication
-with_com_err
-with_syslogfacility
-enable_cmulocal
-enable_oldsievename
-enable_netscapehack
-enable_gssapi
-with_gss_impl
-with_sasl
-with_staticsasl
-with_perl
-with_libwrap
-with_snmp
-with_ucdsnmp
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x$^=*$='`
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | 0-9* | *!_$as_cr_alnum* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X$.*^/$' \| "X$ac_val" : 'X$.*$'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- \\/$* | ?:\\/* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_myself" : 'X$//$^/' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*^/$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 OPTION... VAR=VALUE...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE disabled
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR configure dir or \`..'
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- @<:@@S|@ac_default_prefix@:>@
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- @<:@PREFIX@:>@
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables EPREFIX/bin
- --sbindir=DIR system admin executables EPREFIX/sbin
- --libexecdir=DIR program executables EPREFIX/libexec
- --sysconfdir=DIR read-only single-machine data PREFIX/etc
- --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
- --localstatedir=DIR modifiable single-machine data PREFIX/var
- --libdir=DIR object code libraries EPREFIX/lib
- --includedir=DIR C header files PREFIX/include
- --oldincludedir=DIR C header files for non-gcc /usr/include
- --datarootdir=DIR read-only arch.-independent data root PREFIX/share
- --datadir=DIR read-only architecture-independent data DATAROOTDIR
- --infodir=DIR info documentation DATAROOTDIR/info
- --localedir=DIR locale-dependent data DATAROOTDIR/locale
- --mandir=DIR man documentation DATAROOTDIR/man
- --docdir=DIR documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
- --htmldir=DIR html documentation DOCDIR
- --dvidir=DIR dvi documentation DOCDIR
- --pdfdir=DIR pdf documentation DOCDIR
- --psdir=DIR ps documentation DOCDIR
-_ACEOF
-
- cat <<\_ACEOF
-
-System types:
- --build=BUILD configure for building on BUILD guessed
- --host=HOST cross-compile to build programs to run on HOST BUILD
- --target=TARGET configure for building compilers for TARGET HOST
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
- cat <<\_ACEOF
-
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE=ARG include FEATURE ARG=yes
- --disable-sieve disable Sieve support
- --disable-pcre disable PCRE library
- --enable-afs Enable AFS with ptloader
- --enable-krb5afspts compile afskrb PTS module with krb5 support
- --disable-server disable compiling servers
- --enable-statickrb link Kerberos statically
- --enable-idled enable IMAP idled support
- --enable-nntp enable NNTP support
- --enable-murder enable IMAP Murder support
- --enable-replication enable replication support (experimental)
- --enable-cmulocal enable CMU-specific local support
- --enable-oldsievename enable the use of 'imap' as the sieve service name
- --enable-netscapehack enable Netscape hack for the menu option
- in Communicator to Administrate Mail
- --enable-gssapi=<DIR> enable GSSAPI authentication @<:@yes@:>@
-
-Optional Packages:
- --with-PACKAGE=ARG use PACKAGE ARG=yes
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-extraident=STRING use STRING as extra version information
-
- --with-cyrus-prefix=DIR use DIR as cyrus server install directory
- --with-service-path=DIR use DIR as service install directory
- --with-cyrus-user=USERID use USERID cyrus userid
- --with-cyrus-group=GROUPID use GROUPID cyrus group
- --with-bdb=DIR use Berkeley DB (in DIR) yes 
- --with-bdb-libdir=DIR Berkeley DB lib files are in DIR
- --with-bdb-incdir=DIR Berkeley DB include files are in DIR
- --with-mysql=DIR use MySQL (in DIR) no 
- --with-mysql-libdir=DIR MySQL lib files are in DIR
- --with-mysql-incdir=DIR MySQL include files are in DIR
- --with-pgsql=DIR use PostgreSQL (in DIR) no 
- --with-pgsql-libdir=DIR Pgsql lib files are in DIR
- --with-pgsql-incdir=DIR Pgsql include files are in DIR
- --with-sqlite=DIR use SQLite (in DIR) no 
- --with-sqlite-libdir=DIR SQLite lib files are in DIR
- --with-sqlite-incdir=DIR SQLite include files are in DIR
- --with-lock=METHOD force use of METHOD for locking (flock or fcntl)
- --with-afs-libdir=PATH use AFS libraries from PATH /usr/lib
- --with-afs-incdir=PATH use AFS headers from PATH /usr/include
- --with-ldap=DIR use LDAP (in DIR) (experimental) /usr/local 
- --with-krb=PATH use Kerberos from PATH
- --with-krbimpl=\kth|mit\ assume Kerberos 4 from KTH or MIT
- --with-krbdes use Kerberos DES implementation yes
- --with-openssl=PATH use OpenSSL from PATH
- --with-egd-socket=FILE Entropy Gathering Daemon socket pathname
- for systems without /dev/urandom
- --with-lib-subdir=DIR Find libraries in DIR instead of lib
- --with-zlib=PATH use zlib from PATH
- --with-zephyr=PATH enable Zephyr notification (installed on PATH)
- --with-pidfile=PATH pidfile in PATH (/var/run/cyrus-master.pid)
- --with-com_err=PATH use com_err from path -- includes in PATH/include,
- libs in PATH/lib, and compile_et in PATH/bin
- --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
- --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
- choose specific GSSAPI implementation @<:@@<:@auto@:>@@:>@
- --with-sasl=DIR Compile with libsasl2 in <DIR>
- --with-staticsasl=DIR Compile with staticly linked libsasl2 in <DIR>
- --with-perl=PERL use PERL for perl
- --with-libwrap=DIR use libwrap (rooted in DIR) yes 
- --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes 
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- YACC The `Yet Another Compiler Compiler' implementation to use.
- Defaults to the first program found out of: `bison -y', `byacc',
- `yacc'.
- YFLAGS The list of arguments that will be passed by default to @S|@YACC.
- This script will default YFLAGS to the empty string to avoid a
- default value of `-d' given by some make applications.
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-@%:@ ac_fn_c_try_compile LINENO
-@%:@ --------------------------
-@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_compile
-
-@%:@ ac_fn_c_try_cpp LINENO
-@%:@ ----------------------
-@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_cpp
-
-@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
-@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
-@%:@ the include files in INCLUDES and setting the cache variable VAR
-@%:@ accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_header_mongrel
-
-@%:@ ac_fn_c_try_run LINENO
-@%:@ ----------------------
-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes
-@%:@ that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_run
-
-@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
-@%:@ Tests whether HEADER exists and can be compiled using the include files in
-@%:@ INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_header_compile
-
-@%:@ ac_fn_c_try_link LINENO
-@%:@ -----------------------
-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_link
-
-@%:@ ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-@%:@ --------------------------------------------
-@%:@ Tries to find the compile-time value of EXPR in a program that includes
-@%:@ INCLUDES, setting VAR accordingly. Returns whether the value could be
-@%:@ computed
-ac_fn_c_compute_int ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) >= 0)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=0 ac_mid=0
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid; break
-else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) < 0)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=-1 ac_mid=-1
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) >= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=$ac_mid; break
-else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid
-else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in @%:@((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-@%:@include <stdio.h>
-@%:@include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (($2) < 0)
- {
- long int i = longval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
- ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
- fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_compute_int
-
-@%:@ ac_fn_c_check_func LINENO FUNC VAR
-@%:@ ----------------------------------
-@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_func
-
-@%:@ ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-@%:@ ----------------------------------------------------
-@%:@ Tries to find if the field MEMBER exists in type AGGR, after including
-@%:@ INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_member
-
-@%:@ ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-@%:@ ---------------------------------------------
-@%:@ Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-@%:@ accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-@%:@ifndef $as_decl_name
-@%:@ifdef __cplusplus
- (void) $as_decl_use;
-@%:@else
- (void) $as_decl_name;
-@%:@endif
-@%:@endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
- 2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
- if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
- else
-	case $ac_arg in
-	 *=* | --config-cache | -C | -disable-* | --disable-* \
-	 | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	 | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	 | -with-* | --with-* | -without-* | --without-* | --x)
-	 case "$ac_configure_args0 " in
-	 "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	 esac
-	 ;;
-	 -* ) ac_must_keep_next=true ;;
-	esac
- fi
- as_fn_append ac_configure_args " '$ac_arg'"
- ;;
- esac
- done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in @%:@((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- \\/* | ?:\\/* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	 ac_cache_corrupted=:
-	else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	 eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
-
-
-@%:@ Check whether --with-extraident was given.
-if test "${with_extraident+set}" = set; then :
- withval=$with_extraident; 
-cat >>confdefs.h <<_ACEOF
-@%:@define EXTRA_IDENT "$withval"
-_ACEOF
-
-fi
-
-
-# Extract the first word of "makedepend", so it can be a program name with args.
-set dummy makedepend; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKEDEPEND+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKEDEPEND"; then
- ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MAKEDEPEND="makedepend"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
-fi
-fi
-MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
-if test -n "$MAKEDEPEND"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
-$as_echo "$MAKEDEPEND" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MAKEDEPEND" != "makedepend"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&5
-$as_echo "$as_me: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&2;}
-fi
-
-
-@%:@ Check whether --with-login was given.
-if test "${with_login+set}" = set; then :
- withval=$with_login; as_fn_error $? "--with-login is no longer supported.
-Configure SASL appropriately instead." "$LINENO" 5
-fi
-
-
-
-@%:@ Check whether --with-cyrus-prefix was given.
-if test "${with_cyrus_prefix+set}" = set; then :
- withval=$with_cyrus_prefix; cyrus_prefix="$withval"
-else
- cyrus_prefix="/usr/cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define CYRUS_PATH "$cyrus_prefix"
-_ACEOF
-
-
-@%:@ Check whether --with-service-path was given.
-if test "${with_service_path+set}" = set; then :
- withval=$with_service_path; service_path="$withval"
-else
- service_path="$cyrus_prefix/bin"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SERVICE_PATH "$service_path"
-_ACEOF
-
-
-@%:@ Check whether --with-cyrus-user was given.
-if test "${with_cyrus_user+set}" = set; then :
- withval=$with_cyrus_user; cyrus_user="$withval"
-else
- cyrus_user="cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define CYRUS_USER "$cyrus_user"
-_ACEOF
-
-
-@%:@ Check whether --with-cyrus-group was given.
-if test "${with_cyrus_group+set}" = set; then :
- withval=$with_cyrus_group; cyrus_group="$withval"
-else
- cyrus_group="mail"
-fi
-
-
-
-if test $sysconfdir = '${prefix}/etc'; then
- sysconfdir="/etc"
-fi
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SYSCONFDIR "$sysconfdir"
-_ACEOF
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $@%:@ != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
- ab.out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
- *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	 ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
- * )
-	break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	 break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
- else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- 
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1;
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in @%:@((
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 :
-	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # program-specific install script used by HP pwplus--don't use.
-	 :
-	 else
-	 rm -rf conftest.one conftest.two conftest.dir
-	 echo one > conftest.one
-	 echo two > conftest.two
-	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	 test -s conftest.one && test -s conftest.two &&
-	 test -s conftest.dir/conftest.one &&
-	 test -s conftest.dir/conftest.two
-	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	 break 3
-	 fi
-	 fi
-	fi
- done
- done
- ;;
-esac
-
- done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@ifdef __STDC__
-@%:@ include <limits.h>
-@%:@else
-@%:@ include <assert.h>
-@%:@endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
- 
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@ifdef __STDC__
-@%:@ include <limits.h>
-@%:@else
-@%:@ include <assert.h>
-@%:@endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- 
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
- 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
- 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
- 
-$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		 inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-
-done
-
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
- MINIX=yes
-else
- MINIX=
-fi
-
-
- if test "$MINIX" = yes; then
- 
-$as_echo "@%:@define _POSIX_SOURCE 1" >>confdefs.h
-
- 
-$as_echo "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
-
- 
-$as_echo "@%:@define _MINIX 1" >>confdefs.h
-
- fi
-
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#	 define __EXTENSIONS__ 1
-	 $ac_includes_default
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_safe_to_define___extensions__=yes
-else
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
- test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
-
- $as_echo "@%:@define _ALL_SOURCE 1" >>confdefs.h
-
- $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
-
- $as_echo "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
- $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
- 
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset2;
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x = {25, 17};
- const int *foo = &x0;
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap3; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs0 && !zero.x;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
- 
-$as_echo "@%:@define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
-$as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_sys_long_file_names=yes
-# Test for long file names in all the places we know might matter:
-# .		the current directory, where building will happen
-# $prefix/lib	where we will be installing things
-# $exec_prefix/lib	likewise
-# $TMPDIR		if set, where it might want to write temporary files
-# /tmp		where it might want to write temporary files
-# /var/tmp		likewise
-# /usr/tmp		likewise
-for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
- # in the usual case where exec_prefix is '${prefix}'.
- case $ac_dir in #(
- . | /* | ?:\\/*) ;; #(
- *) continue;;
- esac
- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
- ac_xdir=$ac_dir/cf$$
- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
- ac_tf1=$ac_xdir/conftest9012345
- ac_tf2=$ac_xdir/conftest9012346
- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
- ac_cv_sys_long_file_names=no
- rm -f -r "$ac_xdir" 2>/dev/null
- test $ac_cv_sys_long_file_names = no && break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
-$as_echo "$ac_cv_sys_long_file_names" >&6; }
-if test $ac_cv_sys_long_file_names = yes; then
- 
-$as_echo "@%:@define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
-
-fi
-
-if test $ac_cv_sys_long_file_names = no; then
-	as_fn_error $? "The Cyrus IMAPD requires support for long file names" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
- ;;
-esac
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_size_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_size_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_off_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_off_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
-$as_echo_n "checking size of long long int... " >&6; }
-if ${ac_cv_sizeof_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5
-$as_echo_n "checking size of unsigned long long int... " >&6; }
-if ${ac_cv_sizeof_unsigned_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_unsigned_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_unsigned_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
-_ACEOF
-
-
-if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
- "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
- 
-$as_echo "@%:@define HAVE_LONG_LONG_INT /**/" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
-	 not a universal capable compiler
-	 #endif
-	 typedef int dummy;
-	 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- 
-	# Check for potential -arch flags. It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	 case $ac_word in
-	 i?86 | x86_64 | ppc | ppc64)
-	 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	 else
-		 ac_cv_c_bigendian=universal
-		 break
-	 fi
-	 ;;
-	 esac
-	 ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	 ac_prev=arch
-	 fi
- done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-	 #include <sys/param.h>
-	 
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		 && LITTLE_ENDIAN)
-	 bogus endian macros
-	 #endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-		#include <sys/param.h>
-	 
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-	 
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	 bogus endian macros
-	 #endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-	 
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-short int ascii_mm =
-		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
-		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		 return ascii_mmi + ascii_iii;
-		}
-		short int ebcdic_ii =
-		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
-		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		 return ebcdic_mmi + ebcdic_iii;
-		}
-		extern int foo;
-	 
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	 ac_cv_c_bigendian=yes
-	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	 if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	 else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	 fi
-	 fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
-	 /* Are we little or big endian? From Harbison&Steele. */
-	 union
-	 {
-	 long int l;
-	 char csizeof (long int);
-	 } u;
-	 u.l = 1;
-	 return u.csizeof (long int) - 1 == 1;
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
- no)
- ;; #(
- universal)
- 	
-$as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
- ;; #(
- *)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-$as_echo_n "checking for __attribute__... " >&6; }
-if ${ac_cv___attribute__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv___attribute__=yes
-else
- ac_cv___attribute__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv___attribute__" = "yes"; then
- 
-$as_echo "@%:@define HAVE___ATTRIBUTE__ 1" >>confdefs.h
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
-$as_echo "$ac_cv___attribute__" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -fPIC" >&5
-$as_echo_n "checking if compiler supports -fPIC... " >&6; }
-if ${ac_cv_fpic+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-save_CFLAGS=$CFLAGS
-CFLAGS="${CFLAGS} -fPIC"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_fpic=yes
-else
- ac_cv_fpic=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS=$save_CFLAGS
-
-fi
-
-if test "$ac_cv_fpic" = "yes"; then
- FPIC_CFLAGS="-fPIC"
-else
- FPIC_CFLAGS=""
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
-$as_echo "$ac_cv_fpic" >&6; }
-
-
-
- # CMU GUESS RUNPATH SWITCH
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runpath switch" >&5
-$as_echo_n "checking for runpath switch... " >&6; }
-if ${andrew_cv_runpath_switch+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- # first, try -R
- SAVE_LDFLAGS="${LDFLAGS}"
- LDFLAGS="-R /usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-R"
-else
- 
- 	LDFLAGS="-Wl,-rpath,/usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-Wl,-rpath,"
-else
- andrew_cv_runpath_switch="none"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="${SAVE_LDFLAGS}"
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $andrew_cv_runpath_switch" >&5
-$as_echo "$andrew_cv_runpath_switch" >&6; }
-
-for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-
-done
-
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
- $as_echo "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" memmove.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS memmove.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes; then :
- $as_echo "@%:@define HAVE_STRCASECMP 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" strcasecmp.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS strcasecmp.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
-if test "x$ac_cv_func_ftruncate" = xyes; then :
- $as_echo "@%:@define HAVE_FTRUNCATE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" ftruncate.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS ftruncate.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- $as_echo "@%:@define HAVE_STRERROR 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" strerror.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS strerror.$ac_objext"
- ;;
-esac
-
-fi
-
-
-for ac_func in strlcat strlcpy getgrouplist
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_ac_Header=yes"
-else
- eval "$as_ac_Header=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_ac_Header
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
- 
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
- 
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-fi
-
-
-for ac_header in stdlib.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_STDLIB_H 1
-_ACEOF
- 
-fi
-
-done
-
-for ac_func in getpassphrase
-do :
- ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
-if test "x$ac_cv_func_getpassphrase" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GETPASSPHRASE 1
-_ACEOF
- 
-fi
-done
-
-
-
-	save_LIBS="$LIBS"
-	LIB_SOCKET=""
-	ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
- :
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
- LIB_SOCKET="-lnsl $LIB_SOCKET"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
-else
- ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
- LIB_SOCKET="-lsocket $LIB_SOCKET"
-fi
-
-	
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes; then :
- :
-else
- LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
-#include <resolv.h>
-int
-main ()
-{
-
-const char host12="openafs.org";
-u_char ans1024;
-res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-return 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- LIB_SOCKET="-lresolv $LIB_SOCKET"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	for ac_func in dn_expand dns_lookup
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-	LIBS="$save_LIBS"
-	
-	
-LIBS="$LIBS ${LIB_SOCKET}"
-
-cyrus_cv_getaddrinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
- ac_cv_lib_socket_getaddrinfo=no
- ac_cv_lib_inet6_getaddrinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
-$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getaddrinfo=yes
-else
- ac_cv_lib_socket_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getaddrinfo=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getaddrinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
-$as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getaddrinfo=yes
-else
- ac_cv_lib_inet6_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getaddrinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getaddrinfo=no
-if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
- -o $ac_cv_lib_inet6_getaddrinfo = yes
-then
- ipv6_cv_getaddrinfo=yes
-fi
-if test $ipv6_cv_getaddrinfo = no; then
- if test getaddrinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getaddrinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getaddrinfo = yes; then
- 
-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes; then :
- ac_cv_lib_socket_gai_strerror=no
- ac_cv_lib_inet6_gai_strerror=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -lsocket" >&5
-$as_echo_n "checking for gai_strerror in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_gai_strerror=yes
-else
- ac_cv_lib_socket_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gai_strerror" >&5
-$as_echo "$ac_cv_lib_socket_gai_strerror" >&6; }
-if test "x$ac_cv_lib_socket_gai_strerror" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_gai_strerror=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_gai_strerror=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -linet6" >&5
-$as_echo_n "checking for gai_strerror in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_gai_strerror=yes
-else
- ac_cv_lib_inet6_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gai_strerror" >&5
-$as_echo "$ac_cv_lib_inet6_gai_strerror" >&6; }
-if test "x$ac_cv_lib_inet6_gai_strerror" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_gai_strerror=no
-if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
- -o $ac_cv_lib_inet6_gai_strerror = yes
-then
- ipv6_cv_gai_strerror=yes
-fi
-if test $ipv6_cv_gai_strerror = no; then
- if test gai_strerror = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gai_strerror" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_gai_strerror=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_gai_strerror = yes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getaddrinfo=no
-fi
-else
- cyrus_cv_getaddrinfo=no
-fi
-
-if test $cyrus_cv_getaddrinfo = no; then
-	IPV6_OBJS="getaddrinfo.o"
-fi
-
-cyrus_cv_getnameinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
-if test "x$ac_cv_func_getnameinfo" = xyes; then :
- ac_cv_lib_socket_getnameinfo=no
- ac_cv_lib_inet6_getnameinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
-$as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getnameinfo=yes
-else
- ac_cv_lib_socket_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
-$as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
-if test "x$ac_cv_lib_socket_getnameinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getnameinfo=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getnameinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
-$as_echo_n "checking for getnameinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getnameinfo=yes
-else
- ac_cv_lib_inet6_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getnameinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getnameinfo=no
-if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
- -o $ac_cv_lib_inet6_getnameinfo = yes
-then
- ipv6_cv_getnameinfo=yes
-fi
-if test $ipv6_cv_getnameinfo = no; then
- if test getnameinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getnameinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getnameinfo = yes; then
- 
-$as_echo "@%:@define HAVE_GETNAMEINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getnameinfo=no
-fi
-
-if test $cyrus_cv_getnameinfo = no; then
-	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5
-$as_echo_n "checking whether you have ss_family in struct sockaddr_storage... " >&6; }
-if ${ipv6_cv_ss_family+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr_storage ss; int i = ss.ss_family;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_ss_family=yes
-else
- ipv6_cv_ss_family=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_ss_family = yes; then
- 
-$as_echo "@%:@define HAVE_SS_FAMILY /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_ss_family" >&5
-$as_echo "$ipv6_cv_ss_family" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have sa_len in struct sockaddr" >&5
-$as_echo_n "checking whether you have sa_len in struct sockaddr... " >&6; }
-if ${ipv6_cv_sa_len+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr sa; int i = sa.sa_len;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_sa_len=yes
-else
- ipv6_cv_sa_len=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_sa_len = yes; then
- 
-$as_echo "@%:@define HAVE_SOCKADDR_SA_LEN /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_sa_len" >&5
-$as_echo "$ipv6_cv_sa_len" >&6; }
-
-
-
-for ac_header in sys/time.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_TIME_H 1
-_ACEOF
- 
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
- 
-$as_echo "@%:@define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				 int *p = &tm.tm_sec;
-				 return !p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
-else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
- 
-$as_echo "@%:@define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-"
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
- 
-cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
-
-
-fi
-
-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
- 
-$as_echo "@%:@define HAVE_TM_ZONE 1" >>confdefs.h
-
-else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <time.h>
-#if !HAVE_DECL_TZNAME
-extern char *tzname;
-#endif
-
-int
-main ()
-{
-return tzname00;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_var_tzname=yes
-else
- ac_cv_var_tzname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-$as_echo "$ac_cv_var_tzname" >&6; }
- if test $ac_cv_var_tzname = yes; then
- 
-$as_echo "@%:@define HAVE_TZNAME 1" >>confdefs.h
-
- fi
-fi
-
-
-
-
-
-
-
-for ac_func in vprintf
-do :
- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_VPRINTF 1
-_ACEOF
- 
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
- 
-$as_echo "@%:@define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
-
-
-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-
-
-
-@%:@ Check whether --with-bdb was given.
-if test "${with_bdb+set}" = set; then :
- withval=$with_bdb; with_bdb=$withval
-else
- with_bdb="yes"
-fi
-
-
-
-@%:@ Check whether --with-dbdir was given.
-if test "${with_dbdir+set}" = set; then :
- withval=$with_dbdir; with_bdb=$withval
-fi
-
-
-case "$with_bdb" in
- no)
-	use_berkeley="no"
-	;;
- yes)
-	use_berkeley="yes"
-	with_bdb_lib=none
-	with_bdb_inc=none
-	;;
- 
- *)
-	use_berkeley="yes"
-	with_bdb_lib="$with_bdb/lib"
-	with_bdb_inc="$with_bdb/include"
-	;;
-esac
-
-if test "$use_berkeley" != "no"; then
- 
-
-@%:@ Check whether --with-bdb-libdir was given.
-if test "${with_bdb_libdir+set}" = set; then :
- withval=$with_bdb_libdir; with_bdb_lib=$withval
-else
- test "${with_bdb_lib+set}" = set || with_bdb_lib=none
-fi
-
-
-@%:@ Check whether --with-bdb-incdir was given.
-if test "${with_bdb_incdir+set}" = set; then :
- withval=$with_bdb_incdir; with_bdb_inc=$withval
-else
- test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_bdb_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-	 BDB_INCADD="-I$with_bdb_inc"
-	else
-	 BDB_INCADD=""
-	fi
-
-	 ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
-if test "x$ac_cv_header_db_h" = xyes; then :
- 
-	BDB_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_bdb_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
- else
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-	else
-	 BDB_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
-	 for dbname in ${with_bdb} \
-	 db-4.8 db4.8 db48 \
-	 db-4.7 db4.7 db47 \
-	 db-4.6 db4.6 db46 \
-	 db-4.5 db4.5 db45 \
-	 db-4.4 db4.4 db44 \
-	 db-4.3 db4.3 db43 \
-	 db-4.2 db4.2 db42 \
-	 db-4.1 db4.1 db41 \
-	 db-4.0 db4.0 db40 db-4 db4 \
-	 db-3.3 db3.3 db33 \
-	 db-3.2 db3.2 db32 \
-	 db-3.1 db3.1 db31 \
-	 db-3.0 db3.0 db30 db-3 db3 \
-	 db
-	 do
-	 LIBS="$saved_LIBS -l$dbname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_create(NULL, NULL, 0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$dblib" = "berkeley"; then break; fi
- done
- if test "$dblib" = "no"; then
-	 LIBS="$saved_LIBS -ldb"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$BDB_SAVE_LDFLAGS
-
-else
- dblib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$dblib" = "no"; then
- as_fn_error $? "Berkeley DB 3.x or later was not found. You may need to 
- supply the --with-bdb-libdir or --with-bdb-incdir configure options." "$LINENO" 5
- fi
-
- if test "$with_bdb_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib $andrew_cv_runpath_switch$with_bdb_lib ${LDFLAGS}"
- fi
-
- fi
-
- BDB_INC=${BDB_INCADD}
- BDB_LIB=${BDB_LIBADD}
- 
- 
-
- LIBS="${LIBS} ${BDB_LIBADD}"
- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-
- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
- 
-$as_echo "@%:@define HAVE_BDB /**/" >>confdefs.h
-
-fi
-
-
-
-
-HAVE_SQL=0
-
-
-@%:@ Check whether --with-mysql was given.
-if test "${with_mysql+set}" = set; then :
- withval=$with_mysql; with_mysql=$withval
-else
- with_mysql="no"
-fi
-
-
-case "$with_mysql" in
- no)
-	use_mysql="no"
-	;;
- yes)
-	use_mysql="yes"
-	with_mysql_lib=none
-	with_mysql_inc=none
-	;;
- 
- *)
-	use_mysql="yes"
-	with_mysql_lib="$with_mysql/lib"
-	with_mysql_inc="$with_mysql/include"
-	;;
-esac
-
-if test "$use_mysql" != "no"; then
- 
-
-@%:@ Check whether --with-mysql-libdir was given.
-if test "${with_mysql_libdir+set}" = set; then :
- withval=$with_mysql_libdir; with_mysql_lib=$withval
-else
- test "${with_mysql_lib+set}" = set || with_mysql_lib=none
-fi
-
-
-@%:@ Check whether --with-mysql-incdir was given.
-if test "${with_mysql_incdir+set}" = set; then :
- withval=$with_mysql_incdir; with_mysql_inc=$withval
-else
- test "${with_mysql_inc+set}" = set || with_mysql_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_mysql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_mysql_inc"
-	 MYSQL_INCADD="-I$with_mysql_inc"
-	else
-	 MYSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_h" = xyes; then :
- 
-	MYSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_mysql_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD}"
- else
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-	else
-	 MYSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_mysql} mysqlclient
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <mysql.h>
-int
-main ()
-{
-mysql_select_db(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- MYSQL_LIBADD="$MYSQL_LIBADD -l$libname"; mysqllib="yes"
-else
- mysqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$mysqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$MYSQL_SAVE_LDFLAGS
-
-else
- mysqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$mysqllib" = "no"; then
- as_fn_error $? "MySQL was not found. You may need to supply the
- --with-mysql-libdir or --with-mysql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_mysql_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib $andrew_cv_runpath_switch$with_mysql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${MYSQL_LIBADD}"
- CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_MYSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-@%:@ Check whether --with-pgsql was given.
-if test "${with_pgsql+set}" = set; then :
- withval=$with_pgsql; with_pgsql=$withval
-else
- with_pgsql="no"
-fi
-
-
-case "$with_pgsql" in
- no)
-	use_pgsql="no"
-	;;
- yes)
-	use_pgsql="yes"
-	with_pgsql_lib=none
-	with_pgsql_inc=none
-	;;
- 
- *)
-	use_pgsql="yes"
-	with_pgsql_lib="$with_pgsql/lib"
-	with_pgsql_inc="$with_pgsql/include"
-	;;
-esac
-
-if test "$use_pgsql" != "no"; then
- 
-
-@%:@ Check whether --with-pgsql-libdir was given.
-if test "${with_pgsql_libdir+set}" = set; then :
- withval=$with_pgsql_libdir; with_pgsql_lib=$withval
-else
- test "${with_pgsql_lib+set}" = set || with_pgsql_lib=none
-fi
-
-
-@%:@ Check whether --with-pgsql-incdir was given.
-if test "${with_pgsql_incdir+set}" = set; then :
- withval=$with_pgsql_incdir; with_pgsql_inc=$withval
-else
- test "${with_pgsql_inc+set}" = set || with_pgsql_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_pgsql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_pgsql_inc"
-	 PGSQL_INCADD="-I$with_pgsql_inc"
-	else
-	 PGSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
- 
-	PGSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_pgsql_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD}"
- else
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-	else
-	 PGSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_pgsql} pq
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <libpq-fe.h>
-int
-main ()
-{
-PQconnectdb(NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PGSQL_LIBADD="$PGSQL_LIBADD -l$libname"; pgsqllib="yes"
-else
- pgsqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$pgsqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$PGSQL_SAVE_LDFLAGS
-
-else
- pgsqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$pgsqllib" = "no"; then
- as_fn_error $? "PgSQL was not found. You may need to supply the
- --with-pgsql-libdir or --with-pgsql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_pgsql_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib $andrew_cv_runpath_switch$with_pgsql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${PGSQL_LIBADD}"
- CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_PGSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-@%:@ Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then :
- withval=$with_sqlite; with_sqlite=$withval
-else
- with_sqlite=no
-fi
-
-
-case "$with_sqlite" in
- no)
-	use_sqlite="no"
-	;;
- yes)
-	use_sqlite="yes"
-	with_sqlite_lib=none
-	with_sqlite_inc=none
-	;;
- 
- *)
-	use_sqlite="yes"
-	with_sqlite_lib="$with_sqlite/lib"
-	with_sqlite_inc="$with_sqlite/include"
-	;;
-esac
-
-if test "$use_sqlite" != "no"; then
- 
-
-@%:@ Check whether --with-sqlite-libdir was given.
-if test "${with_sqlite_libdir+set}" = set; then :
- withval=$with_sqlite_libdir; with_sqlite_lib=$withval
-else
- test "${with_sqlite_lib+set}" = set || with_sqlite_lib=none
-fi
-
-
-@%:@ Check whether --with-sqlite-incdir was given.
-if test "${with_sqlite_incdir+set}" = set; then :
- withval=$with_sqlite_incdir; with_sqlite_inc=$withval
-else
- test "${with_sqlite_inc+set}" = set || with_sqlite_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_sqlite_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_sqlite_inc"
-	 SQLITE_INCADD="-I$with_sqlite_inc"
-	else
-	 SQLITE_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = xyes; then :
- 
-	SQLITE_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_sqlite_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD}"
- else
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-	else
-	 SQLITE_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_sqlite} sqlite3
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <sqlite3.h>
-int
-main ()
-{
-sqlite3_open(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- SQLITE_LIBADD="$SQLITE_LIBADD -l$libname"; sqlitelib="yes"
-else
- sqlitelib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$sqlitelib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$SQLITE_SAVE_LDFLAGS
-
-else
- sqlitelib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$sqlitelib" = "no"; then
- as_fn_error $? "Sqlite was not found. You may need to supply the
- --with-sqlite-libdir or --with-sqlite-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_sqlite_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib $andrew_cv_runpath_switch$with_sqlite_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${SQLITE_LIBADD}"
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_SQLITE /**/" >>confdefs.h
-
-fi
-
-
-
-if test $HAVE_SQL = 1; then
- CYRUSDB_OBJS="${CYRUSDB_OBJS} cyrusdb_sql.o"
-fi
-
-
-
-
-SIEVE_SUBDIRS=""
-sievedir="sieve"
-@%:@ Check whether --enable-sieve was given.
-if test "${enable_sieve+set}" = set; then :
- enableval=$enable_sieve; if test "$enableval" = no; then
-		sievedir="no"
-	fi
-fi
-
-
-testpcre="yes"
-@%:@ Check whether --enable-pcre was given.
-if test "${enable_pcre+set}" = set; then :
- enableval=$enable_pcre; if test "$enableval" = no; then
-		testpcre="no"
-	fi
-fi
-
-
-if test "$sievedir" != "no"; then
-	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-	
-	SIEVE_LIBS="../${sievedir}/libsieve.a"
-	
-	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-	
-	
-$as_echo "@%:@define USE_SIEVE /**/" >>confdefs.h
-
-
-		for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_YACC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-	for ac_prog in flex lex
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LEX"; then
- ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LEX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext0); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
- return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-if test -f lex.yy.c; then
- ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
- ac_cv_prog_lex_root=lexyy
-else
- as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-if test -z "${LEXLIB+set}"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- ac_save_LIBS=$LIBS
- ac_cv_lib_lex='none needed'
- for ac_lib in '' -lfl -ll; do
- LIBS="$ac_lib $ac_save_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- test "$ac_cv_lib_lex" != 'none needed' && break
- done
- LIBS=$ac_save_LIBS
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
- test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
- 
-$as_echo "@%:@define YYTEXT_POINTER 1" >>confdefs.h
-
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfl" >&5
-$as_echo_n "checking for main in -lfl... " >&6; }
-if ${ac_cv_lib_fl_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_fl_main=yes
-else
- ac_cv_lib_fl_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_main" >&5
-$as_echo "$ac_cv_lib_fl_main" >&6; }
-if test "x$ac_cv_lib_fl_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBFL 1
-_ACEOF
-
- LIBS="-lfl $LIBS"
-
-fi
-
-
-	if test "$testpcre" != "no"; then
-	 ac_fn_c_check_header_mongrel "$LINENO" "pcreposix.h" "ac_cv_header_pcreposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcreposix_h" = xyes; then :
- 
-fi
-
-
-	 if test "$ac_cv_header_pcreposix_h" = "yes"; then
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
-$as_echo_n "checking for utf8 enabled pcre... " >&6; }
-		 if ${cyrus_cv_pcre_utf8+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <pcreposix.h>
-#ifndef REG_UTF8
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_pcre_utf8=yes
-else
- cyrus_cv_pcre_utf8=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_pcre_utf8" >&5
-$as_echo "$cyrus_cv_pcre_utf8" >&6; }
-	 else
-		 cyrus_cv_pcre_utf8="no"
-	 fi
-	fi
-
-	if test "$cyrus_cv_pcre_utf8" = "yes"; then
-		LIBS="$LIBS -lpcre -lpcreposix";
-		
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-		
-$as_echo "@%:@define HAVE_PCREPOSIX_H /**/" >>confdefs.h
-
-	else 
-		for ac_header in rxposix.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "rxposix.h" "ac_cv_header_rxposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_rxposix_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_RXPOSIX_H 1
-_ACEOF
- 
-fi
-
-done
-
-		if test "$ac_cv_header_rxposix_h" = "yes"; then
-			LIBS="$LIBS -lrx"
-			
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
-$as_echo_n "checking for library containing regcomp... " >&6; }
-if ${ac_cv_search_regcomp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char regcomp ();
-int
-main ()
-{
-return regcomp ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' regex; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_regcomp=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_regcomp+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_regcomp+:} false; then :
- 
-else
- ac_cv_search_regcomp=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
-$as_echo "$ac_cv_search_regcomp" >&6; }
-ac_res=$ac_cv_search_regcomp
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-fi
-
-		fi
-	fi
-
-	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-fi
-
-
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- 
-$as_echo "@%:@define HAS_STRERROR /**/" >>confdefs.h
-
-else
- 
-$as_echo "@%:@define NEED_SYS_ERRLIST /**/" >>confdefs.h
-
-fi
-
-
-for ac_header in sys/resource.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_resource_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_RESOURCE_H 1
-_ACEOF
- 
-fi
-
-done
-
-for ac_func in setrlimit
-do :
- ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SETRLIMIT 1
-_ACEOF
- 
-fi
-done
-
-for ac_func in getrlimit
-do :
- ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GETRLIMIT 1
-_ACEOF
- 
-fi
-done
-
-
-for ac_func in daemon setsid
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-
-for ac_func in shutdown
-do :
- ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
-if test "x$ac_cv_func_shutdown" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SHUTDOWN 1
-_ACEOF
- 
-fi
-done
-
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "socklen_t" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_SOCKLEN_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sockaddr_storage" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_STRUCT_SOCKADDR_STORAGE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/resource.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "rlim_t" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_RLIM_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-
-spt_type=""
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-fi
-
-if test "$spt_type" = ""; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
-$as_echo_n "checking for setproctitle in -lutil... " >&6; }
-if ${ac_cv_lib_util_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setproctitle ();
-int
-main ()
-{
-return setproctitle ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_util_setproctitle=yes
-else
- ac_cv_lib_util_setproctitle=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
-$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
-if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-			LIBS="${LIBS} -lutil"
-fi
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
- spt_type=SPT_PSTAT
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/sysnews.h" "ac_cv_header_sys_sysnews_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysnews_h" = xyes; then :
- spt_type=SPT_SYSMIPS
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-$as_echo_n "checking for PS_STRINGS... " >&6; }
-	if ${cyrus_cv_sys_psstrings+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <machine/vmparam.h>
-#include <sys/exec.h>
-#ifndef PS_STRINGS
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_psstrings=yes
-else
- cyrus_cv_sys_psstrings=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_psstrings = yes; then
-		spt_type=SPT_PSSTRINGS
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_psstrings" >&5
-$as_echo "$cyrus_cv_sys_psstrings" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCO" >&5
-$as_echo_n "checking for SCO... " >&6; }
-	if ${cyrus_cv_sys_sco+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifndef _SCO_unix_
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_sco=yes
-else
- cyrus_cv_sys_sco=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_sco = yes; then
-		spt_type=SPT_SCO
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_sco" >&5
-$as_echo "$cyrus_cv_sys_sco" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle usability" >&5
-$as_echo_n "checking for setproctitle usability... " >&6; }
-	if ${cyrus_cv_sys_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_setproctitle=yes
-else
- cyrus_cv_sys_setproctitle=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_setproctitle = no; then
-		spt_type=SPT_NONE
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_setproctitle" >&5
-$as_echo "$cyrus_cv_sys_setproctitle" >&6; }
-fi
-if test "$spt_type" != ""; then
-	
-cat >>confdefs.h <<_ACEOF
-@%:@define SPT_TYPE $spt_type
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nonblocking method" >&5
-$as_echo_n "checking nonblocking method... " >&6; }
-if ${cyrus_cv_sys_nonblock+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#ifndef	FNDELAY
-#define FNDELAY		O_NDELAY
-#endif
-int
-main ()
-{
-fcntl(0, F_GETFL, 0)&FNDELAY
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- cyrus_cv_sys_nonblock=fcntl
-else
- cyrus_cv_sys_nonblock=ioctl
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_NONBLOCK" >&5
-$as_echo "$WITH_NONBLOCK" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking timezone GMT offset method" >&5
-$as_echo_n "checking timezone GMT offset method... " >&6; }
-if ${cyrus_cv_struct_sys_gmtoff+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <time.h>
-int
-main ()
-{
-struct tm tm;
-tm.tm_gmtoff = 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cyrus_cv_struct_sys_gmtoff=tm
-else
- cyrus_cv_struct_sys_gmtoff=gmtime
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_GMTOFF" >&5
-$as_echo "$WITH_GMTOFF" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared mmap" >&5
-$as_echo_n "checking for shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_shared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_shared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base+4, "test", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_shared=yes
-else
- cyrus_cv_func_mmap_shared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_shared" >&5
-$as_echo "$cyrus_cv_func_mmap_shared" >&6; }
-if test $cyrus_cv_func_mmap_shared = yes; then
-	WITH_MAP="shared"
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stupid shared mmap" >&5
-$as_echo_n "checking for stupid shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_stupidshared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_stupidshared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-lseek(fd, 0L, 0);	
-if (write(fd, "xyzz", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base, "xyzz", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_stupidshared=yes
-else
- cyrus_cv_func_mmap_stupidshared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_stupidshared" >&5
-$as_echo "$cyrus_cv_func_mmap_stupidshared" >&6; }
-if test $cyrus_cv_func_mmap_stupidshared = yes; then
-	WITH_MAP="stupidshared"
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This system does not have a working mmap()" >&5
-$as_echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Expect a considerable performance penalty" >&5
-$as_echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
-	WITH_MAP=nommap
-fi
-fi
-
-
-
-@%:@ Check whether --with-lock was given.
-if test "${with_lock+set}" = set; then :
- withval=$with_lock; WITH_LOCK="$withval"
-else
- 
- ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
-if test "x$ac_cv_func_fcntl" = xyes; then :
- WITH_LOCK="fcntl"
-else
- 
-		ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes; then :
- WITH_LOCK="flock"
-else
- 
-				as_fn_error $? "unable to detect locking method" "$LINENO" 5
-			 
-fi
-
-		
-fi
-
- 
-fi
-
-
-
-
-LIB_RT=""
-ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = xyes; then :
- 
-$as_echo "@%:@define HAVE_FDATASYNC /**/" >>confdefs.h
-
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
-$as_echo_n "checking for fdatasync in -lrt... " >&6; }
-if ${ac_cv_lib_rt_fdatasync+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fdatasync ();
-int
-main ()
-{
-return fdatasync ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rt_fdatasync=yes
-else
- ac_cv_lib_rt_fdatasync=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
-$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
-if test "x$ac_cv_lib_rt_fdatasync" = xyes; then :
- 
-	LIB_RT="-lrt"
-	
-$as_echo "@%:@define HAVE_FDATASYNC /**/" >>confdefs.h
-
- 
-fi
-
-
-fi
-
-
-cant_find_sigvec=no
-if ${cyrus_cv_sigveclib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec"
-if test "x$ac_cv_func_sigvec" = xyes; then :
- 
-	cyrus_cv_sigveclib=""
- 
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lBSD" >&5
-$as_echo_n "checking for sigvec in -lBSD... " >&6; }
-if ${ac_cv_lib_BSD_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lBSD $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_BSD_sigvec=yes
-else
- ac_cv_lib_BSD_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_BSD_sigvec" >&5
-$as_echo "$ac_cv_lib_BSD_sigvec" >&6; }
-if test "x$ac_cv_lib_BSD_sigvec" = xyes; then :
- cyrus_cv_sigveclib="-lBSD"
-else
- 
- SAVE_LDFLAGS="$LDFLAGS"
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lucb" >&5
-$as_echo_n "checking for sigvec in -lucb... " >&6; }
-if ${ac_cv_lib_ucb_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lucb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ucb_sigvec=yes
-else
- ac_cv_lib_ucb_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_sigvec" >&5
-$as_echo "$ac_cv_lib_ucb_sigvec" >&6; }
-if test "x$ac_cv_lib_ucb_sigvec" = xyes; then :
- 
- cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-else
- cant_find_sigvec=yes 
-fi
-
- LDFLAGS="$SAVE_LDFLAGS"
-fi
-
- 
-fi
-
-
-fi
-
-
-
-# ok, we still look for this stuff because of checking groups, but
-# all authentication goes through SASL
-@%:@ Check whether --enable-afs was given.
-if test "${enable_afs+set}" = set; then :
- enableval=$enable_afs; 
-fi
-
-
-
-@%:@ Check whether --with-afs-libdir was given.
-if test "${with_afs_libdir+set}" = set; then :
- withval=$with_afs_libdir; afs_libdir="${withval}"
-else
- afs_libdir="/usr/lib"
-fi
-
- 
-
-@%:@ Check whether --with-afs-incdir was given.
-if test "${with_afs_incdir+set}" = set; then :
- withval=$with_afs_incdir; afs_incdir="${withval}"
-else
- afs_incdir="/usr/include"
-fi
-
-
-
-@%:@ Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then :
- withval=$with_ldap; with_ldap="${withval}"
-else
- with_ldap="no"
-fi
-
- 
-@%:@ Check whether --enable-krb5afspts was given.
-if test "${enable_krb5afspts+set}" = set; then :
- enableval=$enable_krb5afspts; 
-fi
-
-
-if test "x$enable_afs" = "xyes"; then
-# krb5afspts is only valid if AFS is enabled, so check inside here.
- if test "x$enable_krb5afspts" = "xyes"; then :
- SASL_GSSAPI_LIBS_SET="yes"
-
- 
-$as_echo "@%:@define AFSPTS_USE_KRB5 /**/" >>confdefs.h
- 
- 
-fi
-
- CFLAGS="${CFLAGS} -I${with_afs_incdir}/include"
- AFS_LIBS="${with_afs_libdir}/afs/libkauth.a ${with_afs_libdir}/afs/libprot.a ${with_afs_libdir}/afs/libauth.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/librxkad.a ${with_afs_libdir}/librx.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/libubik.a ${with_afs_libdir}/liblwp.a ${with_afs_libdir}/afs/util.a ${with_afs_libdir}/afs/libcom_err.a"
- if test -f ${with_afs_libdir}/afs/libaudit.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libaudit.a"
- fi
- if test -f /usr/ucblib/libucb.a; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
- else
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_cv_runpath_switch/usr/ucblib"
- fi
-
- AFS_LIBS="$AFS_LIBS -lc -lucb"
- fi
- if test -f ${with_afs_libdir}/afs/libdes.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libdes.a"
- else
- AFS_LIBS="$AFS_LIBS -ldes"
- fi
-
- if ${cyrus_cv_afs_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- SAVE_LIBS="$LIBS"
- LIBS="${with_afs_libdir}/liblwp.a"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AFS libraries need sigvec" >&5
-$as_echo_n "checking if AFS libraries need sigvec... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-IOMGR_Initialize();
-int
-main ()
-{
-IOMGR_Initialize()
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cyrus_cv_afs_sigvec="no"
- 
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- cyrus_cv_afs_sigvec="yes"
- 
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-
- if test "$cyrus_cv_afs_sigvec" = yes; then
- if test "$cant_find_sigvec" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
-$as_echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
- else
- AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
- 
- 
- 
-$as_echo "@%:@define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- else
- AFS_LIBS="${AFS_LIBS}"
- 
- 
- 
-$as_echo "@%:@define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- LIBS="$SAVE_LIBS"
-fi
-
-LDAP_CPPFLAGS=""
-LDAP_LDFLAGS=""
-LDAP_LIBS=""
-
-if test "x$with_ldap" != "xno"; then
- if test ! -d $with_ldap; then
- with_ldap=/usr/local
- fi
-
- LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
- LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
- LDAP_LIBS=""
-
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS=$LDAP_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
- 
-$as_echo "@%:@define HAVE_LDAP /**/" >>confdefs.h
-
- 
- 
- 
- LDAP_LIBS="-lldap -llber" 
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
- 
-$as_echo "@%:@define HAVE_LDAP /**/" >>confdefs.h
-
- 
- 
- 
- LDAP_LIBS="-lldap -llber" 
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
-fi
- 
-if test "x$enable_afs" = "xyes" -o "x$with_ldap" != "xno"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-
-	
-$as_echo "@%:@define WITH_PTS /**/" >>confdefs.h
-
-fi
-
-
-
-SERVER_SUBDIRS="master imap"
-@%:@ Check whether --enable-server was given.
-if test "${enable_server+set}" = set; then :
- enableval=$enable_server; if test "$enableval" = no; then
- 	SERVER_SUBDIRS=""
-	fi
-fi
-
-
-# We always output a server makefile (just because we can)
-
-
-@%:@ Check whether --with-krb was given.
-if test "${with_krb+set}" = set; then :
- withval=$with_krb; with_krb="$withval"
-else
- with_krb="no"
-fi
-
-
-
-@%:@ Check whether --with-krbimpl was given.
-if test "${with_krbimpl+set}" = set; then :
- withval=$with_krbimpl; with_krbimpl="$withval"
-else
- with_krbimpl="kth"
-fi
-
-
-@%:@ Check whether --enable-statickrb was given.
-if test "${enable_statickrb+set}" = set; then :
- enableval=$enable_statickrb; with_statickrb="yes"
-else
- with_statickrb="no"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
-
-if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
- as_fn_error $? "--enable-statickrb specified but --with-krb did not specify a valid directory" "$LINENO" 5
-fi 
-
-if test "$with_krb" != "no"; then
-
-@%:@ Check whether --with-krbdes was given.
-if test "${with_krbdes+set}" = set; then :
- withval=$with_krbdes; with_krbdes="$withval"
-else
- with_krbdes="yes"
-fi
-
-if test "$with_krbdes" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_ecb_encrypt in -ldes" >&5
-$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
-if ${ac_cv_lib_des_des_ecb_encrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char des_ecb_encrypt ();
-int
-main ()
-{
-return des_ecb_encrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_des_des_ecb_encrypt=yes
-else
- ac_cv_lib_des_des_ecb_encrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
-$as_echo "$ac_cv_lib_des_des_ecb_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_ecb_encrypt" = xyes; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$with_krb/lib/libdes.a"
- else
- KRB_LIBS="-ldes"
- fi
-else
- as_fn_error $? "The Kerberos DES library is required for Kerberos support. You might want --with-auth=unix." "$LINENO" 5
-fi
-
-fi
-fi
-
-if test -d ${with_krb}; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos includes" >&5
-$as_echo_n "checking for Kerberos includes... " >&6; }
-if ${cyrus_cv_krbinclude+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- for krbhloc in include/kerberosIV include
- do
- if test -f ${with_krb}/${krbhloc}/krb.h ; then
- cyrus_cv_krbinclude=${with_krb}/${krbhloc}
- break
- fi
- done
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_krbinclude" >&5
-$as_echo "$cyrus_cv_krbinclude" >&6; }
-
- if test -n "${cyrus_cv_krbinclude}"; then
- CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
- fi
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_krb}/lib $andrew_cv_runpath_switch${with_krb}/lib ${LDFLAGS}"
- fi
-
-fi
-
-if test "$with_krbimpl" != "kth"; then
- KRBLIB="krb4"
-else
- KRBLIB="krb"
-fi
-
-if test "$with_des" != no; then
- ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb_h" = xyes; then :
- as_ac_Lib=`$as_echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_mk_priv in -l${KRBLIB}" >&5
-$as_echo_n "checking for krb_mk_priv in -l${KRBLIB}... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb_mk_priv ();
-int
-main ()
-{
-return krb_mk_priv ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
- else
- KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No DES library found for Kerberos V4 support" >&5
-$as_echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
- krb4=no
-fi
-
-if test "${krb4}" != no; then
- 
-$as_echo "@%:@define HAVE_KRB /**/" >>confdefs.h
-
-fi
-
-LIBS="$KRB_LIBS $LIBS"
-
-SASL_GSSAPI_LIBS_SET="yes"
-
-
-IMAP_PROGS=""
-
-@%:@ Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
- withval=$with_openssl; with_openssl="${withval}"
-fi
-
-
-OPENSSL_INC=
-OPENSSL_LIB=
-case "$with_openssl" in
-	no) with_openssl="no";;
-	""|yes) 
-	 	 LIB_RSAREF=""
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSAPublicEncrypt in -lrsaref" >&5
-$as_echo_n "checking for RSAPublicEncrypt in -lrsaref... " >&6; }
-if ${ac_cv_lib_rsaref_RSAPublicEncrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrsaref $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char RSAPublicEncrypt ();
-int
-main ()
-{
-return RSAPublicEncrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rsaref_RSAPublicEncrypt=yes
-else
- ac_cv_lib_rsaref_RSAPublicEncrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
-$as_echo "$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
-if test "x$ac_cv_lib_rsaref_RSAPublicEncrypt" = xyes; then :
- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
-else
- cmu_have_rsaref=no
-fi
-
-
-		with_openssl="yes"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_accept in -lcrypto" >&5
-$as_echo_n "checking for BIO_accept in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_BIO_accept+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char BIO_accept ();
-int
-main ()
-{
-return BIO_accept ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypto_BIO_accept=yes
-else
- ac_cv_lib_crypto_BIO_accept=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_accept" >&5
-$as_echo "$ac_cv_lib_crypto_BIO_accept" >&6; }
-if test "x$ac_cv_lib_crypto_BIO_accept" = xyes; then :
- LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
-else
- with_openssl="no"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
-$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SSL_CTX_new ();
-int
-main ()
-{
-return SSL_CTX_new ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ssl_SSL_CTX_new=yes
-else
- ac_cv_lib_ssl_SSL_CTX_new=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
- LIBS="-lssl ${LIBS}"
-else
- with_openssl="no"
-fi
-
-		
-		;;
-	*) OPENSSL_INC="-I${with_openssl}/include"
-	 OPENSSL_LIBPATH="${with_openssl}/lib"
-	 OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-	 CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-	 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
- else
-	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_cv_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
- else
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_cv_runpath_switch${OPENSSL_LIBPATH}"
- fi
-
-	 LIBS="${LIBS} -lssl -lcrypto";;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openssl" >&5
-$as_echo "$with_openssl" >&6; }
-
-if test "$with_openssl" != "no"; then
-	
-$as_echo "@%:@define HAVE_SSL /**/" >>confdefs.h
-
-	IMAP_PROGS="$IMAP_PROGS tls_prune"
- if test "${krb4}" != no; then
- 
-$as_echo "@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT /**/" >>confdefs.h
-
- 
-$as_echo "@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY /**/" >>confdefs.h
-
- fi
-fi
-
-
-
-
-@%:@ Check whether --with-egd-socket was given.
-if test "${with_egd_socket+set}" = set; then :
- withval=$with_egd_socket; EGD_SOCKET="$withval" 
- 
-fi
-
-if test -n "$EGD_SOCKET" ; then
- 
-cat >>confdefs.h <<_ACEOF
-@%:@define EGD_SOCKET "$EGD_SOCKET"
-_ACEOF
-
-fi
-
-
-@%:@ Check whether --with-lib-subdir was given.
-if test "${with_lib_subdir+set}" = set; then :
- withval=$with_lib_subdir; 
-fi
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what directory libraries are found in" >&5
-$as_echo_n "checking what directory libraries are found in... " >&6; }
-if ${ac_cv_cmu_lib_subdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-if test "X$with_lib_subdir" = "X" ; then
- ac_cv_cmu_lib_subdir=lib
- if test $ac_cv_sizeof_long -eq 4 ; then
- test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
- fi
- if test $ac_cv_sizeof_long -eq 8 ; then
- test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
- fi
-else
- ac_cv_cmu_lib_subdir=$with_lib_subdir
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmu_lib_subdir" >&5
-$as_echo "$ac_cv_cmu_lib_subdir" >&6; }
-CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-
-
-
-
-
-@%:@ Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
- withval=$with_zlib; with_zlib=$withval
-else
- with_zlib="yes"
-fi
-
-
-	save_CPPFLAGS=$CPPFLAGS
-	save_LDFLAGS=$LDFLAGS
-
-	if test -d $with_zlib; then
-	 CPPFLAGS="${CPPFLAGS} -I${with_lib}/include"
-	 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR $andrew_cv_runpath_switch${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- fi
-
-	fi
-
-ZLIB=""
-case "$with_zlib" in
-	no)
-	 with_zlib="no";;
-	*) 
-	ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
- 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if ${ac_cv_lib_z_deflate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_z_deflate=yes
-else
- ac_cv_lib_z_deflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = xyes; then :
- LIBS="${LIBS} -lz"; with_zlib="yes"
-else
- with_zlib="no"
-fi
-
-else
- with_zlib=no
-fi
-
-
-	;;
-esac
-
-	if test "$with_zlib" != "no"; then
-		
-$as_echo "@%:@define HAVE_ZLIB /**/" >>confdefs.h
-
-		ZLIB="-lz"
-	else
-		CPPFLAGS=$save_CPPFLAGS
-		LDFLAGS=$save_LDFLAGS
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib" >&5
-$as_echo "$with_zlib" >&6; }
-
-
-
-@%:@ Check whether --with-zephyr was given.
-if test "${with_zephyr+set}" = set; then :
- withval=$with_zephyr; with_zephyr="${withval}"
-fi
-
-if test -z "$with_zephyr"; then
- if test -f /usr/local/lib/libzephyr.a; then
-	with_zephyr="/usr/local"
- elif test -f /usr/lib/libzephyr.a; then
- with_zephyr="/usr"
- fi
-fi
-ZEPHYR_LIBS=""
-case "$with_zephyr" in
-	no) true;;
-	""|yes) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZInitialize in -lzephyr" >&5
-$as_echo_n "checking for ZInitialize in -lzephyr... " >&6; }
-if ${ac_cv_lib_zephyr_ZInitialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzephyr $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ZInitialize ();
-int
-main ()
-{
-return ZInitialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_zephyr_ZInitialize=yes
-else
- ac_cv_lib_zephyr_ZInitialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zephyr_ZInitialize" >&5
-$as_echo "$ac_cv_lib_zephyr_ZInitialize" >&6; }
-if test "x$ac_cv_lib_zephyr_ZInitialize" = xyes; then :
- ZEPHYR_LIBS="-lzephyr"
-else
- with_zephyr="no"
-fi
-;;
- *) ZEPHYR_LIBS="-lzephyr";;
-esac
-
-if test "$with_zephyr" != "no"; then
-	
-$as_echo "@%:@define HAVE_ZEPHYR /**/" >>confdefs.h
-
-fi
-
-
-@%:@ Check whether --with-pidfile was given.
-if test "${with_pidfile+set}" = set; then :
- withval=$with_pidfile; MASTERPIDFILE="$withval"
-else
- MASTERPIDFILE="/var/run/cyrus-master.pid"
-fi
-
-MASTERPIDFILE="\"$MASTERPIDFILE\""
-
-cat >>confdefs.h <<_ACEOF
-@%:@define MASTER_PIDFILE $MASTERPIDFILE
-_ACEOF
-
-
-@%:@ Check whether --enable-idled was given.
-if test "${enable_idled+set}" = set; then :
- enableval=$enable_idled; if test "$enable_val" != no; then
-	 IMAP_PROGS="$IMAP_PROGS idled"
- fi
-fi
- 
-
-ENABLE_NNTP=no
-@%:@ Check whether --enable-nntp was given.
-if test "${enable_nntp+set}" = set; then :
- enableval=$enable_nntp; ENABLE_NNTP=$enableval
- if test "$ENABLE_NNTP" != no; then
-	 IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
- fi
-fi
- 
-
-ENABLE_MURDER=no
-@%:@ Check whether --enable-murder was given.
-if test "${enable_murder+set}" = set; then :
- enableval=$enable_murder; ENABLE_MURDER=$enableval
-fi
-
-
-if test "$ENABLE_MURDER" != no; then
-	IMAP_PROGS="$IMAP_PROGS mupdate"
-	# for master/slave auto-selection
-	for ac_header in sys/sockio.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_SOCKIO_H 1
-_ACEOF
- 
-fi
-
-done
-
-fi
-
-ENABLE_REPLICATION=no
-@%:@ Check whether --enable-replication was given.
-if test "${enable_replication+set}" = set; then :
- enableval=$enable_replication; ENABLE_REPLICATION=$enableval
- if test "$ENABLE_REPLICATION" != no; then
-	 IMAP_PROGS="$IMAP_PROGS sync_client sync_server sync_reset"
- fi
-fi
- 
-
-
-
-
-@%:@ Check whether --with-com_err was given.
-if test "${with_com_err+set}" = set; then :
- withval=$with_com_err; 
-fi
-
-if test -z "$with_com_err"; then
-	# no value supplied
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
-$as_echo_n "checking for com_err in -lcom_err... " >&6; }
-if ${ac_cv_lib_com_err_com_err+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcom_err $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char com_err ();
-int
-main ()
-{
-return com_err ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_com_err_com_err=yes
-else
- ac_cv_lib_com_err_com_err=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
-$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = xyes; then :
- 
-		# com_err is already in library path
-		# guess we're okay
-		# can use system com_err
-		with_com_err=""
-		ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
- 
-$as_echo "@%:@define HAVE_ET_COM_ERR_H /**/" >>confdefs.h
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_com_err_h" = xyes; then :
- 
-else
- as_fn_error $? "cannot locate com_err.h" "$LINENO" 5
-fi
-
-
-fi
-
-
-		# Extract the first word of "compile_et", so it can be a program name with args.
-set dummy compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	
-else
- 
-	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-		with_com_err="/usr/local"
-		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
-set dummy /usr/local/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-		with_com_err="/usr"
-		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
-set dummy /usr/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	else
-		# use ours
-		with_com_err=yes
-	fi
-	
-fi
-
-
-	if test "${with_com_err}" = "no"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: com_err is required; included version will be used." >&5
-$as_echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
-	 with_com_err="yes"
-	fi
-	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
-$as_echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will build com_err from included sources." >&5
-$as_echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
-	 with_com_err="yes" # build it ourselves
-	fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COMPILE_ET="../com_err/et/compile_et"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
- ;;
- *) # use whatever they told us, or whatever we found
- COMPILE_ET="${with_com_err}/bin/compile_et"
-esac
-
-if test "$with_com_err" != yes ; then
- TEST1=".cyrus-configure-test-$$"
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- echo "error_table imap" >> $TEST1.et
- echo "ec IMAP_TESTING," >> $TEST1.et
- echo " \"Testing\"" >> $TEST1.et
- echo "end" >> $TEST1.et
- "${COMPILE_ET}" $TEST1.et > /dev/null
- compile_et_ok=no
- if test -f $TEST1.h ; then
-	if test `awk '/IMAP_TESTING/{print $3}' $TEST1.h 2>/dev/null` = "(-1904809472L)" ; then
-	 compile_et_ok=yes
-	fi
-	 fi
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- if test "$compile_et_ok" = no ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It seems $COMPILE_ET is buggy, building our own" >&5
-$as_echo "$as_me: WARNING: It seems $COMPILE_ET is buggy, building our own" >&2;}
-	COMPILE_ET="../com_err/et/compile_et" # build it ourselves
- fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COM_ERR_LIBS="../com_err/et/libcom_err.a"
-	 COM_ERR_LDFLAGS=""
-	 COM_ERR_CPPFLAGS="-I\${top_srcdir}/com_err/et"
-	 PRE_SUBDIRS="com_err/et ${PRE_SUBDIRS}"
-	 EXTRA_OUTPUT="${EXTRA_OUTPUT} com_err/et/Makefile"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
-	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-	# we already set COMPILE_ET, or we didn't get here
-	COM_ERR_LDFLAGS=""
-	COM_ERR_CPPFLAGS=""
- ;;
- *) # use whatever they told us, or whatever we found
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
- # Ever get the feeling people hide this stuff on purpose?
- if test -d "${with_com_err}/include/et" ; then
- COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
- fi
-esac
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern syslog" >&5
-$as_echo_n "checking for modern syslog... " >&6; }
-if ${cyrus_cv_lib_syslog+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <syslog.h>
-#ifndef LOG_LOCAL6
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_lib_syslog=yes
-else
- cyrus_cv_lib_syslog=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-if test $cyrus_cv_lib_syslog = no; then
-	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_lib_syslog" >&5
-$as_echo "$cyrus_cv_lib_syslog" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which syslog facility to use" >&5
-$as_echo_n "checking which syslog facility to use... " >&6; }
-SYSLOG_FACILITY=LOG_LOCAL6
-
-@%:@ Check whether --with-syslogfacility was given.
-if test "${with_syslogfacility+set}" = set; then :
- withval=$with_syslogfacility; if test "$withval" != "yes" -a "$withval" != "no" ; then
- SYSLOG_FACILITY=LOG_$withval
- fi; 
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSLOG_FACILITY" >&5
-$as_echo "$SYSLOG_FACILITY" >&6; }
-
-ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize"
-if test "x$ac_cv_func_getdtablesize" = xyes; then :
- $as_echo "@%:@define HAVE_GETDTABLESIZE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" getdtablesize.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS getdtablesize.$ac_objext"
- ;;
-esac
-
-fi
-
-
-@%:@ Check whether --enable-cmulocal was given.
-if test "${enable_cmulocal+set}" = set; then :
- enableval=$enable_cmulocal; if test "$enableval" = yes; then
-		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-	fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to use old sieve service name" >&5
-$as_echo_n "checking to use old sieve service name... " >&6; }
-@%:@ Check whether --enable-oldsievename was given.
-if test "${enable_oldsievename+set}" = set; then :
- enableval=$enable_oldsievename; if test "$enableval" = yes; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		
-$as_echo "@%:@define OLD_SIEVE_SERVICE_NAME /**/" >>confdefs.h
-
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-@%:@ Check whether --enable-netscapehack was given.
-if test "${enable_netscapehack+set}" = set; then :
- enableval=$enable_netscapehack; if test "$enableval" = yes; then
-		
-$as_echo "@%:@define ENABLE_X_NETSCAPE_HACK /**/" >>confdefs.h
-
-	fi
-fi
-
-
-ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
-else
- ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBDL 1
-_ACEOF
-
- LIBS="-ldl $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
- cmu_have_crypt=yes
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
-else
- cmu_have_crypt=no
-fi
-
-fi
-
-
-
-
-
-@%:@ Check whether --enable-gssapi was given.
-if test "${enable_gssapi+set}" = set; then :
- enableval=$enable_gssapi; gssapi=$enableval
-else
- gssapi=yes
-fi
-
-
-@%:@ Check whether --with-gss_impl was given.
-if test "${with_gss_impl+set}" = set; then :
- withval=$with_gss_impl; gss_impl=$withval
-else
- gss_impl=auto
-fi
-
-
-if test "$gssapi" != no; then
- platform=
- case "${host}" in
- *-*-linux*)
- platform=__linux
- ;;
- *-*-hpux*)
- platform=__hpux
- ;;
- *-*-irix*)
- platform=__irix
- ;;
- *-*-solaris2*)
-# When should we use __sunos?
- platform=__solaris
- ;;
- *-*-aix*)
-###_AIX
- platform=__aix
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
-$as_echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
- if test "$gss_impl" = "cybersafe"; then
- as_fn_error $? "CyberSafe was forced, cannot continue as platform is not supported" "$LINENO" 5
- fi
- ;;
- esac
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
-
- if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-# We want to keep -I in our CPPFLAGS, but only if we succeed
- cmu_saved_CPPFLAGS=$CPPFLAGS
-### I am not sure how useful is this (and whether this is required at all
-### especially when we have to provide two -L flags for new CyberSafe
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
-
- if test -n "$platform"; then
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
- fi
- fi
- fi
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_h" = xyes; then :
- 
-else
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then :
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no include files found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-fi
-
-
-fi
-
-
-
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
-fi
-
-if test "$gssapi" != no; then
- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
- 
-$as_echo "@%:@define HAVE_GSSAPI_H /**/" >>confdefs.h
-
- fi
-
- # We need to find out which gssapi implementation we are
- # using. Supported alternatives are: MIT Kerberos 5,
- # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
- # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
- # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
- #
- # The choice is reflected in GSSAPIBASE_LIBS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
- if test -d ${gssapi}; then
- gssapi_dir="${gssapi}/lib"
- GSSAPIBASE_LIBS="-L$gssapi_dir"
- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
- else
- # FIXME: This is only used for building cyrus, and then only as
- # a real hack. it needs to be fixed.
- gssapi_dir="/usr/local/lib"
- fi
-
- # Check a full link against the Heimdal libraries.
- # If this fails, check a full link against the MIT libraries.
- # If this fails, check a full link against the CyberSafe libraries.
- # If this fails, check a full link against the Solaris 8 and up libgss.
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi... " >&6; }
-if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_gss_unwrap" = xyes; then :
- gss_impl="heimdal"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5int_getspecific in -lkrb5support" >&5
-$as_echo_n "checking for krb5int_getspecific in -lkrb5support... " >&6; }
-if ${ac_cv_lib_krb5support_krb5int_getspecific+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5support ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb5int_getspecific ();
-int
-main ()
-{
-return krb5int_getspecific ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_krb5support_krb5int_getspecific=yes
-else
- ac_cv_lib_krb5support_krb5int_getspecific=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
-$as_echo "$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
-if test "x$ac_cv_lib_krb5support_krb5int_getspecific" = xyes; then :
- K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
-fi
-
-
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi_krb5" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi_krb5... " >&6; }
-if ${ac_cv_lib_gssapi_krb5_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_krb5_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_krb5_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_krb5_gss_unwrap" = xyes; then :
- gss_impl="mit"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- # For Cybersafe one has to set a platform define in order to make compilation work
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
- if test -d "${gssapi}/appsec-rt/lib"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
- fi
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
-
- gss_failed=0
-
-# Check for CyberSafe with two libraries first, than fall back to a single 
-# library (older CyberSafe)
-
- unset ac_cv_lib_gss_csf_gss_acq_user
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe03"
-else
- unset ac_cv_lib_gss_csf_gss_acq_user;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe"
-else
- gss_failed=1
-fi
-
-fi
-
-
- if test "$gss_failed" = "1"; then
-# Restore variables
- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
- if test "$gss_impl" != "auto"; then
- gss_impl="failed"
- fi
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgss" >&5
-$as_echo_n "checking for gss_unwrap in -lgss... " >&6; }
-if ${ac_cv_lib_gss_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_gss_unwrap=yes
-else
- ac_cv_lib_gss_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gss_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gss_gss_unwrap" = xyes; then :
- gss_impl="seam"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "mit"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
-# Version of CyberSafe with two libraries
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "seam"; then
- GSSAPIBASE_LIBS=-lgss
- # there is no static libgss on Solaris 8 and up
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "failed"; then
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - specified library not found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
- else
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no library" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
- fi
-fi
-
-#
-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-# in gssapi\rfckrb5.h
-#
-if test "$gssapi" != "no"; then
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_HOSTBASED_SERVICE
- hostbased_service_gss_nt_yes
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_USER_NAME
- user_name_yes_gss_nt
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-fi
-
-GSSAPI_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GSSAPI" >&5
-$as_echo_n "checking GSSAPI... " >&6; }
-if test "$gssapi" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: with implementation ${gss_impl}" >&5
-$as_echo "with implementation ${gss_impl}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-fi
-
- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
-
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
- for ac_func in gsskrb5_register_acceptor_identity
-do :
- ac_fn_c_check_func "$LINENO" "gsskrb5_register_acceptor_identity" "ac_cv_func_gsskrb5_register_acceptor_identity"
-if test "x$ac_cv_func_gsskrb5_register_acceptor_identity" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
-_ACEOF
- 
-fi
-done
-
- LIBS="$cmu_save_LIBS"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
-fi
-
-
-
-
-
-
-@%:@ Check whether --with-sasl was given.
-if test "${with_sasl+set}" = set; then :
- withval=$with_sasl; with_sasl="$withval"
-else
- with_sasl="yes"
-fi
-
-
-
-@%:@ Check whether --with-staticsasl was given.
-if test "${with_staticsasl+set}" = set; then :
- withval=$with_staticsasl; with_staticsasl="$withval";
- if test $with_staticsasl != "no"; then
- using_static_sasl="static"
- fi
-else
- with_staticsasl="no"; using_static_sasl="no"
-fi
-
-
-SASLFLAGS=""
-LIB_SASL=""
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-cmu_saved_LDFLAGS=$LDFLAGS
-cmu_saved_LIBS=$LIBS
-
-if test ${with_staticsasl} != "no"; then
- if test -d ${with_staticsasl}; then
- if test -d ${with_staticsasl}/lib64 ; then
- ac_cv_sasl_where_lib=${with_staticsasl}/lib64
- else
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- fi
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- ac_cv_sasl_where_inc=${with_staticsasl}/include
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
- else
- with_staticsasl="/usr"
- fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- for i42 in lib64 lib; do
- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
- ac_cv_found_sasl=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
- fi
- done
- if test ! "$ac_cv_found_sasl" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- as_fn_error $? "Could not find ${with_staticsasl}/lib*/libsasl2.a" "$LINENO" 5
- fi
-fi
-
-
-fi
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-
- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
- else
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
- fi
-fi
-
-if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
- ac_cv_sasl_where_inc=${with_sasl}/include
-
- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
- if test "$ac_cv_sasl_where_lib" != ""; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
- else
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-fi
-
-# be sure to check for a SASLv2 specific function
-ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prop_get in -lsasl2" >&5
-$as_echo_n "checking for prop_get in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_prop_get+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char prop_get ();
-int
-main ()
-{
-return prop_get ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_prop_get=yes
-else
- ac_cv_lib_sasl2_prop_get=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_prop_get" >&5
-$as_echo "$ac_cv_lib_sasl2_prop_get" >&6; }
-if test "x$ac_cv_lib_sasl2_prop_get" = xyes; then :
- ac_cv_found_sasl=yes
-else
- ac_cv_found_sasl=no
-fi
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-
-if test "$ac_cv_found_sasl" = "yes"; then
- if test "$ac_cv_sasl_where_lib" != ""; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
- else
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
- if test "$using_static_sasl" != "static"; then
- LIB_SASL=$DYNLIB_SASL
- SASLFLAGS=$DYNSASLFLAGS
- fi
-else
- DYNLIB_SASL=""
- DYNSASLFLAGS=""
- using_static_sasl="staticonly"
-fi
-
-if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-fi
-
-LIBS="$cmu_saved_LIBS"
-LDFLAGS="$cmu_saved_LDFLAGS"
-CPPFLAGS="$cmu_saved_CPPFLAGS"
-
-
-
-
-
-
-
-if test "$ac_cv_found_sasl" != "yes"; then
- as_fn_error $? "Cannot continue without libsasl2.
-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." "$LINENO" 5
-fi
-
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sasl/sasl.h>
-
-#ifndef SASL_VERSION_MAJOR
-#error SASL_VERSION_MAJOR not defined
-#endif
-#ifndef SASL_VERSION_MINOR
-#error SASL_VERSION_MINOR not defined
-#endif
-#ifndef SASL_VERSION_STEP
-#error SASL_VERSION_STEP not defined
-#endif
-
-#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
-#error SASL version is less than 2.1.7
-#endif
-
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- as_fn_error $? "Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." "$LINENO" 5
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-CPPFLAGS=$cmu_saved_CPPFLAGS
-
-
-
-cmu_saved_LDFLAGS=$LDFLAGS
-
-LDFLAGS="$LDFLAGS $LIB_SASL"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_checkapop in -lsasl2" >&5
-$as_echo_n "checking for sasl_checkapop in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_sasl_checkapop+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sasl_checkapop ();
-int
-main ()
-{
-return sasl_checkapop ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_sasl_checkapop=yes
-else
- ac_cv_lib_sasl2_sasl_checkapop=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
-$as_echo "$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
-if test "x$ac_cv_lib_sasl2_sasl_checkapop" = xyes; then :
- 
-$as_echo "@%:@define HAVE_APOP /**/" >>confdefs.h
-
-else
- as_fn_error $? "libsasl2 without working sasl_checkapop. Cannot continue." "$LINENO" 5
-fi
-
-
-LDFLAGS=$cmu_saved_LDFLAGS
-
-
-
-@%:@ Check whether --with-perl was given.
-if test "${with_perl+set}" = set; then :
- withval=$with_perl; with_perl="$withval"
-else
- with_perl="perl"
-fi
-
-
-if test "${with_perl}" = yes; then
- with_perl="perl"
-fi
-if test "${with_perl}" != no; then
- if test ${using_static_sasl} = "staticonly"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot compile perl utilities using static libsasl" >&5
-$as_echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
-	with_perl="no"
- else 
-	for ac_prog in ${with_perl} perl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PERL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$PERL"; then
- ac_cv_prog_PERL="$PERL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PERL="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-PERL=$ac_cv_prog_PERL
-if test -n "$PERL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$PERL" && break
-done
-test -n "$PERL" || PERL="with_perl=notfound"
-
- fi
-fi
-if test "$with_perl" = "notfound"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perl not found: Administrative tools won't be available" >&5
-$as_echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
-elif test "${with_perl}" != "no"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
- case "${target_os}" in
- linux*|netbsd*|freebsd*|dragonfly*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
-$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
- eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_CCCDLFLAGS" >&5
-$as_echo "$PERL_CCCDLFLAGS" >&6; }
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&5
-$as_echo "$as_me: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&2;}
- esac
-fi
-
-if test "$sievedir" != "no"; then
-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-
-	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-	PERL_DEPSUBDIRS="sieve"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-else
-	PERL_DEPSUBDIRS="none"
-fi
-
-SNMP_SUBDIRS=""
-
-
-
-
- 
- 
-@%:@ Check whether --with-libwrap was given.
-if test "${with_libwrap+set}" = set; then :
- withval=$with_libwrap; with_libwrap=$withval
-else
- with_libwrap=yes
-fi
-
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for request_init in -lwrap" >&5
-$as_echo_n "checking for request_init in -lwrap... " >&6; }
-if ${ac_cv_lib_wrap_request_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwrap ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char request_init ();
-int
-main ()
-{
-return request_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_wrap_request_init=yes
-else
- ac_cv_lib_wrap_request_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_request_init" >&5
-$as_echo "$ac_cv_lib_wrap_request_init" >&6; }
-if test "x$ac_cv_lib_wrap_request_init" = xyes; then :
- 
-		 ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcpd_h" = xyes; then :
- 
-else
- with_libwrap=no
-fi
-
-
-else
- with_libwrap=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libwrap support" >&5
-$as_echo_n "checking libwrap support... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libwrap" >&5
-$as_echo "$with_libwrap" >&6; }
- LIB_WRAP=""
- if test "$with_libwrap" != no; then
- 
-$as_echo "@%:@define HAVE_LIBWRAP /**/" >>confdefs.h
-
- LIB_WRAP="-lwrap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
-$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_yp_get_default_domain+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char yp_get_default_domain ();
-int
-main ()
-{
-return yp_get_default_domain ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_yp_get_default_domain=yes
-else
- ac_cv_lib_nsl_yp_get_default_domain=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-$as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-if test "x$ac_cv_lib_nsl_yp_get_default_domain" = xyes; then :
- LIB_WRAP="${LIB_WRAP} -lnsl"
-fi
-
- fi
- 
-
-
-
- 
- 
-@%:@ Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then :
- withval=$with_snmp; with_snmp=$withval
-else
- with_snmp=yes
-fi
-
-
- 
-@%:@ Check whether --with-ucdsnmp was given.
-if test "${with_ucdsnmp+set}" = set; then :
- withval=$with_ucdsnmp; with_snmp=$withval
-fi
-
-
-if test "$with_snmp" != "no"; then
-
- if test "$with_snmp" = "yes"; then
- # Extract the first word of "net-snmp-config", so it can be a program name with args.
-set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SNMP_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $SNMP_CONFIG in
- \\/* | ?:\\/*)
- ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/local/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-if test -n "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-$as_echo "$SNMP_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- else
- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
- fi
-
- if test -x "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking NET SNMP libraries" >&5
-$as_echo_n "checking NET SNMP libraries... " >&6; }
-
- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
- LIB_UCDSNMP=$SNMP_LIBS
- 
-$as_echo "@%:@define HAVE_NETSNMP 1" >>confdefs.h
-
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- for ac_header in net-snmp/agent/agent_module_config.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "net-snmp/agent/agent_module_config.h" "ac_cv_header_net_snmp_agent_agent_module_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_net_snmp_agent_agent_module_config_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H 1
-_ACEOF
- 
-fi
-
-done
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
-$as_echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
- fi
- else
- if test "$with_snmp" != no; then
- if test -d "$with_snmp"; then
- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
- LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sprint_objid in -lsnmp" >&5
-$as_echo_n "checking for sprint_objid in -lsnmp... " >&6; }
-if ${ac_cv_lib_snmp_sprint_objid+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sprint_objid ();
-int
-main ()
-{
-return sprint_objid ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_snmp_sprint_objid=yes
-else
- ac_cv_lib_snmp_sprint_objid=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snmp_sprint_objid" >&5
-$as_echo "$ac_cv_lib_snmp_sprint_objid" >&6; }
-if test "x$ac_cv_lib_snmp_sprint_objid" = xyes; then :
- 
- 		 ac_fn_c_check_header_mongrel "$LINENO" "ucd-snmp/version.h" "ac_cv_header_ucd_snmp_version_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucd_snmp_version_h" = xyes; then :
- 
-else
- with_snmp=no
-fi
-
-
-else
- with_snmp=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking UCD SNMP libraries" >&5
-$as_echo_n "checking UCD SNMP libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_snmp" >&5
-$as_echo "$with_snmp" >&6; }
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
- 
-$as_echo "@%:@define HAVE_UCDSNMP 1" >>confdefs.h
-
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmdbOpen in -lrpm" >&5
-$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
-if ${ac_cv_lib_rpm_rpmdbOpen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrpm -lpopt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rpmdbOpen ();
-int
-main ()
-{
-return rpmdbOpen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rpm_rpmdbOpen=yes
-else
- ac_cv_lib_rpm_rpmdbOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
-$as_echo "$ac_cv_lib_rpm_rpmdbOpen" >&6; }
-if test "x$ac_cv_lib_rpm_rpmdbOpen" = xyes; then :
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-fi
-
- fi
- 
- fi
-fi
-
-
-
-# Figure out what directories we're linking against.
-# Lots of fun for the whole family.
-# This probably chokes on anything with spaces in it.
-# All we want is the list of -L directories, and -L may or may not be
-# followed by a space.
-isdir=no
-libpath=""
-#echo "debug ldflags: << ${ldflags} >>"
-#echo "debug default_ldflags: << ${default_ldflags} >>"
-for flag in ${ldflags} ${default_ldflags}; do
- case $flag in
- -L)
- # it's a split -L option, we'll mark the next option as a dir.
- isdir=yes
- ;;
-
- -L*) 
- # attached -L option: split off the directory
- larg=`echo $flag | sed -e 's:-L$..*$:\1:'`
- libpath="${libpath} ${larg}"
- ;;
-
- *)
- if test $isdir = yes ; then
-	libpath="${libpath} ${flag}"
-	isdir=no
- fi
- esac
-done
-
-IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
-	"s/'/'\\\\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
- t end
- s/^$^=*$=$.*$$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
-	 mv -f confcache "$cache_file"$$ &&
-	 mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
-	 mv -f confcache "$cache_file" ;;
-	esac
- fi
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIB@&t@OBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in @%:@(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in @%:@((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-@%:@ as_fn_error STATUS ERROR LINENO LOG_FD
-@%:@ ----------------------------------------
-@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} @%:@ as_fn_error
-
-
-@%:@ as_fn_set_status STATUS
-@%:@ -----------------------
-@%:@ Set @S|@? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} @%:@ as_fn_set_status
-
-@%:@ as_fn_exit STATUS
-@%:@ -----------------
-@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} @%:@ as_fn_exit
-
-@%:@ as_fn_unset VAR
-@%:@ ---------------
-@%:@ Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-@%:@ as_fn_append VAR VALUE
-@%:@ ----------------------
-@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-@%:@ advantage of any shell optimizations that allow amortized linear growth over
-@%:@ repeated appends, instead of the typical quadratic growth present in naive
-@%:@ implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-@%:@ as_fn_arith ARG...
-@%:@ ------------------
-@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across @S|@(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-@%:@ as_fn_mkdir_p
-@%:@ -------------
-@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} @%:@ as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in @%:@(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 OPTION... TAG...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE:TEMPLATE 
- instantiate the configuration file FILE
- --header=FILE:TEMPLATE 
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=?*)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=`expr "X$1" : 'X^=*=$.*$'`
- ac_shift=:
- ;;
- --*=)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
-
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
- ac_need_defaults=false ;;
-
- esac
- shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- export CONFIG_SHELL
- exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-@%:@@%:@ Running $as_me. @%:@@%:@
-_ASBOX
- $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
- "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
- "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
- "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
- "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
- "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
- "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
- "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp= ac_tmp=
- trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
- trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S"/; s/!.*/"=/
-p
-g
-s/^^!*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$..*/\1/
-t more1
-s/"\\/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$..*/\1/
-t more2
-s/"\\/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^^""/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_setkey = 1
- FS = "&#x7;"
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field1)
- for (i = 2; i < nfields; i++) {
- key = fieldi
- keylen = length(key)
- if (S_is_setkey) {
- value = Skey
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field++i)
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^	 *VPATH	 *=	 */{
-h
-s///
-s/^/:/
-s/	 *$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/$=	 *$.*/\1/
-G
-s/\n//
-s/^^=*=	 *$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=_$as_cr_Letters_$as_cr_alnum*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^	 *#	 *define	 	 */ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3"/p
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2"/p
-d
-:bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_setkey = 1
- FS = "&#x7;"
-}
-/^\t *#\t *(define|undef)\t +$ac_word_re(\t (|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg1 == "#") {
- defundef = arg2
- mac1 = arg3
- } else {
- defundef = substr(arg1, 2)
- mac1 = arg2
- }
- split(mac1, mac2, "(") #)
- macro = mac21
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_setmacro) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro Pmacro Dmacro
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
-shift
-for ac_tag
-do
- case $ac_tag in
- :FHLC) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :FHL*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- :FH-) ac_tag=-:-;;
- :FH*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
-
- case $ac_mode in
- :L) ac_source=$1;;
- :FH)
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute). The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	 case $ac_f in
-	 \\/$*) false;;
-	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input='Generated from '`
-	 $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
-	`' by configure.'
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
- fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/\\\\&|/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
-
- case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
-
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$ac_file" : 'X$//$^/' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- \\/$* | ?:\\/* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@a-zA-Z_a-zA-Z_0-9*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
-
- rm -f "$ac_tmp/stdin"
- case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
- fi
- ;;
- 
- 
- esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-

cyrus-imapd-2.4.17.tar.gz/autom4te.cache/output.1 Deleted

@@ -1,12233 +0,0 @@
-@%:@! /bin/sh
-@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68.
-@%:@ 
-@%:@ 
-@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-@%:@ Foundation, Inc.
-@%:@ 
-@%:@ 
-@%:@ This configure script is free software; the Free Software Foundation
-@%:@ gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in @%:@(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in @%:@((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- 
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
- 
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in @%:@(
-	 /*)
-	 for as_base in sh bash ksh sh5; do
-	 # Try only shells that exist, to save several forks.
-	 as_shell=$as_dir/$as_base
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
-		 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
-	 done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in @%:@ ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-@%:@ as_fn_unset VAR
-@%:@ ---------------
-@%:@ Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-@%:@ as_fn_set_status STATUS
-@%:@ -----------------------
-@%:@ Set @S|@? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} @%:@ as_fn_set_status
-
-@%:@ as_fn_exit STATUS
-@%:@ -----------------
-@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} @%:@ as_fn_exit
-
-@%:@ as_fn_mkdir_p
-@%:@ -------------
-@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} @%:@ as_fn_mkdir_p
-@%:@ as_fn_append VAR VALUE
-@%:@ ----------------------
-@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-@%:@ advantage of any shell optimizations that allow amortized linear growth over
-@%:@ repeated appends, instead of the typical quadratic growth present in naive
-@%:@ implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-@%:@ as_fn_arith ARG...
-@%:@ ------------------
-@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across @S|@(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-@%:@ as_fn_error STATUS ERROR LINENO LOG_FD
-@%:@ ----------------------------------------
-@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} @%:@ as_fn_error
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /$LINENO/=
- ' <$as_myself |
- sed '
- s/$LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/$LINENO$^'$as_cr_alnum'_.*\n$$.*$/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
- # Don't try to exec as it changes $0, causing all sort of problems
- # (the dirname of $0 is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in @%:@(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIB@&t@OBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="imap/imapd.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-PERL_DEPSUBDIRS
-PERL_SUBDIRS
-IMAP_LIBS
-IMAP_COM_ERR_LIBS
-LIB_RT
-LIB_UCDSNMP
-SNMP_CONFIG
-LIB_WRAP
-SNMP_SUBDIRS
-PERL_CCCDLFLAGS
-PERL
-SASLFLAGS
-LIB_SASL
-DYNSASLFLAGS
-LIB_DYN_SASL
-GSSAPIBASE_LIBS
-GSSAPI_LIBS
-LIB_CRYPT
-COM_ERR_CPPFLAGS
-COM_ERR_LDFLAGS
-COM_ERR_LIBS
-COMPILE_ET
-IMAP_PROGS
-ZEPHYR_LIBS
-ZLIB
-CMU_LIB_SUBDIR
-OPENSSL_LIB
-OPENSSL_INC
-SERVER_SUBDIRS
-LDAP_LIBS
-LDAP_LDFLAGS
-LDAP_CPPFLAGS
-AFS_LDFLAGS
-AFS_LIBS
-cyrus_cv_sigveclib
-WITH_LOCK
-WITH_MAP
-WITH_GMTOFF
-WITH_NONBLOCK
-SIEVE_SUBDIRS
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-YFLAGS
-YACC
-SIEVE_CPPFLAGS
-SIEVE_LIBS
-SIEVE_OBJS
-CYRUSDB_OBJS
-BDB_LIB
-BDB_INC
-LOCALDEFS
-DEPLIBS
-EXTRA_SUBDIRS
-PRE_SUBDIRS
-IPV6_OBJS
-LIB_SOCKET
-LIB@&t@OBJS
-AWK
-EGREP
-GREP
-CPP
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-SET_MAKE
-RANLIB
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-cyrus_group
-cyrus_user
-service_path
-cyrus_prefix
-MAKEDEPEND
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_extraident
-with_login
-with_cyrus_prefix
-with_service_path
-with_cyrus_user
-with_cyrus_group
-with_bdb
-with_dbdir
-with_bdb_libdir
-with_bdb_incdir
-with_mysql
-with_mysql_libdir
-with_mysql_incdir
-with_pgsql
-with_pgsql_libdir
-with_pgsql_incdir
-with_sqlite
-with_sqlite_libdir
-with_sqlite_incdir
-enable_sieve
-enable_pcre
-with_lock
-enable_afs
-with_afs_libdir
-with_afs_incdir
-with_ldap
-enable_krb5afspts
-enable_server
-with_krb
-with_krbimpl
-enable_statickrb
-with_krbdes
-with_openssl
-with_egd_socket
-with_lib_subdir
-with_zlib
-with_zephyr
-with_pidfile
-enable_idled
-enable_nntp
-enable_murder
-enable_replication
-with_com_err
-with_syslogfacility
-enable_cmulocal
-enable_oldsievename
-enable_netscapehack
-enable_gssapi
-with_gss_impl
-with_sasl
-with_staticsasl
-with_perl
-with_libwrap
-with_snmp
-with_ucdsnmp
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x$^=*$='`
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | 0-9* | *!_$as_cr_alnum* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X$.*^/$' \| "X$ac_val" : 'X$.*$'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- \\/$* | ?:\\/* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_myself" : 'X$//$^/' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*^/$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 OPTION... VAR=VALUE...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE disabled
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR configure dir or \`..'
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- @<:@@S|@ac_default_prefix@:>@
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- @<:@PREFIX@:>@
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables EPREFIX/bin
- --sbindir=DIR system admin executables EPREFIX/sbin
- --libexecdir=DIR program executables EPREFIX/libexec
- --sysconfdir=DIR read-only single-machine data PREFIX/etc
- --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
- --localstatedir=DIR modifiable single-machine data PREFIX/var
- --libdir=DIR object code libraries EPREFIX/lib
- --includedir=DIR C header files PREFIX/include
- --oldincludedir=DIR C header files for non-gcc /usr/include
- --datarootdir=DIR read-only arch.-independent data root PREFIX/share
- --datadir=DIR read-only architecture-independent data DATAROOTDIR
- --infodir=DIR info documentation DATAROOTDIR/info
- --localedir=DIR locale-dependent data DATAROOTDIR/locale
- --mandir=DIR man documentation DATAROOTDIR/man
- --docdir=DIR documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
- --htmldir=DIR html documentation DOCDIR
- --dvidir=DIR dvi documentation DOCDIR
- --pdfdir=DIR pdf documentation DOCDIR
- --psdir=DIR ps documentation DOCDIR
-_ACEOF
-
- cat <<\_ACEOF
-
-System types:
- --build=BUILD configure for building on BUILD guessed
- --host=HOST cross-compile to build programs to run on HOST BUILD
- --target=TARGET configure for building compilers for TARGET HOST
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
- cat <<\_ACEOF
-
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE=ARG include FEATURE ARG=yes
- --disable-sieve disable Sieve support
- --disable-pcre disable PCRE library
- --enable-afs Enable AFS with ptloader
- --enable-krb5afspts compile afskrb PTS module with krb5 support
- --disable-server disable compiling servers
- --enable-statickrb link Kerberos statically
- --enable-idled enable IMAP idled support
- --enable-nntp enable NNTP support
- --enable-murder enable IMAP Murder support
- --enable-replication enable replication support (experimental)
- --enable-cmulocal enable CMU-specific local support
- --enable-oldsievename enable the use of 'imap' as the sieve service name
- --enable-netscapehack enable Netscape hack for the menu option
- in Communicator to Administrate Mail
- --enable-gssapi=<DIR> enable GSSAPI authentication @<:@yes@:>@
-
-Optional Packages:
- --with-PACKAGE=ARG use PACKAGE ARG=yes
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-extraident=STRING use STRING as extra version information
-
- --with-cyrus-prefix=DIR use DIR as cyrus server install directory
- --with-service-path=DIR use DIR as service install directory
- --with-cyrus-user=USERID use USERID cyrus userid
- --with-cyrus-group=GROUPID use GROUPID cyrus group
- --with-bdb=DIR use Berkeley DB (in DIR) yes 
- --with-bdb-libdir=DIR Berkeley DB lib files are in DIR
- --with-bdb-incdir=DIR Berkeley DB include files are in DIR
- --with-mysql=DIR use MySQL (in DIR) no 
- --with-mysql-libdir=DIR MySQL lib files are in DIR
- --with-mysql-incdir=DIR MySQL include files are in DIR
- --with-pgsql=DIR use PostgreSQL (in DIR) no 
- --with-pgsql-libdir=DIR Pgsql lib files are in DIR
- --with-pgsql-incdir=DIR Pgsql include files are in DIR
- --with-sqlite=DIR use SQLite (in DIR) no 
- --with-sqlite-libdir=DIR SQLite lib files are in DIR
- --with-sqlite-incdir=DIR SQLite include files are in DIR
- --with-lock=METHOD force use of METHOD for locking (flock or fcntl)
- --with-afs-libdir=PATH use AFS libraries from PATH /usr/lib
- --with-afs-incdir=PATH use AFS headers from PATH /usr/include
- --with-ldap=DIR use LDAP (in DIR) (experimental) /usr/local 
- --with-krb=PATH use Kerberos from PATH
- --with-krbimpl=\kth|mit\ assume Kerberos 4 from KTH or MIT
- --with-krbdes use Kerberos DES implementation yes
- --with-openssl=PATH use OpenSSL from PATH
- --with-egd-socket=FILE Entropy Gathering Daemon socket pathname
- for systems without /dev/urandom
- --with-lib-subdir=DIR Find libraries in DIR instead of lib
- --with-zlib=PATH use zlib from PATH
- --with-zephyr=PATH enable Zephyr notification (installed on PATH)
- --with-pidfile=PATH pidfile in PATH (/var/run/cyrus-master.pid)
- --with-com_err=PATH use com_err from path -- includes in PATH/include,
- libs in PATH/lib, and compile_et in PATH/bin
- --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
- --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
- choose specific GSSAPI implementation @<:@@<:@auto@:>@@:>@
- --with-sasl=DIR Compile with libsasl2 in <DIR>
- --with-staticsasl=DIR Compile with staticly linked libsasl2 in <DIR>
- --with-perl=PERL use PERL for perl
- --with-libwrap=DIR use libwrap (rooted in DIR) yes 
- --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes 
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- YACC The `Yet Another Compiler Compiler' implementation to use.
- Defaults to the first program found out of: `bison -y', `byacc',
- `yacc'.
- YFLAGS The list of arguments that will be passed by default to @S|@YACC.
- This script will default YFLAGS to the empty string to avoid a
- default value of `-d' given by some make applications.
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-@%:@ ac_fn_c_try_compile LINENO
-@%:@ --------------------------
-@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_compile
-
-@%:@ ac_fn_c_try_cpp LINENO
-@%:@ ----------------------
-@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_cpp
-
-@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
-@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
-@%:@ the include files in INCLUDES and setting the cache variable VAR
-@%:@ accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_header_mongrel
-
-@%:@ ac_fn_c_try_run LINENO
-@%:@ ----------------------
-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes
-@%:@ that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_run
-
-@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
-@%:@ Tests whether HEADER exists and can be compiled using the include files in
-@%:@ INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-@%:@include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_header_compile
-
-@%:@ ac_fn_c_try_link LINENO
-@%:@ -----------------------
-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_try_link
-
-@%:@ ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-@%:@ --------------------------------------------
-@%:@ Tries to find the compile-time value of EXPR in a program that includes
-@%:@ INCLUDES, setting VAR accordingly. Returns whether the value could be
-@%:@ computed
-ac_fn_c_compute_int ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) >= 0)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=0 ac_mid=0
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid; break
-else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) < 0)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=-1 ac_mid=-1
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) >= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=$ac_mid; break
-else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-test_array @<:@0@:>@ = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid
-else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in @%:@((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-@%:@include <stdio.h>
-@%:@include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (($2) < 0)
- {
- long int i = longval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
- ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
- fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} @%:@ ac_fn_c_compute_int
-
-@%:@ ac_fn_c_check_func LINENO FUNC VAR
-@%:@ ----------------------------------
-@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_func
-
-@%:@ ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-@%:@ ----------------------------------------------------
-@%:@ Tries to find if the field MEMBER exists in type AGGR, after including
-@%:@ INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_member
-
-@%:@ ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-@%:@ ---------------------------------------------
-@%:@ Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-@%:@ accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-@%:@ifndef $as_decl_name
-@%:@ifdef __cplusplus
- (void) $as_decl_use;
-@%:@else
- (void) $as_decl_name;
-@%:@endif
-@%:@endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} @%:@ ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
- 2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
- if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
- else
-	case $ac_arg in
-	 *=* | --config-cache | -C | -disable-* | --disable-* \
-	 | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	 | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	 | -with-* | --with-* | -without-* | --without-* | --x)
-	 case "$ac_configure_args0 " in
-	 "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	 esac
-	 ;;
-	 -* ) ac_must_keep_next=true ;;
-	esac
- fi
- as_fn_append ac_configure_args " '$ac_arg'"
- ;;
- esac
- done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in @%:@((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- \\/* | ?:\\/* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	 ac_cache_corrupted=:
-	else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	 eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
-
-
-@%:@ Check whether --with-extraident was given.
-if test "${with_extraident+set}" = set; then :
- withval=$with_extraident; 
-cat >>confdefs.h <<_ACEOF
-@%:@define EXTRA_IDENT "$withval"
-_ACEOF
-
-fi
-
-
-# Extract the first word of "makedepend", so it can be a program name with args.
-set dummy makedepend; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKEDEPEND+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKEDEPEND"; then
- ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MAKEDEPEND="makedepend"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
-fi
-fi
-MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
-if test -n "$MAKEDEPEND"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
-$as_echo "$MAKEDEPEND" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MAKEDEPEND" != "makedepend"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&5
-$as_echo "$as_me: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&2;}
-fi
-
-
-@%:@ Check whether --with-login was given.
-if test "${with_login+set}" = set; then :
- withval=$with_login; as_fn_error $? "--with-login is no longer supported.
-Configure SASL appropriately instead." "$LINENO" 5
-fi
-
-
-
-@%:@ Check whether --with-cyrus-prefix was given.
-if test "${with_cyrus_prefix+set}" = set; then :
- withval=$with_cyrus_prefix; cyrus_prefix="$withval"
-else
- cyrus_prefix="/usr/cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define CYRUS_PATH "$cyrus_prefix"
-_ACEOF
-
-
-@%:@ Check whether --with-service-path was given.
-if test "${with_service_path+set}" = set; then :
- withval=$with_service_path; service_path="$withval"
-else
- service_path="$cyrus_prefix/bin"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SERVICE_PATH "$service_path"
-_ACEOF
-
-
-@%:@ Check whether --with-cyrus-user was given.
-if test "${with_cyrus_user+set}" = set; then :
- withval=$with_cyrus_user; cyrus_user="$withval"
-else
- cyrus_user="cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define CYRUS_USER "$cyrus_user"
-_ACEOF
-
-
-@%:@ Check whether --with-cyrus-group was given.
-if test "${with_cyrus_group+set}" = set; then :
- withval=$with_cyrus_group; cyrus_group="$withval"
-else
- cyrus_group="mail"
-fi
-
-
-
-if test $sysconfdir = '${prefix}/etc'; then
- sysconfdir="/etc"
-fi
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SYSCONFDIR "$sysconfdir"
-_ACEOF
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $@%:@ != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
- ab.out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
- *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	 ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
- * )
-	break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	 break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
- else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- 
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1;
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in @%:@((
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 :
-	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # program-specific install script used by HP pwplus--don't use.
-	 :
-	 else
-	 rm -rf conftest.one conftest.two conftest.dir
-	 echo one > conftest.one
-	 echo two > conftest.two
-	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	 test -s conftest.one && test -s conftest.two &&
-	 test -s conftest.dir/conftest.one &&
-	 test -s conftest.dir/conftest.two
-	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	 break 3
-	 fi
-	 fi
-	fi
- done
- done
- ;;
-esac
-
- done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@ifdef __STDC__
-@%:@ include <limits.h>
-@%:@else
-@%:@ include <assert.h>
-@%:@endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
- 
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@ifdef __STDC__
-@%:@ include <limits.h>
-@%:@else
-@%:@ include <assert.h>
-@%:@endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-@%:@include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- 
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
- 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
- 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- 
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
- 
-$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		 inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-
-done
-
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
- MINIX=yes
-else
- MINIX=
-fi
-
-
- if test "$MINIX" = yes; then
- 
-$as_echo "@%:@define _POSIX_SOURCE 1" >>confdefs.h
-
- 
-$as_echo "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
-
- 
-$as_echo "@%:@define _MINIX 1" >>confdefs.h
-
- fi
-
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#	 define __EXTENSIONS__ 1
-	 $ac_includes_default
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_safe_to_define___extensions__=yes
-else
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
- test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
-
- $as_echo "@%:@define _ALL_SOURCE 1" >>confdefs.h
-
- $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
-
- $as_echo "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
- $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
- 
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset2;
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x = {25, 17};
- const int *foo = &x0;
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap3; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs0 && !zero.x;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
- 
-$as_echo "@%:@define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
-$as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_sys_long_file_names=yes
-# Test for long file names in all the places we know might matter:
-# .		the current directory, where building will happen
-# $prefix/lib	where we will be installing things
-# $exec_prefix/lib	likewise
-# $TMPDIR		if set, where it might want to write temporary files
-# /tmp		where it might want to write temporary files
-# /var/tmp		likewise
-# /usr/tmp		likewise
-for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
- # in the usual case where exec_prefix is '${prefix}'.
- case $ac_dir in #(
- . | /* | ?:\\/*) ;; #(
- *) continue;;
- esac
- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
- ac_xdir=$ac_dir/cf$$
- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
- ac_tf1=$ac_xdir/conftest9012345
- ac_tf2=$ac_xdir/conftest9012346
- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
- ac_cv_sys_long_file_names=no
- rm -f -r "$ac_xdir" 2>/dev/null
- test $ac_cv_sys_long_file_names = no && break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
-$as_echo "$ac_cv_sys_long_file_names" >&6; }
-if test $ac_cv_sys_long_file_names = yes; then
- 
-$as_echo "@%:@define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
-
-fi
-
-if test $ac_cv_sys_long_file_names = no; then
-	as_fn_error $? "The Cyrus IMAPD requires support for long file names" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
- ;;
-esac
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_size_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_size_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_off_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_off_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
-$as_echo_n "checking size of long long int... " >&6; }
-if ${ac_cv_sizeof_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5
-$as_echo_n "checking size of unsigned long long int... " >&6; }
-if ${ac_cv_sizeof_unsigned_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_unsigned_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_unsigned_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
-_ACEOF
-
-
-if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
- "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
- 
-$as_echo "@%:@define HAVE_LONG_LONG_INT /**/" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
-	 not a universal capable compiler
-	 #endif
-	 typedef int dummy;
-	 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- 
-	# Check for potential -arch flags. It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	 case $ac_word in
-	 i?86 | x86_64 | ppc | ppc64)
-	 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	 else
-		 ac_cv_c_bigendian=universal
-		 break
-	 fi
-	 ;;
-	 esac
-	 ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	 ac_prev=arch
-	 fi
- done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-	 #include <sys/param.h>
-	 
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		 && LITTLE_ENDIAN)
-	 bogus endian macros
-	 #endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-		#include <sys/param.h>
-	 
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-	 
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	 bogus endian macros
-	 #endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-	 
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-short int ascii_mm =
-		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
-		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		 return ascii_mmi + ascii_iii;
-		}
-		short int ebcdic_ii =
-		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
-		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		 return ebcdic_mmi + ebcdic_iii;
-		}
-		extern int foo;
-	 
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	 ac_cv_c_bigendian=yes
-	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	 if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	 else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	 fi
-	 fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
-	 /* Are we little or big endian? From Harbison&Steele. */
-	 union
-	 {
-	 long int l;
-	 char csizeof (long int);
-	 } u;
-	 u.l = 1;
-	 return u.csizeof (long int) - 1 == 1;
-	 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
- no)
- ;; #(
- universal)
- 	
-$as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
- ;; #(
- *)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-$as_echo_n "checking for __attribute__... " >&6; }
-if ${ac_cv___attribute__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv___attribute__=yes
-else
- ac_cv___attribute__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv___attribute__" = "yes"; then
- 
-$as_echo "@%:@define HAVE___ATTRIBUTE__ 1" >>confdefs.h
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
-$as_echo "$ac_cv___attribute__" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -fPIC" >&5
-$as_echo_n "checking if compiler supports -fPIC... " >&6; }
-if ${ac_cv_fpic+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-save_CFLAGS=$CFLAGS
-CFLAGS="${CFLAGS} -fPIC"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_fpic=yes
-else
- ac_cv_fpic=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS=$save_CFLAGS
-
-fi
-
-if test "$ac_cv_fpic" = "yes"; then
- FPIC_CFLAGS="-fPIC"
-else
- FPIC_CFLAGS=""
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
-$as_echo "$ac_cv_fpic" >&6; }
-
-
-
- # CMU GUESS RUNPATH SWITCH
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runpath switch" >&5
-$as_echo_n "checking for runpath switch... " >&6; }
-if ${andrew_cv_runpath_switch+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- # first, try -R
- SAVE_LDFLAGS="${LDFLAGS}"
- LDFLAGS="-R /usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-R"
-else
- 
- 	LDFLAGS="-Wl,-rpath,/usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-Wl,-rpath,"
-else
- andrew_cv_runpath_switch="none"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="${SAVE_LDFLAGS}"
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $andrew_cv_runpath_switch" >&5
-$as_echo "$andrew_cv_runpath_switch" >&6; }
-
-for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-
-done
-
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
- $as_echo "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" memmove.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS memmove.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes; then :
- $as_echo "@%:@define HAVE_STRCASECMP 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" strcasecmp.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS strcasecmp.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
-if test "x$ac_cv_func_ftruncate" = xyes; then :
- $as_echo "@%:@define HAVE_FTRUNCATE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" ftruncate.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS ftruncate.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- $as_echo "@%:@define HAVE_STRERROR 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" strerror.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS strerror.$ac_objext"
- ;;
-esac
-
-fi
-
-
-for ac_func in strlcat strlcpy getgrouplist
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_ac_Header=yes"
-else
- eval "$as_ac_Header=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_ac_Header
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
- 
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
- 
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-fi
-
-fi
-
-
-for ac_header in stdlib.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_STDLIB_H 1
-_ACEOF
- 
-fi
-
-done
-
-for ac_func in getpassphrase
-do :
- ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
-if test "x$ac_cv_func_getpassphrase" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GETPASSPHRASE 1
-_ACEOF
- 
-fi
-done
-
-
-
-	save_LIBS="$LIBS"
-	LIB_SOCKET=""
-	ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
- :
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
- LIB_SOCKET="-lnsl $LIB_SOCKET"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
-else
- ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
- LIB_SOCKET="-lsocket $LIB_SOCKET"
-fi
-
-	
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes; then :
- :
-else
- LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
-#include <resolv.h>
-int
-main ()
-{
-
-const char host12="openafs.org";
-u_char ans1024;
-res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-return 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- LIB_SOCKET="-lresolv $LIB_SOCKET"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	for ac_func in dn_expand dns_lookup
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-	LIBS="$save_LIBS"
-	
-	
-LIBS="$LIBS ${LIB_SOCKET}"
-
-cyrus_cv_getaddrinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
- ac_cv_lib_socket_getaddrinfo=no
- ac_cv_lib_inet6_getaddrinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
-$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getaddrinfo=yes
-else
- ac_cv_lib_socket_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getaddrinfo=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getaddrinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
-$as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getaddrinfo=yes
-else
- ac_cv_lib_inet6_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getaddrinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getaddrinfo=no
-if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
- -o $ac_cv_lib_inet6_getaddrinfo = yes
-then
- ipv6_cv_getaddrinfo=yes
-fi
-if test $ipv6_cv_getaddrinfo = no; then
- if test getaddrinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getaddrinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getaddrinfo = yes; then
- 
-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes; then :
- ac_cv_lib_socket_gai_strerror=no
- ac_cv_lib_inet6_gai_strerror=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -lsocket" >&5
-$as_echo_n "checking for gai_strerror in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_gai_strerror=yes
-else
- ac_cv_lib_socket_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gai_strerror" >&5
-$as_echo "$ac_cv_lib_socket_gai_strerror" >&6; }
-if test "x$ac_cv_lib_socket_gai_strerror" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_gai_strerror=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_gai_strerror=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -linet6" >&5
-$as_echo_n "checking for gai_strerror in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_gai_strerror=yes
-else
- ac_cv_lib_inet6_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gai_strerror" >&5
-$as_echo "$ac_cv_lib_inet6_gai_strerror" >&6; }
-if test "x$ac_cv_lib_inet6_gai_strerror" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_gai_strerror=no
-if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
- -o $ac_cv_lib_inet6_gai_strerror = yes
-then
- ipv6_cv_gai_strerror=yes
-fi
-if test $ipv6_cv_gai_strerror = no; then
- if test gai_strerror = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gai_strerror" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_gai_strerror=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_gai_strerror = yes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getaddrinfo=no
-fi
-else
- cyrus_cv_getaddrinfo=no
-fi
-
-if test $cyrus_cv_getaddrinfo = no; then
-	IPV6_OBJS="getaddrinfo.o"
-fi
-
-cyrus_cv_getnameinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
-if test "x$ac_cv_func_getnameinfo" = xyes; then :
- ac_cv_lib_socket_getnameinfo=no
- ac_cv_lib_inet6_getnameinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
-$as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getnameinfo=yes
-else
- ac_cv_lib_socket_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
-$as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
-if test "x$ac_cv_lib_socket_getnameinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getnameinfo=no
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getnameinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
-$as_echo_n "checking for getnameinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getnameinfo=yes
-else
- ac_cv_lib_inet6_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getnameinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getnameinfo=no
-if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
- -o $ac_cv_lib_inet6_getnameinfo = yes
-then
- ipv6_cv_getnameinfo=yes
-fi
-if test $ipv6_cv_getnameinfo = no; then
- if test getnameinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
- 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getnameinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getnameinfo = yes; then
- 
-$as_echo "@%:@define HAVE_GETNAMEINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getnameinfo=no
-fi
-
-if test $cyrus_cv_getnameinfo = no; then
-	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5
-$as_echo_n "checking whether you have ss_family in struct sockaddr_storage... " >&6; }
-if ${ipv6_cv_ss_family+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr_storage ss; int i = ss.ss_family;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_ss_family=yes
-else
- ipv6_cv_ss_family=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_ss_family = yes; then
- 
-$as_echo "@%:@define HAVE_SS_FAMILY /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_ss_family" >&5
-$as_echo "$ipv6_cv_ss_family" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have sa_len in struct sockaddr" >&5
-$as_echo_n "checking whether you have sa_len in struct sockaddr... " >&6; }
-if ${ipv6_cv_sa_len+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr sa; int i = sa.sa_len;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_sa_len=yes
-else
- ipv6_cv_sa_len=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_sa_len = yes; then
- 
-$as_echo "@%:@define HAVE_SOCKADDR_SA_LEN /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_sa_len" >&5
-$as_echo "$ipv6_cv_sa_len" >&6; }
-
-
-
-for ac_header in sys/time.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_TIME_H 1
-_ACEOF
- 
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
- 
-$as_echo "@%:@define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				 int *p = &tm.tm_sec;
-				 return !p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
-else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
- 
-$as_echo "@%:@define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-"
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
- 
-cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
-
-
-fi
-
-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
- 
-$as_echo "@%:@define HAVE_TM_ZONE 1" >>confdefs.h
-
-else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <time.h>
-#if !HAVE_DECL_TZNAME
-extern char *tzname;
-#endif
-
-int
-main ()
-{
-return tzname00;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_var_tzname=yes
-else
- ac_cv_var_tzname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-$as_echo "$ac_cv_var_tzname" >&6; }
- if test $ac_cv_var_tzname = yes; then
- 
-$as_echo "@%:@define HAVE_TZNAME 1" >>confdefs.h
-
- fi
-fi
-
-
-
-
-
-
-
-for ac_func in vprintf
-do :
- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_VPRINTF 1
-_ACEOF
- 
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
- 
-$as_echo "@%:@define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
-
-
-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-
-
-
-@%:@ Check whether --with-bdb was given.
-if test "${with_bdb+set}" = set; then :
- withval=$with_bdb; with_bdb=$withval
-else
- with_bdb="yes"
-fi
-
-
-
-@%:@ Check whether --with-dbdir was given.
-if test "${with_dbdir+set}" = set; then :
- withval=$with_dbdir; with_bdb=$withval
-fi
-
-
-case "$with_bdb" in
- no)
-	use_berkeley="no"
-	;;
- yes)
-	use_berkeley="yes"
-	with_bdb_lib=none
-	with_bdb_inc=none
-	;;
- 
- *)
-	use_berkeley="yes"
-	with_bdb_lib="$with_bdb/lib"
-	with_bdb_inc="$with_bdb/include"
-	;;
-esac
-
-if test "$use_berkeley" != "no"; then
- 
-
-@%:@ Check whether --with-bdb-libdir was given.
-if test "${with_bdb_libdir+set}" = set; then :
- withval=$with_bdb_libdir; with_bdb_lib=$withval
-else
- test "${with_bdb_lib+set}" = set || with_bdb_lib=none
-fi
-
-
-@%:@ Check whether --with-bdb-incdir was given.
-if test "${with_bdb_incdir+set}" = set; then :
- withval=$with_bdb_incdir; with_bdb_inc=$withval
-else
- test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_bdb_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-	 BDB_INCADD="-I$with_bdb_inc"
-	else
-	 BDB_INCADD=""
-	fi
-
-	 ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
-if test "x$ac_cv_header_db_h" = xyes; then :
- 
-	BDB_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_bdb_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
- else
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-	else
-	 BDB_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
-	 for dbname in ${with_bdb} \
-	 db-4.8 db4.8 db48 \
-	 db-4.7 db4.7 db47 \
-	 db-4.6 db4.6 db46 \
-	 db-4.5 db4.5 db45 \
-	 db-4.4 db4.4 db44 \
-	 db-4.3 db4.3 db43 \
-	 db-4.2 db4.2 db42 \
-	 db-4.1 db4.1 db41 \
-	 db-4.0 db4.0 db40 db-4 db4 \
-	 db-3.3 db3.3 db33 \
-	 db-3.2 db3.2 db32 \
-	 db-3.1 db3.1 db31 \
-	 db-3.0 db3.0 db30 db-3 db3 \
-	 db
-	 do
-	 LIBS="$saved_LIBS -l$dbname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_create(NULL, NULL, 0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$dblib" = "berkeley"; then break; fi
- done
- if test "$dblib" = "no"; then
-	 LIBS="$saved_LIBS -ldb"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$BDB_SAVE_LDFLAGS
-
-else
- dblib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$dblib" = "no"; then
- as_fn_error $? "Berkeley DB 3.x or later was not found. You may need to 
- supply the --with-bdb-libdir or --with-bdb-incdir configure options." "$LINENO" 5
- fi
-
- if test "$with_bdb_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib $andrew_cv_runpath_switch$with_bdb_lib ${LDFLAGS}"
- fi
-
- fi
-
- BDB_INC=${BDB_INCADD}
- BDB_LIB=${BDB_LIBADD}
- 
- 
-
- LIBS="${LIBS} ${BDB_LIBADD}"
- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-
- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
- 
-$as_echo "@%:@define HAVE_BDB /**/" >>confdefs.h
-
-fi
-
-
-
-
-HAVE_SQL=0
-
-
-@%:@ Check whether --with-mysql was given.
-if test "${with_mysql+set}" = set; then :
- withval=$with_mysql; with_mysql=$withval
-else
- with_mysql="no"
-fi
-
-
-case "$with_mysql" in
- no)
-	use_mysql="no"
-	;;
- yes)
-	use_mysql="yes"
-	with_mysql_lib=none
-	with_mysql_inc=none
-	;;
- 
- *)
-	use_mysql="yes"
-	with_mysql_lib="$with_mysql/lib"
-	with_mysql_inc="$with_mysql/include"
-	;;
-esac
-
-if test "$use_mysql" != "no"; then
- 
-
-@%:@ Check whether --with-mysql-libdir was given.
-if test "${with_mysql_libdir+set}" = set; then :
- withval=$with_mysql_libdir; with_mysql_lib=$withval
-else
- test "${with_mysql_lib+set}" = set || with_mysql_lib=none
-fi
-
-
-@%:@ Check whether --with-mysql-incdir was given.
-if test "${with_mysql_incdir+set}" = set; then :
- withval=$with_mysql_incdir; with_mysql_inc=$withval
-else
- test "${with_mysql_inc+set}" = set || with_mysql_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_mysql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_mysql_inc"
-	 MYSQL_INCADD="-I$with_mysql_inc"
-	else
-	 MYSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_h" = xyes; then :
- 
-	MYSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_mysql_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD}"
- else
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-	else
-	 MYSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_mysql} mysqlclient
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <mysql.h>
-int
-main ()
-{
-mysql_select_db(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- MYSQL_LIBADD="$MYSQL_LIBADD -l$libname"; mysqllib="yes"
-else
- mysqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$mysqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$MYSQL_SAVE_LDFLAGS
-
-else
- mysqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$mysqllib" = "no"; then
- as_fn_error $? "MySQL was not found. You may need to supply the
- --with-mysql-libdir or --with-mysql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_mysql_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib $andrew_cv_runpath_switch$with_mysql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${MYSQL_LIBADD}"
- CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_MYSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-@%:@ Check whether --with-pgsql was given.
-if test "${with_pgsql+set}" = set; then :
- withval=$with_pgsql; with_pgsql=$withval
-else
- with_pgsql="no"
-fi
-
-
-case "$with_pgsql" in
- no)
-	use_pgsql="no"
-	;;
- yes)
-	use_pgsql="yes"
-	with_pgsql_lib=none
-	with_pgsql_inc=none
-	;;
- 
- *)
-	use_pgsql="yes"
-	with_pgsql_lib="$with_pgsql/lib"
-	with_pgsql_inc="$with_pgsql/include"
-	;;
-esac
-
-if test "$use_pgsql" != "no"; then
- 
-
-@%:@ Check whether --with-pgsql-libdir was given.
-if test "${with_pgsql_libdir+set}" = set; then :
- withval=$with_pgsql_libdir; with_pgsql_lib=$withval
-else
- test "${with_pgsql_lib+set}" = set || with_pgsql_lib=none
-fi
-
-
-@%:@ Check whether --with-pgsql-incdir was given.
-if test "${with_pgsql_incdir+set}" = set; then :
- withval=$with_pgsql_incdir; with_pgsql_inc=$withval
-else
- test "${with_pgsql_inc+set}" = set || with_pgsql_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_pgsql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_pgsql_inc"
-	 PGSQL_INCADD="-I$with_pgsql_inc"
-	else
-	 PGSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
- 
-	PGSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_pgsql_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD}"
- else
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-	else
-	 PGSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_pgsql} pq
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <libpq-fe.h>
-int
-main ()
-{
-PQconnectdb(NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PGSQL_LIBADD="$PGSQL_LIBADD -l$libname"; pgsqllib="yes"
-else
- pgsqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$pgsqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$PGSQL_SAVE_LDFLAGS
-
-else
- pgsqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$pgsqllib" = "no"; then
- as_fn_error $? "PgSQL was not found. You may need to supply the
- --with-pgsql-libdir or --with-pgsql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_pgsql_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib $andrew_cv_runpath_switch$with_pgsql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${PGSQL_LIBADD}"
- CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_PGSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-@%:@ Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then :
- withval=$with_sqlite; with_sqlite=$withval
-else
- with_sqlite=no
-fi
-
-
-case "$with_sqlite" in
- no)
-	use_sqlite="no"
-	;;
- yes)
-	use_sqlite="yes"
-	with_sqlite_lib=none
-	with_sqlite_inc=none
-	;;
- 
- *)
-	use_sqlite="yes"
-	with_sqlite_lib="$with_sqlite/lib"
-	with_sqlite_inc="$with_sqlite/include"
-	;;
-esac
-
-if test "$use_sqlite" != "no"; then
- 
-
-@%:@ Check whether --with-sqlite-libdir was given.
-if test "${with_sqlite_libdir+set}" = set; then :
- withval=$with_sqlite_libdir; with_sqlite_lib=$withval
-else
- test "${with_sqlite_lib+set}" = set || with_sqlite_lib=none
-fi
-
-
-@%:@ Check whether --with-sqlite-incdir was given.
-if test "${with_sqlite_incdir+set}" = set; then :
- withval=$with_sqlite_incdir; with_sqlite_inc=$withval
-else
- test "${with_sqlite_inc+set}" = set || with_sqlite_inc=none 
-fi
-
-
-
-	
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_sqlite_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_sqlite_inc"
-	 SQLITE_INCADD="-I$with_sqlite_inc"
-	else
-	 SQLITE_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = xyes; then :
- 
-	SQLITE_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_sqlite_lib; then
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD}"
- else
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-	else
-	 SQLITE_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_sqlite} sqlite3
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <sqlite3.h>
-int
-main ()
-{
-sqlite3_open(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- SQLITE_LIBADD="$SQLITE_LIBADD -l$libname"; sqlitelib="yes"
-else
- sqlitelib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$sqlitelib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$SQLITE_SAVE_LDFLAGS
-
-else
- sqlitelib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$sqlitelib" = "no"; then
- as_fn_error $? "Sqlite was not found. You may need to supply the
- --with-sqlite-libdir or --with-sqlite-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_sqlite_lib" != "none"; then
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib $andrew_cv_runpath_switch$with_sqlite_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${SQLITE_LIBADD}"
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
-
- 
-$as_echo "@%:@define HAVE_SQLITE /**/" >>confdefs.h
-
-fi
-
-
-
-if test $HAVE_SQL = 1; then
- CYRUSDB_OBJS="${CYRUSDB_OBJS} cyrusdb_sql.o"
-fi
-
-
-
-
-SIEVE_SUBDIRS=""
-sievedir="sieve"
-@%:@ Check whether --enable-sieve was given.
-if test "${enable_sieve+set}" = set; then :
- enableval=$enable_sieve; if test "$enableval" = no; then
-		sievedir="no"
-	fi
-fi
-
-
-testpcre="yes"
-@%:@ Check whether --enable-pcre was given.
-if test "${enable_pcre+set}" = set; then :
- enableval=$enable_pcre; if test "$enableval" = no; then
-		testpcre="no"
-	fi
-fi
-
-
-if test "$sievedir" != "no"; then
-	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-	
-	SIEVE_LIBS="../${sievedir}/libsieve.a"
-	
-	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-	
-	
-$as_echo "@%:@define USE_SIEVE /**/" >>confdefs.h
-
-
-		for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_YACC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-	for ac_prog in flex lex
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LEX"; then
- ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LEX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext0); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
- return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
-if test -f lex.yy.c; then
- ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
- ac_cv_prog_lex_root=lexyy
-else
- as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-if test -z "${LEXLIB+set}"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- ac_save_LIBS=$LIBS
- ac_cv_lib_lex='none needed'
- for ac_lib in '' -lfl -ll; do
- LIBS="$ac_lib $ac_save_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- test "$ac_cv_lib_lex" != 'none needed' && break
- done
- LIBS=$ac_save_LIBS
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
- test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
- 
-$as_echo "@%:@define YYTEXT_POINTER 1" >>confdefs.h
-
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfl" >&5
-$as_echo_n "checking for main in -lfl... " >&6; }
-if ${ac_cv_lib_fl_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_fl_main=yes
-else
- ac_cv_lib_fl_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_main" >&5
-$as_echo "$ac_cv_lib_fl_main" >&6; }
-if test "x$ac_cv_lib_fl_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBFL 1
-_ACEOF
-
- LIBS="-lfl $LIBS"
-
-fi
-
-
-	if test "$testpcre" != "no"; then
-	 ac_fn_c_check_header_mongrel "$LINENO" "pcreposix.h" "ac_cv_header_pcreposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcreposix_h" = xyes; then :
- 
-fi
-
-
-	 if test "$ac_cv_header_pcreposix_h" = "yes"; then
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
-$as_echo_n "checking for utf8 enabled pcre... " >&6; }
-		 if ${cyrus_cv_pcre_utf8+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <pcreposix.h>
-#ifndef REG_UTF8
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_pcre_utf8=yes
-else
- cyrus_cv_pcre_utf8=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_pcre_utf8" >&5
-$as_echo "$cyrus_cv_pcre_utf8" >&6; }
-	 else
-		 cyrus_cv_pcre_utf8="no"
-	 fi
-	fi
-
-	if test "$cyrus_cv_pcre_utf8" = "yes"; then
-		LIBS="$LIBS -lpcre -lpcreposix";
-		
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-		
-$as_echo "@%:@define HAVE_PCREPOSIX_H /**/" >>confdefs.h
-
-	else 
-		for ac_header in rxposix.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "rxposix.h" "ac_cv_header_rxposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_rxposix_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_RXPOSIX_H 1
-_ACEOF
- 
-fi
-
-done
-
-		if test "$ac_cv_header_rxposix_h" = "yes"; then
-			LIBS="$LIBS -lrx"
-			
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
-$as_echo_n "checking for library containing regcomp... " >&6; }
-if ${ac_cv_search_regcomp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char regcomp ();
-int
-main ()
-{
-return regcomp ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' regex; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_regcomp=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_regcomp+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_regcomp+:} false; then :
- 
-else
- ac_cv_search_regcomp=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
-$as_echo "$ac_cv_search_regcomp" >&6; }
-ac_res=$ac_cv_search_regcomp
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-$as_echo "@%:@define ENABLE_REGEX /**/" >>confdefs.h
-
-fi
-
-		fi
-	fi
-
-	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-fi
-
-
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- 
-$as_echo "@%:@define HAS_STRERROR /**/" >>confdefs.h
-
-else
- 
-$as_echo "@%:@define NEED_SYS_ERRLIST /**/" >>confdefs.h
-
-fi
-
-
-for ac_header in sys/resource.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_resource_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_RESOURCE_H 1
-_ACEOF
- 
-fi
-
-done
-
-for ac_func in setrlimit
-do :
- ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SETRLIMIT 1
-_ACEOF
- 
-fi
-done
-
-for ac_func in getrlimit
-do :
- ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GETRLIMIT 1
-_ACEOF
- 
-fi
-done
-
-
-for ac_func in daemon setsid
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-
-for ac_func in shutdown
-do :
- ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
-if test "x$ac_cv_func_shutdown" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SHUTDOWN 1
-_ACEOF
- 
-fi
-done
-
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "socklen_t" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_SOCKLEN_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sockaddr_storage" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_STRUCT_SOCKADDR_STORAGE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/resource.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "rlim_t" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_RLIM_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-
-spt_type=""
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-fi
-
-if test "$spt_type" = ""; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
-$as_echo_n "checking for setproctitle in -lutil... " >&6; }
-if ${ac_cv_lib_util_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setproctitle ();
-int
-main ()
-{
-return setproctitle ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_util_setproctitle=yes
-else
- ac_cv_lib_util_setproctitle=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
-$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
-if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-			LIBS="${LIBS} -lutil"
-fi
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
- spt_type=SPT_PSTAT
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/sysnews.h" "ac_cv_header_sys_sysnews_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysnews_h" = xyes; then :
- spt_type=SPT_SYSMIPS
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-$as_echo_n "checking for PS_STRINGS... " >&6; }
-	if ${cyrus_cv_sys_psstrings+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <machine/vmparam.h>
-#include <sys/exec.h>
-#ifndef PS_STRINGS
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_psstrings=yes
-else
- cyrus_cv_sys_psstrings=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_psstrings = yes; then
-		spt_type=SPT_PSSTRINGS
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_psstrings" >&5
-$as_echo "$cyrus_cv_sys_psstrings" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCO" >&5
-$as_echo_n "checking for SCO... " >&6; }
-	if ${cyrus_cv_sys_sco+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifndef _SCO_unix_
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_sco=yes
-else
- cyrus_cv_sys_sco=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_sco = yes; then
-		spt_type=SPT_SCO
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_sco" >&5
-$as_echo "$cyrus_cv_sys_sco" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle usability" >&5
-$as_echo_n "checking for setproctitle usability... " >&6; }
-	if ${cyrus_cv_sys_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_setproctitle=yes
-else
- cyrus_cv_sys_setproctitle=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_setproctitle = no; then
-		spt_type=SPT_NONE
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_setproctitle" >&5
-$as_echo "$cyrus_cv_sys_setproctitle" >&6; }
-fi
-if test "$spt_type" != ""; then
-	
-cat >>confdefs.h <<_ACEOF
-@%:@define SPT_TYPE $spt_type
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nonblocking method" >&5
-$as_echo_n "checking nonblocking method... " >&6; }
-if ${cyrus_cv_sys_nonblock+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#ifndef	FNDELAY
-#define FNDELAY		O_NDELAY
-#endif
-int
-main ()
-{
-fcntl(0, F_GETFL, 0)&FNDELAY
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- cyrus_cv_sys_nonblock=fcntl
-else
- cyrus_cv_sys_nonblock=ioctl
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_NONBLOCK" >&5
-$as_echo "$WITH_NONBLOCK" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking timezone GMT offset method" >&5
-$as_echo_n "checking timezone GMT offset method... " >&6; }
-if ${cyrus_cv_struct_sys_gmtoff+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <time.h>
-int
-main ()
-{
-struct tm tm;
-tm.tm_gmtoff = 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cyrus_cv_struct_sys_gmtoff=tm
-else
- cyrus_cv_struct_sys_gmtoff=gmtime
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_GMTOFF" >&5
-$as_echo "$WITH_GMTOFF" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared mmap" >&5
-$as_echo_n "checking for shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_shared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_shared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base+4, "test", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_shared=yes
-else
- cyrus_cv_func_mmap_shared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_shared" >&5
-$as_echo "$cyrus_cv_func_mmap_shared" >&6; }
-if test $cyrus_cv_func_mmap_shared = yes; then
-	WITH_MAP="shared"
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stupid shared mmap" >&5
-$as_echo_n "checking for stupid shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_stupidshared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_stupidshared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-lseek(fd, 0L, 0);	
-if (write(fd, "xyzz", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base, "xyzz", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_stupidshared=yes
-else
- cyrus_cv_func_mmap_stupidshared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_stupidshared" >&5
-$as_echo "$cyrus_cv_func_mmap_stupidshared" >&6; }
-if test $cyrus_cv_func_mmap_stupidshared = yes; then
-	WITH_MAP="stupidshared"
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This system does not have a working mmap()" >&5
-$as_echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Expect a considerable performance penalty" >&5
-$as_echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
-	WITH_MAP=nommap
-fi
-fi
-
-
-
-@%:@ Check whether --with-lock was given.
-if test "${with_lock+set}" = set; then :
- withval=$with_lock; WITH_LOCK="$withval"
-else
- 
- ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
-if test "x$ac_cv_func_fcntl" = xyes; then :
- WITH_LOCK="fcntl"
-else
- 
-		ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes; then :
- WITH_LOCK="flock"
-else
- 
-				as_fn_error $? "unable to detect locking method" "$LINENO" 5
-			 
-fi
-
-		
-fi
-
- 
-fi
-
-
-
-
-LIB_RT=""
-ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = xyes; then :
- 
-$as_echo "@%:@define HAVE_FDATASYNC /**/" >>confdefs.h
-
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
-$as_echo_n "checking for fdatasync in -lrt... " >&6; }
-if ${ac_cv_lib_rt_fdatasync+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fdatasync ();
-int
-main ()
-{
-return fdatasync ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rt_fdatasync=yes
-else
- ac_cv_lib_rt_fdatasync=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
-$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
-if test "x$ac_cv_lib_rt_fdatasync" = xyes; then :
- 
-	LIB_RT="-lrt"
-	
-$as_echo "@%:@define HAVE_FDATASYNC /**/" >>confdefs.h
-
- 
-fi
-
-
-fi
-
-
-cant_find_sigvec=no
-if ${cyrus_cv_sigveclib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec"
-if test "x$ac_cv_func_sigvec" = xyes; then :
- 
-	cyrus_cv_sigveclib=""
- 
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lBSD" >&5
-$as_echo_n "checking for sigvec in -lBSD... " >&6; }
-if ${ac_cv_lib_BSD_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lBSD $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_BSD_sigvec=yes
-else
- ac_cv_lib_BSD_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_BSD_sigvec" >&5
-$as_echo "$ac_cv_lib_BSD_sigvec" >&6; }
-if test "x$ac_cv_lib_BSD_sigvec" = xyes; then :
- cyrus_cv_sigveclib="-lBSD"
-else
- 
- SAVE_LDFLAGS="$LDFLAGS"
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lucb" >&5
-$as_echo_n "checking for sigvec in -lucb... " >&6; }
-if ${ac_cv_lib_ucb_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lucb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ucb_sigvec=yes
-else
- ac_cv_lib_ucb_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_sigvec" >&5
-$as_echo "$ac_cv_lib_ucb_sigvec" >&6; }
-if test "x$ac_cv_lib_ucb_sigvec" = xyes; then :
- 
- cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-else
- cant_find_sigvec=yes 
-fi
-
- LDFLAGS="$SAVE_LDFLAGS"
-fi
-
- 
-fi
-
-
-fi
-
-
-
-# ok, we still look for this stuff because of checking groups, but
-# all authentication goes through SASL
-@%:@ Check whether --enable-afs was given.
-if test "${enable_afs+set}" = set; then :
- enableval=$enable_afs; 
-fi
-
-
-
-@%:@ Check whether --with-afs-libdir was given.
-if test "${with_afs_libdir+set}" = set; then :
- withval=$with_afs_libdir; afs_libdir="${withval}"
-else
- afs_libdir="/usr/lib"
-fi
-
- 
-
-@%:@ Check whether --with-afs-incdir was given.
-if test "${with_afs_incdir+set}" = set; then :
- withval=$with_afs_incdir; afs_incdir="${withval}"
-else
- afs_incdir="/usr/include"
-fi
-
-
-
-@%:@ Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then :
- withval=$with_ldap; with_ldap="${withval}"
-else
- with_ldap="no"
-fi
-
- 
-@%:@ Check whether --enable-krb5afspts was given.
-if test "${enable_krb5afspts+set}" = set; then :
- enableval=$enable_krb5afspts; 
-fi
-
-
-if test "x$enable_afs" = "xyes"; then
-# krb5afspts is only valid if AFS is enabled, so check inside here.
- if test "x$enable_krb5afspts" = "xyes"; then :
- SASL_GSSAPI_LIBS_SET="yes"
-
- 
-$as_echo "@%:@define AFSPTS_USE_KRB5 /**/" >>confdefs.h
- 
- 
-fi
-
- CFLAGS="${CFLAGS} -I${with_afs_incdir}/include"
- AFS_LIBS="${with_afs_libdir}/afs/libkauth.a ${with_afs_libdir}/afs/libprot.a ${with_afs_libdir}/afs/libauth.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/librxkad.a ${with_afs_libdir}/librx.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/libubik.a ${with_afs_libdir}/liblwp.a ${with_afs_libdir}/afs/util.a ${with_afs_libdir}/afs/libcom_err.a"
- if test -f ${with_afs_libdir}/afs/libaudit.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libaudit.a"
- fi
- if test -f /usr/ucblib/libucb.a; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
- else
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_cv_runpath_switch/usr/ucblib"
- fi
-
- AFS_LIBS="$AFS_LIBS -lc -lucb"
- fi
- if test -f ${with_afs_libdir}/afs/libdes.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libdes.a"
- else
- AFS_LIBS="$AFS_LIBS -ldes"
- fi
-
- if ${cyrus_cv_afs_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- SAVE_LIBS="$LIBS"
- LIBS="${with_afs_libdir}/liblwp.a"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AFS libraries need sigvec" >&5
-$as_echo_n "checking if AFS libraries need sigvec... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-IOMGR_Initialize();
-int
-main ()
-{
-IOMGR_Initialize()
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cyrus_cv_afs_sigvec="no"
- 
-else
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- cyrus_cv_afs_sigvec="yes"
- 
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- 
-fi
-
- if test "$cyrus_cv_afs_sigvec" = yes; then
- if test "$cant_find_sigvec" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
-$as_echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
- else
- AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
- 
- 
- 
-$as_echo "@%:@define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- else
- AFS_LIBS="${AFS_LIBS}"
- 
- 
- 
-$as_echo "@%:@define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- LIBS="$SAVE_LIBS"
-fi
-
-LDAP_CPPFLAGS=""
-LDAP_LDFLAGS=""
-LDAP_LIBS=""
-
-if test "x$with_ldap" != "xno"; then
- if test ! -d $with_ldap; then
- with_ldap=/usr/local
- fi
-
- LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
- LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
- LDAP_LIBS=""
-
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS=$LDAP_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
- 
-$as_echo "@%:@define HAVE_LDAP /**/" >>confdefs.h
-
- 
- 
- 
- LDAP_LIBS="-lldap -llber" 
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
- 
-$as_echo "@%:@define HAVE_LDAP /**/" >>confdefs.h
-
- 
- 
- 
- LDAP_LIBS="-lldap -llber" 
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
-fi
- 
-if test "x$enable_afs" = "xyes" -o "x$with_ldap" != "xno"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-
-	
-$as_echo "@%:@define WITH_PTS /**/" >>confdefs.h
-
-fi
-
-
-
-SERVER_SUBDIRS="master imap"
-@%:@ Check whether --enable-server was given.
-if test "${enable_server+set}" = set; then :
- enableval=$enable_server; if test "$enableval" = no; then
- 	SERVER_SUBDIRS=""
-	fi
-fi
-
-
-# We always output a server makefile (just because we can)
-
-
-@%:@ Check whether --with-krb was given.
-if test "${with_krb+set}" = set; then :
- withval=$with_krb; with_krb="$withval"
-else
- with_krb="no"
-fi
-
-
-
-@%:@ Check whether --with-krbimpl was given.
-if test "${with_krbimpl+set}" = set; then :
- withval=$with_krbimpl; with_krbimpl="$withval"
-else
- with_krbimpl="kth"
-fi
-
-
-@%:@ Check whether --enable-statickrb was given.
-if test "${enable_statickrb+set}" = set; then :
- enableval=$enable_statickrb; with_statickrb="yes"
-else
- with_statickrb="no"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
-
-if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
- as_fn_error $? "--enable-statickrb specified but --with-krb did not specify a valid directory" "$LINENO" 5
-fi 
-
-if test "$with_krb" != "no"; then
-
-@%:@ Check whether --with-krbdes was given.
-if test "${with_krbdes+set}" = set; then :
- withval=$with_krbdes; with_krbdes="$withval"
-else
- with_krbdes="yes"
-fi
-
-if test "$with_krbdes" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_ecb_encrypt in -ldes" >&5
-$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
-if ${ac_cv_lib_des_des_ecb_encrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char des_ecb_encrypt ();
-int
-main ()
-{
-return des_ecb_encrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_des_des_ecb_encrypt=yes
-else
- ac_cv_lib_des_des_ecb_encrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
-$as_echo "$ac_cv_lib_des_des_ecb_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_ecb_encrypt" = xyes; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$with_krb/lib/libdes.a"
- else
- KRB_LIBS="-ldes"
- fi
-else
- as_fn_error $? "The Kerberos DES library is required for Kerberos support. You might want --with-auth=unix." "$LINENO" 5
-fi
-
-fi
-fi
-
-if test -d ${with_krb}; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos includes" >&5
-$as_echo_n "checking for Kerberos includes... " >&6; }
-if ${cyrus_cv_krbinclude+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 
- for krbhloc in include/kerberosIV include
- do
- if test -f ${with_krb}/${krbhloc}/krb.h ; then
- cyrus_cv_krbinclude=${with_krb}/${krbhloc}
- break
- fi
- done
- 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_krbinclude" >&5
-$as_echo "$cyrus_cv_krbinclude" >&6; }
-
- if test -n "${cyrus_cv_krbinclude}"; then
- CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
- fi
- 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_krb}/lib $andrew_cv_runpath_switch${with_krb}/lib ${LDFLAGS}"
- fi
-
-fi
-
-if test "$with_krbimpl" != "kth"; then
- KRBLIB="krb4"
-else
- KRBLIB="krb"
-fi
-
-if test "$with_des" != no; then
- ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb_h" = xyes; then :
- as_ac_Lib=`$as_echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_mk_priv in -l${KRBLIB}" >&5
-$as_echo_n "checking for krb_mk_priv in -l${KRBLIB}... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb_mk_priv ();
-int
-main ()
-{
-return krb_mk_priv ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
- else
- KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No DES library found for Kerberos V4 support" >&5
-$as_echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
- krb4=no
-fi
-
-if test "${krb4}" != no; then
- 
-$as_echo "@%:@define HAVE_KRB /**/" >>confdefs.h
-
-fi
-
-LIBS="$KRB_LIBS $LIBS"
-
-SASL_GSSAPI_LIBS_SET="yes"
-
-
-IMAP_PROGS=""
-
-@%:@ Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
- withval=$with_openssl; with_openssl="${withval}"
-fi
-
-
-OPENSSL_INC=
-OPENSSL_LIB=
-case "$with_openssl" in
-	no) with_openssl="no";;
-	""|yes) 
-	 	 LIB_RSAREF=""
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSAPublicEncrypt in -lrsaref" >&5
-$as_echo_n "checking for RSAPublicEncrypt in -lrsaref... " >&6; }
-if ${ac_cv_lib_rsaref_RSAPublicEncrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrsaref $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char RSAPublicEncrypt ();
-int
-main ()
-{
-return RSAPublicEncrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rsaref_RSAPublicEncrypt=yes
-else
- ac_cv_lib_rsaref_RSAPublicEncrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
-$as_echo "$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
-if test "x$ac_cv_lib_rsaref_RSAPublicEncrypt" = xyes; then :
- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
-else
- cmu_have_rsaref=no
-fi
-
-
-		with_openssl="yes"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_accept in -lcrypto" >&5
-$as_echo_n "checking for BIO_accept in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_BIO_accept+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char BIO_accept ();
-int
-main ()
-{
-return BIO_accept ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypto_BIO_accept=yes
-else
- ac_cv_lib_crypto_BIO_accept=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_accept" >&5
-$as_echo "$ac_cv_lib_crypto_BIO_accept" >&6; }
-if test "x$ac_cv_lib_crypto_BIO_accept" = xyes; then :
- LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
-else
- with_openssl="no"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
-$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SSL_CTX_new ();
-int
-main ()
-{
-return SSL_CTX_new ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ssl_SSL_CTX_new=yes
-else
- ac_cv_lib_ssl_SSL_CTX_new=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
- LIBS="-lssl ${LIBS}"
-else
- with_openssl="no"
-fi
-
-		
-		;;
-	*) OPENSSL_INC="-I${with_openssl}/include"
-	 OPENSSL_LIBPATH="${with_openssl}/lib"
-	 OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-	 CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-	 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
- else
-	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_cv_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
- fi
-
-	 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
- else
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_cv_runpath_switch${OPENSSL_LIBPATH}"
- fi
-
-	 LIBS="${LIBS} -lssl -lcrypto";;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openssl" >&5
-$as_echo "$with_openssl" >&6; }
-
-if test "$with_openssl" != "no"; then
-	
-$as_echo "@%:@define HAVE_SSL /**/" >>confdefs.h
-
-	IMAP_PROGS="$IMAP_PROGS tls_prune"
- if test "${krb4}" != no; then
- 
-$as_echo "@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT /**/" >>confdefs.h
-
- 
-$as_echo "@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY /**/" >>confdefs.h
-
- fi
-fi
-
-
-
-
-@%:@ Check whether --with-egd-socket was given.
-if test "${with_egd_socket+set}" = set; then :
- withval=$with_egd_socket; EGD_SOCKET="$withval" 
- 
-fi
-
-if test -n "$EGD_SOCKET" ; then
- 
-cat >>confdefs.h <<_ACEOF
-@%:@define EGD_SOCKET "$EGD_SOCKET"
-_ACEOF
-
-fi
-
-
-@%:@ Check whether --with-lib-subdir was given.
-if test "${with_lib_subdir+set}" = set; then :
- withval=$with_lib_subdir; 
-fi
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- 
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what directory libraries are found in" >&5
-$as_echo_n "checking what directory libraries are found in... " >&6; }
-if ${ac_cv_cmu_lib_subdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-if test "X$with_lib_subdir" = "X" ; then
- ac_cv_cmu_lib_subdir=lib
- if test $ac_cv_sizeof_long -eq 4 ; then
- test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
- fi
- if test $ac_cv_sizeof_long -eq 8 ; then
- test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
- fi
-else
- ac_cv_cmu_lib_subdir=$with_lib_subdir
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmu_lib_subdir" >&5
-$as_echo "$ac_cv_cmu_lib_subdir" >&6; }
-CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-
-
-
-
-
-@%:@ Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
- withval=$with_zlib; with_zlib=$withval
-else
- with_zlib="yes"
-fi
-
-
-	save_CPPFLAGS=$CPPFLAGS
-	save_LDFLAGS=$LDFLAGS
-
-	if test -d $with_zlib; then
-	 CPPFLAGS="${CPPFLAGS} -I${with_lib}/include"
-	 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR $andrew_cv_runpath_switch${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- fi
-
-	fi
-
-ZLIB=""
-case "$with_zlib" in
-	no)
-	 with_zlib="no";;
-	*) 
-	ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
- 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if ${ac_cv_lib_z_deflate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_z_deflate=yes
-else
- ac_cv_lib_z_deflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = xyes; then :
- LIBS="${LIBS} -lz"; with_zlib="yes"
-else
- with_zlib="no"
-fi
-
-else
- with_zlib=no
-fi
-
-
-	;;
-esac
-
-	if test "$with_zlib" != "no"; then
-		
-$as_echo "@%:@define HAVE_ZLIB /**/" >>confdefs.h
-
-		ZLIB="-lz"
-	else
-		CPPFLAGS=$save_CPPFLAGS
-		LDFLAGS=$save_LDFLAGS
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib" >&5
-$as_echo "$with_zlib" >&6; }
-
-
-
-@%:@ Check whether --with-zephyr was given.
-if test "${with_zephyr+set}" = set; then :
- withval=$with_zephyr; with_zephyr="${withval}"
-fi
-
-if test -z "$with_zephyr"; then
- if test -f /usr/local/lib/libzephyr.a; then
-	with_zephyr="/usr/local"
- elif test -f /usr/lib/libzephyr.a; then
- with_zephyr="/usr"
- fi
-fi
-ZEPHYR_LIBS=""
-case "$with_zephyr" in
-	no) true;;
-	""|yes) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZInitialize in -lzephyr" >&5
-$as_echo_n "checking for ZInitialize in -lzephyr... " >&6; }
-if ${ac_cv_lib_zephyr_ZInitialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzephyr $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ZInitialize ();
-int
-main ()
-{
-return ZInitialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_zephyr_ZInitialize=yes
-else
- ac_cv_lib_zephyr_ZInitialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zephyr_ZInitialize" >&5
-$as_echo "$ac_cv_lib_zephyr_ZInitialize" >&6; }
-if test "x$ac_cv_lib_zephyr_ZInitialize" = xyes; then :
- ZEPHYR_LIBS="-lzephyr"
-else
- with_zephyr="no"
-fi
-;;
- *) ZEPHYR_LIBS="-lzephyr";;
-esac
-
-if test "$with_zephyr" != "no"; then
-	
-$as_echo "@%:@define HAVE_ZEPHYR /**/" >>confdefs.h
-
-fi
-
-
-@%:@ Check whether --with-pidfile was given.
-if test "${with_pidfile+set}" = set; then :
- withval=$with_pidfile; MASTERPIDFILE="$withval"
-else
- MASTERPIDFILE="/var/run/cyrus-master.pid"
-fi
-
-MASTERPIDFILE="\"$MASTERPIDFILE\""
-
-cat >>confdefs.h <<_ACEOF
-@%:@define MASTER_PIDFILE $MASTERPIDFILE
-_ACEOF
-
-
-@%:@ Check whether --enable-idled was given.
-if test "${enable_idled+set}" = set; then :
- enableval=$enable_idled; if test "$enable_val" != no; then
-	 IMAP_PROGS="$IMAP_PROGS idled"
- fi
-fi
- 
-
-ENABLE_NNTP=no
-@%:@ Check whether --enable-nntp was given.
-if test "${enable_nntp+set}" = set; then :
- enableval=$enable_nntp; ENABLE_NNTP=$enableval
- if test "$ENABLE_NNTP" != no; then
-	 IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
- fi
-fi
- 
-
-ENABLE_MURDER=no
-@%:@ Check whether --enable-murder was given.
-if test "${enable_murder+set}" = set; then :
- enableval=$enable_murder; ENABLE_MURDER=$enableval
-fi
-
-
-if test "$ENABLE_MURDER" != no; then
-	IMAP_PROGS="$IMAP_PROGS mupdate"
-	# for master/slave auto-selection
-	for ac_header in sys/sockio.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_SOCKIO_H 1
-_ACEOF
- 
-fi
-
-done
-
-fi
-
-ENABLE_REPLICATION=no
-@%:@ Check whether --enable-replication was given.
-if test "${enable_replication+set}" = set; then :
- enableval=$enable_replication; ENABLE_REPLICATION=$enableval
- if test "$ENABLE_REPLICATION" != no; then
-	 IMAP_PROGS="$IMAP_PROGS sync_client sync_server sync_reset"
- fi
-fi
- 
-
-
-
-
-@%:@ Check whether --with-com_err was given.
-if test "${with_com_err+set}" = set; then :
- withval=$with_com_err; 
-fi
-
-if test -z "$with_com_err"; then
-	# no value supplied
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
-$as_echo_n "checking for com_err in -lcom_err... " >&6; }
-if ${ac_cv_lib_com_err_com_err+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcom_err $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char com_err ();
-int
-main ()
-{
-return com_err ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_com_err_com_err=yes
-else
- ac_cv_lib_com_err_com_err=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
-$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = xyes; then :
- 
-		# com_err is already in library path
-		# guess we're okay
-		# can use system com_err
-		with_com_err=""
-		ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
- 
-$as_echo "@%:@define HAVE_ET_COM_ERR_H /**/" >>confdefs.h
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_com_err_h" = xyes; then :
- 
-else
- as_fn_error $? "cannot locate com_err.h" "$LINENO" 5
-fi
-
-
-fi
-
-
-		# Extract the first word of "compile_et", so it can be a program name with args.
-set dummy compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	
-else
- 
-	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-		with_com_err="/usr/local"
-		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
-set dummy /usr/local/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-		with_com_err="/usr"
-		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
-set dummy /usr/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	else
-		# use ours
-		with_com_err=yes
-	fi
-	
-fi
-
-
-	if test "${with_com_err}" = "no"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: com_err is required; included version will be used." >&5
-$as_echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
-	 with_com_err="yes"
-	fi
-	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
-$as_echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will build com_err from included sources." >&5
-$as_echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
-	 with_com_err="yes" # build it ourselves
-	fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COMPILE_ET="../com_err/et/compile_et"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
- ;;
- *) # use whatever they told us, or whatever we found
- COMPILE_ET="${with_com_err}/bin/compile_et"
-esac
-
-if test "$with_com_err" != yes ; then
- TEST1=".cyrus-configure-test-$$"
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- echo "error_table imap" >> $TEST1.et
- echo "ec IMAP_TESTING," >> $TEST1.et
- echo " \"Testing\"" >> $TEST1.et
- echo "end" >> $TEST1.et
- "${COMPILE_ET}" $TEST1.et > /dev/null
- compile_et_ok=no
- if test -f $TEST1.h ; then
-	if test `awk '/IMAP_TESTING/{print $3}' $TEST1.h 2>/dev/null` = "(-1904809472L)" ; then
-	 compile_et_ok=yes
-	fi
-	 fi
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- if test "$compile_et_ok" = no ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It seems $COMPILE_ET is buggy, building our own" >&5
-$as_echo "$as_me: WARNING: It seems $COMPILE_ET is buggy, building our own" >&2;}
-	COMPILE_ET="../com_err/et/compile_et" # build it ourselves
- fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COM_ERR_LIBS="../com_err/et/libcom_err.a"
-	 COM_ERR_LDFLAGS=""
-	 COM_ERR_CPPFLAGS="-I\${top_srcdir}/com_err/et"
-	 PRE_SUBDIRS="com_err/et ${PRE_SUBDIRS}"
-	 EXTRA_OUTPUT="${EXTRA_OUTPUT} com_err/et/Makefile"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
-	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-	# we already set COMPILE_ET, or we didn't get here
-	COM_ERR_LDFLAGS=""
-	COM_ERR_CPPFLAGS=""
- ;;
- *) # use whatever they told us, or whatever we found
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
- # Ever get the feeling people hide this stuff on purpose?
- if test -d "${with_com_err}/include/et" ; then
- COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
- fi
-esac
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern syslog" >&5
-$as_echo_n "checking for modern syslog... " >&6; }
-if ${cyrus_cv_lib_syslog+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <syslog.h>
-#ifndef LOG_LOCAL6
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_lib_syslog=yes
-else
- cyrus_cv_lib_syslog=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-if test $cyrus_cv_lib_syslog = no; then
-	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_lib_syslog" >&5
-$as_echo "$cyrus_cv_lib_syslog" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which syslog facility to use" >&5
-$as_echo_n "checking which syslog facility to use... " >&6; }
-SYSLOG_FACILITY=LOG_LOCAL6
-
-@%:@ Check whether --with-syslogfacility was given.
-if test "${with_syslogfacility+set}" = set; then :
- withval=$with_syslogfacility; if test "$withval" != "yes" -a "$withval" != "no" ; then
- SYSLOG_FACILITY=LOG_$withval
- fi; 
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSLOG_FACILITY" >&5
-$as_echo "$SYSLOG_FACILITY" >&6; }
-
-ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize"
-if test "x$ac_cv_func_getdtablesize" = xyes; then :
- $as_echo "@%:@define HAVE_GETDTABLESIZE 1" >>confdefs.h
-
-else
- case " $LIB@&t@OBJS " in
- *" getdtablesize.$ac_objext "* ) ;;
- *) LIB@&t@OBJS="$LIB@&t@OBJS getdtablesize.$ac_objext"
- ;;
-esac
-
-fi
-
-
-@%:@ Check whether --enable-cmulocal was given.
-if test "${enable_cmulocal+set}" = set; then :
- enableval=$enable_cmulocal; if test "$enableval" = yes; then
-		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-	fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to use old sieve service name" >&5
-$as_echo_n "checking to use old sieve service name... " >&6; }
-@%:@ Check whether --enable-oldsievename was given.
-if test "${enable_oldsievename+set}" = set; then :
- enableval=$enable_oldsievename; if test "$enableval" = yes; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		
-$as_echo "@%:@define OLD_SIEVE_SERVICE_NAME /**/" >>confdefs.h
-
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-@%:@ Check whether --enable-netscapehack was given.
-if test "${enable_netscapehack+set}" = set; then :
- enableval=$enable_netscapehack; if test "$enableval" = yes; then
-		
-$as_echo "@%:@define ENABLE_X_NETSCAPE_HACK /**/" >>confdefs.h
-
-	fi
-fi
-
-
-ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
-else
- ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBDL 1
-_ACEOF
-
- LIBS="-ldl $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
- cmu_have_crypt=yes
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
-else
- cmu_have_crypt=no
-fi
-
-fi
-
-
-
-
-
-@%:@ Check whether --enable-gssapi was given.
-if test "${enable_gssapi+set}" = set; then :
- enableval=$enable_gssapi; gssapi=$enableval
-else
- gssapi=yes
-fi
-
-
-@%:@ Check whether --with-gss_impl was given.
-if test "${with_gss_impl+set}" = set; then :
- withval=$with_gss_impl; gss_impl=$withval
-else
- gss_impl=auto
-fi
-
-
-if test "$gssapi" != no; then
- platform=
- case "${host}" in
- *-*-linux*)
- platform=__linux
- ;;
- *-*-hpux*)
- platform=__hpux
- ;;
- *-*-irix*)
- platform=__irix
- ;;
- *-*-solaris2*)
-# When should we use __sunos?
- platform=__solaris
- ;;
- *-*-aix*)
-###_AIX
- platform=__aix
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
-$as_echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
- if test "$gss_impl" = "cybersafe"; then
- as_fn_error $? "CyberSafe was forced, cannot continue as platform is not supported" "$LINENO" 5
- fi
- ;;
- esac
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
-
- if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-# We want to keep -I in our CPPFLAGS, but only if we succeed
- cmu_saved_CPPFLAGS=$CPPFLAGS
-### I am not sure how useful is this (and whether this is required at all
-### especially when we have to provide two -L flags for new CyberSafe
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
-
- if test -n "$platform"; then
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
- fi
- fi
- fi
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_h" = xyes; then :
- 
-else
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then :
- 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no include files found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-fi
-
-
-fi
-
-
-
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
-fi
-
-if test "$gssapi" != no; then
- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
- 
-$as_echo "@%:@define HAVE_GSSAPI_H /**/" >>confdefs.h
-
- fi
-
- # We need to find out which gssapi implementation we are
- # using. Supported alternatives are: MIT Kerberos 5,
- # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
- # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
- # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
- #
- # The choice is reflected in GSSAPIBASE_LIBS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
- if test -d ${gssapi}; then
- gssapi_dir="${gssapi}/lib"
- GSSAPIBASE_LIBS="-L$gssapi_dir"
- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
- else
- # FIXME: This is only used for building cyrus, and then only as
- # a real hack. it needs to be fixed.
- gssapi_dir="/usr/local/lib"
- fi
-
- # Check a full link against the Heimdal libraries.
- # If this fails, check a full link against the MIT libraries.
- # If this fails, check a full link against the CyberSafe libraries.
- # If this fails, check a full link against the Solaris 8 and up libgss.
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi... " >&6; }
-if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_gss_unwrap" = xyes; then :
- gss_impl="heimdal"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5int_getspecific in -lkrb5support" >&5
-$as_echo_n "checking for krb5int_getspecific in -lkrb5support... " >&6; }
-if ${ac_cv_lib_krb5support_krb5int_getspecific+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5support ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb5int_getspecific ();
-int
-main ()
-{
-return krb5int_getspecific ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_krb5support_krb5int_getspecific=yes
-else
- ac_cv_lib_krb5support_krb5int_getspecific=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
-$as_echo "$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
-if test "x$ac_cv_lib_krb5support_krb5int_getspecific" = xyes; then :
- K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
-fi
-
-
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi_krb5" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi_krb5... " >&6; }
-if ${ac_cv_lib_gssapi_krb5_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_krb5_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_krb5_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_krb5_gss_unwrap" = xyes; then :
- gss_impl="mit"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- # For Cybersafe one has to set a platform define in order to make compilation work
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
- if test -d "${gssapi}/appsec-rt/lib"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
- fi
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
-
- gss_failed=0
-
-# Check for CyberSafe with two libraries first, than fall back to a single 
-# library (older CyberSafe)
-
- unset ac_cv_lib_gss_csf_gss_acq_user
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe03"
-else
- unset ac_cv_lib_gss_csf_gss_acq_user;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe"
-else
- gss_failed=1
-fi
-
-fi
-
-
- if test "$gss_failed" = "1"; then
-# Restore variables
- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
- if test "$gss_impl" != "auto"; then
- gss_impl="failed"
- fi
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgss" >&5
-$as_echo_n "checking for gss_unwrap in -lgss... " >&6; }
-if ${ac_cv_lib_gss_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_gss_unwrap=yes
-else
- ac_cv_lib_gss_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gss_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gss_gss_unwrap" = xyes; then :
- gss_impl="seam"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "mit"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
-# Version of CyberSafe with two libraries
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "seam"; then
- GSSAPIBASE_LIBS=-lgss
- # there is no static libgss on Solaris 8 and up
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "failed"; then
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - specified library not found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
- else
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no library" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
- fi
-fi
-
-#
-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-# in gssapi\rfckrb5.h
-#
-if test "$gssapi" != "no"; then
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_HOSTBASED_SERVICE
- hostbased_service_gss_nt_yes
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_USER_NAME
- user_name_yes_gss_nt
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
- 
-$as_echo "@%:@define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-fi
-
-GSSAPI_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GSSAPI" >&5
-$as_echo_n "checking GSSAPI... " >&6; }
-if test "$gssapi" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: with implementation ${gss_impl}" >&5
-$as_echo "with implementation ${gss_impl}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-fi
-
- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
-
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
- for ac_func in gsskrb5_register_acceptor_identity
-do :
- ac_fn_c_check_func "$LINENO" "gsskrb5_register_acceptor_identity" "ac_cv_func_gsskrb5_register_acceptor_identity"
-if test "x$ac_cv_func_gsskrb5_register_acceptor_identity" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
-_ACEOF
- 
-fi
-done
-
- LIBS="$cmu_save_LIBS"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
-fi
-
-
-
-
-
-
-@%:@ Check whether --with-sasl was given.
-if test "${with_sasl+set}" = set; then :
- withval=$with_sasl; with_sasl="$withval"
-else
- with_sasl="yes"
-fi
-
-
-
-@%:@ Check whether --with-staticsasl was given.
-if test "${with_staticsasl+set}" = set; then :
- withval=$with_staticsasl; with_staticsasl="$withval";
- if test $with_staticsasl != "no"; then
- using_static_sasl="static"
- fi
-else
- with_staticsasl="no"; using_static_sasl="no"
-fi
-
-
-SASLFLAGS=""
-LIB_SASL=""
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-cmu_saved_LDFLAGS=$LDFLAGS
-cmu_saved_LIBS=$LIBS
-
-if test ${with_staticsasl} != "no"; then
- if test -d ${with_staticsasl}; then
- if test -d ${with_staticsasl}/lib64 ; then
- ac_cv_sasl_where_lib=${with_staticsasl}/lib64
- else
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- fi
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- ac_cv_sasl_where_inc=${with_staticsasl}/include
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
- else
- with_staticsasl="/usr"
- fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- for i42 in lib64 lib; do
- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
- ac_cv_found_sasl=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
- fi
- done
- if test ! "$ac_cv_found_sasl" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- as_fn_error $? "Could not find ${with_staticsasl}/lib*/libsasl2.a" "$LINENO" 5
- fi
-fi
-
-
-fi
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-
- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
- else
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
- fi
-fi
-
-if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
- ac_cv_sasl_where_inc=${with_sasl}/include
-
- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
- if test "$ac_cv_sasl_where_lib" != ""; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
- else
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-fi
-
-# be sure to check for a SASLv2 specific function
-ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prop_get in -lsasl2" >&5
-$as_echo_n "checking for prop_get in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_prop_get+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char prop_get ();
-int
-main ()
-{
-return prop_get ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_prop_get=yes
-else
- ac_cv_lib_sasl2_prop_get=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_prop_get" >&5
-$as_echo "$ac_cv_lib_sasl2_prop_get" >&6; }
-if test "x$ac_cv_lib_sasl2_prop_get" = xyes; then :
- ac_cv_found_sasl=yes
-else
- ac_cv_found_sasl=no
-fi
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-
-if test "$ac_cv_found_sasl" = "yes"; then
- if test "$ac_cv_sasl_where_lib" != ""; then
- 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
- else
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
- if test "$using_static_sasl" != "static"; then
- LIB_SASL=$DYNLIB_SASL
- SASLFLAGS=$DYNSASLFLAGS
- fi
-else
- DYNLIB_SASL=""
- DYNSASLFLAGS=""
- using_static_sasl="staticonly"
-fi
-
-if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-fi
-
-LIBS="$cmu_saved_LIBS"
-LDFLAGS="$cmu_saved_LDFLAGS"
-CPPFLAGS="$cmu_saved_CPPFLAGS"
-
-
-
-
-
-
-
-if test "$ac_cv_found_sasl" != "yes"; then
- as_fn_error $? "Cannot continue without libsasl2.
-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." "$LINENO" 5
-fi
-
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sasl/sasl.h>
-
-#ifndef SASL_VERSION_MAJOR
-#error SASL_VERSION_MAJOR not defined
-#endif
-#ifndef SASL_VERSION_MINOR
-#error SASL_VERSION_MINOR not defined
-#endif
-#ifndef SASL_VERSION_STEP
-#error SASL_VERSION_STEP not defined
-#endif
-
-#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
-#error SASL version is less than 2.1.7
-#endif
-
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- 
-else
- as_fn_error $? "Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." "$LINENO" 5
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-CPPFLAGS=$cmu_saved_CPPFLAGS
-
-
-
-cmu_saved_LDFLAGS=$LDFLAGS
-
-LDFLAGS="$LDFLAGS $LIB_SASL"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_checkapop in -lsasl2" >&5
-$as_echo_n "checking for sasl_checkapop in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_sasl_checkapop+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sasl_checkapop ();
-int
-main ()
-{
-return sasl_checkapop ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_sasl_checkapop=yes
-else
- ac_cv_lib_sasl2_sasl_checkapop=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
-$as_echo "$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
-if test "x$ac_cv_lib_sasl2_sasl_checkapop" = xyes; then :
- 
-$as_echo "@%:@define HAVE_APOP /**/" >>confdefs.h
-
-else
- as_fn_error $? "libsasl2 without working sasl_checkapop. Cannot continue." "$LINENO" 5
-fi
-
-
-LDFLAGS=$cmu_saved_LDFLAGS
-
-
-
-@%:@ Check whether --with-perl was given.
-if test "${with_perl+set}" = set; then :
- withval=$with_perl; with_perl="$withval"
-else
- with_perl="perl"
-fi
-
-
-if test "${with_perl}" = yes; then
- with_perl="perl"
-fi
-if test "${with_perl}" != no; then
- if test ${using_static_sasl} = "staticonly"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot compile perl utilities using static libsasl" >&5
-$as_echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
-	with_perl="no"
- else 
-	for ac_prog in ${with_perl} perl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PERL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$PERL"; then
- ac_cv_prog_PERL="$PERL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PERL="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-PERL=$ac_cv_prog_PERL
-if test -n "$PERL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$PERL" && break
-done
-test -n "$PERL" || PERL="with_perl=notfound"
-
- fi
-fi
-if test "$with_perl" = "notfound"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perl not found: Administrative tools won't be available" >&5
-$as_echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
-elif test "${with_perl}" != "no"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
- case "${target_os}" in
- linux*|netbsd*|freebsd*|dragonfly*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
-$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
- eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_CCCDLFLAGS" >&5
-$as_echo "$PERL_CCCDLFLAGS" >&6; }
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&5
-$as_echo "$as_me: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&2;}
- esac
-fi
-
-if test "$sievedir" != "no"; then
-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-
-	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-	PERL_DEPSUBDIRS="sieve"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-else
-	PERL_DEPSUBDIRS="none"
-fi
-
-SNMP_SUBDIRS=""
-
-
-
-
- 
- 
-@%:@ Check whether --with-libwrap was given.
-if test "${with_libwrap+set}" = set; then :
- withval=$with_libwrap; with_libwrap=$withval
-else
- with_libwrap=yes
-fi
-
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for request_init in -lwrap" >&5
-$as_echo_n "checking for request_init in -lwrap... " >&6; }
-if ${ac_cv_lib_wrap_request_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwrap ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char request_init ();
-int
-main ()
-{
-return request_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_wrap_request_init=yes
-else
- ac_cv_lib_wrap_request_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_request_init" >&5
-$as_echo "$ac_cv_lib_wrap_request_init" >&6; }
-if test "x$ac_cv_lib_wrap_request_init" = xyes; then :
- 
-		 ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcpd_h" = xyes; then :
- 
-else
- with_libwrap=no
-fi
-
-
-else
- with_libwrap=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libwrap support" >&5
-$as_echo_n "checking libwrap support... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libwrap" >&5
-$as_echo "$with_libwrap" >&6; }
- LIB_WRAP=""
- if test "$with_libwrap" != no; then
- 
-$as_echo "@%:@define HAVE_LIBWRAP /**/" >>confdefs.h
-
- LIB_WRAP="-lwrap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
-$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_yp_get_default_domain+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char yp_get_default_domain ();
-int
-main ()
-{
-return yp_get_default_domain ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_yp_get_default_domain=yes
-else
- ac_cv_lib_nsl_yp_get_default_domain=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-$as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-if test "x$ac_cv_lib_nsl_yp_get_default_domain" = xyes; then :
- LIB_WRAP="${LIB_WRAP} -lnsl"
-fi
-
- fi
- 
-
-
-
- 
- 
-@%:@ Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then :
- withval=$with_snmp; with_snmp=$withval
-else
- with_snmp=yes
-fi
-
-
- 
-@%:@ Check whether --with-ucdsnmp was given.
-if test "${with_ucdsnmp+set}" = set; then :
- withval=$with_ucdsnmp; with_snmp=$withval
-fi
-
-
-if test "$with_snmp" != "no"; then
-
- if test "$with_snmp" = "yes"; then
- # Extract the first word of "net-snmp-config", so it can be a program name with args.
-set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SNMP_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $SNMP_CONFIG in
- \\/* | ?:\\/*)
- ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/local/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-if test -n "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-$as_echo "$SNMP_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- else
- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
- fi
-
- if test -x "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking NET SNMP libraries" >&5
-$as_echo_n "checking NET SNMP libraries... " >&6; }
-
- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
- LIB_UCDSNMP=$SNMP_LIBS
- 
-$as_echo "@%:@define HAVE_NETSNMP 1" >>confdefs.h
-
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- for ac_header in net-snmp/agent/agent_module_config.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "net-snmp/agent/agent_module_config.h" "ac_cv_header_net_snmp_agent_agent_module_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_net_snmp_agent_agent_module_config_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H 1
-_ACEOF
- 
-fi
-
-done
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
-$as_echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
- fi
- else
- if test "$with_snmp" != no; then
- if test -d "$with_snmp"; then
- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
- LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sprint_objid in -lsnmp" >&5
-$as_echo_n "checking for sprint_objid in -lsnmp... " >&6; }
-if ${ac_cv_lib_snmp_sprint_objid+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sprint_objid ();
-int
-main ()
-{
-return sprint_objid ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_snmp_sprint_objid=yes
-else
- ac_cv_lib_snmp_sprint_objid=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snmp_sprint_objid" >&5
-$as_echo "$ac_cv_lib_snmp_sprint_objid" >&6; }
-if test "x$ac_cv_lib_snmp_sprint_objid" = xyes; then :
- 
- 		 ac_fn_c_check_header_mongrel "$LINENO" "ucd-snmp/version.h" "ac_cv_header_ucd_snmp_version_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucd_snmp_version_h" = xyes; then :
- 
-else
- with_snmp=no
-fi
-
-
-else
- with_snmp=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking UCD SNMP libraries" >&5
-$as_echo_n "checking UCD SNMP libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_snmp" >&5
-$as_echo "$with_snmp" >&6; }
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
- 
-$as_echo "@%:@define HAVE_UCDSNMP 1" >>confdefs.h
-
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmdbOpen in -lrpm" >&5
-$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
-if ${ac_cv_lib_rpm_rpmdbOpen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrpm -lpopt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rpmdbOpen ();
-int
-main ()
-{
-return rpmdbOpen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rpm_rpmdbOpen=yes
-else
- ac_cv_lib_rpm_rpmdbOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
-$as_echo "$ac_cv_lib_rpm_rpmdbOpen" >&6; }
-if test "x$ac_cv_lib_rpm_rpmdbOpen" = xyes; then :
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-fi
-
- fi
- 
- fi
-fi
-
-
-
-# Figure out what directories we're linking against.
-# Lots of fun for the whole family.
-# This probably chokes on anything with spaces in it.
-# All we want is the list of -L directories, and -L may or may not be
-# followed by a space.
-isdir=no
-libpath=""
-#echo "debug ldflags: << ${ldflags} >>"
-#echo "debug default_ldflags: << ${default_ldflags} >>"
-for flag in ${ldflags} ${default_ldflags}; do
- case $flag in
- -L)
- # it's a split -L option, we'll mark the next option as a dir.
- isdir=yes
- ;;
-
- -L*) 
- # attached -L option: split off the directory
- larg=`echo $flag | sed -e 's:-L$..*$:\1:'`
- libpath="${libpath} ${larg}"
- ;;
-
- *)
- if test $isdir = yes ; then
-	libpath="${libpath} ${flag}"
-	isdir=no
- fi
- esac
-done
-
-IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
-	"s/'/'\\\\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
- t end
- s/^$^=*$=$.*$$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
-	 mv -f confcache "$cache_file"$$ &&
-	 mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
-	 mv -f confcache "$cache_file" ;;
-	esac
- fi
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIB@&t@OBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in @%:@(
- *posix*) :
- set -o posix ;; @%:@(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in @%:@(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in @%:@((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-@%:@ as_fn_error STATUS ERROR LINENO LOG_FD
-@%:@ ----------------------------------------
-@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} @%:@ as_fn_error
-
-
-@%:@ as_fn_set_status STATUS
-@%:@ -----------------------
-@%:@ Set @S|@? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} @%:@ as_fn_set_status
-
-@%:@ as_fn_exit STATUS
-@%:@ -----------------
-@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} @%:@ as_fn_exit
-
-@%:@ as_fn_unset VAR
-@%:@ ---------------
-@%:@ Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-@%:@ as_fn_append VAR VALUE
-@%:@ ----------------------
-@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-@%:@ advantage of any shell optimizations that allow amortized linear growth over
-@%:@ repeated appends, instead of the typical quadratic growth present in naive
-@%:@ implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-@%:@ as_fn_arith ARG...
-@%:@ ------------------
-@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across @S|@(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-@%:@ as_fn_mkdir_p
-@%:@ -------------
-@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} @%:@ as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in @%:@(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 OPTION... TAG...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE:TEMPLATE 
- instantiate the configuration file FILE
- --header=FILE:TEMPLATE 
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=?*)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=`expr "X$1" : 'X^=*=$.*$'`
- ac_shift=:
- ;;
- --*=)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
-
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
- ac_need_defaults=false ;;
-
- esac
- shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- export CONFIG_SHELL
- exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-@%:@@%:@ Running $as_me. @%:@@%:@
-_ASBOX
- $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
- "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
- "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
- "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
- "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
- "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
- "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
- "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp= ac_tmp=
- trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
- trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S"/; s/!.*/"=/
-p
-g
-s/^^!*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$..*/\1/
-t more1
-s/"\\/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$..*/\1/
-t more2
-s/"\\/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^^""/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_setkey = 1
- FS = "&#x7;"
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field1)
- for (i = 2; i < nfields; i++) {
- key = fieldi
- keylen = length(key)
- if (S_is_setkey) {
- value = Skey
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field++i)
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^	 *VPATH	 *=	 */{
-h
-s///
-s/^/:/
-s/	 *$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/$=	 *$.*/\1/
-G
-s/\n//
-s/^^=*=	 *$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=_$as_cr_Letters_$as_cr_alnum*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^	 *#	 *define	 	 */ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3"/p
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2"/p
-d
-:bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_setkey = 1
- FS = "&#x7;"
-}
-/^\t *#\t *(define|undef)\t +$ac_word_re(\t (|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg1 == "#") {
- defundef = arg2
- mac1 = arg3
- } else {
- defundef = substr(arg1, 2)
- mac1 = arg2
- }
- split(mac1, mac2, "(") #)
- macro = mac21
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_setmacro) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro Pmacro Dmacro
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
-shift
-for ac_tag
-do
- case $ac_tag in
- :FHLC) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :FHL*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- :FH-) ac_tag=-:-;;
- :FH*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
-
- case $ac_mode in
- :L) ac_source=$1;;
- :FH)
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute). The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	 case $ac_f in
-	 \\/$*) false;;
-	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input='Generated from '`
-	 $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
-	`' by configure.'
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
- fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/\\\\&|/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
-
- case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
-
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$ac_file" : 'X$//$^/' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- \\/$* | ?:\\/* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@a-zA-Z_a-zA-Z_0-9*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
-
- rm -f "$ac_tmp/stdin"
- case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
- fi
- ;;
- 
- 
- esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-

cyrus-imapd-2.4.17.tar.gz/autom4te.cache/requests Deleted

@@ -1,174 +0,0 @@
-# This file was generated.
-# It contains the lists of macros which have been traced.
-# It can be safely removed.
-
-@request = (
-             bless( 
-                      '0',
-                      1,
-                      
-                        '/usr/share/autoconf'
-                      ,
-                      
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'cmulocal/afs.m4',
-                        'cmulocal/berkdb.m4',
-                        'cmulocal/bsd_sockets.m4',
-                        'cmulocal/c-attribute.m4',
-                        'cmulocal/c-fpic.m4',
-                        'cmulocal/common.m4',
-                        'cmulocal/cyrus.m4',
-                        'cmulocal/ipv6.m4',
-                        'cmulocal/kerberos_v4.m4',
-                        'cmulocal/libssl.m4',
-                        'cmulocal/libwrap.m4',
-                        'cmulocal/sasl2.m4',
-                        'cmulocal/sql.m4',
-                        'cmulocal/ucdsnmp.m4',
-                        'cmulocal/zlib.m4',
-                        'configure.in'
-                      ,
-                      {
-                        'CMU_KRB_RD_REQ_PROTO' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'CMU_USE_DB' => 1,
-                        'CMU_DB_LIB_WHERE' => 1,
-                        'CMU_FIND_LIB_SUBDIR' => 1,
-                        'AC_DEFUN' => 1,
-                        'CYRUS_PGSQL_CHK_LIB' => 1,
-                        'CMU_SOCKETS' => 1,
-                        'CMU_LIBSSL_LIB_WHERE1' => 1,
-                        'CMU_ADD_LIBPATH_TO' => 1,
-                        'CMU_DB3_LIB_WHERE1' => 1,
-                        'CMU_KRB4_32_DEFN' => 1,
-                        '_m4_warn' => 1,
-                        'CMU_AFS_LIB_WHERE1' => 1,
-                        'CMU_LIBSSL_LIB_WHERE' => 1,
-                        'CMU_SASL2_REQUIRED' => 1,
-                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-                        'CYRUS_PGSQL_OPTS' => 1,
-                        'CMU_HAVE_ZLIB' => 1,
-                        'CMU_TEST_LIBPATH' => 1,
-                        'CMU_SASL2_REQUIRE_VER' => 1,
-                        'CMU_KRB_INC_WHERE' => 1,
-                        'CMU_AFS_INC_WHERE1' => 1,
-                        'CMU_LIBSSL_INC_WHERE' => 1,
-                        'IPv6_CHECK_FUNC' => 1,
-                        'CYRUS_SQLITE_OPTS' => 1,
-                        'SASL2_CRYPT_CHK' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'CMU_KRB_SET_KEY_PROTO' => 1,
-                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
-                        'CMU_KRB_INC_WHERE1' => 1,
-                        'CYRUS_MYSQL_CHK' => 1,
-                        'CYRUS_BERKELEY_DB_OPTS' => 1,
-                        'AU_DEFUN' => 1,
-                        'IPv6_CHECK_SOCKLEN_T' => 1,
-                        'CMU_AFS' => 1,
-                        'CMU_LIBSSL' => 1,
-                        'IPv6_CHECK_SA_LEN' => 1,
-                        'CYRUS_MYSQL_OPTS' => 1,
-                        'CMU_DB_INC_WHERE' => 1,
-                        'CMU_UCDSNMP' => 1,
-                        'CMU_DB4_LIB_WHERE1' => 1,
-                        'SASL_SET_GSSAPI_LIBS' => 1,
-                        'CYRUS_SQLITE_CHK' => 1,
-                        'IPv6_CHECK_SS_FAMILY' => 1,
-                        'CMU_KRB_LIB_WHERE' => 1,
-                        'CMU_KRB_SENDAUTH_PROTO' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'CMU_SASL2' => 1,
-                        'CMU_AFS_WHERE' => 1,
-                        'CMU_LIBSSL_INC_WHERE1' => 1,
-                        'CMU_DB_INC_WHERE1' => 1,
-                        'CMU_C___ATTRIBUTE__' => 1,
-                        'CMU_LIBWRAP' => 1,
-                        'include' => 1,
-                        'CYRUS_MYSQL_CHK_LIB' => 1,
-                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
-                        'CMU_KRB_LIB_WHERE1' => 1,
-                        'CMU_C_FPIC' => 1,
-                        'CMU_TEST_INCPATH' => 1,
-                        'CMU_ADD_LIBPATH' => 1,
-                        'CMU_KRB4' => 1,
-                        'SASL_GSSAPI_CHK' => 1,
-                        'CMU_CHECK_HEADER_NOCACHE' => 1,
-                        'CYRUS_BERKELEY_DB_CHK' => 1,
-                        'CYRUS_PGSQL_CHK' => 1,
-                        'm4_include' => 1,
-                        'CMU_NEEDS_AFS' => 1,
-                        'CYRUS_SQLITE_CHK_LIB' => 1
-                      }
-                    , 'Autom4te::Request' ),
-             bless( 
-                      '1',
-                      1,
-                      
-                        '/usr/share/autoconf'
-                      ,
-                      
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        'configure.in'
-                      ,
-                      {
-                        'AM_PROG_F77_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'm4_sinclude' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'LT_INIT' => 1,
-                        'include' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'm4_include' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_SUBST_TRACE' => 1
-                      }
-                    , 'Autom4te::Request' )
-           );
-

cyrus-imapd-2.4.17.tar.gz/autom4te.cache/traces.0 Deleted

@@ -1,2569 +0,0 @@
-m4trace:cmulocal/afs.m4:8: -1- AC_DEFUN(CMU_AFS_INC_WHERE1, 
-cmu_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$cmu_save_CPPFLAGS -I$1"
-AC_TRY_COMPILE(#include <afs/param.h>,
-#ifndef SYS_NAME
-choke me
-#endif
-int foo;,
-ac_cv_found_afs_inc=yes,
-ac_cv_found_afs_inc=no)
-CPPFLAGS=$cmu_save_CPPFLAGS
-)
-m4trace:cmulocal/afs.m4:21: -1- AC_DEFUN(CMU_AFS_LIB_WHERE1, 
-save_LIBS="$LIBS"
-save_LDFLAGS="$LDFLAGS"
-
-LIBS="-lauth $1/afs/util.a $LIB_SOCKET $LIBS"
-LDFLAGS="-L$1 -L$1/afs $LDFLAGS"
-dnl suppress caching
-AC_TRY_LINK(,afsconf_Open();, ac_cv_found_afs_lib=yes, ac_cv_found_afs_lib=no)
-LIBS="$save_LIBS"
-LDFLAGS="$save_LDFLAGS"
-)
-m4trace:cmulocal/afs.m4:33: -1- AC_DEFUN(CMU_AFS_WHERE, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
- for i in $1; do
- AC_MSG_CHECKING(for AFS in $i)
- CMU_AFS_INC_WHERE1("$i/include")
- ac_cv_found_lwp_inc=$ac_cv_found_afs_inc
- CMU_TEST_INCPATH($i/include, lwp) 
- ac_cv_found_afs_inc=$ac_cv_found_lwp_inc
- if test "$ac_cv_found_afs_inc" = "yes"; then
- CMU_AFS_LIB_WHERE1("$i/$CMU_LIB_SUBDIR")
- if test "$ac_cv_found_afs_lib" = "yes"; then
- ac_cv_afs_where=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/afs.m4:56: -1- AC_DEFUN(CMU_AFS, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
-AC_REQUIRE(CMU_SOCKETS)
-AC_REQUIRE(CMU_LIBSSL)
-AC_ARG_WITH(AFS,
-	 --with-afs=PREFIX Compile with AFS support,
-	if test "X$with_AFS" = "X"; then
-		with_AFS=yes
-	fi)
-
-	if test "X$with_AFS" != "X"; then
-	 ac_cv_afs_where=$with_AFS
-	fi
-	if test "X$ac_cv_afs_where" = "X"; then
-	 CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
-	fi
-
-	AC_MSG_CHECKING(whether to include AFS)
-	if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
-	 ac_cv_found_afs=no
-	 AC_MSG_RESULT(no)
-	else
-	 ac_cv_found_afs=yes
-	 AC_MSG_RESULT(yes)
-	 AFS_INC_DIR="$ac_cv_afs_where/include"
-	 AFS_LIB_DIR="$ac_cv_afs_where/$CMU_LIB_SUBDIR"
-	 AFS_TOP_DIR="$ac_cv_afs_where"
-	 AFS_INC_FLAGS="-I${AFS_INC_DIR}"
- AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs"
- cmu_save_LIBS="$LIBS"
- cmu_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}"
-	 cmu_save_LDFLAGS="$LDFLAGS"
- 	 LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
- 
- AC_CHECK_HEADERS(afs/stds.h)
-
- AC_MSG_CHECKING(if libdes is needed)
- AC_TRY_LINK(,des_quad_cksum();,AFS_DES_LIB="",AFS_DES_LIB="maybe")
- if test "X$AFS_DES_LIB" != "X"; then
- LIBS="$cmu_save_LIBS -ldes"
- AC_TRY_LINK(, des_quad_cksum();,AFS_DES_LIB="yes")
- if test "X$AFS_DES_LIB" = "Xyes"; then
- AC_MSG_RESULT(yes)
- 	 AFS_LIBDES="-ldes"
- 	 AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
- 	 else
- 	 LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
- 	 AC_TRY_LINK(,
-	 des_quad_cksum();,AFS_DES_LIB="libcrypto")
-	 if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
-	 AC_MSG_RESULT(libcrypto)
-		 AFS_LIBDES="$LIBSSL_LIB_FLAGS"
-	 AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
- 	 else
- 	 LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
- 	 AC_TRY_LINK(,
-	 des_quad_cksum();,AFS_DES_LIB="libcrypto+descompat")
-	 if test "X$AFS_DES_LIB" = "Xlibcrypto+descompat"; then
-	 AC_MSG_RESULT(libcrypto+descompat)
-		 AFS_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-	 AFS_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-	 else
- 	 AC_MSG_RESULT(unknown)
-	 AC_MSG_ERROR(Could not use -ldes)
-	 fi 
-	 fi 
-	 fi 
-	 else
- AC_MSG_RESULT(no)
- fi
-
-
-	 AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
- AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
-	 AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
-	 AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
- AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a"
-
- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
- AC_CHECK_FUNC(des_pcbc_init)
- if test "X$ac_cv_func_des_pcbc_init" != "Xyes"; then
- AC_CHECK_LIB(descompat, des_pcbc_init, AFS_DESCOMPAT_LIB="-ldescompat")
- if test "X$AFS_DESCOMPAT_LIB" != "X" ; then
- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_DESCOMPAT_LIB"
- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_DESCOMPAT_LIB"
- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_DESCOMPAT_LIB"
- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_DESCOMPAT_LIB"
- else
-
- AC_MSG_CHECKING(if rxkad needs des_pcbc_init)
- AC_TRY_LINK(,tkt_DecodeTicket();,RXKAD_PROBLEM=no,RXKAD_PROBLEM=maybe)
- if test "$RXKAD_PROBLEM" = "maybe"; then
- AC_TRY_LINK(int des_pcbc_init() { return 0;},
- tkt_DecodeTicket();,RXKAD_PROBLEM=yes,RXKAD_PROBLEM=error)
- if test "$RXKAD_PROBLEM" = "yes"; then
- AC_MSG_RESULT(yes)
- AC_MSG_ERROR(cannot use rxkad)
- else
- AC_MSG_RESULT(unknown) 
- AC_MSG_ERROR(Unknown error testing rxkad)
- fi
- else
- AC_MSG_RESULT(no)
- fi
- fi
- fi
-
- LIBS="$cmu_save_LIBS"
- AC_CHECK_FUNC(flock)
- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
- if test "X$ac_cv_func_flock" != "Xyes"; then
- AC_MSG_CHECKING(if AFS needs flock)
- AC_TRY_LINK(#include <afs/param.h>
-#ifdef HAVE_AFS_STDS_H
-#include <afs/stds.h>
-#endif
-#include <ubik.h>
-#include <afs/cellconfig.h>
-#include <afs/auth.h>
-#include <afs/volser.h>
-struct ubik_client * cstruct;
-int sigvec() {return 0;}
-extern int UV_SetSecurity();,
- vsu_ClientInit(1,"","",0,
- &cstruct,UV_SetSecurity),
- AFS_FLOCK=no,AFS_FLOCK=yes)
- if test $AFS_FLOCK = "no"; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- LDFLAGS="$LDFLAGS -L/usr/ucblib"
- AC_CHECK_LIB(ucb, flock,:, AC_CHECK_LIB(BSD, flock))
- fi
- fi
- LIBS="$cmu_save_LIBS"
- AC_CHECK_FUNC(sigvec)
- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
- if test "X$ac_cv_func_sigvec" != "Xyes"; then
- AC_MSG_CHECKING(if AFS needs sigvec)
- AC_TRY_LINK(#include <afs/param.h>
-#ifdef HAVE_AFS_STDS_H
-#include <afs/stds.h>
-#endif
-#include <ubik.h>
-#include <afs/cellconfig.h>
-#include <afs/auth.h>
-#include <afs/volser.h>
-struct ubik_client * cstruct;
-int flock() {return 0;}
-extern int UV_SetSecurity();,
- vsu_ClientInit(1,"","",0,
- &cstruct,UV_SetSecurity),
- AFS_SIGVEC=no,AFS_SIGVEC=yes)
- if test $AFS_SIGVEC = "no"; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- LDFLAGS="$LDFLAGS -L/usr/ucblib"
- AC_CHECK_LIB(ucb, sigvec,:,AC_CHECK_LIB(BSD, sigvec))
- fi
- fi
- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
- AFS_LIB_FLAGS="${AFS_LIB_FLAGS} -L/usr/ucblib -R/usr/ucblib"
- fi
- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
- AFS_BSD_LIB="-lucb"
- elif test "$ac_cv_lib_BSD_flock" = "yes" -o "$ac_cv_lib_BSD_sigvec" = "yes"; then
- AFS_BSD_LIB="-lBSD"
- fi
- if test "X$AFS_BSD_LIB" != "X" ; then
- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_BSD_LIB"
- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_BSD_LIB"
- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
- AFS_RX_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_BSD_LIB"
- fi
-
- AC_MSG_CHECKING(if libaudit is needed)
-	 AFS_LIBAUDIT=""
- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
- AC_TRY_LINK(#include <afs/param.h>
-#ifdef HAVE_AFS_STDS_H
-#include <afs/stds.h>
-#endif
-#include <afs/cellconfig.h>
-#include <afs/auth.h>,
- afsconf_SuperUser();,AFS_AUDIT_LIB="",AFS_AUDIT_LIB="maybe")
- if test "X$AFS_AUDIT_LIB" != "X"; then
- LIBS="$cmu_save_LIBS -lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB $LIB_SOCKET"
- AC_TRY_LINK(#include <afs/param.h>
-#ifdef HAVE_AFS_STDS_H
-#include <afs/stds.h>
-#endif
-#include <afs/cellconfig.h>
-#include <afs/auth.h>,
- afsconf_SuperUser();,AFS_AUDIT_LIB="yes")
- if test "X$AFS_AUDIT_LIB" = "Xyes"; then
- AC_MSG_RESULT(yes)
-	 AFS_LIBAUDIT="-laudit"
-	 AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
- AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
- AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
- else
- AC_MSG_RESULT(unknown)
- AC_MSG_ERROR(Could not use -lauth while testing for -laudit)
- fi 
- else
- AC_MSG_RESULT(no)
- fi
-
-	 AC_CHECK_FUNCS(VL_ProbeServer)
- AC_MSG_CHECKING(if new-style afs_ integer types are defined)
- AC_CACHE_VAL(ac_cv_afs_int32,
-dnl The next few lines contain a quoted argument to egrep
-dnl It is critical that there be no leading or trailing whitespace
-dnl or newlines
-AC_EGREP_CPP(dnl
-changequote(<<,>>)dnl
-<<(^|^a-zA-Z_0-9)afs_int32^a-zA-Z_0-9>>dnl
-changequote(,), #include <afs/param.h>
-#ifdef HAVE_AFS_STDS_H
-#include <afs/stds.h>
-#endif,
-ac_cv_afs_int32=yes, ac_cv_afs_int32=no))
- AC_MSG_RESULT($ac_cv_afs_int32)
- if test $ac_cv_afs_int32 = yes ; then
- AC_DEFINE(HAVE_AFS_INT32,, AFS provides new "unambiguous" type names)
- else
- AC_DEFINE(afs_int16, int16, it's a type definition)
- AC_DEFINE(afs_int32, int32, it's a type definition)
- AC_DEFINE(afs_uint16, u_int16, it's a type definition)
- AC_DEFINE(afs_uint32, u_int32, it's a type definition)
- fi
-
- CPPFLAGS="${cmu_save_CPPFLAGS}"
- LDFLAGS="${cmu_save_LDFLAGS}"
- LIBS="${cmu_save_LIBS}"
-	 AC_DEFINE(AFS_ENV,, Use AFS. (find what needs this and nuke it))
- AC_DEFINE(AFS,, Use AFS. (find what needs this and nuke it))
- AC_SUBST(AFS_CLIENT_LIBS_STATIC)
- AC_SUBST(AFS_KTC_LIBS_STATIC)
- AC_SUBST(AFS_CLIENT_LIBS)
- AC_SUBST(AFS_RX_LIBS)
- AC_SUBST(AFS_KTC_LIBS)
- AC_SUBST(AFS_INC_FLAGS)
- AC_SUBST(AFS_LIB_FLAGS)
-	 AC_SUBST(AFS_TOP_DIR)
-	 AC_SUBST(AFS_LIBAUDIT)
-	 AC_SUBST(AFS_LIBDES)
- AC_SUBST(AFS_LIBDESA)
- 	fi
-	)
-m4trace:cmulocal/afs.m4:310: -1- AC_DEFUN(CMU_NEEDS_AFS, AC_REQUIRE(CMU_AFS)
-if test "$ac_cv_found_afs" != "yes"; then
- AC_ERROR(Cannot continue without AFS)
-fi)
-m4trace:cmulocal/berkdb.m4:3: -1- AC_DEFUN(CMU_DB_INC_WHERE1, 
-saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$saved_CPPFLAGS -I$1"
-AC_TRY_COMPILE(#include <db.h>,
-DB *db;
-db_create(&db, NULL, 0);
-db->open(db, "foo.db", NULL, DB_UNKNOWN, DB_RDONLY, 0644);,
-ac_cv_found_db_inc=yes,
-ac_cv_found_db_inc=no)
-CPPFLAGS=$saved_CPPFLAGS
-)
-m4trace:cmulocal/berkdb.m4:15: -1- AC_DEFUN(CMU_DB_INC_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for db headers in $i)
- CMU_DB_INC_WHERE1($i)
- CMU_TEST_INCPATH($i, db)
- if test "$ac_cv_found_db_inc" = "yes"; then
- ac_cv_db_where_inc=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/berkdb.m4:34: -1- AC_DEFUN(CMU_DB3_LIB_WHERE1, 
-AC_REQUIRE(CMU_AFS)
-AC_REQUIRE(CMU_KRB4)
-saved_LIBS=$LIBS
- LIBS="$saved_LIBS -L$1 -ldb-3"
-AC_TRY_LINK(#include <db.h>,
-db_env_create(NULL, 0);,
-ac_cv_found_db_3_lib=yes,
-ac_cv_found_db_3_lib=no)
-LIBS=$saved_LIBS
-)
-m4trace:cmulocal/berkdb.m4:45: -1- AC_DEFUN(CMU_DB4_LIB_WHERE1, 
-AC_REQUIRE(CMU_AFS)
-AC_REQUIRE(CMU_KRB4)
-saved_LIBS=$LIBS
-LIBS="$saved_LIBS -L$1 -ldb-4"
-AC_TRY_LINK(#include <db.h>,
-db_env_create(NULL, 0);,
-ac_cv_found_db_4_lib=yes,
-ac_cv_found_db_4_lib=no)
-LIBS=$saved_LIBS
-)
-m4trace:cmulocal/berkdb.m4:57: -1- AC_DEFUN(CMU_DB_LIB_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for db libraries in $i)
-if test "$enable_db4" = "yes"; then
- CMU_DB4_LIB_WHERE1($i)
- CMU_TEST_LIBPATH($i, db-4)
- ac_cv_found_db_lib=$ac_cv_found_db_4_lib
-else
- CMU_DB3_LIB_WHERE1($i)
- CMU_TEST_LIBPATH($i, db-3)
- ac_cv_found_db_lib=$ac_cv_found_db_3_lib
-fi
- if test "$ac_cv_found_db_lib" = "yes" ; then
- ac_cv_db_where_lib=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/berkdb.m4:79: -1- AC_DEFUN(CMU_USE_DB, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
-AC_ARG_WITH(db,
-	 --with-db=PREFIX Compile with db support,
-	if test "X$with_db" = "X"; then
-		with_db=yes
-	fi)
-AC_ARG_WITH(db-lib,
-	 --with-db-lib=dir use db libraries in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-db-lib)
-	fi)
-AC_ARG_WITH(db-include,
-	 --with-db-include=dir use db headers in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-db-include)
-	fi)
-AC_ARG_ENABLE(db4,
-	 --enable-db4 use db 4.x libraries)
-	
-	if test "X$with_db" != "X"; then
-	 if test "$with_db" != "yes"; then
-	 ac_cv_db_where_lib=$with_db/$CMU_LIB_SUBDIR
-	 ac_cv_db_where_inc=$with_db/include
-	 fi
-	fi
-
-	if test "X$with_db_lib" != "X"; then
-	 ac_cv_db_where_lib=$with_db_lib
-	fi
-	if test "X$ac_cv_db_where_lib" = "X"; then
-	 CMU_DB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR)
-	fi
-
-	if test "X$with_db_include" != "X"; then
-	 ac_cv_db_where_inc=$with_db_include
-	fi
-	if test "X$ac_cv_db_where_inc" = "X"; then
-	 CMU_DB_INC_WHERE(/usr/athena/include /usr/local/include)
-	fi
-
-	AC_MSG_CHECKING(whether to include db)
-	if test "X$ac_cv_db_where_lib" = "X" -o "X$ac_cv_db_where_inc" = "X"; then
-	 ac_cv_found_db=no
-	 AC_MSG_RESULT(no)
-	else
-	 ac_cv_found_db=yes
-	 AC_MSG_RESULT(yes)
-	 DB_INC_DIR=$ac_cv_db_where_inc
-	 DB_LIB_DIR=$ac_cv_db_where_lib
-	 DB_INC_FLAGS="-I${DB_INC_DIR}"
- if test "$enable_db4" = "yes"; then
-	 DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-4"
- else
-	 DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-3"
- fi
- dnl Do not force configure.in to put these in CFLAGS and LIBS unconditionally
- dnl Allow makefile substitutions....
- AC_SUBST(DB_INC_FLAGS)
- AC_SUBST(DB_LIB_FLAGS)
-	 if test "X$RPATH" = "X"; then
-		RPATH=""
-	 fi
-	 case "${host}" in
-	 *-*-linux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${DB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${DB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-hpux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,+b${DB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${DB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-irix*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${DB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${DB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-solaris2*)
-	 if test "$ac_cv_prog_gcc" = yes; then
-		if test "X$RPATH" = "X"; then
-		 RPATH="-Wl,-R${DB_LIB_DIR}"
-		else 
-		 RPATH="${RPATH}:${DB_LIB_DIR}"
-		fi
-	 else
-	 RPATH="${RPATH} -R${DB_LIB_DIR}"
-	 fi
-	 ;;
-	 esac
-	 AC_SUBST(RPATH)
-	fi
-	)
-m4trace:cmulocal/berkdb.m4:204: -1- AC_DEFUN(CYRUS_BERKELEY_DB_CHK_LIB, 
-	BDB_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_bdb_lib; then
-	 CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
-	 CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
-	else
-	 BDB_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
-	 for dbname in ${with_bdb} \
-	 db-4.8 db4.8 db48 \
-	 db-4.7 db4.7 db47 \
-	 db-4.6 db4.6 db46 \
-	 db-4.5 db4.5 db45 \
-	 db-4.4 db4.4 db44 \
-	 db-4.3 db4.3 db43 \
-	 db-4.2 db4.2 db42 \
-	 db-4.1 db4.1 db41 \
-	 db-4.0 db4.0 db40 db-4 db4 \
-	 db-3.3 db3.3 db33 \
-	 db-3.2 db3.2 db32 \
-	 db-3.1 db3.1 db31 \
-	 db-3.0 db3.0 db30 db-3 db3 \
-	 db
-	 do
-	 LIBS="$saved_LIBS -l$dbname"
-	 AC_TRY_LINK(#include <stdio.h>
-#include <db.h>,
-	 db_create(NULL, NULL, 0);,
-	 BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
- dblib="no")
-	 if test "$dblib" = "berkeley"; then break; fi
- done
- if test "$dblib" = "no"; then
-	 LIBS="$saved_LIBS -ldb"
-	 AC_TRY_LINK(#include <stdio.h>
-#include <db.h>,
-	 db_open(NULL, 0, 0, 0, NULL, NULL, NULL);,
-	 BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
- dblib="no")
- fi
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$BDB_SAVE_LDFLAGS
-)
-m4trace:cmulocal/berkdb.m4:253: -1- AC_DEFUN(CYRUS_BERKELEY_DB_OPTS, 
-AC_ARG_WITH(bdb-libdir,
-	 --with-bdb-libdir=DIR Berkeley DB lib files are in DIR,
-	with_bdb_lib=$withval,
-	 test "${with_bdb_lib+set}" = set || with_bdb_lib=none)
-AC_ARG_WITH(bdb-incdir,
-	 --with-bdb-incdir=DIR Berkeley DB include files are in DIR,
-	with_bdb_inc=$withval,
-	 test "${with_bdb_inc+set}" = set || with_bdb_inc=none )
-)
-m4trace:cmulocal/berkdb.m4:265: -1- AC_DEFUN(CYRUS_BERKELEY_DB_CHK, 
-	AC_REQUIRE(CYRUS_BERKELEY_DB_OPTS)
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_bdb_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-	 BDB_INCADD="-I$with_bdb_inc"
-	else
-	 BDB_INCADD=""
-	fi
-
-	dnl Note that FreeBSD puts it in a wierd place
- dnl (but they should use with-bdb-incdir)
- AC_CHECK_HEADER(db.h,
- CYRUS_BERKELEY_DB_CHK_LIB(),
- dblib="no")
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-)
-m4trace:cmulocal/bsd_sockets.m4:9: -1- AC_DEFUN(CMU_SOCKETS, 
-	save_LIBS="$LIBS"
-	LIB_SOCKET=""
-	AC_CHECK_FUNC(connect, :,
-		AC_CHECK_LIB(nsl, gethostbyname,
-			 LIB_SOCKET="-lnsl $LIB_SOCKET")
-		AC_CHECK_LIB(socket, connect,
-			 LIB_SOCKET="-lsocket $LIB_SOCKET")
-	)
-	LIBS="$LIB_SOCKET $save_LIBS"
-	AC_CHECK_FUNC(res_search, :,
-		LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-		AC_TRY_LINK(
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
-#include <resolv.h>,
-const char host12="openafs.org";
-u_char ans1024;
-res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-return 0;
-, LIB_SOCKET="-lresolv $LIB_SOCKET")
- )
-	LIBS="$LIB_SOCKET $save_LIBS"
-	AC_CHECK_FUNCS(dn_expand dns_lookup)
-	LIBS="$save_LIBS"
-	AC_SUBST(LIB_SOCKET)
-	)
-m4trace:cmulocal/c-attribute.m4:9: -1- AC_DEFUN(CMU_C___ATTRIBUTE__, 
-AC_MSG_CHECKING(for __attribute__)
-AC_CACHE_VAL(ac_cv___attribute__, 
-AC_TRY_COMPILE(
-#include <stdlib.h>
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
- exit(1);
-}
-,
-
-,
-ac_cv___attribute__=yes,
-ac_cv___attribute__=no))
-if test "$ac_cv___attribute__" = "yes"; then
- AC_DEFINE(HAVE___ATTRIBUTE__, 1, define if your compiler has __attribute__)
-fi
-AC_MSG_RESULT($ac_cv___attribute__)
-)
-m4trace:cmulocal/c-fpic.m4:9: -1- AC_DEFUN(CMU_C_FPIC, 
-AC_MSG_CHECKING(if compiler supports -fPIC)
-AC_CACHE_VAL(ac_cv_fpic, 
-save_CFLAGS=$CFLAGS
-CFLAGS="${CFLAGS} -fPIC"
-AC_TRY_COMPILE(
-#include <stdlib.h>
-static void
-foo(void)
-{
- exit(1);
-}
-,
-
-,
-ac_cv_fpic=yes,
-ac_cv_fpic=no)
-CFLAGS=$save_CFLAGS
-)
-if test "$ac_cv_fpic" = "yes"; then
- FPIC_CFLAGS="-fPIC"
-else
- FPIC_CFLAGS=""
-fi
-AC_MSG_RESULT($ac_cv_fpic)
-)
-m4trace:cmulocal/common.m4:3: -1- AC_DEFUN(CMU_TEST_LIBPATH, 
-changequote(<<, >>)
-define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_lib, <<- *>>, <<__p>>))
-changequote(, )
-if test "$CMU_AC_CV_FOUND" = "yes"; then
- if test \! -r "$1/lib$2.a" -a \! -r "$1/lib$2.so" -a \! -r "$1/lib$2.sl" -a \! -r "$1/lib$2.dylib"; then
- CMU_AC_CV_FOUND=no
- fi
-fi
-)
-m4trace:cmulocal/common.m4:14: -1- AC_DEFUN(CMU_TEST_INCPATH, 
-changequote(<<, >>)
-define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_inc, *, _p))
-changequote(, )
-if test "$CMU_AC_CV_FOUND" = "yes"; then
- if test \! -r "$1/$2.h"; then
- CMU_AC_CV_FOUND=no
- fi
-fi
-)
-m4trace:cmulocal/common.m4:26: -1- AC_DEFUN(CMU_CHECK_HEADER_NOCACHE, dnl Do the transliteration at runtime so arg 1 can be a shell variable.
-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for $1)
-AC_TRY_CPP(#include <$1>, eval "ac_cv_header_$ac_safe=yes",
- eval "ac_cv_header_$ac_safe=no")
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse($2, , :, $2)
-else
- AC_MSG_RESULT(no)
-ifelse($3, , , $3
-)dnl
-fi
-)
-m4trace:cmulocal/common.m4:42: -1- AC_DEFUN(CMU_FIND_LIB_SUBDIR, dnl
-AC_ARG_WITH(lib-subdir, AC_HELP_STRING(--with-lib-subdir=DIR,Find libraries in DIR instead of lib))
-AC_CHECK_SIZEOF(long)
-AC_CACHE_CHECK(what directory libraries are found in, ac_cv_cmu_lib_subdir,
-test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-if test "X$with_lib_subdir" = "X" ; then
- ac_cv_cmu_lib_subdir=lib
- if test $ac_cv_sizeof_long -eq 4 ; then
- test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
- fi
- if test $ac_cv_sizeof_long -eq 8 ; then
- test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
- fi
-else
- ac_cv_cmu_lib_subdir=$with_lib_subdir
-fi)
-AC_SUBST(CMU_LIB_SUBDIR, $ac_cv_cmu_lib_subdir)
-)
-m4trace:cmulocal/cyrus.m4:12: -1- AC_DEFUN(CMU_ADD_LIBPATH, 
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$1 ${LDFLAGS}"
- else
-	LDFLAGS="-L$1 $andrew_cv_runpath_switch$1 ${LDFLAGS}"
- fi
-)
-m4trace:cmulocal/cyrus.m4:23: -1- AC_DEFUN(CMU_ADD_LIBPATH_TO, 
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	$2="-L$1 ${$2}"
- else
-	$2="-L$1 ${$2} $andrew_cv_runpath_switch$1"
- fi
-)
-m4trace:cmulocal/cyrus.m4:33: -1- AC_DEFUN(CMU_GUESS_RUNPATH_SWITCH, 
- # CMU GUESS RUNPATH SWITCH
- AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, 
- # first, try -R
- SAVE_LDFLAGS="${LDFLAGS}"
- LDFLAGS="-R /usr/lib"
- AC_TRY_LINK(,,andrew_cv_runpath_switch="-R", 
- 	LDFLAGS="-Wl,-rpath,/usr/lib"
- AC_TRY_LINK(,,andrew_cv_runpath_switch="-Wl,-rpath,",
- andrew_cv_runpath_switch="none")
- )
- LDFLAGS="${SAVE_LDFLAGS}"
- ))
-m4trace:cmulocal/ipv6.m4:4: -1- AC_DEFUN(IPv6_CHECK_FUNC, 
-AC_CHECK_FUNC($1, dnl
- ac_cv_lib_socket_$1=no
- ac_cv_lib_inet6_$1=no
-, dnl
- AC_CHECK_LIB(socket, $1, dnl
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_$1=no
- , dnl
- AC_MSG_CHECKING(whether your system has IPv6 directory)
- AC_CACHE_VAL(ipv6_cv_dir, dnl
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done)dnl
- AC_MSG_RESULT($ipv6_cv_dir)
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_$1=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- AC_CHECK_LIB(inet6, $1, dnl
-	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi,)dnl
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi)dnl
-)dnl
-ipv6_cv_$1=no
-if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \
- -o $ac_cv_lib_inet6_$1 = yes
-then
- ipv6_cv_$1=yes
-fi
-if test $ipv6_cv_$1 = no; then
- if test $1 = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- AC_EGREP_HEADER(${ipv6_cv_pfx}$1, netdb.h,
-		 AC_CHECK_FUNC(${ipv6_cv_pfx}$1))
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}$1 = Xyes; then
- AC_DEFINE(HAVE_GETADDRINFO,,Do we have a getaddrinfo?)
- ipv6_cv_$1=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_$1 = yes; then
- ifelse($2, , :, $2)
-else
- ifelse($3, , :, $3)
-fi)
-m4trace:cmulocal/ipv6.m4:66: -1- AC_DEFUN(IPv6_CHECK_SS_FAMILY, 
-AC_MSG_CHECKING(whether you have ss_family in struct sockaddr_storage)
-AC_CACHE_VAL(ipv6_cv_ss_family, dnl
-AC_TRY_COMPILE(#include <sys/types.h>
-#include <sys/socket.h>,
-	struct sockaddr_storage ss; int i = ss.ss_family;,
-	ipv6_cv_ss_family=yes, ipv6_cv_ss_family=no))dnl
-if test $ipv6_cv_ss_family = yes; then
- ifelse($1, , AC_DEFINE(HAVE_SS_FAMILY,,Is there an ss_family in sockaddr_storage?), $1)
-else
- ifelse($2, , :, $2)
-fi
-AC_MSG_RESULT($ipv6_cv_ss_family))
-m4trace:cmulocal/ipv6.m4:82: -1- AC_DEFUN(IPv6_CHECK_SA_LEN, 
-AC_MSG_CHECKING(whether you have sa_len in struct sockaddr)
-AC_CACHE_VAL(ipv6_cv_sa_len, dnl
-AC_TRY_COMPILE(#include <sys/types.h>
-#include <sys/socket.h>,
-	 struct sockaddr sa; int i = sa.sa_len;,
-	 ipv6_cv_sa_len=yes, ipv6_cv_sa_len=no))dnl
-if test $ipv6_cv_sa_len = yes; then
- ifelse($1, , AC_DEFINE(HAVE_SOCKADDR_SA_LEN,,Does sockaddr have an sa_len?), $1)
-else
- ifelse($2, , :, $2)
-fi
-AC_MSG_RESULT($ipv6_cv_sa_len))
-m4trace:cmulocal/ipv6.m4:98: -1- AC_DEFUN(IPv6_CHECK_SOCKLEN_T, 
-AC_MSG_CHECKING(for socklen_t)
-AC_CACHE_VAL(ipv6_cv_socklen_t, dnl
-AC_TRY_LINK(#include <sys/types.h>
-#include <sys/socket.h>,
-	 socklen_t len = 0;,
-	 ipv6_cv_socklen_t=yes, ipv6_cv_socklen_t=no))dnl
-if test $ipv6_cv_socklen_t = yes; then
- ifelse($1, , AC_DEFINE(HAVE_SOCKLEN_T,,Do we have a socklen_t?), $1)
-else
- ifelse($2, , :, $2)
-fi
-AC_MSG_RESULT($ipv6_cv_socklen_t))
-m4trace:cmulocal/kerberos_v4.m4:6: -1- AC_DEFUN(CMU_KRB_SENDAUTH_PROTO, 
-AC_MSG_CHECKING(for krb_sendauth prototype)
-AC_TRY_COMPILE(
-#include <krb.h>
-int krb_sendauth (long options, int fd, KTEXT ktext, char *service,
- char *inst, char *realm, u_long checksum,
- MSG_DAT *msg_data, CREDENTIALS *cred,
- Key_schedule schedule, struct sockaddr_in *laddr,
- struct sockaddr_in *faddr, char *version);,
-int foo = krb_sendauth(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ,
-ac_cv_krb_sendauth_proto=no,
-ac_cv_krb_sendauth_proto=yes)
-AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
-if test "$ac_cv_krb_sendauth_proto" = yes; then
- AC_DEFINE(HAVE_KRB_SENDAUTH_PROTO)dnl
-fi
-AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
-)
-m4trace:cmulocal/kerberos_v4.m4:25: -1- AC_DEFUN(CMU_KRB_SET_KEY_PROTO, 
-AC_MSG_CHECKING(for krb_set_key prototype)
-AC_CACHE_VAL(ac_cv_krb_set_key_proto, 
-cmu_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-AC_TRY_COMPILE(
-#include <krb.h>
-int krb_set_key(char *key, int cvt);,
-int foo = krb_set_key(0, 0);,
-ac_cv_krb_set_key_proto=no,
-ac_cv_krb_set_key_proto=yes)
-)
-CPPFLAGS="${cmu_save_CPPFLAGS}"
-if test "$ac_cv_krb_set_key_proto" = yes; then
-	AC_DEFINE(HAVE_KRB_SET_KEY_PROTO)dnl
-fi
-AC_MSG_RESULT($ac_cv_krb_set_key_proto)
-)
-m4trace:cmulocal/kerberos_v4.m4:44: -1- AC_DEFUN(CMU_KRB4_32_DEFN, 
-AC_MSG_CHECKING(for KRB4_32 definition)
-AC_CACHE_VAL(ac_cv_krb4_32_defn, 
-cmu_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-AC_TRY_COMPILE(
-#include <krb.h>
-,
-KRB4_32 foo = 1;,
-ac_cv_krb4_32_defn=yes,
-ac_cv_krb4_32_defn=no)
-)
-CPPFLAGS="${cmu_save_CPPFLAGS}"
-if test "$ac_cv_krb4_32_defn" = yes; then
-	AC_DEFINE(HAVE_KRB4_32_DEFINE)dnl
-fi
-AC_MSG_RESULT($ac_cv_krb4_32_defn)
-)
-m4trace:cmulocal/kerberos_v4.m4:63: -1- AC_DEFUN(CMU_KRB_RD_REQ_PROTO, 
-AC_MSG_CHECKING(for krb_rd_req prototype)
-AC_CACHE_VAL(ac_cv_krb_rd_req_proto, 
-cmu_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-AC_TRY_COMPILE(
-#include <krb.h>
-int krb_rd_req(KTEXT authent, char *service, char *instance,
-unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn);,
-int foo = krb_rd_req(0,0,0,0,0,0);,
-ac_cv_krb_rd_req_proto=no,
-ac_cv_krb_rd_req_proto=yes)
-)
-CPPFLAGS="${cmu_save_CPPFLAGS}"
-if test "$ac_cv_krb_rd_req_proto" = yes; then
-	AC_DEFINE(HAVE_KRB_RD_REQ_PROTO)dnl
-fi
-AC_MSG_RESULT($ac_cv_krb_rd_req_proto)
-)
-m4trace:cmulocal/kerberos_v4.m4:83: -1- AC_DEFUN(CMU_KRB_INC_WHERE1, 
-saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$saved_CPPFLAGS -I$1"
-AC_TRY_COMPILE(#include <krb.h>,
-struct ktext foo;,
-ac_cv_found_krb_inc=yes,
-ac_cv_found_krb_inc=no)
-if test "$ac_cv_found_krb_inc" = "no"; then
- CPPFLAGS="$saved_CPPFLAGS -I$1 -I$1/kerberosIV"
- AC_TRY_COMPILE(#include <krb.h>,
- struct ktext foo;,
- ac_cv_found_krb_inc=yes,
- ac_cv_found_krb_inc=no)
-fi
-CPPFLAGS=$saved_CPPFLAGS
-)
-m4trace:cmulocal/kerberos_v4.m4:100: -1- AC_DEFUN(CMU_KRB_INC_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for kerberos headers in $i)
- CMU_KRB_INC_WHERE1($i)
- CMU_TEST_INCPATH($i, krb)
- if test "$ac_cv_found_krb_inc" = "yes"; then
- ac_cv_krb_where_inc=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/kerberos_v4.m4:119: -1- AC_DEFUN(CMU_KRB_LIB_WHERE1, 
-saved_LIBS=$LIBS
-LIBS="$saved_LIBS -L$1 -lkrb ${KRB_LIBDES}"
-AC_TRY_LINK(,
-dest_tkt();,
-ac_cv_found_krb_lib=yes,
-ac_cv_found_krb_lib=no)
-LIBS=$saved_LIBS
-)
-m4trace:cmulocal/kerberos_v4.m4:129: -1- AC_DEFUN(CMU_KRB_LIB_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for kerberos libraries in $i)
- CMU_KRB_LIB_WHERE1($i)
- dnl deal with false positives from implicit link paths
- CMU_TEST_LIBPATH($i, krb)
- if test "$ac_cv_found_krb_lib" = "yes" ; then
- ac_cv_krb_where_lib=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/kerberos_v4.m4:145: -1- AC_DEFUN(CMU_KRB4, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
-AC_REQUIRE(CMU_SOCKETS)
-AC_REQUIRE(CMU_LIBSSL)
-AC_ARG_WITH(krb4,
-	 --with-krb4=PREFIX Compile with Kerberos 4 support,
-	if test "X$with_krb4" = "X"; then
-		with_krb4=yes
-	fi)
-AC_ARG_WITH(krb4-lib,
-	 --with-krb4-lib=dir use kerberos 4 libraries in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-krb4-lib)
-	fi)
-AC_ARG_WITH(krb4-include,
-	 --with-krb4-include=dir use kerberos 4 headers in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-krb4-include)
-	fi)
-
-	if test "X$with_krb4" != "X"; then
-	 if test "$with_krb4" != "yes" -a "$with_krb4" != "no"; then
-	 ac_cv_krb_where_lib=$with_krb4/$CMU_LIB_SUBDIR
-	 ac_cv_krb_where_inc=$with_krb4/include
-	 fi
-	fi
- 
-	if test "$with_krb4" != "no"; then
-	 if test "X$with_krb4_lib" != "X"; then
-	 ac_cv_krb_where_lib=$with_krb4_lib
-	 fi
-	 if test "X$with_krb4_include" != "X"; then
-	 ac_cv_krb_where_inc=$with_krb4_include
-	 fi
-	 if test "X$ac_cv_krb_where_inc" = "X"; then
-	 CMU_KRB_INC_WHERE(/usr/athena/include /usr/include/kerberosIV /usr/local/include /usr/include/kerberos)
-	 fi
-
- AC_MSG_CHECKING(if libdes is needed)
- AC_TRY_LINK(,des_quad_cksum();,KRB_DES_LIB="",KRB_DES_LIB="maybe")
- if test "X$KRB_DES_LIB" != "X"; then
- LIBS="$cmu_save_LIBS -ldes"
- AC_TRY_LINK(, des_quad_cksum();,KRB_DES_LIB="yes")
- if test "X$KRB_DES_LIB" = "Xyes"; then
- AC_MSG_RESULT(yes)
- KRB_LIBDES="-ldes"
- KRB_LIBDESA='$(KRB_LIB_DIR)/libdes.a'
- else
- LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
- AC_TRY_LINK(,
- des_quad_cksum();,KRB_DES_LIB="libcrypto")
- if test "X$KRB_DES_LIB" = "Xlibcrypto"; then
- AC_MSG_RESULT(libcrypto)
- KRB_LIBDES="$LIBSSL_LIB_FLAGS"
- KRB_LIBDESA="$LIBSSL_LIB_FLAGS"
- else
- LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
- AC_TRY_LINK(,
- des_quad_cksum();,KRB_DES_LIB="libcrypto+descompat")
- if test "X$KRB_DES_LIB" = "Xlibcrypto+descompat"; then
- AC_MSG_RESULT(libcrypto+descompat)
- KRB_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
- KRB_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
- else
- AC_MSG_RESULT(unknown)
- AC_MSG_ERROR(Could not use -ldes)
- fi 
- fi 
- fi 
- else
- AC_MSG_RESULT(no)
- fi
- if test "X$ac_cv_krb_where_lib" = "X"; then
- CMU_KRB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
- fi
-	fi
-	 LIBS="${cmu_save_LIBS}"
-
-
-	AC_MSG_CHECKING(whether to include kerberos 4)
-	if test "X$ac_cv_krb_where_lib" = "X" -o "X$ac_cv_krb_where_inc" = "X"; then
-	 ac_cv_found_krb=no
-	 AC_MSG_RESULT(no)
-	else
-	 ac_cv_found_krb=yes
-	 AC_MSG_RESULT(yes)
-	 KRB_INC_DIR=$ac_cv_krb_where_inc
-	 KRB_LIB_DIR=$ac_cv_krb_where_lib
-	 KRB_INC_FLAGS="-I${KRB_INC_DIR}"
-	 KRB_LIB_FLAGS="-L${KRB_LIB_DIR} -lkrb ${KRB_LIBDES}"
-	 LIBS="${cmu_save_LIBS} ${KRB_LIB_FLAGS}"
-	 AC_CHECK_LIB(resolv, dns_lookup, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lresolv",,"${KRB_LIB_FLAGS}")
-	 AC_CHECK_LIB(crypt, crypt, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lcrypt",,"${KRB_LIB_FLAGS}")
-	 LIBS="${LIBS} ${KRB_LIB_FLAGS}"
-	 AC_CHECK_FUNCS(krb_get_int krb_life_to_time)
- AC_SUBST(KRB_INC_FLAGS)
- AC_SUBST(KRB_LIB_FLAGS)
-	 LIBS="${cmu_save_LIBS}"
-	 AC_DEFINE(HAVE_KRB4,,Kerberos V4 is present)dnl zephyr uses this
-	 AC_DEFINE(KERBEROS,,Use kerberos 4. find out what needs this symbol)
-	 if test "X$RPATH" = "X"; then
-		RPATH=""
-	 fi
-	 case "${host}" in
-	 *-*-linux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${KRB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-hpux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,+b${KRB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${KRB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-irix*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${KRB_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-solaris2*)
-	 if test "$ac_cv_prog_gcc" = yes; then
-		if test "X$RPATH" = "X"; then
-		 RPATH="-Wl,-R${KRB_LIB_DIR}"
-		else 
-		 RPATH="${RPATH}:${KRB_LIB_DIR}"
-		fi
-	 else
-	 RPATH="${RPATH} -R${KRB_LIB_DIR}"
-	 fi
-	 ;;
-	 esac
-	 AC_SUBST(RPATH)
-	fi
-	)
-m4trace:cmulocal/libssl.m4:6: -1- AC_DEFUN(CMU_LIBSSL_INC_WHERE1, 
-saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$saved_CPPFLAGS -I$1"
-CMU_CHECK_HEADER_NOCACHE(openssl/ssl.h,
-ac_cv_found_libssl_inc=yes,
-ac_cv_found_libssl_inc=no)
-CPPFLAGS=$saved_CPPFLAGS
-)
-m4trace:cmulocal/libssl.m4:15: -1- AC_DEFUN(CMU_LIBSSL_INC_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for libssl headers in $i)
- CMU_LIBSSL_INC_WHERE1($i)
- CMU_TEST_INCPATH($i, ssl)
- if test "$ac_cv_found_libssl_inc" = "yes"; then
- ac_cv_libssl_where_inc=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/libssl.m4:30: -1- AC_DEFUN(CMU_LIBSSL_LIB_WHERE1, 
-saved_LIBS=$LIBS
-LIBS="$saved_LIBS -L$1 -lssl -lcrypto $LIB_SOCKET"
-AC_TRY_LINK(,
-SSL_write();,
-ac_cv_found_ssl_lib=yes,
-ac_cv_found_ssl_lib=no)
-LIBS=$saved_LIBS
-)
-m4trace:cmulocal/libssl.m4:40: -1- AC_DEFUN(CMU_LIBSSL_LIB_WHERE, 
- for i in $1; do
- AC_MSG_CHECKING(for libssl libraries in $i)
- CMU_LIBSSL_LIB_WHERE1($i)
- dnl deal with false positives from implicit link paths
- CMU_TEST_LIBPATH($i, ssl)
- if test "$ac_cv_found_ssl_lib" = "yes" ; then
- ac_cv_libssl_where_lib=$i
- AC_MSG_RESULT(found)
- break
- else
- AC_MSG_RESULT(not found)
- fi
- done
-)
-m4trace:cmulocal/libssl.m4:56: -1- AC_DEFUN(CMU_LIBSSL, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
-AC_REQUIRE(CMU_SOCKETS)
-AC_ARG_WITH(libssl,
-	 --with-libssl=PREFIX Compile with Libssl support,
-	if test "X$with_libssl" = "X"; then
-		with_libssl=yes
-	fi)
-AC_ARG_WITH(libssl-lib,
-	 --with-libssl-lib=dir use libssl libraries in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-libssl-lib)
-	fi)
-AC_ARG_WITH(libssl-include,
-	 --with-libssl-include=dir use libssl headers in dir,
-	if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_ERROR(No argument for --with-libssl-include)
-	fi)
-
-	if test "X$with_libssl" != "X"; then
-	 if test "$with_libssl" != "yes" -a "$with_libssl" != no; then
-	 ac_cv_libssl_where_lib=$with_libssl/$CMU_LIB_SUBDIR
-	 ac_cv_libssl_where_inc=$with_libssl/include
-	 fi
-	fi
-
-	if test "$with_libssl" != "no"; then 
-	 if test "X$with_libssl_lib" != "X"; then
-	 ac_cv_libssl_where_lib=$with_libssl_lib
-	 fi
-	 if test "X$ac_cv_libssl_where_lib" = "X"; then
-	 CMU_LIBSSL_LIB_WHERE(/usr/local/$CMU_LIB_SUBDIR/openssl /usr/$CMU_LIB_SUBDIR/openssl /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
-	 fi
-
-	 if test "X$with_libssl_include" != "X"; then
-	 ac_cv_libssl_where_inc=$with_libssl_include
-	 fi
-	 if test "X$ac_cv_libssl_where_inc" = "X"; then
-	 CMU_LIBSSL_INC_WHERE(/usr/local/include /usr/include)
-	 fi
-	fi
-
-	AC_MSG_CHECKING(whether to include libssl)
-	if test "X$ac_cv_libssl_where_lib" = "X" -a "X$ac_cv_libssl_where_inc" = "X"; then
-	 ac_cv_found_libssl=no
-	 AC_MSG_RESULT(no)
-	else
-	 ac_cv_found_libssl=yes
-	 AC_MSG_RESULT(yes)
-	 LIBSSL_INC_DIR=$ac_cv_libssl_where_inc
-	 LIBSSL_LIB_DIR=$ac_cv_libssl_where_lib
-	 LIBSSL_INC_FLAGS="-I${LIBSSL_INC_DIR}"
-	 LIBSSL_LIB_FLAGS="-L${LIBSSL_LIB_DIR} -lssl -lcrypto"
-	 if test "X$RPATH" = "X"; then
-		RPATH=""
-	 fi
-	 case "${host}" in
-	 *-*-linux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
-	 else 
- 		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-hpux*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,+b${LIBSSL_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-irix*)
-	 if test "X$RPATH" = "X"; then
-	 RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
-	 else 
-		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-	 fi
-	 ;;
-	 *-*-solaris2*)
-	 if test "$ac_cv_prog_gcc" = yes; then
-		if test "X$RPATH" = "X"; then
-		 RPATH="-Wl,-R${LIBSSL_LIB_DIR}"
-		else 
-		 RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-		fi
-	 else
-	 RPATH="${RPATH} -R${LIBSSL_LIB_DIR}"
-	 fi
-	 ;;
-	 esac
-	 AC_SUBST(RPATH)
-	fi
-	AC_SUBST(LIBSSL_INC_DIR)
-	AC_SUBST(LIBSSL_LIB_DIR)
-	AC_SUBST(LIBSSL_INC_FLAGS)
-	AC_SUBST(LIBSSL_LIB_FLAGS)
-	)
-m4trace:cmulocal/libwrap.m4:4: -1- AC_DEFUN(CMU_LIBWRAP, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
- AC_REQUIRE(CMU_SOCKETS)
- AC_ARG_WITH(libwrap, 
- --with-libwrap=DIR use libwrap (rooted in DIR) yes ,
- with_libwrap=$withval, with_libwrap=yes)
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- AC_CHECK_LIB(wrap, request_init, 
-		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no),
-		 with_libwrap=no, ${LIB_SOCKET})
- LIBS="$cmu_save_LIBS"
- fi
- AC_MSG_CHECKING(libwrap support)
- AC_MSG_RESULT($with_libwrap)
- LIB_WRAP=""
- if test "$with_libwrap" != no; then
- AC_DEFINE(HAVE_LIBWRAP,,Do we have TCP wrappers?)
- LIB_WRAP="-lwrap"
- AC_CHECK_LIB(nsl, yp_get_default_domain, LIB_WRAP="${LIB_WRAP} -lnsl")
- fi
- AC_SUBST(LIB_WRAP)
-)
-m4trace:cmulocal/sasl2.m4:7: -1- AC_DEFUN(SASL_GSSAPI_CHK, AC_REQUIRE(SASL2_CRYPT_CHK)
-AC_REQUIRE(CMU_SOCKETS)
-AC_ARG_ENABLE(gssapi,
- AC_HELP_STRING(--enable-gssapi=<DIR>,
- enable GSSAPI authentication yes),
- gssapi=$enableval,
- gssapi=yes)
-AC_ARG_WITH(gss_impl,
- AC_HELP_STRING(--with-gss_impl={heimdal|mit|cybersafe|seam|auto},
- choose specific GSSAPI implementation auto),
- gss_impl=$withval,
- gss_impl=auto)
-
-if test "$gssapi" != no; then
- platform=
- case "${host}" in
- *-*-linux*)
- platform=__linux
- ;;
- *-*-hpux*)
- platform=__hpux
- ;;
- *-*-irix*)
- platform=__irix
- ;;
- *-*-solaris2*)
-# When should we use __sunos?
- platform=__solaris
- ;;
- *-*-aix*)
-###_AIX
- platform=__aix
- ;;
- *)
- AC_WARN(The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script)
- if test "$gss_impl" = "cybersafe"; then
- AC_ERROR(CyberSafe was forced, cannot continue as platform is not supported)
- fi
- ;;
- esac
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
-
- if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-# We want to keep -I in our CPPFLAGS, but only if we succeed
- cmu_saved_CPPFLAGS=$CPPFLAGS
-### I am not sure how useful is this (and whether this is required at all
-### especially when we have to provide two -L flags for new CyberSafe
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
-
- if test -n "$platform"; then
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
- fi
- fi
- fi
- AC_CHECK_HEADER(gssapi.h,,
- AC_CHECK_HEADER(gssapi/gssapi.h,,
- AC_WARN(Disabling GSSAPI - no include files found); gssapi=no))
-
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
-fi
-
-if test "$gssapi" != no; then
- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
- AC_DEFINE(HAVE_GSSAPI_H,,Define if you have the gssapi.h header file)
- fi
-
- # We need to find out which gssapi implementation we are
- # using. Supported alternatives are: MIT Kerberos 5,
- # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
- # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
- # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
- #
- # The choice is reflected in GSSAPIBASE_LIBS
-
- AC_CHECK_LIB(resolv,res_search)
- if test -d ${gssapi}; then
- gssapi_dir="${gssapi}/lib"
- GSSAPIBASE_LIBS="-L$gssapi_dir"
- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
- else
- # FIXME: This is only used for building cyrus, and then only as
- # a real hack. it needs to be fixed.
- gssapi_dir="/usr/local/lib"
- fi
-
- # Check a full link against the Heimdal libraries.
- # If this fails, check a full link against the MIT libraries.
- # If this fails, check a full link against the CyberSafe libraries.
- # If this fails, check a full link against the Solaris 8 and up libgss.
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
- gss_failed=0
- AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
- ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
-
- gss_failed=0
- AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
- ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- # For Cybersafe one has to set a platform define in order to make compilation work
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
- if test -d "${gssapi}/appsec-rt/lib"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
- fi
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
-
- gss_failed=0
-
-# Check for CyberSafe with two libraries first, than fall back to a single 
-# library (older CyberSafe)
-
- unset ac_cv_lib_gss_csf_gss_acq_user
- AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe03",
- unset ac_cv_lib_gss_csf_gss_acq_user;
- AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
- gss_failed=1,$GSSAPIBASE_LIBS -lgss),
- ${GSSAPIBASE_LIBS} -lgss -lcstbk5)
-
- if test "$gss_failed" = "1"; then
-# Restore variables
- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
- if test "$gss_impl" != "auto"; then
- gss_impl="failed"
- fi
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
- gss_failed=0
- AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",gss_failed=1,-lgss)
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "mit"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
-# Version of CyberSafe with two libraries
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "seam"; then
- GSSAPIBASE_LIBS=-lgss
- # there is no static libgss on Solaris 8 and up
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "failed"; then
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- AC_WARN(Disabling GSSAPI - specified library not found)
- else
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- AC_WARN(Disabling GSSAPI - no library)
- fi
-fi
-
-#
-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-# in gssapi\rfckrb5.h
-#
-if test "$gssapi" != "no"; then
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- AC_EGREP_CPP(hostbased_service_gss_nt_yes,
- #include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_HOSTBASED_SERVICE
- hostbased_service_gss_nt_yes
- #endif,
- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE),
- AC_WARN(Cybersafe define not found))
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE))
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE))
- fi
-
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- AC_EGREP_CPP(user_name_yes_gss_nt,
- #include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_USER_NAME
- user_name_yes_gss_nt
- #endif,
- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME),
- AC_WARN(Cybersafe define not found))
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME))
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME))
- fi
-fi
-
-GSSAPI_LIBS=""
-AC_MSG_CHECKING(GSSAPI)
-if test "$gssapi" != no; then
- AC_MSG_RESULT(with implementation ${gss_impl})
- AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
-
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
- LIBS="$cmu_save_LIBS"
-else
- AC_MSG_RESULT(disabled)
-fi
-AC_SUBST(GSSAPI_LIBS)
-AC_SUBST(GSSAPIBASE_LIBS)
-)
-m4trace:cmulocal/sasl2.m4:274: -1- AC_DEFUN(SASL_SET_GSSAPI_LIBS, SASL_GSSAPI_LIBS_SET="yes"
-)
-m4trace:cmulocal/sasl2.m4:289: -1- AC_DEFUN(CMU_SASL2, AC_REQUIRE(SASL_GSSAPI_CHK)
-
-AC_ARG_WITH(sasl,
- AC_HELP_STRING(--with-sasl=DIR,Compile with libsasl2 in <DIR>),
- with_sasl="$withval",
- with_sasl="yes")
-
-AC_ARG_WITH(staticsasl,
- AC_HELP_STRING(--with-staticsasl=DIR,
- Compile with staticly linked libsasl2 in <DIR>),
- with_staticsasl="$withval";
- if test $with_staticsasl != "no"; then
- using_static_sasl="static"
- fi,
- with_staticsasl="no"; using_static_sasl="no")
-
-SASLFLAGS=""
-LIB_SASL=""
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-cmu_saved_LDFLAGS=$LDFLAGS
-cmu_saved_LIBS=$LIBS
-
-if test ${with_staticsasl} != "no"; then
- if test -d ${with_staticsasl}; then
- if test -d ${with_staticsasl}/lib64 ; then
- ac_cv_sasl_where_lib=${with_staticsasl}/lib64
- else
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- fi
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- ac_cv_sasl_where_inc=${with_staticsasl}/include
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
- else
- with_staticsasl="/usr"
- fi
-
- AC_CHECK_HEADER(sasl/sasl.h,
- AC_CHECK_HEADER(sasl/saslutil.h,
- for i42 in lib64 lib; do
- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
- ac_cv_found_sasl=yes
- AC_MSG_CHECKING(for static libsasl)
- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
- fi
- done
- if test ! "$ac_cv_found_sasl" = "yes"; then
- AC_MSG_CHECKING(for static libsasl)
- AC_ERROR(Could not find ${with_staticsasl}/lib*/libsasl2.a)
- fi))
-
- AC_MSG_RESULT(found)
-
- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
- else
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
- fi
-fi
-
-if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
- ac_cv_sasl_where_inc=${with_sasl}/include
-
- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
- if test "$ac_cv_sasl_where_lib" != ""; then
- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
- fi
- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-fi
-
-# be sure to check for a SASLv2 specific function
-AC_CHECK_HEADER(sasl/sasl.h,
- AC_CHECK_HEADER(sasl/saslutil.h,
- AC_CHECK_LIB(sasl2, prop_get, 
- ac_cv_found_sasl=yes,
- ac_cv_found_sasl=no),
- ac_cv_found_sasl=no),
- ac_cv_found_sasl=no)
-
-if test "$ac_cv_found_sasl" = "yes"; then
- if test "$ac_cv_sasl_where_lib" != ""; then
- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
- fi
- DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
- if test "$using_static_sasl" != "static"; then
- LIB_SASL=$DYNLIB_SASL
- SASLFLAGS=$DYNSASLFLAGS
- fi
-else
- DYNLIB_SASL=""
- DYNSASLFLAGS=""
- using_static_sasl="staticonly"
-fi
-
-if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-fi
-
-LIBS="$cmu_saved_LIBS"
-LDFLAGS="$cmu_saved_LDFLAGS"
-CPPFLAGS="$cmu_saved_CPPFLAGS"
-
-AC_SUBST(LIB_DYN_SASL)
-AC_SUBST(DYNSASLFLAGS)
-AC_SUBST(LIB_SASL)
-AC_SUBST(SASLFLAGS)
-)
-m4trace:cmulocal/sasl2.m4:410: -1- AC_DEFUN(CMU_SASL2_REQUIRED, AC_REQUIRE(CMU_SASL2)
-if test "$ac_cv_found_sasl" != "yes"; then
- AC_ERROR(Cannot continue without libsasl2.
-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.)
-fi)
-m4trace:cmulocal/sasl2.m4:420: -1- AC_DEFUN(CMU_SASL2_REQUIRE_VER, AC_REQUIRE(CMU_SASL2_REQUIRED)
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-
-AC_TRY_CPP(
-#include <sasl/sasl.h>
-
-#ifndef SASL_VERSION_MAJOR
-#error SASL_VERSION_MAJOR not defined
-#endif
-#ifndef SASL_VERSION_MINOR
-#error SASL_VERSION_MINOR not defined
-#endif
-#ifndef SASL_VERSION_STEP
-#error SASL_VERSION_STEP not defined
-#endif
-
-#if SASL_VERSION_MAJOR < $1 || SASL_VERSION_MINOR < $2 || SASL_VERSION_STEP < $3
-#error SASL version is less than $1.$2.$3
-#endif
-,,
- AC_ERROR(Incorrect SASL headers found. This package requires SASL $1.$2.$3 or newer.))
-
-CPPFLAGS=$cmu_saved_CPPFLAGS
-)
-m4trace:cmulocal/sasl2.m4:451: -1- AC_DEFUN(CMU_SASL2_CHECKAPOP_REQUIRED, AC_REQUIRE(CMU_SASL2_REQUIRED)
-
-cmu_saved_LDFLAGS=$LDFLAGS
-
-LDFLAGS="$LDFLAGS $LIB_SASL"
-
-AC_CHECK_LIB(sasl2, sasl_checkapop,
- AC_DEFINE(HAVE_APOP,,Does SASL support APOP?),
- AC_MSG_ERROR(libsasl2 without working sasl_checkapop. Cannot continue.))
-
-LDFLAGS=$cmu_saved_LDFLAGS
-)
-m4trace:cmulocal/sasl2.m4:468: -1- AC_DEFUN(SASL2_CRYPT_CHK, AC_CHECK_FUNC(crypt, cmu_have_crypt=yes,
- AC_CHECK_LIB(crypt, crypt,
- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
- cmu_have_crypt=no))
-AC_SUBST(LIB_CRYPT)
-)
-m4trace:cmulocal/sql.m4:16: -1- AC_DEFUN(CYRUS_MYSQL_CHK_LIB, 
-	MYSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_mysql_lib; then
-	 CMU_ADD_LIBPATH_TO($with_mysql_lib, LDFLAGS)
-	 CMU_ADD_LIBPATH_TO($with_mysql_lib, MYSQL_LIBADD)
-	else
-	 MYSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_mysql} mysqlclient
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 AC_TRY_LINK(#include <stdio.h>
-#include <mysql.h>,
-	 mysql_select_db(NULL, NULL);,
-	 MYSQL_LIBADD="$MYSQL_LIBADD -l$libname"; mysqllib="yes",
- mysqllib="no")
-	 if test "$mysqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$MYSQL_SAVE_LDFLAGS
-)
-m4trace:cmulocal/sql.m4:43: -1- AC_DEFUN(CYRUS_MYSQL_OPTS, 
-AC_ARG_WITH(mysql-libdir,
-	 --with-mysql-libdir=DIR MySQL lib files are in DIR,
-	with_mysql_lib=$withval,
-	 test "${with_mysql_lib+set}" = set || with_mysql_lib=none)
-AC_ARG_WITH(mysql-incdir,
-	 --with-mysql-incdir=DIR MySQL include files are in DIR,
-	with_mysql_inc=$withval,
-	 test "${with_mysql_inc+set}" = set || with_mysql_inc=none )
-)
-m4trace:cmulocal/sql.m4:55: -1- AC_DEFUN(CYRUS_MYSQL_CHK, 
-	AC_REQUIRE(CYRUS_MYSQL_OPTS)
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_mysql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_mysql_inc"
-	 MYSQL_INCADD="-I$with_mysql_inc"
-	else
-	 MYSQL_INCADD=""
-	fi
-
- AC_CHECK_HEADER(mysql.h,
- CYRUS_MYSQL_CHK_LIB(),
- mysqllib="no")
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-)
-m4trace:cmulocal/sql.m4:90: -1- AC_DEFUN(CYRUS_PGSQL_CHK_LIB, 
-	PGSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_pgsql_lib; then
-	 CMU_ADD_LIBPATH_TO($with_pgsql_lib, LDFLAGS)
-	 CMU_ADD_LIBPATH_TO($with_pgsql_lib, PGSQL_LIBADD)
-	else
-	 PGSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_pgsql} pq
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 AC_TRY_LINK(#include <stdio.h>
-#include <libpq-fe.h>,
-	 PQconnectdb(NULL);,
-	 PGSQL_LIBADD="$PGSQL_LIBADD -l$libname"; pgsqllib="yes",
- pgsqllib="no")
-	 if test "$pgsqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$PGSQL_SAVE_LDFLAGS
-)
-m4trace:cmulocal/sql.m4:117: -1- AC_DEFUN(CYRUS_PGSQL_OPTS, 
-AC_ARG_WITH(pgsql-libdir,
-	 --with-pgsql-libdir=DIR Pgsql lib files are in DIR,
-	with_pgsql_lib=$withval,
-	 test "${with_pgsql_lib+set}" = set || with_pgsql_lib=none)
-AC_ARG_WITH(pgsql-incdir,
-	 --with-pgsql-incdir=DIR Pgsql include files are in DIR,
-	with_pgsql_inc=$withval,
-	 test "${with_pgsql_inc+set}" = set || with_pgsql_inc=none )
-)
-m4trace:cmulocal/sql.m4:129: -1- AC_DEFUN(CYRUS_PGSQL_CHK, 
-	AC_REQUIRE(CYRUS_PGSQL_OPTS)
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_pgsql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_pgsql_inc"
-	 PGSQL_INCADD="-I$with_pgsql_inc"
-	else
-	 PGSQL_INCADD=""
-	fi
-
- AC_CHECK_HEADER(libpq-fe.h,
- CYRUS_PGSQL_CHK_LIB(),
- pgsqllib="no")
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-)
-m4trace:cmulocal/sql.m4:164: -1- AC_DEFUN(CYRUS_SQLITE_CHK_LIB, 
-	SQLITE_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_sqlite_lib; then
-	 CMU_ADD_LIBPATH_TO($with_sqlite_lib, LDFLAGS)
-	 CMU_ADD_LIBPATH_TO($with_sqlite_lib, SQLITE_LIBADD)
-	else
-	 SQLITE_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_sqlite} sqlite3
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 AC_TRY_LINK(#include <stdio.h>
-#include <sqlite3.h>,
-	 sqlite3_open(NULL, NULL);,
-	 SQLITE_LIBADD="$SQLITE_LIBADD -l$libname"; sqlitelib="yes",
- sqlitelib="no")
-	 if test "$sqlitelib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$SQLITE_SAVE_LDFLAGS
-)
-m4trace:cmulocal/sql.m4:191: -1- AC_DEFUN(CYRUS_SQLITE_OPTS, 
-AC_ARG_WITH(sqlite-libdir,
-	 --with-sqlite-libdir=DIR SQLite lib files are in DIR,
-	with_sqlite_lib=$withval,
-	 test "${with_sqlite_lib+set}" = set || with_sqlite_lib=none)
-AC_ARG_WITH(sqlite-incdir,
-	 --with-sqlite-incdir=DIR SQLite include files are in DIR,
-	with_sqlite_inc=$withval,
-	 test "${with_sqlite_inc+set}" = set || with_sqlite_inc=none )
-)
-m4trace:cmulocal/sql.m4:203: -1- AC_DEFUN(CYRUS_SQLITE_CHK, 
-	AC_REQUIRE(CYRUS_SQLITE_OPTS)
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_sqlite_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_sqlite_inc"
-	 SQLITE_INCADD="-I$with_sqlite_inc"
-	else
-	 SQLITE_INCADD=""
-	fi
-
- AC_CHECK_HEADER(sqlite3.h,
- CYRUS_SQLITE_CHK_LIB(),
- sqlitelib="no")
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-)
-m4trace:cmulocal/ucdsnmp.m4:4: -1- AC_DEFUN(CMU_UCDSNMP, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
- AC_REQUIRE(CMU_SOCKETS)
- AC_ARG_WITH(snmp, 
- --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes ,
- with_snmp=$withval, with_snmp=yes)
-
- dnl
- dnl Maintain backwards compatibility with old --with-ucdsnmp option
- dnl
- AC_ARG_WITH(ucdsnmp,, with_snmp=$withval,)
-
-if test "$with_snmp" != "no"; then
-
- dnl
- dnl Try net-snmp first
- dnl
- if test "$with_snmp" = "yes"; then
- AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,/usr/local/bin:$PATH)
- else
- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
- fi
-
- if test -x "$SNMP_CONFIG"; then
- AC_MSG_CHECKING(NET SNMP libraries)
-
- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
- LIB_UCDSNMP=$SNMP_LIBS
- AC_DEFINE(HAVE_NETSNMP,1,Do we have Net-SNMP support?)
- AC_SUBST(LIB_UCDSNMP)
- AC_MSG_RESULT(yes)
- AC_CHECK_HEADERS(net-snmp/agent/agent_module_config.h,,)
- else
- AC_MSG_RESULT(no)
- AC_MSG_WARN(Could not find the required paths. Please check your net-snmp installation.)
- fi
- else
- dnl
- dnl Try ucd-snmp if net-snmp test failed
- dnl
- if test "$with_snmp" != no; then
- if test -d "$with_snmp"; then
- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
- LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- AC_CHECK_LIB(snmp, sprint_objid, 
- 		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no),
- 		 with_snmp=no, ${LIB_SOCKET})
- LIBS="$cmu_save_LIBS"
- fi
- AC_MSG_CHECKING(UCD SNMP libraries)
- AC_MSG_RESULT($with_snmp)
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP,1,Do we have UCD-SNMP support?)
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
- AC_CHECK_LIB(rpm, rpmdbOpen,
-		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
- fi
- AC_SUBST(LIB_UCDSNMP)
- fi
-fi
-
-)
-m4trace:cmulocal/zlib.m4:6: -1- AC_DEFUN(CMU_HAVE_ZLIB, 
-AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
-AC_ARG_WITH(zlib, --with-zlib=PATH use zlib from PATH,
-	with_zlib=$withval, with_zlib="yes")
-
-	save_CPPFLAGS=$CPPFLAGS
-	save_LDFLAGS=$LDFLAGS
-
-	if test -d $with_zlib; then
-	 CPPFLAGS="${CPPFLAGS} -I${with_lib}/include"
-	 CMU_ADD_LIBPATH(${with_zlib}/$CMU_LIB_SUBDIR)
-	fi
-
-ZLIB=""
-case "$with_zlib" in
-	no)
-	 with_zlib="no";;
-	*) 
-	AC_CHECK_HEADER(zlib.h, 
-		AC_CHECK_LIB(z, deflate,
-				LIBS="${LIBS} -lz"; with_zlib="yes",
-				with_zlib="no",),
-		with_zlib=no)
-	;;
-esac
-
-	if test "$with_zlib" != "no"; then
-		AC_DEFINE(HAVE_ZLIB,,Do we have zlib?)
-		ZLIB="-lz"
-	else
-		CPPFLAGS=$save_CPPFLAGS
-		LDFLAGS=$save_LDFLAGS
-	fi
-)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?ACHUM_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(_AC_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^LIBOBJS$, do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS')
-m4trace:configure.in:49: -1- m4_pattern_allow(^AS_FLAGS$)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?m4_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^dnl$)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?AS_)
-m4trace:configure.in:49: -1- m4_pattern_allow(^SHELL$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PATH_SEPARATOR$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_NAME$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_TARNAME$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_VERSION$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_STRING$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_BUGREPORT$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_URL$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^exec_prefix$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^prefix$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^program_transform_name$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^bindir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sbindir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^libexecdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^datarootdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^datadir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sysconfdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sharedstatedir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^localstatedir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^includedir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^oldincludedir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^docdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^infodir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^htmldir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^dvidir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^pdfdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^psdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^libdir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^localedir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^mandir$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_NAME$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_TARNAME$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_VERSION$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_STRING$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_BUGREPORT$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_URL$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^DEFS$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_C$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_N$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_T$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^LIBS$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^build_alias$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^host_alias$)
-m4trace:configure.in:49: -1- m4_pattern_allow(^target_alias$)
-m4trace:configure.in:52: -1- _m4_warn(obsolete, The macro `AC_CANONICAL_SYSTEM' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:1858: AC_CANONICAL_SYSTEM is expanded from...
-configure.in:52: the top level)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_cpu$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_vendor$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_os$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_cpu$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_vendor$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_os$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_cpu$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_vendor$)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_os$)
-m4trace:configure.in:55: -1- m4_pattern_allow(^EXTRA_IDENT$)
-m4trace:configure.in:58: -1- m4_pattern_allow(^MAKEDEPEND$)
-m4trace:configure.in:63: -2- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:63: the top level)
-m4trace:configure.in:68: -1- m4_pattern_allow(^cyrus_prefix$)
-m4trace:configure.in:69: -1- m4_pattern_allow(^CYRUS_PATH$)
-m4trace:configure.in:72: -1- m4_pattern_allow(^service_path$)
-m4trace:configure.in:73: -1- m4_pattern_allow(^SERVICE_PATH$)
-m4trace:configure.in:76: -1- m4_pattern_allow(^cyrus_user$)
-m4trace:configure.in:77: -1- m4_pattern_allow(^CYRUS_USER$)
-m4trace:configure.in:80: -1- m4_pattern_allow(^cyrus_group$)
-m4trace:configure.in:87: -1- m4_pattern_allow(^SYSCONFDIR$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CFLAGS$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^LDFLAGS$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^LIBS$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^ac_ct_CC$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^EXEEXT$)
-m4trace:configure.in:89: -1- m4_pattern_allow(^OBJEXT$)
-m4trace:configure.in:90: -1- m4_pattern_allow(^RANLIB$)
-m4trace:configure.in:91: -1- m4_pattern_allow(^SET_MAKE$)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_PROGRAM$)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_SCRIPT$)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_DATA$)
-m4trace:configure.in:93: -1- _m4_warn(obsolete, The macro `AC_AIX' is obsolete.
-You should run autoupdate., ../../lib/autoconf/specific.m4:432: AC_AIX is expanded from...
-configure.in:93: the top level)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPP$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPP$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^GREP$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^EGREP$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^STDC_HEADERS$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_SOURCE$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_1_SOURCE$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_MINIX$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^__EXTENSIONS__$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_ALL_SOURCE$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_GNU_SOURCE$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_PTHREAD_SEMANTICS$)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_TANDEM_SOURCE$)
-m4trace:configure.in:94: -1- _m4_warn(obsolete, The macro `AC_ISC_POSIX' is obsolete.
-You should run autoupdate., ../../lib/autoconf/specific.m4:442: AC_ISC_POSIX is expanded from...
-configure.in:94: the top level)
-m4trace:configure.in:95: -1- m4_pattern_allow(^AWK$)
-m4trace:configure.in:96: -1- m4_pattern_allow(^const$)
-m4trace:configure.in:97: -1- m4_pattern_allow(^HAVE_LONG_FILE_NAMES$)
-m4trace:configure.in:104: -1- m4_pattern_allow(^SIZEOF_INT$)
-m4trace:configure.in:105: -1- m4_pattern_allow(^SIZEOF_LONG$)
-m4trace:configure.in:106: -1- m4_pattern_allow(^SIZEOF_SIZE_T$)
-m4trace:configure.in:107: -1- m4_pattern_allow(^SIZEOF_OFF_T$)
-m4trace:configure.in:110: -1- m4_pattern_allow(^SIZEOF_LONG_LONG_INT$)
-m4trace:configure.in:111: -1- m4_pattern_allow(^SIZEOF_UNSIGNED_LONG_LONG_INT$)
-m4trace:configure.in:114: -1- m4_pattern_allow(^HAVE_LONG_LONG_INT$)
-m4trace:configure.in:115: -1- m4_pattern_allow(^WORDS_BIGENDIAN$)
-m4trace:configure.in:115: -1- m4_pattern_allow(^AC_APPLE_UNIVERSAL_BUILD$)
-m4trace:configure.in:118: -1- CMU_C___ATTRIBUTE__
-m4trace:configure.in:118: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/c-attribute.m4:9: CMU_C___ATTRIBUTE__ is expanded from...
-configure.in:118: the top level)
-m4trace:configure.in:118: -1- m4_pattern_allow(^HAVE___ATTRIBUTE__$)
-m4trace:configure.in:119: -1- CMU_C_FPIC
-m4trace:configure.in:119: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/c-fpic.m4:9: CMU_C_FPIC is expanded from...
-configure.in:119: the top level)
-m4trace:configure.in:122: -1- CMU_GUESS_RUNPATH_SWITCH
-m4trace:configure.in:122: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-cmulocal/cyrus.m4:33: CMU_GUESS_RUNPATH_SWITCH is expanded from...
-configure.in:122: the top level)
-m4trace:configure.in:122: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-cmulocal/cyrus.m4:33: CMU_GUESS_RUNPATH_SWITCH is expanded from...
-configure.in:122: the top level)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_MEMMOVE$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_STRCASECMP$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_FTRUNCATE$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_STRERROR$)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:130: -1- m4_pattern_allow(^HAVE_STDLIB_H$)
-m4trace:configure.in:131: -1- m4_pattern_allow(^HAVE_GETPASSPHRASE$)
-m4trace:configure.in:134: -1- CMU_SOCKETS
-m4trace:configure.in:134: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-cmulocal/bsd_sockets.m4:9: CMU_SOCKETS is expanded from...
-configure.in:134: the top level)
-m4trace:configure.in:134: -1- m4_pattern_allow(^LIB_SOCKET$)
-m4trace:configure.in:139: -1- IPv6_CHECK_FUNC(getaddrinfo, IPv6_CHECK_FUNC(gai_strerror,
-	AC_DEFINE(HAVE_GETADDRINFO,,Do we have a getaddrinfo?),
-	cyrus_cv_getaddrinfo=no), cyrus_cv_getaddrinfo=no)
-m4trace:configure.in:139: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:139: -2- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:139: -1- IPv6_CHECK_FUNC(gai_strerror, 
-$as_echo "@%:@define HAVE_GETADDRINFO /**/" >>confdefs.h
-, cyrus_cv_getaddrinfo=no)
-m4trace:configure.in:139: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:149: -2- m4_pattern_allow(^HAVE_GETNAMEINFO$)
-m4trace:configure.in:148: -1- IPv6_CHECK_FUNC(getnameinfo, 
-$as_echo "@%:@define HAVE_GETNAMEINFO /**/" >>confdefs.h
-, cyrus_cv_getnameinfo=no)
-m4trace:configure.in:148: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:156: -1- IPv6_CHECK_SS_FAMILY()
-m4trace:configure.in:156: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/ipv6.m4:66: IPv6_CHECK_SS_FAMILY is expanded from...
-configure.in:156: the top level)
-m4trace:configure.in:156: -2- m4_pattern_allow(^HAVE_SS_FAMILY$)
-m4trace:configure.in:157: -1- IPv6_CHECK_SA_LEN()
-m4trace:configure.in:157: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/ipv6.m4:82: IPv6_CHECK_SA_LEN is expanded from...
-configure.in:157: the top level)
-m4trace:configure.in:157: -2- m4_pattern_allow(^HAVE_SOCKADDR_SA_LEN$)
-m4trace:configure.in:159: -1- m4_pattern_allow(^IPV6_OBJS$)
-m4trace:configure.in:162: -1- m4_pattern_allow(^HAVE_SYS_TIME_H$)
-m4trace:configure.in:163: -1- m4_pattern_allow(^TIME_WITH_SYS_TIME$)
-m4trace:configure.in:164: -1- m4_pattern_allow(^TM_IN_SYS_TIME$)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_STRUCT_TM_TM_ZONE$)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_TM_ZONE$)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_DECL_TZNAME$)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_TZNAME$)
-m4trace:configure.in:167: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:168: -1- m4_pattern_allow(^PRE_SUBDIRS$)
-m4trace:configure.in:169: -1- m4_pattern_allow(^EXTRA_SUBDIRS$)
-m4trace:configure.in:170: -1- m4_pattern_allow(^DEPLIBS$)
-m4trace:configure.in:171: -1- m4_pattern_allow(^LOCALDEFS$)
-m4trace:configure.in:172: -1- m4_pattern_allow(^HAVE_VPRINTF$)
-m4trace:configure.in:172: -1- m4_pattern_allow(^HAVE_DOPRNT$)
-m4trace:configure.in:205: -1- CYRUS_BERKELEY_DB_CHK()
-m4trace:configure.in:205: -1- CYRUS_BERKELEY_DB_OPTS
-m4trace:configure.in:205: -1- CYRUS_BERKELEY_DB_CHK_LIB()
-m4trace:configure.in:205: -1- CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
-m4trace:configure.in:205: -1- CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
-m4trace:configure.in:205: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/berkdb.m4:204: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/berkdb.m4:265: CYRUS_BERKELEY_DB_CHK is expanded from...
-configure.in:205: the top level)
-m4trace:configure.in:205: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/berkdb.m4:204: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/berkdb.m4:265: CYRUS_BERKELEY_DB_CHK is expanded from...
-configure.in:205: the top level)
-m4trace:configure.in:208: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:208: the top level)
-m4trace:configure.in:213: -1- CMU_ADD_LIBPATH($with_bdb_lib)
-m4trace:configure.in:218: -1- m4_pattern_allow(^BDB_INC$)
-m4trace:configure.in:219: -1- m4_pattern_allow(^BDB_LIB$)
-m4trace:configure.in:225: -1- m4_pattern_allow(^HAVE_BDB$)
-m4trace:configure.in:257: -1- CYRUS_MYSQL_CHK()
-m4trace:configure.in:257: -1- CYRUS_MYSQL_OPTS
-m4trace:configure.in:257: -1- CYRUS_MYSQL_CHK_LIB()
-m4trace:configure.in:257: -1- CMU_ADD_LIBPATH_TO($with_mysql_lib, LDFLAGS)
-m4trace:configure.in:257: -1- CMU_ADD_LIBPATH_TO($with_mysql_lib, MYSQL_LIBADD)
-m4trace:configure.in:257: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:16: CYRUS_MYSQL_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:55: CYRUS_MYSQL_CHK is expanded from...
-configure.in:257: the top level)
-m4trace:configure.in:260: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:260: the top level)
-m4trace:configure.in:267: -1- CMU_ADD_LIBPATH($with_mysql_lib)
-m4trace:configure.in:273: -1- m4_pattern_allow(^HAVE_MYSQL$)
-m4trace:configure.in:301: -1- CYRUS_PGSQL_CHK()
-m4trace:configure.in:301: -1- CYRUS_PGSQL_OPTS
-m4trace:configure.in:301: -1- CYRUS_PGSQL_CHK_LIB()
-m4trace:configure.in:301: -1- CMU_ADD_LIBPATH_TO($with_pgsql_lib, LDFLAGS)
-m4trace:configure.in:301: -1- CMU_ADD_LIBPATH_TO($with_pgsql_lib, PGSQL_LIBADD)
-m4trace:configure.in:301: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:90: CYRUS_PGSQL_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:129: CYRUS_PGSQL_CHK is expanded from...
-configure.in:301: the top level)
-m4trace:configure.in:304: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:304: the top level)
-m4trace:configure.in:311: -1- CMU_ADD_LIBPATH($with_pgsql_lib)
-m4trace:configure.in:317: -1- m4_pattern_allow(^HAVE_PGSQL$)
-m4trace:configure.in:345: -1- CYRUS_SQLITE_CHK()
-m4trace:configure.in:345: -1- CYRUS_SQLITE_OPTS
-m4trace:configure.in:345: -1- CYRUS_SQLITE_CHK_LIB()
-m4trace:configure.in:345: -1- CMU_ADD_LIBPATH_TO($with_sqlite_lib, LDFLAGS)
-m4trace:configure.in:345: -1- CMU_ADD_LIBPATH_TO($with_sqlite_lib, SQLITE_LIBADD)
-m4trace:configure.in:345: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:164: CYRUS_SQLITE_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:203: CYRUS_SQLITE_CHK is expanded from...
-configure.in:345: the top level)
-m4trace:configure.in:348: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:348: the top level)
-m4trace:configure.in:355: -1- CMU_ADD_LIBPATH($with_sqlite_lib)
-m4trace:configure.in:361: -1- m4_pattern_allow(^HAVE_SQLITE$)
-m4trace:configure.in:373: -1- m4_pattern_allow(^CYRUSDB_OBJS$)
-m4trace:configure.in:392: -1- m4_pattern_allow(^SIEVE_OBJS$)
-m4trace:configure.in:394: -1- m4_pattern_allow(^SIEVE_LIBS$)
-m4trace:configure.in:396: -1- m4_pattern_allow(^SIEVE_CPPFLAGS$)
-m4trace:configure.in:397: -1- m4_pattern_allow(^USE_SIEVE$)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YACC$)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YACC$)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YFLAGS$)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEX$)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEX_OUTPUT_ROOT$)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEXLIB$)
-m4trace:configure.in:401: -1- m4_pattern_allow(^YYTEXT_POINTER$)
-m4trace:configure.in:402: -1- m4_pattern_allow(^HAVE_LIBFL$)
-m4trace:configure.in:408: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:408: the top level)
-m4trace:configure.in:420: -1- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:421: -1- m4_pattern_allow(^HAVE_PCREPOSIX_H$)
-m4trace:configure.in:423: -1- m4_pattern_allow(^HAVE_RXPOSIX_H$)
-m4trace:configure.in:426: -1- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:430: -2- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:439: -1- m4_pattern_allow(^SIEVE_SUBDIRS$)
-m4trace:configure.in:442: -2- m4_pattern_allow(^HAS_STRERROR$)
-m4trace:configure.in:443: -2- m4_pattern_allow(^NEED_SYS_ERRLIST$)
-m4trace:configure.in:442: -1- _m4_warn(obsolete, The macro `AC_FUNC_CHECK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/functions.m4:156: AC_FUNC_CHECK is expanded from...
-configure.in:442: the top level)
-m4trace:configure.in:446: -1- m4_pattern_allow(^HAVE_SYS_RESOURCE_H$)
-m4trace:configure.in:447: -1- m4_pattern_allow(^HAVE_SETRLIMIT$)
-m4trace:configure.in:448: -1- m4_pattern_allow(^HAVE_GETRLIMIT$)
-m4trace:configure.in:454: -1- m4_pattern_allow(^HAVE_SHUTDOWN$)
-m4trace:configure.in:456: -2- m4_pattern_allow(^HAVE_SOCKLEN_T$)
-m4trace:configure.in:458: -2- m4_pattern_allow(^HAVE_STRUCT_SOCKADDR_STORAGE$)
-m4trace:configure.in:459: -2- m4_pattern_allow(^HAVE_RLIM_T$)
-m4trace:configure.in:477: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:477: the top level)
-m4trace:configure.in:490: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:490: the top level)
-m4trace:configure.in:501: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:501: the top level)
-m4trace:configure.in:511: -1- m4_pattern_allow(^SPT_TYPE$)
-m4trace:configure.in:515: -2- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-configure.in:515: the top level)
-m4trace:configure.in:523: -1- m4_pattern_allow(^WITH_NONBLOCK$)
-m4trace:configure.in:527: -2- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-configure.in:527: the top level)
-m4trace:configure.in:532: -1- m4_pattern_allow(^WITH_GMTOFF$)
-m4trace:configure.in:535: -2- _m4_warn(obsolete, The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2765: AC_TRY_RUN is expanded from...
-configure.in:535: the top level)
-m4trace:configure.in:566: -2- _m4_warn(obsolete, The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2765: AC_TRY_RUN is expanded from...
-configure.in:566: the top level)
-m4trace:configure.in:603: -1- m4_pattern_allow(^WITH_MAP$)
-m4trace:configure.in:604: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-configure.in:604: the top level)
-m4trace:configure.in:614: -1- m4_pattern_allow(^WITH_LOCK$)
-m4trace:configure.in:618: -2- m4_pattern_allow(^HAVE_FDATASYNC$)
-m4trace:configure.in:618: -1- m4_pattern_allow(^HAVE_FDATASYNC$)
-m4trace:configure.in:645: -1- m4_pattern_allow(^cyrus_cv_sigveclib$)
-m4trace:configure.in:665: -1- SASL_SET_GSSAPI_LIBS
-m4trace:configure.in:665: -1- m4_pattern_allow(^AFSPTS_USE_KRB5$)
-m4trace:configure.in:675: -1- CMU_ADD_LIBPATH_TO(/usr/ucblib, AFS_LDFLAGS)
-m4trace:configure.in:684: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-configure.in:684: the top level)
-m4trace:configure.in:707: -1- m4_pattern_allow(^AFS_LIBS$)
-m4trace:configure.in:708: -1- m4_pattern_allow(^AFS_LDFLAGS$)
-m4trace:configure.in:709: -1- m4_pattern_allow(^HAVE_AFSKRB$)
-m4trace:configure.in:713: -1- m4_pattern_allow(^AFS_LIBS$)
-m4trace:configure.in:714: -1- m4_pattern_allow(^AFS_LDFLAGS$)
-m4trace:configure.in:715: -1- m4_pattern_allow(^HAVE_AFSKRB$)
-m4trace:configure.in:738: -1- m4_pattern_allow(^HAVE_LDAP$)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_CPPFLAGS$)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_LDFLAGS$)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_LIBS$)
-m4trace:configure.in:748: -1- m4_pattern_allow(^HAVE_LDAP$)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_CPPFLAGS$)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_LDFLAGS$)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_LIBS$)
-m4trace:configure.in:763: -1- m4_pattern_allow(^WITH_PTS$)
-m4trace:configure.in:774: -1- m4_pattern_allow(^SERVER_SUBDIRS$)
-m4trace:configure.in:792: -1- m4_pattern_allow(^HAVE_LIBRESOLV$)
-m4trace:configure.in:829: -1- CMU_ADD_LIBPATH(${with_krb}/lib)
-m4trace:configure.in:846: -3- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:846: the top level)
-m4trace:configure.in:848: -2- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:848: the top level)
-m4trace:configure.in:850: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:850: the top level)
-m4trace:configure.in:855: -1- m4_pattern_allow(^HAVE_KRB$)
-m4trace:configure.in:860: -1- SASL_SET_GSSAPI_LIBS
-m4trace:configure.in:893: -1- CMU_ADD_LIBPATH(${OPENSSL_LIBPATH})
-m4trace:configure.in:894: -1- CMU_ADD_LIBPATH_TO(${OPENSSL_LIBPATH}, OPENSSL_LIB)
-m4trace:configure.in:902: -1- m4_pattern_allow(^HAVE_SSL$)
-m4trace:configure.in:905: -1- m4_pattern_allow(^OPENSSL_ENABLE_OLD_DES_SUPPORT$)
-m4trace:configure.in:906: -1- m4_pattern_allow(^OPENSSL_DES_LIBDES_COMPATIBILITY$)
-m4trace:configure.in:909: -1- m4_pattern_allow(^OPENSSL_INC$)
-m4trace:configure.in:910: -1- m4_pattern_allow(^OPENSSL_LIB$)
-m4trace:configure.in:921: -1- m4_pattern_allow(^EGD_SOCKET$)
-m4trace:configure.in:927: -1- CMU_HAVE_ZLIB
-m4trace:configure.in:927: -1- CMU_FIND_LIB_SUBDIR
-m4trace:configure.in:927: -2- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-cmulocal/common.m4:42: CMU_FIND_LIB_SUBDIR is expanded from...
-cmulocal/zlib.m4:6: CMU_HAVE_ZLIB is expanded from...
-configure.in:927: the top level)
-m4trace:configure.in:927: -1- m4_pattern_allow(^SIZEOF_LONG$)
-m4trace:configure.in:927: -1- m4_pattern_allow(^CMU_LIB_SUBDIR$)
-m4trace:configure.in:927: -1- CMU_ADD_LIBPATH(${with_zlib}/$CMU_LIB_SUBDIR)
-m4trace:configure.in:927: -1- m4_pattern_allow(^HAVE_ZLIB$)
-m4trace:configure.in:930: -1- m4_pattern_allow(^ZLIB$)
-m4trace:configure.in:951: -1- m4_pattern_allow(^ZEPHYR_LIBS$)
-m4trace:configure.in:953: -1- m4_pattern_allow(^HAVE_ZEPHYR$)
-m4trace:configure.in:963: -1- m4_pattern_allow(^MASTER_PIDFILE$)
-m4trace:configure.in:996: -1- m4_pattern_allow(^HAVE_SYS_SOCKIO_H$)
-m4trace:configure.in:1010: -1- m4_pattern_allow(^IMAP_PROGS$)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^HAVE_ET_COM_ERR_H$)
-m4trace:configure.in:1024: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
-configure.in:1024: the top level)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1119: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1120: -1- m4_pattern_allow(^COM_ERR_LIBS$)
-m4trace:configure.in:1121: -1- m4_pattern_allow(^COM_ERR_LDFLAGS$)
-m4trace:configure.in:1122: -1- m4_pattern_allow(^COM_ERR_CPPFLAGS$)
-m4trace:configure.in:1125: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:1125: the top level)
-m4trace:configure.in:1143: -1- m4_pattern_allow(^SYSLOG_FACILITY$)
-m4trace:configure.in:1147: -1- m4_pattern_allow(^HAVE_GETDTABLESIZE$)
-m4trace:configure.in:1147: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:1160: -2- m4_pattern_allow(^OLD_SIEVE_SERVICE_NAME$)
-m4trace:configure.in:1170: -2- m4_pattern_allow(^ENABLE_X_NETSCAPE_HACK$)
-m4trace:configure.in:1173: -1- m4_pattern_allow(^HAVE_LIBDL$)
-m4trace:configure.in:1174: -1- CMU_SASL2_REQUIRE_VER(2, 1, 7)
-m4trace:configure.in:1174: -1- CMU_SASL2_REQUIRED
-m4trace:configure.in:1174: -1- CMU_SASL2
-m4trace:configure.in:1174: -1- SASL_GSSAPI_CHK
-m4trace:configure.in:1174: -1- SASL2_CRYPT_CHK
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_CRYPT$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1463: AC_ARG_ENABLE is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSSAPI_H$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_LIBRESOLV$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2539: AC_EGREP_CPP is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2539: AC_EGREP_CPP is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^GSSAPI_LIBS$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^GSSAPIBASE_LIBS$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
-m4trace:configure.in:1174: -1- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_DYN_SASL$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^DYNSASLFLAGS$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_SASL$)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^SASLFLAGS$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2504: _AC_PREPROC_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2519: AC_PREPROC_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1175: -1- CMU_SASL2_CHECKAPOP_REQUIRED
-m4trace:configure.in:1175: -1- m4_pattern_allow(^HAVE_APOP$)
-m4trace:configure.in:1188: -1- m4_pattern_allow(^PERL$)
-m4trace:configure.in:1207: -1- m4_pattern_allow(^PERL_CCCDLFLAGS$)
-m4trace:configure.in:1230: -1- m4_pattern_allow(^SNMP_SUBDIRS$)
-m4trace:configure.in:1232: -1- CMU_LIBWRAP
-m4trace:configure.in:1232: -1- m4_pattern_allow(^HAVE_LIBWRAP$)
-m4trace:configure.in:1232: -1- m4_pattern_allow(^LIB_WRAP$)
-m4trace:configure.in:1233: -1- CMU_UCDSNMP
-m4trace:configure.in:1233: -1- m4_pattern_allow(^SNMP_CONFIG$)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_NETSNMP$)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^LIB_UCDSNMP$)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H$)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_UCDSNMP$)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^LIB_UCDSNMP$)
-m4trace:configure.in:1268: -1- m4_pattern_allow(^LIB_RT$)
-m4trace:configure.in:1269: -1- m4_pattern_allow(^IMAP_COM_ERR_LIBS$)
-m4trace:configure.in:1270: -1- m4_pattern_allow(^IMAP_LIBS$)
-m4trace:configure.in:1278: -1- m4_pattern_allow(^PERL_SUBDIRS$)
-m4trace:configure.in:1279: -1- m4_pattern_allow(^PERL_DEPSUBDIRS$)
-m4trace:configure.in:1280: -1- m4_pattern_allow(^PERL$)
-m4trace:configure.in:1497: -1- _m4_warn(obsolete, AC_OUTPUT should be used without arguments.
-You should run autoupdate., )
-m4trace:configure.in:1497: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:1497: -1- m4_pattern_allow(^LTLIBOBJS$)

cyrus-imapd-2.4.17.tar.gz/autom4te.cache/traces.1 Deleted

@@ -1,1564 +0,0 @@
-m4trace:aclocal.m4:15: -1- m4_include(cmulocal/berkdb.m4)
-m4trace:aclocal.m4:16: -1- m4_include(cmulocal/bsd_sockets.m4)
-m4trace:aclocal.m4:17: -1- m4_include(cmulocal/c-attribute.m4)
-m4trace:aclocal.m4:18: -1- m4_include(cmulocal/c-fpic.m4)
-m4trace:aclocal.m4:19: -1- m4_include(cmulocal/common.m4)
-m4trace:aclocal.m4:20: -1- m4_include(cmulocal/cyrus.m4)
-m4trace:aclocal.m4:21: -1- m4_include(cmulocal/ipv6.m4)
-m4trace:aclocal.m4:22: -1- m4_include(cmulocal/libwrap.m4)
-m4trace:aclocal.m4:23: -1- m4_include(cmulocal/sasl2.m4)
-m4trace:aclocal.m4:24: -1- m4_include(cmulocal/sql.m4)
-m4trace:aclocal.m4:25: -1- m4_include(cmulocal/ucdsnmp.m4)
-m4trace:aclocal.m4:26: -1- m4_include(cmulocal/zlib.m4)
-m4trace:configure.in:49: -1- AC_INIT(imap/imapd.c)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?ACHUM_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(_AC_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^LIBOBJS$, do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS')
-m4trace:configure.in:49: -1- m4_pattern_allow(^AS_FLAGS$)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?m4_)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^dnl$)
-m4trace:configure.in:49: -1- m4_pattern_forbid(^_?AS_)
-m4trace:configure.in:49: -1- AC_SUBST(SHELL)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(SHELL)
-m4trace:configure.in:49: -1- m4_pattern_allow(^SHELL$)
-m4trace:configure.in:49: -1- AC_SUBST(PATH_SEPARATOR)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PATH_SEPARATOR)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PATH_SEPARATOR$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_NAME, m4_ifdef(AC_PACKAGE_NAME, 'AC_PACKAGE_NAME'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_NAME)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_NAME$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_TARNAME, m4_ifdef(AC_PACKAGE_TARNAME, 'AC_PACKAGE_TARNAME'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_TARNAME)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_TARNAME$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_VERSION, m4_ifdef(AC_PACKAGE_VERSION, 'AC_PACKAGE_VERSION'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_VERSION)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_VERSION$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_STRING, m4_ifdef(AC_PACKAGE_STRING, 'AC_PACKAGE_STRING'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_STRING)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_STRING$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_BUGREPORT, m4_ifdef(AC_PACKAGE_BUGREPORT, 'AC_PACKAGE_BUGREPORT'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_BUGREPORT)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_BUGREPORT$)
-m4trace:configure.in:49: -1- AC_SUBST(PACKAGE_URL, m4_ifdef(AC_PACKAGE_URL, 'AC_PACKAGE_URL'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(PACKAGE_URL)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_URL$)
-m4trace:configure.in:49: -1- AC_SUBST(exec_prefix, NONE)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(exec_prefix)
-m4trace:configure.in:49: -1- m4_pattern_allow(^exec_prefix$)
-m4trace:configure.in:49: -1- AC_SUBST(prefix, NONE)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(prefix)
-m4trace:configure.in:49: -1- m4_pattern_allow(^prefix$)
-m4trace:configure.in:49: -1- AC_SUBST(program_transform_name, s,x,x,)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(program_transform_name)
-m4trace:configure.in:49: -1- m4_pattern_allow(^program_transform_name$)
-m4trace:configure.in:49: -1- AC_SUBST(bindir, '${exec_prefix}/bin')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(bindir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^bindir$)
-m4trace:configure.in:49: -1- AC_SUBST(sbindir, '${exec_prefix}/sbin')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(sbindir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sbindir$)
-m4trace:configure.in:49: -1- AC_SUBST(libexecdir, '${exec_prefix}/libexec')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(libexecdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^libexecdir$)
-m4trace:configure.in:49: -1- AC_SUBST(datarootdir, '${prefix}/share')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(datarootdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^datarootdir$)
-m4trace:configure.in:49: -1- AC_SUBST(datadir, '${datarootdir}')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(datadir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^datadir$)
-m4trace:configure.in:49: -1- AC_SUBST(sysconfdir, '${prefix}/etc')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(sysconfdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sysconfdir$)
-m4trace:configure.in:49: -1- AC_SUBST(sharedstatedir, '${prefix}/com')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(sharedstatedir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^sharedstatedir$)
-m4trace:configure.in:49: -1- AC_SUBST(localstatedir, '${prefix}/var')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(localstatedir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^localstatedir$)
-m4trace:configure.in:49: -1- AC_SUBST(includedir, '${prefix}/include')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(includedir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^includedir$)
-m4trace:configure.in:49: -1- AC_SUBST(oldincludedir, '/usr/include')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(oldincludedir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^oldincludedir$)
-m4trace:configure.in:49: -1- AC_SUBST(docdir, m4_ifset(AC_PACKAGE_TARNAME,
-				 '${datarootdir}/doc/${PACKAGE_TARNAME}',
-				 '${datarootdir}/doc/${PACKAGE}'))
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(docdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^docdir$)
-m4trace:configure.in:49: -1- AC_SUBST(infodir, '${datarootdir}/info')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(infodir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^infodir$)
-m4trace:configure.in:49: -1- AC_SUBST(htmldir, '${docdir}')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(htmldir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^htmldir$)
-m4trace:configure.in:49: -1- AC_SUBST(dvidir, '${docdir}')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(dvidir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^dvidir$)
-m4trace:configure.in:49: -1- AC_SUBST(pdfdir, '${docdir}')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(pdfdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^pdfdir$)
-m4trace:configure.in:49: -1- AC_SUBST(psdir, '${docdir}')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(psdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^psdir$)
-m4trace:configure.in:49: -1- AC_SUBST(libdir, '${exec_prefix}/lib')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(libdir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^libdir$)
-m4trace:configure.in:49: -1- AC_SUBST(localedir, '${datarootdir}/locale')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(localedir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^localedir$)
-m4trace:configure.in:49: -1- AC_SUBST(mandir, '${datarootdir}/man')
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(mandir)
-m4trace:configure.in:49: -1- m4_pattern_allow(^mandir$)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_NAME)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_NAME$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_NAME, /* Define to the full name of this package. */
-@%:@undef PACKAGE_NAME)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_TARNAME)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_TARNAME$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_TARNAME, /* Define to the one symbol short name of this package. */
-@%:@undef PACKAGE_TARNAME)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_VERSION)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_VERSION$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_VERSION, /* Define to the version of this package. */
-@%:@undef PACKAGE_VERSION)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_STRING)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_STRING$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_STRING, /* Define to the full name and version of this package. */
-@%:@undef PACKAGE_STRING)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_BUGREPORT)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_BUGREPORT$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_BUGREPORT, /* Define to the address where bug reports for this package should be sent. */
-@%:@undef PACKAGE_BUGREPORT)
-m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL(PACKAGE_URL)
-m4trace:configure.in:49: -1- m4_pattern_allow(^PACKAGE_URL$)
-m4trace:configure.in:49: -1- AH_OUTPUT(PACKAGE_URL, /* Define to the home page for this package. */
-@%:@undef PACKAGE_URL)
-m4trace:configure.in:49: -1- AC_SUBST(DEFS)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(DEFS)
-m4trace:configure.in:49: -1- m4_pattern_allow(^DEFS$)
-m4trace:configure.in:49: -1- AC_SUBST(ECHO_C)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(ECHO_C)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_C$)
-m4trace:configure.in:49: -1- AC_SUBST(ECHO_N)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(ECHO_N)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_N$)
-m4trace:configure.in:49: -1- AC_SUBST(ECHO_T)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(ECHO_T)
-m4trace:configure.in:49: -1- m4_pattern_allow(^ECHO_T$)
-m4trace:configure.in:49: -1- AC_SUBST(LIBS)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(LIBS)
-m4trace:configure.in:49: -1- m4_pattern_allow(^LIBS$)
-m4trace:configure.in:49: -1- AC_SUBST(build_alias)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(build_alias)
-m4trace:configure.in:49: -1- m4_pattern_allow(^build_alias$)
-m4trace:configure.in:49: -1- AC_SUBST(host_alias)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(host_alias)
-m4trace:configure.in:49: -1- m4_pattern_allow(^host_alias$)
-m4trace:configure.in:49: -1- AC_SUBST(target_alias)
-m4trace:configure.in:49: -1- AC_SUBST_TRACE(target_alias)
-m4trace:configure.in:49: -1- m4_pattern_allow(^target_alias$)
-m4trace:configure.in:51: -1- AC_CONFIG_HEADERS(config.h)
-m4trace:configure.in:52: -1- AC_CANONICAL_SYSTEM
-m4trace:configure.in:52: -1- _m4_warn(obsolete, The macro `AC_CANONICAL_SYSTEM' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:1858: AC_CANONICAL_SYSTEM is expanded from...
-configure.in:52: the top level)
-m4trace:configure.in:52: -1- AC_CANONICAL_TARGET
-m4trace:configure.in:52: -1- AC_CANONICAL_HOST
-m4trace:configure.in:52: -1- AC_CANONICAL_BUILD
-m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE(config.sub)
-m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE(config.guess)
-m4trace:configure.in:52: -1- AC_SUBST(build, $ac_cv_build)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(build)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build$)
-m4trace:configure.in:52: -1- AC_SUBST(build_cpu, $1)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(build_cpu)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_cpu$)
-m4trace:configure.in:52: -1- AC_SUBST(build_vendor, $2)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(build_vendor)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_vendor$)
-m4trace:configure.in:52: -1- AC_SUBST(build_os)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(build_os)
-m4trace:configure.in:52: -1- m4_pattern_allow(^build_os$)
-m4trace:configure.in:52: -1- AC_SUBST(host, $ac_cv_host)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(host)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host$)
-m4trace:configure.in:52: -1- AC_SUBST(host_cpu, $1)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(host_cpu)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_cpu$)
-m4trace:configure.in:52: -1- AC_SUBST(host_vendor, $2)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(host_vendor)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_vendor$)
-m4trace:configure.in:52: -1- AC_SUBST(host_os)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(host_os)
-m4trace:configure.in:52: -1- m4_pattern_allow(^host_os$)
-m4trace:configure.in:52: -1- AC_SUBST(target, $ac_cv_target)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(target)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target$)
-m4trace:configure.in:52: -1- AC_SUBST(target_cpu, $1)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(target_cpu)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_cpu$)
-m4trace:configure.in:52: -1- AC_SUBST(target_vendor, $2)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(target_vendor)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_vendor$)
-m4trace:configure.in:52: -1- AC_SUBST(target_os)
-m4trace:configure.in:52: -1- AC_SUBST_TRACE(target_os)
-m4trace:configure.in:52: -1- m4_pattern_allow(^target_os$)
-m4trace:configure.in:55: -1- AC_DEFINE_TRACE_LITERAL(EXTRA_IDENT)
-m4trace:configure.in:55: -1- m4_pattern_allow(^EXTRA_IDENT$)
-m4trace:configure.in:55: -1- AH_OUTPUT(EXTRA_IDENT, /* Extra version information for imap/version.h */
-@%:@undef EXTRA_IDENT)
-m4trace:configure.in:58: -1- AC_SUBST(MAKEDEPEND)
-m4trace:configure.in:58: -1- AC_SUBST_TRACE(MAKEDEPEND)
-m4trace:configure.in:58: -1- m4_pattern_allow(^MAKEDEPEND$)
-m4trace:configure.in:63: -2- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:63: the top level)
-m4trace:configure.in:68: -1- AC_SUBST(cyrus_prefix)
-m4trace:configure.in:68: -1- AC_SUBST_TRACE(cyrus_prefix)
-m4trace:configure.in:68: -1- m4_pattern_allow(^cyrus_prefix$)
-m4trace:configure.in:69: -1- AC_DEFINE_TRACE_LITERAL(CYRUS_PATH)
-m4trace:configure.in:69: -1- m4_pattern_allow(^CYRUS_PATH$)
-m4trace:configure.in:69: -1- AH_OUTPUT(CYRUS_PATH, /* Where will we be installed? */
-@%:@undef CYRUS_PATH)
-m4trace:configure.in:72: -1- AC_SUBST(service_path)
-m4trace:configure.in:72: -1- AC_SUBST_TRACE(service_path)
-m4trace:configure.in:72: -1- m4_pattern_allow(^service_path$)
-m4trace:configure.in:73: -1- AC_DEFINE_TRACE_LITERAL(SERVICE_PATH)
-m4trace:configure.in:73: -1- m4_pattern_allow(^SERVICE_PATH$)
-m4trace:configure.in:73: -1- AH_OUTPUT(SERVICE_PATH, /* Directory to use for service binaries */
-@%:@undef SERVICE_PATH)
-m4trace:configure.in:76: -1- AC_SUBST(cyrus_user)
-m4trace:configure.in:76: -1- AC_SUBST_TRACE(cyrus_user)
-m4trace:configure.in:76: -1- m4_pattern_allow(^cyrus_user$)
-m4trace:configure.in:77: -1- AC_DEFINE_TRACE_LITERAL(CYRUS_USER)
-m4trace:configure.in:77: -1- m4_pattern_allow(^CYRUS_USER$)
-m4trace:configure.in:77: -1- AH_OUTPUT(CYRUS_USER, /* What user will we run as? */
-@%:@undef CYRUS_USER)
-m4trace:configure.in:80: -1- AC_SUBST(cyrus_group)
-m4trace:configure.in:80: -1- AC_SUBST_TRACE(cyrus_group)
-m4trace:configure.in:80: -1- m4_pattern_allow(^cyrus_group$)
-m4trace:configure.in:87: -1- AC_DEFINE_TRACE_LITERAL(SYSCONFDIR)
-m4trace:configure.in:87: -1- m4_pattern_allow(^SYSCONFDIR$)
-m4trace:configure.in:87: -1- AH_OUTPUT(SYSCONFDIR, /* Config File Location */
-@%:@undef SYSCONFDIR)
-m4trace:configure.in:89: -1- AC_SUBST(CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- AC_SUBST(CFLAGS)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CFLAGS)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CFLAGS$)
-m4trace:configure.in:89: -1- AC_SUBST(LDFLAGS)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(LDFLAGS)
-m4trace:configure.in:89: -1- m4_pattern_allow(^LDFLAGS$)
-m4trace:configure.in:89: -1- AC_SUBST(LIBS)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(LIBS)
-m4trace:configure.in:89: -1- m4_pattern_allow(^LIBS$)
-m4trace:configure.in:89: -1- AC_SUBST(CPPFLAGS)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CPPFLAGS)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:89: -1- AC_SUBST(CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- AC_SUBST(CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- AC_SUBST(CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- AC_SUBST(CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^CC$)
-m4trace:configure.in:89: -1- AC_SUBST(ac_ct_CC)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(ac_ct_CC)
-m4trace:configure.in:89: -1- m4_pattern_allow(^ac_ct_CC$)
-m4trace:configure.in:89: -1- AC_SUBST(EXEEXT, $ac_cv_exeext)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(EXEEXT)
-m4trace:configure.in:89: -1- m4_pattern_allow(^EXEEXT$)
-m4trace:configure.in:89: -1- AC_SUBST(OBJEXT, $ac_cv_objext)
-m4trace:configure.in:89: -1- AC_SUBST_TRACE(OBJEXT)
-m4trace:configure.in:89: -1- m4_pattern_allow(^OBJEXT$)
-m4trace:configure.in:90: -1- AC_SUBST(RANLIB)
-m4trace:configure.in:90: -1- AC_SUBST_TRACE(RANLIB)
-m4trace:configure.in:90: -1- m4_pattern_allow(^RANLIB$)
-m4trace:configure.in:91: -1- AC_SUBST(SET_MAKE)
-m4trace:configure.in:91: -1- AC_SUBST_TRACE(SET_MAKE)
-m4trace:configure.in:91: -1- m4_pattern_allow(^SET_MAKE$)
-m4trace:configure.in:92: -1- AC_REQUIRE_AUX_FILE(install-sh)
-m4trace:configure.in:92: -1- AC_SUBST(INSTALL_PROGRAM)
-m4trace:configure.in:92: -1- AC_SUBST_TRACE(INSTALL_PROGRAM)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_PROGRAM$)
-m4trace:configure.in:92: -1- AC_SUBST(INSTALL_SCRIPT)
-m4trace:configure.in:92: -1- AC_SUBST_TRACE(INSTALL_SCRIPT)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_SCRIPT$)
-m4trace:configure.in:92: -1- AC_SUBST(INSTALL_DATA)
-m4trace:configure.in:92: -1- AC_SUBST_TRACE(INSTALL_DATA)
-m4trace:configure.in:92: -1- m4_pattern_allow(^INSTALL_DATA$)
-m4trace:configure.in:93: -1- _m4_warn(obsolete, The macro `AC_AIX' is obsolete.
-You should run autoupdate., ../../lib/autoconf/specific.m4:432: AC_AIX is expanded from...
-configure.in:93: the top level)
-m4trace:configure.in:93: -1- AC_SUBST(CPP)
-m4trace:configure.in:93: -1- AC_SUBST_TRACE(CPP)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPP$)
-m4trace:configure.in:93: -1- AC_SUBST(CPPFLAGS)
-m4trace:configure.in:93: -1- AC_SUBST_TRACE(CPPFLAGS)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:93: -1- AC_SUBST(CPP)
-m4trace:configure.in:93: -1- AC_SUBST_TRACE(CPP)
-m4trace:configure.in:93: -1- m4_pattern_allow(^CPP$)
-m4trace:configure.in:93: -1- AC_SUBST(GREP)
-m4trace:configure.in:93: -1- AC_SUBST_TRACE(GREP)
-m4trace:configure.in:93: -1- m4_pattern_allow(^GREP$)
-m4trace:configure.in:93: -1- AC_SUBST(EGREP)
-m4trace:configure.in:93: -1- AC_SUBST_TRACE(EGREP)
-m4trace:configure.in:93: -1- m4_pattern_allow(^EGREP$)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(STDC_HEADERS)
-m4trace:configure.in:93: -1- m4_pattern_allow(^STDC_HEADERS$)
-m4trace:configure.in:93: -1- AH_OUTPUT(STDC_HEADERS, /* Define to 1 if you have the ANSI C header files. */
-@%:@undef STDC_HEADERS)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_SYS_TYPES_H, /* Define to 1 if you have the <sys/types.h> header file. */
-@%:@undef HAVE_SYS_TYPES_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_SYS_STAT_H, /* Define to 1 if you have the <sys/stat.h> header file. */
-@%:@undef HAVE_SYS_STAT_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_STDLIB_H, /* Define to 1 if you have the <stdlib.h> header file. */
-@%:@undef HAVE_STDLIB_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_STRING_H, /* Define to 1 if you have the <string.h> header file. */
-@%:@undef HAVE_STRING_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_MEMORY_H, /* Define to 1 if you have the <memory.h> header file. */
-@%:@undef HAVE_MEMORY_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_STRINGS_H, /* Define to 1 if you have the <strings.h> header file. */
-@%:@undef HAVE_STRINGS_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_INTTYPES_H, /* Define to 1 if you have the <inttypes.h> header file. */
-@%:@undef HAVE_INTTYPES_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_STDINT_H, /* Define to 1 if you have the <stdint.h> header file. */
-@%:@undef HAVE_STDINT_H)
-m4trace:configure.in:93: -1- AH_OUTPUT(HAVE_UNISTD_H, /* Define to 1 if you have the <unistd.h> header file. */
-@%:@undef HAVE_UNISTD_H)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_POSIX_SOURCE)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_SOURCE$)
-m4trace:configure.in:93: -1- AH_OUTPUT(_POSIX_SOURCE, /* Define to 1 if you need to in order for `stat\' and other things to work. */
-@%:@undef _POSIX_SOURCE)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_POSIX_1_SOURCE)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_1_SOURCE$)
-m4trace:configure.in:93: -1- AH_OUTPUT(_POSIX_1_SOURCE, /* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-@%:@undef _POSIX_1_SOURCE)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_MINIX)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_MINIX$)
-m4trace:configure.in:93: -1- AH_OUTPUT(_MINIX, /* Define to 1 if on MINIX. */
-@%:@undef _MINIX)
-m4trace:configure.in:93: -1- AH_OUTPUT(USE_SYSTEM_EXTENSIONS, /* Enable extensions on AIX 3, Interix. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris. */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop. */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(__EXTENSIONS__)
-m4trace:configure.in:93: -1- m4_pattern_allow(^__EXTENSIONS__$)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_ALL_SOURCE)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_ALL_SOURCE$)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_GNU_SOURCE)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_GNU_SOURCE$)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_POSIX_PTHREAD_SEMANTICS)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_POSIX_PTHREAD_SEMANTICS$)
-m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL(_TANDEM_SOURCE)
-m4trace:configure.in:93: -1- m4_pattern_allow(^_TANDEM_SOURCE$)
-m4trace:configure.in:94: -1- _m4_warn(obsolete, The macro `AC_ISC_POSIX' is obsolete.
-You should run autoupdate., ../../lib/autoconf/specific.m4:442: AC_ISC_POSIX is expanded from...
-configure.in:94: the top level)
-m4trace:configure.in:95: -1- AC_SUBST(AWK)
-m4trace:configure.in:95: -1- AC_SUBST_TRACE(AWK)
-m4trace:configure.in:95: -1- m4_pattern_allow(^AWK$)
-m4trace:configure.in:96: -1- AC_DEFINE_TRACE_LITERAL(const)
-m4trace:configure.in:96: -1- m4_pattern_allow(^const$)
-m4trace:configure.in:96: -1- AH_OUTPUT(const, /* Define to empty if `const\' does not conform to ANSI C. */
-@%:@undef const)
-m4trace:configure.in:97: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LONG_FILE_NAMES)
-m4trace:configure.in:97: -1- m4_pattern_allow(^HAVE_LONG_FILE_NAMES$)
-m4trace:configure.in:97: -1- AH_OUTPUT(HAVE_LONG_FILE_NAMES, /* Define to 1 if you support file names longer than 14 characters. */
-@%:@undef HAVE_LONG_FILE_NAMES)
-m4trace:configure.in:101: -1- AH_OUTPUT(inline, /* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
- calls it, or to nothing if \'inline\' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif)
-m4trace:configure.in:104: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_INT)
-m4trace:configure.in:104: -1- m4_pattern_allow(^SIZEOF_INT$)
-m4trace:configure.in:104: -1- AH_OUTPUT(SIZEOF_INT, /* The size of `int\', as computed by sizeof. */
-@%:@undef SIZEOF_INT)
-m4trace:configure.in:105: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_LONG)
-m4trace:configure.in:105: -1- m4_pattern_allow(^SIZEOF_LONG$)
-m4trace:configure.in:105: -1- AH_OUTPUT(SIZEOF_LONG, /* The size of `long\', as computed by sizeof. */
-@%:@undef SIZEOF_LONG)
-m4trace:configure.in:106: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_SIZE_T)
-m4trace:configure.in:106: -1- m4_pattern_allow(^SIZEOF_SIZE_T$)
-m4trace:configure.in:106: -1- AH_OUTPUT(SIZEOF_SIZE_T, /* The size of `size_t\', as computed by sizeof. */
-@%:@undef SIZEOF_SIZE_T)
-m4trace:configure.in:107: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_OFF_T)
-m4trace:configure.in:107: -1- m4_pattern_allow(^SIZEOF_OFF_T$)
-m4trace:configure.in:107: -1- AH_OUTPUT(SIZEOF_OFF_T, /* The size of `off_t\', as computed by sizeof. */
-@%:@undef SIZEOF_OFF_T)
-m4trace:configure.in:110: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_LONG_LONG_INT)
-m4trace:configure.in:110: -1- m4_pattern_allow(^SIZEOF_LONG_LONG_INT$)
-m4trace:configure.in:110: -1- AH_OUTPUT(SIZEOF_LONG_LONG_INT, /* The size of `long long int\', as computed by sizeof. */
-@%:@undef SIZEOF_LONG_LONG_INT)
-m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_UNSIGNED_LONG_LONG_INT)
-m4trace:configure.in:111: -1- m4_pattern_allow(^SIZEOF_UNSIGNED_LONG_LONG_INT$)
-m4trace:configure.in:111: -1- AH_OUTPUT(SIZEOF_UNSIGNED_LONG_LONG_INT, /* The size of `unsigned long long int\', as computed by sizeof. */
-@%:@undef SIZEOF_UNSIGNED_LONG_LONG_INT)
-m4trace:configure.in:114: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LONG_LONG_INT)
-m4trace:configure.in:114: -1- m4_pattern_allow(^HAVE_LONG_LONG_INT$)
-m4trace:configure.in:114: -1- AH_OUTPUT(HAVE_LONG_LONG_INT, /* Does the compiler support long long int? */
-@%:@undef HAVE_LONG_LONG_INT)
-m4trace:configure.in:115: -1- AH_OUTPUT(WORDS_BIGENDIAN, /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif)
-m4trace:configure.in:115: -1- AC_DEFINE_TRACE_LITERAL(WORDS_BIGENDIAN)
-m4trace:configure.in:115: -1- m4_pattern_allow(^WORDS_BIGENDIAN$)
-m4trace:configure.in:115: -1- AC_DEFINE_TRACE_LITERAL(AC_APPLE_UNIVERSAL_BUILD)
-m4trace:configure.in:115: -1- m4_pattern_allow(^AC_APPLE_UNIVERSAL_BUILD$)
-m4trace:configure.in:115: -1- AH_OUTPUT(AC_APPLE_UNIVERSAL_BUILD, /* Define if building universal (internal helper macro) */
-@%:@undef AC_APPLE_UNIVERSAL_BUILD)
-m4trace:configure.in:118: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/c-attribute.m4:9: CMU_C___ATTRIBUTE__ is expanded from...
-configure.in:118: the top level)
-m4trace:configure.in:118: -1- AC_DEFINE_TRACE_LITERAL(HAVE___ATTRIBUTE__)
-m4trace:configure.in:118: -1- m4_pattern_allow(^HAVE___ATTRIBUTE__$)
-m4trace:configure.in:118: -1- AH_OUTPUT(HAVE___ATTRIBUTE__, /* define if your compiler has __attribute__ */
-@%:@undef HAVE___ATTRIBUTE__)
-m4trace:configure.in:119: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/c-fpic.m4:9: CMU_C_FPIC is expanded from...
-configure.in:119: the top level)
-m4trace:configure.in:122: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-cmulocal/cyrus.m4:33: CMU_GUESS_RUNPATH_SWITCH is expanded from...
-configure.in:122: the top level)
-m4trace:configure.in:122: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-cmulocal/cyrus.m4:33: CMU_GUESS_RUNPATH_SWITCH is expanded from...
-configure.in:122: the top level)
-m4trace:configure.in:124: -1- AH_OUTPUT(HAVE_UNISTD_H, /* Define to 1 if you have the <unistd.h> header file. */
-@%:@undef HAVE_UNISTD_H)
-m4trace:configure.in:124: -1- AH_OUTPUT(HAVE_SYS_SELECT_H, /* Define to 1 if you have the <sys/select.h> header file. */
-@%:@undef HAVE_SYS_SELECT_H)
-m4trace:configure.in:124: -1- AH_OUTPUT(HAVE_SYS_PARAM_H, /* Define to 1 if you have the <sys/param.h> header file. */
-@%:@undef HAVE_SYS_PARAM_H)
-m4trace:configure.in:124: -1- AH_OUTPUT(HAVE_STDARG_H, /* Define to 1 if you have the <stdarg.h> header file. */
-@%:@undef HAVE_STDARG_H)
-m4trace:configure.in:125: -1- AH_OUTPUT(HAVE_MEMMOVE, /* Define to 1 if you have the `memmove\' function. */
-@%:@undef HAVE_MEMMOVE)
-m4trace:configure.in:125: -1- AC_DEFINE_TRACE_LITERAL(HAVE_MEMMOVE)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_MEMMOVE$)
-m4trace:configure.in:125: -1- AC_SUBST(LIB@&t@OBJS, "$LIB@&t@OBJS memmove.$ac_objext")
-m4trace:configure.in:125: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- AC_LIBSOURCE(memmove.c)
-m4trace:configure.in:125: -1- AH_OUTPUT(HAVE_STRCASECMP, /* Define to 1 if you have the `strcasecmp\' function. */
-@%:@undef HAVE_STRCASECMP)
-m4trace:configure.in:125: -1- AC_DEFINE_TRACE_LITERAL(HAVE_STRCASECMP)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_STRCASECMP$)
-m4trace:configure.in:125: -1- AC_SUBST(LIB@&t@OBJS, "$LIB@&t@OBJS strcasecmp.$ac_objext")
-m4trace:configure.in:125: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- AC_LIBSOURCE(strcasecmp.c)
-m4trace:configure.in:125: -1- AH_OUTPUT(HAVE_FTRUNCATE, /* Define to 1 if you have the `ftruncate\' function. */
-@%:@undef HAVE_FTRUNCATE)
-m4trace:configure.in:125: -1- AC_DEFINE_TRACE_LITERAL(HAVE_FTRUNCATE)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_FTRUNCATE$)
-m4trace:configure.in:125: -1- AC_SUBST(LIB@&t@OBJS, "$LIB@&t@OBJS ftruncate.$ac_objext")
-m4trace:configure.in:125: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- AC_LIBSOURCE(ftruncate.c)
-m4trace:configure.in:125: -1- AH_OUTPUT(HAVE_STRERROR, /* Define to 1 if you have the `strerror\' function. */
-@%:@undef HAVE_STRERROR)
-m4trace:configure.in:125: -1- AC_DEFINE_TRACE_LITERAL(HAVE_STRERROR)
-m4trace:configure.in:125: -1- m4_pattern_allow(^HAVE_STRERROR$)
-m4trace:configure.in:125: -1- AC_SUBST(LIB@&t@OBJS, "$LIB@&t@OBJS strerror.$ac_objext")
-m4trace:configure.in:125: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:125: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:125: -1- AC_LIBSOURCE(strerror.c)
-m4trace:configure.in:126: -1- AH_OUTPUT(HAVE_STRLCAT, /* Define to 1 if you have the `strlcat\' function. */
-@%:@undef HAVE_STRLCAT)
-m4trace:configure.in:126: -1- AH_OUTPUT(HAVE_STRLCPY, /* Define to 1 if you have the `strlcpy\' function. */
-@%:@undef HAVE_STRLCPY)
-m4trace:configure.in:126: -1- AH_OUTPUT(HAVE_GETGROUPLIST, /* Define to 1 if you have the `getgrouplist\' function. */
-@%:@undef HAVE_GETGROUPLIST)
-m4trace:configure.in:127: -1- AH_OUTPUT(HAVE_DIRENT_H, /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
- */
-@%:@undef HAVE_DIRENT_H)
-m4trace:configure.in:127: -1- AH_OUTPUT(HAVE_SYS_NDIR_H, /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
- */
-@%:@undef HAVE_SYS_NDIR_H)
-m4trace:configure.in:127: -1- AH_OUTPUT(HAVE_SYS_DIR_H, /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
- */
-@%:@undef HAVE_SYS_DIR_H)
-m4trace:configure.in:127: -1- AH_OUTPUT(HAVE_NDIR_H, /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
-@%:@undef HAVE_NDIR_H)
-m4trace:configure.in:130: -1- AH_OUTPUT(HAVE_STDLIB_H, /* Define to 1 if you have the <stdlib.h> header file. */
-@%:@undef HAVE_STDLIB_H)
-m4trace:configure.in:130: -1- AC_DEFINE_TRACE_LITERAL(HAVE_STDLIB_H)
-m4trace:configure.in:130: -1- m4_pattern_allow(^HAVE_STDLIB_H$)
-m4trace:configure.in:131: -1- AH_OUTPUT(HAVE_GETPASSPHRASE, /* Define to 1 if you have the `getpassphrase\' function. */
-@%:@undef HAVE_GETPASSPHRASE)
-m4trace:configure.in:131: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETPASSPHRASE)
-m4trace:configure.in:131: -1- m4_pattern_allow(^HAVE_GETPASSPHRASE$)
-m4trace:configure.in:134: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-cmulocal/bsd_sockets.m4:9: CMU_SOCKETS is expanded from...
-configure.in:134: the top level)
-m4trace:configure.in:134: -1- AH_OUTPUT(HAVE_DN_EXPAND, /* Define to 1 if you have the `dn_expand\' function. */
-@%:@undef HAVE_DN_EXPAND)
-m4trace:configure.in:134: -1- AH_OUTPUT(HAVE_DNS_LOOKUP, /* Define to 1 if you have the `dns_lookup\' function. */
-@%:@undef HAVE_DNS_LOOKUP)
-m4trace:configure.in:134: -1- AC_SUBST(LIB_SOCKET)
-m4trace:configure.in:134: -1- AC_SUBST_TRACE(LIB_SOCKET)
-m4trace:configure.in:134: -1- m4_pattern_allow(^LIB_SOCKET$)
-m4trace:configure.in:139: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETADDRINFO)
-m4trace:configure.in:139: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:139: -1- AH_OUTPUT(HAVE_GETADDRINFO, /* Do we have a getaddrinfo? */
-@%:@undef HAVE_GETADDRINFO)
-m4trace:configure.in:139: -2- AC_DEFINE_TRACE_LITERAL(HAVE_GETADDRINFO)
-m4trace:configure.in:139: -2- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:139: -2- AH_OUTPUT(HAVE_GETADDRINFO, /* Do we have a getaddrinfo? */
-@%:@undef HAVE_GETADDRINFO)
-m4trace:configure.in:139: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETADDRINFO)
-m4trace:configure.in:139: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:139: -1- AH_OUTPUT(HAVE_GETADDRINFO, /* Do we have a getaddrinfo? */
-@%:@undef HAVE_GETADDRINFO)
-m4trace:configure.in:149: -2- AC_DEFINE_TRACE_LITERAL(HAVE_GETNAMEINFO)
-m4trace:configure.in:149: -2- m4_pattern_allow(^HAVE_GETNAMEINFO$)
-m4trace:configure.in:149: -2- AH_OUTPUT(HAVE_GETNAMEINFO, /* Do we have a getnameinfo? */
-@%:@undef HAVE_GETNAMEINFO)
-m4trace:configure.in:148: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETADDRINFO)
-m4trace:configure.in:148: -1- m4_pattern_allow(^HAVE_GETADDRINFO$)
-m4trace:configure.in:148: -1- AH_OUTPUT(HAVE_GETADDRINFO, /* Do we have a getaddrinfo? */
-@%:@undef HAVE_GETADDRINFO)
-m4trace:configure.in:156: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/ipv6.m4:66: IPv6_CHECK_SS_FAMILY is expanded from...
-configure.in:156: the top level)
-m4trace:configure.in:156: -2- AC_DEFINE_TRACE_LITERAL(HAVE_SS_FAMILY)
-m4trace:configure.in:156: -2- m4_pattern_allow(^HAVE_SS_FAMILY$)
-m4trace:configure.in:156: -2- AH_OUTPUT(HAVE_SS_FAMILY, /* Is there an ss_family in sockaddr_storage? */
-@%:@undef HAVE_SS_FAMILY)
-m4trace:configure.in:157: -1- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-cmulocal/ipv6.m4:82: IPv6_CHECK_SA_LEN is expanded from...
-configure.in:157: the top level)
-m4trace:configure.in:157: -2- AC_DEFINE_TRACE_LITERAL(HAVE_SOCKADDR_SA_LEN)
-m4trace:configure.in:157: -2- m4_pattern_allow(^HAVE_SOCKADDR_SA_LEN$)
-m4trace:configure.in:157: -2- AH_OUTPUT(HAVE_SOCKADDR_SA_LEN, /* Does sockaddr have an sa_len? */
-@%:@undef HAVE_SOCKADDR_SA_LEN)
-m4trace:configure.in:159: -1- AC_SUBST(IPV6_OBJS)
-m4trace:configure.in:159: -1- AC_SUBST_TRACE(IPV6_OBJS)
-m4trace:configure.in:159: -1- m4_pattern_allow(^IPV6_OBJS$)
-m4trace:configure.in:162: -1- AH_OUTPUT(HAVE_SYS_TIME_H, /* Define to 1 if you have the <sys/time.h> header file. */
-@%:@undef HAVE_SYS_TIME_H)
-m4trace:configure.in:162: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SYS_TIME_H)
-m4trace:configure.in:162: -1- m4_pattern_allow(^HAVE_SYS_TIME_H$)
-m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL(TIME_WITH_SYS_TIME)
-m4trace:configure.in:163: -1- m4_pattern_allow(^TIME_WITH_SYS_TIME$)
-m4trace:configure.in:163: -1- AH_OUTPUT(TIME_WITH_SYS_TIME, /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-@%:@undef TIME_WITH_SYS_TIME)
-m4trace:configure.in:164: -1- AC_DEFINE_TRACE_LITERAL(TM_IN_SYS_TIME)
-m4trace:configure.in:164: -1- m4_pattern_allow(^TM_IN_SYS_TIME$)
-m4trace:configure.in:164: -1- AH_OUTPUT(TM_IN_SYS_TIME, /* Define to 1 if your <sys/time.h> declares `struct tm\'. */
-@%:@undef TM_IN_SYS_TIME)
-m4trace:configure.in:165: -1- AC_DEFINE_TRACE_LITERAL(HAVE_STRUCT_TM_TM_ZONE)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_STRUCT_TM_TM_ZONE$)
-m4trace:configure.in:165: -1- AH_OUTPUT(HAVE_STRUCT_TM_TM_ZONE, /* Define to 1 if `tm_zone\' is a member of `struct tm\'. */
-@%:@undef HAVE_STRUCT_TM_TM_ZONE)
-m4trace:configure.in:165: -1- AC_DEFINE_TRACE_LITERAL(HAVE_TM_ZONE)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_TM_ZONE$)
-m4trace:configure.in:165: -1- AH_OUTPUT(HAVE_TM_ZONE, /* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
- `HAVE_STRUCT_TM_TM_ZONE\' instead. */
-@%:@undef HAVE_TM_ZONE)
-m4trace:configure.in:165: -1- AC_DEFINE_TRACE_LITERAL(HAVE_DECL_TZNAME)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_DECL_TZNAME$)
-m4trace:configure.in:165: -1- AH_OUTPUT(HAVE_DECL_TZNAME, /* Define to 1 if you have the declaration of `tzname\', and to 0 if you don\'t.
- */
-@%:@undef HAVE_DECL_TZNAME)
-m4trace:configure.in:165: -1- AC_DEFINE_TRACE_LITERAL(HAVE_TZNAME)
-m4trace:configure.in:165: -1- m4_pattern_allow(^HAVE_TZNAME$)
-m4trace:configure.in:165: -1- AH_OUTPUT(HAVE_TZNAME, /* Define to 1 if you don\'t have `tm_zone\' but do have the external array
- `tzname\'. */
-@%:@undef HAVE_TZNAME)
-m4trace:configure.in:167: -1- AC_SUBST(CPPFLAGS)
-m4trace:configure.in:167: -1- AC_SUBST_TRACE(CPPFLAGS)
-m4trace:configure.in:167: -1- m4_pattern_allow(^CPPFLAGS$)
-m4trace:configure.in:168: -1- AC_SUBST(PRE_SUBDIRS)
-m4trace:configure.in:168: -1- AC_SUBST_TRACE(PRE_SUBDIRS)
-m4trace:configure.in:168: -1- m4_pattern_allow(^PRE_SUBDIRS$)
-m4trace:configure.in:169: -1- AC_SUBST(EXTRA_SUBDIRS)
-m4trace:configure.in:169: -1- AC_SUBST_TRACE(EXTRA_SUBDIRS)
-m4trace:configure.in:169: -1- m4_pattern_allow(^EXTRA_SUBDIRS$)
-m4trace:configure.in:170: -1- AC_SUBST(DEPLIBS)
-m4trace:configure.in:170: -1- AC_SUBST_TRACE(DEPLIBS)
-m4trace:configure.in:170: -1- m4_pattern_allow(^DEPLIBS$)
-m4trace:configure.in:171: -1- AC_SUBST(LOCALDEFS)
-m4trace:configure.in:171: -1- AC_SUBST_TRACE(LOCALDEFS)
-m4trace:configure.in:171: -1- m4_pattern_allow(^LOCALDEFS$)
-m4trace:configure.in:172: -1- AH_OUTPUT(HAVE_VPRINTF, /* Define to 1 if you have the `vprintf\' function. */
-@%:@undef HAVE_VPRINTF)
-m4trace:configure.in:172: -1- AC_DEFINE_TRACE_LITERAL(HAVE_VPRINTF)
-m4trace:configure.in:172: -1- m4_pattern_allow(^HAVE_VPRINTF$)
-m4trace:configure.in:172: -1- AC_DEFINE_TRACE_LITERAL(HAVE_DOPRNT)
-m4trace:configure.in:172: -1- m4_pattern_allow(^HAVE_DOPRNT$)
-m4trace:configure.in:172: -1- AH_OUTPUT(HAVE_DOPRNT, /* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
-@%:@undef HAVE_DOPRNT)
-m4trace:configure.in:205: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/berkdb.m4:204: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/berkdb.m4:265: CYRUS_BERKELEY_DB_CHK is expanded from...
-configure.in:205: the top level)
-m4trace:configure.in:205: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/berkdb.m4:204: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/berkdb.m4:265: CYRUS_BERKELEY_DB_CHK is expanded from...
-configure.in:205: the top level)
-m4trace:configure.in:208: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:208: the top level)
-m4trace:configure.in:218: -1- AC_SUBST(BDB_INC)
-m4trace:configure.in:218: -1- AC_SUBST_TRACE(BDB_INC)
-m4trace:configure.in:218: -1- m4_pattern_allow(^BDB_INC$)
-m4trace:configure.in:219: -1- AC_SUBST(BDB_LIB)
-m4trace:configure.in:219: -1- AC_SUBST_TRACE(BDB_LIB)
-m4trace:configure.in:219: -1- m4_pattern_allow(^BDB_LIB$)
-m4trace:configure.in:225: -1- AC_DEFINE_TRACE_LITERAL(HAVE_BDB)
-m4trace:configure.in:225: -1- m4_pattern_allow(^HAVE_BDB$)
-m4trace:configure.in:225: -1- AH_OUTPUT(HAVE_BDB, /* Build in Berkeley DB support? */
-@%:@undef HAVE_BDB)
-m4trace:configure.in:257: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:16: CYRUS_MYSQL_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:55: CYRUS_MYSQL_CHK is expanded from...
-configure.in:257: the top level)
-m4trace:configure.in:260: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:260: the top level)
-m4trace:configure.in:273: -1- AC_DEFINE_TRACE_LITERAL(HAVE_MYSQL)
-m4trace:configure.in:273: -1- m4_pattern_allow(^HAVE_MYSQL$)
-m4trace:configure.in:273: -1- AH_OUTPUT(HAVE_MYSQL, /* Build in MySQL support? */
-@%:@undef HAVE_MYSQL)
-m4trace:configure.in:301: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:90: CYRUS_PGSQL_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:129: CYRUS_PGSQL_CHK is expanded from...
-configure.in:301: the top level)
-m4trace:configure.in:304: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:304: the top level)
-m4trace:configure.in:317: -1- AC_DEFINE_TRACE_LITERAL(HAVE_PGSQL)
-m4trace:configure.in:317: -1- m4_pattern_allow(^HAVE_PGSQL$)
-m4trace:configure.in:317: -1- AH_OUTPUT(HAVE_PGSQL, /* Build in PgSQL support? */
-@%:@undef HAVE_PGSQL)
-m4trace:configure.in:345: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-cmulocal/sql.m4:164: CYRUS_SQLITE_CHK_LIB is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sql.m4:203: CYRUS_SQLITE_CHK is expanded from...
-configure.in:345: the top level)
-m4trace:configure.in:348: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-configure.in:348: the top level)
-m4trace:configure.in:361: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SQLITE)
-m4trace:configure.in:361: -1- m4_pattern_allow(^HAVE_SQLITE$)
-m4trace:configure.in:361: -1- AH_OUTPUT(HAVE_SQLITE, /* Build in SQLite support? */
-@%:@undef HAVE_SQLITE)
-m4trace:configure.in:373: -1- AC_SUBST(CYRUSDB_OBJS)
-m4trace:configure.in:373: -1- AC_SUBST_TRACE(CYRUSDB_OBJS)
-m4trace:configure.in:373: -1- m4_pattern_allow(^CYRUSDB_OBJS$)
-m4trace:configure.in:392: -1- AC_SUBST(SIEVE_OBJS)
-m4trace:configure.in:392: -1- AC_SUBST_TRACE(SIEVE_OBJS)
-m4trace:configure.in:392: -1- m4_pattern_allow(^SIEVE_OBJS$)
-m4trace:configure.in:394: -1- AC_SUBST(SIEVE_LIBS)
-m4trace:configure.in:394: -1- AC_SUBST_TRACE(SIEVE_LIBS)
-m4trace:configure.in:394: -1- m4_pattern_allow(^SIEVE_LIBS$)
-m4trace:configure.in:396: -1- AC_SUBST(SIEVE_CPPFLAGS)
-m4trace:configure.in:396: -1- AC_SUBST_TRACE(SIEVE_CPPFLAGS)
-m4trace:configure.in:396: -1- m4_pattern_allow(^SIEVE_CPPFLAGS$)
-m4trace:configure.in:397: -1- AC_DEFINE_TRACE_LITERAL(USE_SIEVE)
-m4trace:configure.in:397: -1- m4_pattern_allow(^USE_SIEVE$)
-m4trace:configure.in:397: -1- AH_OUTPUT(USE_SIEVE, /* Build in Sieve support? */
-@%:@undef USE_SIEVE)
-m4trace:configure.in:400: -1- AC_SUBST(YACC)
-m4trace:configure.in:400: -1- AC_SUBST_TRACE(YACC)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YACC$)
-m4trace:configure.in:400: -1- AC_SUBST(YACC)
-m4trace:configure.in:400: -1- AC_SUBST_TRACE(YACC)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YACC$)
-m4trace:configure.in:400: -1- AC_SUBST(YFLAGS)
-m4trace:configure.in:400: -1- AC_SUBST_TRACE(YFLAGS)
-m4trace:configure.in:400: -1- m4_pattern_allow(^YFLAGS$)
-m4trace:configure.in:401: -1- AC_SUBST(LEX)
-m4trace:configure.in:401: -1- AC_SUBST_TRACE(LEX)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEX$)
-m4trace:configure.in:401: -1- AC_SUBST(LEX_OUTPUT_ROOT, $ac_cv_prog_lex_root)
-m4trace:configure.in:401: -1- AC_SUBST_TRACE(LEX_OUTPUT_ROOT)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEX_OUTPUT_ROOT$)
-m4trace:configure.in:401: -1- AC_SUBST(LEXLIB)
-m4trace:configure.in:401: -1- AC_SUBST_TRACE(LEXLIB)
-m4trace:configure.in:401: -1- m4_pattern_allow(^LEXLIB$)
-m4trace:configure.in:401: -1- AC_DEFINE_TRACE_LITERAL(YYTEXT_POINTER)
-m4trace:configure.in:401: -1- m4_pattern_allow(^YYTEXT_POINTER$)
-m4trace:configure.in:401: -1- AH_OUTPUT(YYTEXT_POINTER, /* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
- `char@<:@@:>@\'. */
-@%:@undef YYTEXT_POINTER)
-m4trace:configure.in:402: -1- AH_OUTPUT(HAVE_LIBFL, /* Define to 1 if you have the `fl\' library (-lfl). */
-@%:@undef HAVE_LIBFL)
-m4trace:configure.in:402: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LIBFL)
-m4trace:configure.in:402: -1- m4_pattern_allow(^HAVE_LIBFL$)
-m4trace:configure.in:408: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:408: the top level)
-m4trace:configure.in:420: -1- AC_DEFINE_TRACE_LITERAL(ENABLE_REGEX)
-m4trace:configure.in:420: -1- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:420: -1- AH_OUTPUT(ENABLE_REGEX, /* Do we have a regex library? */
-@%:@undef ENABLE_REGEX)
-m4trace:configure.in:421: -1- AC_DEFINE_TRACE_LITERAL(HAVE_PCREPOSIX_H)
-m4trace:configure.in:421: -1- m4_pattern_allow(^HAVE_PCREPOSIX_H$)
-m4trace:configure.in:421: -1- AH_OUTPUT(HAVE_PCREPOSIX_H, /* Do we have usable pcre library? */
-@%:@undef HAVE_PCREPOSIX_H)
-m4trace:configure.in:423: -1- AH_OUTPUT(HAVE_RXPOSIX_H, /* Define to 1 if you have the <rxposix.h> header file. */
-@%:@undef HAVE_RXPOSIX_H)
-m4trace:configure.in:423: -1- AC_DEFINE_TRACE_LITERAL(HAVE_RXPOSIX_H)
-m4trace:configure.in:423: -1- m4_pattern_allow(^HAVE_RXPOSIX_H$)
-m4trace:configure.in:426: -1- AC_DEFINE_TRACE_LITERAL(ENABLE_REGEX)
-m4trace:configure.in:426: -1- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:426: -1- AH_OUTPUT(ENABLE_REGEX, /* Do we have a regex library? */
-@%:@undef ENABLE_REGEX)
-m4trace:configure.in:430: -2- AC_DEFINE_TRACE_LITERAL(ENABLE_REGEX)
-m4trace:configure.in:430: -2- m4_pattern_allow(^ENABLE_REGEX$)
-m4trace:configure.in:430: -2- AH_OUTPUT(ENABLE_REGEX, /* Do we have a regex library? */
-@%:@undef ENABLE_REGEX)
-m4trace:configure.in:439: -1- AC_SUBST(SIEVE_SUBDIRS)
-m4trace:configure.in:439: -1- AC_SUBST_TRACE(SIEVE_SUBDIRS)
-m4trace:configure.in:439: -1- m4_pattern_allow(^SIEVE_SUBDIRS$)
-m4trace:configure.in:442: -2- AC_DEFINE_TRACE_LITERAL(HAS_STRERROR)
-m4trace:configure.in:442: -2- m4_pattern_allow(^HAS_STRERROR$)
-m4trace:configure.in:442: -2- AH_OUTPUT(HAS_STRERROR, /* Do we have strerror()? */
-@%:@undef HAS_STRERROR)
-m4trace:configure.in:443: -2- AC_DEFINE_TRACE_LITERAL(NEED_SYS_ERRLIST)
-m4trace:configure.in:443: -2- m4_pattern_allow(^NEED_SYS_ERRLIST$)
-m4trace:configure.in:443: -2- AH_OUTPUT(NEED_SYS_ERRLIST, /* Do we have a sys_errlist? */
-@%:@undef NEED_SYS_ERRLIST)
-m4trace:configure.in:442: -1- _m4_warn(obsolete, The macro `AC_FUNC_CHECK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/functions.m4:156: AC_FUNC_CHECK is expanded from...
-configure.in:442: the top level)
-m4trace:configure.in:446: -1- AH_OUTPUT(HAVE_SYS_RESOURCE_H, /* Define to 1 if you have the <sys/resource.h> header file. */
-@%:@undef HAVE_SYS_RESOURCE_H)
-m4trace:configure.in:446: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SYS_RESOURCE_H)
-m4trace:configure.in:446: -1- m4_pattern_allow(^HAVE_SYS_RESOURCE_H$)
-m4trace:configure.in:447: -1- AH_OUTPUT(HAVE_SETRLIMIT, /* Define to 1 if you have the `setrlimit\' function. */
-@%:@undef HAVE_SETRLIMIT)
-m4trace:configure.in:447: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SETRLIMIT)
-m4trace:configure.in:447: -1- m4_pattern_allow(^HAVE_SETRLIMIT$)
-m4trace:configure.in:448: -1- AH_OUTPUT(HAVE_GETRLIMIT, /* Define to 1 if you have the `getrlimit\' function. */
-@%:@undef HAVE_GETRLIMIT)
-m4trace:configure.in:448: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETRLIMIT)
-m4trace:configure.in:448: -1- m4_pattern_allow(^HAVE_GETRLIMIT$)
-m4trace:configure.in:451: -1- AH_OUTPUT(HAVE_DAEMON, /* Define to 1 if you have the `daemon\' function. */
-@%:@undef HAVE_DAEMON)
-m4trace:configure.in:451: -1- AH_OUTPUT(HAVE_SETSID, /* Define to 1 if you have the `setsid\' function. */
-@%:@undef HAVE_SETSID)
-m4trace:configure.in:454: -1- AH_OUTPUT(HAVE_SHUTDOWN, /* Define to 1 if you have the `shutdown\' function. */
-@%:@undef HAVE_SHUTDOWN)
-m4trace:configure.in:454: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SHUTDOWN)
-m4trace:configure.in:454: -1- m4_pattern_allow(^HAVE_SHUTDOWN$)
-m4trace:configure.in:456: -2- AC_DEFINE_TRACE_LITERAL(HAVE_SOCKLEN_T)
-m4trace:configure.in:456: -2- m4_pattern_allow(^HAVE_SOCKLEN_T$)
-m4trace:configure.in:456: -2- AH_OUTPUT(HAVE_SOCKLEN_T, /* Do we have a socklen_t? */
-@%:@undef HAVE_SOCKLEN_T)
-m4trace:configure.in:458: -2- AC_DEFINE_TRACE_LITERAL(HAVE_STRUCT_SOCKADDR_STORAGE)
-m4trace:configure.in:458: -2- m4_pattern_allow(^HAVE_STRUCT_SOCKADDR_STORAGE$)
-m4trace:configure.in:458: -2- AH_OUTPUT(HAVE_STRUCT_SOCKADDR_STORAGE, /* Do we have a sockaddr_storage? */
-@%:@undef HAVE_STRUCT_SOCKADDR_STORAGE)
-m4trace:configure.in:459: -2- AC_DEFINE_TRACE_LITERAL(HAVE_RLIM_T)
-m4trace:configure.in:459: -2- m4_pattern_allow(^HAVE_RLIM_T$)
-m4trace:configure.in:459: -2- AH_OUTPUT(HAVE_RLIM_T, /* Do we have an rlim_t? */
-@%:@undef HAVE_RLIM_T)
-m4trace:configure.in:477: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:477: the top level)
-m4trace:configure.in:490: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:490: the top level)
-m4trace:configure.in:501: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:501: the top level)
-m4trace:configure.in:511: -1- AC_DEFINE_TRACE_LITERAL(SPT_TYPE)
-m4trace:configure.in:511: -1- m4_pattern_allow(^SPT_TYPE$)
-m4trace:configure.in:511: -1- AH_OUTPUT(SPT_TYPE, /* Do we already have setproctitle? */
-@%:@undef SPT_TYPE)
-m4trace:configure.in:515: -2- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-configure.in:515: the top level)
-m4trace:configure.in:523: -1- AC_SUBST(WITH_NONBLOCK)
-m4trace:configure.in:523: -1- AC_SUBST_TRACE(WITH_NONBLOCK)
-m4trace:configure.in:523: -1- m4_pattern_allow(^WITH_NONBLOCK$)
-m4trace:configure.in:527: -2- _m4_warn(obsolete, The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-configure.in:527: the top level)
-m4trace:configure.in:532: -1- AC_SUBST(WITH_GMTOFF)
-m4trace:configure.in:532: -1- AC_SUBST_TRACE(WITH_GMTOFF)
-m4trace:configure.in:532: -1- m4_pattern_allow(^WITH_GMTOFF$)
-m4trace:configure.in:535: -2- _m4_warn(obsolete, The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2765: AC_TRY_RUN is expanded from...
-configure.in:535: the top level)
-m4trace:configure.in:566: -2- _m4_warn(obsolete, The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2765: AC_TRY_RUN is expanded from...
-configure.in:566: the top level)
-m4trace:configure.in:603: -1- AC_SUBST(WITH_MAP)
-m4trace:configure.in:603: -1- AC_SUBST_TRACE(WITH_MAP)
-m4trace:configure.in:603: -1- m4_pattern_allow(^WITH_MAP$)
-m4trace:configure.in:604: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/functions.m4:60: AC_CHECK_FUNC is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-configure.in:604: the top level)
-m4trace:configure.in:614: -1- AC_SUBST(WITH_LOCK)
-m4trace:configure.in:614: -1- AC_SUBST_TRACE(WITH_LOCK)
-m4trace:configure.in:614: -1- m4_pattern_allow(^WITH_LOCK$)
-m4trace:configure.in:618: -2- AC_DEFINE_TRACE_LITERAL(HAVE_FDATASYNC)
-m4trace:configure.in:618: -2- m4_pattern_allow(^HAVE_FDATASYNC$)
-m4trace:configure.in:618: -2- AH_OUTPUT(HAVE_FDATASYNC, /* Do we have fdatasync()? */
-@%:@undef HAVE_FDATASYNC)
-m4trace:configure.in:618: -1- AC_DEFINE_TRACE_LITERAL(HAVE_FDATASYNC)
-m4trace:configure.in:618: -1- m4_pattern_allow(^HAVE_FDATASYNC$)
-m4trace:configure.in:618: -1- AH_OUTPUT(HAVE_FDATASYNC, /* Do we have fdatasync()? */
-@%:@undef HAVE_FDATASYNC)
-m4trace:configure.in:645: -1- AC_SUBST(cyrus_cv_sigveclib)
-m4trace:configure.in:645: -1- AC_SUBST_TRACE(cyrus_cv_sigveclib)
-m4trace:configure.in:645: -1- m4_pattern_allow(^cyrus_cv_sigveclib$)
-m4trace:configure.in:665: -1- AC_DEFINE_TRACE_LITERAL(AFSPTS_USE_KRB5)
-m4trace:configure.in:665: -1- m4_pattern_allow(^AFSPTS_USE_KRB5$)
-m4trace:configure.in:665: -1- AH_OUTPUT(AFSPTS_USE_KRB5, /* Should the AFS PTS plugin use krb5? */
-@%:@undef AFSPTS_USE_KRB5)
-m4trace:configure.in:684: -1- _m4_warn(obsolete, The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-configure.in:684: the top level)
-m4trace:configure.in:707: -1- AC_SUBST(AFS_LIBS)
-m4trace:configure.in:707: -1- AC_SUBST_TRACE(AFS_LIBS)
-m4trace:configure.in:707: -1- m4_pattern_allow(^AFS_LIBS$)
-m4trace:configure.in:708: -1- AC_SUBST(AFS_LDFLAGS)
-m4trace:configure.in:708: -1- AC_SUBST_TRACE(AFS_LDFLAGS)
-m4trace:configure.in:708: -1- m4_pattern_allow(^AFS_LDFLAGS$)
-m4trace:configure.in:709: -1- AC_DEFINE_TRACE_LITERAL(HAVE_AFSKRB)
-m4trace:configure.in:709: -1- m4_pattern_allow(^HAVE_AFSKRB$)
-m4trace:configure.in:709: -1- AH_OUTPUT(HAVE_AFSKRB, /* Should we build afskrb pts module? */
-@%:@undef HAVE_AFSKRB)
-m4trace:configure.in:713: -1- AC_SUBST(AFS_LIBS)
-m4trace:configure.in:713: -1- AC_SUBST_TRACE(AFS_LIBS)
-m4trace:configure.in:713: -1- m4_pattern_allow(^AFS_LIBS$)
-m4trace:configure.in:714: -1- AC_SUBST(AFS_LDFLAGS)
-m4trace:configure.in:714: -1- AC_SUBST_TRACE(AFS_LDFLAGS)
-m4trace:configure.in:714: -1- m4_pattern_allow(^AFS_LDFLAGS$)
-m4trace:configure.in:715: -1- AC_DEFINE_TRACE_LITERAL(HAVE_AFSKRB)
-m4trace:configure.in:715: -1- m4_pattern_allow(^HAVE_AFSKRB$)
-m4trace:configure.in:715: -1- AH_OUTPUT(HAVE_AFSKRB, /* Should we build afskrb pts module? */
-@%:@undef HAVE_AFSKRB)
-m4trace:configure.in:738: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LDAP)
-m4trace:configure.in:738: -1- m4_pattern_allow(^HAVE_LDAP$)
-m4trace:configure.in:738: -1- AH_OUTPUT(HAVE_LDAP, /* Should we build ldap pts module? */
-@%:@undef HAVE_LDAP)
-m4trace:configure.in:738: -1- AC_SUBST(LDAP_CPPFLAGS)
-m4trace:configure.in:738: -1- AC_SUBST_TRACE(LDAP_CPPFLAGS)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_CPPFLAGS$)
-m4trace:configure.in:738: -1- AC_SUBST(LDAP_LDFLAGS)
-m4trace:configure.in:738: -1- AC_SUBST_TRACE(LDAP_LDFLAGS)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_LDFLAGS$)
-m4trace:configure.in:738: -1- AC_SUBST(LDAP_LIBS)
-m4trace:configure.in:738: -1- AC_SUBST_TRACE(LDAP_LIBS)
-m4trace:configure.in:738: -1- m4_pattern_allow(^LDAP_LIBS$)
-m4trace:configure.in:748: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LDAP)
-m4trace:configure.in:748: -1- m4_pattern_allow(^HAVE_LDAP$)
-m4trace:configure.in:748: -1- AH_OUTPUT(HAVE_LDAP, /* Should we build ldap pts module? */
-@%:@undef HAVE_LDAP)
-m4trace:configure.in:748: -1- AC_SUBST(LDAP_CPPFLAGS)
-m4trace:configure.in:748: -1- AC_SUBST_TRACE(LDAP_CPPFLAGS)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_CPPFLAGS$)
-m4trace:configure.in:748: -1- AC_SUBST(LDAP_LDFLAGS)
-m4trace:configure.in:748: -1- AC_SUBST_TRACE(LDAP_LDFLAGS)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_LDFLAGS$)
-m4trace:configure.in:748: -1- AC_SUBST(LDAP_LIBS)
-m4trace:configure.in:748: -1- AC_SUBST_TRACE(LDAP_LIBS)
-m4trace:configure.in:748: -1- m4_pattern_allow(^LDAP_LIBS$)
-m4trace:configure.in:763: -1- AC_DEFINE_TRACE_LITERAL(WITH_PTS)
-m4trace:configure.in:763: -1- m4_pattern_allow(^WITH_PTS$)
-m4trace:configure.in:763: -1- AH_OUTPUT(WITH_PTS, /* Build in PTS support? */
-@%:@undef WITH_PTS)
-m4trace:configure.in:774: -1- AC_SUBST(SERVER_SUBDIRS)
-m4trace:configure.in:774: -1- AC_SUBST_TRACE(SERVER_SUBDIRS)
-m4trace:configure.in:774: -1- m4_pattern_allow(^SERVER_SUBDIRS$)
-m4trace:configure.in:792: -1- AH_OUTPUT(HAVE_LIBRESOLV, /* Define to 1 if you have the `resolv\' library (-lresolv). */
-@%:@undef HAVE_LIBRESOLV)
-m4trace:configure.in:792: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LIBRESOLV)
-m4trace:configure.in:792: -1- m4_pattern_allow(^HAVE_LIBRESOLV$)
-m4trace:configure.in:846: -3- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:846: the top level)
-m4trace:configure.in:848: -2- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:848: the top level)
-m4trace:configure.in:850: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-configure.in:850: the top level)
-m4trace:configure.in:855: -1- AC_DEFINE_TRACE_LITERAL(HAVE_KRB)
-m4trace:configure.in:855: -1- m4_pattern_allow(^HAVE_KRB$)
-m4trace:configure.in:855: -1- AH_OUTPUT(HAVE_KRB, /* Support for Kerberos? */
-@%:@undef HAVE_KRB)
-m4trace:configure.in:902: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SSL)
-m4trace:configure.in:902: -1- m4_pattern_allow(^HAVE_SSL$)
-m4trace:configure.in:902: -1- AH_OUTPUT(HAVE_SSL, /* Build with SSL support? */
-@%:@undef HAVE_SSL)
-m4trace:configure.in:905: -1- AC_DEFINE_TRACE_LITERAL(OPENSSL_ENABLE_OLD_DES_SUPPORT)
-m4trace:configure.in:905: -1- m4_pattern_allow(^OPENSSL_ENABLE_OLD_DES_SUPPORT$)
-m4trace:configure.in:905: -1- AH_OUTPUT(OPENSSL_ENABLE_OLD_DES_SUPPORT, /* Configure OpenSSL to provide legacy des apis */
-@%:@undef OPENSSL_ENABLE_OLD_DES_SUPPORT)
-m4trace:configure.in:906: -1- AC_DEFINE_TRACE_LITERAL(OPENSSL_DES_LIBDES_COMPATIBILITY)
-m4trace:configure.in:906: -1- m4_pattern_allow(^OPENSSL_DES_LIBDES_COMPATIBILITY$)
-m4trace:configure.in:906: -1- AH_OUTPUT(OPENSSL_DES_LIBDES_COMPATIBILITY, /* Configure OpenSSL to provide krb4-compatible legacy des apis */
-@%:@undef OPENSSL_DES_LIBDES_COMPATIBILITY)
-m4trace:configure.in:909: -1- AC_SUBST(OPENSSL_INC)
-m4trace:configure.in:909: -1- AC_SUBST_TRACE(OPENSSL_INC)
-m4trace:configure.in:909: -1- m4_pattern_allow(^OPENSSL_INC$)
-m4trace:configure.in:910: -1- AC_SUBST(OPENSSL_LIB)
-m4trace:configure.in:910: -1- AC_SUBST_TRACE(OPENSSL_LIB)
-m4trace:configure.in:910: -1- m4_pattern_allow(^OPENSSL_LIB$)
-m4trace:configure.in:921: -1- AC_DEFINE_TRACE_LITERAL(EGD_SOCKET)
-m4trace:configure.in:921: -1- m4_pattern_allow(^EGD_SOCKET$)
-m4trace:configure.in:921: -1- AH_OUTPUT(EGD_SOCKET, /* Alternative to /dev/urandom? */
-@%:@undef EGD_SOCKET)
-m4trace:configure.in:927: -2- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-cmulocal/common.m4:42: CMU_FIND_LIB_SUBDIR is expanded from...
-cmulocal/zlib.m4:6: CMU_HAVE_ZLIB is expanded from...
-configure.in:927: the top level)
-m4trace:configure.in:927: -1- AC_DEFINE_TRACE_LITERAL(SIZEOF_LONG)
-m4trace:configure.in:927: -1- m4_pattern_allow(^SIZEOF_LONG$)
-m4trace:configure.in:927: -1- AH_OUTPUT(SIZEOF_LONG, /* The size of `long\', as computed by sizeof. */
-@%:@undef SIZEOF_LONG)
-m4trace:configure.in:927: -1- AC_SUBST(CMU_LIB_SUBDIR, $ac_cv_cmu_lib_subdir)
-m4trace:configure.in:927: -1- AC_SUBST_TRACE(CMU_LIB_SUBDIR)
-m4trace:configure.in:927: -1- m4_pattern_allow(^CMU_LIB_SUBDIR$)
-m4trace:configure.in:927: -1- AC_DEFINE_TRACE_LITERAL(HAVE_ZLIB)
-m4trace:configure.in:927: -1- m4_pattern_allow(^HAVE_ZLIB$)
-m4trace:configure.in:927: -1- AH_OUTPUT(HAVE_ZLIB, /* Do we have zlib? */
-@%:@undef HAVE_ZLIB)
-m4trace:configure.in:930: -1- AC_SUBST(ZLIB)
-m4trace:configure.in:930: -1- AC_SUBST_TRACE(ZLIB)
-m4trace:configure.in:930: -1- m4_pattern_allow(^ZLIB$)
-m4trace:configure.in:951: -1- AC_SUBST(ZEPHYR_LIBS)
-m4trace:configure.in:951: -1- AC_SUBST_TRACE(ZEPHYR_LIBS)
-m4trace:configure.in:951: -1- m4_pattern_allow(^ZEPHYR_LIBS$)
-m4trace:configure.in:953: -1- AC_DEFINE_TRACE_LITERAL(HAVE_ZEPHYR)
-m4trace:configure.in:953: -1- m4_pattern_allow(^HAVE_ZEPHYR$)
-m4trace:configure.in:953: -1- AH_OUTPUT(HAVE_ZEPHYR, /* Build with Zephyr support? */
-@%:@undef HAVE_ZEPHYR)
-m4trace:configure.in:963: -1- AC_DEFINE_TRACE_LITERAL(MASTER_PIDFILE)
-m4trace:configure.in:963: -1- m4_pattern_allow(^MASTER_PIDFILE$)
-m4trace:configure.in:963: -1- AH_OUTPUT(MASTER_PIDFILE, /* Name of the pidfile for master */
-@%:@undef MASTER_PIDFILE)
-m4trace:configure.in:996: -1- AH_OUTPUT(HAVE_SYS_SOCKIO_H, /* Define to 1 if you have the <sys/sockio.h> header file. */
-@%:@undef HAVE_SYS_SOCKIO_H)
-m4trace:configure.in:996: -1- AC_DEFINE_TRACE_LITERAL(HAVE_SYS_SOCKIO_H)
-m4trace:configure.in:996: -1- m4_pattern_allow(^HAVE_SYS_SOCKIO_H$)
-m4trace:configure.in:1010: -1- AC_SUBST(IMAP_PROGS)
-m4trace:configure.in:1010: -1- AC_SUBST_TRACE(IMAP_PROGS)
-m4trace:configure.in:1010: -1- m4_pattern_allow(^IMAP_PROGS$)
-m4trace:configure.in:1024: -1- AC_DEFINE_TRACE_LITERAL(HAVE_ET_COM_ERR_H)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^HAVE_ET_COM_ERR_H$)
-m4trace:configure.in:1024: -1- AH_OUTPUT(HAVE_ET_COM_ERR_H, /* We need et/com_err.h */
-@%:@undef HAVE_ET_COM_ERR_H)
-m4trace:configure.in:1024: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
-configure.in:1024: the top level)
-m4trace:configure.in:1024: -1- AC_SUBST(COMPILE_ET)
-m4trace:configure.in:1024: -1- AC_SUBST_TRACE(COMPILE_ET)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1024: -1- AC_SUBST(COMPILE_ET)
-m4trace:configure.in:1024: -1- AC_SUBST_TRACE(COMPILE_ET)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1024: -1- AC_SUBST(COMPILE_ET)
-m4trace:configure.in:1024: -1- AC_SUBST_TRACE(COMPILE_ET)
-m4trace:configure.in:1024: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1119: -1- AC_SUBST(COMPILE_ET)
-m4trace:configure.in:1119: -1- AC_SUBST_TRACE(COMPILE_ET)
-m4trace:configure.in:1119: -1- m4_pattern_allow(^COMPILE_ET$)
-m4trace:configure.in:1120: -1- AC_SUBST(COM_ERR_LIBS)
-m4trace:configure.in:1120: -1- AC_SUBST_TRACE(COM_ERR_LIBS)
-m4trace:configure.in:1120: -1- m4_pattern_allow(^COM_ERR_LIBS$)
-m4trace:configure.in:1121: -1- AC_SUBST(COM_ERR_LDFLAGS)
-m4trace:configure.in:1121: -1- AC_SUBST_TRACE(COM_ERR_LDFLAGS)
-m4trace:configure.in:1121: -1- m4_pattern_allow(^COM_ERR_LDFLAGS$)
-m4trace:configure.in:1122: -1- AC_SUBST(COM_ERR_CPPFLAGS)
-m4trace:configure.in:1122: -1- AC_SUBST_TRACE(COM_ERR_CPPFLAGS)
-m4trace:configure.in:1122: -1- m4_pattern_allow(^COM_ERR_CPPFLAGS$)
-m4trace:configure.in:1125: -2- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-configure.in:1125: the top level)
-m4trace:configure.in:1143: -1- AC_DEFINE_TRACE_LITERAL(SYSLOG_FACILITY)
-m4trace:configure.in:1143: -1- m4_pattern_allow(^SYSLOG_FACILITY$)
-m4trace:configure.in:1143: -1- AH_OUTPUT(SYSLOG_FACILITY, /* Syslog facility to use. */
-@%:@undef SYSLOG_FACILITY)
-m4trace:configure.in:1147: -1- AH_OUTPUT(HAVE_GETDTABLESIZE, /* Define to 1 if you have the `getdtablesize\' function. */
-@%:@undef HAVE_GETDTABLESIZE)
-m4trace:configure.in:1147: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GETDTABLESIZE)
-m4trace:configure.in:1147: -1- m4_pattern_allow(^HAVE_GETDTABLESIZE$)
-m4trace:configure.in:1147: -1- AC_SUBST(LIB@&t@OBJS, "$LIB@&t@OBJS getdtablesize.$ac_objext")
-m4trace:configure.in:1147: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:1147: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:1147: -1- AC_LIBSOURCE(getdtablesize.c)
-m4trace:configure.in:1160: -2- AC_DEFINE_TRACE_LITERAL(OLD_SIEVE_SERVICE_NAME)
-m4trace:configure.in:1160: -2- m4_pattern_allow(^OLD_SIEVE_SERVICE_NAME$)
-m4trace:configure.in:1160: -2- AH_OUTPUT(OLD_SIEVE_SERVICE_NAME, /* Use "imap" as sieve service name? */
-@%:@undef OLD_SIEVE_SERVICE_NAME)
-m4trace:configure.in:1170: -2- AC_DEFINE_TRACE_LITERAL(ENABLE_X_NETSCAPE_HACK)
-m4trace:configure.in:1170: -2- m4_pattern_allow(^ENABLE_X_NETSCAPE_HACK$)
-m4trace:configure.in:1170: -2- AH_OUTPUT(ENABLE_X_NETSCAPE_HACK, /* Enable Netscape Menu Option Hack? */
-@%:@undef ENABLE_X_NETSCAPE_HACK)
-m4trace:configure.in:1173: -1- AH_OUTPUT(HAVE_LIBDL, /* Define to 1 if you have the `dl\' library (-ldl). */
-@%:@undef HAVE_LIBDL)
-m4trace:configure.in:1173: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LIBDL)
-m4trace:configure.in:1173: -1- m4_pattern_allow(^HAVE_LIBDL$)
-m4trace:configure.in:1174: -1- AC_SUBST(LIB_CRYPT)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(LIB_CRYPT)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_CRYPT$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1463: AC_ARG_ENABLE is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSSAPI_H)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSSAPI_H$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSSAPI_H, /* Define if you have the gssapi.h header file */
-@%:@undef HAVE_GSSAPI_H)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_LIBRESOLV, /* Define to 1 if you have the `resolv\' library (-lresolv). */
-@%:@undef HAVE_LIBRESOLV)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LIBRESOLV)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_LIBRESOLV$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_HOSTBASED_SERVICE, /* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-@%:@undef HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2539: AC_EGREP_CPP is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_HOSTBASED_SERVICE, /* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-@%:@undef HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_HOSTBASED_SERVICE$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_HOSTBASED_SERVICE, /* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-@%:@undef HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_USER_NAME, /* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-@%:@undef HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_WARN' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:33: AC_WARN is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2539: AC_EGREP_CPP is expanded from...
-cmulocal/sasl2.m4:7: SASL_GSSAPI_CHK is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_USER_NAME, /* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-@%:@undef HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSS_C_NT_USER_NAME$)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSS_C_NT_USER_NAME, /* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-@%:@undef HAVE_GSS_C_NT_USER_NAME)
-m4trace:configure.in:1174: -1- AH_OUTPUT(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY, /* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
- */
-@%:@undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY)
-m4trace:configure.in:1174: -1- AC_DEFINE_TRACE_LITERAL(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY$)
-m4trace:configure.in:1174: -1- AC_SUBST(GSSAPI_LIBS)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(GSSAPI_LIBS)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^GSSAPI_LIBS$)
-m4trace:configure.in:1174: -1- AC_SUBST(GSSAPIBASE_LIBS)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(GSSAPIBASE_LIBS)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^GSSAPIBASE_LIBS$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/autoconf/general.m4:1482: AC_ARG_WITH is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
-../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-cmulocal/sasl2.m4:289: CMU_SASL2 is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- AC_SUBST(LIB_DYN_SASL)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(LIB_DYN_SASL)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_DYN_SASL$)
-m4trace:configure.in:1174: -1- AC_SUBST(DYNSASLFLAGS)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(DYNSASLFLAGS)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^DYNSASLFLAGS$)
-m4trace:configure.in:1174: -1- AC_SUBST(LIB_SASL)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(LIB_SASL)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^LIB_SASL$)
-m4trace:configure.in:1174: -1- AC_SUBST(SASLFLAGS)
-m4trace:configure.in:1174: -1- AC_SUBST_TRACE(SASLFLAGS)
-m4trace:configure.in:1174: -1- m4_pattern_allow(^SASLFLAGS$)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate., ../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1174: -1- _m4_warn(obsolete, The macro `AC_ERROR' is obsolete.
-You should run autoupdate., ../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2504: _AC_PREPROC_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2519: AC_PREPROC_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
-cmulocal/sasl2.m4:420: CMU_SASL2_REQUIRE_VER is expanded from...
-configure.in:1174: the top level)
-m4trace:configure.in:1175: -1- AC_DEFINE_TRACE_LITERAL(HAVE_APOP)
-m4trace:configure.in:1175: -1- m4_pattern_allow(^HAVE_APOP$)
-m4trace:configure.in:1175: -1- AH_OUTPUT(HAVE_APOP, /* Does SASL support APOP? */
-@%:@undef HAVE_APOP)
-m4trace:configure.in:1188: -1- AC_SUBST(PERL)
-m4trace:configure.in:1188: -1- AC_SUBST_TRACE(PERL)
-m4trace:configure.in:1188: -1- m4_pattern_allow(^PERL$)
-m4trace:configure.in:1207: -1- AC_SUBST(PERL_CCCDLFLAGS)
-m4trace:configure.in:1207: -1- AC_SUBST_TRACE(PERL_CCCDLFLAGS)
-m4trace:configure.in:1207: -1- m4_pattern_allow(^PERL_CCCDLFLAGS$)
-m4trace:configure.in:1230: -1- AC_SUBST(SNMP_SUBDIRS)
-m4trace:configure.in:1230: -1- AC_SUBST_TRACE(SNMP_SUBDIRS)
-m4trace:configure.in:1230: -1- m4_pattern_allow(^SNMP_SUBDIRS$)
-m4trace:configure.in:1232: -1- AC_DEFINE_TRACE_LITERAL(HAVE_LIBWRAP)
-m4trace:configure.in:1232: -1- m4_pattern_allow(^HAVE_LIBWRAP$)
-m4trace:configure.in:1232: -1- AH_OUTPUT(HAVE_LIBWRAP, /* Do we have TCP wrappers? */
-@%:@undef HAVE_LIBWRAP)
-m4trace:configure.in:1232: -1- AC_SUBST(LIB_WRAP)
-m4trace:configure.in:1232: -1- AC_SUBST_TRACE(LIB_WRAP)
-m4trace:configure.in:1232: -1- m4_pattern_allow(^LIB_WRAP$)
-m4trace:configure.in:1233: -1- AC_SUBST(SNMP_CONFIG)
-m4trace:configure.in:1233: -1- AC_SUBST_TRACE(SNMP_CONFIG)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^SNMP_CONFIG$)
-m4trace:configure.in:1233: -1- AC_DEFINE_TRACE_LITERAL(HAVE_NETSNMP)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_NETSNMP$)
-m4trace:configure.in:1233: -1- AH_OUTPUT(HAVE_NETSNMP, /* Do we have Net-SNMP support? */
-@%:@undef HAVE_NETSNMP)
-m4trace:configure.in:1233: -1- AC_SUBST(LIB_UCDSNMP)
-m4trace:configure.in:1233: -1- AC_SUBST_TRACE(LIB_UCDSNMP)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^LIB_UCDSNMP$)
-m4trace:configure.in:1233: -1- AH_OUTPUT(HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H, /* Define to 1 if you have the <net-snmp/agent/agent_module_config.h> header
- file. */
-@%:@undef HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H)
-m4trace:configure.in:1233: -1- AC_DEFINE_TRACE_LITERAL(HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H$)
-m4trace:configure.in:1233: -1- AC_DEFINE_TRACE_LITERAL(HAVE_UCDSNMP)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^HAVE_UCDSNMP$)
-m4trace:configure.in:1233: -1- AH_OUTPUT(HAVE_UCDSNMP, /* Do we have UCD-SNMP support? */
-@%:@undef HAVE_UCDSNMP)
-m4trace:configure.in:1233: -1- AC_SUBST(LIB_UCDSNMP)
-m4trace:configure.in:1233: -1- AC_SUBST_TRACE(LIB_UCDSNMP)
-m4trace:configure.in:1233: -1- m4_pattern_allow(^LIB_UCDSNMP$)
-m4trace:configure.in:1268: -1- AC_SUBST(LIB_RT)
-m4trace:configure.in:1268: -1- AC_SUBST_TRACE(LIB_RT)
-m4trace:configure.in:1268: -1- m4_pattern_allow(^LIB_RT$)
-m4trace:configure.in:1269: -1- AC_SUBST(IMAP_COM_ERR_LIBS)
-m4trace:configure.in:1269: -1- AC_SUBST_TRACE(IMAP_COM_ERR_LIBS)
-m4trace:configure.in:1269: -1- m4_pattern_allow(^IMAP_COM_ERR_LIBS$)
-m4trace:configure.in:1270: -1- AC_SUBST(IMAP_LIBS)
-m4trace:configure.in:1270: -1- AC_SUBST_TRACE(IMAP_LIBS)
-m4trace:configure.in:1270: -1- m4_pattern_allow(^IMAP_LIBS$)
-m4trace:configure.in:1278: -1- AC_SUBST(PERL_SUBDIRS)
-m4trace:configure.in:1278: -1- AC_SUBST_TRACE(PERL_SUBDIRS)
-m4trace:configure.in:1278: -1- m4_pattern_allow(^PERL_SUBDIRS$)
-m4trace:configure.in:1279: -1- AC_SUBST(PERL_DEPSUBDIRS)
-m4trace:configure.in:1279: -1- AC_SUBST_TRACE(PERL_DEPSUBDIRS)
-m4trace:configure.in:1279: -1- m4_pattern_allow(^PERL_DEPSUBDIRS$)
-m4trace:configure.in:1280: -1- AC_SUBST(PERL)
-m4trace:configure.in:1280: -1- AC_SUBST_TRACE(PERL)
-m4trace:configure.in:1280: -1- m4_pattern_allow(^PERL$)
-m4trace:configure.in:1282: -1- AH_OUTPUT(00001, 
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: configure.in,v 1.316 2010/01/06 17:01:26 murch Exp $
- */
-
-#ifndef _CYRUS_IMAPD_CONFIG_H_
-#define _CYRUS_IMAPD_CONFIG_H_
-)
-m4trace:configure.in:1330: -1- AH_OUTPUT(zzzz2, 
-/* time.h */
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-/* com_err.h, as needed */
-#ifndef IN_COM_ERR
-#ifdef HAVE_ET_COM_ERR_H
-#include <et/com_err.h>
-#else
-#include <com_err.h>
-#endif /* HAVE_ET_COM_ERR_H */
-#endif /* IN_COM_ERR */
-
-/* This allows us to work even when we don\'t have an fdatasync */
-#ifndef HAVE_FDATASYNC
-#define fdatasync(fd) fsync(fd)
-#endif
-
-/* A similar setup for not having O_DSYNC */
-#include <fcntl.h>
-
-#ifndef O_DSYNC
-# ifdef O_SYNC
-# define O_DSYNC O_SYNC /* POSIX */
-# else
-# define O_DSYNC O_FSYNC /* BSD */
-# endif
-#endif
-
-#ifndef HAVE___ATTRIBUTE__
-/* Can\'t use attributes... */
-#define __attribute__(foo)
-#endif
-
-#ifndef HAVE_SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
-
-#ifndef HAVE_RLIM_T
-typedef int rlim_t;
-#endif
-
-/* some potentially memory saving tradeoffs, 
- preconfigured in memory-saving mode */
-
-/* save the cmdlines for the ID command */
-#undef ID_SAVE_CMDLINE
-
-/* IPv6 things */
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-
-struct sockaddr_storage {
-	struct	sockaddr ss_sa;
-	char		__ss_pad2_SS_PADSIZE;
-};
-# define ss_family ss_sa.sa_family
-# define HAVE_SS_FAMILY
-#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-
-#ifndef HAVE_SS_FAMILY
-#define ss_family	__ss_family
-#endif
-
-#ifndef AF_INET6
-/* Define it to something that should never appear */
-#define	AF_INET6	AF_MAX
-#endif
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-#include "gai.h"
-#endif
-
-/* End IPv6 things */
-
-#ifdef OLD_SIEVE_SERVICE_NAME
-#define SIEVE_SERVICE_NAME "imap"
-#else
-#define SIEVE_SERVICE_NAME "sieve"
-#endif
-
-/* filenames */
-#define FNAME_DBDIR "/db"
-#define FNAME_USERDIR "/user/"
-#define FNAME_DOMAINDIR "/domain/"
-#define FNAME_LOGDIR "/log/"
-#define FNAME_PTSDB "/ptclient/ptscache.db"
-#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-
-#ifndef HAVE_SHUTDOWN
-#define shutdown(fd, mode) 0
-#endif
-
-/* *printf() macros */
-#if (SIZEOF_SIZE_T == SIZEOF_INT)
-#define SIZE_T_FMT "%u"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG)
-#define SIZE_T_FMT "%lu"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG_LONG_INT)
-#define SIZE_T_FMT "%llu"
-#else
-#error dont know what to use for SIZE_T_FMT
-#endif
-
-#if (SIZEOF_OFF_T == SIZEOF_LONG)
-#define OFF_T_FMT "%ld"
-#define strtoofft(nptr, endptr, base) strtol(nptr, endptr, base)
-#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG_INT)
-#define OFF_T_FMT "%lld"
-#define strtoofft(nptr, endptr, base) strtoll(nptr, endptr, base)
-#else
-#error dont know what to use for OFF_T_FMT
-#endif
-
-/* compile time options; think carefully before modifying */
-enum {
- /* should we send an UNAVAILABLE message to master when
- * a service is exiting (master is already going to be 
- * informed of the exit by the SIGCHLD signal anyway) ? */
- MESSAGE_MASTER_ON_EXIT = 0,
-
- /* should a hierarchical rename stop on error? */
- RENAME_STOP_ON_ERROR = 1,
-
- /* should we call fsync() to maybe help with softupdates? (it should) */
- APPEND_ULTRA_PARANOID = 1,
-
- /* should we log extra information at the DEBUG level for DB stuff? 
- * 0 -> nothing; 1 -> some; higher -> even more */
- CONFIG_DB_VERBOSE = 1,
-
- /* log timing information to LOG_DEBUG */
- CONFIG_TIMING_VERBOSE = 0,
-
- /* should we be pedantic about namespace or sleezy? */
- SLEEZY_NAMESPACE = 1,
-
- /* should we do a fast TLS session shutdown? */
- TLS_FAST_SHUTDOWN = 1,
-
- /* should we use the SQUAT engine to accelerate SEARCH? */
- SQUAT_ENGINE = 1,
-
- /* should we have long LMTP error messages? */
- LMTP_LONG_ERROR_MSGS = 1
-};
-
-#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-)
-m4trace:configure.in:1497: -1- AC_CONFIG_FILES(man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile)
-m4trace:configure.in:1497: -1- _m4_warn(obsolete, AC_OUTPUT should be used without arguments.
-You should run autoupdate., )
-m4trace:configure.in:1497: -1- AC_SUBST(LIB@&t@OBJS, $ac_libobjs)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(LIB@&t@OBJS)
-m4trace:configure.in:1497: -1- m4_pattern_allow(^LIB@&t@OBJS$)
-m4trace:configure.in:1497: -1- AC_SUBST(LTLIBOBJS, $ac_ltlibobjs)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(LTLIBOBJS)
-m4trace:configure.in:1497: -1- m4_pattern_allow(^LTLIBOBJS$)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(top_builddir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(top_build_prefix)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(srcdir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(abs_srcdir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(top_srcdir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(abs_top_srcdir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(builddir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(abs_builddir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(abs_top_builddir)
-m4trace:configure.in:1497: -1- AC_SUBST_TRACE(INSTALL)

cyrus-imapd-2.4.17.tar.gz/com_err/et/Makefile.in Deleted

@@ -1,142 +0,0 @@
-# Makefile for error-table routines
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.3 2010/01/06 17:01:28 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-ARCHIVE = ar cr
-
-AWK = @AWK@
-SED = sed
-
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-
-LIBOBJS= error_message.o et_name.o init_et.o com_err.o
-# for et_lex.lex.c include in error_table.y
-LOCALINCLUDE=-I. -I.. -I$(srcdir)
-
-all: compile_et libcom_err.a
-
-install:
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
-
-# solaris make loses on com_err.c but not on init_et.c, but this helps
-com_err.o: com_err.c
-
-#
-# real entries...
-#
-
-compile_et: $(srcdir)/compile_et.sh $(srcdir)/config_script
-	$(srcdir)/config_script $(srcdir)/compile_et.sh $(AWK) $(SED) > compile_et
-	chmod 755 compile_et	
-
-et_c.awk: $(srcdir)/et_c.awk
-	$(CP) $(srcdir)/et_c.awk et_c.awk
-
-et_h.awk: $(srcdir)/et_h.awk
-	$(CP) $(srcdir)/et_h.awk et_h.awk
-
-clean:
-	rm -f compile_et compile_et.o error_table.o 
-	rm -f libcom_err.a
-	rm -f $(LIBOBJS)
-
-distclean: clean
-	rm -f compile_et compile_et.o error_table.o 
-	rm -f libcom_err.a
-	rm -f $(LIBOBJS)
-	rm Makefile
-
-depend: compile_et 
-
-#install:: com_err.h 
-#	$(INSTALLFILE) $(srcdir)/com_err.h $(DESTDIR)$(INCLDIR)/com_err.h
-#
-#install:: mit-sipb-copyright.h
-#	$(INSTALLFILE) $(srcdir)/mit-sipb-copyright.h $(DESTDIR)$(INCLDIR)/mit-sipb-copyright.h
-#
-#install:: com_err.3
-#	$(INSTALLFILE) $(srcdir)/com_err.3 $(DESTDIR)$(MANDIR)/man3/com_err.3
-#
-#install:: compile_et.1
-#	$(INSTALLFILE) $(srcdir)/compile_et.1 $(DESTDIR)$(MANDIR)/man1/compile_et.1
-
-
-## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
-
-libcom_err.a: $(LIBOBJS)
-	rm -f libcom_err.a
-	$(ARCHIVE) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-#install::
-#	$(INSTALLLIB) libcom_err.a $(DESTDIR)$(LIBDIR)/libcom_err.a
-#	$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.a
-#	$(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.a
-#	$(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.a
-## 
-
-libcom_err.o:	$(LIBOBJS)
-	ld -r -s -o libcom_err.o $(LIBOBJS)
-	chmod -x libcom_err.o
-
-TAGS:	et_name.c error_message.c compile_et.c error_table.c \
-		lex.yy.c init_et.c
-	etags et_name.c error_message.c compile_et.c \
-		error_table.c init_et.c
-

cyrus-imapd-2.4.17.tar.gz/config.guess Deleted

@@ -1,1526 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 OPTION
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - )	# Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	 if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	 CC_FOR_BUILD="$c"; break ;
-	 fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	 CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format. This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name. We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	 armeb) machine=armeb-unknown ;;
-	 arm*) machine=arm-unknown ;;
-	 sh3el) machine=shl-unknown ;;
-	 sh3eb) machine=sh-unknown ;;
-	 sh5el) machine=sh5le-unknown ;;
-	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		 # Return netbsd for either. FIX?
-		 os=netbsd
-		else
-		 os=netbsdelf
-		fi
-		;;
-	 *)
-	 os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	 Debian*)
-		release='-gnu'
-		;;
-	 *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
- *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
- *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
- *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
- macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
- *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
- alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995. I hope that
-	# covers most systems running today. This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	 "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	 "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	 "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	 "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	 "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	 "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	 "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	 "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	 "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	 "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	 "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	 "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
- Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
- 21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
- Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
- *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
- *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
- *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
- *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
-	exit ;;
- arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
- NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
- DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	 sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
- sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
- sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
- sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	 Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
- sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
- sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	 sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	 sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
- aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
- powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
- RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
- RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
- VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
-	int main (int argc, char *argv) {
-#else
-	int main (argc, argv) int argc; char *argv; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	 printf ("mips-mips-riscos%ssysv\n", argv1); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	 printf ("mips-mips-riscos%ssvr4\n", argv1); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	 printf ("mips-mips-riscos%sbsd\n", argv1); exit (0);
-	#endif
-	#endif
-	 exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$0-9*$.*/\1/p'` &&
-	 SYSTEM_NAME=`$dummy $dummyarg` &&
-	 { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
- Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
- Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
- Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
- m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
- m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
- m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if $UNAME_PROCESSOR = mc88100 || $UNAME_PROCESSOR = mc88110 
-	then
-	 if ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx || \
-	 ${TARGET_BINARY_INTERFACE}x = x 
-	 then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	 else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	 fi
-	else
-	 echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
- M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
- M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
- Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
- *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
- ????????:AIX?:12.1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-	exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
- ia64:AIX:*:*)
-	if -x /usr/bin/oslevel ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
- *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
- *:AIX:*:456)
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if -x /usr/bin/oslevel ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
- *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-	exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
- DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
- 9000/34??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
- hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
- 9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	case "${UNAME_MACHINE}" in
-	 9000/31? ) HP_ARCH=m68000 ;;
-	 9000/34?? ) HP_ARCH=m68k ;;
-	 9000/6780-90-9)
-		if -x /usr/bin/getconf ; then
-		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
-			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
-		fi
-		if "${HP_ARCH}" = "" ; then
-		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- 	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- 	case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- 	 switch (bits)
- 		{
- 		case 64: puts ("hppa2.0w"); break;
- 		case 32: puts ("hppa2.0n"); break;
- 		default: puts ("hppa2.0"); break;
- 		} break;
- #else /* !defined(_SC_KERNEL_BITS) */
- 	 puts ("hppa2.0"); break;
- #endif
- 	default: puts ("hppa1.0"); break;
- 	}
- exit (0);
- }
-EOF
-		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		 test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if ${HP_ARCH} = "hppa2.0w" 
-	then
-	 eval $set_cc_for_build
-
-	 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
-	 # generating 64-bit code. GNU and HP use different nomenclature:
-	 #
-	 # $ CC_FOR_BUILD=cc ./config.guess
-	 # => hppa2.0w-hp-hpux11.23
-	 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	 # => hppa64-hp-hpux11.23
-
-	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	 then
-		HP_ARCH="hppa2.0w"
-	 else
-		HP_ARCH="hppa64"
-	 fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
- ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
- 3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	 long cpu = sysconf (_SC_CPU_VERSION);
-	 /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	 true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-	 results, however. */
-	 if (CPU_IS_PA_RISC (cpu))
-	 {
-	 switch (cpu)
-		{
-		 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		 default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	 }
-	 else if (CPU_IS_HP_MC68K (cpu))
-	 puts ("m68k-hitachi-hiuxwe2");
-	 else puts ("unknown-hitachi-hiuxwe2");
-	 exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
- 9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
- hp7??:OSF1:*:* | hp8?79:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
- hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
- i*86:OSF1:*:*)
-	if -x /usr/sbin/sysversion ; then
-	 echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	 echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
- parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
- CRAY*A-Z90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*$A-Z90$/\1/' \
-	 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	 -e 's/\.^.*$/.X/'
-	exit ;;
- CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
- CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
- CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
- *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
- F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
- sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
- *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
- *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	 pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	 amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	 *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	esac
-	exit ;;
- i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
- *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
- i*:windows32*:*)
- 	# uname -m includes "-pc" on this system.
- 	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
- i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
- *:Interix*:3456*)
- 	case ${UNAME_MACHINE} in
-	 x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	 EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	 IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
- 34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
- i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
- p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
- prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
- *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
- *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-gnu
-	exit ;;
- i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
- arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	 | grep -q __ARM_EABI__
-	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
- avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
- crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
- frv:Linux:*:*)
- 	echo frv-unknown-linux-gnu
-	exit ;;
- ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
- mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
- or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	 *) echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
- sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
- x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
- xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/ 	 	*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	 a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	 coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	 "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
- i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
- i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
- i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
- i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
- i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
- i*86:*:5:678*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	 *486*)	 UNAME_MACHINE=i486 ;;
-	 *Pentium)	 UNAME_MACHINE=i586 ;;
-	 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
- i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
- pc:*:*:*)
-	# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
- paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
- i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-	fi
-	exit ;;
- mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
- M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
- M68*:*:R3V5678*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 334??:*:4.0:* | 334??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
- TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
- RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
- RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
- *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
- *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
- i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
- *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
- mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
- news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
- R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if -d /usr/nec ; then
-	 echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	 echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
- exit ;;
- BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
- BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
- BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
- SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
- Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
- *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
- *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
- *:procnto*:*:* | *:QNX:0123456789*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
- *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
- *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
- BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
- DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
- *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	 UNAME_MACHINE=i386
-	else
-	 UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
- *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
- *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
- *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
- *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
- *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
-	exit ;;
- *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	 A*) echo alpha-dec-vms ; exit ;;
-	 I*) echo ia64-dec-vms ; exit ;;
-	 V*) echo vax-dec-vms ; exit ;;
-	esac ;;
- *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
- i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
- i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
-	 ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if -x /usr/convex/getsysinfo 
-then
- case `getsysinfo -f cpu_type` in
- c1*)
-	echo c1-convex-bsd
-	exit ;;
- c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
- c34*)
-	echo c34-convex-bsd
-	exit ;;
- c38*)
-	echo c38-convex-bsd
-	exit ;;
- c4*)
-	echo c4-convex-bsd
-	exit ;;
- esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

cyrus-imapd-2.4.17.tar.gz/config.h.in Deleted

@@ -1,616 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: configure.in,v 1.316 2010/01/06 17:01:26 murch Exp $
- */
-
-#ifndef _CYRUS_IMAPD_CONFIG_H_
-#define _CYRUS_IMAPD_CONFIG_H_
-
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Should the AFS PTS plugin use krb5? */
-#undef AFSPTS_USE_KRB5
-
-/* Where will we be installed? */
-#undef CYRUS_PATH
-
-/* What user will we run as? */
-#undef CYRUS_USER
-
-/* Alternative to /dev/urandom? */
-#undef EGD_SOCKET
-
-/* Do we have a regex library? */
-#undef ENABLE_REGEX
-
-/* Enable Netscape Menu Option Hack? */
-#undef ENABLE_X_NETSCAPE_HACK
-
-/* Extra version information for imap/version.h */
-#undef EXTRA_IDENT
-
-/* Do we have strerror()? */
-#undef HAS_STRERROR
-
-/* Should we build afskrb pts module? */
-#undef HAVE_AFSKRB
-
-/* Does SASL support APOP? */
-#undef HAVE_APOP
-
-/* Build in Berkeley DB support? */
-#undef HAVE_BDB
-
-/* Define to 1 if you have the `daemon' function. */
-#undef HAVE_DAEMON
-
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
- */
-#undef HAVE_DECL_TZNAME
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `dns_lookup' function. */
-#undef HAVE_DNS_LOOKUP
-
-/* Define to 1 if you have the `dn_expand' function. */
-#undef HAVE_DN_EXPAND
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* We need et/com_err.h */
-#undef HAVE_ET_COM_ERR_H
-
-/* Do we have fdatasync()? */
-#undef HAVE_FDATASYNC
-
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
-/* Do we have a getaddrinfo? */
-#undef HAVE_GETADDRINFO
-
-/* Define to 1 if you have the `getdtablesize' function. */
-#undef HAVE_GETDTABLESIZE
-
-/* Define to 1 if you have the `getgrouplist' function. */
-#undef HAVE_GETGROUPLIST
-
-/* Do we have a getnameinfo? */
-#undef HAVE_GETNAMEINFO
-
-/* Define to 1 if you have the `getpassphrase' function. */
-#undef HAVE_GETPASSPHRASE
-
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
-
-/* Define if you have the gssapi.h header file */
-#undef HAVE_GSSAPI_H
-
-/* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function.
- */
-#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-
-/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-
-/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-#undef HAVE_GSS_C_NT_USER_NAME
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Support for Kerberos? */
-#undef HAVE_KRB
-
-/* Should we build ldap pts module? */
-#undef HAVE_LDAP
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `fl' library (-lfl). */
-#undef HAVE_LIBFL
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Do we have TCP wrappers? */
-#undef HAVE_LIBWRAP
-
-/* Define to 1 if you support file names longer than 14 characters. */
-#undef HAVE_LONG_FILE_NAMES
-
-/* Does the compiler support long long int? */
-#undef HAVE_LONG_LONG_INT
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Build in MySQL support? */
-#undef HAVE_MYSQL
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Do we have Net-SNMP support? */
-#undef HAVE_NETSNMP
-
-/* Define to 1 if you have the <net-snmp/agent/agent_module_config.h> header
- file. */
-#undef HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H
-
-/* Do we have usable pcre library? */
-#undef HAVE_PCREPOSIX_H
-
-/* Build in PgSQL support? */
-#undef HAVE_PGSQL
-
-/* Do we have an rlim_t? */
-#undef HAVE_RLIM_T
-
-/* Define to 1 if you have the <rxposix.h> header file. */
-#undef HAVE_RXPOSIX_H
-
-/* Define to 1 if you have the `setrlimit' function. */
-#undef HAVE_SETRLIMIT
-
-/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
-
-/* Define to 1 if you have the `shutdown' function. */
-#undef HAVE_SHUTDOWN
-
-/* Does sockaddr have an sa_len? */
-#undef HAVE_SOCKADDR_SA_LEN
-
-/* Do we have a socklen_t? */
-#undef HAVE_SOCKLEN_T
-
-/* Build in SQLite support? */
-#undef HAVE_SQLITE
-
-/* Build with SSL support? */
-#undef HAVE_SSL
-
-/* Is there an ss_family in sockaddr_storage? */
-#undef HAVE_SS_FAMILY
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
-
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Do we have a sockaddr_storage? */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE
-
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
- `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
-
-/* Define to 1 if you don't have `tm_zone' but do have the external array
- `tzname'. */
-#undef HAVE_TZNAME
-
-/* Do we have UCD-SNMP support? */
-#undef HAVE_UCDSNMP
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Build with Zephyr support? */
-#undef HAVE_ZEPHYR
-
-/* Do we have zlib? */
-#undef HAVE_ZLIB
-
-/* define if your compiler has __attribute__ */
-#undef HAVE___ATTRIBUTE__
-
-/* Name of the pidfile for master */
-#undef MASTER_PIDFILE
-
-/* Do we have a sys_errlist? */
-#undef NEED_SYS_ERRLIST
-
-/* Use "imap" as sieve service name? */
-#undef OLD_SIEVE_SERVICE_NAME
-
-/* Configure OpenSSL to provide krb4-compatible legacy des apis */
-#undef OPENSSL_DES_LIBDES_COMPATIBILITY
-
-/* Configure OpenSSL to provide legacy des apis */
-#undef OPENSSL_ENABLE_OLD_DES_SUPPORT
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Directory to use for service binaries */
-#undef SERVICE_PATH
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `long long int', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG_INT
-
-/* The size of `off_t', as computed by sizeof. */
-#undef SIZEOF_OFF_T
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `unsigned long long int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_LONG_INT
-
-/* Do we already have setproctitle? */
-#undef SPT_TYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Config File Location */
-#undef SYSCONFDIR
-
-/* Syslog facility to use. */
-#undef SYSLOG_FACILITY
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Build in Sieve support? */
-#undef USE_SIEVE
-
-/* Enable extensions on AIX 3, Interix. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris. */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop. */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Build in PTS support? */
-#undef WITH_PTS
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char'. */
-#undef YYTEXT_POINTER
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-
-/* time.h */
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-/* com_err.h, as needed */
-#ifndef IN_COM_ERR
-#ifdef HAVE_ET_COM_ERR_H
-#include <et/com_err.h>
-#else
-#include <com_err.h>
-#endif /* HAVE_ET_COM_ERR_H */
-#endif /* IN_COM_ERR */
-
-/* This allows us to work even when we don't have an fdatasync */
-#ifndef HAVE_FDATASYNC
-#define fdatasync(fd) fsync(fd)
-#endif
-
-/* A similar setup for not having O_DSYNC */
-#include <fcntl.h>
-
-#ifndef O_DSYNC
-# ifdef O_SYNC
-# define O_DSYNC O_SYNC /* POSIX */
-# else
-# define O_DSYNC O_FSYNC /* BSD */
-# endif
-#endif
-
-#ifndef HAVE___ATTRIBUTE__
-/* Can't use attributes... */
-#define __attribute__(foo)
-#endif
-
-#ifndef HAVE_SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
-
-#ifndef HAVE_RLIM_T
-typedef int rlim_t;
-#endif
-
-/* some potentially memory saving tradeoffs, 
- preconfigured in memory-saving mode */
-
-/* save the cmdlines for the ID command */
-#undef ID_SAVE_CMDLINE
-
-/* IPv6 things */
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-
-struct sockaddr_storage {
-	struct	sockaddr ss_sa;
-	char		__ss_pad2_SS_PADSIZE;
-};
-# define ss_family ss_sa.sa_family
-# define HAVE_SS_FAMILY
-#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-
-#ifndef HAVE_SS_FAMILY
-#define ss_family	__ss_family
-#endif
-
-#ifndef AF_INET6
-/* Define it to something that should never appear */
-#define	AF_INET6	AF_MAX
-#endif
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-#include "gai.h"
-#endif
-
-/* End IPv6 things */
-
-#ifdef OLD_SIEVE_SERVICE_NAME
-#define SIEVE_SERVICE_NAME "imap"
-#else
-#define SIEVE_SERVICE_NAME "sieve"
-#endif
-
-/* filenames */
-#define FNAME_DBDIR "/db"
-#define FNAME_USERDIR "/user/"
-#define FNAME_DOMAINDIR "/domain/"
-#define FNAME_LOGDIR "/log/"
-#define FNAME_PTSDB "/ptclient/ptscache.db"
-#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-
-#ifndef HAVE_SHUTDOWN
-#define shutdown(fd, mode) 0
-#endif
-
-/* *printf() macros */
-#if (SIZEOF_SIZE_T == SIZEOF_INT)
-#define SIZE_T_FMT "%u"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG)
-#define SIZE_T_FMT "%lu"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG_LONG_INT)
-#define SIZE_T_FMT "%llu"
-#else
-#error dont know what to use for SIZE_T_FMT
-#endif
-
-#if (SIZEOF_OFF_T == SIZEOF_LONG)
-#define OFF_T_FMT "%ld"
-#define strtoofft(nptr, endptr, base) strtol(nptr, endptr, base)
-#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG_INT)
-#define OFF_T_FMT "%lld"
-#define strtoofft(nptr, endptr, base) strtoll(nptr, endptr, base)
-#else
-#error dont know what to use for OFF_T_FMT
-#endif
-
-/* compile time options; think carefully before modifying */
-enum {
- /* should we send an UNAVAILABLE message to master when
- * a service is exiting (master is already going to be 
- * informed of the exit by the SIGCHLD signal anyway) ? */
- MESSAGE_MASTER_ON_EXIT = 0,
-
- /* should a hierarchical rename stop on error? */
- RENAME_STOP_ON_ERROR = 1,
-
- /* should we call fsync() to maybe help with softupdates? (it should) */
- APPEND_ULTRA_PARANOID = 1,
-
- /* should we log extra information at the DEBUG level for DB stuff? 
- * 0 -> nothing; 1 -> some; higher -> even more */
- CONFIG_DB_VERBOSE = 1,
-
- /* log timing information to LOG_DEBUG */
- CONFIG_TIMING_VERBOSE = 0,
-
- /* should we be pedantic about namespace or sleezy? */
- SLEEZY_NAMESPACE = 1,
-
- /* should we do a fast TLS session shutdown? */
- TLS_FAST_SHUTDOWN = 1,
-
- /* should we use the SQUAT engine to accelerate SEARCH? */
- SQUAT_ENGINE = 1,
-
- /* should we have long LMTP error messages? */
- LMTP_LONG_ERROR_MSGS = 1
-};
-
-#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-

cyrus-imapd-2.4.17.tar.gz/config.sub Deleted

@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 OPTION CPU-MFR-OPSYS
- $0 OPTION ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - )	# Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-^-*$//'`
- if $basic_machine != $1 
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint0-9*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
-	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
-	| am33_2.0 \
-	| arc | arm | armble | armelb | armv2345 | armv345lb | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh1234 | sh24a | sh23e | sh34eb | sheb | shbe | shle | sh1234le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscaleebl | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680123460 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	 basic_machine=$basic_machine-pc
-	 ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
-	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
-	| alphapca567-* | alpha64pca567-* | arc-* \
-	| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c123* | c30-* | cjt90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh1234-* | sh24a-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
-	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscaleebl-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
- 	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	 | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k90-90-9 | hp90-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k20-90-9 | hp9k310-9)
-		basic_machine=m68000-hp
-		;;
-	hp9k32-90-9)
-		basic_machine=m68k-hp
-		;;
-	hp9k60-90-9 | hp60-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k70-790-9 | hp70-790-9)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k780-9 | hp780-9)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8671 | hp8671 | hp9k8024 | hp8024 | hp9k8789 | hp8789 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k80-913679 | hp80-913679)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k80-90-9 | hp80-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		 -irix*)
-			;;
-		 *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint0-9* | *MiNT | *MiNT0-9*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		 -nextstep* )
-			;;
-		 -ns2*)
-		 os=-nextstep2
-			;;
-		 *)
-		 os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh45000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm4600)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh1234 | sh24a | sh34eb | sh1234le | sh23ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if x"$os" != x"" 
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	 | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos34*\
-	 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	 | -aos* \
-	 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	 | -openbsd* | -solidbsd* \
-	 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	 | -chorusos* | -chorusrdb* \
-	 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	 | -uxpv* | -beos* | -mpeix* | -udk* \
-	 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		 x86-* | i*86-*)
-			;;
-		 *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
- -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
- -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/^-*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
-		os=-elf
-		;;
- spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
- c4x-* | tic4x-*)
- 	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
- mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
- 	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f3001-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

cyrus-imapd-2.4.17.tar.gz/configure Deleted

@@ -1,12233 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in #(
-	 /*)
-	 for as_base in sh bash ksh sh5; do
-	 # Try only shells that exist, to save several forks.
-	 as_shell=$as_dir/$as_base
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
-		 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
-	 done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR LINENO LOG_FD
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /$LINENO/=
- ' <$as_myself |
- sed '
- s/$LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/$LINENO$^'$as_cr_alnum'_.*\n$$.*$/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
- # Don't try to exec as it changes $0, causing all sort of problems
- # (the dirname of $0 is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="imap/imapd.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-PERL_DEPSUBDIRS
-PERL_SUBDIRS
-IMAP_LIBS
-IMAP_COM_ERR_LIBS
-LIB_RT
-LIB_UCDSNMP
-SNMP_CONFIG
-LIB_WRAP
-SNMP_SUBDIRS
-PERL_CCCDLFLAGS
-PERL
-SASLFLAGS
-LIB_SASL
-DYNSASLFLAGS
-LIB_DYN_SASL
-GSSAPIBASE_LIBS
-GSSAPI_LIBS
-LIB_CRYPT
-COM_ERR_CPPFLAGS
-COM_ERR_LDFLAGS
-COM_ERR_LIBS
-COMPILE_ET
-IMAP_PROGS
-ZEPHYR_LIBS
-ZLIB
-CMU_LIB_SUBDIR
-OPENSSL_LIB
-OPENSSL_INC
-SERVER_SUBDIRS
-LDAP_LIBS
-LDAP_LDFLAGS
-LDAP_CPPFLAGS
-AFS_LDFLAGS
-AFS_LIBS
-cyrus_cv_sigveclib
-WITH_LOCK
-WITH_MAP
-WITH_GMTOFF
-WITH_NONBLOCK
-SIEVE_SUBDIRS
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-YFLAGS
-YACC
-SIEVE_CPPFLAGS
-SIEVE_LIBS
-SIEVE_OBJS
-CYRUSDB_OBJS
-BDB_LIB
-BDB_INC
-LOCALDEFS
-DEPLIBS
-EXTRA_SUBDIRS
-PRE_SUBDIRS
-IPV6_OBJS
-LIB_SOCKET
-LIBOBJS
-AWK
-EGREP
-GREP
-CPP
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-SET_MAKE
-RANLIB
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-cyrus_group
-cyrus_user
-service_path
-cyrus_prefix
-MAKEDEPEND
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_extraident
-with_login
-with_cyrus_prefix
-with_service_path
-with_cyrus_user
-with_cyrus_group
-with_bdb
-with_dbdir
-with_bdb_libdir
-with_bdb_incdir
-with_mysql
-with_mysql_libdir
-with_mysql_incdir
-with_pgsql
-with_pgsql_libdir
-with_pgsql_incdir
-with_sqlite
-with_sqlite_libdir
-with_sqlite_incdir
-enable_sieve
-enable_pcre
-with_lock
-enable_afs
-with_afs_libdir
-with_afs_incdir
-with_ldap
-enable_krb5afspts
-enable_server
-with_krb
-with_krbimpl
-enable_statickrb
-with_krbdes
-with_openssl
-with_egd_socket
-with_lib_subdir
-with_zlib
-with_zephyr
-with_pidfile
-enable_idled
-enable_nntp
-enable_murder
-enable_replication
-with_com_err
-with_syslogfacility
-enable_cmulocal
-enable_oldsievename
-enable_netscapehack
-enable_gssapi
-with_gss_impl
-with_sasl
-with_staticsasl
-with_perl
-with_libwrap
-with_snmp
-with_ucdsnmp
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-YACC
-YFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x$^=*$='`
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | 0-9* | *!_$as_cr_alnum* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X$.*^/$' \| "X$ac_val" : 'X$.*$'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- \\/$* | ?:\\/* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_myself" : 'X$//$^/' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*^/$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 OPTION... VAR=VALUE...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE disabled
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR configure dir or \`..'
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- $ac_default_prefix
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- PREFIX
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables EPREFIX/bin
- --sbindir=DIR system admin executables EPREFIX/sbin
- --libexecdir=DIR program executables EPREFIX/libexec
- --sysconfdir=DIR read-only single-machine data PREFIX/etc
- --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
- --localstatedir=DIR modifiable single-machine data PREFIX/var
- --libdir=DIR object code libraries EPREFIX/lib
- --includedir=DIR C header files PREFIX/include
- --oldincludedir=DIR C header files for non-gcc /usr/include
- --datarootdir=DIR read-only arch.-independent data root PREFIX/share
- --datadir=DIR read-only architecture-independent data DATAROOTDIR
- --infodir=DIR info documentation DATAROOTDIR/info
- --localedir=DIR locale-dependent data DATAROOTDIR/locale
- --mandir=DIR man documentation DATAROOTDIR/man
- --docdir=DIR documentation root DATAROOTDIR/doc/PACKAGE
- --htmldir=DIR html documentation DOCDIR
- --dvidir=DIR dvi documentation DOCDIR
- --pdfdir=DIR pdf documentation DOCDIR
- --psdir=DIR ps documentation DOCDIR
-_ACEOF
-
- cat <<\_ACEOF
-
-System types:
- --build=BUILD configure for building on BUILD guessed
- --host=HOST cross-compile to build programs to run on HOST BUILD
- --target=TARGET configure for building compilers for TARGET HOST
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
- cat <<\_ACEOF
-
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE=ARG include FEATURE ARG=yes
- --disable-sieve disable Sieve support
- --disable-pcre disable PCRE library
- --enable-afs Enable AFS with ptloader
- --enable-krb5afspts compile afskrb PTS module with krb5 support
- --disable-server disable compiling servers
- --enable-statickrb link Kerberos statically
- --enable-idled enable IMAP idled support
- --enable-nntp enable NNTP support
- --enable-murder enable IMAP Murder support
- --enable-replication enable replication support (experimental)
- --enable-cmulocal enable CMU-specific local support
- --enable-oldsievename enable the use of 'imap' as the sieve service name
- --enable-netscapehack enable Netscape hack for the menu option
- in Communicator to Administrate Mail
- --enable-gssapi=<DIR> enable GSSAPI authentication yes
-
-Optional Packages:
- --with-PACKAGE=ARG use PACKAGE ARG=yes
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-extraident=STRING use STRING as extra version information
-
- --with-cyrus-prefix=DIR use DIR as cyrus server install directory
- --with-service-path=DIR use DIR as service install directory
- --with-cyrus-user=USERID use USERID cyrus userid
- --with-cyrus-group=GROUPID use GROUPID cyrus group
- --with-bdb=DIR use Berkeley DB (in DIR) yes
- --with-bdb-libdir=DIR Berkeley DB lib files are in DIR
- --with-bdb-incdir=DIR Berkeley DB include files are in DIR
- --with-mysql=DIR use MySQL (in DIR) no
- --with-mysql-libdir=DIR MySQL lib files are in DIR
- --with-mysql-incdir=DIR MySQL include files are in DIR
- --with-pgsql=DIR use PostgreSQL (in DIR) no
- --with-pgsql-libdir=DIR Pgsql lib files are in DIR
- --with-pgsql-incdir=DIR Pgsql include files are in DIR
- --with-sqlite=DIR use SQLite (in DIR) no
- --with-sqlite-libdir=DIR SQLite lib files are in DIR
- --with-sqlite-incdir=DIR SQLite include files are in DIR
- --with-lock=METHOD force use of METHOD for locking (flock or fcntl)
- --with-afs-libdir=PATH use AFS libraries from PATH /usr/lib
- --with-afs-incdir=PATH use AFS headers from PATH /usr/include
- --with-ldap=DIR use LDAP (in DIR) (experimental) /usr/local
- --with-krb=PATH use Kerberos from PATH
- --with-krbimpl=\kth|mit\ assume Kerberos 4 from KTH or MIT
- --with-krbdes use Kerberos DES implementation yes
- --with-openssl=PATH use OpenSSL from PATH
- --with-egd-socket=FILE Entropy Gathering Daemon socket pathname
- for systems without /dev/urandom
- --with-lib-subdir=DIR Find libraries in DIR instead of lib
- --with-zlib=PATH use zlib from PATH
- --with-zephyr=PATH enable Zephyr notification (installed on PATH)
- --with-pidfile=PATH pidfile in PATH (/var/run/cyrus-master.pid)
- --with-com_err=PATH use com_err from path -- includes in PATH/include,
- libs in PATH/lib, and compile_et in PATH/bin
- --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
- --with-gss_impl={heimdal|mit|cybersafe|seam|auto}
- choose specific GSSAPI implementation auto
- --with-sasl=DIR Compile with libsasl2 in <DIR>
- --with-staticsasl=DIR Compile with staticly linked libsasl2 in <DIR>
- --with-perl=PERL use PERL for perl
- --with-libwrap=DIR use libwrap (rooted in DIR) yes
- --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- YACC The `Yet Another Compiler Compiler' implementation to use.
- Defaults to the first program found out of: `bison -y', `byacc',
- `yacc'.
- YFLAGS The list of arguments that will be passed by default to $YACC.
- This script will default YFLAGS to the empty string to avoid a
- default value of `-d' given by some make applications.
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array 1 - 2 * !(($2) >= 0);
-test_array 0 = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=0 ac_mid=0
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array 1 - 2 * !(($2) <= $ac_mid);
-test_array 0 = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid; break
-else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array 1 - 2 * !(($2) < 0);
-test_array 0 = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=-1 ac_mid=-1
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array 1 - 2 * !(($2) >= $ac_mid);
-test_array 0 = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=$ac_mid; break
-else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array 1 - 2 * !(($2) <= $ac_mid);
-test_array 0 = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid
-else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (($2) < 0)
- {
- long int i = longval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ($2))
-	return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
- ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
- fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_member
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
- 2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
- if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
- else
-	case $ac_arg in
-	 *=* | --config-cache | -C | -disable-* | --disable-* \
-	 | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	 | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	 | -with-* | --with-* | -without-* | --without-* | --x)
-	 case "$ac_configure_args0 " in
-	 "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	 esac
-	 ;;
-	 -* ) ac_must_keep_next=true ;;
-	esac
- fi
- as_fn_append ac_configure_args " '$ac_arg'"
- ;;
- esac
- done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- \\/* | ?:\\/* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	 ac_cache_corrupted=:
-	else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	 eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
-
-
-# Check whether --with-extraident was given.
-if test "${with_extraident+set}" = set; then :
- withval=$with_extraident;
-cat >>confdefs.h <<_ACEOF
-#define EXTRA_IDENT "$withval"
-_ACEOF
-
-fi
-
-
-# Extract the first word of "makedepend", so it can be a program name with args.
-set dummy makedepend; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKEDEPEND+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MAKEDEPEND"; then
- ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MAKEDEPEND="makedepend"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
-fi
-fi
-MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
-if test -n "$MAKEDEPEND"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
-$as_echo "$MAKEDEPEND" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MAKEDEPEND" != "makedepend"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&5
-$as_echo "$as_me: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&2;}
-fi
-
-
-# Check whether --with-login was given.
-if test "${with_login+set}" = set; then :
- withval=$with_login; as_fn_error $? "--with-login is no longer supported.
-Configure SASL appropriately instead." "$LINENO" 5
-fi
-
-
-
-# Check whether --with-cyrus-prefix was given.
-if test "${with_cyrus_prefix+set}" = set; then :
- withval=$with_cyrus_prefix; cyrus_prefix="$withval"
-else
- cyrus_prefix="/usr/cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define CYRUS_PATH "$cyrus_prefix"
-_ACEOF
-
-
-# Check whether --with-service-path was given.
-if test "${with_service_path+set}" = set; then :
- withval=$with_service_path; service_path="$withval"
-else
- service_path="$cyrus_prefix/bin"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SERVICE_PATH "$service_path"
-_ACEOF
-
-
-# Check whether --with-cyrus-user was given.
-if test "${with_cyrus_user+set}" = set; then :
- withval=$with_cyrus_user; cyrus_user="$withval"
-else
- cyrus_user="cyrus"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define CYRUS_USER "$cyrus_user"
-_ACEOF
-
-
-# Check whether --with-cyrus-group was given.
-if test "${with_cyrus_group+set}" = set; then :
- withval=$with_cyrus_group; cyrus_group="$withval"
-else
- cyrus_group="mail"
-fi
-
-
-
-if test $sysconfdir = '${prefix}/etc'; then
- sysconfdir="/etc"
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define SYSCONFDIR "$sysconfdir"
-_ACEOF
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
- ab.out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
- *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	 ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
- * )
-	break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
-	 break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
- else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1;
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 :
-	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # program-specific install script used by HP pwplus--don't use.
-	 :
-	 else
-	 rm -rf conftest.one conftest.two conftest.dir
-	 echo one > conftest.one
-	 echo two > conftest.two
-	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	 test -s conftest.one && test -s conftest.two &&
-	 test -s conftest.dir/conftest.one &&
-	 test -s conftest.dir/conftest.two
-	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	 break 3
-	 fi
-	 fi
-	fi
- done
- done
- ;;
-esac
-
- done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		 inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
- MINIX=yes
-else
- MINIX=
-fi
-
-
- if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#	 define __EXTENSIONS__ 1
-	 $ac_includes_default
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_safe_to_define___extensions__=yes
-else
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
- test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset2;
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x = {25, 17};
- const int *foo = &x0;
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap3; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs0 && !zero.x;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
-$as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_sys_long_file_names=yes
-# Test for long file names in all the places we know might matter:
-# .		the current directory, where building will happen
-# $prefix/lib	where we will be installing things
-# $exec_prefix/lib	likewise
-# $TMPDIR		if set, where it might want to write temporary files
-# /tmp		where it might want to write temporary files
-# /var/tmp		likewise
-# /usr/tmp		likewise
-for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
- # in the usual case where exec_prefix is '${prefix}'.
- case $ac_dir in #(
- . | /* | ?:\\/*) ;; #(
- *) continue;;
- esac
- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
- ac_xdir=$ac_dir/cf$$
- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
- ac_tf1=$ac_xdir/conftest9012345
- ac_tf2=$ac_xdir/conftest9012346
- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
- ac_cv_sys_long_file_names=no
- rm -f -r "$ac_xdir" 2>/dev/null
- test $ac_cv_sys_long_file_names = no && break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
-$as_echo "$ac_cv_sys_long_file_names" >&6; }
-if test $ac_cv_sys_long_file_names = yes; then
-
-$as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
-
-fi
-
-if test $ac_cv_sys_long_file_names = no; then
-	as_fn_error $? "The Cyrus IMAPD requires support for long file names" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
- ;;
-esac
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_size_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_size_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_off_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_off_t=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
-
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
-$as_echo_n "checking size of long long int... " >&6; }
-if ${ac_cv_sizeof_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5
-$as_echo_n "checking size of unsigned long long int... " >&6; }
-if ${ac_cv_sizeof_unsigned_long_long_int+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_unsigned_long_long_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned long long int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_unsigned_long_long_int=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long_long_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
-_ACEOF
-
-
-if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
- "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
-
-$as_echo "#define HAVE_LONG_LONG_INT /**/" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
-	 not a universal capable compiler
-	 #endif
-	 typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags. It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	 case $ac_word in
-	 i?86 | x86_64 | ppc | ppc64)
-	 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	 else
-		 ac_cv_c_bigendian=universal
-		 break
-	 fi
-	 ;;
-	 esac
-	 ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	 ac_prev=arch
-	 fi
- done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-	 #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		 && LITTLE_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-short int ascii_mm =
-		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
-		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		 return ascii_mmi + ascii_iii;
-		}
-		short int ebcdic_ii =
-		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
-		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		 return ebcdic_mmi + ebcdic_iii;
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	 ac_cv_c_bigendian=yes
-	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	 if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	 else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	 fi
-	 fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
-	 /* Are we little or big endian? From Harbison&Steele. */
-	 union
-	 {
-	 long int l;
-	 char csizeof (long int);
-	 } u;
-	 u.l = 1;
-	 return u.csizeof (long int) - 1 == 1;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
- no)
- ;; #(
- universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
- ;; #(
- *)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-$as_echo_n "checking for __attribute__... " >&6; }
-if ${ac_cv___attribute__+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv___attribute__=yes
-else
- ac_cv___attribute__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv___attribute__" = "yes"; then
-
-$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
-$as_echo "$ac_cv___attribute__" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -fPIC" >&5
-$as_echo_n "checking if compiler supports -fPIC... " >&6; }
-if ${ac_cv_fpic+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-save_CFLAGS=$CFLAGS
-CFLAGS="${CFLAGS} -fPIC"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdlib.h>
-static void
-foo(void)
-{
- exit(1);
-}
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_fpic=yes
-else
- ac_cv_fpic=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS=$save_CFLAGS
-
-fi
-
-if test "$ac_cv_fpic" = "yes"; then
- FPIC_CFLAGS="-fPIC"
-else
- FPIC_CFLAGS=""
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
-$as_echo "$ac_cv_fpic" >&6; }
-
-
-
- # CMU GUESS RUNPATH SWITCH
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runpath switch" >&5
-$as_echo_n "checking for runpath switch... " >&6; }
-if ${andrew_cv_runpath_switch+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- # first, try -R
- SAVE_LDFLAGS="${LDFLAGS}"
- LDFLAGS="-R /usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-R"
-else
-
- 	LDFLAGS="-Wl,-rpath,/usr/lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- andrew_cv_runpath_switch="-Wl,-rpath,"
-else
- andrew_cv_runpath_switch="none"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="${SAVE_LDFLAGS}"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $andrew_cv_runpath_switch" >&5
-$as_echo "$andrew_cv_runpath_switch" >&6; }
-
-for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
- $as_echo "#define HAVE_MEMMOVE 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" memmove.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memmove.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes; then :
- $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strcasecmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
-if test "x$ac_cv_func_ftruncate" = xyes; then :
- $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" ftruncate.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strerror.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strerror.$ac_objext"
- ;;
-esac
-
-fi
-
-
-for ac_func in strlcat strlcpy getgrouplist
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_ac_Header=yes"
-else
- eval "$as_ac_Header=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_ac_Header
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
-
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
-
-else
- ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
-
-for ac_header in stdlib.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_func in getpassphrase
-do :
- ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
-if test "x$ac_cv_func_getpassphrase" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPASSPHRASE 1
-_ACEOF
-
-fi
-done
-
-
-
-	save_LIBS="$LIBS"
-	LIB_SOCKET=""
-	ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
- :
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
- LIB_SOCKET="-lnsl $LIB_SOCKET"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
-else
- ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
- LIB_SOCKET="-lsocket $LIB_SOCKET"
-fi
-
-
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes; then :
- :
-else
- LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
-#include <resolv.h>
-int
-main ()
-{
-
-const char host12="openafs.org";
-u_char ans1024;
-res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-return 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- LIB_SOCKET="-lresolv $LIB_SOCKET"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-
-	LIBS="$LIB_SOCKET $save_LIBS"
-	for ac_func in dn_expand dns_lookup
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-	LIBS="$save_LIBS"
-
-
-LIBS="$LIBS ${LIB_SOCKET}"
-
-cyrus_cv_getaddrinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
- ac_cv_lib_socket_getaddrinfo=no
- ac_cv_lib_inet6_getaddrinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
-$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getaddrinfo=yes
-else
- ac_cv_lib_socket_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getaddrinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getaddrinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
-$as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getaddrinfo=yes
-else
- ac_cv_lib_inet6_getaddrinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getaddrinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getaddrinfo=no
-if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
- -o $ac_cv_lib_inet6_getaddrinfo = yes
-then
- ipv6_cv_getaddrinfo=yes
-fi
-if test $ipv6_cv_getaddrinfo = no; then
- if test getaddrinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
-
-$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getaddrinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getaddrinfo = yes; then
-
-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes; then :
- ac_cv_lib_socket_gai_strerror=no
- ac_cv_lib_inet6_gai_strerror=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -lsocket" >&5
-$as_echo_n "checking for gai_strerror in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_gai_strerror=yes
-else
- ac_cv_lib_socket_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gai_strerror" >&5
-$as_echo "$ac_cv_lib_socket_gai_strerror" >&6; }
-if test "x$ac_cv_lib_socket_gai_strerror" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_gai_strerror=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_gai_strerror=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -linet6" >&5
-$as_echo_n "checking for gai_strerror in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_gai_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_gai_strerror=yes
-else
- ac_cv_lib_inet6_gai_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gai_strerror" >&5
-$as_echo "$ac_cv_lib_inet6_gai_strerror" >&6; }
-if test "x$ac_cv_lib_inet6_gai_strerror" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_gai_strerror=no
-if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
- -o $ac_cv_lib_inet6_gai_strerror = yes
-then
- ipv6_cv_gai_strerror=yes
-fi
-if test $ipv6_cv_gai_strerror = no; then
- if test gai_strerror = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gai_strerror" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
-
-$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_gai_strerror=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_gai_strerror = yes; then
-
-$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getaddrinfo=no
-fi
-else
- cyrus_cv_getaddrinfo=no
-fi
-
-if test $cyrus_cv_getaddrinfo = no; then
-	IPV6_OBJS="getaddrinfo.o"
-fi
-
-cyrus_cv_getnameinfo=yes
-
-ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
-if test "x$ac_cv_func_getnameinfo" = xyes; then :
- ac_cv_lib_socket_getnameinfo=no
- ac_cv_lib_inet6_getnameinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
-$as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_getnameinfo=yes
-else
- ac_cv_lib_socket_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
-$as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
-if test "x$ac_cv_lib_socket_getnameinfo" = xyes; then :
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getnameinfo=no
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
- if ${ipv6_cv_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-	 break
-	fi
- done
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
-$as_echo "$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getnameinfo=no
- else
- if test x$ipv6_libinet6 = x; then
-	ipv6_libinet6=no
-	SAVELDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
-$as_echo_n "checking for getnameinfo in -linet6... " >&6; }
-if ${ac_cv_lib_inet6_getnameinfo+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-linet6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_inet6_getnameinfo=yes
-else
- ac_cv_lib_inet6_getnameinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
-$as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
-if test "x$ac_cv_lib_inet6_getnameinfo" = xyes; then :
- 	if test $ipv6_libinet6 = no; then
-	 ipv6_libinet6=yes
-	 LIBS="$LIBS -linet6"
-	fi
-fi
- if test $ipv6_libinet6 = no; then
-	LDFLAGS="$SAVELDFLAGS"
- fi
- fi
-fi
-
-fi
-ipv6_cv_getnameinfo=no
-if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
- -o $ac_cv_lib_inet6_getnameinfo = yes
-then
- ipv6_cv_getnameinfo=yes
-fi
-if test $ipv6_cv_getnameinfo = no; then
- if test getnameinfo = getaddrinfo; then
- for ipv6_cv_pfx in o n; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <netdb.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
- as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-fi
-
-fi
-rm -f conftest*
-
- if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
-
-$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
-
- ipv6_cv_getnameinfo=yes
- break
- fi
- done
- fi
-fi
-if test $ipv6_cv_getnameinfo = yes; then
-
-$as_echo "#define HAVE_GETNAMEINFO /**/" >>confdefs.h
-
-else
- cyrus_cv_getnameinfo=no
-fi
-
-if test $cyrus_cv_getnameinfo = no; then
-	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5
-$as_echo_n "checking whether you have ss_family in struct sockaddr_storage... " >&6; }
-if ${ipv6_cv_ss_family+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr_storage ss; int i = ss.ss_family;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_ss_family=yes
-else
- ipv6_cv_ss_family=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_ss_family = yes; then
-
-$as_echo "#define HAVE_SS_FAMILY /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_ss_family" >&5
-$as_echo "$ipv6_cv_ss_family" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have sa_len in struct sockaddr" >&5
-$as_echo_n "checking whether you have sa_len in struct sockaddr... " >&6; }
-if ${ipv6_cv_sa_len+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-int
-main ()
-{
-struct sockaddr sa; int i = sa.sa_len;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ipv6_cv_sa_len=yes
-else
- ipv6_cv_sa_len=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ipv6_cv_sa_len = yes; then
-
-$as_echo "#define HAVE_SOCKADDR_SA_LEN /**/" >>confdefs.h
-
-else
- :
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_sa_len" >&5
-$as_echo "$ipv6_cv_sa_len" >&6; }
-
-
-
-for ac_header in sys/time.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_TIME_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				 int *p = &tm.tm_sec;
-				 return !p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
-else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-"
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
-
-
-fi
-
-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-
-$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
-
-else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <time.h>
-#if !HAVE_DECL_TZNAME
-extern char *tzname;
-#endif
-
-int
-main ()
-{
-return tzname00;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_var_tzname=yes
-else
- ac_cv_var_tzname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-$as_echo "$ac_cv_var_tzname" >&6; }
- if test $ac_cv_var_tzname = yes; then
-
-$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
-
- fi
-fi
-
-
-
-
-
-
-
-for ac_func in vprintf
-do :
- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF
-
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
-
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
-
-
-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-
-
-
-# Check whether --with-bdb was given.
-if test "${with_bdb+set}" = set; then :
- withval=$with_bdb; with_bdb=$withval
-else
- with_bdb="yes"
-fi
-
-
-
-# Check whether --with-dbdir was given.
-if test "${with_dbdir+set}" = set; then :
- withval=$with_dbdir; with_bdb=$withval
-fi
-
-
-case "$with_bdb" in
- no)
-	use_berkeley="no"
-	;;
- yes)
-	use_berkeley="yes"
-	with_bdb_lib=none
-	with_bdb_inc=none
-	;;
-
- *)
-	use_berkeley="yes"
-	with_bdb_lib="$with_bdb/lib"
-	with_bdb_inc="$with_bdb/include"
-	;;
-esac
-
-if test "$use_berkeley" != "no"; then
-
-
-# Check whether --with-bdb-libdir was given.
-if test "${with_bdb_libdir+set}" = set; then :
- withval=$with_bdb_libdir; with_bdb_lib=$withval
-else
- test "${with_bdb_lib+set}" = set || with_bdb_lib=none
-fi
-
-
-# Check whether --with-bdb-incdir was given.
-if test "${with_bdb_incdir+set}" = set; then :
- withval=$with_bdb_incdir; with_bdb_inc=$withval
-else
- test "${with_bdb_inc+set}" = set || with_bdb_inc=none
-fi
-
-
-
-
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_bdb_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-	 BDB_INCADD="-I$with_bdb_inc"
-	else
-	 BDB_INCADD=""
-	fi
-
-	 ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
-if test "x$ac_cv_header_db_h" = xyes; then :
-
-	BDB_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_bdb_lib; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
- else
-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_cv_runpath_switch$with_bdb_lib"
- fi
-
-	else
-	 BDB_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
-	 for dbname in ${with_bdb} \
-	 db-4.8 db4.8 db48 \
-	 db-4.7 db4.7 db47 \
-	 db-4.6 db4.6 db46 \
-	 db-4.5 db4.5 db45 \
-	 db-4.4 db4.4 db44 \
-	 db-4.3 db4.3 db43 \
-	 db-4.2 db4.2 db42 \
-	 db-4.1 db4.1 db41 \
-	 db-4.0 db4.0 db40 db-4 db4 \
-	 db-3.3 db3.3 db33 \
-	 db-3.2 db3.2 db32 \
-	 db-3.1 db3.1 db31 \
-	 db-3.0 db3.0 db30 db-3 db3 \
-	 db
-	 do
-	 LIBS="$saved_LIBS -l$dbname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_create(NULL, NULL, 0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$dblib" = "berkeley"; then break; fi
- done
- if test "$dblib" = "no"; then
-	 LIBS="$saved_LIBS -ldb"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <db.h>
-int
-main ()
-{
-db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
-else
- dblib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$BDB_SAVE_LDFLAGS
-
-else
- dblib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$dblib" = "no"; then
- as_fn_error $? "Berkeley DB 3.x or later was not found. You may need to
- supply the --with-bdb-libdir or --with-bdb-incdir configure options." "$LINENO" 5
- fi
-
- if test "$with_bdb_lib" != "none"; then
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_bdb_lib $andrew_cv_runpath_switch$with_bdb_lib ${LDFLAGS}"
- fi
-
- fi
-
- BDB_INC=${BDB_INCADD}
- BDB_LIB=${BDB_LIBADD}
-
-
-
- LIBS="${LIBS} ${BDB_LIBADD}"
- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-
- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
-
-$as_echo "#define HAVE_BDB /**/" >>confdefs.h
-
-fi
-
-
-
-
-HAVE_SQL=0
-
-
-# Check whether --with-mysql was given.
-if test "${with_mysql+set}" = set; then :
- withval=$with_mysql; with_mysql=$withval
-else
- with_mysql="no"
-fi
-
-
-case "$with_mysql" in
- no)
-	use_mysql="no"
-	;;
- yes)
-	use_mysql="yes"
-	with_mysql_lib=none
-	with_mysql_inc=none
-	;;
-
- *)
-	use_mysql="yes"
-	with_mysql_lib="$with_mysql/lib"
-	with_mysql_inc="$with_mysql/include"
-	;;
-esac
-
-if test "$use_mysql" != "no"; then
-
-
-# Check whether --with-mysql-libdir was given.
-if test "${with_mysql_libdir+set}" = set; then :
- withval=$with_mysql_libdir; with_mysql_lib=$withval
-else
- test "${with_mysql_lib+set}" = set || with_mysql_lib=none
-fi
-
-
-# Check whether --with-mysql-incdir was given.
-if test "${with_mysql_incdir+set}" = set; then :
- withval=$with_mysql_incdir; with_mysql_inc=$withval
-else
- test "${with_mysql_inc+set}" = set || with_mysql_inc=none
-fi
-
-
-
-
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_mysql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_mysql_inc"
-	 MYSQL_INCADD="-I$with_mysql_inc"
-	else
-	 MYSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_h" = xyes; then :
-
-	MYSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_mysql_lib; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD}"
- else
-	MYSQL_LIBADD="-L$with_mysql_lib ${MYSQL_LIBADD} $andrew_cv_runpath_switch$with_mysql_lib"
- fi
-
-	else
-	 MYSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_mysql} mysqlclient
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <mysql.h>
-int
-main ()
-{
-mysql_select_db(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- MYSQL_LIBADD="$MYSQL_LIBADD -l$libname"; mysqllib="yes"
-else
- mysqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$mysqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$MYSQL_SAVE_LDFLAGS
-
-else
- mysqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$mysqllib" = "no"; then
- as_fn_error $? "MySQL was not found. You may need to supply the
- --with-mysql-libdir or --with-mysql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_mysql_lib" != "none"; then
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_mysql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_mysql_lib $andrew_cv_runpath_switch$with_mysql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${MYSQL_LIBADD}"
- CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
-
-
-$as_echo "#define HAVE_MYSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-# Check whether --with-pgsql was given.
-if test "${with_pgsql+set}" = set; then :
- withval=$with_pgsql; with_pgsql=$withval
-else
- with_pgsql="no"
-fi
-
-
-case "$with_pgsql" in
- no)
-	use_pgsql="no"
-	;;
- yes)
-	use_pgsql="yes"
-	with_pgsql_lib=none
-	with_pgsql_inc=none
-	;;
-
- *)
-	use_pgsql="yes"
-	with_pgsql_lib="$with_pgsql/lib"
-	with_pgsql_inc="$with_pgsql/include"
-	;;
-esac
-
-if test "$use_pgsql" != "no"; then
-
-
-# Check whether --with-pgsql-libdir was given.
-if test "${with_pgsql_libdir+set}" = set; then :
- withval=$with_pgsql_libdir; with_pgsql_lib=$withval
-else
- test "${with_pgsql_lib+set}" = set || with_pgsql_lib=none
-fi
-
-
-# Check whether --with-pgsql-incdir was given.
-if test "${with_pgsql_incdir+set}" = set; then :
- withval=$with_pgsql_incdir; with_pgsql_inc=$withval
-else
- test "${with_pgsql_inc+set}" = set || with_pgsql_inc=none
-fi
-
-
-
-
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_pgsql_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_pgsql_inc"
-	 PGSQL_INCADD="-I$with_pgsql_inc"
-	else
-	 PGSQL_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
-
-	PGSQL_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_pgsql_lib; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD}"
- else
-	PGSQL_LIBADD="-L$with_pgsql_lib ${PGSQL_LIBADD} $andrew_cv_runpath_switch$with_pgsql_lib"
- fi
-
-	else
-	 PGSQL_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_pgsql} pq
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <libpq-fe.h>
-int
-main ()
-{
-PQconnectdb(NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PGSQL_LIBADD="$PGSQL_LIBADD -l$libname"; pgsqllib="yes"
-else
- pgsqllib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$pgsqllib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$PGSQL_SAVE_LDFLAGS
-
-else
- pgsqllib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$pgsqllib" = "no"; then
- as_fn_error $? "PgSQL was not found. You may need to supply the
- --with-pgsql-libdir or --with-pgsql-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_pgsql_lib" != "none"; then
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_pgsql_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_pgsql_lib $andrew_cv_runpath_switch$with_pgsql_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${PGSQL_LIBADD}"
- CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"
-
-
-$as_echo "#define HAVE_PGSQL /**/" >>confdefs.h
-
-fi
-
-
-
-
-# Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then :
- withval=$with_sqlite; with_sqlite=$withval
-else
- with_sqlite=no
-fi
-
-
-case "$with_sqlite" in
- no)
-	use_sqlite="no"
-	;;
- yes)
-	use_sqlite="yes"
-	with_sqlite_lib=none
-	with_sqlite_inc=none
-	;;
-
- *)
-	use_sqlite="yes"
-	with_sqlite_lib="$with_sqlite/lib"
-	with_sqlite_inc="$with_sqlite/include"
-	;;
-esac
-
-if test "$use_sqlite" != "no"; then
-
-
-# Check whether --with-sqlite-libdir was given.
-if test "${with_sqlite_libdir+set}" = set; then :
- withval=$with_sqlite_libdir; with_sqlite_lib=$withval
-else
- test "${with_sqlite_lib+set}" = set || with_sqlite_lib=none
-fi
-
-
-# Check whether --with-sqlite-incdir was given.
-if test "${with_sqlite_incdir+set}" = set; then :
- withval=$with_sqlite_incdir; with_sqlite_inc=$withval
-else
- test "${with_sqlite_inc+set}" = set || with_sqlite_inc=none
-fi
-
-
-
-
-
-	cmu_save_CPPFLAGS=$CPPFLAGS
-
-	if test -d $with_sqlite_inc; then
-	 CPPFLAGS="$CPPFLAGS -I$with_sqlite_inc"
-	 SQLITE_INCADD="-I$with_sqlite_inc"
-	else
-	 SQLITE_INCADD=""
-	fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = xyes; then :
-
-	SQLITE_SAVE_LDFLAGS=$LDFLAGS
-
-	if test -d $with_sqlite_lib; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD}"
- else
-	SQLITE_LIBADD="-L$with_sqlite_lib ${SQLITE_LIBADD} $andrew_cv_runpath_switch$with_sqlite_lib"
- fi
-
-	else
-	 SQLITE_LIBADD=""
-	fi
-
-	saved_LIBS=$LIBS
- for libname in ${with_sqlite} sqlite3
- do
-	 LIBS="$saved_LIBS -l$libname"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <sqlite3.h>
-int
-main ()
-{
-sqlite3_open(NULL, NULL);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- SQLITE_LIBADD="$SQLITE_LIBADD -l$libname"; sqlitelib="yes"
-else
- sqlitelib="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	 if test "$sqlitelib" = "yes"; then break; fi
- done
-	LIBS=$saved_LIBS
-
-	LDFLAGS=$SQLITE_SAVE_LDFLAGS
-
-else
- sqlitelib="no"
-fi
-
-
-
-	CPPFLAGS=$cmu_save_CPPFLAGS
-
-
- if test "$sqlitelib" = "no"; then
- as_fn_error $? "Sqlite was not found. You may need to supply the
- --with-sqlite-libdir or --with-sqlite-incdir configure options." "$LINENO" 5
- else
- HAVE_SQL=1
- fi
-
- if test "$with_sqlite_lib" != "none"; then
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L$with_sqlite_lib ${LDFLAGS}"
- else
-	LDFLAGS="-L$with_sqlite_lib $andrew_cv_runpath_switch$with_sqlite_lib ${LDFLAGS}"
- fi
-
- fi
-
- LIBS="${LIBS} ${SQLITE_LIBADD}"
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
-
-
-$as_echo "#define HAVE_SQLITE /**/" >>confdefs.h
-
-fi
-
-
-
-if test $HAVE_SQL = 1; then
- CYRUSDB_OBJS="${CYRUSDB_OBJS} cyrusdb_sql.o"
-fi
-
-
-
-
-SIEVE_SUBDIRS=""
-sievedir="sieve"
-# Check whether --enable-sieve was given.
-if test "${enable_sieve+set}" = set; then :
- enableval=$enable_sieve; if test "$enableval" = no; then
-		sievedir="no"
-	fi
-fi
-
-
-testpcre="yes"
-# Check whether --enable-pcre was given.
-if test "${enable_pcre+set}" = set; then :
- enableval=$enable_pcre; if test "$enableval" = no; then
-		testpcre="no"
-	fi
-fi
-
-
-if test "$sievedir" != "no"; then
-	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-
-	SIEVE_LIBS="../${sievedir}/libsieve.a"
-
-	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-
-
-$as_echo "#define USE_SIEVE /**/" >>confdefs.h
-
-
-		for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_YACC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-	for ac_prog in flex lex
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LEX"; then
- ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LEX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext0); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
- return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-if test -f lex.yy.c; then
- ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
- ac_cv_prog_lex_root=lexyy
-else
- as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-if test -z "${LEXLIB+set}"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ac_save_LIBS=$LIBS
- ac_cv_lib_lex='none needed'
- for ac_lib in '' -lfl -ll; do
- LIBS="$ac_lib $ac_save_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- test "$ac_cv_lib_lex" != 'none needed' && break
- done
- LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
- test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
-
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfl" >&5
-$as_echo_n "checking for main in -lfl... " >&6; }
-if ${ac_cv_lib_fl_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_fl_main=yes
-else
- ac_cv_lib_fl_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_main" >&5
-$as_echo "$ac_cv_lib_fl_main" >&6; }
-if test "x$ac_cv_lib_fl_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBFL 1
-_ACEOF
-
- LIBS="-lfl $LIBS"
-
-fi
-
-
-	if test "$testpcre" != "no"; then
-	 ac_fn_c_check_header_mongrel "$LINENO" "pcreposix.h" "ac_cv_header_pcreposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcreposix_h" = xyes; then :
-
-fi
-
-
-	 if test "$ac_cv_header_pcreposix_h" = "yes"; then
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
-$as_echo_n "checking for utf8 enabled pcre... " >&6; }
-		 if ${cyrus_cv_pcre_utf8+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <pcreposix.h>
-#ifndef REG_UTF8
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_pcre_utf8=yes
-else
- cyrus_cv_pcre_utf8=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_pcre_utf8" >&5
-$as_echo "$cyrus_cv_pcre_utf8" >&6; }
-	 else
-		 cyrus_cv_pcre_utf8="no"
-	 fi
-	fi
-
-	if test "$cyrus_cv_pcre_utf8" = "yes"; then
-		LIBS="$LIBS -lpcre -lpcreposix";
-
-$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-
-
-$as_echo "#define HAVE_PCREPOSIX_H /**/" >>confdefs.h
-
-	else
-		for ac_header in rxposix.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "rxposix.h" "ac_cv_header_rxposix_h" "$ac_includes_default"
-if test "x$ac_cv_header_rxposix_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_RXPOSIX_H 1
-_ACEOF
-
-fi
-
-done
-
-		if test "$ac_cv_header_rxposix_h" = "yes"; then
-			LIBS="$LIBS -lrx"
-
-$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
-$as_echo_n "checking for library containing regcomp... " >&6; }
-if ${ac_cv_search_regcomp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char regcomp ();
-int
-main ()
-{
-return regcomp ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' regex; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_regcomp=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_regcomp+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_regcomp+:} false; then :
-
-else
- ac_cv_search_regcomp=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
-$as_echo "$ac_cv_search_regcomp" >&6; }
-ac_res=$ac_cv_search_regcomp
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-
-fi
-
-		fi
-	fi
-
-	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-fi
-
-
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
-
-$as_echo "#define HAS_STRERROR /**/" >>confdefs.h
-
-else
-
-$as_echo "#define NEED_SYS_ERRLIST /**/" >>confdefs.h
-
-fi
-
-
-for ac_header in sys/resource.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_resource_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_RESOURCE_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_func in setrlimit
-do :
- ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SETRLIMIT 1
-_ACEOF
-
-fi
-done
-
-for ac_func in getrlimit
-do :
- ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETRLIMIT 1
-_ACEOF
-
-fi
-done
-
-
-for ac_func in daemon setsid
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-for ac_func in shutdown
-do :
- ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
-if test "x$ac_cv_func_shutdown" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SHUTDOWN 1
-_ACEOF
-
-fi
-done
-
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "socklen_t" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_SOCKLEN_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/socket.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sockaddr_storage" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/resource.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "rlim_t" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_RLIM_T /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
-
-spt_type=""
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-fi
-
-if test "$spt_type" = ""; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
-$as_echo_n "checking for setproctitle in -lutil... " >&6; }
-if ${ac_cv_lib_util_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setproctitle ();
-int
-main ()
-{
-return setproctitle ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_util_setproctitle=yes
-else
- ac_cv_lib_util_setproctitle=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
-$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
-if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
- spt_type=SPT_BUILTIN
-			LIBS="${LIBS} -lutil"
-fi
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
- spt_type=SPT_PSTAT
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "sys/sysnews.h" "ac_cv_header_sys_sysnews_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysnews_h" = xyes; then :
- spt_type=SPT_SYSMIPS
-fi
-
-
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-$as_echo_n "checking for PS_STRINGS... " >&6; }
-	if ${cyrus_cv_sys_psstrings+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <machine/vmparam.h>
-#include <sys/exec.h>
-#ifndef PS_STRINGS
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_psstrings=yes
-else
- cyrus_cv_sys_psstrings=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_psstrings = yes; then
-		spt_type=SPT_PSSTRINGS
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_psstrings" >&5
-$as_echo "$cyrus_cv_sys_psstrings" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCO" >&5
-$as_echo_n "checking for SCO... " >&6; }
-	if ${cyrus_cv_sys_sco+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifndef _SCO_unix_
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_sco=yes
-else
- cyrus_cv_sys_sco=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_sco = yes; then
-		spt_type=SPT_SCO
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_sco" >&5
-$as_echo "$cyrus_cv_sys_sco" >&6; }
-fi
-if test "$spt_type" = ""; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle usability" >&5
-$as_echo_n "checking for setproctitle usability... " >&6; }
-	if ${cyrus_cv_sys_setproctitle+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_sys_setproctitle=yes
-else
- cyrus_cv_sys_setproctitle=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-	if test $cyrus_cv_sys_setproctitle = no; then
-		spt_type=SPT_NONE
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_setproctitle" >&5
-$as_echo "$cyrus_cv_sys_setproctitle" >&6; }
-fi
-if test "$spt_type" != ""; then
-
-cat >>confdefs.h <<_ACEOF
-#define SPT_TYPE $spt_type
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nonblocking method" >&5
-$as_echo_n "checking nonblocking method... " >&6; }
-if ${cyrus_cv_sys_nonblock+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#ifndef	FNDELAY
-#define FNDELAY		O_NDELAY
-#endif
-int
-main ()
-{
-fcntl(0, F_GETFL, 0)&FNDELAY
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- cyrus_cv_sys_nonblock=fcntl
-else
- cyrus_cv_sys_nonblock=ioctl
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_NONBLOCK" >&5
-$as_echo "$WITH_NONBLOCK" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking timezone GMT offset method" >&5
-$as_echo_n "checking timezone GMT offset method... " >&6; }
-if ${cyrus_cv_struct_sys_gmtoff+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <time.h>
-int
-main ()
-{
-struct tm tm;
-tm.tm_gmtoff = 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cyrus_cv_struct_sys_gmtoff=tm
-else
- cyrus_cv_struct_sys_gmtoff=gmtime
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_GMTOFF" >&5
-$as_echo "$WITH_GMTOFF" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared mmap" >&5
-$as_echo_n "checking for shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_shared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_shared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base+4, "test", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_shared=yes
-else
- cyrus_cv_func_mmap_shared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_shared" >&5
-$as_echo "$cyrus_cv_func_mmap_shared" >&6; }
-if test $cyrus_cv_func_mmap_shared = yes; then
-	WITH_MAP="shared"
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stupid shared mmap" >&5
-$as_echo_n "checking for stupid shared mmap... " >&6; }
-if ${cyrus_cv_func_mmap_stupidshared+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- cyrus_cv_func_mmap_stupidshared=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-lseek(fd, 0L, 0);
-if (write(fd, "xyzz", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base, "xyzz", 4) != 0) exit(1);
-exit(0);}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- cyrus_cv_func_mmap_stupidshared=yes
-else
- cyrus_cv_func_mmap_stupidshared=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_stupidshared" >&5
-$as_echo "$cyrus_cv_func_mmap_stupidshared" >&6; }
-if test $cyrus_cv_func_mmap_stupidshared = yes; then
-	WITH_MAP="stupidshared"
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This system does not have a working mmap()" >&5
-$as_echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Expect a considerable performance penalty" >&5
-$as_echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
-	WITH_MAP=nommap
-fi
-fi
-
-
-
-# Check whether --with-lock was given.
-if test "${with_lock+set}" = set; then :
- withval=$with_lock; WITH_LOCK="$withval"
-else
-
- ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
-if test "x$ac_cv_func_fcntl" = xyes; then :
- WITH_LOCK="fcntl"
-else
-
-		ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes; then :
- WITH_LOCK="flock"
-else
-
-				as_fn_error $? "unable to detect locking method" "$LINENO" 5
-
-fi
-
-
-fi
-
-
-fi
-
-
-
-
-LIB_RT=""
-ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = xyes; then :
-
-$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
-$as_echo_n "checking for fdatasync in -lrt... " >&6; }
-if ${ac_cv_lib_rt_fdatasync+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fdatasync ();
-int
-main ()
-{
-return fdatasync ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rt_fdatasync=yes
-else
- ac_cv_lib_rt_fdatasync=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
-$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
-if test "x$ac_cv_lib_rt_fdatasync" = xyes; then :
-
-	LIB_RT="-lrt"
-
-$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
-
-
-fi
-
-
-fi
-
-
-cant_find_sigvec=no
-if ${cyrus_cv_sigveclib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec"
-if test "x$ac_cv_func_sigvec" = xyes; then :
-
-	cyrus_cv_sigveclib=""
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lBSD" >&5
-$as_echo_n "checking for sigvec in -lBSD... " >&6; }
-if ${ac_cv_lib_BSD_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lBSD $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_BSD_sigvec=yes
-else
- ac_cv_lib_BSD_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_BSD_sigvec" >&5
-$as_echo "$ac_cv_lib_BSD_sigvec" >&6; }
-if test "x$ac_cv_lib_BSD_sigvec" = xyes; then :
- cyrus_cv_sigveclib="-lBSD"
-else
-
- SAVE_LDFLAGS="$LDFLAGS"
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lucb" >&5
-$as_echo_n "checking for sigvec in -lucb... " >&6; }
-if ${ac_cv_lib_ucb_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lucb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigvec ();
-int
-main ()
-{
-return sigvec ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ucb_sigvec=yes
-else
- ac_cv_lib_ucb_sigvec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_sigvec" >&5
-$as_echo "$ac_cv_lib_ucb_sigvec" >&6; }
-if test "x$ac_cv_lib_ucb_sigvec" = xyes; then :
-
- cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-else
- cant_find_sigvec=yes
-fi
-
- LDFLAGS="$SAVE_LDFLAGS"
-fi
-
-
-fi
-
-
-fi
-
-
-
-# ok, we still look for this stuff because of checking groups, but
-# all authentication goes through SASL
-# Check whether --enable-afs was given.
-if test "${enable_afs+set}" = set; then :
- enableval=$enable_afs;
-fi
-
-
-
-# Check whether --with-afs-libdir was given.
-if test "${with_afs_libdir+set}" = set; then :
- withval=$with_afs_libdir; afs_libdir="${withval}"
-else
- afs_libdir="/usr/lib"
-fi
-
-
-
-# Check whether --with-afs-incdir was given.
-if test "${with_afs_incdir+set}" = set; then :
- withval=$with_afs_incdir; afs_incdir="${withval}"
-else
- afs_incdir="/usr/include"
-fi
-
-
-
-# Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then :
- withval=$with_ldap; with_ldap="${withval}"
-else
- with_ldap="no"
-fi
-
-
-# Check whether --enable-krb5afspts was given.
-if test "${enable_krb5afspts+set}" = set; then :
- enableval=$enable_krb5afspts;
-fi
-
-
-if test "x$enable_afs" = "xyes"; then
-# krb5afspts is only valid if AFS is enabled, so check inside here.
- if test "x$enable_krb5afspts" = "xyes"; then :
- SASL_GSSAPI_LIBS_SET="yes"
-
-
-$as_echo "#define AFSPTS_USE_KRB5 /**/" >>confdefs.h
-
-
-fi
-
- CFLAGS="${CFLAGS} -I${with_afs_incdir}/include"
- AFS_LIBS="${with_afs_libdir}/afs/libkauth.a ${with_afs_libdir}/afs/libprot.a ${with_afs_libdir}/afs/libauth.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/librxkad.a ${with_afs_libdir}/librx.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/libubik.a ${with_afs_libdir}/liblwp.a ${with_afs_libdir}/afs/util.a ${with_afs_libdir}/afs/libcom_err.a"
- if test -f ${with_afs_libdir}/afs/libaudit.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libaudit.a"
- fi
- if test -f /usr/ucblib/libucb.a; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
- else
-	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_cv_runpath_switch/usr/ucblib"
- fi
-
- AFS_LIBS="$AFS_LIBS -lc -lucb"
- fi
- if test -f ${with_afs_libdir}/afs/libdes.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libdes.a"
- else
- AFS_LIBS="$AFS_LIBS -ldes"
- fi
-
- if ${cyrus_cv_afs_sigvec+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- SAVE_LIBS="$LIBS"
- LIBS="${with_afs_libdir}/liblwp.a"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AFS libraries need sigvec" >&5
-$as_echo_n "checking if AFS libraries need sigvec... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-IOMGR_Initialize();
-int
-main ()
-{
-IOMGR_Initialize()
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cyrus_cv_afs_sigvec="no"
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- cyrus_cv_afs_sigvec="yes"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-
- if test "$cyrus_cv_afs_sigvec" = yes; then
- if test "$cant_find_sigvec" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
-$as_echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
- else
- AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
-
-
-
-$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- else
- AFS_LIBS="${AFS_LIBS}"
-
-
-
-$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
-
- fi
- LIBS="$SAVE_LIBS"
-fi
-
-LDAP_CPPFLAGS=""
-LDAP_LDFLAGS=""
-LDAP_LIBS=""
-
-if test "x$with_ldap" != "xno"; then
- if test ! -d $with_ldap; then
- with_ldap=/usr/local
- fi
-
- LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
- LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
- LDAP_LIBS=""
-
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS=$LDAP_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
-
-$as_echo "#define HAVE_LDAP /**/" >>confdefs.h
-
-
-
-
- LDAP_LIBS="-lldap -llber"
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_initialize ();
-int
-main ()
-{
-return ldap_initialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_initialize=yes
-else
- ac_cv_lib_ldap_ldap_initialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
-
-$as_echo "#define HAVE_LDAP /**/" >>confdefs.h
-
-
-
-
- LDAP_LIBS="-lldap -llber"
-fi
-
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
-fi
-
-if test "x$enable_afs" = "xyes" -o "x$with_ldap" != "xno"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-
-
-$as_echo "#define WITH_PTS /**/" >>confdefs.h
-
-fi
-
-
-
-SERVER_SUBDIRS="master imap"
-# Check whether --enable-server was given.
-if test "${enable_server+set}" = set; then :
- enableval=$enable_server; if test "$enableval" = no; then
- 	SERVER_SUBDIRS=""
-	fi
-fi
-
-
-# We always output a server makefile (just because we can)
-
-
-# Check whether --with-krb was given.
-if test "${with_krb+set}" = set; then :
- withval=$with_krb; with_krb="$withval"
-else
- with_krb="no"
-fi
-
-
-
-# Check whether --with-krbimpl was given.
-if test "${with_krbimpl+set}" = set; then :
- withval=$with_krbimpl; with_krbimpl="$withval"
-else
- with_krbimpl="kth"
-fi
-
-
-# Check whether --enable-statickrb was given.
-if test "${enable_statickrb+set}" = set; then :
- enableval=$enable_statickrb; with_statickrb="yes"
-else
- with_statickrb="no"
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
-
-if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
- as_fn_error $? "--enable-statickrb specified but --with-krb did not specify a valid directory" "$LINENO" 5
-fi
-
-if test "$with_krb" != "no"; then
-
-# Check whether --with-krbdes was given.
-if test "${with_krbdes+set}" = set; then :
- withval=$with_krbdes; with_krbdes="$withval"
-else
- with_krbdes="yes"
-fi
-
-if test "$with_krbdes" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_ecb_encrypt in -ldes" >&5
-$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
-if ${ac_cv_lib_des_des_ecb_encrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char des_ecb_encrypt ();
-int
-main ()
-{
-return des_ecb_encrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_des_des_ecb_encrypt=yes
-else
- ac_cv_lib_des_des_ecb_encrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
-$as_echo "$ac_cv_lib_des_des_ecb_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_ecb_encrypt" = xyes; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$with_krb/lib/libdes.a"
- else
- KRB_LIBS="-ldes"
- fi
-else
- as_fn_error $? "The Kerberos DES library is required for Kerberos support. You might want --with-auth=unix." "$LINENO" 5
-fi
-
-fi
-fi
-
-if test -d ${with_krb}; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos includes" >&5
-$as_echo_n "checking for Kerberos includes... " >&6; }
-if ${cyrus_cv_krbinclude+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- for krbhloc in include/kerberosIV include
- do
- if test -f ${with_krb}/${krbhloc}/krb.h ; then
- cyrus_cv_krbinclude=${with_krb}/${krbhloc}
- break
- fi
- done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_krbinclude" >&5
-$as_echo "$cyrus_cv_krbinclude" >&6; }
-
- if test -n "${cyrus_cv_krbinclude}"; then
- CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
- fi
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_krb}/lib $andrew_cv_runpath_switch${with_krb}/lib ${LDFLAGS}"
- fi
-
-fi
-
-if test "$with_krbimpl" != "kth"; then
- KRBLIB="krb4"
-else
- KRBLIB="krb"
-fi
-
-if test "$with_des" != no; then
- ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb_h" = xyes; then :
- as_ac_Lib=`$as_echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_mk_priv in -l${KRBLIB}" >&5
-$as_echo_n "checking for krb_mk_priv in -l${KRBLIB}... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb_mk_priv ();
-int
-main ()
-{
-return krb_mk_priv ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
- else
- KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
-$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-fi
-
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No DES library found for Kerberos V4 support" >&5
-$as_echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
- krb4=no
-fi
-
-if test "${krb4}" != no; then
-
-$as_echo "#define HAVE_KRB /**/" >>confdefs.h
-
-fi
-
-LIBS="$KRB_LIBS $LIBS"
-
-SASL_GSSAPI_LIBS_SET="yes"
-
-
-IMAP_PROGS=""
-
-# Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
- withval=$with_openssl; with_openssl="${withval}"
-fi
-
-
-OPENSSL_INC=
-OPENSSL_LIB=
-case "$with_openssl" in
-	no) with_openssl="no";;
-	""|yes)
-	 	 LIB_RSAREF=""
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSAPublicEncrypt in -lrsaref" >&5
-$as_echo_n "checking for RSAPublicEncrypt in -lrsaref... " >&6; }
-if ${ac_cv_lib_rsaref_RSAPublicEncrypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrsaref $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char RSAPublicEncrypt ();
-int
-main ()
-{
-return RSAPublicEncrypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rsaref_RSAPublicEncrypt=yes
-else
- ac_cv_lib_rsaref_RSAPublicEncrypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
-$as_echo "$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
-if test "x$ac_cv_lib_rsaref_RSAPublicEncrypt" = xyes; then :
- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
-else
- cmu_have_rsaref=no
-fi
-
-
-		with_openssl="yes"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_accept in -lcrypto" >&5
-$as_echo_n "checking for BIO_accept in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_BIO_accept+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char BIO_accept ();
-int
-main ()
-{
-return BIO_accept ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypto_BIO_accept=yes
-else
- ac_cv_lib_crypto_BIO_accept=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_accept" >&5
-$as_echo "$ac_cv_lib_crypto_BIO_accept" >&6; }
-if test "x$ac_cv_lib_crypto_BIO_accept" = xyes; then :
- LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
-else
- with_openssl="no"
-fi
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
-$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SSL_CTX_new ();
-int
-main ()
-{
-return SSL_CTX_new ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ssl_SSL_CTX_new=yes
-else
- ac_cv_lib_ssl_SSL_CTX_new=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
- LIBS="-lssl ${LIBS}"
-else
- with_openssl="no"
-fi
-
-
-		;;
-	*) OPENSSL_INC="-I${with_openssl}/include"
-	 OPENSSL_LIBPATH="${with_openssl}/lib"
-	 OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-	 CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
- else
-	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_cv_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
- fi
-
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
- else
-	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_cv_runpath_switch${OPENSSL_LIBPATH}"
- fi
-
-	 LIBS="${LIBS} -lssl -lcrypto";;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openssl" >&5
-$as_echo "$with_openssl" >&6; }
-
-if test "$with_openssl" != "no"; then
-
-$as_echo "#define HAVE_SSL /**/" >>confdefs.h
-
-	IMAP_PROGS="$IMAP_PROGS tls_prune"
- if test "${krb4}" != no; then
-
-$as_echo "#define OPENSSL_ENABLE_OLD_DES_SUPPORT /**/" >>confdefs.h
-
-
-$as_echo "#define OPENSSL_DES_LIBDES_COMPATIBILITY /**/" >>confdefs.h
-
- fi
-fi
-
-
-
-
-# Check whether --with-egd-socket was given.
-if test "${with_egd_socket+set}" = set; then :
- withval=$with_egd_socket; EGD_SOCKET="$withval"
-
-fi
-
-if test -n "$EGD_SOCKET" ; then
-
-cat >>confdefs.h <<_ACEOF
-#define EGD_SOCKET "$EGD_SOCKET"
-_ACEOF
-
-fi
-
-
-# Check whether --with-lib-subdir was given.
-if test "${with_lib_subdir+set}" = set; then :
- withval=$with_lib_subdir;
-fi
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what directory libraries are found in" >&5
-$as_echo_n "checking what directory libraries are found in... " >&6; }
-if ${ac_cv_cmu_lib_subdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-if test "X$with_lib_subdir" = "X" ; then
- ac_cv_cmu_lib_subdir=lib
- if test $ac_cv_sizeof_long -eq 4 ; then
- test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
- fi
- if test $ac_cv_sizeof_long -eq 8 ; then
- test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
- fi
-else
- ac_cv_cmu_lib_subdir=$with_lib_subdir
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmu_lib_subdir" >&5
-$as_echo "$ac_cv_cmu_lib_subdir" >&6; }
-CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-
-
-
-
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
- withval=$with_zlib; with_zlib=$withval
-else
- with_zlib="yes"
-fi
-
-
-	save_CPPFLAGS=$CPPFLAGS
-	save_LDFLAGS=$LDFLAGS
-
-	if test -d $with_zlib; then
-	 CPPFLAGS="${CPPFLAGS} -I${with_lib}/include"
-
- # this is CMU ADD LIBPATH
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- else
-	LDFLAGS="-L${with_zlib}/$CMU_LIB_SUBDIR $andrew_cv_runpath_switch${with_zlib}/$CMU_LIB_SUBDIR ${LDFLAGS}"
- fi
-
-	fi
-
-ZLIB=""
-case "$with_zlib" in
-	no)
-	 with_zlib="no";;
-	*)
-	ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if ${ac_cv_lib_z_deflate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_z_deflate=yes
-else
- ac_cv_lib_z_deflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = xyes; then :
- LIBS="${LIBS} -lz"; with_zlib="yes"
-else
- with_zlib="no"
-fi
-
-else
- with_zlib=no
-fi
-
-
-	;;
-esac
-
-	if test "$with_zlib" != "no"; then
-
-$as_echo "#define HAVE_ZLIB /**/" >>confdefs.h
-
-		ZLIB="-lz"
-	else
-		CPPFLAGS=$save_CPPFLAGS
-		LDFLAGS=$save_LDFLAGS
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-$as_echo_n "checking for zlib... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib" >&5
-$as_echo "$with_zlib" >&6; }
-
-
-
-# Check whether --with-zephyr was given.
-if test "${with_zephyr+set}" = set; then :
- withval=$with_zephyr; with_zephyr="${withval}"
-fi
-
-if test -z "$with_zephyr"; then
- if test -f /usr/local/lib/libzephyr.a; then
-	with_zephyr="/usr/local"
- elif test -f /usr/lib/libzephyr.a; then
- with_zephyr="/usr"
- fi
-fi
-ZEPHYR_LIBS=""
-case "$with_zephyr" in
-	no) true;;
-	""|yes) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZInitialize in -lzephyr" >&5
-$as_echo_n "checking for ZInitialize in -lzephyr... " >&6; }
-if ${ac_cv_lib_zephyr_ZInitialize+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzephyr $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ZInitialize ();
-int
-main ()
-{
-return ZInitialize ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_zephyr_ZInitialize=yes
-else
- ac_cv_lib_zephyr_ZInitialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zephyr_ZInitialize" >&5
-$as_echo "$ac_cv_lib_zephyr_ZInitialize" >&6; }
-if test "x$ac_cv_lib_zephyr_ZInitialize" = xyes; then :
- ZEPHYR_LIBS="-lzephyr"
-else
- with_zephyr="no"
-fi
-;;
- *) ZEPHYR_LIBS="-lzephyr";;
-esac
-
-if test "$with_zephyr" != "no"; then
-
-$as_echo "#define HAVE_ZEPHYR /**/" >>confdefs.h
-
-fi
-
-
-# Check whether --with-pidfile was given.
-if test "${with_pidfile+set}" = set; then :
- withval=$with_pidfile; MASTERPIDFILE="$withval"
-else
- MASTERPIDFILE="/var/run/cyrus-master.pid"
-fi
-
-MASTERPIDFILE="\"$MASTERPIDFILE\""
-
-cat >>confdefs.h <<_ACEOF
-#define MASTER_PIDFILE $MASTERPIDFILE
-_ACEOF
-
-
-# Check whether --enable-idled was given.
-if test "${enable_idled+set}" = set; then :
- enableval=$enable_idled; if test "$enable_val" != no; then
-	 IMAP_PROGS="$IMAP_PROGS idled"
- fi
-fi
-
-
-ENABLE_NNTP=no
-# Check whether --enable-nntp was given.
-if test "${enable_nntp+set}" = set; then :
- enableval=$enable_nntp; ENABLE_NNTP=$enableval
- if test "$ENABLE_NNTP" != no; then
-	 IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
- fi
-fi
-
-
-ENABLE_MURDER=no
-# Check whether --enable-murder was given.
-if test "${enable_murder+set}" = set; then :
- enableval=$enable_murder; ENABLE_MURDER=$enableval
-fi
-
-
-if test "$ENABLE_MURDER" != no; then
-	IMAP_PROGS="$IMAP_PROGS mupdate"
-	# for master/slave auto-selection
-	for ac_header in sys/sockio.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SOCKIO_H 1
-_ACEOF
-
-fi
-
-done
-
-fi
-
-ENABLE_REPLICATION=no
-# Check whether --enable-replication was given.
-if test "${enable_replication+set}" = set; then :
- enableval=$enable_replication; ENABLE_REPLICATION=$enableval
- if test "$ENABLE_REPLICATION" != no; then
-	 IMAP_PROGS="$IMAP_PROGS sync_client sync_server sync_reset"
- fi
-fi
-
-
-
-
-
-# Check whether --with-com_err was given.
-if test "${with_com_err+set}" = set; then :
- withval=$with_com_err;
-fi
-
-if test -z "$with_com_err"; then
-	# no value supplied
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
-$as_echo_n "checking for com_err in -lcom_err... " >&6; }
-if ${ac_cv_lib_com_err_com_err+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcom_err $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char com_err ();
-int
-main ()
-{
-return com_err ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_com_err_com_err=yes
-else
- ac_cv_lib_com_err_com_err=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
-$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = xyes; then :
-
-		# com_err is already in library path
-		# guess we're okay
-		# can use system com_err
-		with_com_err=""
-		ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
-
-$as_echo "#define HAVE_ET_COM_ERR_H /**/" >>confdefs.h
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_com_err_h" = xyes; then :
-
-else
- as_fn_error $? "cannot locate com_err.h" "$LINENO" 5
-fi
-
-
-fi
-
-
-		# Extract the first word of "compile_et", so it can be a program name with args.
-set dummy compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-else
-
-	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-		with_com_err="/usr/local"
-		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
-set dummy /usr/local/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-		with_com_err="/usr"
-		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
-set dummy /usr/bin/compile_et; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPILE_ET+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $COMPILE_ET in
- \\/* | ?:\\/*)
- ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
-esac
-fi
-COMPILE_ET=$ac_cv_path_COMPILE_ET
-if test -n "$COMPILE_ET"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
-$as_echo "$COMPILE_ET" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	else
-		# use ours
-		with_com_err=yes
-	fi
-
-fi
-
-
-	if test "${with_com_err}" = "no"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: com_err is required; included version will be used." >&5
-$as_echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
-	 with_com_err="yes"
-	fi
-	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
-$as_echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will build com_err from included sources." >&5
-$as_echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
-	 with_com_err="yes" # build it ourselves
-	fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COMPILE_ET="../com_err/et/compile_et"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
- ;;
- *) # use whatever they told us, or whatever we found
- COMPILE_ET="${with_com_err}/bin/compile_et"
-esac
-
-if test "$with_com_err" != yes ; then
- TEST1=".cyrus-configure-test-$$"
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- echo "error_table imap" >> $TEST1.et
- echo "ec IMAP_TESTING," >> $TEST1.et
- echo " \"Testing\"" >> $TEST1.et
- echo "end" >> $TEST1.et
- "${COMPILE_ET}" $TEST1.et > /dev/null
- compile_et_ok=no
- if test -f $TEST1.h ; then
-	if test `awk '/IMAP_TESTING/{print $3}' $TEST1.h 2>/dev/null` = "(-1904809472L)" ; then
-	 compile_et_ok=yes
-	fi
-	 fi
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- if test "$compile_et_ok" = no ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It seems $COMPILE_ET is buggy, building our own" >&5
-$as_echo "$as_me: WARNING: It seems $COMPILE_ET is buggy, building our own" >&2;}
-	COMPILE_ET="../com_err/et/compile_et" # build it ourselves
- fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COM_ERR_LIBS="../com_err/et/libcom_err.a"
-	 COM_ERR_LDFLAGS=""
-	 COM_ERR_CPPFLAGS="-I\${top_srcdir}/com_err/et"
-	 PRE_SUBDIRS="com_err/et ${PRE_SUBDIRS}"
-	 EXTRA_OUTPUT="${EXTRA_OUTPUT} com_err/et/Makefile"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
-	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-	# we already set COMPILE_ET, or we didn't get here
-	COM_ERR_LDFLAGS=""
-	COM_ERR_CPPFLAGS=""
- ;;
- *) # use whatever they told us, or whatever we found
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
- # Ever get the feeling people hide this stuff on purpose?
- if test -d "${with_com_err}/include/et" ; then
- COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
- fi
-esac
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern syslog" >&5
-$as_echo_n "checking for modern syslog... " >&6; }
-if ${cyrus_cv_lib_syslog+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <syslog.h>
-#ifndef LOG_LOCAL6
-#include </nonexistent>
-#endif
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- cyrus_cv_lib_syslog=yes
-else
- cyrus_cv_lib_syslog=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi
-
-if test $cyrus_cv_lib_syslog = no; then
-	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_lib_syslog" >&5
-$as_echo "$cyrus_cv_lib_syslog" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which syslog facility to use" >&5
-$as_echo_n "checking which syslog facility to use... " >&6; }
-SYSLOG_FACILITY=LOG_LOCAL6
-
-# Check whether --with-syslogfacility was given.
-if test "${with_syslogfacility+set}" = set; then :
- withval=$with_syslogfacility; if test "$withval" != "yes" -a "$withval" != "no" ; then
- SYSLOG_FACILITY=LOG_$withval
- fi;
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define SYSLOG_FACILITY $SYSLOG_FACILITY
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSLOG_FACILITY" >&5
-$as_echo "$SYSLOG_FACILITY" >&6; }
-
-ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize"
-if test "x$ac_cv_func_getdtablesize" = xyes; then :
- $as_echo "#define HAVE_GETDTABLESIZE 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" getdtablesize.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS getdtablesize.$ac_objext"
- ;;
-esac
-
-fi
-
-
-# Check whether --enable-cmulocal was given.
-if test "${enable_cmulocal+set}" = set; then :
- enableval=$enable_cmulocal; if test "$enableval" = yes; then
-		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-	fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to use old sieve service name" >&5
-$as_echo_n "checking to use old sieve service name... " >&6; }
-# Check whether --enable-oldsievename was given.
-if test "${enable_oldsievename+set}" = set; then :
- enableval=$enable_oldsievename; if test "$enableval" = yes; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define OLD_SIEVE_SERVICE_NAME /**/" >>confdefs.h
-
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Check whether --enable-netscapehack was given.
-if test "${enable_netscapehack+set}" = set; then :
- enableval=$enable_netscapehack; if test "$enableval" = yes; then
-
-$as_echo "#define ENABLE_X_NETSCAPE_HACK /**/" >>confdefs.h
-
-	fi
-fi
-
-
-ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
-else
- ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
- LIBS="-ldl $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
- cmu_have_crypt=yes
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
-else
- cmu_have_crypt=no
-fi
-
-fi
-
-
-
-
-
-# Check whether --enable-gssapi was given.
-if test "${enable_gssapi+set}" = set; then :
- enableval=$enable_gssapi; gssapi=$enableval
-else
- gssapi=yes
-fi
-
-
-# Check whether --with-gss_impl was given.
-if test "${with_gss_impl+set}" = set; then :
- withval=$with_gss_impl; gss_impl=$withval
-else
- gss_impl=auto
-fi
-
-
-if test "$gssapi" != no; then
- platform=
- case "${host}" in
- *-*-linux*)
- platform=__linux
- ;;
- *-*-hpux*)
- platform=__hpux
- ;;
- *-*-irix*)
- platform=__irix
- ;;
- *-*-solaris2*)
-# When should we use __sunos?
- platform=__solaris
- ;;
- *-*-aix*)
-###_AIX
- platform=__aix
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
-$as_echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
- if test "$gss_impl" = "cybersafe"; then
- as_fn_error $? "CyberSafe was forced, cannot continue as platform is not supported" "$LINENO" 5
- fi
- ;;
- esac
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
-
- if test -d ${gssapi}; then
- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-# We want to keep -I in our CPPFLAGS, but only if we succeed
- cmu_saved_CPPFLAGS=$CPPFLAGS
-### I am not sure how useful is this (and whether this is required at all
-### especially when we have to provide two -L flags for new CyberSafe
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
-
- if test -n "$platform"; then
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
- fi
- fi
- fi
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_h" = xyes; then :
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no include files found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-fi
-
-
-fi
-
-
-
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
-fi
-
-if test "$gssapi" != no; then
- if test "$ac_cv_header_gssapi_h" = "yes" -o "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
-
-$as_echo "#define HAVE_GSSAPI_H /**/" >>confdefs.h
-
- fi
-
- # We need to find out which gssapi implementation we are
- # using. Supported alternatives are: MIT Kerberos 5,
- # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
- # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
- # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
- #
- # The choice is reflected in GSSAPIBASE_LIBS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
-
- LIBS="-lresolv $LIBS"
-
-fi
-
- if test -d ${gssapi}; then
- gssapi_dir="${gssapi}/lib"
- GSSAPIBASE_LIBS="-L$gssapi_dir"
- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
- else
- # FIXME: This is only used for building cyrus, and then only as
- # a real hack. it needs to be fixed.
- gssapi_dir="/usr/local/lib"
- fi
-
- # Check a full link against the Heimdal libraries.
- # If this fails, check a full link against the MIT libraries.
- # If this fails, check a full link against the CyberSafe libraries.
- # If this fails, check a full link against the Solaris 8 and up libgss.
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi... " >&6; }
-if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_gss_unwrap" = xyes; then :
- gss_impl="heimdal"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5int_getspecific in -lkrb5support" >&5
-$as_echo_n "checking for krb5int_getspecific in -lkrb5support... " >&6; }
-if ${ac_cv_lib_krb5support_krb5int_getspecific+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5support ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb5int_getspecific ();
-int
-main ()
-{
-return krb5int_getspecific ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_krb5support_krb5int_getspecific=yes
-else
- ac_cv_lib_krb5support_krb5int_getspecific=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
-$as_echo "$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
-if test "x$ac_cv_lib_krb5support_krb5int_getspecific" = xyes; then :
- K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
-fi
-
-
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi_krb5" >&5
-$as_echo_n "checking for gss_unwrap in -lgssapi_krb5... " >&6; }
-if ${ac_cv_lib_gssapi_krb5_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gssapi_krb5_gss_unwrap=yes
-else
- ac_cv_lib_gssapi_krb5_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gssapi_krb5_gss_unwrap" = xyes; then :
- gss_impl="mit"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- # For Cybersafe one has to set a platform define in order to make compilation work
- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-
- cmu_saved_CPPFLAGS=$CPPFLAGS
- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
- if test -d "${gssapi}/appsec-rt/lib"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
- fi
- CPPFLAGS="$CPPFLAGS -D$platform"
- if test -d "${gssapi}/appsec-sdk/include"; then
- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
- fi
-
- gss_failed=0
-
-# Check for CyberSafe with two libraries first, than fall back to a single
-# library (older CyberSafe)
-
- unset ac_cv_lib_gss_csf_gss_acq_user
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe03"
-else
- unset ac_cv_lib_gss_csf_gss_acq_user;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
-$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
-if ${ac_cv_lib_gss_csf_gss_acq_user+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char csf_gss_acq_user ();
-int
-main ()
-{
-return csf_gss_acq_user ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_csf_gss_acq_user=yes
-else
- ac_cv_lib_gss_csf_gss_acq_user=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-if test "x$ac_cv_lib_gss_csf_gss_acq_user" = xyes; then :
- gss_impl="cybersafe"
-else
- gss_failed=1
-fi
-
-fi
-
-
- if test "$gss_failed" = "1"; then
-# Restore variables
- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
- CPPFLAGS=$cmu_saved_CPPFLAGS
-
- if test "$gss_impl" != "auto"; then
- gss_impl="failed"
- fi
- fi
- fi
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
- gss_failed=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgss" >&5
-$as_echo_n "checking for gss_unwrap in -lgss... " >&6; }
-if ${ac_cv_lib_gss_gss_unwrap+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgss -lgss $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gss_unwrap ();
-int
-main ()
-{
-return gss_unwrap ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gss_gss_unwrap=yes
-else
- ac_cv_lib_gss_gss_unwrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_unwrap" >&5
-$as_echo "$ac_cv_lib_gss_gss_unwrap" >&6; }
-if test "x$ac_cv_lib_gss_gss_unwrap" = xyes; then :
- gss_impl="seam"
-else
- gss_failed=1
-fi
-
- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
- gss_impl="failed"
- fi
- fi
-
- if test "$gss_impl" = "mit"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
-# Version of CyberSafe with two libraries
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "cybersafe"; then
- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
- # there is no static libgss for CyberSafe
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "seam"; then
- GSSAPIBASE_LIBS=-lgss
- # there is no static libgss on Solaris 8 and up
- GSSAPIBASE_STATIC_LIBS=none
- elif test "$gss_impl" = "failed"; then
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - specified library not found" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
- else
- gssapi="no"
- GSSAPIBASE_LIBS=
- GSSAPIBASE_STATIC_LIBS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no library" >&5
-$as_echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
- fi
-fi
-
-#
-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-# in gssapi\rfckrb5.h
-#
-if test "$gssapi" != "no"; then
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_HOSTBASED_SERVICE
- hostbased_service_gss_nt_yes
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-
- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
- #ifdef GSS_C_NT_USER_NAME
- user_name_yes_gss_nt
- #endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
-$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_h" = "yes"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- elif test "$ac_cv_header_gssapi_gssapi_h"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gssapi/gssapi.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
-
-$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
-
-fi
-rm -f conftest*
-
- fi
-fi
-
-GSSAPI_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GSSAPI" >&5
-$as_echo_n "checking GSSAPI... " >&6; }
-if test "$gssapi" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: with implementation ${gss_impl}" >&5
-$as_echo "with implementation ${gss_impl}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-$as_echo_n "checking for res_search in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_search+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_search ();
-int
-main ()
-{
-return res_search ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_resolv_res_search=yes
-else
- ac_cv_lib_resolv_res_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-fi
-
- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
-
- cmu_save_LIBS="$LIBS"
- LIBS="$LIBS $GSSAPIBASE_LIBS"
- for ac_func in gsskrb5_register_acceptor_identity
-do :
- ac_fn_c_check_func "$LINENO" "gsskrb5_register_acceptor_identity" "ac_cv_func_gsskrb5_register_acceptor_identity"
-if test "x$ac_cv_func_gsskrb5_register_acceptor_identity" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
-_ACEOF
-
-fi
-done
-
- LIBS="$cmu_save_LIBS"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
-fi
-
-
-
-
-
-
-# Check whether --with-sasl was given.
-if test "${with_sasl+set}" = set; then :
- withval=$with_sasl; with_sasl="$withval"
-else
- with_sasl="yes"
-fi
-
-
-
-# Check whether --with-staticsasl was given.
-if test "${with_staticsasl+set}" = set; then :
- withval=$with_staticsasl; with_staticsasl="$withval";
- if test $with_staticsasl != "no"; then
- using_static_sasl="static"
- fi
-else
- with_staticsasl="no"; using_static_sasl="no"
-fi
-
-
-SASLFLAGS=""
-LIB_SASL=""
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-cmu_saved_LDFLAGS=$LDFLAGS
-cmu_saved_LIBS=$LIBS
-
-if test ${with_staticsasl} != "no"; then
- if test -d ${with_staticsasl}; then
- if test -d ${with_staticsasl}/lib64 ; then
- ac_cv_sasl_where_lib=${with_staticsasl}/lib64
- else
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- fi
- ac_cv_sasl_where_lib=${with_staticsasl}/lib
- ac_cv_sasl_where_inc=${with_staticsasl}/include
-
- SASLFLAGS="-I$ac_cv_sasl_where_inc"
- LIB_SASL="-L$ac_cv_sasl_where_lib"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
- else
- with_staticsasl="/usr"
- fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- for i42 in lib64 lib; do
- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
- ac_cv_found_sasl=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
- fi
- done
- if test ! "$ac_cv_found_sasl" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
-$as_echo_n "checking for static libsasl... " >&6; }
- as_fn_error $? "Could not find ${with_staticsasl}/lib*/libsasl2.a" "$LINENO" 5
- fi
-fi
-
-
-fi
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-
- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
- else
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS"
- fi
-fi
-
-if test -d ${with_sasl}; then
- ac_cv_sasl_where_lib=${with_sasl}/lib
- ac_cv_sasl_where_inc=${with_sasl}/include
-
- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
- if test "$ac_cv_sasl_where_lib" != ""; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
- else
-	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-fi
-
-# be sure to check for a SASLv2 specific function
-ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_saslutil_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prop_get in -lsasl2" >&5
-$as_echo_n "checking for prop_get in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_prop_get+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char prop_get ();
-int
-main ()
-{
-return prop_get ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_prop_get=yes
-else
- ac_cv_lib_sasl2_prop_get=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_prop_get" >&5
-$as_echo "$ac_cv_lib_sasl2_prop_get" >&6; }
-if test "x$ac_cv_lib_sasl2_prop_get" = xyes; then :
- ac_cv_found_sasl=yes
-else
- ac_cv_found_sasl=no
-fi
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-else
- ac_cv_found_sasl=no
-fi
-
-
-
-if test "$ac_cv_found_sasl" = "yes"; then
- if test "$ac_cv_sasl_where_lib" != ""; then
-
- # this is CMU ADD LIBPATH TO
- if test "$andrew_cv_runpath_switch" = "none" ; then
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
- else
-	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_cv_runpath_switch$ac_cv_sasl_where_lib"
- fi
-
- fi
- DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
- if test "$using_static_sasl" != "static"; then
- LIB_SASL=$DYNLIB_SASL
- SASLFLAGS=$DYNSASLFLAGS
- fi
-else
- DYNLIB_SASL=""
- DYNSASLFLAGS=""
- using_static_sasl="staticonly"
-fi
-
-if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
- SASL_GSSAPI_LIBS_SET=""
- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS"
-fi
-
-LIBS="$cmu_saved_LIBS"
-LDFLAGS="$cmu_saved_LDFLAGS"
-CPPFLAGS="$cmu_saved_CPPFLAGS"
-
-
-
-
-
-
-
-if test "$ac_cv_found_sasl" != "yes"; then
- as_fn_error $? "Cannot continue without libsasl2.
-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." "$LINENO" 5
-fi
-
-
-cmu_saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sasl/sasl.h>
-
-#ifndef SASL_VERSION_MAJOR
-#error SASL_VERSION_MAJOR not defined
-#endif
-#ifndef SASL_VERSION_MINOR
-#error SASL_VERSION_MINOR not defined
-#endif
-#ifndef SASL_VERSION_STEP
-#error SASL_VERSION_STEP not defined
-#endif
-
-#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
-#error SASL version is less than 2.1.7
-#endif
-
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- as_fn_error $? "Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." "$LINENO" 5
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-CPPFLAGS=$cmu_saved_CPPFLAGS
-
-
-
-cmu_saved_LDFLAGS=$LDFLAGS
-
-LDFLAGS="$LDFLAGS $LIB_SASL"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_checkapop in -lsasl2" >&5
-$as_echo_n "checking for sasl_checkapop in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_sasl_checkapop+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sasl_checkapop ();
-int
-main ()
-{
-return sasl_checkapop ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_sasl_checkapop=yes
-else
- ac_cv_lib_sasl2_sasl_checkapop=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
-$as_echo "$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
-if test "x$ac_cv_lib_sasl2_sasl_checkapop" = xyes; then :
-
-$as_echo "#define HAVE_APOP /**/" >>confdefs.h
-
-else
- as_fn_error $? "libsasl2 without working sasl_checkapop. Cannot continue." "$LINENO" 5
-fi
-
-
-LDFLAGS=$cmu_saved_LDFLAGS
-
-
-
-# Check whether --with-perl was given.
-if test "${with_perl+set}" = set; then :
- withval=$with_perl; with_perl="$withval"
-else
- with_perl="perl"
-fi
-
-
-if test "${with_perl}" = yes; then
- with_perl="perl"
-fi
-if test "${with_perl}" != no; then
- if test ${using_static_sasl} = "staticonly"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot compile perl utilities using static libsasl" >&5
-$as_echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
-	with_perl="no"
- else
-	for ac_prog in ${with_perl} perl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PERL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$PERL"; then
- ac_cv_prog_PERL="$PERL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PERL="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-PERL=$ac_cv_prog_PERL
-if test -n "$PERL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$PERL" && break
-done
-test -n "$PERL" || PERL="with_perl=notfound"
-
- fi
-fi
-if test "$with_perl" = "notfound"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perl not found: Administrative tools won't be available" >&5
-$as_echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
-elif test "${with_perl}" != "no"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
- case "${target_os}" in
- linux*|netbsd*|freebsd*|dragonfly*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
-$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
- eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_CCCDLFLAGS" >&5
-$as_echo "$PERL_CCCDLFLAGS" >&6; }
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&5
-$as_echo "$as_me: WARNING: skipping check for perl cccdlflags on \"${target_os}\"" >&2;}
- esac
-fi
-
-if test "$sievedir" != "no"; then
-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-
-	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-	PERL_DEPSUBDIRS="sieve"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-else
-	PERL_DEPSUBDIRS="none"
-fi
-
-SNMP_SUBDIRS=""
-
-
-
-
-
-
-# Check whether --with-libwrap was given.
-if test "${with_libwrap+set}" = set; then :
- withval=$with_libwrap; with_libwrap=$withval
-else
- with_libwrap=yes
-fi
-
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for request_init in -lwrap" >&5
-$as_echo_n "checking for request_init in -lwrap... " >&6; }
-if ${ac_cv_lib_wrap_request_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwrap ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char request_init ();
-int
-main ()
-{
-return request_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_wrap_request_init=yes
-else
- ac_cv_lib_wrap_request_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_request_init" >&5
-$as_echo "$ac_cv_lib_wrap_request_init" >&6; }
-if test "x$ac_cv_lib_wrap_request_init" = xyes; then :
-
-		 ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcpd_h" = xyes; then :
-
-else
- with_libwrap=no
-fi
-
-
-else
- with_libwrap=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libwrap support" >&5
-$as_echo_n "checking libwrap support... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libwrap" >&5
-$as_echo "$with_libwrap" >&6; }
- LIB_WRAP=""
- if test "$with_libwrap" != no; then
-
-$as_echo "#define HAVE_LIBWRAP /**/" >>confdefs.h
-
- LIB_WRAP="-lwrap"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
-$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_yp_get_default_domain+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char yp_get_default_domain ();
-int
-main ()
-{
-return yp_get_default_domain ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_yp_get_default_domain=yes
-else
- ac_cv_lib_nsl_yp_get_default_domain=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-$as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-if test "x$ac_cv_lib_nsl_yp_get_default_domain" = xyes; then :
- LIB_WRAP="${LIB_WRAP} -lnsl"
-fi
-
- fi
-
-
-
-
-
-
-# Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then :
- withval=$with_snmp; with_snmp=$withval
-else
- with_snmp=yes
-fi
-
-
-
-# Check whether --with-ucdsnmp was given.
-if test "${with_ucdsnmp+set}" = set; then :
- withval=$with_ucdsnmp; with_snmp=$withval
-fi
-
-
-if test "$with_snmp" != "no"; then
-
- if test "$with_snmp" = "yes"; then
- # Extract the first word of "net-snmp-config", so it can be a program name with args.
-set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SNMP_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $SNMP_CONFIG in
- \\/* | ?:\\/*)
- ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/local/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-if test -n "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-$as_echo "$SNMP_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- else
- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
- fi
-
- if test -x "$SNMP_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking NET SNMP libraries" >&5
-$as_echo_n "checking NET SNMP libraries... " >&6; }
-
- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
- LIB_UCDSNMP=$SNMP_LIBS
-
-$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- for ac_header in net-snmp/agent/agent_module_config.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "net-snmp/agent/agent_module_config.h" "ac_cv_header_net_snmp_agent_agent_module_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_net_snmp_agent_agent_module_config_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_NET_SNMP_AGENT_AGENT_MODULE_CONFIG_H 1
-_ACEOF
-
-fi
-
-done
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
-$as_echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
- fi
- else
- if test "$with_snmp" != no; then
- if test -d "$with_snmp"; then
- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
- LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sprint_objid in -lsnmp" >&5
-$as_echo_n "checking for sprint_objid in -lsnmp... " >&6; }
-if ${ac_cv_lib_snmp_sprint_objid+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sprint_objid ();
-int
-main ()
-{
-return sprint_objid ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_snmp_sprint_objid=yes
-else
- ac_cv_lib_snmp_sprint_objid=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snmp_sprint_objid" >&5
-$as_echo "$ac_cv_lib_snmp_sprint_objid" >&6; }
-if test "x$ac_cv_lib_snmp_sprint_objid" = xyes; then :
-
- 		 ac_fn_c_check_header_mongrel "$LINENO" "ucd-snmp/version.h" "ac_cv_header_ucd_snmp_version_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucd_snmp_version_h" = xyes; then :
-
-else
- with_snmp=no
-fi
-
-
-else
- with_snmp=no
-fi
-
- LIBS="$cmu_save_LIBS"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking UCD SNMP libraries" >&5
-$as_echo_n "checking UCD SNMP libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_snmp" >&5
-$as_echo "$with_snmp" >&6; }
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
-
-$as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h
-
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmdbOpen in -lrpm" >&5
-$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
-if ${ac_cv_lib_rpm_rpmdbOpen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrpm -lpopt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rpmdbOpen ();
-int
-main ()
-{
-return rpmdbOpen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rpm_rpmdbOpen=yes
-else
- ac_cv_lib_rpm_rpmdbOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
-$as_echo "$ac_cv_lib_rpm_rpmdbOpen" >&6; }
-if test "x$ac_cv_lib_rpm_rpmdbOpen" = xyes; then :
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-fi
-
- fi
-
- fi
-fi
-
-
-
-# Figure out what directories we're linking against.
-# Lots of fun for the whole family.
-# This probably chokes on anything with spaces in it.
-# All we want is the list of -L directories, and -L may or may not be
-# followed by a space.
-isdir=no
-libpath=""
-#echo "debug ldflags: << ${ldflags} >>"
-#echo "debug default_ldflags: << ${default_ldflags} >>"
-for flag in ${ldflags} ${default_ldflags}; do
- case $flag in
- -L)
- # it's a split -L option, we'll mark the next option as a dir.
- isdir=yes
- ;;
-
- -L*)
- # attached -L option: split off the directory
- larg=`echo $flag | sed -e 's:-L$..*$:\1:'`
- libpath="${libpath} ${larg}"
- ;;
-
- *)
- if test $isdir = yes ; then
-	libpath="${libpath} ${flag}"
-	isdir=no
- fi
- esac
-done
-
-IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^$a-zA-Z_a-zA-Z0-9_*$=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
-	"s/'/'\\\\''/g;
-	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
- t end
- s/^$^=*$=$.*$$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
-	 mv -f confcache "$cache_file"$$ &&
-	 mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
-	 mv -f confcache "$cache_file" ;;
-	esac
- fi
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
- *\\/* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR LINENO LOG_FD
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$^/^/*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T='	';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 OPTION... TAG...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE:TEMPLATE
- instantiate the configuration file FILE
- --header=FILE:TEMPLATE
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=?*)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=`expr "X$1" : 'X^=*=$.*$'`
- ac_shift=:
- ;;
- --*=)
- ac_option=`expr "X$1" : 'X$^=*$='`
- ac_optarg=
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
-
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
- ac_need_defaults=false ;;
-
- esac
- shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- export CONFIG_SHELL
- exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
- $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
- "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
- "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
- "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
- "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
- "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
- "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
- "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp= ac_tmp=
- trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
- trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S"/; s/!.*/"=/
-p
-g
-s/^^!*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$..*/\1/
-t more1
-s/"\\/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$..*/\1/
-t more2
-s/"\\/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/"\\/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^^""/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_setkey = 1
- FS = "&#x7;"
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field1)
- for (i = 2; i < nfields; i++) {
- key = fieldi
- keylen = length(key)
- if (S_is_setkey) {
- value = Skey
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field++i)
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^	 *VPATH	 *=	 */{
-h
-s///
-s/^/:/
-s/	 *$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/$=	 *$.*/\1/
-G
-s/\n//
-s/^^=*=	 *$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=_$as_cr_Letters_$as_cr_alnum*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^	 *#	 *define	 	 */ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3"/p
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2"/p
-d
-:bsnl
-s/"\\/\\&/g
-s/^ $'"$ac_word_re"'$$(^()*)$	 *$.*$/P"\1"="\2"\
-D"\1"=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$	 *$.*$/D"\1"=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/"\\/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_setkey = 1
- FS = "&#x7;"
-}
-/^\t *#\t *(define|undef)\t +$ac_word_re(\t (|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg1 == "#") {
- defundef = arg2
- mac1 = arg3
- } else {
- defundef = substr(arg1, 2)
- mac1 = arg2
- }
- split(mac1, mac2, "(") #)
- macro = mac21
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_setmacro) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro Pmacro Dmacro
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
-shift
-for ac_tag
-do
- case $ac_tag in
- :FHLC) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :FHL*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- :FH-) ac_tag=-:-;;
- :FH*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
-
- case $ac_mode in
- :L) ac_source=$1;;
- :FH)
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute). The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	 case $ac_f in
-	 \\/$*) false;;
-	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input='Generated from '`
-	 $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
-	`' by configure.'
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
- fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/\\\\&|/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
-
- case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
-
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$ac_file" : 'X$//$^/' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- \\/* | ?:\\/* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- \\/$* | ?:\\/* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@a-zA-Z_a-zA-Z_0-9*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
-
- rm -f "$ac_tmp/stdin"
- case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
- fi
- ;;
-
-
- esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-

cyrus-imapd-2.4.17.tar.gz/configure.in Deleted

@@ -1,1497 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl
-dnl Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions
-dnl are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in
-dnl the documentation and/or other materials provided with the
-dnl distribution.
-dnl
-dnl 3. The name "Carnegie Mellon University" must not be used to
-dnl endorse or promote products derived from this software without
-dnl prior written permission. For permission or any legal
-dnl details, please contact
-dnl Carnegie Mellon University
-dnl Center for Technology Transfer and Enterprise Creation
-dnl 4615 Forbes Avenue
-dnl Suite 302
-dnl Pittsburgh, PA 15213
-dnl (412) 268-7393, fax: (412) 268-7395
-dnl innovation@andrew.cmu.edu
-dnl
-dnl 4. Redistributions of any form whatsoever must retain the following
-dnl acknowledgment:
-dnl "This product includes software developed by Computing Services
-dnl at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-dnl
-dnl CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-dnl THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-dnl FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-dnl AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-dnl OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl $Id: configure.in,v 1.316 2010/01/06 17:01:26 murch Exp $
-dnl
-dnl configure.in for the Cyrus imapd
-dnl
-
-
-AC_INIT(imap/imapd.c)
-AC_PREREQ(2.54)
-AC_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
-
-dnl Useful hook for distributions
-AC_ARG_WITH(extraident, --with-extraident=STRING use STRING as extra version information,
-	AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", Extra version information for imap/version.h))
-
-AC_CHECK_PROG(MAKEDEPEND,makedepend,makedepend,`cd ${srcdir};pwd`/tools/not-mkdep)
-if test "$MAKEDEPEND" != "makedepend"; then
- AC_MSG_WARN(Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory.)
-fi
-
-AC_ARG_WITH(login,,AC_ERROR(--with-login is no longer supported.
-Configure SASL appropriately instead.))
-
-AC_ARG_WITH(cyrus-prefix, --with-cyrus-prefix=DIR use DIR as cyrus server install directory,
-	cyrus_prefix="$withval",cyrus_prefix="/usr/cyrus")
-AC_SUBST(cyrus_prefix)
-AC_DEFINE_UNQUOTED(CYRUS_PATH,"$cyrus_prefix",Where will we be installed?)
-AC_ARG_WITH(service-path, --with-service-path=DIR use DIR as service install directory,
-	service_path="$withval",service_path="$cyrus_prefix/bin")
-AC_SUBST(service_path)
-AC_DEFINE_UNQUOTED(SERVICE_PATH,"$service_path",Directory to use for service binaries)
-AC_ARG_WITH(cyrus-user, --with-cyrus-user=USERID use USERID cyrus userid,
-	cyrus_user="$withval",cyrus_user="cyrus")
-AC_SUBST(cyrus_user)
-AC_DEFINE_UNQUOTED(CYRUS_USER, "$cyrus_user",What user will we run as?)
-AC_ARG_WITH(cyrus-group, --with-cyrus-group=GROUPID use GROUPID cyrus group,
-	cyrus_group="$withval",cyrus_group="mail")
-AC_SUBST(cyrus_group)
-
-dnl allow users to override $sysconfdir, but retain old default (/etc)
-dnl if not specified
-if test $sysconfdir = '${prefix}/etc'; then
- sysconfdir="/etc"
-fi
-AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",Config File Location)
-
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-AC_AIX
-AC_ISC_POSIX
-AC_PROG_AWK
-AC_C_CONST
-AC_SYS_LONG_FILE_NAMES
-if test $ac_cv_sys_long_file_names = no; then
-	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
-fi
-AC_C_INLINE
-
-dnl Check the size of various types
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(size_t)
-AC_CHECK_SIZEOF(off_t)
-
-dnl Check if `long long int' is available
-AC_CHECK_SIZEOF(long long int)
-AC_CHECK_SIZEOF(unsigned long long int)
-if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
- "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
- AC_DEFINE(HAVE_LONG_LONG_INT,,Does the compiler support long long int?)
- AC_C_BIGENDIAN
-fi
-
-CMU_C___ATTRIBUTE__
-CMU_C_FPIC
-
-dnl check for -R, etc. switch
-CMU_GUESS_RUNPATH_SWITCH
-
-AC_CHECK_HEADERS(unistd.h sys/select.h sys/param.h stdarg.h)
-AC_REPLACE_FUNCS(memmove strcasecmp ftruncate strerror)
-AC_CHECK_FUNCS(strlcat strlcpy getgrouplist)
-AC_HEADER_DIRENT
-
-dnl check whether to use getpassphrase or getpass
-AC_CHECK_HEADERS(stdlib.h)
-AC_CHECK_FUNCS(getpassphrase)
-
-dnl do this before Berkeley DB/IPv6 detection
-CMU_SOCKETS
-LIBS="$LIBS ${LIB_SOCKET}"
-
-dnl check for IPv6 functions (fall back to sasl's if we don't have them)
-cyrus_cv_getaddrinfo=yes
-IPv6_CHECK_FUNC(getaddrinfo, IPv6_CHECK_FUNC(gai_strerror,
-	AC_DEFINE(HAVE_GETADDRINFO,,Do we have a getaddrinfo?),
-	cyrus_cv_getaddrinfo=no), cyrus_cv_getaddrinfo=no)
-
-if test $cyrus_cv_getaddrinfo = no; then
-	IPV6_OBJS="getaddrinfo.o"
-fi
-
-cyrus_cv_getnameinfo=yes
-IPv6_CHECK_FUNC(getnameinfo,
-	AC_DEFINE(HAVE_GETNAMEINFO,,Do we have a getnameinfo?),
-	cyrus_cv_getnameinfo=no)
-
-if test $cyrus_cv_getnameinfo = no; then
-	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-fi
-
-IPv6_CHECK_SS_FAMILY()
-IPv6_CHECK_SA_LEN()
-
-AC_SUBST(IPV6_OBJS)
-
-dnl this is to check for time things
-AC_CHECK_HEADERS(sys/time.h)
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-
-AC_SUBST(CPPFLAGS)
-AC_SUBST(PRE_SUBDIRS)
-AC_SUBST(EXTRA_SUBDIRS)
-AC_SUBST(DEPLIBS)
-AC_SUBST(LOCALDEFS)
-AC_FUNC_VPRINTF
-
-dnl function for doing each of the database backends
-dnl parameters: backend name, variable to set, withval
-
-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-
-dnl Berkeley DB Detection
-
-AC_ARG_WITH(bdb, --with-bdb=DIR use Berkeley DB (in DIR) yes ,
-	with_bdb=$withval, with_bdb="yes")
-
-dnl support old-style
-AC_ARG_WITH(dbdir,, with_bdb=$withval)
-
-case "$with_bdb" in
- no)
-	use_berkeley="no"
-	;;
- yes)
-	use_berkeley="yes"
-	with_bdb_lib=none
-	with_bdb_inc=none
-	;;
- 
- *)
-	use_berkeley="yes"
-	with_bdb_lib="$with_bdb/lib"
-	with_bdb_inc="$with_bdb/include"
-	;;
-esac
-
-if test "$use_berkeley" != "no"; then
- CYRUS_BERKELEY_DB_CHK()
-
- if test "$dblib" = "no"; then
- AC_ERROR(Berkeley DB 3.x or later was not found. You may need to 
- supply the --with-bdb-libdir or --with-bdb-incdir configure options.)
- fi
-
- if test "$with_bdb_lib" != "none"; then
- CMU_ADD_LIBPATH($with_bdb_lib)
- fi
-
- BDB_INC=${BDB_INCADD}
- BDB_LIB=${BDB_LIBADD}
- AC_SUBST(BDB_INC)
- AC_SUBST(BDB_LIB)
-
- LIBS="${LIBS} ${BDB_LIBADD}"
- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-
- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
- AC_DEFINE(HAVE_BDB,,Build in Berkeley DB support?)
-fi
-
-dnl End Berkeley DB Detection
-
-
-dnl SQL DB Detection
-
-HAVE_SQL=0
-
-dnl MySQL Detection
-AC_ARG_WITH(mysql, --with-mysql=DIR use MySQL (in DIR) no ,
- with_mysql=$withval, with_mysql="no")
-
-case "$with_mysql" in
- no)
-	use_mysql="no"
-	;;
- yes)
-	use_mysql="yes"
-	with_mysql_lib=none
-	with_mysql_inc=none
-	;;
- 
- *)
-	use_mysql="yes"
-	with_mysql_lib="$with_mysql/lib"
-	with_mysql_inc="$with_mysql/include"
-	;;
-esac
-
-if test "$use_mysql" != "no"; then
- CYRUS_MYSQL_CHK()
-
- if test "$mysqllib" = "no"; then
- AC_ERROR(MySQL was not found. You may need to supply the
- --with-mysql-libdir or --with-mysql-incdir configure options.)
- else
- HAVE_SQL=1
- fi
-
- if test "$with_mysql_lib" != "none"; then
- CMU_ADD_LIBPATH($with_mysql_lib)
- fi
-
- LIBS="${LIBS} ${MYSQL_LIBADD}"
- CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
-
- AC_DEFINE(HAVE_MYSQL,,Build in MySQL support?)
-fi
-
-dnl End MySQL Detection
-
-
-dnl PgSQL Detection
-AC_ARG_WITH(pgsql, --with-pgsql=DIR use PostgreSQL (in DIR) no ,
- with_pgsql=$withval, with_pgsql="no")
-
-case "$with_pgsql" in
- no)
-	use_pgsql="no"
-	;;
- yes)
-	use_pgsql="yes"
-	with_pgsql_lib=none
-	with_pgsql_inc=none
-	;;
- 
- *)
-	use_pgsql="yes"
-	with_pgsql_lib="$with_pgsql/lib"
-	with_pgsql_inc="$with_pgsql/include"
-	;;
-esac
-
-if test "$use_pgsql" != "no"; then
- CYRUS_PGSQL_CHK()
-
- if test "$pgsqllib" = "no"; then
- AC_ERROR(PgSQL was not found. You may need to supply the
- --with-pgsql-libdir or --with-pgsql-incdir configure options.)
- else
- HAVE_SQL=1
- fi
-
- if test "$with_pgsql_lib" != "none"; then
- CMU_ADD_LIBPATH($with_pgsql_lib)
- fi
-
- LIBS="${LIBS} ${PGSQL_LIBADD}"
- CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"
-
- AC_DEFINE(HAVE_PGSQL,,Build in PgSQL support?)
-fi
-
-dnl End PgSQL Detection
-
-
-dnl SQLite Detection
-AC_ARG_WITH(sqlite, --with-sqlite=DIR use SQLite (in DIR) no ,
- with_sqlite=$withval, with_sqlite=no)
-
-case "$with_sqlite" in
- no)
-	use_sqlite="no"
-	;;
- yes)
-	use_sqlite="yes"
-	with_sqlite_lib=none
-	with_sqlite_inc=none
-	;;
- 
- *)
-	use_sqlite="yes"
-	with_sqlite_lib="$with_sqlite/lib"
-	with_sqlite_inc="$with_sqlite/include"
-	;;
-esac
-
-if test "$use_sqlite" != "no"; then
- CYRUS_SQLITE_CHK()
-
- if test "$sqlitelib" = "no"; then
- AC_ERROR(Sqlite was not found. You may need to supply the
- --with-sqlite-libdir or --with-sqlite-incdir configure options.)
- else
- HAVE_SQL=1
- fi
-
- if test "$with_sqlite_lib" != "none"; then
- CMU_ADD_LIBPATH($with_sqlite_lib)
- fi
-
- LIBS="${LIBS} ${SQLITE_LIBADD}"
- CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
-
- AC_DEFINE(HAVE_SQLITE,,Build in SQLite support?)
-fi
-
-dnl End SQLite Detection
-
-
-if test $HAVE_SQL = 1; then
- CYRUSDB_OBJS="${CYRUSDB_OBJS} cyrusdb_sql.o"
-fi
-
-dnl End SQL DB Detection
-
-AC_SUBST(CYRUSDB_OBJS)
-
-SIEVE_SUBDIRS=""
-sievedir="sieve"
-AC_ARG_ENABLE(sieve,
- --disable-sieve disable Sieve support,
-	if test "$enableval" = no; then
-		sievedir="no"
-	fi)
-
-testpcre="yes"
-AC_ARG_ENABLE(pcre,
-		 --disable-pcre disable PCRE library,
-	if test "$enableval" = no; then
-		testpcre="no"
-	fi)
-
-if test "$sievedir" != "no"; then
-	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-	AC_SUBST(SIEVE_OBJS)
-	SIEVE_LIBS="../${sievedir}/libsieve.a"
-	AC_SUBST(SIEVE_LIBS)
-	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-	AC_SUBST(SIEVE_CPPFLAGS)
-	AC_DEFINE(USE_SIEVE,,Build in Sieve support?)
-
-	dnl Sieve configure stuff
-	AC_PROG_YACC
-	AC_PROG_LEX
-	AC_CHECK_LIB(fl,main)
-
-	if test "$testpcre" != "no"; then
-	 AC_CHECK_HEADER(pcreposix.h)
-	 if test "$ac_cv_header_pcreposix_h" = "yes"; then
-		 AC_MSG_CHECKING(for utf8 enabled pcre)
-		 AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP(#include <pcreposix.h>
-#ifndef REG_UTF8
-#include </nonexistent>
-#endif,cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no))
-		 AC_MSG_RESULT($cyrus_cv_pcre_utf8)
-	 else
-		 cyrus_cv_pcre_utf8="no"
-	 fi
-	fi
-
-	if test "$cyrus_cv_pcre_utf8" = "yes"; then
-		LIBS="$LIBS -lpcre -lpcreposix";
-		AC_DEFINE(ENABLE_REGEX, , Do we have a regex library?)
-		AC_DEFINE(HAVE_PCREPOSIX_H, , Do we have usable pcre library?)
-	else 
-		AC_CHECK_HEADERS(rxposix.h)
-		if test "$ac_cv_header_rxposix_h" = "yes"; then
-			LIBS="$LIBS -lrx"
-			AC_DEFINE(ENABLE_REGEX, ,
-				 Do we have a regex library?)
-		else
-			AC_SEARCH_LIBS(regcomp, regex,
-					AC_DEFINE(ENABLE_REGEX, ,
-					Do we have a regex library?), )
-		fi
-	fi
-
-	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-fi
-
-AC_SUBST(SIEVE_SUBDIRS)
-
-dnl for et routines
-AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR,,Do we have strerror()?),
- AC_DEFINE(NEED_SYS_ERRLIST,,Do we have a sys_errlist?))
-
-dnl for master fd limits
-AC_CHECK_HEADERS(sys/resource.h)
-AC_CHECK_FUNCS(setrlimit)
-AC_CHECK_FUNCS(getrlimit)
-
-dnl for detaching terminal
-AC_CHECK_FUNCS(daemon setsid)
-
-dnl for turning off sockets
-AC_CHECK_FUNCS(shutdown)
-
-AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_DEFINE(HAVE_SOCKLEN_T,,Do we have a socklen_t?))
-AC_EGREP_HEADER(sockaddr_storage, sys/socket.h,
-		AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE,,Do we have a sockaddr_storage?))
-AC_EGREP_HEADER(rlim_t, sys/resource.h, AC_DEFINE(HAVE_RLIM_T,,Do we have an rlim_t?))
-
-dnl Bunch of setproctitle stuff
-spt_type=""
-AC_CHECK_FUNC(setproctitle,spt_type=SPT_BUILTIN)
-if test "$spt_type" = ""; then
-	dnl BSD/OS and FreeBSD put it in -lutil
-	AC_CHECK_LIB(util,setproctitle,spt_type=SPT_BUILTIN
-			LIBS="${LIBS} -lutil")
-fi
-if test "$spt_type" = ""; then
-	AC_CHECK_HEADER(sys/pstat.h,spt_type=SPT_PSTAT)
-fi
-if test "$spt_type" = ""; then
-	AC_CHECK_HEADER(sys/sysnews.h,spt_type=SPT_SYSMIPS)
-fi
-if test "$spt_type" = ""; then
-	AC_MSG_CHECKING(for PS_STRINGS)
-	AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_TRY_CPP(
-#include <machine/vmparam.h>
-#include <sys/exec.h>
-#ifndef PS_STRINGS
-#include </nonexistent>
-#endif,cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
-	if test $cyrus_cv_sys_psstrings = yes; then
-		spt_type=SPT_PSSTRINGS
-	fi
-	AC_MSG_RESULT($cyrus_cv_sys_psstrings)
-fi
-if test "$spt_type" = ""; then
-	AC_MSG_CHECKING(for SCO)
-	AC_CACHE_VAL(cyrus_cv_sys_sco, AC_TRY_CPP(
-#ifndef _SCO_unix_
-#include </nonexistent>
-#endif,cyrus_cv_sys_sco=yes,cyrus_cv_sys_sco=no))
-	if test $cyrus_cv_sys_sco = yes; then
-		spt_type=SPT_SCO
-	fi
-	AC_MSG_RESULT($cyrus_cv_sys_sco)
-fi
-if test "$spt_type" = ""; then
-	AC_MSG_CHECKING(for setproctitle usability)
-	AC_CACHE_VAL(cyrus_cv_sys_setproctitle, AC_TRY_CPP(
-#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-#include </nonexistent>
-#endif,cyrus_cv_sys_setproctitle=yes,cyrus_cv_sys_setproctitle=no))
-	if test $cyrus_cv_sys_setproctitle = no; then
-		spt_type=SPT_NONE
-	fi
-	AC_MSG_RESULT($cyrus_cv_sys_setproctitle)
-fi
-if test "$spt_type" != ""; then
-	AC_DEFINE_UNQUOTED(SPT_TYPE,$spt_type,Do we already have setproctitle?)
-fi
-
-AC_MSG_CHECKING(nonblocking method)
-AC_CACHE_VAL(cyrus_cv_sys_nonblock,AC_TRY_LINK(#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#ifndef	FNDELAY
-#define FNDELAY		O_NDELAY
-#endif,fcntl(0, F_GETFL, 0)&FNDELAY,
-cyrus_cv_sys_nonblock=fcntl,cyrus_cv_sys_nonblock=ioctl))
-WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-AC_SUBST(WITH_NONBLOCK)
-AC_MSG_RESULT($WITH_NONBLOCK)
-
-AC_MSG_CHECKING(timezone GMT offset method)
-AC_CACHE_VAL(cyrus_cv_struct_sys_gmtoff,AC_TRY_COMPILE(
-#include <time.h>,struct tm tm;
-tm.tm_gmtoff = 0;
-,cyrus_cv_struct_sys_gmtoff=tm,cyrus_cv_struct_sys_gmtoff=gmtime))
-WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-AC_SUBST(WITH_GMTOFF)
-AC_MSG_RESULT($WITH_GMTOFF)
-AC_MSG_CHECKING(for shared mmap)
-AC_CACHE_VAL(cyrus_cv_func_mmap_shared,AC_TRY_RUN(
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base+4, "test", 4) != 0) exit(1);
-exit(0);}
-,cyrus_cv_func_mmap_shared=yes,cyrus_cv_func_mmap_shared=no,
-cyrus_cv_func_mmap_shared=no))
-AC_MSG_RESULT($cyrus_cv_func_mmap_shared)
-if test $cyrus_cv_func_mmap_shared = yes; then
-	WITH_MAP="shared"
-else
-AC_MSG_CHECKING(for stupid shared mmap)
-AC_CACHE_VAL(cyrus_cv_func_mmap_stupidshared,AC_TRY_RUN(
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-main() {
-char *base;
-int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-if (fd == -1) exit(1);
-if (write(fd, "test", 4) != 4) exit(1);
-fsync(fd);
-base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-#ifdef MAP_FILE
-| MAP_FILE
-#endif
-#ifdef MAP_VARIABLE
-| MAP_VARIABLE
-#endif
-, fd, 0L);
-if (base == (caddr_t)-1) exit(1);
-if (strncmp(base, "test", 4) != 0) exit(1);
-lseek(fd, 0L, 0);	
-if (write(fd, "xyzz", 4) != 4) exit(1);
-fsync(fd);
-if (strncmp(base, "xyzz", 4) != 0) exit(1);
-exit(0);}
-,cyrus_cv_func_mmap_stupidshared=yes,cyrus_cv_func_mmap_stupidshared=no,
-cyrus_cv_func_mmap_stupidshared=no))
-AC_MSG_RESULT($cyrus_cv_func_mmap_stupidshared)
-if test $cyrus_cv_func_mmap_stupidshared = yes; then
-	WITH_MAP="stupidshared"
-else
-	AC_MSG_WARN(*** This system does not have a working mmap())
-	AC_MSG_WARN(*** Expect a considerable performance penalty)
-	WITH_MAP=nommap
-fi
-fi
-
-AC_SUBST(WITH_MAP)
-AC_ARG_WITH(lock,
- --with-lock=METHOD force use of METHOD for locking (flock or fcntl),
- WITH_LOCK="$withval", 
- AC_CHECK_FUNC(fcntl,WITH_LOCK="fcntl",
-		AC_CHECK_FUNC(flock,WITH_LOCK="flock",
-				AC_ERROR(unable to detect locking method)
-			 )
-		)
- )
-
-AC_SUBST(WITH_LOCK)
-
-dnl check for fdatasync (used by cyrusdb_skiplist)
-LIB_RT=""
-AC_CHECK_FUNC(fdatasync, AC_DEFINE(HAVE_FDATASYNC,,Do we have fdatasync()?), 
- AC_CHECK_LIB(rt, fdatasync, 
-	LIB_RT="-lrt"
-	AC_DEFINE(HAVE_FDATASYNC,,Do we have fdatasync()?)
- )
-)
-
-dnl for makedepend and AFS.
-cant_find_sigvec=no
-AC_CACHE_VAL(cyrus_cv_sigveclib,
- dnl bsd classic flavor
- AC_CHECK_FUNC(sigvec, 
-	cyrus_cv_sigveclib=""
- , 
- dnl hp flavor
- AC_CHECK_LIB(BSD, sigvec, cyrus_cv_sigveclib="-lBSD", 
- dnl not hp flavor
- SAVE_LDFLAGS="$LDFLAGS"
- dnl solaris flavor
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
- AC_CHECK_LIB(ucb, sigvec, 
- dnl more solaris flavor
- cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb",
- cant_find_sigvec=yes )
- LDFLAGS="$SAVE_LDFLAGS")
- )
-)
-AC_SUBST(cyrus_cv_sigveclib)
-
-# ok, we still look for this stuff because of checking groups, but
-# all authentication goes through SASL
-AC_ARG_ENABLE(afs, --enable-afs Enable AFS with ptloader)
-
-AC_ARG_WITH(afs-libdir, --with-afs-libdir=PATH use AFS libraries from PATH /usr/lib,
-	 afs_libdir="${withval}", afs_libdir="/usr/lib")
- 
-AC_ARG_WITH(afs-incdir, --with-afs-incdir=PATH use AFS headers from PATH /usr/include,
- afs_incdir="${withval}", afs_incdir="/usr/include")
-
-AC_ARG_WITH(ldap, --with-ldap=DIR use LDAP (in DIR) (experimental) /usr/local ,
-	 with_ldap="${withval}", with_ldap="no")
- 
-dnl select mode of afspts
-AC_ARG_ENABLE(krb5afspts, --enable-krb5afspts compile afskrb PTS module with krb5 support)
-
-if test "x$enable_afs" = "xyes"; then
-# krb5afspts is only valid if AFS is enabled, so check inside here.
- AS_IF(test "x$enable_krb5afspts" = "xyes", SASL_SET_GSSAPI_LIBS
- AC_DEFINE(AFSPTS_USE_KRB5,,Should the AFS PTS plugin use krb5?) 
- )
-
- CFLAGS="${CFLAGS} -I${with_afs_incdir}/include"
- AFS_LIBS="${with_afs_libdir}/afs/libkauth.a ${with_afs_libdir}/afs/libprot.a ${with_afs_libdir}/afs/libauth.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/librxkad.a ${with_afs_libdir}/librx.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/libubik.a ${with_afs_libdir}/liblwp.a ${with_afs_libdir}/afs/util.a ${with_afs_libdir}/afs/libcom_err.a"
- if test -f ${with_afs_libdir}/afs/libaudit.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libaudit.a"
- fi
- if test -f /usr/ucblib/libucb.a; then
- CMU_ADD_LIBPATH_TO(/usr/ucblib, AFS_LDFLAGS)
- AFS_LIBS="$AFS_LIBS -lc -lucb"
- fi
- if test -f ${with_afs_libdir}/afs/libdes.a; then
- AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libdes.a"
- else
- AFS_LIBS="$AFS_LIBS -ldes"
- fi
-
- AC_CACHE_VAL(cyrus_cv_afs_sigvec,
- SAVE_LIBS="$LIBS"
- LIBS="${with_afs_libdir}/liblwp.a"
- AC_MSG_CHECKING(if AFS libraries need sigvec)
- dnl Does AFS need sigvec? We have to link against lwp and see
- dnl if IOMGR_Initialize wants it
- AC_TRY_LINK(IOMGR_Initialize();,
- IOMGR_Initialize(),
- 
- dnl it linked; don't need it
- AC_MSG_RESULT(no)
- cyrus_cv_afs_sigvec="no"
- , 
- dnl didn't link; pick up sigvec
- AC_MSG_RESULT(yes)
- cyrus_cv_afs_sigvec="yes"
- )
- )
- if test "$cyrus_cv_afs_sigvec" = yes; then
- if test "$cant_find_sigvec" = yes; then
- AC_MSG_WARN(Can't find a sigvec for AFS libraries which seem to need one.)
- else
- AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
- AC_SUBST(AFS_LIBS)
- AC_SUBST(AFS_LDFLAGS)
- AC_DEFINE(HAVE_AFSKRB,,Should we build afskrb pts module?)
- fi
- else
- AFS_LIBS="${AFS_LIBS}"
- AC_SUBST(AFS_LIBS)
- AC_SUBST(AFS_LDFLAGS)
- AC_DEFINE(HAVE_AFSKRB,,Should we build afskrb pts module?)
- fi
- LIBS="$SAVE_LIBS"
-fi
-
-LDAP_CPPFLAGS=""
-LDAP_LDFLAGS=""
-LDAP_LIBS=""
-
-if test "x$with_ldap" != "xno"; then
- if test ! -d $with_ldap; then
- with_ldap=/usr/local
- fi
-
- LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
- LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
- LDAP_LIBS=""
-
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS=$LDAP_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- AC_CHECK_LIB(ldap, ldap_initialize, 
- AC_DEFINE(HAVE_LDAP,,Should we build ldap pts module?)
- AC_SUBST(LDAP_CPPFLAGS)
- AC_SUBST(LDAP_LDFLAGS)
- AC_SUBST(LDAP_LIBS) 
- LDAP_LIBS="-lldap -llber" ,,-llber)
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
- AC_CHECK_LIB(ldap, ldap_initialize, 
- AC_DEFINE(HAVE_LDAP,,Should we build ldap pts module?)
- AC_SUBST(LDAP_CPPFLAGS)
- AC_SUBST(LDAP_LDFLAGS)
- AC_SUBST(LDAP_LIBS) 
- LDAP_LIBS="-lldap -llber" ,,-llber)
-
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
-fi
- 
-if test "x$enable_afs" = "xyes" -o "x$with_ldap" != "xno"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-
-	AC_DEFINE(WITH_PTS,,Build in PTS support?)
-fi
-
-
-
-SERVER_SUBDIRS="master imap"
-AC_ARG_ENABLE(server,
-	 --disable-server disable compiling servers,
-	if test "$enableval" = no; then
- 	SERVER_SUBDIRS=""
-	fi)
-AC_SUBST(SERVER_SUBDIRS)
-# We always output a server makefile (just because we can)
-
-dnl this is the new simple check for kerberos; since the person had to
-dnl compile SASL, we might as well use the same checks.
-AC_ARG_WITH(krb, --with-krb=PATH use Kerberos from PATH,
-	with_krb="$withval", with_krb="no")
-
-AC_ARG_WITH(krbimpl, --with-krbimpl=\kth|mit\ assume Kerberos 4 from KTH or MIT,
-	with_krbimpl="$withval", with_krbimpl="kth")
-
-AC_ARG_ENABLE(statickrb,
-		 --enable-statickrb link Kerberos statically,
-	with_statickrb="yes", with_statickrb="no")
-
-dnl In order to compile kerberos4, we need libkrb and libdes.
-
-dnl we might need -lresolv for kerberos
-AC_CHECK_LIB(resolv,res_search)
-
-if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
- AC_MSG_ERROR(--enable-statickrb specified but --with-krb did not specify a valid directory)
-fi 
-
-if test "$with_krb" != "no"; then
-dnl Do we need DES for kerberos?
-AC_ARG_WITH(krbdes, --with-krbdes use Kerberos DES implementation yes,
- with_krbdes="$withval", with_krbdes="yes")
-if test "$with_krbdes" = "yes"; then
- AC_CHECK_LIB(des,des_ecb_encrypt,
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$with_krb/lib/libdes.a"
- else
- KRB_LIBS="-ldes"
- fi,
- AC_MSG_ERROR(The Kerberos DES library is required for Kerberos support. You might want --with-auth=unix.))
-fi
-fi
-
-dnl if we were ambitious, we'd look more aggressively for the
-dnl krb4 install
-if test -d ${with_krb}; then
- AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, 
- for krbhloc in include/kerberosIV include
- do
- if test -f ${with_krb}/${krbhloc}/krb.h ; then
- cyrus_cv_krbinclude=${with_krb}/${krbhloc}
- break
- fi
- done
- )
-
- if test -n "${cyrus_cv_krbinclude}"; then
- CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
- fi
- CMU_ADD_LIBPATH(${with_krb}/lib)
-fi
-
-if test "$with_krbimpl" != "kth"; then
- KRBLIB="krb4"
-else
- KRBLIB="krb"
-fi
-
-if test "$with_des" != no; then
- AC_CHECK_HEADER(krb.h,
- AC_CHECK_LIB(${KRBLIB}, krb_mk_priv,
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
- else
- KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
- fi,
- AC_WARN(No Kerberos V4 found); krb4=no,
- 	 $KRB_LIBS),
- AC_WARN(No Kerberos V4 found); krb4=no)
-else
- AC_WARN(No DES library found for Kerberos V4 support)
- krb4=no
-fi
-
-if test "${krb4}" != no; then
- AC_DEFINE(HAVE_KRB,,Support for Kerberos?)
-fi
-
-LIBS="$KRB_LIBS $LIBS"
-
-SASL_SET_GSSAPI_LIBS
-
-dnl
-dnl Test for OpenSSL
-dnl
-IMAP_PROGS=""
-AC_ARG_WITH(openssl, --with-openssl=PATH use OpenSSL from PATH,
-	with_openssl="${withval}")
-
-OPENSSL_INC=
-OPENSSL_LIB=
-case "$with_openssl" in
-	no) with_openssl="no";;
-	""|yes) 
-	 dnl if openssl has been compiled with the rsaref2 libraries,
-	 dnl we need to include the rsaref libraries in the crypto check
- LIB_RSAREF=""
-	 AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
-		 LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
-		 cmu_have_rsaref=no)
-
-		with_openssl="yes"
-		AC_CHECK_LIB(crypto,BIO_accept,
- LIBS="-lcrypto $LIB_RSAREF ${LIBS}",
-		 with_openssl="no", $LIB_RSAREF)
-		AC_CHECK_LIB(ssl, SSL_CTX_new, LIBS="-lssl ${LIBS}",
-		 with_openssl="no", -lcrypto $LIB_RSAREF)
-		
-		;;
-	*) OPENSSL_INC="-I${with_openssl}/include"
-	 OPENSSL_LIBPATH="${with_openssl}/lib"
-	 OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-	 CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-	 CMU_ADD_LIBPATH(${OPENSSL_LIBPATH})
-	 CMU_ADD_LIBPATH_TO(${OPENSSL_LIBPATH}, OPENSSL_LIB)
-	 LIBS="${LIBS} -lssl -lcrypto";;
-esac
-
-AC_MSG_CHECKING(for openssl)
-AC_MSG_RESULT($with_openssl)
-
-if test "$with_openssl" != "no"; then
-	AC_DEFINE(HAVE_SSL,,Build with SSL support?)
-	IMAP_PROGS="$IMAP_PROGS tls_prune"
- if test "${krb4}" != no; then
- AC_DEFINE(OPENSSL_ENABLE_OLD_DES_SUPPORT,,Configure OpenSSL to provide legacy des apis)
- AC_DEFINE(OPENSSL_DES_LIBDES_COMPATIBILITY,,Configure OpenSSL to provide krb4-compatible legacy des apis)
- fi
-fi
-AC_SUBST(OPENSSL_INC)
-AC_SUBST(OPENSSL_LIB)
-
-dnl
-dnl Allow for setting EGD socket file on systems without /dev/*random.
-dnl
-AC_ARG_WITH(egd-socket,
- --with-egd-socket=FILE Entropy Gathering Daemon socket pathname
- for systems without /dev/urandom,
- EGD_SOCKET="$withval" 
- )
-if test -n "$EGD_SOCKET" ; then
- AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET", Alternative to /dev/urandom?)
-fi
-
-dnl
-dnl Test for zlib
-dnl
-CMU_HAVE_ZLIB
-AC_MSG_CHECKING(for zlib)
-AC_MSG_RESULT($with_zlib)
-AC_SUBST(ZLIB)
-
-dnl
-dnl Test for Zephyr
-dnl
-AC_ARG_WITH(zephyr, --with-zephyr=PATH enable Zephyr notification (installed on PATH),
-	with_zephyr="${withval}")
-if test -z "$with_zephyr"; then
- if test -f /usr/local/lib/libzephyr.a; then
-	with_zephyr="/usr/local"
- elif test -f /usr/lib/libzephyr.a; then
- with_zephyr="/usr"
- fi
-fi
-ZEPHYR_LIBS=""
-case "$with_zephyr" in
-	no) true;;
-	""|yes) AC_CHECK_LIB(zephyr,ZInitialize,ZEPHYR_LIBS="-lzephyr",
-		with_zephyr="no",);;
- *) ZEPHYR_LIBS="-lzephyr";;
-esac
-AC_SUBST(ZEPHYR_LIBS)
-if test "$with_zephyr" != "no"; then
-	AC_DEFINE(HAVE_ZEPHYR,,Build with Zephyr support?)
-fi
-
-dnl
-dnl Set pidfile location
-dnl
-AC_ARG_WITH(pidfile, --with-pidfile=PATH pidfile in PATH (/var/run/cyrus-master.pid),
-	MASTERPIDFILE="$withval",
-	MASTERPIDFILE="/var/run/cyrus-master.pid")
-MASTERPIDFILE="\"$MASTERPIDFILE\""
-AC_DEFINE_UNQUOTED(MASTER_PIDFILE, $MASTERPIDFILE,Name of the pidfile for master)
-
-dnl
-dnl see if we're compiling with IMAP idled support
-dnl
-AC_ARG_ENABLE(idled,
- --enable-idled enable IMAP idled support,
- if test "$enable_val" != no; then
-	 IMAP_PROGS="$IMAP_PROGS idled"
- fi) 
-
-dnl
-dnl see if we're compiling with NNTP support
-dnl
-ENABLE_NNTP=no
-AC_ARG_ENABLE(nntp,
- --enable-nntp enable NNTP support,
-	ENABLE_NNTP=$enableval
- if test "$ENABLE_NNTP" != no; then
-	 IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
- fi) 
-
-dnl
-dnl see if we're compiling the Murder support programs
-dnl
-ENABLE_MURDER=no
-AC_ARG_ENABLE(murder,
- --enable-murder enable IMAP Murder support,
-	ENABLE_MURDER=$enableval)
-
-if test "$ENABLE_MURDER" != no; then
-	IMAP_PROGS="$IMAP_PROGS mupdate"
-	# for master/slave auto-selection
-	AC_CHECK_HEADERS(sys/sockio.h)
-fi
-
-dnl
-dnl see if we're compiling replication support programs
-dnl
-ENABLE_REPLICATION=no
-AC_ARG_ENABLE(replication,
- --enable-replication enable replication support (experimental),
-	ENABLE_REPLICATION=$enableval
- if test "$ENABLE_REPLICATION" != no; then
-	 IMAP_PROGS="$IMAP_PROGS sync_client sync_server sync_reset"
- fi) 
-
-AC_SUBST(IMAP_PROGS)
-
-dnl
-dnl Try and find a system version of com_err.
-dnl If we see something that looks a little wacky, ignore it (there are many
-dnl deficient installs of com_err, unfortunately, which leave out compile_et)
-dnl There is also a broken re-implementation of compile_et, apparently derived
-dnl from the Kerberos project, being shipped in /usr/bin on MacOS X, see Bug #3711.
-dnl
-AC_ARG_WITH(com_err,
- --with-com_err=PATH use com_err from path -- includes in PATH/include,
- libs in PATH/lib, and compile_et in PATH/bin)
-if test -z "$with_com_err"; then
-	# no value supplied
-	AC_CHECK_LIB(com_err, com_err, 
-		# com_err is already in library path
-		# guess we're okay
-		# can use system com_err
-		with_com_err=""
-		AC_CHECK_HEADER(et/com_err.h,
-		 AC_DEFINE(HAVE_ET_COM_ERR_H,,We need et/com_err.h),
-		 AC_CHECK_HEADER(com_err.h,,AC_ERROR(cannot locate com_err.h)))
-		AC_PATH_PROG(COMPILE_ET, compile_et, no compile et)
-	, 
-	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-		with_com_err="/usr/local"
-		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, no compile et)
-	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-		with_com_err="/usr"
-		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, no compile et)
-	else
-		# use ours
-		with_com_err=yes
-	fi
-	)
-
-	if test "${with_com_err}" = "no"; then
-	 AC_MSG_WARN(com_err is required; included version will be used.)
-	 with_com_err="yes"
-	fi
-	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-	 AC_MSG_WARN(Parts of com_err distribuion were found, but not compile_et.)
-	 AC_MSG_WARN(Will build com_err from included sources.)
-	 with_com_err="yes" # build it ourselves
-	fi
-fi
-
-dnl Set up $COMPILE_ET first, we need to test it
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COMPILE_ET="../com_err/et/compile_et"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
- ;;
- *) # use whatever they told us, or whatever we found
- COMPILE_ET="${with_com_err}/bin/compile_et"
-esac
-
-if test "$with_com_err" != yes ; then
- dnl Test that the specified compile_et produces correct output
- dnl See bug #3711 for why this is necessary
- TEST1=".cyrus-configure-test-$$"
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- echo "error_table imap" >> $TEST1.et
- echo "ec IMAP_TESTING," >> $TEST1.et
- echo " \"Testing\"" >> $TEST1.et
- echo "end" >> $TEST1.et
- "${COMPILE_ET}" $TEST1.et > /dev/null
- compile_et_ok=no
- if test -f $TEST1.h ; then
-	if test `awk '/IMAP_TESTING/{print $3}' $TEST1.h 2>/dev/null` = "(-1904809472L)" ; then
-	 compile_et_ok=yes
-	fi
-	dnl Broken compile_et produces (2390157824L)
- fi
- /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
- if test "$compile_et_ok" = no ; then
-	AC_MSG_WARN(It seems $COMPILE_ET is buggy, building our own)
-	COMPILE_ET="../com_err/et/compile_et" # build it ourselves
- fi
-fi
-
-case "$with_com_err" in
- # built-in et
- yes) # use the com_err we're gonna build
-	 COM_ERR_LIBS="../com_err/et/libcom_err.a"
-	 COM_ERR_LDFLAGS=""
-	 COM_ERR_CPPFLAGS="-I\${top_srcdir}/com_err/et"
-	 PRE_SUBDIRS="com_err/et ${PRE_SUBDIRS}"
-	 EXTRA_OUTPUT="${EXTRA_OUTPUT} com_err/et/Makefile"
-	 ;;
- "") # no problem, we already have it in the paths
-	# we do nothing to pick it up
-	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-	# we already set COMPILE_ET, or we didn't get here
-	COM_ERR_LDFLAGS=""
-	COM_ERR_CPPFLAGS=""
- ;;
- *) # use whatever they told us, or whatever we found
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
- # Ever get the feeling people hide this stuff on purpose?
- if test -d "${with_com_err}/include/et" ; then
- COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
- fi
-dnl CMU_ADD_LIBPATH_TO(${with_com_err}/lib, COM_ERR_LDFLAGS)
-esac
-AC_SUBST(COMPILE_ET)
-AC_SUBST(COM_ERR_LIBS)
-AC_SUBST(COM_ERR_LDFLAGS)
-AC_SUBST(COM_ERR_CPPFLAGS)
-
-AC_MSG_CHECKING(for modern syslog)
-AC_CACHE_VAL(cyrus_cv_lib_syslog, AC_TRY_CPP(#include <syslog.h>
-#ifndef LOG_LOCAL6
-#include </nonexistent>
-#endif,cyrus_cv_lib_syslog=yes,cyrus_cv_lib_syslog=no))
-if test $cyrus_cv_lib_syslog = no; then
-	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-fi
-AC_MSG_RESULT($cyrus_cv_lib_syslog)
-
-AC_MSG_CHECKING(which syslog facility to use)
-SYSLOG_FACILITY=LOG_LOCAL6
-AC_ARG_WITH(syslogfacility, --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6),
- if test "$withval" != "yes" -a "$withval" != "no" ; then
- SYSLOG_FACILITY=LOG_$withval
- fi; )
-AC_DEFINE_UNQUOTED(SYSLOG_FACILITY, $SYSLOG_FACILITY, Syslog facility to use.)
-AC_MSG_RESULT($SYSLOG_FACILITY)
-
-dnl Have to check getdtabalesize after adding ossup, as some ossups define it
-AC_REPLACE_FUNCS(getdtablesize)
-AC_ARG_ENABLE(cmulocal,
-	 --enable-cmulocal enable CMU-specific local support,
-	if test "$enableval" = yes; then
-		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-	fi)
-
-AC_MSG_CHECKING(to use old sieve service name)
-AC_ARG_ENABLE(oldsievename,
-	 --enable-oldsievename enable the use of 'imap' as the sieve service name,
-	if test "$enableval" = yes; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(OLD_SIEVE_SERVICE_NAME,,Use "imap" as sieve service name?)
-	else
-		AC_MSG_RESULT(no)
-	fi,
-	AC_MSG_RESULT(no))
-
-AC_ARG_ENABLE(netscapehack,
-	 --enable-netscapehack enable Netscape hack for the menu option
- in Communicator to Administrate Mail,
-	if test "$enableval" = yes; then
-		AC_DEFINE(ENABLE_X_NETSCAPE_HACK,,Enable Netscape Menu Option Hack?)
-	fi)
-
-AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl, dlopen))
-CMU_SASL2_REQUIRE_VER(2,1,7)
-CMU_SASL2_CHECKAPOP_REQUIRED
-
-AC_ARG_WITH(perl, --with-perl=PERL use PERL for perl,
-	with_perl="$withval", with_perl="perl")
-
-if test "${with_perl}" = yes; then
- with_perl="perl"
-fi
-if test "${with_perl}" != no; then
- if test ${using_static_sasl} = "staticonly"; then
-	AC_MSG_WARN(Cannot compile perl utilities using static libsasl)
-	with_perl="no"
- else 
-	AC_CHECK_PROGS(PERL, ${with_perl} perl, with_perl=notfound)
- fi
-fi
-if test "$with_perl" = "notfound"; then
- AC_MSG_WARN(Perl not found: Administrative tools won't be available)
-elif test "${with_perl}" != "no"; then
-dnl compile perl stuff
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-dnl and compile perl/cyradm
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
-dnl add perl cccdlflags when building libraries -- this ensures that the
-dnl libraries will be compiled as PIC if perl requires PIC objects
-dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
- case "${target_os}" in
- linux*|netbsd*|freebsd*|dragonfly*)
- AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
- eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- AC_SUBST(PERL_CCCDLFLAGS)
- AC_MSG_RESULT($PERL_CCCDLFLAGS)
- ;;
- *)
- AC_MSG_WARN(skipping check for perl cccdlflags on "${target_os}")
- esac
-fi
-
-dnl for timsieved
-if test "$sievedir" != "no"; then
-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-
-	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-	PERL_DEPSUBDIRS="sieve"
-	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-else
-	PERL_DEPSUBDIRS="none"
-fi
-
-dnl snmp
-dnl (agentx was depricated, but SNMP_SUBDIRS is conveinent as a placeholder)
-SNMP_SUBDIRS=""
-AC_SUBST(SNMP_SUBDIRS)
-
-CMU_LIBWRAP
-CMU_UCDSNMP
-
-# Figure out what directories we're linking against.
-# Lots of fun for the whole family.
-# This probably chokes on anything with spaces in it.
-# All we want is the list of -L directories, and -L may or may not be
-# followed by a space.
-isdir=no
-libpath=""
-#echo "debug ldflags: << ${ldflags} >>"
-#echo "debug default_ldflags: << ${default_ldflags} >>"
-for flag in ${ldflags} ${default_ldflags}; do
- case $flag in
- -L)
- # it's a split -L option, we'll mark the next option as a dir.
- isdir=yes
- ;;
-
- -L*) 
- # attached -L option: split off the directory
- larg=`echo $flag | sed -e 's:-L$..*$:\1:'`
- libpath="${libpath} ${larg}"
- ;;
-
- *)
- if test $isdir = yes ; then
-	libpath="${libpath} ${flag}"
-	isdir=no
- fi
- esac
-done
-
-IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
-
-AC_SUBST(LIB_RT)
-AC_SUBST(IMAP_COM_ERR_LIBS)
-AC_SUBST(IMAP_LIBS)
-
-dnl AC_OUTPUT_COMMANDS(
-dnl if test "$with_perl" != "no"; then
-dnl (cd perl/sieve/managesieve; $perl Makefile.PL PREFIX=$prefix)
-dnl (cd perl/imap; $perl Makefile.PL PREFIX=$prefix)
-dnl fi
-dnl , perl=$PERL; with_perl=$with_perl; prefix=$prefix; SASL_LIB="$LIB_SASL"; SASL_INC="$SASLFLAGS"; export SASL_LIB SASL_INC)
-AC_SUBST(PERL_SUBDIRS)
-AC_SUBST(PERL_DEPSUBDIRS)
-AC_SUBST(PERL)
-
-AH_TOP(
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: configure.in,v 1.316 2010/01/06 17:01:26 murch Exp $
- */
-
-#ifndef _CYRUS_IMAPD_CONFIG_H_
-#define _CYRUS_IMAPD_CONFIG_H_
-)
-
-AH_BOTTOM(
-/* time.h */
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-/* com_err.h, as needed */
-#ifndef IN_COM_ERR
-#ifdef HAVE_ET_COM_ERR_H
-#include <et/com_err.h>
-#else
-#include <com_err.h>
-#endif /* HAVE_ET_COM_ERR_H */
-#endif /* IN_COM_ERR */
-
-/* This allows us to work even when we don't have an fdatasync */
-#ifndef HAVE_FDATASYNC
-#define fdatasync(fd) fsync(fd)
-#endif
-
-/* A similar setup for not having O_DSYNC */
-#include <fcntl.h>
-
-#ifndef O_DSYNC
-# ifdef O_SYNC
-# define O_DSYNC O_SYNC /* POSIX */
-# else
-# define O_DSYNC O_FSYNC /* BSD */
-# endif
-#endif
-
-#ifndef HAVE___ATTRIBUTE__
-/* Can't use attributes... */
-#define __attribute__(foo)
-#endif
-
-#ifndef HAVE_SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
-
-#ifndef HAVE_RLIM_T
-typedef int rlim_t;
-#endif
-
-/* some potentially memory saving tradeoffs, 
- preconfigured in memory-saving mode */
-
-/* save the cmdlines for the ID command */
-#undef ID_SAVE_CMDLINE
-
-/* IPv6 things */
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-
-struct sockaddr_storage {
-	struct	sockaddr ss_sa;
-	char		__ss_pad2_SS_PADSIZE;
-};
-# define ss_family ss_sa.sa_family
-# define HAVE_SS_FAMILY
-#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-
-#ifndef HAVE_SS_FAMILY
-#define ss_family	__ss_family
-#endif
-
-#ifndef AF_INET6
-/* Define it to something that should never appear */
-#define	AF_INET6	AF_MAX
-#endif
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-#include "gai.h"
-#endif
-
-/* End IPv6 things */
-
-#ifdef OLD_SIEVE_SERVICE_NAME
-#define SIEVE_SERVICE_NAME "imap"
-#else
-#define SIEVE_SERVICE_NAME "sieve"
-#endif
-
-/* filenames */
-#define FNAME_DBDIR "/db"
-#define FNAME_USERDIR "/user/"
-#define FNAME_DOMAINDIR "/domain/"
-#define FNAME_LOGDIR "/log/"
-#define FNAME_PTSDB "/ptclient/ptscache.db"
-#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-
-#ifndef HAVE_SHUTDOWN
-#define shutdown(fd, mode) 0
-#endif
-
-/* *printf() macros */
-#if (SIZEOF_SIZE_T == SIZEOF_INT)
-#define SIZE_T_FMT "%u"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG)
-#define SIZE_T_FMT "%lu"
-#elif (SIZEOF_SIZE_T == SIZEOF_LONG_LONG_INT)
-#define SIZE_T_FMT "%llu"
-#else
-#error dont know what to use for SIZE_T_FMT
-#endif
-
-#if (SIZEOF_OFF_T == SIZEOF_LONG)
-#define OFF_T_FMT "%ld"
-#define strtoofft(nptr, endptr, base) strtol(nptr, endptr, base)
-#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG_INT)
-#define OFF_T_FMT "%lld"
-#define strtoofft(nptr, endptr, base) strtoll(nptr, endptr, base)
-#else
-#error dont know what to use for OFF_T_FMT
-#endif
-
-/* compile time options; think carefully before modifying */
-enum {
- /* should we send an UNAVAILABLE message to master when
- * a service is exiting (master is already going to be 
- * informed of the exit by the SIGCHLD signal anyway) ? */
- MESSAGE_MASTER_ON_EXIT = 0,
-
- /* should a hierarchical rename stop on error? */
- RENAME_STOP_ON_ERROR = 1,
-
- /* should we call fsync() to maybe help with softupdates? (it should) */
- APPEND_ULTRA_PARANOID = 1,
-
- /* should we log extra information at the DEBUG level for DB stuff? 
- * 0 -> nothing; 1 -> some; higher -> even more */
- CONFIG_DB_VERBOSE = 1,
-
- /* log timing information to LOG_DEBUG */
- CONFIG_TIMING_VERBOSE = 0,
-
- /* should we be pedantic about namespace or sleezy? */
- SLEEZY_NAMESPACE = 1,
-
- /* should we do a fast TLS session shutdown? */
- TLS_FAST_SHUTDOWN = 1,
-
- /* should we use the SQUAT engine to accelerate SEARCH? */
- SQUAT_ENGINE = 1,
-
- /* should we have long LMTP error messages? */
- LMTP_LONG_ERROR_MSGS = 1
-};
-
-#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-)
-
-dnl make sure that Makefile is the last thing output
-AC_OUTPUT(man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile)

cyrus-imapd-2.4.17.tar.gz/depot/Makefile.in Deleted

@@ -1,90 +0,0 @@
-# Makefile for CMU local support
-# 
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.9 2010/01/06 17:01:28 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ 
-LIBS = @LIBS@ 
-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-all:
-
-install:
-	$(srcdir)/../install-sh -d ${DESTDIR}etc
-	$(INSTALL) -m 644 $(srcdir)/depot.conf $(DESTDIR)
-	$(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
-	$(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-clean:
-	rm -f *.o Makefile.bak makedepend.log
-
-distclean: clean
-	rm -f Makefile
-
-depend: 
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c \
-	1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-

cyrus-imapd-2.4.17.tar.gz/doc/Makefile.dist Deleted

cyrus-imapd-2.4.17.tar.gz/doc/man Deleted

cyrus-imapd-2.4.17.tar.gz/doc/man/arbitron.8.html Deleted

@@ -1,177 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>ARBITRON</title>
-
-</head>
-<body>
-
-<h1 align="center">ARBITRON</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-arbitron
-&minus; arbitron mailboxes
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-arbitron
- &minus;C config-file &minus;o 
-&minus;u &minus;l &minus;p
-months 
- &minus;d days | &minus;D
-mmddyyyy:mmddyyyy 
-mailbox...
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Arbitron
-collects and reports readership statistics for mailboxes on
-the server. It also optionally prunes the mailboxes of \Seen
-state for dormant users.
-
-
-Arbitron
-produces one line of output per mailbox, reporting the
-mailbox name followed by a space, followed by the number of
-readers (and if -u is specified, followed by a colon and a
-comma-separated list of the readers userids), and if -o is
-not specified, another space and the number of subscribers
-(and if -u is specified, followed by a colon and a
-comma-separated list of the subscribers userids).
-IMPORTANT: This format is subject to change in future
-versions.
-
-Each
-&quot;reader&quot; is a distinct authentication identity
-which has &quot;s&quot; rights to the mailbox and which has
-SELECTed the mailbox within either the past days days
-or the specified date range. Users are not counted as
-reading their own personal mailboxes. Personal mailboxes are
-not reported unless there is at least one reader other than
-the mailboxes owner.
-
-
-Arbitron
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;o</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-&quot;old way&quot; -- do not report subscribers.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;u</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Report userids in addition to the count(s).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;l</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Enable long reporting (comma delimited table consisting
-of mbox, userid, r/s, start time, end time).</td></tr>
-</table>
-
-&minus;d days
-
-Count as a reader an
-authentication identity which has SELECTed the mailbox
-within days days. Default is 30.
-
-&minus;D
-mmddyyyy:mmddyyyy
-
-Count as a reader an
-authentication identity which has SELECTed the mailbox
-within the given date range. The start date and optional end
-date are specified as 2-digit month of the year, 2-digit day
-of the month, and 4-digit year. If the end date is not
-specified, then the current system time is used as the end
-time.
-
-&minus;p
-months
-
-Prune \Seen state for users who
-have not SELECTed the mailbox within months months.
-Default is infinity.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/chk_cyrus.8.html Deleted

@@ -1,112 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CHK_CYRUS</title>
-
-</head>
-<body>
-
-<h1 align="center">CHK_CYRUS</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-chk_cyrus
-&minus; perform a consistency check of the cyrus
-mailstore
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-chk_cyrus
- &minus;C config-file &minus;P
-partition &minus;M mailbox 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Chk_cyrus
-is used to perform a consistency check on the cyrus
-datastore, and output a list of files/directories that are
-expected to exist, but do not. Status messagess are output
-to stderr, the list of files/directories is output to
-stdout. This list can be passed to a backup program to aid a
-partial restoral, for instance.
-
-
-Chk_cyrus
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;P
-partition
-
-Run the consistency check for
-only the given partition. May not be specified with -M.
-&minus;M mailbox Run the consistency check for
-only the given mailbox. May not be specified with -P.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/ctl_cyrusdb.8.html Deleted

@@ -1,155 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CTL_CYRUSDB</title>
-
-</head>
-<body>
-
-<h1 align="center">CTL_CYRUSDB</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-ctl_cyrusdb
-&minus; perform operations common to all Cyrus databases
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-ctl_cyrusdb
- &minus;C config-file &minus;r 
-&minus;x 
-ctl_cyrusdb &minus;C config-file 
-&minus;c
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Ctl_cyrusdb
-is used to perform various administrative operations on the
-Cyrus databases.
-
-
-Ctl_cyrusdb
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. The configdirectory option is used to
-determine the default location of the Cyrus databases.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;r</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Recover the databases after an application or system
-failure. Also performs database cleanup like removing
-mailbox reservations (and any associated mailbox files).</td></tr>
-</table>
-
-All mailbox
-files are also checked to make sure the file format matches
-the configured database type in imapd.conf. If not, the file
-is automatically converted using the same logic as
-cvt_cyrusdb.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;x</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Used with -r to recover the
-database only. (Prevents database cleanup).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;c</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Checkpoint and archive the databases. Changes to the
-database which are part of committed transactions are
-written to disk. Also, a hot backup of the databases
-is made and inactive log files are removed.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/ctl_deliver.8.html Deleted

@@ -1,123 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CTL_DELIVER</title>
-
-</head>
-<body>
-
-<h1 align="center">CTL_DELIVER</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-ctl_deliver
-&minus; perform operations on the duplicate delivery
-database
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-ctl_deliver
- &minus;C config-file &minus;d 
-&minus;f filename 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Ctl_deliver
-is used to perform various administrative operations on the
-duplicate delivery database.
-
-
-Ctl_deliver
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;d</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Dump the contents of the database to standard output in
-a portable flat-text format.</td></tr>
-</table>
-
-&minus;f
-filename
-
-Use the database specified by
-filename instead of the default
-(configdirectory/deliver.db).
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/ctl_mboxlist.8.html Deleted

@@ -1,238 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CTL_MBOXLIST</title>
-
-</head>
-<body>
-
-<h1 align="center">CTL_MBOXLIST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-ctl_mboxlist
-&minus; perform operations on the mailbox list database
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-ctl_mboxlist
- &minus;C config-file &minus;d 
-&minus;x &minus;p partition 
- &minus;f filename 
-ctl_mboxlist &minus;C config-file 
-&minus;u &minus;f filename 
-ctl_mboxlist &minus;C config-file 
-&minus;m &minus;a &minus;w 
-&minus;i 
- &minus;f filename 
-ctl_mboxlist &minus;C config-file 
-&minus;v &minus;f filename 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Ctl_mboxlist
-is used to perform various administrative operations on the
-mailbox list database.
-
-
-Ctl_mboxlist
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. The configdirectory option is used to
-determine the default location of the mailbox list
-database.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C&nbsp;config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;d</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Dump the contents of the database to standard output in
-a portable flat-text format. NOTE: In Cyrus versions 2.2.13
-and earlier, the dump format did not include the mailbox
-type flags, breaking remote mailboxes (frontends, mupdate
-master, unified backends) when undumped.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;x</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-When performing a dump, remove the mailboxes dumped from
-the mailbox list (mostly useful when specified with -p)</td></tr>
-</table>
-
-
-&minus;p&nbsp;partition
-
-When performing a dump, dump
-only thise mailboxes that live on partition
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;u</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Load the contents of the database from standard input.
-The input MUST be in the format output using the
-&minus;d option. NOTE: Both the old and new formats
-can be loaded, but the old format will break remote
-mailboxes. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;m</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-For backend servers in the Cyrus Murder, synchronize the
-local mailbox list file with the MUPDATE server.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;a</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-When used with -m, assume the local mailboxes file is
-authoritiative, that is, only change the mupdate server, do
-not delete any local mailboxes. USE THIS OPTION WITH CARE,
-as it allows namespace collisions into the murder.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;w</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-When used with -m, print out what would be done but do
-not perform the operations.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;i</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-When used with -m, asks for verification before deleting
-local mailboxes.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Verify the consistency of the mailbox list database and
-the spool partition(s). Mailboxes present in the database
-and not located on a spool partition, and those located on a
-spool partition (directory containing a valid cyrus.header
-file) and not present in the database will be reported. Note
-that this function is very I/O intensive.</td></tr>
-</table>
-
-&minus;f
-filename
-
-Use the database specified by
-filename instead of the default
-(configdirectory/mailboxes.db).
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cvt_cyrusdb.8.html Deleted

@@ -1,106 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CVT_CYRUSDB</title>
-
-</head>
-<body>
-
-<h1 align="center">CVT_CYRUSDB</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cvt_cyrusdb
-&minus; convert a database file between cyrus database
-formats
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-cvt_cyrusdb
- &minus;C config-file &lt;old-file&gt;
-&lt;old-fileformat&gt; &lt;new-file&gt;
-&lt;new-file-format&gt;
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-cvt_cyrusdb
-is used to convert a cyrusdb file between different database
-backends. Note that you should not attempt to use the same
-file for input and output.
-
-Running without
-any options will list the available database backends.
-
-
-cvt_cyrusdb
-reads any applicable configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. note that the file locations are NOT read out of
-the configuration file, and must be supplied on the command
-line.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyr_dbtool.8.html Deleted

@@ -1,145 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CYR_DBTOOL</title>
-
-</head>
-<body>
-
-<h1 align="center">CYR_DBTOOL</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cyr_dbtool
-&minus; manage Cyrus databases
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-cyr_dbtool
- &minus;C config-file &minus;n 
-&lt;db file&gt; &lt;db backend&gt; &lt;action&gt; 
-&lt;key&gt; &lt;value&gt; 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-cyr_dbtool
-is used to manage a cyrusdb file. The usable actions
-are:
-
-show
-&lt;prefix&gt;
-
-get
-&lt;key&gt;
-
-set
-&lt;key&gt; &lt;value&gt;
-
-delete
-&lt;key&gt;
-
-
-consistency
-
-You may omit
-key or key/value and specify one per line on stdin. Keys are
-terminated by tab or newline, values are terminated by
-newline.
-
-Running without
-any options will list the available database backends and
-usable actions.
-
-The
-&rsquo;consistency&rsquo; command runs a consistency check
-on the DB by calling
-
-
-cyr_dbtool
-reads any applicable configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. note that the file locations are NOT read out of
-the configuration file, and must be supplied on the command
-line.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;n</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Create the database file if it doesn&rsquo;t already
-exist. </td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyr_df.8.html Deleted

@@ -1,98 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CYR_DF</title>
-
-</head>
-<body>
-
-<h1 align="center">CYR_DF</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cyr_df &minus;
-report Cyrus spool partition disk space usage
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-cyr_df 
-&minus;C config-file &minus;m 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Cyr_df
-examines the Cyrus spool partitions and reports on their
-disk space usage. Cyr_df reads its configuration
-options out of the imapd.conf(5) file unless
-specified otherwise by -C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;m</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Report on metadata partitions rather than message file
-partitions. </td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyr_expire.8.html Deleted

@@ -1,201 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CYR_EXPIRE</title>
-
-</head>
-<body>
-
-<h1 align="center">CYR_EXPIRE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cyr_expire
-&minus; expire messages and duplicate delivery database
-entries
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-cyr_expire
- &minus;C config-file &minus;D
-delete-days &minus;E expire-duration
- &minus;X expunge-days &minus;p
-mailbox-prefix &minus;v 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Cyr_expire
-is used to expire messages and duplicate delivery database
-entries. Cyr_expire also cleanses mailboxes of
-partially expunged messages (when using the
-&quot;delayed&quot; expunge mode). The expiration of
-messages is controlled by the
-/vendor/cmu/cyrus-imapd/expire mailbox annotation
-which specifies the age (in days) of messages in the given
-mailbox that should be deleted. Any duplicate delivery
-database entries which correspond to the mailbox are also
-deleted at the same frequency.
-
-The value of
-the /vendor/cmu/cyrus-imapd/expire annotation is
-inherited by all children of the given mailbox, so an entire
-mailbox tree can be expired by seting a single annotation on
-the root of that tree. If a mailbox does not have a
-/vendor/cmu/cyrus-imapd/expire annotation set on it
-(or does not inherit one), then no messages are expired from
-the mailbox.
-
-
-Cyr_expire
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;D
-delete-duration
-
-Remove previously deleted
-mailboxes older than delete-duration (when using the
-&quot;delayed&quot; delete mode). The value can be a
-floating point number, and may have a suffix to specify the
-unit of time. If no suffix, the value is number of days.
-Valid suffixes are d (days), h (hours),
-m (minutes) and s (seconds).
-
-&minus;E
-expire-duration
-
-Prune the duplicate database of
-entries older than expire-duration. This value is
-only used for entries which do not have a corresponding
-/vendor/cmu/cyrus-imapd/expire mailbox annotation.
-Format is the same as delete-duration.
-
-&minus;X
-expunge-duration
-
-Expunge previously deleted
-messages older than expunge-duration (when using the
-&quot;delayed&quot; expunge mode). Format is the same as
-delete-duration.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="12%"></td>
-<td width="3%">
-
-
-&minus;x</td>
-<td width="7%"></td>
-<td width="78%">
-
-
-Do not expunge messages even if using delayed expunge
-mode (reduces the IO hit considerably, allowing you to run
-cyr_expire frequently to clean up the duplicate database
-without overloading your server)</td></tr>
-</table>
-
-&minus;p
-mailbox-prefix
-
-Only find mailboxes starting
-with this prefix. e.g.
-&quot;user.justgotspammedlots&quot;
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Enable verbose output.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;a</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Skip the annotation lookup, so all
-/vendor/cmu/cyrus-imapd/expire annotations are
-ignored entirely. It behaves as if they were not set, so
-only expire-days is considered for all mailboxes.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyr_synclog.8.html Deleted

@@ -1,150 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CYR_SYNCLOG</title>
-
-</head>
-<body>
-
-<h1 align="center">CYR_SYNCLOG</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#EXAMPLES">EXAMPLES</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cyr_synclog
-&minus; add entries to the replication log
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-cyr_synclog
- &minus;C config-file &minus;type
- &lt;value&gt;
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-cyr_synclog
-is used to append a value to the log file. You can either
-specify the log type and value, or an entire log line.
-
-&minus;u
-USER
-
-&minus;v
-SIEVE
-
-&minus;m
-MAILBOX
-
-&minus;a
-APPEND
-
-&minus;c
-ACL
-
-&minus;q
-QUOTA
-
-&minus;n
-ANNOTATION
-
-&minus;s
-SEEN
-
-&minus;b
-SUBSCRIPTION
-
-Running without
-any options will print a short usage document.
-
-
-cyr_synclog
-reads any applicable configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>EXAMPLES
-<a name="EXAMPLES"></a>
-</h2>
-
-
-Here are some
-example ways to use cyr_synclog:
-
-cyr_synclog
-&minus;m user.brong
-
-cyr_synclog
-&minus;u brong
-
-cyr_synclog
-&minus;C /etc/imapd-special.conf &minus;s user.brong
-brong
-
-cyr_synclog
-&quot;SEEN user.brong brong&quot;
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyradm.1.html Deleted

@@ -1,460 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>cyradm - Cyrus administration shell, alter ego of Cyrus::IMAP::Shell</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body style="background-color: white">
-
-
-
-<div name="index">
-<a name="__index__"></a>
-
-<ul>
-
-	<li><a href="#name">NAME</a></li>
-	<li><a href="#synopsis">SYNOPSIS</a></li>
-	<li><a href="#description">DESCRIPTION</a></li>
-	<li><a href="#commands">COMMANDS</a></li>
-	<li><a href="#notes">NOTES</a></li>
-	<li><a href="#author">AUTHOR</a></li>
-	<li><a href="#see_also">SEE ALSO</a></li>
-</ul>
-
-<hr name="index" />
-</div>
-
-
-
-
-<h1><a name="name">NAME</a></h1>
-cyradm - Cyrus administration shell, alter ego of Cyrus::IMAP::Shell
-
-
-<hr />
-<h1><a name="synopsis">SYNOPSIS</a></h1>
-<pre>
- $ cyradm --user user --norc --systemrc file --userrc file \
- &gt; --port n --auth mechanism --tlskey keyfile --notls \
- &gt; --server server</pre>
-but possibly
-<pre>
- $ perl -MCyrus::IMAP::Shell -e 'run(&quot;myscript&quot;)'</pre>
-or even (not recommended)
-<pre>
- use Cyrus::IMAP::Admin::Shell;</pre>
-<pre>
- run('myscriptname');</pre>
-
-
-<hr />
-<h1><a name="description">DESCRIPTION</a></h1>
-This module implements cyradm in Perl. It is a shell around
-<a href="/Cyrus/IMAP/Admin.html">the Cyrus::IMAP::Admin manpage</a>. Commands are provided in both Tcl-compatible
-forms and GNU-style long option forms.
-
-
-<hr />
-<h1><a name="commands">COMMANDS</a></h1>
-<dl>
-<dt><a name="authenticate_minssf_n_maxssf_n_mechanisms_list_user" class="item"><code>authenticate</code> <code>--minssf</code> N <code>--maxssf</code> N <code>--mechanisms</code> list user</a></dt>
-
-<dt><a name="auth_minssf_n_maxssf_n_mechanisms_list_user" class="item"><code>auth</code> <code>--minssf</code> N <code>--maxssf</code> N <code>--mechanisms</code> list user</a></dt>
-
-<dt><a name="login_minssf_n_maxssf_n_mechanisms_list_user" class="item"><code>login</code> <code>--minssf</code> N <code>--maxssf</code> N <code>--mechanisms</code> list user</a></dt>
-
-<dd>
-Authenticate to server. You must already be connected to a server and
-Cyrus imapd will refuse to allow you to re-authenticate once you have
-authenticated once.
-</dd>
-<dt><a name="chdir_directory" class="item"><code>chdir</code> directory</a></dt>
-
-<dt><a name="cd_directory" class="item"><code>cd</code> directory</a></dt>
-
-<dd>
-Change directory. A <code>pwd</code> builtin is not provided, but the default command
-action will run <code>pwd</code> from a shell if invoked.
-</dd>
-<dt><a name="createmailbox_partition_partition_mailbox" class="item"><code>createmailbox</code> <code>--partition</code> partition mailbox</a></dt>
-
-<dt><a name="createmailbox_mailbox_partition" class="item"><code>createmailbox</code> mailbox partition</a></dt>
-
-<dt><a name="create_partition_partition_mailbox" class="item"><code>create</code> <code>--partition</code> partition mailbox</a></dt>
-
-<dt><a name="create_mailbox_partition" class="item"><code>create</code> mailbox partition</a></dt>
-
-<dt><a name="cm_partition_partition_mailbox" class="item"><code>cm</code> <code>--partition</code> partition mailbox</a></dt>
-
-<dt><a name="cm_mailbox_partition" class="item"><code>cm</code> mailbox partition</a></dt>
-
-<dd>
-Create a mailbox on the default or a specified partition. Both old-style
-and getopt-style usages are accepted (combining them will produce an error).
-</dd>
-<dt><a name="deleteaclmailbox_mailbox_id" class="item"><code>deleteaclmailbox</code> mailbox id ...</a></dt>
-
-<dt><a name="deleteacl_mailbox_id" class="item"><code>deleteacl</code> mailbox id ...</a></dt>
-
-<dt><a name="dam_mailbox_id" class="item"><code>dam</code> mailbox id ...</a></dt>
-
-<dd>
-Remove ACLs from the specified mailbox.
-</dd>
-<dt><a name="deletemailbox_mailbox" class="item"><code>deletemailbox</code> mailbox</a></dt>
-
-<dt><a name="delete_mailbox" class="item"><code>delete</code> mailbox</a></dt>
-
-<dt><a name="dm_mailbox" class="item"><code>dm</code> mailbox</a></dt>
-
-<dd>
-Delete the specified mailbox.
-Administrators do not have implicit delete rights on mailboxes. Use the
-setaclmailbox command to grant the <a href="#x"><code>x</code></a> permission to your
-principal if you need to delete a mailbox you do not own.
-Note that the online help admits to an optional host argument. This argument
-is not currently used, and will be rejected with an error if specified; it
-is reserved for IMSP.
-</dd>
-<dt><a name="disconnect" class="item"><code>disconnect</code></a></dt>
-
-<dt><a name="disc" class="item"><code>disc</code></a></dt>
-
-<dd>
-Disconnect from the current server. The prompt will revert to <code>cyradm&gt;</code>.
-</dd>
-<dt><a name="exit_number" class="item"><code>exit</code> number</a></dt>
-
-<dt><a name="quit_number" class="item"><code>quit</code> number</a></dt>
-
-<dd>
-Exit cyradm, optionally with a specific exit status; the exit status of the
-last command will be used if one is not specified.
-</dd>
-<dt><a name="help_command" class="item">help command</a></dt>
-
-<dt><a name="command" class="item">? command</a></dt>
-
-<dd>
-Show help for <a href="#command"><code>command</code></a> or all commands.
-</dd>
-<dt><a name="info_mailbox" class="item"><code>info</code> mailbox</a></dt>
-
-<dd>
-Display the mailbox/server metadata.
-</dd>
-<dt><a name="listaclmailbox_mailbox" class="item"><code>listaclmailbox</code> mailbox</a></dt>
-
-<dt><a name="listacl_mailbox" class="item"><code>listacl</code> mailbox</a></dt>
-
-<dt><a name="lam_mailbox" class="item"><code>lam</code> mailbox</a></dt>
-
-<dd>
-List ACLs on the specified mailbox.
-</dd>
-<dt><a name="listmailbox_subscribed_pattern_reference" class="item"><code>listmailbox</code> <code>--subscribed</code> pattern reference</a></dt>
-
-<dt><a name="list_subscribed_pattern_reference" class="item"><code>list</code> <code>--subscribed</code> pattern reference</a></dt>
-
-<dt><a name="lm_subscribed_pattern_reference" class="item"><code>lm</code> <code>--subscribed</code> pattern reference</a></dt>
-
-<dd>
-List all, or all subscribed, mailboxes matching the specified pattern.
-The pattern may have embedded wildcards <code>'*'</code> or <code>'%'</code>, which match
-anything or anything except the separator character, respectively.
-Mailboxes returned will be relative to the specified reference if one
-is specified. This allows a mailbox list to be limited to a particular
-hierarchy.
-In some cases when the <code>'%'</code> wildcard is used to end a pattern, it may
-match an entry which is not a mailbox but which contains other mailboxes.
-In this case, the entry will be parenthesized to indicate that it is a
-root for other mailboxes, as opposed to a mailbox itself.
-</dd>
-<dt><a name="listquota_root" class="item"><code>listquota</code> root</a></dt>
-
-<dt><a name="lq_root" class="item"><code>lq</code> root</a></dt>
-
-<dd>
-List quotas on specified root. If the specified mailbox path does not have
-a quota assigned, an error will be raised; see listquotaroot for a way to
-find the quota root for a mailbox.
-</dd>
-<dt><a name="listquotaroot_mailbox" class="item"><code>listquotaroot</code> mailbox</a></dt>
-
-<dt><a name="lqm_mailbox" class="item"><code>lqm</code> mailbox</a></dt>
-
-<dt><a name="lqr_mailbox" class="item"><code>lqr</code> mailbox?</a></dt>
-
-<dd>
-show quota roots and quotas for mailbox
-</dd>
-<dt><a name="mboxconfig_mailbox_attribute_value" class="item"><code>mboxconfig</code> mailbox attribute value</a></dt>
-
-<dt><a name="mboxcfg_mailbox_attribute_value" class="item"><code>mboxcfg</code> mailbox attribute value</a></dt>
-
-<dd>
-Set mailbox metadata. A value of &quot;none&quot; will remove the attribute.
-The currently supported attributes are:
-<dl>
-<dt><a name="comment" class="item"><code>comment</code></a></dt>
-
-<dd>
-Sets a comment or description associated with the mailbox.
-</dd>
-<dt><a name="expire" class="item"><code>expire</code></a></dt>
-
-<dd>
-Sets the number of days after which messages will be expired from the mailbox.
-</dd>
-<dt><a name="news2mail" class="item"><code>news2mail</code></a></dt>
-
-<dd>
-Sets an email address to which messages injected into the server via NNTP 
-will be sent.
-</dd>
-<dt><a name="sharedseen" class="item"><code>sharedseen</code></a></dt>
-
-<dd>
-Enables the use of a shared \Seen flag on messages rather than a
-per-user \Seen flag. The 's' right in the mailbox ACL still controls
-whether a user can set the shared \Seen flag.
-</dd>
-<dt><a name="sieve" class="item"><code>sieve</code></a></dt>
-
-<dd>
-Indicates the name of the global sieve script that should be run when
-a message is delivered to the shared mailbox (not used for personal
-mailboxes).
-</dd>
-<dt><a name="squat" class="item"><code>squat</code></a></dt>
-
-<dd>
-Indicates that the mailbox should have a squat index created for it.
-</dd>
-<dt><a name="explicit_annotation" class="item"><code>/explicit/annotation</code></a></dt>
-
-<dd>
-Sets the annotation /explicit/annotation on mailbox to value.
-</dd>
-</dl>
-</dd>
-<dt><a name="renamemailbox_partition_partition_oldname_newname" class="item"><code>renamemailbox</code> <code>--partition</code> partition oldname newname</a></dt>
-
-<dt><a name="rename_partition_partition_oldname_newname" class="item"><code>rename</code> <code>--partition</code> partition oldname newname</a></dt>
-
-<dt><a name="renm_partition_partition_oldname_newname" class="item"><code>renm</code> <code>--partition</code> partition oldname newname</a></dt>
-
-<dt><a name="renamemailbox_oldname_newname_partition" class="item"><code>renamemailbox</code> oldname newname partition</a></dt>
-
-<dt><a name="rename_oldname_newname_partition" class="item"><code>rename</code> oldname newname partition</a></dt>
-
-<dt><a name="renm_oldname_newname_partition" class="item"><code>renm</code> oldname newname partition</a></dt>
-
-<dd>
-Rename the specified mailbox, optionally moving it to a different partition.
-Both old-style and getopt-style usages are accepted; combining them will
-produce an error.
-</dd>
-<dt><a name="server_noauthenticate_server" class="item">server --noauthenticate server</a></dt>
-
-<dt><a name="connect_noauthenticate_server" class="item">connect --noauthenticate server</a></dt>
-
-<dt><a name="servername_noauthenticate_server" class="item">servername --noauthenticate server</a></dt>
-
-<dd>
-With no arguments, show the current server. With an argument, connect to that
-server. It will prompt for automatic login unless the <code>--noauthenticate</code>
-option is specified. (This may change; in particular, either automatic
-authentication will be removed or all <code>authenticate</code> options will be added.)
-When connected to a server, cyradm's prompt changes from <code>cyradm&gt;</code> to
-<code>servername&gt;</code>, where servername is the fully qualified domain name
-of the connected server.
-</dd>
-<dt><a name="setaclmailbox_mailbox_id_rights_id_rights" class="item"><code>setaclmailbox</code> mailbox id rights id rights ...</a></dt>
-
-<dt><a name="setacl_mailbox_id_rights_id_rights" class="item"><code>setacl</code> mailbox id rights id rights ...</a></dt>
-
-<dt><a name="sam_mailbox_id_rights_id_rights" class="item"><code>sam</code> mailbox id rights id rights ...</a></dt>
-
-<dd>
-Set ACLs on a mailbox. The ACL may be one of the special strings <code>none</code>,
-<code>read</code> (<code>lrs</code>), <code>post</code> (<code>lrsp</code>), <code>append</code> (<code>lrsip</code>), <code>write</code>
-(<code>lrswipkxte</code>), <code>delete</code> (<code>lrxte</code>), or <code>all</code> (<code>lrswipkxte</code>), or
-any combinations of the ACL codes:
-<dl>
-<dt><a name="l" class="item">l</a></dt>
-
-<dd>
-Lookup (mailbox is visible to LIST/LSUB, SUBSCRIBE mailbox)
-</dd>
-<dt><a name="r" class="item">r</a></dt>
-
-<dd>
-Read (SELECT/EXAMINE the mailbox, perform STATUS)
-</dd>
-<dt><a name="s" class="item">s</a></dt>
-
-<dd>
-Seen (set/clear \SEEN flag via STORE, also set \SEEN flag during
- APPEND/COPY/FETCH BODY...)
-</dd>
-<dt><a name="w" class="item">w</a></dt>
-
-<dd>
-Write flags other than \SEEN and \DELETED
-</dd>
-<dt><a name="i" class="item">i</a></dt>
-
-<dd>
-Insert (APPEND, COPY destination)
-</dd>
-<dt><a name="p" class="item">p</a></dt>
-
-<dd>
-Post (send mail to mailbox)
-</dd>
-<dt><a name="k" class="item">k</a></dt>
-
-<dd>
-Create mailbox (CREATE new sub-mailboxes, parent for new mailbox in RENAME)
-</dd>
-<dt><a name="x" class="item">x</a></dt>
-
-<dd>
-Delete mailbox (DELETE mailbox, old mailbox name in RENAME)
-</dd>
-<dt><a name="t" class="item">t</a></dt>
-
-<dd>
-Delete messages (set/clear \DELETED flag via STORE, also set \DELETED
- flag during APPEND/COPY)
-</dd>
-<dt><a name="e" class="item">e</a></dt>
-
-<dd>
-Perform EXPUNGE and expunge as part of CLOSE
-</dd>
-<dt><a name="a" class="item">a</a></dt>
-
-<dd>
-Administer (SETACL/DELETEACL/GETACL/LISTRIGHTS)
-</dd>
-</dl>
-</dd>
-<dt><a name="setinfo_attribute_value" class="item"><code>setinfo</code> attribute value</a></dt>
-
-<dd>
-Set server metadata. A value of &quot;none&quot; will remove the attribute.
-The currently supported attributes are:
-<dl>
-<dt><a name="motd" class="item"><code>motd</code></a></dt>
-
-<dd>
-Sets a &quot;message of the day&quot;. The message gets displayed as an ALERT after
-authentication.
-</dd>
-<dt><code>comment</code></dt>
-
-<dd>
-Sets a comment or description associated with the server.
-</dd>
-<dt><a name="admin" class="item"><code>admin</code></a></dt>
-
-<dd>
-Sets the administrator email address for the server.
-</dd>
-<dt><a name="shutdown" class="item"><code>shutdown</code></a></dt>
-
-<dd>
-Sets a shutdown message. The message gets displayed as an ALERT and
-all users are disconnected from the server (subsequent logins are disallowed).
-</dd>
-<dt><code>expire</code></dt>
-
-<dd>
-Sets the number of days after which messages will be expired from the
-server (unless overridden by a mailbox annotation).
-</dd>
-<dt><code>squat</code></dt>
-
-<dd>
-Indicates that all mailboxes should have a squat indexes created for
-them (unless overridden by a mailbox annotation).
-</dd>
-</dl>
-</dd>
-<dt><a name="setquota_root_resource_value_resource_value" class="item"><code>setquota</code> root resource value resource value ...</a></dt>
-
-<dt><a name="sq_root_resource_value_resource_value" class="item"><code>sq</code> root resource value resource value ...</a></dt>
-
-<dd>
-Set a quota on the specified root, which may or may not be an actual mailbox.
-The only resource understood by Cyrus is <code>STORAGE</code>. The value may
-be the special string <code>none</code> which will remove the quota.
-</dd>
-<dt><a name="version" class="item"><code>version</code></a></dt>
-
-<dt><a name="ver" class="item"><code>ver</code></a></dt>
-
-<dd>
-Display the version info of the current server.
-</dd>
-<dt><a name="xfermailbox_partition_partition_mailbox_server" class="item"><code>xfermailbox</code> <code>--partition</code> partition mailbox server</a></dt>
-
-<dt><a name="xfer_partition_partition_mailbox_server" class="item"><code>xfer</code> <code>--partition</code> partition mailbox server</a></dt>
-
-<dt><a name="xfermailbox_mailbox_server_partition" class="item"><code>xfermailbox</code> mailbox server partition</a></dt>
-
-<dt><a name="xfer_mailbox_server_partition" class="item"><code>xfer</code> mailbox server partition</a></dt>
-
-<dd>
-Transfer (relocate) the specified mailbox to a different server.
-Both old-style and getopt-style usages are accepted; combining them will
-produce an error.
-</dd>
-</dl>
-
-
-<hr />
-<h1><a name="notes">NOTES</a></h1>
-GNU-style long options must be given in their entirety; Tcl-style options
-may be abbreviated.
-Tcl-style options are provided as a compatibility feature. They will
-probably go away in the future.
-Multiple commands can be given on a line, separated by <code>';'</code> characters.
-All commands set an exit status, which at present is not useful.
-Unknown commands are passed to a subshell for execution.
-The Tcl version of cyradm is used for scripting as well as interactively.
-While this is possible to a limited extent by use of the <code>run</code> method,
-scripting would normally be done with <code>Cyrus::IMAP::Admin</code>, which is far
-more flexible than either interactive <code>cyradm</code> or the Tcl scripting
-mechanism for Cyrus.
-cyradm understands /bin/sh-style redirection: any command can have
-its standard or error output redirected, with all sh-style redirections
-(except <code>&lt;&gt;</code>) supported. It does not currently understand pipes
-or backgrounding.
-If the <code>Term::Readline::Perl</code> or <code>Term::Readline::GNU</code> modules are
-available, cyradm will use it.
-An alias facility is implemented internally, but no access is currently
-provided to it. This will change, if only to allow some of the predefined
-aliases to be removed if they conflict with useful shell commands.
-
-
-<hr />
-<h1><a name="author">AUTHOR</a></h1>
-Brandon S. Allbery, <a href="mailto:allbery@ece.cmu.edu">allbery@ece.cmu.edu</a>
-
-
-<hr />
-<h1><a name="see_also">SEE ALSO</a></h1>
-Cyrus::IMAP::Admin
-Term::ReadLine
-<code>sh(1)</code>, <code>perl(1)</code>, <code>imapd(8)</code>.
-
-</body>
-
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/cyrus.conf.5.html Deleted

@@ -1,390 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CYRUS.CONF</title>
-
-</head>
-<body>
-
-<h1 align="center">CYRUS.CONF</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#SECTION DESCRIPTIONS">SECTION DESCRIPTIONS</a> 
-<a href="#EXAMPLE">EXAMPLE</a> 
-<a href="#ACCESS CONTROL">ACCESS CONTROL</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-cyrus.conf
-&minus; Cyrus configuration file
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-/etc/cyrus.conf
-is the configuration file for the Cyrus master
-process. It defines the startup procedures, services and
-events to be spawned by master.
-
-The
-/etc/cyrus.conf file consists of a series of entries
-divided into sections of the form
-
-section
-{
-
-name arguments
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="85%">
-
-
-...</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="85%">
-
-
-...</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="85%">
-
-
-...</td></tr>
-</table>
-
-}
-
-where
-section is the name of the section, name is
-the name of the entry and arguments is the
-whitespace-separated list of arguments for the entry.
-
-Blank lines and
-lines beginning with &lsquo;&lsquo;#&rsquo;&rsquo; are
-ignored.
-
-<h2>SECTION DESCRIPTIONS
-<a name="SECTION DESCRIPTIONS"></a>
-</h2>
-
-
-The paragraphs
-below detail the three sections (START,
-SERVICES, EVENTS) that can be placed in the
-/etc/cyrus.conf file. The arguments that are
-available for each entry within the section are described,
-and each argument&rsquo;s default value is shown.
-
-Arguments can
-appear in any order. Some arguments have no default value,
-these are listed with &lsquo;&lsquo;&lt;no
-default&gt;&rsquo;&rsquo;. For string arguments, the value
-MUST be enclosed in double quotes.
-
-START
- 
-This section lists the processes to run before any
-SERVICES are spawned. This section is typically used
-to initialize databases and start long running daemons.
- 
-cmd=&lt;no default&gt;
-
-The command (with options) to
-spawn as a child process. This string argument is
-required.
-
-
-SERVICES
- 
-This section is the heart of the /etc/cyrus.conf
-file. It lists the processes that should be spawned to
-handle client connections made on certain Internet/UNIX
-sockets. 
-babysit=0
-
-Integer value - if non-zero,
-will make sure at least one process is pre-forked, and will
-set the maxforkrate to 10 if it&rsquo;s zero.
-
-cmd=&lt;no
-default&gt;
-
-The command (with options) to
-spawn as a child process. This string argument is
-required.
-
-listen=&lt;no
-default&gt;
-
-The UNIX or internet socket to
-listen on. This string field is required and takes one of
-the following forms:
-
-path
- 
- host : port
-
-where
-path is the explicit path to a UNIX socket,
-host is either the hostname or bracket-enclosed IP
-address of a network interface, and port is either a
-port number or service name (as listed in
-/etc/services).
-
-proto=tcp
-
-The protocol used for this
-service (tcp, tcp4, tcp6, udp,
-udp4, udp6). This string argument is
-optional.
-
-tcp4,
-udp4: These arguments are used to bind the service to
-IPv4 only. 
-tcp6, udp6: These arguments are used to bind the
-service to IPv6 only, if the operating system supports this.
- 
-tcp, udp: These arguments are used to bind to
-both IPv4 and IPv6 if possible.
-
-prefork=0
-
-The number of instances of this
-service to always have running and waiting for a connection
-(for faster initial response time). This integer value is
-optional. Note that if you are listening on multiple network
-types (i.e. ipv4 and ipv6) then one process will be forked
-for each address, causing twice as many processes as you
-might expect.
-
-maxchild=-1
-
-The maximum number of instances
-of this service to spawn. A value of -1 means unlimited.
-This integer value is optional.
-
-maxfds=256
-
-The maximum number of file
-descriptors to which to limit this process. This integer
-value is optional.
-
-maxforkrate=0
-
-Maximum number of processes to
-fork per second - the master will insert sleeps to ensure it
-doesn&rsquo;t fork faster than this on average.
-
-EVENTS
- 
-This section lists processes that should be run at specific
-intervals, similar to cron jobs. This section is typically
-used to perform scheduled cleanup/maintenance. 
-cmd=&lt;no default&gt;
-
-The command (with options) to
-spawn as a child process. This string argument is
-required.
-
-period=0
-
-The interval (in minutes) at
-which to run the command. This integer value is optional,
-but SHOULD be a positive integer &gt; 10.
-
-at=&lt;hhmm&gt;
-
-The time (24-hour format) at
-which to run the command each day. If set to a valid time
-(0000-2359), period is automatically set to 1440. This
-string argument is optional.
-
-<h2>EXAMPLE
-<a name="EXAMPLE"></a>
-</h2>
-
-
-# example
-cyrus.conf
-
-START {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-
-
-recover<td width="14%"></td>
-<td width="-6%"></td>
-<td width="7%"></td>
-<td width="8%"></td>
-<td width="77%">
-
-
-cmd=&quot;ctl_cyrusdb -r&quot;</td></tr>
-</table>
-
-}
-
-SERVICES {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-
-
-imap<td width="14%"></td>
-<td width="-6%"></td>
-<td width="7%"></td>
-<td width="8%"></td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-cmd=&quot;imapd&quot; listen=&quot;imap&quot; prefork=1
- 
-imaps</td></tr>
-<tr valign="top" align="left">
-<td width="14%"></td>
-<td width="-6%"></td>
-<td width="7%"></td>
-<td width="8%"></td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-cmd=&quot;imapd -s&quot; listen=&quot;imaps&quot;
-prefork=0 
-lmtpunix</td></tr>
-<tr valign="top" align="left">
-<td width="14%"></td>
-<td width="-6%"></td>
-<td width="7%"></td>
-<td width="8%"></td>
-<td width="8%"></td>
-<td width="69%">
-
-
-cmd=&quot;lmtpd&quot;
-listen=&quot;/var/imap/socket/lmtp&quot; 
-lmtp</td></tr>
-<tr valign="top" align="left">
-<td width="14%"></td>
-<td width="-6%"></td>
-<td width="7%"></td>
-<td width="8%"></td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-cmd=&quot;lmtpd&quot;
-listen=&quot;localhost:lmtp&quot; </td></tr>
-</table>
-
-}
-
-EVENTS {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-
-
-checkpoint<td width="14%"></td>
-<td width="-6%"></td>
-<td width="15%"></td>
-<td width="8%"></td>
-<td width="69%">
-
-
-cmd=&quot;ctl_cyrusdb -c&quot; period=30 
-delprune</td></tr>
-<tr valign="top" align="left">
-<td width="14%"></td>
-<td width="-6%"></td>
-<td width="15%"></td>
-<td width="8%"></td>
-<td width="69%">
-
-
-cmd=&quot;cyr_expire -E 3&quot; at=0400 
-tlsprune</td></tr>
-<tr valign="top" align="left">
-<td width="14%"></td>
-<td width="-6%"></td>
-<td width="15%"></td>
-<td width="8%"></td>
-<td width="69%">
-
-
-cmd=&quot;tls_prune&quot; at=0400</td></tr>
-</table>
-
-}
-
-<h2>ACCESS CONTROL
-<a name="ACCESS CONTROL"></a>
-</h2>
-
-
-When TCP
-Wrappers is used to control access to Cyrus services, the
-name of the service entry should be used as the
-process name in the hosts_access(5) table. For
-instance, in the example above, &quot;imap&quot;,
-&quot;imaps&quot;, &quot;lmtpunix&quot; and &quot;lmtp&quot;
-would be used as the process names. This allows a single
-daemon such as imapd to be run in different modes or
-configurations (i.e., SSL and non-SSL enabled) yet still
-have separate access control rules.
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-master(8),
-imapd(8), pop3d(8), lmtpd(8),
-timsieved(8), idled(8), notifyd(8),
-ctl_cyrusdb(8), ctl_deliver(8),
-tls_prune(8), hosts_access(5)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/deliver.8.html Deleted

@@ -1,200 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>DELIVER</title>
-
-</head>
-<body>
-
-<h1 align="center">DELIVER</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#NOTES">NOTES</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-deliver &minus;
-deliver mail to an IMAP mailbox
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-deliver
- &minus;C config-file &minus;d 
-&minus;r address 
- &minus;f address &minus;m
-mailbox &minus;a auth-id 
- &minus;q userid ... 
-deliver &minus;C config-file 
-&minus;l
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Deliver
-reads a message from the standard input and delivers it to
-one or more IMAP mailboxes.
-
-Deliver
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;d</td>
-<td width="8%"></td>
-<td width="63%">
-
-
-Ignored for compatability with /bin/mail.</td>
-<td width="15%">
-</td></tr>
-</table>
-
-&minus;r
-address
-
-Insert a Return-Path:
-header containing address
-
-&minus;f
-address
-
-Insert a Return-Path:
-header containing address
-
-&minus;m
-mailbox
-
-Deliver to mailbox. If
-any userids are specified, attempts to deliver to
-user.userid.mailbox for each userid. If
-the ACL on any such mailbox does not grant the sender the
-&quot;p&quot; right or if &minus;m is not specified,
-then delivers to the INBOX for the userid, regardless
-of the ACL on the INBOX.
-
-If no
-userids are specified, attempts to deliver to
-mailbox. If the ACL on mailbox does not grant
-the sender the &quot;p&quot; right, the delivery fails.
-
-&minus;a
-auth-id
-
-Specify the authorization id of
-the sender. Defaults to &quot;anonymous&quot;.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;q</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Deliver message even when receiving mailbox is over
-quota. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;l</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Accept messages using the LMTP protocol.</td></tr>
-</table>
-
-<h2>NOTES
-<a name="NOTES"></a>
-</h2>
-
-
-Depending on
-the setting of reject8bit in imapd.conf(5),
-deliver either rejects/accepts messages with 8-bit-set
-characters in the headers. If we accept messages with
-8-bit-set characters in the headers, then depending on the
-setting of munge8bit, these characters are either
-left un-touched or changed to &lsquo;X&rsquo;. This is
-because such characters can&rsquo;t be interpreted since the
-character set is not known, although some communities not
-well-served by US-ASCII assume that those characters can be
-used to represent characters not present in US-ASCII.
-
-A method for
-encoding 8-bit-set characters is provided by RFC 2047.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-lmtpd(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/fetchnews.8.html Deleted

@@ -1,160 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>FETCHNEWS</title>
-
-</head>
-<body>
-
-<h1 align="center">FETCHNEWS</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-fetchnews
-&minus; retrieve new articles from peer and feed to
-Cyrus
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-fetchnews
- &minus;C config-file &minus;s
-servername:port 
- &minus;n &minus;y &minus;w
-wildmat &minus;f tstampfile 
- &minus;a authname &minus;p
-password peername
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Fetchnews
-retrieves news articles from a peer news server and feeds
-them to a Cyrus server. Fetchnews connects to the
-peer specified by peername, requests new articles
-since the time stored in tstampfile and feeds them to
-servername.
-
-
-Fetchnews
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;s
-servername
-
-Hostname of the Cyrus server
-(with optional port) to which articles should be fed.
-Defaults to &quot;localhost:nntp&quot;.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;n</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Don&rsquo;t use the NEWNEWS command. Fetchnews
-will keep track of the high and low water marks for each
-group and use them to fetch new articles.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;y</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Use 4 instead of 2 digits for year. 2-digits are rfc977-
-but not y2k-compliant.</td></tr>
-</table>
-
-&minus;w
-wildmat
-
-Wildmat pattern specifying
-which newsgroups to search for new articles. Defaults to
-&quot;*&quot;.
-
-&minus;f
-tstampfile
-
-File in which to read/write the
-timestamp of when articles were last retrieved. Defaults to
-&quot;newsstamp&quot; located in configdir as
-specified by the configuration options.
-
-&minus;a
-authname
-
-Userid to use for
-authentication.
-
-&minus;p
-password
-
-Password to use for
-authentication.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/fud.8.html Deleted

@@ -1,155 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>FUD</title>
-
-</head>
-<body>
-
-<h1 align="center">FUD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#BUGS">BUGS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-FUD &minus;
-provide information about user mailboxes
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-fud 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
-&minus;D 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-FUD is a
-long lived datagram daemon started from master that provides
-information about when a user last read their mail, when
-mail last arrived in a user&rsquo;s mailbox, and how many
-messages are recent for that user.
-
-Note that for
-FUD to run properly you must set proto=udp in its
-cyrus.conf services entry. prefork=1 is also recommended.
-FUD will automatically proxy any and all FUD requests
-to the appropriate backend server if it is runing on a Cyrus
-Murder frontend machine.
-
-FUD
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;D</td>
-<td width="8%"></td>
-<td width="75%">
-
-
-Run external debugger specified in debug_command.</td>
-<td width="3%">
-</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-Default configuration file.
-
-/etc/cyrus.conf
-
-Cyrus Master process
-configuration file.
-
-<h2>BUGS
-<a name="BUGS"></a>
-</h2>
-
-
-Though not
-really a bug, FUD will silently ignore any requests
-that it does not consider valid.
-
-Also not really
-a bug, FUD requires that the anonymous user has the 0
-(zero) right on the mailbox in question. This is only a
-&quot;bug&quot; because 0 is not a standard IMAP ACL
-bit.
-
-FUD is
-an experimental interface meant to provide information to
-build a finger-like service around. Eventually it should be
-superceded by a more standards-based protocol.
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/idled.8.html Deleted

@@ -1,98 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IDLED</title>
-
-</head>
-<body>
-
-<h1 align="center">IDLED</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-idled &minus;
-provide near real-time updates for IMAP IDLE
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-idled 
-&minus;C config-file 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Idled is
-a long lived datagram daemon which receives notifications of
-mailbox changes and signals the appropriate imapd to
-report the changes to the client. Idled is usually
-started from master.
-
-Idled
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. The idlesocket option is used to specify
-the Unix domain socket to listen on for notifications.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/imapd.8.html Deleted

@@ -1,197 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IMAPD</title>
-
-</head>
-<body>
-
-<h1 align="center">IMAPD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-imapd &minus;
-IMAP server process
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-imapd 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
-&minus;D 
- &minus;s &minus;N &minus;p
-ssf 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Imapd is
-an IMAP4rev1 server. It accepts commands on its standard
-input and responds on its standard output. It MUST be
-invoked by master(8) with those descriptors attached
-to a remote client connection.
-
-Imapd
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-If the file
-msg/shutdown is created under the directory specified in the
-configdirectory configuration option, then
-imapd will shut down the connection, sending the
-first line contained in the file to the client as the
-reason. New connections are denied.
-
-If the file
-msg/motd is created under the directory specified in the
-configdirectory configuration option, then
-imapd will send the first line contained in the file
-to clients upon connect as an ALERT message which
-IMAP-compliant clients are required to display. This option
-serves to annoy users mostly. Unfortunately clients tend to
-connect far more frequently than is apparent, causing each
-connection to generate a seperate server ALERT for each
-connection. Many clients do not display these properly, if
-they do anything with them at all.
-
-If the
-directory log/user exists under the directory
-specified in the configdirectory configuration
-option, then imapd will create protocol telemetry
-logs for sessions authenticating as user. The
-telemetry logs will be stored in the log/user
-directory with a filename of the imapd
-process-id.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;D</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Run external debugger specified in debug_command.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Serve IMAP over SSL (imaps). All data to and from
-imapd is encrypted using the Secure Sockets
-Layer. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;N</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Bypass password checking. (Not recommended unless you
-know what you&rsquo;re doing.)</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;p ssf</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Tell imapd that an external layer exists. An SSF
-(security strength factor) of 1 means an integrity
-protection layer exists. Any higher SSF implies some form of
-privacy protection.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/imapd.conf.5.html Deleted

@@ -1,2255 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IMAPD.CONF</title>
-
-</head>
-<body>
-
-<h1 align="center">IMAPD.CONF</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#FIELD DESCRIPTIONS">FIELD DESCRIPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-imapd.conf
-&minus; IMAP configuration file
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-is the configuration file for the Cyrus IMAP server. It
-defines local parameters for IMAP.
-
-Each line of
-the /etc/imapd.conf file has the form
-
-option:
-value
-
-where
-option is the name of the configuration option being
-set and value is the value that the configuration
-option is being set to.
-
-Although there
-is no limit to the length of a line, a
-&lsquo;&lsquo;\&rsquo;&rsquo; (backslash) character may be
-used as the last character on a line to force it to continue
-on the next one. No additional whitespace is inserted before
-or after the &lsquo;&lsquo;\&rsquo;&rsquo;. Note that a line
-that is split using &lsquo;&lsquo;\&rsquo;&rsquo;
-character(s) is still considered a single line. For
-example
-
-
-option:\
-
-value1 value2
-\
-
-value3
-
-is equivalent
-to
-
-option:
-value1 value2 value3
-
-Blank lines and
-lines beginning with &lsquo;&lsquo;#&rsquo;&rsquo; are
-ignored.
-
-For boolean and
-enumerated options, the values
-&lsquo;&lsquo;yes&rsquo;&rsquo;,
-&lsquo;&lsquo;on&rsquo;&rsquo;,
-&lsquo;&lsquo;t&rsquo;&rsquo;,
-&lsquo;&lsquo;true&rsquo;&rsquo; and
-&lsquo;&lsquo;1&rsquo;&rsquo; turn the option on, the values
-&lsquo;&lsquo;no&rsquo;&rsquo;,
-&lsquo;&lsquo;off&rsquo;&rsquo;,
-&lsquo;&lsquo;f&rsquo;&rsquo;,
-&lsquo;&lsquo;false&rsquo;&rsquo; and
-&lsquo;&lsquo;0&rsquo;&rsquo; turn the option off.
-
-<h2>FIELD DESCRIPTIONS
-<a name="FIELD DESCRIPTIONS"></a>
-</h2>
-
-
-The sections
-below detail options that can be placed in the
-/etc/imapd.conf file, and show each option&rsquo;s
-default value. Some options have no default value, these are
-listed with &lsquo;&lsquo;&lt;no default&gt;&rsquo;&rsquo;.
-Some options default to the empty string, these are listed
-with &lsquo;&lsquo;&lt;none&gt;&rsquo;&rsquo;. 
-admins: &lt;empty string&gt;
-
-The list of userids with
-administrative rights. Separate each userid with a space.
-Sites using Kerberos authentication may use separate
-&quot;admin&quot; instances.
-
-Note that
-accounts used by users should not be administrators.
-Administrative accounts should not receive mail. That is, if
-user &quot;jbRo&quot; is a user reading mail, he should not
-also be in the admins line. Some problems may occur
-otherwise, most notably the ability of administrators to
-create top-level mailboxes visible to users, but not
-writable by users. 
-afspts_localrealms: &lt;none&gt;
-
-The list of realms which are to
-be treated as local, and thus stripped during identifier
-canonicalization (for the AFSPTS ptloader module). This is
-different from loginrealms in that it occurs later in the
-authorization process (as the user id is canonified for PTS
-lookup)
-
-afspts_mycell:
-&lt;none&gt;
-
-Cell to use for AFS PTS
-lookups. Defaults to the local cell.
-
-allowallsubscribe: 0
-
-Allow subscription to
-nonexistent mailboxes. This option is typically used on
-backend servers in a Murder so that users can subscribe to
-mailboxes that don&rsquo;t reside on their &quot;home&quot;
-server. This option can also be used as a workaround for
-IMAP clients which don&rsquo;t play well with nonexistent or
-unselectable mailboxes (e.g., Microsoft Outlook).
-
-allowanonymouslogin:
-0
-
-Permit logins by the user
-&quot;anonymous&quot; using any password. Also allows use of
-the SASL ANONYMOUS mechanism.
-
-allowapop: 1
-
-Allow use of the POP3 APOP
-authentication command.
-
-Note that this
-command requires that SASL is compiled with APOP support,
-that the plaintext passwords are available in a SASL auxprop
-backend (e.g., sasldb), and that the system can provide
-enough entropy (e.g., from /dev/urandom) to create a
-challenge in the banner. 
-allownewnews: 0
-
-Allow use of the NNTP NEWNEWS
-command.
-
-Note that this
-is a very expensive command and should only be enabled when
-absolutely necessary. 
-allowplaintext: 0
-
-Allow the use of cleartext
-passwords on the wire.
-
-allowusermoves: 0
-
-Allow moving user accounts
-(with associated meta-data) via RENAME or XFER.
-
-Note that
-measures should be taken to make sure that the user being
-moved is not logged in, and cannot login during the move.
-Failure to do so may result in the user&rsquo;s meta-data
-(seen state, subscriptions, etc) being corrupted or out of
-date. 
-altnamespace: 0
-
-Use the alternate IMAP
-namespace, where personal folders reside at the same level
-in the hierarchy as INBOX.
-
-This option
-ONLY applies where interaction takes place with the
-client/user. Currently this is limited to the IMAP protocol
-(imapd) and Sieve scripts (lmtpd). This option does NOT
-apply to admin tools such as cyradm (admins ONLY),
-reconstruct, quota, etc., NOR does it affect LMTP delivery
-of messages directly to mailboxes via plus-addressing.
- 
-annotation_db: skiplist
-
-The cyrusdb backend to use for
-mailbox annotations.
-
-Allowed values:
-berkeley, berkeley-hash, skiplist
-
-annotation_db_path:
-&lt;none&gt;
-
-The absolute path to the
-annotations db file. If not specified, will be
-confdir/annotations.db
-
-anyoneuseracl: 1
-
-Should non-admin users be
-allowed to set ACLs for the &rsquo;anyone&rsquo; user on
-their mailboxes? In a large organization this can cause
-support problems, but it&rsquo;s enabled by default.
-
-annotation_definitions:
-&lt;none&gt;
-
-File containing external
-(third-party) annotation definitions.
-
-Each line of
-the file specifies the properties of an annotation and has
-the following form:
-
-name,
-scope, attrib-type, proxy-type,
-attrib-names, acl
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="6%">
-
-
-name</td>
-<td width="1%"></td>
-<td width="82%">
-
-
-is the hierarchical name as in the draft standard,
-typically of the form /vendor/acme/blurdybloop</td></tr>
-</table>
-
-scope
-
-specifies whether the
-annotation is for the server or a mailbox
-
-attrib-type
-
-specifies the attribute data
-type which is one of: string, boolean,
-int, uint, or content-type
-
-proxy-type
-
-specifies whether this
-attribute is for the backend or proxy servers
-or both (proxy_and_backend)
-
-attrib-names
-
-is the space-separated list of
-available attributes for the annotation. Possible attribute
-names are (where the suffixless foo permits both
-foo.priv and foo.shared): alue,
-value.shared, value.priv, size,
-size.shared, size.priv, modifiedsince,
-modifiedsince.shared, modifiedsince.priv,
-content-type, content-type.shared,
-content-type.priv
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="4%">
-
-
-acl</td>
-<td width="3%"></td>
-<td width="82%">
-
-
-is the extra ACL requirements for setting annotations.
-This is the standard IMAP ACL permission bit string format.
-Particularly useful is the a right to require admin
-privileges. Note that some ACL requirements (read and write
-on the mailbox) are hard-wired in the server</td></tr>
-</table>
-
-Blank lines and
-lines beginning with &lsquo;&lsquo;#&rsquo;&rsquo; are
-ignored. 
-auditlog: 0
-
-Should cyrus output log entries
-for every action taken on a message file or mailboxes list
-entry? It&rsquo;s noisy so disabled by default, but can be
-very useful for tracking down what happened if things look
-strange
-
-auth_mech: unix
-
-The authorization mechanism to
-use.
-
-Allowed values:
-unix, pts, krb, krb5
-
-autocreatequota: 0
-
-If nonzero, normal users may
-create their own IMAP accounts by creating the mailbox
-INBOX. The user&rsquo;s quota is set to the value if it is
-positive, otherwise the user has unlimited quota.
-
-berkeley_cachesize:
-512
-
-Size (in kilobytes) of the
-shared memory buffer pool (cache) used by the berkeley
-environment. The minimum allowed value is 20. The maximum
-allowed value is 4194303 (4GB).
-
-berkeley_locks_max:
-50000
-
-Maximum number of locks to be
-held or requested in the berkeley environment.
-
-berkeley_txns_max:
-100
-
-Maximum number of transactions
-to be supported in the berkeley environment.
-
-boundary_limit: 1000
-
-messages are parsed recursively
-and a deep enough MIME structure can cause a stack overflow.
-Do not parse deeper than this many layers of MIME structure.
-The default of 1000 is much higher than any sane message
-should have.
-
-client_timeout: 10
-
-Number of seconds to wait
-before returning a timeout failure when performing a client
-connection (e.g., in a murder environment)
-
-commandmintimer:
-&lt;none&gt;
-
-Time in seconds. Any imap
-command that takes longer than this time is logged.
-
-configdirectory:
-&lt;none&gt;
-
-The pathname of the IMAP
-configuration directory. This field is required.
-
-debug_command:
-&lt;none&gt;
-
-Debug command to be used by
-processes started with -D option. The string is a C format
-string that gets 3 options: the first is the name of the
-executable (without path). The second is the pid (integer)
-and the third is the service ID. Example: /usr/local/bin/gdb
-/usr/cyrus/bin/%s %d
-
-defaultacl: anyone
-lrs
-
-The Access Control List (ACL)
-placed on a newly-created (non-user) mailbox that does not
-have a parent mailbox.
-
-defaultdomain:
-&lt;none&gt;
-
-The default domain for virtual
-domain support
-
-defaultpartition:
-&lt;none&gt;
-
-The partition name used by
-default for new mailboxes. If not specified, the partition
-with the most free space will be used for new mailboxes.
-
-defaultserver:
-&lt;none&gt;
-
-The backend server name used by
-default for new mailboxes. If not specified, the server with
-the most free space will be used for new mailboxes.
-
-deletedprefix:
-DELETED
-
-If &quot;delete_mode&quot; set
-to be &quot;delayed&quot;, the prefix for the deleted
-mailboxes hierarchy. The hierarchy delimiter will be
-automatically appended.
-
-delete_mode:
-immediate
-
-The manner in which mailboxes
-are deleted. &quot;immediate&quot; mode is the default
-behavior in which mailboxes are removed immediately. In
-&quot;delayed&quot; mode, mailboxes are renamed to a special
-hiearchy defined by the &quot;deletedprefix&quot; option to
-be removed later by cyr_expire.
-
-Allowed values:
-immediate, delayed
-
-deleteright: c
-
-Deprecated - only used for
-backwards compatibility with existing installations. Lists
-the old RFC 2086 right which was used to grant the user the
-ability to delete a mailbox. If a user has this right, they
-will automatically be given the new &rsquo;x&rsquo;
-right.
-
-disable_user_namespace:
-0
-
-Preclude list command on user
-namespace. If set to &rsquo;yes&rsquo;, the LIST response
-will never include any other user&rsquo;s mailbox. Admin
-users will always see all mailboxes. The default is
-&rsquo;no&rsquo;
-
-
-disable_shared_namespace:
-0
-
-Preclude list command on user
-namespace. If set to &rsquo;yes&rsquo;, the LIST response
-will never include any non-user mailboxes. Admin users will
-always see all mailboxes. The default is
-&rsquo;no&rsquo;
-
-
-disconnect_on_vanished_mailbox:
-0
-
-If enabled, IMAP/POP3/NNTP
-clients will be disconnected by the server if the currently
-selected mailbox is (re)moved by another session. Otherwise,
-the missing mailbox is treated as empty while in use by the
-client.
-
-duplicate_db:
-skiplist
-
-The cyrusdb backend to use for
-the duplicate delivery suppression and sieve.
-
-Allowed values:
-berkeley, berkeley-nosync,
-berkeley-hash, berkeley-hash-nosync,
-skiplist, sql
-
-duplicate_db_path:
-&lt;none&gt;
-
-The absolute path to the
-duplicate db file. If not specified, will be
-confdir/deliver.db
-
-duplicatesuppression:
-1
-
-If enabled, lmtpd will suppress
-delivery of a message to a mailbox if a message with the
-same message-id (or resent-message-id) is recorded as having
-already been delivered to the mailbox. Records the mailbox
-and message-id/resent-message-id of all successful
-deliveries.
-
-expunge_mode:
-default
-
-The mode in which messages (and
-their corresponding cache entries) are expunged.
-&quot;default&quot; mode is the default behavior in which
-the message files are purged at the time of the EXPUNGE, but
-index and cache records are retained to facilitate QRESYNC.
-In &quot;delayed&quot; mode, the message files are also
-retained, allowing unexpunge to rescue them. In
-&quot;immediate&quot; mode, both the message files and the
-index records are removed as soon as possible. In all cases,
-nothing will be finally purged until all other processes
-have closed the mailbox to ensure they never see data
-disappear under them. In &quot;default&quot; or
-&quot;delayed&quot; mode, a later run of
-&quot;cyr_expire&quot; will clean out the retained records
-(and possibly message files). This reduces the amount of I/O
-that takes place at the time of EXPUNGE and should result in
-greater responsiveness for the client, especially when
-expunging a large number of messages.
-
-Allowed values:
-default, immediate, delayed
-
-expunge_days: 7
-
-Number of days to retain
-expunged messages before cleaning up their index records.
-The default is 7. This is necessary for QRESYNC to work
-correctly. If combined with delayed expunge (above) you will
-also be able to unexpunge messages during this time.
-
-failedloginpause: 3
-
-Number of seconds to pause
-after a failed login.
-
-flushseenstate: 0
-
-If enabled, changes to the seen
-state will be flushed to disk immediately, otherwise changes
-will be cached and flushed when the mailbox is closed. This
-option may be used to fix the problem of previously read
-messages being marked as unread in Microsoft Outlook, at the
-expense of a loss of performance/scalability.
-
-foolstupidclients: 0
-
-If enabled, only list the
-personal namespace when a LIST &quot;*&quot; is performed
-(it changes the request to a LIST &quot;INBOX*&quot;).
-
-force_sasl_client_mech:
-&lt;none&gt;
-
-Force preference of a given
-SASL mechanism for client side operations (e.g., murder
-environments). This is separate from (and overridden by) the
-ability to use the &lt;host shortname&gt;_mechs option to
-set preferred mechanisms for a specific host
-
-fulldirhash: 0
-
-If enabled, uses an improved
-directory hashing scheme which hashes on the entire username
-instead of using just the first letter as the hash. This
-changes hash algorithm used for quota and user directories
-and if hashimapspool is enabled, the entire mail
-spool.
-
-Note that this
-option CANNOT be changed on a live system. The server must
-be quiesced and then the directories moved with the
-rehash utility. 
-hashimapspool: 0
-
-If enabled, the partitions will
-also be hashed, in addition to the hashing done on
-configuration directories. This is recommended if one
-partition has a very bushy mailbox tree.
-
-hostname_mechs:
-&lt;none&gt;
-
-Force a particular list of SASL
-mechanisms to be used when authenticating to the backend
-server hostname (where hostname is the short hostname of the
-server in question). If it is not specified it will query
-the server for available mechanisms and pick one to use. -
-Cyrus Murder
-
-hostname_password:
-&lt;none&gt;
-
-The password to use for
-authentication to the backend server hostname (where
-hostname is the short hostname of the server) - Cyrus
-Murder
-
-idlesocket:
-{configdirectory}/socket/idle
-
-Unix domain socket that idled
-listens on.
-
-ignorereference: 0
-
-For backwards compatibility
-with Cyrus 1.5.10 and earlier -- ignore the reference
-argument in LIST or LSUB commands.
-
-imapidlepoll: 60
-
-The interval (in seconds) for
-polling for mailbox changes and ALERTs while running the
-IDLE command. This option is used when idled is not enabled
-or cannot be contacted. The minimum value is 1. A value of 0
-will disable IDLE.
-
-imapidresponse: 1
-
-If enabled, the server responds
-to an ID command with a parameter list containing: version,
-vendor, support-url, os, os-version, command, arguments,
-environment. Otherwise the server returns NIL.
-
-imapmagicplus: 0
-
-Only list a restricted set of
-mailboxes via IMAP by using userid+namespace syntax as the
-authentication/authorization id. Using userid+ (with an
-empty namespace) will list only subscribed mailboxes.
-
-implicit_owner_rights:
-lkxa
-
-The implicit Access Control
-List (ACL) for the owner of a mailbox.
-
-@include:
-&lt;none&gt;
-
-Directive which includes the
-specified file as part of the configuration. If the path to
-the file is not absolute, CYRUS_PATH is prepended.
-
-improved_mboxlist_sort:
-0
-
-If enabled, a special
-comparator will be used which will correctly sort mailbox
-names that contain characters such as &rsquo; &rsquo; and
-&rsquo;-&rsquo;.
-
-Note that this
-option SHOULD NOT be changed on a live system. The mailboxes
-database should be dumped (ctl_mboxlist) before the option
-is changed, removed, and then undumped after changing the
-option. When not using flat files for the subscriptions
-databases the same has to be done (cyr_dbtool) for each
-subscription database See improved_mboxlist_sort.html.
- 
-internaldate_heuristic: standard
-
-Mechanism to determine email
-internaldates on delivery/reconstruct. &quot;standard&quot;
-uses time() when delivering a message, mtime on reconstruct.
-&quot;receivedheader&quot; looks at the top most Received
-header or time/mtime otherwise
-
-Allowed values:
-standard, receivedheader
-
-ldap_authz:
-&lt;none&gt;
-
-SASL authorization ID for the
-LDAP server
-
-ldap_base: &lt;empty
-string&gt;
-
-Contains the LDAP base dn for
-the LDAP ptloader module
-
-ldap_bind_dn:
-&lt;none&gt;
-
-Bind DN for the connection to
-the LDAP server (simple bind). Do not use for anonymous
-simple binds
-
-ldap_deref: never
-
-Specify how aliases
-dereferencing is handled during search.
-
-Allowed values:
-search, find, always, never
-
-ldap_filter:
-(uid=%u)
-
-Specify a filter that searches
-user identifiers. The following tokens can be used in the
-filter string:
-
-%% = % %u =
-user %U = user portion of %u (%U = test when %u =
-test@domain.tld) %d = domain portion of %u if available (%d
-= domain.tld when %u = %test@domain.tld), otherwise same as
-%r %D = user dn. (use when ldap_member_method: filter) %1-9
-= domain tokens (%1 = tld, %2 = domain when %d =
-domain.tld)
-
-ldap_filter is
-not used when ldap_sasl is enabled.
-
-ldap_group_base:
-&lt;empty string&gt;
-
-LDAP base dn for
-ldap_group_filter.
-
-ldap_group_filter:
-(cn=%u)
-
-Specify a filter that searches
-for group identifiers. See ldap_filter for more options.
-
-ldap_group_scope:
-sub
-
-Specify search scope for
-ldap_group_filter.
-
-Allowed values:
-sub, one, base
-
-ldap_id:
-&lt;none&gt;
-
-SASL authentication ID for the
-LDAP server
-
-ldap_mech:
-&lt;none&gt;
-
-SASL mechanism for LDAP
-authentication
-
-ldap_member_attribute:
-&lt;none&gt;
-
-See ldap_member_method.
-
-ldap_member_base:
-&lt;empty string&gt;
-
-LDAP base dn for
-ldap_member_filter.
-
-ldap_member_filter:
-(member=%D)
-
-Specify a filter for
-&quot;ldap_member_method: filter&quot;. See ldap_filter for
-more options.
-
-ldap_member_method:
-attribute
-
-Specify a group method. The
-&quot;attribute&quot; method retrieves groups from a
-multi-valued attribute specified in
-ldap_member_attribute.
-
-The
-&quot;filter&quot; method uses a filter, specified by
-ldap_member_filter, to find groups; ldap_member_attribute is
-a single-value attribute group name.
-
-Allowed values:
-attribute, filter
-
-ldap_member_scope:
-sub
-
-Specify search scope for
-ldap_member_filter.
-
-Allowed values:
-sub, one, base
-
-ldap_password:
-&lt;none&gt;
-
-Password for the connection to
-the LDAP server (SASL and simple bind). Do not use for
-anonymous simple binds
-
-ldap_realm:
-&lt;none&gt;
-
-SASL realm for LDAP
-authentication
-
-ldap_referrals: 0
-
-Specify whether or not the
-client should follow referrals.
-
-ldap_restart: 1
-
-Specify whether or not LDAP I/O
-operations are automatically restarted if they abort
-prematurely.
-
-ldap_sasl: 1
-
-Use SASL for LDAP binds in the
-LDAP PTS module.
-
-ldap_sasl_authc:
-&lt;none&gt;
-
-Deprecated. Use ldap_id
-
-ldap_sasl_authz:
-&lt;none&gt;
-
-Deprecated. Use ldap_authz
-
-ldap_sasl_mech:
-&lt;none&gt;
-
-Deprecated. Use ldap_mech
-
-ldap_sasl_password:
-&lt;none&gt;
-
-Deprecated. User
-ldap_password
-
-ldap_sasl_realm:
-&lt;none&gt;
-
-Deprecated. Use ldap_realm
-
-ldap_scope: sub
-
-Specify search scope.
-
-Allowed values:
-sub, one, base
-
-ldap_servers:
-ldap://localhost/
-
-Deprecated. Use ldap_uri
-
-ldap_size_limit: 1
-
-Specify a number of entries for
-a search request to return.
-
-ldap_start_tls: 0
-
-Use StartTLS extended
-operation. Do not use ldaps: ldap_uri when this option is
-enabled.
-
-ldap_time_limit: 5
-
-Specify a number of seconds for
-a search request to complete.
-
-ldap_timeout: 5
-
-Specify a number of seconds a
-search can take before timing out.
-
-ldap_tls_cacert_dir:
-&lt;none&gt;
-
-Path to directory with CA
-(Certificate Authority) certificates.
-
-ldap_tls_cacert_file:
-&lt;none&gt;
-
-File containing CA (Certificate
-Authority) certificate(s).
-
-ldap_tls_cert:
-&lt;none&gt;
-
-File containing the client
-certificate.
-
-ldap_tls_check_peer:
-0
-
-Require and verify server
-certificate. If this option is yes, you must specify
-ldap_tls_cacert_file or ldap_tls_cacert_dir.
-
-ldap_tls_ciphers:
-&lt;none&gt;
-
-List of SSL/TLS ciphers to
-allow. The format of the string is described in
-ciphers(1).
-
-ldap_tls_key:
-&lt;none&gt;
-
-File containing the private
-client key.
-
-ldap_uri:
-&lt;none&gt;
-
-Contains a list of the URLs of
-all the LDAP servers when using the LDAP PTS module.
-
-ldap_version: 3
-
-Specify the LDAP protocol
-version. If ldap_start_tls and/or ldap_use_sasl are enabled,
-ldap_version will be automatically set to 3.
-
-lmtp_downcase_rcpt:
-0
-
-If enabled, lmtpd will convert
-the recipient addresses to lowercase (up to a
-&rsquo;+&rsquo; character, if present).
-
-
-lmtp_fuzzy_mailbox_match:
-0
-
-If enabled, and the mailbox
-specified in the detail part of the recipient (everything
-after the &rsquo;+&rsquo;) does not exist, lmtpd will try to
-find the closest match (ignoring case, ignoring whitespace,
-falling back to parent) to the specified mailbox name.
-
-
-lmtp_over_quota_perm_failure:
-0
-
-If enabled, lmtpd returns a
-permanent failure code when a user&rsquo;s mailbox is over
-quota. By default, the failure is temporary, causing the MTA
-to queue the message and retry later.
-
-lmtp_strict_quota: 0
-
-If enabled, lmtpd returns a
-failure code when the incoming message will cause the
-user&rsquo;s mailbox to exceed its quota. By default, the
-failure won&rsquo;t occur until the mailbox is already over
-quota.
-
-lmtp_strict_rfc2821:
-1
-
-By default, lmtpd will be
-strict (per RFC 2821) with regards to which envelope
-addresses are allowed. If this option is set to false, 8bit
-characters in the local-part of envelope addresses are
-changed to &rsquo;X&rsquo; instead. This is useful to avoid
-generating backscatter with certain MTAs like Postfix or
-Exim which accept such messages.
-
-lmtpsocket:
-{configdirectory}/socket/lmtp
-
-Unix domain socket that lmtpd
-listens on, used by deliver(8). This should match the path
-specified in cyrus.conf(5).
-
-lmtptxn_timeout: 300
-
-Timeout (in seconds) used
-during a lmtp transaction to a remote backend (e.g. in a
-murder environment). Can be used to prevent hung lmtpds on
-proxy hosts when a backend server becomes unresponsive
-during a lmtp transaction. The default is 300 - change to
-zero for infinite.
-
-loginrealms: &lt;empty
-string&gt;
-
-The list of remote realms whose
-users may authenticate using cross-realm authentication
-identifiers. Separate each realm name by a space. (A
-cross-realm identity is considered any identity returned by
-SASL with an &quot;@&quot; in it.).
-
-loginuseacl: 0
-
-If enabled, any authentication
-identity which has a rights on a user&rsquo;s INBOX
-may log in as that user.
-
-logtimestamps: 0
-
-Include notations in the
-protocol telemetry logs indicating the number of seconds
-since the last command or response.
-
-
-mailbox_default_options:
-0
-
-Default &quot;options&quot;
-field for the mailbox on create. You&rsquo;ll want to know
-what you&rsquo;re doing before setting this, but it can
-apply some default annotations like duplicate supression
-
-mailnotifier:
-&lt;none&gt;
-
-Notifyd(8) method to use for
-&quot;MAIL&quot; notifications. If not set, &quot;MAIL&quot;
-notifications are disabled.
-
-maxheaderlines: 1000
-
-Maximum number of lines of
-header that will be processed into cache records. Default
-1000. If set to zero, it is unlimited. If a message hits the
-limit, an error will be logged and the rest of the lines in
-the header will be skipped. This is to avoid malformed
-messages causing giant cache records
-
-maxmessagesize: 0
-
-Maximum incoming LMTP message
-size. If non-zero, lmtpd will reject messages larger than
-maxmessagesize bytes. If set to 0, this will allow
-messages of any size (the default).
-
-maxquoted: 131072
-
-Maximum size of a single quoted
-string for the parser. Default 128k
-
-maxword: 131072
-
-Maximum size of a single word
-for the parser. Default 128k
-
-mboxkey_db: skiplist
-
-The cyrusdb backend to use for
-mailbox keys.
-
-Allowed values:
-berkeley, skiplist
-
-mboxlist_db:
-skiplist
-
-The cyrusdb backend to use for
-the mailbox list.
-
-Allowed values:
-flat, berkeley, berkeley-hash,
-skiplist
-
-mboxlist_db_path:
-&lt;none&gt;
-
-The absolute path to the
-mailboxes db file. If not specified will be
-confdir/mailboxes.db
-
-mboxname_lockpath:
-&lt;none&gt;
-
-Path to mailbox name lock files
-(default $conf/lock)
-
-metapartition_files:
-&lt;empty string&gt;
-
-Space-separated list of
-metadata files to be stored on a metapartition rather
-than in the mailbox directory on a spool partition.
-
-Allowed values:
-header, index, cache, expunge,
-squat
-
-metapartition-name:
-&lt;none&gt;
-
-The pathname of the metadata
-partition name, corresponding to spool partition
-partition-name. For any mailbox residing in a
-directory on partition-name, the metadata files
-listed in metapartition_files will be stored in a
-corresponding directory on metapartition-name. Note
-that not every partition-name option is required to
-have a corresponding metapartition-name option, so
-that you can selectively choose which spool partitions will
-have separate metadata partitions.
-
-mupdate_authname:
-&lt;none&gt;
-
-The SASL username
-(Authentication Name) to use when authenticating to the
-mupdate server (if needed).
-
-mupdate_config:
-standard
-
-The configuration of the
-mupdate servers in the Cyrus Murder. The
-&quot;standard&quot; config is one in which there are
-discreet frontend (proxy) and backend servers. The
-&quot;unified&quot; config is one in which a server can be
-both a frontend and backend. The &quot;replicated&quot;
-config is one in which multiple backend servers all share
-the same mailspool, but each have their own
-&quot;replicated&quot; copy of mailboxes.db.
-
-Allowed values:
-standard, unified, replicated
-
-munge8bit: 1
-
-If enabled, lmtpd munges
-messages with 8-bit characters in the headers. The 8-bit
-characters are changed to &lsquo;X&rsquo;. If
-reject8bit is enabled, setting munge8bit has
-no effect. (A proper solution to non-ASCII characters in
-headers is offered by RFC 2047 and its predecessors.)
-
-
-mupdate_connections_max:
-128
-
-The max number of connections
-that a mupdate process will allow, this is related to the
-number of file descriptors in the mupdate process. Beyond
-this number connections will be immediately issued a BYE
-response.
-
-mupdate_password:
-&lt;none&gt;
-
-The SASL password (if needed)
-to use when authenticating to the mupdate server.
-
-mupdate_port: 3905
-
-The port of the mupdate server
-for the Cyrus Murder
-
-mupdate_realm:
-&lt;none&gt;
-
-The SASL realm (if needed) to
-use when authenticating to the mupdate server.
-
-mupdate_retry_delay:
-20
-
-The base time to wait between
-connection retries to the mupdate server.
-
-mupdate_server:
-&lt;none&gt;
-
-The mupdate server for the
-Cyrus Murder
-
-mupdate_username:
-&lt;empty string&gt;
-
-The SASL username
-(Authorization Name) to use when authenticating to the
-mupdate server
-
-mupdate_workers_max:
-50
-
-The maximum number of mupdate
-worker threads (overall)
-
-
-mupdate_workers_maxspare:
-10
-
-The maximum number of idle
-mupdate worker threads
-
-
-mupdate_workers_minspare:
-2
-
-The minimum number of idle
-mupdate worker threads
-
-mupdate_workers_start:
-5
-
-The number of mupdate worker
-threads to start
-
-netscapeurl:
-&lt;none&gt;
-
-If enabled at compile time,
-this specifies a URL to reply when Netscape asks the server
-where the mail administration HTTP server is. Administrators
-should set this to a local resource.
-
-newsaddheaders: to
-
-Space-separated list of headers
-to be added to incoming usenet articles. Added To:
-headers will contain email delivery addresses corresponding
-to each newsgroup in the Newsgroups: header. Added
-Reply-To: headers will contain email delivery
-addresses corresponding to each newsgroup in the
-Followup-To: or Newsgroups: header. If the
-specified header(s) already exist in an article, the email
-delivery addresses will be appended to the original header
-body(s).
-
-This option
-applies if and only if the newspostuser option is
-set.
-
-Allowed values:
-to, replyto
-
-newsgroups: *
-
-A wildmat pattern specifying
-which mailbox hierarchies should be treated as newsgroups.
-Only mailboxes matching the wildmat will accept and/or serve
-articles via NNTP. If not set, a default wildmat of
-&quot;*&quot; (ALL shared mailboxes) will be used. If the
-newsprefix option is also set, the default wildmat
-will be translated to &quot;&lt;newsprefix&gt;.*&quot;
-
-newsmaster: news
-
-Userid that is used for
-checking access controls when executing Usenet control
-messages. For instance, to allow articles to be
-automatically deleted by cancel messages, give the
-&quot;news&quot; user the &rsquo;d&rsquo; right on the
-desired mailboxes. To allow newsgroups to be automatically
-created, deleted and renamed by the corresponding control
-messages, give the &quot;news&quot; user the &rsquo;c&rsquo;
-right on the desired mailbox hierarchies.
-
-newspeer:
-&lt;none&gt;
-
-A list of whitespace-separated
-news server specifications to which articles should be fed.
-Each server specification is a string of the form
-user:pass@host:port/wildmat where &rsquo;host&rsquo;
-is the fully qualified hostname of the server,
-&rsquo;port&rsquo; is the port on which the server is
-listening, &rsquo;user&rsquo; and &rsquo;pass&rsquo; are the
-authentication credentials and &rsquo;wildmat&rsquo; is a
-pattern that specifies which groups should be fed. If no
-&rsquo;port&rsquo; is specified, port 119 is used. If no
-&rsquo;wildmat&rsquo; is specified, all groups are fed. If
-&rsquo;user&rsquo; is specified (even if empty), then the
-NNTP POST command will be used to feed the article to the
-server, otherwise the IHAVE command will be used.
-
-A
-&rsquo;@&rsquo; may be used in place of &rsquo;!&rsquo; in
-the wildmat to prevent feeding articles cross-posted to the
-given group, otherwise cross-posted articles are fed if any
-part of the wildmat matches. For example, the string
-&quot;peer.example.com:*,!control.*,@local.*&quot; would
-feed all groups except control messages and local groups to
-peer.example.com. In the case of cross-posting to local
-groups, these articles would not be fed.
-
-newspostuser:
-&lt;none&gt;
-
-Userid used to deliver usenet
-articles to newsgroup folders (usually via lmtp2nntp). For
-example, if set to &quot;post&quot;, email sent to
-&quot;post+comp.mail.imap&quot; would be delivered to the
-&quot;comp.mail.imap&quot; folder.
-
-When set, the
-Cyrus NNTP server will add the header(s) specified in the
-newsaddheaders option to each incoming usenet
-article. The added header(s) will contain email delivery
-addresses corresponding to each relevent newsgroup. If not
-set, no headers are added to usenet articles.
-
-newsprefix:
-&lt;none&gt;
-
-Prefix to be prepended to
-newsgroup names to make the corresponding IMAP mailbox
-names.
-
-newsrc_db_path:
-&lt;none&gt;
-
-The absolute path to the newsrc
-db file. If not specified, will be confdir/fetchnews.db
-
-nntptimeout: 3
-
-Set the length of the NNTP
-server&rsquo;s inactivity autologout timer, in minutes. The
-minimum value is 3, the default.
-
-notifysocket:
-{configdirectory}/socket/notify
-
-Unix domain socket that the
-mail notification daemon listens on.
-
-notify_external:
-&lt;none&gt;
-
-Path to the external program
-that notifyd(8) will call to send mail notifications.
-
-The external
-program will be called with the following command line
-options: 
-&minus;c class 
-&minus;p priority 
-&minus;u user 
-&minus;m mailbox
-
-And the
-notification message will be available on stdin.
- 
-partition-name: &lt;none&gt;
-
-The pathname of the partition
-name. At least one partition pathname MUST be
-specified. If the defaultpartition option is used,
-then its pathname MUST be specified. For example, if the
-value of the defaultpartion option is default,
-then the partition-default field is required.
-
-plaintextloginpause:
-0
-
-Number of seconds to pause
-after a successful plaintext login. For systems that support
-strong authentication, this permits users to perceive a cost
-of using plaintext passwords. (This does not affect the use
-of PLAIN in SASL authentications.)
-
-plaintextloginalert:
-&lt;none&gt;
-
-Message to send to client after
-a successful plaintext login.
-
-popexpiretime: -1
-
-The number of days advertised
-as being the minimum a message may be left on the POP server
-before it is deleted (via the CAPA command, defined in the
-POP3 Extension Mechanism, which some clients may support).
-&quot;NEVER&quot;, the default, may be specified with a
-negative number. The Cyrus POP3 server never deletes mail,
-no matter what the value of this parameter is. However, if a
-site implements a less liberal policy, it needs to change
-this parameter accordingly.
-
-popminpoll: 0
-
-Set the minimum amount of time
-the server forces users to wait between successive POP
-logins, in minutes.
-
-popsubfolders: 0
-
-Allow access to subfolders of
-INBOX via POP3 by using userid+subfolder syntax as the
-authentication/authorization id.
-
-poppollpadding: 1
-
-Create a softer minimum poll
-restriction. Allows poppollpadding connections before
-the minpoll restriction is triggered. Additionally, one
-padding entry is recovered every popminpoll minutes.
-This allows for the occasional polling rate faster than
-popminpoll, (i.e., for clients that require a send/receive
-to send mail) but still enforces the rate long-term. Default
-is 1 (disabled).
-
-The easiest way
-to think of it is a queue of past connections, with one slot
-being filled for every connection, and one slot being
-cleared every popminpoll minutes. When the queue is
-full, the user will not be able to check mail again until a
-slot is cleared. If the user waits a sufficient amount of
-time, they will get back many or all of the slots.
-
-poptimeout: 10
-
-Set the length of the POP
-server&rsquo;s inactivity autologout timer, in minutes. The
-minimum value is 10, the default.
-
-popuseacl: 0
-
-Enforce IMAP ACLs in the pop
-server. Due to the nature of the POP3 protocol, the only
-rights which are used by the pop server are &rsquo;r&rsquo;,
-user to open the mailbox and list/retrieve messages. The
-&rsquo;t&rsquo; right allows the user to delete messages.
-The &rsquo;s&rsquo; right allows messages retrieved by the
-user to have the \Seen flag set (only if
-popuseimapflags is also enabled).
-
-popuseimapflags: 0
-
-If enabled, the pop server will
-set and obey IMAP flags. Messages having the \Deleted flag
-are ignored as if they do not exist. Messages that are
-retrieved by the client will have the \Seen flag set. All
-messages will have the \Recent flag unset.
-
-postmaster:
-postmaster
-
-Username that is used as the
-&rsquo;From&rsquo; address in rejection MDNs produced by
-sieve.
-
-postuser: &lt;empty
-string&gt;
-
-Userid used to deliver messages
-to shared folders. For example, if set to &quot;bb&quot;,
-email sent to &quot;bb+shared.blah&quot; would be delivered
-to the &quot;shared.blah&quot; folder. By default, an email
-address of &quot;+shared.blah&quot; would be used.
-
-proc_path:
-&lt;none&gt;
-
-Path to proc directory. Default
-is NULL - must be an absolute path if specified. If not
-specified, the path $confdir/proc/ will be used.
-
-proxy_authname:
-proxy
-
-The authentication name to use
-when authenticating to a backend server in the Cyrus
-Murder.
-
-proxy_compress: 0
-
-Try to enable protocol-specific
-compression when performing a client connection to a backend
-server in the Cyrus Murder.
-
-Note that this
-should only be necessary over slow network connections. Also
-note that currently only IMAP and MUPDATE support
-compression. 
-proxy_password: &lt;none&gt;
-
-The default password to use
-when authenticating to a backend server in the Cyrus Murder.
-May be overridden on a host-specific basis using the
-hostname_password option.
-
-proxy_realm:
-&lt;none&gt;
-
-The authentication realm to use
-when authenticating to a backend server in the Cyrus
-Murder
-
-
-proxyd_allow_status_referral:
-0
-
-Set to true to allow proxyd to
-issue referrals to clients that support it when answering
-the STATUS command. This is disabled by default since some
-clients issue many STATUS commands in a row, and do not
-cache the connections that these referrals would cause, thus
-resulting in a higher authentication load on the respective
-backend server.
-
-
-proxyd_disable_mailbox_referrals:
-0
-
-Set to true to disable the use
-of mailbox-referrals on the proxy servers.
-
-proxyservers:
-&lt;none&gt;
-
-A list of users and groups that
-are allowed to proxy for other users, separated by spaces.
-Any user listed in this will be allowed to login for any
-other user: use with caution. In a standard murder this
-option should ONLY be set on backends. DO NOT SET on
-frontends or things won&rsquo;t work properly.
-
-pts_module: afskrb
-
-The PTS module to use.
-
-Allowed values:
-afskrb, ldap
-
-ptloader_sock:
-&lt;none&gt;
-
-Unix domain socket that
-ptloader listens on. (defaults to
-configdir/ptclient/ptsock)
-
-ptscache_db:
-skiplist
-
-The cyrusdb backend to use for
-the pts cache.
-
-Allowed values:
-berkeley, berkeley-hash, skiplist
-
-ptscache_db_path:
-&lt;none&gt;
-
-The absolute path to the
-ptscache db file. If not specified, will be
-confdir/ptscache.db
-
-ptscache_timeout:
-10800
-
-The timeout (in seconds) for
-the PTS cache database when using the auth_krb_pts
-authorization method (default: 3 hours).
-
-ptskrb5_convert524:
-1
-
-When using the AFSKRB ptloader
-module with Kerberos 5 canonicalization, do the final 524
-conversion to get a n AFS style name (using &rsquo;.&rsquo;
-instead of &rsquo;/&rsquo;, and using short names
-
-
-ptskrb5_strip_default_realm:
-1
-
-When using the AFSKRB ptloader
-module with Kerberos 5 canonicalization, strip the default
-realm from the userid (this does not affect the stripping of
-realms specified by the afspts_localrealms option)
-
-qosmarking: cs0
-
-This specifies the Class
-Selector or Differentiated Services Code Point designation
-on IP headers (in the ToS field).
-
-Allowed values:
-cs0, cs1, cs2, cs3, cs4,
-cs5, cs6, cs7, af11,
-af12, af13, af21, af22,
-af23, af31, af32, af33,
-af41, af42, af43, ef
-
-quota_db:
-quotalegacy
-
-The cyrusdb backend to use for
-quotas.
-
-Allowed values:
-flat, berkeley, berkeley-hash,
-skiplist, sql, quotalegacy
-
-quota_db_path:
-&lt;none&gt;
-
-The absolute path for the quota
-database (if you choose a single-file quota DB type - or the
-base path if you choose quotalegacy). If not specified will
-be confdir/quota.db or confdir/quota/
-
-quotawarn: 90
-
-The percent of quota
-utilization over which the server generates warnings.
-
-quotawarnkb: 0
-
-The maximum amount of free
-space (in kB) at which to give a quota warning (if this
-value is 0, or if the quota is smaller than this amount,
-than warnings are always given).
-
-reject8bit: 0
-
-If enabled, lmtpd rejects
-messages with 8-bit characters in the headers.
-
-rfc2046_strict: 0
-
-If enabled, imapd will be
-strict (per RFC 2046) when matching MIME boundary strings.
-This means that boundaries containing other boundaries as
-substrings will be treated as identical. Since enabling this
-option will break some messages created by Eudora 5.1 (and
-earlier), it is recommended that it be left disabled unless
-there is good reason to do otherwise.
-
-rfc3028_strict: 1
-
-If enabled, Sieve will be
-strict (per RFC 3028) with regards to which headers are
-allowed to be used in address and envelope tests. This means
-that only those headers which are defined to contain
-addresses will be allowed in address tests and only
-&quot;to&quot; and &quot;from&quot; will be allowed in
-envelope tests. When disabled, ANY grammatically correct
-header will be allowed.
-
-sasl_auto_transition:
-0
-
-If enabled, the SASL library
-will automatically create authentication secrets when given
-a plaintext password. See the SASL documentation.
-
-sasl_maximum_layer:
-256
-
-Maximum SSF (security strength
-factor) that the server will allow a client to
-negotiate.
-
-sasl_minimum_layer:
-0
-
-The minimum SSF that the server
-will allow a client to negotiate. A value of 1 requires
-integrity protection; any higher value requires some amount
-of encryption.
-
-sasl_option: 0
-
-Any SASL option can be set by
-preceding it with &quot;sasl_&quot;. This file overrides the
-SASL configuration file.
-
-sasl_pwcheck_method:
-&lt;none&gt;
-
-The mechanism used by the
-server to verify plaintext passwords. Possible values
-include &quot;auxprop&quot;, &quot;saslauthd&quot;, and
-&quot;pwcheck&quot;.
-
-seenstate_db:
-skiplist
-
-The cyrusdb backend to use for
-the seen state.
-
-Allowed values:
-flat, berkeley, berkeley-hash,
-skiplist
-
-sendmail:
-/usr/lib/sendmail
-
-The pathname of the sendmail
-executable. Sieve invokes sendmail for sending rejections,
-redirects and vacation responses.
-
-serverlist:
-&lt;none&gt;
-
-Whitespace separated list of
-backend server names. Used for finding server with the most
-available free space for proxying CREATE.
-
-servername:
-&lt;none&gt;
-
-This is the hostname visible in
-the greeting messages of the POP, IMAP and LMTP daemons. If
-it is unset, then the result returned from gethostname(2) is
-used.
-
-serverinfo: on
-
-The server information to
-display in the greeting and capability responses.
-Information is displayed as follows:
-
-
-&quot;off&quot;
-= no server information in the greeting or capabilities 
-&quot;min&quot; = servername in the greeting; no
-server information in the capabilities 
-&quot;on&quot; = servername and product version in
-the greeting; product version in the capabilities
-
-Allowed values:
-off, min, on
-
-sharedprefix: Shared
-Folders
-
-If using the alternate IMAP
-namespace, the prefix for the shared namespace. The
-hierarchy delimiter will be automatically appended.
-
-sieve_allowreferrals:
-1
-
-If enabled, timsieved will
-issue referrals to clients when the user&rsquo;s scripts
-reside on a remote server (in a Murder). Otherwise,
-timsieved will proxy traffic to the remote server.
-
-sieve_extensions:
-fileinto reject vacation imapflags notify envelope 
-relational regex subaddress copy
-
-Space-separated list of Sieve
-extensions allowed to be used in sieve scripts, enforced at
-submission by timsieved(8). Any previously installed script
-will be unaffected by this option and will continue to
-execute regardless of the extensions used. This option has
-no effect on options that are disabled at compile time
-(e.g., &quot;regex&quot;).
-
-Allowed values:
-fileinto, reject, vacation,
-imapflags, notify, include,
-envelope, body, relational,
-regex, subaddress, copy
-
-sieve_maxscriptsize:
-32
-
-Maximum size (in kilobytes) any
-sieve script can be, enforced at submission by
-timsieved(8).
-
-sieve_maxscripts: 5
-
-Maximum number of sieve scripts
-any user may have, enforced at submission by
-timsieved(8).
-
-sieve_utf8fileinto:
-0
-
-If enabled, the sieve engine
-expects folder names for the fileinto action in
-scripts to use UTF8 encoding. Otherwise, modified UTF7
-encoding should be used.
-
-
-sieve_sasl_send_unsolicited_capability:
-0
-
-If enabled, timsieved will emit
-a capability response after a successful SASL
-authentication, per draft-martin-managesieve-12.txt .
-
-sievedir: /usr/sieve
-
-If sieveusehomedir is false,
-this directory is searched for Sieve scripts.
-
-sievenotifier:
-&lt;none&gt;
-
-Notifyd(8) method to use for
-&quot;SIEVE&quot; notifications. If not set,
-&quot;SIEVE&quot; notifications are disabled.
-
-This method is
-only used when no method is specified in the script. 
-sieveusehomedir: 0
-
-If enabled, lmtpd will look for
-Sieve scripts in user&rsquo;s home directories:
-~user/.sieve.
-
-singleinstancestore:
-1
-
-If enabled, imapd, lmtpd and
-nntpd attempt to only write one copy of a message per
-partition and create hard links, resulting in a potentially
-large disk savings.
-
-
-skiplist_always_checkpoint:
-1
-
-If enabled, this option forces
-the skiplist cyrusdb backend to always checkpoint when doing
-a recovery. This causes slightly more IO, but on the other
-hand leads to more efficient databases, and the entire file
-is already &quot;hot&quot;.
-
-skiplist_unsafe: 0
-
-If enabled, this option forces
-the skiplist cyrusdb backend to not sync writes to the disk.
-Enabling this option is NOT RECOMMENDED.
-
-soft_noauth: 1
-
-If enabled, lmtpd returns
-temporary failures if the client does not successfully
-authenticate. Otherwise lmtpd returns permanent failures
-(causing the mail to bounce immediately).
-
-specialusealways: 0
-
-If enabled, this option causes
-LIST and LSUB output to always include the XLIST
-&quot;special-use&quot; flags. See
-&quot;xlist-*&rsquo;&quot;
-
-sql_database:
-&lt;none&gt;
-
-Name of the database which
-contains the cyrusdb table(s).
-
-sql_engine:
-&lt;none&gt;
-
-Name of the SQL engine to
-use.
-
-Allowed values:
-mysql, pgsql, sqlite
-
-sql_hostnames: &lt;empty
-string&gt;
-
-Comma separated list of SQL
-servers (in host:port format).
-
-sql_passwd:
-&lt;none&gt;
-
-Password to use for
-authentication to the SQL server.
-
-sql_user:
-&lt;none&gt;
-
-Username to use for
-authentication to the SQL server.
-
-sql_usessl: 0
-
-If enabled, a secure connection
-will be made to the SQL server.
-
-srvtab: &lt;empty
-string&gt;
-
-The pathname of srvtab
-file containing the server&rsquo;s private key. This option
-is passed to the SASL library and overrides its default
-setting.
-
-submitservers:
-&lt;none&gt;
-
-A list of users and groups that
-are allowed to resolve &quot;urlauth=submit+&quot; IMAP
-URLs, separated by spaces. Any user listed in this will be
-allowed to fetch the contents of any valid
-&quot;urlauth=submit+&quot; IMAP URL: use with caution.
-
-subscription_db:
-flat
-
-The cyrusdb backend to use for
-the subscriptions list.
-
-Allowed values:
-flat, berkeley, berkeley-hash,
-skiplist
-
-suppress_capabilities:
-&lt;none&gt;
-
-Suppress the named capabilities
-from any capability response. Use the exact case as it
-appears in the response, e.g. &quot;suppress_capabilities:
-ESEARCH QRESYNC WITHIN XLIST LIST-EXTENDED&quot; if you have
-a murder with 2.3.x backends and don&rsquo;t want clients
-being confused by new capabilities that some backends
-don&rsquo;t support.
-
-statuscache: 0
-
-Enable/disable the imap status
-cache.
-
-statuscache_db:
-skiplist
-
-The cyrusdb backend to use for
-the imap status cache.
-
-Allowed values:
-berkeley, berkeley-nosync,
-berkeley-hash, berkeley-hash-nosync,
-skiplist
-
-statuscache_db_path:
-&lt;none&gt;
-
-The absolute path to the
-statuscache db file. If not specified, will be
-confdir/statuscache.db
-
-sync_authname:
-&lt;none&gt;
-
-The authentication name to use
-when authenticating to a sync server. Prefix with a channel
-name to only apply for that channel
-
-sync_compress: 0
-
-Enable compression on
-replication traffic. Prefix with a channel name to only
-apply for that channel
-
-sync_host:
-&lt;none&gt;
-
-Name of the host (replica
-running sync_server(8)) to which replication actions will be
-sent by sync_client(8). Prefix with a channel name to only
-apply for that channel
-
-sync_log: 0
-
-Enable replication action
-logging by lmtpd(8), imapd(8), pop3d(8), and nntpd(8). The
-log {configdirectory}/sync/log is used by sync_client(8) for
-&quot;rolling&quot; replication.
-
-sync_log_chain: 0
-
-Enable replication action
-logging by sync_server as well, allowing chaining of
-replicas. Use this on &rsquo;B&rsquo; for A =&gt; B =&gt; C
-replication layout
-
-sync_log_channels:
-&lt;none&gt;
-
-If specified, log all events to
-multiple log files in directories specified by each
-&quot;channel&quot;. To run these log files, you need to
-pass the -n option to sync_client -r with the channel name.
-Use this for a mesh style replication layout - every machine
-replicating to every other machine.
-
-sync_password:
-&lt;none&gt;
-
-The default password to use
-when authenticating to a sync server. Prefix with a channel
-name to only apply for that channel
-
-sync_port: csync
-
-Name of the service (or port
-number) of the replication service on replica host. The
-default is &quot;csync&quot; which is usally port 2005, but
-any service name or numeric port can be specified. Prefix
-with a channel name to only apply for that channel
-
-sync_realm:
-&lt;none&gt;
-
-The authentication realm to use
-when authenticating to a sync server. Prefix with a channel
-name to only apply for that channel
-
-sync_repeat_interval:
-1
-
-Minimum interval (in seconds)
-between replication runs in rolling replication mode. If a
-replication run takes longer than this time, we repeat
-immediately. Prefix with a channel name to only apply for
-that channel
-
-sync_shutdown_file:
-&lt;none&gt;
-
-Simple latch used to tell
-sync_client(8) that it should shut down at the next
-opportunity. Safer than sending signals to running
-processes. Prefix with a channel name to only apply for that
-channel
-
-syslog_prefix:
-&lt;none&gt;
-
-String to be prepended to the
-process name in syslog entries.
-
-tcp_keepalive: 0
-
-Enable keepalive on TCP
-connections
-
-tcp_keepalive_cnt: 0
-
-Number of TCP keepalive probes
-to send before declaring the connection dead (0 == system
-default)
-
-tcp_keepalive_idle:
-0
-
-Number of seconds a connection
-must be idle before keepalive probes are sent (0 == system
-default)
-
-tcp_keepalive_intvl:
-0
-
-Number of seconds between
-keepalive probes (0 == system default)
-
-temp_path: /tmp
-
-The pathname to store temporary
-files in
-
-timeout: 30
-
-The length of the IMAP
-server&rsquo;s inactivity autologout timer, in minutes. The
-minimum value is 30, the default.
-
-tls_ca_file:
-&lt;none&gt;
-
-File containing one or more
-Certificate Authority (CA) certificates.
-
-tls_ca_path:
-&lt;none&gt;
-
-Path to directory with
-certificates of CAs. This directory must have filenames with
-the hashed value of the certificates (see openssl(XXX)).
-
-tlscache_db:
-skiplist
-
-The cyrusdb backend to use for
-the TLS cache.
-
-Allowed values:
-berkeley, berkeley-nosync,
-berkeley-hash, berkeley-hash-nosync,
-skiplist, sql
-
-tlscache_db_path:
-&lt;none&gt;
-
-The absolute path to the
-tlscache db file. If not specified, will be
-confdir/tls_sessions.db
-
-tls_cert_file:
-&lt;none&gt;
-
-File containing the certificate
-presented for server authentication during STARTTLS. A value
-of &quot;disabled&quot; will disable SSL/TLS.
-
-tls_cipher_list:
-DEFAULT
-
-The list of SSL/TLS ciphers to
-allow. The format of the string is described in
-ciphers(1).
-
-tls_key_file:
-&lt;none&gt;
-
-File containing the private key
-belonging to the server certificate. A value of
-&quot;disabled&quot; will disable SSL/TLS.
-
-tls_require_cert: 0
-
-Require a client certificate
-for ALL services (imap, pop3, lmtp, sieve).
-
-tls_session_timeout:
-1440
-
-The length of time (in minutes)
-that a TLS session will be cached for later reuse. The
-maximum value is 1440 (24 hours), the default. A value of 0
-will disable session caching.
-
-umask: 077
-
-The umask value used by various
-Cyrus IMAP programs.
-
-userdeny_db: flat
-
-The cyrusdb backend to use for
-the user access list.
-
-Allowed values:
-flat, berkeley, berkeley-hash,
-skiplist, sql
-
-userdeny_db_path:
-&lt;none&gt;
-
-The absolute path to the
-userdeny db file. If not specified, will be
-confdir/user_deny.db
-
-user_folder_limit: 0
-
-Limit the number of folders a
-user can create in their INBOX. Set to 0 (default) for no
-limit. Only affects folders in user.
-
-username_tolower: 1
-
-Convert usernames to all
-lowercase before login/authentication. This is useful with
-authentication backends which ignore case during username
-lookups (such as LDAP).
-
-userprefix: Other
-Users
-
-If using the alternate IMAP
-namespace, the prefix for the other users namespace. The
-hierarchy delimiter will be automatically appended.
-
-unix_group_enable: 1
-
-Should we look up groups when
-using auth_unix (disable this if you are not using groups in
-ACLs for your IMAP server, and you are using auth_unix with
-a backend (such as LDAP) that can make getgrent() calls very
-slow)
-
-unixhierarchysep: 0
-
-Use the UNIX separator
-character &rsquo;/&rsquo; for delimiting levels of mailbox
-hierarchy. The default is to use the netnews separator
-character &rsquo;.&rsquo;.
-
-virtdomains: off
-
-Enable virtual domain support.
-If enabled, the user&rsquo;s domain will be determined by
-splitting a fully qualified userid at the last
-&rsquo;@&rsquo; or &rsquo;%&rsquo; symbol. If the userid is
-unqualified, and the virtdomains option is set to
-&quot;on&quot;, then the domain will be determined by doing
-a reverse lookup on the IP address of the incoming network
-interface, otherwise the user is assumed to be in the
-default domain (if set).
-
-Allowed values:
-off, userid, on
-
-xlist-*:
-&lt;none&gt;
-
-Cyrus 2.4 ONLY - enable special
-use flags. The valid names can be taken from GMail&rsquo;s
-XLIST documents or RFC 6154. Attribute name in the
-configuration key should be defined in lowercase. The
-attribute value is case sensitive, may contain whitespace
-and must be valid UTF7-IMAP string. It must exactly match
-the name of the subfolder of a user&rsquo;s INBOX.
-
-Example:
-xlist-drafts: My Drafts
-
-Every user on
-your server with a &rsquo;INBOX.My Drafts&rsquo; folder will
-get the special use flag &quot; versions of Cyrus have a
-much more flexible RFC 6154 compatible system.
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd(8),
-pop3d(8), nntpd(8), lmtpd(8),
-timsieved(8), idled(8), notifyd(8),
-deliver(8), master(8), ciphers(1)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/imclient.3.html Deleted

@@ -1,628 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IMCLIENT</title>
-
-</head>
-<body>
-
-<h1 align="center">IMCLIENT</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#EXAMPLES">EXAMPLES</a> 
-<a href="#BUGS">BUGS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-<a href="#KEYWORDS">KEYWORDS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-imclient
-library - authenticating callback interface to IMAP/IMSP
-servers
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-#include
-&lt;cyrus/imclient.h&gt;
-
-int
-imclient_connect(struct imclient **imclient,
-const char *host, const char
-*port);
-
-void
-imclient_close (struct imclient *imclient);
- 
-void imclient_setflags(struct imclient
-*imclient, intflags); 
-void imclient_clearflags (struct imclient
-*imclient, intflags); 
-char* imclient_servername (struct imclient
-*imclient); 
-void imclient_addcallback (struct imclient * imclient ,...);
- 
-void imclient_send (struct imclient *imclient,
-void (*finishproc)(), void
-*finishrock, const char *fmt,
-...); 
-void imclient_getselectinfo (struct imclient
-*imclient, int *fd, int *
-wanttowrite); 
-void imclient_processoneevent (struct imclient
-*imclient); 
-int imclient_authenticate (struct imclient
-*imclient, struct sasl_client
-**availmech, const char
-*service, const char *user,
-int protallowed); 
-int imclient_havetls (); 
-int imclient_starttls (struct imclient
-*imclient, char *cert_file, char
-*key_file, char *CAfile, char
-*CApath);
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-The imclient
-library functions are distributed with Cyrus IMAP and IMSP.
-These functions are used for building IMAP/IMSP client
-software. These functions handle Kerberos authentication and
-can set callbacks based on the keyword in untagged replies
-or based on the command tag at the end of command
-replies.
-
-Users must link
-with the -lcyrus switch, and must supply a function called
-fatal to be called in case of any error within
-libcyrus.a.
-
-All of the
-imclient functions begin with the prefix
-imclient and takes an argument of type struct
-imclient * as the first argument which is initialized by
-imclient_connect and freed by
-imclient_close.
-
-See below for a
-description of each function. 
-imclient_connect()
-
-Connects the client server to
-the host. If successful, it returns 0 and sets the imclient
-argument to a pointer to an imclient struct. The
-imclient struct represents the current connection,
-flags, and callbacks. On failure, the current errno
-is returned if a system call failed, -1 is returned if the
-host name was not found, and -2 is returned if the service
-name was not found.
-
-imclient_close()
-
-Closes and frees the
-imclient connection. &nbsp;
-
-imclient_setflags()
-
-Sets the flags specified by the
-flags argument on the imclient connection.
-Currently the only flag allowed is
-IMCLIENT_CONN_NONSYNCLITERAL (this flag indicates
-that the server supports non-synchronizing literals
-described by the LITERAL+ extension).
-
-
-imclient_clearflags()
-
-Clears the flags specified by
-the flags argument on the imclient
-connection.
-
-
-imclient_servername()
-
-Returns a char * pointer to the
-name of the server connected to by imclient.
-
-
-imclient_addcallback()
-
-Adds an untagged data callback
-to the imclient connection. The function
-imclient_addcallback takes callbacks of the type
-imclient_proc_t which is defined to be:
-
-typedef void imclient_proc_t
-(struct imclient *imclient, void *rock, struct
-imclient_reply *reply);
-
-and struct imclient_reply
-* is defined to be:
-
-struct imclient_reply {
-
-char *keyword; 
-long msgno; 
-char *text;
-
-};
-
-After the first
-argument imclient, there can be zero or more
-instances of the set of keyword, flags, proc, and
-rock, each adding or changing a single callback. Each
-instance adds or changes the callback for keyword.
-The argument, flags, specifies information about the
-parsing of the untagged data. proc and rock
-specify the callback function and rock to invoke when the
-untagged data is received. proc may be a null
-pointer, in which case no function is invoked. The callback
-function may not call the functions imclient_close(),
-imclient_send(), imclient_eof(),
-imclient_processoneevent(), or
-imclient_authenticate() on the connection. The
-callback function may over write the text of untagged
-data.
-
-imclient_send()
-
-Sends a new command to the
-imclient connection. finishproc and
-finnishrock are the function and rock called when the
-command completes. functionproc may be a null
-pointer, in which case no callback is made. The call back
-function may not call the functions imclient_close(),
-imclient_send(), imclient_eof(),
-imclient_processoneevent(), or
-imclient_authenticate() on the connection. The
-argument, fmt , is a print like specification of the
-command. It must not include the tag as the tag is
-automatically added by imclient_send(). The defined
-%-sequences are:
-
-%% for % 
-%a for an IMAP atom 
-%s for an astring (which will be quoted or literalized
-as needed) 
-%d for a decimal 
-%u for an unsigned decimal 
-%v for #astring (argument is a null-terminated array of
-char * which are written as space separated
-astrings)
-
-
-imclient_getselectinfo()
-
-Gets the information for
-calling select(2). fd is filled in with the file
-descriptor to select(2) for read. wanttowrite
-is filled in with a nonzero value if select should be used
-for write as well.
-
-
-imclient_processoneevent()
-
-Processes one input or output
-event on the imclient connection.
-
-
-imclient_authenticate()
-
-Authenticates the
-imclient connection using one of the mechanisms in
-availmech. The argument, user, if not NULL,
-specifies the user to authenticate as. If the user is NULL,
-the current user is used. The argument protallowed is
-a bitmask of permissible protection mechanisms. 
-On success, 0 is returned. On failure (i.e., &quot;BAD&quot;
-keyboard, or no authentication mechanisms worked), 1 is
-returned. On extreme failure (premature &quot;OK&quot;), 2
-is returned.
-
-imclient_havetls()
-
-Returns a Boolean indicating
-whether the imclient library was compiled with TLS
-(SSL) support. If so, imclient_starttls() may be used
-to secure the IMAP connection.
-
-imclient_starttls()
-
-Issues a STARTTLS command on an
-existing IMAP connection and negotiates the secure link. The
-cert_file and key_file arguments specify the
-client certificate and secret key to use to authenticate
-ourselves to the server. If client authentication is not
-needed, set both of these arguments to NULL.
-
-The
-CAfile and CApath arguments specify a file or
-directory, respectively, of CA certificates for validating
-server certificates. (See
-SSL_CTX_load_verify_locations(3) for details.) If
-both of these are NULL, the client will be unable to
-validate the server&rsquo;s certificate, in which case the
-connection may succeed but a warning will be printed to
-stdout.
-
-<h2>EXAMPLES
-<a name="EXAMPLES"></a>
-</h2>
-
-
-The following
-code is a possible skeletion of imclient that relies
-on Kerberos to do authentication. This code preforms an IMAP
-CAPABILITY request and prints out the result.
-
-struct
-sasl_client; 
-#include &lt;cyrus/xmalloc.h&gt; /* example uses xstrdup */
- 
-#include &lt;cyrus/sasl.h&gt; 
-#include &lt;cyrus/imclient.h&gt; 
-#include &lt;stdio.h&gt;
-
-extern struct
-sasl_client krb_sasl_client;
-
-struct
-sasl_client *login_sasl_client = { 
-&amp;krb_sasl_client, 
-NULL 
-}; 
-struct imclient *imclient; 
-char server = &quot;cyrus.andrew.cmu.edu&quot; ; 
-char port = &quot;imap&quot;;
-
-void
-fatal(char* message, int rc) { 
-fprintf(stderr, &quot;fatal error: %s\n&quot;, message);
- 
-exit(rc); 
-}
-
-static void
-callback_capability(struct imclient *imclient,
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="7%">
-</td>
-<td width="62%">
-
-
-void *rock,</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="7%">
-</td>
-<td width="62%">
-
-
-struct imclient_reply *reply) {</td></tr>
-</table>
-
-if (reply-&gt;text != NULL)
-{
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="92%">
-
-
-*((char**)rock) = xstrdup( reply-&gt;text );</td></tr>
-</table>
-
-} 
-}
-
-static void
-end_command (struct imclient *connection, void*
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-rock, struct imclient_reply *inmsg) {</td></tr>
-</table>
-
-(*(int*)rock)--; 
-}
-
-main() { 
-char* capability_string; 
-int nc;
-
-if
-(imclient_connect(&amp;imclient, server, port)) {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="8%">
-
-
-fprintf(stderr,</td>
-<td width="77%">
-</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="77%">
-
-
-&quot;error: Couldn&rsquo;t connect to %s
-%s\n&quot;, </td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="77%">
-
-
-server, port);</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="8%">
-
-
-exit(1);</td>
-<td width="77%">
-</td></tr>
-</table>
-
-}
-
-if
-(imclient_authenticate(imclient, login_sasl_client,
-&quot;imap&quot;
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-/* service */,</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-NULL /* user */, SASL_PROT_ANY)) {</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%"></td>
-<td width="8%">
-
-
-exit(1);</td>
-<td width="8%"></td>
-<td width="69%">
-</td></tr>
-</table>
-
-}
-
-
-imclient_addcallback(imclient,
-&quot;CAPABILITY&quot;,
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-CALLBACK_NOLITERAL,</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-callback_capability,</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-&amp;capability_string,</td></tr>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="8%">
-</td>
-<td width="69%">
-
-
-NULL);</td></tr>
-</table>
-
-nc = 1;
-
-
-imclient_send(imclient,
-end_command,
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="7%">
-</td>
-<td width="8%">
-</td>
-<td width="77%">
-
-
-(void*) &amp;nc, &quot;CAPABILITY&quot;);</td></tr>
-</table>
-
-while(nc &gt;
-0) {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="92%">
-
-
-imclient_processoneevent(imclient);</td></tr>
-</table>
-
-}
-
-if
-(strstr(&quot;LITERAL+&quot;, capability_string)) {
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="92%">
-
-
-imclient_setflags(imclient,
-IMCLIENT_CONN_NONSYNCLITERAL); </td></tr>
-</table>
-
-}
-
-
-imclient_send(imclient,
-NULL, NULL, &quot;LOGOUT&quot;); 
-imclient_close(imclient);
-
-
-printf(&quot;capability
-text is: %s\n&quot;, capability_string);
-
-
-free(capability_string);
- 
-}
-
-<h2>BUGS
-<a name="BUGS"></a>
-</h2>
-
-
-No known
-bugs.
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-cyradm,
-imapd, imspd, RFC2033 (IMAP LITERAL+ extension), RFC2060
-(IMAP4rev1 specification), and select(2)
-
-<h2>KEYWORDS
-<a name="KEYWORDS"></a>
-</h2>
-
-
-IMAP, ACAP,
-IMSP, Kerberos, Authentication
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/imtest.1.html Deleted

@@ -1,289 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IMTEST</title>
-
-</head>
-<body>
-
-<h1 align="center">IMTEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-imtest &minus;
-interactive IMAP test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-imtest 
-&minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;s &minus;q 
- &minus;c &minus;i &minus;z 
- &minus;v &minus;I file 
-&minus;x file 
- &minus;X file &minus;o
-option=value hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-imtest
-is a utility that allows you to authenticate to a IMAP or
-IMSP server and interactively issue commands to it. Once
-authenticated you may issue any IMAP or IMSP command by
-simply typing it in. It is capable of multiple SASL
-authentication mechanisms and handles encryption layers
-transparently. This utility is often used for testing the
-operation of a imsp or imap server. Also those developing
-IMAP clients find it useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to imap as defined in
-/etc/services.
-
--m mechanism
-
-Force imtest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen. Specify login to use the LOGIN command
-instead of AUTHENTICATE.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force imtest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable IMAP over SSL (imaps).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--q</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable IMAP COMPRESSion (before the last authentication
-attempt). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--I file
-
-Echo the PID of the running
-process into file (This can be useful with -X).
-
--x file
-
-Open the named socket for the
-interactive portion
-
--X file
-
-Like -x, only close all file
-descriptors &amp; daemonize the process.
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--z</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Timing test.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/installsieve.1.html Deleted

@@ -1,110 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>INSTALLSIEVE</title>
-
-</head>
-<body>
-
-<h1 align="center">INSTALLSIEVE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-installsieve
-&minus; user utility for managing sieve scripts
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-installsieve
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-installsieve
-is a utility that allows users to manage their sieve scripts
-kept on the server.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
--v
-&lt;name&gt; View script with the given name. The script
-if retrieved sucessfully is output to standard output.
-
--l List
-all of the scripts currently on the server. If one of the
-scripts is active a arrow is printed indicating that it is
-the active script.
-
--p
-&lt;port&gt; Port to connect to. If left off this
-defaults to &quot;sieve&quot; as defined in
-/etc/services.
-
--i
-&lt;file&gt; Install a file onto the server. If a script
-with the same name already exists on the server it is
-overwritten. Upon sucessfully putting the script on the
-server the script is set active. If &lt;file&gt; has the
-extension .script it is chopped when put on the server since
-sieve names may not contain a &rsquo;.&rsquo;.
-
--a
-&lt;name&gt; Set &lt;name&gt; as the active script. The
-list of available names can be obtained from the
-&rsquo;-l&rsquo; option..
-
--d
-&lt;name&gt; Delete the sieve script on the server with
-&lt;name&gt;.
-
--m
-&lt;mechanism&gt; Force installsieve to use
-&lt;mechanism&gt; for authentication. If not specified the
-strongest authentication mechanism is chosen.
-
--g
-&lt;name&gt; Get the sieve script with &lt;name&gt; and
-save it to disk with a &quot;.script&quot; extension. If a
-file with that name already exists it is overwritten.
-
--u
-&lt;user&gt; Userid/Authname to use for authentication;
-by default, the current user.
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/ipurge.8.html Deleted

@@ -1,208 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>IPURGE</title>
-
-</head>
-<body>
-
-<h1 align="center">IPURGE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-ipurge &minus;
-delete mail from IMAP mailbox or partition based on age or
-size
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-ipurge 
-&minus;f &minus;C config-file 
-&minus;x &minus;X &minus;i 
-&minus;s &minus;o 
- &minus;d days | &minus;b bytes
-| &minus;k Kbytes | &minus;m
-Mbytes 
- mailbox-pattern... 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Ipurge
-deletes messages from the mailbox(es) specified by
-mailbox-pattern that are older or larger than
-specified by the -d, -b, -k or
--m options. If no mailbox-pattern is given,
-ipurge works on all mailboxes. If the -x
-option is given, the message age and size MUST match exactly
-those specified by -d, -b, -k or
--m. The are no default values, and at least one of
--d, -b, -k or -m MUST be
-specified.
-
-Ipurge
-by default only deletes mail below shared folders, which
-means that mails in mailbox(es) below INBOX.* and user.*
-stay untouched. Use the option -f to also delete mail
-in mailbox(es) below these folders.
-
-Ipurge
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;f</td>
-<td width="8%"></td>
-<td width="61%">
-
-
-Force deletion of mail in
-all mailboxes.</td>
-<td width="17%">
-</td></tr>
-</table>
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;d days
-
-Age of message in
-days.
-
-&minus;b
-bytes
-
-Size of message in
-bytes.
-
-&minus;k
-Kbytes
-
-Size of message in
-Kbytes (2^10 bytes).
-
-&minus;m
-Mbytes
-
-Size of message in
-Mbytes (2^20 bytes).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;x</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Perform an exact match on age or size (instead of older
-or larger).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;X</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Use delivery time instead of Date: header for date
-matches </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;i</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Invert match logic: -x means not equal, date is for
-newer, size is for smaller</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;s</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Skip over messages that have the \Flagged flag set.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;o</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Only purge messages that have the \Deleted flag set.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/krb.equiv.5.html Deleted

@@ -1,72 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>KRB.EQUIV</title>
-
-</head>
-<body>
-
-<h1 align="center">KRB.EQUIV</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#SAMPLE FILE">SAMPLE FILE</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-
-/etc/krb.equiv
-&minus; Kerberos equivalences
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-krb.equiv
-contains zero or more lines, each of which describes a
-mapping of a kerberos principal (userid@host) to a
-local user (userid or alias). Each line of the file
-consists of two fields, separated by at least one whitespace
-character; other blanks are ignored. The first field is the
-kerberos principal name to remap, and the second is the name
-of the corresponding local user.
-
-<h2>SAMPLE FILE
-<a name="SAMPLE FILE"></a>
-</h2>
-
-
-
-tyq4@ANDY.CMU.EDU
-tyq4 
-tyq4@DEANNA.ORG tyq4 
-ty347@ECE.CMU.EDU tyq4 
-jj12@ANDY.CMU.EDU tick 
-tick@DEANNA.ORG tick 
-jy9o@ANDY.CMU.EDU jyager 
-jyager@CS.CMU.EDU jyager
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/lmtpd.8.html Deleted

@@ -1,143 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>LMTPD</title>
-
-</head>
-<body>
-
-<h1 align="center">LMTPD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-lmtpd &minus;
-LMTP server process
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-lmtpd 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
-&minus;D 
- &minus;a 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Lmtpd is
-an LMTP server used to deliver mail to the IMAP mailstore.
-It accepts commands on its standard input and responds on
-its standard output. It MUST be invoked by master(8)
-with those descriptors attached to a remote client
-connection.
-
-Lmtpd
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;D</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Run external debugger specified in debug_command.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;a</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Preauthorize connections initiated on an internet
-socket, instead of requiring LMTP AUTH. This should only be
-used for connections coming from trusted hosts.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/lmtptest.1.html Deleted

@@ -1,237 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>LMTPTEST</title>
-
-</head>
-<body>
-
-<h1 align="center">LMTPTEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-lmtptest
-&minus; interactive LMTP test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-lmtptest
- &minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;c 
- &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-lmtptest
-is a utility that allows you to authenticate to a LMTP
-server and interactively issue commands to it. Once
-authenticated you may issue any LMTP command by simply
-typing it in. It is capable of multiple SASL authentication
-mechanisms and handles encryption layers transparently. This
-utility is often used for testing the operation of a lmtp
-server. Also those developing LMTP clients find it
-useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to lmtp as defined in
-/etc/services.
-
--m mechanism
-
-Force lmtptest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force lmtptest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-lmtpd(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/master.8.html Deleted

@@ -1,214 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>MASTER</title>
-
-</head>
-<body>
-
-<h1 align="center">MASTER</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#CONFIGURATION">CONFIGURATION</a> 
-<a href="#NOTES">NOTES</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-master &minus;
-master Cyrus process
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-master 
-&minus;C alternate imapd.conf 
-&minus;M alternate cyrus.conf 
-&minus;l listen queue &minus;p
-pidfile &minus;P snmp agentx ping
-interval &minus;j janitor period 
-&minus;d &minus;D &minus;x
-snmp agentx socket 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Master
-is the process that controls all of the Cyrus processes.
-This process is responsible for creating all imapd, pop3d,
-lmtpd and sieved child processes. This process also
-initializes the Berkeley DB code and performs scheduled
-cleanup/maintenance.
-
-If this process
-dies, then no new sessions will be started.
-
-It kills itself
-and all child processes when it receives a SIGTERM.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-alternate imapd.conf
-
-Specifies an alternate
-imapd.conf for use by master (note that this will not affect
-any sub-processes spawned by master, you should specify
-those specifically in the respective entries in
-cyrus.conf).
-
-&minus;M alternate
-cyrus.conf
-
-Specifies an alternate
-cyrus.conf for use by master.
-
-&minus;l listen queue
-backlog
-
-Increase the listen queue
-backlog. By default, the listen queue is set to 32. On
-systems with a high connection rate, it may be desirable to
-increase this value. refer to listen(2) for
-details.
-
-&minus;j janitor
-full-sweeps per second
-
-Sets the amount of times per
-second the janitor should sweep the entire child table.
-Leave it at the default of 1 unless you have a really high
-fork rate (and you have not increased the child hash table
-size when you compiled Cyrus from its default of 10000
-entries).
-
-&minus;p
-pidfile
-
-Use pidfile as the
-pidfile. If not specified, defaults to
-/var/run/cyrus-master.pid
-
-&minus;P snmp agentx
-ping interval
-
-Sets the amount on time in
-seconds the subagent will try and reconnect to the master
-agent (snmpd) if it ever becomes (or starts) disconnected.
-Requires net-snmp 5.0 or higher.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;d</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Start in daemon mode (run in background and disconnect
-from controlling terminal).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;D</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Don&rsquo;t close stdin/stdout/stderr. Primiarly useful
-for debugging.</td></tr>
-</table>
-
-&minus;x snmp agentx
-socket
-
-Address the master agent (most
-likely snmpd) listens on. Requires net-snmp 5.0 or
-higher.
-
-<h2>CONFIGURATION
-<a name="CONFIGURATION"></a>
-</h2>
-
-
-Upon execution,
-master reads its configuration information out of the
-cyrus.conf(5) file.
-
-Master
-rereads its configuration file when it receives a hangup
-signal, SIGHUP. Services and events may be added, deleted or
-modified when the configuration file is reread. Any active
-services removed from the configuration file will be allowed
-to run until completion.
-
-<h2>NOTES
-<a name="NOTES"></a>
-</h2>
-
-
-The environment
-variable CYRUS_VERBOSE can be set to log additional
-debugging information. Setting the value to 1 results in
-base level logging. Setting it higher results in more log
-messages being generated.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/cyrus.conf,
-/etc/imapd.conf, /var/run/cyrus-master.pid
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-cyrus.conf(5),
-imapd.conf(5), imapd(8), pop3d(8),
-lmtpd(8), timsieved(8), idled(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/mbexamine.8.html Deleted

@@ -1,132 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>MBEXAMINE</title>
-
-</head>
-<body>
-
-<h1 align="center">MBEXAMINE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-mbexamine
-&minus; examine a cyrus-format mailbox
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-mbexamine
- &minus;C config-file &minus;u uid
- mailbox... 
-mbexamine &minus;C config-file 
-&minus;s seqnum mailbox... 
-mbexamine &minus;C config-file 
-&minus;q mailbox...
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Mbexamine
-will examine the header, index, and cache files of a cyrus
-format mailbox and dump the information contained therein.
-It can also limit its output to a specific uid or sequence
-number, through use of the -s and -u switches.
-Mbexamine reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. It uses the mboxlist database to locate the
-mailbox on disk.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;s</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Dump information for the given sequence number only.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;u</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Dump information for the given uid only.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;q</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Compare the quota usage in cyrus.index to the actual
-message file sizes and report any differences. If there are
-differences, the mailbox SHOULD be reconstructed.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/mbpath.8.html Deleted

@@ -1,102 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>MBPATH</title>
-
-</head>
-<body>
-
-<h1 align="center">MBPATH</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-mbpath &minus;
-translate mailbox names to filesystem paths
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-mbpath 
-&minus;C config-file &minus;q 
-&minus;s &minus;m 
-mailbox-names... 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Given a mailbox
-name or a space separated list of mailbox names,
-mbpath outputs the filesystem path to the
-mailbox.
-
-Mbpath
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-
-&minus;q
-suppress any error output.
-
-
-&minus;s
-if any error occurs, stop processing the list of mailboxes
-and exit.
-
-
-&minus;m
-output the path to the metadata files (if different from the
-message files).
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/mupdatetest.1.html Deleted

@@ -1,242 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>MUPDATETEST</title>
-
-</head>
-<body>
-
-<h1 align="center">MUPDATETEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-mupdatetest
-&minus; interactive MUPDATE test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-mupdatetest
- &minus;p port &minus;m
-mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;q 
- &minus;c &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-mupdatetest
-is a utility that allows you to authenticate to a MUPDATE
-server and interactively issue commands to it. Once
-authenticated you may issue any MUPDATE command by simply
-typing it in. It is capable of multiple SASL authentication
-mechanisms and handles encryption layers transparently. This
-utility is often used for testing the operation of a mupdate
-server. Note that you must be an admin in order to
-authenticate to an mupdate server.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;p
-port
-
-Port to connect to. If left off
-this defaults to mupdate as defined in
-/etc/services.
-
--m mechanism
-
-Force mupdatetest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force mupdatetest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to fast reauth (e.g. DIGEST-MD5), if
-possible. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--q</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable MUPDATE COMPRESSion (before the last
-authentication attempt).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-mupdate(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/nntpd.8.html Deleted

@@ -1,200 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>NNTPD</title>
-
-</head>
-<body>
-
-<h1 align="center">NNTPD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-nntpd &minus;
-NNTP server process
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-nntpd 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
-&minus;D 
- &minus;s &minus;r &minus;f 
- &minus;p ssf 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Nntpd is
-a NNTP server. It accepts commands on its standard input and
-responds on its standard output. It MUST invoked by
-master(8) with those descriptors attached to a remote
-client connection.
-
-Nntpd
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. The optional newsprefix option specifies a
-prefix to be prepended to newsgroup names to make the
-corresponding IMAP mailbox names. The optional
-newspostuser option specifies the special userid to
-be used when contructing the To: header address for
-following up to articles when read via IMAP. The optional
-newspeer option specifies the fully qualified
-hostname of the upstream news server to which articles are
-fed. The optional allownewnews option enables the
-NNTP NEWNEWS command. NOTE: For servers with a large volume
-of articles, the NEWNEWS command can be expensive.
-
-If the
-directory log/user exists under the directory
-specified in the configdirectory configuration
-option, then nntpd will create protocol telemetry
-logs for sessions authenticating as user. The
-telemetry logs will be stored in the log/user
-directory with a filename of the nntpd
-process-id.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;D</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Run external debugger specified in debug_command.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Serve NNTP over SSL (nntps). All data to and from
-nntpd is encrypted using the Secure Sockets
-Layer. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;r</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Only allow NNTP reader commands. Permitted clients will
-only be allowed to read/post articles.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;f</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Only allow NNTP feeder commands. Permitted clients will
-only be allowed to feed articles (no reading).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;p ssf</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Tell nntpd that an external layer exists. An SSF
-(security strength factor) of 1 means an integrity
-protection layer exists. Any higher SSF implies some form of
-privacy protection.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/nntptest.1.html Deleted

@@ -1,249 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>NNTPTEST</title>
-
-</head>
-<body>
-
-<h1 align="center">NNTPTEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-nntptest
-&minus; interactive NNTP test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-nntptest
- &minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;s &minus;c 
- &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-nntptest
-is a utility that allows you to authenticate to a NNTP
-server and interactively issue commands to it. Once
-authenticated you may issue any NNTP command by simply
-typing it in. It is capable of multiple SASL authentication
-mechanisms and handles encryption layers transparently. This
-utility is often used for testing the operation of a nntp
-server. Also those developing NNTP clients find it
-useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to nntp as defined in
-/etc/services.
-
--m mechanism
-
-Force nntptest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen. Specify user to use the AUTHINFO USER/PASS
-commands instead of AUTHINFO SASL.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force nntptest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable NNTP over SSL (nntps).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-nntpd(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/notifyd.8.html Deleted

@@ -1,209 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>NOTIFYD</title>
-
-</head>
-<body>
-
-<h1 align="center">NOTIFYD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#NOTIFICATION METHODS">NOTIFICATION METHODS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-notifyd &minus;
-Cyrus notification server
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-notifyd
- &minus;C config-file &minus;U
-uses &minus;T timeout 
- &minus;D 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Notifyd
-is a daemon started from master(8) that handles notification
-requests on behalf of lmtpd(8). Notifyd accepts the
-request and performs the notification using the method
-specified in the request.
-
-Note that for
-notifyd to run properly you must set proto=udp in its
-cyrus.conf services entry. prefork=1 is also
-recommended.
-
-Notifyd
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. The notifysocket option is used to specify
-the Unix domain socket to listen on for notifications.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;D</td>
-<td width="8%"></td>
-<td width="75%">
-
-
-Run external debugger specified in debug_command.</td>
-<td width="3%">
-</td></tr>
-</table>
-
-<h2>NOTIFICATION METHODS
-<a name="NOTIFICATION METHODS"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-null</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Ignore the notification
-request. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-log</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Log the notification to syslog (for testing).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-mailto</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Email the notification. This method can ONLY be used in
-a Sieve &rsquo;notify&rsquo; action as it requires a
-mailto: URL to be specified as an :option.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-zephyr</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Send the notification as a zephyrgram. If used in a
-Sieve &rsquo;notify&rsquo; action, additional recipients can
-be specified as :options.</td></tr>
-</table>
-
-external
-
-Send the notification via an
-external program. The path to the program is specified using
-the notify_external option in the configuration
-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-Default configuration file.
-
-/etc/cyrus.conf
-
-Cyrus Master process
-configuration file.
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-cyrus.conf, master(8), lmtpd(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/pop3d.8.html Deleted

@@ -1,178 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>POP3D</title>
-
-</head>
-<body>
-
-<h1 align="center">POP3D</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-pop3d &minus;
-POP3 server process
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-pop3d 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
-&minus;D 
- &minus;s &minus;k &minus;p
-ssf 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Pop3d is
-a POP3 server. It accepts commands on its standard input and
-responds on its standard output. It MUST invoked by
-master(8) with those descriptors attached to a remote
-client connection.
-
-Pop3d
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-If the
-directory log/user exists under the directory
-specified in the configdirectory configuration
-option, then pop3d will create protocol telemetry
-logs for sessions authenticating as user. The
-telemetry logs will be stored in the log/user
-directory with a filename of the pop3d
-process-id.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;D</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Run external debugger specified in debug_command.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Serve POP3 over SSL (pop3s). All data to and from
-pop3d is encrypted using the Secure Sockets
-Layer. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;k</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Serve MIT&rsquo;s KPOP (Kerberized POP) protocol
-instead. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;p ssf</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Tell pop3d that an external layer exists. An SSF
-(security strength factor) of 1 means an integrity
-protection layer exists. Any higher SSF implies some form of
-privacy protection.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/pop3test.1.html Deleted

@@ -1,249 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>POP3TEST</title>
-
-</head>
-<body>
-
-<h1 align="center">POP3TEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-pop3test
-&minus; interactive POP3 test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-pop3test
- &minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;s &minus;c 
- &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-pop3test
-is a utility that allows you to authenticate to a POP3
-server and interactively issue commands to it. Once
-authenticated you may issue any POP3 command by simply
-typing it in. It is capable of multiple SASL authentication
-mechanisms and handles encryption layers transparently. This
-utility is often used for testing the operation of a pop3
-server. Also those developing POP3 clients find it
-useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to pop3 as defined in
-/etc/services.
-
--m mechanism
-
-Force pop3test to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen. Specify user to use the USER/PASS commands
-or apop to use the APOP command instead of AUTH.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force pop3test to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable POP3 over SSL (pop3s).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-pop3d(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/quota.8.html Deleted

@@ -1,122 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>QUOTA</title>
-
-</head>
-<body>
-
-<h1 align="center">QUOTA</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-quota &minus;
-report and optionally fix quota usage
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-quota 
-&minus;C config-file &minus;d
-domain &minus;f 
-mailbox-prefix... 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-Quota
-generates a report listing quota roots, giving their limits
-and usage. If the &minus;f option is given,
-quota first fixes any inconsistencies in the quota
-subsystem, such as mailboxes with the wrong quota root or
-quota roots with the wrong quota usage reported. If an
-optional domain is given, the quota listing (and
-inconsistency fixing) is performed in that domain rather
-than the default domain. If any optional
-mailbox-prefix arguments are given, the quota listing
-(and inconsistency fixing) is limited to quota roots with
-names that start with one of the given prefixes.
-
-Running
-quota with both the &minus;f option and
-mailbox-prefix arguments is not recommended.
-
-Quota
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;d
-domain
-
-List/fix quotas in
-domain.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;f</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Fix any inconsistencies in the quota subsystem before
-generating a report.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/reconstruct.8.html Deleted

@@ -1,300 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>RECONSTRUCT</title>
-
-</head>
-<body>
-
-<h1 align="center">RECONSTRUCT</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#EXAMPLES">EXAMPLES</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-reconstruct
-&minus; reconstruct mailboxes
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-reconstruct
- &minus;C config-file &minus;p
-partition &minus;x &minus;r 
-&minus;f 
- &minus;k &minus;s &minus;g 
- &minus;G &minus;R &minus;o 
- &minus;O mailbox... 
-reconstruct &minus;C config-file 
-&minus;m
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Reconstruct
-rebuilds one or more IMAP mailboxes. When invoked with the
-&minus;m switch, it rebuilds the master mailboxes
-file. It can be used to recover from almost any sort of data
-corruption.
-
-If
-Reconstruct can find existing header and index files,
-it attempts to preserve any data in them that is not
-derivable from the message files themselves. The state
-reconstruct attempts to preserve includes the flag
-names, flag state, and internaldate. Reconstruct
-derives all other information from the message files.
-
-
-Reconstruct
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C. Any mailbox directory underneath the path
-specified in the partition-news configuration option
-is assumed to be in news format.
-
-
-Reconstruct
-does not adjust the quota usage recorded in any quota root
-files. After running reconstruct, it is advisable to
-run quota(8) with the &minus;f switch in order
-to fix the quota root files.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;p
-partition
-
-Search for the listed
-(non-existant) mailboxes on the indicated partition. Create
-the mailboxes in the database in addition to reconstructing
-them. (not compatible with the use of wildcards)
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;x</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-When processing a mailbox which is not in the mailbox
-list (e.g. via the -p or -f options), do not import the
-metadata from the mailbox, instead create it anew (this
-specifically affects at least the mailbox&rsquo;s seen state
-unique identifier, user flags, and ACL).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;r</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Recursively reconstruct all sub-mailboxes of the
-mailboxes or mailbox prefixes given as arguments.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;f</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Examine the filesystem underneath mailbox, adding all
-directories with a cyrus.header found there as new
-mailboxes. Useful for restoring mailboxes from backups.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;s</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Don&rsquo;t stat underlying files. This makes
-reconstruct run faster, at the expense of not noticing some
-issues (like zero byte files or size mistmatches).
-&quot;reconstruct -s&quot; should be quite fast.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;n</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Don&rsquo;t make any changes. This gives equivalent
-behaviour to chk_cyrus where problems are reported,
-but not fixed.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;G</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Force re-parsing of the underlying message (checks GUID
-correctness). Reconstruct with -G should fix all possible
-individual message issues, including corrupted data
-files. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;R</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Perform a UID upgrade operation on GUID mismatch files.
-Use this option if you think your index is corrupted rather
-than your message files, or if all backup attempts have
-failed and you&rsquo;re happy to be served the missing
-files. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;U</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Use this option if you have corrupt message files in
-your spool and have been unable to restore them from backup.
-This will make the mailbox IOERROR free and fix replication.
-WARNING this deletes corrupt message files for ever -
-so make sure you&rsquo;ve exhausted other options first!</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--o</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Ignore odd files in your mailbox disk directories.
-Probably useful if you are using some tool which adds
-additional tracking files.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--O</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Delete odd files. This is the opposite of
-&rsquo;-o&rsquo;. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;m</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-NOTE: CURRENTLY UNAVAILABLE</td></tr>
-</table>
-
-Rebuild the mailboxes
-file. Use whatever data in the existing mailboxes
-file it can scavenge, then scans all partitions listed in
-the imapd.conf(5) file for additional mailboxes.
-
-<h2>EXAMPLES
-<a name="EXAMPLES"></a>
-</h2>
-
-
-You want to
-reconstruct the index files for a user, you have recovered a
-deleted mail file from backup and given it a suitable name
-(eg user/ben-lacy/33.), but it is not visible since it is
-not indexed:
-
-reconstruct -r
-user.ben-lacy
-
-If you have the
-unixhierarchysep:yes option set in
-/etc/imapd.conf you would need to run:
-
-reconstruct -r
-user/ben.lacy
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/rmnews.8.html Deleted

@@ -1,91 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>RMNEWS</title>
-
-</head>
-<body>
-
-<h1 align="center">RMNEWS</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-rmnews &minus;
-expunge and remove news articles
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-rmnews
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Rmnews
-reads article data from the standard input. It then expunges
-and removes the listed articles. Rmnews is designed
-to be used by InterNetNews to remove canceled, superseded,
-and expired news articles.
-
-The input is
-processed as an INN expirerm file listing or an INN
-cancel stream written as a &lsquo;&lsquo;WC&rsquo;&rsquo;
-entry in the newsfeeds(5) file. This data consists of
-lines of text, each containing a list of relative article
-pathnames, with a single space between entries. If a listed
-file is contained in an IMAP news mailbox, it is expunged
-out of that mailbox. In any case, each listed file is
-unlinked.
-
-Rmnews
-reads its configuration options out of the
-imapd.conf(5) file. The optional newsprefix
-option specifies a prefix to be prepended to newsgroup names
-to make the corresponding IMAP mailbox names. The required
-partition-news option specifies the pathname prefix
-to the IMAP news mailboxes. The value of
-partition-news concatenated with the
-dots-to-slashes-converted value of newsprefix must be
-the pathname of the news spool directory.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/sieveshell.1.html Deleted

@@ -1,99 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>sieveshell - remotely manipulate sieve scripts</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body style="background-color: white">
-
-
-
-<div name="index">
-<a name="__index__"></a>
-
-<ul>
-
-	<li><a href="#name">NAME</a></li>
-	<li><a href="#synopsis">SYNOPSIS</a></li>
-	<li><a href="#description">DESCRIPTION</a></li>
-	<li><a href="#options">OPTIONS</a></li>
-	<li><a href="#references">REFERENCES</a></li>
-	<li><a href="#author">AUTHOR</a></li>
-</ul>
-
-<hr name="index" />
-</div>
-
-
-
-
-<h1><a name="name">NAME</a></h1>
-sieveshell - remotely manipulate sieve scripts
-
-
-<hr />
-<h1><a name="synopsis">SYNOPSIS</a></h1>
-sieveshell --user=user --authname=authname 
---realm=realm --exec=script server:port
-sieveshell --help
-
-
-<hr />
-<h1><a name="description">DESCRIPTION</a></h1>
-sieveshell allows users to manipulate their scripts on a remote
-server. It works via MANAGESIEVE, a work in progress.
-The following commands are recognized:
-list list scripts on server.
-put &lt;filename&gt; upload script to server.
-get &lt;name&gt; &lt;filename&gt; get script. if no filename display to stdout
-delete &lt;name&gt; delete script.
-activate &lt;name&gt; activate script.
-deactivate deactivate all scripts.
-
-
-<hr />
-<h1><a name="options">OPTIONS</a></h1>
-<dl>
-<dt><a name="u_user_user_user" class="item">-u user, --user=user</a></dt>
-
-<dd>
-The authorization name to request; by default, derived from the
-authentication credentials.
-</dd>
-<dt><a name="a_authname_authname_authname" class="item">-a authname, --authname=authname</a></dt>
-
-<dd>
-The user to use for authentication (defaults to current user).
-</dd>
-<dt><a name="r_realm_realm_realm" class="item">-r realm, --realm=realm</a></dt>
-
-<dd>
-The realm to attempt authentication in.
-</dd>
-<dt><a name="e_script_exec_script" class="item">-e script, --exec=script</a></dt>
-
-<dd>
-Instead of working interactively, run commands from script, and
-exit when done.
-</dd>
-</dl>
-
-
-<hr />
-<h1><a name="references">REFERENCES</a></h1>
-MANAGESIEVE Martin, T.; &quot;A Protocol for Remotely Managing Sieve
-Scripts&quot;, draft-ietf-managesieve-03.txt, Mirapoint, Inc.; May 2001,
-work in progress.
-
-
-<hr />
-<h1><a name="author">AUTHOR</a></h1>
-Tim Martin &lt;<a href="mailto:tmartin@mirapoint.com">tmartin@mirapoint.com</a>&gt;, and the rest of the Cyrus
-team &lt;<a href="mailto:cyrus-bugs@andrew.cmu.edu">cyrus-bugs@andrew.cmu.edu</a>&gt;.
-
-</body>
-
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/sivtest.1.html Deleted

@@ -1,235 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SIVTEST</title>
-
-</head>
-<body>
-
-<h1 align="center">SIVTEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-sivtest &minus;
-interactive MANAGESIEVE test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-sivtest
- &minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;c 
- &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-sivtest
-is a utility that allows you to authenticate to a
-MANAGESIEVE server and interactively issue commands to it.
-Once authenticated you may issue any MANAGESIEVE command by
-simply typing it in. It is capable of multiple SASL
-authentication mechanisms and handles encryption layers
-transparently. This utility is often used for testing the
-operation of a timsieved server. Also those developing
-MANAGESIEVE clients find it useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to sieve as defined in
-/etc/services.
-
--m mechanism
-
-Force sivtest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force sivtest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-timsieved(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/smmapd.8.html Deleted

@@ -1,129 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SMMAPD</title>
-
-</head>
-<body>
-
-<h1 align="center">SMMAPD</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-SMMAPD &minus;
-Sendmail socket map daemon
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-smmapd 
-&minus;C config-file &minus;U
-uses &minus;T timeout 
- &minus;D 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-SMMAPD
-is a Sendmail socket map daemon which is used to verify that
-a Cyrus mailbox exists, that it is postable and it is under
-quota. It accepts commands on its standard input and
-responds on its standard output. It MUST be invoked by
-master(8) with those descriptors attached to a remote
-client connection.
-
-SMMAPD
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;U uses
-
-The maximum number of times
-that the process should be used for new connections before
-shutting down. The default is 250.
-
-&minus;T
-timeout
-
-The number of seconds that the
-process will wait for a new connection before shutting down.
-Note that a value of 0 (zero) will disable the timeout. The
-default is 60.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;D</td>
-<td width="8%"></td>
-<td width="75%">
-
-
-Run external debugger specified in debug_command.</td>
-<td width="3%">
-</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-Default configuration file.
-
-/etc/cyrus.conf
-
-Cyrus Master process
-configuration file.
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/smtptest.1.html Deleted

@@ -1,248 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SMTPTEST</title>
-
-</head>
-<body>
-
-<h1 align="center">SMTPTEST</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-smtptest
-&minus; interactive SMTP test program
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-smtptest
- &minus;t keyfile &minus;p
-port &minus;m mechanism 
- &minus;a userid &minus;u
-userid &minus;k num 
-&minus;l num 
- &minus;r realm &minus;f
-file &minus;n num 
-&minus;s &minus;c 
- &minus;i &minus;o
-option=value &minus;v 
-hostname
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-smtptest
-is a utility that allows you to authenticate to a SMTP
-server and interactively issue commands to it. Once
-authenticated you may issue any SMTP command by simply
-typing it in. It is capable of multiple SASL authentication
-mechanisms and handles encryption layers transparently. This
-utility is often used for testing the operation of a smtp
-server. Also those developing SMTP clients find it
-useful.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;t
-keyfile
-
-Enable TLS. keyfile
-contains the TLS public and private keys. Specify
-&quot;&quot; to negotiate a TLS encryption layer but
-not use TLS authentication.
-
-&minus;p port
-
-Port to connect to. If left off
-this defaults to smtp as defined in
-/etc/services.
-
--m mechanism
-
-Force smtptest to use
-mechanism for authentication. If not specified the
-strongest authentication mechanism supported by the server
-is chosen.
-
--a userid
-
-Userid to use for
-authentication; defaults to the current user. This is the
-userid whose password or credentials will be presented to
-the server for verification.
-
--u userid
-
-Userid to use for
-authorization; defaults to the current user. This is the
-userid whose identity will be assumed after authentication.
-NOTE: This is only used with SASL mechanisms that
-allow proxying (e.g. PLAIN, DIGEST-MD5).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--k num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Minimum protection layer required.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--l num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Maximum protection layer to use (0=none;
-1=integrity; etc). For example if you are using the
-KERBEROS_V4 authentication mechanism specifying 0
-will force smtptest to not use any layer and specifying
-1 will force it to use the integrity layer. By
-default the maximum supported protection layer will be
-used. </td></tr>
-</table>
-
--r realm
-
-Specify the realm to
-use. Certain authentication mechanisms (e.g. DIGEST-MD5) may
-require one to specify the realm.
-
--f file
-
-Pipe file into
-connection after authentication.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--n num</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Number of authentication attempts; default = 1. The
-client will attempt to do SSL/TLS session reuse and/or fast
-reauth (e.g. DIGEST-MD5), if possible.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--s</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable SMTP over SSL (smtps).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--c</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Enable challenge prompt callbacks. This will cause the
-OTP mechanism to ask for the the one-time password instead
-of the secret pass-phrase (library generates the correct
-response). </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
--i</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Don&rsquo;t send an initial client response for SASL
-mechanisms, even if the protocol supports it.</td></tr>
-</table>
-
--o
-option=value
-
-Set the SASL option to
-value.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
--v</td>
-<td width="8%"></td>
-<td width="72%">
-
-
-Verbose. Print out more information than usual.</td>
-<td width="6%">
-</td></tr>
-</table>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-sendmail(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/squatter.8.html Deleted

@@ -1,191 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SQUATTER</title>
-
-</head>
-<body>
-
-<h1 align="center">SQUATTER</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-squatter
-&minus; create SQUAT indexes for mailboxes
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-squatter
- &minus;C config-file &minus;r 
-&minus;s &minus;i &minus;a 
-&minus;v mailbox...
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Squatter
-creates a new SQUAT index for one or more IMAP mailboxes.
-The SQUAT index is a unified index of all of the header and
-body text of each message a given mailbox. This index is
-used to significantly reduce IMAP SEARCH times on a
-mailbox.
-
-
-Squatter
-creates an index of ALL messages in the mailbox, not just
-those since the last time that it was run (i.e., it does NOT
-do incremental updates). Any messages appended to the
-mailbox after squatter is run, will NOT be included
-in the index. To include new messages in the index,
-squatter must be run again. For large and active
-mailboxes, it is recommended to run squatter
-periodically as an EVENT in cyrus.conf(5)
-
-NOTE:
-Messages and mailboxes that have not been indexed CAN still
-be SEARCHed, just not as quickly as those with a SQUAT
-index.
-
-
-Squatter
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;r</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Recursively create indexes for all sub-mailboxes of the
-mailboxes or mailbox prefixes given as arguments.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;s</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Skip mailboxes whose index file is older than their
-current squat file (within a small time delta).</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;i</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Incremental updates where squat indexes already
-exist. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;a</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Only create indexes for mailboxes which have the shared
-/vendor/cmu/cyrus-imapd/squat annotation set to
-&quot;true&quot;. </td></tr>
-</table>
-
-The value of
-the /vendor/cmu/cyrus-imapd/squat annotation is
-inherited by all children of the given mailbox, so an entire
-mailbox tree can be indexed (or not indexed) by setting a
-single annotation on the root of that tree with a value of
-&quot;true&quot; (or &quot;false&quot;). If a mailbox does
-not have a /vendor/cmu/cyrus-imapd/squat annotation
-set on it (or does not inherit one), then the mailbox is not
-indexed. In other words, the implicit value of
-/vendor/cmu/cyrus-imapd/squat is
-&quot;false&quot;.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Increase the verbosity of
-progress/status messages.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-/etc/cyrus.conf
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/sync_client.8.html Deleted

@@ -1,287 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SYNC_CLIENT</title>
-
-</head>
-<body>
-
-<h1 align="center">SYNC_CLIENT</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-<a href="#AUTHORS">AUTHORS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-sync_client
-&minus; client side of the synchronization (replication)
-engine
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-sync_client
- &minus;v &minus;l &minus;z 
- &minus;C config-file &minus;S
-servername 
- &minus;f input-file &minus;F
-shutdown_file &minus;w
-wait_interval 
- &minus;t timeout &minus;d
-delay &minus;r &minus;u 
-&minus;m 
- &minus;s objects...
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Sync_client
-is the client side of the replication system. It runs on the
-client (master) system and connects to the target (replica)
-system and generates an appropriate sequence of transactions
-to synchronize the replica system with the master
-system.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Verbose mode.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;l</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Verbose logging mode.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;o</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Only attempt to connect to the backend server once
-rather than waiting up to 1000 seconds before giving up.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;z</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Enable compress. If you set &rsquo;sync_compress&rsquo;
-in the imapd.conf or pass -z to sync_client, the replication
-protocol will attempt to enable deflate compression on the
-connection. </td></tr>
-</table>
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-&minus;S
-servername
-
-Tells sync_client which
-server to communicate with. Overrides the sync_host
-configuration option.
-
-&minus;f
-input-file
-
-In mailbox or user replication
-mode: provides list of users or mailboxes to replicate. In
-rolling replication mode, specifies an alternate log file
-(sync_client will exit after processing the log file).
-
-&minus;F
-shutdown-file
-
-Rolling replication checks for
-this file at the end of each replication cycle and shuts
-down if it is present. Used to request nice clean shutdown
-at first convenient point. The file in question is removed
-on shutdown. Overrides sync_shutdown_file option in
-imapd.conf
-
-&minus;w
-interval
-
-Wait this long before starting.
-Typically used so that we can attach a debugger to one end
-of the replication system or the other.
-
-&minus;t
-timeout
-
-Timeout for single replication
-run in rolling replication. sync_client will
-negotiate a restart after this many seconds. Default: 600
-seconds
-
-&minus;d
-delay
-
-Minimum delay between
-replication runs in rolling replication mode. Larger values
-provide better efficiency as transactions can be merged.
-Smaller values mean that the replica system is more up to
-date and that you don&rsquo;t end up with large blocks of
-replication transactions as a single group. Default: 3
-seconds.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;r</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Rolling (repeat) replication mode. Pick up a list of
-actions recorded by the lmtpd(8), imapd(8), popd(8) and
-nntpd(8) daemons from the file specified in
-sync_log_file. Repeat until sync_shutdwon_file
-appears. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;n</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Use the named channel for rolling replication mode. If
-multiple channels are specified in sync_log_channels
-then use one of them. This option is probably best combined
-with -S to connect to a different server with each
-channel. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;u</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-User mode. Remaining arguments are list of users who
-should be replicated.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;m</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Mailbox mode. Remaining arguments are list of mailboxes
-which should be replicated.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;s</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Sieve mode. Remaining arguments are list of users whose
-Sieve files should be replicated. Principally used for
-debugging purposes: not exposed to
-sync_client(8). </td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-sync_server(8)
-
-<h2>AUTHORS
-<a name="AUTHORS"></a>
-</h2>
-
-
-David Carter
-(dpc22@cam.ac.uk), Ken Murchison (ken@oceana.com)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/sync_reset.8.html Deleted

@@ -1,130 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SYNC_RESET</title>
-
-</head>
-<body>
-
-<h1 align="center">SYNC_RESET</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-<a href="#AUTHORS">AUTHORS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-sync_reset
-&minus; Account reset utility. DANGER.
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-sync_reset
- &minus;C config-file &minus;v 
-&minus;f 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Sync_reset
-is a small utility program to destroy user accounts on a
-system. The only safeguard which is in place is the obligary
-force option.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Verbose mode.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;f</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Force operation. Without this flag sync_reset
-just bails out with an error. Principally here to try and
-prevent accidents with command autorepeat.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-sync_client(8)
-
-<h2>AUTHORS
-<a name="AUTHORS"></a>
-</h2>
-
-
-David Carter
-(dpc22@cam.ac.uk), Ken Murchison (ken@oceana.com)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/sync_server.8.html Deleted

@@ -1,122 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SYNC_SERVER</title>
-
-</head>
-<body>
-
-<h1 align="center">SYNC_SERVER</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-<a href="#AUTHORS">AUTHORS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-sync_server
-&minus; server side of the synchronization (replication)
-engine
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-sync_server
- &minus;C config-file &minus;p
-ssf 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Sync_server
-is the server side of the the replication system. It runs on
-the target (replica) system and listens for connections from
-sync_client which provides instructions for
-synchronizing the replica system with the master system.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-&minus;p ssf</td>
-<td width="2%"></td>
-<td width="78%">
-
-
-Tell sync_server that an external layer exists.
-An SSF (security strength factor) of 1 means an integrity
-protection layer exists. Any higher SSF implies some form of
-privacy protection.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-sync_client(8)
-
-<h2>AUTHORS
-<a name="AUTHORS"></a>
-</h2>
-
-
-David Carter
-(dpc22@cam.ac.uk), Ken Murchison (ken@oceana.com)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/syncnews.8.html Deleted

@@ -1,112 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SYNCNEWS</title>
-
-</head>
-<body>
-
-<h1 align="center">SYNCNEWS</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#BUGS">BUGS</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-syncnews
-&minus; synchronize IMAP news mailboxes with active file
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-syncnews
- &minus;C config-file 
-active-file
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Syncnews
-compares the list of IMAP news mailboxes with the news
-active file. News mailboxes which are not listed in the
-active file are removed. Newsgroups listed in the active
-file but not in the IMAP mailboxes file have IMAP mailboxes
-created.
-
-A newsgroup
-must have a status of &lsquo;&lsquo;y&rsquo;&rsquo;,
-&lsquo;&lsquo;m&rsquo;&rsquo;, or
-&lsquo;&lsquo;n&rsquo;&rsquo; to be considered listed in the
-active file.
-
-
-Syncnews
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>BUGS
-<a name="BUGS"></a>
-</h2>
-
-
-If a newsgroup
-is listed in the active file, but does not have the news
-spool directories created, syncnews will create those
-news spool directories in the process of creating the IMAP
-mailbox. The created directories are likely to then have
-ownership and permissions that do not permit the news server
-to write article files.
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/timsieved.8.html Deleted

@@ -1,106 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>TIMSIEVED</title>
-
-</head>
-<body>
-
-<h1 align="center">TIMSIEVED</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-timsieved
-&minus; CMU hack for getting sieve scripts onto the
-server
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-timsieved
- &minus;C config-file 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-timsieved
-is a server that allows users to remotely manage their sieve
-scripts kept on the server. It accepts commands on its
-standard input and responds on its standard output. It MUST
-be invoked by master(8) with those descriptors
-attached to a remote client connection.
-
-Cyrus admins
-that authenticate and authorize as themselves (e.g.
-don&rsquo;t proxy) manage global scripts.
-
-
-Timsieved
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/tls_prune.8.html Deleted

@@ -1,100 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>TLS_PRUNE</title>
-
-</head>
-<body>
-
-<h1 align="center">TLS_PRUNE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-tls_prune
-&minus; prune expired sessions from the TLS sessions
-database
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-tls_prune
- &minus;C config-file 
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Tls_prune
-is used to prune expired sessions from the TLS sessions
-database. The lifetime of a TLS session is determined by the
-tls_session_timeout configuration option.
-
-
-Tls_prune
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5),
-master(8)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/man/unexpunge.8.html Deleted

@@ -1,183 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>UNEXPUNGE</title>
-
-</head>
-<body>
-
-<h1 align="center">UNEXPUNGE</h1>
-
-<a href="#NAME">NAME</a> 
-<a href="#SYNOPSIS">SYNOPSIS</a> 
-<a href="#DESCRIPTION">DESCRIPTION</a> 
-<a href="#OPTIONS">OPTIONS</a> 
-<a href="#FILES">FILES</a> 
-<a href="#SEE ALSO">SEE ALSO</a> 
-
-<hr>
-
-
-*
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-unexpunge
-&minus; restore expunged (but yet unremoved) messages
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-unexpunge
- &minus;C config-file &minus;l
-mailbox 
-unexpunge &minus;C config-file 
-&minus;t time-interval &minus;d 
-&minus;v mailbox 
-unexpunge &minus;C config-file 
-&minus;a &minus;d &minus;v 
-mailbox 
-unexpunge &minus;C config-file 
-&minus;u &minus;d &minus;v 
-mailbox uid...
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-
-Unexpunge
-is used to restore expunged messages which have yet to be
-removed from the Cyrus mailspool. This utility is only
-useful when the server is configured to use delayed
-expunge.
-
-
-Unexpunge
-reads its configuration options out of the
-imapd.conf(5) file unless specified otherwise by
--C.
-
-<h2>OPTIONS
-<a name="OPTIONS"></a>
-</h2>
-
-
-
-&minus;C
-config-file
-
-Read configuration options from
-config-file.
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;l</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-List the expunged messages in the specified mailbox
-which are available for restoration.</td></tr>
-</table>
-
-&minus;t
-time-interval
-
-Unexpunge messages which were
-expunged in the last time-interval seconds. (modifiers: m:
-minutes, h: hours, d: days, w: weeks).
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;a</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Restore all of the expunged messages in the
-specified mailbox.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;u</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Restore only those messages having the specified UIDs in
-the specified mailbox.</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;d</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Unset the \Deleted flag on any restored
-messages. </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-&minus;v</td>
-<td width="8%"></td>
-<td width="78%">
-
-
-Enable verbose output/logging.</td></tr>
-</table>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-
-/etc/imapd.conf
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-imapd.conf(5)
-<hr>
-</body>
-</html>

cyrus-imapd-2.4.17.tar.gz/doc/murder.png Deleted

cyrus-imapd-2.4.17.tar.gz/doc/netnews.png Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/Makefile Deleted

@@ -1,72 +0,0 @@
-# Makefile for cyrus documentation directory
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For permission or any legal
-#    details, please contact
-#      Carnegie Mellon University
-#      Center for Technology Transfer and Enterprise Creation
-#      4615 Forbes Avenue
-#      Suite 302
-#      Pittsburgh, PA  15213
-#      (412) 268-7393, fax: (412) 268-7395
-#      innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#    "This product includes software developed by Computing Services
-#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile,v 1.6 2010/01/06 17:01:29 murch Exp $
-
-all: htmlstrip docs clean
-
-docs:
-	for file in ../*.html; \
-	do \
-		echo "=== $$file ==="; \
-		./htmlstrip $$file > `basename $$file .html`; \
-	done
-	@echo "== done =="
-
-htmlstrip: htmlstrip.c
-	$(CC) $(CFLAGS) -o htmlstrip htmlstrip.c
-
-clean:
-	rm -f *.o *~ Makefile.bak htmlstrip
-
-realclean: clean
-	rm -f $(DOCS)
-
-ci: docs
-	cvs ci -m 'updated from html source' $(DOCS)
-
-distclean: clean
-
-depend:
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-

cyrus-imapd-2.4.17.tar.gz/doc/text/ag Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/altnamespace Deleted

@@ -1,73 +0,0 @@
-              Cyrus IMAP Server:  Alternate Namespace
-
-    This document describes the alternatives to the standard mailbox
-    presentation method. These alternatives may be used together or
-    independently. 
-
-    The namespace options do NOT change the rules governing the behavior of
-    mailboxes (as described in overview.html) or how mailboxes are stored
-    on the filesystem. The mailboxes are ALWAYS stored using the netnews
-    convention and internal namespace. When configured to use one (or both)
-    of the options below, the server simply translates mailbox names
-    between the internal names and the external names when used by the
-    client in the IMAP protocol and in Sieve scripts. 
-
-    This design allows the namespace to be changed at runtime (even on a
-    running server) without having to reconfigure the server. This also
-    means that one mailstore can support multiple namespaces if configured
-    correctly. 
-
-    NOTE: If you are upgrading an existing server which uses timsieved to
-    manage Sieve scripts and choose to enable one of the namespace options,
-    you should run the script "tools/translatesieve" after configuring the
-    namespace option(s). This script will translate the folder names in
-    fileinto actions. 
-
-Alternate Mailbox Namespace
-
-    The alternate namespace allows a user's personal mailboxes to appear as
-    if they reside at the same level as that user's INBOX as opposed to
-    children of it. For example, if user "bovik" had a personal "work"
-    mailbox, it would appear to user "bovik" as "work" instead of
-    "INBOX.work" as it would in the standard namespace. 
-
-    This configuration requires that a special prefix be used for shared
-    folders (to distinguish them from personal folders) and for accessing
-    other users' folders. By default, the prefix for shared folders is
-    "Shared Folders" and the prefix for other users folders is "Other
-    Users". For example, a shared folder "foo" in the standard namespace
-    would be presented as "Shared Folders.foo" in the alternate namespace. 
-
-    NOTE: All tools for administering the server, including admins using
-    cyradm, always use the internal namespace. 
-
-Configuring the Alternate Namespace
-
-    To use the alternate namespace, turn on the altnamespace option in
-    /etc/imapd.conf. The prefixes used for shared folders and other users
-    folders can be changed from the defaults by setting the sharedprefix
-    and userprefix options respectively. 
-
-UNIX Hierarchy Convention
-
-    The UNIX hierarchy convention uses the traditional UNIX separator
-    character ("/") to delimit levels of the mailbox hierarchy instead of
-    the netnews character ("."). For example, if user "bovik" had a
-    personal "work" mailbox, it would appear to user "bovik" as
-    "INBOX/work" in the standard namespace. 
-
-    When the UNIX hierarchy convention is used, the "." character MAY be
-    used in mailbox names, including user names. In order to maintain
-    backwards compatibility with the internal namespace, all "." characters
-    are translated to a benign character (currently "^") before any data is
-    stored to disk. For example, if user "elmer.fudd" had a personal
-    "rabbit.holes" mailbox, it would be stored as
-    "user.elmer^fud.rabbit^holes" in the internal namespace. It is
-    important to remember this phenomenon if/when reverting back to the
-    netnews hierarchy convention. 
-
-Configuring the UNIX Hierarchy Convention
-
-    To use the UNIX hierarchy separator, turn on the unixhierarchysep
-    option in /etc/imapd.conf. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/anoncvs Deleted

@@ -1,59 +0,0 @@
-Cyrus IMAP: Anonymous CVS Access
-
-    This file is for those who are reading Cyrus sources via anonymous CVS,
-    or those who would like to. If you're someone who would like to work
-    with the source code and get more frequent updates, keeping in mind
-    that we take some liberties with proper CVS use, you might want to get
-    Cyrus via anonymous CVS. 
-
-        If you're not a programmer, please don't do this. If you're not at
-        least a little experienced with C, configure, and IMAP, please
-        stick with the tarball releases at
-        ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/. 
-
-    To get to the repository, get a version of CVS with client-server
-    support (anything remotely recent has this, I think) and do this: 
-
-    cvs -d :pserver:anoncvs@cvs.andrew.cmu.edu:/cvs login 
-    (enter "anonymous" as the password) 
-    cvs -d :pserver:anoncvs@cvs.andrew.cmu.edu:/cvs co -d cyrus-imapd cyrus
-    (the first -d specifies the CVSROOT, in this case, our CVS server, and
-    a path to the CVS repository; co says "check out", -d says "and stick
-    it in the directory cyrus-imapd", and "cyrus" specifies the "cyrus"
-    collection). The password is "anonymous". 
-
-    You will need autoconf, yacc (bison) and lex (flex) to build CVS from
-    the repository because we don't keep generated files in the repository,
-    along with the usual tools to build Cyrus (a compiler, a Unix box, a
-    network.) To create the configure script, do the following: 
-
-          aclocal -I cmulocal
-          autoheader
-          autoconf
-          
-
-    Read access to the repository is availible to anyone via
-    cvs.andrew.cmu.edu. Write access is availible to only a few people at
-    CMU. 
-
-    Please note that the version in the repository is not the version we
-    are running. We have a seperate system that resembles version control
-    for releases of software on the Andrew system, and sometimes changes
-    don't get propigated back to CVS. 
-
-    What is here is supposed to be stable. It's supposed to work, and
-    compile, and not have amazingly broken changes that can't possibly
-    work. But that may not be the case--and since you decided to use CVS,
-    you shouldn't complain when something doesn't work. You should submit a
-    patch. 
-
-    There is no warranty on the Cyrus software. There is no warranty on
-    anything in CVS, and even less of a guarantee of it working. (There.
-    You've been warned.) 
-
-    Please refer to Sending Feedback if you would like to submit a bug,
-    feature request or (best of all) patch. 
-
-    Thanks to Ryan Troll for putting the time in to make the CVS server
-    work and actually documenting it. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/bugs Deleted

@@ -1,75 +0,0 @@
-                     Known bugs in the Cyrus IMAP Server
-
-    We're working on moving to a Bugzilla database. It's still being built
-    up, but you can search/add to it here. Eventually, all the bugs below
-    will be in there. 
-
-imapd and core utilities
-
-      * Multiple APPENDs don't always correctly return the EXISTS response.
-        (can't reproduce?) 
-      * Particularly large quotas can wrap around. 
-      * The RENAME command is not atomic. 
-      * reconstruct doesn't deal with the mailboxes.db file. 
-      * we should deal with having to reset UIDs 
-      * the algorithm used for naming stage files is fragile and not
-        threadsafe. 
-      * during appendstage(), the message is parsed once per delivery, not
-        once at the beginning. 
-      * master should pay attention to processes that have told it they are
-        listening, and make sure they don't die abnormally. likewise, it
-        should be on the lookout for continually forking services. 
-      * master should probably have a babysitting service ("always keep
-        this process running"). 
-
-proxyd and Cyrus Murder
-
-      * RENAME across servers isn't implemented. 
-      * Tagged lines with literals can cause problems for proxyd. 
-
-lmtpd, deliver, and sieve
-
-      * 8-bit set characters are coerced to 'X', but not before the
-        notify_zephyr code (if used) has had a chance to send them out. 
-      * Deliver does not handle messages containing NUL properly due to
-        stdio problems (the characters between the NUL and the LF will be
-        lost.) 
-      * Deliver doesn't gracefully handle CR CR sequences in messages.
-        Well, ok, it hangs. 
-
-authentication and authorization
-
-      * Using AFS groups with ptclient, users with negative rights as part
-        of groups may be granted access to mailboxes if ptclient has died.
-        We plan to have this fixed eventually. 
-      * In some failures of the krbck program, the error messages printed
-        out bear no resemblance to what actually went wrong. 
-
-other utilities
-
-      * cyradm may need to change authname/username stuff. Something to
-        check. 
-      * imtest: it would be nice for the authorization name to default to
-        the authentication name, except when specifically overridden. 
-      * any utilities doing db operations should catch signals and poll for
-        them to see if it should exit (like mbpath, ipurge). 
-
-libraries
-
-                     Things we want to do
-
-      * Implement the IMAP VIEW extension. 
-      * Implement the IMAP ANNOTATE extension. 
-      * Implement some sort of backup/restore system that's more efficient
-        and easier to use than Amanda on the filesystem. 
-      * Add mailbox version numbers. 
-      * Add mailbox tombstones (gives NEWNAME support). 
-      * Design and implement ALIST, the advanced list command. 
-      * Investigate changing from the prot layer to using sfio. 
-      * Write a test module for lmtpengine. 
-      * Allow renaming users. (RENAME user.joe user.harry.) Needs to move
-        all metadata per-user data. (seen, subscriptions, sieve state?) 
-
-    Please refer to Sending Feedback if you would like to submit a bug,
-    feature request or (best of all) patch. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/changes Deleted

@@ -1,230 +0,0 @@
-Changes to the Cyrus IMAP Server since 2.4.16
-
- * A bunch of cleanups and fixes to compiling 
- * A bunch of sieve cleanups 
- * Fixed bug #3691: unixhierarchysep is now obeyed when printing the
- mailbox name in unexpunge 
- * Fixed bug #3718: crashes fetching message parts 
- * Fixed bug #3719: pop3 seen update of final message in a mailbox 
- * Improved documentation of "proxyservers" option 
- * Fixed bug #3737: lost emails in XFER delivery race 
- * Fixed bug #3725: inefficient statuscache use in some cases 
- * Fixed bug #3484: use of sasl property types (compile fix) 
- * Fixed bug #3754: failure to support binary append. This was found
- by a popular library switching to using binary appends 
- * Fixed bug #3735: user prefix searching now works with fulldirhash 
- * Fixed bug #3696: can no longer rename the same mailbox twice, which
- left things in a corrupted state if you caught the race. 
- * Fixed bug #3715: using berkeley for mailboxes.db was very broken.
- It now works. 
- * Fixed bug #3733: reconstruct with missing cyrus.index will use file
- timestamps for internaldate rather than setting it to NOW if
- internaldate_heuristic is set to standard 
- * Fixed bug #3729: better documentation for xlist-* in 2.4. 
- * Fixed bug #2717: fetches of individual messages or short ranges no
- longer need to parse over the entire index. 
- * Fixed bug #3742: reconstruct can now fix multiple folders with the
- same uniqueid again (regression from 2.3) and also sync_client
- avoids a crash in that broken case. 
- * Fixed bug #3711: detect the buggy /usr/bin/compile_et shipped on
- MacOS X and fall back to our bundled copy. 
-
-Changes to the Cyrus IMAP Server since 2.4.15
-
- * Bug #3651 - 64 bit dirhash breaks existing systems. NOTE this
- includes a fix to the re-written rehash tool released with 2.4.15 
-
-Changes to the Cyrus IMAP Server since 2.4.14
-
- * Bug #3664, #3665 - Sieve filters don't work if mailbox contains
- dots 
- * Bug #3651 - 64 bit dirhash breaks existing systems. NOTE - this
- includes a complete rewrite of tools/rehash, making it much simpler
- and more reliable. Check the usage statement 
- * Bug #1228 - mailbox dumps need to dump quotaroots 
- * Bug #3613 - CATENATE command returns BADURL 
- * Bug #3627 - enabling improved_mboxlist_sort documentation mention
- subscription files 
- * Bug #3661 - Memory leaks in sync_server, nntpd, popd 
- * Bug #3621 - quota bug involving nested quota roots 
- * Bug #3667 - FLAGS.SILENT needs to return new MODSEQ if QRESYNC
- enabled 
-
-Changes to the Cyrus IMAP Server since 2.4.13
-
- * Bug #2685 - folder delete and annotations 
- * Bug #3381 - tools/rehash script is not 64bit safe 
- * Bug #3405 - Cyrus IMAP tls support for ctl_mboxlist 
- * Bug #3485 - cyr_expire tries to delete parent directories that are
- not empty 
- * Bug #3582 - Extra LF+SP characters been inserted in the middle of
- the XML attachments 
- * Bug #3598 - lmtp auditlog for murder proxy mode 
- * Bug #3623 - OpenBSD (and other platforms without working mmap)
- multiple bugs 
- * Bug #3626 - Renaming a mailbox doesn't remove old folder 
- * Bug #3628 - folders with spaces and subfolders with same prefix as
- parent folder don't show up 
- * Bug #3634 - RENAME INBOX no longer works 
- * Bug #3635 - cmd_rename() fails to check error codes 
- * Bug #3636 - unexpunge locks mailbox until all output is emitted 
- * Bug #3637 - imapd and ipop3d in 2.4 no longer log expunge events to
- syslog 
- * Bug #3638 - sessionid logging improvements for murder environments 
- * Bug #3640 - LMTP accepts NULL bytes in headers, resulting in
- incorrect header/mail size in meta-data 
- * Bug #3642 - iPhone 5 expects SPECIAL-USE in LIST output 
- * Bug #3649 - unable to remove mailbox 
- * Bug #3650 - ENVELOPE contains unexpected CRLF 
- * Bug #3645 - Ability to delete folder "shared" 
-
-Changes to the Cyrus IMAP Server since 2.4.12
-
- * Bug #3565 - fix gcc compiler warnings - thanks Dilyan Palauzov
- <dilyan.palauzov@aegee.org> 
- * Bug #2685 - rename annots in delayed folder delete. Avoids
- annotations "reappearing" when a folder is recreated 
- * Bug #3566 - actually fix in a backward compatible way. 2.4.12 broke
- older versions of bison 
- * Lots of small cleanups from CMU as they prepared to build RSS into
- their 2.4 build. Thanks Ken 
- * Bug #3591/#3609 - fix crash in mupdate on partition move 
- * Bug #3610 - fix replication of partition move 
- * Bug #3564 - document the way prefork interacts with multiple
- network protocols 
- * Bug #3586 - allow rename of "\Noselect" if subfolders exist 
- * A handful of small cleanups (#3593, #3594, #3595) from David Carter
- <dpc22@cam.ac.uk>. Very much appreciated 
- * Disabled duplicate_check DEBUG level log messages by default.
- Thanks Philip Prindeville <philipp@redfish-solutions.com> 
- * Bug #3608 - log mailbox name in more sync failure cases 
- * Bug #3615 - fix proxyd_disable_mailbox_referrals. Thanks Andrew
- Morgan <morgan@orst.edu> 
- * Bug #3611 - fix crash in sync_mailbox_full if expunge fails 
- * Backported some nice fixes from master, including safer thread/sort
- (there were some crashes on bad messages before) 
- * Fixed infinite loop on suppress_capabilities with substrings of
- other capabilities. Ouch. 
- * Fixed LIST and LSUB again - this time to make LIST "" "*%" work
- without breaking other things 
- * Bug #3588 - make XFER not break if the wrong server name was used.
- The start of making murder safer 
- * Bug #3603 - tidied up usage of kick_mupdate so it never gets called
- on standard murder backends 
- * Bug #3604 - always suppress the DELETED.* mailbox names, even if
- delete_mode is immediate. It means a config change or different
- frontend won't show undeletable mailboxes 
- * Bug #3602 - allow UpperCase in service names to work 
-
-Changes to the Cyrus IMAP Server since 2.4.11
-
- * Bug #3150 - fix issue with overview and messages without a
- References header 
- * fixed nntp login with tab and space in password 
- * Bug #3501 - be more relaxed about names of DELETED folders 
- * Bug #3553 - fix QRESYNC passing to murder backend - thanks alec
- <alec@alec.pl> 
- * Bug #3554 - only show ENABLED response the first time each option
- is ENABLEd 
- * Lots of cleanup of build process and backporting of APIs 
- * Bug #3502 - make configure.in more portable - thanks OBATA Akio
- <obata@lins.jp> 
- * Bug #3533 - add missing break statements in sieve - thanks Thomas
- Jarosch <thomas.jarosch@intra2net.com> 
- * Bug #3550 - support wildcards for ACLS in cyradm - thanks
- <mark.cave-ayland@siriusit.co.uk> 
- * Bug #3556 - print remote server in mbpath - thanks Wolfgang Breyha
- <wbreyha@gmx.net> 
- * Bug #3559 - make XFER work with unlimited quota - thanks Wolfgang
- Breyha <wbreyha@gmx.net> 
- * Bug #3547 - use strconcat() in writefile() 
- * fixed a case where skiplist library could write error messages
- directly to stdout 
- * Bug #3545 - fix sign extension in squat_decode_64 
- * Bug #3558 - return error if backend doesn't support LIST-EXTENDED 
- * Bug #3565 - clean up in preparation for automake 
- * fixed incomplete authentication checks in nntpd, reported by
- Secunia as SA46093 - thanks Stefan Cornelius, Secunia Research 
-
-Changes to the Cyrus IMAP Server since 2.4.10
-
- * fixed replication recovery from different messages at the each end 
- * Bug #3489 - fixed quotalegacy handling of prefixes so only exact
- subfolders match 
- * Bug #3498 - fixed deletion of users quota files with
- unixheriarchysep enabled, thanks Leena Heino 
- * Bug #3491 - NOOP and UNAUTHENTICATE for timsieved, thanks Dilyan
- Palauzov 
- * Bug #3492 - better response codes for timsieved, thanks Dilyan
- Palauzov 
- * Bug #3497 - fix cmd syslog from master, thanks Kristof Katus 
- * Bug #3503 - compilation of perl libraries on dragonfly and freebsd,
- thanks OBATA Akio 
- * Bug #3451 - allow CC to have spaces 
- * Bug #3505 - fix sync_reset, thanks David Carter 
- * Bug #3506 - use literal+ for sync_(client|server), thanks David
- Carter 
- * Bug #3300 - use portable function for TCP constants, thanks OBATA
- Akio 
- * Bug #3507 - fix replication recovery with non-delayed expunge,
- thanks Julien Coloos 
- * Bug #3495 - improved duplicate suppression, thanks Kristof Katus 
- * Bug #2772/3463 - fixed crashes in THREAD by correcting folding of
- references headers 
- * Bug #3439 - fix ugly syslog message for vacation 
- * Bug #3499 - options to disable namespaces to reduce load on big
- servers with no shared folders. Thanks Olivier ROLAND 
- * Changed skiplist to truncate old files after checkpoint, which can
- save disk space on tmpfs or small ssds when old copies were held
- open by other processes 
- * Made Cyrus more robust against corruption in mailboxes.db data, so
- it will return an error rather than crashing on invalid entries 
- * Fix for CVE-2011-3208, a remotely exploitable buffer overflow in
- nntpd - thanks Coverity 
-
-Changes to the Cyrus IMAP Server since 2.4.9
-
- * fixed handling of unparsable emails during append (which would
- cause invalid cyrus.index records otherwise) 
- * quota: fix a pile of bugs. #1801, virtdomain support; #2728, slow
- user delete; #3178, "file name too long" with big mailbox names;
- #3179, quota -f doubles usage. 
- * Bug #3043 - parse multiple groups in headers correctly 
- * Bug #3158 - lmtp backend connection timeout 
- * Bug #3223 - limit MIME parsing depth to avoid stack overflows 
- * Bug #3273 - add SORT=DISPLAY support (but note: still questions
- about correctness of unicode sorting) 
- * Bug #3504 - convert all sieve scripts to \r\n line endings on
- upload 
- * Bug #3402 - options to munge 8bit characters in headers during lmtp
- delivery to avoid backscatter 
- * sync_client: fix broken keepalive TCP options (I doubt anyone ever
- tried to use it) 
- * Bug #3482 - add "-o" option to ipurge to only purge messages with
- \Deleted flag set 
-
-Changes to the Cyrus IMAP Server since 2.4.8
-
- * fixed crashes in seen handling 
- * Bug #3453 - fixed LSUB replication 
- * Bug #3442 - allow disabling PCRE if it's buggy at your site 
- * Bug #3443 - LSUB response fixes 
- * Bug #3448 - XFER error handling (murder) 
- * Bug #3437 - fixed regression: quotaroot wasn't being updated on
- rename 
- * Bug #3456 - fixed crash on rename user.foo user.foo without
- partition change 
- * config update: database paths for most databases are now
- configurable in imapd.conf 
- * Bug #3303 - fixed index lock breaking on XFER (thanks Julien
- Coloos) 
- * Bug #3457 - fixed ESEARCH parsing (was breaking iPhones) 
- * Bug #3188 - fixed XFER with unlimited quota (thanks again Julien
- Coloos) 
- * Misc other quota fixes (there are still known bugs with the quota
- system) 
- * Bug #3169 - fixed GETQUOTAROOT for domain quotaroots 
- * Bug #3465 - fixed compilation with Perl 5.14 (thanks
- hsk@imb-jena.de, and also thanks to Ondrej Sury who reported it
- separately) 
- * Bug #3464 - fix for sendmail exec failure. This was a nasty one,

cyrus-imapd-2.4.17.tar.gz/doc/text/faq Deleted

@@ -1,259 +0,0 @@
-Cyrus IMAP Server FAQ
-
-      * POP-Before-SMTP It is not included in the default distribution
-        because there is already a standard way of doing this with SMTP
-        AUTH. Any good MTA and/or MUA should support SMTP AUTH, so we
-        shouldn't have to create a hack in an unrelated service. However,
-        if you would like to install it anyway, we recommend using DRAC,
-        along with the patch available in contrib/drac_auth.patch. 
-      * Using NFS We don't recommend it. If you want to do it, it may
-        possibly work but you may also lose your email or have corrupted
-        cyrus.* files. You can look at the mailing list archives for more
-        information. 
-      * Using AFS/Coda We don't recommend it. It's even less likely to work
-        than NFS. If you want to do it, it may possibly work but you may
-        also lose your email or have corrupted cyrus.* files. CMU's
-        previous e-mail system, AMS, leveraged AFS extensively for storage
-        (and transit) purposes. For various reasons it didn't scale
-        particularly well and led to CMU's interest in IMAP. 
-
-        Cyrus was designed to use a local filesystem with Unix semantics
-        and a working mmap()/write() combination. AFS doesn't provide these
-        semantics so won't work correctly. 
-      * Virtual hosting - See virtual domains configuration. 
-      * dots in userids - you can have a '.' in your username IF, AND ONLY
-        IF, you use the UNIX hierarchy convention. 
-      * renaming users - Supported, but try to make sure that the user is
-        not, and cannot login when doing the rename. Otherwise user-meta
-        may get corrupted and/or out of sync. 
-      * plus addressing - Plus addressing allows direct delivery to a
-        particular mailbox (other than an INBOX). This is done in two ways. 
-
-        The first way allows delivery to a subfolder of a specific user's
-        INBOX. This is done via an address of the form:
-        username+mailfolder@domain, which will deliver to the user's
-        INBOX.mailfolder folder (or altnamespace equivalent). This
-        submailbox must allow the posting user the 'p' right (generally,
-        this means 'anyone' must have the 'p' right), otherwise the message
-        will just be filed into the user's INBOX. 
-
-        The second way is to form an address like
-        postuser+mailfolder@domain. This will deliver into the mailbox
-        'mailfolder'. postuser is the string specified in the imapd.conf
-        option of the same name, and may be the empty string. As before,
-        the posting user will need to have the 'p' right on the mailbox. 
-
-        For both methods, if 'mailfolder' is more than one level deep, you
-        will need to conform to the hierarchy separator appropriate to your
-        site. 
-      * Performance/Capacity/Scaling - See the performance guide. 
-
-General Questions
-
-    Q: What are the advantages of LMTP? 
-            
-
-            A: LMTP protocol differs from SMTP in that it causes the Cyrus
-            to return, after the final "." of the DATA command, one reply
-            for each recipient. If, for example, a server is given a
-            transaction for two recipients, delivery to the first succeeds,
-            and delivery to the second encounters a temporary failure
-            condition, the MTA will get a separate response for each
-            recipient and will only have to reattempt to deliver it to the
-            second recipient. If using SMTP, only a single temporary
-            failure response would be returned, and the entire transaction
-            would have to be reattempted. 
-
-            Furthermore, LMTP is superior to invoking command-line delivery
-            agents from the MTA in that most ESMTP extensions are supported
-            by LMTP, without having to extend any interfaces. 
-
-            Lastly, because LMTP can be run over TCP, it allows you to run
-            SMTP (and spam/virus scanning) and mailbox access on separate
-            servers, thus allowing better scalability. 
-    Q: How do I configure my MTA? 
-            
-
-            A: See Configuring the Mail Transfer Agent 
-    Q: How should I configure partitions to deal with a large number of
-            users? 
-            
-
-            A: The key is not to over-subscribe any partitions. Avoid
-            putting too many users on any one partition, such that
-            read/write performance becomes unacceptable. Good RAID
-            performance (plenty of read/write cache, and perhaps RAID 10
-            instead of RAID 5) will improve the number of users a partition
-            can serve. To benefit from multiple partitions, each should be
-            on its own set of disks, served by an unsaturated interface
-            (FC, SCSI, SAS, SATA, etc) to the host running Cyrus. 
-
-            See the performance guide or general performance guidelines.
-            Also see metapartition_files and metapartition-name in
-            imapd.conf.5 for additional configuration options which can
-            help with performance, especially if you have access to
-            high-speed storage (faster than disks). 
-
-Troubleshooting
-
-    Q: Why doesn't imapd/pop3d/nntpd/lmtpd/timsieved advertise PLAIN or
-            plaintext login commands? 
-            
-
-            A: Unless otherwise configured, Cyrus services only advertise
-            PLAIN or plaintext login commands on encrypted connections
-            (SSL-wrapped connections or after a successful STARTTLS
-            command). This behavior can be changed with the use of the
-            allowplaintext option in imapd.conf.5. 
-    Q: I'm getting syslog'd messages from the master process saying
-            processes are "signaled to death by 10". What's up? 
-            
-
-            A: If you're using Berkeley DB 3.0.55, try installing some
-            patches to Berkeley DB available from
-            http://www.sleepycat.com/update/3.0.55/patch.3.0.55.html. 
-    Q: I've used saslpasswd2 to create CRAM-MD5 secrets, but imapd doesn't
-            say AUTH=CRAM-MD5. Why? 
-            
-
-            A: Make sure /etc/sasldb2 is readable by the Cyrus user. 
-    Q: I'm using "sasl_pwcheck_method: saslauthd", but authentication isn't
-            working. 
-            
-
-            A: Make sure that the saslauthd daemon is running (you'll want
-            to start it when the system boots). imapd is unable to connect
-            to saslauthd if the following message appears in the logs: 
-
-            Dec  6 12:58:57 mail3.andrew.cmu.edu imapd1297: cannot connect to saslauthd server
-
-            Make sure that saslauthd is running and that the cyrus user can
-            access the unix domain socket (defaults to /var/run/mux). 
-    Q: I'm getting messages about "duplicate_prune". What's wrong? 
-            
-
-            A: These messages look like 
-
-            Jan 14 13:46:24 grant ctl_deliver9060: duplicate_prune: opening
-              /var/imap/deliverdb/deliver-x.db: No such file or directory
-            Jan 14 13:46:24 grant ctl_deliver9060: duplicate_prune: opening
-              /var/imap/deliverdb/deliver-y.db: No such file or directory
-            Jan 14 13:46:24 grant ctl_deliver9060: duplicate_prune: opening
-              /var/imap/deliverdb/deliver-z.db: No such file or directory
-
-            These messages are normal; one file is maintained for each user
-            beginning with "x", "y", "z", etc. If you're first starting or
-            you have no users beginning with these letters, these messages
-            are completely normal and can be ignored. 
-    Q: I'm getting a message about "imapd: could not getenv(CYRUS_SERVICE);
-            exiting" in my imapd.log. What's wrong? 
-            
-
-            A: Remove all imap, pop, lmtp and sieve lines from
-            xinetd.conf and restart xinetd. Cyrus is run out of its own
-            "master" process. 
-    Q: How do I use different SSL/TLS certificates for imap and pop? 
-            
-
-            A: Specify the different certs using the appropriate options in
-            imapd.conf. Read imapd.conf(5) for details. 
-    Q: My KPOP client is complaining about TLS keys. What should I do? 
-            
-
-            A: Disable TLS for the kpop service. Either set
-            tls_pop3_cert_file to disabled in imapd.conf (which will also
-            disable SSL/TLS for pop3), or use a separate config file for
-            kpop. For example, change the kpop service in cyrus.conf to
-            something like: 
-
-            kpop    cmd="pop3d -k -C /etc/kpopd.conf" listen="kpop"
-
-            then copy /etc/imapd.conf to /etc/kpopd.conf and remove the
-            tls_* options. 
-    Q: Eudora 5.x can't connect using STARTTLS ("SSL Neogotiation Failed").
-            What should I do? 
-            
-
-            A: First, complain to QUALCOMM because their STARTTLS
-            implementation is broken. Eudora doesn't support TLSv1 (per
-            RFC2246) and Cyrus requires it. If you really need this before
-            it is fixed in Eudora, remove or comment out the following
-            lines in tls.c: 
-
-                if (tlsonly) {
-                    off |= SSL_OP_NO_SSLv2;
-                    off |= SSL_OP_NO_SSLv3;
-                }
-
-    Q: I'm getting messages in imapd.log like: 
-
-            Sep 11 17:23:55 ogg lmtpd773: DBERROR db3: 16 lockers
-            Sep 11 17:23:55 ogg lmtpd1409: DBERROR db3: 17 lockers
-            Sep 11 17:23:56 ogg lmtpd1508: DBERROR db3: 9 lockers
-            Sep 11 17:23:56 ogg lmtpd776: DBERROR db3: 9 lockers
-
-            What's wrong? 
-            
-
-            A: Nothing is wrong. These messages are logged whenever
-            Berkeley DB encounters lock contention, but aren't necessarily
-            problems. This is especially likely when you have an empty or
-            small duplicate delivery database and are receiving a large
-            volume of e-mail. 
-
-            Berkeley DB 4.0 has a bug where the number of lockers isn't
-            decremented properly, causing this number to be unreliable. 
-    Q: All of the 8bit characters in the headers of messages that I receive
-            are being changed to 'X's. What's going on? 
-            
-
-            A: 8-bit characters are illegal in message headers. Following
-            the principle of "be liberal in what you accept, and strict in
-            what you send", Cyrus converts them to Xs. (Without a character
-            set, having the 8-bit characters replaced with Xs is just as
-            good as having them be any other 8-bit character, especially
-            for sorting and searching). Alternatively, you can set
-            "reject8bit: t" in imapd.conf to reject the messages outright.
-            It might also be reasonable for Cyrus to support the use of a
-            default character set, however thus far no one has done the
-            work to do so (it would also involve QP-encoding the corrupted
-            headers). 
-    Q: Why can't I delete any messages from my over-quota mailbox? I'm
-            using a client with a 'trash folder'. 
-            
-
-            A: Trash folders, as they are commonly implemented (as actual
-            IMAP mailboxes), do not fit the IMAP delete/expunge model very
-            well. In fact, naive client implementations will get stuck in a
-            situation where they cannot delete a message from a mailbox
-            because they try to COPY it to the trash folder before deleting
-            the message. This operation will fail due to the mailbox being
-            over quota. This is separate from the fact that a specific
-            mailbox name is not interoperable between clients (one might
-            call it 'trash', another 'Trash', another 'Recycle Bin', etc) 
-
-            Given the lack of protocol support for a trash folder, this is
-            mostly a quality-of-implementation issue on the client side.
-            There are a few options here: 
-
-              * Contact your client vendor to have the broken client fixed
-                (one possibility is to have the client ask the user if they
-                wish to permanantly delete the message if the COPY
-                operation fails). 
-              * Stop using the 'trash mailbox' feature of your client (if
-                possible). 
-              * Set a separate quota root on the 'trash folders' of users.
-                This last option is significantly harder to do correctly,
-                since it assumes that all clients that make use of a trash
-                folder do so with the same folder name. 
-
-    Q: How do I stop Cyrus from advertising the DIGEST-MD5 and CRAM-MD5
-            shared secret SASL mechanisms? 
-            
-
-            A: Not really a Cyrus IMAPd question, this can be fixed by just
-            removing the SASL plugins from where Cyrus SASL installed them
-            (if no other applications require them), or by using the
-            sasl_mech_list imapd.conf option to list only the mechanisms
-            that you require. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/feedback Deleted

@@ -1,36 +0,0 @@
-Sending Feedback on the Cyrus IMAP Server
-
-    Feedback on and fixes for the software or on the document may be sent
-    to cyrus-bugs+@andrew.cmu.edu. Unfortunately, we cannot guarantee a
-    response but we'll try the best we can. As usual, a high quality and
-    complete message helps us tremendously. 
-
-    If you submit a patch, please send unified diffs (-u) if your diff
-    program supports them, or context diffs (-c) if it doesn't. Plain diffs
-    are very difficult to evaluate. GNU diff can do this. 
-
-    When reporting problems, be sure to include the relevant information.
-    For example, you must include: 
-
-      * the version of imapd 
-      * the version of libsasl 
-      * your system type (uname -a often provides the right information). 
-
-    You should also include: 
-
-      * the options you passed to ./configure 
-      * the errors from make (if any) 
-      * the config.status file generated by configure 
-
-    NOTE: If you are able to connect to the imap server, all of this
-    information can be gathered by using the version command in cyradm. If
-    you cannot use cyradm because you are having perl problems, you can
-    connect using imtest and then run the following IMAP command: 
-
-        a ID NIL 
-
-    The info-cyrus@andrew.cmu.edu mailing list exists for the discussion of
-    this server and other Cyrus software; more information is available in
-    the mailing-list document. You may get faster/more responses by posting
-    to this list instead of to cyrus-bugs, as there are more readers here. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/index Deleted

@@ -1,36 +0,0 @@
-Cyrus IMAP Server, version 2.4
-
-    IMAP (Internet Message Access Protocol) is an Internet standards-track
-    protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-    IMAP server differs from other IMAP server implementations in that it
-    is generally intended to be run on sealed servers, where normal users
-    are not permitted to log in. The mailbox database is stored in parts of
-    the filesystem that are private to the Cyrus IMAP system. All user
-    access to messages is through the IMAP, POP3, KPOP or NNTP protocols. 
-
-    The private mailbox database design gives the server large advantages
-    in efficiency, scalability, and administratability. Multiple concurrent
-    read/write connections to the same mailbox are permitted. The server
-    supports access control lists on mailboxes and storage quotas on
-    mailbox hierarchies. 
-
-    The Cyrus project is the implementation of IMAP servers by the Carnegie
-    Mellon University Computing Services Department. Over the next few
-    months, we will be releasing components of this server, which will
-    provide better mail security and easier mail administration. 
-
-The Cyrus IMAP Server Distribution
-
-    Cyrus IMAP Server distribution 
-
-    Documentation 
-
-      * General release information 
-      * Overview and Concepts 
-      * Installing the Cyrus IMAP Server 
-      * Changes since the last release 
-      * Frequently Asked Questions 
-      * Man Pages 
-      * Protocol Specifications 
-      * Internal Documentation 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install Deleted

@@ -1,45 +0,0 @@
- Installing and Configuring the Cyrus IMAP Server
-
-    The Internet Message Access Protocol (IMAP) is an Internet
-    standards-track protocol for accessing messages (mail, news, etc). The
-    IMAP server stores and provides access to messages. 
-
-    The file doc/questions.html contains a list of questions we'd like to
-    answer but haven't gotten to yet; doc/faq.html contains some answers
-    that we have thought of. Please feel free to contribute! 
-
-    Please refer to Sending Feedback if you would like to submit a bug,
-    feature request or patch. 
-
-    For detailed changes, refer to the file doc/changes in the
-    distribution. 
-
-Contents
-
-      * Upgrading From Previous Versions 
-      * Prerequisites 
-      * Authenticating Users 
-      * Compiling the IMAP Server 
-      * Configuring the IMAP Server 
-      * Testing the IMAP Server 
-      * Administering Mailboxes 
-      * Installing SIEVE 
-      * SNMP Monitoring 
-      * Cyrus and Netnews 
-      * Virtual Domains 
-      * Cyrus Replication 
-      * Cyrus Murder: The IMAP Aggregator 
-      * Operating System Specific Notes 
-      * Performance Notes 
-
-Other interesting stuff
-
-    Here's some software that you may want to run with Cyrus. This software
-    isn't maintained or supported by CMU, so please ask the maintainers for
-    support. 
-
-      * Websieve, a web-based front-end for Sieve script management with
-        Cyrus. 
-      * Sendmail, the most popular MTA around. 
-      * Postfix, a popular competitor MTA. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-admin-mb Deleted

@@ -1,64 +0,0 @@
-Administering Mailboxes
-
- The "cyradm" command (see the cyradm(1) man page for complete
- documentation) manages the creation of, deletion of, ACLs on, and
- quotas on mailboxes. To get an overview of the command, type "cyradm
- <host>". Once "cyradm" has started, the user prompt is replaced with
- the name of the host followed by a ">". Type "help" at the new prompt.
- The following information is displayed: 
-
- createmailbox, cm create a mailbox
- deleteaclmailbox, dam delete an ACL on a mailbox
- deletemailbox, dm delete a mailbox
- help get help on commands
- listaclmailbox, lam list the ACL on a mailbox
- listmailbox, lm list mailboxes
- listquota, lq list quota on root
- listquotaroot, lqr, lqm list quota roots on mailbox
- quit exit program
- renamemailbox, renm rename a mailbox
- setaclmailbox, sam set an ACL on a mailbox
- setquota, sq set quota limits
-
- Note:It's not necessary to run "cyradm" on the same system as the IMAP
- server. 
-
- Note:If you run "cyradm" on a system not using Kerberos for
- authentication, you will be prompted for your user name and password
- before you can issue any "cyradm" commands. By default, you will be
- prompted for the password of the user ID of the current shell. If you
- want to authenticate as a different user, use the "-a" option. If the
- user that you authenticate as is a Cyrus admin, you can proxy as a
- particular user by also using the "-u" option. 
-
- The mailbox naming convention requires that the primary mailbox (INBOX)
- for anyone must be named "user.<userid>". To create a mailbox, type: 
-
- createmailbox user.<userid>
-
- For example, to create a mailbox for the userid "smith", type: 
-
- createmailbox user.smith
-
- To limit "smith" to 10,000 kilobytes of mail, type: 
-
- setquota user.smith 10000
-
- Once the INBOX is created, users can create their own additional
- mailboxes from a mail program. If Smith created a work mailbox and a
- play mailbox, the full names of the mailboxes would be: 
-
- user.smith.work
- user.smith.play
-
- Access rights are discussed in detail in the cyradm(1) man pages. Note
- that the administrator must grant herself create/delete access
- explicitly before she can delete a mailbox: 
-
- setaclmailbox <mail_box> <admin_userid> c
- deletemailbox <mail_box>
-
- Once you have created mailboxes, your IMAP server installation is done.
- You must then configure a mail interface, such as Pine or Mulberry, to
- work with the IMAP server. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-auth Deleted

@@ -1,171 +0,0 @@
-Authenticating Users
-
-Introduction
-
-    The Cyrus IMAP Server uses the Cyrus SASL library to authenticate
-    users. Please refer to the Cyrus SASL documentation for specific
-    details on SASL. This section focuses specifically on the server
-    processes distributed with Cyrus IMAPd. 
-
-Authentication Mechanisms
-
-    At this writing, the underlying Cyrus SASL library supports a variety
-    of SASL mechanisms, including CRAM-MD5, DIGEST-MD5, KERBEROS_V4, and
-    GSSAPI. The Cyrus IMAP, POP, and LMTP servers also support STARTTLS
-    using client-side certificates and the EXTERNAL authentication method. 
-
-    GSSAPI is specific to Kerberos version 5. Additionally, STARTTLS client
-    side certificates have not been extensively tested. 
-
-    When STARTTLS is enabled, the PLAIN SASL mechanism (if installed) also
-    becomes available. This is because one should not pass a clear text
-    password over the wire unless the connection is encrypted. 
-
-    The IMAP protocol also supports a way for users to authenticate without
-    using SASL (the specification). This is via the 'LOGIN' command (not to
-    be confused by the LOGIN SASL mechanism). The IMAP LOGIN command (as
-    with PLAIN) will send your password in clear-text to the server. In
-    this case, the password is still verified through the Cyrus SASL
-    library, though no SASL mechanism actually performs a negotiation. 
-
-    The POP server is capable of APOP authentication, but this requries
-    that Cyrus SASL be compiled --with-checkapop, and also that you are
-    using an auxprop backend for your password store (e.g. the sasldb
-    auxprop plugin). 
-
-Authentication Recommendations
-
-      * If you are running a mail server on a single machine, we recommend
-        that you configure the system to use CRAM-MD5 or DIGEST-MD5. We
-        have not provided utilities for you to let users change their
-        passwords but either we or someone else might provide that feature. 
-      * If you have more than one mail server, we recommend that you
-        configure the system to use GSSAPI and Kerberos5. 
-      * If you have some other authentication mechanism that requires the
-        clear text password, you should use saslauthd. 
-
-        saslauthd is something specific to the Cyrus SASL libraries. While
-        it is less generic than PAM, it is much simpler to configure. The
-        IMAP server simply sends a userid and a corresponding password down
-        a Unix domain pipe. Then, saslauthd takes that userid and password
-        and tries to authenticate with it -- using whatever authentication
-        you use -- and simply returns "yes" or "no" as to whether or not
-        the password was correct. 
-
-        It is possible to configure saslauthd to check these passwords via
-        a PAM mechanism, /etc/passwd, or other possibilities. 
-
-        PAM stands for pluggable authentication modules and the purpose is
-        to provide a common API which applications can use to obtain
-        authentication for a user. You can think of PAM as a complementary
-        layer under the SASL layer. See
-        http://www.kernel.org/pub/linux/libs/pam/FAQ for more information
-        on PAM. By using a PAM module, all the other applications on your
-        system can take advantage of it -- for example, login, xlock, etc. 
-
-        Keep in mind that when you use PLAIN or LOGIN you should encrypt
-        the stream so a user's password cannot be trivially sniffed off of
-        the network. 
-
-Configuring Authentication
-
-    Cyrus SASL has a number of options that can be configured by the
-    application. To configure these via imapd.conf, simply prefix the
-    appropriate option name with sasl_ (e.g. pwcheck_method becomes
-    sasl_pwcheck_method). 
-
-/etc/sasldb2
-
-    The easiest method for authenticating users is to use the libsasl
-    authentication database and create users using the "saslpasswd2"
-    utility. Set "sasl_pwcheck_method: auxprop", and be sure that the SASL
-    sasldb auxprop module is installed (it is, by default). Make sure Cyrus
-    can read "/etc/sasldb2": 
-
-       chown cyrus /etc/sasldb2*
-
-Shadow Passwords
-
-    If you want to authenticate users from "/etc/shadow", things are
-    considerably more complicated, since the cyrus user cannot read the
-    shadow password file. Additionally, this will not allow you to use
-    shared secret mechanisms. To do this, it is necessary to configure
-    libsasl with saslauthd support, and set "sasl_pwcheck_method:
-    saslauthd". The SASL library will then make calls to an external
-    utility running as root to authenticate users. 
-
-Kerberos
-
-Configuring Kerberos v4
-
-    Cyrus IMAP supports Kerberos v4 if the SASL library was compiled with
-    KERBEROS_V4 support. 
-
-    You'll have to create a Kerberos v4 identity for the server and add the
-    server's key to the "srvtab" file. The file must be readable by the
-    cyrus user. The server's Kerberos identity is "imap.HOST@REALM", where
-    "HOST" is the first component of the machine's host name and "REALM" is
-    the machine's Kerberos realm. 
-
-     1. Here is a sample session, creating a srvtab file for the host named
-        "foobar": 
-
-           ksrvutil -f /var/imap/srvtab add
-
-        Here is the information "ksrvutil" requests. Respond by filling in
-        values or by pressing RETURN. In this example, the host name is
-        "foobar" and the realm is "ANDREW.CMU.EDU". 
-
-           Name: imap
-           Instance: foobar
-           Realm: ANDREW.CMU.EDU
-           Version number: 
-           New principal: imap.foobar@ANDREW.CMU.EDU; version 0
-           Is this correct? (y,n) y 
-           Password: 
-           Verifying, please re-enter Password: 
-           Key successfully added.
-           Would you like to add another key? (y,n) y n
-
-     2. 
-        If you plan to install Kerberized POP, create the Kerberos identity
-        "pop.HOST@REALM" and add the key to the "srvtab" file. Likewise, if
-        you plan on using LMTP over TCP, create the Kerberos identity
-        "lmtp.HOST@REALM" and add the key to the "srvtab" file. 
-     3. 
-
-        Make the "srvtab" file owned by the cyrus user: 
-
-           chown cyrus /var/imap/srvtab
-
-     4. Add the option srvtab option to /etc/imapd.conf: 
-
-           srvtab: /var/imap/srvtab
-
-     5. Test using imtest -m KERBEROS_V4. imtest will attempt to authorize
-        as the current Unix user regardless of the current ticket's held.
-        Override this with the -u option. 
-
-Troubleshooting Kerberos_V4 problems
-
-    Run the program "krbck" (found in the imap directory) as the cyrus user
-    on the IMAP server. This program will diagnose some common Kerberos v4
-    configuration errors. 
-
-Configuring Kerberos v5
-
-    Cyrus IMAP supports Kerberos v5 if the SASL library was compiled with
-    GSSAPI support. 
-
-    You'll have to create a Kerberos v5 identity for the server. Kerberos
-    v5 keys are generally stored in "/etc/krb5.keytab". 
-
-     1. Add the "imap/hostname" key using "kadmin". 
-     2. Let the cyrus user read "/etc/krb5.keytab": user: 
-
-           chown cyrus /etc/krb5.keytab
-
-     3. Test using imtest -m GSSAPI. imtest will attempt to authorize as
-        the current Unix user regardless of the current ticket's held.
-        Override this with the -u option. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-compile Deleted

@@ -1,242 +0,0 @@
-Compiling the IMAP Server
-
-    Once you have unpacked the files by extracting the tar archive, "cd" to
-    the "cyrus-imapd-NNNN" directory where NNNN is the version number. The
-    configuration files and various subdirectories are stored there. In the
-    directory that the configure file is in, type "./configure" to
-    configure the software. Please continue to read this document as there
-    are switches to ./configure that may apply to you. 
-
-configure Overview
-
-    The "configure" shell script attempts to guess correct values for
-    various system-dependent variables used during compilation. It uses
-    those values to create a "Makefile" in each directory of the package.
-    Finally, it creates a shell script "config.status" that you can run in
-    the future to recreate the current configuration, a file "config.cache"
-    that saves the results of its tests to speed up reconfiguring, and a
-    file "config.log" containing compiler output (useful mainly for
-    debugging "configure"). 
-
-    Running "configure" takes awhile. While running, it prints some
-    messages telling which features it is checking for. 
-
-    You can compile the package in a different directory from the one
-    containing the source code. Doing so allows you to compile it on more
-    than one kind of computer at the same time. To do this, you must use a
-    version of "make" that supports the "VPATH" variable, such as GNU
-    "make". "cd" to the directory where you want the object files and
-    executables to go and run the "configure" script. "configure"
-    automatically checks for the source code in the directory that
-    "configure" is in and in "..". 
-
-    By default, "make install" will install files (other than
-    server-specific programs) in "/usr/local/bin", "/usr/local/man", etc.
-    You can specify an installation prefix other than "/usr/local" by
-    giving "configure" the option "--prefix=PATH". 
-
-    You can specify separate installation prefixes for
-    architecture-specific files and architecture-independent files. If you
-    give "configure" the option "--exec-prefix=PATH", the package will use
-    PATH as the prefix for installing programs and libraries. Documentation
-    and other data files will still use the regular prefix. 
-
-    By default, "make install" will install the server-specific programs in
-    "/usr/cyrus/bin". You can specify a server-specific installation prefix
-    other than "/usr/cyrus" by giving "configure" the option
-    "--with-cyrus-prefix=PATH". 
-
-Options to configure
-
-    Here are a list of switches that can be used with "configure". 
-
-    --help  Print a summary of the options to "configure", and exit. 
-
-    --with-auth=METHOD 
-            Specifies the authorization (group membership) module to use.
-            Currently implemented authorization modules are: 
-
-            unix    Unix /etc/passwd and /etc/group file 
-            krb     Kerberos principals (requires Kerberos libraries).
-                    Optionally, specify where to find Kerberos v4 with
-                    "--with-krb=DIR" IMPORTANT: The Kerberos v4 support
-                    requires the DES library. Some vendor distributions of
-                    Kerberos, including the one with Solaris, do not have
-                    this support and cannot be used. 
-            krb_pts Kerberos principals with AFS PTserver groups (requires
-                    Kerberos and AFS libraries). Optionally, specify where
-                    the AFS libraries are found with "--with-afs=PATH".
-                    Also requires krb support as above. 
-
-            Any method of authenticating with SASL can be used with any
-            authorization module.
-
-    --with-krb=PATH 
-            Specifies where to find the Kerberos library.
-
-    --with-com_err=PATH 
-            Specifies where to find the com_err environment.
-
-    --with-cyrus-group=USER 
-            Specifies the group used for installing setguid programs. By
-            default, configure uses "mail". 
-
-    --with-cyrus-prefix=PATH 
-            Change the location of the server software. By default, the
-            cyrus-prefix is /usr/cyrus.
-
-    --with-cyrus-user=USER 
-            Specifies the userid that the Cyrus IMAP server will run as. By
-            default, configure uses "cyrus". 
-
-    --with-dbdir=PATH 
-            Specifies where to find the Berkeley DB library.
-
-    --with-duplicate-db=DB 
-            Specifies which database backend to use for the duplicate
-            delivery database. By default, configure uses
-            "berkeley_nosync".
-
-    --with-mboxlist-db=DB 
-            Specifies which database backend to use for the mailbox list.
-            By default, configure uses "berkeley".
-
-    --with-seen-db=DB 
-            Specifies which database backend to use for the seen state. By
-            default, configure uses "flat".
-
-    --with-subs-db=DB 
-            Specifies which database backend to use for the subscriptions
-            list. By default, configure uses "flat".
-
-    --with-tls-db=DB 
-            Specifies which database backend to use for the TLS cache. By
-            default, configure uses "berkeley_nosync".
-
-    --with-idle=METHOD 
-            Specifies the IMAP IDLE method to use. Currently implemented
-            IDLE methods are: 
-
-            idled   Use the IDLE daemon. The IDLE daemon listens on a UNIX
-                    socket for messages from lmtpd/imapd/pop3d that a
-                    mailbox has been updated. The daemon then signals those
-                    (if any) imapd that are idling on the mailbox to check
-                    for the changes. 
-            poll    Periodically poll the mailbox for changes. 
-            no      Disable IMAP IDLE. 
-
-            By default, configure uses "poll".
-
-    --with-lock=METHOD 
-            Specifies the locking method to use. Currently implemented
-            locking methods are: 
-
-            flock   flock() locking 
-            fcntl   fcntl() locking 
-
-            By default, configure uses "fcntl" if the "fcntl()" function
-            exists, "flock" otherwise.
-
-    --with-openssl=PATH 
-            Specifies where to find the OpenSSL library.
-
-    --with-egd-socket=FILE 
-            Specifies which socket to use to connect to the Entropy
-            Gathering Daemon.
-
-    --with-perl=PATH 
-            Specifies where to find the Perl binary (full path, including
-            name of binary).
-
-    --with-sasl=PATH 
-            Specifies the path to the directories containing the library
-            (.../lib) and include (.../include) files for libsasl. 
-
-    --with-statedir=PATH 
-            Specifies the directory used for communicating with various
-            daemons. By default, configure uses "/var". 
-
-    --with-libwrap=PATH 
-            Specifies where to find the TCP wrappers library.
-
-    --with-ucdsnmp=PATH 
-            Specifies where to find the SNMP library.
-
-    --with-zephyr=PATH 
-            Specifies where to find the Zephyr library (for notifyd).
-
-    --enable-listext 
-            Enables support for LISTEXT extension.
-
-    --enable-murder 
-            Enables support for IMAP Murder.
-
-    --enable-netscapehack 
-            Enables support for X-NETSCAPE extension (administration URLs).
-
-    --disable-sieve 
-            By default, Sieve support is enabled. Use --disable-sieve to
-            disable compiling the Sieve library and to disable all Sieve
-            support.
-
-    --disable-cyradm 
-            Do not compile the cyradm administrative client.
-
-    --disable-server 
-            Do not compile the IMAP server programs.
-
-    Run configure --help for further configuration options. 
-
-    Some systems require unusual options for compilation or linking that
-    the "configure" script does not know about. You can give "configure"
-    initial values for variables by setting them in the environment. Using
-    a Bourne-compatible shell, you can do that on the command line like
-    this: 
-
-       CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-    Or on systems that have the "env" program, you can do it like this: 
-
-       env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-    The "make" variables that you might want to override with environment
-    variables when running "configure" are: 
-
-    CC      C compiler program.
-            Default is "cc", or "gcc" if "gcc" is in your PATH.
-            (For "CC", any value given in the environment overrides the
-            value that "configure" would choose.) 
-    CFLAGS  Debugging and optimization options for the C compiler.
-    CPPFLAGS 
-            Header file search directory ("-IDIR") and any other
-            miscellaneous options for the C preprocessor and compiler. If
-            it is not set in the environment when "configure" runs, the
-            default value is empty.
-    LDFLAGS Stripping ("-s") and any other miscellaneous options for the
-            linker. If it is not set in the environment when "configure"
-            runs, the default value is empty. 
-    DEFS    Configuration options, in the form "-Dfoo -Dbar ..."
-    LIBS    Libraries to link with, in the form "-lfoo -lbar ..."
-            (For "DEFS" and "LIBS", any value given in the environment is
-            added to the value that "configure" chooses.) 
-
-    If you need to do unusual things to compile the package, we encourage
-    you to figure out how "configure" could check whether to do them. After
-    doing so, please send us a patch! Instructions for doing so can be
-    found on the feedback page. 
-
-    The file "configure.in" is used as a template to create "configure" by
-    a program called "autoconf". You will only need it if you want to
-    regenerate "configure" using a newer version of "autoconf". 
-
-    Once you have successfully run "configure", execute the following
-    commands: 
-
-       make depend
-       make all CFLAGS=-O
-
-    If you want, you can override the "make" variables CFLAGS and LDFLAGS
-    by entering the following: 
-
-       make all CFLAGS=-O2 LDFLAGS=-s
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-configure Deleted

@@ -1,482 +0,0 @@
-Installing and configuring the IMAP Server
-
-    This section describes the shell scripts to run and the configuration
-    files to modify once "configure" and "make" have run. 
-
-     1. Create a user and group for the Cyrus subsystem. The examples in
-        this document assume a user of "cyrus" and a group of "mail",
-        though any user and group name can be used. If a user other than
-        "cyrus" is to be used, it must have been previously specified in
-        the "--with-cyrus-user=" option to "configure". If a group other
-        than "mail" is to be used, it must have been previously specified
-        in the "--with-cyrus-group=" option to "configure". 
-
-     2. After you've logged in as "root", install the cyrus software. 
-
-           make install
-
-        Be sure that the server programs ended up in the directory
-        specified by "--with-cyrus-prefix" (by default, "/usr/cyrus/bin"). 
-
-     3. The Cyrus IMAP server uses the 4.3BSD syslog that separates
-        messages into both levels and categories. Invoke "man syslog" to
-        see if "openlog()" takes three arguments. If it does not, replace
-        the system "syslogd" and "syslog.conf" with the files provided in
-        the "syslog" directory. 
-
-           mv syslogd /etc/syslogd
-           mv syslog.conf /etc/syslog.conf
-
-        If you do not copy the "syslog/syslog.conf" file to the "/etc"
-        directory, be sure to add support for "local6.debug". The file
-        should include a line like: 
-
-           local6.debug  /var/log/imapd.log
-
-        You probably also want to log SASL messages with a line like: 
-
-           auth.debug /var/log/auth.log
-
-        After installation and testing, you probably want to change the
-        ".debug" component to something a little less verbose. Create the
-        log files: 
-
-           touch /var/log/imapd.log /var/log/auth.log
-
-     4. Create the file "/etc/imapd.conf". Here is a sample "imapd.conf"
-        with a minimal number of values defined: 
-
-           configdirectory: /var/imap
-           partition-default: /var/spool/imap
-           admins: curtj abell
-           sasl_pwcheck_method: saslauthd
-
-        For a description of all the fields in this file, see the
-        imapd.conf(5) man page. (Note that this file also exports values to
-        libsasl, the most important of them the pwcheck_method. In this
-        example, users are authenticated via the saslauthd daemon, which
-        can be run in a number of different ways.) 
-
-        READ THE imapd.conf(5) MAN PAGE. There are options in there that
-        you will want to know about and default behavior that you may not
-        like. 
-
-        Note that everyday users should not be administrators. Admins have
-        powers not granted to regular users and while the server allows
-        them to receive mail, some problems will occur if admins are used
-        as regular users. You also should not read mail as an
-        administrator. You should have separate accounts for reading mail
-        and administrating. This is especially true if using the
-        altnamespace option, because admins are always presented with the
-        standard (internal) namespace. 
-
-     5. Create the configuration directory specified by the
-        "configdirectory" option in "imapd.conf." The configuration
-        directory is similar in concept to the "/usr/lib/news" directory.
-        It stores information about the IMAP server as a whole. 
-
-        This document uses the configuration directory "/var/imap" in its
-        examples. This directory should be owned by the cyrus user and
-        group and should not permit access to other users. 
-
-           cd /var
-           mkdir imap
-           chown cyrus imap
-           chgrp mail imap
-           chmod 750 imap
-
-     6. Create the default partition directories specified in the
-        "/etc/imapd.conf" file. 
-
-        This document uses a default partition directory of
-        "/var/spool/imap" in the following example: 
-
-           cd /var/spool
-           mkdir imap
-           chown cyrus imap
-           chgrp mail imap
-           chmod 750 imap
-
-        The partition directory is similar in concept to /var/spool/news.
-        It is where the mailboxes are stored. Unlike most netnews systems,
-        Cyrus allows you to have more than one partition. 
-     7. If you wish to use Sieve, and you didn't configure deliver to look
-        in home directories (see the imapd.conf man page), create the Sieve
-        directory: 
-
-           cd /usr
-           mkdir sieve
-           chown cyrus sieve
-           chgrp mail sieve
-           chmod 750 sieve
-
-     8. Change to the Cyrus user and use the tool "tools/mkimap" to create
-        the rest of the directories (subdirectories of the directories you
-        just created). 
-
-           su cyrus
-           tools/mkimap
-           exit
-
-
-        If Perl is not available, it should be easy (but time consuming) to
-        create these directories by hand. 
-
-     9. LINUX SYSTEMS USING EXT2FS ONLY: Set the user, quota, and partition
-        directories to update synchronously. Failure to do this may lead to
-        data corruption and/or loss of mail after a system crash.
-        Unfortunately, doing so may result in a serious performance hit. If
-        you are using a newer filesystem than ext2fs on Linux, this step
-        should not be necessary. (Running ext3 in any mode is safe.) 
-
-           cd /var/imap
-           chattr +S user quota user/* quota/*
-           chattr +S /var/spool/imap /var/spool/imap/*
-
-        Also set the queue directory of the mail daemon to update
-        synchronously. The following example is for sendmail: 
-
-           chattr +S /var/spool/mqueue
-
-    10. To enable STARTTLS support, see how to configure OpenSSL below. 
-
-    11. Add the following lines to the "/etc/services" file if they aren't
-        already there. 
-
-           pop3      110/tcp
-           nntp      119/tcp
-           imap      143/tcp
-           imsp      406/tcp
-           nntps     563/tcp
-           acap      674/tcp
-           imaps     993/tcp
-           pop3s     995/tcp
-           kpop      1109/tcp
-           sieve     2000/tcp
-           lmtp      2003/tcp
-           fud       4201/udp
-
-    12. Remove "/etc/xinetd.conf" entries. Any imap, imaps, pop3, pop3s,
-        kpop, lmtp and sieve lines need to be removed from
-        /etc/xinetd.conf and xinetd needs to be restarted. 
-
-Configuring the Master Process
-
-     1. Choose a configuration from the master/conf directory: 
-
-        small.conf
-                bare-bones server supporting IMAP and POP 
-        normal.conf
-                server supporting IMAP, POP, the SSL wrapped versions, and
-                the Sieve script management protocol 
-        prefork.conf
-                The same configuration as above, but with some preforked
-                processes for faster processing. 
-        backend-cmu.conf
-                Our configuration (for Murder Backend / typical IMAP
-                servers) 
-        frontend-cmu.conf
-                Our configuration (for Murder Frontend servers) 
-
-        To use normal.conf, do: 
-
-           cp master/conf/normal.conf /etc/cyrus.conf
-
-        Optionally, you can edit /etc/cyrus.conf to disable or enable
-        certain services, or to tune the number of preforked copies. Be
-        sure not to remove the entries that are labeled required. 
-
-     2. Arrange to start "/usr/cyrus/bin/master" as root when the system
-        starts. It will bind some ports and then give up its root
-        privileges. Until your system reboots, you can start the master
-        process by hand: 
-
-           /usr/cyrus/bin/master &
-
-     3. Monitor the progress of the master process by examining the
-        imapd.log file. It should never exit by itself, but you can shut
-        down the mail system by sending it a signal with kill. 
-
-     4. Clean Shutdown - you can shut the master process down cleanly by
-        sending it a SIGQUIT rather than SIGTERM signal. This will cause
-        the master process to send SIGQUIT to all its children and then
-        wait for them to finish cleanly. This avoids issues like a message
-        being appended by lmtpd but the sync_log record never being
-        written. 
-
-        Since a clean shutdown may never finish if a child process is stuck
-        for some reason the recommended approach is to send a SIGQUIT then
-        loop on the master process sending a signal 0 every second until
-        either the master process has gone away or a suitable time has
-        expired (maybe 10 seconds). You can then send a SIGTERM if the
-        process still exists. 
-
-        At FastMail the following snippet of perl is used (warning: Linux
-        specific signal numbers - check your own system before using this): 
-
-            my $pid = `cat $PIDFILE`;
-            chomp($pid);
-            print "Trying nice shutdown - killing $pid with SIGQUIT\n";
-            kill 3, $pid;
-            foreach my $num (1..10) {
-              if (kill 0, $pid) {
-                print "Not dead yet after $num seconds\n";
-                sleep 1;
-              }
-              else {
-                last;
-              }
-            }
-            if (kill 0, $pid) {
-              print "No more Mr. Nice Guy - killing $pid with SIGTERM\n";
-              kill 15, $pid;
-            }
-
-Configuring the Mail Transfer Agent
-
-    In order to deliver mail to the Cyrus system, you'll have to configure
-    your MTA (Sendmail, Postfix, Exim, etc.) to use LMTP. 
-
-Configuring Sendmail
-
-    Generate a sendmail configuration file which delivers local mail to the
-    IMAP server. See the file cf/README in the Sendmail distribution for
-    information on how to create a complete configuration file. This file
-    also lists variables that can be used to customize the mailer
-    definitions mentioned below. 
-
-    The following configurations assume that you are using the lmtpunix
-    service from one of the sample cyrus.conf files discussed above. 
-
-      * For Sendmail 8.12.4 and higher, use the cyrusv2 mailer definition
-        in the Sendmail distribution: 
-
-        define(`confLOCAL_MAILER', `cyrusv2')
-        MAILER(`cyrusv2')
-
-        If you wish to change the name of the UNIX socket or switch to TCP,
-        define CYRUSV2_MAILER_ARGS appropriately as described in cf/README. 
-
-      * For Sendmail 8.10 - 8.12.3, use the cyrusv2.mc file as a template
-        to create a Sendmail configuration file. 
-
-      * For Sendmail 8.9.x and earlier, use the cyrus mailer definition in
-        the Sendmail distribution: 
-
-        define(`confLOCAL_MAILER', `cyrus')
-        MAILER(`cyrus')
-
-        Edit /etc/group and add user "daemon" to the "mail" group. This
-        will permit sendmail to run the "deliver" (LMTP client) program to
-        deliver mail to the IMAP server. 
-
-    Cyrus also includes a socket map daemon smmapd which can be used by
-    Sendmail 8.13 and higher (a patch for 8.12 is available) to verify at
-    RCPT TO time that a message can be delivered to the particular mailbox.
-    To use this daemon, add smmapd as a service in cyrus.conf and configure
-    Sendmail accordingly. 
-
-Configuring Postfix
-
-    The Postfix source distribution comes with the file
-    "README_FILES/LMTP_README". Even if you are using a binary distribution
-    of Postfix, it would be well worth your while to download the full
-    Postfix source. Not only will you get the above file, but numerous
-    other "readme" files and sample configuration files. 
-
-    One thing you need to watch out for is the UID and GID of the Postfix
-    software. As it states in the Postfix "INSTALL" document, you must
-    create a new account that does not share its UID and GID with any other
-    user account. This is for security reasons. If you installed Postfix
-    with a GID of "mail", you will need to select a different GID for
-    Cyrus. See the Cyrus configure options "--with-cyrus-user" and
-    "--with-cyrus-group". (This was more crucial when the use of Cyrus'
-    "deliver" was more prevalent, but it is still a good idea to follow
-    this policy.) 
-
-    Another thing to note is the location of your "sendmail" command. On
-    some platforms this will be "/usr/sbin/sendmail", on others,
-    "/usr/lib/sendmail". Cyrus will need to know where this command is. See
-    Installing Sieve for more details. 
-
-    Assuming that you are using the lmtpunix service from one of the sample
-    cyrus.conf files discussed above, the Postfix configuration file
-    "/etc/postfix/main.cf" should have the following line: 
-
-      mailbox_transport = lmtp:unix:/var/imap/socket/lmtp
-
-    Naturally, both the Postfix UID and the Cyrus UID need to be able to
-    access the specified socket file. 
-
-    Starting with Postfix snapshot-20010222, you can improve the efficiency
-    of LMTP delivery via the "mailbox_transport" by putting the following
-    entries in "/etc/postfix/main.cf": 
-
-      local_destination_recipient_limit = 300
-      local_destination_concurrency_limit = 5
-
-    Of course you should adjust these settings as appropriate for the
-    capacity of the hardware you are using. The recipient limit setting can
-    be used to take advantage of the single instance message store
-    capability of Cyrus. The concurrency limit can be used to control how
-    many simultaneous LMTP sessions will be permitted to the Cyrus message
-    store. 
-
-    Additional examples are included in the Postfix file
-    "README_FILES/LMTP_README". 
-
-Configuring Exim 4
-
-    Generate an Exim configuration file which delivers local mail to the
-    IMAP server. See the Exim documentation for information on how to
-    create a complete configuration file. 
-
-    Cyrus is designed to be used as a black-box server -- there are usually
-    no local user accounts. As a result, you must define the following
-    "router": 
-
-        localuser:
-          driver = accept
-          transport = local_delivery
-
-    The following "transports" assume that you are using either the
-    lmtpunix or lmtp service from one of the sample cyrus.conf files
-    discussed above. 
-
-      * Using lmtpunix (UNIX socket): 
-
-        local_delivery:
-          driver = lmtp
-          command = "/usr/cyrus/bin/deliver -l"
-          batch_max = 20
-          user = cyrus
-
-      * Using lmtp (TCP socket -- Exim and Cyrus on same host): 
-
-        local_delivery:
-          driver = smtp
-          protocol = lmtp
-          hosts = localhost
-          allow_localhost
-
-    For more advanced configurations (such as address verification, etc),
-    consult the Exim documentation and sample configurations. 
-
-Exporting Netnews via IMAP
-
-    If you wish to use export Netnews via IMAP, consult
-    install-netnews.html. 
-
-SSL, TLS, and OpenSSL
-
-    Transport Layer Security (TLS), is a standardized version of the Secure
-    Sockets Layer (SSL v3) standard. IMAP can make use of two different
-    versions of TLS/SSL: STARTTLS and an SSL wrapped session. 
-
-    In STARTTLS, a client connects to the IMAP port as normal and then
-    issues the STARTTLS command, which begins a TLS negotiation. This is
-    currently supported by the Cyrus IMAP server when it is compiled with
-    OpenSSL. 
-
-    The alternative, a SSL wrapped connection, involves the client
-    connected to a seperate port ("imaps") and negotiating a SSL session
-    before starting the IMAP protocol. Again, this is supported natively by
-    the Cyrus IMAP server when it is compiled with OpenSSL. 
-
-    Both TLS and SSL require a server key and a certificate. Optionally, in
-    addition to establishing a secure connection, TLS can authenticate the
-    client. 
-
-Configuring Cyrus with OpenSSL
-
-     1. 
-        OpenSSL requires the certificate and key in PEM format. You can
-        create the server's private key and certificate yourself using
-        OpenSSL. Here, we create a self-signed key for the machine
-        "foobar.andrew.cmu.edu" and put both the certificate and key in the
-        file "/var/imap/server.pem". 
-
-        Please do not blindly enter in the information to OpenSSL below.
-        Instead, enter the appropriate information for your organization
-        (i.e., NOT Carnegie Mellon University for the Organization Name,
-        etc.). 
-
-        openssl req -new -x509 -nodes -out /var/imap/server.pem -keyout /var/imap/server.pem -days 365
-        Using configuration from /usr/local/lib/openssl/openssl.cnf
-        Generating a 1024 bit RSA private key
-        .............+++++
-        ......................+++++
-        writing new private key to '/var/imap/server.pem'
-        -----
-        You are about to be asked to enter information that will be incorporated
-        into your certificate request.
-        What you are about to enter is what is called a Distinguished Name or a DN.
-        There are quite a few fields but you can leave some blank
-        For some fields there will be a default value,
-        If you enter '.', the field will be left blank.
-        -----
-        Country Name (2 letter code) AU:US
-        State or Province Name (full name) Some-State:Pennsylvania
-        Locality Name (eg, city) :Pittsburgh
-        Organization Name (eg, company) Internet Widgits Pty Ltd:Carnegie Mellon University
-        Organizational Unit Name (eg, section) :Andrew Systems Group
-        Common Name (eg, YOUR name) :foobar.andrew.cmu.edu
-        Email Address :
-
-     2. Make sure to make key file(s) readable by the Cyrus user. For
-        example: chown cyrus /var/imap/server.pem 
-     3. Add the following to /etc/imapd.conf to tell the server where to
-        find the certificate and key files (used for ALL services): 
-
-        tls_cert_file: /var/imap/server.pem
-        tls_key_file: /var/imap/server.pem
-
-        Optionally, you can use separate certificates and key files for
-        each service: 
-
-        servicename_tls_cert_file: /var/imap/imap-server.pem
-        servicename_tls_key_file: /var/imap/imap-server.pem
-
-        "servicename" here refers to the name of the service as specified
-        in cyrus.conf. It is not necessarily the name of the binary. 
-
-        This is useful if you want to use different hostnames for each
-        service (e.g., via virtual host interfaces or DNS CNAMEs). In the
-        absence of any of the service specific options, the value of the
-        global option is used. A value of disabled for the certificate or
-        key file for a particular service will disable SSL/TLS for that
-        service. 
-
-        If you have a Certificate Authority (CA), you may wish to generate
-        a certificate request and send it to be signed by your CA. 
-
-        By default, Cyrus will cache SSL/TLS sessions for reuse for up to
-        24 hours. By adjusting the value of the tls_session_timeout option
-        in imapd.conf, the session caching can be disabled (0) or the
-        expiration period shortened. 
-
-     4. You can test STARTTLS by using imtest: 
-
-        imtest -t "" foobar.andrew.cmu.edu
-
-Client-side certificates
-
-    Client certificates are somewhat harder to configure than server
-    certificates. You'll need a CA (certificate authority) and need to
-    generate client certificates signed by that CA. STARTTLS in Sendmail
-    and other MTAs have similiar problems, so Claus Assman's page is a good
-    reference. 
-
-    You can use the self-signed certificate generated above as a CA for
-    client certificates. To do this, try the following: 
-
-    TODO: write me! 
-
-    Unfortunately, there's no standard on how to convert the client's
-    authenticate DN (distinguished name) to a SASL authentication name. 
-
-Alternate Namespace and UNIX Hierarchy Convention
-
-    If you wish to use the alternate namespace and/or the UNIX hierarchy
-    convention, consult altnamespace.html. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-murder Deleted

@@ -1,336 +0,0 @@
-Installing The Cyrus Murder
-
-    The Cyrus Murder provides the ability to horizontally scale your Cyrus
-    IMAP environment across multiple servers. It is similar in nature to
-    various proxy solutions such as nginx or perdition with the difference
-    being that Murder offers a uniform namespace. If you're not currently
-    using shared mailboxes and you don't intend to use shared mailboxes in
-    the future, you should probably just consider using a simple proxy
-    solution. 
-
-Introduction & Assumptions
-
-    This document is intended to be a guide to the configuration of a Cyrus
-    IMAP Aggregator, aka Cyrus Murder. It is recommended that you review
-    this document to become familliar with the concepts at work. This
-    document is a work in progress and is at this point incomplete.
-
-    This document assumes that you have successfully been able to setup
-    atleast one Cyrus IMAP server. This server will become your first
-    backend server. It also assumes that you are familliar with the
-    administration and day to day operations of the Cyrus IMAP server and
-    the SASL authentication library. If you feel uncomfortable with this,
-    please refer to the rest of the documentation first.
-
-    There is a diagram that shows the interactions of the various
-    components of the Cyrus Murder which may be helpful in understanding
-    the "big picture".
-
-Installation
-
-    You will need to build Cyrus IMAPd with the --enable-murder configure
-    option. This builds the proxyds and the associated utilities. 
-
-Requirements
-
-      * Atleast one Cyrus IMAP server. If there are more than one, their
-        name spaces must not conflict. That is, all the mailbox names must
-        be unique (or in different namespaces) 
-      * Atleast one machine that will become the first Frontend Server. 
-      * One machine to become the MUPDATE master server. This can be the
-        same as one of your frontend servers. 
-
-Configuring the MUPDATE Master
-
-    The mupdate master server needs to be running the mupdate service in
-    master mode. Note that you can have the MUPDATE master be one of your
-    frontend machines, just do not configure a slave mupdate process on
-    this machine.
-
-    To configure an mupdate master, you will want a cyrus.conf that
-    includes a line similar to the following in the SERVICES section:
-
-      mupdate       cmd="/usr/cyrus/bin/mupdate -m" listen=3905 prefork=1
-
-    Note the "-m" option to tell mupdate that it should start in master
-    mode.
-
-    You will also need to configure atleast a skeleton imapd.conf that
-    defines the configdirectory, a bogus partition-default and the admins
-    that can authenticate to the server. Note that slave mupdate servers as
-    well as the backend servers will need to be able to authenticate as
-    admins on the master. Here is a very simple imapd.conf for a master
-    server:
-
-    configdirectory: /imap/conf
-    partition-default: /tmp
-
-    admins: mupdateslave1 backend1
-
-    You will also need to configure SASL to properly allow authentication
-    in your enviornment.
-
-Setting up the backends to push changes to the MUPDATE Master
-
-    On the backends, configuration to be a part of a murder is easy. You
-    just need to configure the backend to be a part of the murder. To do
-    this, set the mupdate_server option in imapd.conf. Depending on what
-    authentication mechanisms you are using, you may also want to set some
-    or all of the following: 
-
-      * mupdate_username 
-      * mupdate_authname 
-      * mupdate_realm 
-      * mupdate_password 
-
-    Once these settings are successfully made, any mailbox operation on the
-    backend will be sent to the mupdate master for confirmation and entry
-    into the mupdate database.
-
-    You must also configure atleast one user/group using the proxyservers
-    imapd.conf option. This user should not be an administrator, since this
-    means that anyone who can get ahold of your proxy servers now has full
-    administrative control on your backend. Example:
-
-    admins: cyrus
-    proxyservers: murder
-
-    Keep in mind that you will need to create the proxy user(s) and be sure
-    that they can authenticate to the backend as well. NOTE: proxyservers
-    should not be set on your frontends. It is also used to determine which
-    servers to create mailboxes on. 
-
-Importing the database from the backend
-
-    Importing the current mailboxes database is easy, as there is a
-    ctl_mboxlist option to do so. To do the first synchronization, simply
-    change to the cyrus user, and issue a ctl_mboxlist -m.
-
-    Note that you may wish to issue a ctl_mboxlist -mw first to be sure you
-    understand all the operations that this command will perform, since it
-    does require that all mailboxes are unique in the murder namespace. If
-    everything is configured properly, the mailbox database of the current
-    host will dump to the mupdate master. If there are problems, the most
-    likely cause is a misconfiguration of the authentication settings, or
-    that mupdate might not be running on the master. Using mupdatetest may
-    be helpful in this case (it establishes an authenticated connection to
-    the mupdate server, if it can).
-
-    It is also useful to have the backends automatically resync the state
-    of their local mailboxes database with the master on start up. You can
-    configure this by adding the following to the START section of
-    cyrus.conf on the backends:
-
-      mupdatepush   cmd="ctl_mboxlist -m"
-
-    This will perform synchronization with the mupdate master each time the
-    backend restarts, bringing the mupdate database up to date with the
-    contents of the backend (and performing ACTIVATE and DELETES as needed
-    to do so).
-
-    Warning: If somehow a mailbox exists on two (or more) backend servers,
-    each time one of them synchronizes its database that backend server
-    will become authoritative. Though this should not happen during normal
-    operation of the murder (because of the consistancy guarantees of the
-    MUPDATE protocol, and the fact that mailbox operations are denied if
-    the mupdate master is down), it is possible when first creating the
-    mupdate database or when bringing a new backend server into the murder. 
-
-Configuring the frontends
-
-    Configuring the frontends is a two step process. First, you want to set
-    mupdate_server (and friends) as you did for the backends above.
-    However, because the frontends only talk to the mupdate master via a
-    slave running on the local machine, you will also need to set up a
-    slave on the same machine, in the SERVICES section of cyrus.conf, like
-    so:
-
-      # mupdate database service - must prefork atleast 1
-      mupdate       cmd="mupdate" listen=3905 prefork=1 
-
-    Note that as this is a threaded service, you must prefork atleast 1 of
-    them so that the database can be synchronized at startup. Otherwise,
-    the service will not start running until after you recieve an mupdate
-    client connection to the slave (which is not a recommended
-    configuration at this point).
-
-    You will also want to change all of your imapd entries to be proxyd,
-    and all of your lmtpd entries to be lmtpproxyd. That is, you will
-    probably have a SERVICES section that looks more like this now:
-
-      mupdate       cmd="/usr/cyrus/bin/mupdate" listen=3905 prefork=1 
-
-      imap          cmd="proxyd" listen="imap" prefork=5
-      imaps         cmd="proxyd -s" listen="imaps" prefork=1
-      pop3          cmd="pop3d" listen="pop3" prefork=0
-      pop3s         cmd="pop3d -s" listen="pop3s" prefork=0
-      kpop          cmd="pop3d -k" listen="kpop" prefork=0
-      nntp          cmd="nntpd" listen="nntp" prefork=0
-      nntps         cmd="nntpd -s" listen="nntps" prefork=0
-      sieve         cmd="timsieved" listen="sieve" prefork=0
-      lmtp          cmd="lmtpproxyd" listen="/var/imap/socket/lmtp" prefork=0
-
-    Note that timsieved does not need a proxy daemon, the managesieve
-    protocol deals with the murder with referrals to the backends
-    internally.
-
-    Additionally, you will need entries in imapd.conf to indicate the proxy
-    auth name and passwords (if you are using a SASL mechanism that
-    requires them) to the backends, for example, if your backends are
-    mail1.andrew.cmu.edu and mail2.andrew.cmu.edu with passwords of foo and
-    bar, and an auth name of murder:
-
-    mail1_password: foo
-    mail2_password: bar
-    proxy_authname: murder
-
-    If your SASL mechanism does not require authnames or passwords (e.g.
-    KERBEROS_V4), then this is not required. Note that we used the same
-    authname as the configured in the proxyservers line in the backend's
-    imapd.conf above.
-
-    When you start master on the frontend, a local mailboxes database
-    should automatically synchronize itself with the contents of the
-    mupdate master, and you should be ready to go. Your clients should
-    connect to the frontends, and the frontends will proxy or refer as
-    applicable to the blackend servers.
-
-Additional backend configuration
-
-    If your authentication system requires usernames, passwords, etc, to
-    authenticate (e.g. it isn't Kerberos), then you will also need to
-    specify proxy_authname (and friends) in the backend imapd.confs as
-    well. This is so that the backends can authenticate to eachother to
-    facilitate maibox moves. (Backend machines will need to be full
-    admins). 
-
-Delivering mail
-
-    To deliver mail to your Murder, configure your MTA just as you did
-    before, but instead of connecting directly to lmtpd, it should connect
-    to lmtpproxyd. You can connect to the lmtpproxyd running on the
-    frontend machines, or you can install master and lmtpproxyd on your
-    SMTP servers. 
-
-Administration
-
-Keeping the database synced
-
-    Consistancy in the database is maintained by pushing the current status
-    of the backends to the master, and having the frontends stay up to date
-    with the master's database. Since the frontends resync themselves
-    entirely when they startup, downtime should not at all be a problem.
-    (While they are up they should be continously recieving database
-    updates, as well as when they lose connection to the master, they will
-    try to reconnect and resync their database upon reconnection) 
-
-    Provided that the namespace of the backend servers is kept discrete
-    (with no mailboxes existing on the same server), it is not a big deal
-    to resync the mupdate master using ctl_mboxlist -m. If two servers do
-    have the same mailbox, this will need to be resolved before database
-    consistancy can be guranteed. 
-
-Moving Mailboxes between backends
-
-    There is currently no 100% foolproof way to do this, however, if you
-    issue a rename command to a frontend (as you would to move a mailbox
-    between partitions), and replace the partition name with the name of
-    the new backend, it will move the mailbox to the indicated backend. You
-    can also use the format backend.domain.com!partition to move to a
-    specific partition (otherwise the default partition will be used). In
-    cyradm, this looks like:
-
-    cyrus.andrew.cmu.edu> rename user.bcyrus user.bcyrus mail2.andrew.cmu.edu!u2
-
-    Note that since seen state is stored per-user, it is possible that when
-    moving a shared mailbox users will have strange effects. The general
-    rule is that moving an INBOX will move the entire user (including all
-    sub-mailboxes to the INBOX, and seen state, and subscriptions, and
-    sieve scripts, etc). The seen state is merged with the seen state on
-    the new backend, so that no data is lost (seen state is also the only
-    part left behind on the source backend). In the case of any other
-    mailbox, however, only that individual mailbox is moved. If it is a
-    quota root, the new quota root is instated on the new server, but
-    otherwise quotas can appear to be violated, since each backend only
-    takes care of its own quota.
-
-    In general, its better to leave trees of mailboxes on the same server,
-    and not move submailboxes of inboxes between servers. 
-
-Adding additional backend servers
-
-    This is very easy to do, simply configure an empty backend server and
-    set its mupdate_server parameter to point at the mupdate master. Then,
-    issue mailbox creates to it as you would any other backend server. 
-
-Backups
-
-    xxx, need to write stuff. You don't need to really backup the data on
-    the mupdate master or slaves, since this data can all be generated
-    directly from the backends quite easily. 
-
-Gotchyas
-
-      * Clients dealing with a pool of frontend servers - Some clients may
-        not be terribly efficient caching connections to a pool of imap
-        servers, this isn't a problem, per se, but it may mean that you
-        will see many more authentications than you are used to. 
-
-          * Kerberos issues - If you are using kerberos authentication, you
-            will want to ensure that all your machines are keyed properly,
-            as we have seen problems with different clients trying to
-            authenticate to different services (e.g. imap.imap-pool instead
-            of imap.pool-frontend-1), so test the clients in use in your
-            enviornment and be sure that they work with whatever keying
-            scheme you use.
-
-      * Clients dealing with referrals - Some clients (we've had particuar
-        trouble with pine, though most of these issues have now been
-        resolved and new versions should be OK (that is, pine > 4.44), but
-        as referrals have not been extensively used by any IMAP server
-        until now, referrals are very likely to not work correctly or have
-        surprising effects. 
-      * Clients dealing with getting a NO on LSUB commands - Some clients
-        (Outlook, for example) may behave poorly if an LSUB command returns
-        a NO, which may be the case if the backend server with the user's
-        inbox is down. We have, for example, seen this result in the
-        deletion of the disconnected message cache. 
-      * Behavior of cyradm / some mailbox operations - The behavior of some
-        administrative commands might be slightly unexpected. For example,
-        you can only issue a SETQUOTA to a frontend server if the entire
-        mailbox tree underneath where you are setting the quota exists on
-        the same backend server, otherwise you will need to connect
-        directly to the backend servers to perform the needed changes.
-        Similarally, mailboxes will be created on the same backend server
-        that their parent is in. In order to create them on a different
-        server (or to create a new top level mailbox) you will need to
-        connect directly to the desired backend server. 
-      * Subscriptions - If users want subscribe to a mailbox other than on
-        their backend home server, they won't be able to, unless you set
-        "allowallsubscribe: t" in the backend imapd.confs. This essentially
-        lets any string be subscribed to successfully. 
-      * Restarting the mupdate master - Because ctl_cyrusdb -r clears
-        reservations on mailbox, if you restart the mupdate master (and run
-        recovery), then this could (we suspect, very rarely) lead to
-        inconsistancies in the mupdate database. 
-
-Troubleshooting & when things go wrong
-
-      * Mailbox operations are being denied - This is an indication that
-        the mupdate master may be down. Restart it. 
-      * Mailbox operations are not being seen by one or more frontends -
-        This indicates that the mupdate process on a slave may have died,
-        you may need to restart master. Alternatively, mupdate will retry
-        connections every 20 seconds or so for about 20 attempts if the
-        master does go down. 
-      * A frontend's mailboxes.db is corrupt / out of sync - Restart master
-        on the frontend, and have the mupdate process resynch the local
-        database. You may need to remove the local mailboxes database if
-        the corruption is extreme. 
-      * A mailbox's location keeps switching between two (or more) backend
-        hosts. - It probably actually exists on both hosts. Delete the
-        mailbox from all but one of the hosts, and run a ctl_mboxlist -m on
-        the one where you want it to actually live. 
-      * Databases are never created on the frontends/slaves - Check to
-        ensure that the mupdate slave process is started, (is prefork=1) 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-netnews Deleted

@@ -1,192 +0,0 @@
-Cyrus and Netnews
-
- Note that the NNTP support in Cyrus is still relatively young in the
- grand scheme of things, and has not been tested under a heavy Usenet
- load. That being said, the code appears to be stable and is currently
- running in production serving 50-60 newsgroups with a volume of about
- 6000 messages per day. 
-
-Introduction
-
- Cyrus has the ability to export Usenet via IMAP and/or export shared
- IMAP mailboxes via NNTP. This is made possible by a new NNTP daemon
- which is included with Cyrus. 
-
- This document assumes that you have successfully been able to setup
- your Cyrus IMAP server. If you have not already done so, please refer
- to the rest of the documentation. This document also assumes that you
- are familiar with Usenet and shared IMAP mailboxes. 
-
- There is a diagram that shows the interactions of the various
- components of the NNTP support in Cyrus which may be helpful in
- understanding the "big picture".
-
-Installation
-
- You will need to build Cyrus IMAPd with the --enable-nntp configure
- option. This builds nntpd and the associated utilities. 
-
-Requirements
-
- Obviously you must have a newsfeed or news reader access from your ISP
- or Usenet provider. 
-
-Configuration
-
- The first thing that must be done is to decide where your newsgroup
- mailboxes will reside, either at the toplevel of your hierarchy (eg,
- comp.mail.imap) or rooted elsewhere (eg, netnews.comp.mail.imap). If
- your newsgroup mailboxes are not at the toplevel of your hierarchy,
- then you must specify the parent with the newsprefix in imapd.conf.
- Using the example above, newsprefix would be set to netnews. 
-
- You must create a mailbox for each newsgroup that you would like to
- receive/export before the newsgroups can be used. If some groups are
- private, be sure to set the ACLs accordingly. The tools/mknewsgroups
- script can be used to help facilitate mass creation of newsgroup
- mailboxes. When using this script, be sure to add posting rights for
- 'anyone' (eg. mknewsgroups -a 'anyone +p' ...) so that articles can be
- fed/posted. 
-
-Receiving articles
-
- In order to receive usenet articles, you must make sure that the Cyrus
- nntpd service is enabled in cyrus.conf. The master/conf/normal.conf and
- master/conf/prefork.conf sample configs both include entries for nntpd
- (disabled by default). 
-
-Push (traditional) feeds
-
- If your usenet peer will be pushing articles to you, no further
- configuration is necessary, beyond letting your peer access your Cyrus
- server on port 119 (nntp). 
-
-Pull (suck) feeds
-
- If you prefer to pull articles from your peer (and your provider allows
- it), then you can use the fetchnews utility which will retrieve
- articles from your peer and feed them to your Cyrus server. If
- supported by your peer, fetchnews will use the NEWNEWS command,
- otherwise it will fallback to keeping track of the high water mark of
- each group. You will probably want to configure fetchnews as an EVENT
- in cyrus.conf to be called periodically (eg, once an hour, every 15
- minutes, etc). 
-
- As an alternative to fetchnews, you can also use the suck program to
- pull articles from your peer. 
-
-imapfeed
-
- Alternatively, if you already have an INN v2.3 server in-house you can
- use the included imapfeed utility (written by the authors of Cyrus) to
- feed articles to your Cyrus server via LMTP. Consult the INN
- documentation for further details. 
-
-Control Messages
-
- Control messages are accepted, parsed and delivered to the
- corresponding control.* pseudo-group (eg, control.newgroup,
- control.cancel, etc) if it exists, so that they may be reviewed by an
- administrator. 
-
- Automatic execution of control messages is only performed if the
- newsmaster (default = "news") user has the proper access control for
- the given mailbox. For example, to allow cancel control messages to be
- performed for "misc.test" articles, give the "news" user the 'd' right
- on "misc.test". To allow newgroup, rmgroup and mvgroup control messages
- to be performed on the "misc" hierarchy, give the "news" user the 'c'
- right on "misc". 
-
- NOTE: No sender or PGP verification of control messages is currently
- implemented. 
-
-Reading/Posting articles
-
- In order to have articles posted by your local users propagate to the
- outside world, you must specify the name of your usenet peer(s) with
- the newspeer option in imapd.conf. This is the host(s) that nntpd
- contacts to feed outgoing articles. Depending on the configuration of
- the newspeer option, articles will be fed to the upstream server(s)
- using either the POST or IHAVE command. Also note that you may specify
- an optional wildmat to filter which groups will be fed (see
- imapd.conf(5) for details). 
-
- Newsgroups can also be gatewayed to email by setting
- /vendor/cmu/cyrus-imapd/news2mail mailbox annotations to the
- corresponding email addresses. 
-
-News clients
-
- If anonymous logins are disabled (default) in imapd.conf, then your
- news clients will have to be configured to login with a username and
- password, otherwise they will not be allowed to post. Furthermore, if
- plaintext logins are disabled in imapd.conf, then you might have to
- configure your news clients to use SSL/TLS and enable the nntps service
- in cyrus.conf. 
-
- If you want to allow your news clients to use the NNTP NEWNEWS command,
- you will have to enable the allownewnews option in imapd.conf. 
-
-Email clients
-
- If you are exporting Usenet via IMAP, and your users' messaging clients
- are not savvy enough to reply to and post articles via NNTP, then you
- will have to configure your server so your users can reply to and post
- articles via SMTP. 
-
- To help faciliate this, you can set the newspostuser option to a
- "pseudo" user which will be used to construct email delivery addresses
- for each incoming article. These addresses are inserted into a
- Reply-To: in the article. For example, if set to "post", an article
- posted to comp.mail.imap will have an address of "post+comp.mail.imap"
- inserted into the Reply-To: header. This will allow a user to easily
- reply to an article via email. Otherwise, the users will have to learn
- the correct email address format for posting and replying to articles. 
-
- In order for these email messages to be fed into your news server (and
- subsequently to the outside world) you need to use an email to news
- gateway, such as lmtp2nntp. You need to configure your MTA (Sendmail,
- Postfix, etc) so that lmtp2nntp is used as the local mailer whenever it
- receives a news article. A simple rule for doing this in Sendmail is
- shown below: 
-
- # mail addressed to post+ goes to lmtp2nntp@localhost
- LOCAL_RULE_0
- Rpost + $+ < @ $=w . >		$#lmtp2nntp $@ localhost $: $1
-
- For other configurations, consult the lmtp2nntp and documentation and
- your MTA documentation. 
-
- NOTE: If anonymous logins are disabled (default) in imapd.conf, then
- you should configure lmtp2nntp to use its "feed" operation mode. 
-
-Expiring articles
-
- Expiration of articles is done by the cyr_expire utility. Control over
- when articles are expunged is accomplished with the
- /vendor/cmu/cyrus-imapd/expire mailbox annotation. This annotation sets
- the number of days that messages should be kept in the mailbox before
- they expire. All entries in the duplicate deliver database that
- correspond to these messages are also kept for the same number of days
- before they are purged (overriding the cyr_expire -E option). 
-
- Setting the expire time to 0 (zero) for a mailbox will ensure that
- neither the messages nor the corresponding database entries will ever
- be expired. This can be useful for shared mailboxes (e.g. mailing list
- archives) which are being exported via NNTP. Note that this will cause
- the duplicate delivery database to consistently grow in proportion to
- the number of messages in such mailboxes. 
-
- If a mailbox does not have an expire time set on it, then the messages
- will never be expunged, but the corresponding database entries WILL be
- expired after the default number of days (cyr_expire -E option). 
-
- Note that the /vendor/cmu/cyrus-imapd/expire mailbox annotation is
- inherited by child mailboxes, so that you may control expiration on an
- entire mailbox/newsgroup hierarchy simply by setting the annotation on
- the root of the hierarchy. For example, if you set the annotation on
- comp, then ALL of the newsgroups in the comp hierarchy will be expired
- at the same time. Similarly, if you set the annotation on alt.binaries,
- all of the binary newsgroups under alt will be expired at the same time
- (independently from comp). 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-perf Deleted

@@ -1,105 +0,0 @@
-Performance Notes
-
-    Cyrus presents various performance issues for you to consider. If you
-    never expect to have more than 100 simultaneous users, chances are any
-    hardware you have will be fine. If you plan on having thousands or more
-    users, please be sure to review this section. 
-
-    If your configuration directory is not /var/imap, adjust accordingly. 
-
-      * /var/imap/proc - After a successful login, the imapd creates a file
-        in var/imap/proc that is its unix process id. It also contains the
-        name of any SELECTed mailbox. The file is deleted when the user
-        logs out. 
-
-        Given the potential load, this is a good candidate to move
-        elsewhere. This can be done by symlink'ing the directory to another
-        partition. We symlink it to a directory on a memory/virtual memory
-        filesystem (specifically Solaris' tmpfs). If you use a tmpfs type
-        filesystem, make sure that you have sufficient memory/swap to do
-        this. 
-
-        Some people don't care about this information and just #ifdef out
-        the code. We probably should add a configure option to do this. 
-      * /var/imap/mailboxes.db - The mailboxes list is often the ultimate
-        source of contention between imapd processes, especially if clients
-        are inefficient about their use of the LIST command. For this
-        reason it is often better to use the skiplist backend which is
-        optimized for enumeration of the database, as opposed to the
-        default, Berkeley DB (use --with-mboxlist-db=skiplist). 
-
-        Mika Iisakkila (mika.iisakkila@pingrid.fi) writes: Nevertheless,
-        you can also tweak the Berkeley backend if you want to or have to
-        stick with it. Cyrus doesn't do anything to increase the BDB cache
-        size, and the default (256 kB) is way too small for any reasonably
-        large site. With some 50000 mailboxes and random operations, I
-        found the hit rate for the default BDB cache to be 70-80%. After
-        growing the cache size to 2M, the hit rate approached 99% and disk
-        traffic was greatly reduced since most of the operations are reads
-        anyway. Therefore processes could complete their work and release
-        their locks much more quickly, and the dreaded "DBERROR: xxx
-        lockers" messages stayed at a comfortable level. You can modify the
-        source (/lib/cyrusdb_db3.c, the setting is commented out) or you
-        can put a DB_CONFIG file under /var/imap/db with the appropriate
-        setting. Read more about this in the Berkeley docs before trying it
-        - typos and incorrect settings can wreak havoc. 
-      * /var/imap/deliverdb - Unless you disable duplicate delivery
-        suppression, each time a mail message is delivered it needs to lock
-        the database and check to see if the message-id has been seen
-        already. If you require really high throughput delivery, you may
-        want to disable this feature. 
-
-        We run with it enabled and it doesn't significantly impact our
-        performance. 
-      * /var/spool/mqueue - Sendmail can be pretty harsh on the spool
-        partition. Having this on a separate disk is usually a good idea.
-        Consider using LMTP and delivering from a separate machine. 
-      * Unused SASL mechanisms - If you just build the SASL library and
-        copy all the mechanisms into /usr/lib/sasl2, the imapd will try to
-        use them and allocate some amount of memory for each. In general,
-        the operating system will swap out those pages but you may be
-        allocating more swap space than you need. So look in usr/lib/sasl2
-        and if you don't plan on using those mechanisms, don't leave them
-        there. 
-      * You may want to increase the listen queue value when starting up
-        the master process. For example, you may want to do this if you see
-        the listen queue drop counter increasing quickly. Under Solaris,
-        look at the variable tcpListenDrop (from netstat -sP tcp). 
-      * Database recovery. If restarting the server takes a long time due
-        to the cyrusdb database recovery procedure (this is usually true if
-        you have a large number of deliveries) you should look into
-        shortening the interval between checkpoints, controlled by the
-        cyrusdb event in /etc/cyrus.conf. We run checkpoints every 5
-        minutes; the current suggested install interval is 30 minutes. 
-      * Some filesystems support the noatime mount option. The server does
-        not use the atime information so you can go ahead and enable this
-        feature. 
-      * Depending on your syslog configuration and usage volume, Cyrus may
-        generate thousands of syslog messages. On Linux, syslog performance
-        can be greatly improved by disabling synchronous logging (disabling
-        fsync() after each message). Prepending filenames in
-        etc/syslog.conf with a "-", e.g., "/var/log/maillog" becomes
-        "-/var/log/maillog", disables syslog's fsync() call after each log
-        message. If you log many messages those fsync()s will kill your I/O
-        throughput. Note that if you do not need the detail provided by the
-        LOG_DEBUG level, then not logging these messages can significantly
-        reduces the number of log entries that Cyrus makes. 
-
-    In general, there's no magic bullet for performance. It depends on your
-    hardware, your operating system, and how your users use the system. In
-    general, an imapd process takes up anywhere from 256 Kbytes of memory
-    to 512 Kbytes when it is first fired up. CPU has not been a big deal,
-    but it may become more important as the IMAP sessions are encrypted and
-    now that searching may be more frequent. Disk I/O is probably the most
-    important and having a hardware RAID subsystem with a decent amount of
-    write-back cache would be a good thing. 
-
-    Again, if you are talking about less than 100 interactive users it is
-    likely that any relatively modern hardware can support it. If you are
-    talking about having more than 1000 interactive users, you should know
-    how to predict your utilization, go overboard on hardware, be willing
-    to suffer growing pains, or be able to hire someone that can help. 
-
-    There are a number of good performance tuning articles out for Solaris
-    by Adrian Cockcroft. Go to your favorite search engine and look for his
-    name.

cyrus-imapd-2.4.17.tar.gz/doc/text/install-prereq Deleted

@@ -1,57 +0,0 @@
-Prerequisites and other notes
-
-    The following programs and/or packages are required. 
-
-      * libsasl, version 2.1.7 or higher. To obtain libsasl, ftp it from
-        ftp.andrew.cmu.edu. Earlier versions of SASL will not work; please
-        get the latest one. Configure SASL so that it supports whatever
-        authentication method your site uses. Please pay careful attention
-        to the SASL configuration. This is the biggest problem that most
-        people have. 
-      * Berkeley DB, version 3.0.55 or higher. Berkeley DB can be obtained
-        from Sleepycat. It is strongly recommended that libsasl be compiled
-        with Berkeley DB support, using the same version of Berkeley DB.
-        (If you have a Berkeley DB version mismatch, somewhat perplexing
-        crashes result.) 
-      * GNU Make is required. Get it from the Free Software Foundation. It
-        is probably easier to find it via ftp. 
-
-    The following programs and/or packages are required for specific
-    features. If you don't have them, certain features of the IMAP server
-    will be disabled. 
-
-      * makedepend. A version is included in the makedepend subdirectory of
-        the distribution. Try and install it before installing the Cyrus
-        IMAPd. If it fails, the configure script will use a dummy shell
-        script instead of makedepend, and you should be sure to always give
-        the command "make clean" before "make all". If you don't mind
-        builds taking longer, this isn't a big deal and you can ignore any
-        makedepend errors. 
-      * Perl, version 5. To obtain Perl, see the Comprehensive Perl
-        Archive. This is required for cyradm (written by Brandon Allbery).
-        It is also used for some installation scripts: you don't need it
-        but it may make your life easier. We recommend at least version
-        5.00502. 
-      * OpenSSL, version 0.9.4 or higher. Required for STARTTLS support and
-        for IMAP/POP3 wrapped in SSL (the imaps/pop3s ports). Available
-        from http://www.openssl.org/. 
-      * libwrap, from Wietse Venema. This will allow one to control who is
-        accessing what service, based on IP address. Available from
-        ftp://ftp.porcupine.org/pub/security/ in the tcp_wrappers package.. 
-      * Net-SNMP (formerly UCD-SNMP), version 4.2 or higher. Required for
-        SNMP monitoring of the IMAP server. Available from
-        http://www.net-snmp.org/. 
-      * If you use AFS PTS support for groups, Cyrus still depends on
-        Kerberos and AFS. If you successfully compiled SASL with your
-        Kerberos library, it's likely that it will work well with Cyrus. 
-      * We recommend using an MTA (mail transfer agent) that supports LMTP
-        (local mail transfer protocol). We use Sendmail and recommend
-        version 8.12.8 or higher, available from http://www.sendmail.org.
-        Others have reported success with Postfix. 
-
-    The following programs and/or packages are recommended: 
-
-      * flex - libsieve has two different lexical analyzers, and that's
-        hard to do with traditional lex. 
-      * gcc - we build using gcc and the compiler options -O2 -g. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-replication Deleted

@@ -1,137 +0,0 @@
-Cyrus replication
-
-    Note that Cyrus replication is still relatively young in the grand
-    scheme of things, and if you choose to deploy you are doing so at your
-    own risk. The core of the replication code has been used successfully
-    in production at Cambridge University since the summer of 2003, but it
-    has been rewritten extensively as part of the integration into the
-    mainstream Cyrus codebase. The replication code as integrated into
-    Cyrus 2.3 has been running in production at Fastmail.fm and
-    Columbia.edu since early 2006 and will be put into production at CMU in
-    winter 2007. 
-
-    The Cyrus team owes a debt of gratitude to the kind folks at Cambridge,
-    Columbia, and Fastmail for their considerable effort in helping to
-    identify and correct the bugs the in Cyrus 2.3 replication code. 
-
-Introduction & Assumptions
-
-    The Cyrus replication engine is designed to replicate the mailstore on
-    standalone Cyrus servers or "backend" servers in a Cyrus Murder to
-    provide a high-availability environment. It is NOT intended to
-    replicate "frontend" servers or the "mupdate master" in a Cyrus Murder.
-    Note that load balancing is not possible with the current replication
-    code, but it is intended to be supported in the future. 
-
-    This document assumes that you have successfully been able to setup
-    atleast one Cyrus IMAP server. This server will become your first
-    "master" server. It also assumes that you are familliar with the
-    administration and day to day operations of the Cyrus IMAP server and
-    the SASL authentication library. If you feel uncomfortable with this,
-    please refer to the rest of the documentation first. 
-
-Installation
-
-    You will need to build Cyrus IMAPd with the --enable-replication
-    configure option. This builds the replication client/server
-    applications and utilities. 
-
-Requirements
-
-      * Atleast one standalone or "backend" Cyrus IMAP server. 
-      * Atleast one machine that will become the first "replica" server. 
-
-Configuring the "replica" server
-
-    The "replica" server is a standalone server which listens for and
-    processes synchronization messages from a "master" server. The
-    "replica" server needs to be configured to accept these synchonization
-    messages. The "replica" server MUST NOT be configured to be part of a
-    Murder (it should only be configured into the Murder at the point at
-    which it replaces a failed backend "master").
-
-     1. Configure a standalone server as described in the rest of the
-        documentation. 
-
-     2. Add the following line to the "/etc/services" file. 
-
-           csync     2005/tcp
-
-        Note that the port number is arbitrary as long as its not being
-        used by any other services on your network. 
-
-     3. Add a line similar to the following in the SERVICES section of
-        cyrus.conf:
-
-          syncserver       cmd="/usr/cyrus/bin/sync_server" listen="csync"
-
-     4. Start/restart "/usr/cyrus/bin/master". 
-
-Configuring the "master" server
-
-    The "master" server is the standalone or "backend" server which is
-    actively serving mailboxes to clients. This server needs to be
-    configured to synchronize its mailstore with a "replica" server.
-
-     1. Add the following line to the "/etc/services" file. 
-
-           csync     2005/tcp
-
-        Note that the port number MUST be the same as that used on the
-        "replica" server. 
-
-     2. Specify the hostname of the "replica" server and how to
-        authenticate to it using the following imap.conf options: 
-
-          * sync_host 
-          * sync_authname 
-          * sync_realm 
-          * sync_password 
-
-        Note that sync_authname MUST be an admin on the "replica" server.
-        Also note that sync_realm and sync_password may not be necessary
-        depending on the SASL mechanism used for authentication. 
-
-Compression
-
-    If you are running replication over a remote link, then the tradeoff
-    between bandwidth and CPU usage will tilt strongly in favour of
-    enabling compression to save bandwidth at a slight increase in CPU
-    cost. You can set the 'sync_compress' imapd.conf value, or pass the
-    '-z' flag to sync_client. 
-
-     1. sync_compress: 1 
-
-"Rolling" replication
-
-    "Rolling" replication means that the "master" server continuously
-    synchonizes itself with the replica. To configure "rolling"
-    replication, perform the following: 
-
-     1. Enable the sync_log option in imapd.conf. This allows the imapd,
-        pop3d, nntpd, and lmtpd services to log synchonization actions
-        which will be periodically serviced by sync_client. 
-
-     2. Optionally, adjust the sync_repeat_interval in imapd.conf. 
-
-     3. Add a line similar to the following in the STARTUP section of
-        cyrus.conf:
-
-          syncclient       cmd="/usr/cyrus/bin/sync_client -r"
-
-     4. Start/restart "/usr/cyrus/bin/master". 
-
-Administration
-
-Manual replication
-
-    To manually synchonize any part of the mailstore, simply run
-    sync_client(8) with the appropriate command line options. Note that you
-    CAN manually synchonize even if "rolling" replication has been
-    configured. 
-
-    You can also run cyr_synclog(8) instead, which will insert the record
-    into the rolling replication log. 
-
-Failover
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-sieve Deleted

@@ -1,102 +0,0 @@
-Installing Sieve
-
-    This section assumes that you compiled Cyrus with sieve support. If you
-    specified --disable-sieve when running ./configure, you did NOT compile
-    the server with sieve support. 
-
-    A brief introduction to Sieve at is available from Cyrusoft
-    International. 
-
-Configure outgoing mail
-
-    Some Sieve actions (redirect, vacation) can send outgoing mail. 
-
-    You'll need to make sure that "lmtpd" can send outgoing messages.
-    Currently, it invokes "/usr/lib/sendmail" by default to send messages.
-    Change this by adding a line like: 
-
-       sendmail: /usr/sbin/sendmail
-
-    in your "/etc/imapd.conf". If you're using Postfix or another MTA, make
-    sure that the sendmail referenced in "/etc/imapd.conf" is
-    Sendmail-compatible. 
-
-Managing Sieve Scripts
-
-    Since Cyrus is based around the concept of a sealed-server, the normal
-    way for users to manipulate Sieve scripts is through the "sieveshell"
-    utility. 
-
-    If, for some reason, you do have user home directories on the server,
-    you can use the "sieveusehomedir" option and have the sieve script
-    stored in the home directory of the user as "~/.sieve". 
-
-Testing the sieve server
-
-     1. The Sieve server, "timsieved", is used for transporting user Sieve
-        scripts to the sealed IMAP server. It is incompatible with the
-        "sieveusehomedir" option. It is named after the principal author,
-        Tim Martin, who desperately wanted something named after him in the
-        Cyrus distribution. 
-
-     2. From your normal account, telnet to the sieve port on the server
-        you're setting up: 
-
-           telnet foobar sieve
-
-        If your server is running, you'll get a message similar to the
-        following one: 
-
-           Trying 128.2.10.192...
-           Connected to foobar.andrew.cmu.edu.
-           Escape character is '^'.
-           "IMPLEMENTATION" "Cyrus timsieved v1.1.0"
-           "SASL" "ANONYMOUS PLAIN KERBEROS_V4 GSSAPI"
-           "SIEVE" "fileinto reject envelope vacation imapflags notify subaddress regex"
-           OK
-
-        Any message other than one similar to the one above means there is
-        a problem. Make sure all of authentication methods you wish to
-        support are listed. This list should be identical to the one listed
-        by "imapd" earlier. Next terminate the connection, by typing
-        "logout". 
-
-     3. Next test authenticating to the sieve server. To do this run the
-        "sieveshell" utility. You must specify the server. If you run this
-        utility from a different machine without the "sieve" entry in
-        "/etc/services", port 2000 will be used. 
-
-          "sieveshell foobar"
-            Please enter your password: ******
-            > quit
-
-        This should produce the message "Authentication failed" with a
-        description of the failure if there was a problem. 
-
-     4. Next you should attempt to place a sieve script on the server. To
-        do this create a file named "myscript.script" with the following
-        lines. Replace "foo@example.org" with an email address you can send
-        mail from, but that is not the one you are working on now. 
-
-          require "reject","fileinto";
-
-          if address :is :all "From" "foo@example.org"
-          {
-            reject "testing";
-          }
-
-        To place this script on the server run the following command: 
-
-          "sieveshell foobar"
-            Please enter your password: ******
-            > put myscript.script
-            > activate myscript
-            > quit
-
-        This should place your script on the server and make it the active
-        script. 
-
-     5. Test that the sieve script is actually run from deliver. Send a
-        message to the address you're working on from the address mentioned
-        in the sieve script. The message should be rejected. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-snmpmon Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/install-testing Deleted

@@ -1,108 +0,0 @@
-Testing the IMAP Server
-
-    To test the IMAP server, reboot and perform the following steps (all of
-    these samples use "foobar" as the IMAP server name). A list of answers
-    to common installation problems is maintained in
-    http://www.cyrusimap.org/mediawiki/index.php/FAQ#Cyrus_IMAP_Questions. 
-
-     1. From your normal account, telnet to the IMAP port on the server
-        you're setting up: 
-
-           telnet foobar imap
-
-        If your server is running, you'll get the following message: 
-
-           Trying 128.2.232.95...
-           Connected to foobar.andrew.cmu.edu.
-           Escape character is '^'.
-           * OK foobar.andrew.cmu.edu Cyrus IMAP4 v2.0.0 server ready
-
-        Any message other than one starting with "* OK" means there is a
-        problem. To terminate the connection, type ". logout". 
-
-        Naturally the version number should match the version you just
-        installed. 
-
-     2. Use "imtest" to test logging in with plaintext passwords: 
-
-           /usr/local/bin/imtest -m login foobar
-
-        If you want to specify a different user, do: 
-
-           /usr/local/bin/imtest -m login -a USER foobar
-
-        If your server is running, you'll get the following message: 
-
-           % /usr/local/bin/imtest -m login foobar
-           S: * OK mail1.andrew.cmu.edu Cyrus IMAP4 v2.0.0 server ready
-           C: C01 CAPABILITY
-           S: * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS 
-           X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=GSSAPI AUTH=ANONYMOUS 
-           AUTH=KERBEROS_V4 UNSELECT
-           S: C01 OK Completed
-           Password: 
-           + go ahead
-           L01 OK User logged in
-           Authenticated.
-           Security strength factor: 0
-
-        Any message other than one starting with a "L01 OK" means there is
-        a problem. If the test fails, a more specific error message should
-        be written through syslog to the server log. To terminate the
-        connection, type ". logout". 
-     3. You should now test the server with each of the various
-        authentication mechanisms you have installed. The supported
-        mechanisms are listed in the CAPABILITY line: 
-
-          * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS 
-          X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=ANONYMOUS
-          AUTH=KERBEROS_V4 AUTH=DIGEST-MD5 AUTH=CRAM-MD5 UNSELECT
-          . OK Completed
-
-        Each of the mechanism names is preceded by a 'AUTH='. For this
-        example the ANONYMOUS, KERBEROS_V4, DIGEST-MD5, and CRAM-MD5
-        mechanisms are available. If a mechanism does not appear that you
-        wish to use, examine the libsasl log messages. Generally, if a
-        mechanism does not appear, it means it failed to initialize. (For
-        example, if the server is unable to access the srvtab file the
-        KERBEROS_V4 mechanism will refuse to load.) 
-
-        Plaintext login is a special case: the PLAIN SASL mechanism is only
-        advertised under an encrypted connection. However, plaintext logins
-        are available (as long as you haven't disabled plaintext) by using
-        -m login(as above). 
-
-        To terminate the imtest connection, type ". logout". 
-
-        Once you are satisfied with the authentication mechanism list you
-        should attempt to log in with each of those mechanisms. Run imtest
-        specifying which mechanism you would like to use. 
-
-           /usr/local/bin/imtest -m KERBEROS_V4 foobar
-           C: C01 CAPABILITY
-           S: * OK foobar.andrew.cmu.edu Cyrus IMAP4 v2.0.0 server ready
-           S: * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE
-           UIDPLUS X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=ANONYMOUS
-           AUTH=GSSAPI AUTH=KERBEROS_V4 UNSELECT
-           S: C01 OK Completed
-           C: A01 AUTHENTICATE KERBEROS_V4
-           S: + wYcDAA==
-           C: BAYBQU5EUkVXLkNNVS5FRFUAOCAm7F/Y+HabCzJ
-              /UMtVcvWRjTohuq/USaCV6gYdkAU5DOcADAq
-           S: + 0aAsUGQZhgQ=
-           C: ADMe/cVivAYYzy1yd4Vojg==
-           S: A01 OK Success (privacy protection)
-           Authenticated.
-           Security strength factor: 56
-
-        Any message other than one starting with a "A01 OK" means there is
-        a problem. If the test fails, a more specific error message is
-        written through syslog to the server log. To terminate the
-        connection, type ". logout". 
-
-        See the libsasl documentation for a full description of all the
-        mechanisms. It is also possible to support "security layers"
-        (privacy or integrity protected connections). By default, imtest
-        uses the strongest layer available with the selected mechanism; use
-        "-l" to choose an alternate layer. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-upgrade Deleted

@@ -1,591 +0,0 @@
-Upgrading From Previous Versions
-
-Upgrading from 2.4.15
-
- * The tools/rehash utility has been fixed, we recommend ALL sites
- with the fulldirhash option enabled to run tools/rehash on their
- mailspools. 
-
-Upgrading from 2.4.14
-
- * We recommend that ALL sites with fulldirhash enabled run
- tools/rehash on their mail spools after upgrading from 2.4.14.
- There were serious 32 vs 64 bit hashing bugs which were made worse
- with 2.4.14. NOTE: the syntax of tools/rehash has changed. Run it
- without arguments to see a usage statement. 
-
-Upgrading from 2.4.12
-
- * some LOG_DEBUG level messages are no longer created by default in
- the duplicate delivery system, so you won't see them in syslog any
- more 
- * mailboxes in the DELETED. heirarchy are now always suppressed for
- non-admin users, even if delayed delete is not enabled (see Bug
- #3604). If you happen to be using this namespace at your site for
- something else, you're crazy - but you can set "deletedprefix" in
- imapd.conf to an invalid value (e.g. '-') if you need. 
-
-Upgrading from 2.4.11
-
- * To support bug-interoperability with older versions of Cyrus, the
- quota command now supports "-1" as a synonym for unlimited storage 
-
-Upgrading from 2.4.10
-
- * Duplicate database formats have changed, so any duplicate or
- vacation data will be lost - meaning that vacation responses will
- be sent again, and duplicates just across the upgrade time will
- both get delivered. 
-
-Upgrading from 2.4.9
-
- * quota -f now works correctly. If you are upgrading from earlier
- than 2.4.9 we recommend that you run quota -f to ensure that all
- quotas are now correct. There is a slight race condition in the
- quota command, so it's safest to run with the server shut down, but
- this has always existed. 
- * On the topic of quota -f, the documentation has been updated to
- make it quite clear that you need to give "complete" prefixes if
- using quotalegacy, as it doesn't implement quite the same semantics
- as other databases. If you run 'quota -f a' and you have domains
- starting with 'a', you will be quite sad at the results. So don't
- do that. Running quota -f with no argument, or with a full domain
- or full user specification is perfectly safe. 
-
-Upgrading from 2.4.8
-
- * CYRUS_PREFIX environemnt varabile. If you have an environment
- variable "CYRUS_PREFIX" then config files will be searched for in
- there first, so for example the file /var/cyrus/etc/imapd.conf will
- override /etc/imapd.conf if your CYRUS_PREFIX is /var/cyrus. This
- is to make things easier for sites with multiple installs on a
- single machine. You will want to check that there aren't unexpected
- files in those locations when upgrading. 
- * New config options: *_db_path allow moving individual DB files to
- different partitions - for example you may want to put the
- deliver.db onto tmpfs to improve performance. 
- * KNOWN BUG: quota -f can double ALL quota usage values for all
- users. This is particularly bad because of the bug fixed in this
- release where quotaroots were not correctly updated on folder
- rename. Recommended workaround: run quota -f twice. 
-
-Upgrading from 2.4.7
-
- * New config option: proc_path allows setting the path to the proc
- directory onto tmpfs more easily 
-
-Upgrading from 2.4.6
-
- * New config option: failedloginpause allows you to change the pause
- after a failed login from the existing default of 3 seconds 
- * On Solaris: now getpassphrase is used, so passwords longer than 8
- characters will work with management tools 
- * $confdir/proc now gets created automatically if it doesn't exist,
- which may impact init script design 
- * If you have damaged mailboxes that weren't previously fixable, a
- reconstruct of those mailboxes may be advised 
-
-Upgrading from 2.4.5
-
- * New config option: suppress_capabilities, which takes a space
- separated list of capabilities which will NOT be given in any imap
- capability response. This can be used on frontends to not display
- capabilities that older backends don't have, so clients don't get
- confused 
-
-Upgrading from 2.4.4
-
- * sync_client no longer forks two process - it just pre-forks a
- single process in rolling replication mode and uses it "forever".
- This is to avoid the bug where it used to open the BDB environment
- once before forking, then close it in every child, causing the
- reference count to go negative. This also means you can start it
- without '-o' and still have the master start without the replica
- already running. 
-
-Upgrading from 2.4.3
-
- * Actually, it's more upgrading directly to here from 2.3.x or older.
- ALL upgrades from previous versions now incur a full re-parse of
- all messages, which may take a while. In exchange you get reliable
- upgrades though, and guaranteed still-searchable cyrus.cache
- records. 
-
-Upgrading from 2.4.2
-
- * The AFS ptloader configure options have changed. If you were
- previously specifying --with-afs when you built, you'll now want to
- use --enable-afs instead. Additionally, you may now specify
- --with-afs-libdir and --with-afs-incdir to facilitate finding the
- AFS libraries and header files. 
- * The sync_log_names option has been replaced with sync_log_channels
- and the documentation and tools updated to match. This is to use a
- less overloaded term and allow multi-channel replication to be
- used. 
- * Cyrus 2.4.3 can now XFER mailboxes back to earlier version (at
- least as far back as Cyrus 2.2.12) in a murder configuration. 
- * sync_client in rolling mode now only connects after forking, so it
- no longer blocks startup. You can remove the '-o' option from your
- cyrus.conf entry if you want, and not have to start sync_client
- manually afterwards! 
-
-Upgrading from 2.4.0
-
- * The response to the "ID" command has changed slightly to include
- git metadata rather than CVS metadata - so your in-house tools
- expecting a particular value may need changing (very unlikely) 
-
-Upgrading from 2.3.16
-
- * There is a new index format, so downgrades are not possible without
- a reconstruct. We recommend that you take a full backup before
- upgrading, and perform an upgrade with a small test server if
- possible to make sure everything will work for your site. 
- * MURDER does work, but you can't rename a mailbox back to a previous
- version backend because the index was upgraded. 
- * There is a new replication protocol, so you can't replicate between
- 2.4.0 and previous versions in either direction. You need to
- upgrade both before you can restart repliation. 
- * The default value for delayed_expunge has changed to provide better
- QRESYNC and replication support. The default is still pretty
- efficient, but you may want to change it to 'immediate', the
- previous default 
- * The default type for all databases is now skiplist which is very
- reliable now, all the bugs are ironed out! Because ctl_cyrusdb -r
- automatically converts databases between known types, you shouldn't
- need to do anything, but if you want to keep the old defaults,
- you'll need to make them explicit in your imapd.conf as follows: 
-
- duplicate_db: berkeley-nosync
- ptscache_db: berkeley
- statuscache_db: berkeley-nosync
- tlscache_db: berkeley-nosync
-
- * There is a new lock folder which defaults to configdir/lock/ and
- contains one zerobyte file per mailbox. These can get pretty hot,
- and don't need to persist over reboots (they will be auto-created
- when needed) - so you may want to define mboxname_lockpath to be on
- tmpfs or ramfs or similar. It certainly makes sense to clean it out
- on restart, because names will persist in there forever otherwise.
- Even on mailbox delete these files aren't removed (to avoid
- potential race conditions) 
- * The make_md5 and make_sha1 utilities no longer exist. If you want
- to check message file integrity, the best way is reconstruct -r -n
- -G. This will parse every message file, check the sha1 against the
- value stored in the cyrus.index, and tell you about mismatches
- without fixing them. 
- * Speaking of reconstruct, the switches have changed, as has the
- implementation. It fixes the mailbox "in place" a lot more rather
- than creating a new mailbox, meaning that IMAP semantics won't be
- broken. It's more likely to abort rather than complete if your
- filesystem permissions are wrong - fix them first! 
-
- -kRemoved, expunge data is always kept
-
- -gRemoved, GUIDs are always stored
-
- -GChanged, now means "re-parse the message". If not specified,
- reconstruct only checks the message size and assumes the rest of
- the stuff in the index record is OK (pretty safe because we do
- CRC32 checks on index records now)
-
- -sAdded, skip the stat call, so reconstruct doesn't even check the
- message file size - just that a file with the correct name exists
- at all
-
- -nAdded, don't make any changes, just report what would have been
- done if -n wasn't specified
-
- If you try to use -k or -g, you will get a warning but the
- reconstruct will still run. 
-
-Upgrading from 2.3.15
-
- * The SQL detection code in configure has been reworked. Separate
- options for the include directories and lib directories have been
- added. Previous SQL options may not work as expected. 
-
-Upgrading from 2.3.10
-
- * STARTTLS is now allowed for externally preauth'd LMTP connections.
- If you don't want STARTTLS to be advertised and used by preauth'd
- clients, you can set <service_name>_tls_cert_file: disabled in
- imapd.conf. 
-
-Upgrading from 2.3.9
-
- * The method used for generating Globally Unique IDentifiers used for
- replication has been changed to be the SHA1 hash of the messages.
- If you wish to upgrade the existing GUIDs in particular mailbox(es)
- or the entire server, perform the following steps in the listed
- order. Note that is is NOT REQUIRED that existing GUIDs be
- upgraded. 
-
- 1. Zero GUIDs on the replica (reconstruct -g) 
- 2. Regenerate GUIDs on the master (reconstruct -G) 
- 3. Regenerate GUIDs on the replica (reconstruct -G) 
-
-Upgrading from 2.3.8
-
- * You must install and configure Cyrus SASL version 2.1.17 or later
- to use Cyrus IMAP 2.3.9 and later. You can download SASL at
- http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library. 
- * The default value of the allowplaintext option has been changed to
- disabled (0). If you need to allow cleartext passwords on the wire,
- then you will have to explicitly enable the allowplaintext option
- in imapd.conf. 
-
-Upgrading from 2.3.3 or later (64-bit machines)
-
- * Due to byte alignment issues in cyrus.index, all mailboxes will
- have to be reconstructed. 
-
-Upgrading from 2.3.4 or 2.3.5
-
- * Any mailboxes which had messages appended/delivered/copied with a
- 2.3.4 service or copied with a 2.3.5 imapd MUST be reconstructed in
- order for the new messages to be displayed by clients. 
-
-Upgrading from 2.2.x or earlier
-
- * If you wish to use separate metadata partition(s), you MUST first
- shut down Cyrus and then perform the following: 
-
- 1. Set the metapartition-* and metapartition_files options to suit
- your configuration. For a full description of these options,
- see the imapd.conf(5) man page. 
- 2. Create the metadata partition directory(s) listed in the
- metapartition-* option(s), setting the ownership and
- permissions in same fashion as step 6 of install-configure. 
- 3. Run the tools/migrate-metadata script (as the cyrus user) to
- move the metadata files listed in the metapartition_files
- option from the spool partition(s) to the new metadata
- partition(s). This script may take a long time to run depending
- on the number of mailboxes on the server, but presumably the
- metadata partitions are located on high speed storage, so the
- writes should be relatively fast. 
- 4. Restart Cyrus. 
-
-Upgrading from 2.2.2 or earlier
-
- * The Cyrus database backend configuration is now handled at runtime
- using imapd.conf options. If you are not using the default backend
- for any of the databases, make sure that you specify the correct
- backend(s) in appropriate option(s). 
- * The format of the newspeer option has been changed. The existing
- format will still be parsed, but the option should be upgraded to
- use the new format (see imapd.conf(5) for details). 
-
-Upgrading from 2.2.1 or earlier
-
- * The sieve bytecode format has changed again to correct an issue
- with the short circuiting of the allof and anyof operators. To
- upgrade existing scripts (outside of home directories), you can run
- the tools/masssievec perl script included with the distribution. It
- requires a path to your sievec binary. This should also upgrade
- scripts that have already been compiled to bytecode. For example: 
-
- masssievec /usr/src/cyrus/sieve/sievec
-
-Upgrading from 2.2.0 or earlier
-
- * The improved directory hashing (fulldirhash) is now a runtime
- configuration option. If you are currently using this feature, then
- make sure that you enable the fulldirhash option in imapd.conf. 
- * The format of mailbox index files has changed. They are upgraded on
- the fly, so you need to do nothing to upgrade. However, to
- downgrade them you will need to remove the cyrus.index files, and
- reconstruct the mailboxes, otherwise the index files will be
- invalid. 
- * ctl_deliver -E has been deprecated in favor of cyr_expire -E. This
- new tool does both duplicate delivery database pruning as well as
- message expunging. You should replace the appropriate EVENTS entry
- in cyrus.conf with one of those in the sample configurations in the
- master/conf directory. 
- * The sieve bytecode format has changed. The new format is encoded in
- network byte order, and will be transferable between architechures.
- To upgrade existing scripts (outside of home directories), you can
- run the tools/masssievec perl script included with the
- distribution. It requires a path to your sievec binary. This should
- also upgrade scripts that have already been compiled to bytecode.
- For example: 
-
- masssievec /usr/src/cyrus/sieve/sievec
-
-Upgrading from 2.1.x or earlier
-
-General information (ALL SITES)
-
- * The default database formats for the mailbox list and the seen
- state databases has been changed to the skiplist backend. There are
- two ways of dealing with this if you have been using the defaults. 
-
- 1. Specify --with-mboxlist-db=berkeley and --with-seen-db=flat to
- configure. This will instruct Cyrus to continue to use the
- previous defaults. 
- 2. Use the cvt_cyrusdb program to directly convert the databases.
- This should be done with the server down, and with the binaries
- from the new Cyrus distribution. Change any paths that do not
- match your configuration.
- For the mailbox list, the command looks like: 
-
- /usr/cyrus/bin/cvt_cyrusdb /var/imap/mailboxes.db berkeley /var/imap/mailboxes.db.new skiplist
- mv /var/imap/mailboxes.db.new /var/imap/mailboxes.db
-
- Note that the use of full paths to the database files is
- important. You should also backup your old mailboxes database
- before moving the new one in.
- For the seen state databases, the command to get them all in
- one fell swoop looks like: 
-
- find /var/imap/user -name \*.seen -exec /usr/cyrus/bin/cvt_cyrusdb \{\} flat \{\}.new skiplist \; -exec mv \{\}.new \{\} \;
-
- The slashes are important for shell escaping. Again, you should
- back up the contents of your /var/imap/user directory before
- executing this command. These commands may take some time to
- complete, especially if your databases are large. 
-
- We believe that skiplist offers considerable performance advantages
- for these two databases over the previous defaults. 
- * Sieve scripts are now compiled into bytecode. The program sievec is
- provided to do this process manually (timsieved will compile
- submitted sieve scripts as they are uploaded). To upgrade existing
- scripts (outside of home directories), you can run the
- tools/masssievec perl script included with the distribution. It
- requires a path to your sievec binary. For example: 
-
- masssievec /usr/src/cyrus/sieve/sievec
-
- Note that this will fail for scripts that use the "envelope"
- extention but do not require it. Cyrus 2.1's timsieved did not do
- appropriate checking that the optional envelope test was required
- before it was used. 
- * Configuration subsystem changes: 
-
- * The tls_service_* configuration options have been removed.
- Now use servicename_tls_*, where servicename is the service
- identifier from cyrus.conf for that particular process. 
- * The admins and lmtp_admins configuration options no longer
- union. Per-service options completely override the default
- value when they are specified. 
- * lmtp_allowplaintext is no longer a defined parameter and must
- be specified using the service name of your lmtp process if you
- require a specific value. 
-
-Specialized information (Murder, AFS, etc.)
-
- * The IMAP IDLE command is now supported by proxyd and is controlled
- by the imapidlepoll option, which is enabled by default (60
- seconds). To disable IMAP IDLE in proxyd, set imapidlepoll to 0. 
- * User moves via RENAME and XFER are now controlled by the
- allowusermoves option, which defaults to off. 
- * If you use ptloader, it now runs as a regular cyrus service. This
- means that you will need master to acquire and maintain AFS tokens
- for it. You will also need to create the ptclient directory under
- your imap configdirectory, to hold the PTS cache (now a
- full-fledged cyrusdb) and UNIX socket. In cyrus.conf, ptloader
- should be setup to listen on <configdirectory>/ptclient/ptsock. See
- the master/test/cmu-backend.conf example configuration file. 
- * Also, ptloader has been given a generic interface. You should now
- specify "--with-auth=pts" (instead of "--with-auth=krb_pts") to
- configure. There is also a --with-pts= configure option that
- defaults to afskrb (Kerberos Canonicalization, AFS PTS Groups).
- There is also an experimental ldap module. Note also that if
- ptloader fails the lookup, authorization (and therefore
- authentication) will now fail, as canonicalization is done inside
- of ptloader. 
- * The format of sieve referrals has changed to be more consistant
- with the current managesieve draft, this may cause interoperability
- problems when using managesieve clients and servers from different
- cyrus versions. 
- * Clients that use old-style ACL commands that include the "MAILBOX"
- directive will no longer function. We do not know of any clients
- that have this problem currently. 
- * Any applications that link libcyrus.a now need to link
- libcyrus_min.a as well. 
-
-Upgrading from 2.1.13 or earlier
-
- * We are now more forgiving of MIME boundry headers generated by
- earlier versions of eudora. However, if you have messages already
- in the mailstore that you want to fix you will need to reconstruct
- the affected mailboxes to regenerate the cached bodystructure data
- to take this into account. Nothing needs to be done for new
- messages to be treated in this way. 
-
-Upgrading from 2.1.12 or earlier
-
- * timsieved was corrected to behave properly in the altnamespace
- configuration. However, this means that it was previously looking
- for sieve scripts in "user.name" format instead of the (correct)
- "user^name" format. A sample script to do this (which should be run
- in the top level of the sieve directory) is in
- tools/convert-sieve.pl. Note that this is only needed if you are
- running with altnamespace turned on. 
-
-Upgrading from 2.1.3 or earlier
-
- * If you use notifications (previously notify_zephyr or notify_unix)
- this functionality has been seperated out to notifyd. See the
- notifyd manpage and example entries in master/conf. 
-
-Upgrading from 2.1.2 or earlier
-
- * Sieve has been updated to be compliant with RFC 3028 and
- draft-martin-sieve-notify-01. All notify actions and any fileinto
- and/or redirect actions using stringlists will have to be
- updated/changed. 
-
-Upgrading from 2.0.16 or earlier
-
- * You must install and configure Cyrus SASL version 2 to use Cyrus
- IMAP 2.1 and later. You can download SASL at
- http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library. 
- * If you use timsieved to manage Sieve scripts, and have enabled the
- alternate namespace and/or the Unix hierarchy separator, run the
- script "tools/translatesieve". This script will translate the
- folder names in fileinto actions. 
- * Cyrus now uses the service name "sieve" instead of "imap" for the
- SASL profile of timsieved. If you use timsieved to manage Sieve
- scripts, be sure to update your password checking mechanism
- appropriately, 
- * If you have enabled the improved directory hashing scheme, run the
- script "tools/rehash full". This script will rehash your existing
- directories. 
- * The hashed deliver databases (used for duplicate delivery
- suppression and Sieve) have been merged into a single deliver.db
- database. You can safely remove the entire /var/imap/deliverdb
- directory structure after shutting down the server. 
- * All of the Cyrus databases have been unified under a single BDB
- environment. A new ctl_cyrusdb tool is now used for database
- recovery and checkpointing instead of ctl_mboxlist and ctl_deliver.
- You should replace the appropriate START and EVENTS entries in
- cyrus.conf with those in the sample configurations in the
- master/conf directory. 
- * Cyrus now caches SSL/TLS sessions in an external database. If you
- have support for SSL/TLS, and haven't disabled session caching (see
- imapd.conf(5)), you should add a line like the following to the
- EVENTS section of cyrus.conf to prune expired sessions from the
- database: 
-
- # this is only necessary if caching TLS sessions
- tlsprune cmd="tls_prune" period=1440
-
-Upgrading from 2.0.6, 2.0.7, 2.0.8, or 2.0.9 or earlier
-
- * If you use timsieved to manage Sieve scripts, run the script
- "tools/upgradesieve". timsieved now uses symlinks instead of hard
- links. 
-
-Upgrading from a previous 2.0 version to 2.0.6
-
- Warning: You do not need to follow these instructions if you're
- upgrading from version 1.6. 
-
- * You can now pick whether to use Berkeley db to store seen state,
- the subscription files, and the mailboxes file or a flat text file,
- at compile time only. (Look in imap/seen_db.c and imap/mboxlist.h.) 
- * The format of the mailboxes file and seen state has changed. It is
- not possible to preserve seen state, but upgrade the mailboxes file
- as follows: 
-
- 1. Run ctl_mboxlist -d > mboxlist.temp to dump existing mailboxes. 
- 2. Remove old database files: rm mailboxes.db db/* user/*/*.seen 
- 3. With the new version of ctl_mboxlist, run ctl_mboxlist -u <
- mboxlist.temp. 
-
-Upgrading from 1.6.22 or 1.6.24
-
- Warning: Cyrus imapd 2.0 will automatically convert on-disk file
- formats as the server is used. It is not possible to run 1.6 after 2.0
- has been used on a mail spool without reconstructing every mailbox. 
-
- * Create some extra directories and remove the duplicate delivery
- database: 
-
- mkdir /var/imap/db
- mkdir /var/imap/socket
- chown cyrus /var/imap/db /var/imap/socket
- rm -rf /var/imap/deliverdb
-
- * Convert mailboxes file to Berkeley DB: 
-
- su cyrus
- cd /var/imap
- ctl_mboxlist -u < mailboxes
- ctl_cyrusdb -c
-
- Please keep a backup of your mailboxes file. You can dump an
- old-style mailboxes file by using ctl_mboxlist -d. 
- * remove "/etc/inetd.conf" entries. The imap and popd3d lines need to
- be removed from /etc/inetd.conf and inetd needs to be restarted. 
- * master process configuration: You'll need to configure the master
- process Cyrus process and ensure that it starts on boot. see this
- section of the configuration instructions. 
- * MTA configuration. You will have to reconfigure your MTA to speak
- to lmtpd. See this section of the configuration document. 
- * cyrus.seen conversion. The cyrus.seen file will be automatically
- upgraded as users read mail. After some time, you might want to
- delete the cyrus.seen file in each mailbox; it is superceded by the
- user/joe.seen file. 
- * cyrus.index conversion. The cyrus.index file will be automatically
- upgraded the first time each mailbox is SELECTed. 
- * Netnews conversion. The netnews programs are no longer built. If
- you are using netnews, you will need to apply the diff in the
- netnews/ directory to INN or see if INN is now distributing those
- changes. You will also want to run remotepurge on a regular basis
- to purge old netnews posts. 
-
-Upgrading from 1.6.13
-
- * Upgrading from the Cyrus IMAP server version 1.6.13 or earlier: if
- you use Sieve, you should run the "tools/upgradesieve" script, as
- the format of the "/usr/sieve" directory has changed slightly. 
-
- timsieved, included in this release, will handle maintenance of
- Sieve scripts. 
- * Upgrading from the Cyrus IMAP server version 1.6.10 or earlier: if
- you export news via the IMAP server, you'll have to change your
- "newsfeeds" file to contain 
-
- collectnews!:*:Tf,WR:collectnews
-
- The format of the input to collectnews has changed. 
-
- Duplicate delivery suppression is now required for Sieve. 
- * Upgrading from the Cyrus IMAP server version 1.6.1 or earlier
- (including 1.5.x!): the quota and user directories are now hashed
- by the first character of the username. This is to reduce the
- number of entries in any given directory. It doesn't do a great job
- (and in some cases it will do a really poor job) but as a quick
- hack it shouldn't make things worse. Optionally, the data
- partitions can also be hashed by enabling the "hashimapspool"
- option. 
-
- You must hash your directories using the "dohash" script in the
- tools subdirectory. (If you want to hash your mail spool, be sure
- to set "hashimapspool" before running "dohash".) This must be run
- as the Cyrus user. Be sure to stop mail service while converting.
- Doing this in single user mode is probably the safest. 
-
-Upgrading from 1.5
-
- * Upgrading from the Cyrus IMAP server version 1.5 or earlier:
- libsasl is now required. Configuring SASL to work may be a chore,
- especially if you use shadow passwords. 
- * An ANSI C compiler is now required. gcc should work fine and can be
- acquired from http://www.gnu.org/software/gcc/gcc.html. 
- * Make sure to read the upgrading instructions under 1.6 above. 
- * Upgrading from 1.5.14 or earlier requires deleting the delivered
- database. Remove the file delivered.db in the configdirectory and
- make a directory called "deliverdb" in the configdirectory. This
- may cause some duplicates to get through. 
- * Upgrading from 1.5.14 or earlier requires removing the PTS cache
- database (if the AFS PTS group support is used, which is not the
- default). The PTS cache is in /var/ptclient/ptscache.db, and you
- should remove it. This is because the format for the PTS cache for
- IMSP has changed. If you use AFS ACLs, IMSPd, and IMAPd on the same
- machine, make sure you have version 1.5a5 of the IMSP server for
- this version of the IMAP server. (If you don't have IMSP, or AFS,
- don't worry about it.) 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/install-virtdomains Deleted

@@ -1,185 +0,0 @@
-Configuring Virtual Domains
-
-Introduction
-
-    Virtual domains is the practice of hosting a service for more than one
-    domain on one server. Cyrus IMAP has the ability to host IMAP/POP
-    mailboxes for multiple domains (e.g., test@example.com and
-    test@example.net) on a single server or Murder. 
-
-    In order to accomplish this, Cyrus needs to know which domain to look
-    in when a mailbox is accessed. There are two ways in which Cyrus can
-    determine the domain: 
-
-      * Fully qualified userid - the client logs in with a userid
-        containing the domain in which the user belongs (e.g.,
-        test@example.com or test%example.net) 
-      * IP address - the server looks up the domain based on the IP address
-        of the receiving interface (useful for servers with multiple NICs
-        or using IP aliasing) 
-
-    Both of these methods are active if the virtdomains option is set to on
-    (or yes, 1, true) and can be used in conjunction with one another. If
-    the virtdomains option is set to userid, then only the first method is
-    used. Note that a fully qualified userid takes precedence over a domain
-    obtained from the IP address. 
-
-Concepts
-
-    Perhaps the most important part of this process is to understand the
-    changes in the paradigm. 
-
-      * Everyone is in a domain - It's best to think of every user as
-        existing inside a domain. Unqualified users are technically inside
-        the defaultdomain. 
-      * Names can be qualified - Global admins can reference mailboxes and
-        IDs by qualified names. That is, for any given mailbox command, you
-        can add @domain to the end of the mailbox name. Here are some
-        examples: 
-
-          * cyradm> create user.jill@example.net (create a user) 
-          * cyradm> create user.rick@example.net (create another user) 
-          * cyradm> setquota user.rick@example.net 50000 (define a quota) 
-          * cyradm> setaclmailbox user.rick@example.net jill@example.net
-            read (give Jill read access to Rick's mailbox) 
-          * cyradm> listmailbox *@example.net (list all mailboxes in the
-            example.net domain) 
-
-      * Each mailbox exists in only one domain 
-      * Domains are mutually exclusive - Users only have access to
-        mailboxes within their own domain (intra-domain). The following
-        example will not work: setacl user.jill@herdomain.com
-        rick@hisdomain.com read. 
-      * Global and Domain admins - The Cyrus virtual domains implementation
-        supports per-domain administrators as well as global (inter-domain)
-        administrators. Domain-specific administrators are specified with a
-        fully qualified userid in the admins option (e.g.,
-        admin@example.net) and only have access to mailboxes in the
-        associated domain. Global administrators are specified with
-        unqualified userids. 
-
-Quick Start
-
-     1. Add virtdomains: yes to imapd.conf 
-     2. Add a defaultdomain entry to imapd.conf 
-     3. Use cyradm (as a global or domain admin) to create mailboxes for
-        each domain. 
-
-Configuration
-
-    Support for virtual domains is enabled by turning on the virtdomains
-    option in imapd.conf. 
-
-    When upgrading from a single domain installation to a virtual domain
-    installation, the name of the existing domain (domain of the server
-    hostname) should be specified using the defaultdomain option in
-    imapd.conf. This allows users to continue to access their mailboxes
-    using unqualified userids. For example, if the primary IP address on
-    your server resolves to 'www.xxx.yyy.zzz', then set defaultdomain to
-    'xxx.yyy.zzz'. 
-
-    Even for new installations, it is recommended that the "real" domain of
-    the server (domain of its primary hostname), be set to the
-    defaultdomain. See Administrators below for further discussion. 
-
-    Here is a sample imapd.conf with a minimal set of configuration
-    options. 
-
-    configdirectory: /var/imap
-    partition-default: /var/spool/imap
-    admins: admin rick.admin@hisdomain.com jill.admin@herdomain.net
-    virtdomains: yes
-    defaultdomain: exampleisp.net
-
-    This example has three domains: exampleisp.net, hisdomain.com, and
-    herdomain.net. admin can administer all three domains, while
-    rick.admin@hisdomain.com and jill.admin@herdomain.net can only
-    administer their respective domains. 
-
-    Note that everyday users should not be administrators. In the above
-    example, Jill and Rick have separate administrative accounts for their
-    domains. 
-
-Multiple IP Addresses
-
-    In order to use a multiple IP address configuration, the server must be
-    able to do a reverse lookup on the IP address to determine the hostname
-    of the receiving interface. For example: 
-
-    192.168.0.1  ->  mail.example.com
-    192.168.0.2  ->  mail.example.net
-    192.168.0.3  ->  mail.foo.bar
-
-    Once the server obtains the fully qualified hostname of the interface,
-    it removes the localpart (i.e., 'mail') and uses the remainder as the
-    domain for any user that logs in. 
-
-    This address to hostname mapping would usually be done via DNS,
-    /etc/hosts, NIS, etc. Configuration of the various naming services is
-    beyond the scope of this document. 
-
-Delivering mail
-
-    To deliver mail to your virtual domains, configure your MTA so that the
-    envelope recipient (RCPT TO) passed to lmtpd is fully qualified with
-    the correct domain. 
-
-Configuring Sendmail
-
-    In general, follow the basic configuration instructions. Here are a few
-    caveats: 
-
-      * It is easiest to use the mailertable to route mail to Cyrus, rather
-        than adding the domain to the local-host-names file ($w). This
-        prevents Sendmail from changing the domain name to the local host
-        name. 
-
-        example.com              cyrusv2:/var/imap/socket/lmtp
-
-      * You'll have to use the Cyrus mailer in LMTP mode, and you'll have
-        to change the mailer flags so that it provides the full domain
-        while communicating via LMTP. Specifically these changes: 
-
-        S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP
-
-Mail Clients
-
-    The only changes you'll need to make to mail clients is to change
-    usernames to the fully qualified domain names, i.e., user@example.com.
-    Note that to support some mail clients, the user%example.com form of
-    userid is also supported. Users in the default domain will not need to
-    reconfigure their clients (as unqualified userids are assumed to be in
-    the default domain). 
-
-Administration
-
-    The Cyrus virtual domains implementation supports per-domain
-    administrators as well as "global" (inter-domain) administrators.
-    Domain-specific administrators are specified with a fully qualified
-    userid in the admins option (e.g., admin@example.net) and only have
-    access to mailboxes in the associated domain. Mailbox names should be
-    specified in the same fashion as on a single domain configuration. 
-
-    Global administrators are specified with an unqualified userid in the
-    admins option and have access to any mailbox on the server. Because
-    global admins use unqualified userids, they belong to the
-    defaultdomain. As a result, you CANNOT have a global admin without
-    specifying a defaultdomain. Note that when trying to login as a global
-    admin to a multi-homed server from a remote machine, it might be
-    necessary to fully qualify the userid with the defaultdomain. 
-
-    Global admins must use mailbox@domain syntax when specifying mailboxes
-    outside of the defaultdomain. Examples (using cyradm): 
-
-    To create a new INBOX for user 'test' in defaultdomain: 
-
-       cm user.test
-
-    To create a new INBOX for user 'test' in domain 'example.com': 
-
-       cm user.test@example.com
-
-    To list all mailboxes in domain 'example.com': 
-
-       lm *@example.com
-

cyrus-imapd-2.4.17.tar.gz/doc/text/mailing-list Deleted

@@ -1,28 +0,0 @@
-info-cyrus mailing list
-
-    We run a mailing list for users of Project Cyrus software. The
-    info-cyrus@andrew.cmu.edu mailing list exists for the discussion of
-    this server and other Cyrus software. Please do NOT send subscription
-    requests to the list. 
-
-    To subscribe: Send mail to info-cyrus-subscribe@lists.andrew.cmu.edu to
-    subscribe (or just click the link above and that should just work). 
-
-    An archive is availible via anonymous IMAP at
-    imap://cyrus.andrew.cmu.edu/archive.info-cyrus. 
-
-    A web archive is also available at
-    http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists#Archives 
-
-    If you are not subscribed to the list (or you are sending the message
-    from a different address than the one which you are subscribed under),
-    your message is directed to a human for approval. Unfortunately, the
-    human does not always promptly process the message. 
-
-    There is also a developers list available at
-    cyrus-devel@lists.andrew.cmu.edu. with similar subscription methods and
-    archive location 
-
-    Detailed contact information can be found at
-    http://www.cyrusimap.org/mediawiki/index.php/Contact 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/man Deleted

@@ -1,57 +0,0 @@
-Cyrus IMAP Server Man Pages
-
-    User Commands 
-
-      * cyradm(1) 
-      * imtest(1) 
-      * installsieve(1) 
-      * lmtptest(1) 
-      * mupdatetest(1) 
-      * nntptest(1) 
-      * pop3test(1) 
-      * shellsieve(1) 
-      * sivtest(1) 
-      * smtptest(1) 
-
-    Subroutines 
-
-      * imclient(3) 
-
-    File Formats 
-
-      * cyrus.conf(5) 
-      * imapd.conf(5) 
-      * krb.equiv(5) 
-
-    System Administration 
-
-      * arbitron(8) 
-      * chk_cyrus(8) 
-      * ctl_cyrusdb(8) 
-      * ctl_deliver(8) 
-      * ctl_mboxlist(8) 
-      * cyr_dbtool(8) 
-      * cyr_df(8) 
-      * cyr_expire(8) 
-      * deliver(8) 
-      * fetchnews(8) 
-      * fud(8) 
-      * idled(8) 
-      * imapd(8) 
-      * ipurge(8) 
-      * lmtpd(8) 
-      * master(8) 
-      * mbexamine(8) 
-      * mbpath(8) 
-      * nntpd(8) 
-      * notifyd(8) 
-      * pop3d(8) 
-      * quota(8) 
-      * reconstruct(8) 
-      * smmapd(8) 
-      * squatter(8) 
-      * syncnews(8) 
-      * timsieved(8) 
-      * tls_prune(8) 
-      * unexpunge(8) 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/notes Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/os Deleted

@@ -1,48 +0,0 @@
-Operating System Notes
-
-All
-
-     1. Shadow passwords 
-        On any system with shadow passwords (including Solaris 2.5 with
-        Unix authentication), read the SASL documentation carefully to make
-        sure it is configured correctly. 
-
-Solaris
-
-     1. Modern Solaris systems have several useful utilities in
-        /usr/proc/bin, among them pmap. This can be used to calculate the
-        incremental cost (number of non-shared pages) of an imapd process,
-        which is useful for sizing purposes. 
-
-HP-UX
-
-     1. The memory mapping support (mmap(2)) in HP-UX does not have the
-        right semantics for the Cyrus IMAP server under the 9.0 and 10.0
-        release of the operating system. It appears this is related to the
-        hardware's use of inverse page tables. It is recommended that
-        large-scale sites consider using some other platform. 
-
-     2. HP-UX 9.0.4: Comments from testers 
-        The C that ships with HP-UX is totally unsuited for use with unix
-        packages. Either the HP-UX ANSI C developers kit must be purchased
-        separately from HP or GNU's gcc compiler (which can bootstrap
-        itself from the basic HP C) must be built on the target system. 
-
-Linux
-
-     1. synchronous FS updates. 
-        By turning on synchronous updates for ext2fs, all updates (instead
-        of just meta-data) become synchronous. This is good for
-        reliability, but bad for performance. 
-
-        The big problem used to be with the mailboxes file. The 2.0 release
-        and later addressed this problem by changing the flat file to a
-        Berkerley DB database. 
-
-        Note this is for ext2fs. If you are using a newer filesystem (such
-        as xfs, jfs, or reiserfs) the synchronous metadata issue shouldn't
-        come up. Then again, we haven't really looked at other filesystems
-        for Linux yet. (It appears that the different filesystems support
-        slightly different semantics, and it's not always clear what the
-        right thing for the application to do is.) 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/overview Deleted

@@ -1,754 +0,0 @@
-Cyrus IMAP Server: Overview and Concepts
-
- This document gives an overview of the Cyrus IMAP server. The Cyrus
- IMAP (Internet Message Access Protocol) server provides access to
- personal mail and system-wide bulletin boards through the IMAP
- protocol. The Cyrus IMAP server is a scalable enterprise mail system
- designed for use from small to large enterprise environments using
- standards-based technologies. 
-
- A full Cyrus IMAP implementation allows a seamless mail and bulletin
- board environment to be set up across multiple servers. It differs from
- other IMAP server implementations in that it is run on "sealed"
- servers, where users are not normally permitted to log in. The mailbox
- database is stored in parts of the filesystem that are private to the
- Cyrus IMAP system. All user access to mail is through software using
- the IMAP, IMAPS, POP3, POP3S, or KPOP protocols. 
-
- The private mailbox database design gives the server large advantages
- in efficiency, scalability, and administratability. Multiple concurrent
- read/write connections to the same mailbox are permitted. The server
- supports access control lists on mailboxes and storage quotas on
- mailbox hierarchies. 
-
- This document is organized into the following areas: 
-
- * Mailbox Namespace 
-
- * Standard (Internal) Namespace 
- * Alternate Namespace 
-
- * Access Control Lists 
-
- * Access Rights 
- * Identifiers 
- * "anonymous" and "anyone" 
- * Kerberos vs. Unix Authorization 
- * Negative Rights 
- * Calculating Users' Rights 
- * Implicit Rights for Administrators on Personal Mailboxes 
- * Initial ACLs for Newly Created Mailboxes 
-
- * Login Authentication 
-
- * Anonymous Logins 
- * Kerberos Logins 
- * Unix Logins 
-
- * Quotas 
-
- * Supports Quotas on Storage 
- * Quota Roots 
- * Mail Delivery Behavior 
- * Quota Warnings Upon Select When User Has "d" Rights 
- * Quotas and Partitions 
-
- * New Mail Notification 
- * Partitions 
-
- * Specifying Partitions with "create" 
- * Changing Partitions with "rename" 
-
- * News 
- * POP3 Server 
- * The syslog facility 
- * Mail Directory Recovery 
-
- * Reconstructing Mailbox Directories 
- * Reconstructing the Mailboxes File 
- * Reconstructing Quota Roots 
- * Removing Quota Roots 
- * Subscriptions 
-
- * Configuration Directory 
-
- * "log" Directory 
- * "proc" Directory 
-
- * Message Delivery 
-
- * Local Mail Transfer Protocol 
- * Single Instance Store 
- * Duplicate Delivery Suppression 
- * Sieve, a Mail Filtering Language 
-
-Mailbox Namespace
-
- By default, the Cyrus IMAP server presents mailboxes using the netnews
- namespace convention. Mailbox names are case-sensitive. A mailbox name
- may not start or end with a "." character, nor may it contain two "."
- characters in a row. 
-
- In this implementation, non-ASCII characters and shell metacharacters
- are not permitted in mailbox names. 
-
- Optionally, the server can present mailboxes using the UNIX hierarchy
- convention. 
-
-Standard (Internal) Namespace
-
- All personal mailboxes for user "bovik" begin with the string
- "user.bovik.". For example, if user "bovik" had a personal "work"
- mailbox, it would be called "user.bovik.work". To user "bovik",
- however, the prefix "user.bovik." normally appears as "INBOX.". The
- mailbox "user.bovik.work" would therefore appear as "INBOX.work". If
- the access control list of the mailbox permitted other users to see
- that mailbox, it would appear to them as "user.bovik.work". 
-
- The mailbox "user.bovik" is where the user "bovik" normally receives
- new mail, and normally appears to user "bovik" as "INBOX". The mailbox
- "user.bovik" is referred to in this document as user "bovik"'s INBOX. 
-
- Administrators create and delete users by creating and deleting the
- users' INBOX. If a user has an INBOX, then they are allowed to
- subscribe to mailboxes. Only users without dots in their userid are
- permitted to have an INBOX. (A user with a dot in their userid would be
- able to login but would not be able to receive mail. Note that when
- using the unix hierarchy seperator, this is not the case, and any user
- may have a dot in their userid.) 
-
- When an administrator deletes a user's INBOX, all of the user's
- personal mailboxes are deleted as well. 
-
- With the one notable exception of INBOX, all mailbox names are
- system-wide--they refer to the same mailbox regardless of the user.
- Access control lists determine which users can access or see which
- mailboxes. Using 
-
- In contexts which permit relative mailbox names, the mailbox namespace
- works as follows: 
-
- * Names that do not start with "." are fully qualified. 
- * Names that start with "." are relative to the current context. 
-
- Thus, if you are working with folder names and the top of the hierarchy
- is named "cmu.", the name "comp.infosystems.www" resolves to
- "comp.infosystems.www" and the name ".comp.infosystems.www" resolves to
- "cmu.comp.infosystems.www". 
-
-Alternate Namespace
-
- The Cyrus IMAP server can also use an alternate namespace which allows
- a user's personal mailboxes to appear as if they reside at the same
- level as that user's INBOX as opposed to children of it. With this
- feature, it may appear that there are non-unique names for mailboxes
- between users (2 different users may each have a top level "work"
- mailbox), but the internal representation is still user.name.work. 
-
-Access Control Lists
-
- Access to each mailbox is controlled by each mailbox's access control
- list. Access Control Lists (ACLs) provide a powerful mechanism for
- specifying the users or groups of users who have permission to access
- the mailboxes. An ACL is a list of zero or more entries. Each entry has
- an identifier and a set of rights. The identifier specifies the user or
- group of users for which the entry applies. The set of rights is one or
- more letters or digits, each letter or digit conferring a particular
- privilege. 
-
-Access Rights
-
- The defined rights are: 
-
- l lookup - The user may see that the mailbox exists. 
- r read - The user may read the mailbox. The user may select the
- mailbox, fetch data, perform searches, and copy messages from
- the mailbox. 
- s seen - Keep per-user seen state. The "Seen" and "Recent" flags
- are preserved for the user. 
- w write - The user may modify flags and keywords other than
- "Seen" and "Deleted" (which are controlled by other sets of
- rights). 
- i insert - The user may insert new messages into the mailbox. 
- p post - The user may send mail to the submission address for the
- mailbox. This right differs from the "i" right in that the
- delivery system inserts trace information into submitted
- messages. 
- c create - The user may create new sub-mailboxes of the mailbox,
- or delete or rename the current mailbox. 
- d delete - The user may store the "Deleted" flag, and perform
- expunges. 
- a administer - The user may change the ACL on the mailbox. 
-
- You can combine access rights in different ways. For example: 
-
- lrs The user can read the mailbox. 
-
- lrsp The user can read the mailbox, and can post to it through the
- delivery system. Most delivery systems do not provide
- authentication, so the "p" right usually has meaning only for
- the "anonymous" user. 
-
- lr The user can see the mailbox and can read it, but the server
- does not preserve the "Seen" and "Recent" flags. This set of
- rights is primarily useful for "anonymous IMAP." 
-
- rs The user can read the mailbox and the server preserves the
- "Seen" and "Recent" flags, but the mailbox is not visible to
- the user through the various mailbox listing commands. The user
- must know the name of the mailbox to be able to access it. 
-
- lrsip The user can read and append to the mailbox, either through
- IMAP, or through the delivery system. 
-
-Identifiers
-
- The identifier part of an ACL entry specifies the user or group for
- which the entry applies. 
-
- There are two special identifiers, "anonymous", and "anyone", which are
- explained below. The meaning of other identifiers usually depends on
- the authorization mechanism being used (selected by --with-auth at
- compile time, defaulting to Unix). 
-
-"anonymous" and "anyone"
-
- With any authorization mechanism, two special identifiers are defined.
- The identifier "anonymous" refers to the anonymous, or unauthenticated
- user. The identifier "anyone" refers to all users, including the
- anonymous user. 
-
-Kerberos vs. Unix Authorization
-
- The Cyrus IMAP server comes with four authorization mechanisms, one is
- compatible with Unix-style ("/etc/passwd") authorization, one for use
- with Kerberos 4, one for use with Kerberos 5, and one for use with an
- external authorization process (ptloader) which can interface with
- other group databases (e.g. AFS PTS groups, LDAP Groups, etc). 
-
- Note that authorization is not authentication. Authentication is the
- act of proving who you are. Authorization is the act of determining
- what rights you have. Authentication is discussed in the Login
- Authentication part of this document. 
-
- In the Unix authorization mechanism, identifiers are either a valid
- userid or the string "group": followed by a group listed in
- "/etc/group". Thus: 
-
- root Refers to the user root
- group:staff Refers to the group staff
-
- It is also possible to use unix groups with users authenticated through
- a non-/etc/passwd backend. Note that using unix groups in this way
- (without associated /etc/passwd entries) is not recommended. 
-
- Using the Kerberos authorization mechanism, identifiers are of the
- form: 
-
- principal.instance@realm
-
- If ".instance" is omitted, it defaults to the null string. If "@realm"
- is omitted, it defaults to the local realm. 
-
- The file "/etc/krb.equiv" contains mappings between Kerberos
- principals. The file contains zero or more lines, each containing two
- fields. Any identity matching the first field of a line is changed to
- the second identity during canonicalization. For example, a line in
- "/etc/krb.equiv" of: 
-
- bovik@REMOTE.COM bovik
-
- will cause the identity "bovik@REMOTE.COM" to be treated as if it were
- the local identity "bovik". 
-
- A site may wish to write their own authorization mechanism, perhaps to
- implement a local group mechanism. If it does so (by implementing an
- auth_whatever module), it will dictate its own form and meaning of
- identifiers. 
-
-Negative Rights
-
- Any of the above defined identifiers may be prefixed with a "-"
- character. The associated rights are then removed from that identifier.
- These are referred to as "negative rights". 
-
-Calculating Users' Rights
-
- To calculate the set of rights granted to a user, the server first
- calculates the union of all of the rights granted to the user and to
- all groups the user is a member of. The server then calculates and
- removes the union of all the negative rights granted to the user and to
- all groups the user is a member of. 
-
- For example, given the ACL: 
-
- anyone lrsp
- fred lwi
- -anonymous s
-
- The user "fred" will be granted the rights "lrswip" and the anonymous
- user will be granted the rights "lrp". 
-
-Implicit Rights for Administrators on Personal Mailboxes
-
- Regardless of the ACL on a mailbox, users who are listed in the
- "admins" configuration option in "/etc/imapd.conf" implicitly have the
- "l" and "a" rights on all mailboxes. Users also implicitly have the "l"
- and "a" rights on their INBOX and all of their personal mailboxes. 
-
-Initial ACLs for Newly Created Mailboxes
-
- When a mailbox is created, its ACL starts off with a copy of the ACL of
- its closest parent mailbox. When a user is created, the ACL on the
- user's INBOX starts off with a single entry granting all rights to the
- user. When a non-user mailbox is created and does not have a parent,
- its ACL is initialized to the value of the "defaultacl" option in
- "/etc/imapd.conf"
-
- Note that some rights are available implicitly, for example 'anonymous'
- always has 'p' on user INBOXes, and users always have rights on
- mailboxes within their INBOX hierarchy. 
-
-Login Authentication
-
- This section discusses different types of authentication (ways of
- logging in) that can be used with Cyrus IMAP. 
-
- The Cyrus IMAP server uses the Cyrus SASL library for authentication.
- This section describes how to configure SASL with use with Cyrus imapd.
- Please consult the Cyrus SASL System Administrator's Guide for more
- detailed, up-to-date information. 
-
-Anonymous Logins
-
- Regardless of the SASL mechanism used by an individual connection, the
- server can support anonymous login. If the "allowanonymouslogin" option
- in "/etc/imapd.conf" is turned on, then the server will permit
- plaintext password logins using the user "anonymous" and any password.
- Additionally, the server will enable any SASL mechanisms that allow
- anonymous logins. 
-
-Plaintext Authentication
-
- The SASL library has several ways of verifying plaintext passwords
- Plaintext passwords are passed either by the IMAP LOGIN command or by
- the SASL PLAIN mechanism (under a TLS layer). 
-
- * PAM 
- * Kerberos v4 Plaintext passwords are verified by obtaining a ticket
- for the server's Kerberos identity, to protect against Kerberos
- server spoofing attacks. 
- * /etc/passwd 
- * /etc/shadow 
- * etc. 
-
- sasl_auto_transition automatically creates secrets for shared secret
- authentication when given a password. 
-
- The method of plaintext password verification is always through the
- SASL library, even in the case of the internal LOGIN command. This is
- to allow the SASL library to be the only source of authentication
- information. You'll want to look at the sasl_pwcheck_method option in
- the SASL documentation to understand how to configure a plaintext
- password verifier for your system. 
-
- To disallow the use of plaintext passwords for authentication, you can
- set allowplaintext: no in imapd.conf. This will still allow PLAIN under
- TLS, but IMAP LOGIN commands will now fail. 
-
-Kerberos Logins
-
- The Kerberos SASL mechanism supports the KERBEROS_V4 authentication
- mechanism. The mechanism requires that a srvtab file exist in the
- location given in the "srvtab" configuration option. The srvtab file
- must be readable by the Cyrus server and must contain a
- "imap.<host>@<realm>" service key, where <host> is the first component
- of the server's host name and <realm> is the server's Kerberos realm. 
-
- The server will permit logins by identities in the local realm and
- identities in the realms listed in the "loginrealms" option in
- "/etc/imapd.conf". 
-
- The file "/etc/krb.equiv" contains mappings between Kerberos
- principals. The file contains zero or more lines, each containing two
- fields. Any identity matching the first field of a line is permitted to
- log in as the identity in the second field. 
-
- If the "loginuseacl" configuration option is turned on, than any
- Kerberos identity that is granted the "a" right on the user's INBOX is
- permitted to log in as that user. 
-
-Shared Secrets Logins
-
- Some mechanisms require the user and the server to share a secret
- (generally a password) that can be used for comparison without actually
- passing the password in the clear across the network. For these
- mechanism (such as CRAM-MD5 and DIGEST-MD5), you will need to supply a
- source of passwords, such as the sasldb (which is described more fully
- in the Cyrus SASL distribution) 
-
-Quotas
-
- Quotas allow server administrators to limit resources used by
- hierarchies of mailboxes on the server. 
-
-Supports Quotas on Storage
-
- The Cyrus IMAP server supports quotas on storage, which is defined as
- the number of bytes of the relevant RFC-822 messages, in kilobytes.
- Each copy of a message is counted independently, even when the server
- can conserve disk space use by making hard links to message files. The
- additional disk space overhead used by mailbox index and cache files is
- not charged against a quota. 
-
-Quota Roots
-
- Quotas are applied to quota roots, which can be at any level of the
- mailbox hierarchy. Quota roots need not also be mailboxes. 
-
- Quotas on a quota root apply to the sum of the usage of any mailbox at
- that level and any sub-mailboxes of that level that are not underneath
- a quota root on a sub-hierarchy. This means that each mailbox is
- limited by at most one quota root. 
-
- For example, if the mailboxes 
-
- user.bovik
- user.bovik.list.imap
- user.bovik.list.info-cyrus
- user.bovik.saved
- user.bovik.todo
-
- exist and the quota roots 
-
- user.bovik 
- user.bovik.list
- user.bovik.saved
-
- exist, then the quota root "user.bovik" applies to the mailboxes
- "user.bovik" and "user.bovik.todo"; the quota root "user.bovik.list"
- applies to the mailboxes "user.bovik.list.imap" and
- "user.bovik.list.info-cyrus"; and the quota root "user.bovik.saved"
- applies to the mailbox "user.bovik.saved". 
-
- Quota roots are created automatically when they are mentioned in the
- "setquota" command. Quota roots may not be deleted through the
- protocol, see Removing Quota Roots for instructions on how to delete
- them. 
-
-Mail Delivery Behavior
-
- Normally, in order for a message to be inserted into a mailbox, the
- quota root for the mailbox must have enough unused storage so that
- inserting the message will not cause the block quota to go over the
- limit. 
-
- Mail delivery is a special case. In order for a message to be delivered
- to a mailbox, the quota root for the mailbox must not have usage that
- is over the limit. If the usage is not over the limit, then one message
- may be delivered regardless of its size. This puts the mailbox's usage
- over the quota, causing a user to be informed of the problem and
- permitting them to correct it. If delivery were not permitted in this
- case, the user would have no practical way of knowing that there was
- mail that could not be delivered. 
-
- If the usage is over the limit, then the mail delivery will fail with a
- temporary error. This will cause the delivery system to re-attempt
- delivery for a couple of days (permitting the user time to notice and
- correct the problem) and then return the mail to the sender. 
-
-Quota Warnings Upon Select When User Has "d" Rights
-
- When a user selects a mailbox whose quota root has usage that is close
- to or over the limit and the user has "d" rights on the mailbox, the
- server will issue an alert notifying the user that usage is close to or
- over the limit. The threshold of usage at which the server will issue
- quota warnings is set by the "quotawarn" configuration option. 
-
- The server only issues warnings when the user has "d" rights because
- only users with "d" rights are capable of correcting the problem. 
-
-Quotas and Partitions
-
- Quota roots are independent of partitions. A single quota root can
- apply to mailboxes in different partitions. 
-
-New Mail Notification
-
- The Cyrus IMAP server comes with a notification daemon which supports
- multiple mechanisms for notifying users of new mail. Notifications can
- be configured to be sent upon normal delivery ("MAIL" class) and/or
- sent as requested by a Sieve script ("SIEVE" class). 
-
- By default, both types of notifications are disabled. Notifications are
- enabled by using one or both of the following configuration options: 
-
- * the "mailnotifier" option selects the notifyd method to use for
- "MAIL" class notifications 
- * the "sievenotifier" option selects the notifyd method to use for
- "SIEVE" class notifications (when no method is specified by the
- Sieve action) 
-
-Partitions
-
- Partitions allow administrators to store different mailboxes in
- different parts of the Unix filesystem. This is intended to be used to
- allow hierarchies of mailboxes to be spread across multiple disks. 
-
-Specifying Partitions with "create"
-
- When an administrator creates a new mailbox, the name of the partition
- for the mailbox may be specified using an optional second argument to
- the "create" command. Non-administrators are not permitted to specify
- the partition of a mailbox. If the partition is not specified, then the
- mailbox inherits the partition of its most immediate parent mailbox. If
- the mailbox has no parent, it gets the partition specified in the
- "defaultpartition" configuration option. 
-
- The optional second argument to the "create" command can usually be
- given only when using a specialized Cyrus-aware administrative client
- such as cyradm. 
-
-Changing Partitions with "rename"
-
- An administrator may change the partition of a mailbox by using the
- rename command with an optional third argument. When a third argument
- to rename is given, the first and second arguments can be the
- same--this changes the partition of a mailbox without changing its
- name. If a third argument to rename is not given and the first argument
- is not "INBOX", the partition of a mailbox does not change. If a third
- argument to rename is not given and the first argument is "INBOX", the
- newly created mailbox gets the same partition it would get from the
- "create" command. 
-
-News
-
- Cyrus has the ability to export Usenet via IMAP and/or export shared
- IMAP mailboxes via an NNTP server which is included with Cyrus. For
- more information on exporting news groups through the IMAP server, see
- install-netnews.html. 
-
-POP3 Server
-
- The Cyrus IMAP server software comes with a compatibility POP3 server.
- Due to limitations in the POP3 protocol, the server can only access a
- user's INBOX and only one instance of a POP3 server may exist for any
- one user at any time. While a POP3 server has a user's INBOX open,
- expunge operations from any concurrent IMAP session will fail. 
-
- When Kerberos login authentication is being used, the POP3 server uses
- the server identity "pop.host@realm" instead of "imap.host@realm",
- where "host" is the first component of the server's host name and
- "realm" is the server's Kerberos realm. When the POP3 server is invoked
- with the "-k" switch, the server exports MIT's KPOP protocol instead of
- generic POP3. 
-
-The syslog facility
-
- The Cyrus IMAP server software sends log messages to the "local6"
- syslog facility. The severity levels used are: 
-
- * CRIT - Critical errors which probably require prompt administrator
- action 
- * ERR - I/O errors, including failure to update quota usage. The
- syslog message includes the specific file and Unix error. 
- * WARNING - Protection mechanism failures, client inactivity timeouts 
- * NOTICE - Authentications, both successful and unsuccessful 
- * INFO - Mailbox openings, duplicate delivery suppression 
-
-Mail Directory Recovery
-
- This section describes the various databases used by the Cyrus IMAP
- server software and what can be done to recover from various
- inconsistencies in these databases. 
-
-Reconstructing Mailbox Directories
-
- The largest database is the mailbox directories. Each mailbox directory
- contains the following files: 
-
- message files 
- There is one file per message, containing the message in RFC
- 822 format. Lines in the message are separated by CRLF, not
- just LF. The file name of each message is the message's UID
- followed by a dot (.). 
-
- In netnews newsgroups, the message files instead follow the
- format and naming conventions imposed by the netnews software. 
-
- cyrus.header 
- This file contains a magic number and variable-length
- information about the mailbox itself. 
-
- cyrus.index 
- This file contains fixed-length information about the mailbox
- itself and each message in the mailbox. 
-
- cyrus.cache 
- This file contans variable-length information about each
- message in the mailbox. 
-
- cyrus.seen 
- This file contains variable-length state information about each
- reader of the mailbox who has "s" permissions. 
-
- The "reconstruct" program can be used to recover from corruption in
- mailbox directories. If "reconstruct" can find existing header and
- index files, it attempts to preserve any data in them that is not
- derivable from the message files themselves. The state "reconstruct"
- attempts to preserve includes the flag names, flag state, and internal
- date. "Reconstruct" derives all other information from the message
- files. 
-
- An administrator may recover from a damaged disk by restoring message
- files from a backup and then running reconstruct to regenerate what it
- can of the other files. 
-
- The "reconstruct" program does not adjust the quota usage recorded in
- any quota root files. After running reconstruct, it is advisable to run
- "quota -f" (described below) in order to fix the quota root files. 
-
-Reconstructing the Mailboxes File
-
- NOTE: CURRENTLY UNAVAILABLE 
-
- The mailboxes file in the configuration directory is the most critical
- file in the entire Cyrus IMAP system. It contains a sorted list of each
- mailbox on the server, along with the mailboxes quota root and ACL. To
- reconstruct a corrupted mailboxes file, run the "reconstruct -m"
- command. The "reconstruct" program, when invoked with the "-m" switch,
- scavenges and corrects whatever data it can find in the existing
- mailboxes file. It then scans all partitions listed in the imapd.conf
- file for additional mailbox directories to put in the mailboxes file. 
-
- The cyrus.header file in each mailbox directory stores a redundant copy
- of the mailbox ACL, to be used as a backup when rebuilding the
- mailboxes file. 
-
-Reconstructing Quota Roots
-
- The subdirectory "quota" of the configuration directory (specified in
- the "configdirectory" configuration option) contains one file per quota
- root, with the file name being the name of the quota root. These files
- store the quota usage and limits of each of the quota roots. 
-
- The "quota" program, when invoked with the "-f" switch, recalculates
- the quota root of each mailbox and the quota usage of each quota root. 
-
-Removing Quota Roots
-
- To remove a quota root, remove the quota root's file. Then run "quota
- -f" to make the quota files consistent again. 
-
-Subscriptions
-
- The subdirectory "user" of the configuration directory contains user
- subscriptions. There is one file per user, with a filename of the
- userid followed by ".sub". Each file contains a sorted list of
- subscribed mailboxes. 
-
- There is no program to recover from damaged subscription files. A site
- may recover from lost subscription files by restoring from backups. 
-
-Configuration Directory
-
- Many objects in the configuration directory are discussed in the
- Database Recovery section. This section documents two other directories
- that reside in the configuration directory. 
-
-"log" Directory
-
- The subdirectory "log" under the configuration directory permits
- administrators to keep protocol telemetry logs on a per-user basis. 
-
- If a subdirectory of "log" exists with the same name as a user, the
- IMAP and POP3 servers will keep a telemetry log of protocol sessions
- authenticating as that user. The telemetry log is stored in the
- subdirectory with a filename of the server process-id and starts with
- the first command following authentication. 
-
-"proc" Directory
-
- The subdirectory "proc" under the configuration directory contains one
- file per active server process. The file name is the ASCII
- representation of the process id and the file contains the following
- tab-separated fields: 
-
- * hostname of the client 
- * login name of the user, if logged in 
- * selected mailbox, if a mailbox is selected 
-
- The file may contain arbitrary characters after the first newline
- character. 
-
- The "proc" subdirectory is normally be cleaned out on server reboot. 
-
-Message Delivery
-
- Mail transport agents such as Sendmail, Postfix, or Exim communicate
- with the Cyrus server via LMTP (the Local Mail Transport Protocol)
- implemented by the LMTP daemon. This can be done either directly by the
- MTA (prefered, for performance reasons) or via the deliver LMTP client. 
-
-Local Mail Transfer Protocol
-
- LMTP, the Local Mail Transfer Protocol, is a variant of SMTP design for
- transferring mail to the final message store. LMTP allows MTAs to
- deliver "local" mail over a network. This is an easy optimization so
- that the IMAP server doesn't need to maintain a queue of messages or
- run an MTA. 
-
- The Cyrus server implements LMTP via the lmtpd daemon. LMTP can either
- be used over a network via TCP or local via a UNIX domain socket. There
- are security differnces between these two alternatives; read more below 
-
- For final delivery via LMTP over a TCP socket, it is necessary to use
- LMTP AUTH. This is accomplished using SASL to authenticate the
- delivering user. If your mail server is performing delivery via LMTP
- AUTH (that is, using a SASL mechanism), you will want their
- authentication id to be an LMTP admins (either via the admins
- imapd.conf option or via the <service>_admins option, typically
- lmtp_admins). 
-
- Alternatively you may deliver via LMTP to a unix domain socket, and the
- connection will be preauthenticated as an administrative user (and
- access control is accomplished by controlling access to the socket). 
-
- Note that if a user has a sieve script, the sieve script runs
- authorized as *that* user, and the rights of the posting user are
- ignored for the purposes of determining the outcome of the sieve
- script. 
-
-Single Instance Store
-
- If a delivery attempt mentions several recipients (only possible if the
- MTA is speaking LMTP to lmtpd), the server attempts to store as few
- copies of a message as possible. It will store one copy of the message
- per partition, and create hard links for all other recipients of the
- message. 
-
- Single instance store can be turned off by using the
- "singleinstancestore" flag in the configuration file. 
-
-Duplicate Delivery Suppression
-
- A message is considered a duplicate if two copies of a message with the
- same message-id and the same envelope receipient are received. Cyrus
- uses the duplicate delivery database to hold this information, and it
- looks approximately 3 days back in the default install. 
-
- Duplicate delivery suppression can be turned off by using the
- "duplicatesuppression" flag in the configuration file. 
-
-Sieve, a Mail Filtering Language
-
- Sieve is a mail filtering language that can filter mail into an
- appropriate IMAP mailbox as it is delivered via lmtp. For more
- information, look here. 
-
-Cyrus Murder, the IMAP Aggregator
-
- Cyrus now supports the distribution of mailboxes across a number of
- IMAP servers to allow for horizontal scalability. For information on
- setting up this configuration, see here. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/questions Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/readme Deleted

@@ -1,168 +0,0 @@
-                Cyrus IMAP Server Release Information
-
-    IMAP (Internet Message Access Protocol) is an Internet standards-track
-    protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-    IMAP server differs from other IMAP server implementations in that it
-    is generally intended to be run on "sealed" servers, where normal users
-    are not permitted to log in. The mailbox database is stored in parts of
-    the filesystem that are private to the Cyrus IMAP system. All user
-    access to mail is through the IMAP, NNTP, POP3, or KPOP protocols. 
-
-    The private mailbox database design gives the server large advantages
-    in efficiency, scalability, and administratability. Multiple concurrent
-    read/write connections to the same mailbox are permitted. The server
-    supports access control lists on mailboxes and storage quotas on
-    mailbox hierarchies. 
-
-Features
-
-    The Cyrus server supports the IMAP4rev1 protocol described in RFC 3501.
-    IMAP4rev1 has been approved as a proposed standard. 
-
-    Character sets supported for searching are: us-ascii, iso-8859-1,
-    iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, iso-8859-7,
-    iso-8859-8, iso-8859-9, koi8-r, iso-2022-jp, iso-2022-kr, gb2312, big5,
-    iso-8859-15, windows-1252, windows-1256. The character mapping tables
-    most likely contain errors. 
-
-    The server supports any authentication mechanism available from the
-    SASL library. Currently, support includes: KERBEROS_V4, GSSAPI,
-    CRAM-MD5, DIGEST-MD5, OTP, PLAIN, and STARTTLS. 
-
-    The server supports imaps/pop3s/nntps (IMAP/POP3/NNTP encrypted using
-    SSL). 
-
-    The server makes an attempt to do single instance store where possible
-    when an email message is addressed to multiple recipients. 
-
-    We current support the following IMAP capabilities: IMAP4 IMAP4rev1 ACL
-    RIGHTS=kxte QUOTA LITERAL+ NAMESPACE UIDPLUS ID NO_ATOMIC_RENAME
-    UNSELECT CHILDREN MULTIAPPEND SORT SORT=MODSEQ THREAD=ORDEREDSUBJECT
-    THREAD=REFERENCES ANNOTATEMORE CATENATE CONDSTORE URLAUTH IDLE STARTTLS
-    SASL-IR. 
-
-    The server supports SIEVE for server side email filtering. 
-
-Upgrade Caveats
-
-    This section reserved for WARNING WARNING WARNING comments. 
-    Note that the replication protocol currently does not have the facility
-    to support the IMAP CONDSTORE extension (modification sequences). It is
-    recommended that you do not try to use both CONDSTORE and replication
-    at this time. The deficiencies in the replication protocol will be
-    fixed in version 2.3.9. 
-
-Installation Overview
-
-    This system should be expected to have the same order-of-magnitude
-    installation complexity as a netnews system. Maintenance should have
-    similar complexity, except administrators will have to deal with
-    creation and deletion of users and will have the option of managing
-    quotas and access control lists. 
-
-    This package is distributed as a source only release. It is expected
-    that you can compile and configure software. Installation instructions
-    are in the install.html. Please be sure to read this document. 
-
-    A detailed overview of the server is available in overview.html. 
-
-    This server has been successfully installed on a number of Unix
-    systems. We run the software under SPARC Solaris 8. Please refer to
-    os.html for operating system specific issues. 
-
-Server Notes
-
-    The mailbox namespace is like that for netnews--hierarchical names
-    separated by the "." character. Mailboxes without a parent may only be
-    created by an administrator. Mailboxes with a parent may be created as
-    the ACL (Access Control List) on the parent mailbox permits. 
-
-    Users' personal mailboxes are under the "user" hierarchy. The names of
-    the personal mailboxes for user "bovik" all start with the prefix
-    "user.bovik.". The mailbox "user.bovik" is special in that it is
-    presented to user "bovik" as if it were named "INBOX". Creating the
-    mailbox "user.bovik" is equivalent to creating an account for user
-    "bovik"--it permits "bovik" to receive mail, create personal mailboxes,
-    and subscribe to mailboxes. Deleting the mailbox "user.bovik" has the
-    special-case side-effect of deleting all mailboxes starting with
-    "user.bovik." and of deleting the subscriptions for "bovik." 
-
-Licensing Information
-
-    The following copyright applies to the code: 
-
-     * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without
-     * modification, are permitted provided that the following conditions
-     * are met:
-     *
-     * 1. Redistributions of source code must retain the above copyright
-     *    notice, this list of conditions and the following disclaimer.
-     *
-     * 2. Redistributions in binary form must reproduce the above copyright
-     *    notice, this list of conditions and the following disclaimer in
-     *    the documentation and/or other materials provided with the
-     *    distribution.
-     *
-     * 3. The name "Carnegie Mellon University" must not be used to
-     *    endorse or promote products derived from this software without
-     *    prior written permission. For permission or any legal
-     *    details, please contact
-     *      Carnegie Mellon University
-     *      Center for Technology Transfer and Enterprise Creation
-     *      4615 Forbes Avenue
-     *      Suite 302
-     *      Pittsburgh, PA  15213
-     *      (412) 268-7393, fax: (412) 268-7395
-     *      innovation@andrew.cmu.edu
-     *
-     * 4. Redistributions of any form whatsoever must retain the following
-     *    acknowledgment:
-     *    "This product includes software developed by Computing Services
-     *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-     *
-     * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-     * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-     * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-     * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-     * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-     * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-    If you find this software useful and valuable in your work, we would
-    welcome any support you can offer toward continuing this work. We
-    gratefully accept contributions, whether intellectual or monetary.
-    Intellectual contributions in the form of code or constructive
-    collaboration can be directed via the feedback page. 
-
-    If you wish to provide financial support to the Cyrus Project, send a
-    check payable to "Carnegie Mellon University" to 
-
-          Project Cyrus
-          Computing Services
-          Carnegie Mellon University
-          5000 Forbes Ave
-          Pittsburgh, PA 15213
-          USA
-
-Summary
-
-    If you want to install the server, be sure to read the installation
-    instructions in install.html. 
-
-    More details about the server implementation is in the server overview
-    document. 
-
-    Please refer to Sending Feedback if you would like to submit a bug,
-    feature request or (best of all) patch. 
-
-    There is a mailing list. See the mailing list document for details. 
-
-    A list of known problems can be found in the bugs file. 
-
-    O'Reilly has a book out named Managing IMAP. While the book does not
-    directly talk about the 2.0 code base, it provides very good
-    information on the configuration and setup that can be applied to the
-    newer code. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/sieve Deleted

cyrus-imapd-2.4.17.tar.gz/doc/text/sieve-protocol Deleted

@@ -1,56 +0,0 @@
-Protocol for Sieve script exchange
-
-    Please note that this document is not authoritative and may well be out
-    of date; you should look at specs.html for the current authoritative
-    document for the MANAGESIEVE protocol. Note: This is not a standards
-    track protocol. If you decide to base a program upon it you have been
-    warned. This is a simple text-based protocol for getting user sieve
-    scripts onto the (presumably sealed) IMAP server. The requirements for
-    this process are: 
-
-      * the user must authenticate to gain access, preferably via a secure
-        SASL mechanism. 
-      * only valid sieve scripts may be accepted 
-
-    Additional features provided: 
-
-      * the ability to manage multiple scripts on the server with zero or
-        one of them being the "active" sieve script 
-
-Types
-
-    This is a line-oriented protocol much like IMAP or ACAP. There are
-    two types: ATOMS and strings, all space ('SP') separated. Strings may
-    be quoted or literal. See ACAP for detailed descriptions. 
-    sievename is a string where only certain characters are allowed and it
-    must be at least 1 character long. 
-
-Commands
-
-    AUTHENTICATE SP string SP string EOL 
-            SASL authentication; the parameters are the mechanism and
-            optionally the initial data. Initial data is base64 encoded.
-            The server replies with an OK or NO response, or a base64
-            string followed by an EOL. Client then replies with a base64
-            string followed by an EOL, and the procedure is repeated. 
-    NOOP EOL 
-            No side effects. Valid replies: OK or NO. 
-    LOGOUT EOL 
-            Logout: terminates connection. Valid replies: OK or NO. 
-    GETSCRIPT SP sievename EOL 
-            The parameter is the name of the requested script. Returns:
-            string EOL containing the script data. Get the script with name
-            sievename from the server. Valid replies: OK or NO. 
-    PUTSCRIPT SP sievename SP string EOL 
-            Puts sievename with data data onto the server if possible.
-            Valid replies: OK or NO. 
-    SETACTIVE SP sievename EOL 
-            Set the script with the name sievename as the active script.
-            Any other script that was active is no longer. Valid replies:
-            OK or NO. 
-    DELETESCRIPT SP sievename EOL 
-            Delete the script with sievename. Valid replies: OK or NO. 
-    LISTSCRIPTS EOL 
-            Returns zero or more: sievename EOL. Where the active script
-            has a '*' at the end of its name. Valid replies: OK or NO. 
-

cyrus-imapd-2.4.17.tar.gz/doc/text/specs Deleted

@@ -1,202 +0,0 @@
-Cyrus IMAP Server Protocol Specifications
-
-IMAP
-
-    RFC 3501 Internet Message Access Protocol - version 4rev1 
-    being updated by rfc3501-errata
-
-    RFC 1730 Internet Message Access Protocol - version 4
-
-    RFC 4314 IMAP4 Access Control List (ACL) Extension
-
-    RFC 2087 IMAP4 QUOTA extension
-
-    RFC 2088 IMAP4 non-synchronizing literals
-
-    RFC 2177 IMAP4 IDLE command
-
-    RFC 2192 IMAP URL Scheme 
-    being updated by draft-ietf-lemonade-rfc2192bis
-
-    RFC 2193 IMAP4 Mailbox Referrals
-
-    RFC 2342 IMAP4 Namespace
-
-    RFC 4315 Internet Message Access Protocol (IMAP) - UIDPLUS extension
-
-    RFC 2971 IMAP4 ID extension
-
-    RFC 3348 IMAP4 Child Mailbox Extension
-
-    RFC 3502 IMAP MULTIAPPEND extension
-
-    RFC 3516 IMAP4 Binary Content Extension
-
-    RFC 3691 Internet Message Access Protocol (IMAP) UNSELECT command
-
-    RFC 4466 Collected Extensions to IMAP4 ABNF
-
-    RFC 4467 Internet Message Access Protocol (IMAP) - URLAUTH Extension
-
-    RFC 4469 Internet Message Access Protocol (IMAP) CATENATE Extension
-
-    RFC 4550 Internet Email to Support Diverse Service Environments
-    (Lemonade) Profile
-
-    RFC 4551 IMAP Extension for Conditional STORE operation
-
-    RFC 4731 IMAP4 Extension to SEARCH Command for Controlling What Kind of
-    Information Is Returned
-
-    RFC 4959 IMAP Extension for Simple Authentication and Security Layer
-    (SASL) Initial Client Response
-
-    RFC 4978 The IMAP COMPRESS Extension
-
-    RFC 5032 WITHIN Search Extension to the IMAP Protocol
-
-    RFC 5161 The IMAP ENABLE Extension
-
-    RFC 5162 IMAP4 Extensions for Quick Mailbox Resynchronization
-
-    RFC 5256 Internet Message Access Protocol - SORT and THREAD Extensions
-
-    RFC 5258 Internet Message Access Protocol version 4 - LIST Command
-    Extensions
-
-    RFC 5524 Extended URLFETCH for Binary and Converted Parts
-
-    draft-daboo-imap-annotatemore ANNOTATEMORE Draft
-
-    RFC 5464 The IMAP METADATA Extension
-
-    draft-ietf-morg-list-specialuse IMAP SPECIALUSE Draft (And non-standard
-    Google XLIST support)
-
-    RFC 5819 IMAP4 Extension for Returning STATUS Information in Extended
-    LIST
-
-    RFC 5957 Display-Based Address Sorting for the IMAP4 SORT Extension
-
-POP
-
-    RFC 1939 Post Office Protocol - Version 3 (POP3)
-
-    RFC 2449 POP3 Extension Mechanism
-
-    RFC 2595 Using TLS with IMAP, POP3 and ACAP
-
-    RFC 5034 The Post Office Protocol (POP3) Simple Authentication and
-    Security Layer (SASL) Authentication Mechanism
-
-    RFC 3206The SYS and AUTH POP Response Codes
-
-NNTP
-
-    RFC 3977 Network News Transfer Protocol (NNTP)
-
-    RFC 4642 Using Transport Layer Security (TLS) with Network News
-    Transfer Protocol (NNTP)
-
-    RFC 4643 Network News Transfer Protocol (NNTP) Extension for
-    Authentication
-
-    RFC 4644 Network News Transfer Protocol (NNTP) Extension for Streaming
-    Feeds
-
-    RFC 2980 Common NNTP Extensions
-
-SASL
-
-    RFC 4422 Simple Authentication and Security Layer (SASL)
-
-    RFC 4505 Anonymous Simple Authentication and Security Layer (SASL)
-    Mechanism
-
-    RFC 4616 The PLAIN Simple Authentication and Security Layer (SASL)
-    Mechanism
-
-    RFC 2195 IMAP/POP AUTHorize Extension for Simple Challenge/Response 
-    being revised by draft-ietf-sasl-crammd5
-
-    RFC 2444 The One-Time-Password SASL Mechanism
-
-    RFC 2831 Using Digest Authentication as a SASL Mechanism
-
-TLS/SSL
-
-    RFC 4346 The Transport Layer Security (TLS) Protocol Version 1.1
-
-    RFC 2246 The TLS Protocol Version 1.0
-
-    draft-freier-ssl-version3 The SSL Protocol Version 3.0
-
-    draft-hickman-netscape-ssl The SSL Protocol Version 2.0
-
-LMTP
-
-    RFC 2033 Local Mail Transfer Protocol 
-
-    RFC 5321 Simple Mail Transfer Protocol
-
-    RFC 1869 SMTP Service Extensions
-
-    RFC 1652 SMTP Service Extension for 8bit-MIMEtransport
-
-    RFC 1870 SMTP Service Extension for Message Size Declaration
-
-    RFC 2034 SMTP Service Extension for Returning Enhanced Error Codes
-
-    RFC 3463 Enhanced Mail System Status Codes
-
-    RFC 3207 SMTP Service Extension for Secure SMTP over TLS
-
-    RFC 4954 SMTP Service Extension for Authentication
-
-    RFC 2920 SMTP Service Extension for Command Pipelining
-
-    RFC 3848 ESMTP and LMTP Transmission Types Registration
-
-    draft-murchison-lmtp-ignorequota LMTP Service Extension for Ignoring
-    Recipient Quotas
-
-Sieve
-
-    RFC 5228 Sieve: A Mail Filtering Language
-
-    RFC 5230 Sieve Email Filtering: Vacation Extension
-
-    RFC 5231 Sieve Email Filtering: Relational Extension
-
-    RFC 5233 Sieve Email Filtering: Subaddress Extension
-
-    RFC 5173 Sieve Email Filtering: Body Extension
-
-    RFC 3894 Sieve Extension: Copying Without Side Effects
-
-    RFC 2298 Extensible Message Format for Message Disposition
-    Notifications (MDNs)
-
-    draft-ietf-sieve-regex Sieve Email FIltering -- Regular Expression
-    Extension
-
-    draft-ietf-sieve-include Sieve Email Filtering: Include Extension
-
-    draft-melnikov-sieve-imapflags Sieve -- IMAP flag Extension
-
-    draft-martin-sieve-notify Sieve -- An extension for providing instant
-    notifications
-
-    draft-ietf-sieve-managesieve A Protocol for Remotely Managing Sieve
-    Scripts
-
-Other
-
-    RFC 5322 Internet Message Format
-
-    RFC 5536 Netnews Article Format
-
-    RFC 5537 Netnews Architecture and Protocols
-
-    RFC 3656 MUPDATE Protocol (For Cyrus Murder)
-

cyrus-imapd-2.4.17.tar.gz/imap/Makefile.dist Deleted

cyrus-imapd-2.4.17.tar.gz/imap/Makefile.in Deleted

@@ -1,374 +0,0 @@
-# Makefile for cyrus imap server and associated programs
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-DEFINES=-DSETPROCTITLE
-
-# \Seen state database. Either 'db' (berkeley db) or 
-# 'local' (legacy flat file).
-SEEN=seen_db.o
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-AWK = @AWK@
-
-CYRUS_USER=@cyrus_user@
-CYRUS_GROUP=@cyrus_group@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-SIEVE_OBJS = @SIEVE_OBJS@
-SIEVE_LIBS = @SIEVE_LIBS@
-IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
-LIB_WRAP = @LIB_WRAP@
-LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-COMPILE_ET=@COMPILE_ET@
-
-#
-# Some notes on purify --
-# you probably want to run the make as the cyrus user as 
-# purify sets the cache directory based on the user. So,
-# if you don't, purify can't find the instrumented libraries
-# and so you don't get any useful information.
-# It may also help to run purify by hand to instrument any of
-# the dynamic libraries that may crop up during run time.
-# 
-PURIFY=/usr/local/bin/purify
-PUREOPT= -best-effort -logfile=/tmp/pure/%v.%p.log -always_use_cache_dir -cachedir=/usr/tmp/$(USER)
-QUANTIFY=/usr/local/bin/quantify
-QUANTOPT=-windows=no -filename-prefix=/tmp/quant/%v.%p -write-summary-file= -logfile=/tmp/quant/%v.%p.log
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
-	global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
-	convert_code.o duplicate.o saslclient.o saslserver.o ../lib/signals.o \
-	annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
-	imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
-	sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
-	statuscache_db.o userdeny_db.o sequence.o upgrade_index.o \
-	dlist.o version.o
-
-IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o
-
-LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
-
-# Your typical objects for the command line utilities
-CLIOBJS=cli_fatal.o mutex_fake.o
-
-SERVICE=../master/service.o
-SERVICETHREAD=../master/service-thread.o
-
-PROGS = imapd lmtpd pop3d \
-	fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
-	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
-	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-	unexpunge cyr_df cyr_sequence cyr_userseen @IMAP_PROGS@
-
-BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
-	lmtpstats.c lmtpstats.h mupdate_err.c mupdate_err.h \
-	nntp_err.c nntp_err.h
-
-all: $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
-
-pure: imapd.pure lmtpd.pure mupdate.pure
-
-
-install:
-	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-	for file in $(PROGS); \
-	do \
-		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-	done
-	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
-	ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
-	ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-### libimap
-
-libimap.a: $(LOBJS)
-	rm -f libimap.a
-	ar cr libimap.a $(LOBJS)
-	$(RANLIB) libimap.a
-
-### Built Source Files
-
-version.o: ../xversion.h
-
-pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
-	$(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
-
-pushstats.h: pushstats.c
-
-lmtpstats.c: lmtpstats.snmp $(srcdir)/../snmp/snmpgen
-	$(srcdir)/../snmp/snmpgen $(srcdir)/lmtpstats.snmp
-
-lmtpstats.h: lmtpstats.c
-
-imap_err.c: imap_err.et
-	$(COMPILE_ET) $(srcdir)/imap_err.et
-
-imap_err.h: imap_err.c
-
-nntp_err.c: nntp_err.et
-	$(COMPILE_ET) $(srcdir)/nntp_err.et
-
-nntp_err.h: nntp_err.c
-
-mupdate_err.c: mupdate_err.et
-	$(COMPILE_ET) $(srcdir)/mupdate_err.et
-
-mupdate_err.h: mupdate_err.c
-
-### Services
-idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o idled \
-	 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-
-lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
-	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o lmtpd \
-	 $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
-	 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
-	 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
-	 $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
-	 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o imapd \
-	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
-	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
-	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
-	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
-	libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o mupdate \
-	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-	 mutex_pthread.o tls.o libimap.a \
-	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-
-mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
-	libimap.a $(DEPLIBS)
-	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
-	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-
-pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
-	$(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
-	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
-	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
-	 smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
-	 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-sync_server: sync_server.o sync_support.o \
-	imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o \
-	sync_server sync_server.o sync_support.o \
-	imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
-	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
-### Command Line Utilities
-arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_userseen: cyr_userseen.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyr_userseen cyr_userseen.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_sequence: cyr_sequence.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyr_sequence cyr_sequence.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
-	mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-
-ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
-	$(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
-	$(DEPLIBS) $(LIBS)
-
-ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS) -lclamav
-
-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	 $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-
-unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
-	libimap.a $(DEPLIBS) $(LIBS)
-
-sync_client: sync_client.o sync_support.o \
-	backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	sync_client sync_client.o sync_support.o \
-	backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-
-sync_reset: sync_reset.o sync_support.o \
-	libimap.a mutex_fake.o $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o \
-	sync_reset sync_reset.o sync_support.o \
-	libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-
-### Other Misc Targets
-
-clean:
-	rm -f *.o *.a Makefile.bak makedepend.log \
-	$(BUILTSOURCES) $(PROGS) $(SUIDPROGS) cyr_virusscan
-
-distclean: clean
-	rm -f Makefile
-
-depend: imap_err.h
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/imap/idled.h Deleted

@@ -1,70 +0,0 @@
-/* idled.h - daemon for handling IMAP IDLE notifications
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: idled.h,v 1.9 2010/01/06 17:01:32 murch Exp $
- */
-
-#ifndef IDLED_H
-#define IDLED_H
-
-#include "mailbox.h"
-
-/* socket to communicate with the idled */
-#define FNAME_IDLE_SOCK "/socket/idle"
-
-typedef struct idle_data_s {
-    unsigned long msg;
-    unsigned long pid;
-
-    /* 1 for null. leave at end of structure for alignment */
-    char mboxnameMAX_MAILBOX_BUFFER;
-} idle_data_t;
-
-#define IDLEDATA_BASE_SIZE	(2 * (int) sizeof(unsigned long))
-
-typedef enum {
-    IDLE_INIT,
-    IDLE_DONE,
-    IDLE_NOTIFY,
-    IDLE_NOOP
-} idle_msg_t;
-
-#endif

cyrus-imapd-2.4.17.tar.gz/imap/lmtpstats.c Deleted

@@ -1,521 +0,0 @@
-
-/* lmtpstats.c -- automatically generated from lmtpstats.snmp by snmpgen */
-
-
-
-#ifdef USING_SNMPGEN
-
-
-
-/* We disable this code for now since it doesn't actually work and wastes
-
- * resources. At some point in time, we'll make it work again as it would 
-
- * be useful to gather aggregate statistics on what commands are being used 
-
- * so we can better tune the server. This change closes bug #1191. 
-
- * New bug 1267 opened to re-enable the feature.
-
- */
-
-
-
-#ifdef HAVE_UNISTD_H
-
-#include <unistd.h>
-
-#endif
-
-#include <stdio.h>
-
-#include <stdlib.h>
-
-#include <errno.h>
-
-#include <string.h>
-
-#include <sys/types.h>
-
-#include <sys/socket.h>
-
-#include <sys/un.h>
-
-#include <fcntl.h>
-
-#include <stdarg.h>
-
-
-
-#include "index.h"
-
-#include "lmtpstats.h"
-
-
-
-extern int close(int);
-
-
-
-int variable_value2+1;
-
-int variable_tmpvalue2+1;
-
-
-
-int varvalue(lmtpstats_variable_t var)
-
-{
-
- if (variable_tmpvaluevar!=-1)
-
- return variable_tmpvaluevar;
-
-
-
- return variable_valuevar;
-
-}
-
-
-
-const char *snmp_getdescription(lmtpstats_t evt)
-
-{
-
- switch (evt) {
-
- case mtaSuccessfulConvertedMessages: return "Messages converted because of 8bit foo";
- case AUTHENTICATION_YES: return "Successful authentication of given mechanism";
- case SIEVE_FILEINTO: return "sieve fileintos";
- case mtaReceivedVolume: return "Kbytes received";
- case SIEVE_VACATION_TOTAL: return "vacation messages considered";
- case SIEVE_MESSAGES_PROCESSED: return "Number of messages processed by Sieve scripts";
- case SIEVE_KEEP: return "sieve messages kept";
- case SIEVE_DISCARD: return "sieve discards";
- case SERVER_NAME_VERSION: return "Name and version string for server";
- case AUTHENTICATION_NO: return "Failed authentication of given mechanism";
- case SIEVE_VACATION_REPLIED: return "vacation messages sent";
- case SIEVE_REJECT: return "sieve rejects";
- case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
- case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
- case SERVER_UPTIME: return "Amount of time server has been running";
- case mtaTransmittedMessages: return "Messages stored to disk";
- case SIEVE_REDIRECT: return "sieve redirects";
- case mtaTransmittedVolume: return "Kbytes stored to disk";
- case SIEVE_NOTIFY: return "sieve notifications sent";
- case mtaReceivedMessages: return "Messages we've received";
- case mtaReceivedRecipients: return "Recipients accepted";
-
- }
-
- return NULL;
-
-}
-
-
-
-const char *snmp_getoid(const char *name __attribute__((unused)),
-
-			lmtpstats_t evt, char *buf, int buflen)
-
-{
-
- switch (evt) {
-
- case mtaSuccessfulConvertedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.10",varvalue(VARIABLE_MTA)); return buf;
- case AUTHENTICATION_YES: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.0",varvalue(VARIABLE_AUTH)); return buf;
- case SIEVE_FILEINTO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.4"); return buf;
- case mtaReceivedVolume: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.4",varvalue(VARIABLE_MTA)); return buf;
- case SIEVE_VACATION_TOTAL: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.8"); return buf;
- case SIEVE_MESSAGES_PROCESSED: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.0"); return buf;
- case SIEVE_KEEP: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.5"); return buf;
- case SIEVE_DISCARD: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.2"); return buf;
- case SERVER_NAME_VERSION: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.0"); return buf;
- case AUTHENTICATION_NO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.1",varvalue(VARIABLE_AUTH)); return buf;
- case SIEVE_VACATION_REPLIED: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.7"); return buf;
- case SIEVE_REJECT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.3"); return buf;
- case TOTAL_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.1"); return buf;
- case ACTIVE_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.2"); return buf;
- case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.1"); return buf;
- case mtaTransmittedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.3",varvalue(VARIABLE_MTA)); return buf;
- case SIEVE_REDIRECT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.1"); return buf;
- case mtaTransmittedVolume: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.6",varvalue(VARIABLE_MTA)); return buf;
- case SIEVE_NOTIFY: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.6"); return buf;
- case mtaReceivedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.1",varvalue(VARIABLE_MTA)); return buf;
- case mtaReceivedRecipients: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.7",varvalue(VARIABLE_MTA)); return buf;
-
- }
-
- return NULL;
-
-}
-
-
-
-#define SOCK_PATH "/tmp/.snmp_door"
-
-
-
-static int mysock = -1;
-
-static struct sockaddr_un remote;
-
-static int sockaddr_len = 0;
-
-
-
-static void snmp_send(char *str)
-
-{
-
- if (mysock == -1) return;
-
-
-
- if (sendto(mysock, str, strlen(str), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return;
-
- }
-
-
-
- return;
-
-}
-
-
-
-int snmp_connect(void)
-
-{
-
- int s;
-
- int fdflags;
-
- int lup;
-
-
-
- if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-
-	return 1;
-
- }
-
-
-
- for (lup=0;lup < 2+1; lup++)
-
- variable_tmpvaluelup = -1;
-
-
-
- remote.sun_family = AF_UNIX;
-
- strlcpy(remote.sun_path, SOCK_PATH, sizeof(remote.sun_path));
-
- sockaddr_len = strlen(remote.sun_path) + sizeof(remote.sun_family);
-
-
-
- /* put us in non-blocking mode */
-
- fdflags = fcntl(s, F_GETFD, 0);
-
- if (fdflags != -1) fdflags = fcntl(s, F_SETFL, O_NONBLOCK | fdflags);
-
- if (fdflags == -1) { close(s); return -1; }
-
-
-
- mysock = s;
-
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.2.1\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.2.2\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.2.3\n");
- snmp_send("R 1.3.6.1.2.1.28.1\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.3.4\n");
-
- return 0;
-
-}
-
-
-
-int snmp_close(void)
-
-{
-
- if (mysock > -1)
-
-	close(mysock);
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_increment_args(lmtpstats_t cmd, int incr, ...)
-
-{
-
- char tosend256; /* xxx UDP max size??? */
-
- char buf256;
-
-
-
- va_list ap; /* varargs thing */
-
- lmtpstats_variable_t vval;
-
- int ival;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- va_start(ap, incr);
-
-
-
- do {
-
- vval = va_arg(ap, lmtpstats_variable_t); /* get the next arg */
-
-
-
- if (vval!=VARIABLE_LISTEND)
-
- {
-
- ival = va_arg(ap, int); /* get the next arg */
-
- variable_tmpvaluevval = ival; 
-
- }
-
-
-
- } while ( vval != VARIABLE_LISTEND);
-
-
-
- va_end(ap);
-
-
-
- snprintf(tosend, sizeof(tosend),"C %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), incr);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- /* set tmp variables back */
-
- va_start(ap, incr);
-
-
-
- do {
-
- vval = va_arg(ap, lmtpstats_variable_t); /* get the next arg */
-
-
-
- if (vval!=VARIABLE_LISTEND)
-
- {
-
- ival = va_arg(ap, int); /* get the next arg */
-
- variable_tmpvaluevval = -1; 
-
- }
-
-
-
- } while ( vval != VARIABLE_LISTEND);
-
-
-
- va_end(ap);
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_increment(lmtpstats_t cmd, int incr)
-
-{
-
- char tosend256; /* xxx UDP max size??? */
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"C %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), incr);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_set(lmtpstats_t cmd, int value)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"I %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), value);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-int snmp_set_str(lmtpstats_t cmd, char *value)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"S %s %s\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), value);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-int snmp_set_time(lmtpstats_t cmd, time_t t)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"T %s %lu\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), t);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-/* should use SNMPDEFINE's as parameter */
-
-int snmp_set_oid(lmtpstats_t cmd, char *str)
-
-{
-
- return snmp_set_str(cmd,str);
-
-}
-
-
-
-void snmp_setvariable(lmtpstats_variable_t name, int value)
-
-{
-
- variable_valuename = value;
-
-}
-
-
-
-#endif
-
-
-
-
-

cyrus-imapd-2.4.17.tar.gz/imap/lmtpstats.h Deleted

@@ -1,160 +0,0 @@
-
-/* lmtpstats.h -- statistics push interface
-
- * generated automatically from lmtpstats.snmp by snmpgen
-
- *
-
- * Copyright 2000 Carnegie Mellon University
-
- *
-
- * No warranty, yadda yadda
-
- */                                       
-
-                                          
-
-#ifndef lmtpstats_H    
-
-#define lmtpstats_H
-
-
-
-#define SNMPDEFINE_mib2 "1.3.6.1.2.1"
-#define SNMPDEFINE_cmulmtp "1.3.6.1.4.1.3.2.2.3.2"
-#define SNMPDEFINE_mtamib "1.3.6.1.2.1.28"
-#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
-#define SNMPDEFINE_cmusieve "1.3.6.1.4.1.3.2.2.3.3"
-#define SNMPDEFINE_mgmt "1.3.6.1.2"
-
-
-
-#ifndef USING_SNMPGEN
-
-
-
-#define snmp_connect()
-
-#define snmp_close()
-
-#define snmp_increment(a, b)
-
-#define snmp_increment_args(a, b, c, d, e)
-
-#define snmp_set(a, b)
-
-#define snmp_set_str(a, b)
-
-#define snmp_set_oid(a, b)
-
-#define snmp_set_time(a, b)
-
-#define snmp_getdescription(a)
-
-#define snmp_getoid(a, b, c, d)
-
-#define snmp_setvariable(a, b)
-
-
-
-typedef void lmtpstats_t;
-
-
-
-#else
-
-
-
-typedef enum {
-
-    mtaSuccessfulConvertedMessages,
-    AUTHENTICATION_YES,
-    SIEVE_FILEINTO,
-    mtaReceivedVolume,
-    SIEVE_VACATION_TOTAL,
-    SIEVE_MESSAGES_PROCESSED,
-    SIEVE_KEEP,
-    SIEVE_DISCARD,
-    SERVER_NAME_VERSION,
-    AUTHENTICATION_NO,
-    SIEVE_VACATION_REPLIED,
-    SIEVE_REJECT,
-    TOTAL_CONNECTIONS,
-    ACTIVE_CONNECTIONS,
-    SERVER_UPTIME,
-    mtaTransmittedMessages,
-    SIEVE_REDIRECT,
-    mtaTransmittedVolume,
-    SIEVE_NOTIFY,
-    mtaReceivedMessages,
-    mtaReceivedRecipients
-} lmtpstats_t;
-
-
-
-typedef enum {
-
-    VARIABLE_LISTEND,
-    VARIABLE_AUTH,
-    VARIABLE_MTA
-
-
-} lmtpstats_variable_t;
-
-
-
-int snmp_connect(void);
-
-
-
-int snmp_close(void);          
-
-                                    
-
-/* only valid on counters */
-
-int snmp_increment(lmtpstats_t cmd, int);
-
-int snmp_increment_args(lmtpstats_t cmd, int incr, ...);
-
-
-
-/* only valid on values */
-
-int snmp_set(lmtpstats_t cmd, int);
-
-
-
-int snmp_set_str(lmtpstats_t cmd, char *value);
-
-
-
-int snmp_set_oid(lmtpstats_t cmd, char *str);
-
-
-
-int snmp_set_time(lmtpstats_t cmd, time_t t);
-
-                                    
-
-const char *snmp_getdescription(lmtpstats_t cmd); 
-
- 
-
-const char *snmp_getoid(const char *name, lmtpstats_t cmd, char* buf, int buflen); 
-
-
-
-void snmp_setvariable(lmtpstats_variable_t, int);
-
-
-
-#endif /* USING_SNMPGEN */
-
- 
-
-#endif /* lmtpstats_H */ 
-
-
-

cyrus-imapd-2.4.17.tar.gz/imap/pushstats.c Deleted

@@ -1,582 +0,0 @@
-
-/* pushstats.c -- automatically generated from pushstats.snmp by snmpgen */
-
-
-
-#ifdef USING_SNMPGEN
-
-
-
-/* We disable this code for now since it doesn't actually work and wastes
-
- * resources. At some point in time, we'll make it work again as it would 
-
- * be useful to gather aggregate statistics on what commands are being used 
-
- * so we can better tune the server. This change closes bug #1191. 
-
- * New bug 1267 opened to re-enable the feature.
-
- */
-
-
-
-#ifdef HAVE_UNISTD_H
-
-#include <unistd.h>
-
-#endif
-
-#include <stdio.h>
-
-#include <stdlib.h>
-
-#include <errno.h>
-
-#include <string.h>
-
-#include <sys/types.h>
-
-#include <sys/socket.h>
-
-#include <sys/un.h>
-
-#include <fcntl.h>
-
-#include <stdarg.h>
-
-
-
-#include "index.h"
-
-#include "pushstats.h"
-
-
-
-extern int close(int);
-
-
-
-int variable_value1+1;
-
-int variable_tmpvalue1+1;
-
-
-
-int varvalue(pushstats_variable_t var)
-
-{
-
- if (variable_tmpvaluevar!=-1)
-
- return variable_tmpvaluevar;
-
-
-
- return variable_valuevar;
-
-}
-
-
-
-const char *snmp_getdescription(pushstats_t evt)
-
-{
-
- switch (evt) {
-
- case MYRIGHTS_COUNT: return "Number of myrights";
- case BBOARD_COUNT: return "Number of bboard";
- case SCAN_COUNT: return "Number of list";
- case LSUB_COUNT: return "Number of lsub";
- case AUTHENTICATION_YES: return "Successful authentication of given mechanism";
- case GETQUOTAROOT_COUNT: return "Number of getquotaroot";
- case STATUS_COUNT: return "Number of status";
- case FETCH_COUNT: return "Number of fetch";
- case STARTTLS_COUNT: return "Number of starttls";
- case LOGIN_COUNT: return "Number of login";
- case UNSUBSCRIBE_COUNT: return "Number of unsubscribe";
- case GETANNOTATION_COUNT: return "Number of getannotation";
- case SERVER_NAME_VERSION: return "Name and version string for server";
- case LISTRIGHTS_COUNT: return "Number of listrights";
- case AUTHENTICATION_NO: return "Failed authentication of given mechanism";
- case SORT_COUNT: return "Number of sort";
- case EXAMINE_COUNT: return "Number of examine";
- case EXPUNGE_COUNT: return "Number of expunge";
- case SERVER_UPTIME: return "Amount of time server has been running";
- case CHECK_COUNT: return "Number of check";
- case CAPABILITY_COUNT: return "Number of capability";
- case RENAME_COUNT: return "Number of rename";
- case LIST_COUNT: return "Number of list";
- case ID_COUNT: return "Number of id";
- case GETQUOTA_COUNT: return "Number of getquota";
- case IDLE_COUNT: return "Number of idle";
- case COMPRESS_COUNT: return "Number of compress";
- case DELETE_COUNT: return "Number of delete";
- case SETANNOTATION_COUNT: return "Number of setannotation";
- case GETACL_COUNT: return "Number of getacl";
- case SELECT_COUNT: return "Number of select";
- case UNSELECT_COUNT: return "Number of unselect";
- case SETACL_COUNT: return "Number of setacl";
- case CLOSE_COUNT: return "Number of close";
- case NOOP_COUNT: return "Number of noop";
- case GETUIDS_COUNT: return "Number of getuids";
- case SEARCH_COUNT: return "Number of search";
- case NAMESPACE_COUNT: return "Number of namespace";
- case THREAD_COUNT: return "Number of thread";
- case SETQUOTA_COUNT: return "Number of setquota";
- case LOGOUT_COUNT: return "Number of logout";
- case CREATE_COUNT: return "Number of create";
- case SUBSCRIBE_COUNT: return "Number of subscribe";
- case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
- case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
- case DELETEACL_COUNT: return "Number of deleteacl";
- case STORE_COUNT: return "Number of store";
- case FIND_COUNT: return "Number of find";
- case AUTHENTICATE_COUNT: return "Number of authenticate";
- case PARTIAL_COUNT: return "Number of partial";
- case APPEND_COUNT: return "Number of append";
- case COPY_COUNT: return "Number of copy";
-
- }
-
- return NULL;
-
-}
-
-
-
-const char *snmp_getoid(const char *name __attribute__((unused)),
-
-			pushstats_t evt, char *buf, int buflen)
-
-{
-
- switch (evt) {
-
- case MYRIGHTS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.27"); return buf;
- case BBOARD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.2"); return buf;
- case SCAN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.32"); return buf;
- case LSUB_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.25"); return buf;
- case AUTHENTICATION_YES: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.0",varvalue(VARIABLE_AUTH)); return buf;
- case GETQUOTAROOT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.18"); return buf;
- case STATUS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.41"); return buf;
- case FETCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.13"); return buf;
- case STARTTLS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.33"); return buf;
- case LOGIN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.22"); return buf;
- case UNSUBSCRIBE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.44"); return buf;
- case GETANNOTATION_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.16"); return buf;
- case SERVER_NAME_VERSION: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.0"); return buf;
- case LISTRIGHTS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.26"); return buf;
- case AUTHENTICATION_NO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.1",varvalue(VARIABLE_AUTH)); return buf;
- case SORT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.42"); return buf;
- case EXAMINE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.12"); return buf;
- case EXPUNGE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.11"); return buf;
- case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.1"); return buf;
- case CHECK_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.4"); return buf;
- case CAPABILITY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.3"); return buf;
- case RENAME_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.31"); return buf;
- case LIST_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.24"); return buf;
- case ID_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.20"); return buf;
- case GETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.17"); return buf;
- case IDLE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.21"); return buf;
- case COMPRESS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.8"); return buf;
- case DELETE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.9"); return buf;
- case SETANNOTATION_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.39"); return buf;
- case GETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.15"); return buf;
- case SELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.35"); return buf;
- case UNSELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.45"); return buf;
- case SETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.38"); return buf;
- case CLOSE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.7"); return buf;
- case NOOP_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.28"); return buf;
- case GETUIDS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.19"); return buf;
- case SEARCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.36"); return buf;
- case NAMESPACE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.29"); return buf;
- case THREAD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.43"); return buf;
- case SETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.40"); return buf;
- case LOGOUT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.23"); return buf;
- case CREATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.6"); return buf;
- case SUBSCRIBE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.37"); return buf;
- case TOTAL_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.1"); return buf;
- case ACTIVE_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.2"); return buf;
- case DELETEACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.10"); return buf;
- case STORE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.34"); return buf;
- case FIND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.14"); return buf;
- case AUTHENTICATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.0"); return buf;
- case PARTIAL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.30"); return buf;
- case APPEND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.1"); return buf;
- case COPY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.5"); return buf;
-
- }
-
- return NULL;
-
-}
-
-
-
-#define SOCK_PATH "/tmp/.snmp_door"
-
-
-
-static int mysock = -1;
-
-static struct sockaddr_un remote;
-
-static int sockaddr_len = 0;
-
-
-
-static void snmp_send(char *str)
-
-{
-
- if (mysock == -1) return;
-
-
-
- if (sendto(mysock, str, strlen(str), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return;
-
- }
-
-
-
- return;
-
-}
-
-
-
-int snmp_connect(void)
-
-{
-
- int s;
-
- int fdflags;
-
- int lup;
-
-
-
- if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-
-	return 1;
-
- }
-
-
-
- for (lup=0;lup < 1+1; lup++)
-
- variable_tmpvaluelup = -1;
-
-
-
- remote.sun_family = AF_UNIX;
-
- strlcpy(remote.sun_path, SOCK_PATH, sizeof(remote.sun_path));
-
- sockaddr_len = strlen(remote.sun_path) + sizeof(remote.sun_family);
-
-
-
- /* put us in non-blocking mode */
-
- fdflags = fcntl(s, F_GETFD, 0);
-
- if (fdflags != -1) fdflags = fcntl(s, F_SETFL, O_NONBLOCK | fdflags);
-
- if (fdflags == -1) { close(s); return -1; }
-
-
-
- mysock = s;
-
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.1.1\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.1.2\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.1.3\n");
- snmp_send("R 1.3.6.1.4.1.3.2.2.3.1.4\n");
-
- return 0;
-
-}
-
-
-
-int snmp_close(void)
-
-{
-
- if (mysock > -1)
-
-	close(mysock);
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_increment_args(pushstats_t cmd, int incr, ...)
-
-{
-
- char tosend256; /* xxx UDP max size??? */
-
- char buf256;
-
-
-
- va_list ap; /* varargs thing */
-
- pushstats_variable_t vval;
-
- int ival;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- va_start(ap, incr);
-
-
-
- do {
-
- vval = va_arg(ap, pushstats_variable_t); /* get the next arg */
-
-
-
- if (vval!=VARIABLE_LISTEND)
-
- {
-
- ival = va_arg(ap, int); /* get the next arg */
-
- variable_tmpvaluevval = ival; 
-
- }
-
-
-
- } while ( vval != VARIABLE_LISTEND);
-
-
-
- va_end(ap);
-
-
-
- snprintf(tosend, sizeof(tosend),"C %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), incr);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- /* set tmp variables back */
-
- va_start(ap, incr);
-
-
-
- do {
-
- vval = va_arg(ap, pushstats_variable_t); /* get the next arg */
-
-
-
- if (vval!=VARIABLE_LISTEND)
-
- {
-
- ival = va_arg(ap, int); /* get the next arg */
-
- variable_tmpvaluevval = -1; 
-
- }
-
-
-
- } while ( vval != VARIABLE_LISTEND);
-
-
-
- va_end(ap);
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_increment(pushstats_t cmd, int incr)
-
-{
-
- char tosend256; /* xxx UDP max size??? */
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"C %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), incr);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 0;
-
-}
-
-
-
-int snmp_set(pushstats_t cmd, int value)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"I %s %d\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), value);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-int snmp_set_str(pushstats_t cmd, char *value)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"S %s %s\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), value);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-int snmp_set_time(pushstats_t cmd, time_t t)
-
-{
-
- char tosend256;
-
- char buf256;
-
-
-
- if (mysock == -1) return 1;
-
-
-
- snprintf(tosend, sizeof(tosend),"T %s %lu\n",snmp_getoid(NULL,cmd,buf,sizeof(buf)), t);
-
-
-
- if (sendto(mysock, tosend, strlen(tosend), 0, (struct sockaddr *) &remote, sockaddr_len) == -1) {
-
-	return 1;
-
- }
-
-
-
- return 1;
-
-}
-
-
-
-/* should use SNMPDEFINE's as parameter */
-
-int snmp_set_oid(pushstats_t cmd, char *str)
-
-{
-
- return snmp_set_str(cmd,str);
-
-}
-
-
-
-void snmp_setvariable(pushstats_variable_t name, int value)
-
-{
-
- variable_valuename = value;
-
-}
-
-
-
-#endif
-
-
-
-
-

cyrus-imapd-2.4.17.tar.gz/imap/pushstats.h Deleted

@@ -1,186 +0,0 @@
-
-/* pushstats.h -- statistics push interface
-
- * generated automatically from pushstats.snmp by snmpgen
-
- *
-
- * Copyright 2000 Carnegie Mellon University
-
- *
-
- * No warranty, yadda yadda
-
- */                                       
-
-                                          
-
-#ifndef pushstats_H    
-
-#define pushstats_H
-
-
-
-#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
-#define SNMPDEFINE_cmuimap "1.3.6.1.4.1.3.2.2.3.1"
-
-
-
-#ifndef USING_SNMPGEN
-
-
-
-#define snmp_connect()
-
-#define snmp_close()
-
-#define snmp_increment(a, b)
-
-#define snmp_increment_args(a, b, c, d, e)
-
-#define snmp_set(a, b)
-
-#define snmp_set_str(a, b)
-
-#define snmp_set_oid(a, b)
-
-#define snmp_set_time(a, b)
-
-#define snmp_getdescription(a)
-
-#define snmp_getoid(a, b, c, d)
-
-#define snmp_setvariable(a, b)
-
-
-
-typedef void pushstats_t;
-
-
-
-#else
-
-
-
-typedef enum {
-
-    MYRIGHTS_COUNT,
-    BBOARD_COUNT,
-    SCAN_COUNT,
-    LSUB_COUNT,
-    AUTHENTICATION_YES,
-    GETQUOTAROOT_COUNT,
-    STATUS_COUNT,
-    FETCH_COUNT,
-    STARTTLS_COUNT,
-    LOGIN_COUNT,
-    UNSUBSCRIBE_COUNT,
-    GETANNOTATION_COUNT,
-    SERVER_NAME_VERSION,
-    LISTRIGHTS_COUNT,
-    AUTHENTICATION_NO,
-    SORT_COUNT,
-    EXAMINE_COUNT,
-    EXPUNGE_COUNT,
-    SERVER_UPTIME,
-    CHECK_COUNT,
-    CAPABILITY_COUNT,
-    RENAME_COUNT,
-    LIST_COUNT,
-    ID_COUNT,
-    GETQUOTA_COUNT,
-    IDLE_COUNT,
-    COMPRESS_COUNT,
-    DELETE_COUNT,
-    SETANNOTATION_COUNT,
-    GETACL_COUNT,
-    SELECT_COUNT,
-    UNSELECT_COUNT,
-    SETACL_COUNT,
-    CLOSE_COUNT,
-    NOOP_COUNT,
-    GETUIDS_COUNT,
-    SEARCH_COUNT,
-    NAMESPACE_COUNT,
-    THREAD_COUNT,
-    SETQUOTA_COUNT,
-    LOGOUT_COUNT,
-    CREATE_COUNT,
-    SUBSCRIBE_COUNT,
-    TOTAL_CONNECTIONS,
-    ACTIVE_CONNECTIONS,
-    DELETEACL_COUNT,
-    STORE_COUNT,
-    FIND_COUNT,
-    AUTHENTICATE_COUNT,
-    PARTIAL_COUNT,
-    APPEND_COUNT,
-    COPY_COUNT
-} pushstats_t;
-
-
-
-typedef enum {
-
-    VARIABLE_LISTEND,
-    VARIABLE_AUTH
-
-
-} pushstats_variable_t;
-
-
-
-int snmp_connect(void);
-
-
-
-int snmp_close(void);          
-
-                                    
-
-/* only valid on counters */
-
-int snmp_increment(pushstats_t cmd, int);
-
-int snmp_increment_args(pushstats_t cmd, int incr, ...);
-
-
-
-/* only valid on values */
-
-int snmp_set(pushstats_t cmd, int);
-
-
-
-int snmp_set_str(pushstats_t cmd, char *value);
-
-
-
-int snmp_set_oid(pushstats_t cmd, char *str);
-
-
-
-int snmp_set_time(pushstats_t cmd, time_t t);
-
-                                    
-
-const char *snmp_getdescription(pushstats_t cmd); 
-
- 
-
-const char *snmp_getoid(const char *name, pushstats_t cmd, char* buf, int buflen); 
-
-
-
-void snmp_setvariable(pushstats_variable_t, int);
-
-
-
-#endif /* USING_SNMPGEN */
-
- 
-
-#endif /* pushstats_H */ 
-
-
-

cyrus-imapd-2.4.17.tar.gz/imap/signals.c Deleted

@@ -1,115 +0,0 @@
-/* signals.c -- signal handling functions to allow clean shutdown
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: signals.c,v 1.17 2010/01/06 17:01:40 murch Exp $
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <signal.h>
-#include <syslog.h>
-
-#include "signals.h"
-#include "xmalloc.h"
-#include "exitcodes.h"
-
-static volatile sig_atomic_t gotsignal = 0;
-
-static void sighandler(int sig)
-{
- /* syslog(LOG_DEBUG, "got signal %d", sig); */
- gotsignal = sig;
-}
-
-static const int catch = { SIGHUP, SIGINT, SIGQUIT, 0 };
-
-void signals_add_handlers(int alarm)
-{
- struct sigaction action;
- int i;
- 
- sigemptyset(&action.sa_mask);
-
- action.sa_flags = 0;
-#ifdef SA_RESETHAND
- action.sa_flags |= SA_RESETHAND;
-#endif
-
- action.sa_handler = sighandler;
-
- /* SIGALRM used as a syscall timeout, so we don't set SA_RESTART */
- if (alarm && sigaction(SIGALRM, &action, NULL) < 0) {
-	fatal("unable to install signal handler for %d: %m", SIGALRM);
- }
-
-#ifdef SA_RESTART
- action.sa_flags |= SA_RESTART;
-#endif
- 
- for (i = 0; catchi != 0; i++) {
-	if (catchi != SIGALRM && sigaction(catchi, &action, NULL) < 0) {
-	 fatal("unable to install signal handler for %d: %m", catchi);
-	}
- }
-}
-
-static shutdownfn *shutdown_cb = NULL;
-
-void signals_set_shutdown(shutdownfn *s)
-{
- shutdown_cb = s;
-}
-
-int signals_poll(void)
-{
- switch (gotsignal) {
- case SIGINT:
- case SIGQUIT:
-	if (shutdown_cb) shutdown_cb(EC_TEMPFAIL);
-	else exit(EC_TEMPFAIL);
-	break;
- default:
-	return gotsignal;
-	break;
- }
- return 0; /* compiler warning stupidity */
-}

cyrus-imapd-2.4.17.tar.gz/imap/signals.h Deleted

@@ -1,54 +0,0 @@
-/* signals.h -- signal handling functions to allow clean shutdown
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: signals.h,v 1.4 2010/01/06 17:01:40 murch Exp $
- */
-
-#ifndef INCLUDED_SIGNALS_H
-#define INCLUDED_SIGNALS_H
-
-typedef void shutdownfn(int);
-
-void signals_add_handlers(int alarm);
-void signals_set_shutdown(shutdownfn *s);
-int signals_poll(void);
-
-#endif /* INCLUDED_SIGNALS_H */

cyrus-imapd-2.4.17.tar.gz/imtest/Makefile.in Deleted

@@ -1,103 +0,0 @@
-# Makefile for imtest
-# 
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.33 2010/01/06 17:01:43 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-LIBS = @LIBS@ 
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-PURIFY=/usr/local/bin/purify
-PUREOPT= -best-effort -windows=no -logfile=/tmp/pure/%v.%p.log -always_use_cache_dir
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-all: imtest
-
-install:
-	$(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/smtptest
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/mupdatetest
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
-	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-imtest: imtest.o $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
-
-imtest.pure: imtest.o $(DEPLIBS)
-	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
-
-clean:
-	rm -f *.o Makefile.bak makedepend.log imtest
-
-distclean: clean
-	rm -f Makefile
-
-depend: 
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1> makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/install-sh Deleted

@@ -1,238 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while  x"$1" != x ; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if  x"$src" = x 
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if  x"$src" = x 
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if  x"$dir_arg" != x ; then
-	dst=$src
-	src=""
-	
-	if  -d $dst ; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if  -f $src -o -d $src 
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if  x"$dst" = x 
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if  -d $dst 
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,^/*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if  ! -d "$dstdir" ; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while  $# -ne 0  ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if  ! -d "${pathcomp}"  ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if  x"$dir_arg" != x 
-then
-	$doit $instcmd $dst &&
-
-	if  x"$chowncmd" != x ; then $doit $chowncmd $dst; else true ; fi &&
-	if  x"$chgrpcmd" != x ; then $doit $chgrpcmd $dst; else true ; fi &&
-	if  x"$stripcmd" != x ; then $doit $stripcmd $dst; else true ; fi &&
-	if  x"$chmodcmd" != x ; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if  x"$transformarg" = x  
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if  x"$dstfile" = x  
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if  x"$chowncmd" != x ; then $doit $chowncmd $dsttmp; else true;fi &&
-	if  x"$chgrpcmd" != x ; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if  x"$stripcmd" != x ; then $doit $stripcmd $dsttmp; else true;fi &&
-	if  x"$chmodcmd" != x ; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

cyrus-imapd-2.4.17.tar.gz/installsieve Deleted

cyrus-imapd-2.4.17.tar.gz/installsieve/Makefile.in Deleted

@@ -1,97 +0,0 @@
-# Makefile.in - installsieve makefile
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.15 2010/01/06 17:01:43 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-INSTALL = @INSTALL@
-
-MAKEDEPEND = @MAKEDEPEND@
-
-IMAP_LIBS = @IMAP_LIBS@
-LIBS = 
-DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-all: installsieve
-
-install:
-	$(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
-
-OBJS=lex.o mystring.o request.o isieve.o
-
-libinstallsieve.a: $(OBJS)
-	rm -f libinstallsieve.a
-	ar cr libinstallsieve.a $(OBJS)
-	$(RANLIB) libinstallsieve.a
-
-installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
-
-clean:
-	rm -f *.o *.a Makefile.bak makedepend.log
-
-distclean: clean
-	rm -f Makefile installsieve
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
-	$<
-
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/installsieve/codes.h Deleted

@@ -1,59 +0,0 @@
-/* 
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: codes.h,v 1.6 2010/01/06 17:01:43 murch Exp $
- */
-
-#ifndef _CODES_H_
-#define _CODES_H_
-
-
-
-#define SIEVE_OK 0
-#define SIEVE_FAIL -1
-
-#define SIEVE_BADPORT -5
-#define SIEVE_NOEXIST -6
-
-
-#define TRUE 1
-#define FALSE 0
-
-#endif

cyrus-imapd-2.4.17.tar.gz/installsieve/exitcodes.h Deleted

@@ -1,88 +0,0 @@
-/* exitcodes.h -- wrapper around sysextis.h
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: exitcodes.h,v 1.6 2010/01/06 17:01:43 murch Exp $
- */
-
-/* Sendmail has some weird ideas on what constitutes permenant failure. On
- more than one occasion, we have gotten burned by this moving users around
- through various inadvisable means, screwing up the mailboxes file,
- whatever.
- 
- We don't want to fail out permenantly on things like EX_USAGE, EX_SOFTWARE, 
- etc., because that generally means someone was just screwing with the mail
- store and we don't want to lose mail.
-
- Instead, we map these EC_* codes to EX_* codes, thereby lying to Sendmail,
- since we don't derive any benefit from Sendmail knowing what the error was.
- We just want it to retry all the time anyway. This way, should sendmail's
- behavior be different and we start deriving benefit from Sendmail knowing
- stuff, we can easily change it back.
-
- So other code uses the EC_* error, then we maybe change it to TEMPFAIL if
- we don't agree on whether the error should be permenant or not.
- 
- Comments below stolen from sysexits.h. */
-
-#ifndef INCLUDED_EXITCODES_H
-#define INCLUDED_EXITCODES_H
-
-#include <sysexits.h>
-
-#define EC_OK 0		/* successful termination */
-
-#define EC_USAGE EX_TEMPFAIL	/* command line usage error */
-#define EC_DATAERR EX_DATAERR	/* data format error */
-#define EC_NOINPUT EX_TEMPFAIL	/* cannot open input */
-#define EC_NOUSER EX_NOUSER	/* addressee unknown */
-#define EC_NOHOST EX_TEMPFAIL	/* host name unknown */
-#define EC_UNAVAILABLE EX_TEMPFAIL	/* service unavailable */
-#define EC_SOFTWARE EX_TEMPFAIL	/* internal software error */
-#define EC_OSERR EX_TEMPFAIL	/* system error (e.g., can't fork) */
-#define EC_OSFILE EX_TEMPFAIL	/* critical OS file missing */
-#define EC_CANTCREAT EX_TEMPFAIL	/* can't create (user) output file */
-#define EC_IOERR EX_TEMPFAIL	/* input/output error */
-#define EC_TEMPFAIL EX_TEMPFAIL	/* user is invited to retry */
-#define EC_PROTOCOL EX_TEMPFAIL	/* remote error in protocol */
-#define EC_NOPERM EX_TEMPFAIL	/* permission denied */
-#define EC_CONFIG EX_TEMPFAIL	/* configuration error */
-
-#endif /* INCLUDED_EXITCODES_H */

cyrus-imapd-2.4.17.tar.gz/installsieve/installscript.c Deleted

@@ -1,713 +0,0 @@
-/* installscrip.c -- command line program to install sieve scripts
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: installscript.c,v 1.31 2010/01/06 17:01:43 murch Exp $
- */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <unistd.h>
-
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include <sasl/sasl.h>
-#include <sasl/saslutil.h>
-
-#include <pwd.h>
-
-#include "prot.h"
-#include "lex.h"
-#include "request.h"
-#include "util.h"
-
-#define IMTEST_OK 0
-#define IMTEST_FAIL -1
-
-typedef enum {
- STAT_CONT = 0,
- STAT_NO = 1,
- STAT_OK = 2
-} imt_stat;
-
-char *authname=NULL;
-char *username=NULL;
-char *realm=NULL;
-char *password=NULL;
-
-/* global vars */
-sasl_conn_t *conn;
-int sock; /* socket descriptor */
-
-struct protstream *pout, *pin;
-
-static int version;
-
-void imtest_fatal(char *msg)
-{
- if (msg!=NULL)
- printf("failure: %s\n",msg);
- exit(1);
-}
-
-static int
-getsecret(sasl_conn_t *conn,
-	 void *context __attribute__((unused)),
-	 int id,
-	 sasl_secret_t **psecret)
-{
- char *password;
- size_t len;
-
- if (! conn || ! psecret || id != SASL_CB_PASS)
- return SASL_BADPARAM;
-
- printf("xxx todo\n");
- return -1;
-
- /* printf("Password: ", prompt);
- *tresult=strdup(cyrus_getpass(""));
- *tlen=strlen(*tresult);
- if (! password)
- return SASL_FAIL; */
-
- len = strlen(password);
-
- *psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len);
- 
- if (! *psecret) {
- memset(password, 0, len);
- return SASL_NOMEM;
- }
-
- (*psecret)->len = len;
- strcpy((*psecret)->data, password);
- memset(password, 0, len);
- 
- return SASL_OK;
-}
-
-static int
-simple(void *context,
- int id,
- const char **result,
- unsigned *len)
-{
- const char *value = (const char *)context;
- int l;
-
- /* xxx */
- printf("asking for %d\n",id);
-
- if (! result)
- return SASL_BADPARAM;
-
- switch (id) {
- case SASL_CB_USER:
- printf("Username: ");
- *result = xmalloc(1025);
- fgets(*result, 1024, stdin);
- l = strlen(*result);
- (*result)l - 1 = '\0';
- if (len)
-	 *len = strlen(*result);
- break;
- case SASL_CB_AUTHNAME:
- *result = value;
- if (len)
- *len = value ? strlen(value) : 0;
- break;
- case SASL_CB_LANGUAGE:
- *result = NULL;
- if (len)
- *len = 0;
- break;
- default:
- return SASL_BADPARAM;
- }
- return SASL_OK;
-}
-
-void interaction (int id, const char *prompt,
-		 char **tresult, unsigned int *tlen)
-{
- char result1024;
- 
- if (id==SASL_CB_PASS) {
- if (password!=NULL) /* if specified on command line */
- {
-	*tresult = strdup(password);
-	*tlen=strlen(*tresult);
-	
-	/* wipe it out from memory now. we don't want to hold 
-	 onto the user's plaintext password */
-	memset(password, '\0', strlen(password));
-	
- } else {
-	printf("%s: ", prompt);
-	*tresult=strdup(cyrus_getpass(""));
-	*tlen=strlen(*tresult);
- }
-	return;
- } else if ((id==SASL_CB_USER) || (id==SASL_CB_AUTHNAME)) {
- if ((id==SASL_CB_USER) && (username!=NULL))
-	{
-	 strcpy(result, username);
-	} else if (authname) {
-	 strcpy(result, authname);
-	} else {
-	 strcpy(result, getpwuid(getuid())->pw_name);
-	}
-#ifdef SASL_CB_GETREALM
- } else if ((id==SASL_CB_GETREALM) && (realm!=NULL)) {
- strcpy(result, realm);
-#endif
- } else {
-	int c;
-	
-	printf("%s: ",prompt);
-	fgets(result, 1023, stdin);
-	c = strlen(result);
-	resultc - 1 = '\0';
- }
-
- *tlen = strlen(result);
- *tresult = (char *) malloc(*tlen+1);
- memset(*tresult, 0, *tlen+1);
- memcpy((char *) *tresult, result, *tlen);
-}
-
-void fillin_interactions(sasl_interact_t *tlist)
-{
- while (tlist->id!=SASL_CB_LIST_END)
- {
- interaction(tlist->id, tlist->prompt,
-		(void *) &(tlist->result), 
-		&(tlist->len));
- tlist++;
- }
-
-}
-
-/* callbacks we support */
-static sasl_callback_t callbacks = {
- {
- SASL_CB_GETREALM, &simple, NULL
- }, {
- SASL_CB_USER, &simple, NULL
- }, {
- SASL_CB_AUTHNAME, &simple, NULL
- }, {
- SASL_CB_PASS, &getsecret, NULL 
- }, {
- SASL_CB_LIST_END, NULL, NULL
- }
-};
-
-
-/* libcyrus makes us define this */
-void fatal(const char *s, int code)
-{
- printf("Error: %s\n",s);
- exit(code);
-}
-
-static sasl_security_properties_t *make_secprops(int min,int max)
-{
- sasl_security_properties_t *ret=(sasl_security_properties_t *)
- malloc(sizeof(sasl_security_properties_t));
-
- ret->maxbufsize=1024;
- ret->min_ssf=min;
- ret->max_ssf=max;
-
- ret->security_flags=0;
- ret->property_names=NULL;
- ret->property_values=NULL;
-
- return ret;
-}
-
-
-/*
- * Initialize SASL and set necessary options
- */
-
-static int init_sasl(char *serverFQDN, int port, int ssf)
-{
- int saslresult;
- sasl_security_properties_t *secprops=NULL;
- int addrsize=sizeof(struct sockaddr_in);
- struct sockaddr_in *saddr_l=malloc(sizeof(struct sockaddr_in));
- struct sockaddr_in *saddr_r=malloc(sizeof(struct sockaddr_in));
-
- /* attempt to start sasl */
- saslresult=sasl_client_init(callbacks);
-
- if (saslresult!=SASL_OK) return IMTEST_FAIL;
-
- /* client new connection */
- saslresult=sasl_client_new(SIEVE_SERVICE_NAME,
-			 serverFQDN,
-			 NULL,
-			 0,
-			 &conn);
-
- if (saslresult!=SASL_OK) return IMTEST_FAIL;
-
- /* create a security structure and give it to sasl */
- secprops = make_secprops(0, ssf);
- if (secprops != NULL)
- {
- sasl_setprop(conn, SASL_SEC_PROPS, secprops);
- free(secprops);
- }
-
- if (getpeername(sock,(struct sockaddr *)saddr_r,&addrsize)!=0)
- return IMTEST_FAIL;
-
- if (sasl_setprop(conn, SASL_IP_REMOTE, saddr_r)!=SASL_OK)
- return IMTEST_FAIL;
- 
- addrsize=sizeof(struct sockaddr_in);
- if (getsockname(sock,(struct sockaddr *)saddr_l,&addrsize)!=0)
- return IMTEST_FAIL;
-
- /* set the port manually since getsockname is stupid and doesn't */
- saddr_l->sin_port = htons(port);
-
- if (sasl_setprop(conn, SASL_IP_LOCAL, saddr_l)!=SASL_OK)
- return IMTEST_FAIL;
-
-
- /* should be freed */
- free(saddr_l);
- free(saddr_r);
- 
- return IMTEST_OK;
-}
-
-
-int getauthline(char **line, unsigned int *linelen)
-{
- lexstate_t state;
- int res;
- int ret;
- mystring_t *errstr;
-
- /* now let's see what the server said */
- res=yylex(&state, pin);
- if (res!=STRING)
- {
- ret = handle_response(res,version,
-			 pin, &errstr);
-
- if (res==TOKEN_OK) {
- return STAT_OK;
- } else { /* server said no */
- printf("Authentication failed with: \"%s\"\n",string_DATAPTR(errstr));
- return STAT_NO; 
- }
- }
-
- *line=(char *) malloc(state.str->len*2+1);
-
- sasl_decode64(string_DATAPTR(state.str), state.str->len,
-		*line, linelen);
-
- if (yylex(&state, pin)!=EOL)
- parseerror("EOL");
-
- return STAT_CONT;
-}
-
-int auth_sasl(int version, char *mechlist)
-{
- sasl_interact_t *client_interact=NULL;
- int saslresult=SASL_INTERACT;
- char *out;
- unsigned int outlen;
- char *in;
- unsigned int inlen;
- const char *mechusing;
- char inbase642048;
- unsigned int inbase64len;
-
- imt_stat status = STAT_CONT;
-
- /* call sasl client start */
- while (saslresult==SASL_INTERACT)
- {
- saslresult=sasl_client_start(conn, mechlist,
-				 NULL, &client_interact,
-				 &out, &outlen,
-				 &mechusing);
- if (saslresult==SASL_INTERACT)
- fillin_interactions(client_interact); /* fill in prompts */ 
-
- }
-
- if ((saslresult!=SASL_OK) && (saslresult!=SASL_CONTINUE)) return saslresult;
-
- if (out!=NULL)
- {
- prot_printf(pout,"AUTHENTICATE \"%s\" ",mechusing);
-
- sasl_encode64(out, outlen,
-		 inbase64, sizeof(inbase64), &inbase64len);
-
- prot_printf(pout, "{%d+}\r\n",inbase64len);
- prot_write(pout,inbase64,inbase64len);
- prot_printf(pout,"\r\n");
- } else {
- prot_printf(pout,"AUTHENTICATE \"%s\"\r\n",mechusing);
- }
- prot_flush(pout);
-
- inlen = 0;
- status = getauthline(&in,&inlen);
-
- while (status==STAT_CONT)
- {
- saslresult=SASL_INTERACT;
- while (saslresult==SASL_INTERACT)
- {
- saslresult=sasl_client_step(conn,
-				 in,
-				 inlen,
-				 &client_interact,
-				 &out,
-				 &outlen);
-
- if (saslresult==SASL_INTERACT)
-	fillin_interactions(client_interact); /* fill in prompts */ 	
- }
-
- /* check if sasl suceeded */
- if (saslresult<SASL_OK)
- {
- printf("sasl result = %s\n",sasl_errstring(saslresult,NULL,NULL));
- return saslresult;
- }
-
- /* send to server */
-
- sasl_encode64(out, outlen,
-		 inbase64, sizeof(inbase64), &inbase64len);
-
- prot_printf(pout, "{%d+}\r\n",inbase64len);
- prot_flush(pout);
- prot_write(pout,inbase64,inbase64len);
- prot_flush(pout);
- prot_printf(pout,"\r\n");
- prot_flush(pout);
-
- /* get reply */
- status=getauthline(&in,&inlen);
- }
- 
- return (status == STAT_OK) ? IMTEST_OK : IMTEST_FAIL;
-}
-
-
-/* initialize the network */
-int init_net(char *serverFQDN, int port)
-{
- struct sockaddr_in addr;
- struct hostent *hp;
-
- if ((hp = gethostbyname(serverFQDN)) == NULL) {
- perror("gethostbyname");
- return IMTEST_FAIL;
- }
-
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- perror("socket");
- return IMTEST_FAIL;	
- }
-
- addr.sin_family = AF_INET;
- memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
- addr.sin_port = htons(port);
-
- if (connect(sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
- perror("connect");
- return IMTEST_FAIL;
- }
-
- return IMTEST_OK;
-}
-
-char *read_capability(int *version)
-{
- lexstate_t state;
- char *cap = NULL;
-
- *version = NEW_VERSION;
-
- while (yylex(&state,pin)==STRING)
- {
- char *attr = string_DATAPTR(state.str);
- char *val = NULL;
-
-
- if (yylex(&state,pin)==' ')
- {
-	 if (yylex(&state,pin)!=STRING)
-	 {
-	 parseerror("STRING");
-	 }
-	 val = string_DATAPTR(state.str);
-	 if (yylex(&state,pin)!=EOL)
-	 {
-	 parseerror("EOL1");
-	 }
- }
-
- if (strcasecmp(attr,"SASL")==0)
- {
-	cap = val;
- } else if (strcasecmp(attr,"SIEVE")==0) {
-
- } else if (strcasecmp(attr,"IMPLEMENTATION")==0) {
-
- } else if (strncmp(val,"SASL=",5)==0) {
-	 *version = OLD_VERSION;
-	 cap = (char *) malloc(strlen(val));
-	 memset(cap, '\0', strlen(val));
-	 memcpy(cap, val+6, strlen(val)-7);
-
-	 return cap;
- } else {
-	 /* unkown capability */
- }
- }
-
- if (yylex(&state,pin)!=EOL)
- {
- parseerror("EOL2");
- }
- 
- return cap;
-}
-
-void list_cb(char *name, int isactive)
-{
- printf("name = %s active = %d\n",name,isactive);
-}
-
-
-void usage(void)
-{
- printf("usage:\n");
- printf(" installsieve options servername\n");
- printf(" -v <name> view script\n");
- printf(" -l list available scripts\n");
- printf(" -p <port> port to connect to\n");
- printf(" -i <file> filename of script to install\n");
- printf(" -a <name> Set <name> as the active script\n");
- printf(" -d <name> Delete <name> script from server\n");
- printf(" -m <mech> Mechanism to use for authentication\n");
- printf(" -g <name> Get script <name> and save to disk\n");
- printf(" -u <user> Userid/Authname to use\n");
- printf(" -t <user> Userid to use (for proxying)\n");
- printf(" -w <passwd> Specify password (Should only be used for automated scripts)\n");
- exit(1);
-}
-
-
-int main(int argc, char **argv)
-{
- char c;
- int dolist = 0;
- int deflist = 1;
-
- char *portstr = "sieve";
- int port;
- struct servent *serv;
-
- char *mechanism=NULL;
- char *installfile=NULL;
- char *viewfile=NULL;
- char *servername;
- char *setactive=NULL;
- char *deletescript=NULL;
- char *getscriptname=NULL;
- int ssf=0;
-
- char *mechlist=NULL;
-
- int result;
-
- /* look at all the extra args */
- while ((c = getopt(argc, argv, "a:d:g:lv:p:i:m:u:w:t:")) != EOF)
- switch (c) 
- {
- case 'a':
- setactive=optarg;
- deflist = 0;
- break;
- case 'd':
- deletescript=optarg;
- deflist = 0;
- break;
- case 'i':
- installfile=optarg;
- deflist = 0;
- break;
- case 'l':
- dolist=1;
- break;
- case 'v':
- viewfile=optarg;
- deflist = 0;
- break;
- case 'p':
- portstr=optarg;
- break;
- case 'm':
- mechanism=optarg;
- break;
- case 'g':
- getscriptname=optarg;
- deflist = 0;
- break;
- case 'u':
- authname = optarg;
- break;
- case 't':
- username = optarg;
- break;
- case 'w':
- password = optarg;
- break;
- default:
- usage();
- break;
- }
-
- if (optind != argc - 1) {
- usage();
- }
-
- /* last arg is server name */
- servername = argvoptind;
-
- /* map port -> num */
- serv = getservbyname(portstr, "tcp");
- if (serv == NULL) {
- port = atoi(portstr);
- } else {
- port = ntohs(serv->s_port);
- }
-
- if (init_net(servername, port) != IMTEST_OK) {
- imtest_fatal("Network initialization");
- }
- 
- if (init_sasl(servername, port, ssf) != IMTEST_OK) {
- imtest_fatal("SASL initialization");
- }
- 
- /* set up the prot layer */
- pin = prot_new(sock, 0);
- pout = prot_new(sock, 1); 
- 
- mechlist=read_capability(&version);
- 
- if (mechanism!=NULL) {
- result=auth_sasl(version,mechanism);
- } else if (mechlist==NULL) {
- printf("Error reading mechanism list from server\n");
- exit(1);
- } else {
- result=auth_sasl(version,mechlist);
- }
- 
- if (result!=IMTEST_OK) {
- printf("Authentication failed.\n");
- exit(1);
- }
- 
- if (viewfile!=NULL)
- {
- getscript(version,pout,pin, viewfile,0);
- }
- 
- if (installfile!=NULL)
- {
- installafile(version,pout,pin,installfile);
- }
- 
- if (setactive!=NULL)
- {
- setscriptactive(version,pout,pin,setactive);
- }
- 
- if (deletescript!=NULL)
- {
- deleteascript(version,pout, pin, deletescript);
- }
- 
- if (getscriptname!=NULL)
- {
- getscript(version,pout,pin, getscriptname,1);
- }
- 
- if (dolist || deflist) {
- showlist(version,pout,pin);
- }
-
- return 0;
-}

cyrus-imapd-2.4.17.tar.gz/installsieve/isieve.c Deleted

@@ -1,413 +0,0 @@
-/* 
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: isieve.c,v 1.7 2010/01/06 17:01:43 murch Exp $
- */
-
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include <sasl/sasl.h>
-
-#include "isieve.h"
-#include "lex.h"
-#include "request.h"
-
-#include <cyrus/prot.h>
-
-
-struct iseive_s {
- 
- char *serverFQDN;
- int port;
-
- int sock;
-
- sasl_conn_t *conn;
-
- int version;
-
- struct protstream *pin;
- struct protstream *pout;
-
-};
-
-/* initialize the network */
-int init_net(char *serverFQDN, int port, isieve_t **obj)
-{
- struct sockaddr_in addr;
- struct hostent *hp;
- int sock;
-
- if ((hp = gethostbyname(serverFQDN)) == NULL) {
- perror("gethostbyname");
- return -1;
- }
-
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- perror("socket");
- return -1;
- }
-
- addr.sin_family = AF_INET;
- memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
- addr.sin_port = htons(port);
-
- if (connect(sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
- perror("connect");
- return -1;
- }
-
- *obj = (isieve_t *) malloc(sizeof(isieve_t));
- if (!*obj) return -1;
-
- memset(*obj, '\0', sizeof(isieve_t));
-
- (*obj)->sock = sock;
- (*obj)->serverFQDN = serverFQDN;
- (*obj)->port = port;
-
- /* set up the prot layer */
- (*obj)->pin = prot_new(sock, 0);
- (*obj)->pout = prot_new(sock, 1); 
-
- return 0;
-}
-
-static sasl_security_properties_t *make_secprops(int min,int max)
-{
- sasl_security_properties_t *ret=(sasl_security_properties_t *)
- malloc(sizeof(sasl_security_properties_t));
-
- ret->maxbufsize=1024;
- ret->min_ssf=min;
- ret->max_ssf=max;
-
- ret->security_flags=0;
- ret->property_names=NULL;
- ret->property_values=NULL;
-
- return ret;
-}
-
-/*
- * Initialize SASL and set necessary options
- */
-
-int init_sasl(isieve_t *obj,
-	 int ssf,
-	 sasl_callback_t *callbacks)
-{
- int saslresult;
- sasl_security_properties_t *secprops=NULL;
- int addrsize=sizeof(struct sockaddr_in);
- struct sockaddr_in *saddr_l=malloc(sizeof(struct sockaddr_in));
- struct sockaddr_in *saddr_r=malloc(sizeof(struct sockaddr_in));
-
- /* attempt to start sasl */
- saslresult=sasl_client_init(callbacks);
-
- if (saslresult!=SASL_OK) return -1;
-
- /* client new connection */
- saslresult=sasl_client_new("imap",
-			 obj->serverFQDN,
-			 NULL,
-			 0,
-			 &obj->conn);
-
- if (saslresult!=SASL_OK) return -1;
-
- /* create a security structure and give it to sasl */
- secprops = make_secprops(0, ssf);
- if (secprops != NULL)
- {
- sasl_setprop(obj->conn, SASL_SEC_PROPS, secprops);
- free(secprops);
- }
-
- if (getpeername(obj->sock,(struct sockaddr *)saddr_r,&addrsize)!=0)
- return -1;
-
- if (sasl_setprop(obj->conn, SASL_IP_REMOTE, saddr_r)!=SASL_OK)
- return -1;
- 
- addrsize=sizeof(struct sockaddr_in);
- if (getsockname(obj->sock,(struct sockaddr *)saddr_l,&addrsize)!=0)
- return -1;
-
- /* set the port manually since getsockname is stupid and doesn't */
- saddr_l->sin_port = htons(obj->port);
-
- if (sasl_setprop(obj->conn, SASL_IP_LOCAL, saddr_l)!=SASL_OK)
- return -1;
-
-
- /* should be freed */
- free(saddr_l);
- free(saddr_r);
- 
- return 0;
-}
-
-char * read_capability(isieve_t *obj)
-{
- lexstate_t state;
- char *cap = NULL;
-
- obj->version = NEW_VERSION;
-
- while (yylex(&state,obj->pin)==STRING)
- {
- char *attr = string_DATAPTR(state.str);
- char *val = NULL;
-
- printf("attr = %s\n",attr);
-
- if (yylex(&state,obj->pin)==' ')
- {
-	 if (yylex(&state,obj->pin)!=STRING)
-	 {
-	 parseerror("STRING");
-	 }
-	 val = string_DATAPTR(state.str);
-	 if (yylex(&state,obj->pin)!=EOL)
-	 {
-	 parseerror("EOL1");
-	 }
- }
-
- if (strcasecmp(attr,"SASL")==0)
- {
-	cap = val;
- } else if (strcasecmp(attr,"SIEVE")==0) {
-
- } else if (strcasecmp(attr,"IMPLEMENTATION")==0) {
-
- } else if (strncmp(val,"SASL=",5)==0) {
-	 obj->version = OLD_VERSION;
-	 cap = (char *) malloc(strlen(val));
-	 memset(cap, '\0', strlen(val));
-	 memcpy(cap, val+6, strlen(val)-7);
-
-	 return cap;
- } else {
-	 /* unkown capability */
- }
- }
-
- if (yylex(&state,obj->pin)!=EOL)
- {
- parseerror("EOL2");
- }
- 
- return cap;
-}
-
-static int getauthline(isieve_t *obj, char **line, unsigned int *linelen)
-{
- lexstate_t state;
- int res;
- int ret;
- mystring_t *errstr;
-
- /* now let's see what the server said */
- res=yylex(&state, obj->pin);
- if (res!=STRING)
- {
- ret = handle_response(res,obj->version,
-			 obj->pin, &errstr);
-
- if (res==TOKEN_OK) {
- return STAT_OK;
- } else { /* server said no */
- printf("Authentication failed with: \"%s\"\n",string_DATAPTR(errstr));
- return STAT_NO; 
- }
- }
-
- *line=(char *) malloc(state.str->len*2+1);
-
- sasl_decode64(string_DATAPTR(state.str), state.str->len,
-		*line, linelen);
-
- if (yylex(&state, obj->pin)!=EOL)
- return STAT_NO;
-
- return STAT_CONT;
-}
-
-
-int auth_sasl(char *mechlist, isieve_t *obj)
-{
- sasl_interact_t *client_interact=NULL;
- int saslresult=SASL_INTERACT;
- char *out;
- unsigned int outlen;
- char *in;
- unsigned int inlen;
- const char *mechusing;
- char inbase642048;
- unsigned int inbase64len;
-
- imt_stat status = STAT_CONT;
-
- /* call sasl client start */
- while (saslresult==SASL_INTERACT)
- {
- saslresult=sasl_client_start(obj->conn, mechlist,
-				 NULL, &client_interact,
-				 &out, &outlen,
-				 &mechusing);
- if (saslresult==SASL_INTERACT)
- fillin_interactions(client_interact); /* fill in prompts */ 
-
- }
-
- if ((saslresult!=SASL_OK) && (saslresult!=SASL_CONTINUE)) return saslresult;
-
- if (out!=NULL)
- {
- prot_printf(obj->pout,"AUTHENTICATE \"%s\" ",mechusing);
-
- sasl_encode64(out, outlen,
-		 inbase64, sizeof(inbase64), &inbase64len);
-
- prot_printf(obj->pout, "{%d+}\r\n",inbase64len);
- prot_write(obj->pout,inbase64,inbase64len);
- prot_printf(obj->pout,"\r\n");
- } else {
- prot_printf(obj->pout,"AUTHENTICATE \"%s\"\r\n",mechusing);
- }
- prot_flush(obj->pout);
-
- inlen = 0;
- status = getauthline(obj,&in,&inlen);
-
- while (status==STAT_CONT)
- {
- saslresult=SASL_INTERACT;
- while (saslresult==SASL_INTERACT)
- {
- saslresult=sasl_client_step(obj->conn,
-				 in,
-				 inlen,
-				 &client_interact,
-				 &out,
-				 &outlen);
-
- if (saslresult==SASL_INTERACT)
-	fillin_interactions(client_interact); /* fill in prompts */ 	
- }
-
- /* check if sasl suceeded */
- if (saslresult<SASL_OK)
- {
- printf("sasl result = %s\n",sasl_errstring(saslresult,NULL,NULL));
- return saslresult;
- }
-
- /* send to server */
-
- sasl_encode64(out, outlen,
-		 inbase64, sizeof(inbase64), &inbase64len);
-
- prot_printf(obj->pout, "{%d+}\r\n",inbase64len);
- prot_flush(obj->pout);
- prot_write(obj->pout,inbase64,inbase64len);
- prot_flush(obj->pout);
- prot_printf(obj->pout,"\r\n");
- prot_flush(obj->pout);
-
- /* get reply */
- status=getauthline(obj,&in,&inlen);
- }
- 
- return (status == STAT_OK) ? 0 : -1;
-}
-
-
-int isieve_put_file(isieve_t *obj, char *filename)
-{
- return installafile(obj->version,
-			obj->pout, obj->pin,
-			filename);
-}
-
-int isieve_put(isieve_t *obj, char *name, char *data, int len)
-{
- return installdata(obj->version,
-		 obj->pout, obj->pin,
-		 name, data, len);
-}
-
-int isieve_delete(isieve_t *obj, char *name)
-{
- return deleteascript(obj->version,
-			 obj->pout, obj->pin,
-			 name);
-}
-
-int isieve_list(isieve_t *obj, isieve_listcb_t *cb,void *rock)
-{
- return list_wcb(obj->version, obj->pout, obj->pin, cb, rock);
-}
-
-int isieve_activate(isieve_t *obj, char *name)
-{
- return setscriptactive(obj->version,obj->pout, obj->pin, name);
-}
-
-int isieve_get(isieve_t *obj,char *name, char **output)
-{
- int ret;
- mystring_t *mystr;
-
- ret = getscriptvalue(obj->version,obj->pout, obj->pin,
-			 name, &mystr);
-
- *output = string_DATAPTR(mystr);
-
- return ret;
-}

cyrus-imapd-2.4.17.tar.gz/installsieve/isieve.h Deleted

@@ -1,84 +0,0 @@
-/* 
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: isieve.h,v 1.7 2010/01/06 17:01:43 murch Exp $
- */
-
-#ifndef ISIEVE_H_
-#define ISIEVE_H_
-
-#include <sasl/sasl.h>
-
-typedef struct iseive_s isieve_t;
-
-int init_net(char *serverFQDN, int port, isieve_t **obj);
-
-
-int init_sasl(isieve_t *obj,
-	 int ssf,
-	 sasl_callback_t *callbacks);
-
-char * read_capability(isieve_t *obj);
-
-typedef enum {
- STAT_CONT = 0,
- STAT_NO = 1,
- STAT_OK = 2
-} imt_stat;
-
-int auth_sasl(char *mechlist, isieve_t *obj);
-
-
-int isieve_put_file(isieve_t *obj, char *filename);
-
-int isieve_put(isieve_t *obj, char *name, char *data, int len);
-
-int isieve_delete(isieve_t *obj, char *name);
-
-typedef void *isieve_listcb_t(char *name, int isactive, void *rock);
-
-int isieve_list(isieve_t *obj, isieve_listcb_t *cb,void *rock);
-
-int isieve_activate(isieve_t *obj, char *name);
-
-int isieve_get(isieve_t *obj,char *name, char **output); 
-
-
-#endif /* ISIEVE_H_ */

cyrus-imapd-2.4.17.tar.gz/installsieve/lex.c Deleted

@@ -1,304 +0,0 @@
-/* lex.c -- lexers for command line script installer
- * Tim Martin
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lex.c,v 1.14 2010/01/06 17:01:43 murch Exp $
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "prot.h"
-
-#include "lex.h"
-
-#include "codes.h"
-#include "util.h"
-
-/* current state the lexer is in */
-int lexer_state = LEXER_STATE_NORMAL;
-
-#define ACAP_MAX_QSTR_LEN 4096
-
-#define ERR() {								\
-		lexer_state=LEXER_STATE_RECOVER; \
-		return SIEVE_FAIL; \
- /* (result == DAEMON_ERR_EOF ? EOF : ERROR);*/	 \
- 	 }
-
-#define ERR_PUSHBACK() {				\
- 		prot_ungetc(ch, stream); \
-		ERR();					\
- 	 }
-
-int token_lookup(char *str, int len)
-{
- if (strcmp(str,"ok")==0) return TOKEN_OK;
- if (strcmp(str,"no")==0) return TOKEN_NO;
- if (strcmp(str,"active")==0) return TOKEN_ACTIVE;
-
- return -1;
-}
-
-int yylex(lexstate_t * lvalp, void * client)
-{
- int ch;
- char bufferACAP_MAX_QSTR_LEN;	/* big enough for everything */
-
- char *buff_ptr = buffer; /* ptr into the buffer */
- char *buff_end = buffer + ACAP_MAX_QSTR_LEN -1;
-
- unsigned long count=0;
-
- int result = SIEVE_OK;
-
- int synchronizing; /* wheather we are in the process of reading a
-			 synchronizing string or not */
-
- struct protstream *stream=(struct protstream *) client;
- 
- while (1)
- {
-
- /* get a character
- this may block on a read if there is nothing
- in the buffer */
-
- ch = prot_getc(stream);
-
- if (ch == -1) {
-	return SIEVE_FAIL;
- }
-
- switch (lexer_state)
- {
- 
-
- case LEXER_STATE_RECOVER:
- if (ch == '\r')
-	lexer_state=LEXER_STATE_RECOVER_CR;
- break;
- case LEXER_STATE_RECOVER_CR:
- if (ch == '\n')
-	lexer_state=LEXER_STATE_NORMAL;
- return EOL;
- case LEXER_STATE_CR:
- if (ch == '\n') {
-	lexer_state=LEXER_STATE_NORMAL;
-	return EOL;
- }
- /* otherwise, life is bad */
- ERR_PUSHBACK();
- case LEXER_STATE_QSTR:
- if (ch == '\"') {
-	/* End of the string */
-	lvalp->str = NULL;
-	/*	if (! client->recovering) { */
-	 result = string_allocate(buff_ptr - buffer, buffer, &lvalp->str);
-	 if (result != SIEVE_OK)
-	 ERR_PUSHBACK();
-	 /*} */
-	lexer_state=LEXER_STATE_NORMAL;
-	return STRING;
- }
- if (ch == '\0'
-	 || 0x7F < ((unsigned char)ch))
-	ERR_PUSHBACK();
- /* Otherwise, we're appending a character */
- if (buff_end <= buff_ptr)
-	ERR_PUSHBACK();		/* too long! */
- if (ch == '\\') {
-	ch=prot_getc(stream);
-
-	if (result != SIEVE_OK)
-	 ERR();
-	if (ch != '\"' && ch != '\\')
-	 ERR_PUSHBACK();
- }
- *buff_ptr++ = ch;
- break;
- case LEXER_STATE_LITERAL:
- if (('0' <= ch) && (ch <= '9')) {
-	unsigned long newcount = count * 10 + (ch - '0');
-
-	if (newcount < count)
-	 ERR_PUSHBACK();	/* overflow */
-	/*
-	 * XXX This should be fatal if non-synchronizing.
-	 */
-	count = newcount;
-	break;
- }
- synchronizing = FALSE;
-
- if (ch != '}')
-	ERR_PUSHBACK();
- ch=prot_getc(stream);
- if (ch < 0)
-	ERR();
- if (ch != '\r')
-	ERR_PUSHBACK();
- ch=prot_getc(stream);
- if (ch < 0)
-	ERR();
- if (ch != '\n')
-	ERR_PUSHBACK();
- if (synchronizing) {
-	/*	static const char sync_reply = "+ \"Ready for data\"\r\n";*/
-
-	/* xxx	if (client->recovering)
-		return EOL;*/
-	/*	pthread_mutex_lock(client_OUTPUT_MUTEX(client));
-	conn_write(client_CONN(client), sync_reply, sizeof(sync_reply) - 1);
-	conn_flush(client_CONN(client));
-	pthread_mutex_unlock(client_OUTPUT_MUTEX(client));*/
- }
-
- lvalp->str = NULL;
- result = string_allocate(count, NULL, &lvalp->str);
- if (result != SIEVE_OK)
-	ERR_PUSHBACK();
-
- /* there is a literal string on the wire. let's read it */
- {
-	char *it = string_DATAPTR(lvalp->str),
-	 *end = it + count;
-
-	while (it < end) {
-	 *it=prot_getc(stream);
-	 it++;
-	}
- }
- lexer_state=LEXER_STATE_NORMAL;
- return STRING;
- case LEXER_STATE_NUMBER:
- if (('0' <= ch) && (ch <= '9')) {
-	unsigned long newcount = count * 10 + (ch - '0');
-
-	if (newcount < count)
-	 ERR_PUSHBACK();	/* overflow */
-	count = newcount;
- } else {
-	lvalp->number = count;
-	lexer_state=LEXER_STATE_NORMAL;
-	prot_ungetc(ch, stream);
-	return NUMBER;
- }
- break;
- case LEXER_STATE_NORMAL:
- if (Uisalpha(ch)) {
-	lexer_state=LEXER_STATE_ATOM;
-	*buff_ptr++ = tolower(ch);
-	break;
- }
- switch (ch) {
- case '(':
-	return '(';
- case ')':
-	return ')';
- case ' ':
-	return ' ';
- case '\"':
-	lexer_state=LEXER_STATE_QSTR;
-	break;
- case '*':
-	return '*';
- case '0': /* fall through all numbers */
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
-	count = ch - '0';
-	lexer_state=LEXER_STATE_NUMBER;
-	break;
- case '{':
-	count = 0;
-	synchronizing = TRUE;
-	lexer_state=LEXER_STATE_LITERAL;
-	break;
- case '\r':
-	lexer_state=LEXER_STATE_CR;
-	break;
- case '\n':
-	lexer_state=LEXER_STATE_NORMAL;
-	return EOL;
-	break;
- default:
-	ERR_PUSHBACK();
- }
- break;
- case LEXER_STATE_ATOM:
- if (!Uisalpha(ch)) {
-	int token;
-
-	buffer buff_ptr - buffer = '\0';
-
-	/* We've got the atom. */
-	token = token_lookup((char *) buffer, (int) (buff_ptr - buffer));
-
-	if (token!=-1) {
-	 lexer_state=LEXER_STATE_NORMAL;
-	 prot_ungetc(ch, stream);
-
-	 return token;
-	} else
-	 ERR_PUSHBACK();
- }
- if (buff_end <= buff_ptr)
-	ERR_PUSHBACK();		/* atom too long */
- *buff_ptr++ = tolower(ch);
- break;
- }
-
-
-
- } /* while (1) */
-
- return 0;
-}
-
-

cyrus-imapd-2.4.17.tar.gz/installsieve/lex.h Deleted

@@ -1,82 +0,0 @@
-/* lex.h 
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lex.h,v 1.10 2010/01/06 17:01:43 murch Exp $
- */
-
-#ifndef _LEX_H_
-#define _LEX_H_
-
-#include "mystring.h"
-
-typedef struct lexstate_s {
-  mystring_t *str;
-  int number;
-
-} lexstate_t;
-
-int yylex(lexstate_t * lvalp, void * client);
-
-#define	TAG	258
-#define	EOL	259
-#define	STRING	260
-#define NUMBER  261
-
-#define TOKEN_OK      280
-#define TOKEN_NO      281
-#define TOKEN_ACTIVE  282
-
-
-#define LEXER_STATE_TAG         60
-#define LEXER_STATE_RECOVER     61
-#define LEXER_STATE_RECOVER_CR  62
-#define LEXER_STATE_CR          63
-#define LEXER_STATE_QSTR        64
-#define LEXER_STATE_LITERAL     65
-#define LEXER_STATE_NUMBER      66
-#define LEXER_STATE_NORMAL      67
-#define LEXER_STATE_ATOM        68
-
-
-
-#endif /* _LEX_H_ */

cyrus-imapd-2.4.17.tar.gz/installsieve/mystring.c Deleted

@@ -1,214 +0,0 @@
-/* mystring.c -- string utility
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mystring.c,v 1.8 2010/01/06 17:01:43 murch Exp $
- */
-
-#include "mystring.h"
-
-#include "codes.h"
-
-#include <stdlib.h>
-
-#include <strings.h>
-
-int string_allocate(int length,
-		 const char *buf,	/* NULL => no copy */
-		 mystring_t ** str)
-{
- *str=(mystring_t *) malloc(sizeof(mystring_t)+length+1);
-
- (*str)->len=length;
-
- if (buf==NULL) return SIEVE_OK;
-
- /* copy the data into the string object */
- memcpy(((char *)(*str))+sizeof(mystring_t), buf, length);
- ((char *) (*str))sizeof(mystring_t)+length='\0';
-
- return SIEVE_OK;
-}
-
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr)
-{
- int result;
-
-
- result=string_allocate(oldstr->len,
-			 string_DATAPTR(oldstr),
-			 newstr);
-
- return result;
-}
-
-
-void string_free(mystring_t **str)
-{
- free(*str);
-}
-
-
-int string_compare(mystring_t *str1, mystring_t *str2)
-{
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2->len) return SIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return SIEVE_FAIL;
-
- return SIEVE_OK;
-}
-
-int string_compare_with(mystring_t *str1, mystring_t *str2, mystring_t *comp)
-{
- char *data1;
- char *data2;
- int lup;
-
- int len1=str1->len;
- int len2=str2->len;
-
- int low=len1;
- if (len2<len1)
- low=len2;
-
- /* printf("comparing %s and %s\n",string_DATAPTR(str1),
- string_DATAPTR(str2));*/
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<low;lup++)
- if (data1lup<data2lup)
- {
- return -1;
- } else if (data1lup>data2lup) {
- return 1;
- } else {
- /* continue */
- }
- 
- if (len1==len2) return 0;
-
- if (len1<len2)
- return -1;
-
- return 1;
-}
-
-int string_comparestr(mystring_t *str1, char *str2)
-{
- int str2len=strlen(str2);
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2len) return SIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=str2;
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return SIEVE_FAIL;
-
- return SIEVE_OK;
-}
-/*
-eq_result_t
-string_equal_cstr(const mystring_t * str, const char *cstr)
-{
- int len;
-
- I(str);
- I(cstr);
-
- len = strlen(cstr);
- if (len != str->len)
- return EQ_NOT_EQUAL;
-
- if (memcmp(string_DATAPTR(str), cstr, len)==0)
- return EQ_IS_EQUAL;
-
-
- return EQ_NOT_EQUAL; 
-}
-*/
-
-int safe_to_use_quoted(char *str, int len)
-{
- char *end=str+len;
-
- if (len > 4096)
- return FALSE;
-
- while (str < end) {
- if (*str == '\0'		/* check illegal chars... */
-	|| *str == '\r'
-	|| *str == '\n'
-
-#ifdef __CHAR_UNSIGNED__
-	|| 0x7F < *str
-#else
-	|| *str < 0
-#endif
-
- )
- return FALSE;
- if (*str == '\"'		/* check len, with \ escapes... */
-	|| *str == '\\')
- if (4096 < ++len)
-	return FALSE;
- ++str;
- }
- return TRUE;
-}

cyrus-imapd-2.4.17.tar.gz/installsieve/mystring.h Deleted

@@ -1,82 +0,0 @@
-/* mystring.h
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mystring.h,v 1.8 2010/01/06 17:01:43 murch Exp $
- */
-
-#include "codes.h"
-
-
-#ifndef INCLUDED_MYSTRING_H
-#define INCLUDED_MYSTRING_H
-
-typedef struct {
-  int        len;
-  /* Data immediately following... */
-}  mystring_t;
-
-
-int string_allocate(int length,
-		    const char *buf,	/* NULL => no copy */
-		    mystring_t ** str);
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr);
-
-void string_free(mystring_t **str);
-
-int string_compare(mystring_t *str1, mystring_t *str2);
-
-int string_comparestr(mystring_t *str1, char *str2);
-
-int string_compare_with(mystring_t *str1, mystring_t *str2, mystring_t *comp);
-
-/*eq_result_t
-  string_equal_cstr(const mystring_t * str, const char *cstr);*/
-
-#define string_DATAPTR(s) (((char *) s)+sizeof(mystring_t))
-
-int safe_to_use_quoted(char *str, int len);
-
-
-#endif /* INCLUDED_MYSTRING_H */

cyrus-imapd-2.4.17.tar.gz/installsieve/request.c Deleted

@@ -1,547 +0,0 @@
-/* request.c -- request to execute functions on the timsieved server
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: request.c,v 1.21 2010/01/06 17:01:43 murch Exp $
- */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/file.h>
-
-#include "request.h"
-
-#include "prot.h"
-#include "lex.h"
-#include "xmalloc.h"
-
-#define BLOCKSIZE 1024
-
-void parseerror(char *str)
-{
- printf("Parse error:\n");
-
- printf("client expected %s\n",str);
- printf("exiting\n");
-
- exit(2);
-}
-
-int handle_response(int res,int version,struct protstream *pin, mystring_t **errstr)
-{ 
- lexstate_t state;
-
- if ((res!=TOKEN_OK) && (res!=TOKEN_NO))
- parseerror("ATOM");
-
- if (res==TOKEN_NO) {
-
- if (yylex(&state, pin)!=' ')
-	 parseerror("expected space\n");
-
- res = yylex(&state, pin);
-
- /* additional error response */
- if (res == '(') {
-	 /* '(' string SP string ')' */
-	 
-	 if (yylex(&state, pin)!=STRING)
-	 parseerror("expected string\n");
-
-	 if (strcmp(string_DATAPTR(state.str),"SASL")==0) {
-	 if (yylex(&state, pin)!=' ')
-		 parseerror("expected space\n");
-	 if (yylex(&state, pin)!=STRING)
-		 parseerror("expected string\n");
-	 }
-
-	 if (yylex(&state, pin)!=')')
-	 parseerror("expected RPAREN\n");
-
-	 res = yylex(&state, pin);
- }
-
- if (res !=' ')
-	 parseerror("expected sp\n");
- 
- if (yylex(&state, pin)!=STRING)
-	 parseerror("expected string\n");
- 
-
- if (errstr)
-	 *errstr = state.str;
-
- return -1;
- }
- 
- /* old version of protocol had strings with ok responses too */
- if (version == OLD_VERSION) {
- if (yylex(&state, pin)!=' ')
-	 parseerror("expected sp\n");
- 
- if (yylex(&state, pin)!=STRING)
-	 parseerror("expected string\n");
- }
- 
- if (yylex(&state, pin)!=EOL)
- parseerror("expected string\n");
- 
- return 0;
-}
-
-int deleteascript(int version, struct protstream *pout, struct protstream *pin,char *name)
-{
- lexstate_t state;
- int res;
- int ret;
- mystring_t *errstr;
-
- prot_printf(pout,"DELETESCRIPT \"%s\"\r\n",name);
- prot_flush(pout); 
-
- res=yylex(&state, pin);
-
- ret = handle_response(res,version,pin,&errstr);
-
- if (ret!=0)
- {
- printf("Deletescript error: %s\n",string_DATAPTR(errstr));
- return -1;
- }
-
- printf("Script %s deleted successfully\n",name);
- return 0;
-}
-
-int installdata(int version,struct protstream *pout, struct protstream *pin,
-		char *scriptname, char *data, int len)
-{
- int res;
- int ret;
- mystring_t *errstr=NULL;
- lexstate_t state;
-
- prot_printf(pout, "PUTSCRIPT \"%s\" ",scriptname);
-
- prot_printf(pout, "{%d+}\r\n",len);
-
- prot_write(pout, data, len);
-
- prot_printf(pout,"\r\n");
- prot_flush(pout);
-
- /* now let's see what the server said */
- res=yylex(&state,pin);
-
- ret = handle_response(res,version,pin,&errstr);
-
- /* if command failed */
- if (ret!=0)
- {
- printf("Putting script failed with message: %s\n",string_DATAPTR(errstr));
- 
- return -1;
- }
-
- return setscriptactive(version,pout,pin,scriptname);
-}
-
-static char *getsievename(char *filename)
-{
- char *ret, *ptr;
-
- ret=(char *) xmalloc( strlen(filename) + 2);
-
- /* just take the basename of the file */
- ptr = strrchr(filename, '/');
- if (ptr == NULL) {
- ptr = filename;
- } else {
- ptr++;
- }
-
- strcpy(ret, ptr);
-
- if ( strcmp( ret + strlen(ret) - 7,".script")==0)
- {
- ret strlen(ret) - 7 = '\0';
- }
-
- return ret;
-}
-
-
-int installafile(int version,struct protstream *pout, struct protstream *pin,char *filename)
-{
- FILE *stream;
- struct stat filestats; /* returned by stat */
- int size; /* size of the file */
- int result;
- int cnt;
- int res;
- int ret;
- mystring_t *errstr=NULL;
- lexstate_t state;
- char *sievename;
-
- sievename=getsievename(filename);
-
- result=stat(filename,&filestats);
-
- if (result!=0)
- {
- perror("stat");
- return -1;
- }
-
- size=filestats.st_size;
-
- stream=fopen(filename, "r");
-
- if (stream==NULL)
- {
- printf("Couldn't open file\n");
- return -1;
- }
-
- prot_printf(pout, "PUTSCRIPT \"%s\" ",sievename);
-
- prot_printf(pout, "{%d+}\r\n",size);
-
- cnt=0;
-
- while (cnt < size)
- {
- char bufBLOCKSIZE;
- int amount=BLOCKSIZE;
-
- if (size-cnt < BLOCKSIZE)
- amount=size-cnt;
-
- fread(buf, 1, BLOCKSIZE, stream);
- 
- prot_write(pout, buf, amount);
-
- cnt+=amount;
- }
-
- prot_printf(pout,"\r\n");
- prot_flush(pout);
-
- /* now let's see what the server said */
- res=yylex(&state,pin);
-
- ret = handle_response(res,version,pin,&errstr);
-
- /* if command failed */
- if (ret!=0)
- {
- printf("Putting script failed with message: %s\n",string_DATAPTR(errstr)); 
- return -1;
- }
-
- return setscriptactive(version,pout,pin,sievename);
-}
-
-
-
-int showlist(int version, struct protstream *pout, struct protstream *pin)
-{
- lexstate_t state;
- int end=0;
- int res;
- int ret = 0;
-
- printf("You have the following scripts on the server:\n");
-
- prot_printf(pout, "LISTSCRIPTS\r\n");
- prot_flush(pout);
-
- do {
-
- if ((res=yylex(&state, pin))==STRING)
- {
- char *str=string_DATAPTR(state.str);
-
- if (yylex(&state, pin)==' ')
- {
-	 if (yylex(&state, pin)!=TOKEN_ACTIVE)
-	 printf("Expected ACTIVE\n");
-	 if (yylex(&state, pin)!=EOL)
-	 printf("Expected EOL\n");
-
-	 printf(" %s <- Active Sieve Script\n",str);	 
- } else {
-
-	 /* in old version we had that '*' means active script thing */
-	 if (version == OLD_VERSION) {
-
-	 if (strstrlen(str)-1=='*') {
-		 strstrlen(str)-1='\0';
-		 printf(" %s <- Active Sieve Script\n",str);	 
-	 } else {
-		 printf(" %s\n",str);	 	 
-	 }
-
-	 } else { /* NEW_VERSION */
-	 /* assume it's a EOL */
-	 printf(" %s\n",str);	 	 
-	 }
- }
-
- } else {
-
-	ret = handle_response(res,version,pin,NULL);
-	
-	end=1;
- }
-
-
- 
- } while (end==0);
-
- return ret;
-}
-
-int list_wcb(int version, struct protstream *pout, struct protstream *pin,isieve_listcb_t *cb ,void *rock)
-{
- lexstate_t state;
- int end=0;
- int res;
- int ret = 0;
-
- printf("You have the following scripts on the server:\n");
-
- prot_printf(pout, "LISTSCRIPTS\r\n");
- prot_flush(pout);
-
- do {
-
- if ((res=yylex(&state, pin))==STRING)
- {
- char *str=string_DATAPTR(state.str);
-
- if (yylex(&state, pin)==' ')
- {
-	 if (yylex(&state, pin)!=TOKEN_ACTIVE)
-	 printf("Expected ACTIVE\n");
-	 if (yylex(&state, pin)!=EOL)
-	 printf("Expected EOL\n");
-
-	 cb(str, 1, rock);
- } else {
-
-	 /* in old version we had that '*' means active script thing */
-	 if (version == OLD_VERSION) {
-
-	 if (strstrlen(str)-1=='*') {
-		 strstrlen(str)-1='\0';
-		 cb(str, 1, rock);
-	 } else {
-		 cb(str, 0, rock);
-	 }
-
-	 } else { /* NEW_VERSION */
-	 /* assume it's a EOL */
-	 cb(str, 0, rock);
-	 }
- }
-
- } else {
-
-	ret = handle_response(res,version,pin,NULL);
-	
-	end=1;
- }
-
-
- 
- } while (end==0);
-
- return ret;
-}
-
-int setscriptactive(int version, struct protstream *pout, struct protstream *pin,char *name)
-{
- lexstate_t state;
- int res;
- int ret;
- mystring_t *errstr=NULL;
-
- /* tell server we want "name" to be the active script */
- prot_printf(pout, "SETACTIVE \"%s\"\r\n",name);
- prot_flush(pout);
-
-
- /* now let's see what the server said */
- res=yylex(&state, pin);
-
- ret = handle_response(res,version,pin, &errstr);
-
- /* if command failed */
- if (ret!=0)
- {
- if (!strlen(name))
- printf("Disabling active script failed with message: %s\n", string_DATAPTR(errstr));
- else
- printf("Setting script %s active failed with message: %s\n",name, string_DATAPTR(errstr));
- return -1;
- }
-
- return 0;
-}
-
-static int viewafile(mystring_t *data, char *name)
-{
- printf("%s\r\n", string_DATAPTR(data));
-
- return 0;
-}
-
-static int writefile(mystring_t *data, char *name)
-{
- FILE *stream;
-
- char *scrname;
-
- scrname=malloc(strlen(name)+10);
- strcpy(scrname, name);
- strcat(scrname, ".script");
-
- stream=fopen(scrname,"w");
-
- if (stream==NULL)
- {
- printf("Unable to open %s for writing\n",name);
- return -1;
- }
-
- fwrite(string_DATAPTR(data), 1, data->len, stream);
-
- fclose(stream);
-
- return 0;
-}
-
-int getscript(int version, struct protstream *pout, 
-	 struct protstream *pin,char *name, int save)
-{
- int res;
- mystring_t *str=NULL;
- mystring_t *errstr=NULL;
- lexstate_t state;
- int ret = 0;
-
- prot_printf(pout,"GETSCRIPT \"%s\"\r\n",name);
- prot_flush(pout);
-
- res=yylex(&state,pin);
-
- if (res==STRING)
- {
-
- if (save==1)
- writefile(state.str, name);
- else
- viewafile(state.str, name);
-
- if (yylex(&state, pin)!=EOL)
- parseerror("EOL");
-
- res=yylex(&state,pin);
- }
-
- ret = handle_response(res,version,pin, &errstr);
-
- /* if command failed */
- if (ret!=0)
- {
- printf("Getting script %s active failed with message: %s\n",name, string_DATAPTR(str));
- }
-
- return ret;
-
-}
-
-
-int getscriptvalue(int version, struct protstream *pout, 
-		 struct protstream *pin,char *name, mystring_t **data)
-{
- int res;
- int ret;
- mystring_t *errstr=NULL;
- lexstate_t state;
-
- prot_printf(pout,"GETSCRIPT \"%s\"\r\n",name);
- prot_flush(pout);
-
- res=yylex(&state,pin);
-
- if (res==STRING)
- {
- *data=state.str;
-
- if (yylex(&state, pin)!=EOL)
- parseerror("EOL");
-
- res=yylex(&state,pin);
- }
-
- ret = handle_response(res,version,pin, &errstr);
-
- /* if command failed */
- if (ret!=0)
- {
- printf("Getting script %s active failed with message: %s\n",name, string_DATAPTR(errstr));
- return -1;
- }
-
- return 0;
-
-}

cyrus-imapd-2.4.17.tar.gz/installsieve/request.h Deleted

@@ -1,90 +0,0 @@
-/* request.h -- request to execute functions on the timsieved server
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: request.h,v 1.15 2010/01/06 17:01:43 murch Exp $
- */
-
-#ifndef _REQUEST_H_
-#define _REQUEST_H_
-
-#include "prot.h"
-#include "mystring.h"
-#include "isieve.h"
-
-/* old and new versions of the protocol */
-#define OLD_VERSION  4
-#define NEW_VERSION  5
-#define ACAP_VERSION 6
-
-int handle_response(int res,int version,struct protstream *pin, mystring_t **errstr);
-
-int deleteascript(int version,struct protstream *pout, struct protstream *pin,
-		  char *name);
-
-int installafile(int version,struct protstream *pout, struct protstream *pin,
-		 char *filename);
-
-int installdata(int version,struct protstream *pout, struct protstream *pin,
-		char *scriptname, char *data, int len);
-
-int showlist(int version, struct protstream *pout, struct protstream *pin);
-
-int list_wcb(int version, struct protstream *pout, struct protstream *pin,isieve_listcb_t *cb ,void *rock);
-
-int setscriptactive(int version,struct protstream *pout, struct protstream *pin,
-		    char *name);
-
-/*
- * Getscript. Save {0,1} wheather to save to disk or display on screen
- */
-
-int getscript(int version, struct protstream *pout, struct protstream *pin,
-	      char *name, int save);
-
-int getscriptvalue(int version,struct protstream *pout, struct protstream *pin,
-		   char *name, mystring_t **data);
-
-void parseerror(char *str);
-
-
-#endif

cyrus-imapd-2.4.17.tar.gz/lib/Makefile.dist Deleted

cyrus-imapd-2.4.17.tar.gz/lib/Makefile.in Deleted

@@ -1,165 +0,0 @@
-# Makefile for cyrus library
-# 
-# @configure_input@
-# 
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.77 2010/06/28 12:06:31 brong Exp $
-
-# Authorization namespace.
-AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
-
-# ACL interpretation. Only one choice for now:
-ACL=acl_afs.o
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
-LIBS = @LIBS@
-
-MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-libdir = @libdir@
-
-BUILTSOURCES = imapopts.h imapopts.c
-
-LIBCYR_HDRS = $(srcdir)/acl.h $(srcdir)/assert.h $(srcdir)/auth.h \
-	$(srcdir)/bsearch.h $(srcdir)/charset.h $(srcdir)/glob.h \
-	$(srcdir)/gmtoff.h $(srcdir)/imclient.h $(srcdir)/imparse.h \
-	$(srcdir)/cyr_lock.h $(srcdir)/map.h $(srcdir)/mkgmtime.h \
-	$(srcdir)/nonblock.h $(srcdir)/parseaddr.h $(srcdir)/prot.h \
-	$(srcdir)/retry.h $(srcdir)/sysexits.h $(srcdir)/strhash.h \
-	$(srcdir)/lsort.h $(srcdir)/stristr.h $(srcdir)/signals.h \
-	$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h \
-	$(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
-	$(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
-	$(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
-	$(srcdir)/md5.h $(srcdir)/crc32.h $(srcdir)/strarray.h
-
-LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
-	libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
-	lsort.o stristr.o rfc822date.o signals.o cyrusdb.o strhash.o strarray.o \
-	chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
-	gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
-	@LIBOBJS@ @CYRUSDB_OBJS@ \
-	iptostring.o xmalloc.o wildmat.o byteorder64.o \
-	xstrlcat.o xstrlcpy.o crc32.o
-
-LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
-	$(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
-	$(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
-	imapopts.h
-LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
-	xstrlcat.o xstrlcpy.o assert.o util.o signals.o @IPV6_OBJS@
-
-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
-
-install:
-	$(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-	$(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
-	$(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
-	 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
-	for file in $(LIBCYR_HDRS); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
-	done
-	for file in $(LIBCYRM_HDRS); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
-	done
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-libcyrus.a: $(LIBCYR_OBJS)
-	rm -f libcyrus.a
-	ar cr libcyrus.a $(LIBCYR_OBJS)
-	$(RANLIB) libcyrus.a
-
-libcyrus_min.a: $(LIBCYRM_OBJS)
-	rm -f libcyrus_min.a
-	ar cr libcyrus_min.a $(LIBCYRM_OBJS)
-	$(RANLIB) libcyrus_min.a
-
-imapopts.c: imapoptions $(srcdir)/../tools/config2header
-	$(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
-
-imapopts.h: imapopts.c
-
-chartable.c: mkchartable.pl charset/*.t charset/unifix.txt charset/UnicodeData.txt
-	@echo "### Building chartables..."
-	rm -f chartable.c
-	perl ./mkchartable.pl \
-	 -m $(srcdir)/charset/unifix.txt \
-	 -m $(srcdir)/charset/UnicodeData.txt \
-	 $(srcdir)/charset/*.t \
-	 > chartable.c \
-	 || (rm -f chartable.c && exit 1)
-	@echo "### Done building chartables."
-
-clean:
-	rm -f *.o *.a chartable.c Makefile.bak makedepend.log \
-	$(BUILTSOURCES)
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/lib/imapopts.c Deleted

@@ -1,917 +0,0 @@
-/* auto-generated by config2header 1.17 */
-
-/* DO NOT EDIT */
-
-/* THIS FILE AUTOMATICALLY GENERATED BY config2header 1.17 */
-
-#include <config.h>
-
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-
-#include <unistd.h>
-
-#endif
-
-#include <syslog.h>
-
-#include <stdlib.h>
-
-#include <string.h>
-
-#include "imapopts.h"
-
-
-
-struct imapopt_s imapopts =
-
-{
-
- { IMAPOPT_ZERO, "", 0, OPT_NOTOPT, { NULL }, { { NULL, IMAP_ENUM_ZERO } } },
-
- { IMAPOPT_ADMINS, "admins", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_AFSPTS_LOCALREALMS, "afspts_localrealms", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_AFSPTS_MYCELL, "afspts_mycell", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWALLSUBSCRIBE, "allowallsubscribe", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWANONYMOUSLOGIN, "allowanonymouslogin", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWAPOP, "allowapop", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWNEWNEWS, "allownewnews", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWPLAINTEXT, "allowplaintext", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALLOWUSERMOVES, "allowusermoves", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ALTNAMESPACE, "altnamespace", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ANNOTATION_DB, "annotation_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ANNOTATION_DB_PATH, "annotation_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ANYONEUSERACL, "anyoneuseracl", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_ANNOTATION_DEFINITIONS, "annotation_definitions", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_AUDITLOG, "auditlog", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_AUTH_MECH, "auth_mech", 0, OPT_STRINGLIST,
- {(void*)("unix")},
- { { "unix" , IMAP_ENUM_ZERO },
- { "pts" , IMAP_ENUM_ZERO },
- { "krb" , IMAP_ENUM_ZERO },
- { "krb5" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_AUTOCREATEQUOTA, "autocreatequota", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_BERKELEY_CACHESIZE, "berkeley_cachesize", 0, OPT_INT,
- {(void*)512},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_BERKELEY_LOCKS_MAX, "berkeley_locks_max", 0, OPT_INT,
- {(void*)50000},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_BERKELEY_TXNS_MAX, "berkeley_txns_max", 0, OPT_INT,
- {(void*)100},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_BOUNDARY_LIMIT, "boundary_limit", 0, OPT_INT,
- {(void*)1000},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_CLIENT_TIMEOUT, "client_timeout", 0, OPT_INT,
- {(void*)10},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_COMMANDMINTIMER, "commandmintimer", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_CONFIGDIRECTORY, "configdirectory", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DEBUG_COMMAND, "debug_command", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DEFAULTACL, "defaultacl", 0, OPT_STRING,
- {(void *)("anyone lrs")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DEFAULTDOMAIN, "defaultdomain", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DEFAULTPARTITION, "defaultpartition", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DEFAULTSERVER, "defaultserver", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DELETEDPREFIX, "deletedprefix", 0, OPT_STRING,
- {(void *)("DELETED")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DELETE_MODE, "delete_mode", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_DELETE_MODE_IMMEDIATE)},
- { { "immediate" , IMAP_ENUM_DELETE_MODE_IMMEDIATE },
- { "delayed" , IMAP_ENUM_DELETE_MODE_DELAYED },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DELETERIGHT, "deleteright", 0, OPT_STRING,
- {(void *)("c")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DISABLE_USER_NAMESPACE, "disable_user_namespace", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DISABLE_SHARED_NAMESPACE, "disable_shared_namespace", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DISCONNECT_ON_VANISHED_MAILBOX, "disconnect_on_vanished_mailbox", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DUPLICATE_DB, "duplicate_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-nosync" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "berkeley-hash-nosync" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { "sql" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DUPLICATE_DB_PATH, "duplicate_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_DUPLICATESUPPRESSION, "duplicatesuppression", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_EXPUNGE_MODE, "expunge_mode", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_EXPUNGE_MODE_DEFAULT)},
- { { "default" , IMAP_ENUM_EXPUNGE_MODE_DEFAULT },
- { "immediate" , IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE },
- { "delayed" , IMAP_ENUM_EXPUNGE_MODE_DELAYED },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_EXPUNGE_DAYS, "expunge_days", 0, OPT_INT,
- {(void*)7},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_FAILEDLOGINPAUSE, "failedloginpause", 0, OPT_INT,
- {(void*)3},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_FLUSHSEENSTATE, "flushseenstate", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_FOOLSTUPIDCLIENTS, "foolstupidclients", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_FORCE_SASL_CLIENT_MECH, "force_sasl_client_mech", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_FULLDIRHASH, "fulldirhash", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_HASHIMAPSPOOL, "hashimapspool", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IDLESOCKET, "idlesocket", 0, OPT_STRING,
- {(void *)("{configdirectory}/socket/idle")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IGNOREREFERENCE, "ignorereference", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IMAPIDLEPOLL, "imapidlepoll", 0, OPT_INT,
- {(void*)60},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IMAPIDRESPONSE, "imapidresponse", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IMAPMAGICPLUS, "imapmagicplus", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IMPLICIT_OWNER_RIGHTS, "implicit_owner_rights", 0, OPT_STRING,
- {(void *)("lkxa")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_IMPROVED_MBOXLIST_SORT, "improved_mboxlist_sort", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_INTERNALDATE_HEURISTIC, "internaldate_heuristic", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_INTERNALDATE_HEURISTIC_STANDARD)},
- { { "standard" , IMAP_ENUM_INTERNALDATE_HEURISTIC_STANDARD },
- { "receivedheader" , IMAP_ENUM_INTERNALDATE_HEURISTIC_RECEIVEDHEADER },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_AUTHZ, "ldap_authz", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_BASE, "ldap_base", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_BIND_DN, "ldap_bind_dn", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_DEREF, "ldap_deref", 0, OPT_STRINGLIST,
- {(void*)("never")},
- { { "search" , IMAP_ENUM_ZERO },
- { "find" , IMAP_ENUM_ZERO },
- { "always" , IMAP_ENUM_ZERO },
- { "never" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_FILTER, "ldap_filter", 0, OPT_STRING,
- {(void *)("(uid=%u)")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_GROUP_BASE, "ldap_group_base", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_GROUP_FILTER, "ldap_group_filter", 0, OPT_STRING,
- {(void *)("(cn=%u)")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_GROUP_SCOPE, "ldap_group_scope", 0, OPT_STRINGLIST,
- {(void*)("sub")},
- { { "sub" , IMAP_ENUM_ZERO },
- { "one" , IMAP_ENUM_ZERO },
- { "base" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_ID, "ldap_id", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MECH, "ldap_mech", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MEMBER_ATTRIBUTE, "ldap_member_attribute", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MEMBER_BASE, "ldap_member_base", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MEMBER_FILTER, "ldap_member_filter", 0, OPT_STRING,
- {(void *)("(member=%D)")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MEMBER_METHOD, "ldap_member_method", 0, OPT_STRINGLIST,
- {(void*)("attribute")},
- { { "attribute" , IMAP_ENUM_ZERO },
- { "filter" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_MEMBER_SCOPE, "ldap_member_scope", 0, OPT_STRINGLIST,
- {(void*)("sub")},
- { { "sub" , IMAP_ENUM_ZERO },
- { "one" , IMAP_ENUM_ZERO },
- { "base" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_PASSWORD, "ldap_password", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_REALM, "ldap_realm", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_REFERRALS, "ldap_referrals", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_RESTART, "ldap_restart", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL, "ldap_sasl", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL_AUTHC, "ldap_sasl_authc", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL_AUTHZ, "ldap_sasl_authz", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL_MECH, "ldap_sasl_mech", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL_PASSWORD, "ldap_sasl_password", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SASL_REALM, "ldap_sasl_realm", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SCOPE, "ldap_scope", 0, OPT_STRINGLIST,
- {(void*)("sub")},
- { { "sub" , IMAP_ENUM_ZERO },
- { "one" , IMAP_ENUM_ZERO },
- { "base" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SERVERS, "ldap_servers", 0, OPT_STRING,
- {(void *)("ldap://localhost/")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_SIZE_LIMIT, "ldap_size_limit", 0, OPT_INT,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_START_TLS, "ldap_start_tls", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TIME_LIMIT, "ldap_time_limit", 0, OPT_INT,
- {(void*)5},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TIMEOUT, "ldap_timeout", 0, OPT_INT,
- {(void*)5},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_CACERT_DIR, "ldap_tls_cacert_dir", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_CACERT_FILE, "ldap_tls_cacert_file", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_CERT, "ldap_tls_cert", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_CHECK_PEER, "ldap_tls_check_peer", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_CIPHERS, "ldap_tls_ciphers", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_TLS_KEY, "ldap_tls_key", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_URI, "ldap_uri", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LDAP_VERSION, "ldap_version", 0, OPT_INT,
- {(void*)3},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTP_DOWNCASE_RCPT, "lmtp_downcase_rcpt", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH, "lmtp_fuzzy_mailbox_match", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTP_OVER_QUOTA_PERM_FAILURE, "lmtp_over_quota_perm_failure", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTP_STRICT_QUOTA, "lmtp_strict_quota", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTP_STRICT_RFC2821, "lmtp_strict_rfc2821", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTPSOCKET, "lmtpsocket", 0, OPT_STRING,
- {(void *)("{configdirectory}/socket/lmtp")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LMTPTXN_TIMEOUT, "lmtptxn_timeout", 0, OPT_INT,
- {(void*)300},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LOGINREALMS, "loginrealms", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LOGINUSEACL, "loginuseacl", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_LOGTIMESTAMPS, "logtimestamps", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAILBOX_DEFAULT_OPTIONS, "mailbox_default_options", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAILNOTIFIER, "mailnotifier", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAXHEADERLINES, "maxheaderlines", 0, OPT_INT,
- {(void*)1000},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAXMESSAGESIZE, "maxmessagesize", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAXQUOTED, "maxquoted", 0, OPT_INT,
- {(void*)131072},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MAXWORD, "maxword", 0, OPT_INT,
- {(void*)131072},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MBOXKEY_DB, "mboxkey_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MBOXLIST_DB, "mboxlist_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "flat" , IMAP_ENUM_ZERO },
- { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MBOXLIST_DB_PATH, "mboxlist_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MBOXNAME_LOCKPATH, "mboxname_lockpath", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_METAPARTITION_FILES, "metapartition_files", 0, OPT_BITFIELD,
- {(void *)(0)},
- { { "header" , IMAP_ENUM_METAPARTITION_FILES_HEADER },
- { "index" , IMAP_ENUM_METAPARTITION_FILES_INDEX },
- { "cache" , IMAP_ENUM_METAPARTITION_FILES_CACHE },
- { "expunge" , IMAP_ENUM_METAPARTITION_FILES_EXPUNGE },
- { "squat" , IMAP_ENUM_METAPARTITION_FILES_SQUAT },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_AUTHNAME, "mupdate_authname", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_CONFIG, "mupdate_config", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_MUPDATE_CONFIG_STANDARD)},
- { { "standard" , IMAP_ENUM_MUPDATE_CONFIG_STANDARD },
- { "unified" , IMAP_ENUM_MUPDATE_CONFIG_UNIFIED },
- { "replicated" , IMAP_ENUM_MUPDATE_CONFIG_REPLICATED },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUNGE8BIT, "munge8bit", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_CONNECTIONS_MAX, "mupdate_connections_max", 0, OPT_INT,
- {(void*)128},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_PASSWORD, "mupdate_password", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_PORT, "mupdate_port", 0, OPT_INT,
- {(void*)3905},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_REALM, "mupdate_realm", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_RETRY_DELAY, "mupdate_retry_delay", 0, OPT_INT,
- {(void*)20},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_SERVER, "mupdate_server", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_USERNAME, "mupdate_username", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_WORKERS_MAX, "mupdate_workers_max", 0, OPT_INT,
- {(void*)50},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_WORKERS_MAXSPARE, "mupdate_workers_maxspare", 0, OPT_INT,
- {(void*)10},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_WORKERS_MINSPARE, "mupdate_workers_minspare", 0, OPT_INT,
- {(void*)2},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_MUPDATE_WORKERS_START, "mupdate_workers_start", 0, OPT_INT,
- {(void*)5},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NETSCAPEURL, "netscapeurl", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSADDHEADERS, "newsaddheaders", 0, OPT_BITFIELD,
- {(void *)(IMAP_ENUM_NEWSADDHEADERS_TO
-			 | 0)},
- { { "to" , IMAP_ENUM_NEWSADDHEADERS_TO },
- { "replyto" , IMAP_ENUM_NEWSADDHEADERS_REPLYTO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSGROUPS, "newsgroups", 0, OPT_STRING,
- {(void *)("*")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSMASTER, "newsmaster", 0, OPT_STRING,
- {(void *)("news")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSPEER, "newspeer", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSPOSTUSER, "newspostuser", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSPREFIX, "newsprefix", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NEWSRC_DB_PATH, "newsrc_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NNTPTIMEOUT, "nntptimeout", 0, OPT_INT,
- {(void*)3},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NOTIFYSOCKET, "notifysocket", 0, OPT_STRING,
- {(void *)("{configdirectory}/socket/notify")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_NOTIFY_EXTERNAL, "notify_external", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PLAINTEXTLOGINPAUSE, "plaintextloginpause", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PLAINTEXTLOGINALERT, "plaintextloginalert", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPEXPIRETIME, "popexpiretime", 0, OPT_INT,
- {(void*)-1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPMINPOLL, "popminpoll", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPSUBFOLDERS, "popsubfolders", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPPOLLPADDING, "poppollpadding", 0, OPT_INT,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPTIMEOUT, "poptimeout", 0, OPT_INT,
- {(void*)10},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPUSEACL, "popuseacl", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POPUSEIMAPFLAGS, "popuseimapflags", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POSTMASTER, "postmaster", 0, OPT_STRING,
- {(void *)("postmaster")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POSTSPEC, "postspec", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_POSTUSER, "postuser", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROC_PATH, "proc_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXY_AUTHNAME, "proxy_authname", 0, OPT_STRING,
- {(void *)("proxy")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXY_COMPRESS, "proxy_compress", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXY_PASSWORD, "proxy_password", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXY_REALM, "proxy_realm", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXYD_ALLOW_STATUS_REFERRAL, "proxyd_allow_status_referral", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS, "proxyd_disable_mailbox_referrals", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PROXYSERVERS, "proxyservers", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTS_MODULE, "pts_module", 0, OPT_STRINGLIST,
- {(void*)("afskrb")},
- { { "afskrb" , IMAP_ENUM_ZERO },
- { "ldap" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTLOADER_SOCK, "ptloader_sock", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTSCACHE_DB, "ptscache_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTSCACHE_DB_PATH, "ptscache_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTSCACHE_TIMEOUT, "ptscache_timeout", 0, OPT_INT,
- {(void*)10800},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTSKRB5_CONVERT524, "ptskrb5_convert524", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_PTSKRB5_STRIP_DEFAULT_REALM, "ptskrb5_strip_default_realm", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_QOSMARKING, "qosmarking", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_QOSMARKING_CS0)},
- { { "cs0" , IMAP_ENUM_QOSMARKING_CS0 },
- { "cs1" , IMAP_ENUM_QOSMARKING_CS1 },
- { "cs2" , IMAP_ENUM_QOSMARKING_CS2 },
- { "cs3" , IMAP_ENUM_QOSMARKING_CS3 },
- { "cs4" , IMAP_ENUM_QOSMARKING_CS4 },
- { "cs5" , IMAP_ENUM_QOSMARKING_CS5 },
- { "cs6" , IMAP_ENUM_QOSMARKING_CS6 },
- { "cs7" , IMAP_ENUM_QOSMARKING_CS7 },
- { "af11" , IMAP_ENUM_QOSMARKING_AF11 },
- { "af12" , IMAP_ENUM_QOSMARKING_AF12 },
- { "af13" , IMAP_ENUM_QOSMARKING_AF13 },
- { "af21" , IMAP_ENUM_QOSMARKING_AF21 },
- { "af22" , IMAP_ENUM_QOSMARKING_AF22 },
- { "af23" , IMAP_ENUM_QOSMARKING_AF23 },
- { "af31" , IMAP_ENUM_QOSMARKING_AF31 },
- { "af32" , IMAP_ENUM_QOSMARKING_AF32 },
- { "af33" , IMAP_ENUM_QOSMARKING_AF33 },
- { "af41" , IMAP_ENUM_QOSMARKING_AF41 },
- { "af42" , IMAP_ENUM_QOSMARKING_AF42 },
- { "af43" , IMAP_ENUM_QOSMARKING_AF43 },
- { "ef" , IMAP_ENUM_QOSMARKING_EF },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_QUOTA_DB, "quota_db", 0, OPT_STRINGLIST,
- {(void*)("quotalegacy")},
- { { "flat" , IMAP_ENUM_ZERO },
- { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { "sql" , IMAP_ENUM_ZERO },
- { "quotalegacy" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_QUOTA_DB_PATH, "quota_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_QUOTAWARN, "quotawarn", 0, OPT_INT,
- {(void*)90},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_QUOTAWARNKB, "quotawarnkb", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_REJECT8BIT, "reject8bit", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_RFC2046_STRICT, "rfc2046_strict", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_RFC3028_STRICT, "rfc3028_strict", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SASL_MAXIMUM_LAYER, "sasl_maximum_layer", 0, OPT_INT,
- {(void*)256},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SASL_MINIMUM_LAYER, "sasl_minimum_layer", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SEENSTATE_DB, "seenstate_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "flat" , IMAP_ENUM_ZERO },
- { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SENDMAIL, "sendmail", 0, OPT_STRING,
- {(void *)("/usr/lib/sendmail")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SERVERLIST, "serverlist", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SERVERNAME, "servername", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SERVERINFO, "serverinfo", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_SERVERINFO_ON)},
- { { "off" , IMAP_ENUM_SERVERINFO_OFF },
- { "min" , IMAP_ENUM_SERVERINFO_MIN },
- { "on" , IMAP_ENUM_SERVERINFO_ON },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SHAREDPREFIX, "sharedprefix", 0, OPT_STRING,
- {(void *)("Shared Folders")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_ALLOWREFERRALS, "sieve_allowreferrals", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_EXTENSIONS, "sieve_extensions", 0, OPT_BITFIELD,
- {(void *)(IMAP_ENUM_SIEVE_EXTENSIONS_FILEINTO
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_REJECT
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_VACATION
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_IMAPFLAGS
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_NOTIFY
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_ENVELOPE
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_RELATIONAL
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_REGEX
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_SUBADDRESS
-			 | IMAP_ENUM_SIEVE_EXTENSIONS_COPY
-			 | 0)},
- { { "fileinto" , IMAP_ENUM_SIEVE_EXTENSIONS_FILEINTO },
- { "reject" , IMAP_ENUM_SIEVE_EXTENSIONS_REJECT },
- { "vacation" , IMAP_ENUM_SIEVE_EXTENSIONS_VACATION },
- { "imapflags" , IMAP_ENUM_SIEVE_EXTENSIONS_IMAPFLAGS },
- { "notify" , IMAP_ENUM_SIEVE_EXTENSIONS_NOTIFY },
- { "include" , IMAP_ENUM_SIEVE_EXTENSIONS_INCLUDE },
- { "envelope" , IMAP_ENUM_SIEVE_EXTENSIONS_ENVELOPE },
- { "body" , IMAP_ENUM_SIEVE_EXTENSIONS_BODY },
- { "relational" , IMAP_ENUM_SIEVE_EXTENSIONS_RELATIONAL },
- { "regex" , IMAP_ENUM_SIEVE_EXTENSIONS_REGEX },
- { "subaddress" , IMAP_ENUM_SIEVE_EXTENSIONS_SUBADDRESS },
- { "copy" , IMAP_ENUM_SIEVE_EXTENSIONS_COPY },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_MAXSCRIPTSIZE, "sieve_maxscriptsize", 0, OPT_INT,
- {(void*)32},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_MAXSCRIPTS, "sieve_maxscripts", 0, OPT_INT,
- {(void*)5},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_UTF8FILEINTO, "sieve_utf8fileinto", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVE_SASL_SEND_UNSOLICITED_CAPABILITY, "sieve_sasl_send_unsolicited_capability", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVEDIR, "sievedir", 0, OPT_STRING,
- {(void *)("/usr/sieve")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVENOTIFIER, "sievenotifier", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SIEVEUSEHOMEDIR, "sieveusehomedir", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SINGLEINSTANCESTORE, "singleinstancestore", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SKIPLIST_ALWAYS_CHECKPOINT, "skiplist_always_checkpoint", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SKIPLIST_UNSAFE, "skiplist_unsafe", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SOFT_NOAUTH, "soft_noauth", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SPECIALUSEALWAYS, "specialusealways", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_DATABASE, "sql_database", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_ENGINE, "sql_engine", 0, OPT_STRINGLIST,
- {(void*)(NULL)},
- { { "mysql" , IMAP_ENUM_ZERO },
- { "pgsql" , IMAP_ENUM_ZERO },
- { "sqlite" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_HOSTNAMES, "sql_hostnames", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_PASSWD, "sql_passwd", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_USER, "sql_user", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SQL_USESSL, "sql_usessl", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SRVTAB, "srvtab", 0, OPT_STRING,
- {(void *)("")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SUBMITSERVERS, "submitservers", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SUBSCRIPTION_DB, "subscription_db", 0, OPT_STRINGLIST,
- {(void*)("flat")},
- { { "flat" , IMAP_ENUM_ZERO },
- { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SUPPRESS_CAPABILITIES, "suppress_capabilities", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_STATUSCACHE, "statuscache", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_STATUSCACHE_DB, "statuscache_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-nosync" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "berkeley-hash-nosync" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_STATUSCACHE_DB_PATH, "statuscache_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_AUTHNAME, "sync_authname", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_COMPRESS, "sync_compress", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_HOST, "sync_host", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_LOG, "sync_log", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_LOG_CHAIN, "sync_log_chain", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_LOG_CHANNELS, "sync_log_channels", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_PASSWORD, "sync_password", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_PORT, "sync_port", 0, OPT_STRING,
- {(void *)("csync")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_REALM, "sync_realm", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_REPEAT_INTERVAL, "sync_repeat_interval", 0, OPT_INT,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYNC_SHUTDOWN_FILE, "sync_shutdown_file", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_SYSLOG_PREFIX, "syslog_prefix", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TCP_KEEPALIVE, "tcp_keepalive", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TCP_KEEPALIVE_CNT, "tcp_keepalive_cnt", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TCP_KEEPALIVE_IDLE, "tcp_keepalive_idle", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TCP_KEEPALIVE_INTVL, "tcp_keepalive_intvl", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TEMP_PATH, "temp_path", 0, OPT_STRING,
- {(void *)("/tmp")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TIMEOUT, "timeout", 0, OPT_INT,
- {(void*)30},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_CA_FILE, "tls_ca_file", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_CA_PATH, "tls_ca_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLSCACHE_DB, "tlscache_db", 0, OPT_STRINGLIST,
- {(void*)("skiplist")},
- { { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-nosync" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "berkeley-hash-nosync" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { "sql" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLSCACHE_DB_PATH, "tlscache_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_CERT_FILE, "tls_cert_file", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_CIPHER_LIST, "tls_cipher_list", 0, OPT_STRING,
- {(void *)("DEFAULT")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_KEY_FILE, "tls_key_file", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_REQUIRE_CERT, "tls_require_cert", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_TLS_SESSION_TIMEOUT, "tls_session_timeout", 0, OPT_INT,
- {(void*)1440},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_UMASK, "umask", 0, OPT_STRING,
- {(void *)("077")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_USERDENY_DB, "userdeny_db", 0, OPT_STRINGLIST,
- {(void*)("flat")},
- { { "flat" , IMAP_ENUM_ZERO },
- { "berkeley" , IMAP_ENUM_ZERO },
- { "berkeley-hash" , IMAP_ENUM_ZERO },
- { "skiplist" , IMAP_ENUM_ZERO },
- { "sql" , IMAP_ENUM_ZERO },
- { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_USERDENY_DB_PATH, "userdeny_db_path", 0, OPT_STRING,
- {(void *)(NULL)},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_USER_FOLDER_LIMIT, "user_folder_limit", 0, OPT_INT,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_USERNAME_TOLOWER, "username_tolower", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_USERPREFIX, "userprefix", 0, OPT_STRING,
- {(void *)("Other Users")},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_UNIX_GROUP_ENABLE, "unix_group_enable", 0, OPT_SWITCH,
- {(void*)1},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_UNIXHIERARCHYSEP, "unixhierarchysep", 0, OPT_SWITCH,
- {(void*)0},
- { { NULL, IMAP_ENUM_ZERO } } },
- { IMAPOPT_VIRTDOMAINS, "virtdomains", 0, OPT_ENUM,
- {(void *)(IMAP_ENUM_VIRTDOMAINS_OFF)},
- { { "off" , IMAP_ENUM_VIRTDOMAINS_OFF },
- { "userid" , IMAP_ENUM_VIRTDOMAINS_USERID },
- { "on" , IMAP_ENUM_VIRTDOMAINS_ON },
- { NULL, IMAP_ENUM_ZERO } } },
-
- { IMAPOPT_LAST, NULL, 0, OPT_NOTOPT, { NULL }, { { NULL, IMAP_ENUM_ZERO } } }
-
-};
-
-
-
-/* c code goes here */
-
-
-

cyrus-imapd-2.4.17.tar.gz/lib/imapopts.h Deleted

@@ -1,390 +0,0 @@
-/* auto-generated by config2header 1.17 */
-#ifndef INCLUDED_IMAPOPTS_H
-#define INCLUDED_IMAPOPTS_H
-
-enum opttype {
- OPT_BITFIELD,
- OPT_STRINGLIST,
- OPT_ENUM,
- OPT_SWITCH,
- OPT_INT,
- OPT_STRING,
- OPT_NOTOPT
-};
-
-
-enum imapopt {
-
- IMAPOPT_ZERO = 0,
-
- IMAPOPT_ADMINS,
- IMAPOPT_AFSPTS_LOCALREALMS,
- IMAPOPT_AFSPTS_MYCELL,
- IMAPOPT_ALLOWALLSUBSCRIBE,
- IMAPOPT_ALLOWANONYMOUSLOGIN,
- IMAPOPT_ALLOWAPOP,
- IMAPOPT_ALLOWNEWNEWS,
- IMAPOPT_ALLOWPLAINTEXT,
- IMAPOPT_ALLOWUSERMOVES,
- IMAPOPT_ALTNAMESPACE,
- IMAPOPT_ANNOTATION_DB,
- IMAPOPT_ANNOTATION_DB_PATH,
- IMAPOPT_ANYONEUSERACL,
- IMAPOPT_ANNOTATION_DEFINITIONS,
- IMAPOPT_AUDITLOG,
- IMAPOPT_AUTH_MECH,
- IMAPOPT_AUTOCREATEQUOTA,
- IMAPOPT_BERKELEY_CACHESIZE,
- IMAPOPT_BERKELEY_LOCKS_MAX,
- IMAPOPT_BERKELEY_TXNS_MAX,
- IMAPOPT_BOUNDARY_LIMIT,
- IMAPOPT_CLIENT_TIMEOUT,
- IMAPOPT_COMMANDMINTIMER,
- IMAPOPT_CONFIGDIRECTORY,
- IMAPOPT_DEBUG_COMMAND,
- IMAPOPT_DEFAULTACL,
- IMAPOPT_DEFAULTDOMAIN,
- IMAPOPT_DEFAULTPARTITION,
- IMAPOPT_DEFAULTSERVER,
- IMAPOPT_DELETEDPREFIX,
- IMAPOPT_DELETE_MODE,
- IMAPOPT_DELETERIGHT,
- IMAPOPT_DISABLE_USER_NAMESPACE,
- IMAPOPT_DISABLE_SHARED_NAMESPACE,
- IMAPOPT_DISCONNECT_ON_VANISHED_MAILBOX,
- IMAPOPT_DUPLICATE_DB,
- IMAPOPT_DUPLICATE_DB_PATH,
- IMAPOPT_DUPLICATESUPPRESSION,
- IMAPOPT_EXPUNGE_MODE,
- IMAPOPT_EXPUNGE_DAYS,
- IMAPOPT_FAILEDLOGINPAUSE,
- IMAPOPT_FLUSHSEENSTATE,
- IMAPOPT_FOOLSTUPIDCLIENTS,
- IMAPOPT_FORCE_SASL_CLIENT_MECH,
- IMAPOPT_FULLDIRHASH,
- IMAPOPT_HASHIMAPSPOOL,
- IMAPOPT_IDLESOCKET,
- IMAPOPT_IGNOREREFERENCE,
- IMAPOPT_IMAPIDLEPOLL,
- IMAPOPT_IMAPIDRESPONSE,
- IMAPOPT_IMAPMAGICPLUS,
- IMAPOPT_IMPLICIT_OWNER_RIGHTS,
- IMAPOPT_IMPROVED_MBOXLIST_SORT,
- IMAPOPT_INTERNALDATE_HEURISTIC,
- IMAPOPT_LDAP_AUTHZ,
- IMAPOPT_LDAP_BASE,
- IMAPOPT_LDAP_BIND_DN,
- IMAPOPT_LDAP_DEREF,
- IMAPOPT_LDAP_FILTER,
- IMAPOPT_LDAP_GROUP_BASE,
- IMAPOPT_LDAP_GROUP_FILTER,
- IMAPOPT_LDAP_GROUP_SCOPE,
- IMAPOPT_LDAP_ID,
- IMAPOPT_LDAP_MECH,
- IMAPOPT_LDAP_MEMBER_ATTRIBUTE,
- IMAPOPT_LDAP_MEMBER_BASE,
- IMAPOPT_LDAP_MEMBER_FILTER,
- IMAPOPT_LDAP_MEMBER_METHOD,
- IMAPOPT_LDAP_MEMBER_SCOPE,
- IMAPOPT_LDAP_PASSWORD,
- IMAPOPT_LDAP_REALM,
- IMAPOPT_LDAP_REFERRALS,
- IMAPOPT_LDAP_RESTART,
- IMAPOPT_LDAP_SASL,
- IMAPOPT_LDAP_SASL_AUTHC,
- IMAPOPT_LDAP_SASL_AUTHZ,
- IMAPOPT_LDAP_SASL_MECH,
- IMAPOPT_LDAP_SASL_PASSWORD,
- IMAPOPT_LDAP_SASL_REALM,
- IMAPOPT_LDAP_SCOPE,
- IMAPOPT_LDAP_SERVERS,
- IMAPOPT_LDAP_SIZE_LIMIT,
- IMAPOPT_LDAP_START_TLS,
- IMAPOPT_LDAP_TIME_LIMIT,
- IMAPOPT_LDAP_TIMEOUT,
- IMAPOPT_LDAP_TLS_CACERT_DIR,
- IMAPOPT_LDAP_TLS_CACERT_FILE,
- IMAPOPT_LDAP_TLS_CERT,
- IMAPOPT_LDAP_TLS_CHECK_PEER,
- IMAPOPT_LDAP_TLS_CIPHERS,
- IMAPOPT_LDAP_TLS_KEY,
- IMAPOPT_LDAP_URI,
- IMAPOPT_LDAP_VERSION,
- IMAPOPT_LMTP_DOWNCASE_RCPT,
- IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH,
- IMAPOPT_LMTP_OVER_QUOTA_PERM_FAILURE,
- IMAPOPT_LMTP_STRICT_QUOTA,
- IMAPOPT_LMTP_STRICT_RFC2821,
- IMAPOPT_LMTPSOCKET,
- IMAPOPT_LMTPTXN_TIMEOUT,
- IMAPOPT_LOGINREALMS,
- IMAPOPT_LOGINUSEACL,
- IMAPOPT_LOGTIMESTAMPS,
- IMAPOPT_MAILBOX_DEFAULT_OPTIONS,
- IMAPOPT_MAILNOTIFIER,
- IMAPOPT_MAXHEADERLINES,
- IMAPOPT_MAXMESSAGESIZE,
- IMAPOPT_MAXQUOTED,
- IMAPOPT_MAXWORD,
- IMAPOPT_MBOXKEY_DB,
- IMAPOPT_MBOXLIST_DB,
- IMAPOPT_MBOXLIST_DB_PATH,
- IMAPOPT_MBOXNAME_LOCKPATH,
- IMAPOPT_METAPARTITION_FILES,
- IMAPOPT_MUPDATE_AUTHNAME,
- IMAPOPT_MUPDATE_CONFIG,
- IMAPOPT_MUNGE8BIT,
- IMAPOPT_MUPDATE_CONNECTIONS_MAX,
- IMAPOPT_MUPDATE_PASSWORD,
- IMAPOPT_MUPDATE_PORT,
- IMAPOPT_MUPDATE_REALM,
- IMAPOPT_MUPDATE_RETRY_DELAY,
- IMAPOPT_MUPDATE_SERVER,
- IMAPOPT_MUPDATE_USERNAME,
- IMAPOPT_MUPDATE_WORKERS_MAX,
- IMAPOPT_MUPDATE_WORKERS_MAXSPARE,
- IMAPOPT_MUPDATE_WORKERS_MINSPARE,
- IMAPOPT_MUPDATE_WORKERS_START,
- IMAPOPT_NETSCAPEURL,
- IMAPOPT_NEWSADDHEADERS,
- IMAPOPT_NEWSGROUPS,
- IMAPOPT_NEWSMASTER,
- IMAPOPT_NEWSPEER,
- IMAPOPT_NEWSPOSTUSER,
- IMAPOPT_NEWSPREFIX,
- IMAPOPT_NEWSRC_DB_PATH,
- IMAPOPT_NNTPTIMEOUT,
- IMAPOPT_NOTIFYSOCKET,
- IMAPOPT_NOTIFY_EXTERNAL,
- IMAPOPT_PLAINTEXTLOGINPAUSE,
- IMAPOPT_PLAINTEXTLOGINALERT,
- IMAPOPT_POPEXPIRETIME,
- IMAPOPT_POPMINPOLL,
- IMAPOPT_POPSUBFOLDERS,
- IMAPOPT_POPPOLLPADDING,
- IMAPOPT_POPTIMEOUT,
- IMAPOPT_POPUSEACL,
- IMAPOPT_POPUSEIMAPFLAGS,
- IMAPOPT_POSTMASTER,
- IMAPOPT_POSTSPEC,
- IMAPOPT_POSTUSER,
- IMAPOPT_PROC_PATH,
- IMAPOPT_PROXY_AUTHNAME,
- IMAPOPT_PROXY_COMPRESS,
- IMAPOPT_PROXY_PASSWORD,
- IMAPOPT_PROXY_REALM,
- IMAPOPT_PROXYD_ALLOW_STATUS_REFERRAL,
- IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS,
- IMAPOPT_PROXYSERVERS,
- IMAPOPT_PTS_MODULE,
- IMAPOPT_PTLOADER_SOCK,
- IMAPOPT_PTSCACHE_DB,
- IMAPOPT_PTSCACHE_DB_PATH,
- IMAPOPT_PTSCACHE_TIMEOUT,
- IMAPOPT_PTSKRB5_CONVERT524,
- IMAPOPT_PTSKRB5_STRIP_DEFAULT_REALM,
- IMAPOPT_QOSMARKING,
- IMAPOPT_QUOTA_DB,
- IMAPOPT_QUOTA_DB_PATH,
- IMAPOPT_QUOTAWARN,
- IMAPOPT_QUOTAWARNKB,
- IMAPOPT_REJECT8BIT,
- IMAPOPT_RFC2046_STRICT,
- IMAPOPT_RFC3028_STRICT,
- IMAPOPT_SASL_MAXIMUM_LAYER,
- IMAPOPT_SASL_MINIMUM_LAYER,
- IMAPOPT_SEENSTATE_DB,
- IMAPOPT_SENDMAIL,
- IMAPOPT_SERVERLIST,
- IMAPOPT_SERVERNAME,
- IMAPOPT_SERVERINFO,
- IMAPOPT_SHAREDPREFIX,
- IMAPOPT_SIEVE_ALLOWREFERRALS,
- IMAPOPT_SIEVE_EXTENSIONS,
- IMAPOPT_SIEVE_MAXSCRIPTSIZE,
- IMAPOPT_SIEVE_MAXSCRIPTS,
- IMAPOPT_SIEVE_UTF8FILEINTO,
- IMAPOPT_SIEVE_SASL_SEND_UNSOLICITED_CAPABILITY,
- IMAPOPT_SIEVEDIR,
- IMAPOPT_SIEVENOTIFIER,
- IMAPOPT_SIEVEUSEHOMEDIR,
- IMAPOPT_SINGLEINSTANCESTORE,
- IMAPOPT_SKIPLIST_ALWAYS_CHECKPOINT,
- IMAPOPT_SKIPLIST_UNSAFE,
- IMAPOPT_SOFT_NOAUTH,
- IMAPOPT_SPECIALUSEALWAYS,
- IMAPOPT_SQL_DATABASE,
- IMAPOPT_SQL_ENGINE,
- IMAPOPT_SQL_HOSTNAMES,
- IMAPOPT_SQL_PASSWD,
- IMAPOPT_SQL_USER,
- IMAPOPT_SQL_USESSL,
- IMAPOPT_SRVTAB,
- IMAPOPT_SUBMITSERVERS,
- IMAPOPT_SUBSCRIPTION_DB,
- IMAPOPT_SUPPRESS_CAPABILITIES,
- IMAPOPT_STATUSCACHE,
- IMAPOPT_STATUSCACHE_DB,
- IMAPOPT_STATUSCACHE_DB_PATH,
- IMAPOPT_SYNC_AUTHNAME,
- IMAPOPT_SYNC_COMPRESS,
- IMAPOPT_SYNC_HOST,
- IMAPOPT_SYNC_LOG,
- IMAPOPT_SYNC_LOG_CHAIN,
- IMAPOPT_SYNC_LOG_CHANNELS,
- IMAPOPT_SYNC_PASSWORD,
- IMAPOPT_SYNC_PORT,
- IMAPOPT_SYNC_REALM,
- IMAPOPT_SYNC_REPEAT_INTERVAL,
- IMAPOPT_SYNC_SHUTDOWN_FILE,
- IMAPOPT_SYSLOG_PREFIX,
- IMAPOPT_TCP_KEEPALIVE,
- IMAPOPT_TCP_KEEPALIVE_CNT,
- IMAPOPT_TCP_KEEPALIVE_IDLE,
- IMAPOPT_TCP_KEEPALIVE_INTVL,
- IMAPOPT_TEMP_PATH,
- IMAPOPT_TIMEOUT,
- IMAPOPT_TLS_CA_FILE,
- IMAPOPT_TLS_CA_PATH,
- IMAPOPT_TLSCACHE_DB,
- IMAPOPT_TLSCACHE_DB_PATH,
- IMAPOPT_TLS_CERT_FILE,
- IMAPOPT_TLS_CIPHER_LIST,
- IMAPOPT_TLS_KEY_FILE,
- IMAPOPT_TLS_REQUIRE_CERT,
- IMAPOPT_TLS_SESSION_TIMEOUT,
- IMAPOPT_UMASK,
- IMAPOPT_USERDENY_DB,
- IMAPOPT_USERDENY_DB_PATH,
- IMAPOPT_USER_FOLDER_LIMIT,
- IMAPOPT_USERNAME_TOLOWER,
- IMAPOPT_USERPREFIX,
- IMAPOPT_UNIX_GROUP_ENABLE,
- IMAPOPT_UNIXHIERARCHYSEP,
- IMAPOPT_VIRTDOMAINS,
-
- IMAPOPT_LAST
-
-};
-
-
-
-enum enum_value {
-
- IMAP_ENUM_ZERO = 0,
-
- IMAP_ENUM_DELETE_MODE_IMMEDIATE = 0,
- IMAP_ENUM_DELETE_MODE_DELAYED,
- IMAP_ENUM_EXPUNGE_MODE_DEFAULT = 0,
- IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE,
- IMAP_ENUM_EXPUNGE_MODE_DELAYED,
- IMAP_ENUM_INTERNALDATE_HEURISTIC_STANDARD = 0,
- IMAP_ENUM_INTERNALDATE_HEURISTIC_RECEIVEDHEADER,
- IMAP_ENUM_METAPARTITION_FILES_HEADER = (1<<0),
- IMAP_ENUM_METAPARTITION_FILES_INDEX = (1<<1),
- IMAP_ENUM_METAPARTITION_FILES_CACHE = (1<<2),
- IMAP_ENUM_METAPARTITION_FILES_EXPUNGE = (1<<3),
- IMAP_ENUM_METAPARTITION_FILES_SQUAT = (1<<4),
- IMAP_ENUM_MUPDATE_CONFIG_STANDARD = 0,
- IMAP_ENUM_MUPDATE_CONFIG_UNIFIED,
- IMAP_ENUM_MUPDATE_CONFIG_REPLICATED,
- IMAP_ENUM_NEWSADDHEADERS_TO = (1<<0),
- IMAP_ENUM_NEWSADDHEADERS_REPLYTO = (1<<1),
- IMAP_ENUM_QOSMARKING_CS0 = 0,
- IMAP_ENUM_QOSMARKING_CS1,
- IMAP_ENUM_QOSMARKING_CS2,
- IMAP_ENUM_QOSMARKING_CS3,
- IMAP_ENUM_QOSMARKING_CS4,
- IMAP_ENUM_QOSMARKING_CS5,
- IMAP_ENUM_QOSMARKING_CS6,
- IMAP_ENUM_QOSMARKING_CS7,
- IMAP_ENUM_QOSMARKING_AF11,
- IMAP_ENUM_QOSMARKING_AF12,
- IMAP_ENUM_QOSMARKING_AF13,
- IMAP_ENUM_QOSMARKING_AF21,
- IMAP_ENUM_QOSMARKING_AF22,
- IMAP_ENUM_QOSMARKING_AF23,
- IMAP_ENUM_QOSMARKING_AF31,
- IMAP_ENUM_QOSMARKING_AF32,
- IMAP_ENUM_QOSMARKING_AF33,
- IMAP_ENUM_QOSMARKING_AF41,
- IMAP_ENUM_QOSMARKING_AF42,
- IMAP_ENUM_QOSMARKING_AF43,
- IMAP_ENUM_QOSMARKING_EF,
- IMAP_ENUM_SERVERINFO_OFF = 0,
- IMAP_ENUM_SERVERINFO_MIN,
- IMAP_ENUM_SERVERINFO_ON,
- IMAP_ENUM_SIEVE_EXTENSIONS_FILEINTO = (1<<0),
- IMAP_ENUM_SIEVE_EXTENSIONS_REJECT = (1<<1),
- IMAP_ENUM_SIEVE_EXTENSIONS_VACATION = (1<<2),
- IMAP_ENUM_SIEVE_EXTENSIONS_IMAPFLAGS = (1<<3),
- IMAP_ENUM_SIEVE_EXTENSIONS_NOTIFY = (1<<4),
- IMAP_ENUM_SIEVE_EXTENSIONS_INCLUDE = (1<<5),
- IMAP_ENUM_SIEVE_EXTENSIONS_ENVELOPE = (1<<6),
- IMAP_ENUM_SIEVE_EXTENSIONS_BODY = (1<<7),
- IMAP_ENUM_SIEVE_EXTENSIONS_RELATIONAL = (1<<8),
- IMAP_ENUM_SIEVE_EXTENSIONS_REGEX = (1<<9),
- IMAP_ENUM_SIEVE_EXTENSIONS_SUBADDRESS = (1<<10),
- IMAP_ENUM_SIEVE_EXTENSIONS_COPY = (1<<11),
- IMAP_ENUM_VIRTDOMAINS_OFF = 0,
- IMAP_ENUM_VIRTDOMAINS_USERID,
- IMAP_ENUM_VIRTDOMAINS_ON
-
-};
-
-
-
-union config_value {
-
- void *dummy;
-
- const char *s;	/* OPT_STRING, OPT_STRINGLIST */
-
- long i;		/* OPT_INT */
-
- long b;		/* OPT_SWITCH */
-
- enum enum_value e;	/* OPT_ENUM */
-
- unsigned long x;	/* OPT_BITFIELD */
-
-};
-
-
-
-struct enum_option_s {
-
- const char *name;
-
- const enum enum_value val;
-
-};
-
-
-
-#define MAX_ENUM_OPTS 21
-
-struct imapopt_s {
-
- const enum imapopt opt;
-
- const char *optname;
-
- int seen;
-
- const enum opttype t;
-
- union config_value val;
-
- const struct enum_option_s enum_optionsMAX_ENUM_OPTS+1;
-
-};
-
-
-
-extern struct imapopt_s imapopts;
-
-
-
-#endif /* INCLUDED_IMAPOPTIONS_H */
-

cyrus-imapd-2.4.17.tar.gz/lib/rfc822date.c Deleted

@@ -1,78 +0,0 @@
-/* rfc822date.c -- Generate an 822 date
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: rfc822date.c,v 1.8 2010/01/06 17:01:47 murch Exp $
- */
-
-#include <stdio.h>
-
-#include "assert.h"
-#include "rfc822date.h"
-#include "gmtoff.h"
-
-static char *month = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-
-static char *wday = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
-
-/* 'buf' must be at least 80 characters */
-void rfc822date_gen(char *buf, size_t len, time_t t)
-{
- struct tm *tm;
- long gmtoff;
- int gmtnegative = 0;
-
- assert(buf != NULL);
-
- tm = localtime(&t);
- gmtoff = gmtoff_of(tm, t);
- if (gmtoff < 0) {
-	gmtoff = -gmtoff;
-	gmtnegative = 1;
- }
- gmtoff /= 60;
-
- snprintf(buf, len, "%s, %02d %s %4d %02d:%02d:%02d %c%.2lu%.2lu",
-	 wdaytm->tm_wday, 
-	 tm->tm_mday, monthtm->tm_mon, tm->tm_year + 1900,
-	 tm->tm_hour, tm->tm_min, tm->tm_sec,
-	 gmtnegative ? '-' : '+', gmtoff / 60, gmtoff % 60);
-}

cyrus-imapd-2.4.17.tar.gz/lib/rfc822date.h Deleted

@@ -1,53 +0,0 @@
-/* rfc822date.h -- Generate an 822 date
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: rfc822date.h,v 1.5 2010/01/06 17:01:47 murch Exp $
- */
-
-#ifndef INCLUDED_RFC822DATE_H
-#define INCLUDED_RFC822DATE_H
-
-#include <time.h>
-
-/* 'buf' must be at least 80 characters */
-void rfc822date_gen(char *buf, size_t len, time_t t);
-
-#endif

cyrus-imapd-2.4.17.tar.gz/lib/test/Makefile Deleted

cyrus-imapd-2.4.17.tar.gz/lib/test/imapurl.c Deleted

cyrus-imapd-2.4.17.tar.gz/lib/test/testglob.c Deleted

cyrus-imapd-2.4.17.tar.gz/makedepend Deleted

cyrus-imapd-2.4.17.tar.gz/makedepend/Makefile.in Deleted

@@ -1,82 +0,0 @@
-# Makefile for makedepend
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.9 2010/01/06 17:01:50 murch Exp $
-# 
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ 
-LIBS = @LIBS@
-DEPLIBS = @DEPLIBS@ 
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-
-all: makedepend
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
-	$(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
-		main.o parse.o pr.o $(DEPLIBS) $(LIBS)
-
-clean:
-	rm -f *.o Makefile.bak makedepend
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	makedepend $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-

cyrus-imapd-2.4.17.tar.gz/makedepend/configure Deleted

@@ -1,921 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: configure,v 1.4 2010/01/06 17:01:50 murch Exp $
-#
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.3 
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Initialize some other variables.
-subdirs=
-
-ac_prev=
-for ac_option
-do
-
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
- ac_prev=
- continue
- fi
-
- case "$ac_option" in
- -*=*) ac_optarg=`echo "$ac_option" | sed 's/-_a-zA-Z0-9*=//'` ;;
- *) ac_optarg= ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case "$ac_option" in
-
- -build | --build | --buil | --bui | --bu | --b)
- ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
- build="$ac_optarg" ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
-
- -disable-* | --disable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/-a-zA-Z0-9_//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- eval "enable_${ac_feature}=no" ;;
-
- -enable-* | --enable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/-_a-zA-Z0-9//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_${ac_feature}='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix="$ac_optarg" ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he)
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat << EOF
-Usage: configure options host
-Options: defaults in brackets after descriptions
-Configuration:
- --cache-file=FILE cache test results in FILE
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
- --version print the version of autoconf that created configure
-Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
- $ac_default_prefix
- --exec-prefix=PREFIX install architecture-dependent files in PREFIX
- same as prefix
- --srcdir=DIR find the sources in DIR configure dir or ..
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-Host type:
- --build=BUILD configure for building on BUILD BUILD=HOST
- --host=HOST configure for HOST guessed
- --target=TARGET configure for TARGET TARGET=HOST
-Features and packages:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE=ARG include FEATURE ARG=yes
- --with-PACKAGE=ARG use PACKAGE ARG=yes
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
---enable and --with options recognized:$ac_help
-EOF
- exit 0 ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host="$ac_optarg" ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix="$ac_optarg" ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix="$ac_optarg" ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix="$ac_optarg" ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name="$ac_optarg" ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir="$ac_optarg" ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target="$ac_optarg" ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.3"
- exit 0 ;;
-
- -with-* | --with-*)
- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/-_a-zA-Z0-9//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
- *) ac_optarg=yes ;;
- esac
- eval "with_${ac_package}='$ac_optarg'" ;;
-
- -without-* | --without-*)
- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/-a-zA-Z0-9_//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- eval "with_${ac_package}=no" ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes="$ac_optarg" ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries="$ac_optarg" ;;
-
- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
- ;;
-
- *) 
- if test -n "`echo $ac_option| sed 's/-a-z0-9.//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" 1>&2
- fi
- if test "x$nonopt" != xNONE; then
- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
- fi
- nonopt="$ac_option"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
- exec 6>/dev/null
-else
- exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
- case "$ac_arg" in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*"	"*|*\\\~\#\$\^\&\*\{\}\\\|\;\<\>\?*)
- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
- esac
-done
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=cppsetup.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/^/^/*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
- else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
- fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%$^/$/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
-fi
-for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- echo "loading site script $ac_site_file"
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- echo "loading cache $cache_file"
- . $cache_file
-else
- echo "creating cache $cache_file"
- > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ac_n= ac_c='
-' ac_t='	'
- else
- ac_n=-n ac_c= ac_t=
- fi
-else
- ac_n= ac_c='\c' ac_t=
-fi
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.c <<EOF
-#ifdef __GNUC__
- yes;
-#endif
-EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
-else
- ac_cv_prog_gcc=no
-fi
-fi
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
- if test "${CFLAGS+set}" != set; then
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
- ac_cv_prog_gcc_g=yes
-else
- ac_cv_prog_gcc_g=no
-fi
-rm -f conftest*
-
-fi
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
- if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
- else
- CFLAGS="-O"
- fi
- fi
-else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- for ac_prog in ginstall installbsd scoinst install; do
- if test -f $ac_dir/$ac_prog; then
-	 if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 # OSF/1 installbsd also uses dspmsg, but is usable.
-	 :
-	 else
-	 ac_cv_path_install="$ac_dir/$ac_prog -c"
-	 break 2
-	 fi
-	fi
- done
- ;;
- esac
- done
- IFS="$ac_save_ifs"
- # As a last resort, use the slow shell script.
- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
-fi
- INSTALL="$ac_cv_path_install"
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-set dummy ${MAKE-make}; ac_make=$2
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make1: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- SET_MAKE=
-else
- echo "$ac_t""no" 1>&6
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 615 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 629 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
-fi
-fi
-CPP="$ac_cv_prog_CPP"
-echo "$ac_t""$CPP" 1>&6
-
-for ac_hdr in stdarg.h
-do
-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 660 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'a-z./\055' 'A-Z___'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
- sed -n "s/^$a-zA-Z0-9_*_cv_a-zA-Z0-9_*$=$.*$/\1=\${\1='\2'}/p" \
- >> confcache
-if cmp -s $cache_file confcache; then
- :
-else
- if test -w $cache_file; then
- echo "updating cache $cache_file"
- cat confcache > $cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
- ac_vpsub='/^ 	*VPATH 	*=^:*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define $A-Za-z_A-Za-z0-9_*$ $.*$%-D\1=\2%g
-s% 	`~#$^&*(){}\\|;'"<>?%\\&%g
-s%\%\\&%g
-s%\%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS --recheck --version --help"
-for ac_option
-do
- case "\$ac_option" in
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.3"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
- *) echo "\$ac_cs_usage"; exit 1 ;;
- esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:^ *//g"` conftest*; exit 1' 1 2 15
-
-# Protect against being on the right side of a sed subst in config.status. 
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/\\\\&%/\\\\&/g; 
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
-$ac_vpsub
-$extrasub
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@CC@%$CC%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@RANLIB@%$RANLIB%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CPP@%$CPP%g
-s%@DEPLIBS@%$DEPLIBS%g
-
-CEOF
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile:infile", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
- # Adjust relative srcdir, etc. for subdirectories.
-
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/^/^/*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
- # A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/^/*%../%g'`
- else
- ac_dir_suffix= ac_dots=
- fi
-
- case "$ac_given_srcdir" in
- .) srcdir=.
- if test -z "$ac_dots"; then top_srcdir=.
- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
- *) # Relative path.
- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- case "$ac_given_INSTALL" in
- /$*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
- case "$ac_file" in
- *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
- *) ac_comsub= ;;
- esac
- sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
-fi; done
-rm -f conftest.subs
-
-
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-

cyrus-imapd-2.4.17.tar.gz/makedepend/configure.in Deleted

cyrus-imapd-2.4.17.tar.gz/makedepend/cpp.ed Deleted

@@ -1,75 +0,0 @@
-#
-# $XConsortium: cpp.ed,v 1.3 89/12/12 12:44:18 jim Exp $
-#
-# $Locker $
-#
-/struct symtab stab/d
-/struct symtab \*defloc;/d
-/struct symtab \*udfloc;/d
-/struct symtab \*incloc;/d
-/struct symtab \*ifloc;/d
-/struct symtab \*elsloc;/d
-/struct symtab \*eifloc;/d
-/struct symtab \*ifdloc;/d
-/struct symtab \*ifnloc;/d
-/struct symtab \*ysysloc;/d
-/struct symtab \*varloc;/d
-/struct symtab \*lneloc;/d
-/struct symtab \*ulnloc;/d
-/struct symtab \*uflloc;/d
-/^sayline(/s/$/	DELETED/p
-.,/^}/d
-/^unfill(/s/$/	DELETED/p
-.-1,/^}/d
-/^doincl(/s/$/	DELETED/p
-.-1,/^}/d
-/^equfrm(/s/$/	DELETED/p
-.,/^}/d
-/^dodef(/s/$/	DELETED/p
-.-1,/^}/d
-/^control(/s/$/	DELETED/p
-.-1,/^}/d
-/^savestring(/s/$/	DELETED/p
-.-1,/^}/d
-/^stsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^ppsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^yyerror(/s/$/	DELETED/p
-.,/^}/d
-/^ppwarn(/s/$/	DELETED/p
-.,/^}/d
-/^lookup(/s/$/	DELETED/p
-.-1,/^}/d
-/^subst(/s/$/	DELETED/p
-.-1,/^}/d
-/^trmdir(/s/$/	DELETED/p
-.-1,/^}/d
-/^copy(/s/$/	DELETED/p
-.-1,/^}/d
-/^pperror(/s/$/	DELETED/p
-.,/^}/d
-/^main(/s/$/	CHANGED to cpp_varsetup(argc,argv)/p
-.c
-cpp_varsetup(argc,argv)
-.
-/^strdex(/s/$/	DELETED/p
-.-1,/^}/d
-/^ for(i=1; i<argc; i++)/s/$/	To the end DELETED/p
-.,$c
-}
-.
-/^dump(/s/$/	DELETED/p
-.,/^}/c
-dump() { fatal("dump\n"); }
-.
-/^refill(/s/$/	DELETED/p
-.,/^}/c
-refill() { fatal("refill\n"); }
-.
-/^slookup(/s/$/	DELETED/p
-.-1,/^}/c
-static struct symtab *slookup() { fatal("slookup\n"); }
-.
-w
-q

cyrus-imapd-2.4.17.tar.gz/makedepend/cppsetup.c Deleted

@@ -1,285 +0,0 @@
-/* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */
-
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cppsetup.c,v 1.5 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-
-#ifdef	CPP
-/*
- * This file is strictly for the sake of cpy.y and yylex.c (if
- * you indeed have the source for cpp).
- */
-#define IB 1
-#define SB 2
-#define NB 4
-#define CB 8
-#define QB 16
-#define WB 32
-#define SALT '#'
-#if pdp11 | vax | ns16000 | mc68000 | ibm032
-#define COFF 128
-#else
-#define COFF 0
-#endif
-/*
- * These variables used by cpy.y and yylex.c
- */
-extern char	*outp, *inp, *newp, *pend;
-extern char	*ptrtab;
-extern char	fastab;
-extern char	slotab;
-
-/*
- * cppsetup
- */
-struct filepointer	*currentfile;
-struct inclist		*currentinc;
-
-cppsetup(line, filep, inc)
-	register char	*line;
-	register struct filepointer	*filep;
-	register struct inclist		*inc;
-{
-	register char *p, savec;
-	static boolean setupdone = FALSE;
-	boolean	value;
-
-	if (!setupdone) {
-		cpp_varsetup();
-		setupdone = TRUE;
-	}
-
-	currentfile = filep;
-	currentinc = inc;
-	inp = newp = line;
-	for (p=newp; *p; p++)
-		;
-
-	/*
-	 * put a newline back on the end, and set up pend, etc.
-	 */
-	*p++ = '\n';
-	savec = *p;
-	*p = '\0';
-	pend = p;
-
-	ptrtab = slotab+COFF;
-	*--inp = SALT; 
-	outp=inp; 
-	value = yyparse();
-	*p = savec;
-	return(value);
-}
-
-struct symtab *lookup(symbol)
-	char	*symbol;
-{
-	static struct symtab    undefined;
-	struct symtab   *sp;
-
-	sp = isdefined(symbol, currentinc, NULL);
-	if (sp == NULL) {
-		sp = &undefined;
-		sp->s_value = NULL;
-	}
-	return (sp);
-}
-
-pperror(tag, x0,x1,x2,x3,x4)
-	int	tag,x0,x1,x2,x3,x4;
-{
-	warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
-	warning(x0,x1,x2,x3,x4);
-}
-
-
-yyerror(s)
-	register char	*s;
-{
-	fatalerr("Fatal error: %s\n", s);
-}
-#else /* not CPP */
-
-#include "ifparser.h"
-struct _parse_data {
-    struct filepointer *filep;
-    struct inclist *inc;
-    const char *line;
-};
-
-static const char *
-_my_if_errors (ip, cp, expecting)
-    IfParser *ip;
-    const char *cp;
-    const char *expecting;
-{
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-    int lineno = pd->filep->f_line;
-    char *filename = pd->inc->i_file;
-    char prefix300;
-    int prefixlen;
-    int i;
-
-    sprintf (prefix, "\"%s\":%d", filename, lineno);
-    prefixlen = strlen(prefix);
-    fprintf (stderr, "%s:  %s", prefix, pd->line);
-    i = cp - pd->line;
-    if (i > 0 && pd->linei-1 != '\n') {
-	putc ('\n', stderr);
-    }
-    for (i += prefixlen + 3; i > 0; i--) {
-	putc (' ', stderr);
-    }
-    fprintf (stderr, "^--- expecting %s\n", expecting);
-    return NULL;
-}
-
-
-#define MAXNAMELEN 256
-
-static struct symtab *
-_lookup_variable (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    char tmpbufMAXNAMELEN + 1;
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-
-    if (len > MAXNAMELEN)
-	return 0;
-
-    strncpy (tmpbuf, var, len);
-    tmpbuflen = '\0';
-    return isdefined (tmpbuf, pd->inc, NULL);
-}
-
-
-static int
-_my_eval_defined (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    if (_lookup_variable (ip, var, len))
-	return 1;
-    else
-	return 0;
-}
-
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-static int
-_my_eval_variable (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    struct symtab *s;
-
-    s = _lookup_variable (ip, var, len);
-    if (!s)
-	return 0;
-    do {
-	var = s->s_value;
-	if (!isvarfirstletter(*var))
-	    break;
-	s = _lookup_variable (ip, var, strlen(var));
-    } while (s);
-
-    return atoi(var);
-}
-
-
-cppsetup(line, filep, inc)
-	register char	*line;
-	register struct filepointer	*filep;
-	register struct inclist		*inc;
-{
-    IfParser ip;
-    struct _parse_data pd;
-    int val = 0;
-
-    pd.filep = filep;
-    pd.inc = inc;
-    pd.line = line;
-    ip.funcs.handle_error = _my_if_errors;
-    ip.funcs.eval_defined = _my_eval_defined;
-    ip.funcs.eval_variable = _my_eval_variable;
-    ip.data = (char *) &pd;
-
-    (void) ParseIfExpression (&ip, line, &val);
-    if (val)
-	return IF;
-    else
-	return IFFALSE;
-}
-#endif /* CPP */
-

cyrus-imapd-2.4.17.tar.gz/makedepend/def.h Deleted

@@ -1,178 +0,0 @@
-/* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */
-
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: def.h,v 1.5 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define MAXDEFINES	512
-#define MAXFILES	512
-#define MAXDIRS		64
-#define SYMTABINC	10	/* must be > 1 for define() to work right */
-#define	TRUE		1
-#define	FALSE		0
-
-/* the following must match the directives table in main.c */
-#define	IF		0
-#define	IFDEF		1
-#define	IFNDEF		2
-#define	ELSE		3
-#define	ENDIF		4
-#define	DEFINE		5
-#define	UNDEF		6
-#define	INCLUDE		7
-#define	LINE		8
-#define	PRAGMA		9
-#define ERROR 10
-#define IDENT 11
-#define SCCS 12
-#define ELIF 13
-#define EJECT 14
-#define IFFALSE 15 /* pseudo value --- never matched */
-#define ELIFFALSE 16 /* pseudo value --- never matched */
-#define INCLUDEDOT 17 /* pseudo value --- never matched */
-#define IFGUESSFALSE 18 /* pseudo value --- never matched */
-#define ELIFGUESSFALSE 19 /* pseudo value --- never matched */
-
-#ifdef DEBUG
-extern int	_debugmask;
-/*
- * debug levels are:
- * 
- * 0	show ifn*(def)*,endif
- * 1	trace defined/!defined
- * 2	show #include
- * 3	show #include SYMBOL
- * 4-6	unused
- */
-#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; }
-#else
-#define	debug(level,arg) /**/
-#endif /* DEBUG */
-
-typedef	unsigned char boolean;
-
-struct symtab {
-	char	*s_name;
-	char	*s_value;
-};
-
-struct	inclist {
-	char		*i_incstring;	/* string from #include line */
-	char		*i_file;	/* path name of the include file */
-	struct inclist	**i_list;	/* list of files it itself includes */
-	int		i_listlen;	/* length of i_list */
-	struct symtab	*i_defs;	/* symbol table for this file */
-	int		i_ndefs;	/* current # defines */
-	int		i_deflen;	/* amount of space in table */
-	boolean		i_defchecked;	/* whether defines have been checked */
-	boolean		i_notified;	/* whether we have revealed includes */
-	boolean		i_marked;	/* whether it's in the makefile */
-	boolean		i_searched;	/* whether we have read this */
-	boolean i_included_sym; /* whether #include SYMBOL was found */
-					/* Can't use i_list if TRUE */
-};
-
-struct filepointer {
-	char	*f_p;
-	char	*f_base;
-	char	*f_end;
-	long	f_len;
-	long	f_line;
-};
-
-#ifndef NO_STDLIB_H		/* X_NOT_STDC_ENV */
-#include <stdlib.h>
-#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
-char *malloc(), *realloc();
-#endif /* macII */
-#else
-char			*malloc();
-char			*realloc();
-#endif
-
-char			*copy();
-char			*base_name();
-char			*getline();
-struct symtab		*slookup();
-struct symtab		*isdefined();
-struct symtab		*fdefined();
-struct filepointer	*getfile();
-struct inclist		*newinclude();
-struct inclist		*inc_path();
-
-#ifdef HAVE_STDARG_H	/* NeedVarargsPrototypes */
-extern fatalerr(char *, ...);
-extern warning(char *, ...);
-extern warning1(char *, ...);
-#endif

cyrus-imapd-2.4.17.tar.gz/makedepend/ifparser.c Deleted

@@ -1,493 +0,0 @@
-/*
- * $XConsortium: ifparser.c,v 1.7 94/01/18 21:30:50 rws Exp $
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ifparser.c,v 1.5 2010/01/06 17:01:50 murch Exp $
- *
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author: Jim Fulton
- * Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs. It accepts the following grammar:
- * 
- * EXPRESSION	:=	VALUE
- * 			 |	VALUE BINOP	EXPRESSION
- * 
- * VALUE		:=	'(' EXPRESSION ')'
- * 			 |	'!' VALUE
- * 			 |	'-' VALUE
- * 			 |	'defined' '(' variable ')'
- * 			 |	'defined' variable
- *			 |	# variable '(' variable-list ')'
- * 			 |	variable
- * 			 |	number
- * 
- * BINOP		:=	'*'	| '/'	| '%'
- * 			 |	'+'	| '-'
- * 			 |	'<<'	| '>>'
- * 			 |	'<'	| '>'	| '<=' | '>='
- * 			 |	'=='	| '!='
- * 			 |	'&'	| '|'
- * 			 |	'&&'	| '||'
- * 
- * The normal C order of precidence is supported.
- * 
- * 
- * External Entry Points:
- * 
- * ParseIfExpression		parse a string for #if
- */
-
-#include "ifparser.h"
-#include <ctype.h>
-
-/****************************************************************************
-		 Internal Macros and Utilities for Parser
- ****************************************************************************/
-
-#define DO(val) if (!(val)) return NULL
-#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff))
-#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-
-static const char *
-parse_variable (g, cp, varp)
- IfParser *g;
- const char *cp;
- const char **varp;
-{
- SKIPSPACE (cp);
-
- if (!isvarfirstletter (*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable name");
-
- *varp = cp;
- /* EMPTY */
- for (cp++; isalnum(*cp) || *cp == '_'; cp++) ;
- return cp;
-}
-
-
-static const char *
-parse_number (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- SKIPSPACE (cp);
-
- if (!isdigit(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "number");
-
-#ifdef WIN32
- *valp = strtol(cp, &cp, 0);
-#else
- *valp = atoi (cp);
- /* EMPTY */
- for (cp++; isdigit(*cp); cp++) ;
-#endif
- return cp;
-}
-
-
-static const char *
-parse_value (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- const char *var;
-
- *valp = 0;
-
- SKIPSPACE (cp);
- if (!*cp)
-	return cp;
-
- switch (*cp) {
- case '(':
-	DO (cp = ParseIfExpression (g, cp + 1, valp));
-	SKIPSPACE (cp);
-	if (*cp != ')') 
-	 return CALLFUNC(g, handle_error) (g, cp, ")");
-
-	return cp + 1;			/* skip the right paren */
-
- case '!':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = !(*valp);
-	return cp;
-
- case '-':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = -(*valp);
-	return cp;
-
- case '#':
-	DO (cp = parse_variable (g, cp + 1, &var));
-	SKIPSPACE (cp);
-	if (*cp != '(')
-	 return CALLFUNC(g, handle_error) (g, cp, "(");
-	do {
-	 DO (cp = parse_variable (g, cp + 1, &var));
-	 SKIPSPACE (cp);
-	} while (*cp && *cp != ')');
-	if (*cp != ')')
-	 return CALLFUNC(g, handle_error) (g, cp, ")");
-	*valp = 1; /* XXX */
-	return cp + 1;
-
- case 'd':
-	if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp7)) {
-	 int paren = 0;
-	 cp += 7;
-	 SKIPSPACE (cp);
-	 if (*cp == '(') {
-		paren = 1;
-		cp++;
-	 }
-	 DO (cp = parse_variable (g, cp, &var));
-	 SKIPSPACE (cp);
-	 if (paren && *cp != ')')
-		return CALLFUNC(g, handle_error) (g, cp, ")");
-	 *valp = (*(g->funcs.eval_defined)) (g, var, cp - var);
-	 return cp + paren;		/* skip the right paren */
-	}
-	/* fall out */
- }
-
- if (isdigit(*cp)) {
-	DO (cp = parse_number (g, cp, valp));
- } else if (!isvarfirstletter(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable or number");
- else {
-	DO (cp = parse_variable (g, cp, &var));
-	*valp = (*(g->funcs.eval_variable)) (g, var, cp - var);
- }
- 
- return cp;
-}
-
-
-
-static const char *
-parse_product (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_value (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '*':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp * rightval);
-	break;
-
- case '/':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp / rightval);
-	break;
-
- case '%':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp % rightval);
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_sum (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_product (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '+':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp + rightval);
-	break;
-
- case '-':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp - rightval);
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_shift (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_sum (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '<':
-	if (cp1 == '<') {
-	 DO (cp = parse_shift (g, cp + 2, &rightval));
-	 *valp = (*valp << rightval);
-	}
-	break;
-
- case '>':
-	if (cp1 == '>') {
-	 DO (cp = parse_shift (g, cp + 2, &rightval));
-	 *valp = (*valp >> rightval);
-	}
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_inequality (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_shift (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '<':
-	if (cp1 == '=') {
-	 DO (cp = parse_inequality (g, cp + 2, &rightval));
-	 *valp = (*valp <= rightval);
-	} else {
-	 DO (cp = parse_inequality (g, cp + 1, &rightval));
-	 *valp = (*valp < rightval);
-	}
-	break;
-
- case '>':
-	if (cp1 == '=') {
-	 DO (cp = parse_inequality (g, cp + 2, &rightval));
-	 *valp = (*valp >= rightval);
-	} else {
-	 DO (cp = parse_inequality (g, cp + 1, &rightval));
-	 *valp = (*valp > rightval);
-	}
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_equality (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_inequality (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '=':
-	if (cp1 == '=')
-	 cp++;
-	DO (cp = parse_equality (g, cp + 1, &rightval));
-	*valp = (*valp == rightval);
-	break;
-
- case '!':
-	if (cp1 != '=')
-	 break;
-	DO (cp = parse_equality (g, cp + 2, &rightval));
-	*valp = (*valp != rightval);
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_band (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_equality (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '&':
-	if (cp1 != '&') {
-	 DO (cp = parse_band (g, cp + 1, &rightval));
-	 *valp = (*valp & rightval);
-	}
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_bor (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_band (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '|':
-	if (cp1 != '|') {
-	 DO (cp = parse_bor (g, cp + 1, &rightval));
-	 *valp = (*valp | rightval);
-	}
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_land (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_bor (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '&':
-	if (cp1 != '&')
-	 return CALLFUNC(g, handle_error) (g, cp, "&&");
-	DO (cp = parse_land (g, cp + 2, &rightval));
-	*valp = (*valp && rightval);
-	break;
- }
- return cp;
-}
-
-
-static const char *
-parse_lor (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- int rightval;
-
- DO (cp = parse_land (g, cp, valp));
- SKIPSPACE (cp);
-
- switch (*cp) {
- case '|':
-	if (cp1 != '|')
-	 return CALLFUNC(g, handle_error) (g, cp, "||");
-	DO (cp = parse_lor (g, cp + 2, &rightval));
-	*valp = (*valp || rightval);
-	break;
- }
- return cp;
-}
-
-
-/****************************************************************************
-			 External Entry Points
- ****************************************************************************/
-
-const char *
-ParseIfExpression (g, cp, valp)
- IfParser *g;
- const char *cp;
- int *valp;
-{
- return parse_lor (g, cp, valp);
-}
-
-

cyrus-imapd-2.4.17.tar.gz/makedepend/ifparser.h Deleted

@@ -1,118 +0,0 @@
-/*
- * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ifparser.h,v 1.5 2010/01/06 17:01:50 murch Exp $
- *
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author: Jim Fulton
- * Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs. It accepts the following grammar:
- * 
- * EXPRESSION	:=	VALUE
- * 			 |	VALUE BINOP	EXPRESSION
- * 
- * VALUE		:=	'(' EXPRESSION ')'
- * 			 |	'!' VALUE
- * 			 |	'-' VALUE
- * 			 |	'defined' '(' variable ')'
- * 			 |	variable
- * 			 |	number
- * 
- * BINOP		:=	'*'	| '/'	| '%'
- * 			 |	'+'	| '-'
- * 			 |	'<<'	| '>>'
- * 			 |	'<'	| '>'	| '<=' | '>='
- * 			 |	'=='	| '!='
- * 			 |	'&'	| '|'
- * 			 |	'&&'	| '||'
- * 
- * The normal C order of precidence is supported.
- * 
- * 
- * External Entry Points:
- * 
- * ParseIfExpression		parse a string for #if
- */
-
-#include <stdio.h>
-
-#define const /**/
-typedef int Bool;
-#define False 0
-#define True 1
-
-typedef struct _if_parser {
- struct {				/* functions */
-	char *(*handle_error) (/* struct _if_parser *, const char *,
-				 const char * */);
-	int (*eval_variable) (/* struct _if_parser *, const char *, int */);
-	int (*eval_defined) (/* struct _if_parser *, const char *, int */);
- } funcs;
- char *data;
-} IfParser;
-
-char *ParseIfExpression (/* IfParser *, const char *, int * */);
-

cyrus-imapd-2.4.17.tar.gz/makedepend/include.c Deleted

@@ -1,338 +0,0 @@
-/* $XConsortium: include.c,v 1.16 94/04/17 20:10:34 gildea Exp $ */
-
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: include.c,v 1.5 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-
-#include "def.h"
-
-extern struct	inclist	inclist MAXFILES ,
-			*inclistp;
-extern char	*includedirs ;
-extern char	*notdotdot ;
-extern boolean show_where_not;
-extern boolean warn_multiple;
-
-struct inclist *inc_path(file, include, dot)
-	register char	*file,
-			*include;
-	boolean	dot;
-{
-	static char	path BUFSIZ ;
-	register char		**pp, *p;
-	register struct inclist	*ip;
-	struct stat	st;
-	boolean	found = FALSE;
-
-	/*
-	 * Check all previously found include files for a path that
-	 * has already been expanded.
-	 */
-	for (ip = inclist; ip->i_file; ip++)
-	 if ((strcmp(ip->i_incstring, include) == 0) && !ip->i_included_sym)
-	 {
-		found = TRUE;
-		break;
-	 }
-
-	/*
-	 * If the path was surrounded by "" or is an absolute path,
-	 * then check the exact path provided.
-	 */
-	if (!found && (dot || *include == '/')) {
-		if (stat(include, &st) == 0) {
-			ip = newinclude(include, include);
-			found = TRUE;
-		}
-		else if (show_where_not)
-			warning1("\tnot in %s\n", include);
-	}
-
-	/*
-	 * See if this include file is in the directory of the
-	 * file being compiled.
-	 */
-	if (!found) {
-		for (p=file+strlen(file); p>file; p--)
-			if (*p == '/')
-				break;
-		if (p == file)
-			strcpy(path, include);
-		else {
-			strncpy(path, file, (p-file) + 1);
-			path (p-file) + 1 = '\0';
-			strcpy(path + (p-file) + 1, include);
-		}
-		remove_dotdot(path);
-		if (stat(path, &st) == 0) {
-			ip = newinclude(path, include);
-			found = TRUE;
-		}
-		else if (show_where_not)
-			warning1("\tnot in %s\n", path);
-	}
-
-	/*
-	 * Check the include directories specified. (standard include dir
-	 * should be at the end.)
-	 */
-	if (!found)
-		for (pp = includedirs; *pp; pp++) {
-			sprintf(path, "%s/%s", *pp, include);
-			remove_dotdot(path);
-			if (stat(path, &st) == 0) {
-				ip = newinclude(path, include);
-				found = TRUE;
-				break;
-			}
-			else if (show_where_not)
-				warning1("\tnot in %s\n", path);
-		}
-
-	if (!found)
-		ip = NULL;
-	return(ip);
-}
-
-/*
- * Ocaisionally, pathnames are created that look like ../x/../y
- * Any of the 'x/..' sequences within the name can be eliminated.
- * (but only if 'x' is not a symbolic link!!)
- */
-remove_dotdot(path)
-	char	*path;
-{
-	register char	*end, *from, *to, **cp;
-	char		*components MAXFILES ,
-			newpath BUFSIZ ;
-	boolean		component_copied;
-
-	/*
-	 * slice path up into components.
-	 */
-	to = newpath;
-	if (*path == '/')
-		*to++ = '/';
-	*to = '\0';
-	cp = components;
-	for (from=end=path; *end; end++)
-		if (*end == '/') {
-			while (*end == '/')
-				*end++ = '\0';
-			if (*from)
-				*cp++ = from;
-			from = end;
-		}
-	*cp++ = from;
-	*cp = NULL;
-
-	/*
-	 * Now copy the path, removing all 'x/..' components.
-	 */
-	cp = components;
-	component_copied = FALSE;
-	while(*cp) {
-		if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1))) {
-			if (issymbolic(newpath, *cp))
-				goto dont_remove;
-			cp++;
-		} else {
-		dont_remove:
-			if (component_copied)
-				*to++ = '/';
-			component_copied = TRUE;
-			for (from = *cp; *from; )
-				*to++ = *from++;
-			*to = '\0';
-		}
-		cp++;
-	}
-	*to++ = '\0';
-
-	/*
-	 * copy the reconstituted path back to our pointer.
-	 */
-	strcpy(path, newpath);
-}
-
-isdot(p)
-	register char	*p;
-{
-	if(p && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-isdotdot(p)
-	register char	*p;
-{
-	if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-issymbolic(dir, component)
-	register char	*dir, *component;
-{
-#ifdef S_IFLNK
-	struct stat	st;
-	char	buf BUFSIZ , **pp;
-
-	sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component);
-	for (pp=notdotdot; *pp; pp++)
-		if (strcmp(*pp, buf) == 0)
-			return (TRUE);
-	if (lstat(buf, &st) == 0
-	&& (st.st_mode & S_IFMT) == S_IFLNK) {
-		*pp++ = copy(buf);
-		if (pp >= &notdotdot MAXDIRS )
-			fatalerr("out of .. dirs, increase MAXDIRS\n");
-		return(TRUE);
-	}
-#endif
-	return(FALSE);
-}
-
-/*
- * Add an include file to the list of those included by 'file'.
- */
-struct inclist *newinclude(newfile, incstring)
-	register char	*newfile, *incstring;
-{
-	register struct inclist	*ip;
-
-	/*
-	 * First, put this file on the global list of include files.
-	 */
-	ip = inclistp++;
-	if (inclistp == inclist + MAXFILES - 1)
-		fatalerr("out of space: increase MAXFILES\n");
-	ip->i_file = copy(newfile);
-	ip->i_included_sym = FALSE;
-	if (incstring == NULL)
-		ip->i_incstring = ip->i_file;
-	else
-		ip->i_incstring = copy(incstring);
-
-	return(ip);
-}
-
-included_by(ip, newfile)
-	register struct inclist	*ip, *newfile;
-{
-	register i;
-
-	if (ip == NULL)
-		return;
-	/*
-	 * Put this include file (newfile) on the list of files included
-	 * by 'file'. If 'file' is NULL, then it is not an include
-	 * file itself (i.e. was probably mentioned on the command line).
-	 * If it is already on the list, don't stick it on again.
-	 */
-	if (ip->i_list == NULL)
-		ip->i_list = (struct inclist **)
-			malloc(sizeof(struct inclist *) * ++ip->i_listlen);
-	else {
-		for (i=0; i<ip->i_listlen; i++)
-			if (ip->i_list i == newfile) {
-			 i = strlen(newfile->i_file);
-			 if (!ip->i_included_sym &&
-				!(i > 2 &&
-				 newfile->i_filei-1 == 'c' &&
-				 newfile->i_filei-2 == '.'))
-			 {
-				/* only bitch if ip has */
-				/* no #include SYMBOL lines */
-				/* and is not a .c file */
-				if (warn_multiple)
-				{
-					warning("%s includes %s more than once!\n",
-						ip->i_file, newfile->i_file);
-					warning1("Already have\n");
-					for (i=0; i<ip->i_listlen; i++)
-						warning1("\t%s\n", ip->i_listi->i_file);
-				}
-			 }
-			 return;
-			}
-		ip->i_list = (struct inclist **) realloc(ip->i_list,
-			sizeof(struct inclist *) * ++ip->i_listlen);
-	}
-	ip->i_list ip->i_listlen-1 = newfile;
-}
-
-inc_clean ()
-{
-	register struct inclist *ip;
-
-	for (ip = inclist; ip < inclistp; ip++) {
-		ip->i_marked = FALSE;
-	}
-}

cyrus-imapd-2.4.17.tar.gz/makedepend/install-sh Deleted

@@ -1,279 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For permission or any legal
-#    details, please contact
-#      Carnegie Mellon University
-#      Center for Technology Transfer and Enterprise Creation
-#      4615 Forbes Avenue
-#      Suite 302
-#      Pittsburgh, PA  15213
-#      (412) 268-7393, fax: (412) 268-7395
-#      innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#    "This product includes software developed by Computing Services
-#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: install-sh,v 1.4 2010/01/06 17:01:50 murch Exp $
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while  x"$1" != x ; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if  x"$src" = x 
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if  x"$src" = x 
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if  x"$dir_arg" != x ; then
-	dst=$src
-	src=""
-	
-	if  -d $dst ; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if  -f $src -o -d $src 
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if  x"$dst" = x 
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if  -d $dst 
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,^/*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if  ! -d "$dstdir" ; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while  $# -ne 0  ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if  ! -d "${pathcomp}"  ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if  x"$dir_arg" != x 
-then
-	$doit $instcmd $dst &&
-
-	if  x"$chowncmd" != x ; then $doit $chowncmd $dst; else true ; fi &&
-	if  x"$chgrpcmd" != x ; then $doit $chgrpcmd $dst; else true ; fi &&
-	if  x"$stripcmd" != x ; then $doit $stripcmd $dst; else true ; fi &&
-	if  x"$chmodcmd" != x ; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if  x"$transformarg" = x  
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if  x"$dstfile" = x  
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if  x"$chowncmd" != x ; then $doit $chowncmd $dsttmp; else true;fi &&
-	if  x"$chgrpcmd" != x ; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if  x"$stripcmd" != x ; then $doit $stripcmd $dsttmp; else true;fi &&
-	if  x"$chmodcmd" != x ; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

cyrus-imapd-2.4.17.tar.gz/makedepend/main.c Deleted

@@ -1,777 +0,0 @@
-/* $XConsortium: main.c,v 1.83 94/04/17 20:10:36 gildea Exp $ */
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: main.c,v 1.7 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-#ifdef hpux
-#define sigvec sigvector
-#endif /* hpux */
-
-#include <signal.h>
-
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-#include <stdarg.h>
-#endif
-
-#ifdef DEBUG
-int	_debugmask;
-#endif
-
-char *ProgramName;
-
-char	*directives = {
-	"if",
-	"ifdef",
-	"ifndef",
-	"else",
-	"endif",
-	"define",
-	"undef",
-	"include",
-	"line",
-	"pragma",
-	"error",
-	"ident",
-	"sccs",
-	"elif",
-	"eject",
-	NULL
-};
-
-struct symtab	predefs = {
-#ifdef apollo
-	{"apollo", "1"},
-#endif
-#ifdef ibm032
-	{"ibm032", "1"},
-#endif
-#ifdef sun
-	{"sun", "1"},
-#ifdef sparc
-	{"sparc", "1"},
-#endif
-#endif
-#ifdef solaris20
-	{"solaris20", "1"},
-#endif
-#ifdef __i386
-	{"__i386", "1"},
-#endif
-#ifdef hpux
-	{"hpux", "1"},
-#endif
-#ifdef vax
-	{"vax", "1"},
-#endif
-#ifdef VMS
-	{"VMS", "1"},
-#endif
-#ifdef ultrix
-	{"ultrix", "1"},
-#endif
-#ifdef mips
-	{"mips", "1"},
-#endif
-#ifdef __SCO__
-	{"__SCO__", "1"},
-#endif	 
-#ifdef __DGUX
-	{"__DGUX", "1"},
-#endif
-#ifdef __DGUX__
-	{"__DGUX__", "1"},
-#endif
-#ifdef __m88k__
-	{"__m88k__", "1"},
-#endif
-	{NULL, NULL}
-};
-#define OBJSUFFIX ".o"
-#define INCLUDEDIR "/usr/include"
-
-struct	inclist inclist MAXFILES ,
-		*inclistp = inclist,
-		maininclist;
-
-char	*filelist MAXFILES ;
-char	*includedirs MAXDIRS + 1 ;
-char	*notdotdot MAXDIRS ;
-char	*objprefix = "";
-char	*objsuffix = OBJSUFFIX;
-char	*startat = "# DO NOT DELETE";
-int	width = 78;
-boolean	append = FALSE;
-boolean	printed = FALSE;
-boolean	verbose = FALSE;
-boolean	show_where_not = FALSE;
-boolean warn_multiple = FALSE;	/* Warn on multiple includes of same file */
-
-static
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-catch (sig)
- int sig;
-{
-	fflush (stdout);
-	fatalerr ("got signal %d\n", sig);
-}
-
-#if defined(USG) || (defined(SYSV386) && defined(SYSV)) || defined(WIN32) || defined(__i386)
-#define USGISH
-#endif
-
-#ifndef USGISH
-#ifndef _POSIX_SOURCE
-#define sigaction sigvec
-#define sa_handler sv_handler
-#define sa_mask sv_mask
-#define sa_flags sv_flags
-#endif
-struct sigaction sig_act;
-#endif /* USGISH */
-
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	register char	**fp = filelist;
-	register char	**incp = includedirs;
-	register char	*p;
-	register struct inclist	*ip;
-	char	*makefile = NULL;
-	struct filepointer	*filecontent;
-	struct symtab *psymp = predefs;
-	char *endmarker = NULL;
-	char *defincdir = NULL;
-
-	ProgramName = argv0;
-
-	while (psymp->s_name)
-	{
-	 define2(psymp->s_name, psymp->s_value, &maininclist);
-	 psymp++;
-	}
-	if (argc == 2 && argv10 == '@') {
-	 struct stat ast;
-	 int afd;
-	 char *args;
-	 char **nargv;
-	 int nargc;
-	 char quotechar = '\0';
-
-	 nargc = 1;
-	 if ((afd = open(argv1+1, O_RDONLY)) < 0)
-		fatalerr("cannot open \"%s\"\n", argv1+1);
-	 fstat(afd, &ast);
-	 args = (char *)malloc(ast.st_size + 1);
-	 if ((ast.st_size = read(afd, args, ast.st_size)) < 0)
-		fatalerr("failed to read %s\n", argv1+1);
-	 argsast.st_size = '\0';
-	 close(afd);
-	 for (p = args; *p; p++) {
-		if (quotechar) {
-		 if (quotechar == '\\' ||
-			(*p == quotechar && p-1 != '\\'))
-			quotechar = '\0';
-		 continue;
-		}
-		switch (*p) {
-		case '\\':
-		case '"':
-		case '\'':
-		 quotechar = *p;
-		 break;
-		case ' ':
-		case '\n':
-		 *p = '\0';
-		 if (p > args && p-1)
-			nargc++;
-		 break;
-		}
-	 }
-	 if (p-1)
-		nargc++;
-	 nargv = (char **)malloc(nargc * sizeof(char *));
-	 nargv0 = argv0;
-	 argc = 1;
-	 for (p = args; argc < nargc; p += strlen(p) + 1)
-		if (*p) nargvargc++ = p;
-	 argv = nargv;
-	}
-	for(argc--, argv++; argc; argc--, argv++) {
-	 	/* if looking for endmarker then check before parsing */
-		if (endmarker && strcmp (endmarker, *argv) == 0) {
-		 endmarker = NULL;
-		 continue;
-		}
-		if (**argv != '-') {
-			/* treat +thing as an option for C++ */
-			if (endmarker && **argv == '+')
-				continue;
-			*fp++ = argv0;
-			continue;
-		}
-		switch(argv01) {
-		case '-':
-			endmarker = &argv02;
-			if (endmarker0 == '\0') endmarker = "--";
-			break;
-		case 'D':
-			if (argv02 == '\0') {
-				argv++;
-				argc--;
-			}
-			for (p=argv0 + 2; *p ; p++)
-				if (*p == '=') {
-					*p = ' ';
-					break;
-				}
-			define(argv0 + 2, &maininclist);
-			break;
-		case 'I':
-			if (incp >= includedirs + MAXDIRS)
-			 fatalerr("Too many -I flags.\n");
-			*incp++ = argv0+2;
-			if (**(incp-1) == '\0') {
-				*(incp-1) = *(++argv);
-				argc--;
-			}
-			break;
-		case 'Y':
-			defincdir = argv0+2;
-			break;
-		/* do not use if endmarker processing */
-		case 'a':
-			if (endmarker) break;
-			append = TRUE;
-			break;
-		case 'w':
-			if (endmarker) break;
-			if (argv02 == '\0') {
-				argv++;
-				argc--;
-				width = atoi(argv0);
-			} else
-				width = atoi(argv0+2);
-			break;
-		case 'o':
-			if (endmarker) break;
-			if (argv02 == '\0') {
-				argv++;
-				argc--;
-				objsuffix = argv0;
-			} else
-				objsuffix = argv0+2;
-			break;
-		case 'p':
-			if (endmarker) break;
-			if (argv02 == '\0') {
-				argv++;
-				argc--;
-				objprefix = argv0;
-			} else
-				objprefix = argv0+2;
-			break;
-		case 'v':
-			if (endmarker) break;
-			verbose = TRUE;
-#ifdef DEBUG
-			if (argv02)
-				_debugmask = atoi(argv0+2);
-#endif
-			break;
-		case 's':
-			if (endmarker) break;
-			startat = argv0+2;
-			if (*startat == '\0') {
-				startat = *(++argv);
-				argc--;
-			}
-			if (*startat != '#')
-				fatalerr("-s flag's value should start %s\n",
-					"with '#'.");
-			break;
-		case 'f':
-			if (endmarker) break;
-			makefile = argv0+2;
-			if (*makefile == '\0') {
-				makefile = *(++argv);
-				argc--;
-			}
-			break;
-
-		case 'm':
-			warn_multiple = TRUE;
-			break;
-			
-		/* Ignore -O, -g so we can just pass ${CFLAGS} to
-		 makedepend
-		 */
-		case 'O':
-		case 'g':
-			break;
-		default:
-			if (endmarker) break;
-	/*		fatalerr("unknown opt = %s\n", argv0); */
-			warning("ignoring option %s\n", argv0);
-		}
-	}
-	if (!defincdir) {
-#ifdef PREINCDIR
-	 if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	 *incp++ = PREINCDIR;
-#endif
-	 if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	 *incp++ = INCLUDEDIR;
-#ifdef POSTINCDIR
-	 if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	 *incp++ = POSTINCDIR;
-#endif
-	} else if (*defincdir) {
-	 if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	 *incp++ = defincdir;
-	}
-
-	redirect(startat, makefile);
-
-	/*
-	 * catch signals.
-	 */
-#ifdef USGISH
-/* should really reset SIGINT to SIG_IGN if it was. */
-#ifdef SIGHUP
-	signal (SIGHUP, catch);
-#endif
-	signal (SIGINT, catch);
-#ifdef SIGQUIT
-	signal (SIGQUIT, catch);
-#endif
-	signal (SIGILL, catch);
-#ifdef SIGBUS
-	signal (SIGBUS, catch);
-#endif
-	signal (SIGSEGV, catch);
-#ifdef SIGSYS
-	signal (SIGSYS, catch);
-#endif
-#else
-	sig_act.sa_handler = catch;
-#ifdef _POSIX_SOURCE
-	sigemptyset(&sig_act.sa_mask);
-	sigaddset(&sig_act.sa_mask, SIGINT);
-	sigaddset(&sig_act.sa_mask, SIGQUIT);
-#ifdef SIGBUS
-	sigaddset(&sig_act.sa_mask, SIGBUS);
-#endif
-	sigaddset(&sig_act.sa_mask, SIGILL);
-	sigaddset(&sig_act.sa_mask, SIGSEGV);
-	sigaddset(&sig_act.sa_mask, SIGHUP);
-	sigaddset(&sig_act.sa_mask, SIGPIPE);
-#ifdef SIGSYS
-	sigaddset(&sig_act.sa_mask, SIGSYS);
-#endif
-#else
-	sig_act.sa_mask = ((1<<(SIGINT -1))
-			 |(1<<(SIGQUIT-1))
-#ifdef SIGBUS
-			 |(1<<(SIGBUS-1))
-#endif
-			 |(1<<(SIGILL-1))
-			 |(1<<(SIGSEGV-1))
-			 |(1<<(SIGHUP-1))
-			 |(1<<(SIGPIPE-1))
-#ifdef SIGSYS
-			 |(1<<(SIGSYS-1))
-#endif
-			 );
-#endif /* _POSIX_SOURCE */
-	sig_act.sa_flags = 0;
-	sigaction(SIGHUP, &sig_act, (struct sigaction *)0);
-	sigaction(SIGINT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGILL, &sig_act, (struct sigaction *)0);
-#ifdef SIGBUS
-	sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
-#endif
-	sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
-#ifdef SIGSYS
-	sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
-#endif
-#endif /* USGISH */
-
-	/*
-	 * now peruse through the list of files.
-	 */
-	for(fp=filelist; *fp; fp++) {
-		filecontent = getfile(*fp);
-		ip = newinclude(*fp, (char *)NULL);
-
-		find_includes(filecontent, ip, ip, 0, FALSE);
-		freefile(filecontent);
-		recursive_pr_include(ip, ip->i_file, base_name(*fp));
-		inc_clean();
-	}
-	if (printed)
-		printf("\n");
-	exit(0);
-}
-
-struct filepointer *getfile(file)
-	char	*file;
-{
-	register int	fd;
-	struct filepointer	*content;
-	struct stat	st;
-
-	content = (struct filepointer *)malloc(sizeof(struct filepointer));
-	if ((fd = open(file, O_RDONLY)) < 0) {
-		warning("cannot open \"%s\"\n", file);
-		content->f_p = content->f_base = content->f_end = (char *)malloc(1);
-		*content->f_p = '\0';
-		return(content);
-	}
-	fstat(fd, &st);
-	content->f_base = (char *)malloc(st.st_size+1);
-	if (content->f_base == NULL)
-		fatalerr("cannot allocate mem\n");
-	if ((st.st_size = read(fd, content->f_base, st.st_size)) < 0)
-		fatalerr("failed to read %s\n", file);
-	close(fd);
-	content->f_len = st.st_size+1;
-	content->f_p = content->f_base;
-	content->f_end = content->f_base + st.st_size;
-	*content->f_end = '\0';
-	content->f_line = 0;
-	return(content);
-}
-
-freefile(fp)
-	struct filepointer	*fp;
-{
-	free(fp->f_base);
-	free(fp);
-}
-
-char *copy(str)
-	register char	*str;
-{
-	register char	*p = (char *)malloc(strlen(str) + 1);
-
-	strcpy(p, str);
-	return(p);
-}
-
-match(str, list)
-	register char	*str, **list;
-{
-	register int	i;
-
-	for (i=0; *list; i++, list++)
-		if (strcmp(str, *list) == 0)
-			return(i);
-	return(-1);
-}
-
-/*
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
-char *getline(filep)
-	register struct filepointer	*filep;
-{
-	register char	*p,	/* walking pointer */
-			*eof,	/* end of file pointer */
-			*bol;	/* beginning of line pointer */
-	register	lineno;	/* line number */
-
-	p = filep->f_p;
-	eof = filep->f_end;
-	if (p >= eof)
-		return((char *)NULL);
-	lineno = filep->f_line;
-
-	for(bol = p--; ++p < eof; ) {
-		if (*p == '/' && *(p+1) == '*') { /* consume comments */
-			*p++ = ' ', *p++ = ' ';
-			while (*p) {
-				if (*p == '*' && *(p+1) == '/') {
-					*p++ = ' ', *p = ' ';
-					break;
-				}
-				else if (*p == '\n')
-					lineno++;
-				*p++ = ' ';
-			}
-			continue;
-		}
-#ifdef WIN32
-		else if (*p == '/' && *(p+1) == '/') { /* consume comments */
-			*p++ = ' ', *p++ = ' ';
-			while (*p && *p != '\n')
-				*p++ = ' ';
-			lineno++;
-			continue;
-		}
-#endif
-		else if (*p == '\\') {
-			if (*(p+1) == '\n') {
-				*p = ' ';
-				*(p+1) = ' ';
-				lineno++;
-			}
-		}
-		else if (*p == '\n') {
-			lineno++;
-			if (*bol == '#') {
-				register char *cp;
-
-				*p++ = '\0';
-				/* punt lines with just # (yacc generated) */
-				for (cp = bol+1; 
-				 *cp && (*cp == ' ' || *cp == '\t'); cp++);
-				if (*cp) goto done;
-			}
-			bol = p+1;
-		}
-	}
-	if (*bol != '#')
-		bol = NULL;
-done:
-	filep->f_p = p;
-	filep->f_line = lineno;
-	return(bol);
-}
-
-/*
- * Strip the file name down to what we want to see in the Makefile.
- * It will have objprefix and objsuffix around it.
- */
-char *base_name(file)
-	register char	*file;
-{
-	register char	*p;
-
-	file = copy(file);
-	for(p=file+strlen(file); p>file && *p != '.'; p--) ;
-
-	if (*p == '.')
-		*p = '\0';
-	return(file);
-}
-
-#if defined(USG) && !defined(CRAY) && !defined(SVR4)
-int rename (from, to)
- char *from, *to;
-{
- (void) unlink (to);
- if (link (from, to) == 0) {
-	unlink (from);
-	return 0;
- } else {
-	return -1;
- }
-}
-#endif /* USGISH */
-
-redirect(line, makefile)
-	char	*line,
-		*makefile;
-{
-	struct stat	st;
-	FILE	*fdin, *fdout;
-	char	backup BUFSIZ ,
-		buf BUFSIZ ;
-	boolean	found = FALSE;
-	int	len;
-
-	/*
-	 * if makefile is "-" then let it pour onto stdout.
-	 */
-	if (makefile && *makefile == '-' && *(makefile+1) == '\0')
-		return;
-
-	/*
-	 * use a default makefile is not specified.
-	 */
-	if (!makefile) {
-		if (stat("Makefile", &st) == 0)
-			makefile = "Makefile";
-		else if (stat("makefile", &st) == 0)
-			makefile = "makefile";
-		else
-			fatalerr("mMakefile is not present\n");
-	}
-	else
-	 stat(makefile, &st);
-	if ((fdin = fopen(makefile, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", makefile);
-	sprintf(backup, "%s.bak", makefile);
-	unlink(backup);
-#ifdef WIN32
-	fclose(fdin);
-#endif
-	if (rename(makefile, backup) < 0)
-		fatalerr("cannot rename %s to %s\n", makefile, backup);
-#ifdef WIN32
-	if ((fdin = fopen(backup, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-#endif
-	if ((fdout = freopen(makefile, "w", stdout)) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-	len = strlen(line);
-	while (!found && fgets(buf, BUFSIZ, fdin)) {
-		if (*buf == '#' && strncmp(line, buf, len) == 0)
-			found = TRUE;
-		fputs(buf, fdout);
-	}
-	if (!found) {
-		if (verbose)
-		warning("Adding new delimiting line \"%s\" and dependencies...\n",
-			line);
-		puts(line); /* same as fputs(fdout); but with newline */
-	} else if (append) {
-	 while (fgets(buf, BUFSIZ, fdin)) {
-		fputs(buf, fdout);
-	 }
-	}
-	fflush(fdout);
-#if defined(USGISH) || defined(_SEQUENT_)
-	chmod(makefile, st.st_mode);
-#else
- fchmod(fileno(fdout), st.st_mode);
-#endif /* USGISH */
-}
-
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-fatalerr(char *msg, ...)
-#else
-/*VARARGS*/
-fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
- char *msg;
-#endif
-{
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-	va_list args;
-#endif
-	fprintf(stderr, "%s: error: ", ProgramName);
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-	exit (1);
-}
-
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-warning(char *msg, ...)
-#else
-/*VARARGS0*/
-warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
- char *msg;
-#endif
-{
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-	va_list args;
-#endif
-	fprintf(stderr, "%s: warning: ", ProgramName);
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-}
-
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-warning1(char *msg, ...)
-#else
-/*VARARGS0*/
-warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
- char *msg;
-#endif
-{
-#ifdef HAVE_STDARG_H /* NeedVarargsPrototypes */
-	va_list args;
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-}

cyrus-imapd-2.4.17.tar.gz/makedepend/mkdepend.man Deleted

@@ -1,368 +0,0 @@
-.\" $XConsortium: mkdepend.man,v 1.15 94/04/17 20:10:37 gildea Exp $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"), 
-.\" to deal in the Software without restriction, including without limitation 
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH MAKEDEPEND 1 "Release 6" "X Version 11"
-.UC 4
-.SH NAME
-makedepend \- create dependencies in makefiles
-.SH SYNOPSIS
-.B makedepend
-
-.B \-Dname=def
- 
-.B \-Dname
- 
-.B \-Iincludedir
- 
-.B \-Yincludedir
- 
-.B \-a
- 
-.B \-fmakefile
- 
-.B \-oobjsuffix
- 
-.B \-pobjprefix
- 
-.B \-sstring
- 
-.B \-wwidth
- 
-.B \-v
- 
-.B \-m
- 
-\-\^\-
-.B otheroptions
-\-\^\-
-
-sourcefile .\|.\|.
-.br
-.SH DESCRIPTION
-.B Makedepend
-reads each
-.I sourcefile
-in sequence and parses it like a C-preprocessor,
-processing all
-.I #include,
-.I #define,
-.I #undef,
-.I #ifdef,
-.I #ifndef,
-.I #endif,
-.I #if
-and
-.I #else
-directives so that it can correctly tell which
-.I #include,
-directives would be used in a compilation.
-Any
-.I #include,
-directives can reference files having other
-.I #include
-directives, and parsing will occur in these files as well.
-.PP
-Every file that a
-.I sourcefile
-includes,
-directly or indirectly,
-is what
-.B makedepend
-calls a "dependency".
-These dependencies are then written to a
-.I makefile
-in such a way that
-.B make(1)
-will know which object files must be recompiled when a dependency has changed.
-.PP
-By default,
-.B makedepend
-places its output in the file named
-.I makefile
-if it exists, otherwise
-.I Makefile.
-An alternate makefile may be specified with the
-.B \-f
-option.
-It first searches the makefile for
-the line
-.sp
-    # DO NOT DELETE THIS LINE \-\^\- make depend depends on it.
-.sp
-or one provided with the
-.B \-s
-option,
-as a delimiter for the dependency output.
-If it finds it, it will delete everything
-following this to the end of the makefile
-and put the output after this line.
-If it doesn't find it, the program
-will append the string to the end of the makefile
-and place the output following that.
-For each
-.I sourcefile
-appearing on the command line,
-.B makedepend
-puts lines in the makefile of the form
-.sp
-     sourcefile.o:\0dfile .\|.\|.
-.sp
-Where "sourcefile.o" is the name from the command
-line with its suffix replaced with ".o",
-and "dfile" is a dependency discovered in a
-.I #include
-directive while parsing
-.I sourcefile
-or one of the files it included.
-.SH EXAMPLE
-Normally,
-.B makedepend
-will be used in a makefile target so that typing "make depend" will
-bring the dependencies up to date for the makefile.
-For example,
-.nf
-    SRCS\0=\0file1.c\0file2.c\0.\|.\|.
-    CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz
-    depend:
-            makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS)
-.fi
-.SH OPTIONS
-.B Makedepend
-will ignore any option that it does not understand so that you may use
-the same arguments that you would for
-.B cc(1).
-.TP 5
-.B \-Dname=def or \-Dname
-Define.
-This places a definition for
-.I name
-in
-.B makedepend's
-symbol table.
-Without 
-.I =def
-the symbol becomes defined as "1".
-.TP 5
-.B \-Iincludedir
-Include directory.
-This option tells
-.B makedepend
-to prepend
-.I includedir
-to its list of directories to search when it encounters
-a
-.I #include
-directive.
-By default,
-.B makedepend
-only searches the standard include directories (usually /usr/include
-and possibly a compiler-dependent directory).
-.TP 5
-.B \-Yincludedir
-Replace all of the standard include directories with the single specified
-include directory; you can omit the
-.I includedir
-to simply prevent searching the standard include directories.
-.TP 5
-.B \-a
-Append the dependencies to the end of the file instead of replacing them. 
-.TP 5
-.B \-fmakefile
-Filename.
-This allows you to specify an alternate makefile in which
-.B makedepend
-can place its output.
-.TP 5
-.B \-oobjsuffix
-Object file suffix.
-Some systems may have object files whose suffix is something other
-than ".o".
-This option allows you to specify another suffix, such as
-".b" with
-.I -o.b
-or ":obj"
-with
-.I -o:obj
-and so forth.
-.TP 5
-.B \-pobjprefix
-Object file prefix.
-The prefix is prepended to the name of the object file. This is
-usually used to designate a different directory for the object file.
-The default is the empty string.
-.TP 5
-.B \-sstring
-Starting string delimiter.
-This option permits you to specify
-a different string for
-.B makedepend
-to look for in the makefile.
-.TP 5
-.B \-wwidth
-Line width.
-Normally,
-.B makedepend
-will ensure that every output line that it writes will be no wider than
-78 characters for the sake of readability.
-This option enables you to change this width.
-.TP 5
-.B \-v
-Verbose operation.
-This option causes 
-.B makedepend
-to emit the list of files included by each input file on standard output.
-.TP 5
-.B \-m
-Warn about multiple inclusion.
-This option causes 
-.B makedepend
-to produce a warning if any input file includes another file more than
-once.  In previous versions of 
-.B makedepend
-this was the default behavior; the default has been changed to better
-match the behavior of the C compiler, which does not consider multiple
-inclusion to be an error.  This option is provided for backward 
-compatibility, and to aid in debugging problems related to multiple
-inclusion.
-.TP 5
-.B "\-\^\- options \-\^\-"
-If
-.B makedepend
-encounters a double hyphen (\-\^\-) in the argument list,
-then any unrecognized argument following it
-will be silently ignored; a second double hyphen terminates this
-special treatment.
-In this way,
-.B makedepend
-can be made to safely ignore esoteric compiler arguments that might
-normally be found in a CFLAGS
-.B make
-macro (see the
-.B EXAMPLE
-section above).
-All options that
-.B makedepend
-recognizes and appear between the pair of double hyphens
-are processed normally.
-.SH ALGORITHM
-The approach used in this program enables it to run an order of magnitude
-faster than any other "dependency generator" I have ever seen.
-Central to this performance are two assumptions:
-that all files compiled by a single
-makefile will be compiled with roughly the same
-.I -I
-and
-.I -D
-options;
-and that most files in a single directory will include largely the
-same files.
-.PP
-Given these assumptions,
-.B makedepend
-expects to be called once for each makefile, with
-all source files that are maintained by the
-makefile appearing on the command line.
-It parses each source and include
-file exactly once, maintaining an internal symbol table
-for each.
-Thus, the first file on the command line will take an amount of time
-proportional to the amount of time that a normal C preprocessor takes.
-But on subsequent files, if it encounter's an include file
-that it has already parsed, it does not parse it again.
-.PP
-For example,
-imagine you are compiling two files,
-.I file1.c
-and
-.I file2.c,
-they each include the header file
-.I header.h,
-and the file
-.I header.h
-in turn includes the files
-.I def1.h
-and
-.I def2.h.
-When you run the command
-.sp
-    makedepend\0file1.c\0file2.c
-.sp
-.B makedepend
-will parse
-.I file1.c
-and consequently,
-.I header.h
-and then
-.I def1.h
-and
-.I def2.h.
-It then decides that the dependencies for this file are
-.sp
-    file1.o:\0header.h\0def1.h\0def2.h
-.sp
-But when the program parses
-.I file2.c
-and discovers that it, too, includes
-.I header.h,
-it does not parse the file,
-but simply adds
-.I header.h,
-.I def1.h
-and
-.I def2.h
-to the list of dependencies for
-.I file2.o.
-.SH "SEE ALSO"
-cc(1), make(1)
-.SH BUGS
-.B makedepend
-parses, but does not currently evaluate, the SVR4
-#predicate(token-list) preprocessor expression;
-such expressions are simply assumed to be true.
-This may cause the wrong
-.I #include
-directives to be evaluated.
-.PP
-Imagine you are parsing two files,
-say
-.I file1.c
-and
-.I file2.c,
-each includes the file
-.I def.h.
-The list of files that
-.I def.h
-includes might truly be different when
-.I def.h
-is included by
-.I file1.c
-than when it is included by
-.I file2.c.
-But once
-.B makedepend
-arrives at a list of dependencies for a file,
-it is cast in concrete.
-.SH AUTHOR
-Todd Brunhoff, Tektronix, Inc. and MIT Project Athena

cyrus-imapd-2.4.17.tar.gz/makedepend/parse.c Deleted

@@ -1,609 +0,0 @@
-/* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: parse.c,v 1.5 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-
-extern char	*directives;
-extern struct inclist	maininclist;
-
-find_includes(filep, file, file_red, recursion, failOK)
-	struct filepointer	*filep;
-	struct inclist		*file, *file_red;
-	int			recursion;
-	boolean			failOK;
-{
-	register char	*line;
-	register int	type;
-	boolean recfailOK;
-
-	while (line = getline(filep)) {
-		switch(type = deftype(line, filep, file_red, file, TRUE)) {
-		case IF:
-		doif:
-			type = find_includes(filep, file,
-				file_red, recursion+1, failOK);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			 (type == ELIFGUESSFALSE))
-				type = gobble(filep, file, file_red);
-			if (type == ELSE)
-				gobble(filep, file, file_red);
-			break;
-		case IFFALSE:
-		case IFGUESSFALSE:
-		 doiffalse:
-			if (type == IFGUESSFALSE || type == ELIFGUESSFALSE)
-			 recfailOK = TRUE;
-			else
-			 recfailOK = failOK;
-			type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			 find_includes(filep, file,
-					 file_red, recursion+1, recfailOK);
-			else
-			if (type == ELIF)
-			 goto doif;
-			else
-			if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE))
-			 goto doiffalse;
-			break;
-		case IFDEF:
-		case IFNDEF:
-			if ((type == IFDEF && isdefined(line, file_red, NULL))
-			 || (type == IFNDEF && !isdefined(line, file_red, NULL))) {
-				debug(1,(type == IFNDEF ?
-				 "line %d: %s !def'd in %s via %s%s\n" : "",
-				 filep->f_line, line,
-				 file->i_file, file_red->i_file, ": doit"));
-				type = find_includes(filep, file,
-					file_red, recursion+1, failOK);
-				while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
-					type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					gobble(filep, file, file_red);
-			}
-			else {
-				debug(1,(type == IFDEF ?
-				 "line %d: %s !def'd in %s via %s%s\n" : "",
-				 filep->f_line, line,
-				 file->i_file, file_red->i_file, ": gobble"));
-				type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					find_includes(filep, file,
-						file_red, recursion+1, failOK);
-				else if (type == ELIF)
-				 	goto doif;
-				else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
-				 	goto doiffalse;
-			}
-			break;
-		case ELSE:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-		case ELIF:
-			if (!recursion)
-				gobble(filep, file, file_red);
-		case ENDIF:
-			if (recursion)
-				return(type);
-		case DEFINE:
-			define(line, file);
-			break;
-		case UNDEF:
-			if (!*line) {
-			 warning("%s, line %d: incomplete undef == \"%s\"\n",
-				file_red->i_file, filep->f_line, line);
-			 break;
-			}
-			undefine(line, file_red);
-			break;
-		case INCLUDE:
-			add_include(filep, file, file_red, line, FALSE, failOK);
-			break;
-		case INCLUDEDOT:
-			add_include(filep, file, file_red, line, TRUE, failOK);
-			break;
-		case ERROR:
-		 	warning("%s: %d: %s\n", file_red->i_file,
-				 filep->f_line, line);
-		 	break;
-		 
-		case PRAGMA:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-			break;
-		case -1:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			 warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: unknown directive == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		case -2:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			 warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: incomplete include == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		}
-	}
-	return(-1);
-}
-
-gobble(filep, file, file_red)
-	register struct filepointer *filep;
-	struct inclist		*file, *file_red;
-{
-	register char	*line;
-	register int	type;
-
-	while (line = getline(filep)) {
-		switch(type = deftype(line, filep, file_red, file, FALSE)) {
-		case IF:
-		case IFFALSE:
-		case IFGUESSFALSE:
-		case IFDEF:
-		case IFNDEF:
-			type = gobble(filep, file, file_red);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			 (type == ELIFGUESSFALSE))
-			 type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			 (void)gobble(filep, file, file_red);
-			break;
-		case ELSE:
-		case ENDIF:
-			debug(0,("%s, line %d: #%s\n",
-				file->i_file, filep->f_line,
-				directivestype));
-			return(type);
-		case DEFINE:
-		case UNDEF:
-		case INCLUDE:
-		case INCLUDEDOT:
-		case PRAGMA:
-		case ERROR:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-			break;
-		case ELIF:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-			return(type);
-		case -1:
-			warning("%s, line %d: unknown directive == \"%s\"\n",
-				file_red->i_file, filep->f_line, line);
-			break;
-		}
-	}
-	return(-1);
-}
-
-/*
- * Decide what type of # directive this line is.
- */
-int deftype (line, filep, file_red, file, parse_it)
-	register char	*line;
-	register struct filepointer *filep;
-	register struct inclist *file_red, *file;
-	int	parse_it;
-{
-	register char	*p;
-	char	*directive, savechar;
-	register int	ret;
-
-	/*
-	 * Parse the directive...
-	 */
-	directive=line+1;
-	while (*directive == ' ' || *directive == '\t')
-		directive++;
-
-	p = directive;
-	while (*p >= 'a' && *p <= 'z')
-		p++;
-	savechar = *p;
-	*p = '\0';
-	ret = match(directive, directives);
-	*p = savechar;
-
-	/* If we don't recognize this compiler directive or we happen to just
-	 * be gobbling up text while waiting for an #endif or #elif or #else
-	 * in the case of an #elif we must check the zero_value and return an
-	 * ELIF or an ELIFFALSE.
-	 */
-
-	if (ret == ELIF && !parse_it)
-	{
-	 while (*p == ' ' || *p == '\t')
-		p++;
-	 /*
-	 * parse an expression.
-	 */
-	 debug(0,("%s, line %d: #elif %s ",
-		 file->i_file, filep->f_line, p));
-	 ret = zero_value(p, filep, file_red);
-	 if (ret != IF)
-	 {
-		debug(0,("false...\n"));
-		if (ret == IFFALSE)
-		 return(ELIFFALSE);
-		else
-		 return(ELIFGUESSFALSE);
-	 }
-	 else
-	 {
-		debug(0,("true...\n"));
-		return(ELIF);
-	 }
-	}
-
-	if (ret < 0 || ! parse_it)
-		return(ret);
-
-	/*
-	 * now decide how to parse the directive, and do it.
-	 */
-	while (*p == ' ' || *p == '\t')
-		p++;
-	switch (ret) {
-	case IF:
-		/*
-		 * parse an expression.
-		 */
-		ret = zero_value(p, filep, file_red);
-		debug(0,("%s, line %d: %s #if %s\n",
-			 file->i_file, filep->f_line, ret?"false":"true", p));
-		break;
-	case IFDEF:
-	case IFNDEF:
-		debug(0,("%s, line %d: #%s %s\n",
-			file->i_file, filep->f_line, directivesret, p));
-	case UNDEF:
-		/*
-		 * separate the name of a single symbol.
-		 */
-		while (isalnum(*p) || *p == '_')
-			*line++ = *p++;
-		*line = '\0';
-		break;
-	case INCLUDE:
-		debug(2,("%s, line %d: #include %s\n",
-			file->i_file, filep->f_line, p));
-
-		/* Support ANSI macro substitution */
-		{
-		 struct symtab *sym = isdefined(p, file_red, NULL);
-		 while (sym) {
-			p = sym->s_value;
-			debug(3,("%s : #includes SYMBOL %s = %s\n",
-			 file->i_incstring,
-			 sym -> s_name,
-			 sym -> s_value));
-			/* mark file as having included a 'soft include' */
-			file->i_included_sym = TRUE; 
-			sym = isdefined(p, file_red, NULL);
-		 }
-		}
-
-		/*
-		 * Separate the name of the include file.
-		 */
-		while (*p && *p != '"' && *p != '<')
-			p++;
-		if (! *p)
-			return(-2);
-		if (*p++ == '"') {
-			ret = INCLUDEDOT;
-			while (*p && *p != '"')
-				*line++ = *p++;
-		} else
-			while (*p && *p != '>')
-				*line++ = *p++;
-		*line = '\0';
-		break;
-	case DEFINE:
-		/*
-		 * copy the definition back to the beginning of the line.
-		 */
-		strcpy (line, p);
-		break;
-	case ELSE:
-	case ENDIF:
-	case ELIF:
-	case PRAGMA:
-	case ERROR:
-	case IDENT:
-	case SCCS:
-	case EJECT:
-		debug(0,("%s, line %d: #%s\n",
-			file->i_file, filep->f_line, directivesret));
-		/*
-		 * nothing to do.
-		 */
-		break;
-	}
-	return(ret);
-}
-
-struct symtab *isdefined(symbol, file, srcfile)
-	register char	*symbol;
-	struct inclist	*file;
-	struct inclist	**srcfile;
-{
-	register struct symtab	*val;
-
-	if (val = slookup(symbol, &maininclist)) {
-		debug(1,("%s defined on command line\n", symbol));
-		if (srcfile != NULL) *srcfile = &maininclist;
-		return(val);
-	}
-	if (val = fdefined(symbol, file, srcfile))
-		return(val);
-	debug(1,("%s not defined in %s\n", symbol, file->i_file));
-	return(NULL);
-}
-
-struct symtab *fdefined(symbol, file, srcfile)
-	register char	*symbol;
-	struct inclist	*file;
-	struct inclist	**srcfile;
-{
-	register struct inclist	**ip;
-	register struct symtab	*val;
-	register int	i;
-	static int	recurse_lvl = 0;
-
-	if (file->i_defchecked)
-		return(NULL);
-	file->i_defchecked = TRUE;
-	if (val = slookup(symbol, file))
-		debug(1,("%s defined in %s as %s\n", symbol, file->i_file, val->s_value));
-	if (val == NULL && file->i_list)
-		{
-		for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++)
-			if (val = fdefined(symbol, *ip, srcfile)) {
-				break;
-			}
-		}
-	else if (val != NULL && srcfile != NULL) *srcfile = file;
-	recurse_lvl--;
-	file->i_defchecked = FALSE;
-
-	return(val);
-}
-
-/*
- * Return type based on if the #if expression evaluates to 0
- */
-zero_value(exp, filep, file_red)
-	register char	*exp;
-	register struct filepointer *filep;
-	register struct inclist *file_red;
-{
-	if (cppsetup(exp, filep, file_red))
-	 return(IFFALSE);
-	else
-	 return(IF);
-}
-
-define(def, file)
-	char	*def;
-	struct inclist	*file;
-{
- char *val;
-
- /* Separate symbol name and its value */
- val = def;
- while (isalnum(*val) || *val == '_')
-	val++;
- if (*val)
-	*val++ = '\0';
- while (*val == ' ' || *val == '\t')
-	val++;
-
- if (!*val)
-	val = "1";
- define2(def, val, file);
-}
-
-define2(name, val, file)
-	char	*name, *val;
-	struct inclist	*file;
-{
- int first, last, below;
- register struct symtab *sp = NULL, *dest;
-
- /* Make space if it's needed */
- if (file->i_defs == NULL)
- {
-	file->i_defs = (struct symtab *)
-			malloc(sizeof (struct symtab) * SYMTABINC);
-	file->i_deflen = SYMTABINC;
-	file->i_ndefs = 0;
- }
- else if (file->i_ndefs == file->i_deflen)
-	file->i_defs = (struct symtab *)
-			realloc(file->i_defs,
-			 sizeof(struct symtab)*(file->i_deflen+=SYMTABINC));
-
- if (file->i_defs == NULL)
-	fatalerr("malloc()/realloc() failure in insert_defn()\n");
-
- below = first = 0;
- last = file->i_ndefs - 1;
- while (last >= first)
- {
-	/* Fast inline binary search */
-	register char *s1;
-	register char *s2;
-	register int middle = (first + last) / 2;
-
-	/* Fast inline strchr() */
-	s1 = name;
-	s2 = file->i_defsmiddle.s_name;
-	while (*s1++ == *s2++)
-	 if (s2-1 == '\0') break;
-
-	/* If exact match, set sp and break */
-	if (*--s1 == *--s2) 
-	{
-	 sp = file->i_defs + middle;
-	 break;
-	}
-
-	/* If name > i_defsmiddle ... */
-	if (*s1 > *s2) 
-	{
-	 below = first;
-	 first = middle + 1;
-	}
-	/* else ... */
-	else
-	{
-	 below = last = middle - 1;
-	}
- }
-
- /* Search is done. If we found an exact match to the symbol name,
- just replace its s_value */
- if (sp != NULL)
- {
-	free(sp->s_value);
-	sp->s_value = copy(val);
-	return;
- }
-
- sp = file->i_defs + file->i_ndefs++;
- dest = file->i_defs + below + 1;
- while (sp > dest)
- {
-	*sp = sp-1;
-	sp--;
- }
- sp->s_name = copy(name);
- sp->s_value = copy(val);
-}
-
-struct symtab *slookup(symbol, file)
-	register char	*symbol;
-	register struct inclist	*file;
-{
-	register int first = 0;
-	register int last = file->i_ndefs - 1;
-
-	if (file) while (last >= first)
-	{
-	 /* Fast inline binary search */
-	 register char *s1;
-	 register char *s2;
-	 register int middle = (first + last) / 2;
-
-	 /* Fast inline strchr() */
-	 s1 = symbol;
-	 s2 = file->i_defsmiddle.s_name;
-	 while (*s1++ == *s2++)
-	 if (s2-1 == '\0') break;
-
-	 /* If exact match, we're done */
-	 if (*--s1 == *--s2) 
-	 {
-	 return file->i_defs + middle;
-	 }
-
-	 /* If symbol > i_defsmiddle ... */
-	 if (*s1 > *s2) 
-	 {
-	 first = middle + 1;
-	 }
-	 /* else ... */
-	 else
-	 {
-	 last = middle - 1;
-	 }
-	}
-	return(NULL);
-}
-
-undefine(symbol, file)
-	char	*symbol;
-	register struct inclist	*file;
-{
-	register struct symtab *ptr;
-	struct inclist *srcfile;
-	while ((ptr = isdefined(symbol, file, &srcfile)) != NULL)
-	{
-	 srcfile->i_ndefs--;
-	 for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++)
-		*ptr = ptr1;
-	}
-}

cyrus-imapd-2.4.17.tar.gz/makedepend/pr.c Deleted

@@ -1,169 +0,0 @@
-/* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: pr.c,v 1.5 2010/01/06 17:01:50 murch Exp $
- */
-/*
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-
-extern struct	inclist	inclist MAXFILES ,
-			*inclistp;
-extern char	*objprefix;
-extern char	*objsuffix;
-extern int	width;
-extern boolean	printed;
-extern boolean	verbose;
-extern boolean	show_where_not;
-
-add_include(filep, file, file_red, include, dot, failOK)
-	struct filepointer	*filep;
-	struct inclist	*file, *file_red;
-	char	*include;
-	boolean	dot;
-{
-	register struct inclist	*newfile;
-	register struct filepointer	*content;
-
-	/*
-	 * First decide what the pathname of this include file really is.
-	 */
-	newfile = inc_path(file->i_file, include, dot);
-	if (newfile == NULL) {
-		if (failOK)
-		 return;
-		if (file != file_red)
-			warning("%s (reading %s, line %d): ",
-				file_red->i_file, file->i_file, filep->f_line);
-		else
-			warning("%s, line %d: ", file->i_file, filep->f_line);
-		warning1("cannot find include file \"%s\"\n", include);
-		show_where_not = TRUE;
-		newfile = inc_path(file->i_file, include, dot);
-		show_where_not = FALSE;
-	}
-
-	if (newfile) {
-		included_by(file, newfile);
-		if (!newfile->i_searched) {
-			newfile->i_searched = TRUE;
-			content = getfile(newfile->i_file);
-			find_includes(content, newfile, file_red, 0, failOK);
-			freefile(content);
-		}
-	}
-}
-
-recursive_pr_include(head, file, base)
-	register struct inclist	*head;
-	register char	*file, *base;
-{
-	register int	i;
-
-	if (head->i_marked)
-		return;
-	head->i_marked = TRUE;
-	if (head->i_file != file)
-		pr(head, file, base);
-	for (i=0; i<head->i_listlen; i++)
-		recursive_pr_include(head->i_list i , file, base);
-}
-
-pr(ip, file, base)
-	register struct inclist *ip;
-	char	*file, *base;
-{
-	static char	*lastfile;
-	static int	current_len;
-	register int	len, i;
-	char	buf BUFSIZ ;
-
-	printed = TRUE;
-	len = strlen(ip->i_file)+1;
-	if (current_len + len > width || file != lastfile) {
-		lastfile = file;
-		sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
-			ip->i_file);
-		len = current_len = strlen(buf);
-	}
-	else {
-		buf0 = ' ';
-		strcpy(buf+1, ip->i_file);
-		current_len += len;
-	}
-	fwrite(buf, len, 1, stdout);
-
-	/*
-	 * If verbose is set, then print out what this file includes.
-	 */
-	if (! verbose || ip->i_list == NULL || ip->i_notified)
-		return;
-	ip->i_notified = TRUE;
-	lastfile = NULL;
-	printf("\n# %s includes:", ip->i_file);
-	for (i=0; i<ip->i_listlen; i++)
-		printf("\n#\t%s", ip->i_list i ->i_incstring);
-}

cyrus-imapd-2.4.17.tar.gz/man/Makefile.dist Deleted

cyrus-imapd-2.4.17.tar.gz/man/Makefile.in Deleted

@@ -1,112 +0,0 @@
-# Makefile for man pages
-# 
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For permission or any legal
-#    details, please contact
-#      Carnegie Mellon University
-#      Center for Technology Transfer and Enterprise Creation
-#      4615 Forbes Avenue
-#      Suite 302
-#      Pittsburgh, PA  15213
-#      (412) 268-7393, fax: (412) 268-7395
-#      innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#    "This product includes software developed by Computing Services
-#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.42 2010/01/06 17:01:50 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INSTALL = @INSTALL@
-
-SHELL = /bin/sh
-
-prefix = @prefix@
-
-mandir = @mandir@
-
-MAN1 = $(srcdir)/imtest.1 $(srcdir)/pop3test.1 $(srcdir)/nntptest.1 \
-	$(srcdir)/lmtptest.1 $(srcdir)/smtptest.1 $(srcdir)/sivtest.1 \
-	$(srcdir)/mupdatetest.1 $(srcdir)/installsieve.1 $(srcdir)/sieveshell.1
-MAN3 = $(srcdir)/imclient.3
-MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
-MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \
-	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
-	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
-	$(srcdir)/ctl_deliver.8 $(srcdir)/ctl_cyrusdb.8 $(srcdir)/ipurge.8 \
-	$(srcdir)/tls_prune.8 $(srcdir)/squatter.8 $(srcdir)/cvt_cyrusdb.8 \
-	$(srcdir)/notifyd.8 $(srcdir)/chk_cyrus.8 $(srcdir)/mbexamine.8 \
-	$(srcdir)/nntpd.8 $(srcdir)/fetchnews.8 $(srcdir)/smmapd.8 \
-	$(srcdir)/sync_client.8 $(srcdir)/sync_server.8 $(srcdir)/sync_reset.8 \
-	$(srcdir)/unexpunge.8 $(srcdir)/cyr_dbtool.8 \
-	$(srcdir)/cyr_synclog.8 $(srcdir)/cyr_df.8
-
-all: $(MAN1) $(MAN3) $(MAN5) $(MAN8)
-
-$(srcdir)/sieveshell.1: $(srcdir)/../perl/sieve/scripts/sieveshell.pl
-	@echo creating sieveshell.1
-	pod2man $(srcdir)/../perl/sieve/scripts/sieveshell.pl > $(srcdir)/sieveshell.1
-
-$(srcdir)/imapd.conf.5: $(srcdir)/../lib/imapoptions $(srcdir)/../tools/config2man
-	@echo creating imapd.conf.5
-	$(srcdir)/../tools/config2man $(srcdir)/../lib/imapoptions > $(srcdir)/imapd.conf.5
-
-install:
-	for file in $(MAN1); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man1 || exit 1; \
-	done
-	for file in $(MAN3); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man3 || exit 1; \
-	done
-	for file in $(MAN5); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man5 || exit 1; \
-	done
-	for file in $(MAN8); \
-	do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
-	done
-
-clean:
-	rm -f $(srcdir)/imapd.conf.5 $(srcdir)/sieveshell.1 Makefile.bak
-
-distclean: clean
-	rm -f Makefile
-
-depend: 
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-

cyrus-imapd-2.4.17.tar.gz/man/imapd.conf.5 Deleted

@@ -1,1200 +0,0 @@
-.\" -*- nroff -*-
-.\" auto-generated by config2man 1.6
-.\" -*- nroff -*-
-.TH IMAPD.CONF 5 "Project Cyrus" CMU
-.\"
-.\" Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\"
-.\" 3. The name "Carnegie Mellon University" must not be used to
-.\" endorse or promote products derived from this software without
-.\" prior written permission. For permission or any legal
-.\" details, please contact
-.\" Carnegie Mellon University
-.\" Center for Technology Transfer and Enterprise Creation
-.\" 4615 Forbes Avenue
-.\" Suite 302
-.\" Pittsburgh, PA 15213
-.\" (412) 268-7393, fax: (412) 268-7395
-.\" innovation@andrew.cmu.edu
-*
-.\" 4. Redistributions of any form whatsoever must retain the following
-.\" acknowledgment:
-.\" "This product includes software developed by Computing Services
-.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-.\"
-.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: imapoptions,v 1.78 2010/06/28 12:06:43 brong Exp $
-
-.SH NAME
-imapd.conf \- IMAP configuration file
-.SH DESCRIPTION
-\fB/etc/imapd.conf\fR 
-is the configuration file for the Cyrus IMAP server. It defines
-local parameters for IMAP. 
-.PP
-Each line of the \fB/etc/imapd.conf\fR file has the form
-.IP
-\fIoption\fR: \fIvalue\fR
-.PP
-where \fIoption\fR is the name of the configuration option being set
-and \fIvalue\fR is the value that the configuration option is being
-set to.
-.PP
-Although there is no limit to the length of a line, a ``\\''
-(backslash) character may be used as the last character on a line to
-force it to continue on the next one. No additional whitespace is
-inserted before or after the ``\\''. Note that a line that is split
-using ``\\'' character(s) is still considered a single line.
-For example
-.IP
-\fIoption\fR:\\
-.br
-.in +1
-\fIvalue\fR1 \fIvalue\fR2 \\
-.br
-.in +1
-\fIvalue\fR3
-.PP
-is equivalent to
-.IP
-\fIoption\fR: \fIvalue\fR1 \fIvalue\fR2 \fIvalue\fR3
-.PP
-Blank lines and lines beginning with ``#'' are ignored.
-.PP
-For boolean and enumerated options, the values ``yes'', ``on'', ``t'',
-``true'' and ``1'' turn the option on, the values ``no'', ``off'',
-``f'', ``false'' and ``0'' turn the option off.
-.SH FIELD DESCRIPTIONS
-.PP
-The sections below detail options that can be placed in the
-\fB/etc/imapd.conf\fR file, and show each option's default value.
-Some options have no default value, these are listed with
-``<no default>''. Some options default to the empty string, these
-are listed with ``<none>''.
-
-.IP "\fBadmins:\fR <empty string>" 5
-The list of userids with administrative rights. Separate each userid
-with a space. Sites using Kerberos authentication may use
-separate "admin" instances.
-.PP
-Note that accounts used by users should not be administrators.
-Administrative accounts should not receive mail. That is, if user
-"jbRo" is a user reading mail, he should not also be in the admins line.
-Some problems may occur otherwise, most notably the ability of
-administrators to create top-level mailboxes visible to users,
-but not writable by users. 
-.IP "\fBafspts_localrealms:\fR <none>" 5
-The list of realms which are to be treated as local, and thus stripped
-during identifier canonicalization (for the AFSPTS ptloader module).
-This is different from loginrealms in that it occurs later in the
-authorization process (as the user id is canonified for PTS lookup) 
-.IP "\fBafspts_mycell:\fR <none>" 5
-Cell to use for AFS PTS lookups. Defaults to the local cell. 
-.IP "\fBallowallsubscribe:\fR 0" 5
-Allow subscription to nonexistent mailboxes. This option is
-typically used on backend servers in a Murder so that users can
-subscribe to mailboxes that don't reside on their "home" server.
-This option can also be used as a workaround for IMAP clients which
-don't play well with nonexistent or unselectable mailboxes (e.g.,
-Microsoft Outlook). 
-.IP "\fBallowanonymouslogin:\fR 0" 5
-Permit logins by the user "anonymous" using any password. Also
-allows use of the SASL ANONYMOUS mechanism. 
-.IP "\fBallowapop:\fR 1" 5
-Allow use of the POP3 APOP authentication command.
-.PP
-Note that this command requires that SASL is compiled with APOP
-support, that the plaintext passwords are available in a SASL auxprop
-backend (e.g., sasldb), and that the system can provide enough entropy
-(e.g., from /dev/urandom) to create a challenge in the banner. 
-.IP "\fBallownewnews:\fR 0" 5
-Allow use of the NNTP NEWNEWS command.
-.PP
-Note that this is a very expensive command and should only be
-enabled when absolutely necessary. 
-.IP "\fBallowplaintext:\fR 0" 5
-Allow the use of cleartext passwords on the wire. 
-.IP "\fBallowusermoves:\fR 0" 5
-Allow moving user accounts (with associated meta-data) via RENAME
-or XFER.
-.PP
-Note that measures should be taken to make sure that the user being
-moved is not logged in, and cannot login during the move. Failure
-to do so may result in the user's meta-data (seen state,
-subscriptions, etc) being corrupted or out of date. 
-.IP "\fBaltnamespace:\fR 0" 5
-Use the alternate IMAP namespace, where personal folders reside at the
-same level in the hierarchy as INBOX.
-.PP
-This option ONLY applies where interaction takes place with the
-client/user. Currently this is limited to the IMAP protocol (imapd)
-and Sieve scripts (lmtpd). This option does NOT apply to admin tools
-such as cyradm (admins ONLY), reconstruct, quota, etc., NOR does it
-affect LMTP delivery of messages directly to mailboxes via
-plus-addressing. 
-.IP "\fBannotation_db:\fR skiplist" 5
-The cyrusdb backend to use for mailbox annotations. 
-
-Allowed values: \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR
-.IP "\fBannotation_db_path:\fR <none>" 5
-The absolute path to the annotations db file. If not specified,
-will be confdir/annotations.db 
-.IP "\fBanyoneuseracl:\fR 1" 5
-Should non-admin users be allowed to set ACLs for the 'anyone'
-user on their mailboxes? In a large organization this can cause
-support problems, but it's enabled by default. 
-.IP "\fBannotation_definitions:\fR <none>" 5
-File containing external (third-party) annotation definitions.
-.PP
-Each line of the file specifies the properties of an annotation and
-has the following form:
-.IP
-\fIname\fR, \fIscope\fR, \fIattrib-type\fR, \fIproxy-type\fR,
-\fIattrib-names\fR, \fIacl\fR
-.IP \fIname\fR 5
-is the hierarchical name as in the draft standard, typically of the
-form /vendor/acme/blurdybloop
-.IP \fIscope\fR 5
-specifies whether the annotation is for the \fBserver\fR or a
-\fBmailbox\fR
-.IP \fIattrib-type\fR 5
-specifies the attribute data type which is one of: \fBstring\fR,
-\fBboolean\fR, \fBint\fR, \fBuint\fR, or \fBcontent-type\fR
-.IP \fIproxy-type\fR 5
-specifies whether this attribute is for the \fBbackend\fR or
-\fBproxy\fR servers or both (\fBproxy_and_backend\fR) 
-.IP \fIattrib-names\fR 5
-is the space-separated list of available attributes for the
-annotation. Possible attribute names are (where the suffixless \fBfoo\fR
-permits both \fBfoo.priv\fR and \fBfoo.shared\fR): \fBalue\fR,
-\fBvalue.shared\fR, \fBvalue.priv\fR, \fBsize\fR, \fBsize.shared\fR,
-\fBsize.priv\fR, \fBmodifiedsince\fR, \fBmodifiedsince.shared\fR,
-\fBmodifiedsince.priv\fR, \fBcontent-type\fR,
-\fBcontent-type.shared\fR, \fBcontent-type.priv\fR
-.IP \fIacl\fR 5
-is the extra ACL requirements for setting annotations. This is the
-standard IMAP ACL permission bit string format. Particularly useful
-is the \fBa\fR right to require admin privileges. Note that some ACL
-requirements (read and write on the mailbox) are hard-wired in the
-server
-.PP
-Blank lines and lines beginning with ``#'' are ignored.
-
-.IP "\fBauditlog:\fR 0" 5
-Should cyrus output log entries for every action taken on a message
-file or mailboxes list entry? It's noisy so disabled by default, but
-can be very useful for tracking down what happened if things look strange 
-.IP "\fBauth_mech:\fR unix" 5
-The authorization mechanism to use. 
-
-Allowed values: \fIunix\fR, \fIpts\fR, \fIkrb\fR, \fIkrb5\fR
-.IP "\fBautocreatequota:\fR 0" 5
-If nonzero, normal users may create their own IMAP accounts by
-creating the mailbox INBOX. The user's quota is set to the value
-if it is positive, otherwise the user has unlimited quota. 
-.IP "\fBberkeley_cachesize:\fR 512" 5
-Size (in kilobytes) of the shared memory buffer pool (cache) used
-by the berkeley environment. The minimum allowed value is 20. The
-maximum allowed value is 4194303 (4GB). 
-.IP "\fBberkeley_locks_max:\fR 50000" 5
-Maximum number of locks to be held or requested in the berkeley
-environment. 
-.IP "\fBberkeley_txns_max:\fR 100" 5
-Maximum number of transactions to be supported in the berkeley
-environment. 
-.IP "\fBboundary_limit:\fR 1000" 5
-messages are parsed recursively and a deep enough MIME structure
-can cause a stack overflow. Do not parse deeper than this many
-layers of MIME structure. The default of 1000 is much higher
-than any sane message should have. 
-.IP "\fBclient_timeout:\fR 10" 5
-Number of seconds to wait before returning a timeout failure when
-performing a client connection (e.g., in a murder environment) 
-.IP "\fBcommandmintimer:\fR <none>" 5
-Time in seconds. Any imap command that takes longer than this
-time is logged. 
-.IP "\fBconfigdirectory:\fR <none>" 5
-The pathname of the IMAP configuration directory. This field is
-required. 
-.IP "\fBdebug_command:\fR <none>" 5
-Debug command to be used by processes started with -D option. The string
-is a C format string that gets 3 options: the first is the name of the
-executable (without path). The second is the pid (integer) and the third
-is the service ID. Example: /usr/local/bin/gdb /usr/cyrus/bin/%s %d 
-.IP "\fBdefaultacl:\fR anyone lrs" 5
-The Access Control List (ACL) placed on a newly-created (non-user)
-mailbox that does not have a parent mailbox. 
-.IP "\fBdefaultdomain:\fR <none>" 5
-The default domain for virtual domain support 
-.IP "\fBdefaultpartition:\fR <none>" 5
-The partition name used by default for new mailboxes. If not
-specified, the partition with the most free space will be used for new
-mailboxes. 
-.IP "\fBdefaultserver:\fR <none>" 5
-The backend server name used by default for new mailboxes. If not
-specified, the server with the most free space will be used for new
-mailboxes. 
-.IP "\fBdeletedprefix:\fR DELETED" 5
-If "delete_mode" set to be "delayed", the prefix for the deleted
-mailboxes hierarchy. The hierarchy delimiter will be automatically
-appended. 
-.IP "\fBdelete_mode:\fR immediate" 5
-The manner in which mailboxes are deleted. "immediate" mode is the
-default behavior in which mailboxes are removed immediately. In
-"delayed" mode, mailboxes are renamed to a special hiearchy defined
-by the "deletedprefix" option to be removed later by cyr_expire.
-
-
-Allowed values: \fIimmediate\fR, \fIdelayed\fR
-.IP "\fBdeleteright:\fR c" 5
-Deprecated - only used for backwards compatibility with existing
-installations. Lists the old RFC 2086 right which was used to
-grant the user the ability to delete a mailbox. If a user has this
-right, they will automatically be given the new 'x' right. 
-.IP "\fBdisable_user_namespace:\fR 0" 5
-Preclude list command on user namespace. If set to 'yes', the 
-LIST response will never include any other user's mailbox. Admin
-users will always see all mailboxes. The default is 'no' 
-.IP "\fBdisable_shared_namespace:\fR 0" 5
-Preclude list command on user namespace. If set to 'yes', the 
-LIST response will never include any non-user mailboxes. Admin
-users will always see all mailboxes. The default is 'no' 
-.IP "\fBdisconnect_on_vanished_mailbox:\fR 0" 5
-If enabled, IMAP/POP3/NNTP clients will be disconnected by the
-server if the currently selected mailbox is (re)moved by another
-session. Otherwise, the missing mailbox is treated as empty while
-in use by the client.
-.IP "\fBduplicate_db:\fR skiplist" 5
-The cyrusdb backend to use for the duplicate delivery suppression
-and sieve. 
-
-Allowed values: \fIberkeley\fR, \fIberkeley-nosync\fR, \fIberkeley-hash\fR, \fIberkeley-hash-nosync\fR, \fIskiplist\fR, \fIsql\fR
-.IP "\fBduplicate_db_path:\fR <none>" 5
-The absolute path to the duplicate db file. If not specified,
-will be confdir/deliver.db 
-.IP "\fBduplicatesuppression:\fR 1" 5
-If enabled, lmtpd will suppress delivery of a message to a mailbox if
-a message with the same message-id (or resent-message-id) is recorded
-as having already been delivered to the mailbox. Records the mailbox
-and message-id/resent-message-id of all successful deliveries. 
-.IP "\fBexpunge_mode:\fR default" 5
-The mode in which messages (and their corresponding cache entries)
-are expunged. "default" mode is the default behavior in which the
-message files are purged at the time of the EXPUNGE, but index
-and cache records are retained to facilitate QRESYNC. In "delayed"
-mode, the message files are also retained, allowing unexpunge to
-rescue them. In "immediate" mode, both the message files and the
-index records are removed as soon as possible. In all cases,
-nothing will be finally purged until all other processes have
-closed the mailbox to ensure they never see data disappear under
-them. In "default" or "delayed" mode, a later run of "cyr_expire"
-will clean out the retained records (and possibly message files).
-This reduces the amount of I/O that takes place at the time of
-EXPUNGE and should result in greater responsiveness for the client,
-especially when expunging a large number of messages. 
-
-Allowed values: \fIdefault\fR, \fIimmediate\fR, \fIdelayed\fR
-.IP "\fBexpunge_days:\fR 7" 5
-Number of days to retain expunged messages before cleaning up their
-index records. The default is 7. This is necessary for QRESYNC
-to work correctly. If combined with delayed expunge (above) you
-will also be able to unexpunge messages during this time. 
-.IP "\fBfailedloginpause:\fR 3" 5
-Number of seconds to pause after a failed login. 
-.IP "\fBflushseenstate:\fR 0" 5
-If enabled, changes to the seen state will be flushed to disk
-immediately, otherwise changes will be cached and flushed when the
-mailbox is closed. This option may be used to fix the problem of
-previously read messages being marked as unread in Microsoft
-Outlook, at the expense of a loss of performance/scalability. 
-.IP "\fBfoolstupidclients:\fR 0" 5
-If enabled, only list the personal namespace when a LIST "*" is performed
-(it changes the request to a LIST "INBOX*"). 
-.IP "\fBforce_sasl_client_mech:\fR <none>" 5
-Force preference of a given SASL mechanism for client side operations
-(e.g., murder environments). This is separate from (and overridden by)
-the ability to use the <host shortname>_mechs option to set preferred
-mechanisms for a specific host 
-.IP "\fBfulldirhash:\fR 0" 5
-If enabled, uses an improved directory hashing scheme which hashes
-on the entire username instead of using just the first letter as
-the hash. This changes hash algorithm used for quota and user
-directories and if \fIhashimapspool\fR is enabled, the entire mail
-spool.
-.PP
-Note that this option CANNOT be changed on a live system. The
-server must be quiesced and then the directories moved with the
-\fBrehash\fR utility. 
-.IP "\fBhashimapspool:\fR 0" 5
-If enabled, the partitions will also be hashed, in addition to the
-hashing done on configuration directories. This is recommended if
-one partition has a very bushy mailbox tree. 
-.IP "\fBhostname_mechs:\fR <none>" 5
-Force a particular list of SASL mechanisms to be used when authenticating
-to the backend server hostname (where hostname is the short hostname of
-the server in question). If it is not specified it will query the server
-for available mechanisms and pick one to use. - Cyrus Murder 
-.IP "\fBhostname_password:\fR <none>" 5
-The password to use for authentication to the backend server hostname
-(where hostname is the short hostname of the server) - Cyrus Murder 
-.IP "\fBidlesocket:\fR {configdirectory}/socket/idle" 5
-Unix domain socket that idled listens on. 
-.IP "\fBignorereference:\fR 0" 5
-For backwards compatibility with Cyrus 1.5.10 and earlier -- ignore
-the reference argument in LIST or LSUB commands. 
-.IP "\fBimapidlepoll:\fR 60" 5
-The interval (in seconds) for polling for mailbox changes and
-ALERTs while running the IDLE command. This option is used when
-idled is not enabled or cannot be contacted. The minimum value is
-1. A value of 0 will disable IDLE. 
-.IP "\fBimapidresponse:\fR 1" 5
-If enabled, the server responds to an ID command with a parameter 
-list containing: version, vendor, support-url, os, os-version,
-command, arguments, environment. Otherwise the server returns NIL. 
-.IP "\fBimapmagicplus:\fR 0" 5
-Only list a restricted set of mailboxes via IMAP by using
-userid+namespace syntax as the authentication/authorization id.
-Using userid+ (with an empty namespace) will list only subscribed
-mailboxes. 
-.IP "\fBimplicit_owner_rights:\fR lkxa" 5
-The implicit Access Control List (ACL) for the owner of a mailbox. 
-.IP "\fB@include:\fR <none>" 5
-Directive which includes the specified file as part of the
-configuration. If the path to the file is not absolute, CYRUS_PATH
-is prepended. 
-.IP "\fBimproved_mboxlist_sort:\fR 0" 5
-If enabled, a special comparator will be used which will correctly
-sort mailbox names that contain characters such as ' ' and '-'.
-.PP
-Note that this option SHOULD NOT be changed on a live system. The
-mailboxes database should be dumped (ctl_mboxlist) before the
-option is changed, removed, and then undumped after changing the
-option. When not using flat files for the subscriptions databases
-the same has to be done (cyr_dbtool) for each subscription database
-See improved_mboxlist_sort.html.
-.IP "\fBinternaldate_heuristic:\fR standard" 5
-Mechanism to determine email internaldates on delivery/reconstruct.
-"standard" uses time() when delivering a message, mtime on reconstruct.
-"receivedheader" looks at the top most Received header
-or time/mtime otherwise 
-
-Allowed values: \fIstandard\fR, \fIreceivedheader\fR
-.IP "\fBldap_authz:\fR <none>" 5
-SASL authorization ID for the LDAP server 
-.IP "\fBldap_base:\fR <empty string>" 5
-Contains the LDAP base dn for the LDAP ptloader module 
-.IP "\fBldap_bind_dn:\fR <none>" 5
-Bind DN for the connection to the LDAP server (simple bind).
-Do not use for anonymous simple binds 
-.IP "\fBldap_deref:\fR never" 5
-Specify how aliases dereferencing is handled during search. 
-
-Allowed values: \fIsearch\fR, \fIfind\fR, \fIalways\fR, \fInever\fR
-.IP "\fBldap_filter:\fR (uid=%u)" 5
-Specify a filter that searches user identifiers. The following tokens can be
-used in the filter string:
-
-%% = %
-%u = user
-%U = user portion of %u (%U = test when %u = test@domain.tld)
-%d = domain portion of %u if available (%d = domain.tld when %u =
-%test@domain.tld), otherwise same as %r
-%D = user dn. (use when ldap_member_method: filter)
-%1-9 = domain tokens (%1 = tld, %2 = domain when %d = domain.tld)
-
-ldap_filter is not used when ldap_sasl is enabled. 
-.IP "\fBldap_group_base:\fR <empty string>" 5
-LDAP base dn for ldap_group_filter. 
-.IP "\fBldap_group_filter:\fR (cn=%u)" 5
-Specify a filter that searches for group identifiers.
-See ldap_filter for more options. 
-.IP "\fBldap_group_scope:\fR sub" 5
-Specify search scope for ldap_group_filter. 
-
-Allowed values: \fIsub\fR, \fIone\fR, \fIbase\fR
-.IP "\fBldap_id:\fR <none>" 5
-SASL authentication ID for the LDAP server 
-.IP "\fBldap_mech:\fR <none>" 5
-SASL mechanism for LDAP authentication 
-.IP "\fBldap_member_attribute:\fR <none>" 5
-See ldap_member_method. 
-.IP "\fBldap_member_base:\fR <empty string>" 5
-LDAP base dn for ldap_member_filter. 
-.IP "\fBldap_member_filter:\fR (member=%D)" 5
-Specify a filter for "ldap_member_method: filter". 
-See ldap_filter for more options. 
-.IP "\fBldap_member_method:\fR attribute" 5
-Specify a group method. The "attribute" method retrieves groups from 
-a multi-valued attribute specified in ldap_member_attribute. 
-
-The "filter" method uses a filter, specified by ldap_member_filter, to find
-groups; ldap_member_attribute is a single-value attribute group name. 
-
-Allowed values: \fIattribute\fR, \fIfilter\fR
-.IP "\fBldap_member_scope:\fR sub" 5
-Specify search scope for ldap_member_filter. 
-
-Allowed values: \fIsub\fR, \fIone\fR, \fIbase\fR
-.IP "\fBldap_password:\fR <none>" 5
-Password for the connection to the LDAP server (SASL and simple bind). 
-Do not use for anonymous simple binds 
-.IP "\fBldap_realm:\fR <none>" 5
-SASL realm for LDAP authentication 
-.IP "\fBldap_referrals:\fR 0" 5
-Specify whether or not the client should follow referrals. 
-.IP "\fBldap_restart:\fR 1" 5
-Specify whether or not LDAP I/O operations are automatically restarted
-if they abort prematurely. 
-.IP "\fBldap_sasl:\fR 1" 5
-Use SASL for LDAP binds in the LDAP PTS module. 
-.IP "\fBldap_sasl_authc:\fR <none>" 5
-Deprecated. Use ldap_id 
-.IP "\fBldap_sasl_authz:\fR <none>" 5
-Deprecated. Use ldap_authz 
-.IP "\fBldap_sasl_mech:\fR <none>" 5
-Deprecated. Use ldap_mech 
-.IP "\fBldap_sasl_password:\fR <none>" 5
-Deprecated. User ldap_password 
-.IP "\fBldap_sasl_realm:\fR <none>" 5
-Deprecated. Use ldap_realm 
-.IP "\fBldap_scope:\fR sub" 5
-Specify search scope. 
-
-Allowed values: \fIsub\fR, \fIone\fR, \fIbase\fR
-.IP "\fBldap_servers:\fR ldap://localhost/" 5
-Deprecated. Use ldap_uri 
-.IP "\fBldap_size_limit:\fR 1" 5
-Specify a number of entries for a search request to return. 
-.IP "\fBldap_start_tls:\fR 0" 5
-Use StartTLS extended operation. Do not use ldaps: ldap_uri when
-this option is enabled. 
-.IP "\fBldap_time_limit:\fR 5" 5
-Specify a number of seconds for a search request to complete. 
-.IP "\fBldap_timeout:\fR 5" 5
-Specify a number of seconds a search can take before timing out. 
-.IP "\fBldap_tls_cacert_dir:\fR <none>" 5
-Path to directory with CA (Certificate Authority) certificates. 
-.IP "\fBldap_tls_cacert_file:\fR <none>" 5
-File containing CA (Certificate Authority) certificate(s). 
-.IP "\fBldap_tls_cert:\fR <none>" 5
-File containing the client certificate. 
-.IP "\fBldap_tls_check_peer:\fR 0" 5
-Require and verify server certificate. If this option is yes,
-you must specify ldap_tls_cacert_file or ldap_tls_cacert_dir. 
-.IP "\fBldap_tls_ciphers:\fR <none>" 5
-List of SSL/TLS ciphers to allow. The format of the string is
-described in ciphers(1). 
-.IP "\fBldap_tls_key:\fR <none>" 5
-File containing the private client key. 
-.IP "\fBldap_uri:\fR <none>" 5
-Contains a list of the URLs of all the LDAP servers when using the
-LDAP PTS module. 
-.IP "\fBldap_version:\fR 3" 5
-Specify the LDAP protocol version. If ldap_start_tls and/or
-ldap_use_sasl are enabled, ldap_version will be automatically
-set to 3. 
-.IP "\fBlmtp_downcase_rcpt:\fR 0" 5
-If enabled, lmtpd will convert the recipient addresses to lowercase
-(up to a '+' character, if present). 
-.IP "\fBlmtp_fuzzy_mailbox_match:\fR 0" 5
-If enabled, and the mailbox specified in the detail part of the
-recipient (everything after the '+') does not exist, lmtpd will try
-to find the closest match (ignoring case, ignoring whitespace,
-falling back to parent) to the specified mailbox name. 
-.IP "\fBlmtp_over_quota_perm_failure:\fR 0" 5
-If enabled, lmtpd returns a permanent failure code when a user's
-mailbox is over quota. By default, the failure is temporary,
-causing the MTA to queue the message and retry later. 
-.IP "\fBlmtp_strict_quota:\fR 0" 5
-If enabled, lmtpd returns a failure code when the incoming message
-will cause the user's mailbox to exceed its quota. By default, the
-failure won't occur until the mailbox is already over quota. 
-.IP "\fBlmtp_strict_rfc2821:\fR 1" 5
-By default, lmtpd will be strict (per RFC 2821) with regards to which
-envelope addresses are allowed. If this option is set to false, 8bit
-characters in the local-part of envelope addresses are changed to 'X'
-instead. This is useful to avoid generating backscatter with 
-certain MTAs like Postfix or Exim which accept such messages. 
-.IP "\fBlmtpsocket:\fR {configdirectory}/socket/lmtp" 5
-Unix domain socket that lmtpd listens on, used by deliver(8). This should
-match the path specified in cyrus.conf(5). 
-.IP "\fBlmtptxn_timeout:\fR 300" 5
-Timeout (in seconds) used during a lmtp transaction to a remote backend
-(e.g. in a murder environment). Can be used to prevent hung lmtpds
-on proxy hosts when a backend server becomes unresponsive during a
-lmtp transaction. The default is 300 - change to zero for infinite. 
-.IP "\fBloginrealms:\fR <empty string>" 5
-The list of remote realms whose users may authenticate using cross-realm
-authentication identifiers. Separate each realm name by a space. (A
-cross-realm identity is considered any identity returned by SASL
-with an "@" in it.). 
-.IP "\fBloginuseacl:\fR 0" 5
-If enabled, any authentication identity which has \fBa\fR rights on a
-user's INBOX may log in as that user. 
-.IP "\fBlogtimestamps:\fR 0" 5
-Include notations in the protocol telemetry logs indicating the number of
-seconds since the last command or response. 
-.IP "\fBmailbox_default_options:\fR 0" 5
-Default "options" field for the mailbox on create. You'll want to know
-what you're doing before setting this, but it can apply some default
-annotations like duplicate supression 
-.IP "\fBmailnotifier:\fR <none>" 5
-Notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL"
-notifications are disabled. 
-.IP "\fBmaxheaderlines:\fR 1000" 5
-Maximum number of lines of header that will be processed into cache
-records. Default 1000. If set to zero, it is unlimited.
-If a message hits the limit, an error will be logged and the rest of
-the lines in the header will be skipped. This is to avoid malformed
-messages causing giant cache records 
-.IP "\fBmaxmessagesize:\fR 0" 5
-Maximum incoming LMTP message size. If non-zero, lmtpd will reject
-messages larger than \fImaxmessagesize\fR bytes. If set to 0, this
-will allow messages of any size (the default). 
-.IP "\fBmaxquoted:\fR 131072" 5
-Maximum size of a single quoted string for the parser. Default 128k 
-.IP "\fBmaxword:\fR 131072" 5
-Maximum size of a single word for the parser. Default 128k 
-.IP "\fBmboxkey_db:\fR skiplist" 5
-The cyrusdb backend to use for mailbox keys. 
-
-Allowed values: \fIberkeley\fR, \fIskiplist\fR
-.IP "\fBmboxlist_db:\fR skiplist" 5
-The cyrusdb backend to use for the mailbox list. 
-
-Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR
-.IP "\fBmboxlist_db_path:\fR <none>" 5
-The absolute path to the mailboxes db file. If not specified
-will be confdir/mailboxes.db 
-.IP "\fBmboxname_lockpath:\fR <none>" 5
-Path to mailbox name lock files (default $conf/lock) 
-.IP "\fBmetapartition_files:\fR <empty string>" 5
-Space-separated list of metadata files to be stored on a
-\fImetapartition\fR rather than in the mailbox directory on a spool
-partition. 
-
-Allowed values: \fIheader\fR, \fIindex\fR, \fIcache\fR, \fIexpunge\fR, \fIsquat\fR
-.IP "\fBmetapartition-name:\fR <none>" 5
-The pathname of the metadata partition \fIname\fR, corresponding to
-spool partition \fBpartition-name\fR. For any mailbox residing in
-a directory on \fBpartition-name\fR, the metadata files listed in
-\fImetapartition_files\fR will be stored in a corresponding directory on
-\fBmetapartition-name\fR. Note that not every
-\fBpartition-name\fR option is required to have a corresponding
-\fBmetapartition-name\fR option, so that you can selectively choose
-which spool partitions will have separate metadata partitions. 
-.IP "\fBmupdate_authname:\fR <none>" 5
-The SASL username (Authentication Name) to use when authenticating to the
-mupdate server (if needed). 
-.IP "\fBmupdate_config:\fR standard" 5
-The configuration of the mupdate servers in the Cyrus Murder.
-The "standard" config is one in which there are discreet frontend
-(proxy) and backend servers. The "unified" config is one in which
-a server can be both a frontend and backend. The "replicated"
-config is one in which multiple backend servers all share the same
-mailspool, but each have their own "replicated" copy of
-mailboxes.db. 
-
-Allowed values: \fIstandard\fR, \fIunified\fR, \fIreplicated\fR
-.IP "\fBmunge8bit:\fR 1" 5
-If enabled, lmtpd munges messages with 8-bit characters in the
-headers. The 8-bit characters are changed to `X'. If
-\fBreject8bit\fR is enabled, setting \fBmunge8bit\fR has no effect.
-(A proper solution to non-ASCII characters in headers is offered by
-RFC 2047 and its predecessors.) 
-.IP "\fBmupdate_connections_max:\fR 128" 5
-The max number of connections that a mupdate process will allow, this
-is related to the number of file descriptors in the mupdate process.
-Beyond this number connections will be immediately issued a BYE response. 
-.IP "\fBmupdate_password:\fR <none>" 5
-The SASL password (if needed) to use when authenticating to the
-mupdate server. 
-.IP "\fBmupdate_port:\fR 3905" 5
-The port of the mupdate server for the Cyrus Murder 
-.IP "\fBmupdate_realm:\fR <none>" 5
-The SASL realm (if needed) to use when authenticating to the mupdate
-server. 
-.IP "\fBmupdate_retry_delay:\fR 20" 5
-The base time to wait between connection retries to the mupdate server. 
-.IP "\fBmupdate_server:\fR <none>" 5
-The mupdate server for the Cyrus Murder 
-.IP "\fBmupdate_username:\fR <empty string>" 5
-The SASL username (Authorization Name) to use when authenticating to
-the mupdate server 
-.IP "\fBmupdate_workers_max:\fR 50" 5
-The maximum number of mupdate worker threads (overall) 
-.IP "\fBmupdate_workers_maxspare:\fR 10" 5
-The maximum number of idle mupdate worker threads 
-.IP "\fBmupdate_workers_minspare:\fR 2" 5
-The minimum number of idle mupdate worker threads 
-.IP "\fBmupdate_workers_start:\fR 5" 5
-The number of mupdate worker threads to start 
-.IP "\fBnetscapeurl:\fR <none>" 5
-If enabled at compile time, this specifies a URL to reply when
-Netscape asks the server where the mail administration HTTP server
-is. Administrators should set this to a local resource. 
-.IP "\fBnewsaddheaders:\fR to" 5
-Space-separated list of headers to be added to incoming usenet
-articles. Added \fITo:\fR headers will contain email
-delivery addresses corresponding to each newsgroup in the
-\fINewsgroups:\fR header. Added \fIReply-To:\fR headers will
-contain email delivery addresses corresponding to each newsgroup in
-the \fIFollowup-To:\fR or \fINewsgroups:\fR header. If the
-specified header(s) already exist in an article, the email
-delivery addresses will be appended to the original header body(s).
-.br
-.sp
-This option applies if and only if the \fBnewspostuser\fR option is
-set. 
-
-Allowed values: \fIto\fR, \fIreplyto\fR
-.IP "\fBnewsgroups:\fR *" 5
-A wildmat pattern specifying which mailbox hierarchies should be
-treated as newsgroups. Only mailboxes matching the wildmat will
-accept and/or serve articles via NNTP. If not set, a default
-wildmat of "*" (ALL shared mailboxes) will be used. If the
-\fInewsprefix\fR option is also set, the default wildmat will be
-translated to "<newsprefix>.*" 
-.IP "\fBnewsmaster:\fR news" 5
-Userid that is used for checking access controls when executing
-Usenet control messages. For instance, to allow articles to be
-automatically deleted by cancel messages, give the "news" user
-the 'd' right on the desired mailboxes. To allow newsgroups to be 
-automatically created, deleted and renamed by the corresponding
-control messages, give the "news" user the 'c' right on the desired
-mailbox hierarchies. 
-.IP "\fBnewspeer:\fR <none>" 5
-A list of whitespace-separated news server specifications to which
-articles should be fed. Each server specification is a string of
-the form user:pass@host:port/wildmat where 'host' is the fully
-qualified hostname of the server, 'port' is the port on which the
-server is listening, 'user' and 'pass' are the authentication
-credentials and 'wildmat' is a pattern that specifies which groups
-should be fed. If no 'port' is specified, port 119 is used. If
-no 'wildmat' is specified, all groups are fed. If 'user' is specified
-(even if empty), then the NNTP POST command will be used to feed
-the article to the server, otherwise the IHAVE command will be
-used.
-.br
-.sp
-A '@' may be used in place of '!' in the wildmat to prevent feeding
-articles cross-posted to the given group, otherwise cross-posted
-articles are fed if any part of the wildmat matches. For example,
-the string "peer.example.com:*,!control.*,@local.*" would feed all
-groups except control messages and local groups to
-peer.example.com. In the case of cross-posting to local groups,
-these articles would not be fed. 
-.IP "\fBnewspostuser:\fR <none>" 5
-Userid used to deliver usenet articles to newsgroup folders
-(usually via lmtp2nntp). For example, if set to "post", email sent
-to "post+comp.mail.imap" would be delivered to the "comp.mail.imap"
-folder.
-.br
-.sp
-When set, the Cyrus NNTP server will add the header(s) specified in
-the \fBnewsaddheaders\fR option to each incoming usenet article.
-The added header(s) will contain email delivery addresses
-corresponding to each relevent newsgroup. If not set, no headers
-are added to usenet articles. 
-.IP "\fBnewsprefix:\fR <none>" 5
-Prefix to be prepended to newsgroup names to make the corresponding
-IMAP mailbox names. 
-.IP "\fBnewsrc_db_path:\fR <none>" 5
-The absolute path to the newsrc db file. If not specified,
-will be confdir/fetchnews.db 
-.IP "\fBnntptimeout:\fR 3" 5
-Set the length of the NNTP server's inactivity autologout timer, 
-in minutes. The minimum value is 3, the default. 
-.IP "\fBnotifysocket:\fR {configdirectory}/socket/notify" 5
-Unix domain socket that the mail notification daemon listens on. 
-.IP "\fBnotify_external:\fR <none>" 5
-Path to the external program that notifyd(8) will call to send mail
-notifications.
-.PP
-The external program will be called with the following
-command line options:
-.TP
-.BI \-c " class"
-.TP
-.BI \-p " priority"
-.TP
-.BI \-u " user"
-.TP
-.BI \-m " mailbox"
-.PP
-And the notification message will be available on \fIstdin\fR.
-
-.IP "\fBpartition-name:\fR <none>" 5
-The pathname of the partition \fIname\fR. At least one partition
-pathname MUST be specified. If the \fBdefaultpartition\fR option is
-used, then its pathname MUST be specified. For example, if the
-value of the \fBdefaultpartion\fR option is \fBdefault\fR, then the
-\fBpartition-default\fR field is required. 
-.IP "\fBplaintextloginpause:\fR 0" 5
-Number of seconds to pause after a successful plaintext login. For
-systems that support strong authentication, this permits users to 
-perceive a cost of using plaintext passwords. (This does not
-affect the use of PLAIN in SASL authentications.) 
-.IP "\fBplaintextloginalert:\fR <none>" 5
-Message to send to client after a successful plaintext login. 
-.IP "\fBpopexpiretime:\fR -1" 5
-The number of days advertised as being the minimum a message may be
-left on the POP server before it is deleted (via the CAPA command,
-defined in the POP3 Extension Mechanism, which some clients may
-support). "NEVER", the default, may be specified with a negative
-number. The Cyrus POP3 server never deletes mail, no matter what 
-the value of this parameter is. However, if a site implements a 
-less liberal policy, it needs to change this parameter
-accordingly. 
-.IP "\fBpopminpoll:\fR 0" 5
-Set the minimum amount of time the server forces users to wait
-between successive POP logins, in minutes. 
-.IP "\fBpopsubfolders:\fR 0" 5
-Allow access to subfolders of INBOX via POP3 by using
-userid+subfolder syntax as the authentication/authorization id. 
-.IP "\fBpoppollpadding:\fR 1" 5
-Create a softer minimum poll restriction. Allows \fIpoppollpadding\fR
-connections before the minpoll restriction is triggered. Additionally,
-one padding entry is recovered every \fIpopminpoll\fR minutes.
-This allows for the occasional polling rate faster than popminpoll, 
-(i.e., for clients that require a send/receive to send mail) but still 
-enforces the rate long-term. Default is 1 (disabled).
-.br
-.sp
-The easiest way to think of it is a queue of past connections, with one
-slot being filled for every connection, and one slot being cleared 
-every \fIpopminpoll\fR minutes. When the queue is full, the user
-will not be able to check mail again until a slot is cleared. If the 
-user waits a sufficient amount of time, they will get back many or all
-of the slots. 
-.IP "\fBpoptimeout:\fR 10" 5
-Set the length of the POP server's inactivity autologout timer, 
-in minutes. The minimum value is 10, the default. 
-.IP "\fBpopuseacl:\fR 0" 5
-Enforce IMAP ACLs in the pop server. Due to the nature of the POP3
-protocol, the only rights which are used by the pop server are 'r',
-'t', and 's' for the owner of the mailbox. The 'r' right allows the
-user to open the mailbox and list/retrieve messages. The 't' right
-allows the user to delete messages. The 's' right allows messages
-retrieved by the user to have the \\Seen flag set (only if
-\fIpopuseimapflags\fR is also enabled). 
-.IP "\fBpopuseimapflags:\fR 0" 5
-If enabled, the pop server will set and obey IMAP flags. Messages
-having the \\Deleted flag are ignored as if they do not exist.
-Messages that are retrieved by the client will have the \\Seen flag
-set. All messages will have the \\Recent flag unset. 
-.IP "\fBpostmaster:\fR postmaster" 5
-Username that is used as the 'From' address in rejection MDNs produced
-by sieve. 
-.IP "\fBpostuser:\fR <empty string>" 5
-Userid used to deliver messages to shared folders. For example, if
-set to "bb", email sent to "bb+shared.blah" would be delivered to
-the "shared.blah" folder. By default, an email address of
-"+shared.blah" would be used. 
-.IP "\fBproc_path:\fR <none>" 5
-Path to proc directory. Default is NULL - must be an absolute path
-if specified. If not specified, the path $confdir/proc/ will be 
-used. 
-.IP "\fBproxy_authname:\fR proxy" 5
-The authentication name to use when authenticating to a backend server
-in the Cyrus Murder. 
-.IP "\fBproxy_compress:\fR 0" 5
-Try to enable protocol-specific compression when performing a client
-connection to a backend server in the Cyrus Murder.
-.PP
-Note that this should only be necessary over slow network
-connections. Also note that currently only IMAP and MUPDATE support
-compression. 
-.IP "\fBproxy_password:\fR <none>" 5
-The default password to use when authenticating to a backend server
-in the Cyrus Murder. May be overridden on a host-specific basis using
-the hostname_password option. 
-.IP "\fBproxy_realm:\fR <none>" 5
-The authentication realm to use when authenticating to a backend server
-in the Cyrus Murder 
-.IP "\fBproxyd_allow_status_referral:\fR 0" 5
-Set to true to allow proxyd to issue referrals to clients that support it
-when answering the STATUS command. This is disabled by default since
-some clients issue many STATUS commands in a row, and do not cache the
-connections that these referrals would cause, thus resulting in a higher
-authentication load on the respective backend server. 
-.IP "\fBproxyd_disable_mailbox_referrals:\fR 0" 5
-Set to true to disable the use of mailbox-referrals on the
-proxy servers. 
-.IP "\fBproxyservers:\fR <none>" 5
-A list of users and groups that are allowed to proxy for other
-users, separated by spaces. Any user listed in this will be
-allowed to login for any other user: use with caution.
-In a standard murder this option should ONLY be set on backends.
-DO NOT SET on frontends or things won't work properly. 
-.IP "\fBpts_module:\fR afskrb" 5
-The PTS module to use. 
-
-Allowed values: \fIafskrb\fR, \fIldap\fR
-.IP "\fBptloader_sock:\fR <none>" 5
-Unix domain socket that ptloader listens on.
-(defaults to configdir/ptclient/ptsock) 
-.IP "\fBptscache_db:\fR skiplist" 5
-The cyrusdb backend to use for the pts cache. 
-
-Allowed values: \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR
-.IP "\fBptscache_db_path:\fR <none>" 5
-The absolute path to the ptscache db file. If not specified,
-will be confdir/ptscache.db 
-.IP "\fBptscache_timeout:\fR 10800" 5
-The timeout (in seconds) for the PTS cache database when using the
-auth_krb_pts authorization method (default: 3 hours). 
-.IP "\fBptskrb5_convert524:\fR 1" 5
-When using the AFSKRB ptloader module with Kerberos 5 canonicalization,
-do the final 524 conversion to get a n AFS style name (using '.' instead
-of '/', and using short names 
-.IP "\fBptskrb5_strip_default_realm:\fR 1" 5
-When using the AFSKRB ptloader module with Kerberos 5 canonicalization,
-strip the default realm from the userid (this does not affect the stripping
-of realms specified by the afspts_localrealms option) 
-.IP "\fBqosmarking:\fR cs0" 5
-This specifies the Class Selector or Differentiated Services Code Point
-designation on IP headers (in the ToS field). 
-
-Allowed values: \fIcs0\fR, \fIcs1\fR, \fIcs2\fR, \fIcs3\fR, \fIcs4\fR, \fIcs5\fR, \fIcs6\fR, \fIcs7\fR, \fIaf11\fR, \fIaf12\fR, \fIaf13\fR, \fIaf21\fR, \fIaf22\fR, \fIaf23\fR, \fIaf31\fR, \fIaf32\fR, \fIaf33\fR, \fIaf41\fR, \fIaf42\fR, \fIaf43\fR, \fIef\fR
-.IP "\fBquota_db:\fR quotalegacy" 5
-The cyrusdb backend to use for quotas. 
-
-Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR, \fIsql\fR, \fIquotalegacy\fR
-.IP "\fBquota_db_path:\fR <none>" 5
-The absolute path for the quota database (if you choose a single-file
-quota DB type - or the base path if you choose quotalegacy). If
-not specified will be confdir/quota.db or confdir/quota/ 
-.IP "\fBquotawarn:\fR 90" 5
-The percent of quota utilization over which the server generates
-warnings. 
-.IP "\fBquotawarnkb:\fR 0" 5
-The maximum amount of free space (in kB) at which to give a quota
-warning (if this value is 0, or if the quota is smaller than this
-amount, than warnings are always given). 
-.IP "\fBreject8bit:\fR 0" 5
-If enabled, lmtpd rejects messages with 8-bit characters in the
-headers. 
-.IP "\fBrfc2046_strict:\fR 0" 5
-If enabled, imapd will be strict (per RFC 2046) when matching MIME
-boundary strings. This means that boundaries containing other
-boundaries as substrings will be treated as identical. Since
-enabling this option will break some messages created by Eudora 5.1
-(and earlier), it is recommended that it be left disabled unless
-there is good reason to do otherwise. 
-.IP "\fBrfc3028_strict:\fR 1" 5
-If enabled, Sieve will be strict (per RFC 3028) with regards to
-which headers are allowed to be used in address and envelope tests.
-This means that only those headers which are defined to contain addresses
-will be allowed in address tests and only "to" and "from" will be
-allowed in envelope tests. When disabled, ANY grammatically correct header
-will be allowed. 
-.IP "\fBsasl_auto_transition:\fR 0" 5
-If enabled, the SASL library will automatically create authentication
-secrets when given a plaintext password. See the SASL documentation. 
-.IP "\fBsasl_maximum_layer:\fR 256" 5
-Maximum SSF (security strength factor) that the server will allow a
-client to negotiate. 
-.IP "\fBsasl_minimum_layer:\fR 0" 5
-The minimum SSF that the server will allow a client to negotiate.
-A value of 1 requires integrity protection; any higher value 
-requires some amount of encryption. 
-.IP "\fBsasl_option:\fR 0" 5
-Any SASL option can be set by preceding it with "sasl_". This
-file overrides the SASL configuration file. 
-.IP "\fBsasl_pwcheck_method:\fR <none>" 5
-The mechanism used by the server to verify plaintext passwords. 
-Possible values include "auxprop", "saslauthd", and "pwcheck". 
-.IP "\fBseenstate_db:\fR skiplist" 5
-The cyrusdb backend to use for the seen state. 
-
-Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR
-.IP "\fBsendmail:\fR /usr/lib/sendmail" 5
-The pathname of the sendmail executable. Sieve invokes sendmail
-for sending rejections, redirects and vacation responses. 
-.IP "\fBserverlist:\fR <none>" 5
-Whitespace separated list of backend server names. Used for
-finding server with the most available free space for proxying
-CREATE. 
-.IP "\fBservername:\fR <none>" 5
-This is the hostname visible in the greeting messages of the POP,
-IMAP and LMTP daemons. If it is unset, then the result returned
-from gethostname(2) is used. 
-.IP "\fBserverinfo:\fR on" 5
-The server information to display in the greeting and capability
-responses. Information is displayed as follows:
-.IP
-"off" = no server information in the greeting or capabilities
-.br
-"min" = \fIservername\fR in the greeting; no server information in the capabilities
-.br
-"on" = \fIservername\fR and product version in the greeting;
-product version in the capabilities 
-
-Allowed values: \fIoff\fR, \fImin\fR, \fIon\fR
-.IP "\fBsharedprefix:\fR Shared Folders" 5
-If using the alternate IMAP namespace, the prefix for the shared
-namespace. The hierarchy delimiter will be automatically appended. 
-.IP "\fBsieve_allowreferrals:\fR 1" 5
-If enabled, timsieved will issue referrals to clients when the
-user's scripts reside on a remote server (in a Murder).
-Otherwise, timsieved will proxy traffic to the remote server. 
-.IP "\fBsieve_extensions:\fR fileinto reject vacation imapflags notify envelope relational regex subaddress copy" 5
-Space-separated list of Sieve extensions allowed to be used in
-sieve scripts, enforced at submission by timsieved(8). Any
-previously installed script will be unaffected by this option and
-will continue to execute regardless of the extensions used. This
-option has no effect on options that are disabled at compile time
-(e.g., "regex"). 
-
-Allowed values: \fIfileinto\fR, \fIreject\fR, \fIvacation\fR, \fIimapflags\fR, \fInotify\fR, \fIinclude\fR, \fIenvelope\fR, \fIbody\fR, \fIrelational\fR, \fIregex\fR, \fIsubaddress\fR, \fIcopy\fR
-.IP "\fBsieve_maxscriptsize:\fR 32" 5
-Maximum size (in kilobytes) any sieve script can be, enforced at
-submission by timsieved(8). 
-.IP "\fBsieve_maxscripts:\fR 5" 5
-Maximum number of sieve scripts any user may have, enforced at
-submission by timsieved(8). 
-.IP "\fBsieve_utf8fileinto:\fR 0" 5
-If enabled, the sieve engine expects folder names for the
-\fIfileinto\fR action in scripts to use UTF8 encoding. Otherwise,
-modified UTF7 encoding should be used. 
-.IP "\fBsieve_sasl_send_unsolicited_capability:\fR 0" 5
-If enabled, timsieved will emit a capability response after a successful
-SASL authentication, per draft-martin-managesieve-12.txt . 
-.IP "\fBsievedir:\fR /usr/sieve" 5
-If sieveusehomedir is false, this directory is searched for Sieve
-scripts. 
-.IP "\fBsievenotifier:\fR <none>" 5
-Notifyd(8) method to use for "SIEVE" notifications. If not set, "SIEVE"
-notifications are disabled.
-.PP
-This method is only used when no method is specified in the script. 
-.IP "\fBsieveusehomedir:\fR 0" 5
-If enabled, lmtpd will look for Sieve scripts in user's home
-directories: ~user/.sieve. 
-.IP "\fBsingleinstancestore:\fR 1" 5
-If enabled, imapd, lmtpd and nntpd attempt to only write one copy
-of a message per partition and create hard links, resulting in a
-potentially large disk savings. 
-.IP "\fBskiplist_always_checkpoint:\fR 1" 5
-If enabled, this option forces the skiplist cyrusdb backend to
-always checkpoint when doing a recovery. This causes slightly
-more IO, but on the other hand leads to more efficient databases,
-and the entire file is already "hot". 
-.IP "\fBskiplist_unsafe:\fR 0" 5
-If enabled, this option forces the skiplist cyrusdb backend to
-not sync writes to the disk. Enabling this option is NOT RECOMMENDED. 
-.IP "\fBsoft_noauth:\fR 1" 5
-If enabled, lmtpd returns temporary failures if the client does not
-successfully authenticate. Otherwise lmtpd returns permanent failures
-(causing the mail to bounce immediately). 
-.IP "\fBspecialusealways:\fR 0" 5
-If enabled, this option causes LIST and LSUB output to always include
-the XLIST "special-use" flags. See "xlist-*'"
-.IP "\fBsql_database:\fR <none>" 5
-Name of the database which contains the cyrusdb table(s). 
-.IP "\fBsql_engine:\fR <none>" 5
-Name of the SQL engine to use. 
-
-Allowed values: \fImysql\fR, \fIpgsql\fR, \fIsqlite\fR
-.IP "\fBsql_hostnames:\fR <empty string>" 5
-Comma separated list of SQL servers (in host:port format). 
-.IP "\fBsql_passwd:\fR <none>" 5
-Password to use for authentication to the SQL server. 
-.IP "\fBsql_user:\fR <none>" 5
-Username to use for authentication to the SQL server. 
-.IP "\fBsql_usessl:\fR 0" 5
-If enabled, a secure connection will be made to the SQL server. 
-.IP "\fBsrvtab:\fR <empty string>" 5
-The pathname of \fIsrvtab\fR file containing the server's private
-key. This option is passed to the SASL library and overrides its
-default setting. 
-.IP "\fBsubmitservers:\fR <none>" 5
-A list of users and groups that are allowed to resolve "urlauth=submit+"
-IMAP URLs, separated by spaces. Any user listed in this will be
-allowed to fetch the contents of any valid "urlauth=submit+" IMAP URL:
-use with caution. 
-.IP "\fBsubscription_db:\fR flat" 5
-The cyrusdb backend to use for the subscriptions list. 
-
-Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR
-.IP "\fBsuppress_capabilities:\fR <none>" 5
-Suppress the named capabilities from any capability response. Use the
-exact case as it appears in the response, e.g. 
-"suppress_capabilities: ESEARCH QRESYNC WITHIN XLIST LIST-EXTENDED"
-if you have a murder with 2.3.x backends and don't want clients being
-confused by new capabilities that some backends don't support. 
-.IP "\fBstatuscache:\fR 0" 5
-Enable/disable the imap status cache. 
-.IP "\fBstatuscache_db:\fR skiplist" 5
-The cyrusdb backend to use for the imap status cache. 
-
-Allowed values: \fIberkeley\fR, \fIberkeley-nosync\fR, \fIberkeley-hash\fR, \fIberkeley-hash-nosync\fR, \fIskiplist\fR
-.IP "\fBstatuscache_db_path:\fR <none>" 5
-The absolute path to the statuscache db file. If not specified,
-will be confdir/statuscache.db 
-.IP "\fBsync_authname:\fR <none>" 5
-The authentication name to use when authenticating to a sync server.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_compress:\fR 0" 5
-Enable compression on replication traffic.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_host:\fR <none>" 5
-Name of the host (replica running sync_server(8)) to which
-replication actions will be sent by sync_client(8).
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_log:\fR 0" 5
-Enable replication action logging by lmtpd(8), imapd(8), pop3d(8),
-and nntpd(8). The log {configdirectory}/sync/log is used by
-sync_client(8) for "rolling" replication. 
-.IP "\fBsync_log_chain:\fR 0" 5
-Enable replication action logging by sync_server as well, allowing
-chaining of replicas. Use this on 'B' for A => B => C replication layout 
-.IP "\fBsync_log_channels:\fR <none>" 5
-If specified, log all events to multiple log files in directories
-specified by each "channel". To run these log files, you need to pass
-the -n option to sync_client -r with the channel name. Use this for
-a mesh style replication layout - every machine replicating to every
-other machine. 
-.IP "\fBsync_password:\fR <none>" 5
-The default password to use when authenticating to a sync server.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_port:\fR csync" 5
-Name of the service (or port number) of the replication service on
-replica host. The default is "csync" which is usally port 2005, but
-any service name or numeric port can be specified.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_realm:\fR <none>" 5
-The authentication realm to use when authenticating to a sync server.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_repeat_interval:\fR 1" 5
-Minimum interval (in seconds) between replication runs in rolling
-replication mode. If a replication run takes longer than this
-time, we repeat immediately.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsync_shutdown_file:\fR <none>" 5
-Simple latch used to tell sync_client(8) that it should shut down at the
-next opportunity. Safer than sending signals to running processes.
-Prefix with a channel name to only apply for that channel 
-.IP "\fBsyslog_prefix:\fR <none>" 5
-String to be prepended to the process name in syslog entries. 
-.IP "\fBtcp_keepalive:\fR 0" 5
-Enable keepalive on TCP connections 
-.IP "\fBtcp_keepalive_cnt:\fR 0" 5
-Number of TCP keepalive probes to send before declaring the 
-connection dead (0 == system default) 
-.IP "\fBtcp_keepalive_idle:\fR 0" 5
-Number of seconds a connection must be idle before keepalive
-probes are sent (0 == system default) 
-.IP "\fBtcp_keepalive_intvl:\fR 0" 5
-Number of seconds between keepalive probes (0 == system default) 
-.IP "\fBtemp_path:\fR /tmp" 5
-The pathname to store temporary files in 
-.IP "\fBtimeout:\fR 30" 5
-The length of the IMAP server's inactivity autologout timer, 
-in minutes. The minimum value is 30, the default. 
-.IP "\fBtls_ca_file:\fR <none>" 5
-File containing one or more Certificate Authority (CA) certificates. 
-.IP "\fBtls_ca_path:\fR <none>" 5
-Path to directory with certificates of CAs. This directory must
-have filenames with the hashed value of the certificates (see
-openssl(XXX)). 
-.IP "\fBtlscache_db:\fR skiplist" 5
-The cyrusdb backend to use for the TLS cache. 
-
-Allowed values: \fIberkeley\fR, \fIberkeley-nosync\fR, \fIberkeley-hash\fR, \fIberkeley-hash-nosync\fR, \fIskiplist\fR, \fIsql\fR
-.IP "\fBtlscache_db_path:\fR <none>" 5
-The absolute path to the tlscache db file. If not specified,
-will be confdir/tls_sessions.db 
-.IP "\fBtls_cert_file:\fR <none>" 5
-File containing the certificate presented for server authentication
-during STARTTLS. A value of "disabled" will disable SSL/TLS. 
-.IP "\fBtls_cipher_list:\fR DEFAULT" 5
-The list of SSL/TLS ciphers to allow. The format of the string is
-described in ciphers(1). 
-.IP "\fBtls_key_file:\fR <none>" 5
-File containing the private key belonging to the server
-certificate. A value of "disabled" will disable SSL/TLS. 
-.IP "\fBtls_require_cert:\fR 0" 5
-Require a client certificate for ALL services (imap, pop3, lmtp, sieve). 
-.IP "\fBtls_session_timeout:\fR 1440" 5
-The length of time (in minutes) that a TLS session will be cached
-for later reuse. The maximum value is 1440 (24 hours), the
-default. A value of 0 will disable session caching. 
-.IP "\fBumask:\fR 077" 5
-The umask value used by various Cyrus IMAP programs. 
-.IP "\fBuserdeny_db:\fR flat" 5
-The cyrusdb backend to use for the user access list. 
-
-Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR, \fIsql\fR
-.IP "\fBuserdeny_db_path:\fR <none>" 5
-The absolute path to the userdeny db file. If not specified,
-will be confdir/user_deny.db 
-.IP "\fBuser_folder_limit:\fR 0" 5
-Limit the number of folders a user can create in their INBOX. 
-Set to 0 (default) for no limit. Only affects folders in user. 
-.IP "\fBusername_tolower:\fR 1" 5
-Convert usernames to all lowercase before login/authentication. This
-is useful with authentication backends which ignore case during
-username lookups (such as LDAP). 
-.IP "\fBuserprefix:\fR Other Users" 5
-If using the alternate IMAP namespace, the prefix for the other users
-namespace. The hierarchy delimiter will be automatically appended. 
-.IP "\fBunix_group_enable:\fR 1" 5
-Should we look up groups when using auth_unix (disable this if you are
-not using groups in ACLs for your IMAP server, and you are using auth_unix
-with a backend (such as LDAP) that can make getgrent() calls very
-slow) 
-.IP "\fBunixhierarchysep:\fR 0" 5
-Use the UNIX separator character '/' for delimiting levels of
-mailbox hierarchy. The default is to use the netnews separator
-character '.'. 
-.IP "\fBvirtdomains:\fR off" 5
-Enable virtual domain support. If enabled, the user's domain will
-be determined by splitting a fully qualified userid at the last '@'
-or '%' symbol. If the userid is unqualified, and the virtdomains
-option is set to "on", then the domain will be determined by doing
-a reverse lookup on the IP address of the incoming network
-interface, otherwise the user is assumed to be in the default
-domain (if set). 
-
-Allowed values: \fIoff\fR, \fIuserid\fR, \fIon\fR
-.IP "\fBxlist-*:\fR <none>" 5
-Cyrus 2.4 ONLY - enable special use flags. The valid names
-can be taken from GMail's XLIST documents or RFC 6154.
-Attribute name in the configuration key should be defined in
-lowercase. The attribute value is case sensitive, may contain
-whitespace and must be valid UTF7-IMAP string. It must
-exactly match the name of the subfolder of a user's INBOX.
-
-Example: xlist-drafts: My Drafts
-
-Every user on your server with a 'INBOX.My Drafts' folder will get 
-the special use flag "\Drafts" added. Later versions of Cyrus
-have a much more flexible RFC 6154 compatible system. 
-
-.SH SEE ALSO
-.PP
-\fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR,
-\fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
-\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR
-

cyrus-imapd-2.4.17.tar.gz/man/sieveshell.1 Deleted

@@ -1,184 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds # \f1
-. ds # \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds # \&
-. ds # \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#\z\(de\v'.3n'\h'|\\n:u'\*(#
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#
-.ds Th \*(#\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm # # #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "SIEVESHELL 1"
-.TH SIEVESHELL 1 "2012-12-01" "perl v5.14.3" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-sieveshell \- remotely manipulate sieve scripts
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-sieveshell \fB\-\-user\fR=\fIuser\fR \fB\-\-authname\fR=\fIauthname\fR 
-\fB\-\-realm\fR=\fIrealm\fR \fB\-\-exec\fR=\fIscript\fR \fIserver\fR\fB:\fR\fIport\fR
-.PP
-sieveshell \fB\-\-help\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-\&\fBsieveshell\fR allows users to manipulate their scripts on a remote
-server. It works via \s-1MANAGESIEVE\s0, a work in progress.
-.PP
-The following commands are recognized:
-.Sp
-.RS 4
-\&\fBlist\fR list scripts on server.
-.Sp
-\&\fBput\fR <filename> upload script to server.
-.Sp
-\&\fBget\fR <name> <filename> get script. if no filename display to stdout
-.Sp
-\&\fBdelete\fR <name> delete script.
-.Sp
-\&\fBactivate\fR <name> activate script.
-.Sp
-\&\fBdeactivate\fR deactivate all scripts.
-.RE
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\fB\-u\fR \fIuser\fR, \fB\-\-user\fR=\fIuser\fR" 4
-.IX Item "-u user, --user=user"
-The authorization name to request; by default, derived from the
-authentication credentials.
-.IP "\fB\-a\fR \fIauthname\fR, \fB\-\-authname\fR=\fIauthname\fR" 4
-.IX Item "-a authname, --authname=authname"
-The user to use for authentication (defaults to current user).
-.IP "\fB\-r\fR \fIrealm\fR, \fB\-\-realm\fR=\fIrealm\fR" 4
-.IX Item "-r realm, --realm=realm"
-The realm to attempt authentication in.
-.IP "\fB\-e\fR \fIscript\fR, \fB\-\-exec\fR=\fIscript\fR" 4
-.IX Item "-e script, --exec=script"
-Instead of working interactively, run commands from \fIscript\fR, and
-exit when done.
-.SH "REFERENCES"
-.IX Header "REFERENCES"
-\s-1MANAGESIEVE\s0 Martin, T.; \*(L"A Protocol for Remotely Managing Sieve
-Scripts\*(R", draft\-ietf\-managesieve\-03.txt, Mirapoint, Inc.; May 2001,
-work in progress.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Tim Martin <tmartin@mirapoint.com>, and the rest of the Cyrus
-team <cyrus\-bugs@andrew.cmu.edu>.

cyrus-imapd-2.4.17.tar.gz/master/Makefile.in Deleted

@@ -1,100 +0,0 @@
-# Makefile for the Cyrus controlling process
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.25 2010/01/06 17:01:53 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-CYRUS_USER=@cyrus_user@
-CYRUS_GROUP=@cyrus_group@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
-DEPLIBS = @DEPLIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-LOBJS=service.o service-thread.o
-
-PROGS=master
-
-all: $(PROGS) $(LOBJS)
-
-install:
-	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-	for file in $(PROGS); \
-	do \
-		$(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-	done
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
-	$(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
-
-clean:
-	rm -f *.o *.a Makefile.bak $(PROGS)
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/netnews/Makefile.in Deleted

@@ -1,94 +0,0 @@
-# Makefile for netnews tools useful with cyrus
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.12 2010/01/06 17:01:53 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
-LIBS = @IMAP_LIBS@ @LIB_RT@
-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-OBJS = remotepurge.o readconfig.o
-
-all: remotepurge
-
-install:
-	$(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-remotepurge: $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
-		$(DEPLIBS) $(LIBS)
-
-
-clean:
-	rm -f *.o Makefile.bak remotepurge makedepend.log
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-

cyrus-imapd-2.4.17.tar.gz/notifyd/Makefile.in Deleted

@@ -1,116 +0,0 @@
-# Makefile.in - notifyd makefile
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.13 2010/01/06 17:01:54 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-RANLIB = @RANLIB@
-
-INSTALL = @INSTALL@
-CYRUS_USER=@cyrus_user@
-CYRUS_GROUP=@cyrus_group@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-MAKEDEPEND = @MAKEDEPEND@
-
-NOTIFYD_LIBS = @NOTIFYD_LIBS@
-
-SERVICE=../master/service.o
-
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
-LIB_WRAP = @LIB_WRAP@
-LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-PURIFY=/usr/local/bin/purify
-PUREOPT=-best-effort
-
-all: notifyd
-
-install:
-	$(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-
-OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o \
-	notify_external.o
-
-notifytest: notifytest.o
-	$(CC) $(LDFLAGS) -o notifytest \
-	 notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
-notifyd: $(OBJS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o notifyd \
-	 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
-notifyd.pure: $(OBJS) $(SERVICE)
-	$(PURIFY) $(PUREOPT) \
-	$(CC) $(LDFLAGS) -o notifyd.pure \
-	 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
-clean:
-	rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/notifyd/exitcodes.h Deleted

@@ -1,88 +0,0 @@
-/* exitcodes.h -- wrapper around sysextis.h
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: exitcodes.h,v 1.4 2010/01/06 17:01:54 murch Exp $
- */
-
-/* Sendmail has some weird ideas on what constitutes permenant failure. On
- more than one occasion, we have gotten burned by this moving users around
- through various inadvisable means, screwing up the mailboxes file,
- whatever.
- 
- We don't want to fail out permenantly on things like EX_USAGE, EX_SOFTWARE, 
- etc., because that generally means someone was just screwing with the mail
- store and we don't want to lose mail.
-
- Instead, we map these EC_* codes to EX_* codes, thereby lying to Sendmail,
- since we don't derive any benefit from Sendmail knowing what the error was.
- We just want it to retry all the time anyway. This way, should sendmail's
- behavior be different and we start deriving benefit from Sendmail knowing
- stuff, we can easily change it back.
-
- So other code uses the EC_* error, then we maybe change it to TEMPFAIL if
- we don't agree on whether the error should be permenant or not.
- 
- Comments below stolen from sysexits.h. */
-
-#ifndef INCLUDED_EXITCODES_H
-#define INCLUDED_EXITCODES_H
-
-#include <sysexits.h>
-
-#define EC_OK 0		/* successful termination */
-
-#define EC_USAGE EX_TEMPFAIL	/* command line usage error */
-#define EC_DATAERR EX_DATAERR	/* data format error */
-#define EC_NOINPUT EX_TEMPFAIL	/* cannot open input */
-#define EC_NOUSER EX_NOUSER	/* addressee unknown */
-#define EC_NOHOST EX_TEMPFAIL	/* host name unknown */
-#define EC_UNAVAILABLE EX_TEMPFAIL	/* service unavailable */
-#define EC_SOFTWARE EX_TEMPFAIL	/* internal software error */
-#define EC_OSERR EX_TEMPFAIL	/* system error (e.g., can't fork) */
-#define EC_OSFILE EX_TEMPFAIL	/* critical OS file missing */
-#define EC_CANTCREAT EX_TEMPFAIL	/* can't create (user) output file */
-#define EC_IOERR EX_TEMPFAIL	/* input/output error */
-#define EC_TEMPFAIL EX_TEMPFAIL	/* user is invited to retry */
-#define EC_PROTOCOL EX_TEMPFAIL	/* remote error in protocol */
-#define EC_NOPERM EX_TEMPFAIL	/* permission denied */
-#define EC_CONFIG EX_TEMPFAIL	/* configuration error */
-
-#endif /* INCLUDED_EXITCODES_H */

cyrus-imapd-2.4.17.tar.gz/notifyd/version.h Deleted

@@ -1,53 +0,0 @@
-/* version.h: the version number
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: version.h,v 1.4 2010/01/06 17:01:54 murch Exp $
- */
-
-#define _NOTIFYD_VERSION "0.9"
-
-#ifdef EXTRA_IDENT
-#define NOTIFYD_VERSION _NOTIFYD_VERSION "-" EXTRA_IDENT
-#else
-#define NOTIFYD_VERSION _NOTIFYD_VERSION
-#endif
-
-#define NOTIFYD_IDENT "Cyrus notifyd"

cyrus-imapd-2.4.17.tar.gz/perl/Makefile.in Deleted

@@ -1,149 +0,0 @@
-# SIEVE Makefile for cyrus software
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.18 2010/01/06 17:01:54 murch Exp $
-# 
-
-SUBDIRS = @PERL_SUBDIRS@
-
-DEPSUBDIRS = @PERL_DEPSUBDIRS@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INSTALL = @INSTALL@
-
-# Note that we use the *dynamic* sasl libraries
-SASL_LIB=@LIB_DYN_SASL@
-SASL_INC=@DYNSASLFLAGS@
-OPENSSL_LIB=@OPENSSL_LIB@
-OPENSSL_INC=@OPENSSL_INC@
-BDB_LIB=@BDB_LIB@
-BDB_INC=@BDB_INC@
-
-LIB_RT=@LIB_RT@
-ZLIB=@ZLIB@
-
-PERL=@PERL@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-CC = @CC@
-PLMAKE = imap/Makefile
-
-all::
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" all "in" `pwd`;	\
-			if -f Makefile.PL -a ! -f Makefile ; then \
-			 LIB_RT="$(LIB_RT)" \
-			 ZLIB="$(ZLIB)" \
-			 BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
-			 OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
-			 SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-			 $(PERL) Makefile.PL PREFIX=$(prefix); \
-			fi; \
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
-	done
-
-install::
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" install "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) install) || exit 1; \
-	done
-
-clean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) clean ;	\
-			echo "### Done with" `pwd`);		\
-	done
-
-distclean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) distclean ; \
-			echo "### Done with" `pwd`);		\
-	done
-	rm -f Makefile Makefile.bak config.status config.log config.cache
-
-depend::
-	@if test "$(DEPSUBDIRS)" != "none"; then \
-		for d in $(DEPSUBDIRS); \
-		do \
-			(cd $$d; echo "### Making" depend "in" `pwd`;	\
-				$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) depend) || exit 1; \
-		done; \
-	fi
-
-checkdepend::
-
-depend::
-	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ed -s Makefile < eddep
-	rm eddep
-	echo '' >> Makefile
-	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-	echo '# see make depend above' >> Makefile
-
-# DO NOT DELETE THIS LINE -- make depend uses it
-
-# The following rule ensures that "make depend" gets run at least
-# once before a "make all". The "depend" rule above removes
-# this rule from the Makefile the first time the "make depend"
-# has been run after the Makefile is generated by Configure
-
-checkdepend:: depend
-
-# IF YOU PUT STUFF HERE IT WILL GO AWAY
-# see make depend above

cyrus-imapd-2.4.17.tar.gz/perl/imap/Makefile.PL Deleted

@@ -1,81 +0,0 @@
-# 
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any other legal
-# details, please contact 
-# Office of Technology Transfer
-# Carnegie Mellon University
-# 5000 Forbes Avenue
-# Pittsburgh, PA 15213-3890
-# (412) 268-4387, fax: (412) 268-7395
-# tech-transfer@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.PL,v 1.21 2010/01/06 17:01:55 murch Exp $
-
-use ExtUtils::MakeMaker;
-use Config;
-
-my $SASL_INC = $ENV{SASL_INC};
-my $SASL_LIB = $ENV{SASL_LIB} || "-lsasl2";
-
-my $OPENSSL_INC = $ENV{OPENSSL_INC};
-my $OPENSSL_LIB = $ENV{OPENSSL_LIB};
-
-my $BDB_INC = $ENV{BDB_INC};
-my $BDB_LIB = $ENV{BDB_LIB};
-
-my $LIB_RT = $ENV{LIB_RT};
-my $ZLIB = $ENV{ZLIB};
-
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-$libs = "-lcyrus";
-
-sub MY::postamble
-{
- return <<'EOT';
-cyradm: cyradm.sh
-	$(ABSPERLRUN) -pne 's|\@INSTALLSITEARCH\@|$(INSTALLSITEARCH)|g;' < $< > $@
-
-EOT
-}
-
-WriteMakefile( 
- 'NAME'	=> 'Cyrus::IMAP',
- 'ABSTRACT' => 'Cyrus administrative interface',
- 'VERSION_FROM' => 'IMAP.pm', # finds $VERSION
- 'macro'	=> {'IMCLIENT_LIBS' => ''},	# hack
- 'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
- 'OBJECT' => 'IMAP.o',
- 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
- 'LIBS'	=> "$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto",
- 'DEFINE'	=> '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' 
- 'INC'	=> "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC", 
- 'EXE_FILES' => cyradm,
-);

cyrus-imapd-2.4.17.tar.gz/perl/sieve/Makefile.in Deleted

@@ -1,152 +0,0 @@
-# SIEVE Makefile for cyrus software
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.20 2010/01/06 17:01:55 murch Exp $
-# 
-
-SUBDIRS = lib managesieve
-SCRIPTS = installsieve sieveshell
-
-# Makefile.PL doesn't make a depend rule. just make depend in these dirs
-DEPSUBDIRS = lib
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INSTALL = @INSTALL@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-# Note that we use the *dynamic* sasl libraries
-SASL_LIB=@LIB_DYN_SASL@
-SASL_INC=@DYNSASLFLAGS@
-OPENSSL_LIB=@OPENSSL_LIB@
-OPENSSL_INC=@OPENSSL_INC@
-BDB_LIB=@BDB_LIB@
-BDB_INC=@BDB_INC@
-
-LIB_RT=@LIB_RT@
-ZLIB=@ZLIB@
-
-CC=@CC@
-PERL=@PERL@
-
-all::
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" all "in" `pwd`;	\
-			if -f Makefile.PL -a ! -f Makefile ; then \
-			 LIB_RT="$(LIB_RT)" \
-			 ZLIB="$(ZLIB)" \
-			 BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
-			 OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
-			 SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-			 $(PERL) Makefile.PL PREFIX=$(prefix); \
-			fi; \
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
-	done
-
-install::
-	for s in $(SCRIPTS); \
-	do \
-		$(INSTALL) -m 755 scripts/$$s.pl $(DESTDIR)$(exec_prefix)/bin/$$s ; \
-	done
-#xxx install scripts/*
-	@for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" install "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) install) || exit 1; \
-	done
-
-clean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) clean ;	\
-			echo "### Done with" `pwd`);		\
-	done
-
-distclean::
-	@-for d in $(SUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" clean "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) distclean ; \
-			echo "### Done with" `pwd`);		\
-	done
-	rm -f Makefile Makefile.bak config.status config.log config.cache
-
-depend::
-	@for d in $(DEPSUBDIRS); \
-	do \
-		(cd $$d; echo "### Making" depend "in" `pwd`;	\
-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) depend) || exit 1; \
-	done
-
-checkdepend::
-
-depend::
-	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ed -s Makefile < eddep
-	rm eddep
-	echo '' >> Makefile
-	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-	echo '# see make depend above' >> Makefile
-
-# DO NOT DELETE THIS LINE -- make depend uses it
-
-# The following rule ensures that "make depend" gets run at least
-# once before a "make all". The "depend" rule above removes
-# this rule from the Makefile the first time the "make depend"
-# has been run after the Makefile is generated by Configure
-
-checkdepend:: depend
-
-# IF YOU PUT STUFF HERE IT WILL GO AWAY
-# see make depend above

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/Makefile.in Deleted

@@ -1,94 +0,0 @@
-# Makefile for imtest
-# 
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.17 2010/01/06 17:01:55 murch Exp $
-# 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
-CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
-LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
-IMAP_LIBS = @IMAP_LIBS@
-DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
-
-MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-
-OBJS=isieve.o lex.o mystring.o request.o
-
-all: libisieve.a
-
-install:
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-libisieve.a: $(OBJS)
-	rm -f libisieve.a
-	ar cr libisieve.a $(OBJS)
-	$(RANLIB) libisieve.a
-
-clean:
-	rm -f *.o Makefile.bak makedepend.log libisieve.a
-
-distclean: clean
-	rm -f Makefile
-
-depend: 
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(MAKEDEPEND_CFLAGS) *.c $(srcdir)/*.c 1> makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/exitcodes.h Deleted

@@ -1,88 +0,0 @@
-/* exitcodes.h -- wrapper around sysextis.h
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: exitcodes.h,v 1.5 2010/01/06 17:01:56 murch Exp $
- */
-
-/* Sendmail has some weird ideas on what constitutes permenant failure. On
- more than one occasion, we have gotten burned by this moving users around
- through various inadvisable means, screwing up the mailboxes file,
- whatever.
- 
- We don't want to fail out permenantly on things like EX_USAGE, EX_SOFTWARE, 
- etc., because that generally means someone was just screwing with the mail
- store and we don't want to lose mail.
-
- Instead, we map these EC_* codes to EX_* codes, thereby lying to Sendmail,
- since we don't derive any benefit from Sendmail knowing what the error was.
- We just want it to retry all the time anyway. This way, should sendmail's
- behavior be different and we start deriving benefit from Sendmail knowing
- stuff, we can easily change it back.
-
- So other code uses the EC_* error, then we maybe change it to TEMPFAIL if
- we don't agree on whether the error should be permenant or not.
- 
- Comments below stolen from sysexits.h. */
-
-#ifndef INCLUDED_EXITCODES_H
-#define INCLUDED_EXITCODES_H
-
-#include <sysexits.h>
-
-#define EC_OK 0		/* successful termination */
-
-#define EC_USAGE EX_TEMPFAIL	/* command line usage error */
-#define EC_DATAERR EX_DATAERR	/* data format error */
-#define EC_NOINPUT EX_TEMPFAIL	/* cannot open input */
-#define EC_NOUSER EX_NOUSER	/* addressee unknown */
-#define EC_NOHOST EX_TEMPFAIL	/* host name unknown */
-#define EC_UNAVAILABLE EX_TEMPFAIL	/* service unavailable */
-#define EC_SOFTWARE EX_TEMPFAIL	/* internal software error */
-#define EC_OSERR EX_TEMPFAIL	/* system error (e.g., can't fork) */
-#define EC_OSFILE EX_TEMPFAIL	/* critical OS file missing */
-#define EC_CANTCREAT EX_TEMPFAIL	/* can't create (user) output file */
-#define EC_IOERR EX_TEMPFAIL	/* input/output error */
-#define EC_TEMPFAIL EX_TEMPFAIL	/* user is invited to retry */
-#define EC_PROTOCOL EX_TEMPFAIL	/* remote error in protocol */
-#define EC_NOPERM EX_TEMPFAIL	/* permission denied */
-#define EC_CONFIG EX_TEMPFAIL	/* configuration error */
-
-#endif /* INCLUDED_EXITCODES_H */

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/mystring.c Deleted

@@ -1,219 +0,0 @@
-/* mystring.c -- string utility
- * Tim Martin
- * 9/21/99
- */
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mystring.c,v 1.10 2010/01/06 17:01:56 murch Exp $
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mystring.h"
-#include "codes.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-int string_allocate(int length,
-		 const char *buf,	/* NULL => no copy */
-		 mystring_t ** str)
-{
- *str=(mystring_t *) malloc(sizeof(mystring_t)+length+3);
-
- (*str)->len=length;
- ((char *) (*str))sizeof(mystring_t)+length='\0';
-
- if (buf==NULL) return SIEVE_OK;
-
- /* copy the data into the string object */
- memcpy(((char *)(*str))+sizeof(mystring_t), buf, length);
- ((char *) (*str))sizeof(mystring_t)+length='\0';
-
- return SIEVE_OK;
-}
-
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr)
-{
- int result;
-
-
- result=string_allocate(oldstr->len,
-			 string_DATAPTR(oldstr),
-			 newstr);
-
- return result;
-}
-
-
-void string_free(mystring_t **str)
-{
- free(*str);
-}
-
-
-int string_compare(mystring_t *str1, mystring_t *str2)
-{
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2->len) return SIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return SIEVE_FAIL;
-
- return SIEVE_OK;
-}
-
-int string_compare_with(mystring_t *str1, mystring_t *str2,
-			mystring_t *comp __attribute__((unused)))
-{
- char *data1;
- char *data2;
- int lup;
-
- int len1=str1->len;
- int len2=str2->len;
-
- int low=len1;
- if (len2<len1)
- low=len2;
-
- /* printf("comparing %s and %s\n",string_DATAPTR(str1),
- string_DATAPTR(str2));*/
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<low;lup++)
- if (data1lup<data2lup)
- {
- return -1;
- } else if (data1lup>data2lup) {
- return 1;
- } else {
- /* continue */
- }
- 
- if (len1==len2) return 0;
-
- if (len1<len2)
- return -1;
-
- return 1;
-}
-
-int string_comparestr(mystring_t *str1, char *str2)
-{
- int str2len=strlen(str2);
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2len) return SIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=str2;
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return SIEVE_FAIL;
-
- return SIEVE_OK;
-}
-/*
-eq_result_t
-string_equal_cstr(const mystring_t * str, const char *cstr)
-{
- int len;
-
- I(str);
- I(cstr);
-
- len = strlen(cstr);
- if (len != str->len)
- return EQ_NOT_EQUAL;
-
- if (memcmp(string_DATAPTR(str), cstr, len)==0)
- return EQ_IS_EQUAL;
-
-
- return EQ_NOT_EQUAL; 
-}
-*/
-
-int safe_to_use_quoted(char *str, int len)
-{
- char *end=str+len;
-
- if (len > 4096)
- return FALSE;
-
- while (str < end) {
- if (*str == '\0'		/* check illegal chars... */
-	|| *str == '\r'
-	|| *str == '\n'
-
-#ifdef __CHAR_UNSIGNED__
-	|| 0x7F < *str
-#else
-	|| *str < 0
-#endif
-
- )
- return FALSE;
- if (*str == '\"'		/* check len, with \ escapes... */
-	|| *str == '\\')
- if (4096 < ++len)
-	return FALSE;
- ++str;
- }
- return TRUE;
-}

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/mystring.h Deleted

@@ -1,83 +0,0 @@
-/* mystring.h
- * Tim Martin
- * 9/21/99
- */
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mystring.h,v 1.7 2010/01/06 17:01:56 murch Exp $
- */
-
-#include "codes.h"
-
-
-#ifndef INCLUDED_MYSTRING_H
-#define INCLUDED_MYSTRING_H
-
-typedef struct {
-  int        len;
-  /* Data immediately following... */
-}  mystring_t;
-
-
-int string_allocate(int length,
-		    const char *buf,	/* NULL => no copy */
-		    mystring_t ** str);
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr);
-
-void string_free(mystring_t **str);
-
-int string_compare(mystring_t *str1, mystring_t *str2);
-
-int string_comparestr(mystring_t *str1, char *str2);
-
-int string_compare_with(mystring_t *str1, mystring_t *str2, mystring_t *comp);
-
-/*eq_result_t
-  string_equal_cstr(const mystring_t * str, const char *cstr);*/
-
-#define string_DATAPTR(s) (s ? (((char *) s)+sizeof(mystring_t)) : 0)
-
-int safe_to_use_quoted(char *str, int len);
-
-
-#endif /* INCLUDED_MYSTRING_H */

cyrus-imapd-2.4.17.tar.gz/perl/sieve/managesieve/Makefile.PL Deleted

@@ -1,68 +0,0 @@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For permission or any legal
-#    details, please contact
-#      Carnegie Mellon University
-#      Center for Technology Transfer and Enterprise Creation
-#      4615 Forbes Avenue
-#      Suite 302
-#      Pittsburgh, PA  15213
-#      (412) 268-7393, fax: (412) 268-7395
-#      innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#    "This product includes software developed by Computing Services
-#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.PL,v 1.17 2010/01/06 17:01:56 murch Exp $
-#
-use ExtUtils::MakeMaker;
-use Config;
-
-my $SASL_INC = $ENV{SASL_INC};
-my $SASL_LIB = $ENV{SASL_LIB} || "-lsasl2";
-my $OPENSSL_INC = $ENV{OPENSSL_INC};
-my $OPENSSL_LIB = $ENV{OPENSSL_LIB};
-my $BDB_INC = $ENV{BDB_INC};
-my $BDB_LIB = $ENV{BDB_LIB};
-
-my $LIB_RT = $ENV{LIB_RT};
-my $ZLIB = $ENV{ZLIB};
-
-$libs = "-lcyrus";
-
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'	=> 'Cyrus::SIEVE::managesieve',
-    'ABSTRACT'  => 'Cyurs Sieve management interface',
-    'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
-    'MYEXTLIB'  => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
-    'LIBS'	=> "$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto", 
-    'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
-    'INC'	=> "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
-);

cyrus-imapd-2.4.17.tar.gz/ptclient/Makefile.in Deleted

@@ -1,130 +0,0 @@
-# Makefile for ptclient
-# 
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.31 2010/01/06 17:01:57 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-PURIFY = /usr/local/bin/purify
-
-CC = @CC@
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
-AFS_LIBS = @AFS_LIBS@
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
-LIB_SASL = @LIB_SASL@
-LIB_WRAP = @LIB_WRAP@
-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
-
-LDAP_LIBS=@LDAP_LIBS@
-LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
-LDAP_LDFLAGS=@LDAP_LDFLAGS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-EXTRA_PROGS = # ptextract pttest
-PROGS = ptexpire ptloader ptdump $(EXTRA_PROGS)
-
-LIB_RT = @LIB_RT@
-
-SERVICE=../master/service.o
-SERVICETHREAD=../master/service-thread.o
-
-all: $(PROGS)
-
-install:
-	$(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
-	$(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
-	$(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
-ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
-	$(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
-ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-	$(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
-
-ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-	$(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
-ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
-	$(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
-
-ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-	$(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
-ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
-	$(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
-
-clean:
-	rm -f *.o Makefile.bak $(PROGS) makedepend.log
-
-distclean: clean
-	rm -f Makefile
-
-depend: 
-	$(MAKEDEPEND) $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c \
-	1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/sieve/Makefile.dist Deleted

cyrus-imapd-2.4.17.tar.gz/sieve/Makefile.in Deleted

@@ -1,155 +0,0 @@
-# Makefile.in - sieve makefile
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.46 2010/01/06 17:01:58 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-CC = @CC@
-YACC = @YACC@
-YFLAGS = -d
-LEX = @LEX@
-RANLIB = @RANLIB@
-COMPILE_ET = @COMPILE_ET@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-LDFLAGS = @LDFLAGS@
-
-MAKEDEPEND = @MAKEDEPEND@
-
-IMAP_LIBS = @IMAP_LIBS@
-IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
-DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-BUILT_SOURCES = addr.c addr.h addr-lex.c \
-	sieve.c sieve.h sieve-lex.c \
-	sieve_err.h sieve_err.c
-
-all: libsieve.a sievec sieved
-
-dist: $(BUILT_SOURCES)
-
-install: sievec sieved
-	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-	$(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
-
-test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
-	$(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
-	libsieve.a $(DEPLIBS) $(LIBS)
-
-OBJS = sieve_err.o \
- sieve.o sieve-lex.o comparator.o interp.o message.o \
- bc_generate.o bc_dump.o bc_emit.o bc_eval.o \
- script.o tree.o addr.o addr-lex.o
-
-sieve-lex.c: sieve-lex.l sieve.h
-
-sieve.c sieve.h: sieve.y
-	$(YACC) $(YFLAGS) $(srcdir)/sieve.y
-	mv -f y.tab.c sieve.c 
-	mv -f y.tab.h sieve.h
-
-
-addr-lex.c: addr-lex.l addr.h
-#taken out by new makefile
-#	$(LEX) -t -Paddr $(srcdir)/addr-lex.l > $@
-
-addr.c addr.h: addr.y
-	$(YACC) $(YFLAGS) $(srcdir)/addr.y
-	mv -f y.tab.c addr.c
-	mv -f y.tab.h addr.h
-
-
-# This is needed because 'makedepend' leaves it out 
-#(this is not in newer version, is it still needed?)
-#addr.o: addr.h 
-
-
-#libsieve.a: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
-#changed to...
-libsieve.a: $(OBJS)
-	rm -f libsieve.a
-	ar cr libsieve.a $(OBJS)
-	$(RANLIB) libsieve.a
-
-sievec: sievec.o libsieve.a
-	$(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
-
-sieved: sieved.o libsieve.a
-	$(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
-
-
-sieve_interface.h: sieve_err.h
-
-sieve_err.h sieve_err.c: sieve_err.et 
-	$(COMPILE_ET) $(srcdir)/sieve_err.et
-
-clean:
-	rm -f sievec sieved test *~ *.o *.a Makefile.bak makedepend.log
-
-distclean: clean
-	rm -f sieve_err.c sieve_err.h
-	rm -f Makefile
-
-clobber:
-	rm -f $(BUILT_SOURCES)
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/sieve/addr-lex.c Deleted

@@ -1,1929 +0,0 @@
-
-#line 3 "<stdout>"
-
-#define YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define yy_create_buffer addr_create_buffer
-#define yy_delete_buffer addr_delete_buffer
-#define yy_flex_debug addr_flex_debug
-#define yy_init_buffer addr_init_buffer
-#define yy_flush_buffer addr_flush_buffer
-#define yy_load_buffer_state addr_load_buffer_state
-#define yy_switch_to_buffer addr_switch_to_buffer
-#define yyin addrin
-#define yyleng addrleng
-#define yylex addrlex
-#define yylineno addrlineno
-#define yyout addrout
-#define yyrestart addrrestart
-#define yytext addrtext
-#define yywrap addrwrap
-#define yyalloc addralloc
-#define yyrealloc addrrealloc
-#define yyfree addrfree
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE addrrestart(addrin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int addrleng;
-
-extern FILE *addrin, *addrout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
- #define YY_LESS_LINENO(n)
- 
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up addrtext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up addrtext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr) )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
- 
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more. We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via addrrestart()), so that the user can continue scanning by
-	 * just pointing addrin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
- ? (yy_buffer_stack)(yy_buffer_stack_top) \
- : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)(yy_buffer_stack_top)
-
-/* yy_hold_char holds the character lost when addrtext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int addrleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow addrwrap()'s to do buffer switches
- * instead of setting up a fresh addrin. A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void addrrestart (FILE *input_file );
-void addr_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE addr_create_buffer (FILE *file,int size );
-void addr_delete_buffer (YY_BUFFER_STATE b );
-void addr_flush_buffer (YY_BUFFER_STATE b );
-void addrpush_buffer_state (YY_BUFFER_STATE new_buffer );
-void addrpop_buffer_state (void );
-
-static void addrensure_buffer_stack (void );
-static void addr_load_buffer_state (void );
-static void addr_init_buffer (YY_BUFFER_STATE b,FILE *file );
-
-#define YY_FLUSH_BUFFER addr_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE addr_scan_buffer (char *base,yy_size_t size );
-YY_BUFFER_STATE addr_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE addr_scan_bytes (yyconst char *bytes,int len );
-
-void *addralloc (yy_size_t );
-void *addrrealloc (void *,yy_size_t );
-void addrfree (void * );
-
-#define yy_new_buffer addr_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
- addrensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE = \
- addr_create_buffer(addrin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
- addrensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE = \
- addr_create_buffer(addrin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define addrwrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *addrin = (FILE *) 0, *addrout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int addrlineno;
-
-int addrlineno = 1;
-
-extern char *addrtext;
-#define yytext_ptr addrtext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up addrtext.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	addrleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 15
-#define YY_END_OF_BUFFER 16
-/* This struct is not used in this scanner,
- but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept40 =
- { 0,
- 0, 0, 8, 8, 10, 10, 12, 12, 16, 5,
- 5, 6, 6, 1, 3, 4, 7, 2, 8, 15,
- 9, 15, 10, 15, 11, 12, 13, 14, 15, 5,
- 5, 6, 8, 0, 10, 0, 12, 0, 0
- } ;
-
-static yyconst flex_int32_t yy_ec256 =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 5, 1, 6, 1, 1, 1, 1, 1, 7,
- 8, 1, 1, 9, 1, 9, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 9, 9, 9,
- 1, 9, 1, 9, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 10, 11, 12, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static yyconst flex_int32_t yy_meta14 =
- { 0,
- 1, 2, 3, 4, 5, 6, 7, 7, 8, 9,
- 8, 9, 10
- } ;
-
-static yyconst flex_int16_t yy_base48 =
- { 0,
- 0, 0, 11, 20, 29, 39, 49, 60, 27, 0,
- 73, 0, 0, 182, 182, 182, 182, 182, 14, 182,
- 182, 83, 10, 86, 182, 9, 182, 182, 92, 0,
- 0, 0, 8, 102, 7, 0, 5, 0, 182, 108,
- 118, 128, 138, 147, 152, 162, 172
- } ;
-
-static yyconst flex_int16_t yy_def48 =
- { 0,
- 39, 1, 40, 40, 41, 41, 42, 42, 39, 43,
- 39, 44, 44, 39, 39, 39, 39, 39, 45, 39,
- 39, 45, 46, 46, 39, 47, 39, 39, 47, 43,
- 11, 44, 45, 45, 46, 24, 47, 29, 0, 39,
- 39, 39, 39, 39, 39, 39, 39
- } ;
-
-static yyconst flex_int16_t yy_nxt196 =
- { 0,
- 10, 11, 12, 13, 13, 14, 15, 16, 17, 18,
- 17, 17, 10, 20, 20, 38, 21, 36, 34, 38,
- 36, 22, 20, 20, 34, 21, 39, 39, 39, 39,
- 22, 20, 20, 39, 39, 39, 39, 39, 20, 24,
- 25, 20, 20, 39, 39, 39, 39, 39, 20, 24,
- 25, 20, 39, 39, 39, 27, 28, 39, 39, 29,
- 39, 20, 20, 39, 39, 39, 27, 28, 39, 39,
- 29, 39, 20, 30, 31, 32, 32, 32, 39, 39,
- 39, 39, 39, 39, 39, 30, 33, 39, 33, 35,
- 39, 39, 39, 39, 39, 35, 39, 35, 37, 37,
-
- 39, 39, 39, 39, 37, 33, 39, 33, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 30, 30,
- 39, 39, 39, 39, 39, 39, 39, 30, 32, 32,
- 32, 32, 33, 33, 39, 39, 33, 39, 33, 33,
- 33, 33, 35, 35, 39, 39, 35, 35, 35, 35,
- 39, 35, 37, 37, 39, 37, 37, 37, 39, 37,
- 37, 9, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39
-
- } ;
-
-static yyconst flex_int16_t yy_chk196 =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 3, 3, 37, 3, 35, 33, 26,
- 23, 3, 4, 4, 19, 4, 9, 0, 0, 0,
- 4, 5, 5, 0, 0, 0, 0, 0, 5, 5,
- 5, 6, 6, 0, 0, 0, 0, 0, 6, 6,
- 6, 7, 0, 0, 0, 7, 7, 0, 0, 7,
- 0, 7, 8, 0, 0, 0, 8, 8, 0, 0,
- 8, 0, 8, 11, 11, 11, 11, 11, 0, 0,
- 0, 0, 0, 0, 0, 11, 22, 0, 22, 24,
- 0, 0, 0, 0, 0, 24, 0, 24, 29, 29,
-
- 0, 0, 0, 0, 29, 34, 0, 34, 40, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 41, 41,
- 41, 41, 41, 41, 41, 41, 41, 41, 42, 42,
- 42, 42, 42, 42, 42, 42, 42, 42, 43, 43,
- 0, 0, 0, 0, 0, 0, 0, 43, 44, 44,
- 44, 44, 45, 45, 0, 0, 45, 0, 45, 45,
- 45, 45, 46, 46, 0, 0, 46, 46, 46, 46,
- 0, 46, 47, 47, 0, 47, 47, 47, 0, 47,
- 47, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39
-
- } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int addr_flex_debug;
-int addr_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *addrtext;
-#line 1 "addr-lex.l"
-#line 2 "addr-lex.l"
-/*
- * addr-lex.l -- RFC 822 address lexer
- * Ken Murchison
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: addr-lex.l,v 1.12 2010/01/06 17:01:58 murch Exp $
- */
-
-#include "addr.h"
-#include <stdlib.h>
-#include <string.h>
-
-#undef YY_INPUT
-#define YY_INPUT(b, r, ms) (r = addrinput(b, ms))
-
-int addrinput(char *buf, size_t max_size);
-void addrerror(const char *);
-
-static int ncom;	/* number of open comments */
-
-#line 584 "<stdout>"
-
-#define INITIAL 0
-#define QSTRING 1
-#define DOMAINLIT 2
-#define COMMENT 3
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
- These are made visible to non-reentrant scanners for convenience. */
-
-int addrlex_destroy (void );
-
-int addrget_debug (void );
-
-void addrset_debug (int debug_flag );
-
-YY_EXTRA_TYPE addrget_extra (void );
-
-void addrset_extra (YY_EXTRA_TYPE user_defined );
-
-FILE *addrget_in (void );
-
-void addrset_in (FILE * in_str );
-
-FILE *addrget_out (void );
-
-void addrset_out (FILE * out_str );
-
-int addrget_leng (void );
-
-char *addrget_text (void );
-
-int addrget_lineno (void );
-
-void addrset_lineno (int line_number );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int addrwrap (void );
-#else
-extern int addrwrap (void );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( addrtext, addrleng, 1, addrout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		unsigned n; \
-		for ( n = 0; n < max_size && \
-			 (c = getc( addrin )) != EOF && c != '\n'; ++n ) \
-			bufn = (char) c; \
-		if ( c == '\n' ) \
-			bufn++ = (char) c; \
-		if ( c == EOF && ferror( addrin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, addrin))==0 && ferror(addrin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(addrin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int addrlex (void);
-
-#define YY_DECL int addrlex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after addrtext and addrleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
- 
-#line 67 "addr-lex.l"
-
-
-#line 770 "<stdout>"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! addrin )
-			addrin = stdin;
-
-		if ( ! addrout )
-			addrout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			addrensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				addr_create_buffer(addrin,YY_BUF_SIZE );
-		}
-
-		addr_load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of addrtext. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ecYY_SC_TO_UI(*yy_cp);
-			if ( yy_acceptyy_current_state )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-				{
-				yy_current_state = (int) yy_defyy_current_state;
-				if ( yy_current_state >= 40 )
-					yy_c = yy_meta(unsigned int) yy_c;
-				}
-			yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-			++yy_cp;
-			}
-		while ( yy_baseyy_current_state != 182 );
-
-yy_find_action:
-		yy_act = yy_acceptyy_current_state;
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			yy_act = yy_acceptyy_current_state;
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 69 "addr-lex.l"
-{ BEGIN QSTRING; return addrtext0; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 70 "addr-lex.l"
-{ BEGIN DOMAINLIT; return addrtext0; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 71 "addr-lex.l"
-{ ncom = 1; BEGIN COMMENT; }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 72 "addr-lex.l"
-{ addrerror("address parse error, "
-					 "unexpected `')'' "
-					 "(unbalanced comment)");
-				 yyterminate(); }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 77 "addr-lex.l"
-return ATOM;
-	YY_BREAK
-case 6:
-/* rule 6 can match eol */
-YY_RULE_SETUP
-#line 79 "addr-lex.l"
-/* ignore whitespace */
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 80 "addr-lex.l"
-return addrtext0;
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 82 "addr-lex.l"
-return QTEXT;
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 83 "addr-lex.l"
-{ BEGIN INITIAL; return addrtext0; }
-	YY_BREAK
-case YY_STATE_EOF(QSTRING):
-#line 84 "addr-lex.l"
-{ BEGIN INITIAL;
-				 addrerror("address parse error, expecting `'\"'' (unterminated string)");
-				 yyterminate(); }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 88 "addr-lex.l"
-return DTEXT;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 89 "addr-lex.l"
-{ BEGIN INITIAL; return addrtext0; }
-	YY_BREAK
-case YY_STATE_EOF(DOMAINLIT):
-#line 90 "addr-lex.l"
-{ BEGIN INITIAL;
-				 addrerror("address parse error, expecting `''' (unterminated domain literal)");
-				 yyterminate(); }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 96 "addr-lex.l"
-/* ignore comments */
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 97 "addr-lex.l"
-ncom++;
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 98 "addr-lex.l"
-{ ncom--; if (ncom == 0) BEGIN INITIAL; }
-	YY_BREAK
-case YY_STATE_EOF(COMMENT):
-#line 99 "addr-lex.l"
-{ BEGIN INITIAL;
-				 addrerror("address parse error, "
-					 "expecting `')'' "
-					 "(unterminated comment)");
-				 yyterminate(); }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 105 "addr-lex.l"
-ECHO;
-	YY_BREAK
-#line 952 "<stdout>"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source. It's
-			 * possible that this happened because the user
-			 * just pointed addrin at a new source and called
-			 * addrlex(). If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals. Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = addrin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state). Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition. We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( addrwrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * addrtext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars);
-
-				yy_current_state = yy_get_previous_state( );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of addrlex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
- 	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					addrrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_bufyy_c_buf_p_offset;
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_bufnumber_to_move),
-			(yy_n_chars), (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			addrrestart(addrin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) addrrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf0;
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
- static yy_state_type yy_get_previous_state (void)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
- 
-	yy_current_state = (yy_start);
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ecYY_SC_TO_UI(*yy_cp) : 13);
-		if ( yy_acceptyy_current_state )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-			{
-			yy_current_state = (int) yy_defyy_current_state;
-			if ( yy_current_state >= 40 )
-				yy_c = yy_meta(unsigned int) yy_c;
-			}
-		yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
-{
-	register int yy_is_jam;
- 	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 13;
-	if ( yy_acceptyy_current_state )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-		{
-		yy_current_state = (int) yy_defyy_current_state;
-		if ( yy_current_state >= 40 )
-			yy_c = yy_meta(unsigned int) yy_c;
-		}
-	yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-	yy_is_jam = (yy_current_state == 39);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
- static int yyinput (void)
-#else
- static int input (void)
-#endif
-
-{
-	int c;
- 
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer( ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding. But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					addrrestart(addrin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( addrwrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve addrtext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
- void addrrestart (FILE * input_file )
-{
- 
-	if ( ! YY_CURRENT_BUFFER ){
- addrensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
- addr_create_buffer(addrin,YY_BUF_SIZE );
-	}
-
-	addr_init_buffer(YY_CURRENT_BUFFER,input_file );
-	addr_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
- void addr_switch_to_buffer (YY_BUFFER_STATE new_buffer )
-{
- 
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		addrpop_buffer_state();
-	 *		addrpush_buffer_state(new_buffer);
- */
-	addrensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	addr_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (addrwrap()) processing, but the only time this flag
-	 * is looked at is after addrwrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void addr_load_buffer_state (void)
-{
- 	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	addrin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
- YY_BUFFER_STATE addr_create_buffer (FILE * file, int size )
-{
-	YY_BUFFER_STATE b;
- 
-	b = (YY_BUFFER_STATE) addralloc(sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in addr_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) addralloc(b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in addr_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	addr_init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with addr_create_buffer()
- * 
- */
- void addr_delete_buffer (YY_BUFFER_STATE b )
-{
- 
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		addrfree((void *) b->yy_ch_buf );
-
-	addrfree((void *) b );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
- 
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a addrrestart() or at EOF.
- */
- static void addr_init_buffer (YY_BUFFER_STATE b, FILE * file )
-
-{
-	int oerrno = errno;
- 
-	addr_flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
- /* If b is the current buffer, then addr_init_buffer was _probably_
- * called from addrrestart() or through yy_get_next_buffer.
- * In that case, we don't want to reset the lineno or column.
- */
- if (b != YY_CURRENT_BUFFER){
- b->yy_bs_lineno = 1;
- b->yy_bs_column = 0;
- }
-
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
- 
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
- void addr_flush_buffer (YY_BUFFER_STATE b )
-{
- 	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters. The first causes
-	 * a transition to the end-of-buffer state. The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf0 = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf1 = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf0;
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		addr_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- * the current state. This function will allocate the stack
- * if necessary.
- * @param new_buffer The new state.
- * 
- */
-void addrpush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
- 	if (new_buffer == NULL)
-		return;
-
-	addrensure_buffer_stack();
-
-	/* This block is copied from addr_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from addr_switch_to_buffer. */
-	addr_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- * The next element becomes the new top.
- * 
- */
-void addrpop_buffer_state (void)
-{
- 	if (!YY_CURRENT_BUFFER)
-		return;
-
-	addr_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		addr_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- * Guarantees space for at least one push.
- */
-static void addrensure_buffer_stack (void)
-{
-	int num_to_alloc;
- 
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
- */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)addralloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in addrensure_buffer_stack()" );
-								 
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)addrrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in addrensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE addr_scan_buffer (char * base, yy_size_t size )
-{
-	YY_BUFFER_STATE b;
- 
-	if ( size < 2 ||
-	 basesize-2 != YY_END_OF_BUFFER_CHAR ||
-	 basesize-1 != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) addralloc(sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in addr_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	addr_switch_to_buffer(b );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to addrlex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- * addr_scan_bytes() instead.
- */
-YY_BUFFER_STATE addr_scan_string (yyconst char * yystr )
-{
- 
-	return addr_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to addrlex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE addr_scan_bytes (yyconst char * yybytes, int _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
- 
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) addralloc(n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in addr_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		bufi = yybytesi;
-
-	buf_yybytes_len = buf_yybytes_len+1 = YY_END_OF_BUFFER_CHAR;
-
-	b = addr_scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in addr_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
- 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up addrtext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
-		addrtextaddrleng = (yy_hold_char); \
-		(yy_c_buf_p) = addrtext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		addrleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int addrget_lineno (void)
-{
- 
- return addrlineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *addrget_in (void)
-{
- return addrin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *addrget_out (void)
-{
- return addrout;
-}
-
-/** Get the length of the current token.
- * 
- */
-int addrget_leng (void)
-{
- return addrleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *addrget_text (void)
-{
- return addrtext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void addrset_lineno (int line_number )
-{
- 
- addrlineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see addr_switch_to_buffer
- */
-void addrset_in (FILE * in_str )
-{
- addrin = in_str ;
-}
-
-void addrset_out (FILE * out_str )
-{
- addrout = out_str ;
-}
-
-int addrget_debug (void)
-{
- return addr_flex_debug;
-}
-
-void addrset_debug (int bdebug )
-{
- addr_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
- /* Initialization is the same as for the non-reentrant scanner.
- * This function is called from addrlex_destroy(), so don't allocate here.
- */
-
- (yy_buffer_stack) = 0;
- (yy_buffer_stack_top) = 0;
- (yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
- (yy_init) = 0;
- (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
- addrin = stdin;
- addrout = stdout;
-#else
- addrin = (FILE *) 0;
- addrout = (FILE *) 0;
-#endif
-
- /* For future reference: Set errno on error, since we are called by
- * addrlex_init()
- */
- return 0;
-}
-
-/* addrlex_destroy is for both reentrant and non-reentrant scanners. */
-int addrlex_destroy (void)
-{
- 
- /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		addr_delete_buffer(YY_CURRENT_BUFFER );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		addrpop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	addrfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
- /* Reset the globals. This is important in a non-reentrant scanner so the next time
- * addrlex() is called, initialization will occur. */
- yy_init_globals( );
-
- return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1i = s2i;
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; sn; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *addralloc (yy_size_t size )
-{
-	return (void *) malloc( size );
-}
-
-void *addrrealloc (void * ptr, yy_size_t size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers. It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void addrfree (void * ptr )
-{
-	free( (char *) ptr );	/* see addrrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 105 "addr-lex.l"
-
-
-
-/* take input from address string provided by sieve parser */
-int addrinput(char *buf, size_t max_size)
-{
- extern char *addrptr;	/* current position in address string */
- size_t n;			/* number of characters to read from string */
-
- n = strlen(addrptr) < max_size ? strlen(addrptr) : max_size;
- if (n > 0) {
-	memcpy(buf, addrptr, n);
-	addrptr += n;
- }
- return n;
-}
-

cyrus-imapd-2.4.17.tar.gz/sieve/addr.c Deleted

@@ -1,1680 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.5. */
-
-/* Bison implementation for Yacc-like parsers in C
- 
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- 
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
- simplifying the original so-called "semantic" parser. */
-
-/* All symbols defined below should begin with yy or YY, to avoid
- infringing on user name space. This should be done even for local
- variables, as they might otherwise be expanded by user macros.
- There are some unavoidable exceptions within include files to
- define necessary library symbols; they are noted "INFRINGES ON
- USER NAME SPACE" below. */
-
-/* Identify Bison output. */
-#define YYBISON 1
-
-/* Bison version. */
-#define YYBISON_VERSION "2.5"
-
-/* Skeleton name. */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers. */
-#define YYPURE 0
-
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
-/* Using locations. */
-#define YYLSP_NEEDED 0
-
-/* Substitute the variable and function names. */
-#define yyparse addrparse
-#define yylex addrlex
-#define yyerror addrerror
-#define yylval addrlval
-#define yychar addrchar
-#define yydebug addrdebug
-#define yynerrs addrnerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
-#line 1 "addr.y"
-
-/*
- * addr.y -- RFC 822 address parser
- * Ken Murchison
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: addr.y,v 1.15 2010/01/06 17:01:58 murch Exp $
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "addr.h"
-#include "script.h"
-#include "xmalloc.h"
-#include "xstrlcpy.h"
-
-#define ADDRERR_SIZE 500
- 
-int yyerror(const char *msg);
-extern int yylex(void);
-
-#define YYERROR_VERBOSE /* i want better error messages! */
-
-/* byacc default is 500, bison default is 10000 - go with the
- larger to support big sieve scripts (see Bug #3461) */
-#define YYSTACKSIZE 10000 
-
-
-/* Line 268 of yacc.c */
-#line 151 "y.tab.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- ATOM = 258,
- QTEXT = 259,
- DTEXT = 260
- };
-#endif
-/* Tokens. */
-#define ATOM 258
-#define QTEXT 259
-#define DTEXT 260
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-/* Copy the second part of user declarations. */
-
-
-/* Line 343 of yacc.c */
-#line 203 "y.tab.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-# define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# else
-# define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-# if ENABLE_NLS
-# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
-# endif
-# endif
-# ifndef YY_
-# define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E. */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
- int yyi;
-#endif
-{
- return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols. */
-
-# ifdef YYSTACK_USE_ALLOCA
-# if YYSTACK_USE_ALLOCA
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# elif defined __BUILTIN_VA_ARG_INCR
-# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-# elif defined _AIX
-# define YYSTACK_ALLOC __alloca
-# elif defined _MSC_VER
-# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-# define alloca _alloca
-# else
-# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-# endif
-# endif
-# endif
-# endif
-# endif
-
-# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-# ifndef YYSTACK_ALLOC_MAXIMUM
- /* The OS might guarantee only one guard page at the bottom of the stack,
- and a page size can be as small as 4096 bytes. So we cannot safely
- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
- to allow for a few compiler-allocated temporary stack slots. */
-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-# endif
-# else
-# define YYSTACK_ALLOC YYMALLOC
-# define YYSTACK_FREE YYFREE
-# ifndef YYSTACK_ALLOC_MAXIMUM
-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-# endif
-# if (defined __cplusplus && ! defined EXIT_SUCCESS \
- && ! ((defined YYMALLOC || defined malloc) \
-	 && (defined YYFREE || defined free)))
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-# endif
-# endif
-# ifndef YYMALLOC
-# define YYMALLOC malloc
-# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# ifndef YYFREE
-# define YYFREE free
-# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
- && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member. */
-union yyalloc
-{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next. */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
- N elements. */
-# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
- elements in the stack, and YYPTR gives the new location of the
- stack. Advance YYPTR to a properly aligned location for the next
- stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
- do									\
- {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
- }									\
- while (YYID (0))
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count)		\
- do					\
-	{					\
-	 YYSIZE_T yyi;				\
-	 for (yyi = 0; yyi < (Count); yyi++)	\
-	 (To)yyi = (From)yyi;		\
-	}					\
- while (YYID (0))
-# endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 10
-/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 26
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 13
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 11
-/* YYNRULES -- Number of rules. */
-#define YYNRULES 17
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 31
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 260
-
-#define YYTRANSLATE(YYX)						\
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
-
-/* YYTRANSLATEYYLEX -- Bison symbol number corresponding to YYLEX. */
-static const yytype_uint8 yytranslate =
-{
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 12, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 9, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 6, 2, 7, 2, 8, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 10, 2, 11, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
- 5
-};
-
-#if YYDEBUG
-/* YYPRHSYYN -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint8 yyprhs =
-{
- 0, 0, 3, 5, 10, 14, 16, 20, 22, 26,
- 28, 30, 32, 36, 38, 41, 43, 45
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs =
-{
- 14, 0, -1, 15, -1, 21, 6, 15, 7, -1,
- 16, 8, 17, -1, 22, -1, 22, 9, 16, -1,
- 18, -1, 18, 9, 17, -1, 19, -1, 20, -1,
- 3, -1, 10, 5, 11, -1, 22, -1, 22, 21,
- -1, 3, -1, 23, -1, 12, 4, 12, -1
-};
-
-/* YYRLINEYYN -- source line where rule number YYN was defined. */
-static const yytype_uint8 yyrline =
-{
- 0, 75, 75, 76, 79, 82, 83, 86, 87, 90,
- 91, 94, 97, 100, 101, 104, 105, 108
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname =
-{
- "$end", "error", "$undefined", "ATOM", "QTEXT", "DTEXT", "'<'", "'>'",
- "'@'", "'.'", "''", "''", "'\"'", "$accept", "sieve_address",
- "addrspec", "localpart", "domain", "subdomain", "domainref", "domainlit",
- "phrase", "word", "qstring", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUMYYLEX-NUM -- Internal token number corresponding to
- token YYLEX-NUM. */
-static const yytype_uint16 yytoknum =
-{
- 0, 256, 257, 258, 259, 260, 60, 62, 64, 46,
- 91, 93, 34
-};
-# endif
-
-/* YYR1YYN -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1 =
-{
- 0, 13, 14, 14, 15, 16, 16, 17, 17, 18,
- 18, 19, 20, 21, 21, 22, 22, 23
-};
-
-/* YYR2YYN -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2 =
-{
- 0, 2, 1, 4, 3, 1, 3, 1, 3, 1,
- 1, 1, 3, 1, 2, 1, 1, 3
-};
-
-/* YYDEFACTSTATE-NAME -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const yytype_uint8 yydefact =
-{
- 0, 15, 0, 0, 2, 0, 0, 5, 16, 0,
- 1, 0, 0, 0, 14, 13, 17, 11, 0, 4,
- 7, 9, 10, 0, 5, 6, 0, 0, 3, 12,
- 8
-};
-
-/* YYDEFGOTONTERM-NUM. */
-static const yytype_int8 yydefgoto =
-{
- -1, 3, 4, 5, 19, 20, 21, 22, 14, 15,
- 8
-};
-
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -7
-static const yytype_int8 yypact =
-{
- -1, -7, 1, 3, -7, 6, 10, -2, -7, -6,
- -7, 5, -1, -1, -7, -1, -7, -7, 4, -7,
- 8, -7, -7, 11, 12, -7, 9, 5, -7, -7,
- -7
-};
-
-/* YYPGOTONTERM-NUM. */
-static const yytype_int8 yypgoto =
-{
- -7, -7, 7, 13, -5, -7, -7, -7, 23, 0,
- -7
-};
-
-/* YYTABLEYYPACTSTATE-NUM. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -14
-static const yytype_int8 yytable =
-{
- 7, 1, 1, 10, -13, 9, 16, 13, 17, 26,
- 2, 2, 24, 24, 11, 18, 12, 27, 28, 23,
- 29, 13, 30, 6, 0, 0, 25
-};
-
-#define yypact_value_is_default(yystate) \
- ((yystate) == (-7))
-
-#define yytable_value_is_error(yytable_value) \
- YYID (0)
-
-static const yytype_int8 yycheck =
-{
- 0, 3, 3, 0, 6, 4, 12, 9, 3, 5,
- 12, 12, 12, 13, 8, 10, 6, 9, 7, 12,
- 11, 9, 27, 0, -1, -1, 13
-};
-
-/* YYSTOSSTATE-NUM -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const yytype_uint8 yystos =
-{
- 0, 3, 12, 14, 15, 16, 21, 22, 23, 4,
- 0, 8, 6, 9, 21, 22, 12, 3, 10, 17,
- 18, 19, 20, 15, 22, 16, 5, 9, 7, 11,
- 17
-};
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
-
-#define YYFAIL		goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
- if (yychar == YYEMPTY && yylen == 1)				\
- {								\
- yychar = (Token);						\
- yylval = (Value);						\
- YYPOPSTACK (1);						\
- goto yybackup;						\
- }								\
- else								\
- {								\
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR;							\
- }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS1 to RHSN.
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS0 (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)K)
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
- do									\
- if (YYID (N)) \
-	{								\
-	 (Current).first_line = YYRHSLOC (Rhs, 1).first_line;	\
-	 (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	 (Current).last_line = YYRHSLOC (Rhs, N).last_line;		\
-	 (Current).last_column = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
- else								\
-	{								\
-	 (Current).first_line = (Current).last_line =		\
-	 YYRHSLOC (Rhs, 0).last_line;				\
-	 (Current).first_column = (Current).last_column =		\
-	 YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
- while (YYID (0))
-#endif
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments. */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
-
-/* Enable debugging if requested. */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
- if (yydebug)					\
- YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			 \
-do {									 \
- if (yydebug)								 \
- {									 \
- YYFPRINTF (stderr, "%s ", Title);					 \
- yy_symbol_print (stderr,						 \
-		 Type, Value); \
- YYFPRINTF (stderr, "\n");						 \
- }									 \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (!yyvaluep)
- return;
-# ifdef YYPRINT
- if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
-# else
- YYUSE (yyoutput);
-# endif
- switch (yytype)
- {
- default:
-	break;
- }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytnameyytype);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytnameyytype);
-
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
- YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included). |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
-#endif
-{
- YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
- YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
- if (yydebug)							\
- yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced. |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
-{
- int yynrhs = yyr2yyrule;
- int yyi;
- unsigned long int yylno = yyrlineyyrule;
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	 yyrule - 1, yylno);
- /* The symbols being reduced. */
- for (yyi = 0; yyi < yynrhs; yyi++)
- {
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhsyyprhsyyrule + yyi,
-		 &(yyvsp(yyi + 1) - (yynrhs))
-		 		 );
- YYFPRINTF (stderr, "\n");
- }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
- if (yydebug)				\
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-
-/* Nonzero means print parse trace. It is left uninitialized so that
- multiple parsers can coexist. */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
- if the built-in stack extension method is used).
-
- Do not make this value too large; the results are undefined if
- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
- evaluated with infinite-precision integer arithmetic. */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-# if defined __GLIBC__ && defined _STRING_H
-# define yystrlen strlen
-# else
-/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
-{
- YYSIZE_T yylen;
- for (yylen = 0; yystryylen; yylen++)
- continue;
- return yylen;
-}
-# endif
-# endif
-
-# ifndef yystpcpy
-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-# define yystpcpy stpcpy
-# else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
- YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
-{
- char *yyd = yydest;
- const char *yys = yysrc;
-
- while ((*yyd++ = *yys++) != '\0')
- continue;
-
- return yyd - 1;
-}
-# endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
- quotes and backslashes, so that it's suitable for yyerror. The
- heuristic is that double-quoting is unnecessary unless the string
- contains an apostrophe, a comma, or backslash (other than
- backslash-backslash). YYSTR is taken from yytname. If YYRES is
- null, do not copy; instead, return the length of what the result
- would have been. */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
- if (*yystr == '"')
- {
- YYSIZE_T yyn = 0;
- char const *yyp = yystr;
-
- for (;;)
-	switch (*++yyp)
-	 {
-	 case '\'':
-	 case ',':
-	 goto do_not_strip_quotes;
-
-	 case '\\':
-	 if (*++yyp != '\\')
-	 goto do_not_strip_quotes;
-	 /* Fall through. */
-	 default:
-	 if (yyres)
-	 yyresyyn = *yyp;
-	 yyn++;
-	 break;
-
-	 case '"':
-	 if (yyres)
-	 yyresyyn = '\0';
-	 return yyn;
-	 }
- do_not_strip_quotes: ;
- }
-
- if (! yyres)
- return yystrlen (yystr);
-
- return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
- about the unexpected token YYTOKEN for the state stack whose top is
- YYSSP.
-
- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
- not large enough to hold the message. In that case, also set
- *YYMSG_ALLOC to the required number of bytes. Return 2 if the
- required number of bytes is too large to store. */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
- yytype_int16 *yyssp, int yytoken)
-{
- YYSIZE_T yysize0 = yytnamerr (0, yytnameyytoken);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- /* Internationalized format string. */
- const char *yyformat = 0;
- /* Arguments of yyformat. */
- char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
- /* Number of reported tokens (one for the "unexpected", one per
- "expected"). */
- int yycount = 0;
-
- /* There are many possibilities here to consider:
- - Assume YYFAIL is not used. It's too flawed to consider. See
- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
- for details. YYERROR is fine as it does not invoke this
- function.
- - If this state is a consistent state with a default action, then
- the only way this function was invoked is if the default action
- is an error action. In that case, don't check for expected
- tokens because there are none.
- - The only way there can be no lookahead present (in yychar) is if
- this state is a consistent state with a default action. Thus,
- detecting the absence of a lookahead is sufficient to determine
- that there is no unexpected or expected token to report. In that
- case, just report a simple "syntax error".
- - Don't assume there isn't a lookahead just because this state is a
- consistent state with a default action. There might have been a
- previous inconsistent state, consistent state with a non-default
- action, or user semantic action that manipulated yychar.
- - Of course, the expected token list depends on states to have
- correct lookahead information, and it depends on the parser not
- to perform extra reductions after fetching a lookahead from the
- scanner and before detecting a syntax error. Thus, state merging
- (from LALR or IELR) and default reductions corrupt the expected
- token list. However, the list is correct for canonical LR with
- one exception: it will still contain any token that will not be
- accepted due to an error action in a later state.
- */
- if (yytoken != YYEMPTY)
- {
- int yyn = yypact*yyssp;
- yyargyycount++ = yytnameyytoken;
- if (!yypact_value_is_default (yyn))
- {
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. In other words, skip the first -YYN actions for
- this state because they are default actions. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yyx;
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheckyyx + yyn == yyx && yyx != YYTERROR
- && !yytable_value_is_error (yytableyyx + yyn))
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- break;
- }
- yyargyycount++ = yytnameyyx;
- yysize1 = yysize + yytnamerr (0, yytnameyyx);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
- }
- }
- }
-
- switch (yycount)
- {
-# define YYCASE_(N, S) \
- case N: \
- yyformat = S; \
- break
- YYCASE_(0, YY_("syntax error"));
- YYCASE_(1, YY_("syntax error, unexpected %s"));
- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
- }
-
- yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
-
- if (*yymsg_alloc < yysize)
- {
- *yymsg_alloc = 2 * yysize;
- if (! (yysize <= *yymsg_alloc
- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
- return 1;
- }
-
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- {
- char *yyp = *yymsg;
- int yyi = 0;
- while ((*yyp = *yyformat) != '\0')
- if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyargyyi++);
- yyformat += 2;
- }
- else
- {
- yyp++;
- yyformat++;
- }
- }
- return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol. |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
-{
- YYUSE (yyvaluep);
-
- if (!yymsg)
- yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
- switch (yytype)
- {
-
- default:
-	break;
- }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-/* The lookahead symbol. */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far. */
-int yynerrs;
-
-
-/*----------.
-| yyparse. |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssaYYINITDEPTH;
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsaYYINITDEPTH;
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
-
- int yyn;
- int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf128;
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
- /* The number of symbols on the RHS of the reduced rule.
- Keep to zero when no symbol should be popped. */
- int yylen = 0;
-
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
- YYDPRINTF ((stderr, "Starting parse\n"));
-
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
- yyssp = yyss;
- yyvsp = yyvs;
-
- goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
-`------------------------------------------------------------*/
- yynewstate:
- /* In all cases, when you get here, the value and location stacks
- have just been pushed. So pushing a state here evens the stacks. */
- yyssp++;
-
- yysetstate:
- *yyssp = yystate;
-
- if (yyss + yystacksize - 1 <= yyssp)
- {
- /* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
- {
-	/* Give user a chance to reallocate the stack. Use copies of
-	 these so that the &'s don't force the real ones into
-	 memory. */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	 data in use in that stack, in bytes. This used to be a
-	 conditional around just the two extra args, but that might
-	 be undefined if yyoverflow is a macro. */
-	yyoverflow (YY_("memory exhausted"),
-		 &yyss1, yysize * sizeof (*yyssp),
-		 &yyvs1, yysize * sizeof (*yyvsp),
-		 &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
- }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
- {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	 goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	 YYSTACK_FREE (yyss1);
- }
-# endif
-#endif /* no yyoverflow */
-
- yyssp = yyss + yysize - 1;
- yyvsp = yyvs + yysize - 1;
-
- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		 (unsigned long int) yystacksize));
-
- if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
- }
-
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
- if (yystate == YYFINAL)
- YYACCEPT;
-
- goto yybackup;
-
-/*-----------.
-| yybackup. |
-`-----------*/
-yybackup:
-
- /* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
-
- /* First try to decide what to do without reference to lookahead token. */
- yyn = yypactyystate;
- if (yypact_value_is_default (yyn))
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY)
- {
- YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
- }
-
- if (yychar <= YYEOF)
- {
- yychar = yytoken = YYEOF;
- YYDPRINTF ((stderr, "Now at end of input.\n"));
- }
- else
- {
- yytoken = YYTRANSLATE (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
- }
-
- /* If the proper action on seeing token YYTOKEN is to reduce or to
- detect an error, take that action. */
- yyn += yytoken;
- if (yyn < 0 || YYLAST < yyn || yycheckyyn != yytoken)
- goto yydefault;
- yyn = yytableyyn;
- if (yyn <= 0)
- {
- if (yytable_value_is_error (yyn))
- goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
-
- /* Count tokens shifted since error; after three, turn off error
- status. */
- if (yyerrstatus)
- yyerrstatus--;
-
- /* Shift the lookahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the shifted token. */
- yychar = YYEMPTY;
-
- yystate = yyn;
- *++yyvsp = yylval;
-
- goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state. |
-`-----------------------------------------------------------*/
-yydefault:
- yyn = yydefactyystate;
- if (yyn == 0)
- goto yyerrlab;
- goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction. |
-`-----------------------------*/
-yyreduce:
- /* yyn is the number of a rule to reduce with. */
- yylen = yyr2yyn;
-
- /* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
-
- Otherwise, the following line sets YYVAL to garbage.
- This behavior is undocumented and Bison
- users should not rely upon it. Assigning to YYVAL
- unconditionally makes the parser a bit smaller, and it avoids a
- GCC warning that YYVAL may be used uninitialized. */
- yyval = yyvsp1-yylen;
-
-
- YY_REDUCE_PRINT (yyn);
- switch (yyn)
- {
- 
-
-/* Line 1806 of yacc.c */
-#line 1439 "y.tab.c"
- default: break;
- }
- /* User semantic actions sometimes alter yychar, and that requires
- that yytoken be updated with the new translation. We take the
- approach of translating immediately before every use of yytoken.
- One alternative is translating here after every semantic action,
- but that translation would be missed if the semantic action invokes
- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
- incorrect destructor might then be invoked immediately. In the
- case of YYERROR or YYBACKUP, subsequent parser actions might lead
- to an incorrect destructor call or verbose syntax error message
- before the lookahead is translated. */
- YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
-
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
-
- *++yyvsp = yyval;
-
- /* Now `shift' the result of the reduction. Determine what state
- that goes to, based on the state we popped back to and the rule
- number reduced by. */
-
- yyn = yyr1yyn;
-
- yystate = yypgotoyyn - YYNTOKENS + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheckyystate == *yyssp)
- yystate = yytableyystate;
- else
- yystate = yydefgotoyyn - YYNTOKENS;
-
- goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
- /* Make sure we have latest lookahead translation. See comments at
- user semantic actions for why this is necessary. */
- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
- /* If not already recovering from an error, report this error. */
- if (!yyerrstatus)
- {
- ++yynerrs;
-#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
- yyssp, yytoken)
- {
- char const *yymsgp = YY_("syntax error");
- int yysyntax_error_status;
- yysyntax_error_status = YYSYNTAX_ERROR;
- if (yysyntax_error_status == 0)
- yymsgp = yymsg;
- else if (yysyntax_error_status == 1)
- {
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
- if (!yymsg)
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- yysyntax_error_status = 2;
- }
- else
- {
- yysyntax_error_status = YYSYNTAX_ERROR;
- yymsgp = yymsg;
- }
- }
- yyerror (yymsgp);
- if (yysyntax_error_status == 2)
- goto yyexhaustedlab;
- }
-# undef YYSYNTAX_ERROR
-#endif
- }
-
-
-
- if (yyerrstatus == 3)
- {
- /* If just tried and failed to reuse lookahead token after an
-	 error, discard it. */
-
- if (yychar <= YYEOF)
-	{
-	 /* Return failure if at end of input. */
-	 if (yychar == YYEOF)
-	 YYABORT;
-	}
- else
-	{
-	 yydestruct ("Error: discarding",
-		 yytoken, &yylval);
-	 yychar = YYEMPTY;
-	}
- }
-
- /* Else will try to reuse lookahead token after shifting the error
- token. */
- goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR. |
-`---------------------------------------------------*/
-yyerrorlab:
-
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
- /* Do not reclaim the symbols of the rule which action triggered
- this YYERROR. */
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
- yystate = *yyssp;
- goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR. |
-`-------------------------------------------------------------*/
-yyerrlab1:
- yyerrstatus = 3;	/* Each real token shifted decrements this. */
-
- for (;;)
- {
- yyn = yypactyystate;
- if (!yypact_value_is_default (yyn))
-	{
-	 yyn += YYTERROR;
-	 if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
-	 {
-	 yyn = yytableyyn;
-	 if (0 < yyn)
-		break;
-	 }
-	}
-
- /* Pop the current state because it cannot handle the error token. */
- if (yyssp == yyss)
-	YYABORT;
-
-
- yydestruct ("Error: popping",
-		 yystosyystate, yyvsp);
- YYPOPSTACK (1);
- yystate = *yyssp;
- YY_STACK_PRINT (yyss, yyssp);
- }
-
- *++yyvsp = yylval;
-
-
- /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
-
- yystate = yyn;
- goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here. |
-`-------------------------------------*/
-yyacceptlab:
- yyresult = 0;
- goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here. |
-`-----------------------------------*/
-yyabortlab:
- yyresult = 1;
- goto yyreturn;
-
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here. |
-`-------------------------------------------------*/
-yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
- yyresult = 2;
- /* Fall through. */
-#endif
-
-yyreturn:
- if (yychar != YYEMPTY)
- {
- /* Make sure we have latest lookahead translation. See comments at
- user semantic actions for why this is necessary. */
- yytoken = YYTRANSLATE (yychar);
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
- }
- /* Do not reclaim the symbols of the rule which action triggered
- this YYABORT or YYACCEPT. */
- YYPOPSTACK (yylen);
- YY_STACK_PRINT (yyss, yyssp);
- while (yyssp != yyss)
- {
- yydestruct ("Cleanup: popping",
-		 yystos*yyssp, yyvsp);
- YYPOPSTACK (1);
- }
-#ifndef yyoverflow
- if (yyss != yyssa)
- YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
-#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
-}
-
-
-
-/* Line 2067 of yacc.c */
-#line 111 "addr.y"
-
-
-/* copy address error message into buffer provided by sieve parser */
-int yyerror(const char *s)
-{
- extern char addrerrADDRERR_SIZE;
- 
- strlcpy(addrerr, s, ADDRERR_SIZE);
- return 0;
-}
-

cyrus-imapd-2.4.17.tar.gz/sieve/addr.h Deleted

@@ -1,62 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.5. */
-
-/* Bison interface for Yacc-like parsers in C
- 
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- 
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- ATOM = 258,
- QTEXT = 259,
- DTEXT = 260
- };
-#endif
-/* Tokens. */
-#define ATOM 258
-#define QTEXT 259
-#define DTEXT 260
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-extern YYSTYPE addrlval;
-
-

cyrus-imapd-2.4.17.tar.gz/sieve/sieve-lex.c Deleted

@@ -1,2446 +0,0 @@
-
-#line 3 "<stdout>"
-
-#define YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int yyleng;
-
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
- /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
- * access to the local variable yy_act. Since yyless() is a macro, it would break
- * existing scanners that call yyless() from OUTSIDE yylex. 
- * One obvious solution it to make yy_act a global. I tried that, and saw
- * a 5% performance hit in a non-yylineno scanner, because yy_act is
- * normally declared as a register variable-- so it is not worth it.
- */
- #define YY_LESS_LINENO(n) \
- do { \
- int yyl;\
- for ( yyl = n; yyl < yyleng; ++yyl )\
- if ( yytextyyl == '\n' )\
- --yylineno;\
- }while(0)
- 
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr) )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
- 
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more. We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
- ? (yy_buffer_stack)(yy_buffer_stack_top) \
- : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)(yy_buffer_stack_top)
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin. A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart (FILE *input_file );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
-void yy_delete_buffer (YY_BUFFER_STATE b );
-void yy_flush_buffer (YY_BUFFER_STATE b );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
-
-void *yyalloc (yy_size_t );
-void *yyrealloc (void *,yy_size_t );
-void yyfree (void * );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
- yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
- yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 78
-#define YY_END_OF_BUFFER 79
-/* This struct is not used in this scanner,
- but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept359 =
- { 0,
- 0, 0, 0, 0, 0, 0, 79, 77, 74, 74,
- 8, 75, 77, 9, 77, 77, 77, 77, 77, 77,
- 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
- 3, 3, 3, 6, 6, 4, 6, 75, 0, 9,
- 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 10, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 2, 5, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 38,
-
- 53, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 22, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 76, 0, 61, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 41, 0, 0, 0, 0, 0, 0, 0, 0, 66,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 21, 0, 0, 12, 0, 0, 0, 0, 0, 0,
- 0, 27, 34, 0, 0, 0, 0, 0, 0, 0,
-
- 23, 29, 0, 17, 0, 0, 76, 0, 0, 0,
- 73, 0, 46, 0, 0, 49, 0, 0, 43, 0,
- 0, 0, 0, 51, 0, 0, 59, 0, 0, 0,
- 67, 0, 64, 0, 0, 0, 14, 13, 0, 0,
- 11, 0, 0, 16, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 57, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 56, 0, 60, 58, 0, 0, 0,
- 0, 0, 15, 0, 20, 0, 36, 0, 24, 0,
- 0, 72, 0, 0, 7, 7, 0, 35, 0, 0,
-
- 0, 0, 0, 65, 63, 71, 50, 0, 0, 0,
- 39, 42, 0, 0, 0, 32, 18, 0, 30, 0,
- 0, 69, 0, 0, 28, 31, 0, 7, 0, 0,
- 0, 0, 68, 0, 55, 44, 40, 0, 48, 37,
- 19, 25, 26, 0, 7, 45, 0, 0, 54, 0,
- 70, 0, 47, 0, 62, 33, 52, 0
- } ;
-
-static yyconst flex_int32_t yy_ec256 =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 5, 6, 1, 1, 1, 1, 1,
- 1, 7, 1, 1, 1, 8, 9, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 11, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 12, 1, 1, 1, 12, 1, 12, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 13, 1, 1, 1, 1, 14, 15, 16, 17,
-
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static yyconst flex_int32_t yy_meta40 =
- { 0,
- 1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1
- } ;
-
-static yyconst flex_int16_t yy_base365 =
- { 0,
- 0, 0, 393, 37, 38, 39, 395, 397, 397, 397,
- 397, 0, 387, 36, 49, 30, 365, 31, 60, 36,
- 374, 40, 373, 376, 361, 370, 68, 61, 360, 372,
- 397, 397, 85, 397, 397, 397, 0, 0, 378, 84,
- 397, 47, 356, 77, 352, 357, 84, 82, 353, 89,
- 352, 80, 361, 98, 344, 359, 86, 362, 358, 349,
- 335, 355, 344, 338, 337, 333, 345, 341, 340, 350,
- 397, 347, 344, 330, 327, 100, 326, 319, 329, 319,
- 321, 328, 337, 397, 349, 397, 397, 344, 93, 333,
- 324, 93, 310, 314, 320, 317, 316, 316, 322, 397,
-
- 397, 105, 308, 92, 314, 308, 305, 319, 305, 299,
- 314, 318, 295, 314, 312, 304, 42, 300, 299, 288,
- 297, 308, 110, 305, 290, 289, 302, 302, 293, 288,
- 292, 293, 292, 295, 284, 277, 276, 290, 290, 278,
- 273, 287, 290, 289, 122, 397, 271, 397, 272, 267,
- 261, 271, 265, 282, 281, 268, 278, 275, 270, 276,
- 397, 273, 256, 266, 268, 259, 262, 252, 250, 397,
- 263, 257, 246, 260, 246, 242, 250, 256, 254, 253,
- 397, 238, 256, 397, 250, 243, 234, 248, 243, 246,
- 229, 397, 397, 243, 230, 244, 224, 236, 226, 231,
-
- 397, 397, 244, 397, 223, 220, 245, 233, 236, 120,
- 397, 216, 397, 226, 225, 397, 232, 220, 397, 219,
- 222, 228, 213, 397, 226, 211, 397, 210, 200, 218,
- 397, 204, 397, 216, 219, 200, 397, 397, 209, 199,
- 397, 201, 196, 397, 200, 195, 208, 186, 205, 189,
- 203, 189, 192, 204, 133, 193, 194, 183, 183, 191,
- 185, 397, 186, 183, 184, 190, 178, 188, 185, 187,
- 178, 175, 174, 397, 184, 397, 397, 179, 166, 178,
- 179, 166, 397, 161, 397, 175, 397, 176, 397, 172,
- 172, 397, 169, 140, 397, 185, 144, 397, 159, 154,
-
- 171, 157, 150, 397, 397, 397, 397, 168, 149, 162,
- 397, 397, 147, 164, 144, 397, 397, 138, 397, 157,
- 146, 397, 140, 147, 397, 397, 146, 148, 144, 152,
- 136, 136, 397, 136, 397, 397, 397, 141, 397, 397,
- 397, 397, 397, 151, 397, 397, 132, 135, 397, 129,
- 397, 141, 397, 114, 397, 397, 397, 397, 152, 154,
- 139, 53, 156, 158
- } ;
-
-static yyconst flex_int16_t yy_def365 =
- { 0,
- 358, 1, 359, 359, 360, 360, 358, 358, 358, 358,
- 358, 361, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 362, 361, 363, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 363, 363, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
-
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 363, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
-
- 358, 358, 358, 358, 358, 358, 363, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 364, 358, 358, 358,
-
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 364, 364, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 0, 358, 358,
- 358, 358, 358, 358
- } ;
-
-static yyconst flex_int16_t yy_nxt437 =
- { 0,
- 8, 9, 10, 9, 11, 12, 8, 8, 13, 14,
- 15, 8, 8, 16, 17, 8, 18, 19, 20, 8,
- 21, 22, 8, 23, 8, 24, 25, 8, 8, 8,
- 26, 27, 28, 29, 30, 8, 8, 8, 8, 32,
- 35, 35, 36, 36, 33, 40, 59, 41, 63, 68,
- 37, 37, 64, 87, 60, 41, 61, 69, 71, 41,
- 177, 41, 42, 90, 43, 44, 72, 45, 46, 47,
- 48, 91, 178, 49, 50, 51, 52, 53, 80, 54,
- 55, 56, 57, 58, 65, 77, 66, 84, 85, 78,
- 93, 81, 86, 40, 94, 41, 67, 98, 100, 145,
-
- 79, 146, 103, 41, 95, 99, 104, 41, 107, 41,
- 105, 110, 114, 101, 108, 111, 133, 115, 149, 150,
- 160, 151, 134, 163, 164, 135, 152, 184, 89, 136,
- 207, 185, 137, 260, 294, 295, 296, 261, 297, 38,
- 161, 294, 295, 296, 357, 297, 295, 328, 295, 328,
- 345, 328, 31, 31, 34, 34, 88, 88, 327, 327,
- 356, 355, 354, 353, 352, 351, 350, 349, 348, 347,
- 346, 344, 343, 342, 341, 340, 339, 338, 337, 336,
- 335, 334, 333, 332, 331, 330, 329, 295, 326, 325,
- 324, 323, 322, 321, 320, 319, 318, 317, 316, 315,
-
- 314, 313, 312, 311, 310, 309, 308, 307, 306, 305,
- 304, 303, 302, 301, 300, 299, 298, 293, 292, 291,
- 290, 289, 288, 287, 286, 285, 284, 283, 282, 281,
- 280, 279, 278, 277, 276, 275, 274, 273, 272, 271,
- 270, 269, 268, 267, 266, 265, 264, 263, 262, 259,
- 258, 89, 257, 256, 255, 254, 253, 252, 251, 250,
- 249, 248, 247, 246, 245, 244, 243, 242, 241, 240,
- 239, 238, 237, 236, 235, 234, 233, 232, 231, 230,
- 229, 228, 227, 226, 225, 224, 223, 222, 221, 220,
- 219, 218, 217, 216, 215, 214, 213, 212, 211, 210,
-
- 209, 208, 206, 205, 204, 203, 202, 201, 200, 199,
- 198, 197, 196, 195, 194, 193, 192, 191, 190, 189,
- 188, 187, 186, 183, 182, 181, 180, 179, 176, 175,
- 174, 173, 172, 171, 170, 169, 168, 167, 166, 165,
- 162, 159, 158, 157, 156, 155, 154, 153, 148, 147,
- 89, 84, 144, 143, 142, 141, 140, 139, 138, 132,
- 131, 130, 129, 128, 127, 126, 125, 124, 123, 122,
- 121, 120, 119, 118, 117, 116, 113, 112, 109, 106,
- 102, 97, 96, 92, 89, 83, 82, 76, 75, 74,
- 73, 70, 62, 39, 358, 32, 7, 358, 358, 358,
-
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358
- } ;
-
-static yyconst flex_int16_t yy_chk437 =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 5, 6, 5, 6, 4, 14, 16, 14, 18, 20,
- 5, 6, 18, 362, 16, 14, 16, 20, 22, 14,
- 117, 14, 15, 42, 15, 15, 22, 15, 15, 15,
- 15, 42, 117, 15, 15, 15, 15, 15, 28, 15,
- 15, 15, 15, 15, 19, 27, 19, 33, 33, 27,
- 44, 28, 33, 40, 44, 40, 19, 47, 48, 89,
-
- 27, 89, 50, 40, 44, 47, 50, 40, 52, 40,
- 50, 54, 57, 48, 52, 54, 76, 57, 92, 92,
- 102, 92, 76, 104, 104, 76, 92, 123, 145, 76,
- 145, 123, 76, 210, 255, 255, 255, 210, 255, 361,
- 102, 294, 294, 294, 354, 294, 297, 297, 327, 327,
- 328, 328, 359, 359, 360, 360, 363, 363, 364, 364,
- 352, 350, 348, 347, 344, 338, 334, 332, 331, 330,
- 329, 324, 323, 321, 320, 318, 315, 314, 313, 310,
- 309, 308, 303, 302, 301, 300, 299, 296, 293, 291,
- 290, 288, 286, 284, 282, 281, 280, 279, 278, 275,
-
- 273, 272, 271, 270, 269, 268, 267, 266, 265, 264,
- 263, 261, 260, 259, 258, 257, 256, 254, 253, 252,
- 251, 250, 249, 248, 247, 246, 245, 243, 242, 240,
- 239, 236, 235, 234, 232, 230, 229, 228, 226, 225,
- 223, 222, 221, 220, 218, 217, 215, 214, 212, 209,
- 208, 207, 206, 205, 203, 200, 199, 198, 197, 196,
- 195, 194, 191, 190, 189, 188, 187, 186, 185, 183,
- 182, 180, 179, 178, 177, 176, 175, 174, 173, 172,
- 171, 169, 168, 167, 166, 165, 164, 163, 162, 160,
- 159, 158, 157, 156, 155, 154, 153, 152, 151, 150,
-
- 149, 147, 144, 143, 142, 141, 140, 139, 138, 137,
- 136, 135, 134, 133, 132, 131, 130, 129, 128, 127,
- 126, 125, 124, 122, 121, 120, 119, 118, 116, 115,
- 114, 113, 112, 111, 110, 109, 108, 107, 106, 105,
- 103, 99, 98, 97, 96, 95, 94, 93, 91, 90,
- 88, 85, 83, 82, 81, 80, 79, 78, 77, 75,
- 74, 73, 72, 70, 69, 68, 67, 66, 65, 64,
- 63, 62, 61, 60, 59, 58, 56, 55, 53, 51,
- 49, 46, 45, 43, 39, 30, 29, 26, 25, 24,
- 23, 21, 17, 13, 7, 3, 358, 358, 358, 358,
-
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 358
- } ;
-
-/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol79 =
- { 0,
-1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, };
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "sieve-lex.l"
-#line 2 "sieve-lex.l"
-/* sieve.l -- sieve lexer
- * Larry Greenfield
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieve-lex.l,v 1.24 2010/01/06 17:01:59 murch Exp $
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h> /* for strdup */
-#include "xmalloc.h"
-
-#include "tree.h"
-#include "sieve.h"
-
-#define YY_NO_INPUT
-
-static int tonum(char *c);
-static char *chkstr(char *);
-static char *mlbuf;
-static int mlbufsz, mlcur;
-extern int yyerror(char *);
-
-
-#line 751 "<stdout>"
-
-#define INITIAL 0
-#define MULTILINE 1
-#define QSTRING 2
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
- These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined );
-
-FILE *yyget_in (void );
-
-void yyset_in (FILE * in_str );
-
-FILE *yyget_out (void );
-
-void yyset_out (FILE * out_str );
-
-int yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		unsigned n; \
-		for ( n = 0; n < max_size && \
-			 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			bufn = (char) c; \
-		if ( c == '\n' ) \
-			bufn++ = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	if ( yyleng > 0 ) \
-		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-				(yytextyyleng - 1 == '\n'); \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
- 
-#line 77 "sieve-lex.l"
-
-#line 938 "<stdout>"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
-
-		yy_load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-		yy_current_state += YY_AT_BOL();
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ecYY_SC_TO_UI(*yy_cp);
-			if ( yy_acceptyy_current_state )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-				{
-				yy_current_state = (int) yy_defyy_current_state;
-				if ( yy_current_state >= 359 )
-					yy_c = yy_meta(unsigned int) yy_c;
-				}
-			yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-			++yy_cp;
-			}
-		while ( yy_baseyy_current_state != 397 );
-
-yy_find_action:
-		yy_act = yy_acceptyy_current_state;
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			yy_act = yy_acceptyy_current_state;
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eolyy_act )
-			{
-			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytextyyl == '\n' )
-					 
- yylineno++;
-;
-			}
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-/* rule 1 can match eol */
-YY_RULE_SETUP
-#line 78 "sieve-lex.l"
-{ BEGIN INITIAL; 
- if (mlbuf) mlbufmlcur = '\0';
- yylval.sval = chkstr(mlbuf); return STRING; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 81 "sieve-lex.l"
-{ /* dot stuffing! we want one . */ yyless(1); }
-	YY_BREAK
-case 3:
-/* rule 3 can match eol */
-YY_RULE_SETUP
-#line 82 "sieve-lex.l"
-{ if (mlcur == mlbufsz) 
-			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
-		 mlbufmlcur++ = yytext0; }
-	YY_BREAK
-case YY_STATE_EOF(MULTILINE):
-#line 85 "sieve-lex.l"
-{ yyerror("unexpected end of file in string"); 
-		 BEGIN INITIAL;
-		 if (mlbuf) free(mlbuf);
-		 yyterminate(); }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 89 "sieve-lex.l"
-{ BEGIN INITIAL;
- if (mlbuf) mlbufmlcur = '\0';
-		 yylval.sval = chkstr(mlbuf); return STRING; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 92 "sieve-lex.l"
-{ if (mlcur == mlbufsz) 
-			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
-		 mlbufmlcur++ = yytext1; }
-	YY_BREAK
-case 6:
-/* rule 6 can match eol */
-YY_RULE_SETUP
-#line 95 "sieve-lex.l"
-{ if (mlcur == mlbufsz) 
-			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
-		 mlbufmlcur++ = yytext0; }
-	YY_BREAK
-case YY_STATE_EOF(QSTRING):
-#line 98 "sieve-lex.l"
-{ yyerror("unexpected end of file in string");
-		 BEGIN INITIAL;
-		 if (mlbuf) free(mlbuf);
-		 yyterminate(); }
-	YY_BREAK
-case 7:
-/* rule 7 can match eol */
-YY_RULE_SETUP
-#line 102 "sieve-lex.l"
-{ BEGIN MULTILINE;
-			 mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 104 "sieve-lex.l"
-{ BEGIN QSTRING;
- mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 106 "sieve-lex.l"
-{ yylval.nval = tonum(yytext); return NUMBER; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 107 "sieve-lex.l"
-return IF;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 108 "sieve-lex.l"
-return ELSIF;
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 109 "sieve-lex.l"
-return ELSE;
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 110 "sieve-lex.l"
-return ANYOF;
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 111 "sieve-lex.l"
-return ALLOF;
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 112 "sieve-lex.l"
-return EXISTS;
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 113 "sieve-lex.l"
-return SFALSE;
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 114 "sieve-lex.l"
-return STRUE;
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 115 "sieve-lex.l"
-return ADDRESS;
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 116 "sieve-lex.l"
-return ENVELOPE;
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 117 "sieve-lex.l"
-return HEADER;
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 118 "sieve-lex.l"
-return BODY;
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 119 "sieve-lex.l"
-return NOT;
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 120 "sieve-lex.l"
-return SIZE;
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 121 "sieve-lex.l"
-return REJCT;
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 122 "sieve-lex.l"
-return FILEINTO;
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 123 "sieve-lex.l"
-return REDIRECT;
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 124 "sieve-lex.l"
-return KEEP;
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 125 "sieve-lex.l"
-return REQUIRE;
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 126 "sieve-lex.l"
-return STOP;
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 127 "sieve-lex.l"
-return DISCARD;
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 128 "sieve-lex.l"
-return SETFLAG;
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 129 "sieve-lex.l"
-return ADDFLAG;
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 130 "sieve-lex.l"
-return REMOVEFLAG;
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 131 "sieve-lex.l"
-return MARK;
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 132 "sieve-lex.l"
-return UNMARK;
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 133 "sieve-lex.l"
-return NOTIFY;
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 134 "sieve-lex.l"
-return DENOTIFY;
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 135 "sieve-lex.l"
-return ID;
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 136 "sieve-lex.l"
-return METHOD;
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 137 "sieve-lex.l"
-return OPTIONS;
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 138 "sieve-lex.l"
-return LOW;
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 139 "sieve-lex.l"
-return NORMAL;
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 140 "sieve-lex.l"
-return HIGH;
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 141 "sieve-lex.l"
-return MESSAGE;
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 142 "sieve-lex.l"
-return VACATION;
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 143 "sieve-lex.l"
-return DAYS;
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 144 "sieve-lex.l"
-return ADDRESSES;
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 145 "sieve-lex.l"
-return SUBJECT;
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 146 "sieve-lex.l"
-return FROM;
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 147 "sieve-lex.l"
-return HANDLE;
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 148 "sieve-lex.l"
-return MIME;
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 149 "sieve-lex.l"
-return COMPARATOR;
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 150 "sieve-lex.l"
-return IS;
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 151 "sieve-lex.l"
-return CONTAINS;
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 152 "sieve-lex.l"
-return MATCHES;
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 153 "sieve-lex.l"
-return REGEX;
-	YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 154 "sieve-lex.l"
-return COUNT;
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 155 "sieve-lex.l"
-return VALUE;
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 156 "sieve-lex.l"
-return OVER;
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 157 "sieve-lex.l"
-return UNDER;
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 158 "sieve-lex.l"
-return ALL;
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
-#line 159 "sieve-lex.l"
-return LOCALPART;
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 160 "sieve-lex.l"
-return DOMAIN;
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 161 "sieve-lex.l"
-return USER;
-	YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 162 "sieve-lex.l"
-return DETAIL;
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 163 "sieve-lex.l"
-return RAW;
-	YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 164 "sieve-lex.l"
-return TEXT;
-	YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 165 "sieve-lex.l"
-return CONTENT;
-	YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 166 "sieve-lex.l"
-return INCLUDE;
-	YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 167 "sieve-lex.l"
-return PERSONAL;
-	YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 168 "sieve-lex.l"
-return GLOBAL;
-	YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 169 "sieve-lex.l"
-return RETURN;
-	YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 170 "sieve-lex.l"
-return COPY;
-	YY_BREAK
-case 74:
-/* rule 74 can match eol */
-YY_RULE_SETUP
-#line 171 "sieve-lex.l"
-;	/* ignore whitespace */
-	YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 172 "sieve-lex.l"
-;		/* ignore hash comments */
-	YY_BREAK
-case 76:
-/* rule 76 can match eol */
-YY_RULE_SETUP
-#line 173 "sieve-lex.l"
-;	/* ignore bracket comments */
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 174 "sieve-lex.l"
-return yytext0;
-	YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 176 "sieve-lex.l"
-ECHO;
-	YY_BREAK
-#line 1454 "<stdout>"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source. It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex(). If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals. Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state). Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition. We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars);
-
-				yy_current_state = yy_get_previous_state( );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
- 	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_bufyy_c_buf_p_offset;
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_bufnumber_to_move),
-			(yy_n_chars), (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf0;
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
- static yy_state_type yy_get_previous_state (void)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
- 
-	yy_current_state = (yy_start);
-	yy_current_state += YY_AT_BOL();
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ecYY_SC_TO_UI(*yy_cp) : 1);
-		if ( yy_acceptyy_current_state )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-			{
-			yy_current_state = (int) yy_defyy_current_state;
-			if ( yy_current_state >= 359 )
-				yy_c = yy_meta(unsigned int) yy_c;
-			}
-		yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
-{
-	register int yy_is_jam;
- 	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_acceptyy_current_state )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-		{
-		yy_current_state = (int) yy_defyy_current_state;
-		if ( yy_current_state >= 359 )
-			yy_c = yy_meta(unsigned int) yy_c;
-		}
-	yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-	yy_is_jam = (yy_current_state == 358);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
- static int yyinput (void)
-#else
- static int input (void)
-#endif
-
-{
-	int c;
- 
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer( ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding. But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart(yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol )
-		 
- yylineno++;
-;
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
- void yyrestart (FILE * input_file )
-{
- 
-	if ( ! YY_CURRENT_BUFFER ){
- yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
-	}
-
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
- void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
-{
- 
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
- */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void yy_load_buffer_state (void)
-{
- 	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
- YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
-{
-	YY_BUFFER_STATE b;
- 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
- void yy_delete_buffer (YY_BUFFER_STATE b )
-{
- 
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf );
-
-	yyfree((void *) b );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
- 
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
- static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
-
-{
-	int oerrno = errno;
- 
-	yy_flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
- /* If b is the current buffer, then yy_init_buffer was _probably_
- * called from yyrestart() or through yy_get_next_buffer.
- * In that case, we don't want to reset the lineno or column.
- */
- if (b != YY_CURRENT_BUFFER){
- b->yy_bs_lineno = 1;
- b->yy_bs_column = 0;
- }
-
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
- 
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
- void yy_flush_buffer (YY_BUFFER_STATE b )
-{
- 	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters. The first causes
-	 * a transition to the end-of-buffer state. The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf0 = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf1 = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf0;
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- * the current state. This function will allocate the stack
- * if necessary.
- * @param new_buffer The new state.
- * 
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
- 	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- * The next element becomes the new top.
- * 
- */
-void yypop_buffer_state (void)
-{
- 	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- * Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	int num_to_alloc;
- 
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
- */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								 
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
-{
-	YY_BUFFER_STATE b;
- 
-	if ( size < 2 ||
-	 basesize-2 != YY_END_OF_BUFFER_CHAR ||
-	 basesize-1 != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer(b );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- * yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
- 
-	return yy_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
- 
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		bufi = yybytesi;
-
-	buf_yybytes_len = buf_yybytes_len+1 = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
- 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
-		yytextyyleng = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int yyget_lineno (void)
-{
- 
- return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in (void)
-{
- return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out (void)
-{
- return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-int yyget_leng (void)
-{
- return yyleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *yyget_text (void)
-{
- return yytext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int line_number )
-{
- 
- yylineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE * in_str )
-{
- yyin = in_str ;
-}
-
-void yyset_out (FILE * out_str )
-{
- yyout = out_str ;
-}
-
-int yyget_debug (void)
-{
- return yy_flex_debug;
-}
-
-void yyset_debug (int bdebug )
-{
- yy_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
- /* Initialization is the same as for the non-reentrant scanner.
- * This function is called from yylex_destroy(), so don't allocate here.
- */
-
- /* We do not touch yylineno unless the option is enabled. */
- yylineno = 1;
- 
- (yy_buffer_stack) = 0;
- (yy_buffer_stack_top) = 0;
- (yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
- (yy_init) = 0;
- (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
- yyin = stdin;
- yyout = stdout;
-#else
- yyin = (FILE *) 0;
- yyout = (FILE *) 0;
-#endif
-
- /* For future reference: Set errno on error, since we are called by
- * yylex_init()
- */
- return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy (void)
-{
- 
- /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
- /* Reset the globals. This is important in a non-reentrant scanner so the next time
- * yylex() is called, initialization will occur. */
- yy_init_globals( );
-
- return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1i = s2i;
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; sn; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t size )
-{
-	return (void *) malloc( size );
-}
-
-void *yyrealloc (void * ptr, yy_size_t size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers. It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 176 "sieve-lex.l"
-
-
-/* */
-static int tonum(char *c)
-{
- int val = atoi(c);
- switch (cstrlen(c)-1) {
- case 'K': case 'k': val *= (1 << 10); break;
- case 'M': case 'm': val *= (1 << 20); break;
- case 'G': case 'g': val *= (1 << 30); break;
- default: break;
- }
- return val;
-}
-
-/* convert NULL strings to "" */
-static char *chkstr(char *str)
-{
- if (!str) return xstrdup("");
- else return str;
-}
-

cyrus-imapd-2.4.17.tar.gz/sieve/sieve.c Deleted

@@ -1,3785 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.5. */
-
-/* Bison implementation for Yacc-like parsers in C
- 
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- 
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
- simplifying the original so-called "semantic" parser. */
-
-/* All symbols defined below should begin with yy or YY, to avoid
- infringing on user name space. This should be done even for local
- variables, as they might otherwise be expanded by user macros.
- There are some unavoidable exceptions within include files to
- define necessary library symbols; they are noted "INFRINGES ON
- USER NAME SPACE" below. */
-
-/* Identify Bison output. */
-#define YYBISON 1
-
-/* Bison version. */
-#define YYBISON_VERSION "2.5"
-
-/* Skeleton name. */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers. */
-#define YYPURE 0
-
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
-/* Using locations. */
-#define YYLSP_NEEDED 0
-
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
-#line 1 "sieve.y"
-
-/* sieve.y -- sieve parser
- * Larry Greenfield
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieve.y,v 1.45.2.1 2010/02/12 03:41:11 brong Exp $
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include "xmalloc.h"
-#include "comparator.h"
-#include "interp.h"
-#include "script.h"
-#include "tree.h"
-
-#include "../lib/imapurl.h"
-#include "../lib/util.h"
-#include "../lib/imparse.h"
-#include "../lib/libconfig.h"
-
-#define ERR_BUF_SIZE 1024
-
-char errbufERR_BUF_SIZE;
-
- /* definitions */
- extern int addrparse(void);
-
-struct vtags {
- int days;
- stringlist_t *addresses;
- char *subject;
- char *from;
- char *handle;
- int mime;
-};
-
-struct htags {
- char *comparator;
- int comptag;
- int relation;
-};
-
-struct aetags {
- int addrtag;
- char *comparator;
- int comptag;
- int relation;
-};
-
-struct btags {
- int transform;
- int offset;
- stringlist_t *content_types;
- char *comparator;
- int comptag;
- int relation;
-};
-
-struct ntags {
- char *method;
- char *id;
- stringlist_t *options;
- int priority;
- char *message;
-};
-
-struct dtags {
- int comptag;
- int relation;
- void *pattern;
- int priority;
-};
-
-static commandlist_t *ret;
-static sieve_script_t *parse_script;
-static char *check_reqs(stringlist_t *sl);
-static test_t *build_address(int t, struct aetags *ae,
-			 stringlist_t *sl, stringlist_t *pl);
-static test_t *build_header(int t, struct htags *h,
-			 stringlist_t *sl, stringlist_t *pl);
-static test_t *build_body(int t, struct btags *b, stringlist_t *pl);
-static commandlist_t *build_vacation(int t, struct vtags *h, char *s);
-static commandlist_t *build_notify(int t, struct ntags *n);
-static commandlist_t *build_denotify(int t, struct dtags *n);
-static commandlist_t *build_fileinto(int t, int c, char *f);
-static commandlist_t *build_redirect(int t, int c, char *a);
-static struct aetags *new_aetags(void);
-static struct aetags *canon_aetags(struct aetags *ae);
-static void free_aetags(struct aetags *ae);
-static struct htags *new_htags(void);
-static struct htags *canon_htags(struct htags *h);
-static void free_htags(struct htags *h);
-static struct btags *new_btags(void);
-static struct btags *canon_btags(struct btags *b);
-static void free_btags(struct btags *b);
-static struct vtags *new_vtags(void);
-static struct vtags *canon_vtags(struct vtags *v);
-static void free_vtags(struct vtags *v);
-static struct ntags *new_ntags(void);
-static struct ntags *canon_ntags(struct ntags *n);
-static void free_ntags(struct ntags *n);
-static struct dtags *new_dtags(void);
-static struct dtags *canon_dtags(struct dtags *d);
-static void free_dtags(struct dtags *d);
-
-static int verify_stringlist(stringlist_t *sl, int (*verify)(char *));
-static int verify_mailbox(char *s);
-static int verify_address(char *s);
-static int verify_header(char *s);
-static int verify_addrheader(char *s);
-static int verify_envelope(char *s);
-static int verify_flag(char *s);
-static int verify_relat(char *s);
-#ifdef ENABLE_REGEX
-static int verify_regex(char *s, int cflags);
-static int verify_regexs(stringlist_t *sl, char *comp);
-#endif
-static int verify_utf8(char *s);
-
-int yyerror(const char *msg);
-extern int yylex(void);
-extern void yyrestart(FILE *f);
-
-#define YYERROR_VERBOSE /* i want better error messages! */
-
-/* byacc default is 500, bison default is 10000 - go with the
- larger to support big sieve scripts (see Bug #3461) */
-#define YYSTACKSIZE 10000
-
-
-/* Line 268 of yacc.c */
-#line 247 "y.tab.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- NUMBER = 258,
- STRING = 259,
- IF = 260,
- ELSIF = 261,
- ELSE = 262,
- REJCT = 263,
- FILEINTO = 264,
- REDIRECT = 265,
- KEEP = 266,
- STOP = 267,
- DISCARD = 268,
- VACATION = 269,
- REQUIRE = 270,
- SETFLAG = 271,
- ADDFLAG = 272,
- REMOVEFLAG = 273,
- MARK = 274,
- UNMARK = 275,
- NOTIFY = 276,
- DENOTIFY = 277,
- ANYOF = 278,
- ALLOF = 279,
- EXISTS = 280,
- SFALSE = 281,
- STRUE = 282,
- HEADER = 283,
- NOT = 284,
- SIZE = 285,
- ADDRESS = 286,
- ENVELOPE = 287,
- BODY = 288,
- COMPARATOR = 289,
- IS = 290,
- CONTAINS = 291,
- MATCHES = 292,
- REGEX = 293,
- COUNT = 294,
- VALUE = 295,
- OVER = 296,
- UNDER = 297,
- GT = 298,
- GE = 299,
- LT = 300,
- LE = 301,
- EQ = 302,
- NE = 303,
- ALL = 304,
- LOCALPART = 305,
- DOMAIN = 306,
- USER = 307,
- DETAIL = 308,
- RAW = 309,
- TEXT = 310,
- CONTENT = 311,
- DAYS = 312,
- ADDRESSES = 313,
- SUBJECT = 314,
- FROM = 315,
- HANDLE = 316,
- MIME = 317,
- METHOD = 318,
- ID = 319,
- OPTIONS = 320,
- LOW = 321,
- NORMAL = 322,
- HIGH = 323,
- ANY = 324,
- MESSAGE = 325,
- INCLUDE = 326,
- PERSONAL = 327,
- GLOBAL = 328,
- RETURN = 329,
- COPY = 330
- };
-#endif
-/* Tokens. */
-#define NUMBER 258
-#define STRING 259
-#define IF 260
-#define ELSIF 261
-#define ELSE 262
-#define REJCT 263
-#define FILEINTO 264
-#define REDIRECT 265
-#define KEEP 266
-#define STOP 267
-#define DISCARD 268
-#define VACATION 269
-#define REQUIRE 270
-#define SETFLAG 271
-#define ADDFLAG 272
-#define REMOVEFLAG 273
-#define MARK 274
-#define UNMARK 275
-#define NOTIFY 276
-#define DENOTIFY 277
-#define ANYOF 278
-#define ALLOF 279
-#define EXISTS 280
-#define SFALSE 281
-#define STRUE 282
-#define HEADER 283
-#define NOT 284
-#define SIZE 285
-#define ADDRESS 286
-#define ENVELOPE 287
-#define BODY 288
-#define COMPARATOR 289
-#define IS 290
-#define CONTAINS 291
-#define MATCHES 292
-#define REGEX 293
-#define COUNT 294
-#define VALUE 295
-#define OVER 296
-#define UNDER 297
-#define GT 298
-#define GE 299
-#define LT 300
-#define LE 301
-#define EQ 302
-#define NE 303
-#define ALL 304
-#define LOCALPART 305
-#define DOMAIN 306
-#define USER 307
-#define DETAIL 308
-#define RAW 309
-#define TEXT 310
-#define CONTENT 311
-#define DAYS 312
-#define ADDRESSES 313
-#define SUBJECT 314
-#define FROM 315
-#define HANDLE 316
-#define MIME 317
-#define METHOD 318
-#define ID 319
-#define OPTIONS 320
-#define LOW 321
-#define NORMAL 322
-#define HIGH 323
-#define ANY 324
-#define MESSAGE 325
-#define INCLUDE 326
-#define PERSONAL 327
-#define GLOBAL 328
-#define RETURN 329
-#define COPY 330
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 293 of yacc.c */
-#line 176 "sieve.y"
-
- int nval;
- char *sval;
- stringlist_t *sl;
- test_t *test;
- testlist_t *testl;
- commandlist_t *cl;
- struct vtags *vtag;
- struct aetags *aetag;
- struct htags *htag;
- struct btags *btag;
- struct ntags *ntag;
- struct dtags *dtag;
-
-
-
-/* Line 293 of yacc.c */
-#line 450 "y.tab.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-/* Copy the second part of user declarations. */
-
-
-/* Line 343 of yacc.c */
-#line 462 "y.tab.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-# define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# else
-# define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-# if ENABLE_NLS
-# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
-# endif
-# endif
-# ifndef YY_
-# define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E. */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
- int yyi;
-#endif
-{
- return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols. */
-
-# ifdef YYSTACK_USE_ALLOCA
-# if YYSTACK_USE_ALLOCA
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# elif defined __BUILTIN_VA_ARG_INCR
-# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-# elif defined _AIX
-# define YYSTACK_ALLOC __alloca
-# elif defined _MSC_VER
-# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-# define alloca _alloca
-# else
-# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-# endif
-# endif
-# endif
-# endif
-# endif
-
-# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-# ifndef YYSTACK_ALLOC_MAXIMUM
- /* The OS might guarantee only one guard page at the bottom of the stack,
- and a page size can be as small as 4096 bytes. So we cannot safely
- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
- to allow for a few compiler-allocated temporary stack slots. */
-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-# endif
-# else
-# define YYSTACK_ALLOC YYMALLOC
-# define YYSTACK_FREE YYFREE
-# ifndef YYSTACK_ALLOC_MAXIMUM
-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-# endif
-# if (defined __cplusplus && ! defined EXIT_SUCCESS \
- && ! ((defined YYMALLOC || defined malloc) \
-	 && (defined YYFREE || defined free)))
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-# endif
-# endif
-# ifndef YYMALLOC
-# define YYMALLOC malloc
-# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# ifndef YYFREE
-# define YYFREE free
-# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
- && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member. */
-union yyalloc
-{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next. */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
- N elements. */
-# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
- elements in the stack, and YYPTR gives the new location of the
- stack. Advance YYPTR to a properly aligned location for the next
- stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
- do									\
- {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
- }									\
- while (YYID (0))
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count)		\
- do					\
-	{					\
-	 YYSIZE_T yyi;				\
-	 for (yyi = 0; yyi < (Count); yyi++)	\
-	 (To)yyi = (From)yyi;		\
-	}					\
- while (YYID (0))
-# endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 8
-/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 248
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 84
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 28
-/* YYNRULES -- Number of rules. */
-#define YYNRULES 106
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 164
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 330
-
-#define YYTRANSLATE(YYX)						\
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
-
-/* YYTRANSLATEYYLEX -- Bison symbol number corresponding to YYLEX. */
-static const yytype_uint8 yytranslate =
-{
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 82, 83, 2, 2, 79, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 76,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 77, 2, 78, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 80, 2, 81, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75
-};
-
-#if YYDEBUG
-/* YYPRHSYYN -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint16 yyprhs =
-{
- 0, 0, 3, 5, 8, 9, 12, 16, 18, 21,
- 24, 29, 32, 33, 38, 41, 44, 48, 52, 54,
- 56, 58, 62, 65, 68, 71, 73, 75, 78, 81,
- 85, 87, 88, 90, 92, 93, 97, 101, 105, 108,
- 112, 113, 116, 120, 124, 126, 128, 130, 131, 135,
- 139, 143, 147, 151, 154, 158, 160, 162, 166, 170,
- 173, 176, 179, 182, 184, 186, 191, 196, 200, 203,
- 207, 209, 211, 213, 214, 217, 220, 224, 228, 229,
- 232, 236, 240, 241, 244, 247, 251, 254, 258, 262,
- 264, 266, 268, 270, 272, 274, 276, 278, 280, 282,
- 284, 286, 288, 289, 291, 295, 297
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs =
-{
- 85, 0, -1, 86, -1, 86, 88, -1, -1, 87,
- 86, -1, 15, 97, 76, -1, 89, -1, 89, 88,
- -1, 91, 76, -1, 5, 100, 99, 90, -1, 1,
- 76, -1, -1, 6, 100, 99, 90, -1, 7, 99,
- -1, 8, 4, -1, 9, 109, 4, -1, 10, 109,
- 4, -1, 11, -1, 12, -1, 13, -1, 14, 96,
- 4, -1, 16, 97, -1, 17, 97, -1, 18, 97,
- -1, 19, -1, 20, -1, 21, 93, -1, 22, 94,
- -1, 71, 92, 4, -1, 74, -1, -1, 72, -1,
- 73, -1, -1, 93, 64, 4, -1, 93, 63, 4,
- -1, 93, 65, 97, -1, 93, 95, -1, 93, 70,
- 4, -1, -1, 94, 95, -1, 94, 106, 4, -1,
- 94, 107, 4, -1, 66, -1, 67, -1, 68, -1,
- -1, 96, 57, 3, -1, 96, 58, 97, -1, 96,
- 59, 4, -1, 96, 60, 4, -1, 96, 61, 4,
- -1, 96, 62, -1, 77, 98, 78, -1, 4, -1,
- 4, -1, 98, 79, 4, -1, 80, 88, 81, -1,
- 80, 81, -1, 23, 110, -1, 24, 110, -1, 25,
- 97, -1, 26, -1, 27, -1, 28, 103, 97, 97,
- -1, 101, 102, 97, 97, -1, 33, 104, 97, -1,
- 29, 100, -1, 30, 108, 3, -1, 1, -1, 31,
- -1, 32, -1, -1, 102, 105, -1, 102, 106, -1,
- 102, 107, 4, -1, 102, 34, 4, -1, -1, 103,
- 106, -1, 103, 107, 4, -1, 103, 34, 4, -1,
- -1, 104, 54, -1, 104, 55, -1, 104, 56, 97,
- -1, 104, 106, -1, 104, 107, 4, -1, 104, 34,
- 4, -1, 49, -1, 50, -1, 51, -1, 52, -1,
- 53, -1, 35, -1, 36, -1, 37, -1, 38, -1,
- 39, -1, 40, -1, 41, -1, 42, -1, -1, 75,
- -1, 82, 111, 83, -1, 100, -1, 100, 79, 111,
- -1
-};
-
-/* YYRLINEYYN -- source line where rule number YYN was defined. */
-static const yytype_uint16 yyrline =
-{
- 0, 222, 222, 223, 226, 227, 230, 238, 239, 242,
- 243, 244, 247, 248, 249, 252, 261, 269, 273, 274,
- 275, 276, 285, 294, 303, 312, 317, 323, 331, 341,
- 354, 361, 362, 363, 366, 367, 370, 373, 376, 379,
- 384, 385, 388, 403, 413, 414, 415, 418, 419, 422,
- 430, 436, 442, 448, 454, 455, 458, 459, 462, 463,
- 466, 467, 468, 469, 470, 471, 495, 517, 543, 544,
- 546, 549, 550, 557, 558, 563, 567, 575, 585, 586,
- 590, 598, 608, 609, 614, 619, 627, 631, 639, 650,
- 651, 652, 653, 658, 664, 665, 666, 667, 674, 679,
- 687, 688, 691, 692, 699, 702, 703
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname =
-{
- "$end", "error", "$undefined", "NUMBER", "STRING", "IF", "ELSIF",
- "ELSE", "REJCT", "FILEINTO", "REDIRECT", "KEEP", "STOP", "DISCARD",
- "VACATION", "REQUIRE", "SETFLAG", "ADDFLAG", "REMOVEFLAG", "MARK",
- "UNMARK", "NOTIFY", "DENOTIFY", "ANYOF", "ALLOF", "EXISTS", "SFALSE",
- "STRUE", "HEADER", "NOT", "SIZE", "ADDRESS", "ENVELOPE", "BODY",
- "COMPARATOR", "IS", "CONTAINS", "MATCHES", "REGEX", "COUNT", "VALUE",
- "OVER", "UNDER", "GT", "GE", "LT", "LE", "EQ", "NE", "ALL", "LOCALPART",
- "DOMAIN", "USER", "DETAIL", "RAW", "TEXT", "CONTENT", "DAYS",
- "ADDRESSES", "SUBJECT", "FROM", "HANDLE", "MIME", "METHOD", "ID",
- "OPTIONS", "LOW", "NORMAL", "HIGH", "ANY", "MESSAGE", "INCLUDE",
- "PERSONAL", "GLOBAL", "RETURN", "COPY", "';'", "''", "''", "','",
- "'{'", "'}'", "'('", "')'", "$accept", "start", "reqs", "require",
- "commands", "command", "elsif", "action", "location", "ntags", "dtags",
- "priority", "vtags", "stringlist", "strings", "block", "test",
- "addrorenv", "aetags", "htags", "btags", "addrparttag", "comptag",
- "relcomp", "sizetag", "copy", "testlist", "tests", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUMYYLEX-NUM -- Internal token number corresponding to
- token YYLEX-NUM. */
-static const yytype_uint16 yytoknum =
-{
- 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
- 325, 326, 327, 328, 329, 330, 59, 91, 93, 44,
- 123, 125, 40, 41
-};
-# endif
-
-/* YYR1YYN -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1 =
-{
- 0, 84, 85, 85, 86, 86, 87, 88, 88, 89,
- 89, 89, 90, 90, 90, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 92, 92, 92, 93, 93, 93, 93, 93, 93,
- 94, 94, 94, 94, 95, 95, 95, 96, 96, 96,
- 96, 96, 96, 96, 97, 97, 98, 98, 99, 99,
- 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 101, 101, 102, 102, 102, 102, 102, 103, 103,
- 103, 103, 104, 104, 104, 104, 104, 104, 104, 105,
- 105, 105, 105, 105, 106, 106, 106, 106, 107, 107,
- 108, 108, 109, 109, 110, 111, 111
-};
-
-/* YYR2YYN -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2 =
-{
- 0, 2, 1, 2, 0, 2, 3, 1, 2, 2,
- 4, 2, 0, 4, 2, 2, 3, 3, 1, 1,
- 1, 3, 2, 2, 2, 1, 1, 2, 2, 3,
- 1, 0, 1, 1, 0, 3, 3, 3, 2, 3,
- 0, 2, 3, 3, 1, 1, 1, 0, 3, 3,
- 3, 3, 3, 2, 3, 1, 1, 3, 3, 2,
- 2, 2, 2, 1, 1, 4, 4, 3, 2, 3,
- 1, 1, 1, 0, 2, 2, 3, 3, 0, 2,
- 3, 3, 0, 2, 2, 3, 2, 3, 3, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 1, 3, 1, 3
-};
-
-/* YYDEFACTSTATE-NAME -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const yytype_uint8 yydefact =
-{
- 4, 0, 0, 0, 4, 55, 0, 0, 1, 0,
- 0, 0, 102, 102, 18, 19, 20, 47, 0, 0,
- 0, 25, 26, 34, 40, 31, 30, 3, 0, 0,
- 5, 56, 0, 6, 11, 70, 0, 0, 0, 63,
- 64, 78, 0, 0, 71, 72, 82, 0, 73, 15,
- 103, 0, 0, 0, 22, 23, 24, 27, 28, 32,
- 33, 0, 8, 9, 54, 0, 0, 60, 61, 62,
- 0, 68, 100, 101, 0, 0, 0, 12, 0, 16,
- 17, 21, 0, 0, 0, 0, 0, 53, 0, 0,
- 0, 44, 45, 46, 0, 38, 94, 95, 96, 97,
- 98, 99, 41, 0, 0, 29, 57, 105, 0, 0,
- 0, 79, 0, 69, 0, 83, 84, 0, 67, 86,
- 0, 59, 0, 0, 0, 10, 0, 89, 90, 91,
- 92, 93, 0, 74, 75, 0, 48, 49, 50, 51,
- 52, 36, 35, 37, 39, 42, 43, 0, 104, 81,
- 65, 80, 88, 85, 87, 58, 0, 14, 77, 66,
- 76, 106, 12, 13
-};
-
-/* YYDEFGOTONTERM-NUM. */
-static const yytype_int16 yydefgoto =
-{
- -1, 2, 3, 4, 27, 28, 125, 29, 61, 57,
- 58, 95, 53, 7, 32, 77, 107, 48, 78, 70,
- 75, 133, 103, 104, 74, 51, 67, 108
-};
-
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -113
-static const yytype_int16 yypact =
-{
- -4, 0, 54, 112, -4, -113, 25, -20, -113, -12,
- 215, 55, 6, 6, -113, -113, -113, -113, 0, 0,
- 0, -113, -113, -113, -113, -64, -113, -113, 5, 2,
- -113, -113, -47, -113, -113, -113, -2, -2, 0, -113,
- -113, -113, 215, 21, -113, -113, -113, 4, -113, -113,
- -113, 78, 79, 85, -113, -113, -113, 3, 135, -113,
- -113, 81, -113, -113, -113, 83, 215, -113, -113, -113,
- 160, -113, -113, -113, 87, 153, 29, 68, 101, -113,
- -113, -113, 88, 0, 84, 89, 90, -113, 91, 92,
- 0, -113, -113, -113, 93, -113, -113, -113, -113, -113,
- -113, -113, -113, 94, 97, -113, -113, 23, 24, 100,
- 0, -113, 102, -113, 104, -113, -113, 0, -113, -113,
- 105, -113, 30, 215, 4, -113, 111, -113, -113, -113,
- -113, -113, 0, -113, -113, 114, -113, -113, -113, -113,
- -113, -113, -113, -113, -113, -113, -113, 215, -113, -113,
- -113, -113, -113, -113, -113, -113, 4, -113, -113, -113,
- -113, -113, 68, -113
-};
-
-/* YYPGOTONTERM-NUM. */
-static const yytype_int16 yypgoto =
-{
- -113, -113, 115, -113, -21, -113, -35, -113, -113, -113,
- -113, 98, -113, -18, -113, -112, -7, -113, -113, -113,
- -113, -113, -42, -17, -113, 136, 118, 1
-};
-
-/* YYTABLEYYPACTSTATE-NUM. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -8
-static const yytype_int16 yytable =
-{
- 54, 55, 56, 47, 5, -7, 9, 62, 59, 60,
- 10, 1, 157, 11, 12, 13, 14, 15, 16, 17,
- 69, 18, 19, 20, 21, 22, 23, 24, 111, 31,
- 9, 64, 65, 119, 10, 71, 134, 11, 12, 13,
- 14, 15, 16, 17, 162, 18, 19, 20, 21, 22,
- 23, 24, 110, 112, 8, 122, 33, 118, 120, 49,
- 132, 135, 72, 73, 34, 137, 88, 89, 90, 91,
- 92, 93, 143, 94, 123, 124, 25, 6, 63, 26,
- 66, 50, 79, 80, 76, 105, -7, 106, 138, 81,
- 113, 136, 150, 139, 140, 141, 142, 144, 145, 153,
- 25, 146, 147, 26, 149, 5, 151, 148, 152, 154,
- 121, 155, -2, 9, 159, 158, 156, 10, 160, 30,
- 11, 12, 13, 14, 15, 16, 17, 163, 18, 19,
- 20, 21, 22, 23, 24, 126, 96, 97, 98, 99,
- 100, 101, 82, 83, 84, 85, 86, 87, 161, 52,
- 127, 128, 129, 130, 131, 68, 102, 5, 0, 0,
- 0, 0, 0, 0, 5, 0, 0, 0, 0, 0,
- 96, 97, 98, 99, 100, 101, 0, 0, 6, 0,
- 0, 0, 0, 25, 0, 0, 26, 114, 96, 97,
- 98, 99, 100, 101, 109, 96, 97, 98, 99, 100,
- 101, 91, 92, 93, 0, 0, 0, 115, 116, 117,
- 0, 0, 0, 0, 0, 0, 35, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 6, 0, 0, 0, 0, 0, 0, 6, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46
-};
-
-#define yypact_value_is_default(yystate) \
- ((yystate) == (-113))
-
-#define yytable_value_is_error(yytable_value) \
- YYID (0)
-
-static const yytype_int16 yycheck =
-{
- 18, 19, 20, 10, 4, 0, 1, 28, 72, 73,
- 5, 15, 124, 8, 9, 10, 11, 12, 13, 14,
- 38, 16, 17, 18, 19, 20, 21, 22, 70, 4,
- 1, 78, 79, 75, 5, 42, 78, 8, 9, 10,
- 11, 12, 13, 14, 156, 16, 17, 18, 19, 20,
- 21, 22, 70, 70, 0, 76, 76, 75, 75, 4,
- 78, 78, 41, 42, 76, 83, 63, 64, 65, 66,
- 67, 68, 90, 70, 6, 7, 71, 77, 76, 74,
- 82, 75, 4, 4, 80, 4, 81, 4, 4, 4,
- 3, 3, 110, 4, 4, 4, 4, 4, 4, 117,
- 71, 4, 79, 74, 4, 4, 4, 83, 4, 4,
- 81, 81, 0, 1, 132, 4, 123, 5, 4, 4,
- 8, 9, 10, 11, 12, 13, 14, 162, 16, 17,
- 18, 19, 20, 21, 22, 34, 35, 36, 37, 38,
- 39, 40, 57, 58, 59, 60, 61, 62, 147, 13,
- 49, 50, 51, 52, 53, 37, 58, 4, -1, -1,
- -1, -1, -1, -1, 4, -1, -1, -1, -1, -1,
- 35, 36, 37, 38, 39, 40, -1, -1, 77, -1,
- -1, -1, -1, 71, -1, -1, 74, 34, 35, 36,
- 37, 38, 39, 40, 34, 35, 36, 37, 38, 39,
- 40, 66, 67, 68, -1, -1, -1, 54, 55, 56,
- -1, -1, -1, -1, -1, -1, 1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 77, -1, -1, -1, -1, -1, -1, 77, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33
-};
-
-/* YYSTOSSTATE-NUM -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const yytype_uint8 yystos =
-{
- 0, 15, 85, 86, 87, 4, 77, 97, 0, 1,
- 5, 8, 9, 10, 11, 12, 13, 14, 16, 17,
- 18, 19, 20, 21, 22, 71, 74, 88, 89, 91,
- 86, 4, 98, 76, 76, 1, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 100, 101, 4,
- 75, 109, 109, 96, 97, 97, 97, 93, 94, 72,
- 73, 92, 88, 76, 78, 79, 82, 110, 110, 97,
- 103, 100, 41, 42, 108, 104, 80, 99, 102, 4,
- 4, 4, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 70, 95, 35, 36, 37, 38,
- 39, 40, 95, 106, 107, 4, 4, 100, 111, 34,
- 97, 106, 107, 3, 34, 54, 55, 56, 97, 106,
- 107, 81, 88, 6, 7, 90, 34, 49, 50, 51,
- 52, 53, 97, 105, 106, 107, 3, 97, 4, 4,
- 4, 4, 4, 97, 4, 4, 4, 79, 83, 4,
- 97, 4, 4, 97, 4, 81, 100, 99, 4, 97,
- 4, 111, 99, 90
-};
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
-
-#define YYFAIL		goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
- if (yychar == YYEMPTY && yylen == 1)				\
- {								\
- yychar = (Token);						\
- yylval = (Value);						\
- YYPOPSTACK (1);						\
- goto yybackup;						\
- }								\
- else								\
- {								\
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR;							\
- }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS1 to RHSN.
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS0 (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)K)
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
- do									\
- if (YYID (N)) \
-	{								\
-	 (Current).first_line = YYRHSLOC (Rhs, 1).first_line;	\
-	 (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	 (Current).last_line = YYRHSLOC (Rhs, N).last_line;		\
-	 (Current).last_column = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
- else								\
-	{								\
-	 (Current).first_line = (Current).last_line =		\
-	 YYRHSLOC (Rhs, 0).last_line;				\
-	 (Current).first_column = (Current).last_column =		\
-	 YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
- while (YYID (0))
-#endif
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments. */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
-
-/* Enable debugging if requested. */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
- if (yydebug)					\
- YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			 \
-do {									 \
- if (yydebug)								 \
- {									 \
- YYFPRINTF (stderr, "%s ", Title);					 \
- yy_symbol_print (stderr,						 \
-		 Type, Value); \
- YYFPRINTF (stderr, "\n");						 \
- }									 \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (!yyvaluep)
- return;
-# ifdef YYPRINT
- if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
-# else
- YYUSE (yyoutput);
-# endif
- switch (yytype)
- {
- default:
-	break;
- }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytnameyytype);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytnameyytype);
-
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
- YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included). |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
-#endif
-{
- YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
- YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
- if (yydebug)							\
- yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced. |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
-{
- int yynrhs = yyr2yyrule;
- int yyi;
- unsigned long int yylno = yyrlineyyrule;
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	 yyrule - 1, yylno);
- /* The symbols being reduced. */
- for (yyi = 0; yyi < yynrhs; yyi++)
- {
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhsyyprhsyyrule + yyi,
-		 &(yyvsp(yyi + 1) - (yynrhs))
-		 		 );
- YYFPRINTF (stderr, "\n");
- }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
- if (yydebug)				\
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-
-/* Nonzero means print parse trace. It is left uninitialized so that
- multiple parsers can coexist. */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
- if the built-in stack extension method is used).
-
- Do not make this value too large; the results are undefined if
- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
- evaluated with infinite-precision integer arithmetic. */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-# if defined __GLIBC__ && defined _STRING_H
-# define yystrlen strlen
-# else
-/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
-{
- YYSIZE_T yylen;
- for (yylen = 0; yystryylen; yylen++)
- continue;
- return yylen;
-}
-# endif
-# endif
-
-# ifndef yystpcpy
-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-# define yystpcpy stpcpy
-# else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
- YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
-{
- char *yyd = yydest;
- const char *yys = yysrc;
-
- while ((*yyd++ = *yys++) != '\0')
- continue;
-
- return yyd - 1;
-}
-# endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
- quotes and backslashes, so that it's suitable for yyerror. The
- heuristic is that double-quoting is unnecessary unless the string
- contains an apostrophe, a comma, or backslash (other than
- backslash-backslash). YYSTR is taken from yytname. If YYRES is
- null, do not copy; instead, return the length of what the result
- would have been. */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
- if (*yystr == '"')
- {
- YYSIZE_T yyn = 0;
- char const *yyp = yystr;
-
- for (;;)
-	switch (*++yyp)
-	 {
-	 case '\'':
-	 case ',':
-	 goto do_not_strip_quotes;
-
-	 case '\\':
-	 if (*++yyp != '\\')
-	 goto do_not_strip_quotes;
-	 /* Fall through. */
-	 default:
-	 if (yyres)
-	 yyresyyn = *yyp;
-	 yyn++;
-	 break;
-
-	 case '"':
-	 if (yyres)
-	 yyresyyn = '\0';
-	 return yyn;
-	 }
- do_not_strip_quotes: ;
- }
-
- if (! yyres)
- return yystrlen (yystr);
-
- return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
- about the unexpected token YYTOKEN for the state stack whose top is
- YYSSP.
-
- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
- not large enough to hold the message. In that case, also set
- *YYMSG_ALLOC to the required number of bytes. Return 2 if the
- required number of bytes is too large to store. */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
- yytype_int16 *yyssp, int yytoken)
-{
- YYSIZE_T yysize0 = yytnamerr (0, yytnameyytoken);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- /* Internationalized format string. */
- const char *yyformat = 0;
- /* Arguments of yyformat. */
- char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
- /* Number of reported tokens (one for the "unexpected", one per
- "expected"). */
- int yycount = 0;
-
- /* There are many possibilities here to consider:
- - Assume YYFAIL is not used. It's too flawed to consider. See
- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
- for details. YYERROR is fine as it does not invoke this
- function.
- - If this state is a consistent state with a default action, then
- the only way this function was invoked is if the default action
- is an error action. In that case, don't check for expected
- tokens because there are none.
- - The only way there can be no lookahead present (in yychar) is if
- this state is a consistent state with a default action. Thus,
- detecting the absence of a lookahead is sufficient to determine
- that there is no unexpected or expected token to report. In that
- case, just report a simple "syntax error".
- - Don't assume there isn't a lookahead just because this state is a
- consistent state with a default action. There might have been a
- previous inconsistent state, consistent state with a non-default
- action, or user semantic action that manipulated yychar.
- - Of course, the expected token list depends on states to have
- correct lookahead information, and it depends on the parser not
- to perform extra reductions after fetching a lookahead from the
- scanner and before detecting a syntax error. Thus, state merging
- (from LALR or IELR) and default reductions corrupt the expected
- token list. However, the list is correct for canonical LR with
- one exception: it will still contain any token that will not be
- accepted due to an error action in a later state.
- */
- if (yytoken != YYEMPTY)
- {
- int yyn = yypact*yyssp;
- yyargyycount++ = yytnameyytoken;
- if (!yypact_value_is_default (yyn))
- {
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. In other words, skip the first -YYN actions for
- this state because they are default actions. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yyx;
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheckyyx + yyn == yyx && yyx != YYTERROR
- && !yytable_value_is_error (yytableyyx + yyn))
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- break;
- }
- yyargyycount++ = yytnameyyx;
- yysize1 = yysize + yytnamerr (0, yytnameyyx);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
- }
- }
- }
-
- switch (yycount)
- {
-# define YYCASE_(N, S) \
- case N: \
- yyformat = S; \
- break
- YYCASE_(0, YY_("syntax error"));
- YYCASE_(1, YY_("syntax error, unexpected %s"));
- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
- }
-
- yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
-
- if (*yymsg_alloc < yysize)
- {
- *yymsg_alloc = 2 * yysize;
- if (! (yysize <= *yymsg_alloc
- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
- return 1;
- }
-
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- {
- char *yyp = *yymsg;
- int yyi = 0;
- while ((*yyp = *yyformat) != '\0')
- if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyargyyi++);
- yyformat += 2;
- }
- else
- {
- yyp++;
- yyformat++;
- }
- }
- return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol. |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
-{
- YYUSE (yyvaluep);
-
- if (!yymsg)
- yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
- switch (yytype)
- {
-
- default:
-	break;
- }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-/* The lookahead symbol. */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far. */
-int yynerrs;
-
-
-/*----------.
-| yyparse. |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssaYYINITDEPTH;
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsaYYINITDEPTH;
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
-
- int yyn;
- int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf128;
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
- /* The number of symbols on the RHS of the reduced rule.
- Keep to zero when no symbol should be popped. */
- int yylen = 0;
-
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
- YYDPRINTF ((stderr, "Starting parse\n"));
-
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
- yyssp = yyss;
- yyvsp = yyvs;
-
- goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
-`------------------------------------------------------------*/
- yynewstate:
- /* In all cases, when you get here, the value and location stacks
- have just been pushed. So pushing a state here evens the stacks. */
- yyssp++;
-
- yysetstate:
- *yyssp = yystate;
-
- if (yyss + yystacksize - 1 <= yyssp)
- {
- /* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
- {
-	/* Give user a chance to reallocate the stack. Use copies of
-	 these so that the &'s don't force the real ones into
-	 memory. */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	 data in use in that stack, in bytes. This used to be a
-	 conditional around just the two extra args, but that might
-	 be undefined if yyoverflow is a macro. */
-	yyoverflow (YY_("memory exhausted"),
-		 &yyss1, yysize * sizeof (*yyssp),
-		 &yyvs1, yysize * sizeof (*yyvsp),
-		 &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
- }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
- {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	 goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	 YYSTACK_FREE (yyss1);
- }
-# endif
-#endif /* no yyoverflow */
-
- yyssp = yyss + yysize - 1;
- yyvsp = yyvs + yysize - 1;
-
- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		 (unsigned long int) yystacksize));
-
- if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
- }
-
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
- if (yystate == YYFINAL)
- YYACCEPT;
-
- goto yybackup;
-
-/*-----------.
-| yybackup. |
-`-----------*/
-yybackup:
-
- /* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
-
- /* First try to decide what to do without reference to lookahead token. */
- yyn = yypactyystate;
- if (yypact_value_is_default (yyn))
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY)
- {
- YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
- }
-
- if (yychar <= YYEOF)
- {
- yychar = yytoken = YYEOF;
- YYDPRINTF ((stderr, "Now at end of input.\n"));
- }
- else
- {
- yytoken = YYTRANSLATE (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
- }
-
- /* If the proper action on seeing token YYTOKEN is to reduce or to
- detect an error, take that action. */
- yyn += yytoken;
- if (yyn < 0 || YYLAST < yyn || yycheckyyn != yytoken)
- goto yydefault;
- yyn = yytableyyn;
- if (yyn <= 0)
- {
- if (yytable_value_is_error (yyn))
- goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
-
- /* Count tokens shifted since error; after three, turn off error
- status. */
- if (yyerrstatus)
- yyerrstatus--;
-
- /* Shift the lookahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the shifted token. */
- yychar = YYEMPTY;
-
- yystate = yyn;
- *++yyvsp = yylval;
-
- goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state. |
-`-----------------------------------------------------------*/
-yydefault:
- yyn = yydefactyystate;
- if (yyn == 0)
- goto yyerrlab;
- goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction. |
-`-----------------------------*/
-yyreduce:
- /* yyn is the number of a rule to reduce with. */
- yylen = yyr2yyn;
-
- /* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
-
- Otherwise, the following line sets YYVAL to garbage.
- This behavior is undocumented and Bison
- users should not rely upon it. Assigning to YYVAL
- unconditionally makes the parser a bit smaller, and it avoids a
- GCC warning that YYVAL may be used uninitialized. */
- yyval = yyvsp1-yylen;
-
-
- YY_REDUCE_PRINT (yyn);
- switch (yyn)
- {
- case 2:
-
-/* Line 1806 of yacc.c */
-#line 222 "sieve.y"
- { ret = NULL; }
- break;
-
- case 3:
-
-/* Line 1806 of yacc.c */
-#line 223 "sieve.y"
- { ret = (yyvsp(2) - (2).cl); }
- break;
-
- case 6:
-
-/* Line 1806 of yacc.c */
-#line 230 "sieve.y"
- { char *err = check_reqs((yyvsp(2) - (3).sl));
- if (err) {
-				 yyerror(err);
-				 free(err);
-				 YYERROR; 
- } }
- break;
-
- case 7:
-
-/* Line 1806 of yacc.c */
-#line 238 "sieve.y"
- { (yyval.cl) = (yyvsp(1) - (1).cl); }
- break;
-
- case 8:
-
-/* Line 1806 of yacc.c */
-#line 239 "sieve.y"
- { (yyvsp(1) - (2).cl)->next = (yyvsp(2) - (2).cl); (yyval.cl) = (yyvsp(1) - (2).cl); }
- break;
-
- case 9:
-
-/* Line 1806 of yacc.c */
-#line 242 "sieve.y"
- { (yyval.cl) = (yyvsp(1) - (2).cl); }
- break;
-
- case 10:
-
-/* Line 1806 of yacc.c */
-#line 243 "sieve.y"
- { (yyval.cl) = new_if((yyvsp(2) - (4).test), (yyvsp(3) - (4).cl), (yyvsp(4) - (4).cl)); }
- break;
-
- case 11:
-
-/* Line 1806 of yacc.c */
-#line 244 "sieve.y"
- { (yyval.cl) = new_command(STOP); }
- break;
-
- case 12:
-
-/* Line 1806 of yacc.c */
-#line 247 "sieve.y"
- { (yyval.cl) = NULL; }
- break;
-
- case 13:
-
-/* Line 1806 of yacc.c */
-#line 248 "sieve.y"
- { (yyval.cl) = new_if((yyvsp(2) - (4).test), (yyvsp(3) - (4).cl), (yyvsp(4) - (4).cl)); }
- break;
-
- case 14:
-
-/* Line 1806 of yacc.c */
-#line 249 "sieve.y"
- { (yyval.cl) = (yyvsp(2) - (2).cl); }
- break;
-
- case 15:
-
-/* Line 1806 of yacc.c */
-#line 252 "sieve.y"
- { if (!parse_script->support.reject) {
-				 yyerror("reject MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 if (!verify_utf8((yyvsp(2) - (2).sval))) {
-				 YYERROR; /* vu should call yyerror() */
-				 }
-				 (yyval.cl) = new_command(REJCT);
-				 (yyval.cl)->u.str = (yyvsp(2) - (2).sval); }
- break;
-
- case 16:
-
-/* Line 1806 of yacc.c */
-#line 261 "sieve.y"
- { if (!parse_script->support.fileinto) {
-				 yyerror("fileinto MUST be enabled with \"require\"");
-	 YYERROR;
- }
-				 if (!verify_mailbox((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* vm should call yyerror() */
-				 }
-	 (yyval.cl) = build_fileinto(FILEINTO, (yyvsp(2) - (3).nval), (yyvsp(3) - (3).sval)); }
- break;
-
- case 17:
-
-/* Line 1806 of yacc.c */
-#line 269 "sieve.y"
- { if (!verify_address((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* va should call yyerror() */
-				 }
-	 (yyval.cl) = build_redirect(REDIRECT, (yyvsp(2) - (3).nval), (yyvsp(3) - (3).sval)); }
- break;
-
- case 18:
-
-/* Line 1806 of yacc.c */
-#line 273 "sieve.y"
- { (yyval.cl) = new_command(KEEP); }
- break;
-
- case 19:
-
-/* Line 1806 of yacc.c */
-#line 274 "sieve.y"
- { (yyval.cl) = new_command(STOP); }
- break;
-
- case 20:
-
-/* Line 1806 of yacc.c */
-#line 275 "sieve.y"
- { (yyval.cl) = new_command(DISCARD); }
- break;
-
- case 21:
-
-/* Line 1806 of yacc.c */
-#line 276 "sieve.y"
- { if (!parse_script->support.vacation) {
-				 yyerror("vacation MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 if (((yyvsp(2) - (3).vtag)->mime == -1) && !verify_utf8((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* vu should call yyerror() */
-				 }
- 				 (yyval.cl) = build_vacation(VACATION,
-					 canon_vtags((yyvsp(2) - (3).vtag)), (yyvsp(3) - (3).sval)); }
- break;
-
- case 22:
-
-/* Line 1806 of yacc.c */
-#line 285 "sieve.y"
- { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
- YYERROR;
- }
- if (!verify_stringlist((yyvsp(2) - (2).sl), verify_flag)) {
- YYERROR; /* vf should call yyerror() */
- }
- (yyval.cl) = new_command(SETFLAG);
- (yyval.cl)->u.sl = (yyvsp(2) - (2).sl); }
- break;
-
- case 23:
-
-/* Line 1806 of yacc.c */
-#line 294 "sieve.y"
- { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
- YYERROR;
- }
- if (!verify_stringlist((yyvsp(2) - (2).sl), verify_flag)) {
- YYERROR; /* vf should call yyerror() */
- }
- (yyval.cl) = new_command(ADDFLAG);
- (yyval.cl)->u.sl = (yyvsp(2) - (2).sl); }
- break;
-
- case 24:
-
-/* Line 1806 of yacc.c */
-#line 303 "sieve.y"
- { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
- YYERROR;
- }
- if (!verify_stringlist((yyvsp(2) - (2).sl), verify_flag)) {
- YYERROR; /* vf should call yyerror() */
- }
- (yyval.cl) = new_command(REMOVEFLAG);
- (yyval.cl)->u.sl = (yyvsp(2) - (2).sl); }
- break;
-
- case 25:
-
-/* Line 1806 of yacc.c */
-#line 312 "sieve.y"
- { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
- YYERROR;
- }
- (yyval.cl) = new_command(MARK); }
- break;
-
- case 26:
-
-/* Line 1806 of yacc.c */
-#line 317 "sieve.y"
- { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
- YYERROR;
- }
- (yyval.cl) = new_command(UNMARK); }
- break;
-
- case 27:
-
-/* Line 1806 of yacc.c */
-#line 323 "sieve.y"
- { if (!parse_script->support.notify) {
-				 yyerror("notify MUST be enabled with \"require\"");
-				 (yyval.cl) = new_command(NOTIFY); 
-				 YYERROR;
-	 			 } else {
-				 (yyval.cl) = build_notify(NOTIFY,
-				 canon_ntags((yyvsp(2) - (2).ntag)));
-				 } }
- break;
-
- case 28:
-
-/* Line 1806 of yacc.c */
-#line 331 "sieve.y"
- { if (!parse_script->support.notify) {
- yyerror("notify MUST be enabled with \"require\"");
-				 (yyval.cl) = new_command(DENOTIFY);
-				 YYERROR;
-				 } else {
-					(yyval.cl) = build_denotify(DENOTIFY, canon_dtags((yyvsp(2) - (2).dtag)));
-					if ((yyval.cl) == NULL) { 
-			yyerror("unable to find a compatible comparator");
-			YYERROR; } } }
- break;
-
- case 29:
-
-/* Line 1806 of yacc.c */
-#line 341 "sieve.y"
- { if (!parse_script->support.include) {
-				 yyerror("include MUST be enabled with \"require\"");
-	 YYERROR;
- }
-	 (yyval.cl) = new_command(INCLUDE);
-				 (yyval.cl)->u.inc.location = (yyvsp(2) - (3).nval);
-				 int i;
-				 for (i=0; (yyvsp(3) - (3).sval)i != '\0'; i++)
-				 if ((yyvsp(3) - (3).sval)i == '/') {
-				 yyerror("included script name must not contain slash"); YYERROR;
-				 break;
-				 }
-				 (yyval.cl)->u.inc.script = (yyvsp(3) - (3).sval); }
- break;
-
- case 30:
-
-/* Line 1806 of yacc.c */
-#line 354 "sieve.y"
- { if (!parse_script->support.include) {
- yyerror("include MUST be enabled with \"require\"");
- YYERROR;
- }
- (yyval.cl) = new_command(RETURN); }
- break;
-
- case 31:
-
-/* Line 1806 of yacc.c */
-#line 361 "sieve.y"
- { (yyval.nval) = PERSONAL; }
- break;
-
- case 32:
-
-/* Line 1806 of yacc.c */
-#line 362 "sieve.y"
- { (yyval.nval) = PERSONAL; }
- break;
-
- case 33:
-
-/* Line 1806 of yacc.c */
-#line 363 "sieve.y"
- { (yyval.nval) = GLOBAL; }
- break;
-
- case 34:
-
-/* Line 1806 of yacc.c */
-#line 366 "sieve.y"
- { (yyval.ntag) = new_ntags(); }
- break;
-
- case 35:
-
-/* Line 1806 of yacc.c */
-#line 367 "sieve.y"
- { if ((yyval.ntag)->id != NULL) { 
-					yyerror("duplicate :method"); YYERROR; }
-				 else { (yyval.ntag)->id = (yyvsp(3) - (3).sval); } }
- break;
-
- case 36:
-
-/* Line 1806 of yacc.c */
-#line 370 "sieve.y"
- { if ((yyval.ntag)->method != NULL) { 
-					yyerror("duplicate :method"); YYERROR; }
-				 else { (yyval.ntag)->method = (yyvsp(3) - (3).sval); } }
- break;
-
- case 37:
-
-/* Line 1806 of yacc.c */
-#line 373 "sieve.y"
- { if ((yyval.ntag)->options != NULL) { 
-					yyerror("duplicate :options"); YYERROR; }
-				 else { (yyval.ntag)->options = (yyvsp(3) - (3).sl); } }
- break;
-
- case 38:
-
-/* Line 1806 of yacc.c */
-#line 376 "sieve.y"
- { if ((yyval.ntag)->priority != -1) { 
- yyerror("duplicate :priority"); YYERROR; }
- else { (yyval.ntag)->priority = (yyvsp(2) - (2).nval); } }
- break;
-
- case 39:
-
-/* Line 1806 of yacc.c */
-#line 379 "sieve.y"
- { if ((yyval.ntag)->message != NULL) { 
-					yyerror("duplicate :message"); YYERROR; }
-				 else { (yyval.ntag)->message = (yyvsp(3) - (3).sval); } }
- break;
-
- case 40:
-
-/* Line 1806 of yacc.c */
-#line 384 "sieve.y"
- { (yyval.dtag) = new_dtags(); }
- break;
-
- case 41:
-
-/* Line 1806 of yacc.c */
-#line 385 "sieve.y"
- { if ((yyval.dtag)->priority != -1) { 
-				yyerror("duplicate priority level"); YYERROR; }
-				 else { (yyval.dtag)->priority = (yyvsp(2) - (2).nval); } }
- break;
-
- case 42:
-
-/* Line 1806 of yacc.c */
-#line 388 "sieve.y"
- { if ((yyval.dtag)->comptag != -1)
-	 { 
-					 yyerror("duplicate comparator type tag"); YYERROR;
-				 }
-	 (yyval.dtag)->comptag = (yyvsp(2) - (3).nval);
-#ifdef ENABLE_REGEX
-				 if ((yyval.dtag)->comptag == REGEX)
-				 {
-				 int cflags = REG_EXTENDED |
-					 REG_NOSUB | REG_ICASE;
-				 if (!verify_regex((yyvsp(3) - (3).sval), cflags)) { YYERROR; }
-				 }
-#endif
-				 (yyval.dtag)->pattern = (yyvsp(3) - (3).sval);
-	 }
- break;
-
- case 43:
-
-/* Line 1806 of yacc.c */
-#line 403 "sieve.y"
- { (yyval.dtag) = (yyvsp(1) - (3).dtag);
-				 if ((yyval.dtag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.dtag)->comptag = (yyvsp(2) - (3).nval);
-				 (yyval.dtag)->relation = verify_relat((yyvsp(3) - (3).sval));
-				 if ((yyval.dtag)->relation==-1) 
-				 {YYERROR; /*vr called yyerror()*/ }
-				 } }
- break;
-
- case 44:
-
-/* Line 1806 of yacc.c */
-#line 413 "sieve.y"
- { (yyval.nval) = LOW; }
- break;
-
- case 45:
-
-/* Line 1806 of yacc.c */
-#line 414 "sieve.y"
- { (yyval.nval) = NORMAL; }
- break;
-
- case 46:
-
-/* Line 1806 of yacc.c */
-#line 415 "sieve.y"
- { (yyval.nval) = HIGH; }
- break;
-
- case 47:
-
-/* Line 1806 of yacc.c */
-#line 418 "sieve.y"
- { (yyval.vtag) = new_vtags(); }
- break;
-
- case 48:
-
-/* Line 1806 of yacc.c */
-#line 419 "sieve.y"
- { if ((yyval.vtag)->days != -1) { 
-					yyerror("duplicate :days"); YYERROR; }
-				 else { (yyval.vtag)->days = (yyvsp(3) - (3).nval); } }
- break;
-
- case 49:
-
-/* Line 1806 of yacc.c */
-#line 422 "sieve.y"
- { if ((yyval.vtag)->addresses != NULL) { 
-					yyerror("duplicate :addresses"); 
-					YYERROR;
-				 } else if (!verify_stringlist((yyvsp(3) - (3).sl),
-							verify_address)) {
-					 YYERROR;
-				 } else {
-					 (yyval.vtag)->addresses = (yyvsp(3) - (3).sl); } }
- break;
-
- case 50:
-
-/* Line 1806 of yacc.c */
-#line 430 "sieve.y"
- { if ((yyval.vtag)->subject != NULL) { 
-					yyerror("duplicate :subject"); 
-					YYERROR;
-				 } else if (!verify_utf8((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* vu should call yyerror() */
-				 } else { (yyval.vtag)->subject = (yyvsp(3) - (3).sval); } }
- break;
-
- case 51:
-
-/* Line 1806 of yacc.c */
-#line 436 "sieve.y"
- { if ((yyval.vtag)->from != NULL) { 
-					yyerror("duplicate :from"); 
-					YYERROR;
-				 } else if (!verify_address((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* vu should call yyerror() */
-				 } else { (yyval.vtag)->from = (yyvsp(3) - (3).sval); } }
- break;
-
- case 52:
-
-/* Line 1806 of yacc.c */
-#line 442 "sieve.y"
- { if ((yyval.vtag)->handle != NULL) { 
-					yyerror("duplicate :handle"); 
-					YYERROR;
-				 } else if (!verify_utf8((yyvsp(3) - (3).sval))) {
-				 YYERROR; /* vu should call yyerror() */
-				 } else { (yyval.vtag)->handle = (yyvsp(3) - (3).sval); } }
- break;
-
- case 53:
-
-/* Line 1806 of yacc.c */
-#line 448 "sieve.y"
- { if ((yyval.vtag)->mime != -1) { 
-					yyerror("duplicate :mime"); 
-					YYERROR; }
-				 else { (yyval.vtag)->mime = MIME; } }
- break;
-
- case 54:
-
-/* Line 1806 of yacc.c */
-#line 454 "sieve.y"
- { (yyval.sl) = sl_reverse((yyvsp(2) - (3).sl)); }
- break;
-
- case 55:
-
-/* Line 1806 of yacc.c */
-#line 455 "sieve.y"
- { (yyval.sl) = new_sl((yyvsp(1) - (1).sval), NULL); }
- break;
-
- case 56:
-
-/* Line 1806 of yacc.c */
-#line 458 "sieve.y"
- { (yyval.sl) = new_sl((yyvsp(1) - (1).sval), NULL); }
- break;
-
- case 57:
-
-/* Line 1806 of yacc.c */
-#line 459 "sieve.y"
- { (yyval.sl) = new_sl((yyvsp(3) - (3).sval), (yyvsp(1) - (3).sl)); }
- break;
-
- case 58:
-
-/* Line 1806 of yacc.c */
-#line 462 "sieve.y"
- { (yyval.cl) = (yyvsp(2) - (3).cl); }
- break;
-
- case 59:
-
-/* Line 1806 of yacc.c */
-#line 463 "sieve.y"
- { (yyval.cl) = NULL; }
- break;
-
- case 60:
-
-/* Line 1806 of yacc.c */
-#line 466 "sieve.y"
- { (yyval.test) = new_test(ANYOF); (yyval.test)->u.tl = (yyvsp(2) - (2).testl); }
- break;
-
- case 61:
-
-/* Line 1806 of yacc.c */
-#line 467 "sieve.y"
- { (yyval.test) = new_test(ALLOF); (yyval.test)->u.tl = (yyvsp(2) - (2).testl); }
- break;
-
- case 62:
-
-/* Line 1806 of yacc.c */
-#line 468 "sieve.y"
- { (yyval.test) = new_test(EXISTS); (yyval.test)->u.sl = (yyvsp(2) - (2).sl); }
- break;
-
- case 63:
-
-/* Line 1806 of yacc.c */
-#line 469 "sieve.y"
- { (yyval.test) = new_test(SFALSE); }
- break;
-
- case 64:
-
-/* Line 1806 of yacc.c */
-#line 470 "sieve.y"
- { (yyval.test) = new_test(STRUE); }
- break;
-
- case 65:
-
-/* Line 1806 of yacc.c */
-#line 472 "sieve.y"
- {
-				 if (!verify_stringlist((yyvsp(3) - (4).sl), verify_header)) {
-					 YYERROR; /* vh should call yyerror() */
-				 }
-				 if (!verify_stringlist((yyvsp(4) - (4).sl), verify_utf8)) {
-					 YYERROR; /* vu should call yyerror() */
-				 }
-				 
-				 (yyvsp(2) - (4).htag) = canon_htags((yyvsp(2) - (4).htag));
-#ifdef ENABLE_REGEX
-				 if ((yyvsp(2) - (4).htag)->comptag == REGEX)
-				 {
-					 if (!(verify_regexs((yyvsp(4) - (4).sl), (yyvsp(2) - (4).htag)->comparator)))
-					 { YYERROR; }
-				 }
-#endif
-				 (yyval.test) = build_header(HEADER, (yyvsp(2) - (4).htag), (yyvsp(3) - (4).sl), (yyvsp(4) - (4).sl));
-				 if ((yyval.test) == NULL) { 
-					 yyerror("unable to find a compatible comparator");
-					 YYERROR; } 
-				 }
- break;
-
- case 66:
-
-/* Line 1806 of yacc.c */
-#line 496 "sieve.y"
- { 
-				 if (((yyvsp(1) - (4).nval) == ADDRESS) &&
-					 !verify_stringlist((yyvsp(3) - (4).sl), verify_addrheader))
-					 { YYERROR; }
-				 else if (((yyvsp(1) - (4).nval) == ENVELOPE) &&
-					 !verify_stringlist((yyvsp(3) - (4).sl), verify_envelope))
-					 { YYERROR; }
-				 (yyvsp(2) - (4).aetag) = canon_aetags((yyvsp(2) - (4).aetag));
-#ifdef ENABLE_REGEX
-				 if ((yyvsp(2) - (4).aetag)->comptag == REGEX)
-				 {
-					 if (!( verify_regexs((yyvsp(4) - (4).sl), (yyvsp(2) - (4).aetag)->comparator)))
-					 { YYERROR; }
-				 }
-#endif
-				 (yyval.test) = build_address((yyvsp(1) - (4).nval), (yyvsp(2) - (4).aetag), (yyvsp(3) - (4).sl), (yyvsp(4) - (4).sl));
-				 if ((yyval.test) == NULL) { 
-					 yyerror("unable to find a compatible comparator");
-					 YYERROR; } 
-				 }
- break;
-
- case 67:
-
-/* Line 1806 of yacc.c */
-#line 518 "sieve.y"
- {
-				 if (!parse_script->support.body) {
- yyerror("body MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-					
-				 if (!verify_stringlist((yyvsp(3) - (3).sl), verify_utf8)) {
-					 YYERROR; /* vu should call yyerror() */
-				 }
-				 
-				 (yyvsp(2) - (3).btag) = canon_btags((yyvsp(2) - (3).btag));
-#ifdef ENABLE_REGEX
-				 if ((yyvsp(2) - (3).btag)->comptag == REGEX)
-				 {
-					 if (!(verify_regexs((yyvsp(3) - (3).sl), (yyvsp(2) - (3).btag)->comparator)))
-					 { YYERROR; }
-				 }
-#endif
-				 (yyval.test) = build_body(BODY, (yyvsp(2) - (3).btag), (yyvsp(3) - (3).sl));
-				 if ((yyval.test) == NULL) { 
-					 yyerror("unable to find a compatible comparator");
-					 YYERROR; } 
-				 }
- break;
-
- case 68:
-
-/* Line 1806 of yacc.c */
-#line 543 "sieve.y"
- { (yyval.test) = new_test(NOT); (yyval.test)->u.t = (yyvsp(2) - (2).test); }
- break;
-
- case 69:
-
-/* Line 1806 of yacc.c */
-#line 544 "sieve.y"
- { (yyval.test) = new_test(SIZE); (yyval.test)->u.sz.t = (yyvsp(2) - (3).nval);
-		 (yyval.test)->u.sz.n = (yyvsp(3) - (3).nval); }
- break;
-
- case 70:
-
-/* Line 1806 of yacc.c */
-#line 546 "sieve.y"
- { (yyval.test) = NULL; }
- break;
-
- case 71:
-
-/* Line 1806 of yacc.c */
-#line 549 "sieve.y"
- { (yyval.nval) = ADDRESS; }
- break;
-
- case 72:
-
-/* Line 1806 of yacc.c */
-#line 550 "sieve.y"
- {if (!parse_script->support.envelope)
-	 {yyerror("envelope MUST be enabled with \"require\""); YYERROR;}
-	 else{(yyval.nval) = ENVELOPE; }
-	 }
- break;
-
- case 73:
-
-/* Line 1806 of yacc.c */
-#line 557 "sieve.y"
- { (yyval.aetag) = new_aetags(); }
- break;
-
- case 74:
-
-/* Line 1806 of yacc.c */
-#line 558 "sieve.y"
- { (yyval.aetag) = (yyvsp(1) - (2).aetag);
-				 if ((yyval.aetag)->addrtag != -1) { 
-			yyerror("duplicate or conflicting address part tag");
-			YYERROR; }
-				 else { (yyval.aetag)->addrtag = (yyvsp(2) - (2).nval); } }
- break;
-
- case 75:
-
-/* Line 1806 of yacc.c */
-#line 563 "sieve.y"
- { (yyval.aetag) = (yyvsp(1) - (2).aetag);
-				 if ((yyval.aetag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.aetag)->comptag = (yyvsp(2) - (2).nval); } }
- break;
-
- case 76:
-
-/* Line 1806 of yacc.c */
-#line 567 "sieve.y"
- { (yyval.aetag) = (yyvsp(1) - (3).aetag);
-				 if ((yyval.aetag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.aetag)->comptag = (yyvsp(2) - (3).nval);
-				 (yyval.aetag)->relation = verify_relat((yyvsp(3) - (3).sval));
-				 if ((yyval.aetag)->relation==-1) 
-				 {YYERROR; /*vr called yyerror()*/ }
-				 } }
- break;
-
- case 77:
-
-/* Line 1806 of yacc.c */
-#line 575 "sieve.y"
- { (yyval.aetag) = (yyvsp(1) - (3).aetag);
-	if ((yyval.aetag)->comparator != NULL) { 
-			yyerror("duplicate comparator tag"); YYERROR; }
-				 else if (!strcmp((yyvsp(3) - (3).sval), "i;ascii-numeric") &&
-					 !parse_script->support.i_ascii_numeric) {
-			yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\"");
-			YYERROR; }
-				 else { (yyval.aetag)->comparator = (yyvsp(3) - (3).sval); } }
- break;
-
- case 78:
-
-/* Line 1806 of yacc.c */
-#line 585 "sieve.y"
- { (yyval.htag) = new_htags(); }
- break;
-
- case 79:
-
-/* Line 1806 of yacc.c */
-#line 586 "sieve.y"
- { (yyval.htag) = (yyvsp(1) - (2).htag);
-				 if ((yyval.htag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.htag)->comptag = (yyvsp(2) - (2).nval); } }
- break;
-
- case 80:
-
-/* Line 1806 of yacc.c */
-#line 590 "sieve.y"
- { (yyval.htag) = (yyvsp(1) - (3).htag);
-				 if ((yyval.htag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.htag)->comptag = (yyvsp(2) - (3).nval);
-				 (yyval.htag)->relation = verify_relat((yyvsp(3) - (3).sval));
-				 if ((yyval.htag)->relation==-1) 
-				 {YYERROR; /*vr called yyerror()*/ }
-				 } }
- break;
-
- case 81:
-
-/* Line 1806 of yacc.c */
-#line 598 "sieve.y"
- { (yyval.htag) = (yyvsp(1) - (3).htag);
-				 if ((yyval.htag)->comparator != NULL) { 
-			 yyerror("duplicate comparator tag"); YYERROR; }
-				 else if (!strcmp((yyvsp(3) - (3).sval), "i;ascii-numeric") &&
-					 !parse_script->support.i_ascii_numeric) { 
-			 yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
-				 else { 
-				 (yyval.htag)->comparator = (yyvsp(3) - (3).sval); } }
- break;
-
- case 82:
-
-/* Line 1806 of yacc.c */
-#line 608 "sieve.y"
- { (yyval.btag) = new_btags(); }
- break;
-
- case 83:
-
-/* Line 1806 of yacc.c */
-#line 609 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (2).btag);
-				 if ((yyval.btag)->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
-			YYERROR; }
-				 else { (yyval.btag)->transform = RAW; } }
- break;
-
- case 84:
-
-/* Line 1806 of yacc.c */
-#line 614 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (2).btag);
-				 if ((yyval.btag)->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
-			YYERROR; }
-				 else { (yyval.btag)->transform = TEXT; } }
- break;
-
- case 85:
-
-/* Line 1806 of yacc.c */
-#line 619 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (3).btag);
-				 if ((yyval.btag)->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
-			YYERROR; }
-				 else {
-				 (yyval.btag)->transform = CONTENT;
-				 (yyval.btag)->content_types = (yyvsp(3) - (3).sl);
-				 } }
- break;
-
- case 86:
-
-/* Line 1806 of yacc.c */
-#line 627 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (2).btag);
-				 if ((yyval.btag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.btag)->comptag = (yyvsp(2) - (2).nval); } }
- break;
-
- case 87:
-
-/* Line 1806 of yacc.c */
-#line 631 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (3).btag);
-				 if ((yyval.btag)->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
-				 else { (yyval.btag)->comptag = (yyvsp(2) - (3).nval);
-				 (yyval.btag)->relation = verify_relat((yyvsp(3) - (3).sval));
-				 if ((yyval.btag)->relation==-1) 
-				 {YYERROR; /*vr called yyerror()*/ }
-				 } }
- break;
-
- case 88:
-
-/* Line 1806 of yacc.c */
-#line 639 "sieve.y"
- { (yyval.btag) = (yyvsp(1) - (3).btag);
-				 if ((yyval.btag)->comparator != NULL) { 
-			 yyerror("duplicate comparator tag"); YYERROR; }
-				 else if (!strcmp((yyvsp(3) - (3).sval), "i;ascii-numeric") &&
-					 !parse_script->support.i_ascii_numeric) { 
-			 yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
-				 else { 
-				 (yyval.btag)->comparator = (yyvsp(3) - (3).sval); } }
- break;
-
- case 89:
-
-/* Line 1806 of yacc.c */
-#line 650 "sieve.y"
- { (yyval.nval) = ALL; }
- break;
-
- case 90:
-
-/* Line 1806 of yacc.c */
-#line 651 "sieve.y"
- { (yyval.nval) = LOCALPART; }
- break;
-
- case 91:
-
-/* Line 1806 of yacc.c */
-#line 652 "sieve.y"
- { (yyval.nval) = DOMAIN; }
- break;
-
- case 92:
-
-/* Line 1806 of yacc.c */
-#line 653 "sieve.y"
- { if (!parse_script->support.subaddress) {
-				 yyerror("subaddress MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 (yyval.nval) = USER; }
- break;
-
- case 93:
-
-/* Line 1806 of yacc.c */
-#line 658 "sieve.y"
- { if (!parse_script->support.subaddress) {
-				 yyerror("subaddress MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 (yyval.nval) = DETAIL; }
- break;
-
- case 94:
-
-/* Line 1806 of yacc.c */
-#line 664 "sieve.y"
- { (yyval.nval) = IS; }
- break;
-
- case 95:
-
-/* Line 1806 of yacc.c */
-#line 665 "sieve.y"
- { (yyval.nval) = CONTAINS; }
- break;
-
- case 96:
-
-/* Line 1806 of yacc.c */
-#line 666 "sieve.y"
- { (yyval.nval) = MATCHES; }
- break;
-
- case 97:
-
-/* Line 1806 of yacc.c */
-#line 667 "sieve.y"
- { if (!parse_script->support.regex) {
-				 yyerror("regex MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 (yyval.nval) = REGEX; }
- break;
-
- case 98:
-
-/* Line 1806 of yacc.c */
-#line 674 "sieve.y"
- { if (!parse_script->support.relational) {
-				 yyerror("relational MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 (yyval.nval) = COUNT; }
- break;
-
- case 99:
-
-/* Line 1806 of yacc.c */
-#line 679 "sieve.y"
- { if (!parse_script->support.relational) {
-				 yyerror("relational MUST be enabled with \"require\"");
-				 YYERROR;
-				 }
-				 (yyval.nval) = VALUE; }
- break;
-
- case 100:
-
-/* Line 1806 of yacc.c */
-#line 687 "sieve.y"
- { (yyval.nval) = OVER; }
- break;
-
- case 101:
-
-/* Line 1806 of yacc.c */
-#line 688 "sieve.y"
- { (yyval.nval) = UNDER; }
- break;
-
- case 102:
-
-/* Line 1806 of yacc.c */
-#line 691 "sieve.y"
- { (yyval.nval) = 0; }
- break;
-
- case 103:
-
-/* Line 1806 of yacc.c */
-#line 692 "sieve.y"
- { if (!parse_script->support.copy) {
-				 yyerror("copy MUST be enabled with \"require\"");
-	 YYERROR;
- }
-				 (yyval.nval) = COPY; }
- break;
-
- case 104:
-
-/* Line 1806 of yacc.c */
-#line 699 "sieve.y"
- { (yyval.testl) = (yyvsp(2) - (3).testl); }
- break;
-
- case 105:
-
-/* Line 1806 of yacc.c */
-#line 702 "sieve.y"
- { (yyval.testl) = new_testlist((yyvsp(1) - (1).test), NULL); }
- break;
-
- case 106:
-
-/* Line 1806 of yacc.c */
-#line 703 "sieve.y"
- { (yyval.testl) = new_testlist((yyvsp(1) - (3).test), (yyvsp(3) - (3).testl)); }
- break;
-
-
-
-/* Line 1806 of yacc.c */
-#line 2905 "y.tab.c"
- default: break;
- }
- /* User semantic actions sometimes alter yychar, and that requires
- that yytoken be updated with the new translation. We take the
- approach of translating immediately before every use of yytoken.
- One alternative is translating here after every semantic action,
- but that translation would be missed if the semantic action invokes
- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
- incorrect destructor might then be invoked immediately. In the
- case of YYERROR or YYBACKUP, subsequent parser actions might lead
- to an incorrect destructor call or verbose syntax error message
- before the lookahead is translated. */
- YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
-
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
-
- *++yyvsp = yyval;
-
- /* Now `shift' the result of the reduction. Determine what state
- that goes to, based on the state we popped back to and the rule
- number reduced by. */
-
- yyn = yyr1yyn;
-
- yystate = yypgotoyyn - YYNTOKENS + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheckyystate == *yyssp)
- yystate = yytableyystate;
- else
- yystate = yydefgotoyyn - YYNTOKENS;
-
- goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
- /* Make sure we have latest lookahead translation. See comments at
- user semantic actions for why this is necessary. */
- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
- /* If not already recovering from an error, report this error. */
- if (!yyerrstatus)
- {
- ++yynerrs;
-#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
- yyssp, yytoken)
- {
- char const *yymsgp = YY_("syntax error");
- int yysyntax_error_status;
- yysyntax_error_status = YYSYNTAX_ERROR;
- if (yysyntax_error_status == 0)
- yymsgp = yymsg;
- else if (yysyntax_error_status == 1)
- {
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
- if (!yymsg)
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- yysyntax_error_status = 2;
- }
- else
- {
- yysyntax_error_status = YYSYNTAX_ERROR;
- yymsgp = yymsg;
- }
- }
- yyerror (yymsgp);
- if (yysyntax_error_status == 2)
- goto yyexhaustedlab;
- }
-# undef YYSYNTAX_ERROR
-#endif
- }
-
-
-
- if (yyerrstatus == 3)
- {
- /* If just tried and failed to reuse lookahead token after an
-	 error, discard it. */
-
- if (yychar <= YYEOF)
-	{
-	 /* Return failure if at end of input. */
-	 if (yychar == YYEOF)
-	 YYABORT;
-	}
- else
-	{
-	 yydestruct ("Error: discarding",
-		 yytoken, &yylval);
-	 yychar = YYEMPTY;
-	}
- }
-
- /* Else will try to reuse lookahead token after shifting the error
- token. */
- goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR. |
-`---------------------------------------------------*/
-yyerrorlab:
-
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
- /* Do not reclaim the symbols of the rule which action triggered
- this YYERROR. */
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
- yystate = *yyssp;
- goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR. |
-`-------------------------------------------------------------*/
-yyerrlab1:
- yyerrstatus = 3;	/* Each real token shifted decrements this. */
-
- for (;;)
- {
- yyn = yypactyystate;
- if (!yypact_value_is_default (yyn))
-	{
-	 yyn += YYTERROR;
-	 if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
-	 {
-	 yyn = yytableyyn;
-	 if (0 < yyn)
-		break;
-	 }
-	}
-
- /* Pop the current state because it cannot handle the error token. */
- if (yyssp == yyss)
-	YYABORT;
-
-
- yydestruct ("Error: popping",
-		 yystosyystate, yyvsp);
- YYPOPSTACK (1);
- yystate = *yyssp;
- YY_STACK_PRINT (yyss, yyssp);
- }
-
- *++yyvsp = yylval;
-
-
- /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
-
- yystate = yyn;
- goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here. |
-`-------------------------------------*/
-yyacceptlab:
- yyresult = 0;
- goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here. |
-`-----------------------------------*/
-yyabortlab:
- yyresult = 1;
- goto yyreturn;
-
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here. |
-`-------------------------------------------------*/
-yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
- yyresult = 2;
- /* Fall through. */
-#endif
-
-yyreturn:
- if (yychar != YYEMPTY)
- {
- /* Make sure we have latest lookahead translation. See comments at
- user semantic actions for why this is necessary. */
- yytoken = YYTRANSLATE (yychar);
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
- }
- /* Do not reclaim the symbols of the rule which action triggered
- this YYABORT or YYACCEPT. */
- YYPOPSTACK (yylen);
- YY_STACK_PRINT (yyss, yyssp);
- while (yyssp != yyss)
- {
- yydestruct ("Cleanup: popping",
-		 yystos*yyssp, yyvsp);
- YYPOPSTACK (1);
- }
-#ifndef yyoverflow
- if (yyss != yyssa)
- YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
-#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
-}
-
-
-
-/* Line 2067 of yacc.c */
-#line 706 "sieve.y"
-
-commandlist_t *sieve_parse(sieve_script_t *script, FILE *f)
-{
- commandlist_t *t;
-
- parse_script = script;
- yyrestart(f);
- if (yyparse()) {
-	t = NULL;
- } else {
-	t = ret;
- }
- ret = NULL;
- return t;
-}
-
-int yyerror(const char *msg)
-{
- extern int yylineno;
- int ret;
-
- parse_script->err++;
- if (parse_script->interp.err) {
-	ret = parse_script->interp.err(yylineno, msg, 
-				 parse_script->interp.interp_context,
-				 parse_script->script_context);
- }
-
- return 0;
-}
-
-static char *check_reqs(stringlist_t *sl)
-{
- stringlist_t *s;
- char *err = NULL, *p, sep = ':';
- size_t alloc = 0;
- 
- while (sl != NULL) {
-	s = sl;
-	sl = sl->next;
-
-	if (!script_require(parse_script, s->s)) {
-	 if (!err) {
-		alloc = 100;
-		p = err = xmalloc(alloc);
-		p += sprintf(p, "Unsupported feature(s) in \"require\"");
-	 }
-	 else if ((size_t) (p - err + strlen(s->s) + 5) > alloc) {
-		alloc += 100;
-		err = xrealloc(err, alloc);
-		p = err + strlen(err);
-	 }
-
-	 p += sprintf(p, "%c \"%s\"", sep, s->s);
-	 sep = ',';
-	}
-
-	free(s->s);
-	free(s);
- }
- return err;
-}
-
-static test_t *build_address(int t, struct aetags *ae,
-			 stringlist_t *sl, stringlist_t *pl)
-{
- test_t *ret = new_test(t);	/* can be either ADDRESS or ENVELOPE */
-
- assert((t == ADDRESS) || (t == ENVELOPE));
-
- if (ret) {
-	ret->u.ae.comptag = ae->comptag;
-	ret->u.ae.relation=ae->relation;
-	ret->u.ae.comparator=xstrdup(ae->comparator);
-	ret->u.ae.sl = sl;
-	ret->u.ae.pl = pl;
-	ret->u.ae.addrpart = ae->addrtag;
-	free_aetags(ae);
-
- }
- return ret;
-}
-
-static test_t *build_header(int t, struct htags *h,
-			 stringlist_t *sl, stringlist_t *pl)
-{
- test_t *ret = new_test(t);	/* can be HEADER */
-
- assert(t == HEADER);
-
- if (ret) {
-	ret->u.h.comptag = h->comptag;
-	ret->u.h.relation=h->relation;
-	ret->u.h.comparator=xstrdup(h->comparator);
-	ret->u.h.sl = sl;
-	ret->u.h.pl = pl;
-	free_htags(h);
- }
- return ret;
-}
-
-static test_t *build_body(int t, struct btags *b, stringlist_t *pl)
-{
- test_t *ret = new_test(t);	/* can be BODY */
-
- assert(t == BODY);
-
- if (ret) {
-	ret->u.b.comptag = b->comptag;
-	ret->u.b.relation = b->relation;
-	ret->u.b.comparator = xstrdup(b->comparator);
-	ret->u.b.transform = b->transform;
-	ret->u.b.offset = b->offset;
-	ret->u.b.content_types = b->content_types; b->content_types = NULL;
-	ret->u.b.pl = pl;
-	free_btags(b);
- }
- return ret;
-}
-
-static commandlist_t *build_vacation(int t, struct vtags *v, char *reason)
-{
- commandlist_t *ret = new_command(t);
-
- assert(t == VACATION);
-
- if (ret) {
-	ret->u.v.subject = v->subject; v->subject = NULL;
-	ret->u.v.from = v->from; v->from = NULL;
-	ret->u.v.handle = v->handle; v->handle = NULL;
-	ret->u.v.days = v->days;
-	ret->u.v.mime = v->mime;
-	ret->u.v.addresses = v->addresses; v->addresses = NULL;
-	free_vtags(v);
-	ret->u.v.message = reason;
- }
- return ret;
-}
-
-static commandlist_t *build_notify(int t, struct ntags *n)
-{
- commandlist_t *ret = new_command(t);
-
- assert(t == NOTIFY);
- if (ret) {
-	ret->u.n.method = n->method; n->method = NULL;
-	ret->u.n.id = n->id; n->id = NULL;
-	ret->u.n.options = n->options; n->options = NULL;
-	ret->u.n.priority = n->priority;
-	ret->u.n.message = n->message; n->message = NULL;
-	free_ntags(n);
- }
- return ret;
-}
-
-static commandlist_t *build_denotify(int t, struct dtags *d)
-{
- commandlist_t *ret = new_command(t);
-
- assert(t == DENOTIFY);
-
- if (ret) {
-	ret->u.d.comptag = d->comptag;
-	ret->u.d.relation=d->relation;
-	ret->u.d.pattern = d->pattern; d->pattern = NULL;
-	ret->u.d.priority = d->priority;
-	free_dtags(d);
- }
- return ret;
-}
-
-static commandlist_t *build_fileinto(int t, int copy, char *folder)
-{
- commandlist_t *ret = new_command(t);
-
- assert(t == FILEINTO);
-
- if (ret) {
-	ret->u.f.copy = copy;
-	if (config_getswitch(IMAPOPT_SIEVE_UTF8FILEINTO)) {
-	 ret->u.f.folder = xmalloc(5 * strlen(folder) + 1);
-	 UTF8_to_mUTF7(ret->u.f.folder, folder);
-	 free(folder);
-	}
-	else {
-	 ret->u.f.folder = folder;
-	}
- }
- return ret;
-}
-
-static commandlist_t *build_redirect(int t, int copy, char *address)
-{
- commandlist_t *ret = new_command(t);
-
- assert(t == REDIRECT);
-
- if (ret) {
-	ret->u.r.copy = copy;
-	ret->u.r.address = address;
- }
- return ret;
-}
-
-static struct aetags *new_aetags(void)
-{
- struct aetags *r = (struct aetags *) xmalloc(sizeof(struct aetags));
-
- r->addrtag = r->comptag = r->relation=-1;
- r->comparator=NULL;
-
- return r;
-}
-
-static struct aetags *canon_aetags(struct aetags *ae)
-{
- if (ae->addrtag == -1) { ae->addrtag = ALL; }
- if (ae->comparator == NULL) {
- ae->comparator = xstrdup("i;ascii-casemap");
- }
- if (ae->comptag == -1) { ae->comptag = IS; }
- return ae;
-}
-
-static void free_aetags(struct aetags *ae)
-{
- free(ae->comparator);
- free(ae);
-}
-
-static struct htags *new_htags(void)
-{
- struct htags *r = (struct htags *) xmalloc(sizeof(struct htags));
-
- r->comptag = r->relation= -1;
- 
- r->comparator = NULL;
-
- return r;
-}
-
-static struct htags *canon_htags(struct htags *h)
-{
- if (h->comparator == NULL) {
-	h->comparator = xstrdup("i;ascii-casemap");
- }
- if (h->comptag == -1) { h->comptag = IS; }
- return h;
-}
-
-static void free_htags(struct htags *h)
-{
- free(h->comparator);
- free(h);
-}
-
-static struct btags *new_btags(void)
-{
- struct btags *r = (struct btags *) xmalloc(sizeof(struct btags));
-
- r->transform = r->offset = r->comptag = r->relation = -1;
- r->content_types = NULL;
- r->comparator = NULL;
-
- return r;
-}
-
-static struct btags *canon_btags(struct btags *b)
-{
- if (b->transform == -1) { b->transform = TEXT; }
- if (b->content_types == NULL) {
-	if (b->transform == RAW) {
-	 b->content_types = new_sl(xstrdup(""), NULL);
-	} else {
-	 b->content_types = new_sl(xstrdup("text"), NULL);
-	}
- }
- if (b->offset == -1) { b->offset = 0; }
- if (b->comparator == NULL) { b->comparator = xstrdup("i;ascii-casemap"); }
- if (b->comptag == -1) { b->comptag = IS; }
- return b;
-}
-
-static void free_btags(struct btags *b)
-{
- if (b->content_types) { free_sl(b->content_types); }
- free(b->comparator);
- free(b);
-}
-
-static struct vtags *new_vtags(void)
-{
- struct vtags *r = (struct vtags *) xmalloc(sizeof(struct vtags));
-
- r->days = -1;
- r->addresses = NULL;
- r->subject = NULL;
- r->from = NULL;
- r->handle = NULL;
- r->mime = -1;
-
- return r;
-}
-
-static struct vtags *canon_vtags(struct vtags *v)
-{
- assert(parse_script->interp.vacation != NULL);
-
- if (v->days == -1) { v->days = 7; }
- if (v->days < parse_script->interp.vacation->min_response) 
- { v->days = parse_script->interp.vacation->min_response; }
- if (v->days > parse_script->interp.vacation->max_response)
- { v->days = parse_script->interp.vacation->max_response; }
- if (v->mime == -1) { v->mime = 0; }
-
- return v;
-}
-
-static void free_vtags(struct vtags *v)
-{
- if (v->addresses) { free_sl(v->addresses); }
- if (v->subject) { free(v->subject); }
- if (v->from) { free(v->from); }
- if (v->handle) { free(v->handle); }
- free(v);
-}
-
-static struct ntags *new_ntags(void)
-{
- struct ntags *r = (struct ntags *) xmalloc(sizeof(struct ntags));
-
- r->method = NULL;
- r->id = NULL;
- r->options = NULL;
- r->priority = -1;
- r->message = NULL;
-
- return r;
-}
-
-static struct ntags *canon_ntags(struct ntags *n)
-{
- if (n->priority == -1) { n->priority = NORMAL; }
- if (n->message == NULL) { n->message = xstrdup("$from$: $subject$"); }
- if (n->method == NULL) { n->method = xstrdup("default"); }
- return n;
-}
-static struct dtags *canon_dtags(struct dtags *d)
-{
- if (d->priority == -1) { d->priority = ANY; }
- if (d->comptag == -1) { d->comptag = ANY; }
- return d;
-}
-
-static void free_ntags(struct ntags *n)
-{
- if (n->method) { free(n->method); }
- if (n->id) { free(n->id); }
- if (n->options) { free_sl(n->options); }
- if (n->message) { free(n->message); }
- free(n);
-}
-
-static struct dtags *new_dtags(void)
-{
- struct dtags *r = (struct dtags *) xmalloc(sizeof(struct dtags));
-
- r->comptag = r->priority= r->relation = -1;
- r->pattern = NULL;
-
- return r;
-}
-
-static void free_dtags(struct dtags *d)
-{
- if (d->pattern) free(d->pattern);
- free(d);
-}
-
-static int verify_stringlist(stringlist_t *sl, int (*verify)(char *))
-{
- for (; sl != NULL && verify(sl->s); sl = sl->next) ;
- return (sl == NULL);
-}
-
-char *addrptr;		/* pointer to address string for address lexer */
-char addrerr500;	/* buffer for address parser error messages */
-
-static int verify_address(char *s)
-{
- addrptr = s;
- addrerr0 = '\0';	/* paranoia */
- if (addrparse()) {
-	snprintf(errbuf, ERR_BUF_SIZE, 
-		 "address '%s': %s", s, addrerr);
-	yyerror(errbuf);
-	return 0;
- }
- return 1;
-}
-
-static int verify_mailbox(char *s)
-{
- if (!verify_utf8(s)) return 0;
-
- /* xxx if not a mailbox, call yyerror */
- return 1;
-}
-
-static int verify_header(char *hdr)
-{
- char *h = hdr;
-
- while (*h) {
-	/* field-name = 1*ftext
-	 ftext = %d33-57 / %d59-126 
-	 ; Any character except
-	 ; controls, SP, and
-	 ; ":". */
-	if (!((*h >= 33 && *h <= 57) || (*h >= 59 && *h <= 126))) {
-	 snprintf(errbuf, ERR_BUF_SIZE,
-		 "header '%s': not a valid header", hdr);
-	 yyerror(errbuf);
-	 return 0;
-	}
-	h++;
- }
- return 1;
-}
- 
-static int verify_addrheader(char *hdr)
-{
- const char **h, *hdrs = {
-	"from", "sender", "reply-to",	/* RFC2822 originator fields */
-	"to", "cc", "bcc",		/* RFC2822 destination fields */
-	"resent-from", "resent-sender",	/* RFC2822 resent fields */
-	"resent-to", "resent-cc", "resent-bcc",
-	"return-path",			/* RFC2822 trace fields */
-	"disposition-notification-to",	/* RFC2298 MDN request fields */
-	"delivered-to",			/* non-standard (loop detection) */
-	"approved",			/* RFC1036 moderator/control fields */
-	NULL
- };
-
- if (!config_getswitch(IMAPOPT_RFC3028_STRICT))
-	return verify_header(hdr);
-
- for (lcase(hdr), h = hdrs; *h; h++) {
-	if (!strcmp(*h, hdr)) return 1;
- }
-
- snprintf(errbuf, ERR_BUF_SIZE,
-	 "header '%s': not a valid header for an address test", hdr);
- yyerror(errbuf);
- return 0;
-}
- 
-static int verify_envelope(char *env)
-{
- lcase(env);
- if (!config_getswitch(IMAPOPT_RFC3028_STRICT) ||
-	!strcmp(env, "from") || !strcmp(env, "to") || !strcmp(env, "auth")) {
-	return 1;
- }
-
- snprintf(errbuf, ERR_BUF_SIZE,
-	 "env-part '%s': not a valid part for an envelope test", env);
- yyerror(errbuf);
- return 0;
-}
- 
-static int verify_relat(char *r)
-{/* this really should have been a token to begin with.*/
-	lcase(r);
-	if (!strcmp(r, "gt")) {return GT;}
-	else if (!strcmp(r, "ge")) {return GE;}
-	else if (!strcmp(r, "lt")) {return LT;}
-	else if (!strcmp(r, "le")) {return LE;}
-	else if (!strcmp(r, "ne")) {return NE;}
-	else if (!strcmp(r, "eq")) {return EQ;}
-	else{
-	 snprintf(errbuf, ERR_BUF_SIZE,
-		 "flag '%s': not a valid relational operation", r);
-	 yyerror(errbuf);
-	 return -1;
-	}
-	
-}
-
-
-
-
-static int verify_flag(char *f)
-{
- if (f0 == '\\') {
-	lcase(f);
-	if (strcmp(f, "\\seen") && strcmp(f, "\\answered") &&
-	 strcmp(f, "\\flagged") && strcmp(f, "\\draft") &&
-	 strcmp(f, "\\deleted")) {
-	 snprintf(errbuf, ERR_BUF_SIZE,
-		 "flag '%s': not a system flag", f);
-	 yyerror(errbuf);
-	 return 0;
-	}
-	return 1;
- }
- if (!imparse_isatom(f)) {
-	snprintf(errbuf, ERR_BUF_SIZE,
-		 "flag '%s': not a valid keyword", f);
-	yyerror(errbuf);
-	return 0;
- }
- return 1;
-}
- 
-#ifdef ENABLE_REGEX
-static int verify_regex(char *s, int cflags)
-{
- int ret;
- regex_t *reg = (regex_t *) xmalloc(sizeof(regex_t));
-
-#ifdef HAVE_PCREPOSIX_H
- /* support UTF8 comparisons */
- cflags |= REG_UTF8;
-#endif
-
- if ((ret = regcomp(reg, s, cflags)) != 0) {
-	(void) regerror(ret, reg, errbuf, ERR_BUF_SIZE);
-	yyerror(errbuf);
-	free(reg);
-	return 0;
- }
- free(reg);
- return 1;
-}
-
-static int verify_regexs(stringlist_t *sl, char *comp)
-{
- stringlist_t *sl2;
- int cflags = REG_EXTENDED | REG_NOSUB;
- 
-
- if (!strcmp(comp, "i;ascii-casemap")) {
-	cflags |= REG_ICASE;
- }
-
- for (sl2 = sl; sl2 != NULL; sl2 = sl2->next) {
-	if ((verify_regex(sl2->s, cflags)) == 0) {
-	 break;
-	}
- }
- if (sl2 == NULL) {
-	return 1;
- }
- return 0;
-}
-#endif
-
-/*
- * Valid UTF-8 check (from RFC 2640 Annex B.1)
- *
- * The following routine checks if a byte sequence is valid UTF-8. This
- * is done by checking for the proper tagging of the first and following
- * bytes to make sure they conform to the UTF-8 format. It then checks
- * to assure that the data part of the UTF-8 sequence conforms to the
- * proper range allowed by the encoding. Note: This routine will not
- * detect characters that have not been assigned and therefore do not
- * exist.
- */
-static int verify_utf8(char *s)
-{
- const char *buf = s;
- const char *endbuf = s + strlen(s);
- unsigned char byte2mask = 0x00, c;
- int trailing = 0; /* trailing (continuation) bytes to follow */
-
- while (buf != endbuf) {
-	c = *buf++;
-	if (trailing) {
-	 if ((c & 0xC0) == 0x80) {		/* Does trailing byte
-						 follow UTF-8 format? */
-		if (byte2mask) {		/* Need to check 2nd byte
-						 for proper range? */
-		 if (c & byte2mask)		/* Are appropriate bits set? */
-			byte2mask = 0x00;
-		 else
-			break;
-		}
-		trailing--;
-	 }
-	 else
-		break;
-	}
-	else {
-	 if ((c & 0x80) == 0x00)		/* valid 1 byte UTF-8 */
-		continue;
-	 else if ((c & 0xE0) == 0xC0)	/* valid 2 byte UTF-8 */
-		if (c & 0x1E) {			/* Is UTF-8 byte
-						 in proper range? */
-		 trailing = 1;
-		}
-		else
-		 break;
-	 else if ((c & 0xF0) == 0xE0) {	/* valid 3 byte UTF-8 */
-		if (!(c & 0x0F)) {		/* Is UTF-8 byte
-						 in proper range? */
-		 byte2mask = 0x20;		/* If not, set mask
-						 to check next byte */
-		}
-		trailing = 2;
-	 }
-	 else if ((c & 0xF8) == 0xF0) {	/* valid 4 byte UTF-8 */
-		if (!(c & 0x07)) {		/* Is UTF-8 byte
-						 in proper range? */
-		 byte2mask = 0x30;		/* If not, set mask
-						 to check next byte */
-		}
-		trailing = 3;
-	 }
-	 else if ((c & 0xFC) == 0xF8) {	/* valid 5 byte UTF-8 */
-		if (!(c & 0x03)) {		/* Is UTF-8 byte
-						 in proper range? */
-		 byte2mask = 0x38;		/* If not, set mask
-						 to check next byte */
-		}
-		trailing = 4;
-	 }
-	 else if ((c & 0xFE) == 0xFC) {	/* valid 6 byte UTF-8 */
-		if (!(c & 0x01)) {		/* Is UTF-8 byte
-						 in proper range? */
-		 byte2mask = 0x3C;		/* If not, set mask
-						 to check next byte */
-		}
-		trailing = 5;
-	 }
-	 else
-		break;
-	}
- }
-
- if ((buf != endbuf) || trailing) {
-	snprintf(errbuf, ERR_BUF_SIZE,
-		 "string '%s': not valid utf8", s);
-	yyerror(errbuf);
-	return 0;
- }
-
- return 1;
-}
-

cyrus-imapd-2.4.17.tar.gz/sieve/sieve.h Deleted

@@ -1,225 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.5. */
-
-/* Bison interface for Yacc-like parsers in C
- 
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- 
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- NUMBER = 258,
- STRING = 259,
- IF = 260,
- ELSIF = 261,
- ELSE = 262,
- REJCT = 263,
- FILEINTO = 264,
- REDIRECT = 265,
- KEEP = 266,
- STOP = 267,
- DISCARD = 268,
- VACATION = 269,
- REQUIRE = 270,
- SETFLAG = 271,
- ADDFLAG = 272,
- REMOVEFLAG = 273,
- MARK = 274,
- UNMARK = 275,
- NOTIFY = 276,
- DENOTIFY = 277,
- ANYOF = 278,
- ALLOF = 279,
- EXISTS = 280,
- SFALSE = 281,
- STRUE = 282,
- HEADER = 283,
- NOT = 284,
- SIZE = 285,
- ADDRESS = 286,
- ENVELOPE = 287,
- BODY = 288,
- COMPARATOR = 289,
- IS = 290,
- CONTAINS = 291,
- MATCHES = 292,
- REGEX = 293,
- COUNT = 294,
- VALUE = 295,
- OVER = 296,
- UNDER = 297,
- GT = 298,
- GE = 299,
- LT = 300,
- LE = 301,
- EQ = 302,
- NE = 303,
- ALL = 304,
- LOCALPART = 305,
- DOMAIN = 306,
- USER = 307,
- DETAIL = 308,
- RAW = 309,
- TEXT = 310,
- CONTENT = 311,
- DAYS = 312,
- ADDRESSES = 313,
- SUBJECT = 314,
- FROM = 315,
- HANDLE = 316,
- MIME = 317,
- METHOD = 318,
- ID = 319,
- OPTIONS = 320,
- LOW = 321,
- NORMAL = 322,
- HIGH = 323,
- ANY = 324,
- MESSAGE = 325,
- INCLUDE = 326,
- PERSONAL = 327,
- GLOBAL = 328,
- RETURN = 329,
- COPY = 330
- };
-#endif
-/* Tokens. */
-#define NUMBER 258
-#define STRING 259
-#define IF 260
-#define ELSIF 261
-#define ELSE 262
-#define REJCT 263
-#define FILEINTO 264
-#define REDIRECT 265
-#define KEEP 266
-#define STOP 267
-#define DISCARD 268
-#define VACATION 269
-#define REQUIRE 270
-#define SETFLAG 271
-#define ADDFLAG 272
-#define REMOVEFLAG 273
-#define MARK 274
-#define UNMARK 275
-#define NOTIFY 276
-#define DENOTIFY 277
-#define ANYOF 278
-#define ALLOF 279
-#define EXISTS 280
-#define SFALSE 281
-#define STRUE 282
-#define HEADER 283
-#define NOT 284
-#define SIZE 285
-#define ADDRESS 286
-#define ENVELOPE 287
-#define BODY 288
-#define COMPARATOR 289
-#define IS 290
-#define CONTAINS 291
-#define MATCHES 292
-#define REGEX 293
-#define COUNT 294
-#define VALUE 295
-#define OVER 296
-#define UNDER 297
-#define GT 298
-#define GE 299
-#define LT 300
-#define LE 301
-#define EQ 302
-#define NE 303
-#define ALL 304
-#define LOCALPART 305
-#define DOMAIN 306
-#define USER 307
-#define DETAIL 308
-#define RAW 309
-#define TEXT 310
-#define CONTENT 311
-#define DAYS 312
-#define ADDRESSES 313
-#define SUBJECT 314
-#define FROM 315
-#define HANDLE 316
-#define MIME 317
-#define METHOD 318
-#define ID 319
-#define OPTIONS 320
-#define LOW 321
-#define NORMAL 322
-#define HIGH 323
-#define ANY 324
-#define MESSAGE 325
-#define INCLUDE 326
-#define PERSONAL 327
-#define GLOBAL 328
-#define RETURN 329
-#define COPY 330
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 2068 of yacc.c */
-#line 176 "sieve.y"
-
- int nval;
- char *sval;
- stringlist_t *sl;
- test_t *test;
- testlist_t *testl;
- commandlist_t *cl;
- struct vtags *vtag;
- struct aetags *aetag;
- struct htags *htag;
- struct btags *btag;
- struct ntags *ntag;
- struct dtags *dtag;
-
-
-
-/* Line 2068 of yacc.c */
-#line 217 "y.tab.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-extern YYSTYPE yylval;
-
-

cyrus-imapd-2.4.17.tar.gz/syslog Deleted

cyrus-imapd-2.4.17.tar.gz/syslog/Makefile.in Deleted

@@ -1,90 +0,0 @@
-# Makefile for syslog replacement
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.12 2010/01/06 17:02:00 murch Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-
-INSTALL = @INSTALL@
-RANLIB = @RANLIB@
-
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-SHELL = /bin/sh
-MAKEDEPEND = @MAKEDEPEND@
-
-all: libsyslog.a syslogd
-
-install:
-	@echo "Install syslogd and syslog.conf as appropriate"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
-
-libsyslog.a: syslog.o
-	ar cr libsyslog.a syslog.o
-	$(RANLIB) libsyslog.a
-
-syslogd: syslogd.o
-	$(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
-
-clean:
-	rm -f *.o *.a Makefile.bak
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-

cyrus-imapd-2.4.17.tar.gz/syslog/README Deleted

@@ -1,41 +0,0 @@
-$Revision: 1.1 $
-
-InterNetNews uses the "three-arg" version of syslog.  That version is
-standard with many systems (4.3BSD, SunOS4.x, etc).  Some vendors have
-not yet upgraded, however.  The principal difference between the two
-versions is that the current syslog divides reports up into "facilities."
-For example, news reports can be filed separately from mail or login
-report.
-
-If your system is running the older version of syslog, you should complain
-to your vendor.  I also encourage you to bring up the syslog that is included
-in this directory and replace what is running on your system.  The sources
-are from the freely-redistributable BSD sources, and the syslog.conf file
-matches the old actions pretty closely.
-
-If you can't replace the syslog on your machine, you can run two syslog
-daemons for awhile.  Edit syslog.c and syslogd.c so that
-    #define _PATH_LOGNAME "/dev/log"
-points to something like "/dev/newsyslog".  In syslogd.c you should also
-do the following
-	#define NO_INET_SOCKET
-this will prevent the new syslog daemon from listening on the Internet
-port (the old syslog daemon is presumably doing that).  You should also do
-	#undef _PATH_KLOG
-which will tell the daemon to not try to read Unix kernel log messages.
-Change
-    #define _PATH_LOGCONF "/etc/syslog.conf"
-    #define _PATH_LOGPID "/etc/syslog.pid"
-to something like "/etc/newsyslog.conf" and "/etc/newsyslog.pid"
-
-Finally, install the new syslogd and make sure that it is started at
-system boot time.
-
-Good luck.  I haven't tried this -- I replaced the daemon on my machines --
-but it should work without too many problems.
-
-On machines without Unix-domain sockets you can just add this line to
-the top of syslog.c:
-	#define INET_SYSLOG
-and add syslog to the INN library as exlained in the installation manual.
-	/rich $alz

cyrus-imapd-2.4.17.tar.gz/syslog/logger.1 Deleted

@@ -1,135 +0,0 @@
-.\"
-.\" Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\"
-.\" 3. The name "Carnegie Mellon University" must not be used to
-.\" endorse or promote products derived from this software without
-.\" prior written permission. For permission or any legal
-.\" details, please contact
-.\" Carnegie Mellon University
-.\" Center for Technology Transfer and Enterprise Creation
-.\" 4615 Forbes Avenue
-.\" Suite 302
-.\" Pittsburgh, PA 15213
-.\" (412) 268-7393, fax: (412) 268-7395
-.\" innovation@andrew.cmu.edu
- *
-.\" 4. Redistributions of any form whatsoever must retain the following
-.\" acknowledgment:
-.\" "This product includes software developed by Computing Services
-.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-.\"
-.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: logger.1,v 1.4 2010/01/06 17:02:00 murch Exp $
-.\"
-.\" Modified by Rich $alz <rsalz@osf.org> to be more portable to older
-.\" systems.
-.\" Copyright (c) 1983, 1990 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement: ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\" @(#)logger.1	6.6 (Berkeley) 7/24/90
-.\"
-.TH LOGGER 1 "July 24, 1990"
-.SH NAME
-logger \- make entries in the system log
-.SH SYNOPSIS
-.B logger
-
-.B \-i
-
-
-.B \-s
-
-
-.BI \-f file
-
-
-.BI \-p pri
-
-
-.BI \-t tag
-
-.I message...
-.SH DESCRIPTION
-.I Logger
-provides a shell command interface to the
-.IR syslog (3)
-system log module.
-.PP
-Options:
-.TP
-.B \-i
-Log the process id of the logger process with each line.
-.TP
-.B \-s
-Log the message to standard error, as well as the system log.
-.TP
-.BI \-f file
-Log the specified file.
-.TP
-.BI \-p pri
-Enter the message with the specified priority.
-The priority may be specified numerically or as a ``facility.level'' pair.
-For example, ``\-p local3.info'' logs the message(s) as
-.IR info rmational
-level in the
-.I local3
-facility.
-The default is ``user.notice.''
-.TP
-.BI \-t tag
-Mark every line in the log with the specified
-.IR tag .
-.TP
-.I message
-Write the message to log; if not specified, and the ``\-f'' flag is not
-provided, standard input is logged.
-.PP
-The
-.I logger
-utility exits 0 on success, and >0 if an error occurs.
-.SH EXAMPLES
-.RS
-.nf
-logger System rebooted
-
-logger \-p local0.notice \-t HOSTIDM \-f /dev/idmc
-.fi
-.DE
-.SH "SEE ALSO"
-.syslog(3),
-syslogd(8)
-.SH STANDARDS
-The logger function is expected to be POSIX 1003.2 compatible.

cyrus-imapd-2.4.17.tar.gz/syslog/logger.c Deleted

@@ -1,237 +0,0 @@
-/* $Revision: 1.5 $
-** Modified by Rich $alz <rsalz@osf.org> to be more portable to older
-** systems.
-*/
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: logger.c,v 1.5 2010/01/06 17:02:00 murch Exp $
- */
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement: ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-char copyright =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid = "@(#)logger.c	6.14 (Berkeley) 6/1/90";
-#endif /* not lint */
-
-#include <stdio.h>
-#define SYSLOG_NAMES
-#include "syslog.h"
-#include <ctype.h>
-
-/*
-** LOGGER -- read and log utility
-**
-**	This routine reads from an input and arranges to write the
-**	result on the system log, along with a useful tag.
-*/
-
-/*
-** Return a string representation of errno.
-*/
-static char *
-xstrerror(e)
- int		e;
-{
- extern int	sys_nerr;
- extern char	*sys_errlist;
- static char	buff30;
-
- if (e >= 0 && e < sys_nerr)
-	return sys_errliste;
- (void)sprintf(buff, "Error code %d\n", e);
- return buff;
-}
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	extern char *optarg;
-	extern int errno, optind;
-	int pri = LOG_NOTICE;
-	int ch, logflags = 0;
-	char *tag, buf1024, *getlogin();
-
-	tag = NULL;
-	while ((ch = getopt(argc, argv, "f:ip:st:")) != EOF)
-		switch((char)ch) {
-		case 'f':		/* file to log */
-			if (freopen(optarg, "r", stdin) == NULL) {
-				(void)fprintf(stderr, "logger: %s: %s.\n",
-				 optarg, xstrerror(errno));
-				exit(1);
-			}
-			break;
-		case 'i':		/* log process id also */
-			logflags |= LOG_PID;
-			break;
-		case 'p':		/* priority */
-			pri = pencode(optarg);
-			break;
-		case 's':		/* log to standard error */
-			logflags |= LOG_PERROR;
-			break;
-		case 't':		/* tag */
-			tag = optarg;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	/* setup for logging */
-	openlog(tag ? tag : getlogin(), logflags, 0);
-	(void) fclose(stdout);
-
-	/* log input line if appropriate */
-	if (argc > 0) {
-		register char *p, *endp;
-		int len;
-
-		for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) {
-			len = strlen(*argv);
-			if (p + len > endp && p > buf) {
-				syslog(pri, "%s", buf);
-				p = buf;
-			}
-			if (len > sizeof(buf) - 1)
-				syslog(pri, "%s", *argv++);
-			else {
-				if (p != buf)
-					*p++ = ' ';
-				bcopy(*argv++, p, len);
-				*(p += len) = '\0';
-			}
-		}
-		if (p != buf)
-			syslog(pri, "%s", buf);
-		exit(0);
-	}
-
-	/* main loop */
-	while (fgets(buf, sizeof(buf), stdin) != NULL)
-		syslog(pri, "%s", buf);
-
-	exit(0);
-}
-
-
-/*
- * Decode a symbolic name to a numeric value
- */
-pencode(s)
-	register char *s;
-{
-	char *save;
-	int fac, lev;
-
-	for (save = s; *s && *s != '.'; ++s);
-	if (*s) {
-		*s = '\0';
-		fac = decode(save, facilitynames);
-		if (fac < 0)
-			bailout("unknown facility name: ", save);
-		*s++ = '.';
-	}
-	else {
-		fac = 0;
-		s = save;
-	}
-	lev = decode(s, prioritynames);
-	if (lev < 0)
-		bailout("unknown priority name: ", save);
-	return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
-}
-
-
-decode(name, codetab)
-	char *name;
-	CODE *codetab;
-{
-	register CODE *c;
-
-	if (isdigit(*name))
-		return (atoi(name));
-
-	for (c = codetab; c->c_name; c++)
-		if (!strcasecmp(name, c->c_name))
-			return (c->c_val);
-
-	return (-1);
-}
-
-bailout(msg, arg)
-	char *msg, *arg;
-{
-	fprintf(stderr, "logger: %s%s\n", msg, arg);
-	exit(1);
-}
-
-usage()
-{
-	fputs("logger: -i -f file -p pri -t tag message ... \n",
-	 stderr);
-	exit(1);
-}

cyrus-imapd-2.4.17.tar.gz/syslog/syslog.3 Deleted

@@ -1,278 +0,0 @@
-.\" 
-.\" Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer. 
-.\"
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\"
-.\" 3. The name "Carnegie Mellon University" must not be used to
-.\" endorse or promote products derived from this software without
-.\" prior written permission. For permission or any other legal
-.\" details, please contact 
-.\" Office of Technology Transfer
-.\" Carnegie Mellon University
-.\" 5000 Forbes Avenue
-.\" Pittsburgh, PA 15213-3890
-.\" (412) 268-4387, fax: (412) 268-7395
-.\" tech-transfer@andrew.cmu.edu
-.\"
-.\" 4. Redistributions of any form whatsoever must retain the following
-.\" acknowledgment:
-.\" "This product includes software developed by Computing Services
-.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-.\"
-.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\" 
-.\" $Revision: 1.2 $
-.\" Copyright (c) 1985 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement: ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\"	@(#)syslog.3	6.13 (Berkeley) 6/23/90
-.\"
-.TH SYSLOG 3 "June 23, 1990"
-.UC 5
-.SH NAME
-syslog, openlog, closelog, setlogmask, vsyslog \- control system log
-.SH SYNOPSIS
-.B "#include <syslog.h>
-.PP
-.B "openlog(ident, logopt, facility)
-.br
-.B "char *ident;
-.PP
-.B "syslog(priority, message, parameters ... )
-.br
-.B "int priority;
-.br
-.B "char *message;
-.PP
-.B "#include <varargs.h>
-.br
-.B "vsyslog(priority, message, args)
-.br
-.B "int priority;
-.br
-.B "char *message;
-.br
-.B "va_list args;
-.PP
-.B "closelog()
-.PP
-.B "setlogmask(maskpri)
-.SH DESCRIPTION
-.I Syslog
-arranges to write
-.I message
-onto the system log maintained by
-.IR syslogd (8).
-The message is tagged with
-.IR priority .
-The message looks like a
-.IR printf (3)
-string except that
-.B %m
-is replaced by the current error message (as referenced by
-.IR errno ).
-A trailing newline is added if needed.
-An alternate form, in which the arguments have already been captured
-using the variable-length argument facilities of
-.IR varargs (3),
-is available under the name
-.IR vsyslog .
-.PP
-This message will be read by
-.IR syslogd (8)
-and written to the system console, log files, or forwarded to
-.I syslogd
-on another host as appropriate.
-.PP
-Priorities are encoded as a
-.I facility
-and a
-.IR level .
-The facility describes the part of the system
-generating the message.
-The level is selected from an ordered list:
-.TP
-LOG_ALERT
-A condition that should be corrected immediately,
-such as a corrupted system database.
-.TP
-LOG_CRIT
-Critical conditions,
-e.g., hard device errors.
-.TP
-LOG_DEBUG
-Messages that contain information
-normally of use only when debugging a program.
-.TP
-LOG_EMERG
-A panic condition.
-This is normally broadcast to all users.
-.TP
-LOG_ERR
-Errors.
-.TP
-LOG_INFO
-Informational messages.
-.TP
-LOG_NOTICE
-Conditions that are not error conditions,
-but should possibly be handled specially.
-.TP
-LOG_WARNING
-Warning messages.
-.PP
-If
-.I syslog
-cannot pass the message to
-.IR syslogd ,
-it will attempt to write the message to the console (``/dev/console'')
-if the LOG_CONS option is set (see below).
-.PP
-If special processing is needed,
-.I openlog
-can be called to initialize the log file.
-The parameter
-.I ident
-is a string that is prepended to every message.
-.I Logopt
-is a bit field indicating logging options.
-Current values for
-.I logopt
-are:
-.TP
-LOG_CONS
-If unable to send the message to
-.IR syslogd ,
-write it to the console.
-.TP
-LOG_NDELAY 
-Open the connection to
-.I syslogd
-immediately.
-Normally the open is delayed
-until the first message is logged.
-Useful for programs that need to manage the
-order in which file descriptors are allocated.
-.TP
-LOG_PERROR
-Write the message to stderr as well to the system log.
-.TP
-LOG_PID
-Log the process id with each message:
-useful for identifying instantiations of daemons.
-.PP
-The
-.I facility
-parameter encodes a default facility to be assigned to all messages
-that do not have an explicit facility encoded:
-.TP
-LOG_AUTH
-The authorization system:
-.IR login (1),
-.IR su (1),
-.IR getty (8),
-etc.
-.TP
-LOG_CRON
-The clock daemon.
-.TP
-LOG_DAEMON
-System daemons, such as
-.IR ftpd (8),
-.IR routed (8),
-etc, that are not provided for explicitly by other facilities.
-.TP
-LOG_KERN
-Messages generated by the kernel.
-These cannot be generated by any user processes.
-.TP
-LOG_LPR
-The line printer spooling system:
-.IR lpr (1),
-.IR lpc (8),
-.IR lpd (8),
-etc.
-.TP
-LOG_MAIL
-The mail system.
-.TP
-LOG_NEWS
-The network news system.
-.TP
-LOG_SYSLOG
-Messages generated internally by
-.IR syslogd (8).
-.TP
-LOG_USER
-Messages generated by random user processes.
-This is the default facility identifier if none is specified.
-.TP
-LOG_UUCP
-The uucp system.
-.TP
-LOG_LOCAL0
-Reserved for local use.
-Similarly for LOG_LOCAL1 through LOG_LOCAL7.
-.PP
-.I Closelog
-can be used to close the log file.
-.PP
-.I Setlogmask
-sets the log priority mask to
-.I maskpri
-and returns the previous mask.
-Calls to
-.I syslog
-with a priority not set in
-.I maskpri
-are rejected.
-The mask for an individual priority
-.I pri
-is calculated by the macro LOG_MASK(\fIpri\fP);
-the mask for all priorities up to and including
-.I toppri
-is given by the macro LOG_UPTO(\fItoppri\fP).
-The default allows all priorities to be logged.
-.SH EXAMPLES
-.nf
-syslog(LOG_ALERT, "who: internal error 23");
-
-openlog("ftpd", LOG_PID, LOG_DAEMON);
-setlogmask(LOG_UPTO(LOG_ERR));
-syslog(LOG_INFO, "Connection from host %d", CallingHost);
-
-syslog(LOG_INFO|LOG_LOCAL2, "foobar error: %m");
-.fi
-.SH "SEE ALSO"
-logger(1),
-syslogd(8)

cyrus-imapd-2.4.17.tar.gz/syslog/syslog.c Deleted

@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 1983, 1988, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid = "@(#)syslog.c 8.8 (Berkeley) 8/30/95";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <syslog.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifdef BSD4_4
-# include <paths.h>
-#else
-# ifndef _PATH_CONSOLE
-# define _PATH_CONSOLE "/dev/console"
-# endif
-# ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-# endif
-#endif
-
-#ifdef HAVE_STDARG_H
-# include <stdarg.h>
-#else
-# include <varargs.h>
-# define const /* */
-#endif
-
-#ifndef USESNPRINTF
-# if defined(BSD4_4)
-# define USESNPRINTF 1 /* has snprintf(3), vsnprintf(3), etc. */
-# else
-# define USESNPRINTF 0 /* cheesy old C library */
-# endif
-#endif
-
-#ifndef LOG_PRI
-# define LOG_PRI(p) ((p) & LOG_PRIMASK)
-#endif
-
-#ifndef LOG_PERROR
-# define LOG_PERROR 0
-#endif
-
-#define BUFSLOP 1024 /* overflow space */
-
-static int LogFile = -1; /* fd for log */
-static int connected; /* have done connect */
-static int LogStat = 0; /* status bits, set by openlog() */
-static const char *LogTag = NULL; /* string to tag the entry with */
-static int LogFacility = LOG_USER; /* default facility code */
-static int LogMask = 0xff; /* mask of priorities to be logged */
-#if defined(BSD4_4)
-extern char *__progname; /* Program name, from crt0. */
-#else
-char *__progname = NULL;
-#endif
-
-/*
- * syslog, vsyslog --
- * print message on log file; output is intended for syslogd(8).
- */
-void
-#if __STDC__
-syslog(int pri, const char *fmt, ...)
-#else
-syslog(pri, fmt, va_alist)
- int pri;
- char *fmt;
- va_dcl
-#endif
-{
- va_list ap;
- extern void vsyslog();
-
-#if __STDC__
- va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
- vsyslog(pri, fmt, ap);
- va_end(ap);
-}
-
-void
-vsyslog(pri, fmt, ap)
- int pri;
- register const char *fmt;
- va_list ap;
-{
- register int cnt;
- register char ch, *p, *t;
- time_t now;
- int fd, saved_errno;
- int panic = 0;
- static int maxsend = BUFSIZ;
- char *stdp, fmt_cpy1024, tbufBUFSIZ + BUFSLOP;
- extern void openlog();
-
-#define INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- /* Check for invalid bits. */
- if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
- syslog(INTERNALLOG,
- "syslog: unknown facility/priority: %x", pri);
- pri &= LOG_PRIMASK|LOG_FACMASK;
- }
-
- /* Check priority against setlogmask values. */
- if (!(LOG_MASK(LOG_PRI(pri)) & LogMask))
- return;
-
- saved_errno = errno;
-
- /* Set default facility if none specified. */
- if ((pri & LOG_FACMASK) == 0)
- pri |= LogFacility;
-
- /* Get connected. */
- if (!connected)
- openlog(LogTag, LogStat | LOG_NDELAY, 0);
-
- /* Build the message. */
- (void)time(&now);
- sprintf(tbuf, "<%d>", pri);
- p = tbuf + strlen(tbuf);
- strftime(p, sizeof (tbuf) - (p - tbuf), "%h %d %T ", localtime(&now));
- p += strlen(p);
- stdp = p;
- if (LogTag == NULL)
- LogTag = __progname;
- if (LogTag != NULL) {
- sprintf(p, "%s", LogTag);
- p += strlen(p);
- }
- if (LogStat & LOG_PID) {
- sprintf(p, "%d", getpid());
- p += strlen(p);
- }
- if (LogTag != NULL) {
- *p++ = ':';
- *p++ = ' ';
- }
-
- /* Substitute error message for %m. */
- for (t = fmt_cpy; ch = *fmt; ++fmt)
- if (ch == '%' && fmt1 == 'm') {
- ++fmt;
- sprintf(t, "%s", strerror(saved_errno));
- t += strlen(t);
- } else
- *t++ = ch;
- *t = '\0';
-
-#if USESNPRINTF
- cnt = maxsend - (p - tbuf) + 1;
- p += vsnprintf(p, cnt, fmt_cpy, ap);
- cnt = p - tbuf;
-#else
- vsprintf(p, fmt_cpy, ap);
- p += strlen(p);
- cnt = p - tbuf;
- if (cnt > sizeof tbuf) {
- /* Panic condition. */
- panic = 1;
- }
- if (cnt > maxsend)
- cnt = maxsend;
-#endif
-
- /* Output to stderr if requested. */
- if (LogStat & LOG_PERROR) {
- struct iovec iov2;
- register struct iovec *v = iov;
-
- v->iov_base = stdp;
- v->iov_len = cnt - (stdp - tbuf);
- ++v;
- v->iov_base = "\n";
- v->iov_len = 1;
- (void)writev(STDERR_FILENO, iov, 2);
- }
-
- /* Output the message to the local logger. */
- for (;;) {
- if (send(LogFile, tbuf, cnt, 0) >= 0)
- goto done;
- if (errno != EMSGSIZE || maxsend <= 256)
- break;
-
- /* Message was too large -- back it off. */
- do {
- maxsend -= 128;
- } while (cnt < maxsend && maxsend > 256);
- cnt = maxsend;
- }
-
- /*
- * Output the message to the console; don't worry about blocking,
- * if console blocks everything will. Make sure the error reported
- * is the one from the syslogd failure.
- */
- if (LogStat & LOG_CONS &&
- (fd = open(_PATH_CONSOLE, O_WRONLY, 0)) >= 0) {
- (void)strcat(tbuf, "\r\n");
- cnt += 2;
- p = strchr(tbuf, '>') + 1;
- (void)write(fd, p, cnt - (p - tbuf));
- (void)close(fd);
- }
-
- done:
-#if !USESNPRINTF
- /*
- * If we had a buffer overrun, log a panic and abort.
- * We can't return because our stack is probably toast.
- */
- if (panic) {
- syslog(LOG_EMERG, "SYSLOG BUFFER OVERRUN -- EXITING");
- abort();
- }
-#endif
-}
-
-static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
-
-void
-openlog(ident, logstat, logfac)
- const char *ident;
- int logstat, logfac;
-{
- if (ident != NULL)
- LogTag = ident;
- LogStat = logstat;
- if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
- LogFacility = logfac;
-
- if (LogFile == -1) {
- SyslogAddr.sa_family = AF_UNIX;
- (void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
- sizeof(SyslogAddr.sa_data));
- if (LogStat & LOG_NDELAY) {
- if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
- return;
- (void)fcntl(LogFile, F_SETFD, 1);
- }
- }
- if (LogFile != -1 && !connected)
- if (connect(LogFile, &SyslogAddr, sizeof(SyslogAddr)) == -1) {
- (void)close(LogFile);
- LogFile = -1;
- } else
- connected = 1;
-}
-
-void
-closelog()
-{
- (void)close(LogFile);
- LogFile = -1;
- connected = 0;
-}
-
-/* setlogmask -- set the log mask level */
-int
-setlogmask(pmask)
- int pmask;
-{
- int omask;
-
- omask = LogMask;
- if (pmask != 0)
- LogMask = pmask;
- return (omask);
-}
-

cyrus-imapd-2.4.17.tar.gz/syslog/syslog.conf Deleted

cyrus-imapd-2.4.17.tar.gz/syslog/syslog.h Deleted

@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: syslog.h,v 1.5 2010/01/06 17:02:00 murch Exp $
- */
-
-/* $Revision: 1.5 $
- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents. Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement: This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software. Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *	@(#)syslog.h	7.16 (Berkeley) 6/28/90
- */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number). Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code. This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x007	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI(LOG_NFACILITIES, 0)
-typedef struct _code {
-	char	*c_name;
-	int	c_val;
-} CODE;
-
-CODE prioritynames = {
-	"alert",	LOG_ALERT,
-	"crit",		LOG_CRIT,
-	"debug",	LOG_DEBUG,
-	"emerg",	LOG_EMERG,
-	"err",		LOG_ERR,
-	"error",	LOG_ERR,		/* DEPRECATED */
-	"info",		LOG_INFO,
-	"none",		INTERNAL_NOPRI,		/* INTERNAL */
-	"notice",	LOG_NOTICE,
-	"panic", 	LOG_EMERG,		/* DEPRECATED */
-	"warn",		LOG_WARNING,		/* DEPRECATED */
-	"warning",	LOG_WARNING,
-	NULL,		-1,
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(15<<3)	/* clock daemon */
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-CODE facilitynames = {
-	"auth",		LOG_AUTH,
-	"cron", 	LOG_CRON,
-	"daemon",	LOG_DAEMON,
-	"kern",		LOG_KERN,
-	"lpr",		LOG_LPR,
-	"mail",		LOG_MAIL,
-	"mark", 	INTERNAL_MARK,		/* INTERNAL */
-	"news",		LOG_NEWS,
-	"security",	LOG_AUTH,		/* DEPRECATED */
-	"syslog",	LOG_SYSLOG,
-	"user",		LOG_USER,
-	"uucp",		LOG_UUCP,
-	"local0",	LOG_LOCAL0,
-	"local1",	LOG_LOCAL1,
-	"local2",	LOG_LOCAL2,
-	"local3",	LOG_LOCAL3,
-	"local4",	LOG_LOCAL4,
-	"local5",	LOG_LOCAL5,
-	"local6",	LOG_LOCAL6,
-	"local7",	LOG_LOCAL7,
-	NULL,		-1,
-};
-#endif
-
-#ifdef KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */

cyrus-imapd-2.4.17.tar.gz/syslog/syslogd.8 Deleted

@@ -1,239 +0,0 @@
-.\"
-.\" Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\"
-.\" 3. The name "Carnegie Mellon University" must not be used to
-.\" endorse or promote products derived from this software without
-.\" prior written permission. For permission or any legal
-.\" details, please contact
-.\" Carnegie Mellon University
-.\" Center for Technology Transfer and Enterprise Creation
-.\" 4615 Forbes Avenue
-.\" Suite 302
-.\" Pittsburgh, PA 15213
-.\" (412) 268-7393, fax: (412) 268-7395
-.\" innovation@andrew.cmu.edu
- *
-.\" 4. Redistributions of any form whatsoever must retain the following
-.\" acknowledgment:
-.\" "This product includes software developed by Computing Services
-.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-.\"
-.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: syslogd.8,v 1.4 2010/01/06 17:02:00 murch Exp $
-.\"
-.\" Copyright (c) 1983, 1986 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement: ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\"	@(#)syslogd.8	6.8 (Berkeley) 6/27/90
-.\"
-.TH SYSLOGD 8 "June 27, 1990"
-.UC 5
-.SH NAME
-syslogd \- log systems messages
-.SH SYNOPSIS
-.B syslogd
-
-.BI \-f configfile
- 
-.BI \-m markinterval
- 
-.B \-d
-
-.SH DESCRIPTION
-.I Syslogd
-reads and logs messages into a set of files
-described by the configuration file
-/etc/syslog.conf.
-Each message is one line.
-A message can contain a priority code,
-marked by a number in angle braces
-at the beginning of the line.
-Priorities are defined in
-.RI < sys/syslog.h >.
-.I Syslogd
-reads from the UNIX domain socket
-.IR /dev/log ,
-from an Internet domain socket specified in
-.IR /etc/services ,
-and from the special device
-.I /dev/klog
-(to read kernel messages).
-.PP
-.I Syslogd
-configures when it starts up
-and whenever it receives a hangup signal.
-Lines in the configuration file have a
-.I selector
-to determine the message priorities to which the line applies
-and an
-.IR action .
-The
-.I action
-field are separated from the selector by one or more tabs.
-.PP
-Selectors are semicolon separated lists of priority specifiers.
-Each priority has a
-.I facility
-describing the part of the system that generated the message,
-a dot,
-and a
-.I level
-indicating the severity of the message.
-Symbolic names may be used.
-An asterisk selects all facilities.
-All messages of the specified level or higher (greater severity)
-are selected.
-More than one facility may be selected using commas to separate them.
-For example:
-.PP
-.ti +5
-*.emerg;mail,daemon.crit
-.PP
-Selects all facilities at the
-.I emerg
-level and the
-.I mail
-and
-.I daemon
-facilities at the
-.I crit
-level.
-.PP
-Known facilities and levels
-recognized by
-.I syslogd
-are those listed in
-.IR syslog (3)
-without the leading ``LOG_''.
-The additional facility
-``mark'' has a message at priority LOG_INFO sent to it every
-20 minutes
-(this may be changed with the
-.B \-m
-flag).
-The ``mark'' facility is not enabled by a facility field containing an asterisk.
-The level ``none'' may be used to disable a particular facility.
-For example,
-.PP
-.ti +5
-*.debug;mail.none
-.PP
-Sends all messages
-.I except
-mail messages to the selected file.
-.PP
-The second part of each line describes where the message is to be logged
-if this line is selected.
-There are four forms:
-.IP \(bu 3n
-A filename (beginning with a leading slash).
-The file will be opened in append mode.
-.IP \(bu 3n
-A hostname preceeded by an at sign (``@'').
-Selected messages are forwarded to the
-.I syslogd
-on the named host.
-.IP \(bu 3n
-A comma separated list of users.
-Selected messages are written to those users
-if they are logged in.
-.IP \(bu 3n
-An asterisk.
-Selected messages are written to all logged-in users.
-.PP
-Blank lines and lines beginning with `#' are ignored.
-.PP
-For example, the configuration file:
-.PP
-.nf
-.ta 4m +\w'*.alert,auth.warning'u+3
-	kern,mark.debug	/dev/console
-	*.notice;mail.info	/var/log/maillog
-	*.crit	/var/log/critical
-	kern.err	@ucbarpa
-	*.emerg	*
-	*.alert	eric,kridle
-	*.alert;auth.warning	ralph
-.fi
-.PP
-logs all kernel messages
-and 20 minute marks onto the system console,
-all notice (or higher) level messages and all mail system messages
-except debug messages
-into the file /var/log/maillog,
-and all critical messages
-into /var/log/critical;
-kernel messages of error severity or higher are forwarded
-to ucbarpa.
-All users will be informed of any emergency messages,
-the users ``eric'' and ``kridle''
-will be informed of any alert messages,
-and the user ``ralph''
-will be informed of any alert message,
-or any warning message (or higher)
-from the authorization system.
-.PP
-The flags are:
-.TP 0.5i
-.B \-f
-Specify an alternate configuration file.
-.TP
-.B \-m
-Select the number of minutes between mark messages.
-.TP
-.B \-d
-Turn on debugging.
-.PP
-.I Syslogd
-creates the file /var/run/syslog.pid, if possible,
-containing a single line with its process id.
-This can be used to kill or reconfigure
-.I syslogd.
-.PP
-To bring
-.I syslogd
-down,
-it should be sent a terminate signal (e.g. kill \`cat /var/run/syslog.pid\`).
-.SH FILES
-.ta \w'/etc/syslog.conf 'u
-.nf
-/etc/syslog.conf	the configuration file
-/var/run/syslog.pid	the process id
-/dev/log	Name of the UNIX domain datagram log socket
-/dev/klog	The kernel log device
-.fi
-.SH SEE ALSO
-logger(1), syslog(3)

cyrus-imapd-2.4.17.tar.gz/syslog/syslogd.c Deleted

@@ -1,1431 +0,0 @@
-/*
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: syslogd.c,v 1.5 2010/01/06 17:02:00 murch Exp $
- */
-/*
-** This file has been modified to get it to compile more easily
-** on pre-4.4BSD (e.g., SysVr4 :-) systems. Rich $alz, June 1991.
-*/
-
- /* change these three if you must keep running an old syslog. */
-#define	_PATH_LOGFILE	"/dev/log"
-#define	_PATH_LOGCONF	"/etc/syslog.conf"
-#define	_PATH_LOGPID	"/etc/syslog.pid"
-
- /* #define this to enable verbose debugging of all messages. */
-#undef VERBOSE_DEBUG
- /* #define this to line to listen on the INET port. */
-#undef DO_INET_SOCKET
- /* #undef this to not read kernel syslog messages. */
-#define	_PATH_KLOG	"/dev/klog"
-#undef _PATH_KLOG
- /* set this depending on what your sighandler is. */
- /* =()<#define SIGHANDLER	@<SIGHANDLER>@>()= */
-#define SIGHANDLER	void
- /* if you need various BSD functions, set this. */
-#define NEED_BZERO_ETC
-
- /* Use "union wait" instead of int? */
- /* =()<#define @<USE_UNION_WAIT>@_USE_UNION_WAIT>()= */
-#define DO_USE_UNION_WAIT
-#if	defined(DO_USE_UNION_WAIT)
-#define WAITVALUE	union wait
-#else
-#define WAITVALUE	int
-#endif	/* defined(DO_USE_UNION_WAIT) */
-
-/*
- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-char copyright =
-"@(#) Copyright (c) 1983, 1988 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid = "@(#)syslogd.c	5.42 (Berkeley) 6/29/90";
-#endif /* not lint */
-
-/*
- * syslogd -- log system messages
- *
- * This program implements a system log. It takes a series of lines.
- * Each line may have a priority, signified as "<n>" as
- * the first characters of the line. If this is
- * not present, a default priority is used.
- *
- * To kill syslogd, send a signal 15 (terminate). A signal 1 (hup) will
- * cause it to reread its configuration file.
- *
- * Defined Constants:
- *
- * MAXLINE -- the maximimum line length that can be handled.
- * DEFUPRI -- the default priority for user messages
- * DEFSPRI -- the default priority for kernel messages
- *
- * Author: Eric Allman
- * extensive changes by Ralph Campbell
- * more extensive changes by Eric Allman (again)
- */
-
-#define	MAXLINE		1024		/* maximum line length */
-#define	MAXSVLINE	120		/* maximum saved line length */
-#define DEFUPRI		(LOG_USER|LOG_NOTICE)
-#define DEFSPRI		(LOG_KERN|LOG_CRIT)
-#define TIMERINTVL	30		/* interval for checking flush, mark */
-
-#include <sys/param.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/signal.h>
-
-#ifdef	MSG_BSIZE
-#undef	MSG_BSIZE
-#endif
-#define MSG_BSIZE	4096
-
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include <utmp.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#define SYSLOG_NAMES
-#include "syslog.h"
-
-#define UT_NAMESIZE	8
-#define	_PATH_UTMP	"/etc/utmp"
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_CONSOLE	"/dev/console"
-
-#ifndef sigmask
-#define sigmask(m) (1 << ((m)-1))
-#endif
-char	*LogName = _PATH_LOGFILE;
-char	*ConfFile = _PATH_LOGCONF;
-char	*PidFile = _PATH_LOGPID;
-char	ctty = _PATH_CONSOLE;
-
-#define FDMASK(fd)	(1 << (fd))
-
-#define	dprintf		if (Debug) printf
-
-#define MAXUNAMES	20	/* maximum number of user names */
-
-#ifdef NEED_BZERO_ETC
-#include <fcntl.h>
-bzero(b, length)
- char *b;
- int length;
-{
- while (--length >= 0)
-	*b++ = '\0';
-}
-bcopy(b1, b2, length)
- char *b1;
- char *b2;
- int length;
-{
- while (--length >= 0)
-	*b2++ = *b1++;
-}
-setlinebuf(f)
- FILE *f;
-{
- setbuf(f, (char *)NULL);
-}
-wait3(status, flags, np)
- WAITVALUE *status;
- int flags;
- struct rusage *np;
-{
- return waitpid(-1, status, WNOHANG);
-}
-
-/* Not a general mask handler -- it know what we call, below. */
-SIGHANDLER (*oldhup)(), (*oldalrm)();
-int
-sigsetmask(omask)
- int omask;
-{
- if (omask & sigmask(SIGHUP))
-	(void) signal(SIGHUP, oldhup);
- if (omask & sigmask(SIGALRM))
-	(void) signal(SIGALRM, oldalrm);
-}
-int
-sigblock(mask)
- int mask;
-{
- if (mask & sigmask(SIGHUP))
-	oldhup = signal(SIGHUP, SIG_IGN);
- if (mask & sigmask(SIGALRM))
-	oldhup = signal(SIGALRM, SIG_IGN);
-}
-#endif
-
-/*
- * Flags to logmsg().
- */
-
-#define IGN_CONS	0x001	/* don't print on console */
-#define SYNC_FILE	0x002	/* do fsync on file after printing */
-#define ADDDATE		0x004	/* add a date to the message */
-#define MARK		0x008	/* this message is a mark */
-
-/*
- * This structure represents the files that will have log
- * copies printed.
- */
-
-struct filed {
-	struct	filed *f_nextone;	/* next in linked list */
-	short	f_type;			/* entry type, see below */
-	short	f_file;			/* file descriptor */
-	time_t	f_time;			/* time this was last written */
-	u_char	f_pmaskLOG_NFACILITIES+1;	/* priority mask */
-	union {
-		char	f_unameMAXUNAMESUT_NAMESIZE+1;
-		struct {
-			char	f_hnameMAXHOSTNAMELEN+1;
-			struct sockaddr_in	f_addr;
-		} f_forw;		/* forwarding address */
-		char	f_fnameMAXPATHLEN;
-	} f_un;
-	char	f_prevlineMAXSVLINE;		/* last message logged */
-	char	f_lasttime16;			/* time of last occurrence */
-	char	f_prevhostMAXHOSTNAMELEN+1;	/* host from which recd. */
-	int	f_prevpri;			/* pri of f_prevline */
-	int	f_prevlen;			/* length of f_prevline */
-	int	f_prevcount;			/* repetition cnt of prevline */
-	int	f_repeatcount;			/* number of "repeated" msgs */
-};
-
-/*
- * Intervals at which we flush out "message repeated" messages,
- * in seconds after previous message is logged. After each flush,
- * we move to the next interval until we reach the largest.
- */
-int	repeatinterval = { 30, 120, 600 };	/* # of secs before flush */
-#define	MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval0)) - 1)
-#define	REPEATTIME(f)	((f)->f_time + repeatinterval(f)->f_repeatcount)
-#define	BACKOFF(f)	{ if (++(f)->f_repeatcount > MAXREPEAT) \
-				 (f)->f_repeatcount = MAXREPEAT; \
-			}
-
-/* values for f_type */
-#define F_UNUSED	0		/* unused entry */
-#define F_FILE		1		/* regular file */
-#define F_TTY		2		/* terminal */
-#define F_CONSOLE	3		/* console terminal */
-#define F_FORW		4		/* remote machine */
-#define F_USERS		5		/* list of users */
-#define F_WALL		6		/* everyone logged on */
-
-char	*TypeNames7 = {
-	"UNUSED",	"FILE",		"TTY",		"CONSOLE",
-	"FORW",		"USERS",	"WALL"
-};
-
-struct	filed *Files;
-struct	filed consfile;
-
-int	Debug;			/* debug flag */
-char	LocalHostNameMAXHOSTNAMELEN+1;	/* our hostname */
-char	*LocalDomain;		/* our local domain name */
-int	InetInuse = 0;		/* non-zero if INET sockets are being used */
-int	finet;			/* Internet datagram socket */
-int	LogPort;		/* port number for INET connections */
-int	Initialized = 0;	/* set when we have initialized ourselves */
-int	MarkInterval = 20 * 60;	/* interval between marks in seconds */
-int	MarkSeq = 0;		/* mark sequence number */
-
-extern	int errno;
-extern	char *ctime(), *strchr(), *malloc();
-SIGHANDLER die(), domark(), init(), reapchild();
-
-int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	register int i;
-	register char *p;
-	int funix, inetm, fklog, klogm, len;
-	struct sockaddr_un sunx, fromunix;
-	struct sockaddr_in sin, frominet;
-	FILE *fp;
-	int ch;
-	char lineMSG_BSIZE + 1;
-	extern int optind;
-	extern char *optarg;
-
-	while ((ch = getopt(argc, argv, "df:m:p:")) != EOF)
-		switch((char)ch) {
-		case 'd':		/* debug */
-			Debug++;
-			break;
-		case 'f':		/* configuration file */
-			ConfFile = optarg;
-			break;
-		case 'm':		/* mark interval */
-			MarkInterval = atoi(optarg) * 60;
-			break;
-		case 'p':		/* path */
-			LogName = optarg;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	if (argc -= optind)
-		usage();
-
-	if (!Debug)
-		daemon(0, 0);
-	else
-		setlinebuf(stdout);
-
-	consfile.f_type = F_CONSOLE;
-	(void) strcpy(consfile.f_un.f_fname, ctty);
-	(void) gethostname(LocalHostName, sizeof LocalHostName);
-	if (p = strchr(LocalHostName, '.')) {
-		*p++ = '\0';
-		LocalDomain = p;
-	}
-	else
-		LocalDomain = "";
-	(void) signal(SIGTERM, die);
-	if (Debug) {
-	 (void) signal(SIGINT, die);
-	 (void) signal(SIGQUIT, die);
-	}
-	else {
-	 (void) signal(SIGINT, SIG_IGN);
-	 (void) signal(SIGQUIT, SIG_IGN);
-	}
-	(void) signal(SIGCHLD, reapchild);
-	(void) signal(SIGALRM, domark);
-	(void) alarm(TIMERINTVL);
-	(void) unlink(LogName);
-
-	bzero((char *)&sunx, sizeof(sunx));
-	sunx.sun_family = AF_UNIX;
-	(void) strncpy(sunx.sun_path, LogName, sizeof sunx.sun_path);
-	funix = socket(AF_UNIX, SOCK_DGRAM, 0);
-	if (funix < 0 || bind(funix, (struct sockaddr *) &sunx,
-	 sizeof(sunx)) < 0 ||
-	 chmod(LogName, 0666) < 0) {
-		(void) sprintf(line, "cannot create %s", LogName);
-		logerror(line);
-		dprintf("cannot create %s (%d)\n", LogName, errno);
-		die(0);
-	}
-#ifdef	DO_INET_SOCKET
-	finet = socket(AF_INET, SOCK_DGRAM, 0);
-	if (finet >= 0) {
-		struct servent *sp;
-
-		sp = getservbyname("syslog", "udp");
-		if (sp == NULL) {
-			errno = 0;
-			logerror("syslog/udp: unknown service");
-			die(0);
-		}
-		bzero((char *)&sin, sizeof(sin)); /* added uunet!rbj */
-		sin.sin_family = AF_INET;
-		sin.sin_addr.s_addr = INADDR_ANY;
-		sin.sin_port = LogPort = htons(sp->s_port);
-		if (bind(finet, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-			logerror("bind");
-			if (!Debug)
-				die(0);
-		} else {
-			inetm = FDMASK(finet);
-			InetInuse = 1;
-		}
-	}
-#else
-	finet = -1;
-	inetm = 0;
-#endif	/* DO_INET_SOCKET */
-#ifdef	_PATH_KLOG
-	if ((fklog = open(_PATH_KLOG, O_RDONLY, 0)) >= 0)
-		klogm = FDMASK(fklog);
-	else {
-		dprintf("can't open %s (%d)\n", _PATH_KLOG, errno);
-		klogm = 0;
-	}
-#else
-	fklog = -1;
-	klogm = 0;
-#endif	/* _PATH_KLOG */
-
-	/* tuck my process id away */
-	fp = fopen(PidFile, "w");
-	if (fp != NULL) {
-		fprintf(fp, "%d\n", getpid());
-		(void) fclose(fp);
-	}
-
-	dprintf("off & running....\n");
-
-	init();
-	(void) signal(SIGHUP, init);
-
-	for (;;) {
-		int nfds, readfds = FDMASK(funix) | inetm | klogm;
-
-		errno = 0;
-		dprintf("readfds = %#x\n", readfds);
-		nfds = select(20, (fd_set *) &readfds, (fd_set *) NULL,
-		 (fd_set *) NULL, (struct timeval *) NULL);
-		if (nfds == 0)
-			continue;
-		if (nfds < 0) {
-			if (errno != EINTR)
-				logerror("select");
-			continue;
-		}
-		dprintf("got a message (%d, %#x)\n", nfds, readfds);
-		if (readfds & klogm) {
-			i = read(fklog, line, sizeof(line) - 1);
-			if (i > 0) {
-				linei = '\0';
-				printsys(line);
-			} else if (i < 0 && errno != EINTR) {
-				logerror("klog");
-				fklog = -1;
-				klogm = 0;
-			}
-		}
-		if (readfds & FDMASK(funix)) {
-			len = sizeof fromunix;
-			i = recvfrom(funix, line, MAXLINE, 0,
-			 (struct sockaddr *) &fromunix, &len);
-			if (i > 0) {
-				linei = '\0';
-				printline(LocalHostName, line);
-			} else if (i < 0 && errno != EINTR)
-				logerror("recvfrom unix");
-		}
-		if (readfds & inetm) {
-			len = sizeof frominet;
-			i = recvfrom(finet, line, MAXLINE, 0,
-			 (struct sockaddr *) &frominet, &len);
-			if (i > 0) {
-				extern char *cvthname();
-
-				linei = '\0';
-				printline(cvthname(&frominet), line);
-			} else if (i < 0 && errno != EINTR)
-				logerror("recvfrom inet");
-		}
-	}
-}
-
-usage()
-{
-	(void) fprintf(stderr,
-	 "usage: syslogd -d -f conffile -m markinterval -p path\n");
-	exit(1);
-}
-
-/*
- * Take a raw input line, decode the message, and print the message
- * on the appropriate log files.
- */
-
-printline(hname, msg)
-	char *hname;
-	char *msg;
-{
-	register char *p, *q;
-	register int c;
-	char lineMAXLINE + 1;
-	int pri;
-
-	/* test for special codes */
-	pri = DEFUPRI;
-	p = msg;
-	if (*p == '<') {
-		pri = 0;
-		while (isdigit(*++p))
-			pri = 10 * pri + (*p - '0');
-		if (*p == '>')
-			++p;
-	}
-	if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
-		pri = DEFUPRI;
-
-	/* don't allow users to log kernel messages */
-	if (LOG_FAC(pri) == LOG_KERN)
-		pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
-
-	q = line;
-
-	while ((c = *p++ & 0177) != '\0' &&
-	 q < &linesizeof(line) - 1)
-		if (iscntrl(c))
-			if (c == '\n')
-				*q++ = ' ';
-			else if (c == '\t')
-				*q++ = '\t';
-			else {
-				*q++ = '^';
-				*q++ = c ^ 0100;
-			}
-		else
-			*q++ = c;
-	*q = '\0';
-
-	logmsg(pri, line, hname, 0);
-}
-
-/*
- * Take a raw input line from /dev/klog, split and format similar to syslog().
- */
-
-printsys(msg)
-	char *msg;
-{
-	register char *p, *q;
-	register int c;
-	char lineMAXLINE + 1;
-	int pri, flags;
-	char *lp;
-
-	(void) strcpy(line, "vmunix: ");
-	lp = line + strlen(line);
-	for (p = msg; *p != '\0'; ) {
-		flags = SYNC_FILE | ADDDATE;	/* fsync file after write */
-		pri = DEFSPRI;
-		if (*p == '<') {
-			pri = 0;
-			while (isdigit(*++p))
-				pri = 10 * pri + (*p - '0');
-			if (*p == '>')
-				++p;
-		} else {
-			/* kernel printf's come out on console */
-			flags |= IGN_CONS;
-		}
-		if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
-			pri = DEFSPRI;
-		q = lp;
-		while (*p != '\0' && (c = *p++) != '\n' &&
-		 q < &lineMAXLINE)
-			*q++ = c;
-		*q = '\0';
-		logmsg(pri, line, LocalHostName, flags);
-	}
-}
-
-
-#ifdef	VERBOSE_DEBUG
-/*
- * Decode a numeric value to a symbolic name
- */
-char *
-edoced(val, codetab)
-	int val;
-	CODE *codetab;
-{
-	register CODE *c;
-
-	if (val >= 0)
-		for (c = codetab; c->c_val != -1; c++)
-			if (c->c_val == val)
-				return (c->c_name);
-	return ("???");
-}
-#endif
-
-time_t	now;
-
-/*
- * Log a message to the appropriate log files, users, etc. based on
- * the priority.
- */
-
-logmsg(pri, msg, from, flags)
-	int pri;
-	char *msg, *from;
-	int flags;
-{
-	register struct filed *f;
-	int fac, prilev;
-	int omask, msglen;
-	char *timestamp;
-	time_t time();
-
-#ifdef	VERBOSE_DEBUG
-	if (Debug) {
-		int pfac = (flags & MARK) ? INTERNAL_MARK : (pri & LOG_FACMASK);
-		printf("logmsg: {%s.%s} pri %o, flags %x, from %s, msg %s\n",
-		 edoced(pfac, facilitynames),
-		 edoced(LOG_PRI(pri), prioritynames),
-		 pri, flags, from, msg);
- 	}
-#else
-	dprintf("logmsg: pri %o, flags %x, from %s, msg %s\n",
-	 pri, flags, from, msg);
-#endif
-
-	omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
-
-	/*
-	 * Check to see if msg looks non-standard.
-	 */
-	msglen = strlen(msg);
-	if (msglen < 16 || msg3 != ' ' || msg6 != ' ' ||
-	 msg9 != ':' || msg12 != ':' || msg15 != ' ')
-		flags |= ADDDATE;
-
-	(void) time(&now);
-	if (flags & ADDDATE)
-		timestamp = ctime(&now) + 4;
-	else {
-		timestamp = msg;
-		msg += 16;
-		msglen -= 16;
-	}
-
-	/* extract facility and priority level */
-	if (flags & MARK)
-		fac = LOG_NFACILITIES;
-	else
-		fac = LOG_FAC(pri);
-	prilev = LOG_PRI(pri);
-
-	/* log the message to the particular outputs */
-	if (!Initialized) {
-		f = &consfile;
-		f->f_file = open(ctty, O_WRONLY, 0);
-
-		if (f->f_file >= 0) {
-			fprintlog(f, flags, msg);
-			(void) close(f->f_file);
-		}
-		(void) sigsetmask(omask);
-		return;
-	}
-	for (f = Files; f; f = f->f_nextone) {
-		/* skip messages that are incorrect priority */
-		if ((int)f->f_pmaskfac < prilev ||
-		 f->f_pmaskfac == INTERNAL_NOPRI)
-			continue;
-
-		if (f->f_type == F_CONSOLE && (flags & IGN_CONS))
-			continue;
-
-		/* don't output marks to recently written files */
-		if ((flags & MARK) && (now - f->f_time) < MarkInterval / 2)
-			continue;
-
-		/*
-		 * suppress duplicate lines to this file
-		 */
-		if ((flags & MARK) == 0 && msglen == f->f_prevlen &&
-		 !strcmp(msg, f->f_prevline) &&
-		 !strcmp(from, f->f_prevhost)) {
-			(void) strncpy(f->f_lasttime, timestamp, 15);
-			f->f_prevcount++;
-			dprintf("msg repeated %d times, %ld sec of %d\n",
-			 f->f_prevcount, now - f->f_time,
-			 repeatintervalf->f_repeatcount);
-			/*
-			 * If domark would have logged this by now,
-			 * flush it now (so we don't hold isolated messages),
-			 * but back off so we'll flush less often
-			 * in the future.
-			 */
-			if (now > REPEATTIME(f)) {
-				fprintlog(f, flags, (char *)NULL);
-				BACKOFF(f);
-			}
-		} else {
-			/* new line, save it */
-			if (f->f_prevcount)
-				fprintlog(f, 0, (char *)NULL);
-			f->f_repeatcount = 0;
-			(void) strncpy(f->f_lasttime, timestamp, 15);
-			(void) strncpy(f->f_prevhost, from,
-					sizeof(f->f_prevhost));
-			if (msglen < MAXSVLINE) {
-				f->f_prevlen = msglen;
-				f->f_prevpri = pri;
-				(void) strcpy(f->f_prevline, msg);
-				fprintlog(f, flags, (char *)NULL);
-			} else {
-				f->f_prevline0 = 0;
-				f->f_prevlen = 0;
-				fprintlog(f, flags, msg);
-			}
-		}
-	}
-	(void) sigsetmask(omask);
-}
-
-fprintlog(f, flags, msg)
-	register struct filed *f;
-	int flags;
-	char *msg;
-{
-	struct iovec iov6;
-	register struct iovec *v;
-	register int l;
-	char lineMAXLINE + 1, repbuf80, greetings200;
-
-	v = iov;
-	if (f->f_type == F_WALL) {
-		v->iov_base = greetings;
-		sprintf(greetings,
-		 "\r\n\7Message from syslogd@%s at %.24s ...\r\n",
-		 f->f_prevhost, ctime(&now));
-		v->iov_len = strlen(greetings);
-		v++;
-		v->iov_base = "";
-		v->iov_len = 0;
-		v++;
-	} else {
-		v->iov_base = f->f_lasttime;
-		v->iov_len = 15;
-		v++;
-		v->iov_base = " ";
-		v->iov_len = 1;
-		v++;
-	}
-	v->iov_base = f->f_prevhost;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = " ";
-	v->iov_len = 1;
-	v++;
-
-	if (msg) {
-		v->iov_base = msg;
-		v->iov_len = strlen(msg);
-	} else if (f->f_prevcount > 1) {
-		v->iov_base = repbuf;
-		sprintf(repbuf, "last message repeated %d times",
-		 f->f_prevcount);
-		v->iov_len = strlen(repbuf);
-	} else {
-		v->iov_base = f->f_prevline;
-		v->iov_len = f->f_prevlen;
-	}
-	v++;
-
-	dprintf("Logging to %s", TypeNamesf->f_type);
-	f->f_time = now;
-
-	switch (f->f_type) {
-	case F_UNUSED:
-		dprintf("\n");
-		break;
-
-	case F_FORW:
-		dprintf(" %s\n", f->f_un.f_forw.f_hname);
-		sprintf(line, "<%d>%.15s %s", f->f_prevpri,
-		 iov0.iov_base, iov4.iov_base);
-		l = strlen(line);
-		if (l > MAXLINE)
-			l = MAXLINE;
-		if (sendto(finet, line, l, 0, &f->f_un.f_forw.f_addr,
-		 sizeof f->f_un.f_forw.f_addr) != l) {
-			int e = errno;
-			(void) close(f->f_file);
-			f->f_type = F_UNUSED;
-			errno = e;
-			logerror("sendto");
-		}
-		break;
-
-	case F_CONSOLE:
-		if (flags & IGN_CONS) {
-			dprintf(" (ignored)\n");
-			break;
-		}
-		/* FALLTHROUGH */
-
-	case F_TTY:
-	case F_FILE:
-		dprintf(" %s\n", f->f_un.f_fname);
-		if (f->f_type != F_FILE) {
-			v->iov_base = "\r\n";
-			v->iov_len = 2;
-		} else {
-			v->iov_base = "\n";
-			v->iov_len = 1;
-		}
-	again:
-		if (writev(f->f_file, iov, 6) < 0) {
-			int e = errno;
-			(void) close(f->f_file);
-			/*
-			 * Check for errors on TTY's due to loss of tty
-			 */
-			if ((e == EIO || e == EBADF) && f->f_type != F_FILE) {
-				f->f_file = open(f->f_un.f_fname,
-				 O_WRONLY|O_APPEND, 0);
-				if (f->f_file < 0) {
-					f->f_type = F_UNUSED;
-					logerror(f->f_un.f_fname);
-				} else
-					goto again;
-			} else {
-				f->f_type = F_UNUSED;
-				errno = e;
-				logerror(f->f_un.f_fname);
-			}
-		} else if (flags & SYNC_FILE)
-			(void) fsync(f->f_file);
-		break;
-
-	case F_USERS:
-	case F_WALL:
-		dprintf("\n");
-		v->iov_base = "\r\n";
-		v->iov_len = 2;
-		wallmsg(f, iov);
-		break;
-	}
-	f->f_prevcount = 0;
-}
-
-/*
- * WALLMSG -- Write a message to the world at large
- *
- *	Write the specified message to either the entire
- *	world, or a list of approved users.
- */
-
-wallmsg(f, iov)
-	register struct filed *f;
-	struct iovec *iov;
-{
-	static int reenter;			/* avoid calling ourselves */
-	register FILE *uf;
-	register int i;
-	struct utmp ut;
-	char *p, *ttymsg();
-
-	if (reenter++)
-		return;
-	if ((uf = fopen(_PATH_UTMP, "r")) == NULL) {
-		logerror(_PATH_UTMP);
-		reenter = 0;
-		return;
-	}
-	/* NOSTRICT */
-	while (fread((char *) &ut, sizeof ut, 1, uf) == 1) {
-		if (ut.ut_name0 == '\0')
-			continue;
-		if (f->f_type == F_WALL) {
-			if (p = ttymsg(iov, 6, ut.ut_line, 1)) {
-				errno = 0;	/* already in msg */
-				logerror(p);
-			}
-			continue;
-		}
-		/* should we send the message to this user? */
-		for (i = 0; i < MAXUNAMES; i++) {
-			if (!f->f_un.f_unamei0)
-				break;
-			if (!strncmp(f->f_un.f_unamei, ut.ut_name,
-			 UT_NAMESIZE)) {
-				if (p = ttymsg(iov, 6, ut.ut_line, 1)) {
-					errno = 0;	/* already in msg */
-					logerror(p);
-				}
-				break;
-			}
-		}
-	}
-	(void) fclose(uf);
-	reenter = 0;
-}
-
-SIGHANDLER
-reapchild()
-{
-	WAITVALUE status;
-
-	while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
-		continue;
-}
-
-/*
- * Return a printable representation of a host address.
- */
-char *
-cvthname(f)
-	struct sockaddr_in *f;
-{
-	struct hostent *hp;
-	register char *p;
-	extern char *inet_ntoa();
-
-	dprintf("cvthname(%s)\n", inet_ntoa(f->sin_addr));
-
-	if (f->sin_family != AF_INET) {
-		dprintf("Malformed from address\n");
-		return ("???");
-	}
-	hp = gethostbyaddr(&f->sin_addr, sizeof(struct in_addr), f->sin_family);
-	if (hp == 0) {
-		dprintf("Host name for your address (%s) unknown\n",
-			inet_ntoa(f->sin_addr));
-		return (inet_ntoa(f->sin_addr));
-	}
-	if ((p = strchr(hp->h_name, '.')) && strcmp(p + 1, LocalDomain) == 0)
-		*p = '\0';
-	return (hp->h_name);
-}
-
-SIGHANDLER
-domark()
-{
-	register struct filed *f;
-	time_t time();
-
-	now = time((time_t *)NULL);
-	MarkSeq += TIMERINTVL;
-	if (MarkSeq >= MarkInterval) {
-		logmsg(LOG_INFO, "-- MARK --", LocalHostName, ADDDATE|MARK);
-		MarkSeq = 0;
-	}
-
-	for (f = Files; f; f = f->f_nextone) {
-		if (f->f_prevcount && now >= REPEATTIME(f)) {
-			dprintf("flush %s: repeated %d times, %d sec.\n",
-			 TypeNamesf->f_type, f->f_prevcount,
-			 repeatintervalf->f_repeatcount);
-			fprintlog(f, 0, (char *)NULL);
-			BACKOFF(f);
-		}
-	}
-	(void) alarm(TIMERINTVL);
-}
-
-static char *
-xstrerror()
-{
- extern int	sys_nerr;
- extern char	*sys_errlist;
- extern int	errno;
- static char	buff30;
-
- if (errno >= 0 && errno < sys_nerr)
-	return sys_errlisterrno;
- (void)sprintf(buff, "Error code %d\n", errno);
- return buff;
-}
-
-/*
- * Print syslogd errors some place.
- */
-logerror(type)
-	char *type;
-{
-	char buf100;
-
-	if (errno)
-		(void) sprintf(buf, "syslogd: %s: %s", type, xstrerror(errno));
-	else
-		(void) sprintf(buf, "syslogd: %s", type);
-	errno = 0;
-	dprintf("%s\n", buf);
-	logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE);
-}
-
-SIGHANDLER
-die(sig)
-{
-	register struct filed *f;
-	char buf100;
-
-	for (f = Files; f != NULL; f = f->f_nextone) {
-		/* flush any pending output */
-		if (f->f_prevcount)
-			fprintlog(f, 0, (char *)NULL);
-	}
-	if (sig) {
-		dprintf("syslogd: exiting on signal %d\n", sig);
-		(void) sprintf(buf, "exiting on signal %d", sig);
-		errno = 0;
-		logerror(buf);
-	}
-	(void) unlink(LogName);
-	exit(0);
-}
-
-/*
- * INIT -- Initialize syslogd from configuration table
- */
-
-SIGHANDLER
-init()
-{
-	register int i;
-	register FILE *cf;
-	register struct filed *f, *next, **nextp;
-	register char *p;
-	char clineBUFSIZ;
-
-	dprintf("init\n");
-
-	/*
-	 * Close all open log files.
-	 */
-	Initialized = 0;
-	for (f = Files; f != NULL; f = next) {
-		/* flush any pending output */
-		if (f->f_prevcount)
-			fprintlog(f, 0, (char *)NULL);
-
-		switch (f->f_type) {
-		 case F_FILE:
-		 case F_TTY:
-		 case F_CONSOLE:
-		 case F_FORW:
-			(void) close(f->f_file);
-			break;
-		}
-		next = f->f_nextone;
-		free((char *) f);
-	}
-	Files = NULL;
-	nextp = &Files;
-
-	/* open the configuration file */
-	if ((cf = fopen(ConfFile, "r")) == NULL) {
-		dprintf("cannot open %s\n", ConfFile);
-		*nextp = (struct filed *)malloc(sizeof(*f));
-		cfline("*.ERR\t/dev/console", *nextp);
-		(*nextp)->f_nextone = (struct filed *)malloc(sizeof(*f));
-		cfline("*.PANIC\t*", (*nextp)->f_nextone);
-		Initialized = 1;
-		return;
-	}
-
-	/*
-	 * Foreach line in the conf table, open that file.
-	 */
-	f = NULL;
-	while (fgets(cline, sizeof cline, cf) != NULL) {
-		/*
-		 * check for end-of-section, comments, strip off trailing
-		 * spaces and newline character.
-		 */
-		for (p = cline; isspace(*p); ++p);
-		if (*p == NULL || *p == '#')
-			continue;
-		for (p = strchr(cline, '\0'); isspace(*--p););
-		*++p = '\0';
-		f = (struct filed *)malloc(sizeof(*f));
-		*nextp = f;
-		nextp = &f->f_nextone;
-		cfline(cline, f);
-	}
-
-	/* close the configuration file */
-	(void) fclose(cf);
-
-	Initialized = 1;
-
-	if (Debug) {
-		for (f = Files; f; f = f->f_nextone) {
-			for (i = 0; i <= LOG_NFACILITIES; i++)
-				if (f->f_pmaski == INTERNAL_NOPRI)
-					printf("X ");
-				else
-					printf("%d ", f->f_pmaski);
-			printf("%s: ", TypeNamesf->f_type);
-			switch (f->f_type) {
-			case F_FILE:
-			case F_TTY:
-			case F_CONSOLE:
-				printf("%s", f->f_un.f_fname);
-				break;
-
-			case F_FORW:
-				printf("%s", f->f_un.f_forw.f_hname);
-				break;
-
-			case F_USERS:
-				for (i = 0; i < MAXUNAMES && *f->f_un.f_unamei; i++)
-					printf("%s, ", f->f_un.f_unamei);
-				break;
-			}
-			printf("\n");
-		}
-	}
-
-	logmsg(LOG_SYSLOG|LOG_INFO, "syslogd: restart", LocalHostName, ADDDATE);
-	dprintf("syslogd: restarted\n");
-}
-
-/*
- * Crack a configuration file line
- */
-
-cfline(line, f)
-	char *line;
-	register struct filed *f;
-{
-	register char *p;
-	register char *q;
-	register int i;
-	char *bp;
-	int pri;
-	struct hostent *hp;
-	char bufMAXLINE;
-
-	dprintf("cfline(%s)\n", line);
-
-	errno = 0;	/* keep strerror() stuff out of logerror messages */
-
-	/* clear out file entry */
-	bzero((char *) f, sizeof *f);
-	for (i = 0; i <= LOG_NFACILITIES; i++)
-		f->f_pmaski = INTERNAL_NOPRI;
-
-	/* scan through the list of selectors */
-	for (p = line; *p && *p != '\t';) {
-
-		/* find the end of this facility name list */
-		for (q = p; *q && *q != '\t' && *q++ != '.'; )
-			continue;
-
-		/* collect priority name */
-		for (bp = buf; *q && !strchr("\t,;", *q); )
-			*bp++ = *q++;
-		*bp = '\0';
-
-		/* skip cruft */
-		while (strchr(", ;", *q))
-			q++;
-
-		/* decode priority name */
-		pri = decode(buf, prioritynames);
-		if (pri < 0) {
-			char xbuf200;
-
-			(void) sprintf(xbuf, "unknown priority name \"%s\"",
-			 buf);
-			logerror(xbuf);
-			return;
-		}
-
-		/* scan facilities */
-		while (*p && !strchr("\t.;", *p)) {
-			for (bp = buf; *p && !strchr("\t,;.", *p); )
-				*bp++ = *p++;
-			*bp = '\0';
-			if (*buf == '*')
-				for (i = 0; i < LOG_NFACILITIES; i++)
-					f->f_pmaski = pri;
-			else {
-				i = decode(buf, facilitynames);
-				if (i < 0) {
-					char xbuf200;
-
-					(void) sprintf(xbuf,
-					 "unknown facility name \"%s\"",
-					 buf);
-					logerror(xbuf);
-					return;
-				}
-				f->f_pmaski >> 3 = pri;
-			}
-			while (*p == ',' || *p == ' ')
-				p++;
-		}
-
-		p = q;
-	}
-
-	/* skip to action part */
-	while (*p == '\t')
-		p++;
-
-	switch (*p)
-	{
-	case '@':
-		if (!InetInuse)
-			break;
-		(void) strcpy(f->f_un.f_forw.f_hname, ++p);
-		hp = gethostbyname(p);
-		if (hp == NULL) {
-			logerror("hostname lookup error");
-			break;
-		}
-		bzero((char *) &f->f_un.f_forw.f_addr,
-			 sizeof f->f_un.f_forw.f_addr);
-		f->f_un.f_forw.f_addr.sin_family = AF_INET;
-		f->f_un.f_forw.f_addr.sin_port = LogPort;
-		bcopy(hp->h_addr, (char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_length);
-		f->f_type = F_FORW;
-		break;
-
-	case '/':
-		(void) strcpy(f->f_un.f_fname, p);
-		if ((f->f_file = open(p, O_WRONLY|O_APPEND, 0)) < 0) {
-			f->f_file = F_UNUSED;
-			logerror(p);
-			break;
-		}
-		if (isatty(f->f_file))
-			f->f_type = F_TTY;
-		else
-			f->f_type = F_FILE;
-		if (strcmp(p, ctty) == 0)
-			f->f_type = F_CONSOLE;
-		break;
-
-	case '*':
-		f->f_type = F_WALL;
-		break;
-
-	default:
-		for (i = 0; i < MAXUNAMES && *p; i++) {
-			for (q = p; *q && *q != ','; )
-				q++;
-			(void) strncpy(f->f_un.f_unamei, p, UT_NAMESIZE);
-			if ((q - p) > UT_NAMESIZE)
-				f->f_un.f_unameiUT_NAMESIZE = '\0';
-			else
-				f->f_un.f_unameiq - p = '\0';
-			while (*q == ',' || *q == ' ')
-				q++;
-			p = q;
-		}
-		f->f_type = F_USERS;
-		break;
-	}
-}
-
-
-/*
- * Decode a symbolic name to a numeric value
- */
-
-decode(name, codetab)
-	char *name;
-	CODE *codetab;
-{
-	register CODE *c;
-	register char *p;
-	char buf40;
-
-	if (isdigit(*name))
-		return (atoi(name));
-
-	(void) strcpy(buf, name);
-	for (p = buf; *p; p++)
-		if (isupper(*p))
-			*p = tolower(*p);
-	for (c = codetab; c->c_name; c++)
-		if (!strcmp(buf, c->c_name))
-			return (c->c_val);
-
-	return (-1);
-}
-
-daemon(nochdir, noclose)
- int nochdir, noclose;
-{
- int cpid;
-
- if ((cpid = fork()) == -1)
- return (-1);
- if (cpid)
- exit(0);
- (void) setsid();
- if (!nochdir)
- (void) chdir("/");
- if (!noclose) {
- int devnull = open("/dev/null", O_RDWR, 0);
-
- if (devnull != -1) {
- (void) dup2(devnull, 0);
- (void) dup2(devnull, 1);
- (void) dup2(devnull, 2);
- if (devnull > 2)
- (void) close(devnull);
- }
- }
-}
-
-
-/*
- * Display the contents of a uio structure on a terminal. Used by wall(1)
- * and syslogd(8). Forks and finishes in child if write would block, waiting
- * at most five minutes. Returns pointer to error string on unexpected error;
- * string is not newline-terminated. Various "normal" errors are ignored
- * (exclusive-use, lack of permission, etc.).
- */
-char *
-ttymsg(iov, iovcnt, line)
-	struct iovec *iov;
-	int iovcnt;
-	char *line;
-{
-	static char device64 = _PATH_DEV;
-	static char errbuf1024;
-	register int cnt, fd, left, wret;
-	struct iovec localiov6;
-	int forked = 0;
-
-	if (iovcnt > 6)
-		return ("too many iov's");
-	/*
-	 * open will fail on slip lines or exclusive-use lines
-	 * if not running as root; not an error.
-	 */
-	(void) strcpy(device + sizeof(_PATH_DEV) - 1, line);
-	if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) {
-		if (errno == EBUSY || errno == EACCES)
-			return (NULL);
-		(void) sprintf(errbuf, "%s: error %d", device, errno);
-		return (errbuf);
-	}
-
-	for (cnt = left = 0; cnt < iovcnt; ++cnt)
-		left += iovcnt.iov_len;
-
-	for (;;) {
-		wret = writev(fd, iov, iovcnt);
-		if (wret >= left)
-			break;
-		if (wret >= 0) {
-			left -= wret;
-			if (iov != localiov) {
-				bcopy(iov, localiov,
-				 iovcnt * sizeof(struct iovec));
-				iov = localiov;
-			}
-			for (cnt = 0; wret >= iov->iov_len; ++cnt) {
-				wret -= iov->iov_len;
-				++iov;
-				--iovcnt;
-			}
-			if (wret) {
-				iov->iov_base += wret;
-				iov->iov_len -= wret;
-			}
-			continue;
-		}
-		if (errno == EWOULDBLOCK) {
-			int cpid, off = 0;
-
-			if (forked) {
-				(void) close(fd);
-				_exit(1);
-			}
-			cpid = fork();
-			if (cpid < 0) {
-				(void) sprintf(errbuf,
-				 "fork: error %d", errno);
-				(void) close(fd);
-				return (errbuf);
-			}
-			if (cpid) {	/* parent */
-				(void) close(fd);
-				return (NULL);
-			}
-			forked++;
-			/* wait at most 5 minutes */
-			(void) signal(SIGALRM, SIG_DFL);
-			(void) signal(SIGTERM, SIG_DFL); /* XXX */
-			(void) sigsetmask(0);
-			(void) alarm((u_int)(60 * 5));
-			(void) fcntl(fd, FNDELAY, &off);
-			continue;
-		}
-		/*
-		 * We get ENODEV on a slip line if we're running as root,
-		 * and EIO if the line just went away.
-		 */
-		if (errno == ENODEV || errno == EIO)
-			break;
-		(void) close(fd);
-		if (forked)
-			_exit(1);
-		(void) sprintf(errbuf, "%s: error %d", errno);
-		return (errbuf);
-	}
-
-	(void) close(fd);
-	if (forked)
-		_exit(0);
-	return (NULL);
-}

cyrus-imapd-2.4.17.tar.gz/timsieved/Makefile.in Deleted

@@ -1,112 +0,0 @@
-# Makefile.in - timsieved makefile
-#
-# @configure_input@
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Makefile.in,v 1.29 2010/01/06 17:02:00 murch Exp $
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-RANLIB = @RANLIB@
-
-INSTALL = @INSTALL@
-CYRUS_USER=@cyrus_user@
-CYRUS_GROUP=@cyrus_group@
-
-DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-cyrus_prefix = @cyrus_prefix@
-service_path = @service_path@
-
-MAKEDEPEND = @MAKEDEPEND@
-
-TIMSIEVED_LIBS = @TIMSIEVED_LIBS@
-
-SERVICE=../master/service.o
-
-IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
-LIB_WRAP = @LIB_WRAP@
-LIBS = $(IMAP_COM_ERR_LIBS)
-DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
-PURIFY=/usr/local/bin/purify
-PUREOPT=-best-effort
-
-all: timsieved
-
-install:
-	$(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-
-OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
-	../imap/proxy.o
-
-timsieved: $(OBJS) $(SERVICE)
-	$(CC) $(LDFLAGS) -o timsieved \
-	 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
-timsieved.pure: $(OBJS) $(SERVICE)
-	$(PURIFY) $(PUREOPT) \
-	$(CC) $(LDFLAGS) -o timsieved.pure \
-	 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
-clean:
-	rm -f timsieved *~ *.o *.a Makefile.bak makedepend.log
-
-distclean: clean
-	rm -f Makefile
-
-depend:
-	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-	$<
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

cyrus-imapd-2.4.17.tar.gz/timsieved/exitcodes.h Deleted

@@ -1,88 +0,0 @@
-/* exitcodes.h -- wrapper around sysextis.h
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For permission or any legal
- * details, please contact
- * Carnegie Mellon University
- * Center for Technology Transfer and Enterprise Creation
- * 4615 Forbes Avenue
- * Suite 302
- * Pittsburgh, PA 15213
- * (412) 268-7393, fax: (412) 268-7395
- * innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by Computing Services
- * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: exitcodes.h,v 1.6 2010/01/06 17:02:01 murch Exp $
- */
-
-/* Sendmail has some weird ideas on what constitutes permenant failure. On
- more than one occasion, we have gotten burned by this moving users around
- through various inadvisable means, screwing up the mailboxes file,
- whatever.
- 
- We don't want to fail out permenantly on things like EX_USAGE, EX_SOFTWARE, 
- etc., because that generally means someone was just screwing with the mail
- store and we don't want to lose mail.
-
- Instead, we map these EC_* codes to EX_* codes, thereby lying to Sendmail,
- since we don't derive any benefit from Sendmail knowing what the error was.
- We just want it to retry all the time anyway. This way, should sendmail's
- behavior be different and we start deriving benefit from Sendmail knowing
- stuff, we can easily change it back.
-
- So other code uses the EC_* error, then we maybe change it to TEMPFAIL if
- we don't agree on whether the error should be permenant or not.
- 
- Comments below stolen from sysexits.h. */
-
-#ifndef INCLUDED_EXITCODES_H
-#define INCLUDED_EXITCODES_H
-
-#include <sysexits.h>
-
-#define EC_OK 0		/* successful termination */
-
-#define EC_USAGE EX_TEMPFAIL	/* command line usage error */
-#define EC_DATAERR EX_DATAERR	/* data format error */
-#define EC_NOINPUT EX_TEMPFAIL	/* cannot open input */
-#define EC_NOUSER EX_NOUSER	/* addressee unknown */
-#define EC_NOHOST EX_TEMPFAIL	/* host name unknown */
-#define EC_UNAVAILABLE EX_TEMPFAIL	/* service unavailable */
-#define EC_SOFTWARE EX_TEMPFAIL	/* internal software error */
-#define EC_OSERR EX_TEMPFAIL	/* system error (e.g., can't fork) */
-#define EC_OSFILE EX_TEMPFAIL	/* critical OS file missing */
-#define EC_CANTCREAT EX_TEMPFAIL	/* can't create (user) output file */
-#define EC_IOERR EX_TEMPFAIL	/* input/output error */
-#define EC_TEMPFAIL EX_TEMPFAIL	/* user is invited to retry */
-#define EC_PROTOCOL EX_TEMPFAIL	/* remote error in protocol */
-#define EC_NOPERM EX_TEMPFAIL	/* permission denied */
-#define EC_CONFIG EX_TEMPFAIL	/* configuration error */
-
-#endif /* INCLUDED_EXITCODES_H */

cyrus-imapd-2.4.17.tar.gz/timsieved/mystring.c Deleted

@@ -1,154 +0,0 @@
-/* $Id: mystring.c,v 1.8 2006/11/30 17:11:25 murch Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mystring.h"
-
-#include "codes.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-int string_allocate(int length,
-		 const char *buf,	/* NULL => no copy */
-		 mystring_t ** str)
-{
- *str=(mystring_t *) malloc(sizeof(mystring_t)+length+1);
-
- (*str)->len=length;
-
- if (buf==NULL) return TIMSIEVE_OK;
-
- /* copy the data into the string object */
- memcpy(((char *)(*str))+sizeof(mystring_t), buf, length);
- ((char *) (*str))sizeof(mystring_t)+length='\0';
-
- return TIMSIEVE_OK;
-}
-
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr)
-{
- int result;
-
-
- result=string_allocate(oldstr->len,
-			 string_DATAPTR(oldstr),
-			 newstr);
-
- return result;
-}
-
-
-void string_free(mystring_t **str)
-{
- free(*str);
-}
-
-
-int string_compare(mystring_t *str1, mystring_t *str2)
-{
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2->len) return TIMSIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return TIMSIEVE_FAIL;
-
- return TIMSIEVE_OK;
-}
-
-int string_compare_with(mystring_t *str1, mystring_t *str2,
-			mystring_t *comp __attribute__((unused)))
-{
- char *data1;
- char *data2;
- int lup;
-
- int len1=str1->len;
- int len2=str2->len;
-
- int low=len1;
- if (len2<len1)
- low=len2;
-
- /* printf("comparing %s and %s\n",string_DATAPTR(str1),
- string_DATAPTR(str2));*/
-
- data1=string_DATAPTR(str1);
- data2=string_DATAPTR(str2);
-
- for (lup=0;lup<low;lup++)
- if (data1lup<data2lup)
- {
- return -1;
- } else if (data1lup>data2lup) {
- return 1;
- } else {
- /* continue */
- }
- 
- if (len1==len2) return 0;
-
- if (len1<len2)
- return -1;
-
- return 1;
-}
-
-int string_comparestr(mystring_t *str1, char *str2)
-{
- int str2len=strlen(str2);
- char *data1;
- char *data2;
- int lup;
-
- if (str1->len!=str2len) return TIMSIEVE_FAIL;
-
- data1=string_DATAPTR(str1);
- data2=str2;
-
- for (lup=0;lup<str1->len;lup++)
- if (data1lup!=data2lup)
- return TIMSIEVE_FAIL;
-
- return TIMSIEVE_OK;
-}
-
-int safe_to_use_quoted(char *str, int len)
-{
- char *end=str+len;
-
- if (len > 4096)
- return FALSE;
-
- while (str < end) {
- if (*str == '\0'		/* check illegal chars... */
-	|| *str == '\r'
-	|| *str == '\n'
-
-#ifdef __CHAR_UNSIGNED__
-	|| 0x7F < *str
-#else
-	|| *str < 0
-#endif
-
- )
- return FALSE;
- if (*str == '\"'		/* check len, with \ escapes... */
-	|| *str == '\\')
- if (4096 < ++len)
-	return FALSE;
- ++str;
- }
- return TRUE;
-}

cyrus-imapd-2.4.17.tar.gz/timsieved/mystring.h Deleted

@@ -1,82 +0,0 @@
-/* mystring.h -- base datatype used by timsieved
- * Tim Martin
- * 9/21/99
- *
- * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Carnegie Mellon University
- *      Center for Technology Transfer and Enterprise Creation
- *      4615 Forbes Avenue
- *      Suite 302
- *      Pittsburgh, PA  15213
- *      (412) 268-7393, fax: (412) 268-7395
- *      innovation@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mystring.h,v 1.8 2010/01/06 17:02:01 murch Exp $
- */
-
-#include "codes.h"
-
-
-#ifndef INCLUDED_MYSTRING_H
-#define INCLUDED_MYSTRING_H
-
-typedef struct {
-  int        len;
-  /* Data immediately following... */
-} mystring_t;
-
-
-int string_allocate(int length,
-		    const char *buf,	/* NULL => no copy */
-		    mystring_t ** str);
-
-int string_copy(mystring_t *oldstr,
-		mystring_t **newstr);
-
-void string_free(mystring_t **str);
-
-int string_compare(mystring_t *str1, mystring_t *str2);
-
-int string_comparestr(mystring_t *str1, char *str2);
-
-int string_compare_with(mystring_t *str1, mystring_t *str2, mystring_t *comp);
-
-/*eq_result_t
-  string_equal_cstr(const mystring_t * str, const char *cstr);*/
-
-#define string_DATAPTR(s) (((char *) s)+sizeof(mystring_t))
-
-int safe_to_use_quoted(char *str, int len);
-
-
-#endif /* INCLUDED_MYSTRING_H */

cyrus-imapd-2.4.17.tar.gz/tools/not-mkdep Deleted

@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# not-mkdep for those systems without it
-#
-# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The name "Carnegie Mellon University" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For permission or any legal
-# details, please contact
-# Carnegie Mellon University
-# Center for Technology Transfer and Enterprise Creation
-# 4615 Forbes Avenue
-# Suite 302
-# Pittsburgh, PA 15213
-# (412) 268-7393, fax: (412) 268-7395
-# innovation@andrew.cmu.edu
-#
-# 4. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by Computing Services
-# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-#
-# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: not-mkdep,v 1.5 2010/01/06 17:02:01 murch Exp $
-
-cat <<EOF
-
-		 WARNING: MAKEDEPEND COULD NOT BE FOUND
-
-Makedepend did not run because the configure script did not find it when it
-was run. You can fix this by compiling and installing the version from the
-makedepend subdirectory in the distribution.
-
-You're probably seeing this warning message a lot, but that's okay.
-EOF

cyrus-imapd-2.4.17.tar.gz/xversion Deleted

cyrus-imapd-2.4.17.tar.gz/xversion.h Deleted

cyrus-imapd-2.4.17.tar.gz/.gitignore -> cyrus-imapd-2.5.tar.gz/.gitignore Changed

@@ -1,10 +1,20 @@
 *.o
 *.a
+*.lo
+*.la
 *~
 *.patch
+!debian/patches/*.patch
 *.orig
 *.rej
 *.tar.gz
+*.gcno
+*.gcda
+.deps
+.libs
+.dirstamp
+.libs
+Makefile.in
 Makefile
 Makefile.bak
 Makefile.old
@@ -12,19 +22,22 @@
 aclocal.m4
 autom4te.cache/
 cmulocal/
+compile
+config.guess
 config.h
 config.h.in
 config.log
 config.status
 config.status.lineno
+config.sub
 configure
-com_err/et/com_err.o
+debian/
 com_err/et/compile_et
-com_err/et/error_message.o
-com_err/et/et_name.o
-com_err/et/init_et.o
-com_err/et/libcom_err.a
+coverage.xml
+cscope.out
+depcomp
 imap/arbitron
+imap/ctl_conversationsdb
 imap/chk_cyrus
 imap/ctl_cyrusdb
 imap/ctl_deliver
@@ -32,16 +45,23 @@
 imap/cvt_cyrusdb
 imap/cyr_charset
 imap/cyr_dbtool
+imap/cyr_deny
 imap/cyr_df
 imap/cyr_expire
+imap/cyr_info
 imap/cyr_sequence
+imap/cyr_sphinxmgr
 imap/cyr_synclog
 imap/cyr_userseen
 imap/cyrdump
+imap/dav_reconstruct
 imap/deliver
 imap/fetchnews
 imap/fud
-imap/hammer_skiplist
+imap/http_err.c
+imap/http_err.h
+imap/httpd
+imap/hammer_cyrusdb
 imap/idled
 imap/imap_err.c
 imap/imap_err.h
@@ -52,6 +72,8 @@
 imap/lmtpstats.h
 imap/mbexamine
 imap/mbpath
+imap/mbtool
+imap/message_test
 imap/mupdate_err.c
 imap/mupdate_err.h
 imap/mupdate
@@ -63,31 +85,60 @@
 imap/pushstats.h
 imap/quota
 imap/reconstruct
+imap/search_test
 imap/smmapd
 imap/squatter
+imap/squat_dump
 imap/sync_client
 imap/sync_reset
 imap/sync_server
 imap/tls_prune
 imap/unexpunge
 imtest/imtest
+install-sh
 lib/chartable.c
 lib/imapopts.c
 lib/imapopts.h
 lib/mkchartable
+libcyrus.pc
+libcyrus_min.pc
+libcyrus_sieve.pc
+libtool
+ltmain.sh
 man/imapd.conf.5
 man/sieveshell.1
 master/master
+missing
+netnews/remotepurge
 notifyd/notifyd
+notifyd/notifytest
+perl/annotator/Makefile.old
+perl/annotator/Makefile.PL
+perl/annotator/MYMETA.json
+perl/annotator/MYMETA.yml
+perl/annotator/blib/
+perl/annotator/pm_to_blib
 perl/imap/IMAP.bs
 perl/imap/IMAP.c
-perl/imap/IMAP.o
 perl/imap/Makefile.old
+perl/imap/Makefile.PL
 perl/imap/blib/
 perl/imap/cyradm
 perl/imap/pm_to_blib
-timsieved/timsieved
-sieve/Makefile
+perl/imap/MYMETA.json
+perl/imap/MYMETA.yml
+perl/sieve/managesieve/MYMETA.json
+perl/sieve/managesieve/MYMETA.yml
+perl/sieve/managesieve/blib/
+perl/sieve/managesieve/managesieve.c
+perl/sieve/managesieve/pm_to_blib
+perl/sieve/managesieve/Makefile.old
+perl/sieve/managesieve/Makefile.PL
+perl/sieve/scripts/installsieve
+perl/sieve/scripts/sieveshell
+ptclient/ptexpire
+ptclient/ptdump
+ptclient/ptloader
 sieve/addr-lex.c
 sieve/addr.c
 sieve/addr.h
@@ -98,4 +149,9 @@
 sieve/sieve_err.h
 sieve/sievec
 sieve/sieved
+sieve/test
+sieve/tests/
+stamp-h1
+timsieved/timsieved
 xversion.h
+ylwrap

cyrus-imapd-2.5.tar.gz/.indent.pro Added

@@ -0,0 +1,115 @@
+// don't force a blank line afer every block of declarations
+-nbad
+// force a blank line after procedure bodies
+-bap
+// prefer to break long lines before && or || operators
+-bbo
+// Don't put newlines after commas in multiple declarations
+// int foo, bar, baz;
+-nbc
+// K&R style braces
+// if (foo) {
+// bar;
+// }
+-br
+// cuddle 'else' to preceding }
+// if (foo) {
+// bar;
+// } else {
+// baz;
+// }
+-ce
+// cuddle 'while' to preceding }
+// do {
+// foo;
+// } while (bar);
+-cdw
+// K&R style braces in struct declarations
+// struct foo {
+// ...
+// };
+-brs
+// BUT the opening brace of a function is at the
+// start of it's own line. Consistent? Nope.
+// int foo(int bar)
+// {
+// ...
+// }
+-blf
+// Start comments which follow code on a line, at column 33 (the
+// default)
+-c33
+// Ditto for comments following declarations
+-cd33
+// Ditto for comments following cpp directives
+-cp33
+// Don't force comment delimiters onto their own lines
+-ncdb
+// 'case' statements are not indented relative to the switch
+// switch (foo) {
+// case BAR:
+// }
+-cli0
+// Don't put a space after a cast operator
+-ncs
+// Indent block comments to their surrounding code
+-d0
+// put identifiers in declarations immediately after type
+// int foo;
+-di1
+// Don't format comments starting in column 1
+-nfc1
+// Don't format comments starting after column 1
+-nfca
+// try to break long lines where the original code did
+-hnl
+// indentation is 4 characters
+-i4
+// tabs are 8 characters (the default)
+-ts8
+// Don't add extra indentation for multiple opening parens
+// or K&R function declarations (not that we should have any)
+-ip0
+// Maximum line length of long code lines
+-l75
+// broken 2nd line of function arguments is indented
+// to align with open parenthesis e.g.
+// long_function_name(first_argument, second_argument,
+// indented_third_argument)
+-lp
+// indent nested cpp directives
+// #if X
+// # if Y
+// # define Z 1
+-ppi4
+// goto labels start in column 0
+-il0
+// No space between a called function name and its args
+// function_call(arg1, arg2)
+-npcs
+// No space between 'sizeof' and its arg
+// sizeof(struct foo);
+-nbs
+// No space inside parentheses
+-nprs
+// Put the type of a procedure at the start of the same
+// line it's definition
+// int foo(int bar)
+// {
+-npsl
+// Force a space between 'for' and the following parenthesis
+// for (i=0 ; i<5 ; i++) {
+-saf
+// Force a space between 'if' and the following parenthesis
+// if (foo != bar) {
+-sai
+// Force a space between 'while' and the following parenthesis
+// while (foo) {
+-saw
+// Don't force a * at the beginning of each line of box comments
+-nsc
+// Don't swallow "optional" blank lines in the original code
+-nsob
+// Don't force a space before the ';' when it's the entire
+// body of a 'for' or 'while'.
+-nss

cyrus-imapd-2.4.17.tar.gz/COPYRIGHT -> cyrus-imapd-2.5.tar.gz/COPYRIGHT Changed

cyrus-imapd-2.5.tar.gz/Makefile.am Added

@@ -0,0 +1,1492 @@
+#
+# @configure_input@
+#
+# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+ACLOCAL_AMFLAGS = -I cmulocal
+AM_CFLAGS = @PERL_CCCDLFLAGS@ $(COV_CFLAGS)
+AM_CPPFLAGS = $(COM_ERR_CPPFLAGS) \
+	-I${top_builddir} -I${top_builddir}/lib \
+	-I${top_srcdir} -I${top_srcdir}/lib \
+	${DEFS} ${LOCALDEFS} $(SASLFLAGS) $(SSL_CPPFLAGS)
+if HAVE_LDAP
+AM_CPPFLAGS += $(LDAP_CPPFLAGS)
+endif
+AM_LDFLAGS = $(COV_LDFLAGS)
+BUILT_SOURCES = xversion.h \
+	imap/imap_err.c \
+	lib/imapopts.c
+DISTCLEANFILES = imap/imap_err.c imap/imap_err.h imap/mupdate_err.c imap/mupdate_err.h imap/nntp_err.c imap/nntp_err.h \
+	imap/http_err.c imap/http_err.h \
+	com_err/et/compile_et \
+	perl/annotator/Makefile perl/annotator/Makefile.PL perl/imap/Makefile perl/imap/Makefile.PL perl/sieve/managesieve/Makefile perl/sieve/managesieve/Makefile.PL perl/sieve/scripts/installsieve perl/sieve/scripts/sieveshell \
+	sieve/sieve_err.c sieve/sieve_err.h
+
+MAINTAINERCLEANFILES = \
+	doc/murder.png doc/netnews.png \
+	doc/man/cyradm.1.html man/imapd.conf.5 man/sieveshell.1 doc/man/sieveshell.1.html \
+	imap/lmtpstats.h imap/pushstats.h \
+	lib/chartable.c lib/imapopts.h \
+	sieve/addr.h sieve/sieve.h
+
+SUBDIRS = .
+DIST_SUBDIRS = .
+dist_sysconf_DATA =
+lib_LTLIBRARIES = lib/libcyrus_min.la lib/libcyrus.la
+EXTRA_PROGRAMS = doc/text/htmlstrip
+check_PROGRAMS =
+service_PROGRAMS =
+user_PROGRAMS =
+CLEANFILES =
+
+if COM_ERR
+COMPILE_ET_DEP = com_err/et/compile_et
+BUILT_SOURCES += com_err/et/compile_et
+lib_LTLIBRARIES += com_err/et/libcyrus_com_err.la
+endif
+
+bin_PROGRAMS = imtest/imtest
+if SERVER
+BUILT_SOURCES += \
+	imap/mupdate_err.c \
+	imap/nntp_err.c \
+	imap/lmtpstats.c \
+	imap/pushstats.c \
+	lib/htmlchar.c \
+	lib/htmlchar.h \
+	imap/rfc822_header.c \
+	imap/rfc822_header.h
+lib_LTLIBRARIES += imap/libcyrus_imap.la
+service_PROGRAMS += \
+	imap/imapd \
+	imap/lmtpd \
+	imap/pop3d \
+	imap/smmapd
+user_PROGRAMS += \
+	imap/arbitron \
+	imap/chk_cyrus \
+	imap/ctl_conversationsdb \
+	imap/ctl_cyrusdb \
+	imap/ctl_deliver \
+	imap/ctl_mboxlist \
+	imap/cvt_cyrusdb \
+	imap/cyr_df \
+	imap/cyrdump \
+	imap/cyr_dbtool \
+	imap/cyr_deny \
+	imap/cyr_expire \
+	imap/cyr_info \
+	imap/cyr_sequence \
+	imap/cyr_synclog \
+	imap/cyr_userseen \
+	imap/deliver \
+	imap/hammer_cyrusdb \
+	imap/ipurge \
+	imap/mbexamine \
+	imap/mbpath \
+	imap/mbtool \
+	imap/message_test \
+	imap/quota \
+	imap/reconstruct \
+	imap/search_test
+if USE_SQUAT
+service_PROGRAMS += imap/squat_dump
+endif
+if SQUATTER
+# Despite the name, the squatter program handles any search engine
+service_PROGRAMS += imap/squatter
+endif
+if NNTPD
+user_PROGRAMS += imap/fetchnews
+endif
+service_PROGRAMS += imap/fud
+if IDLED
+user_PROGRAMS += imap/idled
+endif
+if MURDER
+service_PROGRAMS += imap/mupdate
+endif
+if NNTPD
+service_PROGRAMS += imap/nntpd
+endif
+if HTTPD
+AM_CPPFLAGS += $(HTTP_CPPFLAGS)
+AM_LDFLAGS += $(HTTP_LIBS)
+BUILT_SOURCES += imap/http_err.c imap/http_err.h
+service_PROGRAMS += imap/httpd
+user_PROGRAMS += imap/dav_reconstruct
+HTTP_SOURCES = imap/http_err.c \
+	 imap/http_proxy.c \
+	 imap/http_caldav.c \
+	 imap/http_carddav.c \
+	 imap/http_dav.c \
+	 imap/http_dblookup.c \
+	 imap/http_ischedule.c \
+	 imap/http_rss.c \
+	 imap/caldav_db.c \
+	 imap/proxy.c \
+	 imap/smtpclient.c \
+	 imap/spool.c \
+	 imap/carddav_db.c \
+	 imap/dav_db.c \
+	 imap/jcal.c \
+	 imap/xcal.c \
+	 imap/httpd.c
+endif
+if REPLICATION
+user_PROGRAMS += imap/sync_client imap/sync_reset
+service_PROGRAMS += imap/sync_server
+endif
+if HAVE_SSL
+user_PROGRAMS += imap/tls_prune
+endif
+user_PROGRAMS += imap/unexpunge master/master
+endif
+if CMULOCAL
+dist_sysconf_DATA += depot/rc.local.imap depot/rc.local.ptclient
+user_PROGRAMS += netnews/remotepurge
+endif
+if SIEVE
+if SERVER
+check_PROGRAMS += notifyd/notifytest
+service_PROGRAMS += notifyd/notifyd
+endif
+endif
+if PTCLIENT
+user_PROGRAMS += ptclient/ptdump ptclient/ptexpire
+service_PROGRAMS += ptclient/ptloader
+# ptclient/ptextract
+endif
+if PERL
+SUBDIRS += perl/annotator perl/imap
+noinst_LTLIBRARIES = perl/libcyrus.la perl/libcyrus_min.la
+endif
+if SIEVE
+if PERL
+SUBDIRS += perl/sieve/managesieve
+noinst_LIBRARIES = perl/sieve/lib/libisieve.a
+endif
+BUILT_SOURCES += sieve/addr.c sieve/sieve.c sieve/sieve_err.c
+lib_LTLIBRARIES += sieve/libcyrus_sieve.la
+check_PROGRAMS += sieve/test
+user_PROGRAMS += sieve/sievec sieve/sieved
+if SERVER
+service_PROGRAMS += timsieved/timsieved
+endif
+endif
+
+EXTRA_DIST = \
+	COPYRIGHT \
+	README.andrew \
+	SMakefile \
+	xversion.h \
+	com_err/et/et_c.awk \
+	com_err/et/et_h.awk \
+	com_err/et/test1.et \
+	com_err/et/test2.et \
+	com_err/et/test_et.c \
+	contrib/drac_auth.patch \
+	contrib/sieve-spamasssassin \
+	contrib/fud-client.c \
+	contrib/deliver-notify-zephyr.patch \
+	contrib/add-cyrus-user \
+	contrib/README \
+	contrib/cyrus-graphtools.1.0 \
+	contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl \
+	contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl \
+	contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl \
+	contrib/cyrus-graphtools.1.0/html \
+	contrib/cyrus-graphtools.1.0/html/index.html \
+	contrib/cyrus-graphtools.1.0/README \
+	contrib/cyrus-graphtools.1.0/script \
+	contrib/cyrus-graphtools.1.0/script/cyrus.pl \
+	contrib/cyrus-graphtools.1.0/script/run \
+	contrib/cyrus-graphtools.1.0/script/cyrusrc \
+	contrib/notify_unix/notify \
+	contrib/notify_unix/net-server-prefork-0.01.tgz \
+	contrib/notify_unix/README \
+	contrib/notify_unix/sql_notify.pl \
+	contrib/notify_unix/simple_notify.pl \
+	contrib/squatrunner.pl \
+	contrib/mupdate-test.pl \
+	contrib/squatrunner.txt \
+	cunit/cacert.pem \
+	cunit/cert.pem \
+	cunit/cunit.pl \
+	cunit/cunit-to-junit.pl \
+	cunit/key.pem \
+	cunit/vg.supp \
+	doc \
+	imap/imap_err.et \
+	imap/mupdate_err.et \
+	imap/nntp_err.et \
+	imap/rfc822_header.st \
+	lib/charset/aliases.txt \
+	lib/charset/big5.t \
+	lib/charset/gb2312.t \
+	lib/charset/iso-2022-jp.t \
+	lib/charset/iso-2022-kr.t \
+	lib/charset/iso-8859-10.t \
+	lib/charset/iso-8859-11.t \
+	lib/charset/iso-8859-13.t \
+	lib/charset/iso-8859-14.t \
+	lib/charset/iso-8859-15.t \
+	lib/charset/iso-8859-16.t \
+	lib/charset/iso-8859-1.t \
+	lib/charset/iso-8859-2.t \
+	lib/charset/iso-8859-3.t \
+	lib/charset/iso-8859-4.t \
+	lib/charset/iso-8859-5.t \
+	lib/charset/iso-8859-6.t \
+	lib/charset/iso-8859-7.t \
+	lib/charset/iso-8859-8.t \
+	lib/charset/iso-8859-9.t \
+	lib/charset/koi8-r.t \
+	lib/charset/UnicodeData.txt \
+	lib/charset/unifix.txt \
+	lib/charset/us-ascii.t \
+	lib/charset/windows-1250.t \
+	lib/charset/windows-1251.t \
+	lib/charset/windows-1252.t \
+	lib/charset/windows-1255.t \
+	lib/charset/windows-1256.t \
+	lib/htmlchar.st \
+	lib/test/cyrusdb.c \
+	lib/test/cyrusdb.INPUT \
+	lib/test/cyrusdblong.INPUT \
+	lib/test/cyrusdblong.OUTPUT \
+	lib/test/cyrusdb.OUTPUT \
+	lib/test/cyrusdbtxn.INPUT \
+	lib/test/cyrusdbtxn.OUTPUT \
+	lib/test/pool.c \
+	lib/test/rnddb.c \
+	lib/test/testglob2.c \
+	master/CYRUS-MASTER.mib \
+	master/conf/cmu-backend.conf \
+	master/conf/cmu-frontend.conf \
+	master/conf/normal.conf \
+	master/conf/prefork.conf \
+	master/conf/small.conf \
+	master/README \
+	netnews/inn.diffs \
+	perl/annotator/Daemon.pm \
+	perl/annotator/Makefile.PL.in \
+	perl/annotator/MANIFEST \
+	perl/annotator/Message.pm \
+	perl/annotator/README \
+	perl/imap/Changes \
+	perl/imap/cyradm.sh \
+	perl/imap/cyrperl.h \
+	perl/imap/Cyrus/Shell.pm \
+	perl/imap/examples/auditmbox.pl \
+	perl/imap/examples/imapcollate.pl \
+	perl/imap/examples/imapdu.pl \
+	perl/imap/examples/test-imsp.pl \
+	perl/imap/IMAP/Admin.pm \
+	perl/imap/IMAP/IMSP.pm \
+	perl/imap/IMAP/Shell.pm \
+	perl/imap/IMAP.pm \
+	perl/imap/IMAP.xs \
+	perl/imap/Makefile.PL.in \
+	perl/imap/MANIFEST \
+	perl/imap/README \
+	perl/imap/t/01-imclient.t \
+	perl/imap/t/02-admin.t \
+	perl/imap/typemap \
+	perl/imap/xsutil.c \
+	perl/sieve/managesieve/Makefile.PL.in \
+	perl/sieve/managesieve/managesieve.h \
+	perl/sieve/managesieve/managesieve.pm \
+	perl/sieve/managesieve/managesieve.xs \
+	perl/sieve/managesieve/MANIFEST \
+	perl/sieve/managesieve/typemap \
+	ptclient/README \
+	ptclient/test.c \
+	ptclient/test2.c \
+	sieve/addr.h \
+	sieve/sieve.h \
+	sieve/sieve_err.et \
+	sieve/tests/testExtension \
+	sieve/tests/testExtension/uberExtensionTestScript.key \
+	sieve/tests/testExtension/testm \
+	sieve/tests/testExtension/testm/uetest-envelope \
+	sieve/tests/testExtension/testm/uetest-asub \
+	sieve/tests/testExtension/testm/uetest-areg \
+	sieve/tests/testExtension/testm/uetest-count \
+	sieve/tests/testExtension/testm/uetest-value \
+	sieve/tests/testExtension/testm/uetest-hreg \
+	sieve/tests/testExtension/serverm \
+	sieve/tests/testExtension/serverm/uetmail-hreg \
+	sieve/tests/testExtension/serverm/uetmail-value \
+	sieve/tests/testExtension/serverm/uetmail-count2 \
+	sieve/tests/testExtension/serverm/uetmail-envelope \
+	sieve/tests/testExtension/serverm/uetmail-asub \
+	sieve/tests/testExtension/serverm/uetmail-value2 \
+	sieve/tests/testExtension/serverm/uetmail-areg \
+	sieve/tests/testExtension/serverm/uetmail-count \
+	sieve/tests/testExtension/uberExtensionTestScript.s \
+	sieve/tests/README \
+	sieve/tests/action \
+	sieve/tests/action/testm \
+	sieve/tests/action/testm/uatest-keep \
+	sieve/tests/action/testm/uatest-redirect \
+	sieve/tests/action/testm/uatest-discard \
+	sieve/tests/action/testm/uatest-stop2 \
+	sieve/tests/action/testm/uatest-stop \
+	sieve/tests/action/serverm \
+	sieve/tests/action/serverm/uamail-stop2 \
+	sieve/tests/action/serverm/uamail-redirect \
+	sieve/tests/action/serverm/uamail-stop \
+	sieve/tests/action/serverm/uamail-keep \
+	sieve/tests/action/serverm/uamail-discard \
+	sieve/tests/action/uberActionScript.key \
+	sieve/tests/action/uberActionScript.s \
+	sieve/tests/test \
+	sieve/tests/test/uberTestScript.key \
+	sieve/tests/test/testm \
+	sieve/tests/test/testm/utest-header \
+	sieve/tests/test/testm/utest-address \
+	sieve/tests/test/serverm \
+	sieve/tests/test/serverm/utmail-address \
+	sieve/tests/test/serverm/utmail-header \
+	sieve/tests/test/uberTestScript.s \
+	sieve/tests/actionExtensions \
+	sieve/tests/actionExtensions/uberExtensionActionScript.s \
+	sieve/tests/actionExtensions/testm \
+	sieve/tests/actionExtensions/testm/ueatest-flag4 \
+	sieve/tests/actionExtensions/testm/ueatest-flag2 \
+	sieve/tests/actionExtensions/testm/ueatest-fileinto \
+	sieve/tests/actionExtensions/testm/ueatest-denotify \
+	sieve/tests/actionExtensions/testm/ueatest-vacation \
+	sieve/tests/actionExtensions/testm/ueatest-reject \
+	sieve/tests/actionExtensions/testm/ueatest-mark \
+	sieve/tests/actionExtensions/testm/ueatest-denotify2 \
+	sieve/tests/actionExtensions/testm/ueatest-flag5 \
+	sieve/tests/actionExtensions/testm/ueatest-notify2 \
+	sieve/tests/actionExtensions/testm/ueatest-notify \
+	sieve/tests/actionExtensions/testm/ueatest-flag1 \
+	sieve/tests/actionExtensions/testm/ueatest-flag3 \
+	sieve/tests/actionExtensions/testm/ueatest-unmark \
+	sieve/tests/actionExtensions/uberExtensionActionScript.key \
+	sieve/tests/actionExtensions/serverm \
+	sieve/tests/actionExtensions/serverm/ueamail-flag4 \
+	sieve/tests/actionExtensions/serverm/ueamail-denotify \
+	sieve/tests/actionExtensions/serverm/ueamail-mark \
+	sieve/tests/actionExtensions/serverm/ueamail-denotify2 \
+	sieve/tests/actionExtensions/serverm/ueamail-flag2 \
+	sieve/tests/actionExtensions/serverm/ueamail-unmark \
+	sieve/tests/actionExtensions/serverm/ueamail-reject \
+	sieve/tests/actionExtensions/serverm/ueamail-flag3 \
+	sieve/tests/actionExtensions/serverm/ueamail-fileinto \
+	sieve/tests/actionExtensions/serverm/ueamail-flag1 \
+	sieve/tests/actionExtensions/serverm/ueamail-notify \
+	sieve/tests/actionExtensions/serverm/ueamail-flag5 \
+	sieve/tests/actionExtensions/serverm/ueamail-notify2 \
+	sieve/tests/actionExtensions/serverm/ueamail-vacation \
+	timsieved/TODO
+
+TEXINFO_TEX = com_err/et/texinfo.tex
+dist_noinst_SCRIPTS = \
+	com_err/et/compile_et.sh \
+	com_err/et/config_script \
+	imap/lmtpstats.snmp \
+	imap/pushstats.snmp \
+	lib/imapoptions \
+	lib/mkchartable.pl \
+	lib/test/run \
+	perl/sieve/scripts/installsieve.pl \
+	perl/sieve/scripts/sieveshell.pl \
+	tools/arbitronsort.pl \
+	tools/compile_st.pl \
+	tools/config2header \
+	tools/config2man \
+	tools/convert-sieve.pl \
+	tools/dohash \
+	tools/fixsearchpath.pl \
+	tools/jenkins-build.sh \
+	tools/masssievec \
+	tools/migrate-metadata \
+	tools/mkimap \
+	tools/mknewsgroups \
+	tools/mupdate-loadgen.pl \
+	tools/rehash \
+	tools/translatesieve \
+	tools/undohash \
+	tools/upgradesieve \
+	snmp/snmpgen
+noinst_MAN = \
+	com_err/et/com_err.3 \
+	com_err/et/compile_et.1
+noinst_TEXINFOS = com_err/et/com_err.texinfo
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcyrus_min.pc libcyrus.pc libcyrus_sieve.pc
+
+com_err_et_libcyrus_com_err_la_SOURCES = \
+	com_err/et/com_err.c \
+	com_err/et/com_err.h \
+	com_err/et/error_message.c \
+	com_err/et/error_table.h \
+	com_err/et/et_name.c \
+	com_err/et/init_et.c \
+	com_err/et/internal.h \
+	com_err/et/mit-sipb-copyright.h
+com_err_et_libcyrus_com_err_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+com_err/et/compile_et: com_err/et/compile_et.sh com_err/et/config_script \
+	config.h
+	@${top_srcdir}/com_err/et/config_script ${top_srcdir}/com_err/et/compile_et.sh ${AWK} ${SED} > $@
+	@chmod 755 $@
+
+# ---- Libraries ----
+
+# BASIC is the libraries that every Cyrus program (except master) will
+# need to link with.
+#
+# Note that several places in the code use -lcrypto, e.g. for SHA1 or
+# MD5 algorithms, without needing SSL. Currently we have no way of
+# minimally linking such code.
+LD_BASIC_ADD = lib/libcyrus.la lib/libcyrus_min.la ${LIBS} $(LIB_RT) \
+	${LIB_SASL} $(SSL_LIBS)
+
+# UTILITY is the libraries that utility programs which use Cyrus'
+# mailbox and message handling code need to link with.
+
+LD_UTILITY_ADD = imap/libcyrus_imap.la $(LD_BASIC_ADD) $(COM_ERR_LIBS)
+
+# SERVER is the libraries that network-facing servers need to link with
+#
+# Note that the code is horribly intertwingled e.g. in imap/global.c
+# so that even utilities which never open a socket need to link against
+# the SASL library.
+LD_SERVER_ADD = $(LD_UTILITY_ADD) $(LIB_WRAP)
+
+# ----
+
+if CUNIT
+
+CUNIT_PROJECT = cunit/default.cunit
+BUILT_SOURCES += cunit/registers.h $(CUNIT_PROJECT)
+CLEANFILES += cunit/registers.h $(CUNIT_PROJECT)
+check_PROGRAMS += cunit/unit
+
+cunit_FRAMEWORK = \
+	cunit/unit.c \
+	cunit/cunit.h \
+	cunit/syslog.c \
+	cunit/cunit-syslog.h \
+	cunit/timeout.c \
+	cunit/timeout.h \
+	cunit/timezones.c \
+	cunit/timezones.h \
+	cunit/timeofday.c \
+	cunit/timeofday.h
+
+cunit_TESTS = \
+	cunit/annotate.testc \
+	cunit/backend.testc \
+	cunit/binhex.testc \
+	cunit/bitvector.testc \
+	cunit/buf.testc \
+	cunit/byteorder64.testc \
+	cunit/charset.testc \
+	cunit/command.testc \
+	cunit/crc32.testc \
+	cunit/db.testc \
+	cunit/dlist.testc \
+	cunit/duplicate.testc \
+	cunit/getxstring.testc \
+	cunit/glob.testc \
+	cunit/guid.testc \
+	cunit/hash.testc \
+	cunit/imapurl.testc \
+	cunit/mboxname.testc \
+	cunit/md5.testc \
+	cunit/message.testc \
+	cunit/msgid.testc \
+	cunit/parseaddr.testc \
+	cunit/parse.testc \
+	cunit/prot.testc \
+	cunit/ptrarray.testc \
+	cunit/quota.testc \
+	cunit/rfc822tok.testc \
+	cunit/search_expr.testc \
+	cunit/seqset.testc
+if SIEVE
+cunit_TESTS += cunit/sieve.testc
+endif
+cunit_TESTS += \
+	cunit/spool.testc \
+	cunit/squat.testc \
+	cunit/strarray.testc \
+	cunit/strconcat.testc \
+	cunit/times.testc \
+	cunit/tok.testc
+
+cunit_unit_SOURCES = $(cunit_FRAMEWORK) $(cunit_TESTS) \
+		imap/mutex_fake.c imap/spool.c
+cunit_unit_LDADD =
+if SIEVE
+cunit_unit_LDADD += sieve/libcyrus_sieve.la
+endif
+cunit_unit_LDADD += $(LD_UTILITY_ADD) -lcunit
+
+CUNIT_PL = cunit/cunit.pl --project $(CUNIT_PROJECT)
+
+.testc.o:
+	$(CUNIT_PL) --generate-wrapper $<
+	$(COMPILE) -c -o $@ $<-cunit.c
+	$(RM) $<-cunit.c
+
+$(CUNIT_PROJECT):
+	$(RM) $@
+	$(CUNIT_PL) --add-sources $(cunit_TESTS)
+
+cunit/registers.h: $(CUNIT_PROJECT)
+	$(CUNIT_PL) --generate-register-function $@
+
+# To run under Valgrind, do: make VG=1 check
+VALGRIND = valgrind --tool=memcheck --leak-check=full --suppressions=vg.supp
+
+check-local:
+	@echo "Running unit tests"
+	@vg= ; test -z "$$VG" || vg="$(VALGRIND)" ;\
+	f="-v" ; test "x$$CUFORMAT" = xjunit && f="-x" ;\
+	cd cunit ;\
+	$$vg ./unit $$f ;\
+	if "x$$CUFORMAT" = xjunit ; then \
+	$(RM) -rf reports ; mkdir reports ; ./cunit-to-junit.pl ;\
+	fi
+endif
+
+doc_text_htmlstrip_SOURCE = doc/text/htmlstrip.c
+
+includedir=@includedir@/cyrus
+include_HEADERS = \
+	lib/acl.h \
+	lib/arrayu64.h \
+	lib/assert.h \
+	lib/auth.h \
+	lib/auth_pts.h \
+	lib/bitvector.h \
+	lib/bsearch.h \
+	lib/charset.h \
+	lib/chartable.h \
+	lib/command.h \
+	lib/crc32.h \
+	lib/cyr_lock.h \
+	lib/cyrusdb.h \
+	lib/exitcodes.h \
+	lib/glob.h \
+	lib/gmtoff.h \
+	lib/hash.h \
+	lib/hashu64.h \
+	lib/imapopts.h \
+	lib/imapurl.h \
+	lib/imclient.h \
+	lib/imparse.h \
+	lib/iostat.h \
+	lib/iptostring.h \
+	lib/libcyr_cfg.h \
+	lib/lsort.h \
+	lib/map.h \
+	lib/mappedfile.h \
+	lib/me.h \
+	lib/mkgmtime.h \
+	lib/mpool.h \
+	lib/nonblock.h \
+	lib/parseaddr.h \
+	lib/retry.h \
+	lib/rfc822tok.h \
+	lib/signals.h \
+	lib/strarray.h \
+	lib/strhash.h \
+	lib/stristr.h \
+	lib/sysexits.h \
+	lib/times.h \
+	lib/tok.h \
+	lib/wildmat.h \
+	lib/xmalloc.h
+nobase_include_HEADERS = sieve/sieve_interface.h
+nobase_nodist_include_HEADERS = sieve/sieve_err.h
+
+noinst_HEADERS = \
+	lib/byteorder64.h \
+	lib/gai.h \
+	lib/libconfig.h \
+	lib/md5.h \
+	lib/prot.h \
+	lib/ptrarray.h \
+	lib/util.h \
+	lib/xstrlcat.h \
+	lib/xstrlcpy.h
+
+imap_arbitron_SOURCES = imap/arbitron.c imap/cli_fatal.c imap/mutex_fake.c
+imap_arbitron_LDADD = $(LD_UTILITY_ADD)
+
+imap_chk_cyrus_SOURCES = imap/chk_cyrus.c imap/cli_fatal.c imap/mutex_fake.c
+imap_chk_cyrus_LDADD = $(LD_UTILITY_ADD)
+
+imap_ctl_conversationsdb_SOURCES = imap/ctl_conversationsdb.c imap/mutex_fake.c
+imap_ctl_conversationsdb_LDADD = $(LD_UTILITY_ADD)
+
+imap_ctl_cyrusdb_SOURCES = imap/cli_fatal.c imap/ctl_cyrusdb.c imap/mutex_fake.c
+imap_ctl_cyrusdb_LDADD = $(LD_UTILITY_ADD)
+
+imap_ctl_deliver_SOURCES = imap/cli_fatal.c imap/ctl_deliver.c imap/mutex_fake.c
+imap_ctl_deliver_LDADD = $(LD_UTILITY_ADD)
+
+imap_ctl_mboxlist_SOURCES = imap/cli_fatal.c imap/ctl_mboxlist.c imap/mutex_fake.c
+imap_ctl_mboxlist_LDADD = $(LD_UTILITY_ADD)
+
+imap_cvt_cyrusdb_SOURCES = imap/cli_fatal.c imap/cvt_cyrusdb.c imap/mutex_fake.c
+imap_cvt_cyrusdb_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyrdump_SOURCES = imap/cli_fatal.c imap/cyrdump.c imap/mutex_fake.c
+imap_cyrdump_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_dbtool_SOURCES = imap/cli_fatal.c imap/cyr_dbtool.c imap/mutex_fake.c
+imap_cyr_dbtool_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_deny_SOURCES = imap/cli_fatal.c imap/cyr_deny.c imap/mutex_fake.c
+imap_cyr_deny_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_df_SOURCES = imap/cli_fatal.c imap/cyr_df.c imap/mutex_fake.c
+imap_cyr_df_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_expire_SOURCES = imap/cli_fatal.c imap/cyr_expire.c imap/mutex_fake.c
+imap_cyr_expire_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_info_SOURCES = imap/cli_fatal.c imap/cyr_info.c imap/mutex_fake.c master/masterconf.c
+imap_cyr_info_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_sequence_SOURCES = imap/cli_fatal.c imap/cyr_sequence.c imap/mutex_fake.c
+imap_cyr_sequence_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_synclog_SOURCES = imap/cli_fatal.c imap/cyr_synclog.c imap/mutex_fake.c
+imap_cyr_synclog_LDADD = $(LD_UTILITY_ADD)
+
+imap_cyr_userseen_SOURCES = imap/cli_fatal.c imap/cyr_userseen.c imap/mutex_fake.c
+imap_cyr_userseen_LDADD = $(LD_UTILITY_ADD)
+
+#imap_cyr_virusscan_SOURCES = imap/cli_fatal.c imap/cyr_virusscan.c imap/mutex_fake.c
+#imap_cyr_virusscan_LDADD = $(LD_UTILITY_ADD) -lclamav
+
+imap_deliver_SOURCES = \
+	imap/deliver.c \
+	imap/lmtpengine.c \
+	imap/lmtpstats.c \
+	imap/mutex_fake.c \
+	imap/proxy.c \
+	imap/spool.c
+imap_deliver_LDADD = $(LD_UTILITY_ADD)
+
+imap_fetchnews_SOURCES = imap/cli_fatal.c imap/fetchnews.c imap/mutex_fake.c
+imap_fetchnews_LDADD = $(LD_UTILITY_ADD)
+
+imap_fud_SOURCES = imap/fud.c imap/mutex_fake.c master/service.c
+imap_fud_LDADD = $(LD_SERVER_ADD)
+
+imap_hammer_cyrusdb_SOURCES = imap/cli_fatal.c imap/hammer_cyrusdb.c imap/mutex_fake.c
+imap_hammer_cyrusdb_LDADD = $(LD_UTILITY_ADD)
+
+imap_idled_SOURCES = imap/idled.c imap/mutex_fake.c
+imap_idled_LDADD = $(LD_UTILITY_ADD)
+
+imap_imapd_SOURCES = \
+	imap/imap_proxy.c \
+	imap/imap_proxy.h \
+	imap/imapd.c \
+	imap/imapd.h \
+	imap/mutex_fake.c \
+	imap/pushstats.c \
+	imap/pushstats.h \
+	imap/proxy.c \
+	imap/proxy.h \
+	master/service.c \
+	imap/autocreate.h \
+	imap/autocreate.c
+imap_imapd_LDADD =
+if SIEVE
+imap_imapd_LDADD += sieve/libcyrus_sieve.la
+endif
+imap_imapd_LDADD += $(LD_SERVER_ADD)
+
+imap_ipurge_SOURCES = imap/cli_fatal.c imap/ipurge.c imap/mutex_fake.c
+imap_ipurge_LDADD = $(LD_UTILITY_ADD)
+
+nodist_imap_libcyrus_imap_la_SOURCES = \
+	imap/imap_err.c \
+	imap/mupdate_err.c \
+	imap/mupdate_err.h
+imap_libcyrus_imap_la_SOURCES = \
+	imap/annotate.c \
+	imap/annotate.h \
+	imap/append.c \
+	imap/append.h \
+	imap/backend.c \
+	imap/backend.h \
+	imap/conversations.c \
+	imap/convert_code.c \
+	imap/convert_code.h \
+	imap/dlist.c \
+	imap/dlist.h \
+	imap/duplicate.c \
+	imap/duplicate.h \
+	imap/global.c \
+	imap/global.h \
+	imap/idle.c \
+	imap/idle.h \
+	imap/idlemsg.c \
+	imap/idlemsg.h \
+	imap/imapparse.c \
+	imap/imapparse.h \
+	imap/index.c \
+	imap/index.h \
+	imap/mailbox.c \
+	imap/mailbox.h \
+	imap/mbdump.c \
+	imap/mbdump.h \
+	imap/mboxkey.c \
+	imap/mboxkey.h \
+	imap/mboxlist.c \
+	imap/mboxlist.h \
+	imap/mboxevent.c \
+	imap/mboxevent.h \
+	imap/mboxname.c \
+	imap/mboxname.h \
+	imap/message_guid.c \
+	imap/message_guid.h \
+	imap/message.c \
+	imap/message.h \
+	imap/mupdate-client.c \
+	imap/mupdate-client.h \
+	imap/mutex.h \
+	imap/notify.c \
+	imap/notify.h \
+	imap/proc.c \
+	imap/proc.h \
+	imap/protocol.h \
+	imap/quota_db.c \
+	imap/rfc822_header.c \
+	imap/rfc822_header.h \
+	imap/saslclient.c \
+	imap/saslclient.h \
+	imap/saslserver.c \
+	imap/search_engines.c \
+	imap/search_engines.h \
+	imap/search_expr.c \
+	imap/search_expr.h \
+	imap/search_query.c \
+	imap/search_query.h \
+	imap/seen.h \
+	imap/seen_db.c \
+	imap/sequence.c \
+	imap/sequence.h \
+	imap/setproctitle.c \
+	imap/statuscache.h \
+	imap/statuscache_db.c \
+	imap/sync_log.c \
+	imap/sync_log.h \
+	imap/telemetry.c \
+	imap/telemetry.h \
+	imap/tls.c \
+	imap/tls.h \
+	imap/upgrade_index.c \
+	imap/upgrade_index.h \
+	imap/user.c \
+	imap/user.h \
+	imap/userdeny_db.c \
+	imap/userdeny.h \
+	imap/version.c \
+	imap/version.h \
+	imap/xstats.c \
+	imap/xstats.h \
+	imap/xstats_metrics.h
+
+imap_libcyrus_imap_la_LIBADD = $(COM_ERR_LIBS) $(LIB_UUID) lib/libcyrus_min.la lib/libcyrus.la
+imap_libcyrus_imap_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+imap_libcyrus_imap_la_CXXFLAGS =
+
+if USE_SQUAT
+imap_libcyrus_imap_la_SOURCES += \
+	imap/search_squat.c \
+	imap/squat.c \
+	imap/squat.h \
+	imap/squat_build.c \
+	imap/squat_internal.c \
+	imap/squat_internal.h
+endif
+if USE_SPHINX
+imap_libcyrus_imap_la_SOURCES += \
+	imap/search_sphinx.c
+endif
+if JANSSON
+imap_libcyrus_imap_la_LIBADD += $(JANSSON_LIBS)
+imap_libcyrus_imap_la_CFLAGS += $(JANSSON_CFLAGS)
+endif
+if HTTPD
+imap_libcyrus_imap_la_SOURCES += $(HTTP_SOURCES)
+endif
+if USE_XAPIAN
+imap_libcyrus_imap_la_SOURCES += \
+	imap/search_xapian.c \
+	imap/xapian_wrap.h \
+	imap/xapian_wrap.cpp
+imap_libcyrus_imap_la_LIBADD += $(XAPIAN_LIBS)
+imap_libcyrus_imap_la_CXXFLAGS += $(XAPIAN_CXXFLAGS)
+endif
+
+imap_lmtpd_SOURCES = \
+	imap/autocreate.c \
+	imap/autocreate.h \
+	imap/lmtpd.c \
+	imap/lmtpd.h \
+	imap/lmtpengine.c \
+	imap/lmtpengine.h \
+	imap/lmtpstats.c \
+	imap/lmtpstats.h \
+	imap/mutex_fake.c \
+	imap/proxy.c \
+	imap/spool.c \
+	master/service.c
+imap_lmtpd_LDADD =
+if SIEVE
+imap_lmtpd_SOURCES += imap/lmtp_sieve.c imap/lmtp_sieve.h imap/smtpclient.c
+imap_lmtpd_LDADD += sieve/libcyrus_sieve.la
+endif
+imap_lmtpd_LDADD += $(LD_SERVER_ADD)
+
+imap/lmtpstats.c: imap/lmtpstats.snmp snmp/snmpgen
+	cd imap && ../${top_srcdir}/snmp/snmpgen ../${top_srcdir}/imap/lmtpstats.snmp
+
+imap/pushstats.c: imap/pushstats.snmp snmp/snmpgen
+	cd imap && ../${top_srcdir}/snmp/snmpgen ../${top_srcdir}/imap/pushstats.snmp
+
+imap_mbexamine_SOURCES = imap/cli_fatal.c imap/mbexamine.c imap/mutex_fake.c
+imap_mbexamine_LDADD = $(LD_UTILITY_ADD)
+
+imap_mbpath_SOURCES = imap/cli_fatal.c imap/mbpath.c imap/mutex_fake.c
+imap_mbpath_LDADD = $(LD_UTILITY_ADD)
+
+imap_mbtool_SOURCES = imap/cli_fatal.c imap/mbtool.c imap/mutex_fake.c
+imap_mbtool_LDADD = $(LD_UTILITY_ADD)
+
+imap_message_test_SOURCES = imap/message_test.c imap/mutex_fake.c
+imap_message_test_LDADD = $(LD_UTILITY_ADD)
+
+imap_mupdate_SOURCES = \
+	imap/mupdate.c \
+	imap/mupdate.h \
+	imap/mupdate-slave.c \
+	imap/mutex_pthread.c \
+	master/service-thread.c
+imap_mupdate_LDADD = $(LD_SERVER_ADD) -lpthread
+
+nodist_imap_nntpd_SOURCES = \
+	imap/nntp_err.c \
+	imap/nntp_err.h
+imap_nntpd_SOURCES = \
+	imap/mutex_fake.c \
+	imap/nntpd.c \
+	imap/proxy.c \
+	imap/smtpclient.c \
+	imap/smtpclient.h \
+	imap/spool.c \
+	imap/spool.h \
+	master/service.c
+imap_nntpd_LDADD = $(LD_SERVER_ADD)
+
+nodist_imap_httpd_SOURCES = \
+	imap/http_err.c \
+	imap/http_err.h
+imap_httpd_SOURCES = \
+	imap/mutex_fake.c \
+	imap/carddav_db.c \
+	imap/caldav_db.c \
+	imap/http_proxy.c \
+	imap/httpd.c \
+	imap/proxy.c \
+	imap/spool.c \
+	imap/spool.h \
+	imap/http_rss.c \
+	imap/http_dav.c \
+	imap/http_dblookup.c \
+	imap/dav_db.c \
+	imap/http_ischedule.c \
+	imap/http_carddav.c \
+	imap/http_caldav.c \
+	imap/smtpclient.c \
+	imap/xcal.c \
+	imap/jcal.c \
+	master/service.c
+imap_httpd_LDADD = $(LD_SERVER_ADD)
+
+imap_pop3d_SOURCES = \
+	imap/autocreate.c \
+	imap/autocreate.h \
+	imap/mutex_fake.c \
+	imap/pop3d.c \
+	imap/proxy.c \
+	master/service.c
+imap_pop3d_LDADD =
+if SIEVE
+imap_pop3d_LDADD += sieve/libcyrus_sieve.la
+endif
+imap_pop3d_LDADD += $(LD_SERVER_ADD)
+
+imap_quota_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/quota.c imap/quota.h
+imap_quota_LDADD = $(LD_UTILITY_ADD)
+
+imap_reconstruct_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/reconstruct.c
+imap_reconstruct_LDADD = $(LD_UTILITY_ADD)
+
+imap_dav_reconstruct_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/dav_reconstruct.c
+imap_dav_reconstruct_LDADD = $(LD_UTILITY_ADD)
+
+imap_search_test_SOURCES = imap/search_test.c imap/mutex_fake.c
+imap_search_test_LDADD = $(LD_UTILITY_ADD)
+
+imap_smmapd_SOURCES = imap/mutex_fake.c imap/proxy.c imap/smmapd.c master/service.c
+imap_smmapd_LDADD = $(LD_SERVER_ADD)
+
+imap_squatter_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/squatter.c
+imap_squatter_LDADD = $(LD_UTILITY_ADD)
+
+imap_squat_dump_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/squat_dump.c
+imap_squat_dump_LDADD = $(LD_UTILITY_ADD)
+
+imap_sync_client_SOURCES = imap/mutex_fake.c imap/sync_client.c imap/sync_support.c imap/sync_support.h
+imap_sync_client_LDADD = $(LD_UTILITY_ADD)
+
+imap_sync_reset_SOURCES = imap/mutex_fake.c imap/sync_reset.c imap/sync_support.c imap/sync_support.h
+imap_sync_reset_LDADD = $(LD_UTILITY_ADD)
+
+imap_sync_server_SOURCES = imap/mutex_fake.c imap/sync_server.c imap/sync_support.c master/service.c
+imap_sync_server_LDADD = $(LD_SERVER_ADD)
+
+imap_tls_prune_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/tls_prune.c
+imap_tls_prune_LDADD = $(LD_UTILITY_ADD)
+
+imap_unexpunge_SOURCES = imap/cli_fatal.c imap/mutex_fake.c imap/unexpunge.c
+imap_unexpunge_LDADD = $(LD_UTILITY_ADD)
+
+imap/imap_err.h imap/imap_err.c: imap/imap_err.et $(COMPILE_ET_DEP)
+	cd imap && $(COMPILE_ET) ../$(top_srcdir)/imap/imap_err.et
+
+imap/mupdate_err.h imap/mupdate_err.c: imap/mupdate_err.et $(COMPILE_ET_DEP)
+	cd imap && $(COMPILE_ET) ../$(top_srcdir)/imap/mupdate_err.et
+
+imap/nntp_err.h imap/nntp_err.c: imap/nntp_err.et $(COMPILE_ET_DEP)
+	cd imap && $(COMPILE_ET) ../$(top_srcdir)/imap/nntp_err.et
+
+imap/http_err.h imap/http_err.c: imap/http_err.et $(COMPILE_ET_DEP)
+	cd imap && $(COMPILE_ET) ../$(top_srcdir)/imap/http_err.et
+
+if MAINTAINER_MODE
+imap/rfc822_header.c: imap/rfc822_header.st
+	${top_srcdir}/tools/compile_st.pl -c $< > $@.NEW && mv $@.NEW $@
+
+imap/rfc822_header.h: imap/rfc822_header.st
+	${top_srcdir}/tools/compile_st.pl -h $< > $@.NEW && mv $@.NEW $@
+
+lib/htmlchar.c: lib/htmlchar.st
+	${top_srcdir}/tools/compile_st.pl -c $< > $@.NEW && mv $@.NEW $@
+
+lib/htmlchar.h: lib/htmlchar.st
+	${top_srcdir}/tools/compile_st.pl -h $< > $@.NEW && mv $@.NEW $@
+endif
+
+imtest_imtest_SOURCES = imtest/imtest.c
+imtest_imtest_LDADD = $(LD_BASIC_ADD)
+imtest_imtest_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+nodist_lib_libcyrus_la_SOURCES = lib/chartable.c
+lib_libcyrus_la_SOURCES = \
+	lib/acl.c \
+	lib/acl_afs.c \
+	lib/auth.c \
+	lib/auth_krb.c \
+	lib/auth_krb5.c \
+	lib/auth_pts.c \
+	lib/auth_unix.c \
+	lib/bitvector.c \
+	lib/bsearch.c \
+	lib/byteorder64.c \
+	lib/charset.c \
+	lib/command.c \
+	lib/crc32.c \
+	lib/cyrusdb.c \
+	lib/cyrusdb_flat.c \
+	lib/cyrusdb_quotalegacy.c \
+	lib/cyrusdb_skiplist.c \
+	lib/cyrusdb_twoskip.c \
+	lib/glob.c \
+	lib/htmlchar.c \
+	lib/htmlchar.h \
+	lib/imapurl.c \
+	lib/imclient.c \
+	lib/imparse.c \
+	lib/iostat.c \
+	lib/iptostring.c \
+	lib/libcyr_cfg.c \
+	lib/lsort.c \
+	lib/mappedfile.c \
+	lib/mkgmtime.c \
+	lib/parseaddr.c \
+	lib/prot.c \
+	lib/ptrarray.c \
+	lib/rfc822tok.c \
+	lib/signals.c \
+	lib/stristr.c \
+	lib/times.c \
+	lib/tok.c \
+	lib/wildmat.c
+if USE_BERKELEY
+lib_libcyrus_la_SOURCES += lib/cyrusdb_berkeley.c
+endif
+if USE_SQL
+lib_libcyrus_la_SOURCES += lib/cyrusdb_sql.c
+endif
+if GMTOFF_TM
+lib_libcyrus_la_SOURCES += lib/gmtoff_tm.c
+else
+lib_libcyrus_la_SOURCES += lib/gmtoff_gmtime.c
+endif
+if NONBLOCK_FCNTL
+lib_libcyrus_la_SOURCES += lib/nonblock_fcntl.c
+else
+lib_libcyrus_la_SOURCES += lib/nonblock_ioctl.c
+endif
+lib_libcyrus_la_LIBADD = $(LIB_RT) ${LIB_SASL} $(SSL_LIBS)
+lib_libcyrus_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+lib_libcyrus_min_la_SOURCES = \
+	lib/arrayu64.c \
+	lib/assert.c \
+	lib/hash.c \
+	lib/hashu64.c \
+	lib/imapopts.c \
+	lib/libconfig.c \
+	lib/me.c \
+	lib/mpool.c \
+	lib/retry.c \
+	lib/strarray.c \
+	lib/strhash.c \
+	lib/util.c \
+	lib/xmalloc.c \
+	lib/xstrlcat.c \
+	lib/xstrlcpy.c
+if IPV6_noGETADDRINFO
+lib_libcyrus_min_la_SOURCES += lib/getaddrinfo.c
+endif
+if IPV6_noGETNAMEINFO
+lib_libcyrus_min_la_SOURCES += lib/getnameinfo.c
+endif
+if LOCK_FCNTL
+lib_libcyrus_min_la_SOURCES += lib/lock_fcntl.c
+else
+lib_libcyrus_min_la_SOURCES += lib/lock_flock.c
+endif
+if MAP_SHARED
+lib_libcyrus_min_la_SOURCES += lib/map_shared.c
+else
+if MAP_STUPIDSHARED
+lib_libcyrus_min_la_SOURCES += lib/map_stupidshared.c
+else
+lib_libcyrus_min_la_SOURCES += lib/map_nommap.c
+endif
+endif
+lib_libcyrus_min_la_LIBADD = $(LTLIBOBJS)
+lib_libcyrus_min_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+lib/chartable.c: lib/mkchartable.pl lib/charset/unifix.txt \
+	$(top_srcdir)/lib/charset/*.t lib/charset/UnicodeData.txt \
+	lib/charset/aliases.txt
+	@echo "### Building chartables..."
+	perl $(top_srcdir)/lib/mkchartable.pl -m $(top_srcdir)/lib/charset/unifix.txt -m $(top_srcdir)/lib/charset/UnicodeData.txt -a $(top_srcdir)/lib/charset/aliases.txt -o $@ $(top_srcdir)/lib/charset/*.t || (rm -f $@ && exit 1)
+	@echo "### Done building chartables."
+
+lib/imapopts.c: lib/imapoptions tools/config2header
+	$(top_srcdir)/tools/config2header CC="$(CC)" $(top_builddir)/lib/imapopts.c $(top_builddir)/lib/imapopts.h < $(top_srcdir)/lib/imapoptions
+
+#this is from lib/test/Makefile.in, however testglob.c does not exist in
+#/lib/test, instead testglob2.c is there.
+#lib_test_testglob_LIRBARIES = lib/libcyrus.la lib/libcyrus_min.la -ldb-4.0
+
+
+@SET_MAKE@
+
+dist_man_MANS = \
+	man/imtest.1 \
+	man/installsieve.1 \
+	man/lmtptest.1 \
+	man/mupdatetest.1 \
+	man/nntptest.1 \
+	man/pop3test.1 \
+	man/sieveshell.1 \
+	man/sivtest.1 \
+	man/smtptest.1 \
+	man/imclient.3 \
+	man/cyrus.conf.5 \
+	man/imapd.conf.5 \
+	man/krb.equiv.5 \
+	man/arbitron.8 \
+	man/chk_cyrus.8 \
+	man/ctl_cyrusdb.8 \
+	man/ctl_deliver.8 \
+	man/ctl_mboxlist.8 \
+	man/cyr_expire.8 \
+	man/cvt_cyrusdb.8 \
+	man/cyr_dbtool.8 \
+	man/cyr_deny.8 \
+	man/cyr_df.8 \
+	man/cyr_info.8 \
+	man/cyr_synclog.8 \
+	man/deliver.8 \
+	man/fetchnews.8 \
+	man/fud.8 \
+	man/httpd.8 \
+	man/idled.8 \
+	man/imapd.8 \
+	man/ipurge.8 \
+	man/lmtpd.8 \
+	man/master.8 \
+	man/mbexamine.8 \
+	man/mbpath.8 \
+	man/nntpd.8 \
+	man/notifyd.8 \
+	man/pop3d.8 \
+	man/quota.8 \
+	man/reconstruct.8 \
+	man/rmnews.8 \
+	man/smmapd.8 \
+	man/syncnews.8 \
+	man/sync_client.8 \
+	man/sync_reset.8 \
+	man/sync_server.8 \
+	man/timsieved.8 \
+	man/tls_prune.8 \
+	man/unexpunge.8
+if USE_SQUAT
+dist_man_MANS += \
+	man/squatter.8
+endif
+
+master_master_SOURCES = \
+	master/cyrusMasterMIB.c \
+	master/cyrusMasterMIB.h \
+	master/master.c \
+	master/master.h \
+	master/masterconf.c \
+	master/masterconf.h \
+	master/service.h
+master_master_LDADD = lib/libcyrus_min.la $(LIB_UCDSNMP) $(LIBS) -lm
+
+
+netnews_remotepurge_SOURCES = \
+	netnews/macros.h \
+	netnews/readconfig.c \
+	netnews/readconfig.h \
+	netnews/remotepurge.c
+netnews_remotepurge_LDADD = $(LD_BASIC_ADD)
+
+notifyd_notifyd_SOURCES = \
+	imap/mutex_fake.c \
+	master/service.c \
+	notifyd/notify_external.c \
+	notifyd/notify_external.h \
+	notifyd/notify_log.c \
+	notifyd/notify_log.h \
+	notifyd/notify_mailto.c \
+	notifyd/notify_mailto.h \
+	notifyd/notify_null.c \
+	notifyd/notify_null.h \
+	notifyd/notifyd.c \
+	notifyd/notifyd.h
+if ZEPHYR
+notifyd_notifyd_SOURCES += notifyd/notify_zephyr.c notifyd/notify_zephyr.h
+endif
+notifyd_notifyd_LDADD = $(LD_SERVER_ADD) $(ZEPHYR_LIBS)
+
+notifyd_notifytest_SOURCES = notifyd/notifytest.c imap/mutex_fake.c
+notifyd_notifytest_LDADD = $(LD_BASIC_ADD)
+
+perl_libcyrus_la_SOURCES = $(lib_libcyrus_la_SOURCES)
+perl_libcyrus_la_LIBADD = $(lib_libcyrus_la_LIBADD)
+perl_libcyrus_min_la_SOURCES = $(lib_libcyrus_min_la_SOURCES)
+perl_libcyrus_min_la_LIBADD = $(lib_libcyrus_min_la_LIBADD)
+
+perl_sieve_lib_libisieve_a_SOURCES = \
+	perl/sieve/lib/codes.h \
+	perl/sieve/lib/isieve.c \
+	perl/sieve/lib/isieve.h \
+	perl/sieve/lib/lex.c \
+	perl/sieve/lib/lex.h \
+	perl/sieve/lib/request.c \
+	perl/sieve/lib/request.h
+
+ptclient_ptdump_SOURCES = imap/cli_fatal.c imap/mutex_fake.c ptclient/ptdump.c
+ptclient_ptdump_LDADD = $(LD_UTILITY_ADD)
+ptclient_ptexpire_SOURCES = imap/cli_fatal.c imap/mutex_fake.c ptclient/ptexpire.c
+ptclient_ptexpire_LDADD = $(LD_UTILITY_ADD)
+
+#ptclient_ptextract_SOURCES = imap/cli_fatal.c imap/mutex_fake.c ptclient/ptextract.c
+#ptclient_ptextract_LDADD = $(LD_UTILITY_ADD)
+
+ptclient_ptloader_SOURCES = \
+	imap/mutex_fake.c \
+	ptclient/ptloader.c \
+	ptclient/ptloader.h \
+	master/service-thread.c
+ptclient_ptloader_LDFLAGS =
+ptclient_ptloader_LDADD = $(LD_SERVER_ADD)
+
+if HAVE_LDAP
+ptclient_ptloader_SOURCES += ptclient/ldap.c
+ptclient_ptloader_LDADD += $(LDAP_LIBS)
+ptclient_ptloader_LDFLAGS += $(LDAP_LDFLAGS)
+endif
+
+if USE_AFSKRB
+ptclient_ptloader_SOURCES += ptclient/afskrb.c
+ptclient_ptloader_LDADD += $(AFS_LIBS)
+ptclient_ptloader_LDFLAGS += $(AFS_LDFLAGS)
+endif
+
+nodist_sieve_libcyrus_sieve_la_SOURCES = \
+	sieve/sieve_err.c \
+	sieve/sieve_err.h
+sieve_libcyrus_sieve_la_SOURCES = \
+	sieve/bytecode.h \
+	sieve/addr.y \
+	sieve/addr-lex.l \
+	sieve/bc_dump.c \
+	sieve/bc_emit.c \
+	sieve/bc_eval.c \
+	sieve/bc_generate.c \
+	sieve/comparator.c \
+	sieve/comparator.h \
+	sieve/interp.c \
+	sieve/interp.h \
+	sieve/message.c \
+	sieve/message.h \
+	sieve/script.c \
+	sieve/script.h \
+	sieve/sieve-lex.l \
+	sieve/sieve.y \
+	sieve/tree.c \
+	sieve/tree.h
+sieve_libcyrus_sieve_la_LIBADD = $(COM_ERR_LIBS) lib/libcyrus_min.la lib/libcyrus.la
+sieve_libcyrus_sieve_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+LD_SIEVE_ADD = sieve/libcyrus_sieve.la $(LD_BASIC_ADD)
+
+sieve_sievec_LDADD = $(LD_SIEVE_ADD)
+sieve_sieved_LDADD = $(LD_SIEVE_ADD)
+
+sieve/sieve_err.h sieve/sieve_err.c: sieve/sieve_err.et $(COMPILE_ET_DEP)
+	cd sieve && $(COMPILE_ET) ../$(top_srcdir)/sieve/sieve_err.et
+
+sieve_test_SOURCES = sieve/test.c imap/mutex_fake.c
+sieve_test_LDADD = sieve/libcyrus_sieve.la $(LD_UTILITY_ADD)
+
+timsieved_timsieved_SOURCES = \
+	imap/mutex_fake.c \
+	imap/proxy.c \
+	master/service.c \
+	timsieved/actions.c \
+	timsieved/actions.h \
+	timsieved/codes.h \
+	timsieved/lex.c \
+	timsieved/lex.h \
+	timsieved/parser.c \
+	timsieved/parser.h \
+	timsieved/scripttest.c \
+	timsieved/scripttest.h \
+	timsieved/timsieved.c
+timsieved_timsieved_LDADD = sieve/libcyrus_sieve.la $(LD_SERVER_ADD)
+
+GIT_VERSION = $(PACKAGE_VERSION).git$(shell date +'%Y%m%d%H%M')
+
+snapshot::
+	@echo "creating snapshot $(GIT_VERSION)"
+	@$(MKDIR_P) snapshot
+	@git archive --format=tar --prefix=$(PACKAGE_NAME)-$(GIT_VERSION)/ HEAD | tar -C snapshot/ -x -f -
+	@echo "/* $(PACKAGE_NAME) $(GIT_VERSION) */" > snapshot/$(PACKAGE_NAME)-$(GIT_VERSION)/xversion.h
+	@echo "#define _CYRUS_VERSION \"git$(PACKAGE_VERSION)+`git log --pretty=oneline $(PACKAGE_NAME)-$(PACKAGE_VERSION)..HEAD | wc -l`\"" >> snapshot/$(PACKAGE_NAME)-$(GIT_VERSION)/xversion.h
+	@echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty=\"format:%h %ci\" -1 | cut -d\" \" -f1,2`\"" >> snapshot/$(PACKAGE_NAME)-$(GIT_VERSION)/xversion.h
+	@touch snapshot/$(PACKAGE_NAME)-$(GIT_VERSION)/xversion
+	@cd snapshot/$(PACKAGE_NAME)-$(GIT_VERSION) ; sh SMakefile
+	@for d in $(DIST_SUBDIRS); \
+	do \
+	(cd snapshot/$(PACKAGE_NAME)-$(GIT_VERSION)/$$d; \
+	if -f Makefile.dist ; then \
+	echo "### Making" snapshot "in" `pwd`; \
+	$(MAKE) $(MFLAGS) YACC='$(YACC)' LEX='$(LEX)' \
+	COMPILE_ET='$(COMPILE_ET)' -f Makefile.dist dist ; \
+	fi) || exit 1; \
+	done
+	@echo "creating tarfile"
+	tar -C snapshot -c -f - $(PACKAGE_NAME)-$(GIT_VERSION) | gzip -9 > $(PACKAGE_NAME)-$(GIT_VERSION).tar.gz
+	@rm -rf snapshot
+
+man/imapd.conf.5: $(top_srcdir)/tools/config2man $(top_srcdir)/lib/imapoptions
+	@echo creating man/imapd.conf.5
+	@$(MKDIR_P) man
+	$(top_srcdir)/tools/config2man $(top_srcdir)/lib/imapoptions > $@
+
+man/sieveshell.1: $(top_srcdir)/perl/sieve/scripts/sieveshell.pl
+	@echo creating man/sieveshell.1
+	@$(MKDIR_P) man
+	pod2man $(top_srcdir)/perl/sieve/scripts/sieveshell.pl > $@
+
+doc/man/cyradm.1.html: $(top_srcdir)/perl/imap/cyradm.sh
+	@$(MKDIR_P) doc/man
+	pod2html $(top_srcdir)/perl/imap/cyradm.sh > $@
+	rm pod2htm*
+
+doc/man/sieveshell.1.html: $(top_srcdir)/perl/sieve/scripts/sieveshell.pl
+	@$(MKDIR_P) doc/man
+	pod2html $(top_srcdir)/perl/sieve/scripts/sieveshell.pl > $@
+	rm pod2htm*
+
+
+dist-old:: distgit
+	@echo "creating configure"
+	@cd dist/cyrus-imapd-$(PACKAGE_VERSION) ; sh SMakefile
+	@for d in $(DIST_SUBDIRS); \
+	do \
+	(cd dist/cyrus-imapd-$(PACKAGE_VERSION)/$$d; \
+	if -f Makefile.dist ; then \
+	echo "### Making" dist "in" `pwd`; \
+	$(MAKE) $(MFLAGS) YACC='$(YACC)' LEX='$(LEX)' \
+	COMPILE_ET='$(COMPILE_ET)' -f Makefile.dist dist ; \
+	fi) || exit 1; \
+	done
+	@echo "creating tarfile"
+	@cd dist ; tar cf - cyrus-imapd-$(PACKAGE_VERSION) | \
+	gzip -9 > ../cyrus-imapd-$(PACKAGE_VERSION).tar.gz
+	rm -f distgit
+	rm -rf dist
+
+distgit:
+	$(MKDIR_P) dist
+	@echo "checking out the distribution from tag $(PACKAGE_NAME)-$(PACKAGE_VERSION)"
+	git archive --format=tar --prefix=$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ $(PACKAGE_NAME)-$(PACKAGE_VERSION) | tar -C dist -x -f -
+	echo "/* Release $(PACKAGE_NAME)-$(PACKAGE_VERSION) */" > dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/xversion.h
+	echo "#define _CYRUS_VERSION \"v$(PACKAGE_VERSION)\"" >> dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/xversion.h
+	echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty=\"format:%h %ci\" -1 | cut -d\" \" -f1,2`\"" >> dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/xversion.h
+	touch dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/xversion
+	touch distgit
+
+xversion xversion.h:
+	@echo "/* Development version */" > xversion.h.tmp
+	@echo "#define _CYRUS_VERSION \"git$(PACKAGE_VERSION)+`git log --pretty=oneline $(PACKAGE_NAME)-$(PACKAGE_VERSION)..HEAD | wc -l`\"" >> xversion.h.tmp
+	@echo "#define CYRUS_GITVERSION \"`git log --abbrev=8 --pretty=\"format:%h %ci\" -1 | cut -d\" \" -f1,2`\"" >> xversion.h.tmp
+	@cmp -s xversion.h.tmp xversion.h || mv xversion.h.tmp xversion.h
+	@rm -f xversion.h.tmp
+
+dist-hook: doc/text/htmlstrip doc/man/cyradm.1.html doc/man/sieveshell.1.html
+	@$(MKDIR_P) doc/text doc/man
+	for man in $(top_builddir)/man/*.1-9 $(top_srcdir)/man/*.1-9; \
+	do \
+		echo "=== $$man ==="; \
+		groff -man -Thtml $$man > doc/man/`basename $$man`.html; \
+	done
+	rm -f doc/groff-html-*.png
+
+	for file in $(top_srcdir)/doc/*.html; \
+	do \
+		echo "=== $$file ==="; \
+		doc/text/htmlstrip $$file > doc/text/`basename $$file .html`; \
+	done
+	@rm doc/text/htmlstrip doc/text/htmlstrip.o doc/text/.dirstamp
+	@echo "== done =="
+
+install-data-hook:
+if CMULOCAL
+	$(INSTALL) -m 644 $(top_srcdir)/depot/depot.conf $(DESTDIR)/
+endif
+
+install-exec-hook:
+if PERL
+	for s in installsieve sieveshell; \
+	do \
+	 $(PERL_PREINSTALL) < perl/sieve/scripts/$$s.pl > perl/sieve/scripts/$$s ;\
+	 $(INSTALL) -m 755 perl/sieve/scripts/$$s $(DESTDIR)$(bindir)/$$s ; \
+	done
+endif
+
+## The @$(MKDIR_P) line is added due to a bug in Automake 1.10 and can be removed if using Automake 1.12.
+	@$(MKDIR_P) $(DESTDIR)$(userdir)
+	@$(MKDIR_P) $(DESTDIR)$(servicedir)
+if SERVER
+	cd $(DESTDIR)$(servicedir) && \
+	 $(LN_S) -f pop3d pop3proxyd && \
+	 $(LN_S) -f imapd proxyd && \
+	 $(LN_S) -f lmtpd lmtpproxyd
+endif
+## The @$(MKDIR_P) line is added due to a bug in Automake 1.10 and can be removed if using Automake 1.12.
+	@$(MKDIR_P) $(DESTDIR)$(bindir)
+	cd $(DESTDIR)$(bindir) && \
+	 $(LN_S) -f imtest lmtptest && \
+	 $(LN_S) -f imtest mupatetest && \
+	 $(LN_S) -f imtest nntptest && \
+	 $(LN_S) -f imtest pop3test && \
+	 $(LN_S) -f imtest sivtest && \
+	 $(LN_S) -f imtest smpttest && \
+	 $(LN_S) -f imtest synctest
+
+SUFFIXES = .fig.png
+
+.fig.png:
+	fig2dev -L png $< $@
+
+valgrind:
+	$(MAKE) VG=yes check
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
+
+# Install for Cassandane
+cassandane:
+	$(MAKE) DESTDIR=`cd ../inst ; /bin/pwd` install

cyrus-imapd-2.4.17.tar.gz/README.andrew -> cyrus-imapd-2.5.tar.gz/README.andrew Changed

cyrus-imapd-2.5.tar.gz/README.git Added

cyrus-imapd-2.5.tar.gz/README.ubuntu Added

cyrus-imapd-2.4.17.tar.gz/SMakefile -> cyrus-imapd-2.5.tar.gz/SMakefile Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/README.andrew -> cyrus-imapd-2.5.tar.gz/cmulocal/README.andrew Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/afs.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/afs.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/agentx.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/agentx.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/arx.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/arx.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/ax_path_bdb.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/ax_path_bdb.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/berkdb.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/berkdb.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/bsd_sockets.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/bsd_sockets.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/c-attribute.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/c-attribute.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/c-fpic.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/c-fpic.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/clamav.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/clamav.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/com_err.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/com_err.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/com_err_link.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/com_err_link.m4 Changed

@@ -2,7 +2,6 @@
 dnl library with the collection, I just want to know where it's installed,
 dnl so don't bitch, Rob...
 dnl Derrick Brashear
-dnl $Id: com_err_link.m4,v 1.9 2006/02/25 18:32:46 cg2v Exp $
 
 
 AC_DEFUN(CMU_COMERR_INC_WHERE1, 
@@ -62,17 +61,17 @@
 AC_DEFUN(CMU_USE_COMERR, 
 AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
 AC_ARG_WITH(comerr,
-	  --with-comerr=PREFIX      Compile with com_err support,
+	AS_HELP_STRING(--with-comerr=PREFIX, Compile with com_err support),
 	if test "X$with_comerr" = "X"; then
 		with_comerr=yes
 	fi)
 AC_ARG_WITH(comerr-lib,
-	  --with-comerr-lib=dir     use com_err libraries in dir,
+	AS_HELP_STRING(--with-comerr-lib=DIR, use com_err libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-comerr-lib)
 	fi)
 AC_ARG_WITH(comerr-include,
-	  --with-comerr-include=dir use com_err headers in dir,
+	AS_HELP_STRING(--with-comerr-include=DIR, use com_err headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-comerr-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/common.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/common.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/cyrus.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/cyrus.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/db.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/db.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/find-func-no-libs.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/find-func-no-libs.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/find-func-no-libs2.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/find-func-no-libs2.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/find-func.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/find-func.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/heimdal.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/heimdal.m4 Changed

@@ -1,7 +1,6 @@
 dnl kerberos_v5.m4--Kerberos 5 libraries and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
-dnl $Id: heimdal.m4,v 1.9 2005/04/26 19:14:07 shadow Exp $
 
 AC_DEFUN(CMU_LIBHEIMDAL_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -102,17 +101,17 @@
 AC_REQUIRE(CMU_SOCKETS)
 AC_REQUIRE(CMU_USE_COMERR)
 AC_ARG_WITH(LIBHEIMDAL,
-	  --with-libheimdal=PREFIX      Compile with Heimdal support,
+	AS_HELP_STRING(--with-libheimdal=PREFIX, Compile with Heimdal support),
 	if test "X$with_libheimdal" = "X"; then
 		with_libheimdal=yes
 	fi)
 AC_ARG_WITH(libheimdal-lib,
-	  --with-libheimdal-lib=dir     use heimdal libraries in dir,
+	AS_HELP_STRING(--with-libheimdal-lib=DIR, use heimdal libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libheimdal-lib)
 	fi)
 AC_ARG_WITH(libheimdal-include,
-	  --with-libheimdal-include=dir use heimdal headers in dir,
+	AS_HELP_STRING(--with-libheimdal-include=DIR, use heimdal headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libheimdal-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/init_automake.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/init_automake.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/kafs.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/kafs.m4 Changed

@@ -1,7 +1,6 @@
 dnl kerberos_v4.m4--Kafs libraries and includes
 dnl Derrick Brashear
 dnl from KTH kafs and Arla
-dnl $Id: kafs.m4,v 1.7 2005/04/26 19:14:07 shadow Exp $
 
 AC_DEFUN(CMU_KAFS_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -75,17 +74,17 @@
 AC_REQUIRE(CMU_KRB4)
 AC_REQUIRE(CMU_KRB5)
 AC_ARG_WITH(kafs,
-	  --with-kafs=PREFIX      Compile with Kafs support,
+	AS_HELP_STRING(--with-kafs=PREFIX, Compile with Kafs support),
 	if test "X$with_kafs" = "X"; then
 		with_kafs=yes
 	fi)
 AC_ARG_WITH(kafs-lib,
-	  --with-kafs-lib=dir     use kafs libraries in dir,
+	AS_HELP_STRING(--with-kafs-lib=DIR, use kafs libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-kafs-lib)
 	fi)
 AC_ARG_WITH(kafs-include,
-	  --with-kafs-include=dir use kafs headers in dir,
+	AS_HELP_STRING(--with-kafs-include=DIR, use kafs headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-kafs-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/kerberos_v4.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/kerberos_v4.m4 Changed

@@ -1,7 +1,6 @@
 dnl kerberos_v4.m4--Kerberos 4 libraries and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
-dnl $Id: kerberos_v4.m4,v 1.28 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_KRB_SENDAUTH_PROTO, 
 AC_MSG_CHECKING(for krb_sendauth prototype)
@@ -147,17 +146,17 @@
 AC_REQUIRE(CMU_SOCKETS)
 AC_REQUIRE(CMU_LIBSSL)
 AC_ARG_WITH(krb4,
-	  --with-krb4=PREFIX      Compile with Kerberos 4 support,
+	AS_HELP_STRING(--with-krb4=PREFIX, Compile with Kerberos 4 support),
 	if test "X$with_krb4" = "X"; then
 		with_krb4=yes
 	fi)
 AC_ARG_WITH(krb4-lib,
-	  --with-krb4-lib=dir     use kerberos 4 libraries in dir,
+	AS_HELP_STRING(--with-krb4-lib=DIR, use kerberos 4 libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-krb4-lib)
 	fi)
 AC_ARG_WITH(krb4-include,
-	  --with-krb4-include=dir use kerberos 4 headers in dir,
+	AS_HELP_STRING(--with-krb4-include=DIR, use kerberos 4 headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-krb4-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/kerberos_v5.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/kerberos_v5.m4 Changed

@@ -1,7 +1,6 @@
 dnl kerberos_v5.m4--Kerberos 5 libraries and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
-dnl $Id: kerberos_v5.m4,v 1.9 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_KRB5_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -62,23 +61,22 @@
 AC_REQUIRE(CMU_SOCKETS)
 AC_REQUIRE(CMU_USE_COMERR)
 AC_ARG_WITH(krb5,
-	  --with-krb5=PREFIX      Compile with Kerberos 5 support,
+	AS_HELP_STRING(--with-krb5=PREFIX, Compile with Kerberos 5 support),
 	if test "X$with_krb5" = "X"; then
 		with_krb5=yes
 	fi)
 AC_ARG_WITH(krb5-lib,
-	  --with-krb5-lib=dir     use kerberos 5 libraries in dir,
+	AS_HELP_STRING(--with-krb5-lib=DIR, use kerberos 5 libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-krb5-lib)
 	fi)
 AC_ARG_WITH(krb5-include,
-	  --with-krb5-include=dir use kerberos 5 headers in dir,
+	AS_HELP_STRING(--with-krb5-include=DIR, use kerberos 5 headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-krb5-include)
 	fi)
 AC_ARG_WITH(krb5-impl,
-	  --with-krb5-impl=heimdal use heimdal kerberos 5 libraries
-  --with-krb5-impl=mit     use MIT kerberos 5 libraries,
+	AS_HELP_STRING(--with-krb5-impl=heimdal/mit, use heimdal/MIT kerberos 5 libraries),
 	if test "$withval" != "heimdal" -a "$withval" != "mit"; then
 		AC_MSG_ERROR(Invalid argument for --with-krb5-impl)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/libXau.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libXau.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/libcyrus.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libcyrus.m4 Changed

@@ -1,7 +1,6 @@
 dnl libcyrus.m4--Cyrus libraries and includes
 dnl Derrick Brashear
 dnl from KTH kafs and Arla
-dnl $Id: libcyrus.m4,v 1.20 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_LIBCYRUS_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -59,17 +58,17 @@
 AC_REQUIRE(CMU_SASL2)
 AC_REQUIRE(CMU_LIBSSL)
 AC_ARG_WITH(libcyrus,
-	  --with-libcyrus=PREFIX      Compile with Libcyrus support,
+	AS_HELP_STRING(--with-libcyrus=PREFIX, Compile with Libcyrus support),
 	if test "X$with_libcyrus" = "X"; then
 		with_libcyrus=yes
 	fi)
 AC_ARG_WITH(libcyrus-lib,
-	  --with-libcyrus-lib=dir     use libcyrus libraries in dir,
+	AS_HELP_STRING(--with-libcyrus-lib=DIR, use libcyrus libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libcyrus-lib)
 	fi)
 AC_ARG_WITH(libcyrus-include,
-	  --with-libcyrus-include=dir use libcyrus headers in dir,
+	AS_HELP_STRING(--with-libcyrus-include=DIR, use libcyrus headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libcyrus-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/libloguse.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libloguse.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/libnet.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libnet.m4 Changed

@@ -1,7 +1,6 @@
 dnl libnet.m4--libnet and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
-dnl $Id: libnet.m4,v 1.8 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_LIBNET_CFG_WHERE1, 
 ac_cv_found_libnet_bin=no
@@ -80,22 +79,22 @@
 AC_DEFUN(CMU_LIBNET, 
 AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
 AC_ARG_WITH(libnet,
-	  --with-libnet=PREFIX      Compile with LIBNET support,
+	AS_HELP_STRING(--with-libnet=PREFIX, Compile with LIBNET support),
 	if test "X$with_libnet" = "X"; then
 		with_libnet=yes
 	fi)
 AC_ARG_WITH(libnet-config,
-	  --with-libnet-config=dir  use libnet config program in dir,
+	AS_HELP_STRING(--with-libnet-config=DIR, use libnet config program in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libnet-config)
 	fi)
 AC_ARG_WITH(libnet-lib,
-	  --with-libnet-lib=dir     use libnet libraries in dir,
+	AS_HELP_STRING(--with-libnet-lib=DIR, use libnet libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libnet-lib)
 	fi)
 AC_ARG_WITH(libnet-include,
-	  --with-libnet-include=dir use libnet headers in dir,
+	AS_HELP_STRING(--with-libnet-include=DIR, use libnet headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-libnet-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/libpcap.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libpcap.m4 Changed

@@ -1,7 +1,6 @@
 dnl libpcap.m4--PCAP libraries and includes
 dnl Derrick Brashear
 dnl from KTH krb and Arla
-dnl $Id: libpcap.m4,v 1.9 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_PCAP_INC_WHERE1, 
 ac_cv_found_pcap_inc=no
@@ -52,17 +51,17 @@
 AC_DEFUN(CMU_PCAP, 
 AC_REQUIRE(CMU_FIND_LIB_SUBDIR)
 AC_ARG_WITH(pcap,
-	  --with-pcap=PREFIX      Compile with PCAP support,
+	AS_HELP_STRING(--with-pcap=PREFIX, Compile with PCAP support),
 	if test "X$with_pcap" = "X"; then
 		with_pcap=yes
 	fi)
 AC_ARG_WITH(pcap-lib,
-	  --with-pcap-lib=dir     use pcap libraries in dir,
+	AS_HELP_STRING(--with-pcap-lib=DIR, use pcap libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-pcap-lib)
 	fi)
 AC_ARG_WITH(pcap-include,
-	  --with-pcap-include=dir use pcap headers in dir,
+	AS_HELP_STRING(--with-pcap-include=DIR, use pcap headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-pcap-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/librestrict.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/librestrict.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/libssl.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libssl.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/libtoolhack.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libtoolhack.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/libwrap.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/libwrap.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/mips-abi.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/mips-abi.m4 Changed

@@ -2,11 +2,10 @@
 dnl to some value
 dnl Derrick Brashear
 dnl from KTH krb (from CMU)
-dnl $Id: mips-abi.m4,v 1.5 2003/10/08 20:35:25 rjs3 Exp $
 
 AC_DEFUN(AC_MIPS_ABI, 
 AC_ARG_WITH(mips_abi,
-  --with-mips-abi=abi     ABI to use for IRIX (32, n32, or 64))
+    AS_HELP_STRING(--with-mips-abi=abi, ABI to use for IRIX (32, n32, or 64)))
 
 case "$host_os" in
 irix*)
@@ -27,7 +26,7 @@
        n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
         64) abi='-mabi=64';  abilibdirext='64'   ;;
 	no) abi=''; abilibdirext='';;
-         *) AC_ERROR("Invalid ABI specified") ;;
+         *) AC_MSG_ERROR("Invalid ABI specified") ;;
 esac
 if test -n "$abi" ; then
 ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
@@ -54,7 +53,7 @@
 	CLAGS="$save_CFLAGS"
 	if test $ac_res = yes; then
 		# New GCC
-		AC_ERROR($CC does not support the $with_mips_abi ABI)
+		AC_MSG_ERROR($CC does not support the $with_mips_abi ABI)
 	fi
 	# Old GCC
 	abi=''
@@ -67,7 +66,7 @@
 			abilibdirext=''
 		else
 			# Some broken GCC
-			AC_ERROR($CC does not support the $with_mips_abi ABI)
+			AC_MSG_ERROR($CC does not support the $with_mips_abi ABI)
 		fi
 	;;
 esac
@@ -79,7 +78,7 @@
        n32|yes) abi='-n32'; abilibdirext='32'  ;;
         64) abi='-64'; abilibdirext='64'   ;;
 	no) abi=''; abilibdirext='';;
-         *) AC_ERROR("Invalid ABI specified") ;;
+         *) AC_MSG_ERROR("Invalid ABI specified") ;;
 esac
 fi #if test -n "$GCC"; then
 ;;

cyrus-imapd-2.4.17.tar.gz/cmulocal/nadine.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/nadine.m4 Changed

@@ -1,7 +1,6 @@
 dnl nadine.m4--The nadine event library
 dnl Derrick Brashear
 dnl from KTH kafs and Arla
-dnl $Id: nadine.m4,v 1.6 2003/10/08 20:35:25 rjs3 Exp $
 
 AC_DEFUN(CMU_NADINE_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -62,17 +61,17 @@
 AC_DEFUN(CMU_NADINE, 
 AC_REQUIRE(CMU_SOCKETS)
 AC_ARG_WITH(nadine,
-	  --with-nadine=PREFIX      Compile with nadine libevent support,
+	AS_HELP_STRING(--with-nadine=PREFIX, Compile with nadine libevent support),
 	if test "X$with_nadine" = "X"; then
 		with_nadine=yes
 	fi)
 AC_ARG_WITH(nadine-lib,
-	  --with-nadine-lib=dir     use nadine libraries in dir,
+	AS_HELP_STRING(--with-nadine-lib=DIR, use nadine libraries in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-nadine-lib)
 	fi)
 AC_ARG_WITH(nadine-include,
-	  --with-nadine-include=dir use nadine headers in dir,
+	AS_HELP_STRING(--with-nadine-include=DIR, use nadine headers in DIR),
 	if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_ERROR(No argument for --with-nadine-include)
 	fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/nana.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/nana.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/openldap.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/openldap.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/openssl.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/openssl.m4 Changed

cyrus-imapd-2.5.tar.gz/cmulocal/perlmake.m4 Added

@@ -0,0 +1,53 @@
+# perlmake.m4 - Perl MakeMaker support
+#
+# Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+# CMU_PERL_MAKEMAKER
+# ------------------
+AC_DEFUN(CMU_PERL_MAKEMAKER,
+AC_CONFIG_FILES($1/Makefile.PL)
+AC_CONFIG_COMMANDS($1/Makefile,
+    ( cd $1; $PERL Makefile.PL $MAKE_MAKER_ARGS )
+,
+    PERL="${PERL}"
+    MAKE_MAKER_ARGS="PREFIX=${prefix}"
+)
+)#CMU_PERL_MAKEMAKER

cyrus-imapd-2.4.17.tar.gz/cmulocal/pthreads.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/pthreads.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/sasl.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/sasl.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/sasl2.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/sasl2.m4 Changed

@@ -1,6 +1,5 @@
 # sasl2.m4--sasl2 libraries and includes
 # Rob Siemborski
-# $Id: sasl2.m4,v 1.55 2010/01/06 17:01:27 murch Exp $
 
 # SASL2_CRYPT_CHK
 # ---------------
@@ -41,7 +40,7 @@
 *)
 AC_WARN(The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script)
 if test "$gss_impl" = "cybersafe"; then
- AC_ERROR(CyberSafe was forced, cannot continue as platform is not supported)
+ AC_MSG_ERROR(CyberSafe was forced, cannot continue as platform is not supported)
 fi
 ;;
 esac
@@ -68,7 +67,7 @@
 AC_CHECK_HEADER(gssapi.h,,
 AC_CHECK_HEADER(gssapi/gssapi.h,,
 AC_WARN(Disabling GSSAPI - no include files found); gssapi=no))
-
+ AC_CHECK_HEADERS(gssapi/gssapi_ext.h)
 CPPFLAGS=$cmu_saved_CPPFLAGS
 
 fi
@@ -215,17 +214,17 @@
 hostbased_service_gss_nt_yes
 #endif,
 AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE),
+ Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE),
 AC_WARN(Cybersafe define not found))
 
 elif test "$ac_cv_header_gssapi_h" = "yes"; then
 AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
 AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE))
+ Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE))
 elif test "$ac_cv_header_gssapi_gssapi_h"; then
 AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
 AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
- Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE))
+ Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE))
 fi
 
 if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
@@ -235,20 +234,23 @@
 user_name_yes_gss_nt
 #endif,
 AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME),
+ Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME),
 AC_WARN(Cybersafe define not found))
 elif test "$ac_cv_header_gssapi_h" = "yes"; then
 AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
 AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME))
+ Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME))
+ AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi.h, rfc5587=yes)
+ AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
 elif test "$ac_cv_header_gssapi_gssapi_h"; then
 AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
 AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
- Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME))
+ Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME))
+ AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi/gssapi.h, rfc5587=yes)
+ AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
 fi
 fi
 
-GSSAPI_LIBS=""
 AC_MSG_CHECKING(GSSAPI)
 if test "$gssapi" != no; then
 AC_MSG_RESULT(with implementation ${gss_impl})
@@ -256,15 +258,58 @@
 SASL_MECHS="$SASL_MECHS libgssapiv2.la"
 SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
 SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
+ if test "$rfc5587" = "yes" -a "$rfc5801" = "yes"; then
+ SASL_MECHS="$SASL_MECHS libgs2.la"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS gs2.o"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gs2.c"
+ fi
 
 cmu_save_LIBS="$LIBS"
 LIBS="$LIBS $GSSAPIBASE_LIBS"
 AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
+ AC_CHECK_FUNCS(gss_decapsulate_token)
+ AC_CHECK_FUNCS(gss_encapsulate_token)
+ AC_CHECK_FUNCS(gss_oid_equal)
 LIBS="$cmu_save_LIBS"
+
+ cmu_save_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
+ AC_CHECK_FUNCS(gss_get_name_attribute)
+ LIBS="$cmu_save_LIBS"
+
+ cmu_save_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
+ AC_MSG_CHECKING(for SPNEGO support in GSSAPI libraries)
+ AC_TRY_RUN(
+#ifdef HAVE_GSSAPI_H
+#include <gssapi.h>
+#else
+#include <gssapi/gssapi.h>
+#endif
+
+int main(void)
+{
+ gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
+ gss_OID_set mech_set;
+ OM_uint32 min_stat;
+ int have_spnego = 0;
+ 
+ if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
+	gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
+	gss_release_oid_set(&min_stat, &mech_set);
+ }
+
+ return (!have_spnego); // 0 = success, 1 = failure
+}
+,	
+	 AC_DEFINE(HAVE_GSS_SPNEGO,,Define if your GSSAPI implementation supports SPNEGO)
+	AC_MSG_RESULT(yes) ,
+	AC_MSG_RESULT(no))
+ LIBS="$cmu_save_LIBS"
+
 else
 AC_MSG_RESULT(disabled)
 fi
-AC_SUBST(GSSAPI_LIBS)
 AC_SUBST(GSSAPIBASE_LIBS)
 )# SASL_GSSAPI_CHK
 
@@ -337,9 +382,10 @@
 LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
 fi
 done
+ AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl, dlopen, LIB_SASL+="$LIB_SASL -ldl"))
 if test ! "$ac_cv_found_sasl" = "yes"; then
 AC_MSG_CHECKING(for static libsasl)
- AC_ERROR(Could not find ${with_staticsasl}/lib*/libsasl2.a)
+ AC_MSG_ERROR(Could not find ${with_staticsasl}/lib*/libsasl2.a)
 fi))
 
 AC_MSG_RESULT(found)
@@ -410,7 +456,7 @@
 AC_DEFUN(CMU_SASL2_REQUIRED,
 AC_REQUIRE(CMU_SASL2)
 if test "$ac_cv_found_sasl" != "yes"; then
- AC_ERROR(Cannot continue without libsasl2.
+ AC_MSG_ERROR(Cannot continue without libsasl2.
 Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.)
 fi)
 
@@ -440,7 +486,7 @@
 #error SASL version is less than $1.$2.$3
 #endif
 ,,
- AC_ERROR(Incorrect SASL headers found. This package requires SASL $1.$2.$3 or newer.))
+ AC_MSG_ERROR(Incorrect SASL headers found. This package requires SASL $1.$2.$3 or newer.))
 
 CPPFLAGS=$cmu_saved_CPPFLAGS
 )# CMU_SASL2_REQUIRE_VER

cyrus-imapd-2.4.17.tar.gz/cmulocal/sql.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/sql.m4 Changed

@@ -1,5 +1,3 @@
-dnl $Id: sql.m4,v 1.2 2010/01/06 17:01:28 murch Exp $
-
 dnl These are the Cyrus MySQL macros.
 
 dnl They are here so that they can be shared between Cyrus IMAPd
@@ -43,11 +41,11 @@
 AC_DEFUN(CYRUS_MYSQL_OPTS,
 
 AC_ARG_WITH(mysql-libdir,
-	  --with-mysql-libdir=DIR   MySQL lib files are in DIR,
+	AS_HELP_STRING(--with-mysql-libdir=DIR, MySQL lib files are in DIR),
 	with_mysql_lib=$withval,
 	 test "${with_mysql_lib+set}" = set || with_mysql_lib=none)
 AC_ARG_WITH(mysql-incdir,
-	  --with-mysql-incdir=DIR   MySQL include files are in DIR,
+	AS_HELP_STRING(--with-mysql-incdir=DIR, MySQL include files are in DIR),
 	with_mysql_inc=$withval,
 	 test "${with_mysql_inc+set}" = set || with_mysql_inc=none )
 )
@@ -117,11 +115,11 @@
 AC_DEFUN(CYRUS_PGSQL_OPTS,
 
 AC_ARG_WITH(pgsql-libdir,
-	  --with-pgsql-libdir=DIR   Pgsql lib files are in DIR,
+	AS_HELP_STRING(--with-pgsql-libdir=DIR, Pgsql lib files are in DIR),
 	with_pgsql_lib=$withval,
 	 test "${with_pgsql_lib+set}" = set || with_pgsql_lib=none)
 AC_ARG_WITH(pgsql-incdir,
-	  --with-pgsql-incdir=DIR   Pgsql include files are in DIR,
+	AS_HELP_STRING(--with-pgsql-incdir=DIR, Pgsql include files are in DIR),
 	with_pgsql_inc=$withval,
 	 test "${with_pgsql_inc+set}" = set || with_pgsql_inc=none )
 )
@@ -191,11 +189,11 @@
 AC_DEFUN(CYRUS_SQLITE_OPTS,
 
 AC_ARG_WITH(sqlite-libdir,
-	  --with-sqlite-libdir=DIR   SQLite lib files are in DIR,
+	AS_HELP_STRING(--with-sqlite-libdir=DIR, SQLite lib files are in DIR),
 	with_sqlite_lib=$withval,
 	 test "${with_sqlite_lib+set}" = set || with_sqlite_lib=none)
 AC_ARG_WITH(sqlite-incdir,
-	  --with-sqlite-incdir=DIR   SQLite include files are in DIR,
+	AS_HELP_STRING(--with-sqlite-incdir=DIR, SQLite include files are in DIR),
 	with_sqlite_inc=$withval,
 	 test "${with_sqlite_inc+set}" = set || with_sqlite_inc=none )
 )

cyrus-imapd-2.4.17.tar.gz/cmulocal/tcl.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/tcl.m4 Changed

@@ -3,7 +3,6 @@
 dnl I MEAN IT!
 dnl
 dnl tcl.m4: an autoconf Tcl locator
-dnl $Id: tcl.m4,v 1.4 2003/10/08 20:35:25 rjs3 Exp $
 dnl
 dnl This is rob's Tcl macro, fixed by tjs.  It may need occasional tweaking,
 dnl but until the next impediment to compilation, it's fill-in-the-blank,
@@ -45,14 +44,15 @@
 dnl
 
 dnl Check for some information from the user on what the world looks like
-AC_ARG_WITH(tclconfig,  --with-tclconfig=PATH   use tclConfig.sh from PATH
-                          (configure gets Tcl configuration from here),
+AC_ARG_WITH(tclconfig,
+	AS_HELP_STRING(--with-tclconfig=DIR, use tclConfig.sh from DIR (configure gets Tcl configuration from here)), 
         dnl trim tclConfig.sh off the end so we can add it back on later.
 	TclLibBase=`echo ${withval} | sed s/tclConfig.sh\$//`)
-AC_ARG_WITH(tcl,        --with-tcl=PATH         use Tcl from PATH,
+AC_ARG_WITH(tcl,
+        AS_HELP_STRING(--with-tcl=DIR, use Tcl from DIR),
 	TclLibBase="${withval}/lib")
-AC_ARG_WITH(tclsh,      --with-tclsh=TCLSH      use TCLSH as the tclsh program
-                          (let configure find Tcl using this program),
+AC_ARG_WITH(tclsh,
+        AS_HELP_STRING(--with-tclsh=TCLSH, use TCLSH as the tclsh program (let configure find Tcl using this program)),
 	TCLSH="${withval}")
 
 if test "$TCLSH" = "no" -o "$with_tclconfig" = "no" ; then

cyrus-imapd-2.4.17.tar.gz/cmulocal/telnet.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/telnet.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/ucdsnmp.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/ucdsnmp.m4 Changed

cyrus-imapd-2.4.17.tar.gz/cmulocal/util.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/util.m4 Changed

cyrus-imapd-2.5.tar.gz/cmulocal/visibility.m4 Added

@@ -0,0 +1,77 @@
+# visibility.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2005, 2008, 2010-2012 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl Mac OS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN(gl_VISIBILITY,
+
+  AC_REQUIRE(AC_PROG_CC)
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_MSG_CHECKING(whether the -Werror option is usable)
+    AC_CACHE_VAL(gl_cv_cc_vis_werror, 
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Werror"
+      AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM(, ),
+        gl_cv_cc_vis_werror=yes,
+        gl_cv_cc_vis_werror=no)
+      CFLAGS="$gl_save_CFLAGS")
+    AC_MSG_RESULT($gl_cv_cc_vis_werror)
+    dnl Now check whether visibility declarations are supported.
+    AC_MSG_CHECKING(for simple visibility declarations)
+    AC_CACHE_VAL(gl_cv_cc_visibility, 
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      dnl We use the option -Werror and a function dummyfunc, because on some
+      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+      dnl "visibility attribute not supported in this configuration; ignored"
+      dnl at the first function definition in every compilation unit, and we
+      dnl don't want to use the option in this case.
+      if test $gl_cv_cc_vis_werror = yes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi
+      AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM(
+           extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+           ,
+           ),
+        gl_cv_cc_visibility=yes,
+        gl_cv_cc_visibility=no)
+      CFLAGS="$gl_save_CFLAGS")
+    AC_MSG_RESULT($gl_cv_cc_visibility)
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST(CFLAG_VISIBILITY)
+  AC_SUBST(HAVE_VISIBILITY)
+  AC_DEFINE_UNQUOTED(HAVE_VISIBILITY, $HAVE_VISIBILITY,
+    Define to 1 or 0, depending whether the compiler supports simple visibility declarations.)
+)

cyrus-imapd-2.4.17.tar.gz/cmulocal/zephyr.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/zephyr.m4 Changed

@@ -2,7 +2,6 @@
 dnl based on kafs.m4, by
 dnl Derrick Brashear
 dnl from KTH kafs and Arla
-dnl $Id: zephyr.m4,v 1.2 2005/04/26 19:14:08 shadow Exp $
 
 AC_DEFUN(CMU_ZEPHYR_INC_WHERE1, 
 saved_CPPFLAGS=$CPPFLAGS
@@ -61,17 +60,17 @@
 AC_REQUIRE(CMU_SOCKETS)
 AC_REQUIRE(CMU_KRB4)
 AC_ARG_WITH(zephyr,
-          --with-zephyr=PREFIX      Compile with Zephyr support,
+        AS_HELP_STRING(--with-zephyr=PREFIX,Compile with Zephyr support),
         if test "X$with_zephyr" = "X"; then
                 with_zephyr=yes
         fi)
 AC_ARG_WITH(zephyr-lib,
-          --with-zephyr-lib=dir     use zephyr libraries in dir,
+        AS_HELP_STRING(--with-zephyr-lib=DIR, use zephyr libraries in DIR),
         if test "$withval" = "yes" -o "$withval" = "no"; then
                 AC_MSG_ERROR(No argument for --with-zephyr-lib)
         fi)
 AC_ARG_WITH(zephyr-include,
-          --with-zephyr-include=dir use zephyr headers in dir,
+        AS_HELP_STRING(--with-zephyr-include=DIR, use zephyr headers in DIR),
         if test "$withval" = "yes" -o "$withval" = "no"; then
                 AC_MSG_ERROR(No argument for --with-zephyr-include)
         fi)

cyrus-imapd-2.4.17.tar.gz/cmulocal/zlib.m4 -> cyrus-imapd-2.5.tar.gz/cmulocal/zlib.m4 Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/com_err.3 -> cyrus-imapd-2.5.tar.gz/com_err/et/com_err.3 Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/com_err.c -> cyrus-imapd-2.5.tar.gz/com_err/et/com_err.c Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/com_err.h -> cyrus-imapd-2.5.tar.gz/com_err/et/com_err.h Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/compile_et.1 -> cyrus-imapd-2.5.tar.gz/com_err/et/compile_et.1 Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/compile_et.sh -> cyrus-imapd-2.5.tar.gz/com_err/et/compile_et.sh Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/config_script -> cyrus-imapd-2.5.tar.gz/com_err/et/config_script Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/error_message.c -> cyrus-imapd-2.5.tar.gz/com_err/et/error_message.c Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/error_table.h -> cyrus-imapd-2.5.tar.gz/com_err/et/error_table.h Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/et_name.c -> cyrus-imapd-2.5.tar.gz/com_err/et/et_name.c Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/init_et.c -> cyrus-imapd-2.5.tar.gz/com_err/et/init_et.c Changed

cyrus-imapd-2.4.17.tar.gz/com_err/et/internal.h -> cyrus-imapd-2.5.tar.gz/com_err/et/internal.h Changed

cyrus-imapd-2.5.tar.gz/configure.ac Added

@@ -0,0 +1,1730 @@
+dnl Process this file with autoconf to produce a configure script.
+
+dnl
+dnl Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions
+dnl are met:
+dnl
+dnl 1. Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl
+dnl 2. Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in
+dnl the documentation and/or other materials provided with the
+dnl distribution.
+dnl
+dnl 3. The name "Carnegie Mellon University" must not be used to
+dnl endorse or promote products derived from this software without
+dnl prior written permission. For permission or any legal
+dnl details, please contact
+dnl Carnegie Mellon University
+dnl Center for Technology Transfer and Enterprise Creation
+dnl 4615 Forbes Avenue
+dnl Suite 302
+dnl Pittsburgh, PA 15213
+dnl (412) 268-7393, fax: (412) 268-7395
+dnl innovation@andrew.cmu.edu
+dnl
+dnl 4. Redistributions of any form whatsoever must retain the following
+dnl acknowledgment:
+dnl "This product includes software developed by Computing Services
+dnl at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+dnl
+dnl CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+dnl THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+dnl AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+dnl FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+dnl AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+dnl OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl configure.ac for the Cyrus imapd
+dnl
+
+
+AC_INIT(cyrus-imapd, 2.5, http://bugzilla.cyrusimap.org,,http://www.cyrusimap.org)
+AC_PREREQ(2.63)
+AC_CONFIG_SRCDIR(imap/imapd.c)
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR(cmulocal)
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability foreign dist-bzip2 no-installinfo subdir-objects)
+AC_CONFIG_LIBOBJ_DIR(lib)
+dnl Useful hook for distributions
+AC_ARG_WITH(extraident,
+ AS_HELP_STRING(--with-extraident=STRING,use STRING as extra version information),
+	AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", Extra version information for imap/version.h))
+
+AM_MAINTAINER_MODE
+
+AC_ARG_ENABLE(coverage,
+	AS_HELP_STRING(--enable-coverage,enable C test coverage),
+	COV_CFLAGS="--coverage"
+	 COV_LDFLAGS="--coverage"
+	,
+	 COV_CFLAGS=
+	 COV_LDFLAGS=
+	)
+AC_SUBST(COV_CFLAGS)
+AC_SUBST(COV_LDFLAGS)
+
+AC_ARG_WITH(login,,AC_MSG_ERROR(--with-login is no longer supported.
+Configure SASL appropriately instead.))
+
+AC_ARG_WITH(cyrus-prefix,
+	AS_HELP_STRING(--with-cyrus-prefix=DIR, use DIR as cyrus server install directory PREFIX/cyrus),
+	cyrus_prefix="$withval",cyrus_prefix="$prefix/cyrus")
+AC_DEFINE_UNQUOTED(CYRUS_PATH,"$cyrus_prefix",Where will we be installed?)
+AC_ARG_WITH(service-path,
+	AS_HELP_STRING(--with-service-path=DIR, use DIR as service install directory CYRUSPREFIX/bin),
+	servicedir="$withval",servicedir="$cyrus_prefix/bin")
+userdir=$servicedir
+AC_SUBST(userdir)
+AC_SUBST(servicedir)
+AC_DEFINE_UNQUOTED(SERVICE_DIR,"$servicedir",Directory to use for service binaries)
+AC_ARG_WITH(cyrus-user,
+	AS_HELP_STRING(--with-cyrus-user=USERID, use USERID cyrus userid),
+	cyrus_user="$withval",cyrus_user="cyrus")
+AC_SUBST(cyrus_user)
+AC_DEFINE_UNQUOTED(CYRUS_USER, "$cyrus_user",What user will we run as?)
+AC_ARG_WITH(cyrus-group,
+	AS_HELP_STRING(--with-cyrus-group=GROUPID, use GROUPID cyrus group),
+	cyrus_group="$withval",cyrus_group="mail")
+AC_SUBST(cyrus_group)
+
+dnl allow users to override $sysconfdir, but retain old default (/etc)
+dnl if not specified
+if test $sysconfdir = '${prefix}/etc'; then
+ sysconfdir="/etc"
+fi
+AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",Config File Location)
+
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_USE_SYSTEM_EXTENSIONS
+AC_ISC_POSIX
+AC_PROG_AWK
+AC_C_CONST
+AC_SYS_LONG_FILE_NAMES
+if test $ac_cv_sys_long_file_names = no; then
+	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
+fi
+AC_C_INLINE
+
+gl_VISIBILITY
+AH_BOTTOM(#if HAVE_VISIBILITY
+#define EXPORTED __attribute__((__visibility__("default")))
+#define HIDDEN __attribute__((__visibility__("hidden")))
+#else
+#define EXPORTED
+#define HIDDEN
+#endif)
+
+LT_PREREQ(2.2.6)
+LT_INIT(disable-static)
+AC_SUBST(LIBTOOL_DEPS)
+
+dnl Check the size of various types
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(off_t)
+
+dnl Check that `long long int' is available
+AC_CHECK_SIZEOF(long long int)
+AC_CHECK_SIZEOF(unsigned long long int)
+if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
+ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
+ AC_C_BIGENDIAN
+else
+ AC_MSG_ERROR(The Cyrus IMAPD requires support for long long int)
+fi
+
+CMU_C___ATTRIBUTE__
+CMU_C_FPIC
+
+dnl check for -R, etc. switch
+CMU_GUESS_RUNPATH_SWITCH
+
+AC_CHECK_HEADERS(unistd.h sys/select.h sys/param.h stdarg.h)
+AC_REPLACE_FUNCS(memmove strcasecmp ftruncate strerror posix_fadvise strsep memmem)
+AC_CHECK_FUNCS(strlcat strlcpy getgrouplist fmemopen pselect)
+AC_HEADER_DIRENT
+
+dnl check whether to use getpassphrase or getpass
+AC_CHECK_HEADERS(stdlib.h)
+AC_CHECK_FUNCS(getpassphrase)
+
+dnl do this before Berkeley DB/IPv6 detection
+CMU_SOCKETS
+LIBS="$LIBS ${LIB_SOCKET}"
+
+dnl check for IPv6 functions (fall back to sasl's if we don't have them)
+cyrus_cv_getaddrinfo=yes
+IPv6_CHECK_FUNC(getaddrinfo, IPv6_CHECK_FUNC(gai_strerror,
+	AC_DEFINE(HAVE_GETADDRINFO,,Do we have a getaddrinfo?),
+	cyrus_cv_getaddrinfo=no), cyrus_cv_getaddrinfo=no)
+
+cyrus_cv_getnameinfo=yes
+IPv6_CHECK_FUNC(getnameinfo,
+	AC_DEFINE(HAVE_GETNAMEINFO,,Do we have a getnameinfo?),
+	cyrus_cv_getnameinfo=no)
+
+AM_CONDITIONAL(IPV6_noGETADDRINFO, test $cyrus_cv_getaddrinfo = no)
+AM_CONDITIONAL(IPV6_noGETNAMEINFO, test $cyrus_cv_getnameinfo = no)
+IPv6_CHECK_SS_FAMILY()
+IPv6_CHECK_SA_LEN()
+
+dnl this is to check for time things
+AC_CHECK_HEADERS(sys/time.h)
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_STRUCT_TIMEZONE
+AC_CHECK_FUNCS(timegm)
+
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LOCALDEFS)
+AC_FUNC_VPRINTF
+
+dnl function for doing each of the database backends
+dnl parameters: backend name, variable to set, withval
+
+dnl Berkeley DB Detection
+
+AC_ARG_WITH(bdb,
+	AS_HELP_STRING(--with-bdb=DIR, use Berkeley DB (in DIR) yes),
+	with_bdb=$withval, with_bdb="yes")
+
+dnl support old-style
+AC_ARG_WITH(dbdir,, with_bdb=$withval)
+
+case "$with_bdb" in
+ no)
+	use_berkeley="no"
+	;;
+ yes)
+	use_berkeley="yes"
+	with_bdb_lib=none
+	with_bdb_inc=none
+	;;
+ *)
+	use_berkeley="yes"
+	with_bdb_lib="$with_bdb/lib"
+	with_bdb_inc="$with_bdb/include"
+	;;
+esac
+
+if test "$use_berkeley" != "no"; then
+ CYRUS_BERKELEY_DB_CHK()
+
+ if test "$dblib" = "no"; then
+ AC_MSG_ERROR(Berkeley DB 3.x or later was not found. You may need to 
+ supply the --with-bdb-libdir or --with-bdb-incdir configure options.)
+ fi
+
+ if test "$with_bdb_lib" != "none"; then
+ CMU_ADD_LIBPATH($with_bdb_lib)
+ fi
+
+ BDB_INC=${BDB_INCADD}
+ BDB_LIB=${BDB_LIBADD}
+ AC_SUBST(BDB_INC)
+ AC_SUBST(BDB_LIB)
+
+ LIBS="${LIBS} ${BDB_LIBADD}"
+ CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+ AC_DEFINE(HAVE_BDB,,Build in Berkeley DB support?)
+fi
+AM_CONDITIONAL(USE_BERKELEY, test "$use_berkeley" != "no")
+
+dnl End Berkeley DB Detection
+
+
+dnl SQL DB Detection
+
+HAVE_SQL=0
+
+dnl MySQL Detection
+
+dnl legacy options --with-mysql-libdir and --with-mysql-incdir
+CYRUS_MYSQL_OPTS
+if test "$with_mysql_lib" != none ; then
+ AC_MSG_NOTICE(Legacy option --with-mysql-libdir=DIR detected.
+		 You may wish to change to --with-mysql which works now.)
+ withval="$with_mysql_lib/.."
+else
+ withval="no"
+fi
+
+AC_MSG_CHECKING(whether to use MySQL)
+AC_ARG_WITH(mysql,
+	AS_HELP_STRING(--with-mysql=DIR, use MySQL (in DIR) no))
+with_mysql=$withval
+
+case "$with_mysql" in
+ no)
+	# Explicitly disable MySQL
+	;;
+ yes)
+	# Find mysql_config in $PATH
+	mysql_config=mysql_config
+	;;
+ *)
+	# Find mysql_config in the specified directory
+	mysql_config="$with_mysql/bin/mysql_config"
+	if test ! -x "$mysql_config" ; then
+	 AC_MSG_ERROR(The mysql_config program was not found
+			 in $with_mysql/bin, disabling MySQL support)
+	 with_mysql="no"
+	fi
+	;;
+esac
+
+if test "$with_mysql" != "no"; then
+ MYSQL_LIBADD=`$mysql_config --libs`
+ MYSQL_INCADD=`$mysql_config --cflags`
+ HAVE_SQL=1
+ LIBS="${LIBS} ${MYSQL_LIBADD}"
+ CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
+ AC_DEFINE(HAVE_MYSQL,,Build in MySQL support?)
+fi
+AC_MSG_RESULT($with_mysql)
+
+dnl End MySQL Detection
+
+
+dnl PgSQL Detection
+AC_ARG_WITH(pgsql,
+	AS_HELP_STRING(--with-pgsql=DIR, use PostgreSQL (in DIR) no),
+	with_pgsql=$withval, with_pgsql="no")
+
+case "$with_pgsql" in
+ no)
+	use_pgsql="no"
+	;;
+ yes)
+	use_pgsql="yes"
+	with_pgsql_lib=none
+	with_pgsql_inc=none
+	;;
+ *)
+	use_pgsql="yes"
+	with_pgsql_lib="$with_pgsql/lib"
+	with_pgsql_inc="$with_pgsql/include"
+	;;
+esac
+
+if test "$use_pgsql" != "no"; then
+ CYRUS_PGSQL_CHK()
+
+ if test "$pgsqllib" = "no"; then
+ AC_MSG_ERROR(PgSQL was not found. You may need to supply the
+ --with-pgsql-libdir or --with-pgsql-incdir configure options.)
+ else
+ HAVE_SQL=1
+ fi
+
+ if test "$with_pgsql_lib" != "none"; then
+ CMU_ADD_LIBPATH($with_pgsql_lib)
+ fi
+
+ LIBS="${LIBS} ${PGSQL_LIBADD}"
+ CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"
+
+ AC_DEFINE(HAVE_PGSQL,,Build in PgSQL support?)
+fi
+
+dnl End PgSQL Detection
+
+
+dnl SQLite Detection
+AC_ARG_WITH(sqlite,
+	AS_HELP_STRING(--with-sqlite=DIR, use SQLite (in DIR) no),
+	with_sqlite=$withval, with_sqlite=no)
+
+case "$with_sqlite" in
+ no)
+	use_sqlite="no"
+	;;
+ yes)
+	use_sqlite="yes"
+	with_sqlite_lib=none
+	with_sqlite_inc=none
+	;;
+ *)
+	use_sqlite="yes"
+	with_sqlite_lib="$with_sqlite/lib"
+	with_sqlite_inc="$with_sqlite/include"
+	;;
+esac
+
+if test "$use_sqlite" != "no"; then
+ CYRUS_SQLITE_CHK()
+
+ if test "$sqlitelib" = "no"; then
+ AC_MSG_ERROR(Sqlite was not found. You may need to supply the
+ --with-sqlite-libdir or --with-sqlite-incdir configure options.)
+ else
+ HAVE_SQL=1
+ fi
+
+ if test "$with_sqlite_lib" != "none"; then
+ CMU_ADD_LIBPATH($with_sqlite_lib)
+ fi
+
+ LIBS="${LIBS} ${SQLITE_LIBADD}"
+ CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
+
+ AC_DEFINE(HAVE_SQLITE,,Build in SQLite support?)
+fi
+
+dnl End SQLite Detection
+
+AM_CONDITIONAL(USE_SQL, test $HAVE_SQL = 1)
+dnl End SQL DB Detection
+
+dnl
+dnl Search engines - SQUAT
+dnl
+
+AC_ARG_ENABLE(squat,
+	 --disable-squat disable Squat support)
+if test "x$enable_squat" != xno ; then
+ AC_DEFINE(USE_SQUAT,,Build in Squat support?)
+fi
+AM_CONDITIONAL(USE_SQUAT, test "${enable_squat}" != "no")
+
+dnl
+dnl Search engines - Sphinx
+dnl
+
+AC_ARG_ENABLE(sphinx,
+	 --enable-sphinx disable Sphinx support,
+	 enable_sphinx=$enableval
+	,
+	 enable_sphinx=no
+	)
+if test "x$enable_sphinx" != xno ; then
+ AC_DEFINE(USE_SPHINX,,Build in Sphinx support?)
+fi
+AM_CONDITIONAL(USE_SPHINX, test "${enable_sphinx}" != "no")
+
+dnl Note that Sphinx' searchd uses the MySQL protocol
+dnl so we need to link with the MySQL client libraries.
+if test "$enable_sphinx" = yes -a "$with_mysql" = no ; then
+ AC_MSG_ERROR(Sphinx requires MySQL but you have not used --with-mysql; disabling Sphinx)
+ enable_sphinx=no
+fi
+
+dnl
+dnl Search engines - Xapian
+dnl
+
+AC_ARG_ENABLE(xapian,
+	 --enable-xapian enable Xapian support,
+	 enable_xapian=$enableval
+	,
+	 enable_xapian=no
+	)
+if test "x$enable_xapian" != xno ; then
+ XO_LIB_XAPIAN(
+	AC_DEFINE(USE_XAPIAN,,Build in Xapian support?)
+ )
+fi
+AM_CONDITIONAL(USE_XAPIAN, test "${enable_xapian}" != "no")
+
+
+AM_CONDITIONAL(SQUATTER,
+ test "${enable_squat}" != "no" -o "${enable_sphinx}" != "no" -o "${enable_xapian}" != "no" )
+
+AC_ARG_ENABLE(sieve,
+ AS_HELP_STRING(--disable-sieve, disable Sieve support),,enable_sieve="yes";)
+AC_ARG_ENABLE(pcre,
+	AS_HELP_STRING(--disable-pcre, disable PCRE library))
+
+if test "$enable_sieve" != "no"; then
+	AC_DEFINE(USE_SIEVE,,Build in Sieve support?)
+
+	dnl Sieve configure stuff
+	AC_PROG_YACC
+	AM_PROG_LEX
+
+	if test "$enable_pcre" != "no"; then
+	 AC_CHECK_HEADER(pcreposix.h)
+	 if test "$ac_cv_header_pcreposix_h" = "yes"; then
+		 AC_MSG_CHECKING(for utf8 enabled pcre)
+		 AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP(#include <pcreposix.h>
+#ifndef REG_UTF8
+#include </nonexistent>
+#endif,cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no))
+		 AC_MSG_RESULT($cyrus_cv_pcre_utf8)
+	 else
+		 cyrus_cv_pcre_utf8="no"
+	 fi
+	fi
+
+	if test "$cyrus_cv_pcre_utf8" = "yes"; then
+		LIBS="$LIBS -lpcre -lpcreposix";
+		AC_DEFINE(ENABLE_REGEX, , Do we have a regex library?)
+		AC_DEFINE(HAVE_PCREPOSIX_H, , Do we have usable pcre library?)
+	else
+		AC_CHECK_HEADERS(rxposix.h)
+		if test "$ac_cv_header_rxposix_h" = "yes"; then
+			LIBS="$LIBS -lrx"
+			AC_DEFINE(ENABLE_REGEX, ,
+				 Do we have a regex library?)
+		else
+			AC_SEARCH_LIBS(regcomp, regex,
+					AC_DEFINE(ENABLE_REGEX, ,
+					Do we have a regex library?), )
+		fi
+	fi
+fi
+
+AM_CONDITIONAL(SIEVE, test "${enable_sieve}" != "no")
+
+dnl for et routines
+AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR,,Do we have strerror()?),
+ AC_DEFINE(NEED_SYS_ERRLIST,,Do we have a sys_errlist?))
+
+dnl for master fd limits
+AC_CHECK_HEADERS(sys/resource.h)
+AC_CHECK_FUNCS(setrlimit)
+AC_CHECK_FUNCS(getrlimit)
+
+dnl for detaching terminal
+AC_CHECK_FUNCS(daemon setsid)
+
+dnl for turning off sockets
+AC_CHECK_FUNCS(shutdown)
+
+AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_DEFINE(HAVE_SOCKLEN_T,,Do we have a socklen_t?))
+AC_EGREP_HEADER(sockaddr_storage, sys/socket.h,
+		AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE,,Do we have a sockaddr_storage?))
+AC_EGREP_HEADER(rlim_t, sys/resource.h, AC_DEFINE(HAVE_RLIM_T,,Do we have an rlim_t?))
+
+dnl Bunch of setproctitle stuff
+spt_type=""
+AC_CHECK_FUNC(setproctitle,spt_type=SPT_BUILTIN)
+if test "$spt_type" = ""; then
+	dnl BSD/OS and FreeBSD put it in -lutil
+	AC_CHECK_LIB(util,setproctitle,spt_type=SPT_BUILTIN
+			LIBS="${LIBS} -lutil")
+fi
+if test "$spt_type" = ""; then
+	AC_CHECK_HEADER(sys/pstat.h,spt_type=SPT_PSTAT)
+fi
+if test "$spt_type" = ""; then
+	AC_CHECK_HEADER(sys/sysnews.h,spt_type=SPT_SYSMIPS)
+fi
+if test "$spt_type" = ""; then
+	AC_MSG_CHECKING(for PS_STRINGS)
+	AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_TRY_CPP(
+#include <machine/vmparam.h>
+#include <sys/exec.h>
+#ifndef PS_STRINGS
+#include </nonexistent>
+#endif,cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
+	if test $cyrus_cv_sys_psstrings = yes; then
+		spt_type=SPT_PSSTRINGS
+	fi
+	AC_MSG_RESULT($cyrus_cv_sys_psstrings)
+fi
+if test "$spt_type" = ""; then
+	AC_MSG_CHECKING(for SCO)
+	AC_CACHE_VAL(cyrus_cv_sys_sco, AC_TRY_CPP(
+#ifndef _SCO_unix_
+#include </nonexistent>
+#endif,cyrus_cv_sys_sco=yes,cyrus_cv_sys_sco=no))
+	if test $cyrus_cv_sys_sco = yes; then
+		spt_type=SPT_SCO
+	fi
+	AC_MSG_RESULT($cyrus_cv_sys_sco)
+fi
+if test "$spt_type" = ""; then
+	AC_MSG_CHECKING(for setproctitle usability)
+	AC_CACHE_VAL(cyrus_cv_sys_setproctitle, AC_TRY_CPP(
+#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
+#include </nonexistent>
+#endif,cyrus_cv_sys_setproctitle=yes,cyrus_cv_sys_setproctitle=no))
+	if test $cyrus_cv_sys_setproctitle = no; then
+		spt_type=SPT_NONE
+	fi
+	AC_MSG_RESULT($cyrus_cv_sys_setproctitle)
+fi
+if test "$spt_type" != ""; then
+	AC_DEFINE_UNQUOTED(SPT_TYPE,$spt_type,Do we already have setproctitle?)
+fi
+
+AC_MSG_CHECKING(nonblocking method)
+AC_CACHE_VAL(cyrus_cv_sys_nonblock,AC_TRY_LINK(#include <sys/types.h>
+#include <sys/file.h>
+#include <fcntl.h>
+#ifndef	FNDELAY
+#define FNDELAY		O_NDELAY
+#endif,fcntl(0, F_GETFL, 0)&FNDELAY,
+cyrus_cv_sys_nonblock=fcntl,cyrus_cv_sys_nonblock=ioctl))
+AM_CONDITIONAL(NONBLOCK_FCNTL, test "$cyrus_cv_sys_nonblock" = "fcntl")
+AC_MSG_RESULT($cyrus_cv_sys_nonblock)
+
+AC_MSG_CHECKING(timezone GMT offset method)
+AC_CACHE_VAL(cyrus_cv_struct_sys_gmtoff,AC_TRY_COMPILE(
+#include <time.h>,struct tm tm;
+tm.tm_gmtoff = 0;
+,cyrus_cv_struct_sys_gmtoff=tm,cyrus_cv_struct_sys_gmtoff=gmtime))
+AM_CONDITIONAL(GMTOFF_TM, test "$cyrus_cv_struct_sys_gmtoff" = "tm")
+AC_MSG_RESULT($cyrus_cv_struct_sys_gmtoff)
+AC_MSG_CHECKING(for shared mmap)
+AC_CACHE_VAL(cyrus_cv_func_mmap_shared,AC_TRY_RUN(
+#include <fcntl.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <unistd.h>
+int main() {
+ char *base;
+ int mmapflags = MAP_SHARED;
+ int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
+ if (fd == -1) return 1;
+ if (write(fd, "test", 4) != 4) return 1;
+ fsync(fd);
+#ifdef MAP_FILE
+ mmapflags |= MAP_FILE;
+#endif
+#ifdef MAP_VARIABLE
+ mmapflags |= MAP_VARIABLE;
+#endif
+ base = mmap((caddr_t)0, 100, PROT_READ, mmapflags, fd, 0L);
+ if (base == (caddr_t)-1) return 1;
+ if (memcmp(base, "test", 4) != 0) return 1;
+ if (write(fd, "test", 4) != 4) return 1;
+ fsync(fd);
+ if (memcmp(base+4, "test", 4) != 0) return 1;
+ return 0;
+}
+,cyrus_cv_func_mmap_shared=yes,cyrus_cv_func_mmap_shared=no,
+cyrus_cv_func_mmap_shared=no))
+AC_MSG_RESULT($cyrus_cv_func_mmap_shared)
+if test $cyrus_cv_func_mmap_shared = yes; then
+	found_map="shared"
+else
+AC_MSG_CHECKING(for stupid shared mmap)
+AC_CACHE_VAL(cyrus_cv_func_mmap_stupidshared,AC_TRY_RUN(
+#include <fcntl.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <unistd.h>
+int main() {
+ char *base;
+ int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
+ int mmapflags = MAP_SHARED;
+ if (fd == -1) return 1;
+ if (write(fd, "test", 4) != 4) return 1;
+ fsync(fd);
+#ifdef MAP_FILE
+ mmapflags |= MAP_FILE;
+#endif
+#ifdef MAP_VARIABLE
+ mmapflags |= MAP_VARIABLE;
+#endif
+ base = mmap((caddr_t)0, 4, PROT_READ, mmapflags, fd, 0L);
+ if (base == (caddr_t)-1) return 1;
+ if (memcmp(base, "test", 4) != 0) return 1;
+ lseek(fd, 0L, 0);
+ if (write(fd, "xyzz", 4) != 4) return 1;
+ fsync(fd);
+ if (memcmp(base, "xyzz", 4) != 0) return 1;
+ return 0;
+}
+,cyrus_cv_func_mmap_stupidshared=yes,cyrus_cv_func_mmap_stupidshared=no,
+cyrus_cv_func_mmap_stupidshared=no))
+AC_MSG_RESULT($cyrus_cv_func_mmap_stupidshared)
+if test $cyrus_cv_func_mmap_stupidshared = yes; then
+	found_map="stupidshared"
+else
+	AC_MSG_WARN(*** This system does not have a working mmap())
+	AC_MSG_WARN(*** Expect a considerable performance penalty)
+	found_map=nommap
+fi
+fi
+
+AC_ARG_WITH(mmap,
+	AS_HELP_STRING(--with-mmap=TYPE, force shared/stupidshared/nommap - JUST FOR TESTING),
+	WITH_MAP="$withval",WITH_MAP="$found_map")
+AM_CONDITIONAL(MAP_SHARED, test "$WITH_MAP" = "shared")
+AM_CONDITIONAL(MAP_STUPIDSHARED, test "$WITH_MAP" = "stupidshared")
+
+AC_ARG_WITH(lock,
+ AS_HELP_STRING(--with-lock=METHOD, force use of METHOD for locking (flock or fcntl)),
+ WITH_LOCK="$withval", 
+ AC_CHECK_FUNC(fcntl,WITH_LOCK="fcntl",
+		AC_CHECK_FUNC(flock,WITH_LOCK="flock",
+				AC_MSG_ERROR(unable to detect locking method)
+			 )
+		)
+ )
+AM_CONDITIONAL(LOCK_FCNTL, test $WITH_LOCK = "fcntl")
+
+dnl check for fdatasync (used by cyrusdb_skiplist)
+LIB_RT=""
+AC_CHECK_FUNC(fdatasync, AC_DEFINE(HAVE_FDATASYNC,,Do we have fdatasync()?), 
+ AC_CHECK_LIB(rt, fdatasync, 
+	LIB_RT="-lrt"
+	AC_DEFINE(HAVE_FDATASYNC,,Do we have fdatasync()?)
+ )
+)
+
+dnl check for libuuid (used when generating mailbox uniqueids)
+LIB_UUID=
+AC_CHECK_LIB(uuid, uuid_generate,
+ LIB_UUID="-luuid"
+ AC_DEFINE(HAVE_LIBUUID,,Do we have the uuid library)
+)
+
+dnl for AFS.
+cant_find_sigvec=no
+AC_CACHE_VAL(cyrus_cv_sigveclib,
+ dnl bsd classic flavor
+ AC_CHECK_FUNC(sigvec, 
+	cyrus_cv_sigveclib=""
+ , 
+ dnl hp flavor
+ AC_CHECK_LIB(BSD, sigvec, cyrus_cv_sigveclib="-lBSD", 
+ dnl not hp flavor
+ SAVE_LDFLAGS="$LDFLAGS"
+ dnl solaris flavor
+ LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
+ AC_CHECK_LIB(ucb, sigvec, 
+ dnl more solaris flavor
+ cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb",
+ cant_find_sigvec=yes )
+ LDFLAGS="$SAVE_LDFLAGS")
+ )
+)
+AC_SUBST(cyrus_cv_sigveclib)
+
+# ok, we still look for this stuff because of checking groups, but
+# all authentication goes through SASL
+AC_ARG_ENABLE(afs,
+	AS_HELP_STRING(--enable-afs, Enable AFS with ptloader))
+
+AC_ARG_WITH(afs-libdir,
+	AS_HELP_STRING(--with-afs-libdir=DIR, use AFS libraries from DIR /usr/lib),
+	afs_libdir="${withval}", afs_libdir="/usr/lib")
+ 
+AC_ARG_WITH(afs-incdir,
+	AS_HELP_STRING(--with-afs-incdir=DIR, use AFS headers from DIR /usr/include),
+	afs_incdir="${withval}", afs_incdir="/usr/include")
+
+AC_ARG_WITH(ldap,
+	AS_HELP_STRING(--with-ldap=DIR, use LDAP (in DIR) (experimental) /usr/local),
+	with_ldap="${withval}", with_ldap="no")
+ 
+dnl select mode of afspts
+AC_ARG_ENABLE(krb5afspts,
+	AS_HELP_STRING(--enable-krb5afspts, compile afskrb PTS module with krb5 support))
+
+if test "x$enable_afs" = "xyes"; then
+# krb5afspts is only valid if AFS is enabled, so check inside here.
+ AS_IF(test "x$enable_krb5afspts" = "xyes", SASL_SET_GSSAPI_LIBS
+ AC_DEFINE(AFSPTS_USE_KRB5,,Should the AFS PTS plugin use krb5?) 
+ )
+
+ CFLAGS="${CFLAGS} -I${with_afs_incdir}/include"
+ AFS_LIBS="${with_afs_libdir}/afs/libkauth.a ${with_afs_libdir}/afs/libprot.a ${with_afs_libdir}/afs/libauth.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/librxkad.a ${with_afs_libdir}/librx.a ${with_afs_libdir}/afs/libsys.a ${with_afs_libdir}/libubik.a ${with_afs_libdir}/liblwp.a ${with_afs_libdir}/afs/util.a ${with_afs_libdir}/afs/libcom_err.a"
+ if test -f ${with_afs_libdir}/afs/libaudit.a; then
+ AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libaudit.a"
+ fi
+ if test -f /usr/ucblib/libucb.a; then
+ CMU_ADD_LIBPATH_TO(/usr/ucblib, AFS_LDFLAGS)
+ AFS_LIBS="$AFS_LIBS -lc -lucb"
+ fi
+ if test -f ${with_afs_libdir}/afs/libdes.a; then
+ AFS_LIBS="$AFS_LIBS ${with_afs_libdir}/afs/libdes.a"
+ else
+ AFS_LIBS="$AFS_LIBS -ldes"
+ fi
+
+ AC_CACHE_VAL(cyrus_cv_afs_sigvec,
+ SAVE_LIBS="$LIBS"
+ LIBS="${with_afs_libdir}/liblwp.a"
+ AC_MSG_CHECKING(if AFS libraries need sigvec)
+ dnl Does AFS need sigvec? We have to link against lwp and see
+ dnl if IOMGR_Initialize wants it
+ AC_TRY_LINK(IOMGR_Initialize();,
+ IOMGR_Initialize(),
+ 
+ dnl it linked; don't need it
+ AC_MSG_RESULT(no)
+ cyrus_cv_afs_sigvec="no"
+ , 
+ dnl didn't link; pick up sigvec
+ AC_MSG_RESULT(yes)
+ cyrus_cv_afs_sigvec="yes"
+ )
+ )
+ if test "$cyrus_cv_afs_sigvec" = yes; then
+ if test "$cant_find_sigvec" = yes; then
+ AC_MSG_WARN(Can not find a sigvec for AFS libraries which seem to need one.)
+ else
+ AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
+ AC_DEFINE(HAVE_AFSKRB,,Should we build afskrb pts module?)
+ fi
+ else
+ AFS_LIBS="${AFS_LIBS}"
+ AC_DEFINE(HAVE_AFSKRB,,Should we build afskrb pts module?)
+ fi
+ LIBS="$SAVE_LIBS"
+ AC_SUBST(AFS_LDFLAGS)
+ AC_SUBST(AFS_LIBS)
+fi
+AM_CONDITIONAL(USE_AFSKRB, test "$HAVE_AFSKRB" = "1")
+
+have_ldap=no
+LDAP_CPPFLAGS=
+LDAP_LDFLAGS=
+LDAP_LIBS=
+
+case "x$with_ldap" in
+xno)
+ # default args or --without-ldap
+ # do not try to enable
+ ;;
+xyes)
+ # --with-ldap
+ # try to enable, search in default system directories
+ ldap_cppflags=
+ ldap_ldflags=
+ ;;
+*)
+ # --with-ldap=DIR
+ # try to enable, search in given install directory
+ if test "x$with_ldap" != "x" -a -d "$with_ldap"; then
+	ldap_cppflags="-I${with_ldap}/include"
+	ldap_ldflags="-L${with_ldap}/lib"
+	with_ldap=yes
+ else
+	AC_WARN(Disabling LDAP - no include files found)
+	with_ldap=no
+ fi
+esac
+
+if test $with_ldap = yes; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $ldap_cppflags"
+ LDFLAGS="$LDFLAGS $ldap_ldflags"
+
+ AC_CHECK_LIB(ldap, ldap_initialize, 
+	AC_DEFINE(HAVE_LDAP,,Should we build the LDAP pts module?)
+	LDAP_CPPFLAGS="$ldap_cppflags"
+	LDAP_LDFLAGS="$ldap_ldflags"
+	LDAP_LIBS="-lldap -llber"
+	have_ldap=yes
+ ,,-llber)
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+fi
+AC_SUBST(LDAP_CPPFLAGS)
+AC_SUBST(LDAP_LDFLAGS)
+AC_SUBST(LDAP_LIBS)
+AM_CONDITIONAL(HAVE_LDAP, test "$have_ldap" = "yes")
+
+
+AM_CONDITIONAL(PTCLIENT, test "x$enable_afs" = "xyes" -o "$have_ldap" = "yes")
+
+AC_ARG_ENABLE(server,
+	AS_HELP_STRING(--disable-server, disable compiling servers))
+AM_CONDITIONAL(SERVER, test "$enable_server" != "no")
+# We always output a server makefile (just because we can)
+
+dnl this is the new simple check for kerberos; since the person had to
+dnl compile SASL, we might as well use the same checks.
+AC_ARG_WITH(krb,
+	AS_HELP_STRING(--with-krb=DIR, use Kerberos from DIR),
+	with_krb="$withval", with_krb="no")
+
+AC_ARG_WITH(krbimpl,
+	AS_HELP_STRING(--with-krbimpl=kth|mit, assume Kerberos 4 from KTH or MIT),
+	with_krbimpl="$withval", with_krbimpl="kth")
+
+AC_ARG_ENABLE(statickrb,
+	AS_HELP_STRING(--enable-statickrb, link Kerberos statically),
+	with_statickrb="yes", with_statickrb="no")
+
+dnl In order to compile kerberos4, we need libkrb and libdes.
+
+dnl we might need -lresolv for kerberos
+AC_CHECK_LIB(resolv,res_search)
+
+if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
+ AC_MSG_ERROR(--enable-statickrb specified but --with-krb did not specify a valid directory)
+fi 
+
+if test "$with_krb" != "no"; then
+dnl Do we need DES for kerberos?
+AC_ARG_WITH(krbdes,
+	AS_HELP_STRING(--with-krbdes, use Kerberos DES implementation yes),
+	with_krbdes="$withval", with_krbdes="yes")
+if test "$with_krbdes" = "yes"; then
+ AC_CHECK_LIB(des,des_ecb_encrypt,
+ if test "$with_statickrb" = "yes"; then
+ KRB_LIBS="$with_krb/lib/libdes.a"
+ else
+ KRB_LIBS="-ldes"
+ fi,
+ AC_MSG_ERROR(The Kerberos DES library is required for Kerberos support. You might want --with-auth=unix.))
+fi
+fi
+
+dnl if we were ambitious, we'd look more aggressively for the
+dnl krb4 install
+if test -d ${with_krb}; then
+ AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, 
+ for krbhloc in include/kerberosIV include
+ do
+ if test -f ${with_krb}/${krbhloc}/krb.h ; then
+ cyrus_cv_krbinclude=${with_krb}/${krbhloc}
+ break
+ fi
+ done
+ )
+
+ if test -n "${cyrus_cv_krbinclude}"; then
+ CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
+ fi
+ CMU_ADD_LIBPATH(${with_krb}/lib)
+fi
+
+if test "$with_krbimpl" != "kth"; then
+ KRBLIB="krb4"
+else
+ KRBLIB="krb"
+fi
+
+if test "$with_des" != no; then
+ AC_CHECK_HEADER(krb.h,
+ AC_CHECK_LIB(${KRBLIB}, krb_mk_priv,
+ if test "$with_statickrb" = "yes"; then
+ KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
+ else
+ KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
+ fi,
+ AC_WARN(No Kerberos V4 found); krb4=no,
+ 	 $KRB_LIBS),
+ AC_WARN(No Kerberos V4 found); krb4=no)
+else
+ AC_WARN(No DES library found for Kerberos V4 support)
+ krb4=no
+fi
+
+if test "${krb4}" != no; then
+ AC_DEFINE(HAVE_KRB,,Support for Kerberos?)
+fi
+
+LIBS="$KRB_LIBS $LIBS"
+
+SASL_SET_GSSAPI_LIBS
+
+dnl
+dnl Test for OpenSSL
+dnl
+AC_ARG_WITH(openssl,
+	AS_HELP_STRING(--with-openssl=DIR, use OpenSSL from DIR),
+	with_ssl="${withval}")
+
+SSL_CPPFLAGS=
+SSL_LIBS=
+
+case "x$with_ssl" in
+xno)
+ # --without-openssl
+ # do not try to enable
+ ;;
+x|xyes)
+ # default args or --with-openssl
+ # try to enable, search in default system directories
+ #
+ ssl_cppflags=
+ ssl_ldflags=
+ ;;
+*)
+ # --with-openssl=DIR
+ # try to enable, search in given install directory
+ if test -d "$with_ssl"; then
+	ssl_cppflags="-I${with_ssl}/include"
+	ssl_ldflags=
+	CMU_ADD_LIBPATH_TO(${with_ssl}/lib, ssl_ldflags)
+	with_ssl=yes
+ else
+	AC_WARN(Disabling OpenSSL - no include files found)
+	with_ssl=no
+ fi
+esac
+
+if test "$with_ssl" != "no"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $ssl_cppflags"
+ LDFLAGS="$LDFLAGS $ssl_ldflags"
+
+ AC_CHECK_HEADER(openssl/evp.h, 
+	with_ssl=yes
+ ,
+	with_ssl=no
+ )
+
+ dnl if openssl has been compiled with the rsaref2 libraries,
+ dnl we need to include the rsaref libraries in the crypto check
+ ssl_libs=
+ AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
+ ssl_libs="-lRSAglue -lrsaref"
+ ,
+ # whatever, we do not care
+ :
+ )
+ AC_CHECK_LIB(crypto, BIO_accept,
+	ssl_libs="-lcrypto $ssl_libs"
+ ,
+	with_ssl=no
+ , $ssl_libs)
+ AC_CHECK_LIB(ssl, SSL_CTX_new, 
+	ssl_libs="-lssl $ssl_libs"
+ ,
+	with_ssl=no
+ , $ssl_libs)
+
+ if test "$with_ssl" = "no"; then
+	AC_WARN(Disabling SSL - no library files found)
+ fi
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+fi
+
+AC_MSG_CHECKING(for ssl)
+AC_MSG_RESULT($with_ssl)
+
+if test "$with_ssl" != "no"; then
+ SSL_CPPFLAGS="$ssl_cppflags"
+ SSL_LIBS="$ssl_ldflags $ssl_libs"
+ AC_DEFINE(HAVE_SSL,,Build with SSL support?)
+ if test "${krb4}" != no; then
+ AC_DEFINE(OPENSSL_ENABLE_OLD_DES_SUPPORT,,Configure OpenSSL to provide legacy des apis)
+ AC_DEFINE(OPENSSL_DES_LIBDES_COMPATIBILITY,,Configure OpenSSL to provide krb4-compatible legacy des apis)
+ fi
+fi
+AM_CONDITIONAL(HAVE_SSL, test "$with_ssl" != "no")
+AC_SUBST(SSL_CPPFLAGS)
+AC_SUBST(SSL_LIBS)
+
+dnl
+dnl Allow for setting EGD socket file on systems without /dev/*random.
+dnl
+AC_ARG_WITH(egd-socket,
+ AC_HELP_STRING(--with-egd-socket=FILE, Entropy Gathering Daemon socket pathname for systems without /dev/urandom),
+ EGD_SOCKET="$withval" 
+ )
+if test -n "$EGD_SOCKET" ; then
+ AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET", Alternative to /dev/urandom?)
+fi
+
+dnl
+dnl Test for zlib
+dnl
+CMU_HAVE_ZLIB
+AC_MSG_CHECKING(for zlib)
+AC_MSG_RESULT($with_zlib)
+AC_SUBST(ZLIB)
+
+dnl
+dnl Test for Zephyr
+dnl
+AC_ARG_WITH(zephyr,
+	AS_HELP_STRING(--with-zephyr=DIR, enable Zephyr notification (installed on DIR)),
+	with_zephyr="${withval}")
+if test -z "$with_zephyr"; then
+ if test -f /usr/local/lib/libzephyr.a; then
+	with_zephyr="/usr/local"
+ elif test -f /usr/lib/libzephyr.a; then
+ with_zephyr="/usr"
+ fi
+fi
+ZEPHYR_LIBS=""
+case "$with_zephyr" in
+	no) true;;
+	""|yes) AC_CHECK_LIB(zephyr,ZInitialize,ZEPHYR_LIBS="-lzephyr",
+		with_zephyr="no",);;
+ *) ZEPHYR_LIBS="-lzephyr";;
+esac
+AC_SUBST(ZEPHYR_LIBS)
+if test "$with_zephyr" != "no"; then
+	AC_DEFINE(HAVE_ZEPHYR,,Build with Zephyr support?)
+fi
+AM_CONDITIONAL(ZEPHYR, test "$with_zephyr" != "no")
+
+
+dnl
+dnl Test for libcap (POSIX.1e - security API) on Linux systems
+dnl
+AC_ARG_WITH(libcap,
+	AS_HELP_STRING(--with-libcap, Enable libcap system capabilities handling (Linux systems only)),
+	with_libcap="${withval}")
+
+have_libcap=no
+case $host_os in
+linux*)
+	if test "x$with_libcap" = "xyes"; then
+		AC_CHECK_LIB(cap, cap_get_proc, have_libcap=yes, have_libcap=no)
+		AC_CHECK_HEADERS(sys/capability.h sys/prctl.h, , have_libcap=no)
+		if test "$have_libcap" = "yes"; then
+			AC_DEFINE(HAVE_LIBCAP, , Do we have libcap system capabilities handling (Linux systems only)?)
+			LIBS="$LIBS -lcap"
+		fi
+	fi
+	;;
+*)
+	;;
+esac
+
+AC_MSG_CHECKING(for libcap)
+AC_MSG_RESULT($have_libcap)
+
+
+dnl
+dnl Test for mailbox event notification
+dnl enable requires the installation of jansson library
+dnl
+AC_ARG_ENABLE(event-notification,
+ AS_HELP_STRING(--disable-event-notification, disable compiling of mailbox event notification (that needs jansson library)),,
+ enable_event_notification="yes";)
+
+if test "$enable_event_notification" != "no"; then
+ PKG_CHECK_MODULES(JANSSON, jansson >= 2.0,
+	check_jansson=true 
+	 dnl call AC_SUBST macro to support pkg-config version older that 0.24 without any bad consequence for recent version
+	 AC_SUBST(JANSSON_LIBS)
+	 AC_SUBST(JANSSON_CFLAGS)
+	 AC_DEFINE(ENABLE_MBOXEVENT,,Build with support of mailbox event notification),
+	check_jansson=false
+	 AC_MSG_WARN(jansson 2.0 or later was not found, but is required to enable mailbox event notification)
+	 enable_event_notification="no")
+fi
+AM_CONDITIONAL(JANSSON, test x$check_jansson = xtrue)
+
+dnl
+dnl Set pidfile location
+dnl
+AC_ARG_WITH(pidfile,
+	AS_HELP_STRING(--with-pidfile=DIR, pidfile in DIR /var/run/cyrus-master.pid),
+	MASTERPIDFILE="$withval",
+	MASTERPIDFILE="/var/run/cyrus-master.pid")
+MASTERPIDFILE="\"$MASTERPIDFILE\""
+AC_DEFINE_UNQUOTED(MASTER_PIDFILE, $MASTERPIDFILE,Name of the pidfile for master)
+
+dnl
+dnl see if we're compiling with IMAP idled support
+dnl
+AC_ARG_ENABLE(idled,
+ AS_HELP_STRING(--enable-idled, enable IMAP idled support),,enable_idled="no";)
+AM_CONDITIONAL(IDLED, test "$enable_idled" != "no")
+dnl
+dnl see if we're compiling with NNTP support
+dnl
+AC_ARG_ENABLE(nntp,
+ AS_HELP_STRING(--enable-nntp, enable NNTP support),,enable_nntp="no";)
+AM_CONDITIONAL(NNTPD, test "$enable_nntp" != "no")
+
+dnl
+dnl see if we're compiling the Murder support programs
+dnl
+AC_ARG_ENABLE(murder,
+ AS_HELP_STRING(--enable-murder, enable IMAP Murder support),, enable_murder="no";)
+AM_CONDITIONAL(MURDER, test "$enable_murder" != "no")
+if test "$enable_murder" != no; then
+	# for master/slave auto-selection
+	AC_CHECK_HEADERS(sys/sockio.h)
+fi
+
+dnl
+dnl see if we're compiling with HTTP support
+dnl
+ENABLE_HTTP=no
+AC_ARG_ENABLE(http,
+ AS_HELP_STRING(--enable-http, enable HTTP support),, enable_http="no";)
+AM_CONDITIONAL(HTTPD, test "$enable_http" != "no")
+
+HTTP_CPPFLAGS=
+HTTP_LIBS=
+if test "$enable_http" != no; then
+dnl
+dnl make sure all the modules we need are present
+dnl
+	ENABLE_RSS=yes
+	ENABLE_DAV=yes
+	PKG_CHECK_MODULES(XML2, libxml-2.0,,AC_MSG_ERROR(Need libxml-2.0 for http))
+	PKG_CHECK_MODULES(ICAL, libical,,AC_MSG_ERROR(Need libical for http))
+	PKG_CHECK_MODULES(SQLITE3, sqlite3,,AC_MSG_ERROR(Need sqlite3 for http))
+	PKG_CHECK_MODULES(JSON, jansson,,AC_MSG_ERROR(Need jansson for http))
+
+	HTTP_LIBS="${XML2_LIBS} ${ICAL_LIBS} ${SQLITE3_LIBS} ${JSON_LIBS}"
+	HTTP_CPPFLAGS="${JSON_CFLAGS} ${SQLITE3_CFLAGS} ${ICAL_CFLAGS} ${XML2_CFLAGS}"
+
+	AC_DEFINE(HAVE_XML2,,Build in libxml support?)
+	AC_DEFINE(HAVE_ICAL,,Build in ical support?)
+	AC_DEFINE(HAVE_SQLITE3,,Build in SQLite support?)
+
+	AC_DEFINE(WITH_DAV,,Build DAV support into httpd?)
+	AC_DEFINE(WITH_JSON,,Build jCal/jCard support into httpd?)
+
+	CYRUS_OPENDKIM_CHK()
+	if test "$opendkimlib" = "yes"; then
+	 AC_SUBST(DKIM_CFLAGS)
+	 AC_SUBST(DKIM_LIBS)
+	 AC_DEFINE(WITH_DKIM,,Build DKIM support into iSchedule?) 
+	fi
+fi
+AC_SUBST(HTTP_CPPFLAGS)
+AC_SUBST(HTTP_LIBS)
+
+dnl
+dnl see if we're compiling replication support programs
+dnl
+AC_ARG_ENABLE(replication,
+ AS_HELP_STRING(--enable-replication, enable replication support (experimental)),,enable_replication="no";)
+AM_CONDITIONAL(REPLICATION, test "$enable_replication" != no)
+
+dnl
+dnl Try and find a system version of com_err.
+dnl If we see something that looks a little wacky, ignore it (there are many
+dnl deficient installs of com_err, unfortunately, which leave out compile_et)
+dnl There is also a broken re-implementation of compile_et, apparently derived
+dnl from the Kerberos project, being shipped in /usr/bin on MacOS X, see Bug #3711.
+dnl
+AC_ARG_WITH(com_err,
+	AS_HELP_STRING(--with-com_err=DIR, use com_err from path -- includes in DIR/include, libs in DIR/lib, and compile_et in DIR/bin))
+if test -z "$with_com_err"; then
+	# no value supplied
+	AC_CHECK_LIB(com_err, com_err, 
+		# com_err is already in library path
+		# guess we're okay
+		# can use system com_err
+		with_com_err=""
+		AC_CHECK_HEADER(et/com_err.h,
+		 AC_DEFINE(HAVE_ET_COM_ERR_H,,We need et/com_err.h),
+		 AC_CHECK_HEADER(com_err.h,,AC_MSG_ERROR(cannot locate com_err.h)))
+		AC_PATH_PROG(COMPILE_ET, compile_et, no compile et)
+	, 
+	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
+		with_com_err="/usr/local"
+		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, no compile et)
+	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
+		with_com_err="/usr"
+		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, no compile et)
+	else
+		# use ours
+		with_com_err=yes
+	fi
+	)
+
+	if test "${with_com_err}" = "no"; then
+	 AC_MSG_WARN(com_err is required; included version will be used.)
+	 with_com_err="yes"
+	fi
+	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
+	 AC_MSG_WARN(Parts of com_err distribuion were found, but not compile_et.)
+	 AC_MSG_WARN(Will build com_err from included sources.)
+	 with_com_err="yes" # build it ourselves
+	fi
+fi
+
+dnl Set up $COMPILE_ET first, we need to test it
+case "$with_com_err" in
+ # built-in et
+ yes) # use the com_err we're gonna build
+	COMPILE_ET="\${abs_top_builddir}/com_err/et/compile_et"
+	;;
+ "")	# no problem, we already have it in the paths
+	# we do nothing to pick it up
+	;;
+ *)	# use whatever they told us, or whatever we found
+	COMPILE_ET="${with_com_err}/bin/compile_et"
+	;;
+esac
+
+if test "$with_com_err" != yes ; then
+ dnl Test that the specified compile_et produces correct output
+ dnl See bug #3711 for why this is necessary
+ TEST1=".cyrus-configure-test-$$"
+ /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
+ echo "error_table imap" >> $TEST1.et
+ echo "ec IMAP_TESTING," >> $TEST1.et
+ echo " \"Testing\"" >> $TEST1.et
+ echo "end" >> $TEST1.et
+ "${COMPILE_ET}" $TEST1.et > /dev/null
+ compile_et_ok=no
+ if test -f $TEST1.h ; then
+	if test `awk '/IMAP_TESTING/{print $3}' $TEST1.h 2>/dev/null` = "(-1904809472L)" ; then
+	 compile_et_ok=yes
+	fi
+	dnl Broken compile_et produces (2390157824L)
+ fi
+ /bin/rm -f $TEST1.et $TEST1.h $TEST1.c
+ if test "$compile_et_ok" = no ; then
+	# revert to the built-in compile_et
+	AC_MSG_WARN(It seems $COMPILE_ET is buggy, building our own)
+	with_com_err=yes
+	COMPILE_ET="\${abs_top_builddir}/com_err/et/compile_et"
+ fi
+fi
+
+case "$with_com_err" in
+ # built-in et
+ yes) # use the com_err we're gonna build
+	 COM_ERR_LIBS="com_err/et/libcyrus_com_err.la"
+	 COM_ERR_CPPFLAGS="-I\${top_srcdir}/com_err/et"
+	 ;;
+ "") # no problem, we already have it in the paths
+	# we do nothing to pick it up
+	COM_ERR_LIBS="-lcom_err" # hope it's not shared
+	# we already set COMPILE_ET, or we didn't get here
+	COM_ERR_CPPFLAGS=""
+ ;;
+ *) # use whatever they told us, or whatever we found
+ COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
+ COM_ERR_CPPFLAGS="-I${with_com_err}/include"
+ # Ever get the feeling people hide this stuff on purpose?
+ if test -d "${with_com_err}/include/et" ; then
+ COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
+ fi
+esac
+AM_CONDITIONAL(COM_ERR, test "$with_com_err" = "yes")
+if test "$with_com_err" = "yes"; then
+ PKG_CONFIG_COM_ERR_LIB="-lcyrus_com_err"
+fi
+AC_SUBST(PKG_CONFIG_COM_ERR_LIB)
+AC_SUBST(COMPILE_ET)
+AC_SUBST(COM_ERR_LIBS)
+AC_SUBST(COM_ERR_CPPFLAGS)
+
+if test "$USE_MAINTAINER_MODE" = "yes" ; then
+ AC_CHECK_PROG(GPERF,gperf,yes,no)
+ if test "$GPERF" != "yes"; then
+	AC_MSG_ERROR(gperf is not installed on this system, but is required for maintainer mode build rules)
+ fi
+fi
+
+AC_MSG_CHECKING(for modern syslog)
+AC_CACHE_VAL(cyrus_cv_lib_syslog, AC_TRY_CPP(#include <syslog.h>
+#ifndef LOG_LOCAL6
+#include </nonexistent>
+#endif,cyrus_cv_lib_syslog=yes,cyrus_cv_lib_syslog=no))
+AC_MSG_RESULT($cyrus_cv_lib_syslog)
+
+AC_MSG_CHECKING(which syslog facility to use)
+SYSLOG_FACILITY=LOG_LOCAL6
+AC_ARG_WITH(syslogfacility,
+	AS_HELP_STRING(--with-syslogfacility=FACILITY, set the syslog facility to use (default LOCAL6)),
+ if test "$withval" != "yes" -a "$withval" != "no" ; then
+ SYSLOG_FACILITY=LOG_$withval
+ fi; )
+AC_DEFINE_UNQUOTED(SYSLOG_FACILITY, $SYSLOG_FACILITY, Syslog facility to use.)
+AC_MSG_RESULT($SYSLOG_FACILITY)
+
+dnl Have to check getdtabalesize after adding ossup, as some ossups define it
+AC_REPLACE_FUNCS(getdtablesize)
+AC_ARG_ENABLE(cmulocal,
+	AS_HELP_STRING(--enable-cmulocal, enable CMU-specific local support))
+AM_CONDITIONAL(CMULOCAL, test "$enable_cmulocal" = "yes")
+AC_MSG_CHECKING(to use old sieve service name)
+AC_ARG_ENABLE(oldsievename,
+	AS_HELP_STRING(--enable-oldsievename, enable the use of 'imap' as the sieve service name),
+	if test "$enableval" = yes; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(OLD_SIEVE_SERVICE_NAME,,Use "imap" as sieve service name?)
+	else
+		AC_MSG_RESULT(no)
+	fi,
+	AC_MSG_RESULT(no))
+
+AC_ARG_ENABLE(netscapehack,
+	AS_HELP_STRING(--enable-netscapehack, enable Netscape hack for the menu option in Communicator to Administrate Mail),
+	if test "$enableval" = yes; then
+		AC_DEFINE(ENABLE_X_NETSCAPE_HACK,,Enable Netscape Menu Option Hack?)
+	fi)
+
+CMU_SASL2_REQUIRE_VER(2,1,7)
+CMU_SASL2_CHECKAPOP_REQUIRED
+
+AC_ARG_WITH(perl,
+	AS_HELP_STRING(--with-perl=PERL, use PERL for perl),
+	with_perl="$withval", with_perl="perl")
+
+if test "${with_perl}" = yes; then
+ with_perl="perl"
+fi
+if test "${with_perl}" != no; then
+ if test ${using_static_sasl} = "staticonly"; then
+	AC_MSG_WARN(Cannot compile perl utilities using static libsasl)
+	with_perl="no"
+ else 
+	AC_CHECK_PROGS(PERL, ${with_perl} perl, with_perl=notfound)
+ fi
+fi
+AM_CONDITIONAL(PERL, test "$with_perl" != "no" -a "$with_perl" != "notfound")
+srctoolsdir=`cd ${srcdir};pwd`/tools
+if test "$with_perl" = "notfound"; then
+ AC_MSG_WARN(Perl not found: Administrative tools will not be available)
+elif test "${with_perl}" != "no"; then
+dnl compile perl stuff and perl/cyradm
+ PERL="${with_perl}"
+dnl add perl cccdlflags when building libraries -- this ensures that the
+dnl libraries will be compiled as PIC if perl requires PIC objects
+dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
+ case "${target_os}" in
+ linux*|netbsd*|freebsd*|dragonfly*)
+ AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
+ eval `${PERL} -V:cccdlflags`
+ PERL_CCCDLFLAGS="$cccdlflags"
+ AC_SUBST(PERL_CCCDLFLAGS)
+ AC_MSG_RESULT($PERL_CCCDLFLAGS)
+ ;;
+ *)
+ AC_MSG_WARN(skipping check for perl cccdlflags on "${target_os}")
+ esac
+
+ PERL_PREINSTALL="${PERL} ${srctoolsdir}/fixsearchpath.pl ${cyrus_prefix} ${bindir}"
+ AC_SUBST(PERL_PREINSTALL)
+fi
+
+CMU_LIBWRAP
+CMU_UCDSNMP
+
+# Figure out what directories we're linking against.
+# Lots of fun for the whole family.
+# This probably chokes on anything with spaces in it.
+# All we want is the list of -L directories, and -L may or may not be
+# followed by a space.
+isdir=no
+libpath=""
+#echo "debug ldflags: << ${ldflags} >>"
+#echo "debug default_ldflags: << ${default_ldflags} >>"
+for flag in ${ldflags} ${default_ldflags}; do
+ case $flag in
+ -L)
+ # it's a split -L option, we'll mark the next option as a dir.
+ isdir=yes
+ ;;
+
+ -L*) 
+ # attached -L option: split off the directory
+ larg=`echo $flag | sed -e 's:-L$..*$:\1:'`
+ libpath="${libpath} ${larg}"
+ ;;
+
+ *)
+ if test $isdir = yes ; then
+	libpath="${libpath} ${flag}"
+	isdir=no
+ fi
+ esac
+done
+
+AC_SUBST(LIB_SASL)
+AC_SUBST(LIB_RT)
+AC_SUBST(LIB_UUID)
+AC_SUBST(PERL)
+
+dnl
+dnl Enable/disable unit tests. These are disabled by default, as
+dnl they require an additional library (the CUnit library).
+dnl
+AC_ARG_ENABLE(unit-tests,
+ AS_HELP_STRING(--enable-unit-tests, enable CUnit-based unit regression tests))
+
+dnl Unit tests need the CUnit library, so check if we
+dnl have both the header and the library.
+if test "$enable_unit_tests" = "yes" ; then
+ AC_CHECK_LIB(cunit,CU_initialize_registry,found_lib=yes,found_lib=no)
+ AC_CHECK_HEADER(CUnit/CUnit.h,found_hdr=yes,found_hdr=no)
+ if test "$found_lib$found_hdr" != "yesyes" ; then
+	AC_MSG_NOTICE(Disabling unit tests because the required CUnit library is not installed)
+	enable_unit_tests=no
+ fi
+fi
+if test "$enable_unit_tests" = "yes" ; then
+ dnl Valgrind is an amazingly useful tool for running tests. It doesn't
+ dnl need the program under test to be modified in any way, but it we can
+ dnl optionally use some magic in it's header file to compensate for some
+ dnl of the shortcomings of a C development environment by giving error
+ dnl messages with backtraces. This is so enormously useful for the unit
+ dnl tests that want to enable it if possible, but we can struggle on
+ dnl without it. Besides, on many platforms the header file is in a
+ dnl different package to the main valgrind binary, and so might not be
+ dnl installed.
+ AC_CHECK_HEADERS(valgrind/valgrind.h)
+fi
+
+AM_CONDITIONAL(CUNIT, test "$enable_unit_tests" = "yes")
+
+AH_TOP(
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _CYRUS_IMAPD_CONFIG_H_
+#define _CYRUS_IMAPD_CONFIG_H_
+)
+
+AH_BOTTOM(
+/* time.h */
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+/* com_err.h, as needed */
+#ifndef IN_COM_ERR
+#ifdef HAVE_ET_COM_ERR_H
+#include <et/com_err.h>
+#else
+#include <com_err.h>
+#endif /* HAVE_ET_COM_ERR_H */
+#endif /* IN_COM_ERR */
+
+/* This allows us to work even when we don't have an fdatasync */
+#ifndef HAVE_FDATASYNC
+#define fdatasync(fd) fsync(fd)
+#endif
+
+/* A similar setup for not having O_DSYNC */
+#include <fcntl.h>
+
+#ifndef O_DSYNC
+# ifdef O_SYNC
+# define O_DSYNC O_SYNC /* POSIX */
+# else
+# define O_DSYNC O_FSYNC /* BSD */
+# endif
+#endif
+
+#ifndef HAVE___ATTRIBUTE__
+/* Can't use attributes... */
+#define __attribute__(foo)
+#endif
+
+#ifndef HAVE_SOCKLEN_T
+typedef unsigned int socklen_t;
+#endif
+
+#ifndef HAVE_RLIM_T
+typedef int rlim_t;
+#endif
+
+/* some potentially memory saving tradeoffs, 
+ preconfigured in memory-saving mode */
+
+/* save the cmdlines for the ID command */
+#undef ID_SAVE_CMDLINE
+
+/* IPv6 things */
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+#define	_SS_MAXSIZE	128	/* Implementation specific max size */
+#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
+
+struct sockaddr_storage {
+	struct	sockaddr ss_sa;
+	char		__ss_pad2_SS_PADSIZE;
+};
+# define ss_family ss_sa.sa_family
+# define HAVE_SS_FAMILY
+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
+
+#ifndef AF_INET6
+/* Define it to something that should never appear */
+#define	AF_INET6	AF_MAX
+#endif
+
+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+#include "gai.h"
+#endif
+
+/* End IPv6 things */
+
+#ifdef OLD_SIEVE_SERVICE_NAME
+#define SIEVE_SERVICE_NAME "imap"
+#else
+#define SIEVE_SERVICE_NAME "sieve"
+#endif
+
+/* filenames */
+#define FNAME_DBDIR "/db"
+#define FNAME_USERDIR "/user/"
+#define FNAME_DOMAINDIR "/domain/"
+#define FNAME_LOGDIR "/log/"
+#define FNAME_PTSDB "/ptclient/ptscache.db"
+#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
+#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
+
+#ifndef HAVE_SHUTDOWN
+#define shutdown(fd, mode) 0
+#endif
+
+/* *printf() macros */
+#if (SIZEOF_SIZE_T == SIZEOF_INT)
+#define SIZE_T_FMT "%u"
+#elif (SIZEOF_SIZE_T == SIZEOF_LONG)
+#define SIZE_T_FMT "%lu"
+#elif (SIZEOF_SIZE_T == SIZEOF_LONG_LONG_INT)
+#define SIZE_T_FMT "%llu"
+#else
+#error dont know what to use for SIZE_T_FMT
+#endif
+
+#if (SIZEOF_OFF_T == SIZEOF_LONG)
+#define OFF_T_FMT "%ld"
+#define strtoofft(nptr, endptr, base) strtol(nptr, endptr, base)
+#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG_INT)
+#define OFF_T_FMT "%lld"
+#define strtoofft(nptr, endptr, base) strtoll(nptr, endptr, base)
+#else
+#error dont know what to use for OFF_T_FMT
+#endif
+
+#ifndef HAVE_POSIX_FADVISE
+#define POSIX_FADV_WILLNEED 0
+extern int posix_fadvise(int fd, off_t offset, off_t len, int advice);
+#endif
+
+#ifndef HAVE_STRSEP
+extern char *strsep(char **, const char *);
+#endif
+
+#ifndef HAVE_MEMMEM
+extern void *memmem(const void *, size_t, const void *, size_t);
+#endif
+
+/* compile time options; think carefully before modifying */
+enum {
+ /* should we send an UNAVAILABLE message to master when
+ * a service is exiting (master is already going to be 
+ * informed of the exit by the SIGCHLD signal anyway) ? */
+ MESSAGE_MASTER_ON_EXIT = 0,
+
+ /* should a hierarchical rename stop on error? */
+ RENAME_STOP_ON_ERROR = 1,
+
+ /* should we call fsync() to maybe help with softupdates? (it should) */
+ APPEND_ULTRA_PARANOID = 1,
+
+ /* should we log extra information at the DEBUG level for DB stuff? 
+ * 0 -> nothing; 1 -> some; higher -> even more */
+ CONFIG_DB_VERBOSE = 1,
+
+ /* log timing information to LOG_DEBUG */
+ CONFIG_TIMING_VERBOSE = 0,
+
+ /* should we be pedantic about namespace or sleezy? */
+ SLEEZY_NAMESPACE = 1,
+
+ /* should we do a fast TLS session shutdown? */
+ TLS_FAST_SHUTDOWN = 1,
+
+ /* should we have long LMTP error messages? */
+ LMTP_LONG_ERROR_MSGS = 1
+};
+
+#endif /* _CYRUS_IMAPD_CONFIG_H_ */
+)
+
+dnl make sure that Makefile is the last thing output
+AC_CONFIG_FILES(
+ libcyrus_min.pc
+ libcyrus.pc
+ libcyrus_sieve.pc
+ Makefile
+)
+
+if test "$with_perl" != "no" -a "$with_perl" != "notfound" ; then
+CMU_PERL_MAKEMAKER(perl/annotator)
+CMU_PERL_MAKEMAKER(perl/imap)
+CMU_PERL_MAKEMAKER(perl/sieve/managesieve)
+fi
+
+AC_OUTPUT
+echo "
+Cyrus Imapd configured components
+
+ event notification: $enable_event_notification
+ idled: $enable_idled
+ murder: $enable_murder
+ nttpd: $enable_nntp
+ replication: $enable_replication
+ sieve: $enable_sieve
+ http: $enable_http
+
+External dependencies:
+ pcre: $cyrus_cv_pcre_utf8
+
+Database support:
+ bdb: $use_berkeley
+ mysql: $with_mysql
+ postgresql: $use_pgsql
+ sqlite: $use_sqlite
+"

cyrus-imapd-2.4.17.tar.gz/contrib/README -> cyrus-imapd-2.5.tar.gz/contrib/README Changed

cyrus-imapd-2.4.17.tar.gz/contrib/cyrus-graphtools.1.0/script/cyrus.pl -> cyrus-imapd-2.5.tar.gz/contrib/cyrus-graphtools.1.0/script/cyrus.pl Changed

cyrus-imapd-2.4.17.tar.gz/contrib/deliver-notify-zephyr.patch -> cyrus-imapd-2.5.tar.gz/contrib/deliver-notify-zephyr.patch Changed

cyrus-imapd-2.4.17.tar.gz/contrib/drac_auth.patch -> cyrus-imapd-2.5.tar.gz/contrib/drac_auth.patch Changed

@@ -1,5 +1,3 @@
-$Id: drac_auth.patch,v 1.30 2010/01/06 17:01:28 murch Exp $
-
 Patch to add support for Dynamic Relay Authorization Control
 
 For more information about DRAC, see:
@@ -64,10 +62,10 @@
 
 
 
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.ac
 index e0e8cf4..7d237c0 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -1171,6 +1171,19 @@ dnl (agentx was depricated, but SNMP_SUBDIRS is conveinent as a placeholder)
  SNMP_SUBDIRS=""
  AC_SUBST(SNMP_SUBDIRS)
@@ -92,44 +90,30 @@
 index b5e139b..1f887f3 100644
 --- a/imap/Makefile.in
 +++ b/imap/Makefile.in
-@@ -66,6 +66,7 @@ SIEVE_OBJS = @SIEVE_OBJS@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+@@ -66,4 +66,5 @@
  LIB_WRAP = @LIB_WRAP@
 +DRAC_LIBS = @DRACLIBS@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
- DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
+ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.la
  
-@@ -203,17 +204,17 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
- imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+@@ -203,7 +204,7 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) \
+ imapd: $(IMAPDOBJS) mutex_fake.o libcyrus_imap.la $(DEPLIBS) $(SERVICE)
  	$(CC) $(LDFLAGS) -o imapd \
  	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
--	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+-	libcyrus_imap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	libcyrus_imap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
  
  mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- 	libimap.a $(DEPLIBS)
+ 	libcyrus_imap.la $(DEPLIBS)
 @@ -231,7 +232,7 @@ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
+ pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libcyrus_imap.la \
  	$(DEPLIBS) $(SERVICE)
  	$(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
--	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+-	 mutex_fake.o libcyrus_imap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++	 mutex_fake.o libcyrus_imap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
  
  nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
- 	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
+ 	 mutex_fake.o nntp_err.o libcyrus_imap.la $(DEPLIBS) $(SERVICE)
 diff --git a/imap/imapd.c b/imap/imapd.c
 index d979f3b..e9f51d1 100644
 --- a/imap/imapd.c
@@ -151,7 +135,7 @@
 +#endif /* DRAC_AUTH */
 +
  /* current sub-user state */
- struct index_state *imapd_index;
+ static struct index_state *imapd_index;
  
 @@ -738,6 +750,23 @@ int service_init(int argc, char **argv, char **envp)
      /* setup for sending IMAP IDLE notifications */
@@ -253,7 +237,7 @@
  /*
   * Top-level command loop parsing
   */
-@@ -2239,6 +2316,11 @@ void cmd_login(char *tag, char *user)
+@@ -2239,6 +2316,11 @@ static void cmd_login(char *tag, char *user)
      capa_response(CAPA_PREAUTH|CAPA_POSTAUTH);
      prot_printf(imapd_out, " %s\r\n", reply);
  
@@ -292,14 +276,14 @@
  
  #ifdef HAVE_SSL
  static SSL *tls_conn;
-@@ -120,6 +124,7 @@ int popd_timeout;
- char *popd_userid = 0, *popd_subfolder = 0;
- struct mailbox *popd_mailbox = NULL;
- struct auth_state *popd_authstate = 0;
+@@ -120,6 +124,7 @@ static int popd_timeout;
+ static char *popd_userid = 0, *popd_subfolder = 0;
+ static struct mailbox *popd_mailbox = NULL;
+ static struct auth_state *popd_authstate = 0;
 +static int popd_userisproxyadmin = 0;
- int config_popuseacl, config_popuseimapflags;
+ static int config_popuseacl, config_popuseimapflags;
  struct sockaddr_storage popd_localaddr, popd_remoteaddr;
- int popd_haveaddr = 0;
+ static int popd_haveaddr = 0;
 @@ -150,7 +155,7 @@ static mailbox_decideproc_t expungedeleted;
  
  /* the sasl proxy policy context */

cyrus-imapd-2.4.17.tar.gz/contrib/fud-client.c -> cyrus-imapd-2.5.tar.gz/contrib/fud-client.c Changed

cyrus-imapd-2.5.tar.gz/cunit Added

cyrus-imapd-2.5.tar.gz/cunit/.gitignore Added

cyrus-imapd-2.5.tar.gz/cunit/annotate.testc Added

@@ -0,0 +1,1965 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "cunit/cunit.h"
+#include "assert.h"
+#include "xmalloc.h"
+#include "retry.h"
+#include "imap/global.h"
+#include "libcyr_cfg.h"
+#include "imap/annotate.h"
+#include "imap/mboxlist.h"
+#include "imap/imap_err.h"
+
+#define DBDIR		"test-dbdir"
+#define MBOXNAME1_INT "user.smurf"
+#define MBOXNAME2_INT "user.smurfette"
+#define PARTITION	"default"
+#define COMMENT		"/comment"
+#define EXENTRY		"/vendor/example.com/a-non-default-entry"
+#define VALUE_SHARED	"value.shared"
+#define SIZE_SHARED	"size.shared"
+#define VALUE0		"Hello World"
+#define LENGTH0		"11"
+#define VALUE1		"lorem ipsum"
+#define VALUE2		"dolor sit amet"
+#define ACL		"anyone\tlrswipkxtecdan\t"
+
+static int isadmin;
+static const char *userid;
+static struct auth_state *auth_state;
+static const char *old_annotation_definitions = NULL;
+
+static void config_read_string(const char *s)
+{
+ char *fname = xstrdup("/tmp/cyrus-cunit-configXXXXXX");
+ int fd = mkstemp(fname);
+ retry_write(fd, s, strlen(s));
+ config_reset();
+ config_read(fname, 0);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static void set_annotation_definitions(const char *s)
+{
+ static const char *fname = DBDIR"/conf/annotations.def";
+ int fd;
+
+ if (s) {
+	fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+	assert(fd >= 0);
+	retry_write(fd, s, strlen(s));
+	close(fd);
+ }
+ else {
+	unlink(fname);
+ }
+
+ imapoptsIMAPOPT_ANNOTATION_DEFINITIONS.val.s = fname;
+}
+
+static int fexists(const char *fname)
+{
+ struct stat sb;
+ int r;
+
+ r = stat(fname, &sb);
+ if (r < 0)
+	r = -errno;
+ return r;
+}
+
+
+static void fetch_cb(const char *mboxname, uint32_t uid,
+		 const char *entry, struct attvaluelist *avlist,
+		 void *rock)
+{
+ strarray_t *results = (strarray_t *)rock;
+ struct buf buf = BUF_INITIALIZER;
+
+ buf_printf(&buf, "mboxname=\"%s\" uid=%u entry=\"%s\"",
+	 mboxname, uid, entry);
+
+ for ( ; avlist ; avlist = avlist->next) {
+	buf_printf(&buf, " %s=", avlist->attrib);
+	if (avlist->value.s)
+	 buf_printf(&buf, "\"%s\"", buf_cstring(&avlist->value));
+	else
+	 buf_printf(&buf, "NIL");
+ }
+
+ strarray_appendm(results, buf_release(&buf));
+}
+
+/* test_begin_without_open deleted -- begin has been removed */
+
+/* test_commit_without_begin deleted -- begin has been removed */
+
+/* test_store_without_begin deleted -- begin has been removed */
+
+static void test_getset_server_shared(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ strarray_t results = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* check that there is no value initially */
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ /* set a value */
+
+ /* pretend to be admin */
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* check that we can fetch the value back in the same txn */
+ r = annotate_state_fetch(astate, &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that we can fetch the value back in a new txn */
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ /* check that we can fetch the value back after close and re-open */
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ /* delete the value */
+
+ buf_free(&val);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ /* pretend to be admin */
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that there is no value any more */
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ strarray_fini(&results);
+ buf_free(&val);
+}
+
+static void test_getset_mailbox_shared(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ strarray_t results = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox = NULL;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* check that there is no value initially */
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(MBOXNAME1_INT, COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ /* set a value */
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* check that we can fetch the value back in the same txn */
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(MBOXNAME1_INT, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that we can fetch the value back in a new txn */
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(MBOXNAME1_INT, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ /* check that we can fetch the value back after close and re-open */
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(MBOXNAME1_INT, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ /* delete the value */
+
+ buf_free(&val);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that there is no value any more */
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=0 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ buf_free(&val);
+ r = annotatemore_lookup(MBOXNAME1_INT, COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ strarray_fini(&results);
+ buf_free(&val);
+ mailbox_close(&mailbox);
+}
+
+
+static void test_getset_message_shared(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ strarray_t results = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox = NULL;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* check that there is no value initially */
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=42 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ /* set a value */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* check that we can fetch the value back in the same txn */
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=42 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = mailbox_commit(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox);
+
+ /* check that we can fetch the value back in a new txn */
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=42 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = mailbox_commit(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox);
+
+ annotatemore_close();
+
+ /* check that we can fetch the value back after close and re-open */
+
+ annotatemore_open();
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=42 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ /* delete the value */
+
+ buf_free(&val);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = mailbox_commit(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox);
+
+ /* check that there is no value any more */
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"" MBOXNAME1_INT "\" " \
+	 "uid=42 " \
+	 "entry=\"" COMMENT "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ buf_free(&val);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ r = mailbox_commit(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox);
+
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ strarray_fini(&results);
+ buf_free(&val);
+ mailbox_close(&mailbox);
+}
+
+
+static void test_delete(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ struct mboxlist_entry mbentry;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox = NULL;
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ memset(&mbentry, 0, sizeof(mbentry));
+ mbentry.name = MBOXNAME1_INT;
+ mbentry.mbtype = 0;
+ mbentry.partition = PARTITION;
+ mbentry.acl = ACL;
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* set some values */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE1);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE2);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox, 127, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = mailbox_commit(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox);
+
+ /* check that we can fetch the values back */
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE1);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE2);
+ buf_free(&val2);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), 0);
+
+ /* delete all the entries associated with the mailbox */
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ r = annotate_delete_mailbox(mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+
+ /* check that the values are gone */
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ annotatemore_close();
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ buf_free(&val);
+ mailbox_close(&mailbox);
+}
+
+static void test_rename(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox1 = NULL;
+ struct mailbox *mailbox2 = NULL;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), -ENOENT);
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox1);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ r = mailbox_open_iwl(MBOXNAME2_INT, &mailbox2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* set some values */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_set_mailbox(astate, mailbox1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE1);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox1, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE2);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox1, 127, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = mailbox_commit(mailbox1);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox1);
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox1);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ /* check that we can fetch the values back */
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE1);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE2);
+ buf_free(&val2);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), 0);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), -ENOENT);
+
+ /* rename MBOXNAME1 -> MBOXNAME2 */
+
+ r = annotate_rename_mailbox(mailbox1, mailbox2);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mailbox_copy_files(mailbox1, PARTITION, MBOXNAME2_INT);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mailbox_rename_cleanup(&mailbox1, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(mailbox1);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), 0);
+
+ /* check that the values are gone under the old name */
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+ buf_free(&val2);
+
+ /* check that the values are present under the new name */
+
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE1);
+ buf_free(&val2);
+
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE2);
+ buf_free(&val2);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), 0);
+
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ buf_free(&val);
+ mailbox_close(&mailbox1);
+ mailbox_close(&mailbox2);
+}
+
+static void test_abort(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox = NULL;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* check that the values we'll be setting are not already present */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup("", 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ /* set a per-server value */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* but abort the txn */
+ annotate_state_abort(&astate);
+
+ /* check that the values are still not present */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup("", 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ /* set a per-mailbox value */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* but abort the txn */
+ annotate_state_abort(&astate);
+
+ /* check that the values are still not present */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup("", 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ /* set a per-message value */
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE1);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* but abort the txn */
+ annotate_state_abort(&mailbox->annot_state);
+
+ /* check that the values are still not present */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup("", 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 0, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ buf_free(&val);
+ buf_free(&val2);
+ mailbox_close(&mailbox);
+}
+
+
+static void test_msg_copy(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+ struct mailbox *mailbox1 = NULL;
+ struct mailbox *mailbox2 = NULL;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), -ENOENT);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), -ENOENT);
+
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox1);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ r = mailbox_open_iwl(MBOXNAME2_INT, &mailbox2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ strarray_append(&entries, COMMENT);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* set some values */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox1, 17, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE1);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox1, 42, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ buf_reset(&val);
+ buf_appendcstr(&val, VALUE2);
+ setentryatt(&ealist, COMMENT, VALUE_SHARED, &val);
+ r = mailbox_get_annotate_state(mailbox1, 127, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = mailbox_commit(mailbox1);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox1);
+
+ /* check that we can fetch the values back */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 17, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE1);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE2);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 35, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(val2.s);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), 0);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), -ENOENT);
+
+ /* copy MBOXNAME1,17 -> MBOXNAME2,35 */
+ r = mailbox_open_iwl(MBOXNAME1_INT, &mailbox1);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ /* ensure we have an astate connected to the destination
+ * mailbox, so that the annotation txn will be committed
+ * when we close the mailbox */
+ r = mailbox_get_annotate_state(mailbox2, 35, &astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = annotate_msg_copy(mailbox1, 17, mailbox2, 35, "smurf");
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = mailbox_commit(mailbox2);
+ CU_ASSERT_EQUAL(r, 0);
+ mailbox_close(&mailbox2);
+ mailbox_close(&mailbox1);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), 0);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), 0);
+
+ /* check that the values copied are present for both mailboxes */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 17, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 35, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+
+ /* check that the values not copied are only present in the source
+ * mailbox */
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE1);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME1_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE2);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 42, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL(val2.s);
+
+ buf_free(&val2);
+ r = annotatemore_msg_lookup(MBOXNAME2_INT, 127, COMMENT, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL(val2.s);
+
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurf/cyrus.annotations"), 0);
+ CU_ASSERT_EQUAL(fexists(DBDIR"/data/user/smurfette/cyrus.annotations"), 0);
+
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ buf_free(&val);
+ buf_free(&val2);
+ mailbox_close(&mailbox1);
+ mailbox_close(&mailbox2);
+}
+
+static void test_missing_definitions_file(void)
+{
+ set_annotation_definitions(NULL);
+ CU_SYSLOG_MATCH("annotations\\.def: could not open.*No such file");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_1(void)
+{
+ set_annotation_definitions(
+	EXENTRY",sXerver,string,backend,value.shared,\n");
+ CU_SYSLOG_MATCH("invalid annotation scope.*'sXerver'");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_2(void)
+{
+ set_annotation_definitions(
+	EXENTRY",server,stXring,backend,value.shared,\n");
+ CU_SYSLOG_MATCH("invalid annotation type.*'stXring'");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_3(void)
+{
+ set_annotation_definitions(
+	EXENTRY",server,string,bacXkend,value.shared,\n");
+ CU_SYSLOG_MATCH("invalid annotation proxy type.*'bacXkend'");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_4(void)
+{
+ set_annotation_definitions(
+	EXENTRY",server,string,backend,valuXe.shared,\n");
+ CU_SYSLOG_MATCH("invalid annotation attributes.*'valuXe.shared'");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_5(void)
+{
+ set_annotation_definitions(
+	"/flags/foobar,message,string,backend,value.shared,\n");
+ CU_SYSLOG_MATCH("message entry under /flags/");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_6(void)
+{
+ set_annotation_definitions(
+	"/vendor/cmu/cyrus-imapd/foobar,server,string,backend,value.shared,\n");
+ CU_SYSLOG_MATCH("annotation under /vendor/cmu/cyrus-imapd/");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_7(void)
+{
+ set_annotation_definitions(
+	EXENTRY",server,string,backend,value.shared,,,,\n");
+ CU_SYSLOG_MATCH("junk at end of line");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_8(void)
+{
+ set_annotation_definitions(
+	EXENTRY",server,string,\n");
+ CU_SYSLOG_MATCH("short line");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_9(void)
+{
+ /* test that when parsing a bitfield, only the first
+ * invalid name is reported in the error context */
+ set_annotation_definitions(
+	EXENTRY",server,string,backend,value valXue valYue,\n");
+ CU_SYSLOG_MATCH("invalid annotation attributes.*'valXue'");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_broken_definitions_file_10(void)
+{
+ set_annotation_definitions(
+	EXENTRY",ser@ver,string,backend,value.shared,\n");
+ CU_SYSLOG_MATCH("invalid character.*'@");
+
+ annotate_init(NULL, NULL);
+ /* if we got here, we didn't fatal() */
+
+ /* but we did complain to syslog */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);
+}
+
+static void test_getset_server_undefined(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ strarray_t results = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ strarray_append(&entries, EXENTRY);
+ strarray_append(&attribs, VALUE_SHARED);
+
+ /* check that there is no value initially */
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ /* setting a value should fail */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, EXENTRY, VALUE_SHARED, &val);
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ CU_ASSERT_EQUAL(r, IMAP_PERMISSION_DENIED);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that there is no value */
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=NIL"
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ buf_free(&val);
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ strarray_fini(&results);
+ buf_free(&val);
+ buf_free(&val2);
+}
+
+
+static void test_getset_server_defined(void)
+{
+ int r;
+ annotate_state_t *astate = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ strarray_t results = STRARRAY_INITIALIZER;
+ struct entryattlist *ealist = NULL;
+ struct buf val = BUF_INITIALIZER;
+ struct buf val2 = BUF_INITIALIZER;
+
+ set_annotation_definitions(
+	EXENTRY",server,string,backend,value.shared,\n");
+ annotate_init(NULL, NULL);
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ strarray_append(&entries, EXENTRY);
+ strarray_append(&attribs, VALUE_SHARED);
+ strarray_append(&attribs, SIZE_SHARED);
+
+ /* check that there is no value initially */
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=NIL " \
+	 SIZE_SHARED "=\"0\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+ /* set a value */
+
+ buf_appendcstr(&val, VALUE0);
+ setentryatt(&ealist, EXENTRY, VALUE_SHARED, &val);
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ /* check that we can fetch the value back in the same txn */
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\" " \
+	 SIZE_SHARED "=\"" LENGTH0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that we can fetch the value back in a new txn */
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\" " \
+	 SIZE_SHARED "=\"" LENGTH0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ /* check that we can fetch the value back after close and re-open */
+
+ annotatemore_open();
+
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=\"" VALUE0 "\" " \
+	 SIZE_SHARED "=\"" LENGTH0 "\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val2);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(val2.s);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&val2), VALUE0);
+ buf_free(&val2);
+
+ buf_free(&val);
+ setentryatt(&ealist, EXENTRY, VALUE_SHARED, &val);
+ annotate_state_set_auth(astate, /*isadmin*/1, userid, auth_state);
+ r = annotate_state_store(astate, ealist);
+ annotate_state_set_auth(astate, /*isadmin*/0, userid, auth_state);
+ CU_ASSERT_EQUAL(r, 0);
+ freeentryatts(ealist);
+ ealist = NULL;
+
+ r = annotate_state_commit(&astate);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check that there is no value any more */
+ astate = annotate_state_new();
+ r = annotate_state_set_server(astate);
+ CU_ASSERT_EQUAL(r, 0);
+ annotate_state_set_auth(astate, isadmin, userid, auth_state);
+
+ r = annotate_state_fetch(astate,
+		 &entries, &attribs,
+		 fetch_cb, &results,
+		 NULL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL_FATAL(results.count, 1);
+#define EXPECTED \
+	 "mboxname=\"\" " \
+	 "uid=0 " \
+	 "entry=\"" EXENTRY "\" " \
+	 VALUE_SHARED "=NIL " \
+	 SIZE_SHARED "=\"0\""
+ CU_ASSERT_STRING_EQUAL(results.data0, EXPECTED);
+#undef EXPECTED
+ strarray_truncate(&results, 0);
+
+ r = annotatemore_lookup(/*mboxname*/"", EXENTRY, /*userid*/"", &val);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(val.s);
+
+
+ annotate_state_abort(&astate);
+ annotatemore_close();
+
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ strarray_fini(&results);
+ buf_free(&val);
+}
+
+static const char *stringifyea(const struct entryattlist *ea)
+{
+ const struct attvaluelist *av;
+ static struct buf buf;
+ buf_reset(&buf);
+
+ for ( ; ea ; ea = ea->next) {
+	buf_printf(&buf, "(%s", ea->entry);
+	for (av = ea->attvalues ; av ; av = av->next) {
+	 buf_printf(&buf, "(%s\"", av->attrib);
+	 buf_appendmap(&buf, av->value.s, av->value.len);
+	 buf_appendcstr(&buf, "\")");
+	}
+	buf_putc(&buf, ')');
+ }
+
+ return buf_cstring(&buf);
+}
+
+static void test_setentryatt(void)
+{
+ struct entryattlist *eal = NULL;
+ struct buf val = BUF_INITIALIZER;
+
+ CU_ASSERT_PTR_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal), "");
+
+ /* Test data courtesy http://hipsteripsum.me */
+
+ /* append an ea and av */
+ buf_init_ro(&val, "coffee", 6);
+ setentryatt(&eal, "letterpress", "single-origin", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\"))");
+
+ /* append another ea and av */
+ buf_init_ro(&val, "mustache", 8);
+ setentryatt(&eal, "cosby", "sweater", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\"))"
+			 "(cosby(sweater\"mustache\"))");
+
+ /* append a third ea and av */
+ buf_init_ro(&val, "portland", 8);
+ setentryatt(&eal, "cred", "artisan", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\"))"
+			 "(cosby(sweater\"mustache\"))"
+			 "(cred(artisan\"portland\"))");
+
+ /* replace the value in an av */
+ buf_init_ro(&val, "shoreditch", 10);
+ setentryatt(&eal, "cosby", "sweater", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\"))"
+			 "(cosby(sweater\"shoreditch\"))"
+			 "(cred(artisan\"portland\"))");
+
+ /* add an av to an existing ea */
+ buf_init_ro(&val, "gluten-free", 11);
+ setentryatt(&eal, "letterpress", "biodiesel", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\")"
+			 "(biodiesel\"gluten-free\"))"
+			 "(cosby(sweater\"shoreditch\"))"
+			 "(cred(artisan\"portland\"))");
+
+ freeentryatts(eal);
+ buf_free(&val);
+}
+
+static void test_clearentryatt(void)
+{
+ struct entryattlist *eal = NULL;
+ struct buf val = BUF_INITIALIZER;
+
+ /* Test data courtesy http://hipsteripsum.me */
+
+ /* append an ea and av */
+ buf_init_ro(&val, "coffee", 6);
+ setentryatt(&eal, "letterpress", "single-origin", &val);
+ /* add an av to an existing ea */
+ buf_init_ro(&val, "gluten-free", 11);
+ setentryatt(&eal, "letterpress", "biodiesel", &val);
+ /* add another av to an existing ea */
+ buf_init_ro(&val, "organic", 7);
+ setentryatt(&eal, "letterpress", "keffiyeh", &val);
+ /* append another ea and av */
+ buf_init_ro(&val, "shoreditch", 10);
+ setentryatt(&eal, "cosby", "sweater", &val);
+ /* append a third ea and av */
+ buf_init_ro(&val, "portland", 8);
+ setentryatt(&eal, "cred", "artisan", &val);
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\")"
+			 "(biodiesel\"gluten-free\")"
+			 "(keffiyeh\"organic\"))"
+			 "(cosby(sweater\"shoreditch\"))"
+			 "(cred(artisan\"portland\"))");
+
+ clearentryatt(&eal, "cosby", "sweater");
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\")"
+			 "(biodiesel\"gluten-free\")"
+			 "(keffiyeh\"organic\"))"
+			 "(cred(artisan\"portland\"))");
+
+ clearentryatt(&eal, "letterpress", "biodiesel");
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress(single-origin\"coffee\")"
+			 "(keffiyeh\"organic\"))"
+			 "(cred(artisan\"portland\"))");
+
+ clearentryatt(&eal, "letterpress", "single-origin");
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(letterpress"
+			 "(keffiyeh\"organic\"))"
+			 "(cred(artisan\"portland\"))");
+
+ clearentryatt(&eal, "letterpress", "keffiyeh");
+ CU_ASSERT_PTR_NOT_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal),
+			 "(cred(artisan\"portland\"))");
+
+ clearentryatt(&eal, "cred", "artisan");
+ CU_ASSERT_PTR_NULL(eal);
+ CU_ASSERT_STRING_EQUAL(stringifyea(eal), "");
+
+ freeentryatts(eal);
+ buf_free(&val);
+}
+
+
+static int set_up(void)
+{
+ int r;
+ struct mboxlist_entry mbentry;
+ struct mailbox *mailbox;
+ const char * const *d;
+ static const char * const dirs = {
+	DBDIR,
+	DBDIR"/db",
+	DBDIR"/conf",
+	DBDIR"/data",
+	DBDIR"/data/user",
+	DBDIR"/data/user/smurf",
+	DBDIR"/data/user/smurfette",
+	NULL
+ };
+
+ r = system("rm -rf " DBDIR);
+ if (r)
+	return r;
+ r = fexists(DBDIR);
+ if (r != -ENOENT)
+	return ENOTDIR;
+
+ for (d = dirs ; *d ; d++) {
+	r = mkdir(*d, 0777);
+	if (r < 0) {
+	 int e = errno;
+	 perror(*d);
+	 return e;
+	}
+ }
+
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, DBDIR);
+ config_read_string(
+	"configdirectory: "DBDIR"/conf\n"
+	"defaultpartition: "PARTITION"\n"
+	"partition-"PARTITION": "DBDIR"/data\n"
+ );
+
+ cyrusdb_init();
+ config_mboxlist_db = "skiplist";
+ config_annotation_db = "skiplist";
+ config_quota_db = "skiplist";
+
+ userid = "smurf";
+ isadmin = 0;
+ auth_state = auth_newstate(userid);
+
+ quotadb_init(0);
+ quotadb_open(NULL);
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ memset(&mbentry, 0, sizeof(mbentry));
+ mbentry.name = MBOXNAME1_INT;
+ mbentry.mbtype = 0;
+ mbentry.partition = PARTITION;
+ mbentry.acl = ACL;
+ r = mboxlist_update(&mbentry, /*localonly*/1);
+ if (r)
+	return r;
+
+ r = mailbox_create(MBOXNAME1_INT, /*mbtype*/0, PARTITION, ACL,
+		 /*uniqueid*/NULL,
+		 /*options*/0, /*uidvalidity*/0,
+		 /*highestmodseq*/0, &mailbox);
+ if (r)
+	return r;
+ mailbox_close(&mailbox);
+
+ memset(&mbentry, 0, sizeof(mbentry));
+ mbentry.name = MBOXNAME2_INT;
+ mbentry.mbtype = 0;
+ mbentry.partition = PARTITION;
+ mbentry.acl = ACL;
+ r = mboxlist_update(&mbentry, /*localonly*/1);
+ if (r)
+	return r;
+
+ r = mailbox_create(MBOXNAME2_INT, /*mbtype*/0, PARTITION, ACL,
+		 /*uniqueid*/NULL,
+		 /*options*/0, /*uidvalidity*/0,
+		 /*highestmodseq*/0, &mailbox);
+ if (r)
+	return r;
+ mailbox_close(&mailbox);
+
+ old_annotation_definitions =
+	imapoptsIMAPOPT_ANNOTATION_DEFINITIONS.val.s;
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ int r;
+
+ mboxlist_close();
+ mboxlist_done();
+
+ quotadb_close();
+ quotadb_done();
+
+ annotate_done();
+
+ imapoptsIMAPOPT_ANNOTATION_DEFINITIONS.val.s =
+	old_annotation_definitions;
+
+ auth_freestate(auth_state);
+
+ cyrusdb_done();
+ config_mboxlist_db = NULL;
+ config_annotation_db = NULL;
+
+ r = system("rm -rf " DBDIR);
+ if (r) r = -1;
+
+ return r;
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/backend.testc Added

@@ -0,0 +1,1338 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+#include <assert.h>
+#include "cunit/cunit.h"
+#include "imap/saslclient.h"
+#include <sasl/saslutil.h>
+#include <sasl/saslplug.h>
+#include "xmalloc.h"
+#include "imap/mutex.h"
+#include "prot.h"
+#include "imap/backend.h"
+
+struct server_config {
+ int sasl_plain;
+ int sasl_login;
+ int sasl_digestmd5;
+ int starttls;
+ int deflate;
+ int caps_one_per_line;
+};
+
+/*
+ * This is a useful hack. All the test server's state is
+ * stored using this structure in an anonymous page which
+ * is shared between the client and server. This lets the
+ * test code in the client reach into the server state and
+ * either tweak the behaviour via the config or do asserts
+ * on the per-connection state (which makes integrating
+ * with CUnit a whole lot easier, as CU asserts in a child
+ * process are really not helpful).
+ */
+struct server_state {
+ /* dynamic configuration */
+ struct server_config config;
+
+ /* global state */
+ int rend_sock;
+
+ /* per-connection state */
+ int is_connected;
+ int is_authenticated;
+ int is_tls;
+ sasl_conn_t *saslconn;	 /* the sasl connection context */
+#ifdef HAVE_SSL
+ SSL *tls_conn;
+#endif
+ struct protstream *in;
+ struct protstream *out;
+};
+
+
+#define HOST		"localhost"
+#define SASLSERVICE	"vorpal"
+#define USERID		"fbloggs"
+#define PASSWORD	"shibboleth"
+extern int verbose;
+
+static sasl_callback_t *callbacks;
+static struct server_state *server_state;
+static const struct server_config default_server_config = {
+ .sasl_plain = 1,
+ .sasl_login = 0,
+ .sasl_digestmd5 = 0,
+ .starttls = 0,
+ .deflate = 0,
+ .caps_one_per_line = 1
+};
+static const struct capa_t default_capa = {
+ { "CCSASL", CAPA_AUTH },
+ { "CCSTARTTLS", CAPA_STARTTLS },
+ { "CCCOMPRESS=DEFLATE", CAPA_COMPRESS },
+ { NULL, 0 }
+};
+static char default_service32;
+
+static int init_sasl(int isclient);
+
+static struct protocol_t test_prot =
+{
+ /* .service is setup in default_conditions() */
+ .sasl_service = SASLSERVICE,
+ .type = TYPE_STD,
+ .u.std = {
+	.banner = {
+	 .auto_capa = 1,
+	 .resp = "OK"
+	},
+	.capa_cmd = {
+	 .cmd = "XXCAPABILITY",
+	 .arg = NULL,
+	 .resp = "OK",
+	 .postcapability = NULL,
+	 .formatflags = CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD,
+	 /* .capa is setup in default_conditions() */
+	},
+	.tls_cmd = {
+	 .cmd = "XXSTARTTLS",
+	 .ok = "OK",
+	 .fail = "NO",
+	 .auto_capa = 0
+	},
+	.sasl_cmd = {
+	 .cmd = "XXAUTHENTICATE",
+	 .maxlen = USHRT_MAX,
+	 .quote = 0,
+	 .ok = "OK",
+	 .fail = "NO",
+	 .cont = "+ ",
+	 .cancel = "*",
+	 .parse_success = NULL,
+	 .auto_capa = 0
+	},
+	.compress_cmd = {
+	 .cmd = NULL,
+	 .unsol = NULL,
+	 .ok = NULL
+	},
+	.ping_cmd = {
+	 .cmd = "XXNOOP",
+	 .unsol = NULL,
+	 .ok = "OK"
+	},
+	.logout_cmd = {
+	 .cmd = "XXLOGOUT",
+	 .unsol = NULL,
+	 .ok = "OK"
+	}
+ }
+};
+
+
+/*
+ * Setup default test conditions, on both the client and server.
+ */
+static void default_conditions(void)
+{
+ server_state->config = default_server_config;
+
+ test_prot.service = default_service;
+ memcpy(&test_prot.u.std.capa_cmd.capa, default_capa, sizeof(default_capa));
+ test_prot.u.std.capa_cmd.formatflags = CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD;
+}
+
+/* ====================================================================== */
+
+/*
+ * Test connecting to a host which doesn't exist.
+ */
+static void test_badhost(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+
+ default_conditions();
+
+ be = backend_connect(NULL, "nonexistanthost", &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NULL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 0);
+}
+
+/*
+ * Test connecting to the wrong port on the right host.
+ */
+static void test_badservice(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+
+ default_conditions();
+ test_prot.service = "nonexistantservice";
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NULL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 0);
+}
+
+/*
+ * Test authenticating with the PLAIN mechanism.
+ */
+static void test_sasl_plain(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+ char *mechs;
+ int r;
+
+ default_conditions();
+ server_state->config.sasl_plain = 1;
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 1);
+ CU_ASSERT_EQUAL(server_state->is_authenticated, 1);
+ CU_ASSERT_EQUAL(server_state->is_tls, 0);
+
+ mechs = backend_get_cap_params(be, CAPA_AUTH);
+ CU_ASSERT_STRING_EQUAL(mechs, "PLAIN");
+ free(mechs);
+
+ r = backend_ping(be, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ backend_disconnect(be);
+ free(be);
+}
+
+#if 0
+/*
+ * Test authenticating with the LOGIN mechanism.
+ * This test doesn't work for me. I have NFI why - gnb.
+ */
+static void not_test_sasl_login(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+ char *mechs;
+ int r;
+
+ default_conditions();
+ server_state->config.sasl_plain = 0;
+ server_state->config.sasl_login = 1;
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 1);
+ CU_ASSERT_EQUAL(server_state->is_authenticated, 1);
+ CU_ASSERT_EQUAL(server_state->is_tls, 0);
+
+ mechs = backend_get_cap_params(be, CAPA_AUTH);
+ CU_ASSERT_STRING_EQUAL(mechs, "LOGIN");
+ free(mechs);
+
+ r = backend_ping(be);
+ CU_ASSERT_EQUAL(r, 0);
+
+ backend_disconnect(be);
+ free(be);
+}
+#endif
+
+/*
+ * Test authenticating with the DIGEST-MD5 mechanism.
+ */
+static void test_sasl_digestmd5(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+ char *mechs;
+ int r;
+
+ default_conditions();
+ server_state->config.sasl_plain = 0;
+ server_state->config.sasl_digestmd5 = 1;
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 1);
+ CU_ASSERT_EQUAL(server_state->is_authenticated, 1);
+ CU_ASSERT_EQUAL(server_state->is_tls, 0);
+
+ mechs = backend_get_cap_params(be, CAPA_AUTH);
+ CU_ASSERT_STRING_EQUAL(mechs, "DIGEST-MD5");
+ free(mechs);
+
+ r = backend_ping(be, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ backend_disconnect(be);
+ free(be);
+}
+
+/* Common routine to test the semantics of capabilities */
+static void caps_common(void)
+{
+#define CAPA_FOO	(1<<(CAPA_COMPRESS+1))
+#define CAPA_BAZ	(1<<(CAPA_COMPRESS+2))
+#define CAPA_QUUX	(1<<(CAPA_COMPRESS+3))
+#define CAPA_FNORD	(1<<(CAPA_COMPRESS+4))
+#define CAPA_CAPITALS	(1<<(CAPA_COMPRESS+5))
+#define CAPA_MIA	(1<<(CAPA_COMPRESS+6))
+ struct backend *be;
+ const char *auth_status = NULL;
+ char *params;
+ int r;
+ int n;
+ static const struct capa_t extra_capa = {
+	{ "FOO", CAPA_FOO },
+	{ "BAZ", CAPA_BAZ },
+	{ "QUUX", CAPA_QUUX },
+	{ "FNORD=BOO", CAPA_FNORD },
+	{ "CAPITALS", CAPA_CAPITALS },
+	{ "MIA", CAPA_MIA },
+	{ NULL, 0 }
+	/* No more room in the fixed size array, dammit */
+ };
+
+ /* append some extra capabilities */
+ n = sizeof(default_capa)/sizeof(default_capa0) - 1;
+ CU_ASSERT_FATAL(n * sizeof(struct capa_t) +
+		 sizeof(extra_capa) <= sizeof(test_prot.u.std.capa_cmd.capa));
+ memcpy(&test_prot.u.std.capa_cmd.capan, extra_capa, sizeof(extra_capa));
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 1);
+ CU_ASSERT_EQUAL(server_state->is_authenticated, 1);
+ CU_ASSERT_EQUAL(server_state->is_tls, 0);
+
+ /* FOO is present, its parameter is BAR */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_FOO), 1);
+ params = backend_get_cap_params(be, CAPA_FOO);
+ CU_ASSERT_STRING_EQUAL(params, "BAR");
+ free(params);
+
+ /* BAZ is present, it has no parameters */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_BAZ), 1);
+ params = backend_get_cap_params(be, CAPA_BAZ);
+ CU_ASSERT_PTR_NULL(params);
+
+ /* QUUX is present, its parameters are FOONLY and FMEH */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_QUUX), 1);
+ params = backend_get_cap_params(be, CAPA_QUUX);
+ CU_ASSERT_STRING_EQUAL(params, "FOONLY FMEH");
+ free(params);
+
+ /* FNORD is present, its parameters are BOO and GNERGH,
+ * but we asked specifically for FNORD=BOO so CAPA()
+ * should succeed but we should see no params. */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_FNORD), 1);
+ params = backend_get_cap_params(be, CAPA_FNORD);
+ CU_ASSERT_PTR_NULL(params);
+
+ /* CAPITALS is present, its parameter is Oslo. Note the
+ * name is matched case-insensitive but the parameters
+ * are returned as seen on the wire. */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_CAPITALS), 1);
+ params = backend_get_cap_params(be, CAPA_CAPITALS);
+ CU_ASSERT_STRING_EQUAL(params, "Oslo");
+ free(params);
+
+ /* MIA is missing in action */
+ CU_ASSERT_EQUAL(!!CAPA(be, CAPA_MIA), 0);
+ params = backend_get_cap_params(be, CAPA_MIA);
+ CU_ASSERT_PTR_NULL(params);
+
+ r = backend_ping(be, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ backend_disconnect(be);
+ free(be);
+#undef CAPA_FOO
+#undef CAPA_BAZ
+#undef CAPA_QUUX
+#undef CAPA_FNORD
+#undef CAPA_CAPITALS
+#undef CAPA_MIA
+}
+
+/*
+ * Test parsing capabilities in multi-line format
+ */
+static void test_multiline_caps(void)
+{
+ default_conditions();
+ server_state->config.caps_one_per_line = 1;
+ test_prot.u.std.capa_cmd.formatflags = CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD;
+ caps_common();
+}
+
+/*
+ * Test parsing capabilities in one-line format
+ */
+static void test_oneline_caps(void)
+{
+ default_conditions();
+ server_state->config.caps_one_per_line = 0;
+ test_prot.u.std.capa_cmd.formatflags = CAPAF_MANY_PER_LINE;
+ caps_common();
+}
+
+#ifdef HAVE_SSL
+/*
+ * Test STARTTLS
+ */
+static void test_starttls(void)
+{
+ struct backend *be;
+ const char *auth_status = NULL;
+ char *mechs;
+ int r;
+
+ default_conditions();
+ server_state->config.sasl_plain = 1;
+ server_state->config.starttls = 1;
+
+ be = backend_connect(NULL, HOST, &test_prot,
+			 USERID, callbacks, &auth_status, /*fd*/-1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(be);
+ CU_ASSERT_EQUAL(server_state->is_connected, 1);
+ CU_ASSERT_EQUAL(server_state->is_authenticated, 1);
+ CU_ASSERT_EQUAL(server_state->is_tls, 1);
+
+ mechs = backend_get_cap_params(be, CAPA_AUTH);
+ CU_ASSERT_STRING_EQUAL(mechs, "PLAIN");
+ free(mechs);
+
+ CU_ASSERT(CAPA(be, CAPA_STARTTLS))
+
+ r = backend_ping(be, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ backend_disconnect(be);
+ free(be);
+}
+#endif
+
+/* TODO: test UNIX socket comms too */
+/* TODO: test IPv6 socket comms too */
+/* TODO: test connect() timeout */
+
+/* ====================================================================== */
+
+/*
+ * Allocate, and return a mapped pointer to, an anonymous page in
+ * memory (a non-heap non-text page with no backing file) which will be
+ * shared across fork(). The page is assumed to be zeroed.
+ */
+static void *get_anonymous_page(void)
+{
+ void *page;
+ size_t pagesize = getpagesize();
+
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+ /* FreeBSD */
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+#ifdef MAP_ANONYMOUS
+ /* Linux and Solaris */
+ page = mmap(NULL, pagesize, PROT_READ|PROT_WRITE,
+	 MAP_ANONYMOUS|MAP_SHARED, -1, 0);
+ if (page == MAP_FAILED) {
+	perror("mmap");
+	return NULL;
+ }
+#else
+ int fd;
+
+ fd = open("/dev/zero", O_RDWR);
+ if (fd < 0) {
+	perror("/dev/zero");
+	return NULL;
+ }
+ page = mmap(NULL, pagesize, PROT_READ|PROT_WRITE,
+	 MAP_SHARED, fd, 0);
+ if (page == MAP_FAILED) {
+	perror("mmap");
+	page = NULL;
+ }
+ close(fd);
+#endif
+
+ return page;
+}
+
+/*
+ * Free an anonymous page returned from get_anonymous_page()
+ */
+static void free_anonymous_page(void *page)
+{
+ munmap(page, getpagesize());
+}
+
+/*
+ * Create a bound and listening TCP4 server socket, bound to the IPv4
+ * loopback address and a port chosen by the kernel.
+ *
+ * Returns: socket, or -1 on error. *@portp is filled with the port
+ * number.
+ */
+static int create_server_socket(int *portp)
+{
+ int sock;
+ struct sockaddr_in sin;
+ int r;
+
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
+	perror("socket(TCP)");
+	return -1;
+ }
+
+ memset(&sin, 0, sizeof(sin));
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ if (*portp)
+	sin.sin_port = htons(*portp);
+
+ r = bind(sock, (struct sockaddr *)&sin, sizeof(sin));
+ if (r < 0) {
+	perror("bind");
+	goto error;
+ }
+
+ r = listen(sock, 5);
+ if (r < 0) {
+	perror("listen");
+	goto error;
+ }
+
+ if (!*portp) {
+	socklen_t len = sizeof(sin);
+	r = getsockname(sock, (struct sockaddr *)&sin, &len);
+	if (r < 0) {
+	 perror("getsockname");
+	 goto error;
+	}
+	if (len != sizeof(sin) || sin.sin_family != AF_INET) {
+	 fprintf(stderr, "Bad address from getsockname()\n");
+	 goto error;
+	}
+	*portp = ntohs(sin.sin_port);
+ }
+
+ return sock;
+
+error:
+ close(sock);
+ return -1;
+}
+
+/*
+ * Block until an incoming connection is received, then establish the
+ * connection and initialise per-connection state. On success, set
+ * @state->is_connected.
+ *
+ * Returns 0 on success, -1 on failure (errors indicate some resource
+ * limitation in the server, not any behaviour of the client, and
+ * should be fatal).
+ */
+static int server_accept(struct server_state *state)
+{
+ int conn_sock;
+ int r;
+
+ if (verbose > 1)
+	fprintf(stderr, "Server waiting for connection\n");
+
+ conn_sock = accept(state->rend_sock, NULL, NULL);
+ if (conn_sock < 0) {
+	perror("accept");
+	return -1;
+ }
+ if (verbose > 1)
+	fprintf(stderr, "Server accepted connection\n");
+
+ state->in = prot_new(conn_sock, /*read*/0);
+ state->out = prot_new(dup(conn_sock), /*write*/1);
+ if (!state->in || !state->out) {
+	perror("prot_new");
+	return -1;
+ }
+
+ r = sasl_server_new(SASLSERVICE, HOST,
+			/*user_realm*/NULL, /*iplocalport*/NULL,
+			/*ipremoteport*/NULL, /*callbacks*/NULL,
+			/*flags*/0, &state->saslconn);
+ if (r != SASL_OK) {
+	fprintf(stderr, "sasl_server_new() failed with error %d\n", r);
+	return -1;
+ }
+
+ state->is_authenticated = 0;
+ state->is_connected = 1;
+ state->is_tls = 0;
+ state->tls_conn = NULL;
+
+ return 0;
+}
+
+/*
+ * Handle the end of a connection, by cleaning up all the per-connection
+ * state. In particular, clears @state->is_connected.
+ */
+static void server_unaccept(struct server_state *state)
+{
+ prot_free(state->in);
+ state->in = NULL;
+ prot_free(state->out);
+ state->out = NULL;
+ sasl_dispose(&state->saslconn);
+ state->is_connected = 0;
+ state->is_tls = 0;
+ if (state->tls_conn) {
+	tls_reset_servertls(&state->tls_conn);
+	state->tls_conn = NULL;
+ }
+}
+
+/*
+ * Main routine for pushing text back to the client.
+ */
+static void server_printf(struct server_state *, const char *fmt, ...)
+ __attribute__((format(printf,2,3)));
+
+static void server_printf(struct server_state *state, const char *fmt, ...)
+{
+ va_list args;
+ int r;
+ char buf2048;
+
+ if (verbose > 1) {
+	va_start(args, fmt);
+	fprintf(stderr, "S: ");
+	vfprintf(stderr, fmt, args);
+	va_end(args);
+ }
+
+ va_start(args, fmt);
+ r = vsnprintf(buf, sizeof(buf), fmt, args);
+ assert(r < (int)sizeof(buf));
+ va_end(args);
+
+ r = prot_write(state->out, buf, strlen(buf));
+ assert(r >= 0);
+}
+
+/*
+ * Flush any pending output back to the client.
+ */
+static void server_flush(struct server_state *state)
+{
+ prot_flush(state->out);
+}
+
+/*
+ * Get a line of text from the client. Blocks until
+ * a while line is available.
+ *
+ * Returns: 0 on success, -1 on error or end of file.
+ */
+static int server_getline(struct server_state *state,
+			 char *buf, int maxlen)
+{
+ if (!prot_fgets(buf, maxlen, state->in))
+	return -1;
+ if (verbose > 1)
+	fprintf(stderr, "C: %s\n", buf);
+ return 0;
+}
+
+/*
+ * Emit to the client a banner including the server's capability
+ * strings. This might be in response to the client connecting, or to
+ * the client issuing the XXCAPABILITY command. Various flags in
+ * @state->config control which of the magical caps known by the
+ * backend.c client code are reported. Some other test capabilities are
+ * always reported. Depending on @state->config.caps_one_per_line, the
+ * caps are listed in a multi-line format, one cap per line (LMTP, POP3,
+ * ManageSieve, and sync style) or a single-line, many caps per line
+ * format (IMAP style).
+ */
+static void server_emit_caps(struct server_state *state)
+{
+ const char *saslmechs = NULL;
+ char *p;
+ char *b;
+ int n = 0;
+ const char *name;
+ const char *words256;	/* array of:
+				 * NAME, VALUE, VALUE, NULL,
+				 * NAME, VALUE, NULL,
+				 * NULL */
+ char line1024;
+ static const char banner = "Toy Test server v0.0.1";
+
+ /*
+ * The ccSASL cap reports a list of SASL mechanism names.
+ * Note that we suppress them all if STARTTLS is enabled.
+ */
+ if (!state->config.starttls || state->is_tls) {
+	int got_login = 0;
+	int got_plain = 0;
+	int got_digestmd5 = 0;
+
+	/* First see what mechanisms SASL has; no point reporting
+	 * mechanisms which aren't actually available. */
+	sasl_listmech(state->saslconn, /*user*/NULL, /*prefix*/"",
+		 /*sep*/" ", /*suffix*/"", &saslmechs, /*plen*/NULL,
+		 /*pcount*/NULL);
+	b = xstrdup(saslmechs);
+	/* Build our own list of mechanisms, which is the intersection
+	 * of the ones configured in SASL and the ones our server config
+	 * allows us. */
+	wordsn++ = "ccSASL";
+	for (p = strtok(b, " ") ; p ; p = strtok(NULL, " ")) {
+	 if (!strcasecmp(p, "LOGIN") && state->config.sasl_login) {
+		wordsn++ = "LOGIN";
+		got_login = 1;
+	 }
+	 if (!strcasecmp(p, "LOGIN") && state->config.sasl_plain) {
+		wordsn++ = "PLAIN";
+		got_plain = 1;
+	 }
+	 if (!strcasecmp(p, "DIGEST-MD5") && state->config.sasl_digestmd5) {
+		wordsn++ = "DIGEST-MD5";
+		got_digestmd5 = 1;
+	 }
+	}
+	wordsn++ = NULL;
+	free(b);
+
+	if (state->config.sasl_login && !got_login)
+	 fprintf(stderr, "Server failed to find requested "
+			 "SASL mechanism \"LOGIN\"\n");
+	if (state->config.sasl_plain && !got_plain)
+	 fprintf(stderr, "Server failed to find requested "
+			 "SASL mechanism \"PLAIN\"\n");
+	if (state->config.sasl_digestmd5 && !got_digestmd5)
+	 fprintf(stderr, "Server failed to find requested "
+			 "SASL mechanism \"DIGEST-MD5\"\n");
+ }
+
+ /*
+ * The ccSTARTTLS cap reports the ability to do STARTTLS
+ */
+ if (state->config.starttls) {
+	wordsn++ = "ccSTARTTLS";
+	wordsn++ = NULL;
+ }
+
+ /*
+ * The ccCOMPRESS=DEFLATE cap reports the ability to do Deflate
+ * compression.
+ */
+ if (state->config.deflate) {
+	wordsn++ = "ccCOMPRESS";
+	wordsn++ = "DEFLATE";
+	wordsn++ = NULL;
+ }
+
+ /*
+ * Various test capabilities; the test code in the client knows what
+ * to expect for these.
+ */
+ wordsn++ = "FOO";
+ wordsn++ = "BAR";
+ wordsn++ = NULL;
+
+ wordsn++ = "BAZ";
+ wordsn++ = NULL;
+
+ wordsn++ = "QUUX";
+ wordsn++ = "FOONLY";
+ wordsn++ = "FMEH";
+ wordsn++ = NULL;
+
+ wordsn++ = "FNORD";
+ wordsn++ = "BOO";
+ wordsn++ = "GNERGH";
+ wordsn++ = NULL;
+
+ wordsn++ = "cApItAls";
+ wordsn++ = "Oslo";
+ wordsn++ = NULL;
+
+ wordsn++ = NULL;
+
+ /*
+ * Finally we have all the capability names and values, now
+ * pull them out of words and emit lines to the client.
+ */
+ n = 0;
+ if (state->config.caps_one_per_line) {
+	/* Multi-line, one cap and all its values on each line (LMTP,
+	 * ManageSieve, POP3 and sync style) */
+	while ((name = wordsn++)) {
+	 line0 = '\0';
+	 for ( ; wordsn ; n++) {
+		strcat(line, " ");
+		strcat(line, wordsn);
+	 }
+	 n++;
+	 server_printf(state, "* %s%s\r\n", name, line);
+	}
+	server_printf(state, "OK %s\r\n", banner);
+ } else {
+	/* One-line, NAME=VALUE pairs inside IMAP-style response code */
+	line0 = '\0';
+	while ((name = wordsn++)) {
+	 if (wordsn) {
+		for ( ; wordsn ; n++) {
+		 strcat(line, " ");
+		 strcat(line, name);
+		 strcat(line, "=");
+		 strcat(line, wordsn);
+		}
+	 } else {
+		strcat(line, " ");
+		strcat(line, name);
+	 }
+	 n++;
+	}
+	server_printf(state, "OK CAPABILITY%s %s\r\n", line, banner);
+ }
+ server_flush(state);
+}
+
+/*
+ * Handle the XXAUTHENTICATE command from the client. The 1st and 2nd
+ * arguments to the command on wire are passed as @mech and
+ * @initial_in_b64. Handles any SASL conversation with the client (e.g.
+ * server challenges and client responses), and telling the client the
+ * final status. If successful, sets @state->is_authenticated.
+ */
+static void cmd_authenticate(struct server_state *state,
+			 const char *mech, const char *initial_in_b64)
+{
+ char *word;
+ const char *server_out;
+ unsigned int server_out_len;
+ int r;
+ unsigned int buflen = 0;
+ char buf21848;
+ static const char sep = " \t\r\n";
+
+ if (!mech)
+	goto badsyntax;
+
+ if (initial_in_b64) {
+	r = sasl_decode64(initial_in_b64, strlen(initial_in_b64),
+			 buf, sizeof(buf), &buflen);
+	if (r != SASL_OK)
+	 goto badsyntax;
+ } else {
+	buflen = 0;
+ }
+
+ server_out = NULL;
+ server_out_len = 0;
+ r = sasl_server_start(state->saslconn, mech,
+			 buf, buflen,
+			 &server_out, &server_out_len);
+
+ while (r == SASL_CONTINUE) {
+	if (server_out_len)
+	 sasl_encode64(server_out, server_out_len, buf, sizeof(buf), NULL);
+	else
+	 strcpy(buf, "=");
+	server_printf(state, "+ %s\n", buf);
+	server_flush(state);
+
+	if (server_getline(state, buf, sizeof(buf)) < 0) {
+	 fprintf(stderr, "No response to AUTH challenge\n");
+	 return;
+	}
+	word = strtok(buf, sep);
+	if (word) {
+	 r = sasl_decode64(word, strlen(word), buf, sizeof(buf), &buflen);
+	 if (r != SASL_OK)
+		goto badsyntax;
+	} else {
+	 buflen = 0;
+	}
+
+	server_out = NULL;
+	server_out_len = 0;
+	r = sasl_server_step(state->saslconn, buf, buflen,
+			 &server_out, &server_out_len);
+ }
+
+ if (r != SASL_OK) {
+	server_printf(state, "BAD sasl error code %d\r\n", r);
+	server_flush(state);
+	return;
+ }
+
+ state->is_authenticated = 1;
+ server_printf(state, "OK\r\n");
+ server_flush(state);
+ return;
+
+badsyntax:
+ server_printf(state, "BAD syntax\r\n");
+ server_flush(state);
+}
+
+/*
+ * Handle the XXSTARTTLS command from the client.
+ * If successful, sets @state->is_tls.
+ */
+static void cmd_starttls(struct server_state *state)
+{
+#ifdef HAVE_SSL
+ int r;
+ char *auth_id = NULL;
+ SSL *tls_conn = NULL;
+ sasl_ssf_t ssf;
+
+ r = tls_init_serverengine("backend_test", /*verifydepth*/5,
+			 /*askcert*/1, /*tlsonly*/1);
+ if (r < 0) {
+	server_printf(state, "BAD error initializing TLS\r\n");
+	server_flush(state);
+	return;
+ }
+
+ server_printf(state, "OK Begin TLS negotiation now\r\n");
+ /* must flush our buffers before starting tls */
+ server_flush(state);
+
+ r = tls_start_servertls(/*readfd*/state->in->fd,
+			 /*writefd*/state->out->fd,
+			 /*timeout_sec*/3000,
+			 (int *)&ssf, &auth_id, &tls_conn);
+ if (r < 0) {
+	server_printf(state, "BAD STARTTLS negotiation failed\r\n");
+	server_flush(state);
+	return;
+ }
+
+ /* tell SASL about the negotiated layer */
+ r = sasl_setprop(state->saslconn, SASL_SSF_EXTERNAL, &ssf);
+ if (r != SASL_OK) {
+	server_printf(state, "BAD sasl_setprop(SASL_SSF_EXTERNAL) "
+			 "failed: cmd_starttls()\r\n");
+	server_flush(state);
+	return;
+ }
+
+ r = sasl_setprop(state->saslconn, SASL_AUTH_EXTERNAL, auth_id);
+ if (r != SASL_OK) {
+	server_printf(state, "BAD sasl_setprop(SASL_AUTH_EXTERNAL) "
+			 "failed: cmd_starttls()\r\n");
+	server_flush(state);
+	return;
+ }
+
+ /* tell the prot layer about our new layers */
+ prot_settls(state->in, tls_conn);
+ prot_settls(state->out, tls_conn);
+ state->tls_conn = tls_conn;
+ state->is_tls = 1;
+#else
+ server_printf(state, "BAD this server is not built with SSL\r\n");
+ server_flush(state);
+#endif
+}
+
+/*
+ * Server main command loop for a single connection. Blocks waiting for
+ * commands from the client, and handles each command. Returns when the
+ * client sends a XXLOGOUT command or drops the connection.
+ */
+static void server_cmdloop(struct server_state *state)
+{
+ char *command;
+ char buf1024;
+ static const char sep = " \t\r\n";
+
+ /* Emit the connection banner */
+ server_emit_caps(state);
+
+ while (server_getline(state, buf, sizeof(buf)) == 0) {
+	command = strtok(buf, sep);
+
+	if (!command) {
+	 server_printf(state, "BAD command\r\n");
+	 server_flush(state);
+	 continue;
+	}
+
+	if (!strcasecmp(command, "XXLOGOUT")) {
+	 /* graceful disconnect */
+	 server_printf(state, "OK\r\n");
+	 server_flush(state);
+	 break;
+	} else if (!strcasecmp(command, "XXNOOP")) {
+	 server_printf(state, "OK\r\n");
+	 server_flush(state);
+	} else if (!strcasecmp(command, "XXCAPABILITY")) {
+	 server_emit_caps(state);
+	} else if (!strcasecmp(command, "XXAUTHENTICATE")) {
+	 char *mech = strtok(NULL, sep);
+	 char *initial_in = strtok(NULL, sep);
+	 cmd_authenticate(state, mech, initial_in);
+	} else if (!strcasecmp(command, "XXSTARTTLS")) {
+	 cmd_starttls(state);
+	} else {
+	 server_printf(state, "BAD command\r\n");
+	 server_flush(state);
+	}
+ }
+}
+
+/*
+ * Start the server. Forks a child process, which does some once-off
+ * server initialisation and then enters a service loop. The service
+ * loop is very dumb: it serves a single connection at a time, with no
+ * forking or threading or async request handling.
+ *
+ * Returns: pid of the child process, or -1 on error.
+ */
+static pid_t server_start(struct server_state *state)
+{
+ pid_t pid;
+
+ pid = fork();
+ if (pid < 0) {
+	perror("fork");
+	return -1;
+ }
+ if (pid) {
+	/* We are the parent process. We don't need to wait for the
+	 * child to finish starting, as we have a bound socket we can
+	 * connect immediately (it just might take the child a little
+	 * while to respond to the first command). */
+	close(state->rend_sock);
+	return pid;
+ }
+ /* We are the child process. */
+
+ if (init_sasl(/*client*/0) < 0)
+	exit(1);
+
+ /* Main connection loop. This is a toy, single-threaded server
+ * which handles one connection at a time. */
+ for (;;)
+ {
+	/* Wait for a connection */
+	if (server_accept(state) < 0)
+	 exit(1);
+
+	/* Run the main command loop for this connection */
+	server_cmdloop(state);
+
+	/* Forget the per-connection state */
+	server_unaccept(state);
+ }
+}
+
+/*
+ * Shut down the server, given it's PID. It's pretty simple and brutal:
+ * we just send it SIGTERM and wait to reap it.
+ */
+static void server_shutdown(pid_t pid)
+{
+ int status;
+ pid_t r;
+
+ kill(pid, SIGTERM);
+ for (;;) {
+	r = waitpid(pid, &status, 0);
+	if (r < 0) {
+	 if (errno == EINTR)
+		continue;
+	 if (errno != ESRCH)
+		perror("waitpid");
+	 return;
+	}
+	if (r == pid)
+	 return; /* ok, killed it */
+	fprintf(stderr, "WTF? waitpid(%d) = %d?\n", pid, r);
+ }
+}
+
+/*
+ * Callback which we use to fakes server-side password checking for
+ * those mechanisms where a plaintext password from the client is
+ * available to the SASL server code, i.e. PLAIN and LOGIN.
+ */
+static int server_checkpass(sasl_conn_t *conn __attribute__((unused)),
+			 void *context __attribute__((unused)),
+			 const char *user, const char *pass,
+			 unsigned passlen,
+			 struct propctx *propctx __attribute__((unused)))
+{
+ if (strcmp(user, USERID))
+	return SASL_NOUSER;
+ if (passlen != strlen(PASSWORD) ||
+	strncmp(pass, PASSWORD, passlen))
+	return SASL_BADAUTH;
+ return SASL_OK;
+}
+
+/* The auxprop API changed in commit a321326, Oct 2008 */
+#if SASL_AUXPROP_PLUG_VERSION > 4
+# define AUXPROP_RTYPE int
+# define AUXPROP_RET 0
+#else
+# define AUXPROP_RTYPE void
+# define AUXPROP_RET
+#endif
+
+/*
+ * Callback which we use to fake out server-side password checking for
+ * those mechanisms where a plaintext password from the client is *NOT*
+ * available, and so the SASL server code needs to retrieve the password
+ * from an auxprop plugin.
+ */
+static AUXPROP_RTYPE server_auxprop_lookup(void *glob_context __attribute__((unused)),
+				 sasl_server_params_t *sparams,
+				 unsigned flags __attribute__((unused)),
+				 const char *user,
+				 unsigned ulen)
+{
+ const struct propval *prop;
+
+ if (ulen != strlen(USERID) ||
+	strncmp(user, USERID, ulen))
+	return AUXPROP_RET;
+
+ prop = sparams->utils->prop_get(sparams->propctx);
+ if (!prop)
+	return AUXPROP_RET;
+ for ( ; prop->name ; prop++) {
+	if (!strcmp(prop->name, "*userPassword") ||
+	 !strcmp(prop->name, "*cmusaslsecretDIGEST-MD5")) {
+	 if (prop->values)
+		sparams->utils->prop_erase(sparams->propctx, prop->name);
+	 sparams->utils->prop_set(sparams->propctx, prop->name,
+				 PASSWORD, strlen(PASSWORD));
+	}
+ }
+
+ return AUXPROP_RET;
+}
+
+/*
+ * Helps create a fake "auxiliary propert plugin" for the SASL library,
+ * which is how we hook into the DIGEST-MD5 mechanism when it wants to
+ * get a plaintext password to check aginst the hash received from the
+ * client.
+ */
+static int server_auxprop_init(const sasl_utils_t *utils __attribute__((unused)),
+			 int max_version,
+			 int *out_version,
+			 sasl_auxprop_plug_t **plugp,
+			 const char *plugname __attribute__((unused)))
+{
+ static sasl_auxprop_plug_t plug = {
+	.features = 0,
+	.auxprop_lookup = server_auxprop_lookup,
+	.name = "testserver-hack"
+ };
+
+ *out_version = max_version;
+ *plugp = &plug;
+ return SASL_OK;
+}
+
+/*
+ * Initialise the SASL library, client or server.
+ *
+ * Returns: 0 on success, -ve on error.
+ */
+static int init_sasl(int isclient)
+{
+ int r;
+
+ /* set the SASL allocation functions */
+ sasl_set_alloc((sasl_malloc_t *)xmalloc,
+		 (sasl_calloc_t *)xcalloc,
+		 (sasl_realloc_t *)xrealloc,
+		 (sasl_free_t *)free);
+
+ /* set the SASL mutex functions */
+ sasl_set_mutex(cyrus_mutex_alloc, cyrus_mutex_lock,
+		 cyrus_mutex_unlock, cyrus_mutex_free);
+
+ if (isclient) {
+	static const struct sasl_callback client_cb = {
+	 { SASL_CB_LIST_END, NULL, NULL }
+	};
+
+	/* load the SASL client plugins */
+	if (sasl_client_init(client_cb)) {
+	 fprintf(stderr, "could not init sasl client\n");
+	 return -1;
+	}
+
+	callbacks = mysasl_callbacks(USERID, USERID, NULL, PASSWORD);
+	if (!callbacks)
+	 return -1;
+ } else {
+	static const struct sasl_callback server_cb = {
+	 { SASL_CB_SERVER_USERDB_CHECKPASS, (void *)&server_checkpass, NULL },
+	 { SASL_CB_LIST_END, NULL, NULL }
+	};
+
+	/* load the SASL server plugins */
+	r = sasl_server_init(server_cb, "testserver");
+	if (r != SASL_OK) {
+	 fprintf(stderr, "sasl_server_init() failed: error %d\n", r);
+	 return -1;
+	}
+
+	sasl_auxprop_add_plugin("testserver", server_auxprop_init);
+ }
+
+ return 0;
+}
+
+/* ====================================================================== */
+
+static struct server_state *server_state;
+static pid_t server_pid;
+static int sasl_initialised;
+static int old_session_timeout;
+static char *old_config_dir;
+static char *old_tls_ca_file;
+static char *old_tls_cert_file;
+static char *old_tls_key_file;
+
+/*
+ * Test suite setup function. Sets up the global
+ * server_state page. Forks a server process which listens
+ * on a TCP port, and writes the port number into default_service
+ * so that the client code can connect to it.
+ */
+static int set_up(void)
+{
+ int rend_sock, port = 0;
+ char *sr;
+ static char cwdPATH_MAX;
+
+ if (verbose > 1)
+	fprintf(stderr, "Starting server!\n");
+
+ sr = getcwd(cwd, sizeof(cwd));
+ if (!sr) {
+	fprintf(stderr, "getcwd() failed: %s\n", strerror(errno));
+	return -1;
+ }
+
+ old_config_dir = (char *)config_dir;
+ config_dir = xstrdup(cwd);
+
+ old_tls_ca_file = (char *)imapoptsIMAPOPT_TLS_CA_FILE.val.s;
+ imapoptsIMAPOPT_TLS_CA_FILE.val.s =
+	 strconcat(cwd, "/cacert.pem", (char *)NULL);
+
+ old_tls_cert_file = (char *)imapoptsIMAPOPT_TLS_CERT_FILE.val.s;
+ imapoptsIMAPOPT_TLS_CERT_FILE.val.s =
+	 strconcat(cwd, "/cert.pem", (char *)NULL);
+
+ old_tls_key_file = (char *)imapoptsIMAPOPT_TLS_KEY_FILE.val.s;
+ imapoptsIMAPOPT_TLS_KEY_FILE.val.s =
+	 strconcat(cwd, "/key.pem", (char *)NULL);
+
+ /* disable SSL session caching */
+ old_session_timeout = imapoptsIMAPOPT_TLS_SESSION_TIMEOUT.val.i;
+ imapoptsIMAPOPT_TLS_SESSION_TIMEOUT.val.i = 0;
+
+ rend_sock = create_server_socket(&port);
+ if (rend_sock < 0)
+	return -1;
+
+ server_state = get_anonymous_page();
+ if (!server_state) {
+	close(rend_sock);
+	return -1;
+ }
+ server_state->rend_sock = rend_sock;
+
+ if (verbose > 1)
+	fprintf(stderr, "Bound to port tcp/%u\n", port);
+ snprintf(default_service, sizeof(default_service), "%d", port);
+
+ server_pid = server_start(server_state);
+ if (server_pid < 0)
+	return -1;
+
+ /*
+ * Initialise the SASL library in the client process. This init
+ * function can actually be called multiple times in the lifetime of
+ * a test runner process, which is perhaps surprising, but we have
+ * to deal with it. We do however seem to be able to get away with
+ * initialising SASL multiple times as long as we call sasl_done()
+ * after we're done.
+ */
+ if (init_sasl(/*client*/1) < 0)
+	return -1;
+ sasl_initialised = 1;
+
+ return 0;
+}
+
+/*
+ * Test suite teardown function. Shuts down the server and
+ * removes the global server_state page.
+ */
+static int tear_down(void)
+{
+ if (verbose > 1)
+	fprintf(stderr, "Cleaning up server! NOT.\n");
+ if (server_pid > 1)
+	server_shutdown(server_pid);
+ if (server_state)
+	free_anonymous_page(server_state);
+ if (callbacks) {
+	free_callbacks(callbacks);
+	callbacks = NULL;
+ }
+ if (sasl_initialised) {
+	sasl_done();
+	sasl_initialised = 0;
+ }
+
+ free((char *)config_dir);
+ config_dir = old_config_dir;
+
+ imapoptsIMAPOPT_TLS_SESSION_TIMEOUT.val.i = old_session_timeout;
+
+ free((char *)imapoptsIMAPOPT_TLS_CA_FILE.val.s);
+ imapoptsIMAPOPT_TLS_CA_FILE.val.s = old_tls_ca_file;
+
+ free((char *)imapoptsIMAPOPT_TLS_CERT_FILE.val.s);
+ imapoptsIMAPOPT_TLS_CERT_FILE.val.s = old_tls_cert_file;
+
+ free((char *)imapoptsIMAPOPT_TLS_KEY_FILE.val.s);
+ imapoptsIMAPOPT_TLS_KEY_FILE.val.s = old_tls_key_file;
+
+ return 0;
+}
+
+/* ====================================================================== */
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/binhex.testc Added

@@ -0,0 +1,175 @@
+#include "cunit/cunit.h"
+#include "util.h"
+
+static void test_bin_to_hex(void)
+{
+    static const unsigned char BIN4 = { 0xca, 0xfe, 0xba, 0xbe };
+    static const char HEX9 = "cafebabe";
+    int r;
+    char hex9;
+
+    memset(hex, 0x45, sizeof(hex));
+    r = bin_to_hex(BIN, sizeof(BIN), hex, BH_LOWER);
+    CU_ASSERT_EQUAL(r, sizeof(hex)-1);
+    CU_ASSERT_STRING_EQUAL(hex, HEX);
+}
+
+static void test_bin_to_hex_long(void)
+{
+    static const unsigned char BIN20 = {
+	0x33,0xac,0x18,0xb6,0xdc,0x74,0x6e,0x9a,0xd7,0xbd,
+	0x6f,0x9f,0xfa,0x77,0xe4,0x04,0x84,0x04,0xa0,0x02
+    };
+    static const char HEX41 = "33ac18b6dc746e9ad7bd6f9ffa77e4048404a002";
+    int r;
+    char hex41;
+
+    memset(hex, 0x45, sizeof(hex));
+    r = bin_to_hex(BIN, sizeof(BIN), hex, BH_LOWER);
+    CU_ASSERT_EQUAL(r, sizeof(hex)-1);
+    CU_ASSERT_STRING_EQUAL(hex, HEX);
+}
+
+static void test_bin_to_hex_short(void)
+{
+    static const unsigned char BIN1 = { 0x42 };
+    static const char HEX3 = "42";
+    int r;
+    char hex3;
+
+    memset(hex, 0x45, sizeof(hex));
+    r = bin_to_hex(BIN, sizeof(BIN), hex, BH_LOWER);
+    CU_ASSERT_EQUAL(r, sizeof(hex)-1);
+    CU_ASSERT_STRING_EQUAL(hex, HEX);
+}
+
+static void test_bin_to_hex_sep(void)
+{
+    static const unsigned char BIN4 = { 0xca, 0xfe, 0xba, 0xbe };
+    static const char HEX12 = "ca:fe:ba:be";
+    int r;
+    char hex12;
+
+    memset(hex, 0x45, sizeof(hex));
+    r = bin_to_hex(BIN, sizeof(BIN), hex, BH_LOWER|BH_SEPARATOR(':'));
+    CU_ASSERT_EQUAL(r, sizeof(hex)-1);
+    CU_ASSERT_STRING_EQUAL(hex, HEX);
+}
+
+static void test_hex_to_bin(void)
+{
+    static const char HEX9 = "cafebabe";
+    static const unsigned char BIN4 = { 0xca, 0xfe, 0xba, 0xbe };
+    int r;
+    char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, sizeof(bin));
+    CU_ASSERT_EQUAL(memcmp(bin, BIN, sizeof(bin)), 0);
+}
+
+static void test_hex_to_bin_short(void)
+{
+    static const char HEX3 = "42";
+    static const unsigned char BIN1 = { 0x42 };
+    int r;
+    char bin1;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, sizeof(bin));
+    CU_ASSERT_EQUAL(memcmp(bin, BIN, sizeof(bin)), 0);
+}
+
+static void test_hex_to_bin_long(void)
+{
+    static const char HEX41 = "33ac18b6dc746e9ad7bd6f9ffa77e4048404a002";
+    static const unsigned char BIN20 = {
+	0x33,0xac,0x18,0xb6,0xdc,0x74,0x6e,0x9a,0xd7,0xbd,
+	0x6f,0x9f,0xfa,0x77,0xe4,0x04,0x84,0x04,0xa0,0x02
+    };
+    int r;
+    char bin20;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, sizeof(bin));
+    CU_ASSERT_EQUAL(memcmp(bin, BIN, sizeof(bin)), 0);
+}
+
+static void test_hex_to_bin_capitals(void)
+{
+    static const char HEX9 = "CAFEBABE";
+    static const unsigned char BIN4 = { 0xca, 0xfe, 0xba, 0xbe };
+    int r;
+    char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, sizeof(bin));
+    CU_ASSERT_EQUAL(memcmp(bin, BIN, sizeof(bin)), 0);
+}
+
+static void test_hex_to_bin_odd(void)
+{
+    static const char HEX8 = "cafebab";
+    int r;
+    unsigned char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, -1);
+    CU_ASSERT_EQUAL(bin0, 0xff);
+    CU_ASSERT_EQUAL(bin1, 0xff);
+    CU_ASSERT_EQUAL(bin2, 0xff);
+    CU_ASSERT_EQUAL(bin3, 0xff);
+}
+
+static void test_hex_to_bin_nonxdigit(void)
+{
+    static const char HEX9 = "foobarly";
+    int r;
+    char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, -1);
+}
+
+static void test_hex_to_bin_whitespace(void)
+{
+    static const char HEX13 = "  cafebabe  ";
+    int r;
+    char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, sizeof(HEX)-1, bin);
+    CU_ASSERT_EQUAL(r, -1);
+}
+
+static void test_hex_to_bin_nolength(void)
+{
+    static const char HEX9 = "cafebabe";
+    static const unsigned char BIN4 = { 0xca, 0xfe, 0xba, 0xbe };
+    int r;
+    char bin4;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(HEX, 0, bin);
+    CU_ASSERT_EQUAL(r, sizeof(bin));
+    CU_ASSERT_EQUAL(memcmp(bin, BIN, sizeof(bin)), 0);
+}
+
+static void test_hex_to_bin_null(void)
+{
+    int r;
+    unsigned char bin1;
+
+    memset(bin, 0xff, sizeof(bin));
+    r = hex_to_bin(NULL, 0, bin);
+    CU_ASSERT_EQUAL(r, -1);
+    CU_ASSERT_EQUAL(bin0, 0xff);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/bitvector.testc Added

@@ -0,0 +1,516 @@
+#include <stdlib.h>
+
+#include "cunit/cunit.h"
+#include "bitvector.h"
+#include "util.h"
+
+static void test_free(void)
+{
+ bitvector_t bv = BV_INITIALIZER;
+ /* it's ok to call free() even if we never
+ * set or cleared any bits */
+ bv_free(&bv);
+}
+
+static void test_basic(void)
+{
+ bitvector_t bv = BV_INITIALIZER;
+
+ /* read-only operations do not expand the vector */
+ CU_ASSERT_EQUAL(0, bv.length);
+ CU_ASSERT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(0, bv.length);
+ CU_ASSERT_EQUAL(0, bv.alloc);
+
+ /* can set bit0 and get it back */
+ bv_set(&bv, 0);
+ CU_ASSERT_EQUAL(1, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(1, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ /* can set bit23 and get it back */
+ bv_set(&bv, 23);
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ /* can set all bits, does not change length */
+ bv_setall(&bv);
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ /* can clear all bits, does not change length */
+ bv_clearall(&bv);
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(24, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ /* can set the size, does not change existing bits */
+ bv_set(&bv, 0);
+ bv_set(&bv, 23);
+ bv_setsize(&bv, 105);
+ CU_ASSERT_EQUAL(105, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(105, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ /* setall now works on the new size */
+ bv_setall(&bv);
+ CU_ASSERT_EQUAL(105, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 7));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 104));
+ CU_ASSERT_EQUAL(105, bv.length);
+ CU_ASSERT_NOT_EQUAL(0, bv.alloc);
+
+ bv_free(&bv);
+}
+
+static void test_andeq(void)
+{
+ bitvector_t a = BV_INITIALIZER;
+ bitvector_t b = BV_INITIALIZER;
+
+ bv_set(&a, 0);
+ bv_set(&a, 3);
+ CU_ASSERT_EQUAL(4, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 3));
+
+ bv_set(&b, 0);
+ bv_set(&b, 23);
+ CU_ASSERT_EQUAL(24, b.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 23));
+
+ bv_andeq(&a, &b);
+
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&a, 3));
+ CU_ASSERT_EQUAL(0, bv_isset(&a, 23));
+
+ bv_free(&a);
+ bv_free(&b);
+}
+
+static void test_andeq_noexpand(void)
+{
+ bitvector_t a = BV_INITIALIZER;
+ bitvector_t b = BV_INITIALIZER;
+
+ bv_set(&a, 0);
+ bv_set(&a, 23);
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 23));
+
+ bv_set(&b, 0);
+ bv_set(&b, 3);
+ bv_set(&b, 7);
+ CU_ASSERT_EQUAL(8, b.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 3));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 7));
+
+ bv_andeq(&a, &b);
+
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&a, 3));
+ CU_ASSERT_EQUAL(0, bv_isset(&a, 7));
+ CU_ASSERT_EQUAL(0, bv_isset(&a, 23));
+
+ bv_free(&a);
+ bv_free(&b);
+}
+
+static void test_oreq(void)
+{
+ bitvector_t a = BV_INITIALIZER;
+ bitvector_t b = BV_INITIALIZER;
+
+ bv_set(&a, 0);
+ bv_set(&a, 3);
+ CU_ASSERT_EQUAL(4, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 3));
+
+ bv_set(&b, 0);
+ bv_set(&b, 23);
+ CU_ASSERT_EQUAL(24, b.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 23));
+
+ bv_oreq(&a, &b);
+
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 3));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 23));
+
+ bv_free(&a);
+ bv_free(&b);
+}
+
+static void test_oreq_empty(void)
+{
+ bitvector_t a = BV_INITIALIZER;
+ bitvector_t b = BV_INITIALIZER;
+
+ bv_set(&b, 0);
+ bv_set(&b, 23);
+ CU_ASSERT_EQUAL(24, b.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 23));
+
+ bv_oreq(&a, &b);
+
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 23));
+
+ bv_free(&a);
+ bv_free(&b);
+}
+
+static void test_oreq_noexpand(void)
+{
+ bitvector_t a = BV_INITIALIZER;
+ bitvector_t b = BV_INITIALIZER;
+
+ bv_set(&a, 0);
+ bv_set(&a, 23);
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 23));
+
+ bv_set(&b, 0);
+ bv_set(&b, 3);
+ CU_ASSERT_EQUAL(4, b.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&b, 3));
+
+ bv_oreq(&a, &b);
+
+ CU_ASSERT_EQUAL(24, a.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 3));
+ CU_ASSERT_EQUAL(1, bv_isset(&a, 23));
+
+ bv_free(&a);
+ bv_free(&b);
+}
+
+static void test_shrink_expand(void)
+{
+ bitvector_t bv = BV_INITIALIZER;
+ int i;
+
+ /* set up some bits */
+ bv_setsize(&bv, 59);
+ bv_setall(&bv);
+ CU_ASSERT_EQUAL(59, bv.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 3));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 4));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 23));
+ CU_ASSERT_EQUAL(1, bv_isset(&bv, 58));
+
+ for (i = 55 ; i >= 4 ; i--) {
+	/* explicitly shrink the vector - bits off
+	 * the end are now gone */
+	bv_setsize(&bv, i);
+	CU_ASSERT_EQUAL(i, bv.length);
+	CU_ASSERT_EQUAL(1, bv_isset(&bv, i-2));
+	CU_ASSERT_EQUAL(1, bv_isset(&bv, i-1));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i+1));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i+2));
+
+	/* implicitly expand the vector - old bits
+	 * do not come back */
+	bv_set(&bv, 58);
+	CU_ASSERT_EQUAL(59, bv.length);
+	CU_ASSERT_EQUAL(1, bv_isset(&bv, 0));
+	CU_ASSERT_EQUAL(1, bv_isset(&bv, i-2));
+	CU_ASSERT_EQUAL(1, bv_isset(&bv, i-1));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i+1));
+	CU_ASSERT_EQUAL(0, bv_isset(&bv, i+2));
+
+	bv_setall(&bv);
+ }
+
+ bv_free(&bv);
+}
+
+static void test_copy(void)
+{
+ bitvector_t dst = BV_INITIALIZER;
+ bitvector_t src = BV_INITIALIZER;
+
+ /* test copying of empty sets */
+ bv_copy(&dst, &src);
+ CU_ASSERT_EQUAL(0, dst.length);
+
+ /* set up some bits */
+ bv_set(&src, 0);
+ bv_set(&src, 11);
+ bv_set(&src, 23);
+ CU_ASSERT_EQUAL(24, src.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 1));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 10));
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 11));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 12));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 22));
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 24));
+
+ /* copy and check the bits are now in both */
+ bv_copy(&dst, &src);
+
+ CU_ASSERT_EQUAL(24, dst.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&dst, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&dst, 1));
+ CU_ASSERT_EQUAL(0, bv_isset(&dst, 10));
+ CU_ASSERT_EQUAL(1, bv_isset(&dst, 11));
+ CU_ASSERT_EQUAL(0, bv_isset(&dst, 12));
+ CU_ASSERT_EQUAL(0, bv_isset(&dst, 22));
+ CU_ASSERT_EQUAL(1, bv_isset(&dst, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&dst, 24));
+
+ CU_ASSERT_EQUAL(24, src.length);
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 0));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 1));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 10));
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 11));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 12));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 22));
+ CU_ASSERT_EQUAL(1, bv_isset(&src, 23));
+ CU_ASSERT_EQUAL(0, bv_isset(&src, 24));
+
+ bv_free(&dst);
+ bv_free(&src);
+}
+
+static void test_cstring(void)
+{
+ bitvector_t bv = BV_INITIALIZER;
+ char *s;
+
+ /* test empty set */
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "");
+ free(s);
+
+ /* set a bit */
+ bv_set(&bv, 11);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "000811");
+ free(s);
+
+ /* set another bit, not adjacent */
+ bv_set(&bv, 3);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "08083,11");
+ free(s);
+
+ /* set another bit, adjacent */
+ bv_clear(&bv, 3);
+ bv_set(&bv, 10);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "000c10-11");
+ free(s);
+
+ /* set more bits, adjacent */
+ bv_set(&bv, 9);
+ bv_set(&bv, 12);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "001e9-12");
+ free(s);
+
+ /* set a bit at the start */
+ bv_clearall(&bv);
+ bv_set(&bv, 0);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "01000");
+ free(s);
+
+ /* set another bit adjacent to the start */
+ bv_set(&bv, 1);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "03000-1");
+ free(s);
+
+ /* set every 2nd bit */
+ bv_clearall(&bv);
+ bv_set(&bv, 1);
+ bv_set(&bv, 3);
+ bv_set(&bv, 5);
+ bv_set(&bv, 7);
+ bv_set(&bv, 9);
+ bv_set(&bv, 11);
+ s = bv_cstring(&bv);
+ CU_ASSERT_STRING_EQUAL(s, "aa0a1,3,5,7,9,11");
+ free(s);
+
+ bv_free(&bv);
+}
+
+static void test_next_set(void)
+{
+#define TESTCASE(...) \
+ { \
+	static const int _in = {__VA_ARGS__}; \
+	bitvector_t bv = BV_INITIALIZER; \
+	int bit = -1; \
+	int i; \
+	for (i = 0 ; i < (int)VECTOR_SIZE(_in) ; i++) \
+	 bv_set(&bv, _ini); \
+	for (i = 0 ; i < (int)VECTOR_SIZE(_in) ; i++) { \
+	 bit = bv_next_set(&bv, bit+1); \
+	 CU_ASSERT_EQUAL(bit, _ini); \
+	} \
+	bit = bv_next_set(&bv, bit+1); \
+	CU_ASSERT_EQUAL(bit, -1); \
+	bv_free(&bv); \
+ }
+
+ /* empty vector never reports any set bits */
+ TESTCASE();
+
+ /* vector with a single bit reports only that bit */
+ TESTCASE(0);
+ TESTCASE(3);
+ TESTCASE(7);
+ TESTCASE(8);
+ TESTCASE(15);
+ TESTCASE(16);
+ TESTCASE(128);
+
+ /* vector with several bits reports them all */
+ TESTCASE(1,2,3,4,7,11,12,63,64,65);
+
+ /* vector with all bits reports them all */
+ TESTCASE(0,1,2,3,4,5,6,7);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23);
+
+#undef TESTCASE
+}
+
+static void test_prev_set(void)
+{
+#define TESTCASE(...) \
+ { \
+	static const int _in = {__VA_ARGS__}; \
+	bitvector_t bv = BV_INITIALIZER; \
+	int bit; \
+	int i; \
+	for (i = 0 ; i < (int)VECTOR_SIZE(_in) ; i++) \
+	 bv_set(&bv, _ini); \
+	bit = bv.length; \
+	for (i = (int)VECTOR_SIZE(_in)-1 ; i >= 0 ; i--) { \
+	 bit = bv_prev_set(&bv, bit-1); \
+	 CU_ASSERT_EQUAL(bit, _ini); \
+	} \
+	bit = bv_prev_set(&bv, bit-1); \
+	CU_ASSERT_EQUAL(bit, -1); \
+	bv_free(&bv); \
+ }
+
+ /* empty vector never reports any set bits */
+ TESTCASE();
+
+ /* vector with a single bit reports only that bit */
+ TESTCASE(0);
+ TESTCASE(3);
+ TESTCASE(7);
+ TESTCASE(8);
+ TESTCASE(15);
+ TESTCASE(16);
+ TESTCASE(128);
+
+ /* vector with several bits reports them all */
+ TESTCASE(1,2,3,4,7,11,12,63,64,65);
+
+ /* vector with all bits reports them all */
+ TESTCASE(0,1,2,3,4,5,6,7);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23);
+
+#undef TESTCASE
+}
+
+static void test_count(void)
+{
+#define TESTCASE(...) \
+ { \
+	static const int _in = {__VA_ARGS__}; \
+	bitvector_t bv = BV_INITIALIZER; \
+	int count; \
+	int i; \
+	for (i = 0 ; i < (int)VECTOR_SIZE(_in) ; i++) \
+	 bv_set(&bv, _ini); \
+	count = bv_count(&bv); \
+	CU_ASSERT_EQUAL(count, VECTOR_SIZE(_in)); \
+	bv_free(&bv); \
+ }
+
+ /* empty vector */
+ TESTCASE();
+
+ /* vector with a single bit */
+ TESTCASE(0);
+ TESTCASE(3);
+ TESTCASE(7);
+ TESTCASE(8);
+ TESTCASE(15);
+ TESTCASE(16);
+ TESTCASE(128);
+
+ /* vector with several bits */
+ TESTCASE(1,2,3,4,7,11,12,63,64,65);
+
+ /* vector with all bits */
+ TESTCASE(0,1,2,3,4,5,6,7);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
+ TESTCASE(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23);
+
+#undef TESTCASE
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/buf.testc Added

@@ -0,0 +1,1651 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "prot.h"
+#include "xmalloc.h"
+#include "util.h"
+#include "retry.h"
+#include "map.h"
+#include <sys/mman.h>
+
+static void test_simple(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_appendcstr(&b, WORD0);
+ buf_putc(&b, ' ');
+ buf_appendcstr(&b, WORD1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1+sizeof(WORD1)-1+1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ s = buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1+sizeof(WORD1)-1+1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, WORD0" "WORD1);
+
+ buf_free(&b);
+
+#undef WORD0
+#undef WORD1
+}
+
+static void test_map(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ const char *map;
+ size_t len;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_appendmap(&b, WORD0, sizeof(WORD0)-1);
+ buf_putc(&b, ' ');
+ buf_appendmap(&b, WORD1, 2);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+2);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ map = (void *)0xdeadbeef;
+ len = 42;
+ buf_getmap(&b, &map, &len);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+2);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_EQUAL(len, b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_NOT_NULL(map);
+ CU_ASSERT(!memcmp(map, WORD0" ip", sizeof(WORD0)+2));
+
+ buf_free(&b);
+
+#undef WORD0
+#undef WORD1
+}
+
+static void test_initm(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ /* data thanks to hipsteripsum.me */
+ static const char WORD0 = "terry richardson fanny pack";
+ char *s = xstrdup(WORD0);
+
+ buf_initm(&b, s, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, WORD0, sizeof(WORD0)-1));
+
+ /* we don't free(s) - the buf_free() should do that */
+ buf_free(&b);
+}
+
+static void test_long(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ int i;
+ char *exp;
+#define SZ 6
+#define N 10000
+ char ttSZ+1;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ for (i = 0 ; i < N ; i++) {
+	snprintf(tt, sizeof(tt), "%c%05d", 'A'+(i%26), i);
+	buf_appendcstr(&b, tt);
+ }
+ buf_cstring(&b);
+
+ CU_ASSERT_EQUAL(b.len, SZ*N);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ exp = xmalloc(SZ*N+1);
+ for (i = 0 ; i < N ; i++)
+	snprintf(exp+SZ*i, SZ+1, "%c%05d", 'A'+(i%26), i);
+ CU_ASSERT(!strcmp(b.s, exp));
+ free(exp);
+
+ buf_free(&b);
+#undef N
+#undef SZ
+}
+
+static void test_setcstr(void)
+{
+#define WORD0	"lorem"
+ struct buf b = BUF_INITIALIZER;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_setcstr(&b, WORD0);
+ buf_cstring(&b);
+
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0);
+
+ buf_free(&b);
+#undef WORD0
+}
+
+static void test_setmap(void)
+{
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_setmap(&b, WORD1, sizeof(WORD1)-1);
+ buf_cstring(&b);
+
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD1);
+
+ buf_free(&b);
+#undef WORD1
+}
+
+static void test_append(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ CU_ASSERT_EQUAL(b2.len, 0);
+ CU_ASSERT(b2.alloc >= b2.len);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT_PTR_NULL(b2.s);
+
+ buf_setmap(&b, WORD0, sizeof(WORD0)-1);
+ buf_setmap(&b2, WORD1, sizeof(WORD1)-1);
+ buf_append(&b, &b2);
+
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1+sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ s = buf_cstring(&b);
+ CU_ASSERT_STRING_EQUAL(s, WORD0""WORD1);
+
+ CU_ASSERT_EQUAL(b2.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT(b2.alloc >= b2.len);
+ CU_ASSERT_PTR_NOT_NULL(b2.s);
+ s = buf_cstring(&b2);
+ CU_ASSERT_STRING_EQUAL(s, WORD1);
+
+ buf_free(&b);
+ buf_free(&b2);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_appendbit32(void)
+{
+#define HEX0	0xcafebabe
+#define HEX1	0xdeadbeef
+ static const unsigned char HEX8 = {
+	0xca, 0xfe, 0xba, 0xbe,
+	0xde, 0xad, 0xbe, 0xef
+ };
+ struct buf b = BUF_INITIALIZER;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_appendbit32(&b, HEX0);
+ buf_appendbit32(&b, HEX1);
+
+ CU_ASSERT_EQUAL(b.len, 8);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, HEX, sizeof(HEX)));
+
+ buf_free(&b);
+#undef HEX0
+#undef HEX1
+}
+
+static void test_reset(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_appendcstr(&b, WORD0);
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ s = buf_cstring(&b);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, WORD1);
+
+ buf_free(&b);
+
+#undef WORD0
+#undef WORD1
+}
+
+static void test_copy(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ CU_ASSERT_EQUAL(b2.len, 0);
+ CU_ASSERT(b2.alloc >= b2.len);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT_PTR_NULL(b2.s);
+
+ buf_setmap(&b, WORD0, sizeof(WORD0)-1);
+ buf_setmap(&b2, WORD1, sizeof(WORD1)-1);
+ buf_copy(&b, &b2);
+
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ s = buf_cstring(&b);
+ CU_ASSERT_STRING_EQUAL(s, WORD1);
+
+ CU_ASSERT_EQUAL(b2.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT(b2.alloc >= b2.len);
+ CU_ASSERT_PTR_NOT_NULL(b2.s);
+ s = buf_cstring(&b2);
+ CU_ASSERT_STRING_EQUAL(s, WORD1);
+
+ buf_free(&b);
+ buf_free(&b2);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_move(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsummma"
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ CU_ASSERT_EQUAL(b2.len, 0);
+ CU_ASSERT(b2.alloc >= b2.len);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT_PTR_NULL(b2.s);
+
+ buf_setmap(&b, WORD0, sizeof(WORD0)-1);
+ buf_setmap(&b2, WORD1, sizeof(WORD1)-1);
+ buf_move(&b, &b2);
+
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ s = buf_cstring(&b);
+ CU_ASSERT_STRING_EQUAL(s, WORD1);
+
+ CU_ASSERT_EQUAL(b2.len, 0);
+ CU_ASSERT_EQUAL(buf_len(&b2), b2.len);
+ CU_ASSERT_EQUAL(b2.alloc, 0);
+ CU_ASSERT_PTR_NULL(b2.s);
+
+ buf_free(&b);
+ buf_free(&b2);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_printf(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define DEC0	31337
+#define HEX0	0xcafebabe
+ struct buf b = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_printf(&b, WORD0" %s 0x%x %d", WORD1, HEX0, DEC0);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+sizeof(WORD1)+16);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ s = buf_cstring(&b);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, WORD0" "WORD1" 0xcafebabe 31337");
+
+ buf_free(&b);
+#undef WORD0
+#undef WORD1
+#undef DEC0
+#undef HEX0
+}
+
+static void test_long_printf(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ int i;
+ const char *s;
+ char *exp;
+#define SZ 6
+#define N 10000
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ exp = xmalloc(SZ*N+1);
+ for (i = 0 ; i < N ; i++)
+	snprintf(exp+SZ*i, SZ+1, "%c%05d", 'A'+(i%26), i);
+
+ buf_printf(&b, "x%sy", exp);
+ s = buf_cstring(&b);
+
+ CU_ASSERT_EQUAL(b.len, SZ*N+2);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_EQUAL(s0, 'x');
+ CU_ASSERT(!memcmp(s+1, exp, SZ*N));
+ CU_ASSERT_EQUAL(sSZ*N+1, 'y');
+
+ buf_free(&b);
+ free(exp);
+#undef N
+#undef SZ
+}
+
+static void test_replace_all(void)
+{
+#define WORD0	"lorem"
+#define WORD0REP "LAUREN BACALL"
+#define WORD0REP2 "L0R3M"
+#define WORD0REP3 "LRM"
+#define WORD0REP4 "XloremY"
+#define WORD1	"ipsum"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+ struct buf b = BUF_INITIALIZER;
+ unsigned int n;
+ char *buf_s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ /* simple test: a single replacement */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ n = buf_replace_all(&b, WORD0, WORD0REP);
+ CU_ASSERT_EQUAL(n, 1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0REP" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0REP" "WORD1);
+
+ /* simple test: failure to match */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ n = buf_replace_all(&b, WORD4, WORD0REP);
+ CU_ASSERT_EQUAL(n, 0);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ /* a replacement which doesn't change the size */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ buf_s = b.s;
+ n = buf_replace_all(&b, WORD0, WORD0REP2);
+ CU_ASSERT_EQUAL(n, 1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0REP2" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_EQUAL(b.s, buf_s); /* no size change => no realloc */
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0REP2" "WORD1);
+
+ /* a replacement which shrinks the size */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ /* a replacement with an empty string */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ buf_s = b.s;
+ n = buf_replace_all(&b, WORD0, "");
+ CU_ASSERT_EQUAL(n, 1);
+ CU_ASSERT_EQUAL(b.len, sizeof(" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_EQUAL(b.s, buf_s); /* no size change => no realloc */
+ CU_ASSERT_STRING_EQUAL(b.s, " "WORD1);
+
+ /* a replacement with a NULL string */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ buf_s = b.s;
+ n = buf_replace_all(&b, WORD0, NULL);
+ CU_ASSERT_EQUAL(n, 1);
+ CU_ASSERT_EQUAL(b.len, sizeof(" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_EQUAL(b.s, buf_s); /* no size change => no realloc */
+ CU_ASSERT_STRING_EQUAL(b.s, " "WORD1);
+
+ /* multiple replacements, including abutted ones */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+
+ n = buf_replace_all(&b, WORD0, WORD0REP2);
+ CU_ASSERT_EQUAL(n, 4);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0REP2" "WORD1" "WORD2" "WORD0REP2" "WORD3" "WORD0REP2""WORD0REP2" "WORD4)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0REP2" "WORD1" "WORD2" "WORD0REP2" "WORD3" "WORD0REP2""WORD0REP2" "WORD4);
+
+ /* multiple replacements with a replacement which contains the match */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+
+ n = buf_replace_all(&b, WORD0, WORD0REP4);
+ CU_ASSERT_EQUAL(n, 4);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0REP4" "WORD1" "WORD2" "WORD0REP4" "WORD3" "WORD0REP4""WORD0REP4" "WORD4)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0REP4" "WORD1" "WORD2" "WORD0REP4" "WORD3" "WORD0REP4""WORD0REP4" "WORD4);
+
+ buf_free(&b);
+
+#undef WORD0
+#undef WORD0REP
+#undef WORD0REP2
+#undef WORD0REP3
+#undef WORD0REP4
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+/* we use buf_init_ro() instead of buf_appendcstr() to test
+ * the case where the input buffer is not a C string before
+ * caling buf_replace_*() */
+#define TESTCASE_START(in, reg, rep, expn, exp) \
+ { \
+	static const char _in = in; \
+	static const char _reg = reg; \
+	static const char *_rep = rep; \
+	static const int _expn = expn; \
+	static const char _exp = exp; \
+	struct buf b = BUF_INITIALIZER; \
+	regex_t re; \
+	unsigned int n; \
+	int r; \
+ \
+	buf_init_ro(&b, _in, sizeof(_in)-1); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_in)-1); \
+	CU_ASSERT_EQUAL(buf_len(&b), b.len); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _in); \
+ \
+	r = regcomp(&re, _reg, REG_EXTENDED); \
+	CU_ASSERT_EQUAL(r, 0);
+#define TESTCASE_MIDDLE \
+	n = buf_replace_one_re(&b, &re, _rep);
+#define TESTCASE_END \
+	CU_ASSERT_EQUAL(n, _expn); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT_EQUAL(buf_len(&b), b.len); \
+	CU_ASSERT(b.alloc >= b.len); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+	regfree(&re); \
+	buf_free(&b); \
+ }
+
+#define TESTCASE(in, reg, rep, expn, exp) \
+	TESTCASE_START(in, reg, rep, expn, exp) \
+	TESTCASE_MIDDLE \
+	TESTCASE_END
+
+static void test_replace_one_re(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	 "bespoke"
+#define WORD0_RE "bea-df-z+e"
+#define WORD0REP "butcher"
+#define WORD0REP2 "BeSp0K3"
+#define WORD0REP3 "BpK"
+#define WORD0REP4 "XbespokeY"
+#define WORD1	 "tattooed"
+#define WORD2	 "fap"
+#define WORD3	 "keffiyeh"
+#define WORD4	 "biodiesel"
+#define WORD4_RE "a-zioda-z+"
+ const char *buf_s;
+
+ /* simple test: a single replacement */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, WORD0REP,
+	 1, WORD0REP" "WORD1);
+
+ /* simple test: failure to match */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD4_RE, WORD0REP,
+		 0, WORD0" "WORD1);
+ TESTCASE_MIDDLE
+ buf_cstring(&b);
+ TESTCASE_END
+
+ /* a replacement which doesn't change the size */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD0_RE, WORD0REP2,
+		 1, WORD0REP2" "WORD1);
+ buf_s = buf_cstring(&b);
+ TESTCASE_MIDDLE
+ CU_ASSERT_PTR_EQUAL(buf_cstring(&b), buf_s); /* no size change => no realloc */
+ TESTCASE_END
+
+ /* a replacement which shrinks the size */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD0_RE, WORD0REP3,
+		 1, WORD0REP3" "WORD1);
+ buf_s = buf_cstring(&b);
+ TESTCASE_MIDDLE
+ CU_ASSERT_PTR_EQUAL(buf_cstring(&b), buf_s); /* no size change => no realloc */
+ TESTCASE_END
+
+ /* a replacement with an empty string */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, "",
+	 1, " "WORD1);
+
+ /* a replacement with a NULL string */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, NULL,
+	 1, " "WORD1);
+
+ /* multiple matches, including abutted ones */
+ TESTCASE(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4,
+	 WORD0_RE, WORD0REP2,
+	 1, WORD0REP2" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+
+ /* multiple matches with a replacement which contains the match */
+ TESTCASE(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4,
+	 WORD0_RE, WORD0REP4,
+	 1, WORD0REP4" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4);
+
+#undef WORD0
+#undef WORD0REP
+#undef WORD0REP2
+#undef WORD0REP3
+#undef WORD0REP4
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+#undef TESTCASE_MIDDLE
+#define TESTCASE_MIDDLE \
+	n = buf_replace_all_re(&b, &re, _rep);
+
+static void test_replace_all_re(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	 "bespoke"
+#define WORD0_RE "bea-df-z+e"
+#define WORD0REP "butcher"
+#define WORD0REP2 "BeSp0K3"
+#define WORD0REP3 "BpK"
+#define WORD0REP4 "XbespokeY"
+#define WORD1	 "tattooed"
+#define WORD2	 "fap"
+#define WORD3	 "keffiyeh"
+#define WORD4	 "biodiesel"
+#define WORD4_RE "a-zioda-z+"
+ const char *buf_s;
+
+ /* simple test: a single replacement */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, WORD0REP,
+	 1, WORD0REP" "WORD1);
+
+ /* simple test: failure to match */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD4_RE, WORD0REP,
+		 0, WORD0" "WORD1);
+ TESTCASE_MIDDLE
+ buf_cstring(&b);
+ TESTCASE_END
+
+ /* a replacement which doesn't change the size */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD0_RE, WORD0REP2,
+		 1, WORD0REP2" "WORD1);
+ buf_s = buf_cstring(&b);
+ TESTCASE_MIDDLE
+ CU_ASSERT_PTR_EQUAL(buf_cstring(&b), buf_s); /* no size change => no realloc */
+ TESTCASE_END
+
+ /* a replacement which shrinks the size */
+ TESTCASE_START(WORD0" "WORD1,
+		 WORD0_RE, WORD0REP3,
+		 1, WORD0REP3" "WORD1);
+ buf_s = buf_cstring(&b);
+ TESTCASE_MIDDLE
+ CU_ASSERT_PTR_EQUAL(buf_cstring(&b), buf_s); /* no size change => no realloc */
+ TESTCASE_END
+
+ /* a replacement with an empty string */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, "",
+	 1, " "WORD1);
+
+ /* a replacement with a NULL string */
+ TESTCASE(WORD0" "WORD1,
+	 WORD0_RE, NULL,
+	 1, " "WORD1);
+
+ /* multiple matches, including abutted ones */
+ TESTCASE(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4,
+	 WORD0_RE, WORD0REP2,
+	 4, WORD0REP2" "WORD1" "WORD2" "WORD0REP2" "WORD3" "WORD0REP2""WORD0REP2" "WORD4);
+
+ /* multiple matches with a replacement which contains the match */
+ TESTCASE(WORD0" "WORD1" "WORD2" "WORD0" "WORD3" "WORD0""WORD0" "WORD4,
+	 WORD0_RE, WORD0REP4,
+	 4, WORD0REP4" "WORD1" "WORD2" "WORD0REP4" "WORD3" "WORD0REP4""WORD0REP4" "WORD4);
+
+#undef WORD0
+#undef WORD0REP
+#undef WORD0REP2
+#undef WORD0REP3
+#undef WORD0REP4
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+#undef TESTCASE_START
+#undef TESTCASE_MIDDLE
+#undef TESTCASE_END
+#undef TESTCASE
+
+
+
+#define TESTCASE(in, off, rep, exp) \
+ { \
+	static const char _in = in; \
+	int _off = off; \
+	static const char _rep = rep; \
+	static const char _exp = exp; \
+	struct buf b = BUF_INITIALIZER; \
+ \
+	buf_appendcstr(&b, _in); \
+	buf_cstring(&b); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_in)-1); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _in); \
+ \
+	buf_insertcstr(&b, _off, _rep); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT(b.alloc >= b.len); \
+	buf_cstring(&b); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+	buf_free(&b); \
+ }
+
+static void test_insertcstr(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"gastropub"
+#define WORD1	"vegan brunch"
+#define WORD2	"portland"
+
+ TESTCASE(WORD0" "WORD2,
+	 0, WORD1"\t",
+	 WORD1"\t"WORD0" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0)-1, "\t"WORD1,
+	 WORD0"\t"WORD1" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0" "WORD2)-1, "\t"WORD1,
+	 WORD0" "WORD2"\t"WORD1);
+
+ TESTCASE("",
+	 0, WORD1,
+	 WORD1);
+
+ TESTCASE("",
+	 1, WORD1,
+	 "");
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+#undef TESTCASE
+
+
+#define TESTCASE(in, off, rep, exp) \
+ { \
+	static const char _in = in; \
+	int _off = off; \
+	static const char _rep = rep; \
+	static const char _exp = exp; \
+	struct buf b = BUF_INITIALIZER; \
+ \
+	buf_appendcstr(&b, _in); \
+	buf_cstring(&b); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_in)-1); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _in); \
+ \
+	buf_insertmap(&b, _off, _rep, sizeof(_rep)-1); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT(b.alloc >= b.len); \
+	buf_cstring(&b); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+	buf_free(&b); \
+ }
+
+static void test_insertmap(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"gastropub"
+#define WORD1	"vegan brunch"
+#define WORD2	"portland"
+
+ TESTCASE(WORD0" "WORD2,
+	 0, WORD1"\t",
+	 WORD1"\t"WORD0" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0)-1, "\t"WORD1,
+	 WORD0"\t"WORD1" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0" "WORD2)-1, "\t"WORD1,
+	 WORD0" "WORD2"\t"WORD1);
+
+ TESTCASE("",
+	 0, WORD1,
+	 WORD1);
+
+ TESTCASE("",
+	 1, WORD1,
+	 "");
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+#undef TESTCASE
+
+
+#define TESTCASE(in, off, rep, exp) \
+ { \
+	static const char _in = in; \
+	int _off = off; \
+	static const char _rep = rep; \
+	struct buf _repb = BUF_INITIALIZER; \
+	static const char _exp = exp; \
+	struct buf b = BUF_INITIALIZER; \
+\
+	buf_appendmap(&_repb, _rep, sizeof(_rep)-1); \
+ \
+	buf_appendcstr(&b, _in); \
+	buf_cstring(&b); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_in)-1); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _in); \
+ \
+	buf_insert(&b, _off, &_repb); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT(b.alloc >= b.len); \
+	buf_cstring(&b); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+	buf_free(&b); \
+	buf_free(&_repb); \
+ }
+
+static void test_insert(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"gastropub"
+#define WORD1	"brunch"
+#define WORD2	"portland"
+
+ TESTCASE(WORD0" "WORD2,
+	 0, WORD1"\t",
+	 WORD1"\t"WORD0" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0)-1, "\t"WORD1,
+	 WORD0"\t"WORD1" "WORD2);
+
+ TESTCASE(WORD0" "WORD2,
+	 sizeof(WORD0" "WORD2)-1, "\t"WORD1,
+	 WORD0" "WORD2"\t"WORD1);
+
+ TESTCASE("",
+	 0, WORD1,
+	 WORD1);
+
+ TESTCASE("",
+	 1, WORD1,
+	 "");
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+#undef TESTCASE
+
+
+#define TESTCASE(in, off, xlen, exp) \
+ { \
+	static const char _in = in; \
+	int _off = off; \
+	int _len = xlen; \
+	static const char _exp = exp; \
+	struct buf b = BUF_INITIALIZER; \
+ \
+	buf_appendcstr(&b, _in); \
+	buf_cstring(&b); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_in)-1); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _in); \
+ \
+	buf_remove(&b, _off, _len); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT(b.alloc >= b.len); \
+	buf_cstring(&b); \
+	CU_ASSERT_PTR_NOT_NULL(b.s); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+	buf_free(&b); \
+ }
+
+static void test_remove(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"fingerstache"
+#define WORD1	"scenester"
+#define WORD2	"ennui"
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 0, sizeof(WORD0),
+	 WORD1"\t"WORD2);
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 0, 0,
+	 WORD0" "WORD1"\t"WORD2);
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 sizeof(WORD0), sizeof(WORD1),
+	 WORD0" "WORD2);
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 sizeof(WORD0)+sizeof(WORD1), sizeof(WORD2)-1,
+	 WORD0" "WORD1"\t");
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 sizeof(WORD0)+sizeof(WORD1), sizeof(WORD2)-1+20,
+	 WORD0" "WORD1"\t");
+
+ TESTCASE(WORD0" "WORD1"\t"WORD2,
+	 0, sizeof(WORD0" "WORD1"\t"WORD2)-1,
+	 "");
+
+ TESTCASE("",
+	 0, 1,
+	 "");
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+#undef TESTCASE
+
+
+static void test_truncate(void)
+{
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+ struct buf b = BUF_INITIALIZER;
+ unsigned int i;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ /* buf_truncate() which shortens the buffer */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ buf_truncate(&b, sizeof(WORD0)-1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0);
+
+ /* buf_truncate() which extends and zero-fills the buffer */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+
+ buf_truncate(&b, sizeof(WORD0" "WORD1)-1+2048);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0" "WORD1)-1+2048);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, WORD0" "WORD1);
+ for (i=sizeof(WORD0" "WORD1)-1; i<sizeof(WORD0" "WORD1)-1+2048 ; i++)
+	if (b.si != 0)
+	 break;
+ CU_ASSERT_EQUAL(i, sizeof(WORD0" "WORD1)-1+2048);
+
+ buf_free(&b);
+
+#undef WORD0
+#undef WORD1
+}
+
+static void test_cmp(void)
+{
+/* words chosen to be in alphabetical order */
+#define WORD0		"alpha"
+#define WORD0SUB	"alp"
+#define WORD1		"omega"
+ struct buf a = BUF_INITIALIZER;
+ struct buf b = BUF_INITIALIZER;
+ int d;
+
+ /* compare two empty (null) bufs */
+ CU_ASSERT_PTR_NULL(a.s);
+ CU_ASSERT_EQUAL(a.len, 0);
+ CU_ASSERT_PTR_NULL(b.s);
+ CU_ASSERT_EQUAL(b.len, 0);
+ d = buf_cmp(&a, &b);
+ CU_ASSERT_EQUAL(d, 0);
+ d = buf_cmp(&b, &a);
+ CU_ASSERT_EQUAL(d, 0);
+
+ /* compare empty (null) vs empty (zero-length) */
+ buf_appendcstr(&b, "foo");
+ buf_truncate(&b, 0);
+ CU_ASSERT_PTR_NULL(a.s);
+ CU_ASSERT_EQUAL(a.len, 0);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_EQUAL(b.len, 0);
+ d = buf_cmp(&a, &b);
+ CU_ASSERT_EQUAL(d, 0);
+ d = buf_cmp(&b, &a);
+ CU_ASSERT_EQUAL(d, 0);
+
+ /* compare identical strings */
+ buf_reset(&a);
+ buf_appendcstr(&a, WORD0);
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0);
+ CU_ASSERT_PTR_NOT_NULL(a.s);
+ CU_ASSERT_EQUAL(a.len, sizeof(WORD0)-1);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ d = buf_cmp(&a, &b);
+ CU_ASSERT_EQUAL(d, 0);
+ d = buf_cmp(&b, &a);
+ CU_ASSERT_EQUAL(d, 0);
+
+ /* compare different strings */
+ buf_reset(&a);
+ buf_appendcstr(&a, WORD0);
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD1);
+ CU_ASSERT_PTR_NOT_NULL(a.s);
+ CU_ASSERT_EQUAL(a.len, sizeof(WORD0)-1);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD1)-1);
+ d = buf_cmp(&a, &b);
+ CU_ASSERT(d < 0);
+ d = buf_cmp(&b, &a);
+ CU_ASSERT(d > 0);
+
+ /* compare different strings where one is
+ * an initial subset of the other */
+ buf_reset(&a);
+ buf_appendcstr(&a, WORD0SUB);
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0);
+ CU_ASSERT_PTR_NOT_NULL(a.s);
+ CU_ASSERT_EQUAL(a.len, sizeof(WORD0SUB)-1);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ d = buf_cmp(&a, &b);
+ CU_ASSERT(d < 0);
+ d = buf_cmp(&b, &a);
+ CU_ASSERT(d > 0);
+
+ buf_free(&a);
+ buf_free(&b);
+#undef WORD0
+#undef WORD0SUB
+#undef WORD1
+}
+
+static void test_cow(void)
+{
+ static const char DATA0 = "LoRem";
+ struct buf b = BUF_INITIALIZER;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_init_ro(&b, DATA0, sizeof(DATA0)-1);
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)-1);
+ CU_ASSERT_EQUAL(b.alloc, 0);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_EQUAL(b.s, (char *)DATA0);
+
+ buf_putc(&b, 'X');
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)-1+1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NOT_EQUAL(b.s, (char *)DATA0);
+
+ buf_free(&b);
+}
+
+static void test_cow2(void)
+{
+ static const char DATA0 = "cardigan umami";
+ struct buf b = BUF_INITIALIZER;
+ const char *s;
+
+ CU_ASSERT_EQUAL(b.len, 0);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NULL(b.s);
+
+ buf_init_ro_cstr(&b, DATA0);
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)-1);
+ CU_ASSERT_EQUAL(b.alloc, 0);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_EQUAL(b.s, (char *)DATA0);
+
+ s = buf_cstring(&b);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_PTR_EQUAL(s, (char *)DATA0);
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)-1);
+ CU_ASSERT_EQUAL(b.alloc, 0);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_EQUAL(b.s, (char *)DATA0);
+
+ buf_putc(&b, 'X');
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)-1+1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NOT_EQUAL(b.s, (char *)DATA0);
+
+ buf_free(&b);
+}
+
+static int is_valid_mapping(const char *p, size_t len)
+{
+ /* To test the validity of an address mapping in a portable
+ * way, we're using a system call which will fail gracefully
+ * if the address is invalid. On Linux, the mremap() call
+ * would be the best way to do this, but we're only assuming
+ * POSIX systems so we use msync() */
+ int r;
+ unsigned long page_size = sysconf(_SC_PAGESIZE);
+
+ /* round up to a page size */
+ len = ((len + page_size-1) / page_size) * page_size;
+
+ r = msync((void *)p, len, 0);
+
+ if (r == 0)
+	return 1;		/* valid mapping */
+
+ if (r < 0 &&
+	(errno == EFAULT || errno == ENOMEM))
+	return 0;		/* not a valid mapping */
+
+ fprintf(stderr, "is_valid_mapping: unexpected error %d (%s)\n",
+	 errno, error_message(errno));
+ return -1;
+}
+
+static void test_mmap(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ char *fname = xstrdup("/tmp/cyrus-cunit-mmapXXXXXX");
+ int fd = mkstemp(fname);
+ const char *base = NULL;
+ size_t len = 0;
+ static const char DATA0 = "Brooklyn keffiyeh tattooed, "
+				"letterpress cosby sweater ennui "
+				"Austin.";
+
+ /* write out a trailing NUL too so we don't walk past
+ * the end of the mmap'ed region when comparing - just
+ * in case Valgrind is smart enough to detect that */
+ retry_write(fd, DATA0, sizeof(DATA0));
+
+ buf_init_mmap(&b, 1, fd, fname, MAP_UNKNOWN_LEN, NULL);
+ base = b.s;
+ len = b.len;
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0));
+ CU_ASSERT_EQUAL(b.alloc, 0);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, DATA0);
+
+ CU_ASSERT(is_valid_mapping(base, len));
+ buf_free(&b);
+ CU_ASSERT(!is_valid_mapping(base, len));
+
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static void test_mmap_cow(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ char *fname = xstrdup("/tmp/cyrus-cunit-mmapXXXXXX");
+ int fd = mkstemp(fname);
+ const char *base = NULL;
+ size_t len = 0;
+ static const char DATA0 = "Seitan mcsweeney's letterpress "
+				"bespoke, bushwick iphone banh mi";
+
+ /* write out a trailing NUL too so we don't walk past
+ * the end of the mmap'ed region when comparing - just
+ * in case Valgrind is smart enough to detect that */
+ retry_write(fd, DATA0, sizeof(DATA0));
+
+ map_refresh(fd, /*onceonly*/1, &base, &len, sizeof(DATA0), fname, NULL);
+
+ CU_ASSERT(is_valid_mapping(base, len));
+
+ buf_init_mmap(&b, 1, fd, fname, MAP_UNKNOWN_LEN, NULL);
+ base = b.s;
+ len = b.len;
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0));
+ CU_ASSERT_EQUAL(b.alloc, 0);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_STRING_EQUAL(b.s, DATA0);
+ CU_ASSERT(is_valid_mapping(base, len));
+
+ /* writing to the buf does a CoW, which munmap()s the data */
+ buf_putc(&b, 'X');
+ CU_ASSERT_EQUAL(b.len, sizeof(DATA0)+1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_EQUAL(buf_len(&b), b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_NOT_EQUAL(b.s, base);
+ CU_ASSERT_STRING_EQUAL(b.s, DATA0);
+ CU_ASSERT(b.ssizeof(DATA0) == 'X');
+ CU_ASSERT(!is_valid_mapping(base, len));
+
+ buf_free(&b);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static void test_findchar(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ int i;
+
+ buf_appendcstr(&b, "ABCDEF");
+ /* Note: buf is NOT a C-string so should get a Valgrind
+ * error if findchar() runs off the end */
+
+ i = buf_findchar(&b, 0, 'A');
+ CU_ASSERT_EQUAL(i, 0);
+
+ i = buf_findchar(&b, 0, 'C');
+ CU_ASSERT_EQUAL(i, 2);
+
+ i = buf_findchar(&b, 0, 'F');
+ CU_ASSERT_EQUAL(i, 5);
+
+ i = buf_findchar(&b, 0, 'X');
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 0, -1);
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 2, 'A');
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 2, 'C');
+ CU_ASSERT_EQUAL(i, 2);
+
+ i = buf_findchar(&b, 2, 'F');
+ CU_ASSERT_EQUAL(i, 5);
+
+ i = buf_findchar(&b, 2, 'X');
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 2, -1);
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 6, 'F');
+ CU_ASSERT_EQUAL(i, -1);
+
+ i = buf_findchar(&b, 6, 'X');
+ CU_ASSERT_EQUAL(i, -1);
+
+ buf_free(&b);
+}
+
+static void test_cowappendmap(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"beard"
+#define WORD1	"narwhal"
+ struct buf b = BUF_INITIALIZER;
+
+ buf_cowappendmap(&b, WORD0, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ CU_ASSERT(b.alloc == 0);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, WORD0, sizeof(WORD0)-1));
+
+ buf_cowappendmap(&b, WORD1, sizeof(WORD1)-1);
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1+sizeof(WORD1)-1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, WORD0""WORD1, sizeof(WORD0)-1+sizeof(WORD1)-1));
+
+ buf_free(&b);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_cowappendfree(void)
+{
+ /* data thanks to hipsteripsum.me */
+#define WORD0	"beard"
+#define WORD1	"narwhal"
+ struct buf b = BUF_INITIALIZER;
+ char *s;
+
+ s = xstrdup(WORD0);
+ buf_cowappendfree(&b, s, strlen(s));
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, WORD0, sizeof(WORD0)-1));
+
+ s = xstrdup(WORD1);
+ buf_cowappendfree(&b, s, strlen(s));
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)-1+sizeof(WORD1)-1);
+ CU_ASSERT(b.alloc >= b.len);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT(!memcmp(b.s, WORD0""WORD1, sizeof(WORD0)-1+sizeof(WORD1)-1));
+
+ /* we don't free s, buf_free() should do that */
+ buf_free(&b);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_bufprint(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ struct protstream *outstream;
+ int i;
+
+ outstream = prot_writebuf(&b);
+
+ for (i = 0; i < 5000; i++) {
+	prot_putc('.', outstream);
+ }
+
+ prot_flush(outstream);
+ prot_free(outstream);
+
+ CU_ASSERT_EQUAL(b.len, 5000);
+
+ buf_free(&b);
+}
+
+#ifdef HAVE_ZLIB
+static void test_compress(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ static const char DATA0 = "LoRem";
+ int r;
+
+ buf_printf(&b, "%s", DATA0);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), DATA0);
+
+ r = buf_deflate(&b, Z_DEFAULT_COMPRESSION, DEFLATE_RAW);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_NOT_EQUAL(buf_cstring(&b), DATA0);
+
+ r = buf_inflate(&b, DEFLATE_RAW);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), DATA0);
+
+ buf_free(&b);
+}
+#endif
+
+static void test_replace_shorten(void)
+{
+ struct buf b = BUF_INITIALIZER;
+
+ buf_appendcstr(&b, "dreamcatcher skateboard");
+
+ /* Test that buf_replace_all() does not wander off the end of the
+ * buffer if a replacement operation at the end of the string
+ * shortens the string - this would show up in Valgrind. */
+
+ buf_replace_all(&b, "skateboard", "truck");
+ CU_ASSERT_STRING_EQUAL(b.s, "dreamcatcher truck");
+
+ buf_free(&b);
+}
+
+static void test_replace_cow_cstr(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ static const char DATA0 = "food truck vegan";
+
+ buf_init_ro_cstr(&b, DATA0);
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_EQUAL(b.s, DATA0);
+ CU_ASSERT_STRING_EQUAL(b.s, "food truck vegan");
+
+ /* There was a bug where buf_replace_all() was enforcing that
+ * the buffer was a C string but not that it was writable, which
+ * is often the same but isn't after a buf_init_ro_cstr(). With
+ * the bug, buf_replace_all() would SEGV */
+
+ buf_replace_all(&b, "truck", "vinyl");
+ CU_ASSERT_PTR_NOT_NULL(b.s);
+ CU_ASSERT_PTR_NOT_EQUAL(b.s, DATA0);
+ CU_ASSERT_STRING_EQUAL(b.s, "food vinyl vegan");
+
+ buf_free(&b);
+}
+
+static void test_findline(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ int r;
+#define WORD0 "etsy"
+#define WORD1 "quinoa"
+#define WORD2 "dreamcatcher"
+#define WORD3 "shoreditch"
+#define WORD4 "williamsburg"
+#define WORD5 "brooklyn"
+#define WORDU "banksy"
+
+ buf_appendcstr(&b, WORD0"\n"WORD1"\n"WORD2"\n"WORD3" "WORD4"\n"WORD5"\n");
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+			 sizeof(WORD3)+sizeof(WORD4)+sizeof(WORD5));
+
+ /* a zero length line is always unfound */
+ r = buf_findline(&b, "");
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, "\n");
+ CU_ASSERT_EQUAL(r, -1);
+
+ /* a line which is not present is unfound */
+ r = buf_findline(&b, WORDU);
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORDU"\n");
+ CU_ASSERT_EQUAL(r, -1);
+
+ /* only the first line of the needle is searched for */
+ r = buf_findline(&b, WORD1"\n"WORD3"\n");
+ CU_ASSERT_EQUAL(r, sizeof(WORD0));
+
+ /* the very first line is found */
+ r = buf_findline(&b, WORD0);
+ CU_ASSERT_EQUAL(r, 0);
+ r = buf_findline(&b, WORD0"\n");
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* a line which is neither first nor last is found */
+ r = buf_findline(&b, WORD1);
+ CU_ASSERT_EQUAL(r, sizeof(WORD0));
+ r = buf_findline(&b, WORD1"\n");
+ CU_ASSERT_EQUAL(r, sizeof(WORD0));
+
+ /* a word which is a subset of a present line, is unfound */
+ r = buf_findline(&b, WORD3);
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORD3"\n");
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORD4);
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORD4"\n");
+ CU_ASSERT_EQUAL(r, -1);
+
+ /* the very last line is found */
+ r = buf_findline(&b, WORD5);
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+		 sizeof(WORD3)+sizeof(WORD4));
+ r = buf_findline(&b, WORD5"\n");
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+		 sizeof(WORD3)+sizeof(WORD4));
+
+ /* a word which is a subset of an earlier line, but
+ * matches a later present line, is found */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0"\n"WORD1" "WORD2"\n"WORD1"\n"WORD2"\n"WORD5"\n");
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+			 sizeof(WORD1)+sizeof(WORD2)+sizeof(WORD5));
+ r = buf_findline(&b, WORD1);
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2));
+ r = buf_findline(&b, WORD1"\n");
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2));
+ r = buf_findline(&b, WORD2);
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+		 sizeof(WORD1));
+ r = buf_findline(&b, WORD2"\n");
+ CU_ASSERT_EQUAL(r, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+		 sizeof(WORD1));
+
+ /* a word which is the first subset of the first line, is unfound */
+ buf_reset(&b);
+ buf_appendcstr(&b, WORD0" "WORD1"\n"WORD2" "WORD3"\n");
+ CU_ASSERT_EQUAL(b.len, sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2)+
+			 sizeof(WORD3));
+ r = buf_findline(&b, WORD0);
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORD0"\n");
+ CU_ASSERT_EQUAL(r, -1);
+
+ /* a word which is the last subset of the last line, is unfound */
+ r = buf_findline(&b, WORD3);
+ CU_ASSERT_EQUAL(r, -1);
+ r = buf_findline(&b, WORD3"\n");
+ CU_ASSERT_EQUAL(r, -1);
+
+ buf_free(&b);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+#undef WORD5
+#undef WORDU
+}
+
+/* TODO: test the Copy-On-Write feature of buf_ensure()...if anyone
+ * actually uses it */
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/byteorder64.testc Added

cyrus-imapd-2.5.tar.gz/cunit/cacert.pem Added

@@ -0,0 +1,66 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            dc:ff:1e:12:b0:0b:b6:a0
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+        Validity
+            Not Before: Feb  1 06:35:58 2011 GMT
+            Not After : Jan 31 06:35:58 2014 GMT
+        Subject: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:da:e4:ec:8f:ef:07:6d:58:b3:13:3e:d0:25:30:
+                    07:11:35:88:df:70:5c:f5:0d:10:5c:a6:96:4b:e4:
+                    9c:f3:df:3f:8f:54:fa:00:1b:a2:b9:e8:5f:17:19:
+                    ee:a8:9a:5d:40:59:6b:d3:90:1b:6f:6c:3b:27:0c:
+                    be:e0:32:1a:a6:31:bc:57:e5:20:86:c8:c2:2f:b1:
+                    7c:a0:fe:a9:d7:57:7e:6c:3e:ee:92:b7:f7:7a:fe:
+                    20:e1:4e:46:91:0a:4a:c2:5b:23:1c:f2:03:0a:8d:
+                    cc:c9:e4:9b:d8:02:fb:97:6e:38:ee:ce:8d:1f:6b:
+                    d6:45:70:f8:b9:3b:6e:d3:a7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+            X509v3 Authority Key Identifier: 
+                keyid:D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+                DirName:/C=AU/ST=Victoria/O=Cyrus IMAP Testers, Inc./OU=SSL Wrangling/CN=Greg Banks/emailAddress=gnb@fastmail.fm
+                serial:DC:FF:1E:12:B0:0B:B6:A0
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        6f:ec:eb:37:40:53:b0:af:c7:db:28:64:6f:5d:49:80:7d:2f:
+        98:59:3b:18:c4:f9:19:57:5d:04:80:97:0e:9e:dc:d5:fe:da:
+        93:d9:55:38:ec:33:f7:e2:e2:c0:ba:9c:13:4d:15:1b:52:40:
+        af:93:1b:6c:97:74:7a:cc:1d:8d:31:ec:cd:b0:ba:31:5e:18:
+        44:45:7a:80:3d:e4:6d:18:dc:87:95:f9:2b:8e:3c:1f:64:04:
+        b1:8e:10:fb:6b:db:60:ed:62:75:d5:08:ab:55:03:ff:a5:7c:
+        33:0a:66:07:35:37:b2:49:93:e7:8a:80:c7:0d:e9:c0:fe:9b:
+        80:2a
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAwKgAwIBAgIJANz/HhKwC7agMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAg
+VGVzdGVycywgSW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMK
+R3JlZyBCYW5rczEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtMB4XDTEx
+MDIwMTA2MzU1OFoXDTE0MDEzMTA2MzU1OFowgZAxCzAJBgNVBAYTAkFVMREwDwYD
+VQQIEwhWaWN0b3JpYTEhMB8GA1UEChMYQ3lydXMgSU1BUCBUZXN0ZXJzLCBJbmMu
+MRYwFAYDVQQLEw1TU0wgV3JhbmdsaW5nMRMwEQYDVQQDEwpHcmVnIEJhbmtzMR4w
+HAYJKoZIhvcNAQkBFg9nbmJAZmFzdG1haWwuZm0wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANrk7I/vB21YsxM+0CUwBxE1iN9wXPUNEFymlkvknPPfP49U+gAb
+ornoXxcZ7qiaXUBZa9OQG29sOycMvuAyGqYxvFflIIbIwi+xfKD+qddXfmw+7pK3
+93r+IOFORpEKSsJbIxzyAwqNzMnkm9gC+5duOO7OjR9r1kVw+Lk7btOnAgMBAAGj
+gfgwgfUwHQYDVR0OBBYEFNONAFabcZnOAET0hpiuqXirIBeKMIHFBgNVHSMEgb0w
+gbqAFNONAFabcZnOAET0hpiuqXirIBeKoYGWpIGTMIGQMQswCQYDVQQGEwJBVTER
+MA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAgVGVzdGVycywg
+SW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMKR3JlZyBCYW5r
+czEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtggkA3P8eErALtqAwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBv7Os3QFOwr8fbKGRvXUmAfS+Y
+WTsYxPkZV10EgJcOntzV/tqT2VU47DP34uLAupwTTRUbUkCvkxtsl3R6zB2NMezN
+sLoxXhhERXqAPeRtGNyHlfkrjjwfZASxjhD7a9tg7WJ11QirVQP/pXwzCmYHNTey
+SZPnioDHDenA/puAKg==
+-----END CERTIFICATE-----

cyrus-imapd-2.5.tar.gz/cunit/cert.pem Added

@@ -0,0 +1,63 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            dc:ff:1e:12:b0:0b:b6:a1
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wrangling, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+        Validity
+            Not Before: Feb  1 07:40:55 2011 GMT
+            Not After : Feb  1 07:40:55 2012 GMT
+        Subject: C=AU, ST=Victoria, O=Cyrus IMAP Testers, Inc., OU=SSL Wranglers, CN=Greg Banks/emailAddress=gnb@fastmail.fm
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:f2:cc:96:27:92:93:ad:56:9c:78:85:68:d0:bd:
+                    00:00:62:7a:d5:22:b3:54:f0:4a:1b:bc:18:8d:7e:
+                    37:1f:cb:b0:04:ab:d8:91:55:37:c8:89:79:2f:94:
+                    cd:02:d3:34:0f:49:ca:68:80:1c:8b:9b:be:43:c4:
+                    8f:a1:53:04:a8:35:b7:8d:d8:67:ec:92:30:89:87:
+                    55:0b:a9:9d:45:37:88:af:ea:99:64:11:9c:5e:c2:
+                    d5:95:17:df:37:23:f1:0c:75:e9:0b:b6:1e:b0:80:
+                    7d:a0:da:87:6c:80:3f:73:72:f4:d4:b4:5d:54:78:
+                    07:6b:ef:7f:7f:0a:08:84:bb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                96:48:A2:12:B6:AD:DC:B8:94:D4:4E:46:94:C4:1E:AF:32:4C:B9:01
+            X509v3 Authority Key Identifier: 
+                keyid:D3:8D:00:56:9B:71:99:CE:00:44:F4:86:98:AE:A9:78:AB:20:17:8A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        7a:4c:82:b7:55:31:76:89:44:08:57:0d:c9:df:82:e7:1f:94:
+        b1:5f:a6:bc:93:63:d7:90:74:25:b0:0b:5b:eb:b6:d0:46:e3:
+        59:34:8c:e8:46:7a:33:af:b6:4d:3f:b8:0a:dd:89:51:22:f2:
+        f8:26:97:9e:4b:62:8a:10:f4:87:0c:cb:53:ff:c8:2b:a2:95:
+        0e:02:65:e5:97:b5:ad:c6:87:25:c9:dc:35:b5:c7:e2:4d:d5:
+        cb:dd:a7:2a:e4:0f:7e:e1:a3:b8:fa:11:02:61:0e:04:2b:3a:
+        a7:73:80:e1:26:24:24:6c:fb:35:50:31:6e:ce:15:53:c7:43:
+        1a:60
+-----BEGIN CERTIFICATE-----
+MIIDGzCCAoSgAwIBAgIJANz/HhKwC7ahMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExITAfBgNVBAoTGEN5cnVzIElNQVAg
+VGVzdGVycywgSW5jLjEWMBQGA1UECxMNU1NMIFdyYW5nbGluZzETMBEGA1UEAxMK
+R3JlZyBCYW5rczEeMBwGCSqGSIb3DQEJARYPZ25iQGZhc3RtYWlsLmZtMB4XDTEx
+MDIwMTA3NDA1NVoXDTEyMDIwMTA3NDA1NVowgZAxCzAJBgNVBAYTAkFVMREwDwYD
+VQQIEwhWaWN0b3JpYTEhMB8GA1UEChMYQ3lydXMgSU1BUCBUZXN0ZXJzLCBJbmMu
+MRYwFAYDVQQLEw1TU0wgV3JhbmdsZXJzMRMwEQYDVQQDEwpHcmVnIEJhbmtzMR4w
+HAYJKoZIhvcNAQkBFg9nbmJAZmFzdG1haWwuZm0wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAPLMlieSk61WnHiFaNC9AABietUis1TwShu8GI1+Nx/LsASr2JFV
+N8iJeS+UzQLTNA9JymiAHIubvkPEj6FTBKg1t43YZ+ySMImHVQupnUU3iK/qmWQR
+nF7C1ZUX3zcj8Qx16Qu2HrCAfaDah2yAP3Ny9NS0XVR4B2vvf38KCIS7AgMBAAGj
+ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+IENlcnRpZmljYXRlMB0GA1UdDgQWBBSWSKIStq3cuJTUTkaUxB6vMky5ATAfBgNV
+HSMEGDAWgBTTjQBWm3GZzgBE9IaYrql4qyAXijANBgkqhkiG9w0BAQUFAAOBgQB6
+TIK3VTF2iUQIVw3J34LnH5SxX6a8k2PXkHQlsAtb67bQRuNZNIzoRnozr7ZNP7gK
+3YlRIvL4JpeeS2KKEPSHDMtT/8gropUOAmXll7Wtxoclydw1tcfiTdXL3acq5A9+
+4aO4+hECYQ4EKzqnc4DhJiQkbPs1UDFuzhVTx0MaYA==
+-----END CERTIFICATE-----

cyrus-imapd-2.5.tar.gz/cunit/charset.testc Added

@@ -0,0 +1,672 @@
+#include <stdlib.h>
+
+#include "cunit/cunit.h"
+#include "charset.h"
+
+extern int charset_debug;
+
+/* The Unicode Replacement character 0xfffd in UTF-8 encoding */
+#define UTF8_REPLACEMENT "\357\277\275"
+/* The Replacement char after search normalisation */
+#define SEARCH_REPLACEMENT "\377"
+
+static void test_lookupname(void)
+{
+ int cs, cs2;
+
+ /* us-ascii must exist */
+ cs = charset_lookupname("us-ascii");
+ CU_ASSERT(cs >= 0);
+
+ /* names are case-insensitive */
+ cs2 = charset_lookupname("US-ASCII");
+ CU_ASSERT(cs2 >= 0);
+ CU_ASSERT_EQUAL(cs, cs2);
+
+ cs2 = charset_lookupname("Us-AsCiI");
+ CU_ASSERT(cs2 >= 0);
+ CU_ASSERT_EQUAL(cs, cs2);
+
+ /* some others must also exist */
+ cs = charset_lookupname("utf-8");
+ CU_ASSERT(cs >= 0);
+
+ cs = charset_lookupname("utf-7");
+ CU_ASSERT(cs >= 0);
+
+ cs = charset_lookupname("iso-8859-1");
+ CU_ASSERT(cs >= 0);
+}
+
+static void test_to_utf8(void)
+{
+ int cs;
+ char *s;
+ static const char ASCII_1 = "Hello World";
+ static const char ASCII_2 = "Hello W\370rld";
+ static const char UTF8_2 = "Hello W" UTF8_REPLACEMENT "rld";
+ static const char BASE64_3 = "SGVsbG8gV29ybGQ=";
+ static const char QP_4 =
+"If you believe that truth=3Dbeauty, then surely=20=\r\n"
+"mathematics is the most beautiful branch of philosophy.\r\n";
+ static const char ASCII_4 =
+"If you believe that truth=beauty, then surely "
+"mathematics is the most beautiful branch of philosophy.\r\n";
+
+ cs = charset_lookupname("us-ascii");
+ CU_ASSERT(cs >= 0);
+
+ /* zero length input */
+ s = charset_to_utf8("", 0, cs, ENCODING_NONE);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, "");
+ free(s);
+
+ /* invalid encoding */
+ s = charset_to_utf8(ASCII_1, sizeof(ASCII_1), cs, 0xdeadbeef);
+ CU_ASSERT_PTR_NULL(s);
+
+ /* invalid charset */
+ s = charset_to_utf8(ASCII_1, sizeof(ASCII_1), 0xdeadbeef, ENCODING_NONE);
+ CU_ASSERT_PTR_NULL(s);
+
+ /* simple ASCII string */
+ s = charset_to_utf8(ASCII_1, sizeof(ASCII_1)-1, cs, ENCODING_NONE);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, ASCII_1);
+ free(s);
+
+ /* ASCII string with an invalid character */
+ s = charset_to_utf8(ASCII_2, sizeof(ASCII_2)-1, cs, ENCODING_NONE);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, UTF8_2);
+ free(s);
+
+ /* base64 encoding */
+ s = charset_to_utf8(BASE64_3, sizeof(BASE64_3)-1, cs, ENCODING_BASE64);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, ASCII_1);
+ free(s);
+
+ /* Quoted-printable encoding */
+ s = charset_to_utf8(QP_4, sizeof(QP_4)-1, cs, ENCODING_QP);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, ASCII_4);
+ free(s);
+}
+
+static void test_qp(void)
+{
+ /* corner cases in Quoted-Printable */
+#define TESTCASE(in, cs, enc, exp) \
+ { \
+	static const char _in = (in); \
+	static const char _exp = (exp); \
+	int _cs = (cs); \
+	int _enc = (enc); \
+	char *s = charset_to_utf8(_in, sizeof(_in)-1, _cs, _enc); \
+	CU_ASSERT_PTR_NOT_NULL(s); \
+	CU_ASSERT_STRING_EQUAL(s, _exp); \
+	free(s); \
+ }
+
+ /* encoding of SP */
+ TESTCASE("ab=20xy", 0, ENCODING_QP, "ab xy");
+
+ /* encoding of '=' */
+ TESTCASE("ab=3Dxy", 0, ENCODING_QP, "ab=xy");
+
+ /* lowercase also */
+ TESTCASE("ab=3dxy", 0, ENCODING_QP, "ab=xy");
+
+ /* underscore is not special outside of headers */
+ TESTCASE("ab_xy", 0, ENCODING_QP, "ab_xy");
+
+ /* invalid characters after = are passed through
+ * even if one of them is a valid hexchar */
+ TESTCASE("ab=ZZxy", 0, ENCODING_QP, "ab=ZZxy");
+ TESTCASE("ab=ZCxy", 0, ENCODING_QP, "ab=ZCxy");
+ TESTCASE("ab=CZxy", 0, ENCODING_QP, "ab=CZxy");
+ TESTCASE("ab=Zcxy", 0, ENCODING_QP, "ab=Zcxy");
+ TESTCASE("ab=cZxy", 0, ENCODING_QP, "ab=cZxy");
+
+ /* soft line break */
+ TESTCASE("ab=\r\nxy", 0, ENCODING_QP, "abxy");
+
+#undef TESTCASE
+}
+
+
+static void test_decode_mimeheader(void)
+{
+ char *s;
+ static const char ASCII_1 = "Lorem IPSUM dolor \t \t sit amet";
+ static const char SEARCH_1 = "LOREM IPSUM DOLOR SIT AMET";
+ static const char ASCII_B64_2 = "Lorem =?us-ascii?q?ipsum?= dolor "
+				 "=?US-ASCII?Q?sit amet?=";
+ static const char ASCII_B64_3 = "Lorem =?iso-8859-1?q?ips=fcm?= \t"
+				 "DOLOR =?iso-8859-1?Q?s=eft am=ebt?=";
+ static const char SEARCH_3 = "LOREM IPSUM DOLOR SIT AMET";
+ static const char SEARCH_3b = "LOREM IPSÜM DOLOR SÏT AMËT";
+ static const char SEARCH_3c = "LOREMIPSUMDOLORSITAMET";
+ static const char SEARCH_3d = "LOREMIPSÜMDOLORSÏTAMËT";
+ static const char SEARCH_3e = "LOREM IPSÜM DOLOR SÏT AMËT";
+ int flags = CHARSET_SKIPDIACRIT | CHARSET_MERGESPACE; /* default */
+
+ s = charset_decode_mimeheader(NULL, flags);
+ CU_ASSERT_PTR_NULL(s);
+ free(s);
+
+ s = charset_decode_mimeheader("", flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, "");
+ free(s);
+
+ s = charset_decode_mimeheader(ASCII_1, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_1);
+ free(s);
+
+ s = charset_decode_mimeheader(ASCII_B64_2, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_1);
+ free(s);
+
+ s = charset_decode_mimeheader(ASCII_B64_3, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_3);
+ free(s);
+
+ flags = CHARSET_MERGESPACE;
+ s = charset_decode_mimeheader(ASCII_B64_3, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_3b);
+ free(s);
+
+ flags = CHARSET_SKIPSPACE | CHARSET_SKIPDIACRIT;
+ s = charset_decode_mimeheader(ASCII_B64_3, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_3c);
+ free(s);
+
+ flags = CHARSET_SKIPSPACE;
+ s = charset_decode_mimeheader(ASCII_B64_3, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_3d);
+ free(s);
+
+ flags = 0;
+ s = charset_decode_mimeheader(ASCII_B64_3, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_3e);
+ free(s);
+}
+
+static void test_mimeheader_badcharset(void)
+{
+ /* when given an unknown charset, the entire word is
+ * replaced with a single Unicode replacement char */
+ char *s;
+ static const char ASCII_1 = "A =?EUC-KR?B?wMzIo8Dn?= B";
+ static const char SEARCH_1 = "A " UTF8_REPLACEMENT "B";
+ int flags = CHARSET_SKIPDIACRIT | CHARSET_MERGESPACE; /* default */
+
+ s = charset_decode_mimeheader(ASCII_1, flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, SEARCH_1);
+ free(s);
+}
+
+static void test_mime_unfold(void)
+{
+ char *s;
+
+ /* Test unfolding and the 'keep' space option. Note that 'keep' is
+ * a bit of a misnomer, it actually converts whitespace characters
+ * to SP before keeping the same *number* of chars, which is
+ * actually quite unhelpful.
+ */
+ s = charset_decode_mimeheader(
+"From: foo@bar\r\n"
+"To: baz@quux\r\n"
+"Subject: this\r\n"
+"\tline is continued\r\n"
+"Keywords: and\r\n"
+"\tso is\r\n"
+" this one\r\n"
+"\r\n",
+ CHARSET_SKIPDIACRIT);
+ CU_ASSERT_STRING_EQUAL(s,
+"FROM: FOO@BAR "
+"TO: BAZ@QUUX "
+"SUBJECT: THIS LINE IS CONTINUED "
+"KEYWORDS: AND SO IS THIS ONE "
+" "
+ );
+ free(s);
+
+ /* test unfolding and the 'merge' space option which merges any
+ * amount of whitespace down to a single SP character */
+ s = charset_decode_mimeheader(
+"From: foo@bar\r\n"
+"To: baz@quux\r\n"
+"Subject: this\r\n"
+"\tline is continued\r\n"
+"Keywords: and\r\n"
+"\tso is\r\n"
+" this one\r\n"
+"\r\n",
+ CHARSET_SKIPDIACRIT|CHARSET_MERGESPACE);
+ CU_ASSERT_STRING_EQUAL(s,
+"FROM: FOO@BAR "
+"TO: BAZ@QUUX "
+"SUBJECT: THIS LINE IS CONTINUED "
+"KEYWORDS: AND SO IS THIS ONE "
+ );
+ free(s);
+
+ /* test unfolding and the 'skip' space option which elides
+ * all whitespace. */
+ s = charset_decode_mimeheader(
+"From: foo@bar\r\n"
+"To: baz@quux\r\n"
+"Subject: this\r\n"
+"\tline is continued\r\n"
+"Keywords: and\r\n"
+"\tso is\r\n"
+" this one\r\n"
+"\r\n",
+ CHARSET_SKIPDIACRIT|CHARSET_SKIPSPACE);
+ CU_ASSERT_STRING_EQUAL(s,
+"FROM:FOO@BAR"
+"TO:BAZ@QUUX"
+"SUBJECT:THISLINEISCONTINUED"
+"KEYWORDS:ANDSOISTHISONE"
+ );
+ free(s);
+}
+
+static void test_search_mimeheader(void)
+{
+ char *s;
+ comp_pat *pat;
+ static const char SUBJECT_CP1252 = "=?Cp1252?Q?Herzlichen_Gl=FCckwunsch,_der_Artikel_Canon_Ob?= "
+				 "=?Cp1252?Q?jektiv_EF-S_18-55_mm_1:3,5-5,6_geh=F6rt_Ihnen!?=";
+ static const char SEARCH_CP1252 = "Herzlichen";
+ int flags = CHARSET_SKIPDIACRIT | CHARSET_MERGESPACE; /* default */
+
+ s = charset_convert(SEARCH_CP1252, 0, flags);
+ pat = charset_compilepat(s);
+ CU_ASSERT(charset_search_mimeheader(s, pat, SUBJECT_CP1252, flags));
+ charset_freepat(pat);
+ free(s);
+}
+
+static void test_rfc5051(void)
+{
+ /* Example: codepoint U+01C4 (LATIN CAPITAL LETTER DZ WITH CARON)
+ * has a titlecase property of U+01C5 (LATIN CAPITAL LETTER D
+ * WITH SMALL LETTER Z WITH CARON). Codepoint U+01C5 has a
+ * decomposition property of U+0044 (LATIN CAPITAL LETTER D)
+ * U+017E (LATIN SMALL LETTER Z WITH CARON). U+017E has a
+ * decomposition property of U+007A (LATIN SMALL LETTER Z) U+030c
+ */
+ char *s;
+ static const char STR_RFC5051 = {0xc7, 0x84, 0};
+ static const char RES_RFC5051 = {'D', 'z', 0xcc, 0x8c, 0};
+ int flags = 0; /* super complient */
+
+ s = charset_convert(STR_RFC5051, charset_lookupname("utf-8"), flags);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, RES_RFC5051);
+ free(s);
+}
+
+struct text_rock {
+ int ncalls;
+ struct buf out;
+};
+
+static void append_text(const struct buf *text, void *rock)
+{
+ struct text_rock *tr = (struct text_rock *)rock;
+
+ tr->ncalls++;
+ buf_append(&tr->out, text);
+}
+
+#define TESTCASE(in, cs, enc, st, exp) \
+ { \
+	static const char _in = (in); \
+	static int _cs = (cs); \
+	int _enc = (enc); \
+	static const char _st = (st); \
+	static const char _exp = (exp); \
+	struct buf bin = BUF_INITIALIZER; \
+	struct text_rock tr; \
+	int r; \
+ \
+	memset(&tr, 0, sizeof(tr)); \
+	buf_init_ro(&bin, _in, sizeof(_in)-1); \
+ \
+	r = charset_extract(append_text, &tr, &bin, _cs, _enc, _st, flags); \
+	CU_ASSERT_EQUAL(r, 1); \
+	CU_ASSERT_EQUAL(tr.ncalls, 1); \
+	CU_ASSERT_STRING_EQUAL(buf_cstring(&tr.out), _exp); \
+ \
+	buf_free(&bin); \
+	buf_free(&tr.out); \
+ }
+
+static void test_extract(void)
+{
+ int flags = CHARSET_SKIPDIACRIT | CHARSET_MERGESPACE; /* default */
+ /* data thanks to hipsteripsum.me */
+
+ /* simplest case - no space, plain text is capitalised */
+ TESTCASE("freegan", 0, ENCODING_NONE, "PLAIN", "FREEGAN");
+
+ /* capitalised text is still capitalised */
+ TESTCASE("FANNY PACK", 0, ENCODING_NONE, "PLAIN", "FANNY PACK");
+
+ /* single spaces become single spaces */
+ TESTCASE("before they sold out",
+	 0, ENCODING_NONE, "PLAIN",
+	 "BEFORE THEY SOLD OUT");
+
+ /* multiple spaces are squashed to a single spaces */
+ TESTCASE("you probably \t haven't\r\nheard\t\r\tof them",
+	 0, ENCODING_NONE, "PLAIN",
+	 "YOU PROBABLY HAVEN'T HEARD OF THEM");
+
+ /* invalid UTF-8 bytes become the Replacement character */
+ TESTCASE("a\300b", 0, ENCODING_NONE, "PLAIN", /* 0xC0 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\301b", 0, ENCODING_NONE, "PLAIN", /* 0xC1 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\365b", 0, ENCODING_NONE, "PLAIN", /* 0xF5 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\366b", 0, ENCODING_NONE, "PLAIN", /* 0xF6 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\367b", 0, ENCODING_NONE, "PLAIN", /* 0xF7 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\370b", 0, ENCODING_NONE, "PLAIN", /* 0xF8 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\371b", 0, ENCODING_NONE, "PLAIN", /* 0xF9 */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\372b", 0, ENCODING_NONE, "PLAIN", /* 0xFA */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\373b", 0, ENCODING_NONE, "PLAIN", /* 0xFB */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\374b", 0, ENCODING_NONE, "PLAIN", /* 0xFC */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\375b", 0, ENCODING_NONE, "PLAIN", /* 0xFD */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\376b", 0, ENCODING_NONE, "PLAIN", /* 0xFE */
+	 "A"UTF8_REPLACEMENT"B");
+ TESTCASE("a\377b", 0, ENCODING_NONE, "PLAIN", /* 0xFF */
+	 "A"UTF8_REPLACEMENT"B");
+
+ /* ill-formed UTF-8 sequences become the Replacement character */
+
+ /* 2-byte sequence lead byte then a non-continuation byte */
+ TESTCASE("a\302bcd", 0, ENCODING_NONE, "PLAIN",
+	 "A"UTF8_REPLACEMENT"BCD");
+ /* 3-byte sequence lead byte then a non-continuation byte */
+ TESTCASE("a\340bcde", 0, ENCODING_NONE, "PLAIN",
+	 "A"UTF8_REPLACEMENT"BCDE");
+ /* 4-byte sequence lead byte then a non-continuation byte */
+ TESTCASE("a\360bcdef", 0, ENCODING_NONE, "PLAIN",
+	 "A"UTF8_REPLACEMENT"BCDEF");
+ /* unexpected continuation byte */
+ TESTCASE("a\240bc", 0, ENCODING_NONE, "PLAIN",
+	 "A"UTF8_REPLACEMENT"BC");
+
+ /* HTML: correctly formed balanced tag pairs */
+ TESTCASE("Photo booth",
+	0, ENCODING_NONE, "HTML",
+	"PHOTO BOOTH");
+
+ /* HTML: unbalanced tags */
+ TESTCASE("American Apparel",
+	0, ENCODING_NONE, "HTML",
+	"AMERICAN APPAREL");
+
+ /* HTML: OMITTAG tags with and without end tags */
+ TESTCASE("<hr>Terry<hr> <hr>Richardson</hr>",
+	0, ENCODING_NONE, "HTML",
+	" TERRY RICHARDSON ");
+
+ /* HTML: non-phrasing tags are replaced with whitespace */
+ TESTCASE("hella mlkshk",
+	0, ENCODING_NONE, "HTML",
+	"HELLA MLKSHK");
+ TESTCASE("godard synth",
+	0, ENCODING_NONE, "HTML",
+	"GODARD SYNTH");
+ TESTCASE("<div>vinyl</div><div>narwhal</div>",
+	0, ENCODING_NONE, "HTML",
+	" VINYL NARWHAL ");
+
+ /* HTML: quoted tag parameters */
+ TESTCASE("<a href=\"foo.html\">leggings</a> <img src\"beer.jpg\">gastropub",
+	0, ENCODING_NONE, "HTML",
+	"LEGGINGS GASTROPUB");
+
+ /* HTML: unquoted tag parameters */
+ TESTCASE("<a href=foo.html>biodiesel</a> <img srcbeer.jpg>seitan",
+	0, ENCODING_NONE, "HTML",
+	"BIODIESEL SEITAN");
+
+ /* HTML: contents of SCRIPT tag */
+ TESTCASE("viral <script>bicycle rights</script>readymade",
+	0, ENCODING_NONE, "HTML",
+	"VIRAL READYMADE");
+
+ /* HTML: HTML4 SCRIPT tag with no contents */
+ TESTCASE("cardigan <script type=\"text/javascript\" "
+	 "src=\"truffaut.js\"></script>williamsburg",
+	0, ENCODING_NONE, "HTML",
+	"CARDIGAN WILLIAMSBURG");
+
+ /* HTML: XHTML SCRIPT empty-element-tag aka self-closing tag */
+ TESTCASE("brunch <script type=\"text/javascript\" "
+	 "src=\"cred.js\"/>shoreditch",
+	0, ENCODING_NONE, "HTML",
+	"BRUNCH SHOREDITCH");
+
+ /* HTML: contents of STYLE tag */
+ TESTCASE("pickled <style>whatever tumblr</style>stumptown",
+	0, ENCODING_NONE, "HTML",
+	"PICKLED STUMPTOWN");
+
+ /* HTML: comments, correctly formed */
+ TESTCASE("pinterest forage",
+	0, ENCODING_NONE, "HTML",
+	"PINTEREST FORAGE");
+
+ /* HTML: comments correctly formed with embedded -- */
+ TESTCASE("polaroid letterpress",
+	0, ENCODING_NONE, "HTML",
+	"POLAROID LETTERPRESS");
+
+ /* HTML: comments correctly formed with embedded tags */
+ TESTCASE("semiotics scenester",
+	0, ENCODING_NONE, "HTML",
+	"SEMIOTICS SCENESTER");
+
+ /* HTML: comments correctly formed with embedded -> */
+ TESTCASE("butcher whatever",
+	0, ENCODING_NONE, "HTML",
+	"BUTCHER WHATEVER");
+
+ /* HTML: comments correctly formed with ---> ending */
+ TESTCASE("ennui keffiyeh",
+	0, ENCODING_NONE, "HTML",
+	"ENNUI KEFFIYEH");
+
+ /* HTML: trivial comment */
+ TESTCASE("street <!-->art",
+	0, ENCODING_NONE, "HTML",
+	"STREET ART");
+
+ /* HTML: initial DOCTYPE is ignored */
+ TESTCASE("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" "
+	 "\"http://www.w3.org/TR/html4/strict.dtd\">ethnic sustainable",
+	0, ENCODING_NONE, "HTML",
+	"ETHNIC SUSTAINABLE");
+
+ /* HTML: simple character references */
+ TESTCASE("&quot;Twee &amp; Keytar&quot; &lt;dreamcatcher@umami.org&gt;",
+	0, ENCODING_NONE, "HTML",
+	"\"TWEE & KEYTAR\" <DREAMCATCHER@UMAMI.ORG>");
+
+ /* HTML: naked & is emitted */
+ TESTCASE("gentrify&sartorial",
+	0, ENCODING_NONE, "HTML",
+	"GENTRIFY&SARTORIAL");
+
+ /* HTML: non-zero length unterminated entities are emitted */
+ TESTCASE("tattooed&amp locavore",
+	0, ENCODING_NONE, "HTML",
+	"TATTOOED& LOCAVORE");
+
+ /* HTML: decimal Unicode entities: U+267B RECYCLE SYMBOL */
+ TESTCASE("odd&#9851;future",
+	0, ENCODING_NONE, "HTML",
+	"ODD♻FUTURE");
+
+ /* HTML: hexadecimal Unicode entities: U+2704 SCISSORS */
+ TESTCASE("odd&#x2704;future",
+	0, ENCODING_NONE, "HTML",
+	"ODD✄FUTURE");
+
+ /* HTML: compatibility numerical character references */
+ TESTCASE(
+	"A&#128;B&#129;C&#130;D&#131;"
+	"E&#132;F&#133;G&#134;H&#135;"
+	"I&#136;J&#137;K&#138;L&#139;"
+	"M&#140;N&#141;O&#142;P&#143;"
+	"Q&#144;R&#145;S&#146;T&#147;"
+	"U&#148;V&#149;W&#150;X&#151;"
+	"Y&#152;Z&#153;A&#154;B&#155;"
+	"C&#156;D&#157;E&#158;F&#159;g",
+	0, ENCODING_NONE, "HTML",
+	"A€BC‚DƑ"	/* ƒ capitalised */
+	"E„F...G†H‡"	/* … normalised to ... */
+	"IˆJ‰KSL‹"	/* Š normalised to S */
+	"MŒNOZP"	/* Ž normalised to Z */
+	"QR‘S’T“"
+	"U”V•W–X—"
+	"Y˜ZTMASB›"	/* š capitalised then normalised to S,
+			 * ™ normalised to TM */
+	"CŒDEZFYG")	/* œ capitalised to Œ,
+			 ž capitalised then normalised to Z,
+			 * Ÿ normalised to Y */
+
+ /* HTML: numerical character references to invalid Unicode
+ * codepoints and valid codepoints just adjacent to invalid
+ * ranges. HTML5 requires us to emit a Replacement char. */
+ TESTCASE("A&#xd7ff;B", 0, ENCODING_NONE, "HTML", "A\355\237\277B");
+ TESTCASE("A&#xd800;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#xd801;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#xdffe;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#xdfff;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#xc000;B", 0, ENCODING_NONE, "HTML", "A\354\200\200B");
+ TESTCASE("A&#x10fffd;B", 0, ENCODING_NONE, "HTML", "A\364\217\277\275B");
+ TESTCASE("A&#x110000;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#x7fffffff;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&#xffffffff;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+
+ /* HTML: zero numerical character reference. The HTML5 spec says
+ * to return a Replacement char. */
+ TESTCASE("A&#0;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+
+ /* HTML: numerical character references whose codepoints the HTML5
+ * spec says are a parse error. We just silently swallow these. */
+ /* U+0001..U+0008 */
+ TESTCASE("A&#1;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#8;B", 0, ENCODING_NONE, "HTML", "AB");
+ /* U+000B */
+ TESTCASE("A&#xb;B", 0, ENCODING_NONE, "HTML", "AB");
+ /* U+000E..U+001F */
+ TESTCASE("A&#xe;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x1f;B", 0, ENCODING_NONE, "HTML", "AB");
+ /* U+007F..U+009f, when not a compatibility codepoint */
+ TESTCASE("A&#x7f;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x81;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x8D;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x8F;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x90;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x9D;B", 0, ENCODING_NONE, "HTML", "AB");
+ /* U+FDD0..U+FDEF */
+ TESTCASE("A&#xFDD0;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xFDEF;B", 0, ENCODING_NONE, "HTML", "AB");
+ /* the last two codepoints in each plane */
+ TESTCASE("A&#xFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x1FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x1FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x2FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x2FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x3FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x3FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x4FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x4FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x5FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x5FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x6FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x6FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x7FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x7FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x8FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x8FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x9FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x9FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xAFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xAFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xBFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xBFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xCFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xCFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xDFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xDFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xEFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xEFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xFFFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#xFFFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x10FFFE;B", 0, ENCODING_NONE, "HTML", "AB");
+ TESTCASE("A&#x10FFFF;B", 0, ENCODING_NONE, "HTML", "AB");
+
+ /* HTML: some of the more obscure named character references. The
+ * tricky part is testing the case sensitivity and unusual character
+ * generation of the HTML character reference matching code, while
+ * the search normalisation code gets in the way. */
+
+ /* &alpha; and &Alpha; are both defined but both get normalised
+ * to GREEK CAPITAL LETTER ALPHA */
+ TESTCASE("A&alpha;B", 0, ENCODING_NONE, "HTML", "AΑB");
+ TESTCASE("A&Alpha;B", 0, ENCODING_NONE, "HTML", "AΑB");
+ /* &clubs; is defined, &Clubs is not */
+ TESTCASE("A&clubs;B", 0, ENCODING_NONE, "HTML", "A♣B");
+ TESTCASE("A&Clubs;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ /* &fjlig; is defined to emit a 2-codepoint sequence */
+ TESTCASE("A&fjlig;B", 0, ENCODING_NONE, "HTML", "AFJB");
+ /* &ycirc; emits a codepoint which is then normalised and capitalised */
+ TESTCASE("A&ycirc;B", 0, ENCODING_NONE, "HTML", "AYB");
+ /* &uparrow; and &UpArrow; are both defined to the same codepoint,
+ * which survives normalisation intact, but neither &UParrow; nor
+ * &upARROW; are defined. &Uparrow is defined to a *different*
+ * codepoint which also survives normalisation. */
+ TESTCASE("A&uparrow;B", 0, ENCODING_NONE, "HTML", "A↑B");
+ TESTCASE("A&Uparrow;B", 0, ENCODING_NONE, "HTML", "A⇑B");
+ TESTCASE("A&UpArrow;B", 0, ENCODING_NONE, "HTML", "A↑B");
+ TESTCASE("A&UParrow;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+ TESTCASE("A&upARROW;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+
+ /* &nonesuch; is most definitely not defined */
+ TESTCASE("A&nonesuch;B", 0, ENCODING_NONE, "HTML", "A"UTF8_REPLACEMENT"B");
+}
+#undef TESTCASE
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/command.testc Added

@@ -0,0 +1,125 @@
+#include "config.h"
+#include <stdio.h>
+#include "cunit/cunit.h"
+#include <sys/stat.h>
+#include "command.h"
+
+const char canary = "canary.txt";
+
+static void test_run(void)
+{
+ int r;
+ struct stat sb;
+
+ /* make sure the file isnt there */
+ r = unlink(canary);
+ if (r < 0) r = errno;
+ if (r == ENOENT) r = 0;
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ r = run_command("/usr/bin/touch", canary, NULL);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ r = stat(canary, &sb);
+ if (r < 0) r = errno;
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ unlink(canary);
+}
+
+static void test_popen_r(void)
+{
+#define WORD0	"dreamcatcher"
+ int r;
+ struct command *cmd = NULL;
+ char buf32;
+
+ r = command_popen(&cmd, "r", "/bin/echo", WORD0, NULL);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd);
+ CU_ASSERT_PTR_NULL_FATAL(cmd->stdin_prot);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd->stdout_prot);
+
+ memset(buf, 0, sizeof(buf));
+ r = prot_read(cmd->stdout_prot, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, sizeof(WORD0));
+ CU_ASSERT_STRING_EQUAL(buf, WORD0 "\n");
+
+ r = command_pclose(&cmd);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(cmd);
+#undef WORD0
+}
+
+static void test_popen_w(void)
+{
+#define WORD0	"semiotics"
+ int r;
+ struct command *cmd = NULL;
+ FILE *fp;
+ char buf32;
+
+ /* make sure the file isnt there */
+ r = unlink(canary);
+ if (r < 0) r = errno;
+ if (r == ENOENT) r = 0;
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ snprintf(buf, sizeof(buf), "cat > %s", canary);
+ r = command_popen(&cmd, "w", "/bin/sh", "-c", buf, NULL);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd->stdin_prot);
+ CU_ASSERT_PTR_NULL_FATAL(cmd->stdout_prot);
+
+ r = prot_write(cmd->stdin_prot, WORD0, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = command_pclose(&cmd);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(cmd);
+
+ fp = fopen(canary, "r");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(fp);
+ memset(buf, 0, sizeof(buf));
+ r = fread(buf, 1, sizeof(buf), fp);
+ CU_ASSERT_EQUAL_FATAL(r, sizeof(WORD0)-1);
+ CU_ASSERT_STRING_EQUAL(buf, WORD0);
+ fclose(fp);
+
+ unlink(canary);
+#undef WORD0
+}
+
+static void test_popen_rw(void)
+{
+#define WORD0		"cosby sweater"
+#define WORD0_CAP	"COSBY SWEATER"
+ int r;
+ struct command *cmd = NULL;
+ char buf32;
+
+ r = command_popen(&cmd, "rw", "/usr/bin/tr", "a-z", "A-Z", NULL);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd->stdin_prot);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cmd->stdout_prot);
+
+ r = prot_write(cmd->stdin_prot, WORD0, sizeof(WORD0)-1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = command_done_stdin(cmd);
+ CU_ASSERT_EQUAL(r, 0);
+
+ memset(buf, 0, sizeof(buf));
+ r = prot_read(cmd->stdout_prot, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, sizeof(WORD0_CAP)-1);
+ CU_ASSERT_STRING_EQUAL(buf, WORD0_CAP);
+
+ r = command_pclose(&cmd);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_PTR_NULL_FATAL(cmd);
+#undef WORD0
+#undef WORD0_CAP
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/conversations.c Added

@@ -0,0 +1,1443 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "cunit/cunit.h"
+#include "conversations.h"
+#include "global.h"
+#include "strarray.h"
+#include "cyrusdb.h"
+#include "libcyr_cfg.h"
+#include "message.h"	 /* for VECTOR_SIZE */
+#include "xmalloc.h"
+
+#define DBDIR	"test-dbdir"
+#define DBNAME	"conversations.db"
+#define DBNAME2	"conversations2.db"
+#define DBNAME3	"conversations.db"
+
+static void test_open(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+static void test_getset(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char C_MSGID = "<0001.1288854309@example.com>";
+ static const conversation_id_t C_CID = 0x12345689abcdef0ULL;
+ conversation_id_t cid;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Database is empty, so get should succeed and report no results */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ /* set should succeed */
+ r = conversations_set_msgid(state, C_MSGID, C_CID);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should now succeed and report the value we gave it */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID);
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should still succeed after the db is closed & reopened */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID);
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+static void test_abort(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char C_MSGID = "<0002.1288854309@example.com>";
+ static const conversation_id_t C_CID = 0x10345689abcdef2ULL;
+ conversation_id_t cid;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Database is empty, so get should succeed and report no results */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ /* set should succeed */
+ r = conversations_set_msgid(state, C_MSGID, C_CID);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should now succeed and report the value we gave it */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID);
+
+ /* abort the txn */
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* the set vanished with the txn abort, so get should
+ * succeed and report no results */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+static void test_prune(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char C_MSGID1 = "<0003.1288854309@example.com>";
+ static const conversation_id_t C_CID1 = 0x1045689abcdef23ULL;
+ time_t stamp1;
+ static const char C_MSGID2 = "<0004.1288854309@example.com>";
+ static const conversation_id_t C_CID2 = 0x105689abcdef234ULL;
+ time_t stamp2;
+ static const char C_MSGID3 = "<0005.1288854309@example.com>";
+ static const conversation_id_t C_CID3 = 0x10689abcdef2345ULL;
+ time_t stamp3;
+ conversation_id_t cid;
+ unsigned int nseen = 0, ndeleted = 0;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Add keys, with delays in between */
+ /* TODO: CUnit needs a time warping system */
+
+ r = conversations_set_msgid(state, C_MSGID1, C_CID1);
+ CU_ASSERT_EQUAL(r, 0);
+ stamp1 = time(NULL);
+
+ sleep(4);
+
+ r = conversations_set_msgid(state, C_MSGID2, C_CID2);
+ CU_ASSERT_EQUAL(r, 0);
+ stamp2 = time(NULL);
+
+ sleep(4);
+
+ r = conversations_set_msgid(state, C_MSGID3, C_CID3);
+ CU_ASSERT_EQUAL(r, 0);
+ stamp3 = time(NULL);
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Should be able to get all 3 msgids */
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID1);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID2);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID3, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID3);
+
+ /* Prune out the oldest two. Note we try to make this test
+ * stable with respect to timing artifacts, such as clock
+ * granularity, by careful choice of sleep times. */
+ r = conversations_prune(state, stamp2+(stamp3-stamp2)/2,
+			 &nseen, &ndeleted);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT(nseen >= 3);
+ CU_ASSERT(ndeleted >= 2);
+ CU_ASSERT(nseen - ndeleted >= 1);
+
+ /* gets of the oldest two records should succeed
+ * but report no record, and a get of the newest
+ * record should succeed */
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID3, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID3);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+/* Test whether it is possible to open two databases at
+ * the same time. */
+static void test_two(void)
+{
+ int r;
+ struct conversations_state *state1 = NULL;
+ struct conversations_state *state2 = NULL;
+ static const char C_MSGID1 = "<0006.1288854309@example.com>";
+ static const conversation_id_t C_CID1 = 0x1089abcdef23456ULL;
+ static const char C_MSGID2 = "<0007.1288854309@example.com>";
+ static const conversation_id_t C_CID2 = 0x109abcdef234567ULL;
+ conversation_id_t cid;
+
+ r = conversations_open_path(DBNAME, &state1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_open_path(DBNAME2, &state2);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Databases are empty, so gets of either msgid from either db
+ * should succeed and report no results */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state1, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state1, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state2, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state2, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ /* set should succeed */
+ r = conversations_set_msgid(state1, C_MSGID1, C_CID1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_set_msgid(state2, C_MSGID2, C_CID2);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should now succeed and report the value we gave it
+ * and not the value in the other db */
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state1, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID1);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state1, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state2, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, NULLCONVERSATION);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state2, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID2);
+
+ r = conversations_abort(&state1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_abort(&state2);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+/* test CID encoding */
+static void test_cid_encode(void)
+{
+ static const conversation_id_t CID1 = 0x01089abcdef23456ULL;
+ static const char STR1 = "01089abcdef23456";
+ static const conversation_id_t CID2 = NULLCONVERSATION;
+ static const char STR2 = "NIL";
+ const char *r;
+
+ r = conversation_id_encode(CID1);
+ CU_ASSERT_STRING_EQUAL(r, STR1);
+
+ r = conversation_id_encode(CID2);
+ CU_ASSERT_STRING_EQUAL(r, STR2);
+}
+
+/* test CID decoding */
+static void test_cid_decode(void)
+{
+ static const char STR1 = "01089abcdef23456";
+ static const conversation_id_t CID1 = 0x01089abcdef23456ULL;
+ static const char STR2 = "NIL";
+ static const conversation_id_t CID2 = NULLCONVERSATION;
+ conversation_id_t cid;
+ int r;
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversation_id_decode(&cid, STR1);
+ CU_ASSERT_EQUAL(r, 1);
+ CU_ASSERT_EQUAL(cid, CID1);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversation_id_decode(&cid, STR2);
+ CU_ASSERT_EQUAL(r, 1);
+ CU_ASSERT_EQUAL(cid, CID2);
+}
+
+static int num_folders(conversation_t *conv)
+{
+ int n = 0;
+ conv_folder_t *folder;
+
+ if (!conv) return 0;
+
+ for (folder = conv->folders ; folder ; folder = folder->next)
+	n++;
+
+ return n;
+}
+
+static void test_cid_rename(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char FOLDER1 = "fnarp.com!user.smurf";
+ static const char FOLDER2 = "fnarp.com!user.smurf.foo bar";
+ static const char FOLDER3 = "fnarp.com!user.smurf.quux.foonly";
+ static const char C_MSGID1 = "<0008.1288854309@example.com>";
+ static const char C_MSGID2 = "<0009.1288854309@example.com>";
+ static const char C_MSGID3 = "<0010.1288854309@example.com>";
+ static const conversation_id_t C_CID1 = 0x10bcdef23456789aULL;
+ static const conversation_id_t C_CID2 = 0x10cdef23456789abULL;
+ conversation_id_t cid;
+ conversation_t *conv;
+ conv_folder_t *folder;
+
+ /* XXX - need to fix conversations_rename_cid to have a real mailbox
+ * underneath! */
+ return;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* setup the records we expect */
+ r = conversations_set_msgid(state, C_MSGID1, C_CID1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = conversations_set_msgid(state, C_MSGID2, C_CID1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = conversations_set_msgid(state, C_MSGID3, C_CID1);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conv = conversation_new(state);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ conversation_update(state, conv, FOLDER1, /*num_records*/3,
+			/*exists*/3, /*unseen*/0, /*counts*/NULL,
+			/*modseq*/1);
+ conversation_update(state, conv, FOLDER2, /*num_records*/3,
+			/*exists*/2, /*unseen*/0, /*counts*/NULL,
+			/*modseq*/8);
+ conversation_update(state, conv, FOLDER3, /*num_records*/13,
+			/*exists*/10, /*unseen*/0, /*counts*/NULL,
+			/*modseq*/5);
+
+ r = conversation_save(state, C_CID1, conv);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* commit & close */
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* do a rename */
+ conversations_rename_cid(state, C_CID1, C_CID2);
+
+ /* commit & close */
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /*
+ * The B records in the database are renamed immediately, so the
+ * counts should all be in CID2, and CID1 should be empty
+ */
+ conv = NULL;
+ r = conversation_load(state, C_CID2, &conv);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(conv);
+ CU_ASSERT_EQUAL(conv->modseq, 8);
+ CU_ASSERT_EQUAL(num_folders(conv), 3);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ conversation_free(conv);
+ conv = NULL;
+
+ conv = NULL;
+ r = conversation_load(state, C_CID1, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(conv);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID1, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID2);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID2, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID2);
+
+ memset(&cid, 0x45, sizeof(cid));
+ r = conversations_get_msgid(state, C_MSGID3, &cid);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(cid, C_CID2);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+static void test_folder_rename(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char FOLDER1 = "fnarp.com!user.smurf";
+ static const char FOLDER2 = "fnarp.com!user.smurf.foo";
+ static const char FOLDER3 = "fnarp.com!user.smurf.bar";
+ static const char C_MSGID1 = "<0008.1288854309@example.com>";
+ static const char C_MSGID2 = "<0009.1288854309@example.com>";
+ static const char C_MSGID3 = "<0010.1288854309@example.com>";
+ static const conversation_id_t C_CID = 0x10bcdef23456789aULL;
+ conversation_t *conv;
+ conv_folder_t *folder;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(state);
+
+ /* setup the records we expect */
+ r = conversations_set_msgid(state, C_MSGID1, C_CID);
+ CU_ASSERT_EQUAL(r, 0);
+ r = conversations_set_msgid(state, C_MSGID2, C_CID);
+ CU_ASSERT_EQUAL(r, 0);
+ r = conversations_set_msgid(state, C_MSGID3, C_CID);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conv = conversation_new(state);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ conversation_update(state, conv, FOLDER1, /*num_records*/3,
+			/*exists*/3, /*unseen*/0, /*counts*/NULL,
+			/*modseq*/1);
+ conversation_update(state, conv, FOLDER2, /*num_records*/3,
+			/*exists*/2, /*unseen*/0, /*counts*/NULL,
+			/*modseq*/8);
+
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ /* commit & close */
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* do a rename */
+ r = conversations_rename_folder(state, FOLDER2, FOLDER3);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* commit & close */
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(conv);
+ CU_ASSERT_EQUAL(conv->modseq, 8);
+ CU_ASSERT_EQUAL(num_folders(conv), 2);
+ CU_ASSERT_EQUAL(conv->exists, 5);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->exists, 3);
+ /* no record for folder2 */
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ /* have a record for folder3 */
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->exists, 2);
+ conversation_free(conv);
+ conv = NULL;
+
+ /* now "delete" the folder. NOTE - this doesn't actually
+ * change any counts, because we go through the CIDs
+ * individually on the delete codepath */
+ r = conversations_rename_folder(state, FOLDER3, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ /* commit & close */
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(conv);
+ /* got a record for folder1 */
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->exists, 3);
+ /* no record for folder2 */
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ /* no record for folder3 either */
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+}
+
+static void test_folders(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char FOLDER1 = "foobar.com!user.smurf";
+ static const char FOLDER2 = "foobar.com!user.smurf.foo bar";
+ static const char FOLDER3 = "foobar.com!user.smurf.quux.foonly";
+ static const char FOLDER_N1 = "aaa not here";
+ static const char FOLDER_N2 = "zzz not here";
+ static const conversation_id_t C_CID = 0x10abcdef23456789ULL;
+ conversation_t *conv;
+ conv_folder_t *folder;
+ int *counts;
+
+ /* hack to get this DB created with a counted_strings value */
+ imapoptsIMAPOPT_CONVERSATIONS_COUNTED_FLAGS.val.s = "\\Draft $HasRandom";
+
+ r = conversations_open_path(DBNAME3, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ imapoptsIMAPOPT_CONVERSATIONS_COUNTED_FLAGS.val.s = NULL;
+
+ CU_ASSERT_EQUAL(state->counted_flags->count, 2);
+
+ counts = xzmalloc(sizeof(int) * state->counted_flags->count);
+
+ /* Database is empty, so get should succeed and report no results */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(conv);
+
+ /* update should succeed */
+ conv = conversation_new(state);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+
+ counts0 = 1;
+ counts1 = 0;
+
+ conversation_update(state, conv, FOLDER1, /*num_records*/13,
+			/*exists*/7, /*unseen*/5, counts,
+			/*modseq*/4);
+
+ /* make sure the data we just passed to conversation_update()
+ * is present in the structure */
+ CU_ASSERT_EQUAL(conv->num_records, 13);
+ CU_ASSERT_EQUAL(conv->exists, 7);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 1);
+ CU_ASSERT_EQUAL(conv->counts1, 0);
+ CU_ASSERT_EQUAL(conv->modseq, 4);
+ CU_ASSERT_EQUAL(num_folders(conv), 1);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ /* get should now succeed and report the value we gave it */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->num_records, 13);
+ CU_ASSERT_EQUAL(conv->exists, 7);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 1);
+ CU_ASSERT_EQUAL(conv->counts1, 0);
+ CU_ASSERT_EQUAL(conv->modseq, 4);
+ CU_ASSERT_EQUAL(num_folders(conv), 1);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+
+ counts1 = 2;
+ /* some more updates should succeed */
+ conversation_update(state, conv, FOLDER2,/*num_records*/2,
+			/*exists*/1, /*unseen*/0, counts,
+			/*modseq*/7);
+
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+ CU_ASSERT_EQUAL(conv->num_records, 15);
+ CU_ASSERT_EQUAL(conv->exists, 8);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 2);
+ CU_ASSERT_EQUAL(conv->counts1, 2);
+ CU_ASSERT_EQUAL(conv->modseq, 7);
+ CU_ASSERT_EQUAL(num_folders(conv), 2);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+
+
+ counts1 = 5;
+ conversation_update(state, conv, FOLDER3,/*num_records*/10,
+			/*exists*/10, /*unseen*/0, counts,
+			/*modseq*/55);
+
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+ CU_ASSERT_EQUAL(conv->num_records, 25);
+ CU_ASSERT_EQUAL(conv->exists, 18);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 3);
+ CU_ASSERT_EQUAL(conv->counts1, 7);
+ CU_ASSERT_EQUAL(conv->modseq, 55);
+ CU_ASSERT_EQUAL(num_folders(conv), 3);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 10);
+ CU_ASSERT_EQUAL(folder->exists, 10);
+ CU_ASSERT_EQUAL(folder->modseq, 55);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ /* get should now succeed and report all values we gave it */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->num_records, 25);
+ CU_ASSERT_EQUAL(conv->exists, 18);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 3);
+ CU_ASSERT_EQUAL(conv->counts1, 7);
+ CU_ASSERT_EQUAL(conv->modseq, 55);
+ CU_ASSERT_EQUAL(num_folders(conv), 3);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 10);
+ CU_ASSERT_EQUAL(folder->exists, 10);
+ CU_ASSERT_EQUAL(folder->modseq, 55);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME3, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should still succeed and report all values we gave it */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->num_records, 25);
+ CU_ASSERT_EQUAL(conv->exists, 18);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 3);
+ CU_ASSERT_EQUAL(conv->counts1, 7);
+ CU_ASSERT_EQUAL(conv->modseq, 55);
+ CU_ASSERT_EQUAL(num_folders(conv), 3);
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 13);
+ CU_ASSERT_EQUAL(folder->exists, 7);
+ CU_ASSERT_EQUAL(folder->modseq, 4);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 10);
+ CU_ASSERT_EQUAL(folder->exists, 10);
+ CU_ASSERT_EQUAL(folder->modseq, 55);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+
+ /* decrementing a folder down to zero */
+ counts0 = -1;
+ counts1 = 0;
+ conversation_update(state, conv, FOLDER1,/*num_records*/-13,
+			/*exists*/-7, /*unseen*/0, counts,
+			/*modseq*/56);
+
+ CU_ASSERT_EQUAL(conv->num_records, 12);
+ CU_ASSERT_EQUAL(conv->exists, 11);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 2);
+ CU_ASSERT_EQUAL(conv->counts1, 7);
+ CU_ASSERT_EQUAL(conv->modseq, 56);
+ CU_ASSERT_EQUAL(num_folders(conv), 3); /* struct still in place
+					 with all counters zero */
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 0);
+ CU_ASSERT_EQUAL(folder->exists, 0);
+ CU_ASSERT_EQUAL(folder->modseq, 56);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 10);
+ CU_ASSERT_EQUAL(folder->exists, 10);
+ CU_ASSERT_EQUAL(folder->modseq, 55);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+
+ /* folder goes away properly when saved & re-loaded */
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ CU_ASSERT_EQUAL(conv->num_records, 12);
+ CU_ASSERT_EQUAL(conv->exists, 11);
+ CU_ASSERT_EQUAL(conv->unseen, 5);
+ CU_ASSERT_EQUAL(conv->counts0, 2);
+ CU_ASSERT_EQUAL(conv->counts1, 7);
+ CU_ASSERT_EQUAL(conv->modseq, 56);
+ CU_ASSERT_EQUAL(num_folders(conv), 2); /* FOLDER1 gone now */
+ folder = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 2);
+ CU_ASSERT_EQUAL(folder->exists, 1);
+ CU_ASSERT_EQUAL(folder->modseq, 7);
+ folder = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL(folder);
+ CU_ASSERT_EQUAL(folder->num_records, 10);
+ CU_ASSERT_EQUAL(folder->exists, 10);
+ CU_ASSERT_EQUAL(folder->modseq, 55);
+ folder = conversation_find_folder(state, conv, FOLDER_N1);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ folder = conversation_find_folder(state, conv, FOLDER_N2);
+ CU_ASSERT_PTR_NULL_FATAL(folder);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ free(counts);
+}
+
+static void test_folder_ordering(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char FOLDER1 = "foobar.com!user.smurf";
+ static const char FOLDER2 = "foobar.com!user.smurf.foo bar";
+ static const char FOLDER3 = "foobar.com!user.smurf.quux.foonly";
+ static const conversation_id_t C_CID = 0x10abcdef23456789ULL;
+ conversation_t *conv;
+ conv_folder_t *folder1;
+ conv_folder_t *folder2;
+ conv_folder_t *folder3;
+ int *counts = 0;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Database is empty, so get should succeed and report no results */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(conv);
+
+ /* update should succeed */
+ conv = conversation_new(state);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+
+ /* set up the folder names in order - we are going to discard
+ * this conversation, but the folder_number call will persist */
+ conversation_update(state, conv, FOLDER1, 0, 0, 0, 0, 0);
+ conversation_update(state, conv, FOLDER2, 0, 0, 0, 0, 0);
+ conversation_update(state, conv, FOLDER3, 0, 0, 0, 0, 0);
+
+ /* discard and recreate */
+ conversation_free(conv);
+ conv = conversation_new(state);
+
+ conversation_update(state, conv, FOLDER1, /*num_records*/1,
+			/*exists*/1, /*unseen*/0, counts,
+			/*modseq*/1);
+
+ /* add folders out of order */
+ conversation_update(state, conv, FOLDER3,/*num_records*/10,
+			/*exists*/10, /*unseen*/0, counts,
+			/*modseq*/55);
+
+ /* save and reload here just to be sure */
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ conversation_free(conv);
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ conversation_update(state, conv, FOLDER2,/*num_records*/2,
+			/*exists*/1, /*unseen*/0, counts,
+			/*modseq*/7);
+
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+
+ /* check that they've been created in the same order */
+ folder1 = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder1);
+ folder2 = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder2);
+ folder3 = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder3);
+
+ /* in the right order! */
+ CU_ASSERT_PTR_EQUAL(conv->folders, folder1);
+ CU_ASSERT_PTR_EQUAL(folder1->next, folder2);
+ CU_ASSERT_PTR_EQUAL(folder2->next, folder3);
+ CU_ASSERT_PTR_NULL(folder3->next);
+
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ conversation_free(conv);
+ conv = NULL;
+
+ /* get should now succeed and report the value we gave it */
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(conv->dirty, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ /* check that they've been re-loaded in the same order */
+ folder1 = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder1);
+ folder2 = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder2);
+ folder3 = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder3);
+
+ /* in the right order! */
+ CU_ASSERT_PTR_EQUAL(conv->folders, folder1);
+ CU_ASSERT_PTR_EQUAL(folder1->next, folder2);
+ CU_ASSERT_PTR_EQUAL(folder2->next, folder3);
+ CU_ASSERT_PTR_NULL(folder3->next);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should still succeed and report all values we gave it */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+
+ /* check that they are still in the same order */
+ folder1 = conversation_find_folder(state, conv, FOLDER1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder1);
+ folder2 = conversation_find_folder(state, conv, FOLDER2);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder2);
+ folder3 = conversation_find_folder(state, conv, FOLDER3);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(folder3);
+
+ /* in the right order! */
+ CU_ASSERT_PTR_EQUAL(conv->folders, folder1);
+ CU_ASSERT_PTR_EQUAL(folder1->next, folder2);
+ CU_ASSERT_PTR_EQUAL(folder2->next, folder3);
+ CU_ASSERT_PTR_NULL(folder3->next);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ free(counts);
+}
+
+static void test_senders(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ static const char FOLDER = "foobar.com!user.smurf";
+ static const char NAME1 = "Smurf 1";
+ static const char MAILBOX1 = "smurf";
+ static const char DOMAIN1 = "foobar.com";
+ static const char NAME2 = "Smurf 2";
+ static const char MAILBOX2 = "smurf2";
+ static const char DOMAIN2 = "foobar.com";
+ static const char NAME3 = "Aardvark";
+ static const char MAILBOX3 = "aardvark";
+ static const char DOMAIN3 = "aalphabetsoup.com";
+ static const conversation_id_t C_CID = 0x10abcdef23456789ULL;
+ conversation_t *conv;
+ conv_sender_t *sender1;
+ conv_sender_t *sender2;
+ conv_sender_t *sender3;
+ int *counts = 0;
+
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Database is empty, so get should succeed and report no results */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(conv);
+
+ /* update should succeed */
+ conv = conversation_new(state);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+ CU_ASSERT_EQUAL(conv->dirty, 1);
+
+ conversation_add_sender(conv, NAME1, NULL, MAILBOX1, DOMAIN1);
+ conversation_add_sender(conv, NAME2, NULL, MAILBOX2, DOMAIN2);
+ conversation_add_sender(conv, NAME3, NULL, MAILBOX3, DOMAIN3);
+
+ conversation_update(state, conv, FOLDER, /*num_records*/1,
+			/*exists*/1, /*unseen*/0, counts,
+			/*modseq*/1);
+
+ /* there's no function for getting sender data, oh well */
+ sender1 = conv->senders;
+ CU_ASSERT_PTR_NOT_NULL(sender1);
+ sender2 = sender1->next;
+ CU_ASSERT_PTR_NOT_NULL(sender2);
+ sender3 = sender2->next;
+ CU_ASSERT_PTR_NOT_NULL(sender3);
+ CU_ASSERT_PTR_NULL(sender3->next);
+
+ /* check ordering */
+ CU_ASSERT_STRING_EQUAL(sender1->name, NAME3);
+ CU_ASSERT_PTR_NULL(sender1->route);
+ CU_ASSERT_STRING_EQUAL(sender1->mailbox, MAILBOX3);
+ CU_ASSERT_STRING_EQUAL(sender1->domain, DOMAIN3);
+
+ CU_ASSERT_STRING_EQUAL(sender2->name, NAME1);
+ CU_ASSERT_PTR_NULL(sender2->route);
+ CU_ASSERT_STRING_EQUAL(sender2->mailbox, MAILBOX1);
+ CU_ASSERT_STRING_EQUAL(sender2->domain, DOMAIN1);
+
+ CU_ASSERT_STRING_EQUAL(sender3->name, NAME2);
+ CU_ASSERT_PTR_NULL(sender3->route);
+ CU_ASSERT_STRING_EQUAL(sender3->mailbox, MAILBOX2);
+ CU_ASSERT_STRING_EQUAL(sender3->domain, DOMAIN2);
+
+ /* save and reload here just to be sure */
+ r = conversation_save(state, C_CID, conv);
+ CU_ASSERT_EQUAL(r, 0);
+ conversation_free(conv);
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(conv);
+
+ /* there's no function for getting sender data, oh well */
+ sender1 = conv->senders;
+ CU_ASSERT_PTR_NOT_NULL(sender1);
+ sender2 = sender1->next;
+ CU_ASSERT_PTR_NOT_NULL(sender2);
+ sender3 = sender2->next;
+ CU_ASSERT_PTR_NOT_NULL(sender3);
+ CU_ASSERT_PTR_NULL(sender3->next);
+
+ /* check ordering */
+ CU_ASSERT_STRING_EQUAL(sender1->name, NAME3);
+ CU_ASSERT_PTR_NULL(sender1->route);
+ CU_ASSERT_STRING_EQUAL(sender1->mailbox, MAILBOX3);
+ CU_ASSERT_STRING_EQUAL(sender1->domain, DOMAIN3);
+
+ CU_ASSERT_STRING_EQUAL(sender2->name, NAME1);
+ CU_ASSERT_PTR_NULL(sender2->route);
+ CU_ASSERT_STRING_EQUAL(sender2->mailbox, MAILBOX1);
+ CU_ASSERT_STRING_EQUAL(sender2->domain, DOMAIN1);
+
+ CU_ASSERT_STRING_EQUAL(sender3->name, NAME2);
+ CU_ASSERT_PTR_NULL(sender3->route);
+ CU_ASSERT_STRING_EQUAL(sender3->mailbox, MAILBOX2);
+ CU_ASSERT_STRING_EQUAL(sender3->domain, DOMAIN2);
+
+ conversation_free(conv);
+ conv = NULL;
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open the db again */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* get should still succeed and report all values we gave it */
+ conv = NULL;
+ r = conversation_load(state, C_CID, &conv);
+
+ /* there's no function for getting sender data, oh well */
+ sender1 = conv->senders;
+ CU_ASSERT_PTR_NOT_NULL(sender1);
+ sender2 = sender1->next;
+ CU_ASSERT_PTR_NOT_NULL(sender2);
+ sender3 = sender2->next;
+ CU_ASSERT_PTR_NOT_NULL(sender3);
+ CU_ASSERT_PTR_NULL(sender3->next);
+
+ /* check ordering */
+ CU_ASSERT_STRING_EQUAL(sender1->name, NAME3);
+ CU_ASSERT_PTR_NULL(sender1->route);
+ CU_ASSERT_STRING_EQUAL(sender1->mailbox, MAILBOX3);
+ CU_ASSERT_STRING_EQUAL(sender1->domain, DOMAIN3);
+
+ CU_ASSERT_STRING_EQUAL(sender2->name, NAME1);
+ CU_ASSERT_PTR_NULL(sender2->route);
+ CU_ASSERT_STRING_EQUAL(sender2->mailbox, MAILBOX1);
+ CU_ASSERT_STRING_EQUAL(sender2->domain, DOMAIN1);
+
+ CU_ASSERT_STRING_EQUAL(sender3->name, NAME2);
+ CU_ASSERT_PTR_NULL(sender3->route);
+ CU_ASSERT_STRING_EQUAL(sender3->mailbox, MAILBOX2);
+ CU_ASSERT_STRING_EQUAL(sender3->domain, DOMAIN2);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ free(counts);
+}
+
+static void gen_msgid_cid(int i, char *msgid, int msgidlen,
+			 conversation_id_t *cidp)
+{
+ static const char * const domains = {
+	"fastmail.fm",
+	"example.com",
+	"gmail.com",
+	"yahoo.com",
+	"hotmail.com"
+ };
+ snprintf(msgid, msgidlen, "<%04d.1298269537@%s>",
+	 i, domainsi % VECTOR_SIZE(domains));
+
+ *cidp = 0xfeeddeadbeef0000ULL | (unsigned int)i;
+}
+
+static void gen_cid_folder(int i, conversation_id_t *cidp,
+			 strarray_t *mboxnames)
+{
+ int n;
+ int j;
+ static const char * const folders = {
+	"user.foo.INBOX",
+	"user.foo.Manilla",
+	"user.foo.VanillaGorilla",
+	"user.foo.SarsparillaGorilla"
+ };
+
+ *cidp = 0xfeeddeadbeef0000ULL | (unsigned int)i;
+
+ strarray_truncate(mboxnames, 0);
+ n = 1 + (17 - i) % (VECTOR_SIZE(folders)-1);
+ CU_ASSERT(n > 0);
+ for (j = 0 ; j < n ; j++)
+	strarray_append(mboxnames,
+			folders(j + i/2) % VECTOR_SIZE(folders));
+}
+
+static void test_dump(void)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ int fd;
+ FILE *fp;
+ char filename64;
+ char msgid40;
+ strarray_t mboxnames = STRARRAY_INITIALIZER;
+ conversation_id_t cid, cid2;
+ conversation_t *conv;
+ conv_folder_t *folder;
+ int i;
+ int j;
+#define N_MSGID_TO_CID	500
+#define N_CID_TO_FOLDER	333
+ struct stat sb;
+
+ strcpy(filename, "/tmp/cyrus-conv.datXXXXXX");
+ fd = mkstemp(filename);
+ CU_ASSERT_FATAL(fd >= 0);
+ fp = fdopen(fd, "r+");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(fp);
+
+ memset(&state, 0, sizeof(state));
+
+ /* generate some data in the database */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
+	gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
+	r = conversations_set_msgid(state, msgid, cid);
+	CU_ASSERT_EQUAL(r, 0);
+ }
+ for (i = 0 ; i < N_CID_TO_FOLDER ; i++) {
+	gen_cid_folder(i, &cid, &mboxnames);
+	conv = conversation_new(state);
+	CU_ASSERT_PTR_NOT_NULL(conv);
+	for (j = 0 ; j < mboxnames.count ; j++) {
+	 conversation_update(state, conv, mboxnames.dataj,
+				/*num_records*/1,
+				/*exists*/1, /*unseen*/0, NULL,
+				/*modseq*/100);
+	}
+	r = conversation_save(state, cid, conv);
+	CU_ASSERT_EQUAL(r, 0);
+	conversation_free(conv);
+	conv = NULL;
+ }
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open and dump the database */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ conversations_dump(state, fp);
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* do some basic checks on the output file */
+ fflush(fp);
+
+ r = fstat(fd, &sb);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT(sb.st_size > 20*N_MSGID_TO_CID + 20*N_CID_TO_FOLDER);
+
+ r = (int)fseek(fp, 0L, SEEK_SET);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* open and truncate the database */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_truncate(state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* check we can no longer find any of the data */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
+	gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
+	r = conversations_get_msgid(state, msgid, &cid2);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_EQUAL(cid2, NULLCONVERSATION);
+ }
+ for (i = 0 ; i < N_CID_TO_FOLDER ; i++) {
+	gen_cid_folder(i, &cid, &mboxnames);
+	conv = NULL;
+	r = conversation_load(state, cid, &conv);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_PTR_NULL(conv);
+ }
+
+ /* now undump */
+ r = conversations_undump(state, fp);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = conversations_commit(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* finally check that we got all the data back */
+ r = conversations_open_path(DBNAME, &state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ for (i = 0 ; i < N_MSGID_TO_CID ; i++) {
+	gen_msgid_cid(i, msgid, sizeof(msgid), &cid);
+	r = conversations_get_msgid(state, msgid, &cid2);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_EQUAL(cid, cid2);
+ }
+ for (i = 0 ; i < N_CID_TO_FOLDER ; i++) {
+	gen_cid_folder(i, &cid, &mboxnames);
+	conv = NULL;
+	r = conversation_load(state, cid, &conv);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_PTR_NOT_NULL_FATAL(conv);
+	CU_ASSERT_EQUAL(conv->modseq, 100);
+	CU_ASSERT_EQUAL(mboxnames.count, num_folders(conv));
+	for (j = 0 ; j < mboxnames.count ; j++) {
+	 folder = conversation_find_folder(state, conv, mboxnames.dataj);
+	 CU_ASSERT_PTR_NOT_NULL(folder);
+	 CU_ASSERT_EQUAL(folder->modseq, 100);
+	}
+	conversation_free(conv);
+	conv = NULL;
+ }
+
+ r = conversations_abort(&state);
+ CU_ASSERT_EQUAL(r, 0);
+
+ fclose(fp);
+ unlink(filename);
+ strarray_fini(&mboxnames);
+#undef N_MSGID_TO_CID
+#undef N_CID_TO_FOLDER
+}
+
+
+#define TESTCASE(in, exp) \
+ { \
+	struct buf b = BUF_INITIALIZER; \
+	static const char _in = in; \
+	static const char _exp = exp; \
+ \
+	buf_appendcstr(&b, _in); \
+	conversation_normalise_subject(&b); \
+	CU_ASSERT_EQUAL(b.len, sizeof(_exp)-1); \
+	CU_ASSERT_STRING_EQUAL(b.s, _exp); \
+ \
+	buf_free(&b); \
+ }
+
+
+static void test_subject_normalise(void)
+{
+ TESTCASE("understanding merge history",
+	 "understandingmergehistory");
+ TESTCASE("Re: Alias of constant passed to sub",
+	 "Aliasofconstantpassedtosub");
+ TESTCASE("Re: RE: Re: Perl_peep recursion exceeds",
+	 "Perl_peeprecursionexceeds");
+ TESTCASE("Fwd: Re: Sv: Re: SV: vms rename Unix mode fixes",
+	 "vmsrenameUnixmodefixes");
+ TESTCASE("PATCH merging make_ext and make_ext_cross",
+	 "mergingmake_extandmake_ext_cross");
+ TESTCASE("Re: PATCH Parallel testing conflict",
+	 "Paralleltestingconflict");
+ TESTCASE("Re: PATCH Fwd: deprecate UNIVERSAL->import",
+	 "deprecateUNIVERSAL->import");
+}
+
+#undef TESTCASE
+
+
+static int set_up(void)
+{
+ int r;
+
+ r = system("rm -rf " DBDIR);
+ if (r)
+	return r;
+
+ r = mkdir(DBDIR, 0777);
+ if (r < 0) {
+	int e = errno;
+	perror(DBDIR);
+	return e;
+ }
+
+ r = mkdir(DBDIR "/db", 0777);
+ if (r < 0) {
+	int e = errno;
+	perror(DBDIR "/db");
+	return e;
+ }
+
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, DBDIR);
+ cyrusdb_init();
+ config_conversations_db = "berkeley";
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ int r;
+
+ cyrusdb_done();
+ config_conversations_db = NULL;
+
+ r = system("rm -rf " DBDIR);
+ /* I'm ignoring you */
+
+ return 0;
+}

cyrus-imapd-2.5.tar.gz/cunit/crc32.testc Added

cyrus-imapd-2.5.tar.gz/cunit/cunit-syslog.h Added

@@ -0,0 +1,56 @@
+/* cunit-syslog.h - declarations for CUnit syslog functions
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CUNIT_SYSLOG_H__
+#define __CUNIT_SYSLOG_H__
+
+/* returns an active match number from 1 up */
+extern unsigned int CU_syslogMatchBegin(const char *re,
+			const char *filename, unsigned int lineno);
+/* returns count of given match (or 0 for sum of all matches), and remove the match */
+extern unsigned int CU_syslogMatchEnd(unsigned int match, const char **s);
+/* reset all matches, call before each test */
+#define CU_syslogMatchReset() \
+    CU_syslogMatchEnd(0, NULL)
+
+#endif /* __CUNIT_SYSLOG_H__ */
+

cyrus-imapd-2.5.tar.gz/cunit/cunit-to-junit.pl Added

@@ -0,0 +1,229 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use XML::DOM;
+use File::Path qw(mkpath rmtree);
+use File::Basename qw(dirname);
+use Data::Dumper;
+use Carp;
+
+my $verbose = 0;
+my $infile = 'CUnitAutomated-Results.xml';
+my $outbase = 'reports/TEST-';
+
+sub get_child
+{
+    my ($node, $name) = @_;
+
+    croak "Invalid document"
+	unless defined $node;
+    my $kids = $node->getElementsByTagName($name, 0);
+    croak "Invalid document: name=$name"
+	unless (defined $kids && $kids->getLength == 1);
+    return $kids->item(0);
+}
+
+sub get_child_maybe
+{
+    my ($node, $name) = @_;
+
+    croak "Invalid document"
+	unless defined $node;
+    my $kids = $node->getElementsByTagName($name, 0);
+    return undef
+	if !defined $kids;
+    return undef
+	if $kids->getLength == 0;
+    croak "Invalid document"
+	if $kids->getLength > 1;
+    return $kids->item(0);
+}
+
+sub get_children
+{
+    my ($node, $name) = @_;
+
+    croak "Invalid document"
+	unless defined $node;
+    return ( $node->getElementsByTagName($name, 0) );
+}
+
+sub get_content
+{
+    my ($node, $name) = @_;
+
+    croak "Invalid document"
+	unless defined $node;
+    my $s = $node->getFirstChild->getData;
+    if (defined $s)
+    {
+	$s =~ s/^\s+//;
+	$s =~ s/\s+$//;
+    }
+    return $s;
+}
+
+my @suites;
+sub get_suite
+{
+    my ($sname) = @_;
+
+    printf STDERR "Suite \"%s\"\n", $sname if $verbose;
+
+    my @existing = grep { $_->{name} eq $sname; } @suites;
+    return $existing0 if scalar @existing;
+
+    my $s = {
+	name => $sname,
+	nerrors => 0,
+	tests => ,
+	tests_by_name => {},
+    };
+    push(@suites, $s);
+    return $s;
+}
+
+sub _add_test
+{
+    my ($s, $tname) = @_;
+
+    my $t = $s->{tests_by_name}->{$tname};
+    if (!defined $t)
+    {
+	$t = {
+	    name => $tname,
+	    errors => ,
+	};
+	push(@{$s->{tests}}, $t);
+	$s->{tests_by_name}->{$tname} = $t;
+    }
+    return $t;
+}
+
+sub add_pass
+{
+    my ($s, $tname) = @_;
+    printf STDERR "     Test \"%s\": pass\n", $tname if $verbose;
+    _add_test($s, $tname);
+}
+
+sub add_fail
+{
+    my ($s, $tname, $msg) = @_;
+    printf STDERR "     Test \"%s\": fail\n     %s\n", $tname, $msg
+	    if $verbose;
+    my $t = _add_test($s, $tname);
+    push(@{$t->{errors}}, $msg);
+    $s->{nerrors}++;
+}
+
+my $parser = new XML::DOM::Parser;
+my $doc = $parser->parsefile($infile);
+
+my $root = get_child($doc, 'CUNIT_TEST_RUN_REPORT');
+my $result = get_child($root, 'CUNIT_RESULT_LISTING');
+
+foreach my $suite (get_children($result, 'CUNIT_RUN_SUITE'))
+{
+    my $succ = get_child_maybe($suite, 'CUNIT_RUN_SUITE_SUCCESS');
+    my $fail = get_child_maybe($suite, 'CUNIT_RUN_SUITE_FAILURE');
+
+    if (defined $succ)
+    {
+	my $s = get_suite(get_content(get_child($succ, 'SUITE_NAME')));
+
+	foreach my $record (get_children($succ, 'CUNIT_RUN_TEST_RECORD'))
+	{
+	    my $tr;
+
+	    $tr = get_child_maybe($record, 'CUNIT_RUN_TEST_SUCCESS');
+	    if (defined $tr)
+	    {
+		my $tname = get_content(get_child($tr, 'TEST_NAME'));
+		add_pass($s, $tname);
+		next;
+	    }
+
+	    foreach $tr (get_children($record, 'CUNIT_RUN_TEST_FAILURE'))
+	    {
+		my $tname = get_content(get_child($tr, 'TEST_NAME'));
+		my $fname = get_content(get_child($tr, 'FILE_NAME'));
+		my $lineno = get_content(get_child($tr, 'LINE_NUMBER'));
+		my $cond = get_content(get_child($tr, 'CONDITION'));
+		add_fail($s, $tname, "$fname:$lineno: $cond");
+		next;
+	    }
+	}
+    }
+    elsif (defined $fail)
+    {
+	# TODO: there must be a way in the jUnit output format
+	# to report a failure of the suite fixture code, but
+	# I have no idea what it is.  Instead use a fake test name.
+	my $s = get_suite(get_content(get_child($fail, 'SUITE_NAME')));
+	my $reason = get_content(get_child($fail, 'FAILURE_REASON'));
+
+	my $tname = '__wtf';
+	if ($reason =~ m/cleanup/i)
+	{
+	    $tname = '__cleanup';
+	}
+	elsif ($reason =~ m/initialization/i)
+	{
+	    $tname = '__cleanup';
+	}
+
+	add_fail($s, $tname, $reason);
+    }
+    else
+    {
+	carp "Neither a CUNIT_RUN_SUITE_SUCCESS nor a " .
+	     "CUNIT_RUN_SUITE_FAILURE child are present";
+    }
+
+}
+
+my $dir = dirname($outbase . 'foo');
+rmtree($dir) if (defined $dir && $dir ne '.');
+my $nrun = 0;
+my $nfailed = 0;
+
+foreach my $s (@suites)
+{
+    my $sdoc = XML::DOM::Document->new();
+
+    $nfailed += $s->{nerrors};
+
+    my $selt = $sdoc->createElement('testsuite');
+    $selt->setAttribute(failures => 0);
+    $selt->setAttribute(errors => $s->{nerrors});
+    $selt->setAttribute(time => "0.001");
+    $selt->setAttribute(tests => scalar @{$s->{tests}});
+    $selt->setAttribute(name => $s->{name});
+    $sdoc->appendChild($selt);
+
+    foreach my $t (@{$s->{tests}})
+    {
+	$nrun++;
+
+	my $telt = $sdoc->createElement('testcase');
+	$telt->setAttribute(time => "0.001");
+	$telt->setAttribute(name => $t->{name});
+	$selt->appendChild($telt);
+
+	foreach my $e (@{$t->{errors}})
+	{
+	    my $eelt = $sdoc->createElement('error');
+	    $eelt->appendChild($sdoc->createTextNode($e));
+	    $telt->appendChild($eelt);
+	}
+    }
+
+    my $fname = $outbase . $s->{name} . '.xml';
+    mkpath(dirname($fname));
+    $sdoc->printToFile($fname);
+}
+
+print "$0: ran $nrun tests, $nfailed failed\n";
+exit(1) if ($nfailed > 0);

cyrus-imapd-2.5.tar.gz/cunit/cunit.h Added

@@ -0,0 +1,219 @@
+/* cunit.h - wrapper for CUnit assert macros
+ *
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef INCLUDED_CUNIT_H
+#define INCLUDED_CUNIT_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <CUnit/CUnit.h>
+#include "cunit-syslog.h"
+
+extern int verbose;
+
+/*
+ * The standard CUnit assertion *EQUAL* macros have a flaw: they do
+ * not report the actual values of the 'actual' and 'expected' values,
+ * which makes it rather hard to see why an assertion failed. So we
+ * replace the macros with improved ones, keeping the same API.
+ */
+extern CU_BOOL CU_assertFormatImplementation(CU_BOOL bValue, unsigned int uiLine,
+					 char strFile, char strFunction,
+					 CU_BOOL bFatal,
+					 char strConditionFormat, ...);
+extern void __cunit_wrap_test(const char *name, void (*fn)(void));
+extern int __cunit_wrap_fixture(const char *name, int (*fn)(void));
+
+#undef CU_ASSERT_EQUAL
+#define CU_ASSERT_EQUAL(actual,expected) \
+ { long long _a = (actual), _e = (expected); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_EQUAL(" #actual "=%lld," #expected "=%lld)", _a, _e); }
+
+#undef CU_ASSERT_EQUAL_FATAL
+#define CU_ASSERT_EQUAL_FATAL(actual,expected) \
+ { long long _a = (actual), _e = (expected); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_EQUAL_FATAL(" #actual "=%lld," #expected "=%lld)", _a, _e); }
+
+#undef CU_ASSERT_NOT_EQUAL
+#define CU_ASSERT_NOT_EQUAL(actual,expected) \
+ { long long _a = (actual), _e = (expected); \
+ CU_assertFormatImplementation((_a != _e), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_NOT_EQUAL(" #actual "=%lld," #expected "=%lld)", _a, _e); }
+
+#undef CU_ASSERT_NOT_EQUAL_FATAL
+#define CU_ASSERT_NOT_EQUAL_FATAL(actual,expected) \
+ { long long _a = (actual), _e = (expected); \
+ CU_assertFormatImplementation((_a != _e), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_NOT_EQUAL_FATAL(" #actual "=%lld," #expected "=%lld)", _a, _e); }
+
+
+
+#undef CU_ASSERT_PTR_EQUAL
+#define CU_ASSERT_PTR_EQUAL(actual,expected) \
+ { const void *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_PTR_EQUAL(" #actual "=%p," #expected "=%p)", _a, _e); }
+
+#undef CU_ASSERT_PTR_EQUAL_FATAL
+#define CU_ASSERT_PTR_EQUAL_FATAL(actual,expected) \
+ { const void *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_PTR_EQUAL_FATAL(" #actual "=%p," #expected "=%p)", _a, _e); }
+
+#undef CU_ASSERT_PTR_NOT_EQUAL
+#define CU_ASSERT_PTR_NOT_EQUAL(actual,expected) \
+ { const void *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation((_a != _e), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_PTR_NOT_EQUAL(" #actual "=%p," #expected "=%p)", _a, _e); }
+
+#undef CU_ASSERT_PTR_NOT_EQUAL_FATAL
+#define CU_ASSERT_PTR_NOT_EQUAL_FATAL(actual,expected) \
+ { const void *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation((_a != _e), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_PTR_NOT_EQUAL_FATAL(" #actual "=%p," #expected "=%p)", _a, _e); }
+
+#undef CU_ASSERT_PTR_NULL
+#define CU_ASSERT_PTR_NULL(actual) \
+ { const void *_a = (actual); \
+ CU_assertFormatImplementation(!(_a), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_PTR_NULL(" #actual ")"); }
+
+#undef CU_ASSERT_PTR_NULL_FATAL
+#define CU_ASSERT_PTR_NULL_FATAL(actual) \
+ { const void *_a = (actual); \
+ CU_assertFormatImplementation(!(_a), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_PTR_NULL_FATAL(" #actual ")"); }
+
+#undef CU_ASSERT_PTR_NOT_NULL
+#define CU_ASSERT_PTR_NOT_NULL(actual) \
+ { const void *_a = (actual); \
+ CU_assertFormatImplementation(!!(_a), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_PTR_NOT_NULL(" #actual ")"); }
+
+#undef CU_ASSERT_PTR_NOT_NULL_FATAL
+#define CU_ASSERT_PTR_NOT_NULL_FATAL(actual) \
+ { const void *_a = (actual); \
+ CU_assertFormatImplementation(!!(_a), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_PTR_NOT_NULL_FATAL(" #actual ")"); }
+
+#undef CU_ASSERT_STRING_EQUAL
+#define CU_ASSERT_STRING_EQUAL(actual,expected) \
+ { const char *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation(!strcmp(_a?_a:"",_e?_e:""), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_STRING_EQUAL(" #actual "=\"%s\"," #expected "=\"%s\")", _a, _e); }
+
+#undef CU_ASSERT_STRING_EQUAL_FATAL
+#define CU_ASSERT_STRING_EQUAL_FATAL(actual,expected) \
+ { const char *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation(!strcmp(_a?_a:"",_e?_e:""), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_STRING_EQUAL_FATAL(" #actual "=\"%s\"," #expected "=\"%s\")", _a, _e); }
+
+#undef CU_ASSERT_STRING_NOT_EQUAL
+#define CU_ASSERT_STRING_NOT_EQUAL(actual,expected) \
+ { const char *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation(!!strcmp(_a?_a:"",_e?_e:""), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_STRING_NOT_EQUAL(" #actual "=\"%s\"," #expected "=\"%s\")", _a, _e); }
+
+#undef CU_ASSERT_STRING_NOT_EQUAL_FATAL
+#define CU_ASSERT_STRING_NOT_EQUAL_FATAL(actual,expected) \
+ { const char *_a = (actual), *_e = (expected); \
+ CU_assertFormatImplementation(!!strcmp(_a?_a:"",_e?_e:""), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_STRING_NOT_EQUAL_FATAL(" #actual "=\"%s\"," #expected "=\"%s\")", _a, _e); }
+
+#define CU_SYSLOG_MATCH(re) \
+ CU_syslogMatchBegin((re), __FILE__, __LINE__)
+#define CU_ASSERT_SYSLOG(match, expected) \
+ { const char *_s = NULL; unsigned int _e = (expected), \
+ _a = CU_syslogMatchEnd((match), &_s); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_FALSE, \
+ "CU_ASSERT_SYSLOG(/%s/=%u, " #expected "=%u)", _s, _a, _e); }
+#define CU_ASSERT_SYSLOG_FATAL(match, expected) \
+ { const char *_s = NULL; unsigned int _e = (expected), \
+ _a = CU_syslogMatchEnd((match), &_s); \
+ CU_assertFormatImplementation((_a == _e), __LINE__, \
+ __FILE__, "", CU_TRUE, \
+ "CU_ASSERT_SYSLOG_FATAL(/%s/=%u, " #expected "=%u)", _s, _a, _e); }
+
+/* for parametrised tests */
+
+#define CUNIT_PARAM(x)	 (x)
+
+struct cunit_param
+{
+ /* initialisation state */
+ const char *name;
+ char **variable;
+ /* iteration state */
+ int nvalues;
+ char **values;
+ int idx;
+ char *freeme1;
+};
+#define __CUNIT_DECLARE_PARAM(nm) \
+ { #nm, &nm, 0, NULL, 0, NULL }
+#define __CUNIT_LAST_PARAM \
+ { NULL, NULL, 0, NULL, 0, NULL }
+
+extern void __cunit_params_begin(struct cunit_param *);
+extern int __cunit_params_next(struct cunit_param *);
+extern void __cunit_params_end(void);
+
+#endif /* INCLUDED_CUNIT_H */

cyrus-imapd-2.5.tar.gz/cunit/cunit.pl Added

@@ -0,0 +1,1254 @@
+#!/usr/bin/perl
+#
+# Build time front end for CUnit
+#
+# Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+use strict;
+use warnings;
+use Cwd;
+use File::Basename;
+use File::Compare;
+
+my $unitdir = dirname($0);
+my $project;
+my $DEFAULT_PROJECT = "default.cunit";
+my @suites;
+my @libraries;
+my $here = getcwd();
+my $verbose = 0;
+
+#
+# Emit a message if we're in verbose mode
+# Args: void
+# Returns: void
+#
+sub vmsg(@)
+{
+ print STDERR "## ". join(' ', @_) . "\n" if ($verbose);
+}
+
+#
+# Given an absolute path, construct and return the simplest possible
+# absolute path that points to the same file, in particular by flattening
+# ".." components. Similar to the libc realpath() function but without
+# the behaviour of looking up symlinks.
+# Args: absolute pathname
+# Returns: absolute pathname
+#
+sub path_sanitise($)
+{
+ my ($path) = @_;
+ my @comps;
+
+ die "$path: not an absolute path"
+	unless ($path =~ m/^\//);
+
+ foreach my $comp (split('/', $path))
+ {
+	if ($comp eq "." || $comp eq "")
+	{
+	 next;
+	}
+	elsif ($comp eq "..")
+	{
+	 # Note: will silently fail if we try to pop more
+	 # components than we've added, which is exactly
+	 # the right behaviour for trying to walk past
+	 # the root directory with ".."s.
+	 pop(@comps);
+	}
+	else
+	{
+	 push(@comps, $comp);
+	}
+ }
+ return "/" . join("/",@comps);
+}
+
+#
+# Given a (sanitised) absolute path, calculate and return a path
+# relative to the given directory.
+# Args: absolute pathname, base directory
+# Returns: relative pathname
+#
+sub path_relativise($$)
+{
+ my ($path, $base) = @_;
+ my @pathcomps;
+ my @basecomps;
+
+ die "$path: not an absolute path"
+	unless ($path =~ m/^\//);
+
+ @pathcomps = split("/", $path);
+ @basecomps = split("/", $base);
+
+ # Remove the components of the common
+ # ancestor of both paths
+ while (defined $pathcomps0 &&
+	 defined $basecomps0 &&
+	 $pathcomps0 eq $basecomps0)
+ {
+	shift(@pathcomps);
+	shift(@basecomps);
+ }
+
+ # Prepend enough ".."s to the path
+ # to reach the common ancestor
+ while (defined $basecomps0)
+ {
+	shift(@basecomps);
+	unshift(@pathcomps, "..");
+ }
+
+ return join("/", @pathcomps);
+}
+
+#
+# Return the initial common subset of two sanitised paths
+# Args: absolute path, absolute path
+# Returns: absolute path
+#
+sub path_common($$)
+{
+ my ($path1, $path2) = @_;
+ my @path1comps;
+ my @path2comps;
+ my @common;
+
+ die "$path1: not an absolute path"
+	unless ($path1 =~ m/^\//);
+ die "$path2: not an absolute path"
+	unless ($path2 =~ m/^\//);
+
+ @path1comps = split("/", $path1);
+ @path2comps = split("/", $path2);
+
+ # Remove the components of the common
+ # ancestor of both paths
+ while (defined $path1comps0 &&
+	 defined $path2comps0 &&
+	 $path1comps0 eq $path2comps0)
+ {
+	push(@common, $path1comps0);
+	shift(@path1comps);
+	shift(@path2comps);
+ }
+
+ return join("/", @common);
+}
+
+#
+# Given either a relative or absolute path,
+# calculate and return both.
+# Args: pathname, directory to be relative to
+# Returns: absolute pathname, relative pathname
+#
+sub path_absrel($$)
+{
+ my ($path, $basedir) = @_;
+ my ($abspath, $relpath);
+
+ if ($path =~ m/^\//)
+ {
+	# Given an absolute path
+	$abspath = $path;
+	# Calculate the relative path from the absolute path.
+	# Note, this only gives a true relative path if we're
+	# in the same directory.
+	if (substr($abspath,0,length($basedir)+1) eq "$basedir/")
+	{
+	 $relpath = substr($abspath,length($basedir)+1);
+	}
+	else
+	{
+	 # Fallback
+	 $relpath = $abspath;
+	}
+ }
+ else
+ {
+	# Given a relative path
+	$relpath = $path;
+	# Calculate the absolute path
+	$abspath = "$basedir/$relpath";
+ }
+ return (path_sanitise($abspath), $relpath);
+}
+
+#
+# Given a pathname of the C source file of a suite, return
+# the name by which the suite will be known to CUnit.
+# Args: absolute pathname
+# Returns: name
+#
+sub suite_path_to_name($)
+{
+ my ($path) = @_;
+
+ # Generate a path from the "top" directory down to this
+ # C source file. The "top" directory should be something
+ # like @top_srcdir@ in autoconf speak, but we have to
+ # infer it from the location of the project file.
+ my ($projdir, $whatever) = path_absrel($project, $here);
+ my $topdir = path_common($path, $projdir);
+ vmsg("inferred top_srcdir is \"$topdir\"");
+ my $name = path_relativise($path, $topdir);
+
+ $name =~ s/\.(testc|c)$//;
+ $name =~ s/\/test_?/\//g;
+ $name =~ s/_?test\//\//g;
+ $name =~ s/\/+/\//g;
+ $name =~ s/^\/+/\//;
+ return $name;
+}
+
+#
+# Given a pathname (relative or absolute, doesn't matter)
+# of the C source file of a suite, return the relative
+# path of the wrapper C source file. This is always in
+# the basedir.
+# Args: pathname
+# Returns: pathname
+#
+sub suite_path_to_wrapper($)
+{
+ my ($path) = @_;
+ return $path . "-cunit.c";
+}
+
+#
+# Given a pathname (relative or absolute, doesn't matter)
+# of the C source file of a suite, return the relative
+# path of the object file. This is always in the basedir.
+# Args: pathname
+# Returns: pathname
+#
+sub suite_path_to_object($)
+{
+ my ($path) = @_;
+ my $obj = basename($path);
+ $obj =~ s/^/.cunit-/;
+ $obj =~ s/\.c$/.o/;
+ return $obj;
+}
+
+#
+# Given a suite name return the name of a C variable which will
+# be used to name the CU_SuiteInfo object. Only needed because
+# we allow test names to contain characters which are not legal
+# in C symbols, notably '/'.
+# Args: string name
+# Returns: string symbol name
+#
+sub suite_name_to_var($)
+{
+ my ($name) = @_;
+
+ $name =~ s/\W/_/g;
+ $name =~ s/_+/_/g;
+ $name = "__cunit_suite_" . $name;
+ return $name;
+}
+
+
+#
+# Create a new suite hash.
+#
+# Note that we maintain the basedirectory and relative path
+# separately instead of taking the easy route of smooshing
+# them together. This allows us to handle the case where
+# the C source file for a suite is in a subdirectory relative
+# to the Makefile which is invoking us e.g. test/splunk.c
+# rather than test_splunk.c, without stuffing up and putting
+# the wrapper, object file, and archive in places where we
+# won't be able to find them again later.
+#
+# Args: relative path, directory the path is relative to.
+# Returns: ref to new suite hash
+#
+sub suite_new($$)
+{
+ my ($relpath, $basedir) = @_;
+ my ($abspath, $whatever) = path_absrel($relpath, $basedir);
+
+ my $suite =
+ {
+	basedir => $basedir,
+	relpath => $relpath,
+	abspath => $abspath,
+	name => suite_path_to_name($abspath),
+	wrap => suite_path_to_wrapper($relpath),
+	object => suite_path_to_object($relpath),
+	setupfn => undef,
+	teardownfn => undef,
+	params => ,
+	tests => 
+ };
+ $suite->{suitevar} = suite_name_to_var($suite->{name});
+ return $suite;
+}
+
+#
+# Compare two suite hashes; suitable for use as a sort function.
+# Args: ref to suite hash, ref to suite hash
+# Returns: 0 if the same, <0 or >0 if not the same.
+#
+sub suite_cmp($$)
+{
+ my ($s1, $s2) = @_;
+ return ($s1->{abspath} cmp $s2->{abspath});
+}
+
+#
+# Return the linker argument for a suite hash, adjusted
+# to be relative to the current working directory if
+# appropriate.
+# Args: ref to suite hash
+# Returns: string linker argument
+#
+sub suite_get_linkable($)
+{
+ my ($suite) = @_;
+ return path_relativise($suite->{basedir} . "/" . $suite->{object}, $here);
+}
+
+# Any of these (case insensitive) names can be used as the setup function
+my %setup_names = (
+ 'setup' => 1,	# standard name from Kent Beck's original paper
+ 'set_up' => 1,	# standard, C style with underscore
+ 'init' => 1,	# allowed in older versions of cunit.pl
+ 'before' => 1,	# like jUnit's @Before annotation
+);
+# Any of these (case insensitive) names can be used as the teardown function
+my %teardown_names = (
+ 'teardown' => 1,	# standard name from Kent Beck's original paper
+ 'tear_down' => 1,	# standard, C style with underscore
+ 'cleanup' => 1,	# allowed in older versions of cunit.pl
+ 'after' => 1,	# like jUnit's @After annotation
+);
+
+#
+# Helper for suite_scan_for_tests
+#
+sub suite_found_function
+{
+ my ($suite, $rtype, $fn) = @_;
+
+ if (defined $teardown_names{lc($fn)} && (!defined($rtype) || $rtype eq 'int'))
+ {
+	vmsg("Found teardown function");
+	die "$suite->{abspath}: Too many teardown functions: " .
+	 "both \"$fn\" and \"$suite->{teardownfn}\" found"
+	 if defined($suite->{teardownfn});
+	$suite->{teardownfn} = $fn;
+ }
+ elsif (defined $setup_names{lc($fn)} && (!defined($rtype) || $rtype eq 'int'))
+ {
+	vmsg("Found setup function");
+	die "$suite->{abspath}: too many setup functions: both " .
+	 "\"$fn\" and \"$suite->{setupfn}\" found"
+	 if defined($suite->{setupfn});
+	$suite->{setupfn} = $fn;
+ }
+ else
+ {
+	my ($name) = ($fn =~ m/^test_*(\w+)/);
+	if (defined $name && (!defined($rtype) || $rtype eq 'void'))
+	{
+	 vmsg("Found test function \"$fn\" -> name \"$name\"");
+	 push(@{$suite->{tests}},
+		 {
+			name => $name,
+			func => $fn
+		 });
+	}
+ }
+}
+
+#
+# Helper for suite_scan_for_tests
+#
+sub suite_found_param
+{
+ my ($suite, $param) = @_;
+
+ die "$suite->{abspath}: parameter \"$param\" declared " .
+ "more than once"
+	if grep { $_ eq $param } @{$suite->{params}};
+ vmsg("Found parameter \"$param\"");
+
+ # Note: we preserve the order of discovery in the
+ # source file to provide a predictable order of
+ # walking the parameter space at runtime.
+ push (@{$suite->{params}}, $param);
+}
+
+#
+# Scan the C source file of the given suite for function
+# definitions of one of the signatures:
+#
+# static void test_WHATEVER(void)
+#	we map this to a CUnit test called "WHATEVER"
+#
+# static void init(void)
+#	we use this as the suite's initialisation function
+#
+# static void cleanup(void)
+#	we use this as the suite's cleanup function
+#
+# The names of any such functions found are added to the
+# suite hash, using {setupfn}, {teardownfn} and {tests}.
+#
+# Also scan for variable declarations of the form
+#
+# static char * foo = CUNIT_PARAM("stringliteral");
+#
+# and make them a parameter for the containing test suite.
+#
+# Args: ref to suite hash
+# Returns: number of tests found
+#
+sub suite_scan_for_tests($)
+{
+ my ($suite) = @_;
+ my $state = 0;
+ my $fn;
+ my $rtype;
+
+ open FH,'<',$suite->{abspath}
+	or die "Can't open $suite->{abspath} for reading: $!";
+ while (<FH>)
+ {
+	chomp;
+
+	if ($state == 0)
+	{
+	 # Detect definitions of functions with the signature
+	 # void func(void), static void func(void), int func(void),
+	 # and static int func(void).
+	 ($rtype, $fn) = m/^(?:static\s+)(int|void)\s+(\w+)\s*$\s*void\s*$\s*$/;
+	 if (defined $fn)
+	 {
+		suite_found_function($suite, $rtype, $fn);
+		next;
+	 }
+
+	 ($fn) = m/^(\w+)\s*$\s*void\s*$\s*$/;
+	 if (defined $fn)
+	 {
+		# old fashioned function declarations with no return type
+		suite_found_function($suite, undef, $fn);
+		next;
+	 }
+
+	 ($rtype) = m/^(?:static\s+)(int|void)\s*$/;
+	 if (defined $rtype)
+	 {
+		$state = 1;
+		next;
+	 }
+
+	 my ($param) = m/^(?:static\s+)char\s*\*\s*(\w+)\s*=\s*CUNIT_PARAM\s*$/;
+	 if (defined $param)
+	 {
+		suite_found_param($suite, $param);
+		next;
+	 }
+
+	}
+	elsif ($state == 1)
+	{
+	 # $rtype is left over from previous line
+	 ($fn) = m/^(\w+)\s*\(\s*void\s*$\s*$/;
+	 if (defined $fn)
+	 {
+		# split-line declaration of the form:
+		# static void
+		# test_foo(void)
+		suite_found_function($suite, $rtype, $fn);
+		next;
+	 }
+	 $state = 0;
+	}
+ }
+ close FH;
+
+ return scalar(@{$suite->{tests}});
+}
+
+#
+# Return the subset of @suites located in or below the current directory.
+# Args: void
+# Returns: list refs to suite hash
+#
+sub suites_for_here()
+{
+ my $heresl = "$here/";
+ my $l = length($heresl);
+ return grep { substr($_->{abspath},0,$l) eq $heresl } @suites;
+}
+
+#
+# Return the suite which corresponds to the given C source file.
+# Args: C source file name
+# Returns: ref to suite hash, or undef if not found
+#
+sub suite_find($)
+{
+ my ($path) = @_;
+
+ foreach my $suite (@suites)
+ {
+	return $suite
+	 if ($suite->{relpath} eq $path);
+ }
+ return undef;
+}
+
+#
+# Create a new library hash.
+#
+# Note that we maintain the basedirectory and relative path
+# separately, like for suites, but only after partially
+# parsing the argument to see if comprises or contains
+# a path.
+#
+# Args: linker argument, directory which any path is relative to.
+# Returns: ref to new library hash
+#
+sub library_new($$)
+{
+ my ($arg, $basedir) = @_;
+ my $abspath;
+ my $relpath;
+
+ if ($arg =~ m/\.oa$/)
+ {
+	($abspath, $relpath) = path_absrel($arg, $basedir);
+ }
+ elsif (my ($dir) = ($arg =~ m/^-L(.+)$/))
+ {
+	($abspath, $relpath) = path_absrel($dir, $basedir);
+ }
+ elsif (!($arg =~ m/^-lBW/))
+ {
+	die "Don't know what to do with library \"$arg\"";
+ }
+
+ my $lib =
+ {
+	arg => $arg,
+	basedir => $basedir,
+	relpath => $relpath,	# might be undef
+	abspath => $abspath,	# might be undef
+ };
+ return $lib;
+}
+
+#
+# Compare two library hashes; suitable for use as a sort function.
+# Args: ref to library hash, ref to library hash
+# Returns: 0 if the same, <0 or >0 if not the same.
+#
+sub library_cmp($$)
+{
+ my ($l1, $l2) = @_;
+ return ($l1->{basedir} cmp $l2->{basedir} ||
+	 $l1->{arg} cmp $l2->{arg});
+}
+
+#
+# Return the linker argument for a library hash, adjusted
+# to be relative to the current working directory if
+# appropriate.
+# Args: ref to library hash
+# Returns: string linker argument
+#
+sub library_get_linkable($)
+{
+ my ($lib) = @_;
+ my $arg = $lib->{arg};
+
+ if ($arg =~ m/\.oa$/)
+ {
+	my ($abspath, $relpath) = path_absrel($arg, $lib->{basedir});
+	$arg = path_relativise($abspath, $here);
+ }
+ elsif (my ($dir) = ($arg =~ m/^-L(.+)$/))
+ {
+	my ($abspath, $relpath) = path_absrel($dir, $lib->{basedir});
+	$arg = "-L" . path_relativise($abspath, $here);
+ }
+ return $arg;
+}
+
+#
+# Atomic rewrite: atomic update of file contents.
+#
+# We use the standard trick for POSIX filesystems of writing all
+# the data to a new file in the same directory, then renaming
+# (relying on the atomicity of the rename() system call). This
+# ensures that no process ever sees a partially updated version
+# of the file, without the use of POSIX file locking.
+#
+# The atomic_rewrite_begin() call just returns a new filename to
+# write to. Call this first, then open the returned filename
+# and write to it, then call atomic_rewrite_end() with your
+# original filename.
+#
+# Note: this relies on the PIDs being unique to avoid a race
+# between two writers, which is true on local filesystems. If
+# we were doing this properly we would use one of the library
+# routines for generating a temporary filename and opening it
+# atomically, then return a ref to a filehandle.
+#
+# Args: filename
+# Returns: temporary filename to actually write to.
+#
+sub atomic_rewrite_begin($)
+{
+ my ($real) = @_;
+ return "$real.$$.TMP";
+}
+
+#
+# The second half of the atomic rewite; performs the comparison
+# of file contents and the rename.
+# Args: filename (the original one, not the temporary file)
+# Returns: 1 if the file was changed, 0 if not.
+#
+sub atomic_rewrite_end($)
+{
+ my ($real) = @_;
+ my $tmp = "$real.$$.TMP";
+ my $different = 1;
+
+ if ( -f $real )
+ {
+	$different = compare($real, $tmp);
+ }
+ if ($different == 1)
+ {
+	rename($tmp, $real)
+	 or die "Cannot rename $tmp to $real: $!";
+	vmsg("rewrote $real");
+	return 1;
+ }
+ else
+ {
+	unlink($tmp)
+	 or die "Cannot remove $tmp: $!";
+	return 0;
+ }
+}
+
+#
+# Generate a C file which is used to wrap the C source file containing
+# a suite. The wrapper #includes the original C code and defines
+# CUnit data structures which describe the suite and all it's tests.
+# Uses atomic rewrite.
+# Args: ref to suite hash
+# Returns: void
+#
+sub suite_generate_wrap($)
+{
+ my ($suite) = @_;
+ my $file = atomic_rewrite_begin($suite->{wrap});
+ my $cfile = $suite->{abspath};
+
+ open WRAP,'>',$file
+	or die "Cannot open $file for writing: $!";
+ print WRAP "/* Automatically generated by cunit.pl, do not edit */\n";
+ print WRAP "#include \"$suite->{relpath}\"\n";
+
+ if (scalar @{$suite->{params}})
+ {
+	print WRAP "static struct cunit_param params = {\n";
+	map
+	{
+	 print WRAP "__CUNIT_DECLARE_PARAM($_),\n";
+	} @{$suite->{params}};
+	print WRAP "__CUNIT_LAST_PARAM };\n";
+ }
+
+ my $setupfn = $suite->{setupfn};
+ my $teardownfn = $suite->{teardownfn};
+
+ foreach my $test (@{$suite->{tests}})
+ {
+	my $fn = $test->{func};
+	print WRAP "static void __cunit_$fn(void)\n";
+	print WRAP "{\n";
+
+	print WRAP "__cunit_params_begin(params);\ndo {\n"
+	 if (scalar @{$suite->{params}});
+
+	print WRAP " CU_syslogMatchReset();\n";
+	print WRAP " if (__cunit_wrap_fixture(" .
+		 "\"$cfile:$setupfn\", $setupfn)) " .
+		 "CU_FAIL_FATAL(\"$setupfn failed\");\n"
+	 if defined $setupfn;
+	print WRAP " __cunit_wrap_test(\"$cfile:$fn\", $fn);\n";
+	print WRAP " if (__cunit_wrap_fixture(" .
+		 "\"$cfile:$teardownfn\", $teardownfn)) " .
+		 "CU_FAIL_FATAL(\"$teardownfn failed\");\n"
+	 if defined $teardownfn;
+	print WRAP "} while (__cunit_params_next(params));\n__cunit_params_end();\n"
+	 if (scalar @{$suite->{params}});
+	print WRAP "}\n";
+ }
+
+ print WRAP "static CU_TestInfo _tests = {\n";
+ foreach my $test (@{$suite->{tests}})
+ {
+	print WRAP " { \"$test->{name}\", __cunit_$test->{func} },\n";
+ }
+ print WRAP " CU_TEST_INFO_NULL\n};\n";
+
+ print WRAP "const CU_SuiteInfo $suite->{suitevar} = {" .
+	 "\"$suite->{name}\", NULL, NULL, _tests};\n";
+ close WRAP;
+
+ atomic_rewrite_end($suite->{wrap});
+}
+
+#
+# Load the $project file into the arrays @suites and @libraries.
+# Args: void
+# Returns: void
+#
+sub project_load()
+{
+ open PROJ,'<',$project
+	or return;	# TODO: should be silent on ENOENT only
+
+ # TODO: should check file version header
+
+ while (<PROJ>)
+ {
+	chomp;
+	next if (m/^#/); # skip comments
+	my @a = split;
+
+	if ($a0 eq 'suite')
+	{
+	 die "Invalid format"
+		unless scalar(@a) == 3;
+	 push(@suites, suite_new($a1, $a2));
+	}
+	elsif ($a0 eq 'library')
+	{
+	 die "Invalid format"
+		unless scalar(@a) == 3;
+	 push(@libraries, library_new($a1, $a2));
+	}
+ }
+ close PROJ;
+
+ vmsg("loaded project $project");
+}
+
+#
+# Add a suite to @suites, if it's not already present.
+# Args: ref to a suite hash
+# Returns: void
+#
+sub project_add_suite($)
+{
+ my ($suite) = @_;
+
+ return if grep { !suite_cmp($_,$suite) } @suites;
+ #
+ # Note: appending is an important semantic. It ensures
+ # that the order of suites in the CUnit run matches the
+ # order in which test source is specified, in SUBDIRS
+ # in the top-level Makefile and then in TESTSOURCES
+ # in each Makefile below that.
+ #
+ vmsg("adding suite $suite->{relpath} $suite->{basedir}");
+ push(@suites, $suite);
+}
+
+#
+# Add a library to the @libraries if it's not already present.
+# Args: library string
+# Returns: void
+#
+sub project_add_library($)
+{
+ my ($lib) = @_;
+
+ @libraries = grep { library_cmp($_, $lib) } @libraries;
+ vmsg("adding library $lib->{arg} $lib->{basedir}");
+ push(@libraries, $lib);
+}
+
+#
+# Save the @suites and @libraries arrays to the $project file
+# Uses atomic rewrite.
+# Args: void
+# Returns: void
+#
+sub project_save()
+{
+ my $file = atomic_rewrite_begin($project);
+
+ open PROJ,'>',$file
+	or die "Failed to open $file for writing: $!";
+
+ print PROJ "#CUnitProject-1.0\n";
+
+ foreach my $suite (@suites)
+ {
+	print PROJ "suite $suite->{relpath} $suite->{basedir}\n";
+ }
+ foreach my $lib (@libraries)
+ {
+	print PROJ "library $lib->{arg} $lib->{basedir}\n";
+ }
+ close PROJ;
+
+ atomic_rewrite_end($project);
+}
+
+#
+# Add the named test sources (which are C source files) to the
+# project, and rewrite the project file. Re-adding is deliberately
+# a harmless no-op; in particular the project file is not written
+# if it's contents would not change.
+#
+sub add_sources(@)
+{
+ my (@args) = @_;
+
+ project_load();
+
+ foreach my $path (@args)
+ {
+	die "$path: not a C source file"
+	 unless ($path =~ m/\.(test)?(c|C|cc|cxx|c\+\+)$/);
+	project_add_suite(suite_new($path, $here));
+ }
+
+ project_save();
+}
+
+#
+# Add the named libraries (which may be object files, lib.a archives,
+# or -llibrary -Ldirectory -Bfoo -Wl,-foo ldflags, to the project,
+# and rewrite the project file. Re-adding is deliberately a harmless
+# no-op; in particular the project file is not written if it's contents
+# would not change.
+#
+sub add_libraries(@)
+{
+ my (@args) = @_;
+
+ project_load();
+
+ foreach my $arg (@args)
+ {
+	project_add_library(library_new($arg, $here));
+ }
+
+ project_save();
+}
+
+#
+# Generate a wrapper C source file for each of the suites
+# specified by their C source files on the commandline.
+#
+sub generate_wrapper(@)
+{
+ my @args = @_;
+ my $nfails = 0;
+
+ project_load();
+
+ foreach my $a (@args)
+ {
+	my $suite = suite_find($a);
+	if (!defined $suite)
+	{
+	 print STDERR "$a: unknown suite, did you use --add-sources?\n";
+	 $nfails++;
+	 next;
+	}
+	my $ntests = suite_scan_for_tests($suite);
+	if ($ntests == 0)
+	{
+	 vmsg("No tests in $suite->{relpath}");
+	 if ( -f $suite->{wrap})
+	 {
+		vmsg("Removing stale $suite->{wrap}");
+		unlink($suite->wrap)
+		 or die "Cannot unlink $suite->{wrap}: $!";
+	 }
+	 next;
+	}
+	suite_generate_wrap($suite);
+ }
+
+ exit 1
+	if ($nfails > 0);
+}
+
+#
+# Emit to the MAKE filehandle, a makefile fragment which contains
+# variable definitions which list the objects/libraries/linkflags
+# for the final link step, and which list the objects/libraries to
+# depend on for the final link step, assuming we want all the tests
+# in all the suites mentioned in the project. We rely on the calling
+# Makefile to define the actual link rule.
+#
+# Note that the order and uniqueness of @linkables matters
+# but not in obvious ways, and may interact in interesting
+# ways with weird linker switches. We try to optimise by
+# listing each individual linkable exactly once, so it's
+# only searched once. This will break if the libraries
+# have circular dependencies, so don't do stupid things
+# like that! To preserve link order semantics, the *last*
+# instance of each library seen is used.
+#
+# We should probably disable this optimisation if fancy
+# order-dependent options like -Bstatic were given. Also,
+# we don't handle GNU linker groups very well either.
+#
+# Args: void
+# Returns: void
+#
+sub emit_final_makefile_bits()
+{
+ my ($makefile) = @_;
+ my %seen;
+ my @all_linkables;
+ my @linkables;
+ my @deplibs;
+
+ push(@all_linkables, map { suite_get_linkable($_) } @suites );
+ push(@all_linkables, map { library_get_linkable($_) } @libraries );
+ map { $seen{$_}++ } @all_linkables;
+ foreach my $arg (@all_linkables)
+ {
+	push (@linkables, $arg)
+	 if ($seen{$arg} == 1);
+	$seen{$arg}--;
+ }
+
+ @deplibs = grep { m/\.oa$/ } @linkables;
+
+ print MAKE "CUNIT_OBJECTS = " . join(' ', @linkables) . "\n";
+ print MAKE "CUNIT_DEPLIBS = " . join(' ', @deplibs) . "\n";
+}
+
+#
+# Emit to the MAKE filehandle, a makefile fragment which contains
+# rules to build wrappers around each test source in this directory
+# or it's descendants, and to build object files from those wrappers.
+#
+# Args: name of output makefile
+# Returns: void
+#
+sub emit_partial_makefile_bits($)
+{
+ my ($makefile) = @_;
+ my $cunit;
+
+ $cunit = "$0";
+ $cunit .= " --project $project"
+	unless ($project eq $DEFAULT_PROJECT);
+
+ print MAKE "CUNIT_TEST_WRAPS =";
+ foreach my $suite (suites_for_here())
+ {
+	print MAKE " $suite->{wrap}";
+ }
+ print MAKE "\n";
+
+ print MAKE "CUNIT_TEST_OBJS =";
+ foreach my $suite (suites_for_here())
+ {
+	print MAKE " $suite->{object}";
+ }
+ print MAKE "\n";
+
+ foreach my $suite (suites_for_here())
+ {
+	print MAKE "$suite->{object}: $suite->{wrap} $suite->{relpath}\n";
+ }
+ print MAKE "\n";
+
+ foreach my $suite (suites_for_here())
+ {
+	print MAKE "$suite->{wrap}: $suite->{relpath}\n";
+	print MAKE "\t$cunit --generate-wrapper \$<\n";
+ }
+ print MAKE "\n";
+
+ print MAKE "clean::\n";
+ print MAKE "\t\$(RM) -f \$(CUNIT_TEST_WRAPS) \$(CUNIT_TEST_OBJS) $makefile\n";
+ print MAKE "\n";
+}
+
+#
+# Generate a makefile fragment which contains rules to build
+# wrappers around each test source in this directory or it's
+# descendants, and to build object files from those wrappers.
+#
+sub generate_partial_makefile(@)
+{
+ my ($makefile) = @_;
+
+ project_load();
+
+ my $file = atomic_rewrite_begin($makefile);
+
+ open MAKE,'>',$file
+	or die "Cannot open $file for writing: $!";
+
+ print MAKE "# Automatically generated by cunit.pl, do not edit\n";
+ print MAKE "\n";
+
+ emit_partial_makefile_bits($makefile);
+
+ print MAKE "check:: \$(CUNIT_TEST_OBJS)\n";
+ print MAKE "\n";
+
+ atomic_rewrite_end($makefile);
+}
+
+#
+# Generate a makefile fragment which contains variable definitions
+# which list the objects/libraries/linkflags for the final link
+# step, and which list the objects/libraries to depend on for
+# the final link step, assuming we want all the tests in all the
+# suites mentioned in the project. We rely on the calling Makefile
+# to define the actual link rule.
+#
+sub generate_final_makefile(@)
+{
+ my ($makefile) = @_;
+
+ project_load();
+
+ my $file = atomic_rewrite_begin($makefile);
+
+ open MAKE,'>',$file
+	or die "Cannot open $file for writing: $!";
+
+ print MAKE "# Automatically generated by cunit.pl, do not edit\n";
+ print MAKE "\n";
+
+ emit_final_makefile_bits();
+
+ atomic_rewrite_end($makefile);
+}
+
+#
+# Generate a combined makefile fragment which does both the
+# partial and final stages.
+#
+sub generate_makefile(@)
+{
+ my ($makefile) = @_;
+
+ project_load();
+
+ my $file = atomic_rewrite_begin($makefile);
+
+ open MAKE,'>',$file
+	or die "Cannot open $file for writing: $!";
+
+ print MAKE "# Automatically generated by cunit.pl, do not edit\n";
+ print MAKE "\n";
+
+ emit_partial_makefile_bits($makefile);
+ emit_final_makefile_bits();
+
+ atomic_rewrite_end($makefile);
+}
+
+
+#
+# Generate a file containing a C function register_cunit_suites()
+# which registers all the CUnit suites in the project.
+#
+sub generate_register_function(@)
+{
+ my ($cfile) = @_;
+
+ project_load();
+
+ my $file = atomic_rewrite_begin($cfile);
+
+ open CFILE,'>',$file
+	or die "Cannot open $file for writing: $!";
+
+ print CFILE "/* Automatically generated by cunit.pl, do not edit */\n";
+
+ foreach my $suite (@suites)
+ {
+	print CFILE "extern const CU_SuiteInfo $suite->{suitevar};\n";
+ }
+
+ print CFILE "void register_cunit_suites(void)\n";
+ print CFILE "{\n";
+ print CFILE " CU_SuiteInfo ss2 = { CU_SUITE_INFO_NULL, CU_SUITE_INFO_NULL };\n";
+ foreach my $suite (@suites)
+ {
+	print CFILE " ss0 = $suite->{suitevar};\n";
+	print CFILE " CU_register_suites(ss);\n";
+ }
+ print CFILE "}\n";
+
+ atomic_rewrite_end($cfile);
+}
+
+#
+# Parse arguments
+#
+
+sub usage()
+{
+ print STDERR "Usage: cunit.pl flags --add-sources file.c ...\n";
+ print STDERR "Usage: cunit.pl flags --add-libraries -llib|-Ldir ...\n";
+ print STDERR " cunit.pl flags --generate-partial-makefile foo.mk\n";
+ print STDERR " cunit.pl flags --generate-wrapper testfoo.c\n";
+ print STDERR " cunit.pl flags --generate-final-makefile foo.mk\n";
+ print STDERR " cunit.pl flags --generate-makefile foo.mk\n";
+ print STDERR " cunit.pl flags --emit-register-function foo.c\n";
+ print STDERR "\n";
+ print STDERR "flags include:\n";
+ print STDERR " --project PROJ, -p PROJ	 specify the project file (default is \"$DEFAULT_PROJECT\")\n";
+ print STDERR " --verbose, -v		 be more verbose\n";
+ exit 1;
+}
+
+my $modefn = undef;
+my @args;
+my $want_args = 0;
+while (my $a = shift)
+{
+ if ($a eq '--project' || $a eq '-p')
+ {
+	$project = shift;
+	usage() unless defined $project;
+ }
+ elsif ($a eq '--add-sources' || $a eq '-a')
+ {
+	$modefn = \&add_sources;
+	$want_args = 1;
+ }
+ elsif ($a eq '--add-libraries' || $a eq '-A')
+ {
+	$modefn = \&add_libraries;
+	$want_args = 2;
+ }
+ elsif ($a eq '--generate-partial-makefile' || $a eq '-p')
+ {
+	$modefn = \&generate_partial_makefile;
+	my $makefile = shift;
+	usage() unless defined $makefile;
+	push(@args, $makefile);
+ }
+ elsif ($a eq '--generate-final-makefile' || $a eq '-f')
+ {
+	$modefn = \&generate_final_makefile;
+	my $makefile = shift;
+	usage() unless defined $makefile;
+	push(@args, $makefile);
+ }
+ elsif ($a eq '--generate-makefile' || $a eq '-m')
+ {
+	$modefn = \&generate_makefile;
+	my $makefile = shift;
+	usage() unless defined $makefile;
+	push(@args, $makefile);
+ }
+ elsif ($a eq '--generate-wrapper' || $a eq '-w')
+ {
+	$modefn = \&generate_wrapper;
+	$want_args = 1;
+ }
+ elsif ($a eq '--generate-register-function' || $a eq '-r')
+ {
+	$modefn = \&generate_register_function;
+	my $cfile = shift;
+	usage() unless defined $cfile;
+	push(@args, $cfile);
+ }
+ elsif ($a eq '--verbose' || $a eq '-v')
+ {
+	$verbose++;
+ }
+ elsif ($a =~ /^-lLBW/ && $want_args == 2)
+ {
+	push(@args, $a);
+ }
+ elsif ($a =~ /^-/)
+ {
+	usage();
+ }
+ elsif ($want_args)
+ {
+	push(@args, $a);
+ }
+ else
+ {
+	usage();
+ }
+}
+
+if (!defined $project)
+{
+ $project = $DEFAULT_PROJECT;
+}
+elsif ( -d $project)
+{
+ $project = "$project/$DEFAULT_PROJECT";
+}
+
+# Actually run the selected mode
+usage() unless defined $modefn;
+$modefn->(@args);
+

cyrus-imapd-2.5.tar.gz/cunit/db.testc Added

@@ -0,0 +1,1545 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "xmalloc.h"
+#include "imap/global.h"
+#include "retry.h"
+#include "cyrusdb.h"
+#include "libcyr_cfg.h"
+#include "util.h"
+#include "hash.h"
+
+#define DBDIR	 "test-mb-dbdir"
+
+struct binary_result
+{
+ struct binary_result *next;
+ char *key;
+ size_t keylen;
+ char *data;
+ size_t datalen;
+};
+
+static char *backend = CUNIT_PARAM("skiplist,flat,berkeley,twoskip");
+static char *filename;
+static char *filename2;
+
+static void config_read_string(const char *s)
+{
+ char *fname = xstrdup("/tmp/cyrus-cunit-configXXXXXX");
+ int fd = mkstemp(fname);
+ retry_write(fd, s, strlen(s));
+ config_reset();
+ config_read(fname, 0);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static int fexists(const char *fname)
+{
+ struct stat sb;
+ int r;
+
+ r = stat(fname, &sb);
+ if (r < 0)
+	r = -errno;
+ return r;
+}
+
+static char *make_basedir(const char * const *reldirs)
+{
+ int r;
+ int unique = 0;
+ const char *tmpdir;
+ char *basedir;
+ char pathPATH_MAX;
+ const char * const *d;
+
+ tmpdir = getenv("TMPDIR");
+ if (!tmpdir)
+	tmpdir = "/tmp";
+
+ for (;;) {
+	if (unique)
+	 snprintf(path, sizeof(path), "%s/cunit-db-test.%d.%d", tmpdir, getpid(), unique);
+	else
+	 snprintf(path, sizeof(path), "%s/cunit-db-test.%d", tmpdir, getpid());
+
+	r = mkdir(path, 0700);
+	if (!r)
+	 break;	/* success! */
+	if (errno != EEXIST) {
+	 perror(path);
+	 return NULL;
+	}
+	unique++;
+ }
+ basedir = xstrdup(path);
+
+ for (d = reldirs ; *d ; d++) {
+	snprintf(path, sizeof(path), "%s/%s", basedir, *d);
+	r = mkdir(path, 0700);
+	if (r < 0) {
+	 perror(path);
+	 free(basedir);
+	 return NULL;
+	}
+ }
+
+ return basedir;
+}
+
+#define CANSTORE(key, keylen, data, datalen) \
+ r = cyrusdb_store(db, key, keylen, data, datalen, &txn); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+#define BADDATA		((const char *)0xdeadbeef)
+#define BADLEN		((int)0xcafebabe)
+
+#define CANFETCH(key, keylen, expdata, expdatalen) \
+{ \
+ const char *_data = BADDATA; \
+ size_t _datalen = BADLEN; \
+ r = cyrusdb_fetch(db, key, keylen, &_data, &_datalen, &txn); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_PTR_NOT_NULL(txn); \
+ CU_ASSERT_PTR_NOT_NULL(_data); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, BADDATA); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, expdata); \
+ CU_ASSERT_NOT_EQUAL(_datalen, BADLEN); \
+ CU_ASSERT_EQUAL(_datalen, expdatalen); \
+ CU_ASSERT(!memcmp(_data, expdata, _datalen)); \
+}
+
+#define CANFETCH_NOTXN(key, keylen, expdata, expdatalen) \
+{ \
+ const char *_data = BADDATA; \
+ size_t _datalen = BADLEN; \
+ r = cyrusdb_fetch(db, key, keylen, &_data, &_datalen, NULL); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_PTR_NOT_NULL(_data); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, BADDATA); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, expdata); \
+ CU_ASSERT_NOT_EQUAL(_datalen, BADLEN); \
+ CU_ASSERT_EQUAL(_datalen, expdatalen); \
+ CU_ASSERT(!memcmp(_data, expdata, _datalen)); \
+}
+
+#define CANFETCHNEXT(key, keylen, expkey, expkeylen, expdata, expdatalen) \
+{ \
+ const char *_data = BADDATA; \
+ size_t _datalen = BADLEN; \
+ const char *_key = BADDATA; \
+ size_t _keylen = BADLEN; \
+ r = cyrusdb_fetchnext(db, key, keylen, &_key, &_keylen, &_data, &_datalen, &txn); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_PTR_NOT_NULL(txn); \
+ CU_ASSERT_PTR_NOT_NULL(_data); \
+ CU_ASSERT_PTR_NOT_NULL(_key); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, BADDATA); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, expdata); \
+ CU_ASSERT_PTR_NOT_EQUAL(_key, BADDATA); \
+ CU_ASSERT_PTR_NOT_EQUAL(_key, expdata); \
+ CU_ASSERT_NOT_EQUAL(_datalen, BADLEN); \
+ CU_ASSERT_NOT_EQUAL(_keylen, BADLEN); \
+ CU_ASSERT_EQUAL(_datalen, expdatalen); \
+ CU_ASSERT(!memcmp(_data, expdata, _datalen)); \
+ CU_ASSERT_EQUAL(_keylen, expkeylen); \
+ CU_ASSERT(!memcmp(_key, expkey, _keylen)); \
+}
+
+#define CANNOTFETCH(key, keylen, experror) \
+{ \
+ const char *_data = BADDATA; \
+ size_t _datalen = BADLEN; \
+ r = cyrusdb_fetch(db, key, keylen, &_data, &_datalen, &txn); \
+ CU_ASSERT_EQUAL(r, experror); \
+ CU_ASSERT_PTR_NOT_NULL(txn); \
+ CU_ASSERT_PTR_NULL(_data); \
+ CU_ASSERT_PTR_NOT_EQUAL(_data, BADDATA); \
+ CU_ASSERT_EQUAL(_datalen, 0); \
+ CU_ASSERT_NOT_EQUAL(_datalen, BADLEN); \
+}
+
+#define CANNOTFETCHNEXT(key, keylen, experror) \
+{ \
+ r = cyrusdb_fetchnext(db, key, keylen, NULL, 0, NULL, 0, &txn); \
+ CU_ASSERT_EQUAL(r, experror); \
+ CU_ASSERT_PTR_NOT_NULL(txn); \
+}
+
+#define CANCOMMIT() \
+ r = cyrusdb_commit(db, txn); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ txn = NULL;
+
+#define CANREOPEN() \
+ r = cyrusdb_close(db); \
+ db = NULL; \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ r = cyrusdb_open(backend, filename, 0, &db); \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+#define GOTRESULT(expkey, expkeylen, expdata, expdatalen) \
+{ \
+ const char *_key = (expkey); \
+ size_t _keylen = (expkeylen); \
+ const char *_data = (expdata); \
+ size_t _datalen = (expdatalen); \
+ struct binary_result *actual = results; \
+ CU_ASSERT_PTR_NOT_NULL_FATAL(results); \
+ results = results->next; \
+ CU_ASSERT_EQUAL(_keylen, actual->keylen); \
+ CU_ASSERT_EQUAL(0, memcmp(_data, actual->data, _datalen)); \
+ CU_ASSERT_EQUAL(_datalen, actual->datalen); \
+ CU_ASSERT_EQUAL(0, memcmp(_key, actual->key, _keylen)); \
+ free(actual->key); \
+ free(actual->data); \
+ free(actual); \
+}
+
+static void test_openclose(void)
+{
+ struct db *db = NULL;
+ int r;
+
+ CU_ASSERT_EQUAL(fexists(filename), -ENOENT);
+
+ /* open() without _CREATE fails with NOTFOUND
+ * and doesn't create the db */
+ r = cyrusdb_open(backend, filename, 0, &db);
+ CU_ASSERT(r == CYRUSDB_NOTFOUND || r == CYRUSDB_IOERROR);
+ CU_ASSERT_PTR_NULL(db);
+ CU_ASSERT_EQUAL(fexists(filename), -ENOENT);
+
+ /* open() with _CREATE succeeds and creates the db */
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+
+ /* closing succeeds and leaves the file in place */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+}
+
+static void test_multiopen(void)
+{
+ struct db *db1 = NULL;
+ struct txn *txn1 = NULL;
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ int r;
+ /* data courtesy hipsteripsum.me */
+ static const char KEY1 = "mustache";
+ static const char DATA1 = "blog lomo";
+ static const char KEY2 = "cred";
+ static const char DATA2 = "beard ethical";
+ static const char KEY3 = "leggings";
+ static const char DATA3 = "tumblr salvia";
+
+ CU_ASSERT_EQUAL(fexists(filename), -ENOENT);
+
+ /* open() with _CREATE succeeds and creates the db */
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+
+ /* 1st txn starts */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANCOMMIT();
+ /* 1st txn ends */
+
+ /*
+ * Note: the transaction started on the first db reference is
+ * carefully *not* left open when starting a transaction on the
+ * second db reference. Supported nested transactions is actually
+ * quite a challenge for some backends, and is NOT part of the Cyrus
+ * DB semantics. All we're testing here is that both db references
+ * work fine as long as the transactions do not overlap.
+ */
+
+ db1 = db;
+ txn1 = txn;
+ {
+	db = NULL;
+	txn = NULL;
+
+	/* a second open() with the same filename returns
+	 * another reference to the same db */
+	r = cyrusdb_open(backend, filename, 0, &db);
+	CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+	CU_ASSERT_PTR_NOT_NULL(db);
+
+	/* 2nd txn starts */
+	CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+	CANCOMMIT();
+	/* 2nd txn ends */
+
+	/* closing succeeds and leaves the file in place */
+	r = cyrusdb_close(db);
+	CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+	CU_ASSERT_EQUAL(fexists(filename), 0);
+ }
+ db = db1;
+ txn = txn1;
+
+ /* the 1st db ref still works */
+ /* 3rd txn starts */
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ CANCOMMIT();
+ /* 3rd txn ends */
+
+ /* closing the other reference succeeds and leaves the file in place */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+
+ /* re-opening works */
+ r = cyrusdb_open(backend, filename, 0, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+
+ /* all the records are present in the file */
+ /* 4th txn starts */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ CANCOMMIT();
+ /* 4th txn ends */
+
+ /* out of TXN works too */
+ CANFETCH_NOTXN(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH_NOTXN(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANFETCH_NOTXN(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+}
+
+static void test_opentwo(void)
+{
+ struct db *db1 = NULL;
+ struct db *db2 = NULL;
+ int r;
+
+ CU_ASSERT_EQUAL(fexists(filename), -ENOENT);
+ CU_ASSERT_EQUAL(fexists(filename2), -ENOENT);
+
+ /* open() with _CREATE succeeds and creates the db */
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db1);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db1);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+ CU_ASSERT_EQUAL(fexists(filename2), -ENOENT);
+
+ /* open() of the 2nd filename with _CREATE
+ * succeeds and creates another separate db */
+ r = cyrusdb_open(backend, filename2, CYRUSDB_CREATE, &db2);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db2);
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+ CU_ASSERT_EQUAL(fexists(filename2), 0);
+ CU_ASSERT_PTR_NOT_EQUAL(db1, db2);
+
+ /* closing succeeds and leaves the file in place */
+ r = cyrusdb_close(db1);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* closing the other reference succeeds and leaves the file in place */
+ r = cyrusdb_close(db2);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ CU_ASSERT_EQUAL(fexists(filename), 0);
+ CU_ASSERT_EQUAL(fexists(filename2), 0);
+}
+
+static void test_readwrite(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ static const char KEY = "skeleton";
+ static const char DATA = "dem bones dem bones dem thighbones";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* the record can be fetched back */
+ CANFETCH(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* data can be read back in a new transaction */
+ CANFETCH(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data can still be read back */
+ CANFETCH(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+static void test_multirw(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ static const char KEY = "skeleton";
+ static const char DATA1 = "dem bones";
+ static const char DATA2 = "Dem KneeBones";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY, strlen(KEY), DATA1, strlen(DATA1));
+
+ /* the record can be fetched back */
+ CANFETCH(KEY, strlen(KEY), DATA1, strlen(DATA1));
+
+ /* store()ing the record again, in the same txn, succeeds */
+ CANSTORE(KEY, strlen(KEY), DATA2, strlen(DATA2));
+
+ /* fetching again gets the new data */
+ CANFETCH(KEY, strlen(KEY), DATA2, strlen(DATA2));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* new data can be read back in a new transaction */
+ CANFETCH(KEY, strlen(KEY), DATA2, strlen(DATA2));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* new data can still be read back */
+ CANFETCH(KEY, strlen(KEY), DATA2, strlen(DATA2));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ CANFETCH_NOTXN(KEY, strlen(KEY), DATA2, strlen(DATA2));
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+/* read-write of a non-NULL zero length datum */
+static void test_readwrite_zerolen(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ /* test data thanks to hipsteripsum.me */
+ static const char KEY = "keffiyeh";
+ static const char DATA = "";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY, strlen(KEY), DATA, 0);
+
+ /* the records can be fetched back; we get non-NULL
+ * zero-length data */
+ CANFETCH(KEY, strlen(KEY), DATA, 0);
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* data can be read back in a new transaction */
+ CANFETCH(KEY, strlen(KEY), DATA, 0);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data can still be read back */
+ CANFETCH(KEY, strlen(KEY), DATA, 0);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+/* read-write of a NULL zero length datum */
+static void test_readwrite_null(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ /* test data thanks to hipsteripsum.me */
+ static const char KEY = "skateboard";
+ static const char EMPTY = "";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY, strlen(KEY), NULL, 0);
+
+ /* the records can be fetched back; we get non-NULL
+ * zero-length data */
+ CANFETCH(KEY, strlen(KEY), EMPTY, 0);
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* data can be read back in a new transaction */
+ CANFETCH(KEY, strlen(KEY), EMPTY, 0);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data can still be read back */
+ CANFETCH(KEY, strlen(KEY), EMPTY, 0);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+static void test_abort(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ static const char KEY = "yale";
+ static const char DATA = "standford mit harvard";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* the record can be fetched back */
+ CANFETCH(KEY, strlen(KEY), DATA, strlen(DATA));
+
+ /* abort succeeds */
+ r = cyrusdb_abort(db, txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ txn = NULL;
+
+ /* data is not present in a new transaction */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* close the new txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data is still not present after close/reopen */
+ CANNOTFETCH(KEY, strlen(KEY), CYRUSDB_NOTFOUND);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+
+static void test_delete(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ /* random word generator to the rescue! */
+ static const char KEY1 = "buzzes";
+ static const char DATA1 = "afro timur funky cents hewitt";
+ static const char KEY2 = "galas";
+ static const char DATA2 = "assad goering flemish brynner heshvan";
+ static const char KEY3 = "bathes";
+ static const char DATA3 = "flax corm naipaul enable herrera fating";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* all records can be fetched back */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* one of the records can be deleted */
+ r = cyrusdb_delete(db, KEY2, strlen(KEY2), &txn, 1);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ /* deleted record cannot be fetch()ed now */
+ CANNOTFETCH(KEY2, strlen(KEY2), CYRUSDB_NOTFOUND);
+ /* but others can */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* deleted record still cannot be fetch()ed in a new txn */
+ CANNOTFETCH(KEY2, strlen(KEY2), CYRUSDB_NOTFOUND);
+ /* but others can */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* deleted record still cannot be fetch()ed and re-open */
+ CANNOTFETCH(KEY2, strlen(KEY2), CYRUSDB_NOTFOUND);
+ /* but others can */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+static int foreacher(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct binary_result **head = (struct binary_result **)rock;
+ struct binary_result **tail;
+ struct binary_result *res;
+
+ /* check that key and data are correct */
+ CU_ASSERT_PTR_NOT_NULL(key);
+ CU_ASSERT(keylen > 0);
+
+ CU_ASSERT_PTR_NOT_NULL(data);
+ CU_ASSERT(datalen > 0);
+
+ /* remember them for later perusal */
+ res = xzmalloc(sizeof(*res));
+ res->key = xmemdup(key, keylen);
+ res->keylen = keylen;
+ res->data = xmemdup(data, datalen);
+ res->datalen = datalen;
+ /* append to the list. yes, it's inefficient. */
+ for (tail = head ; *tail ; tail = &(*tail)->next)
+	;
+ *tail = res;
+
+ return 0;
+}
+
+struct deleteit {
+ struct db *db;
+ struct binary_result **results;
+};
+
+static int deleter(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct deleteit *dd = rock;
+ int r;
+
+ r = foreacher(dd->results, key, keylen, data, datalen);
+ if (r) return r;
+
+ r = cyrusdb_delete(dd->db, key, keylen, NULL, 0/*force*/);
+ if (r) return r;
+
+ return 0;
+}
+
+static void test_mboxlist(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ struct binary_result *results = NULL;
+ /* random word generator to the rescue! */
+ static const char KEY1 = "INBOX.a";
+ static const char DATA1 = "delays maj bullish packard ronald";
+ static const char KEY2 = "INBOX.a b";
+ static const char DATA2 = "bobby tswana cu albumin created";
+ static const char KEY3 = "INBOX.a.b";
+ static const char DATA3 = "aleut stoic muscovy adonis moe docent";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* all records can be fetched back */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ /* flat is always in mboxlist order! */
+ if (!strcmp(backend, "flat")) {
+	GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+	GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ }
+ else {
+	GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+	GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ }
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* try again with mboxlist sort */
+
+ r = cyrusdb_open(backend, filename2, CYRUSDB_CREATE | CYRUSDB_MBOXSORT, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order - that is MBOXLIST
+ * sort order, so 3 before 2 */
+ GOTRESULT(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+static void test_foreach(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ struct binary_result *results = NULL;
+ struct deleteit deldata;
+ /* random word generator to the rescue! */
+ static const char KEY1 = "carib";
+ static const char DATA1 = "delays maj bullish packard ronald";
+ static const char KEY2 = "cubist";
+ static const char DATA2 = "bobby tswana cu albumin created";
+ static const char KEY3 = "eulogy";
+ static const char DATA3 = "aleut stoic muscovy adonis moe docent";
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* all records can be fetched back */
+ CANFETCH(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANFETCH(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANFETCH(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* only check "fetchnext" iteration if it's defined for this backend */
+ if (cyrusdb_canfetchnext(backend)) {
+	CANFETCHNEXT(NULL, 0, KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+	CANFETCHNEXT(KEY1, strlen(KEY1), KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+	CANFETCHNEXT(KEY2, strlen(KEY2), KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+	CANNOTFETCHNEXT(KEY3, strlen(KEY3), CYRUSDB_NOTFOUND);
+ }
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* check again without TXN */
+
+ /* foreach succeeds without txn */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, NULL);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* delete all the records after viewing them */
+ deldata.db = db;
+ deldata.results = &results;
+ r = cyrusdb_foreach(db, NULL, 0, NULL, deleter, &deldata, NULL);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ GOTRESULT(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ GOTRESULT(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* nothing left! */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &deldata, NULL);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+struct ffrock {
+ struct db *db;
+ struct txn **tid;
+ int state;
+};
+
+#define K0 "affect"
+#define K0U "bother"
+#define K1 "carib"
+#define K2 "cubist"
+#define K3 "eulogy"
+#define K4 "kidding"
+#define K4A "notice"
+#define K5 "penguin"
+#define K6 "zebra"
+
+static int ffstatemachine(void *rockp,
+			 const char *key, size_t keylen,
+			 const char *data __attribute((unused)),
+			 size_t datalen __attribute((unused)))
+{
+ struct ffrock *fr = (struct ffrock *)rockp;
+ char *kcopy = xstrndup(key, keylen);
+ int r;
+
+ /* oh yeah, state machine time */
+ switch (fr->state) {
+ case 0:
+	CU_ASSERT_STRING_EQUAL(kcopy, K1);
+	fr->state = 1;
+	break;
+ case 1:
+	CU_ASSERT_STRING_EQUAL(kcopy, K2);
+	/* test prior-location store */
+	r = cyrusdb_store(fr->db, K0, strlen(K0), "", 0, fr->tid);
+	CU_ASSERT_EQUAL(r, 0);
+	fr->state = 2;
+	break;
+ case 2:
+	CU_ASSERT_STRING_EQUAL(kcopy, K3);
+	/* test prior non-existent fetch - can cause infinite loops if buggy */
+	r = cyrusdb_fetch(fr->db, K0U, strlen(K0U), NULL, NULL, fr->tid);
+	CU_ASSERT_EQUAL(r, CYRUSDB_NOTFOUND);
+	fr->state = 3;
+	break;
+ case 3:
+	CU_ASSERT_STRING_EQUAL(kcopy, K4);
+	r = cyrusdb_store(fr->db, K4A, strlen(K4A), "", 0, fr->tid);
+	CU_ASSERT_EQUAL(r, 0);
+	fr->state = 4;
+	break;
+ case 4:
+	/* we found the after-added record correctly */
+	CU_ASSERT_STRING_EQUAL(kcopy, K4A);
+	r = cyrusdb_store(fr->db, K4A, strlen(K4A), "another", 7, fr->tid);
+	CU_ASSERT_EQUAL(r, 0);
+	fr->state = 5;
+	break;
+ case 5:
+	/* didn't repeat after replacing */
+	CU_ASSERT_STRING_EQUAL(kcopy, K5);
+	r = cyrusdb_delete(fr->db, K5, strlen(K5), fr->tid, /*force*/1);
+	fr->state = 6;
+	break;
+ case 6:
+	/* moved on after deleting */
+	CU_ASSERT_STRING_EQUAL(kcopy, K6);
+	fr->state = 7;
+	break;
+ default:
+	CU_ASSERT(0); /* bogus state found */
+	break;
+ }
+
+ free(kcopy);
+
+ return 0;
+}
+
+static void test_foreach_changes(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ struct ffrock rock;
+
+ /* random word generator to the rescue! */
+ static const char KEY1 = K1;
+ static const char DATA1 = "delays maj bullish packard ronald";
+ static const char KEY2 = K2;
+ static const char DATA2 = "bobby tswana cu albumin created";
+ static const char KEY3 = K3;
+ static const char DATA3 = "aleut stoic muscovy adonis moe docent";
+ static const char KEY4 = K4;
+ static const char DATA4 = "curry deterrent drove raising hiring";
+ static const char KEY5 = K5;
+ static const char DATA5 = "joining keeper angle burden buffer";
+ static const char KEY6 = K6;
+ static const char DATA6 = "annoying push security plenty ending";
+ int r;
+
+ if (!strcmp(backend, "flat")) return; /* flat concurency is bogus */
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ CANSTORE(KEY4, strlen(KEY4), DATA4, strlen(DATA4));
+ CANSTORE(KEY5, strlen(KEY5), DATA5, strlen(DATA5));
+ CANSTORE(KEY6, strlen(KEY6), DATA6, strlen(DATA6));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ rock.db = db;
+ rock.state = 0;
+ rock.tid = &txn;
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, ffstatemachine, &rock, rock.tid);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_EQUAL(rock.state, 7);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* check again without TXN */
+
+ db = NULL;
+ r = cyrusdb_open(backend, filename2, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ CANSTORE(KEY1, strlen(KEY1), DATA1, strlen(DATA1));
+ CANSTORE(KEY2, strlen(KEY2), DATA2, strlen(DATA2));
+ CANSTORE(KEY3, strlen(KEY3), DATA3, strlen(DATA3));
+ CANSTORE(KEY4, strlen(KEY4), DATA4, strlen(DATA4));
+ CANSTORE(KEY5, strlen(KEY5), DATA5, strlen(DATA5));
+ CANSTORE(KEY6, strlen(KEY6), DATA6, strlen(DATA6));
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ rock.db = db;
+ rock.state = 0;
+ rock.tid = NULL;
+
+ /* foreach succeeds without txn */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, ffstatemachine, &rock, rock.tid);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_EQUAL(rock.state, 7);
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+#undef K0
+#undef K0U
+#undef K1
+#undef K2
+#undef K3
+#undef K4
+#undef K4A
+#undef K5
+#undef K6
+
+static void test_binary_keys(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ /* data from hipsteripsum.me */
+ static const char KEY1 = "master\0cleanse";
+ static const char DATA1 = "ethical";
+ static const char KEY2 = "cardigan\tdreamcatcher";
+ static const char DATA2 = "shoreditch";
+ static const char KEY3 = "pitchfork\rcarles";
+ static const char DATA3 = "tumble";
+ static const char KEY4 = "seitan\nraw\ndenim";
+ static const char DATA4 = "fap";
+ static const char KEY5 = { 0x01, 0x02, 0x04, 0x08,
+			 0x10, 0x20, 0x40, 0x80,
+				 0x00/*unused*/};
+ static const char DATA5 = "farm-to-table";
+ struct binary_result *results = NULL;
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY1, sizeof(KEY1)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY2, sizeof(KEY2)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY3, sizeof(KEY3)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY4, sizeof(KEY4)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY5, sizeof(KEY5)-1, CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANSTORE(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANSTORE(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANSTORE(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANSTORE(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* the record can be fetched back */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* data can be read back in a new transaction */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+ GOTRESULT(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ GOTRESULT(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ GOTRESULT(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ GOTRESULT(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data can still be read back */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* foreach still succeeds - out of txn */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, NULL);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+ GOTRESULT(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ GOTRESULT(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ GOTRESULT(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ GOTRESULT(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+
+static void test_binary_data(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ /* data from hipsteripsum.me */
+ static const char KEY1 = "vinyl";
+ static const char DATA1 = "cosby\0sweater";
+ static const char KEY2 = "blog";
+ static const char DATA2 = "next\tlevel";
+ static const char KEY3 = "chambray";
+ static const char DATA3 = "mcsweeneys\rletterpress";
+ static const char KEY4 = "synth";
+ static const char DATA4 = "readymade\ncliche\nterry\nrichardson";
+ static const char KEY5 = "fixie";
+ static const char DATA5 = { 0x01, 0x02, 0x04, 0x08,
+			 0x10, 0x20, 0x40, 0x80,
+				 0x00/*unused*/};
+ struct binary_result *results = NULL;
+ int r;
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* the database is initially empty, so fetch will fail */
+ CANNOTFETCH(KEY1, sizeof(KEY1)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY2, sizeof(KEY2)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY3, sizeof(KEY3)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY4, sizeof(KEY4)-1, CYRUSDB_NOTFOUND);
+ CANNOTFETCH(KEY5, sizeof(KEY5)-1, CYRUSDB_NOTFOUND);
+
+ /* store()ing a record succeeds */
+ CANSTORE(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANSTORE(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANSTORE(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANSTORE(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANSTORE(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* the record can be fetched back */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* data can be read back in a new transaction */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* foreach succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ GOTRESULT(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ GOTRESULT(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+ GOTRESULT(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ GOTRESULT(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* close and re-open the database */
+ CANREOPEN();
+
+ /* data can still be read back */
+ CANFETCH(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ CANFETCH(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ CANFETCH(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ CANFETCH(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ CANFETCH(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+
+ /* foreach still succeeds */
+ r = cyrusdb_foreach(db, NULL, 0, NULL, foreacher, &results, &txn);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ /* got the expected keys in the expected order */
+ GOTRESULT(KEY2, sizeof(KEY2)-1, DATA2, sizeof(DATA2)-1);
+ GOTRESULT(KEY3, sizeof(KEY3)-1, DATA3, sizeof(DATA3)-1);
+ GOTRESULT(KEY5, sizeof(KEY5)-1, DATA5, sizeof(DATA5)-1);
+ GOTRESULT(KEY4, sizeof(KEY4)-1, DATA4, sizeof(DATA4)-1);
+ GOTRESULT(KEY1, sizeof(KEY1)-1, DATA1, sizeof(DATA1)-1);
+ /* foreach iterated over exactly all the keys */
+ CU_ASSERT_PTR_NULL(results);
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+}
+
+
+const char *nth_compound(unsigned int n,
+			 const char * const * words /*37*/,
+			 const char *sep,
+			 struct buf *res)
+{
+ buf_reset(res);
+
+ if ((n / 1000) % 10) {
+	buf_appendcstr(res, words28 + (n / 1000) % 10);
+ }
+
+ if ((n / 100) % 10) {
+	if (res->len && sep)
+	 buf_appendcstr(res, sep);
+	buf_appendcstr(res, words19 + (n / 100) % 10);
+ }
+
+ if ((n / 10) % 10) {
+	if (res->len && sep)
+	 buf_appendcstr(res, sep);
+	buf_appendcstr(res, words10 + (n / 10) % 10);
+ }
+
+ if (res->len && sep)
+	buf_appendcstr(res, sep);
+ buf_appendcstr(res, wordsn % 10);
+
+ return buf_cstring(res);
+}
+
+static const char *nth_key(unsigned int n)
+{
+ static const char * const words37 = {
+	"dray", "bite", "cue", "ado", "felt",
+	"firm", "sal", "ahab", "cab", "lord",
+	"blob", "be", "coil", "hay",
+	"bled", "got", "leta", "sept", "deft",
+	"ibm", "kama", "bean", "ado",
+	"cord", "firm", "ben", "fore", "huck",
+	"haas", "jack", "aden", "nerf",
+	"gash", "stu", "nona", "gel", "ale"
+ };
+ static struct buf buf = BUF_INITIALIZER;
+ return nth_compound(n, words, ".", &buf);
+}
+
+static const char *nth_data(unsigned int n)
+{
+ static const char * const words37 = {
+	"abettor", "afresh", "aisling", "arthur", "ascots",
+	"belled", "berserk", "border", "bourbon", "brawny",
+	"carpels", "cavils", "coating", "cologne",
+	"concern", "consul", "crater", "crocks", "deirdre",
+	"dewier", "disdain", "dowdier", "duncan",
+	"eighth", "enigma", "evelyn", "fennel", "flowery",
+	"flukier", "forums", "gametes", "gamins",
+	"gavels", "gibbers", "gulags", "gunther", "gunwale"
+ };
+ static struct buf buf = BUF_INITIALIZER;
+ return nth_compound(n, words, " ", &buf);
+}
+
+static int finder(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ hash_table *exphash = (hash_table *)rock;
+ char *expected;
+ struct buf kbuf = BUF_INITIALIZER;
+
+ /* check that key and data are correct */
+ CU_ASSERT_PTR_NOT_NULL(key);
+ CU_ASSERT(keylen > 0);
+
+ CU_ASSERT_PTR_NOT_NULL(data);
+ CU_ASSERT(datalen > 0);
+
+ buf_appendmap(&kbuf, key, keylen);
+ buf_cstring(&kbuf);
+
+ expected = hash_lookup(kbuf.s, exphash);
+ CU_ASSERT_EQUAL(datalen, strlen(expected));
+ CU_ASSERT_EQUAL(0, memcmp(data, expected, datalen));
+ hash_del(kbuf.s, exphash);
+ free(expected);
+ buf_free(&kbuf);
+
+ return 0;
+}
+
+static void count_cb(const char *key __attribute__((unused)),
+		 void *data __attribute__((unused)),
+		 void *rock)
+{
+ unsigned int *np = (unsigned int *)rock;
+ (*np)++;
+}
+
+static unsigned int hash_count(hash_table *ht)
+{
+ unsigned int n = 0;
+ hash_enumerate(ht, count_cb, &n);
+ return n;
+}
+
+#define FOREACH_PRECONDITION(condition, expcount) \
+{ \
+ unsigned int nsubset = 0; \
+ unsigned int i; \
+ for (i = 0 ; i <= MAXN ; i++) { \
+	const char *key = nth_key(i); \
+	const char *data = nth_data(i); \
+	if ((condition)) { \
+	 hash_insert(key, (void *)xstrdup(data), &exphash); \
+	 nsubset++; \
+	} \
+ } \
+ CU_ASSERT_EQUAL(nsubset, expcount); \
+ CU_ASSERT_EQUAL(hash_count(&exphash), nsubset); \
+}
+
+#define FOREACH_POSTCONDITION() \
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK); \
+ CU_ASSERT_EQUAL(hash_count(&exphash), 0);
+
+#define FOREACH_TEST(prefix, prefixlen, good, condition, expcount) \
+ FOREACH_PRECONDITION(condition, expcount); \
+ r = cyrusdb_foreach(db, prefix, prefixlen, good, finder, &exphash, &txn); \
+ FOREACH_POSTCONDITION()
+
+static void test_many(void)
+{
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ hash_table exphash = HASH_TABLE_INITIALIZER;
+#define MAXN	4095
+ unsigned int n;
+ int r;
+
+ construct_hash_table(&exphash, (MAXN+1)*4, 0);
+
+ r = cyrusdb_open(backend, filename, CYRUSDB_CREATE, &db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+ CU_ASSERT_PTR_NOT_NULL(db);
+
+ /* store() some records */
+ for (n = 0 ; n <= MAXN ; n++) {
+	const char *key = nth_key(n);
+	const char *data = nth_data(n);
+	CANSTORE(key, strlen(key), data, strlen(data));
+ }
+
+ /* commit succeeds */
+ CANCOMMIT();
+
+ /* check the records all made it */
+ for (n = 0 ; n <= MAXN ; n++)
+ {
+	const char *key = nth_key(n);
+	const char *data = nth_data(n);
+	CANFETCH(key, strlen(key), data, strlen(data));
+ }
+
+ /* prefix=NULL: iterate all the records */
+ FOREACH_TEST(/*prefix*/NULL, /*prefixlen*/0,
+	 /*good*/NULL, /*condition*/1, MAXN+1);
+
+ /* prefix="": iterate all the records */
+ FOREACH_TEST(/*prefix*/"", /*prefixlen*/0,
+	 /*good*/NULL, /*condition*/1, MAXN+1);
+
+ /* prefix=an uncommon prefix: iterate some of the records */
+ FOREACH_TEST(/*prefix*/"jack.", /*prefixlen*/5,
+		 /*good*/NULL, /*condition*/i / 1000 == 1, 1000);
+
+ /* delete records one by one, checking that foreach
+ * walks over the expected number from time to time */
+ for (n = 0 ; n <= MAXN ; n++) {
+	const char *key = nth_key(n);
+	r = cyrusdb_delete(db, key, strlen(key), &txn, 1);
+	CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+	CU_ASSERT_PTR_NOT_NULL(txn);
+	if (n && n % 301 == 0) {
+	 FOREACH_TEST(/*prefix*/NULL, /*prefixlen*/0,
+			 /*good*/NULL, /*condition*/i > n, MAXN-n);
+	}
+ }
+
+ /* close the txn - it doesn't matter here if we commit or abort */
+ CANCOMMIT();
+
+ /* closing succeeds */
+ r = cyrusdb_close(db);
+ CU_ASSERT_EQUAL(r, CYRUSDB_OK);
+
+ free_hash_table(&exphash, free);
+#undef MAXN
+}
+
+static char *basedir;
+
+static int set_up(void)
+{
+ char bufPATH_MAX;
+ static const char * const reldirs = {
+	"db",
+	"conf",
+	"conf/lock/",
+	"conf/lock/user",
+	"stuff",
+	NULL
+ };
+
+ basedir = make_basedir(reldirs);
+ if (!basedir)
+	return -1;
+
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, basedir);
+ snprintf(buf, sizeof(buf), "configdirectory: %s/conf\n", basedir);
+ config_read_string(buf);
+
+ cyrusdb_init();
+
+ filename = strconcat(basedir, "/stuff/cyrus.", backend, "-test", (char *)NULL);
+ filename2 = strconcat(basedir, "/stuff/cyrus.", backend, "-testB", (char *)NULL);
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ int r = 0;
+
+ cyrusdb_done();
+
+ if (basedir) {
+	char bufPATH_MAX;
+	snprintf(buf, sizeof(buf), "rm -rf \"%s\"", basedir);
+	r = system(buf);
+	if (r) r = -1;
+ }
+
+ free(filename);
+ filename = NULL;
+ free(filename2);
+ filename2 = NULL;
+ free(basedir);
+ basedir = NULL;
+
+ return r;
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/dlist.testc Added

@@ -0,0 +1,383 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "prot.h"
+#include "imap/dlist.h"
+#include "util.h"
+
+/* XXX - need LOTS of dlist tests */
+
+static void test_nil(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ struct dlist *dl = dlist_newlist(NULL, NULL);
+ struct dlist *item;
+ int r;
+
+ dlist_setatom(dl, "STRING", "NIL");
+ dlist_setatom(dl, "EMPTY", NULL);
+ dlist_printbuf(dl, 0, &b);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "(\"NIL\" NIL)");
+ dlist_free(&dl);
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ item = dlist_getchildn(dl, 0);
+ CU_ASSERT_PTR_NOT_NULL(item);
+ CU_ASSERT_EQUAL(item->type, DL_ATOM);
+ CU_ASSERT_STRING_EQUAL(item->sval, "NIL");
+
+ item = dlist_getchildn(dl, 1);
+ CU_ASSERT_PTR_NOT_NULL(item);
+ CU_ASSERT_EQUAL(item->type, DL_NIL);
+ CU_ASSERT_PTR_NULL(item->sval);
+
+ dlist_free(&dl);
+ buf_free(&b);
+}
+
+static void test_splice_middle(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 5);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "(6 7 8 9 10)");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(1 2 3 4 5)");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splice_none(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 0);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "(1 2 3 4 5 6 7 8 9 10)");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "()");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splice_one(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 1);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "(2 3 4 5 6 7 8 9 10)");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(1)");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splice_allbut(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 9);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "(10)");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(1 2 3 4 5 6 7 8 9)");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splice_all(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 10);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "()");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(1 2 3 4 5 6 7 8 9 10)");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splice_over(void)
+{
+ struct dlist *dl = dlist_newlist(NULL, "NAME");
+ struct dlist *dl2 = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int i;
+
+ for (i = 1; i <= 10; i++) {
+	dlist_setnum32(dl, "NUM", i);
+ }
+
+ dl2 = dlist_splice(dl, 11);
+
+ dlist_printbuf(dl, 0, &b);
+ dlist_printbuf(dl2, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(dl->name, "NAME");
+ CU_ASSERT_STRING_EQUAL(dl2->name, "NAME");
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b), "()");
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(1 2 3 4 5 6 7 8 9 10)");
+
+ dlist_free(&dl);
+ dlist_free(&dl2);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_start(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "((a b) (c d) (e f))");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 0);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(a b (c d) (e f))");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_middle(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "((a b) (c d) (e f))");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 1);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "((a b) c d (e f))");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_end(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "((a b) (c d) (e f))");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 2);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "((a b) (c d) e f)");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_short(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "((a b) (c) (d e))");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 1);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "((a b) c (d e))");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_empty(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "((a b) () (c d))");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 1);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "((a b) (c d))");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+static void test_splat_nonlist(void)
+{
+ struct dlist *dl = NULL;
+ struct dlist *sub = NULL;
+ struct buf b = BUF_INITIALIZER;
+ struct buf b2 = BUF_INITIALIZER;
+ int r;
+
+ buf_printf(&b, "(a b c d e)");
+
+ r = dlist_parsemap(&dl, 0, b.s, b.len);
+
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(dl);
+
+ sub = dlist_getchildn(dl, 2);
+
+ dlist_splat(dl, sub);
+
+ dlist_printbuf(dl, 0, &b2);
+
+ CU_ASSERT_STRING_EQUAL(buf_cstring(&b2), "(a b d e)");
+
+ dlist_free(&dl);
+ buf_free(&b);
+ buf_free(&b2);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/duplicate.testc Added

@@ -0,0 +1,321 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include "config.h"
+#include "cunit/cunit.h"
+#include "imap/duplicate.h"
+#include "xmalloc.h"
+#include "retry.h"
+#include "imap/global.h"
+#include "imap/imap_err.h"
+#include "cyrusdb.h"
+#include "libcyr_cfg.h"
+#include "libconfig.h"
+
+#define DBDIR			"test-mb-dbdir"
+
+struct result
+{
+ struct result *next;
+ char *id;
+ char *to;
+ char *date;
+ time_t mark;
+ unsigned long uid;
+};
+
+#define GOTRESULT(expid, expto, expdate, expmark, expuid) \
+{ \
+ struct result *actual = results; \
+ CU_ASSERT_PTR_NOT_NULL_FATAL(results); \
+ results = results->next; \
+ CU_ASSERT_STRING_EQUAL(expid, actual->id); \
+ CU_ASSERT_STRING_EQUAL(expto, actual->to); \
+ CU_ASSERT_STRING_EQUAL(expdate, actual->date); \
+ CU_ASSERT_EQUAL(expmark, actual->mark); \
+ CU_ASSERT_EQUAL(expuid, actual->uid); \
+ free(actual->id); \
+ free(actual->to); \
+ free(actual->date); \
+ free(actual); \
+}
+
+static void test_getset(void)
+{
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
+ time_t t;
+ time_t now;
+ static const char MSGID1 = "<fake0999@fastmail.fm>";
+ static const char MSGID2 = "<fake1001@fastmail.fm>";
+ static const char FOLDER = "user.smurf";
+ static const char DATE = "Wed, 27 Oct 2010 18:37:26 +1100";
+ static unsigned long UID = 42;
+
+ /* an invalid key returns 0 */
+ dkey.id = NULL;
+ dkey.to = NULL;
+ dkey.date = NULL;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_EQUAL(t, 0);
+
+ /* a valid but missing key returns 0 */
+ dkey.id = MSGID1;
+ dkey.to = FOLDER;
+ dkey.date = DATE;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_EQUAL(t, 0);
+
+ /* the other one too */
+ dkey.id = MSGID2;
+ dkey.to = FOLDER;
+ dkey.date = DATE;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_EQUAL(t, 0);
+
+ /* mark appears to succeed */
+ dkey.id = MSGID1;
+ dkey.to = FOLDER;
+ dkey.date = DATE;
+ now = time(NULL);
+ duplicate_mark(&dkey, now, UID);
+
+ /* an invalid key still returns 0 */
+ dkey.id = NULL;
+ dkey.to = NULL;
+ dkey.date = NULL;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_EQUAL(t, 0);
+
+ /* a valid and present key returns non-zero */
+ dkey.id = MSGID1;
+ dkey.to = FOLDER;
+ dkey.date = DATE;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_NOT_EQUAL(t, 0);
+ CU_ASSERT_EQUAL(t, now);
+
+ /* a valid but missing key still returns 0 */
+ dkey.id = MSGID2;
+ dkey.to = FOLDER;
+ dkey.date = DATE;
+ t = duplicate_check(&dkey);
+ CU_ASSERT_EQUAL(t, 0);
+}
+
+static int finder(const duplicate_key_t *dkey, time_t mark,
+		 unsigned long uid, void *rock)
+{
+ struct result **head = (struct result **)rock;
+ struct result **tail;
+ struct result *res;
+
+// if (verbose)
+// 	fprintf(stderr, "found: id=\"%s\" to=\"%s\" date=\"%s\" "
+// 			"mark=%lu uid=%lu\n",
+// 			dkey->id, dkey->to, dkey->date,
+// 			(unsigned long)mark, (unsigned long)uid);
+
+ /* remember arguments for later perusal */
+ res = xzmalloc(sizeof(*res));
+ res->id = xstrdup(dkey->id);
+ res->to = xstrdup(dkey->to);
+ res->date = xstrdup(dkey->date);
+ res->mark = mark;
+ res->uid = uid;
+
+ /* append to the list. yes, it's inefficient. */
+ for (tail = head ; *tail ; tail = &(*tail)->next)
+	;
+ *tail = res;
+
+ return 0;
+}
+
+static void test_find(void)
+{
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
+ struct result *results = NULL;
+ static const char MSGID1 = "<fake0999@fastmail.fm>";
+ static const char MSGID2 = "<fake1001@fastmail.fm>";
+ /* test data from hipsteripsum.me */
+ static const char FOLDER1 = "user.vegan";
+ static const char FOLDER2 = "user.irony";
+ static const char FOLDER3 = "user.single.origin";
+ static const char FOLDER4 = "user.loko";
+ static const char FOLDER5 = "user.biodiesel";
+ static const char DATE1 = "Wed, 27 Oct 2010 18:01:02 +1100";
+ static const char DATE2 = "Wed, 27 Oct 2010 18:03:04 +1100";
+ static const char DATE3 = "Wed, 27 Oct 2010 18:05:06 +1100";
+ static const char DATE4 = "Wed, 27 Oct 2010 18:07:08 +1100";
+ static const char DATE5 = "Wed, 27 Oct 2010 18:09:10 +1100";
+ static time_t MARK1 = 1319088235;
+ static time_t MARK2 = 1319088235;
+ static time_t MARK3 = 1319088236;
+ static time_t MARK4 = 1319088735;
+ static time_t MARK5 = 1319089235;
+ static unsigned long UID1 = 23;
+ static unsigned long UID2 = 37;
+ static unsigned long UID3 = 42;
+ static unsigned long UID4 = 1007;
+ static unsigned long UID5 = 314159;
+ int r;
+
+ /* find on an empty db returns nothing */
+ r = duplicate_find(MSGID1, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(results);
+ r = duplicate_find(MSGID2, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* add one entry */
+ dkey.id = MSGID1;
+ dkey.to = FOLDER1;
+ dkey.date = DATE1;
+ duplicate_mark(&dkey, MARK1, UID1);
+
+ /* find returns the only entry */
+ r = duplicate_find(MSGID1, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID1, FOLDER1, DATE1, MARK1, UID1);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* find of another msgid returns nothing */
+ r = duplicate_find(MSGID2, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* add some more entries */
+ dkey.id = MSGID1;
+ dkey.to = FOLDER2;
+ dkey.date = DATE2;
+ duplicate_mark(&dkey, MARK2, UID2);
+
+ dkey.id = MSGID1;
+ dkey.to = FOLDER3;
+ dkey.date = DATE3;
+ duplicate_mark(&dkey, MARK3, UID3);
+
+ /* find returns all the entries in lexical order */
+ r = duplicate_find(MSGID1, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID1, FOLDER2, DATE2, MARK2, UID2);
+ GOTRESULT(MSGID1, FOLDER3, DATE3, MARK3, UID3);
+ GOTRESULT(MSGID1, FOLDER1, DATE1, MARK1, UID1);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* find of another msgid returns nothing */
+ r = duplicate_find(MSGID2, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* add some entries for another msgid */
+ dkey.id = MSGID2;
+ dkey.to = FOLDER4;
+ dkey.date = DATE4;
+ duplicate_mark(&dkey, MARK4, UID4);
+
+ dkey.id = MSGID2;
+ dkey.to = FOLDER5;
+ dkey.date = DATE5;
+ duplicate_mark(&dkey, MARK5, UID5);
+
+ /* find returns all the entries in lexical order */
+ r = duplicate_find(MSGID1, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID1, FOLDER2, DATE2, MARK2, UID2);
+ GOTRESULT(MSGID1, FOLDER3, DATE3, MARK3, UID3);
+ GOTRESULT(MSGID1, FOLDER1, DATE1, MARK1, UID1);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* find of another msgid all it's entries in lexical order */
+ r = duplicate_find(MSGID2, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID2, FOLDER5, DATE5, MARK5, UID5);
+ GOTRESULT(MSGID2, FOLDER4, DATE4, MARK4, UID4);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* find with msgid="" returns all the entries for all msgids */
+ r = duplicate_find("", finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID1, FOLDER2, DATE2, MARK2, UID2);
+ GOTRESULT(MSGID1, FOLDER3, DATE3, MARK3, UID3);
+ GOTRESULT(MSGID1, FOLDER1, DATE1, MARK1, UID1);
+ GOTRESULT(MSGID2, FOLDER5, DATE5, MARK5, UID5);
+ GOTRESULT(MSGID2, FOLDER4, DATE4, MARK4, UID4);
+ CU_ASSERT_PTR_NULL(results);
+
+ /* likewise msgid=NULL */
+ r = duplicate_find(NULL, finder, &results);
+ CU_ASSERT_EQUAL(r, 0);
+ GOTRESULT(MSGID1, FOLDER2, DATE2, MARK2, UID2);
+ GOTRESULT(MSGID1, FOLDER3, DATE3, MARK3, UID3);
+ GOTRESULT(MSGID1, FOLDER1, DATE1, MARK1, UID1);
+ GOTRESULT(MSGID2, FOLDER5, DATE5, MARK5, UID5);
+ GOTRESULT(MSGID2, FOLDER4, DATE4, MARK4, UID4);
+ CU_ASSERT_PTR_NULL(results);
+}
+
+
+static void config_read_string(const char *s)
+{
+ char *fname = xstrdup("/tmp/cyrus-cunit-configXXXXXX");
+ int fd = mkstemp(fname);
+ retry_write(fd, s, strlen(s));
+ config_reset();
+ config_read(fname, 0);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static int set_up(void)
+{
+ int r;
+ const char * const *d;
+ static const char * const dirs = {
+	DBDIR,
+	DBDIR"/db",
+	NULL
+ };
+
+ r = system("rm -rf " DBDIR);
+ if (r)
+	return r;
+
+ for (d = dirs ; *d ; d++) {
+	r = mkdir(*d, 0777);
+	if (r < 0) {
+	 int e = errno;
+	 perror(*d);
+	 return e;
+	}
+ }
+
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, DBDIR);
+ config_read_string(
+	"configdirectory: "DBDIR"/conf\n"
+ );
+
+ cyrusdb_init();
+ config_duplicate_db = "skiplist";
+
+ duplicate_init(0);
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ int r;
+
+ duplicate_done();
+ cyrusdb_done();
+ config_duplicate_db = NULL;
+ config_reset();
+
+ r = system("rm -rf " DBDIR);
+ if (r) r = -1;
+
+ return r;
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/getxstring.testc Added

@@ -0,0 +1,616 @@
+/* Test the getxstring() function */
+#include "config.h"
+#include "cunit/cunit.h"
+#include "prot.h"
+#include "imap/global.h"
+
+/*
+ * Here's the ABNF describing the various types of string from RF3501.
+ * This is included for amusement mainly, as the getxstring() code takes
+ * many liberties with it, being at times more liberal and at times more
+ * conservative than the strict interpretation of the ABNF. As these
+ * behaviours have been in the field a long time and clients may well
+ * depend on them, we test for the existing behaviour rather than strict
+ * RFC compliance.
+ *
+ * astring = 1*ASTRING-CHAR / string
+ *
+ * ASTRING-CHAR = ATOM-CHAR / resp-specials
+ *
+ * ATOM-CHAR = <any CHAR except atom-specials>
+ *
+ * atom-specials = "(" / ")" / "{" / SP / CTL / list-wildcards /
+ * quoted-specials / resp-specials
+ *
+ * string = quoted / literal
+ *
+ * list-wildcards = "%" / "*"
+ *
+ * literal = "{" number "}" CRLF *CHAR8
+ * ; Number represents the number of CHAR8s
+ *
+ * nil = "NIL"
+ *
+ * nstring = string / nil
+ *
+ * quoted = DQUOTE *QUOTED-CHAR DQUOTE
+ *
+ * QUOTED-CHAR = <any TEXT-CHAR except quoted-specials> /
+ * "\" quoted-specials
+ *
+ * quoted-specials = DQUOTE / "\"
+ *
+ * resp-specials = ""
+ *
+ * string = quoted / literal
+ */
+
+/*
+ * Run a single testcase.
+ *
+ * Note: prot_setisclient() turns off off literal synchronising so
+ * we don't have to futz around with testing that.
+ */
+#define _TESTCASE_PRE(fut, input, retval) \
+ do { \
+	struct buf b = BUF_INITIALIZER; \
+	struct protstream *p; \
+	int c; \
+	p = prot_readmap(input, sizeof(input)-1); \
+	CU_ASSERT_PTR_NOT_NULL(p); \
+	prot_setisclient(p, 1); \
+	c = fut(p, NULL, &b); \
+	CU_ASSERT_EQUAL(c, retval); \
+	if (c != EOF) {
+#define _TESTCASE_POST() \
+	} \
+	prot_free(p); \
+	buf_free(&b); \
+ } while (0)
+#define TESTCASE(fut, input, retval, output) \
+ do { \
+	int outputlen = sizeof(output)-1; \
+	_TESTCASE_PRE(fut, input, retval); \
+	CU_ASSERT_EQUAL(b.len, outputlen); \
+	CU_ASSERT(!memcmp(b.s, output, outputlen)); \
+	_TESTCASE_POST(); \
+ } while(0)
+#define TESTCASE_NULL(fut, input, retval) \
+ do { \
+	_TESTCASE_PRE(fut, input, retval); \
+	CU_ASSERT_EQUAL(b.len, 0); \
+	CU_ASSERT_PTR_NULL(b.s); \
+	_TESTCASE_POST(); \
+ } while(0)
+
+/*
+ * getastring() parses something vaguely like an astring, with a few differences.
+ */
+static void test_getastring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms */
+ TESTCASE(getastring, "hydrogen helium", ' ', "hydrogen");
+ TESTCASE(getastring, "258 uranium", ' ', "258");
+ TESTCASE(getastring, "uranium258 plutonium", ' ', "uranium258");
+
+ /* The character sequence NIL is not special, it's parsed as an atom */
+ TESTCASE(getastring, "NIL by mouth", ' ', "NIL");
+ TESTCASE(getastring, "NELLY the lamb", ' ', "NELLY");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings.
+ */
+ TESTCASE(getastring, "foo*bar baz", ' ', "foo*bar");
+ TESTCASE(getastring, "baz%quux foo", ' ', "baz%quux");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getastring, "foo(bar baz", '(', "foo");
+ TESTCASE(getastring, "foo)bar baz", ')', "foo");
+ TESTCASE(getastring, "foo{bar baz", ' ', "foo{bar"); /* should be: '{', "foo" */
+ TESTCASE(getastring, "foo\"bar baz", '"', "foo");
+ TESTCASE(getastring, "foo\\bar baz", ' ', "foo\\bar"); /* should be: '\\', "foo" */
+ TESTCASE(getastring, "foobar baz", ' ', "foobar"); /* should be '', "foo" */
+
+ /*
+ * Quoted strings are astrings
+ */
+ TESTCASE(getastring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getastring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getastring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getastring, "\"foo bar", EOF, "");
+ TESTCASE(getastring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getastring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getastring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getastring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getastring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getastring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getastring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are astrings
+ */
+ /* boring literal */
+ TESTCASE(getastring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getastring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getastring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getastring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getastring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getastring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getastring() rejects these */
+ TESTCASE(getastring, "{7}\r\nfoo\0bar ", EOF, ""); /* should be ' ', "foo\0bar" */
+}
+
+/*
+ * getbastring() is just the same as getastring() but allows embedded
+ * NULs in literals.
+ */
+static void test_getbastring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms */
+ TESTCASE(getbastring, "hydrogen helium", ' ', "hydrogen");
+ TESTCASE(getbastring, "258 uranium", ' ', "258");
+ TESTCASE(getbastring, "uranium258 plutonium", ' ', "uranium258");
+
+ /* The character sequence NIL is not special, it's parsed as an atom */
+ TESTCASE(getbastring, "NIL by mouth", ' ', "NIL");
+ TESTCASE(getbastring, "NELLY the lamb", ' ', "NELLY");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings. This is probably sheer laziness on Cyrus' part
+ * but it's a liberal-server interpretation which has been in the
+ * field a while now, so we ought to preserve it.
+ */
+ TESTCASE(getbastring, "foo*bar baz", ' ', "foo*bar");
+ TESTCASE(getbastring, "baz%quux foo", ' ', "baz%quux");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getbastring, "foo(bar baz", '(', "foo");
+ TESTCASE(getbastring, "foo)bar baz", ')', "foo");
+ TESTCASE(getbastring, "foo{bar baz", ' ', "foo{bar"); /* should be: '{', "foo" */
+ TESTCASE(getbastring, "foo\"bar baz", '"', "foo");
+ TESTCASE(getbastring, "foo\\bar baz", ' ', "foo\\bar"); /* should be: '\\', "foo" */
+ TESTCASE(getbastring, "foobar baz", ' ', "foobar"); /* should be '', "foo" */
+
+ /*
+ * Quoted strings are astrings
+ */
+ TESTCASE(getbastring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getbastring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getbastring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getbastring, "\"foo bar", EOF, "");
+ TESTCASE(getbastring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getbastring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getbastring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getbastring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getbastring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getbastring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getbastring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are astrings
+ */
+ /* boring literal */
+ TESTCASE(getbastring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getbastring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getbastring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getbastring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getbastring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getbastring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getbastring() allows these */
+ TESTCASE(getbastring, "{7}\r\nfoo\0bar ", ' ', "foo\0bar");
+}
+
+/*
+ * getstring() parses something very like a 'string' in the ABNF.
+ */
+static void test_getstring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms
+ * which are not strings */
+ TESTCASE(getstring, "hydrogen helium", EOF, "");
+ TESTCASE(getstring, "258 uranium", EOF, "");
+ TESTCASE(getstring, "uranium258 plutonium", EOF, "");
+
+ /* The character sequence NIL is not special, it's parsed as an atom */
+ TESTCASE(getstring, "NIL by mouth", EOF, "");
+ TESTCASE(getstring, "NELLY the lamb", EOF, "");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings. This is probably sheer laziness on Cyrus' part
+ * but it's a liberal-server interpretation which has been in the
+ * field a while now, so we ought to preserve it.
+ */
+ TESTCASE(getstring, "foo*bar baz", EOF, "");
+ TESTCASE(getstring, "baz%quux foo", EOF, "");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getstring, "foo(bar baz", EOF, "");
+ TESTCASE(getstring, "foo)bar baz", EOF, "");
+ TESTCASE(getstring, "foo{bar baz", EOF, "");
+ TESTCASE(getstring, "foo\"bar baz", EOF, "");
+ TESTCASE(getstring, "foo\\bar baz", EOF, "");
+ TESTCASE(getstring, "foobar baz", EOF, "");
+
+ /*
+ * Quoted strings are strings
+ */
+ TESTCASE(getstring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getstring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getstring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getstring, "\"foo bar", EOF, "");
+ TESTCASE(getstring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getstring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getstring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getstring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getstring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getstring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getstring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are strings
+ */
+ /* boring literal */
+ TESTCASE(getstring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getstring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getstring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getstring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getstring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getstring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getstring() rejects these */
+ TESTCASE(getqstring, "{7}\r\nfoo\0bar ", EOF, ""); /* should be ' ', "foo\0bar" */
+}
+
+
+/*
+ * getqstring() accepts something very like the qstring in the ABNF.
+ * Atoms, NIL and literals all fail.
+ */
+static void test_getqstring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms
+ * which are not qstrings */
+ TESTCASE(getqstring, "hydrogen helium", EOF, "");
+ TESTCASE(getqstring, "258 uranium", EOF, "");
+ TESTCASE(getqstring, "uranium258 plutonium", EOF, "");
+
+ /* The character sequence NIL is not special, it's parsed as an atom */
+ TESTCASE(getqstring, "NIL by mouth", EOF, "");
+ TESTCASE(getqstring, "NELLY the lamb", EOF, "");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings. This is probably sheer laziness on Cyrus' part
+ * but it's a liberal-server interpretation which has been in the
+ * field a while now, so we ought to preserve it.
+ */
+ TESTCASE(getqstring, "foo*bar baz", EOF, "");
+ TESTCASE(getqstring, "baz%quux foo", EOF, "");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getqstring, "foo(bar baz", EOF, "");
+ TESTCASE(getqstring, "foo)bar baz", EOF, "");
+ TESTCASE(getqstring, "foo{bar baz", EOF, "");
+ TESTCASE(getqstring, "foo\"bar baz", EOF, "");
+ TESTCASE(getqstring, "foo\\bar baz", EOF, "");
+ TESTCASE(getqstring, "foobar baz", EOF, "");
+
+ /*
+ * Quoted strings
+ */
+ TESTCASE(getqstring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getqstring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getqstring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getqstring, "\"foo bar", EOF, "");
+ TESTCASE(getqstring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getqstring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getqstring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getqstring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getqstring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getqstring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getqstring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are not qstrings
+ */
+ /* boring literal */
+ TESTCASE(getqstring, "{3}\r\nfoo ", EOF, "");
+ /* literal NIL */
+ TESTCASE(getqstring, "{3}\r\nNIL ", EOF, "");
+ /* literals with embedded space */
+ TESTCASE(getqstring, "{7}\r\nfoo bar ", EOF, "");
+ /* literals with embedded \n or \r */
+ TESTCASE(getqstring, "{7}\r\nfoo\nbar ", EOF, "");
+ TESTCASE(getqstring, "{7}\r\nfoo\rbar ", EOF, "");
+ /* literals with 8-bit chars */
+ TESTCASE(getqstring, "{7}\r\nfoo\277bar ", EOF, "");
+ /* literals with embedded NUL */
+ TESTCASE(getqstring, "{7}\r\nfoo\0bar ", EOF, "");
+}
+
+/*
+ * getnstring() parses something vaguely like an nstring, with a few differences.
+ */
+static void test_getnstring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms */
+ TESTCASE(getnstring, "hydrogen helium", EOF, "");
+ TESTCASE(getnstring, "258 uranium", EOF, "");
+ TESTCASE(getnstring, "uranium258 plutonium", EOF, "");
+
+ /* The character sequence NIL is special for nstrings only */
+ TESTCASE_NULL(getnstring, "NIL by mouth", ' ');
+ TESTCASE(getnstring, "NELLY ", EOF, "");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings.
+ */
+ TESTCASE(getnstring, "foo*bar baz", EOF, "");
+ TESTCASE(getnstring, "baz%quux foo", EOF, "");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getnstring, "foo(bar baz", EOF, "");
+ TESTCASE(getnstring, "foo)bar baz", EOF, "");
+ TESTCASE(getnstring, "foo{bar baz", EOF, "");
+ TESTCASE(getnstring, "foo\"bar baz", EOF, "");
+ TESTCASE(getnstring, "foo\\bar baz", EOF, "");
+ TESTCASE(getnstring, "foobar baz", EOF, "");
+
+ /*
+ * Quoted strings are nstrings
+ */
+ TESTCASE(getnstring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getnstring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getnstring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getnstring, "\"foo bar", EOF, "");
+ TESTCASE(getnstring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getnstring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getnstring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getnstring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getnstring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getnstring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getnstring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are nstrings
+ */
+ /* boring literal */
+ TESTCASE(getnstring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getnstring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getnstring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getnstring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getnstring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getnstring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getnstring() rejects these */
+ TESTCASE(getnstring, "{7}\r\nfoo\0bar ", EOF, ""); /* should be ' ', "foo\0bar" */
+}
+
+/*
+ * getbnstring() is just like getnstring() but allows embedded NULs in
+ * literals.
+ */
+static void test_getbnstring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms */
+ TESTCASE(getbnstring, "hydrogen helium", EOF, "");
+ TESTCASE(getbnstring, "258 uranium", EOF, "");
+ TESTCASE(getbnstring, "uranium258 plutonium", EOF, "");
+
+ /* The character sequence NIL is special for nstrings only */
+ TESTCASE_NULL(getbnstring, "NIL by mouth", ' ');
+ TESTCASE(getbnstring, "NELLY ", EOF, "");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings.
+ */
+ TESTCASE(getnstring, "foo*bar baz", EOF, "");
+ TESTCASE(getbnstring, "baz%quux foo", EOF, "");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getbnstring, "foo(bar baz", EOF, "");
+ TESTCASE(getbnstring, "foo)bar baz", EOF, "");
+ TESTCASE(getbnstring, "foo{bar baz", EOF, "");
+ TESTCASE(getbnstring, "foo\"bar baz", EOF, "");
+ TESTCASE(getbnstring, "foo\\bar baz", EOF, "");
+ TESTCASE(getbnstring, "foobar baz", EOF, "");
+
+ /*
+ * Quoted strings are nstrings
+ */
+ TESTCASE(getbnstring, "\"foo\" bar", ' ', "foo");
+ TESTCASE(getbnstring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getbnstring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getbnstring, "\"foo bar", EOF, "");
+ TESTCASE(getbnstring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getbnstring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getbnstring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getbnstring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getbnstring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getbnstring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getbnstring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are nstrings
+ */
+ /* boring literal */
+ TESTCASE(getbnstring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getbnstring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getbnstring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getbnstring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getbnstring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getbnstring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getbnstring() allows these */
+ TESTCASE(getbnstring, "{7}\r\nfoo\0bar ", ' ', "foo\0bar");
+}
+
+/*
+ * getnastring() gets an astring, but with NIL returning NULL
+ */
+static void test_getnastring(void)
+{
+ /* Simple sequences of ascii alphanumerics characters are atoms */
+ TESTCASE(getnastring, "hydrogen helium", ' ', "hydrogen");
+ TESTCASE(getnastring, "258 uranium", ' ', "258");
+ TESTCASE(getnastring, "uranium258 plutonium", ' ', "uranium258");
+
+ /* The character sequence NIL is special, unless quoted */
+ TESTCASE_NULL(getnastring, "NIL by mouth", ' ');
+ TESTCASE(getnastring, "NELLY the lamb", ' ', "NELLY");
+
+ /*
+ * List wildcards aren't part of an atom, but Cyrus accepts them
+ * in order to implement the "mailbox" and "list-mailbox" rules,
+ * which are like astrings but also allow unquoted wildcards,
+ * as astrings.
+ */
+ TESTCASE(getnastring, "foo*bar baz", ' ', "foo*bar");
+ TESTCASE(getnastring, "baz%quux foo", ' ', "baz%quux");
+
+ /*
+ * Various special characters are not part of atoms.
+ *
+ * Again the server code is very liberal in accepting all kinds of
+ * things which aren't in the ABNF, so we test for the liberal
+ * interpretation and note the conservative one in a comment.
+ */
+ TESTCASE(getnastring, "foo(bar baz", '(', "foo");
+ TESTCASE(getnastring, "foo)bar baz", ')', "foo");
+ TESTCASE(getnastring, "foo{bar baz", ' ', "foo{bar"); /* should be: '{', "foo" */
+ TESTCASE(getnastring, "foo\"bar baz", '"', "foo");
+ TESTCASE(getnastring, "foo\\bar baz", ' ', "foo\\bar"); /* should be: '\\', "foo" */
+ TESTCASE(getnastring, "foobar baz", ' ', "foobar"); /* should be '', "foo" */
+
+ /*
+ * Quoted strings are astrings
+ */
+ TESTCASE(getnastring, "\"foo\" bar", ' ', "foo");
+ /* literals with embedded space */
+ TESTCASE(getnastring, "\"NIL\" by mouth ", ' ', "NIL");
+ TESTCASE(getnastring, "\"foo bar\" baz", ' ', "foo bar");
+ TESTCASE(getnastring, "\"foo bar", EOF, "");
+ TESTCASE(getnastring, "\"foo\\\"bar\" baz", ' ', "foo\"bar");
+ TESTCASE(getnastring, "\"foo\\\\bar\" baz", ' ', "foo\\bar");
+ /* Any non-special char can be escaped with \ */
+ TESTCASE(getnastring, "\"foo\\bar\" baz", ' ', "foobar");
+ /* \n and \r can be escaped with \ */
+ TESTCASE(getnastring, "\"foo\\\nbar\" baz", ' ', "foo\nbar");
+ TESTCASE(getnastring, "\"foo\\\rbar\" baz", ' ', "foo\rbar");
+ /* Non-escaped \n and \r. The server is actually more
+ * conversative than the ABNF and rejects these. */
+ TESTCASE(getnastring, "\"foo\nbar\" baz", EOF, ""); /* should be ' ', "foo\nbar" */
+ TESTCASE(getnastring, "\"foo\rbar\" baz", EOF, ""); /* should be ' ', "foo\rbar" */
+
+ /*
+ * Literals are astrings
+ */
+ /* boring literal */
+ TESTCASE(getnastring, "{3}\r\nfoo ", ' ', "foo");
+ /* literal NIL */
+ TESTCASE(getnastring, "{3}\r\nNIL ", ' ', "NIL");
+ /* literals with embedded space */
+ TESTCASE(getnastring, "{7}\r\nfoo bar ", ' ', "foo bar");
+ /* literals with embedded \n or \r */
+ TESTCASE(getnastring, "{7}\r\nfoo\nbar ", ' ', "foo\nbar");
+ TESTCASE(getnastring, "{7}\r\nfoo\rbar ", ' ', "foo\rbar");
+ /* literals with 8-bit chars */
+ TESTCASE(getnastring, "{7}\r\nfoo\277bar ", ' ', "foo\277bar");
+ /* literals with embedded NUL - getastring() rejects these */
+ TESTCASE(getnastring, "{7}\r\nfoo\0bar ", EOF, ""); /* should be ' ', "foo\0bar" */
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/glob.testc Added

@@ -0,0 +1,199 @@
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include "cunit/cunit.h"
+#include "glob.h"
+
+static void test_star(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo*", GLOB_HIERARCHY);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "mofoo", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fnarp", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fod", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "foonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 6);
+
+ r = glob_test(g, "foon.ly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "fo.only", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "f.oonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ glob_free(&g);
+}
+
+static void test_percent(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo%", GLOB_HIERARCHY);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fnarp", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fod", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "foonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 6);
+
+ r = glob_test(g, "foon.ly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fo.only", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "f.oonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ glob_free(&g);
+}
+
+static void test_percent_percent(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo%.%", GLOB_HIERARCHY);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "foon.ly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "fo.only", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "f.oonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ glob_free(&g);
+}
+
+static void test_questionmark(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo?", 0);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fnarp", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fod", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "foonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ glob_free(&g);
+}
+
+static void test_star_substring(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo*", GLOB_SUBSTRING|GLOB_HIERARCHY);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "mofoo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 5);
+
+ r = glob_test(g, "fnarp", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "fod", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "foonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 6);
+
+ r = glob_test(g, "foon.ly", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "fo.only", 0, NULL);
+ CU_ASSERT_EQUAL(r, 7);
+
+ r = glob_test(g, "f.oonly", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "mo.foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 6);
+
+ glob_free(&g);
+}
+
+static void test_star_icase(void)
+{
+ glob *g;
+ int r;
+
+ g = glob_init("fo*", GLOB_ICASE|GLOB_HIERARCHY);
+ CU_ASSERT_PTR_NOT_EQUAL_FATAL(g, NULL);
+
+ r = glob_test(g, "foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "FOO", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "MEH", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ r = glob_test(g, "Foo", 0, NULL);
+ CU_ASSERT_EQUAL(r, 3);
+
+ r = glob_test(g, "Meh", 0, NULL);
+ CU_ASSERT_EQUAL(r, -1);
+
+ glob_free(&g);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/guid.testc Added

@@ -0,0 +1,80 @@
+#include "cunit/cunit.h"
+#include "imap/message_guid.h"
+
+static void test_guid(void)
+{
+    static const char TEXT = "lorem ipsum dolor sit amet, "
+			       "consectetur adipisicing elit\n";
+    static const unsigned char SHA120 = {
+	0xd1,0xb0,0x52,0xa0,0x12,0xcb,0xec,0xd5,0x42,0x5b,
+	0x23,0xf3,0x61,0x42,0x6f,0x24,0xdb,0x56,0xd7,0x45
+    };
+    struct message_guid guid;
+    struct message_guid guid2;
+    int r;
+
+    message_guid_set_null(&guid);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 1);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 1);
+
+    message_guid_generate(&guid, TEXT, sizeof(TEXT)-1);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 0);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_EQUAL(memcmp(&guid.value, SHA1, sizeof(SHA1)), 0);
+
+    memset(&guid2, 0x45, sizeof(guid2));
+    r = message_guid_equal(&guid, &guid2);
+    CU_ASSERT_EQUAL(r, 0);
+
+    message_guid_copy(&guid2, &guid);
+    CU_ASSERT_EQUAL(memcmp(&guid2.value, SHA1, sizeof(SHA1)), 0);
+    r = message_guid_equal(&guid, &guid2);
+    CU_ASSERT_EQUAL(r, 1);
+}
+
+static void test_import(void)
+{
+    static const unsigned char SHA120 = {
+	0xd1,0xb0,0x52,0xa0,0x12,0xcb,0xec,0xd5,0x42,0x5b,
+	0x23,0xf3,0x61,0x42,0x6f,0x24,0xdb,0x56,0xd7,0x45
+    };
+    struct message_guid guid;
+    unsigned char bufMESSAGE_GUID_SIZE;
+    int r;
+
+    memset(&guid, 0x45, sizeof(guid));
+    message_guid_import(&guid, SHA1);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_EQUAL(memcmp(&guid.value, SHA1, sizeof(SHA1)), 0);
+
+    memset(buf, 0x69, sizeof(buf));
+    message_guid_export(&guid, buf);
+    CU_ASSERT_EQUAL(memcmp(buf, SHA1, sizeof(SHA1)), 0);
+}
+
+static void test_encode(void)
+{
+    static const char SHA1HEX41 = "d1b052a012cbecd5425b23f361426f24db56d745";
+    static const unsigned char SHA1BIN20 = {
+	0xd1,0xb0,0x52,0xa0,0x12,0xcb,0xec,0xd5,0x42,0x5b,
+	0x23,0xf3,0x61,0x42,0x6f,0x24,0xdb,0x56,0xd7,0x45
+    };
+    struct message_guid guid;
+    char *s;
+    int r;
+
+    memset(&guid, 0x45, sizeof(guid));
+    message_guid_decode(&guid, SHA1HEX);
+    r = message_guid_isnull(&guid);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_EQUAL(memcmp(&guid.value, SHA1BIN, sizeof(SHA1BIN)), 0);
+
+    s = message_guid_encode(&guid);
+    CU_ASSERT_STRING_EQUAL(s, SHA1HEX);
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/hash.testc Added

@@ -0,0 +1,294 @@
+#include "cunit/cunit.h"
+#include "strarray.h"
+#include "util.h"
+#include "hash.h"
+
+static void count_cb(const char *key __attribute__((unused)),
+	 void *data __attribute__((unused)),
+		 void *rock)
+{
+ unsigned int *countp = (unsigned int *)rock;
+ (*countp)++;
+}
+
+static void printer_cb(const char *key,
+	 void *data,
+		 void *rock)
+{
+ strarray_t *sa = (strarray_t *)rock;
+ struct buf buf = BUF_INITIALIZER;
+ buf_printf(&buf, "%s=%s", key, (char *)data);
+ strarray_appendm(sa, buf_release(&buf));
+}
+
+
+#define KEY0	"Yale"
+#define KEY1	"Lockwood"
+#define KEY2	"Skeleton"
+static const char * const values = {
+ "Paper", "Glass", "Wood", "Diamond"
+};
+#define VALUE0	 ((void *)values0)
+#define VALUE1	 ((void *)values1)
+#define VALUE2	 ((void *)values2)
+#define VALUE3	 ((void *)values3)
+
+static void test_old(void)
+{
+ /* this is the old test code in lib/hash.c converted to CUnit */
+ hash_table table;
+
+ static const char * const strings = {
+	"1","2","3","4","5","A decently long string",
+	NULL
+ };
+
+ static const char * const junk = {
+	"The first data",
+	"The second data",
+	"The third data",
+	"The fourth data",
+	"The fifth datum",
+	"The sixth piece of data"
+ };
+
+ int i;
+ void *j;
+ strarray_t sa = STRARRAY_INITIALIZER;
+
+ construct_hash_table(&table, 200, 1);
+
+ for (i = 0 ; NULL != stringsi ; i++ ) {
+	j = hash_insert(stringsi, (void *)junki, &table);
+	CU_ASSERT_PTR_EQUAL((void *)junki, j);
+ }
+
+ for (i = 0 ; NULL != stringsi ; i++) {
+	j = hash_lookup(stringsi, &table);
+	CU_ASSERT_PTR_NOT_NULL(j);
+	CU_ASSERT_PTR_EQUAL((void *)junki, j);
+ }
+
+ for (i = 0 ; NULL != stringsi ; i++) {
+	strarray_truncate(&sa, 0);
+	hash_enumerate(&table, printer_cb, &sa);
+	CU_ASSERT_EQUAL(6-i, sa.count);
+	if (i < 1) CU_ASSERT(strarray_find(&sa, "1=The first data", 0) >= 0);
+	if (i < 2) CU_ASSERT(strarray_find(&sa, "2=The second data", 0) >= 0);
+	if (i < 3) CU_ASSERT(strarray_find(&sa, "3=The third data", 0) >= 0);
+	if (i < 4) CU_ASSERT(strarray_find(&sa, "4=The fourth data", 0) >= 0);
+	if (i < 5) CU_ASSERT(strarray_find(&sa, "5=The fifth datum", 0) >= 0);
+	if (i < 6) CU_ASSERT(strarray_find(&sa, "A decently long string=The sixth piece of data", 0) >= 0);
+	strarray_fini(&sa);
+
+	j = hash_del((char *)stringsi, &table);
+	CU_ASSERT_PTR_EQUAL((void *)junki, j);
+ }
+
+ for (i = 0 ; NULL != stringsi ; i++) {
+	j = hash_lookup(stringsi, &table);
+	CU_ASSERT_PTR_NULL(j);
+ }
+
+ free_hash_table(&table, NULL);
+}
+
+static void test_empty(void)
+{
+ hash_table ht;
+ hash_table *h;
+ void *d;
+ unsigned int count;
+
+ /* construct an empty hash table */
+ h = construct_hash_table(&ht, 1024, 0);
+ CU_ASSERT_PTR_EQUAL(&ht, h);
+
+ /* lookup the empty hash table */
+ d = hash_lookup(KEY0, &ht);
+ CU_ASSERT_PTR_NULL(d);
+
+ /* delete from the empty hash table */
+ d = hash_del(KEY0, &ht);
+ CU_ASSERT_PTR_NULL(d);
+
+ /* enumerate the empty hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(0, count);
+
+ /* free the hash table */
+ free_hash_table(&ht, NULL);
+}
+
+static void test_reinsert(void)
+{
+ hash_table ht;
+ hash_table *h;
+ void *d;
+ unsigned int count;
+
+ /* construct an empty hash table */
+ h = construct_hash_table(&ht, 1024, 0);
+ CU_ASSERT_PTR_EQUAL(&ht, h);
+
+ /* insert into the table */
+ d = hash_insert(KEY0, VALUE0, &ht);
+ /* no old data so hash_insert() returns the new data pointer */
+ CU_ASSERT_PTR_EQUAL(VALUE0, d);
+
+ /* lookup the hash table */
+ d = hash_lookup(KEY0, &ht);
+ CU_ASSERT_PTR_EQUAL(VALUE0, d);
+
+ /* enumerate the hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(1, count);
+
+ /* re-insert into the hash table */
+ d = hash_insert(KEY0, VALUE1, &ht);
+ /* get the old value back */
+ CU_ASSERT_PTR_EQUAL(VALUE0, d);
+
+ /* lookup the hash table */
+ d = hash_lookup(KEY0, &ht);
+ CU_ASSERT_PTR_EQUAL(VALUE1, d);
+
+ /* enumerate the hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(1, count);
+
+ /* delete from the hash table */
+ d = hash_del(KEY0, &ht);
+ CU_ASSERT_PTR_EQUAL(VALUE1, d);
+
+ /* lookup the hash table */
+ d = hash_lookup(KEY0, &ht);
+ CU_ASSERT_PTR_NULL(d);
+
+ /* enumerate the hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(0, count);
+
+ /* free the hash table */
+ free_hash_table(&ht, NULL);
+}
+
+static const char *key(unsigned int i)
+{
+ static char buf32;
+ snprintf(buf, sizeof(buf), "%u", i);
+ return buf;
+}
+
+static void *value(unsigned int i)
+{
+ return (void *)(unsigned long)(0xdead0000 + i);
+}
+
+static unsigned int freed_count = 0;
+static void lincoln(void *x __attribute__((unused)))
+{
+ ++freed_count;
+}
+
+/* test overloading a hash table with more
+ * entries than the configured number of buckets */
+static void test_many(void)
+{
+ hash_table ht;
+ hash_table *h;
+ void *d;
+ unsigned int count;
+#define N 2048
+ unsigned int i;
+
+ /* construct an empty hash table */
+ h = construct_hash_table(&ht, N/8, 0);
+ CU_ASSERT_PTR_EQUAL(&ht, h);
+
+ /* insert lots of entries into the table */
+ for (i = 0 ; i < N ; i++) {
+	d = hash_insert(key(i), value(i), &ht);
+	CU_ASSERT_PTR_EQUAL(value(i), d);
+ }
+
+ /* lookup all the entries in the hash table */
+ for (i = 0 ; i < N ; i++) {
+	d = hash_lookup(key(i), &ht);
+	CU_ASSERT_PTR_EQUAL(value(i), d);
+ }
+
+ /* lookup and delete entries that aren't there */
+ for (i = N ; i < 2*N ; i++) {
+	d = hash_lookup(key(i), &ht);
+	CU_ASSERT_PTR_NULL(d);
+	d = hash_del(key(i), &ht);
+	CU_ASSERT_PTR_NULL(d);
+ }
+ d = hash_del("Not here please stop looking", &ht);
+ CU_ASSERT_PTR_NULL(d);
+ d = hash_lookup("Not here please stop looking", &ht);
+ CU_ASSERT_PTR_NULL(d);
+
+ /* enumerate the hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(N, count);
+
+ /* delete from the hash table */
+ for (i = 0 ; i < N ; i++) {
+	d = hash_del(key(i), &ht);
+	CU_ASSERT_PTR_EQUAL(value(i), d);
+ }
+
+ /* all the entries should be gone */
+ for (i = 0 ; i < N ; i++) {
+	d = hash_lookup(key(i), &ht);
+	CU_ASSERT_PTR_NULL(d);
+ }
+
+ /* enumerate the hash table: should be empty now */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(0, count);
+
+ /* free the hash table */
+ freed_count = 0;
+ free_hash_table(&ht, lincoln);
+ CU_ASSERT_EQUAL(0, freed_count);
+}
+
+static void test_freeing_nonempty(void)
+{
+ hash_table ht;
+ hash_table *h;
+ void *d;
+ unsigned int count;
+#define N 2048
+ unsigned int i;
+
+ /* construct an empty hash table */
+ h = construct_hash_table(&ht, N/8, 0);
+ CU_ASSERT_PTR_EQUAL(&ht, h);
+
+ /* insert lots of entries into the table */
+ for (i = 0 ; i < N ; i++) {
+	d = hash_insert(key(i), value(i), &ht);
+	CU_ASSERT_PTR_EQUAL(value(i), d);
+ }
+
+ /* enumerate the hash table */
+ count = 0;
+ hash_enumerate(&ht, count_cb, &count);
+ CU_ASSERT_EQUAL(N, count);
+
+ /* free the hash table */
+ freed_count = 0;
+ free_hash_table(&ht, lincoln);
+ CU_ASSERT_EQUAL(N, freed_count);
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/imapurl.testc Added

@@ -0,0 +1,398 @@
+#include <malloc.h>
+#include <time.h>
+#include "cunit/cunit.h"
+#include "imapurl.h"
+
+static void test_fromurl_cclient(void)
+{
+ static const char URL = "{foo}bar";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(iurl.user);
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "foo");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "bar");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 0);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+static void test_fromurl(void)
+{
+ static const char URL = "imap://jeeves/deverill";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(iurl.user);
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "jeeves");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "deverill");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 0);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+static void test_fromurl_user(void)
+{
+ static const char URL = "imap://wooster@jeeves/deverill";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(iurl.user, "wooster");
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "jeeves");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "deverill");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 0);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+static void test_fromurl_encuser(void)
+{
+ static const char URL = "imap://%53po%64e@jeeves/deverill";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(iurl.user, "Spode");
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "jeeves");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "deverill");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 0);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+static void test_fromurl_options(void)
+{
+ static const char URL = "imap://wooster@jeeves/deverill"
+			 ";UIDVALIDITY=7890"
+			 "/;UID=123456"
+			 "/;SECTION=1.4"
+			 "/;PARTIAL=1.1023";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(iurl.user, "wooster");
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "jeeves");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "deverill");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 7890);
+ CU_ASSERT_EQUAL(iurl.uid, 123456);
+ CU_ASSERT_STRING_EQUAL(iurl.section, "1.4");
+ CU_ASSERT_EQUAL(iurl.start_octet, 1);
+ CU_ASSERT_EQUAL(iurl.octet_count, 1023);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+static void test_fromurl_urlauth(void)
+{
+ static const char URL = "imap://wooster@jeeves/deverill"
+			 "/;UID=123456"
+			 ";EXPIRE=2010-11-24T06:57:26Z"
+			 ";URLAUTH=submit+fred:internal:91354a473744909de610943775f92038";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(iurl.user, "wooster");
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "jeeves");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "deverill");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 123456);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_STRING_EQUAL(iurl.urlauth.access, "submit+fred");
+ CU_ASSERT_STRING_EQUAL(iurl.urlauth.mech, "internal");
+ CU_ASSERT_STRING_EQUAL(iurl.urlauth.token,
+			 "91354a473744909de610943775f92038");
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 1290581846);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 90);
+ free(iurl.freeme);
+}
+
+// TODO: {foo is invalid
+// TODO: imap:// is invalid
+// TODO: imap://server/ and imap://server
+// TODO: %xx encoding in username
+// TODO: %xx encoding in section
+// TODO: lowercase option names
+// TODO: relative urls
+// TODO: it doesn't seem like it parses a host port
+//	 specially, it will be accidentally appended to .server
+// TODO: no / before ;
+// TODO: invalidly formatted uidvalidity
+// TODO: invalidly formatted uid
+// TODO: invalidly formatted section
+// TODO: ;AUTH=* at end of user name
+// TODO: ;AUTH=<mech> at end of user name
+// TODO: ?enc-search at the end
+
+static void test_tourl(void)
+{
+ static const char URL = "imap://jeeves/deverill";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "jeeves";
+ iurl.mailbox = "deverill";
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_server(void)
+{
+ static const char URL = "imap://jeeves";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "jeeves";
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_user(void)
+{
+ static const char URL = "imap://wooster@jeeves/deverill";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.user = "wooster";
+ iurl.server = "jeeves";
+ iurl.mailbox = "deverill";
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_options(void)
+{
+ static const char URL = "imap://jeeves/deverill"
+			 ";UIDVALIDITY=7890"
+			 "/;UID=123456"
+			 "/;SECTION=1.4"
+			 "/;PARTIAL=1.1023";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "jeeves";
+ iurl.mailbox = "deverill";
+ iurl.uidvalidity = 7890;
+ iurl.uid = 123456;
+ iurl.section = "1.4";
+ iurl.start_octet = 1;
+ iurl.octet_count = 1023;
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_urlauth(void)
+{
+ static const char URL = "imap://jeeves/deverill"
+			 "/;UID=123456"
+			 ";EXPIRE=2010-11-24T06:57:26Z"
+			 ";URLAUTH=submit+fred:internal:91354a473744909de610943775f92038";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "jeeves";
+ iurl.mailbox = "deverill";
+ iurl.uid = 123456;
+ iurl.urlauth.access = "submit+fred";
+ iurl.urlauth.mech = "internal";
+ iurl.urlauth.token = "91354a473744909de610943775f92038";
+ iurl.urlauth.expire = 1290581846;
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_ampersand(void)
+{
+ /*
+ * Test a mailbox name containing an ampersand, which
+ * character is significant to both the modified UTF-7
+ * encoding of mailbox names and to URL-encoding.
+ */
+ static const char URL = "imap://goons/Goosey%26Bawks";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "goons";
+ iurl.mailbox = "Goosey&-Bawks";
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_urlunsafe(void)
+{
+ /*
+ * Test a mailbox name containing characters which are
+ * not special to modified UTF-7 but are unsafe in URLs.
+ */
+ static const char URL = "imap://gibberish/%20%22%23%25%2B%3A%3B%3C%3D%3E%3F%40%5B%5C%5D%5E%60%7B%7C%7D";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "gibberish";
+ iurl.mailbox = " \"#%+:;<=>?@\\^`{|}";
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_tourl_utf7_high(void)
+{
+ /*
+ * This guy has a mailbox whose name is expressed in
+ * Unicode 5.0 Cuneiform. The name is three glyphs:
+ *
+ * 12073 CUNEIFORM SIGN DIB
+ * 12020 CUNEIFORM SIGN AL
+ * 12129 CUNEIFORM SIGN HA
+ *
+ * Presumably it contains emails discussing some ancestor
+ * of Cut Me Own Throat Dibbler. Anyway, this tests the
+ * UTF-7 -> UTF-16 -> UCS-4 -> UTF-8 -> URL-encoded
+ * path when converting a mailbox name.
+ */
+ static const char URL = "imap://uruk/%F0%92%81%B3%F0%92%80%A0%F0%92%84%A9";
+ struct imapurl iurl;
+ char buf300;
+
+ memset(&iurl, 0, sizeof(iurl));
+ iurl.server = "uruk";
+ iurl.mailbox = "&2Ajcc9gI3CDYCN0p-";
+
+ memset(buf, 0x45, sizeof(buf));
+ imapurl_toURL(buf, &iurl);
+ CU_ASSERT_STRING_EQUAL(buf, URL);
+}
+
+static void test_fromurl_utf2_high(void)
+{
+ /* Same Cuneiform as above, but test the opposite conversion */
+ static const char URL = "imap://uruk/%F0%92%81%B3%F0%92%80%A0%F0%92%84%A9";
+ struct imapurl iurl;
+ int r;
+
+ memset(&iurl, 0x45, sizeof(iurl));
+ r = imapurl_fromURL(&iurl, URL);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(iurl.user);
+ CU_ASSERT_PTR_NULL(iurl.auth);
+ CU_ASSERT_STRING_EQUAL(iurl.server, "uruk");
+ CU_ASSERT_STRING_EQUAL(iurl.mailbox, "&2Ajcc9gI3CDYCN0p-");
+ CU_ASSERT_EQUAL(iurl.uidvalidity, 0);
+ CU_ASSERT_EQUAL(iurl.uid, 0);
+ CU_ASSERT_PTR_NULL(iurl.section);
+ CU_ASSERT_EQUAL(iurl.start_octet, 0);
+ CU_ASSERT_EQUAL(iurl.octet_count, 0);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.access);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.mech);
+ CU_ASSERT_PTR_NULL(iurl.urlauth.token);
+ CU_ASSERT_EQUAL(iurl.urlauth.expire, 0);
+ CU_ASSERT_EQUAL(iurl.urlauth.rump_len, 0);
+ free(iurl.freeme);
+}
+
+/* This test was located in lib/test/imapurl.c. */
+static void test_cycle(void)
+{
+ struct imapurl iurl;
+ struct imapurl iurl2;
+ static const char URL = "imap://;AUTH=*@server/%C3%A4%20%C3%84;UIDVALIDITY=1234567890";
+ int r;
+ char url400;
+
+ memset(&iurl, 0, sizeof(struct imapurl));
+ iurl.server = "server";
+ iurl.auth = "*";
+ iurl.mailbox = "&AOQ- &AMQ-"; /* "ä Ä" */
+ iurl.uidvalidity = 1234567890;
+
+ memset(url, 0x45, sizeof(url));
+ imapurl_toURL(url, &iurl);
+ CU_ASSERT_STRING_EQUAL(url, URL);
+
+ r = imapurl_fromURL(&iurl2, url);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(iurl2.mailbox, "&AOQ- &AMQ-");
+ CU_ASSERT_EQUAL(iurl2.uidvalidity, 1234567890);
+ free(iurl2.freeme);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/key.pem Added

cyrus-imapd-2.5.tar.gz/cunit/mboxname.testc Added

@@ -0,0 +1,441 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <assert.h>
+#include "cunit/cunit.h"
+#include "libconfig.h"
+#include "imap/mboxname.h"
+#include "imap/mailbox.h"
+#include "imap/global.h"
+
+static void test_dir_hash_c(void)
+{
+ static const char FRED = "fred";
+ static const char FRED_DRAFTS = "fred.Drafts";
+ static const char JANEAT_SENT = "bloggs.com!user.jane.Sent";
+ static const char SHARED = "Gossip";
+ static const char INTERNAL = "internal!Tattle";
+ static const char LONGNAME = "thisisareallylongname";
+ static const char LONGNAME_SUB = "thisisareallylongname.with.a.subdir";
+ char c;
+
+ c = dir_hash_c(FRED, 0);
+ CU_ASSERT_EQUAL(c, 'f');
+ c = dir_hash_c(FRED_DRAFTS, 0);
+ CU_ASSERT_EQUAL(c, 'f');
+ c = dir_hash_c(JANEAT_SENT, 0);
+ CU_ASSERT_EQUAL(c, 'b');
+ c = dir_hash_c(SHARED, 0);
+ CU_ASSERT_EQUAL(c, 'g');
+ c = dir_hash_c(INTERNAL, 0);
+ CU_ASSERT_EQUAL(c, 'i');
+ c = dir_hash_c(LONGNAME, 0);
+ CU_ASSERT_EQUAL(c, 't');
+ c = dir_hash_c(LONGNAME_SUB, 0);
+ CU_ASSERT_EQUAL(c, 't');
+
+ c = dir_hash_c(FRED, 1);
+ CU_ASSERT_EQUAL(c, 'E');
+ c = dir_hash_c(FRED_DRAFTS, 1);
+ CU_ASSERT_EQUAL(c, 'E');
+ c = dir_hash_c(JANEAT_SENT, 1);
+ CU_ASSERT_EQUAL(c, 'L');
+ c = dir_hash_c(SHARED, 1);
+ CU_ASSERT_EQUAL(c, 'K');
+ c = dir_hash_c(INTERNAL, 1);
+ CU_ASSERT_EQUAL(c, 'I');
+ c = dir_hash_c(LONGNAME, 1);
+ CU_ASSERT_EQUAL(c, 'J');
+ c = dir_hash_c(LONGNAME_SUB, 1);
+ CU_ASSERT_EQUAL(c, 'J');
+}
+
+static void test_to_parts(void)
+{
+ static const char FRED_DRAFTS = "user.fred.Drafts";
+ static const char JANEAT_SENT = "bloggs.com!user.jane.Sent";
+ static const char SHARED = "shared.Gossip";
+ static const char SHAREDAT = "foonly.com!shared.Tattle";
+ struct mboxname_parts parts;
+ int r;
+
+ r = mboxname_to_parts(FRED_DRAFTS, &parts);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(parts.domain);
+ CU_ASSERT_STRING_EQUAL(parts.userid, "fred");
+ CU_ASSERT_STRING_EQUAL(parts.box, "Drafts");
+ mboxname_free_parts(&parts);
+
+ r = mboxname_to_parts(JANEAT_SENT, &parts);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(parts.domain, "bloggs.com");
+ CU_ASSERT_STRING_EQUAL(parts.userid, "jane");
+ CU_ASSERT_STRING_EQUAL(parts.box, "Sent");
+ mboxname_free_parts(&parts);
+
+ r = mboxname_to_parts(SHARED, &parts);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(parts.domain);
+ CU_ASSERT_PTR_NULL(parts.userid);
+ CU_ASSERT_STRING_EQUAL(parts.box, "shared.Gossip");
+ mboxname_free_parts(&parts);
+
+ r = mboxname_to_parts(SHAREDAT, &parts);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(parts.domain, "foonly.com");
+ CU_ASSERT_PTR_NULL(parts.userid);
+ CU_ASSERT_STRING_EQUAL(parts.box, "shared.Tattle");
+ mboxname_free_parts(&parts);
+}
+
+static void test_to_userid(void)
+{
+ static const char SAM_DRAFTS = "user.sam.Drafts";
+ static const char BETTYAT_SENT = "boop.com!user.betty.Sent";
+ static const char SHARED = "shared.Gossip";
+ static const char SHAREDAT = "foonly.com!shared.Tattle";
+ const char *r;
+
+ r = mboxname_to_userid(SAM_DRAFTS);
+ CU_ASSERT_STRING_EQUAL(r, "sam");
+
+ r = mboxname_to_userid(BETTYAT_SENT);
+ CU_ASSERT_STRING_EQUAL(r, "betty@boop.com");
+
+ r = mboxname_to_userid(SHARED);
+ CU_ASSERT_PTR_NULL(r);
+
+ r = mboxname_to_userid(SHAREDAT);
+ CU_ASSERT_PTR_NULL(r);
+}
+
+static void test_to_usermbox(void)
+{
+ char *r;
+
+ r = mboxname_user_mbox(NULL, NULL);
+ CU_ASSERT_PTR_NULL(r);
+
+ r = mboxname_user_mbox(NULL, "extra.stuff");
+ CU_ASSERT_PTR_NULL(r);
+
+ r = mboxname_user_mbox("sam", NULL);
+ CU_ASSERT_STRING_EQUAL(r, "user.sam");
+ free(r);
+
+ r = mboxname_user_mbox("betty@boop.com", NULL);
+ CU_ASSERT_STRING_EQUAL(r, "boop.com!user.betty");
+ free(r);
+
+ r = mboxname_user_mbox("sam", "sub");
+ CU_ASSERT_STRING_EQUAL(r, "user.sam.sub");
+ free(r);
+
+ r = mboxname_user_mbox("sam", "sub.deep.stuff");
+ CU_ASSERT_STRING_EQUAL(r, "user.sam.sub.deep.stuff");
+ free(r);
+
+ r = mboxname_user_mbox("betty@boop.com", "sub");
+ CU_ASSERT_STRING_EQUAL(r, "boop.com!user.betty.sub");
+ free(r);
+
+ r = mboxname_user_mbox("betty@boop.com", "sub.deep.stuff");
+ CU_ASSERT_STRING_EQUAL(r, "boop.com!user.betty.sub.deep.stuff");
+ free(r);
+}
+
+
+static void test_same_userid(void)
+{
+ static const char FRED_DRAFTS = "user.fred.Drafts";
+ static const char FRED_SENT = "user.fred.Sent";
+ static const char JANE_SENT = "user.jane.Sent";
+
+ CU_ASSERT_EQUAL(mboxname_same_userid(FRED_DRAFTS, FRED_SENT), 1);
+ CU_ASSERT_EQUAL(mboxname_same_userid(JANE_SENT, FRED_SENT), 0);
+}
+
+static void test_same_userid_domain(void)
+{
+ static const char FREDAT_DRAFTS = "bloggs.com!user.fred.Drafts";
+ static const char FREDAT_SENT = "bloggs.com!user.fred.Sent";
+ static const char JANEAT_SENT = "bloggs.com!user.jane.Sent";
+ static const char JANE_SENT = "user.jane.Sent";
+
+ CU_ASSERT_EQUAL(mboxname_same_userid(FREDAT_DRAFTS, FREDAT_SENT), 1);
+ CU_ASSERT_EQUAL(mboxname_same_userid(JANEAT_SENT, FREDAT_SENT), 0);
+ CU_ASSERT_EQUAL(mboxname_same_userid(JANE_SENT, FREDAT_SENT), 0);
+ CU_ASSERT_EQUAL(mboxname_same_userid(JANE_SENT, JANEAT_SENT), 0);
+}
+
+static void test_contains(void)
+{
+ static const char FOO = "bloggs.com!user.foo";
+ static const char FOOBAR = "bloggs.com!user.foobar";
+ static const char FOODRAFT = "bloggs.com!user.foo.Drafts";
+ static const char FOONET = "bloggs.net!user.foo";
+ static const char FOONONE = "user.foo";
+
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOO, FOOBAR), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOOBAR, FOO), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOO, FOODRAFT), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOODRAFT, FOO), 1);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOOBAR, FOOBAR), 1);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOO, FOONET), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOONET, FOO), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOONONE, FOO), 0);
+ CU_ASSERT_EQUAL(mboxname_is_prefix(FOO, FOONONE), 0);
+}
+
+static void test_parts_same_userid(void)
+{
+ static const char FRED_DRAFTS = "user.fred.Drafts";
+ static const char FRED_SENT = "user.fred.Sent";
+ static const char JANE_SENT = "user.jane.Sent";
+ struct mboxname_parts parts1, parts2;
+ int r;
+
+ r = mboxname_to_parts(FRED_DRAFTS, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(FRED_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 1);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+
+ r = mboxname_to_parts(JANE_SENT, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(FRED_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 0);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+}
+
+static void test_parts_same_userid_domain(void)
+{
+ static const char FREDAT_DRAFTS = "bloggs.com!user.fred.Drafts";
+ static const char FREDAT_SENT = "bloggs.com!user.fred.Sent";
+ static const char JANEAT_SENT = "bloggs.com!user.jane.Sent";
+ static const char JANE_SENT = "user.jane.Sent";
+ struct mboxname_parts parts1, parts2;
+ int r;
+
+ r = mboxname_to_parts(FREDAT_DRAFTS, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(FREDAT_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 1);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+
+ r = mboxname_to_parts(JANEAT_SENT, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(FREDAT_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 0);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+
+ r = mboxname_to_parts(JANE_SENT, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(FREDAT_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 0);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+
+ r = mboxname_to_parts(JANE_SENT, &parts1);
+ CU_ASSERT_EQUAL(r, 0);
+ r = mboxname_to_parts(JANEAT_SENT, &parts2);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(mboxname_parts_same_userid(&parts1, &parts2), 0);
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+}
+
+/* This structure encapsulates all the variables which affect
+ * namespace translation in one place */
+static struct
+{
+ const char *userid;
+ int isadmin;
+ int altnamespace;
+ int virtdomains;
+ const char *defdomain;
+ const char *userprefix;
+ const char *sharedprefix;
+ int unixhierarchysep;
+} conf;
+
+static void toexternal_helper(const char *intname,
+			 const char *extname_expected)
+{
+ struct namespace ns;
+ char extnameMAX_MAILBOX_NAME;
+ int r;
+
+ config_virtdomains = conf.virtdomains;
+ config_defdomain = conf.defdomain;
+ imapoptsIMAPOPT_UNIXHIERARCHYSEP.val.b = conf.unixhierarchysep;
+ imapoptsIMAPOPT_ALTNAMESPACE.val.b = conf.altnamespace;
+ imapoptsIMAPOPT_USERPREFIX.val.s = conf.userprefix;
+ imapoptsIMAPOPT_SHAREDPREFIX.val.s = conf.sharedprefix;
+
+ r = mboxname_init_namespace(&ns, conf.isadmin);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+
+ memset(extname, 0x45, sizeof(extname));
+ r = ns.mboxname_toexternal(&ns, intname, conf.userid, extname);
+ CU_ASSERT_EQUAL_FATAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(extname, extname_expected);
+}
+
+static void test_toexternal_simple(void)
+{
+ memset(&conf, 0, sizeof(conf));
+ conf.virtdomains = 0;
+ conf.userid = "fred";
+
+ toexternal_helper("user.fred", "INBOX");
+ toexternal_helper("user.fred.foo", "INBOX.foo");
+ toexternal_helper("user.fred.foo.barracuda", "INBOX.foo.barracuda");
+ toexternal_helper("user.jane", "user.jane");
+ toexternal_helper("user.jane.baz", "user.jane.baz");
+ toexternal_helper("shared.quux", "shared.quux");
+}
+
+static void test_toexternal_domains(void)
+{
+ memset(&conf, 0, sizeof(conf));
+ conf.virtdomains = 1;
+ conf.userid = "fred@bloggs.com";
+
+ toexternal_helper("bloggs.com!user.fred", "INBOX");
+ toexternal_helper("bloggs.com!user.fred.foo", "INBOX.foo");
+ toexternal_helper("bloggs.com!user.fred.foo.barracuda", "INBOX.foo.barracuda");
+ toexternal_helper("bloggs.com!user.jane", "user.jane");
+ toexternal_helper("bloggs.com!user.jane.baz", "user.jane.baz");
+ toexternal_helper("boop.com!user.betty", "user.betty@boop.com");
+ toexternal_helper("bloggs.com!shared.quux", "shared.quux");
+ toexternal_helper("boop.com!shared.quux", "shared.quux@boop.com");
+}
+
+static void test_toexternal_unixhier(void)
+{
+ memset(&conf, 0, sizeof(conf));
+ conf.unixhierarchysep = 1;
+ conf.userid = "fred";
+
+ toexternal_helper("user.fred", "INBOX");
+ toexternal_helper("user.fred.foo", "INBOX/foo");
+ toexternal_helper("user.fred.foo.barracuda", "INBOX/foo/barracuda");
+ toexternal_helper("user.jane", "user/jane");
+ toexternal_helper("user.jane.baz", "user/jane/baz");
+ toexternal_helper("shared.quux", "shared/quux");
+}
+
+static void test_toexternal_alt(void)
+{
+ memset(&conf, 0, sizeof(conf));
+ conf.altnamespace = 1;
+ conf.userprefix = "Uvvers";
+ conf.sharedprefix = "Chaired";
+ conf.userid = "fred";
+
+ toexternal_helper("user.fred", "INBOX");
+ toexternal_helper("user.fred.foo", "foo");
+ toexternal_helper("user.fred.foo.barracuda", "foo.barracuda");
+ toexternal_helper("user.jane", "Uvvers.jane");
+ toexternal_helper("user.jane.baz", "Uvvers.jane.baz");
+ toexternal_helper("shared.quux", "Chaired.shared.quux");
+}
+
+static void test_nextmodseq(void)
+{
+ static const char FREDNAME = "bloggs.com!user.fred";
+ struct mboxname_parts parts;
+ char *fname;
+
+ imapoptsIMAPOPT_CONVERSATIONS.val.b = 1;
+
+ /* ensure there is no file */
+ mboxname_to_parts(FREDNAME, &parts);
+ fname = mboxname_conf_getpath(&parts, "modseq");
+ unlink(fname);
+ free(fname);
+ mboxname_free_parts(&parts);
+
+ /* initial value should be 1 without file */
+ CU_ASSERT_EQUAL(mboxname_nextmodseq(FREDNAME, 0), 1);
+ /* next value should always increment */
+ CU_ASSERT_EQUAL(mboxname_nextmodseq(FREDNAME, 0), 2);
+ /* higher value should force a jump */
+ CU_ASSERT_EQUAL(mboxname_nextmodseq(FREDNAME, 100), 101);
+ /* lower value should not decrease */
+ CU_ASSERT_EQUAL(mboxname_nextmodseq(FREDNAME, 5), 102);
+}
+
+static enum enum_value old_config_virtdomains;
+static union config_value old_config_unixhierarchysep;
+static union config_value old_config_altnamespace;
+static union config_value old_config_userprefix;
+static union config_value old_config_sharedprefix;
+static union config_value old_config_conversations;
+static const char *old_config_defdomain;
+static char *old_config_dir;
+
+static int set_up(void)
+{
+ char cwdPATH_MAX;
+ char *s;
+
+ /*
+ * TODO: this is pretty hacky. There should be some
+ * cleaner way of pushing aside the config for a moment
+ * and temporarily setting up a particular set of config
+ * options for testing.
+ */
+ old_config_virtdomains = config_virtdomains;
+ config_virtdomains = IMAP_ENUM_VIRTDOMAINS_ON;
+
+ old_config_dir = (char *)config_dir;
+ s = getcwd(cwd, sizeof(cwd));
+ assert(s);
+ config_dir = strconcat(cwd, "/conf.d", (char *)NULL);
+
+ old_config_defdomain = config_defdomain;
+
+ old_config_unixhierarchysep = imapoptsIMAPOPT_UNIXHIERARCHYSEP.val;
+ old_config_altnamespace = imapoptsIMAPOPT_ALTNAMESPACE.val;
+ old_config_userprefix = imapoptsIMAPOPT_USERPREFIX.val;
+ old_config_sharedprefix = imapoptsIMAPOPT_SHAREDPREFIX.val;
+ old_config_conversations = imapoptsIMAPOPT_CONVERSATIONS.val;
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ char *cmd;
+ int r;
+
+ cmd = strconcat("rm -rf \"", config_dir, "\"", (char *)NULL);
+ r = system(cmd);
+ assert(!r);
+ free(cmd);
+ free((char *)config_dir);
+ config_dir = old_config_dir;
+
+ config_virtdomains = old_config_virtdomains;
+ config_defdomain = old_config_defdomain;
+ imapoptsIMAPOPT_UNIXHIERARCHYSEP.val = old_config_unixhierarchysep;
+ imapoptsIMAPOPT_ALTNAMESPACE.val = old_config_altnamespace;
+ imapoptsIMAPOPT_USERPREFIX.val = old_config_userprefix;
+ imapoptsIMAPOPT_SHAREDPREFIX.val = old_config_sharedprefix;
+ imapoptsIMAPOPT_CONVERSATIONS.val = old_config_conversations;
+
+ return 0;
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/md5.testc Added

@@ -0,0 +1,45 @@
+#include "cunit/cunit.h"
+#include "md5.h"
+
+static const char *asciify(unsigned char mac16)
+{
+ static char buf33;
+ int i;
+
+ for (i = 0 ; i < 16 ; i++)
+	sprintf(buf+2*i, "%02x", maci);
+ return buf;
+}
+
+static void test_single(void)
+{
+ MD5_CTX ctx;
+ unsigned char result16;
+ static const char text = "Hello World";
+ static const char expected33 = "b10a8db164e0754105b7a99be72e3fe5";
+
+ CU_ASSERT_EQUAL(MD5_DIGEST_LENGTH, 16);
+
+ MD5Init(&ctx);
+ MD5Update(&ctx, text, strlen(text));
+ MD5Final(result, &ctx);
+ CU_ASSERT_STRING_EQUAL(asciify(result), expected);
+}
+
+static void test_multiple(void)
+{
+ MD5_CTX ctx;
+ unsigned char result16;
+ static const char text1 = "lorem ipsum";
+ static const char text2 = " dolor sit amet,";
+ static const char text3 = " consectetur adipisicing elit";
+ static const char expected33 = "247ce3dcb025a6fd563b878072be7cc9";
+
+ MD5Init(&ctx);
+ MD5Update(&ctx, text1, strlen(text1));
+ MD5Update(&ctx, text2, strlen(text2));
+ MD5Update(&ctx, text3, strlen(text3));
+ MD5Final(result, &ctx);
+ CU_ASSERT_STRING_EQUAL(asciify(result), expected);
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/message.testc Added

@@ -0,0 +1,1072 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "cunit/cunit.h"
+#include "parseaddr.h"
+#include "imap/message.h"
+
+static void test_parse_trivial(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Wed, 27 Oct 2010 18:37:26 +1100\r\n"
+"Subject: Trivial testing email\r\n"
+"Message-ID: <fake800@fastmail.fm>\r\n"
+"X-Mailer: Norman\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* From: Fred Bloggs <fbloggs@fastmail.fm> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.from);
+ CU_ASSERT_STRING_EQUAL(body.from->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(body.from->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(body.from->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(body.from->next);
+
+ CU_ASSERT_PTR_NULL(body.reply_to);
+
+ /* To: Sarah Jane Smith <sjsmith@gmail.com> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.to);
+ CU_ASSERT_STRING_EQUAL(body.to->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(body.to->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(body.to->domain, "gmail.com");
+ CU_ASSERT_PTR_NULL(body.to->next);
+
+ CU_ASSERT_PTR_NULL(body.cc);
+
+ CU_ASSERT_PTR_NULL(body.bcc);
+
+ /* Date: Wed, 27 Oct 2010 18:37:26 +1100 */
+ CU_ASSERT_STRING_EQUAL(body.date, "Wed, 27 Oct 2010 18:37:26 +1100");
+
+ /* Subject: Trivial testing email */
+ CU_ASSERT_STRING_EQUAL(body.subject, "Trivial testing email");
+
+ /* Content-Type not specified, this is the default */
+ CU_ASSERT_STRING_EQUAL(body.type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "PLAIN");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ CU_ASSERT_PTR_NULL(body.language);
+
+ /* Message-ID: <fake800@fastmail.fm> */
+ CU_ASSERT_STRING_EQUAL(body.message_id, "<fake800@fastmail.fm>");
+
+ CU_ASSERT_PTR_NULL(body.in_reply_to);
+
+ CU_ASSERT_PTR_NULL(body.references);
+
+ CU_ASSERT_PTR_NULL(body.received_date);
+
+ /* simple body */
+ CU_ASSERT_EQUAL(body.numparts, 0);
+ CU_ASSERT_PTR_NULL(body.subpart);
+
+ /* check cacheheaders */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cacheheaders.s);
+ CU_ASSERT(strstr(body.cacheheaders.s, "Norman") != NULL);
+
+ message_free_body(&body);
+}
+
+
+static void test_parse_simple(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"Reply-To: <bounce.me.harder@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Cc: Al Capone <al@speakeasy.com>\r\n"
+"Bcc: Bugsy Moran <bugsy@garage.com>\r\n"
+"Date: Thu, 28 Oct 2010 18:37:26 +1100\r\n"
+"Subject: Simple testing email\r\n"
+"Content-Type: text/plain; charset=\"utf-8\"\r\n"
+"Content-Language: en\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"X-Mailer: Norman\r\n"
+"In-Reply-To: <fake999@gmail.com>\r\n"
+"Received: from foo.fastmail.fm (foo.fastmail.fm 10.0.0.1)\r\n"
+"\tby bar.gmail.com (Software); Thu, 28 Oct 2010 18:55:54 +1100\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* From: Fred Bloggs <fbloggs@fastmail.fm> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.from);
+ CU_ASSERT_STRING_EQUAL(body.from->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(body.from->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(body.from->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(body.from->next);
+
+ /* Reply-To: <bounce.me.harder@fastmail.fm> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.reply_to);
+ CU_ASSERT_PTR_NULL(body.reply_to->name);
+ CU_ASSERT_STRING_EQUAL(body.reply_to->mailbox, "bounce.me.harder");
+ CU_ASSERT_STRING_EQUAL(body.reply_to->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(body.reply_to->next);
+
+ /* To: Sarah Jane Smith <sjsmith@gmail.com> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.to);
+ CU_ASSERT_STRING_EQUAL(body.to->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(body.to->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(body.to->domain, "gmail.com");
+ CU_ASSERT_PTR_NULL(body.to->next);
+
+ /* Cc: Al Capone <al@speakeasy.com> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cc);
+ CU_ASSERT_STRING_EQUAL(body.cc->name, "Al Capone");
+ CU_ASSERT_STRING_EQUAL(body.cc->mailbox, "al");
+ CU_ASSERT_STRING_EQUAL(body.cc->domain, "speakeasy.com");
+ CU_ASSERT_PTR_NULL(body.cc->next);
+
+ /* Bcc: Bugsy Moran <bugsy@garage.com> */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.bcc);
+ CU_ASSERT_STRING_EQUAL(body.bcc->name, "Bugsy Moran");
+ CU_ASSERT_STRING_EQUAL(body.bcc->mailbox, "bugsy");
+ CU_ASSERT_STRING_EQUAL(body.bcc->domain, "garage.com");
+ CU_ASSERT_PTR_NULL(body.bcc->next);
+
+ /* Date: Thu, 28 Oct 2010 18:37:26 +1100 */
+ CU_ASSERT_STRING_EQUAL(body.date, "Thu, 28 Oct 2010 18:37:26 +1100");
+
+ /* Subject: Simple testing email */
+ CU_ASSERT_STRING_EQUAL(body.subject, "Simple testing email");
+
+ /* Content-Type: text/plain; charset="utf-8" */
+ CU_ASSERT_STRING_EQUAL(body.type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "PLAIN");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "utf-8");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ /* Content-Language: en */
+ CU_ASSERT_PTR_NOT_NULL(body.language);
+ CU_ASSERT_PTR_NULL(body.language->attribute);
+ CU_ASSERT_STRING_EQUAL(body.language->value, "EN");
+ CU_ASSERT_PTR_NULL(body.language->next);
+
+ /* Message-ID: <fake1000@fastmail.fm> */
+ CU_ASSERT_STRING_EQUAL(body.message_id, "<fake1000@fastmail.fm>");
+
+ /* In-Reply-To: <fake999@gmail.com> */
+ CU_ASSERT_STRING_EQUAL(body.in_reply_to, "<fake999@gmail.com>");
+
+ CU_ASSERT_PTR_NULL(body.references);
+
+ /* Received: from foo.fastmail.fm (foo.fastmail.fm 10.0.0.1) ... */
+ CU_ASSERT_STRING_EQUAL(body.received_date, "Thu, 28 Oct 2010 18:55:54 +1100");
+
+ /* simple body */
+ CU_ASSERT_EQUAL(body.numparts, 0);
+ CU_ASSERT_PTR_NULL(body.subpart);
+
+ /* check cacheheaders */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cacheheaders.s);
+ CU_ASSERT(strstr(body.cacheheaders.s, "Norman") != NULL);
+
+ message_free_body(&body);
+}
+
+
+/*
+ * There are two different headers from which we can extract
+ * the body.received_date field. Test that the rules for
+ * choosing which date are correctly applied.
+ */
+static void test_parse_rxdate(void)
+{
+#define DELIVERED "Fri, 29 Oct 2010 13:07:07 +1100"
+#define FIRST_RX "Fri, 29 Oct 2010 13:05:01 +1100"
+#define SECOND_RX "Fri, 29 Oct 2010 13:03:03 +1100"
+#define THIRD_RX "Fri, 29 Oct 2010 13:01:01 +1100"
+#define SENT	 "Thu, 28 Oct 2010 18:37:26 +1100"
+
+ /* Message has neither Received: nor X-DeliveredInternalDate headers. */
+ static const char msg_neither =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: " SENT "\r\n"
+"Subject: Simple testing email\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"\r\n"
+"Hello, World\n";
+
+ /* Message has only Received: headers. */
+ static const char msg_only_received =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: " SENT "\r\n"
+"Subject: Simple testing email\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"Received: from mail.quux.com (mail.quux.com 10.0.0.1)\r\n"
+"\tby mail.gmail.com (Software); " FIRST_RX "\r\n"
+"Received: from mail.bar.com (mail.bar.com 10.0.0.1)\r\n"
+"\tby mail.quux.com (Software); " SECOND_RX "\r\n"
+"Received: from mail.fastmail.fm (mail.fastmail.fm 10.0.0.1)\r\n"
+"\tby mail.bar.com (Software); " THIRD_RX "\r\n"
+"\r\n"
+"Hello, World\n";
+
+ /* Message has only X-DeliveredInternalDate (weird!) */
+ static const char msg_only_xdid =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: " SENT "\r\n"
+"Subject: Simple testing email\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"X-Deliveredinternaldate: " DELIVERED "\r\n"
+"\r\n"
+"Hello, World\n";
+
+ /* Message has both Received and X-DeliveredInternalDate in that order */
+ static const char msg_received_then_xdid =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: " SENT "\r\n"
+"Subject: Simple testing email\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"Received: from mail.quux.com (mail.quux.com 10.0.0.1)\r\n"
+"\tby mail.gmail.com (Software); " FIRST_RX "\r\n"
+"Received: from mail.bar.com (mail.bar.com 10.0.0.1)\r\n"
+"\tby mail.quux.com (Software); " SECOND_RX "\r\n"
+"Received: from mail.fastmail.fm (mail.fastmail.fm 10.0.0.1)\r\n"
+"\tby mail.bar.com (Software); " THIRD_RX "\r\n"
+"X-Deliveredinternaldate: " DELIVERED "\r\n"
+"\r\n"
+"Hello, World\n";
+
+ /* Message has both X-DeliveredInternalDate and Received in that order */
+ static const char msg_xdid_then_received =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: " SENT "\r\n"
+"Subject: Simple testing email\r\n"
+"Message-ID: <fake1000@fastmail.fm>\r\n"
+"X-Deliveredinternaldate: " DELIVERED "\r\n"
+"Received: from mail.quux.com (mail.quux.com 10.0.0.1)\r\n"
+"\tby mail.gmail.com (Software); " FIRST_RX "\r\n"
+"Received: from mail.bar.com (mail.bar.com 10.0.0.1)\r\n"
+"\tby mail.quux.com (Software); " SECOND_RX "\r\n"
+"Received: from mail.fastmail.fm (mail.fastmail.fm 10.0.0.1)\r\n"
+"\tby mail.bar.com (Software); " THIRD_RX "\r\n"
+"\r\n"
+"Hello, World\n";
+
+ int r;
+ struct body body;
+
+ /* Neither: no received_date */
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg_neither, sizeof(msg_neither)-1, &body);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NULL(body.received_date);
+ message_free_body(&body);
+
+ /* Received only: first seen Received */
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg_only_received,
+			 sizeof(msg_only_received)-1, &body);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(body.received_date, FIRST_RX);
+ message_free_body(&body);
+
+ /* X-DeliveredInternalDate only: use that */
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg_only_xdid,
+			 sizeof(msg_only_xdid)-1, &body);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(body.received_date, DELIVERED);
+ message_free_body(&body);
+
+ /* both, Received first: use X-DeliveredInternalDate */
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg_received_then_xdid,
+			 sizeof(msg_received_then_xdid)-1, &body);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(body.received_date, DELIVERED);
+ message_free_body(&body);
+
+ /* both, X-DeliveredInternalDate first: use X-DeliveredInternalDate */
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg_xdid_then_received,
+			 sizeof(msg_xdid_then_received)-1, &body);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_STRING_EQUAL(body.received_date, DELIVERED);
+ message_free_body(&body);
+}
+
+
+static void test_mime_trivial(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"Reply-To: <bounce.me.harder@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Thu, 28 Oct 2010 18:37:26 +1100\r\n"
+"Subject: MIME testing email\r\n"
+"X-Mailer: Norman\r\n"
+"MIME-Version: 1.0\r\n"
+"Content-Type: multipart/mixed; boundary=\"2b47bc7b64285b8be25dcdca86fbc501b048eab1\"\r\n"
+"Content-Language: en\r\n"
+"Message-ID: <fake1001@fastmail.fm>\r\n"
+"\r\n"
+"--2b47bc7b64285b8be25dcdca86fbc501b048eab1\r\n"
+"\r\n"
+"Hello, World\n"
+"\r\n--2b47bc7b64285b8be25dcdca86fbc501b048eab1--\r\n";
+ int r;
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Content-Type: */
+ CU_ASSERT_STRING_EQUAL(body.type, "MULTIPART");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "MIXED");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "BOUNDARY");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "2b47bc7b64285b8be25dcdca86fbc501b048eab1");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ /*
+ * RFC2046 says that all headers and in particular the Content-Type:
+ * header may be missing in an entity, and if so the default
+ * Content-Type is text/plain;charset="us-ascii"
+ */
+
+ /* simple body */
+ CU_ASSERT_EQUAL(body.numparts, 1);
+ CU_ASSERT_PTR_NOT_NULL(body.subpart);
+ CU_ASSERT_STRING_EQUAL(body.subpart0.type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(body.subpart0.subtype, "PLAIN");
+ CU_ASSERT_PTR_NOT_NULL(body.subpart0.params);
+ CU_ASSERT_STRING_EQUAL(body.subpart0.params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(body.subpart0.params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(body.subpart0.params->next);
+
+ /* check cacheheaders */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cacheheaders.s);
+ CU_ASSERT(strstr(body.cacheheaders.s, "Norman") != NULL);
+ CU_ASSERT_PTR_NULL(body.subpart0.cacheheaders.s);
+
+ message_free_body(&body);
+}
+
+static void test_mime_multiple(void)
+{
+#define TEXT_PART \
+ "Hello, World"
+#define HTML_PART \
+ "<html><head><title>Hello, World</title></head>\r\n" \
+ "<body>\r\n" \
+ "Hello, World\r\n" \
+ "<body></html>"
+
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"Reply-To: <bounce.me.harder@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Thu, 28 Oct 2010 18:37:26 +1100\r\n"
+"Subject: MIME testing email\r\n"
+"X-Mailer: Norman\r\n"
+"MIME-Version: 1.0\r\n"
+"Content-Type: multipart/mixed; boundary=\"7225e50d962de81173be22223f706458743c3a9a\"\r\n"
+"Content-Language: en\r\n"
+"Message-ID: <fake1003@fastmail.fm>\r\n"
+"\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+"Content-Type: text/plain; charset=\"us-ascii\"\r\n"
+"\r\n"
+TEXT_PART "\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+"Content-Type: text/html; charset=\"us-ascii\"\r\n"
+"\r\n"
+HTML_PART "\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+"Content-Type: image/png\r\n"
+"Content-Disposition: attachment; filename=cyrus-favicon.png\r\n"
+"Content-Transfer-Encoding: base64\r\n"
+"\r\n"
+"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A\r\n"
+"/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sBEQEMHNieJnIAAAIsSURBVDjL\r\n"
+"tZNPSNNhGMc/r+xSUY4hbHO1LYyRSXRw4iaSRVFCiNBf8BA/mwWVB1sQFGgdgqjfph6i0EEUXaxJ\r\n"
+"3tTmkA6zQxieVlR0GP0xy7n9Ftipng6/NZMM6dBzenmf5/083+d53gf+l42Njkm1zychTZPZ2Vn5\r\n"
+"p8dRPSIuu0NcdodsdDgl4K+TqVRqRYj6dZhKpaQv2kuhYJBOp0GKXgGlzLBAMAjAdV2nakuVWka6\r\n"
+"3N0tyYkJWc2G43GJ6vpyNbGBQXHZHZJMJFYFJBMJqfb55MHQkABYQpomV3p6QKmSVIC+SATD+AqA\r\n"
+"x7OJ9o6OYtGKglEg3HWOkKYJle7N0hgIynA8LtlsdlUF2WxWkomENAYbxGV3iGXR6SHl38ePWwN4\r\n"
+"vV5sNhsA/dEo+byBUgq3e0lBPpej55rOU38L5d/HwVrfJDx8JegjUrHdL726/tfsd2Ix8TTsFvQR\r\n"
+"If5arPW7pAwUKAWebcyfv0144hnHDh0hl8uV+rGwsMDJ9hOcvT9C5tQN8NaAmIMoE5HizBWsK4e2\r\n"
+"Czx+/4U9O5uYTCZ5Pj1N64EWRief8O1o2IwpNlNEsJS+kwhkXlAe78eo2sHM1lraOrsAmOu4CpmX\r\n"
+"VAxeZL75ONTtL6kzAQKM34UPbzHOREpZ5i7dM8FrN4C3hvmmw/DoJryZgdbTvwEyaajdC82aWYoU\r\n"
+"qWvWL//xAhzshMUCfH5neqp9PvlodS4tR7G2P5ZmhfvK/Cd+At3OXF7AwYF1AAAAAElFTkSuQmCC\r\n"
+"\r\n--7225e50d962de81173be22223f706458743c3a9a--\r\n";
+ int r;
+ struct body body;
+ struct body *part;
+ struct message_content mcontent;
+ const char *types2 = { NULL, NULL };
+ struct bodypart **parts = NULL;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Content-Type: */
+ CU_ASSERT_STRING_EQUAL(body.type, "MULTIPART");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "MIXED");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "BOUNDARY");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "7225e50d962de81173be22223f706458743c3a9a");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ CU_ASSERT_EQUAL(body.numparts, 3);
+ CU_ASSERT_PTR_NOT_NULL(body.subpart);
+
+ part = &body.subpart0;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "PLAIN");
+ CU_ASSERT_PTR_NOT_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(part->params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(part->params->next);
+ CU_ASSERT_PTR_NULL(part->disposition);
+ CU_ASSERT_PTR_NULL(part->encoding);
+
+ part = &body.subpart1;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "HTML");
+ CU_ASSERT_PTR_NOT_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(part->params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(part->params->next);
+ CU_ASSERT_PTR_NULL(part->disposition);
+ CU_ASSERT_PTR_NULL(part->encoding);
+
+ part = &body.subpart2;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "IMAGE");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "PNG");
+ CU_ASSERT_PTR_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->disposition, "ATTACHMENT");
+ CU_ASSERT_STRING_EQUAL(part->encoding, "BASE64");
+
+ mcontent.base = msg;
+ mcontent.len = sizeof(msg)-1;
+ mcontent.body = &body;
+
+ types0 = "TEXT/PLAIN";
+ parts = NULL;
+ message_fetch_part(&mcontent, types, &parts);
+ CU_ASSERT_PTR_NOT_NULL(parts);
+ if (parts) {
+	CU_ASSERT_PTR_NOT_NULL(parts0);
+	CU_ASSERT_PTR_NULL(parts1);
+	CU_ASSERT_STRING_EQUAL(parts0->decoded_body, TEXT_PART);
+	free(parts0);
+	free(parts);
+	parts = NULL;
+ }
+
+ types0 = "TEXT/HTML";
+ parts = NULL;
+ message_fetch_part(&mcontent, types, &parts);
+ CU_ASSERT_PTR_NOT_NULL(parts);
+ if (parts) {
+	CU_ASSERT_PTR_NOT_NULL(parts0);
+	CU_ASSERT_PTR_NULL(parts1);
+	CU_ASSERT_STRING_EQUAL(parts0->decoded_body, HTML_PART);
+	free(parts0);
+	free(parts);
+	parts = NULL;
+ }
+
+ /* check cacheheaders */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cacheheaders.s);
+ CU_ASSERT(strstr(body.cacheheaders.s, "Norman") != NULL);
+ CU_ASSERT_PTR_NULL(body.subpart0.cacheheaders.s);
+ CU_ASSERT_PTR_NULL(body.subpart1.cacheheaders.s);
+ CU_ASSERT_PTR_NULL(body.subpart2.cacheheaders.s);
+
+ message_free_body(&body);
+#undef TEXT_PART
+#undef HTML_PART
+}
+
+/*
+ * RFC2231 specifies, amongst other things, a method for
+ * breaking up across multiple lines, long parameter values
+ * which cannot have whitespace inserted into them.
+ */
+static void test_rfc2231_continuations(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Wed, 27 Oct 2010 18:37:26 +1100\r\n"
+/* This example based on one in RFC2231 */
+"Content-Type: message/external-body; access-type=URL;\r\n"
+"\tURL*0=\"ftp://\";\r\n"
+"\tURL*1=\"cs.utk.edu/pub/moore/\";\r\n"
+"\tURL*2=\"bulk-mailer/bulk-mailer.tar\"\r\n"
+"Subject: RFC2231 continuation testing email\r\n"
+"Message-ID: <fake1002@fastmail.fm>\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ static const char URL = "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar";
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Date: Wed, 27 Oct 2010 18:37:26 +1100 */
+ CU_ASSERT_STRING_EQUAL(body.date, "Wed, 27 Oct 2010 18:37:26 +1100");
+
+ /* Subject: Trivial testing email */
+ CU_ASSERT_STRING_EQUAL(body.subject, "RFC2231 continuation testing email");
+
+ CU_ASSERT_STRING_EQUAL(body.type, "MESSAGE");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "EXTERNAL-BODY");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "ACCESS-TYPE");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "URL");
+ CU_ASSERT_PTR_NOT_NULL(body.params->next);
+ CU_ASSERT_STRING_EQUAL(body.params->next->attribute, "URL");
+ CU_ASSERT_STRING_EQUAL(body.params->next->value, URL);
+ CU_ASSERT_PTR_NULL(body.params->next->next);
+
+ message_free_body(&body);
+}
+
+/*
+ * RFC2231 has a second syntax for continuations, which
+ * indicates the language & charset info may be encoded
+ * in the value and allows for %xx encoded chars.
+ */
+static void test_rfc2231_extended_continuations(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Wed, 27 Oct 2010 18:37:26 +1100\r\n"
+/* This example also loosely based on one in RFC2231 */
+"Content-Type: application/x-stuff;\r\n"
+"\ttitle*0*=us-ascii'en'This%20is%20even%20more%20;\r\n"
+"\ttitle*1*=%2A%2A%2Afun%2A%2A%2A%20;\r\n"
+"\ttitle*2=\"isn't it!\"\r\n"
+"Subject: RFC2231 extended continuation testing email\r\n"
+"Message-ID: <fake1002@fastmail.fm>\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ static const char TITLE =
+		"us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it!";
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Date: Wed, 27 Oct 2010 18:37:26 +1100 */
+ CU_ASSERT_STRING_EQUAL(body.date, "Wed, 27 Oct 2010 18:37:26 +1100");
+
+ /* Subject: Trivial testing email */
+ CU_ASSERT_STRING_EQUAL(body.subject, "RFC2231 extended continuation testing email");
+
+ CU_ASSERT_STRING_EQUAL(body.type, "APPLICATION");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "X-STUFF");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "TITLE*");
+ CU_ASSERT_STRING_EQUAL(body.params->value, TITLE);
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ message_free_body(&body);
+}
+
+static void test_references(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Wed, 27 Oct 2010 18:37:26 +1100\r\n"
+"Subject: Trivial testing email\r\n"
+"Message-ID: <fake800@fastmail.fm>\r\n"
+"In-Reply-To: <fake701@fastmail.fm>\r\n"
+"References: <fake332@gmail.com> <fake437@garage.com>\r\n"
+"\t<fake589@speakeasy.com>\t(Hey ignore me I'm a comment) <fake679@gmail.com>\r\n"
+"\t<fake701@fastmail.fm>\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Message-ID: <fake800@fastmail.fm> */
+ CU_ASSERT_STRING_EQUAL(body.message_id, "<fake800@fastmail.fm>");
+
+ /* In_Reply-To: <fake701@fastmail.fm> */
+ CU_ASSERT_STRING_EQUAL(body.in_reply_to, "<fake701@fastmail.fm>");
+
+ CU_ASSERT_PTR_NOT_NULL(strstr(body.references, "<fake332@gmail.com>"));
+ CU_ASSERT_PTR_NOT_NULL(strstr(body.references, "<fake437@garage.com>"));
+ CU_ASSERT_PTR_NOT_NULL(strstr(body.references, "<fake589@speakeasy.com>"));
+ CU_ASSERT_PTR_NOT_NULL(strstr(body.references, "<fake679@gmail.com>"));
+ CU_ASSERT_PTR_NOT_NULL(strstr(body.references, "<fake701@fastmail.fm>"));
+
+ message_free_body(&body);
+}
+
+static void test_x_me_message_id(void)
+{
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Wed, 27 Oct 2010 18:37:26 +1100\r\n"
+"Subject: Trivial testing email\r\n"
+"X-ME-Message-ID: <fake1700@fastmail.fm>\r\n"
+"\r\n"
+"Hello, World\n";
+ int r;
+ struct body body;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Message-ID: <fake1700@fastmail.fm> */
+ CU_ASSERT_PTR_NULL(body.message_id);
+ CU_ASSERT_STRING_EQUAL(body.x_me_message_id, "<fake1700@fastmail.fm>");
+ CU_ASSERT_PTR_NULL(body.in_reply_to);
+ CU_ASSERT_PTR_NULL(body.references);
+
+ message_free_body(&body);
+}
+
+static void test_zero_length_fieldnames(void)
+{
+#define TEXT_PART \
+ "Hello, World"
+#define HTML_PART \
+ "<html><head><title>Hello, World</title></head>\r\n" \
+ "<body>\r\n" \
+ "Hello, World\r\n" \
+ "<body></html>"
+
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"Reply-To: <bounce.me.harder@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Thu, 28 Oct 2010 18:37:26 +1100\r\n"
+"Subject: MIME testing email\r\n"
+"X-Mailer: Norman\r\n"
+"MIME-Version: 1.0\r\n"
+"Content-Type: multipart/mixed; boundary=\"7225e50d962de81173be22223f706458743c3a9a\"\r\n"
+"Content-Language: en\r\n"
+"Message-ID: <fake1003@fastmail.fm>\r\n"
+"\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+": \r\n"
+"Content-Type: text/plain; charset=\"us-ascii\"\r\n"
+": \r\n"
+"\r\n"
+TEXT_PART "\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+": \r\n"
+"Content-Type: text/html; charset=\"us-ascii\"\r\n"
+": \r\n"
+"\r\n"
+HTML_PART "\r\n"
+"--7225e50d962de81173be22223f706458743c3a9a\r\n"
+": \r\n"
+"Content-Type: image/png\r\n"
+"Content-Disposition: attachment; filename=cyrus-favicon.png\r\n"
+"Content-Transfer-Encoding: base64\r\n"
+": \r\n"
+"\r\n"
+"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A\r\n"
+"/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sBEQEMHNieJnIAAAIsSURBVDjL\r\n"
+"tZNPSNNhGMc/r+xSUY4hbHO1LYyRSXRw4iaSRVFCiNBf8BA/mwWVB1sQFGgdgqjfph6i0EEUXaxJ\r\n"
+"3tTmkA6zQxieVlR0GP0xy7n9Ftipng6/NZMM6dBzenmf5/083+d53gf+l42Njkm1zychTZPZ2Vn5\r\n"
+"p8dRPSIuu0NcdodsdDgl4K+TqVRqRYj6dZhKpaQv2kuhYJBOp0GKXgGlzLBAMAjAdV2nakuVWka6\r\n"
+"3N0tyYkJWc2G43GJ6vpyNbGBQXHZHZJMJFYFJBMJqfb55MHQkABYQpomV3p6QKmSVIC+SATD+AqA\r\n"
+"x7OJ9o6OYtGKglEg3HWOkKYJle7N0hgIynA8LtlsdlUF2WxWkomENAYbxGV3iGXR6SHl38ePWwN4\r\n"
+"vV5sNhsA/dEo+byBUgq3e0lBPpej55rOU38L5d/HwVrfJDx8JegjUrHdL726/tfsd2Ix8TTsFvQR\r\n"
+"If5arPW7pAwUKAWebcyfv0144hnHDh0hl8uV+rGwsMDJ9hOcvT9C5tQN8NaAmIMoE5HizBWsK4e2\r\n"
+"Czx+/4U9O5uYTCZ5Pj1N64EWRief8O1o2IwpNlNEsJS+kwhkXlAe78eo2sHM1lraOrsAmOu4CpmX\r\n"
+"VAxeZL75ONTtL6kzAQKM34UPbzHOREpZ5i7dM8FrN4C3hvmmw/DoJryZgdbTvwEyaajdC82aWYoU\r\n"
+"qWvWL//xAhzshMUCfH5neqp9PvlodS4tR7G2P5ZmhfvK/Cd+At3OXF7AwYF1AAAAAElFTkSuQmCC\r\n"
+"\r\n--7225e50d962de81173be22223f706458743c3a9a--\r\n";
+ int r;
+ struct body body;
+ struct body *part;
+ struct message_content mcontent;
+ const char *types2 = { NULL, NULL };
+ struct bodypart **parts = NULL;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Content-Type: */
+ CU_ASSERT_STRING_EQUAL(body.type, "MULTIPART");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "MIXED");
+ CU_ASSERT_PTR_NOT_NULL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "BOUNDARY");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "7225e50d962de81173be22223f706458743c3a9a");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ CU_ASSERT_EQUAL(body.numparts, 3);
+ CU_ASSERT_PTR_NOT_NULL(body.subpart);
+
+ part = &body.subpart0;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "PLAIN");
+ CU_ASSERT_PTR_NOT_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(part->params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(part->params->next);
+ CU_ASSERT_PTR_NULL(part->disposition);
+ CU_ASSERT_PTR_NULL(part->encoding);
+
+ part = &body.subpart1;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "HTML");
+ CU_ASSERT_PTR_NOT_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(part->params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(part->params->next);
+ CU_ASSERT_PTR_NULL(part->disposition);
+ CU_ASSERT_PTR_NULL(part->encoding);
+
+ part = &body.subpart2;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "IMAGE");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "PNG");
+ CU_ASSERT_PTR_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->disposition, "ATTACHMENT");
+ CU_ASSERT_STRING_EQUAL(part->encoding, "BASE64");
+
+ mcontent.base = msg;
+ mcontent.len = sizeof(msg)-1;
+ mcontent.body = &body;
+
+ types0 = "TEXT/PLAIN";
+ parts = NULL;
+ message_fetch_part(&mcontent, types, &parts);
+ CU_ASSERT_PTR_NOT_NULL(parts);
+ if (parts) {
+	CU_ASSERT_PTR_NOT_NULL(parts0);
+	CU_ASSERT_PTR_NULL(parts1);
+	CU_ASSERT_STRING_EQUAL(parts0->decoded_body, TEXT_PART);
+	free(parts0);
+	free(parts);
+	parts = NULL;
+ }
+
+ types0 = "TEXT/HTML";
+ parts = NULL;
+ message_fetch_part(&mcontent, types, &parts);
+ CU_ASSERT_PTR_NOT_NULL(parts);
+ if (parts) {
+	CU_ASSERT_PTR_NOT_NULL(parts0);
+	CU_ASSERT_PTR_NULL(parts1);
+	CU_ASSERT_STRING_EQUAL(parts0->decoded_body, HTML_PART);
+	free(parts0);
+	free(parts);
+	parts = NULL;
+ }
+
+ /* check cacheheaders */
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.cacheheaders.s);
+ CU_ASSERT(strstr(body.cacheheaders.s, "Norman") != NULL);
+ CU_ASSERT_PTR_NULL(body.subpart0.cacheheaders.s);
+ CU_ASSERT_PTR_NULL(body.subpart1.cacheheaders.s);
+ CU_ASSERT_PTR_NULL(body.subpart2.cacheheaders.s);
+
+ message_free_body(&body);
+#undef TEXT_PART
+#undef HTML_PART
+}
+
+static void test_parameter_recovery(void)
+{
+#define HTML_PART \
+ "<html><head><title>Hello, World</title></head>\r\n" \
+ "<body>\r\n" \
+ "Hello, World\r\n" \
+ "<body></html>"
+
+ static const char msg =
+"From: Fred Bloggs <fbloggs@fastmail.fm>\r\n"
+"Reply-To: <bounce.me.harder@fastmail.fm>\r\n"
+"To: Sarah Jane Smith <sjsmith@gmail.com>\r\n"
+"Date: Thu, 28 Oct 2010 18:37:26 +1100\r\n"
+"Subject: MIME testing email\r\n"
+"X-Mailer: Norman\r\n"
+"MIME-Version: 1.0\r\n"
+/* The value of the "type" parameter contains an / but is
+ * not quoted, which is illegal under RFC2045 rules. We should
+ * be either accepting it, or ignoring it, but in either case
+ * the "boundary" that follows it should be accepted and used
+ * to pick apart the MIME structure. This actually happened
+ * in the wild. */
+"Content-Type: multipart/related; type=text/html; boundary=_related\r\n"
+"Content-Language: en\r\n"
+"Message-ID: <fake1003@fastmail.fm>\r\n"
+"\r\n"
+"--_related\r\n"
+"Content-Type: text/html; charset=\"us-ascii\"\r\n"
+"\r\n"
+HTML_PART "\r\n"
+"--_related\r\n"
+"Content-Type: image/png\r\n"
+"Content-Transfer-Encoding: base64\r\n"
+"\r\n"
+"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A\r\n"
+"/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sBEQEMHNieJnIAAAIsSURBVDjL\r\n"
+"tZNPSNNhGMc/r+xSUY4hbHO1LYyRSXRw4iaSRVFCiNBf8BA/mwWVB1sQFGgdgqjfph6i0EEUXaxJ\r\n"
+"3tTmkA6zQxieVlR0GP0xy7n9Ftipng6/NZMM6dBzenmf5/083+d53gf+l42Njkm1zychTZPZ2Vn5\r\n"
+"p8dRPSIuu0NcdodsdDgl4K+TqVRqRYj6dZhKpaQv2kuhYJBOp0GKXgGlzLBAMAjAdV2nakuVWka6\r\n"
+"3N0tyYkJWc2G43GJ6vpyNbGBQXHZHZJMJFYFJBMJqfb55MHQkABYQpomV3p6QKmSVIC+SATD+AqA\r\n"
+"x7OJ9o6OYtGKglEg3HWOkKYJle7N0hgIynA8LtlsdlUF2WxWkomENAYbxGV3iGXR6SHl38ePWwN4\r\n"
+"vV5sNhsA/dEo+byBUgq3e0lBPpej55rOU38L5d/HwVrfJDx8JegjUrHdL726/tfsd2Ix8TTsFvQR\r\n"
+"If5arPW7pAwUKAWebcyfv0144hnHDh0hl8uV+rGwsMDJ9hOcvT9C5tQN8NaAmIMoE5HizBWsK4e2\r\n"
+"Czx+/4U9O5uYTCZ5Pj1N64EWRief8O1o2IwpNlNEsJS+kwhkXlAe78eo2sHM1lraOrsAmOu4CpmX\r\n"
+"VAxeZL75ONTtL6kzAQKM34UPbzHOREpZ5i7dM8FrN4C3hvmmw/DoJryZgdbTvwEyaajdC82aWYoU\r\n"
+"qWvWL//xAhzshMUCfH5neqp9PvlodS4tR7G2P5ZmhfvK/Cd+At3OXF7AwYF1AAAAAElFTkSuQmCC\r\n"
+"\r\n--_related--\r\n";
+ int r;
+ struct body body;
+ struct body *part;
+
+ memset(&body, 0x45, sizeof(body));
+ r = message_parse_mapped(msg, sizeof(msg)-1, &body);
+
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* Content-Type: */
+ CU_ASSERT_STRING_EQUAL(body.type, "MULTIPART");
+ CU_ASSERT_STRING_EQUAL(body.subtype, "RELATED");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(body.params);
+ CU_ASSERT_STRING_EQUAL(body.params->attribute, "BOUNDARY");
+ CU_ASSERT_STRING_EQUAL(body.params->value, "_related");
+ CU_ASSERT_PTR_NULL(body.params->next);
+
+ CU_ASSERT_EQUAL(body.numparts, 2);
+ CU_ASSERT_PTR_NOT_NULL(body.subpart);
+
+ part = &body.subpart0;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "TEXT");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "HTML");
+ CU_ASSERT_PTR_NOT_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->params->attribute, "CHARSET");
+ CU_ASSERT_STRING_EQUAL(part->params->value, "us-ascii");
+ CU_ASSERT_PTR_NULL(part->params->next);
+ CU_ASSERT_PTR_NULL(part->disposition);
+ CU_ASSERT_PTR_NULL(part->encoding);
+
+ part = &body.subpart1;
+ CU_ASSERT_PTR_NOT_NULL(part);
+ CU_ASSERT_STRING_EQUAL(part->type, "IMAGE");
+ CU_ASSERT_STRING_EQUAL(part->subtype, "PNG");
+ CU_ASSERT_PTR_NULL(part->params);
+ CU_ASSERT_STRING_EQUAL(part->encoding, "BASE64");
+
+#undef HTML_PART
+}
+
+
+#undef TESTCASE
+#define TESTCASE(input, explen, expout) \
+ buf_reset(&b); \
+ message_write_nstring(&b, input); \
+ buf_cstring(&b); \
+ CU_ASSERT_EQUAL(b.len, explen); \
+ CU_ASSERT(!strcmp(b.s, expout))
+
+static void test_write_nstring(void)
+{
+ struct buf b = BUF_INITIALIZER;
+
+ /* NULL string */
+ TESTCASE(0, 3, "NIL");
+
+ /* Zero length string */
+ TESTCASE("", 2, "\"\"");
+
+ /* Boring string */
+ TESTCASE("Hello", 7, "\"Hello\"");
+
+ /* String with non-dangerous whitespace */
+ TESTCASE("Hello World\tagain", 19, "\"Hello World\tagain\"");
+
+ /* String with dangerous whitespace */
+ TESTCASE("Good\rBye\nEarth", 20, "{14}\r\nGood\rBye\nEarth");
+
+ /* String with embedded dquote */
+ TESTCASE("Quot\"able", 14, "{9}\r\nQuot\"able");
+
+ /* String with embedded percent */
+ TESTCASE("per%ent", 12, "{7}\r\nper%ent");
+
+ /* String with embedded backslash */
+ TESTCASE("slash\\dot", 14, "{9}\r\nslash\\dot");
+
+ /* String with embedded 8-bit chars */
+ TESTCASE("Hi I'm \330l\345f", 17, "{11}\r\nHi I'm \330l\345f");
+
+ /* Boring but overly long string */
+ {
+	struct buf llb = BUF_INITIALIZER;
+	int i;
+
+	for (i = 0 ; i<500 ; i++)
+	 buf_appendcstr(&llb, "blah ");
+	buf_cstring(&llb);
+
+	buf_reset(&b);
+	message_write_nstring(&b, llb.s);
+	buf_cstring(&b);
+	CU_ASSERT_EQUAL(b.len, llb.len+8); \
+	CU_ASSERT_STRING_EQUAL(b.s+8, llb.s);
+	b.s8 = '\0';
+	CU_ASSERT_STRING_EQUAL(b.s, "{2500}\r\n");
+	buf_free(&llb);
+ }
+
+ /* embedded NULs not handled in message_write_nstring */
+ TESTCASE("Hello\0World", 7, "\"Hello\"");
+
+ /* embedded NULs in message_write_nstring_map */
+ buf_reset(&b);
+ message_write_nstring_map(&b, "Hello\0World", 11);
+ buf_cstring(&b);
+ CU_ASSERT_EQUAL(b.len, 17);
+ CU_ASSERT(!memcmp(b.s, "{11}\r\nHello\0World", 17));
+
+ buf_free(&b);
+}
+
+#undef TESTPARSE
+#define TESTPARSE(expout, explen, input) \
+ buf_setcstr(&b, input); \
+ buf_putc(&b, ')'); \
+ ptr = b.s; \
+ output = parse_nstring(&ptr); \
+ CU_ASSERT(!memcmp(output, expout, explen))
+
+static void test_parse_nstring(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ char *output;
+ char *ptr;
+
+ /* NULL string */
+ buf_setcstr(&b, "NIL)");
+ ptr = b.s;
+ output = parse_nstring(&ptr);
+ CU_ASSERT_PTR_NULL(output);
+
+ /* Zero length string */
+ TESTPARSE("", 0, "\"\"");
+
+ /* Boring string */
+ TESTPARSE("Hello", 5, "\"Hello\"");
+
+ /* String with non-dangerous whitespace */
+ TESTPARSE("Hello World\tagain", 17, "\"Hello World\tagain\"");
+
+ /* String with dangerous whitespace */
+ TESTPARSE("Good\rBye\nEarth", 14, "{14}\r\nGood\rBye\nEarth");
+
+ /* String with embedded dquote */
+ TESTPARSE("Quot\"able", 9, "{9}\r\nQuot\"able");
+
+ /* String with embedded percent */
+ TESTPARSE("per%ent", 7, "{7}\r\nper%ent");
+
+ /* String with embedded backslash */
+ TESTPARSE("slash\\dot", 9, "{9}\r\nslash\\dot");
+
+ /* String with embedded 8-bit chars */
+ TESTPARSE("Hi I'm \330l\345f", 11, "{11}\r\nHi I'm \330l\345f");
+
+ /* And some stuff seen in the wild */
+ TESTPARSE("Lloyd Burns\\\"", 13, "\"Lloyd Burns\\\"\" NIL \"MariogenoaRobertson\" \"fiftyfoureleven.com\")");
+
+ buf_free(&b);
+}
+
+#undef TESTCASE
+
+#define TESTCASE(input, expout) \
+ buf_reset(&b); \
+ buf_init_ro(&s, input, sizeof(input)-1); \
+ message_write_xdrstring(&b, &s); \
+ CU_ASSERT_EQUAL(b.len, sizeof(expout)-1); \
+ CU_ASSERT(!memcmp(b.s, expout, sizeof(expout)-1))
+
+static void test_write_xdrstring(void)
+{
+ struct buf b = BUF_INITIALIZER;
+ struct buf s = BUF_INITIALIZER;
+
+ /* Zero length string */
+ TESTCASE("", "\0\0\0\0");
+
+ /* 1-length string */
+ TESTCASE("H", "\0\0\0\001H\0\0\0");
+
+ /* 2-length string */
+ TESTCASE("He", "\0\0\0\002He\0\0");
+
+ /* 3-length string */
+ TESTCASE("Hel", "\0\0\0\003Hel\0");
+
+ /* 4-length string */
+ TESTCASE("Hell", "\0\0\0\004Hell");
+
+ /* 5-length string */
+ TESTCASE("Hello", "\0\0\0\005Hello\0\0\0");
+
+ buf_free(&b);
+ buf_free(&s);
+}
+
+#undef TESTCASE
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/msgid.testc Added

@@ -0,0 +1,490 @@
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "cunit/cunit.h"
+#include "imap/global.h"
+
+static void test_simple(void)
+{
+#define C_MSGID1 "<001.02.00003@example.com>"
+ static const char C_MSGIDS = C_MSGID1;
+ char *buf;
+ char *s;
+ char *m;
+
+ buf = strdup(C_MSGIDS);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(buf);
+ s = buf;
+
+ /* first call returns a newly allocated string which is the
+ * only msgid in the input */
+ m = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m);
+ CU_ASSERT_PTR_NOT_EQUAL(m, s);
+ CU_ASSERT_PTR_NOT_EQUAL(m, buf);
+ CU_ASSERT_STRING_EQUAL(m, C_MSGID1);
+
+ /* 's' should point somewhere into the buffer */
+ CU_ASSERT(s >= buf && s <= buf+sizeof(C_MSGIDS));
+
+ /* the buffer should be unmolested */
+ CU_ASSERT(memcmp(buf, C_MSGIDS, sizeof(C_MSGIDS)) == 0);
+
+ free(m);
+
+ /* second call returns NULL, there are no more msgids */
+ m = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m);
+
+ free(buf);
+#undef C_MSGID1
+}
+
+
+/* multiple msgids separated by a single space */
+static void test_multiple(void)
+{
+#define C_MSGID1 "<004.05.00006@example.com>"
+#define C_MSGID2 "<007.08.09@gmail.com>"
+#define C_MSGID3 "<0000A-0B-0000C@apple.com>"
+#define C_MSGID4 "<010309849374836@fastmail.fm>"
+ static const char C_MSGIDS = C_MSGID1 " " C_MSGID2 " " C_MSGID3 " " C_MSGID4;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+ char *m4;
+ char *m5;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m3);
+ CU_ASSERT_STRING_EQUAL(m3, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m4 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m4);
+ CU_ASSERT_STRING_EQUAL(m4, C_MSGID4);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* last call returns NULL, there are no more msgids */
+ m5 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m5);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m3, m4);
+
+ free(m1);
+ free(m2);
+ free(m3);
+ free(m4);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID3
+#undef C_MSGID4
+}
+
+
+/* multiple msgids separated by more interesting whitespace */
+static void test_whitespace(void)
+{
+#define C_MSGID1 "<104.05.00006@example.com>"
+#define C_MSGID2 "<107.08.09@gmail.com>"
+#define C_MSGID3 "<1000A-0B-0000C@apple.com>"
+#define C_MSGID4 "<110309849374836@fastmail.fm>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 "\t" C_MSGID3 "\t\r\n\t" C_MSGID4 "\r\n";
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+ char *m4;
+ char *m5;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m3);
+ CU_ASSERT_STRING_EQUAL(m3, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m4 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m4);
+ CU_ASSERT_STRING_EQUAL(m4, C_MSGID4);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* last call returns NULL, there are no more msgids */
+ m5 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m5);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m3, m4);
+
+ free(m1);
+ free(m2);
+ free(m3);
+ free(m4);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID3
+#undef C_MSGID4
+}
+
+
+
+/* duplicate msgids are returned, not elided */
+static void test_dups(void)
+{
+#define C_MSGID1 "<204.05.00006@example.com>"
+#define C_MSGID2 "<207.08.09@gmail.com>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 " " C_MSGID2 " " C_MSGID1;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+ char *m4;
+ char *m5;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m3);
+ CU_ASSERT_STRING_EQUAL(m3, C_MSGID2);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m4 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m4);
+ CU_ASSERT_STRING_EQUAL(m4, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* last call returns NULL, there are no more msgids */
+ m5 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m5);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m4);
+ CU_ASSERT_PTR_NOT_EQUAL(m3, m4);
+
+ free(m1);
+ free(m2);
+ free(m3);
+ free(m4);
+#undef C_MSGID1
+#undef C_MSGID2
+}
+
+
+/* a CRLF followed by a non WS marks the end of the header */
+static void test_eol(void)
+{
+#define C_MSGID1 "<304.05.00006@example.com>"
+#define C_MSGID2 "<307.08.09@gmail.com>"
+#define C_MSGID3 "<3000A-0B-0000C@apple.com>"
+#define C_MSGID4 "<310309849374836@fastmail.fm>"
+ static const char C_MSGIDS =
+	C_MSGID1 "\r\n"
+	" " C_MSGID2 "\r\n"
+	"In-Reply-To: " C_MSGID3 "\r\n"
+	"Message-Id: " C_MSGID4 "\r\n"
+	"\r\n";
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* we stop seeing msgids after the end of the first header */
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m3);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+
+ free(m1);
+ free(m2);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID3
+#undef C_MSGID4
+}
+
+
+/* ignore a malformed msgid with no @ sign */
+static void test_noatsign(void)
+{
+#define C_MSGID1 "<404.05.00006@example.com>"
+#define C_MSGID2 "<407.08.09-no-at-here-gmail.com>"
+#define C_MSGID3 "<4000A-0B-0000C@apple.com>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 " " C_MSGID3;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* we stop seeing msgids after 2nd msgid */
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m3);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+
+ free(m1);
+ free(m2);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID3
+}
+
+
+/* handle a msgid with a quoted localpart */
+static void test_quoted_localpart(void)
+{
+#define C_MSGID1 "<504.05.00006@example.com>"
+#define C_MSGID2 "<\"507>0 8@09\"@gmail.com>"
+#define C_MSGID2ret "<507>0 8@09@gmail.com>"
+#define C_MSGID3 "<5000A-0B-0000C@apple.com>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 " " C_MSGID3;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+ char *m4;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2ret);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m3);
+ CU_ASSERT_STRING_EQUAL(m3, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* we stop seeing msgids after 2nd msgid */
+ m4 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m4);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m3);
+
+ free(m1);
+ free(m2);
+ free(m3);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID2ret
+#undef C_MSGID3
+}
+
+
+/* handle a msgid with a quoted localpart containing an escaped quote */
+static void test_escaped_quoted_localpart(void)
+{
+#define C_MSGID1 "<504.05.00006@example.com>"
+#define C_MSGID2 "<\"507>0\\\"8@09\"@gmail.com>"
+#define C_MSGID2ret "<507>0\"8@09@gmail.com>"
+#define C_MSGID3 "<5000A-0B-0000C@apple.com>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 " " C_MSGID3;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+ char *m4;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID2ret);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m3);
+ CU_ASSERT_STRING_EQUAL(m3, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* we stop seeing msgids after 2nd msgid */
+ m4 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m4);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m3);
+ CU_ASSERT_PTR_NOT_EQUAL(m2, m3);
+
+ free(m1);
+ free(m2);
+ free(m3);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID2ret
+#undef C_MSGID3
+}
+
+
+/* handle a msgid with malformed <> */
+static void test_malformed_angles(void)
+{
+#define C_MSGID1 "<604.05.00006@example.com>"
+#define C_MSGID2 "<607.08.09@gmail.com"
+#define C_MSGID3 "<6000A-0B-0000C@apple.com>"
+ static const char C_MSGIDS =
+	C_MSGID1 " " C_MSGID2 " " C_MSGID3;
+ char *s;
+ char *m1;
+ char *m2;
+ char *m3;
+
+ /* We checked in the "simple" test that buffers are unmolested,
+ * so this time just pass find_msgid() a const variable */
+ s = (char *)C_MSGIDS;
+
+ /* each call should returns a separate newly allocated string
+ * which is the next msgid in the input */
+
+ m1 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m1);
+ CU_ASSERT_STRING_EQUAL(m1, C_MSGID1);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ m2 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NOT_NULL(m2);
+ CU_ASSERT_STRING_EQUAL(m2, C_MSGID3);
+ CU_ASSERT(s >= C_MSGIDS && s <= C_MSGIDS+sizeof(C_MSGIDS));
+
+ /* we stop seeing msgids after 2nd msgid */
+ m3 = find_msgid(s, &s);
+ CU_ASSERT_PTR_NULL(m3);
+
+ /* check the returned msgids are all distinct */
+ CU_ASSERT_PTR_NOT_EQUAL(m1, m2);
+
+ free(m1);
+ free(m2);
+#undef C_MSGID1
+#undef C_MSGID2
+#undef C_MSGID3
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/parse.testc Added

@@ -0,0 +1,261 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "xmalloc.h"
+#include "prot.h"
+#include "imap/global.h"
+#include "util.h"
+
+#define CANARY		0xdeadbeef
+#define CANARY64	0xdeadbeefcafebabe
+
+static void test_parsenum(void)
+{
+    const char NUM = "18338747846901181684 some other stuff";
+    bit64 val = CANARY64;
+    int r;
+
+    r = parsenum(NUM, NULL, strlen(NUM), &val);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_EQUAL(val, 18338747846901181684LLU);
+}
+
+int wrap_getint32(const char *s, int32_t *valp)
+{
+    struct protstream *prot;
+    char *b;
+    int c;
+
+    b = xstrdup(s);	/* work around bug in prot_ungetc */
+    prot = prot_readmap(b, strlen(b));
+    *valp = CANARY;
+    c = getint32(prot, valp);
+    free(b);
+    prot_free(prot);
+
+    return c;
+}
+
+static void test_getint32(void)
+{
+    static const char STR1 = "0 ";
+    static const int32_t VAL1 = 0;
+    static const char STR2 = "1234567890 ";
+    static const int32_t VAL2 = 1234567890;
+//     static const char STR3 = "12345678901234567890 ";
+    static const char STR4 = "123)";
+    static const int32_t VAL4 = 123;
+    static const char STR5 = "y&+123 ";
+    static const char STR6 = "123";
+    static const int32_t VAL6 = 123;
+    static const char STR7 = "-123 ";
+    static const char STR8 = "+123 ";
+    int32_t val;
+    int c;
+
+    /* test a valid zero value */
+    c = wrap_getint32(STR1, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL1);
+
+    /* test a valid value with all the digits */
+    c = wrap_getint32(STR2, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL2);
+
+// This test fatal()s which we cannot catch for now
+//     /* test a string with too many digits */
+//     c = wrap_getint32(STR3, &val);
+//     CU_ASSERT_EQUAL(c, EOF);
+//     CU_ASSERT_EQUAL(val, CANARY);
+
+    /* test a valid value with a different terminator */
+    c = wrap_getint32(STR4, &val);
+    CU_ASSERT_EQUAL(c, ')');
+    CU_ASSERT_EQUAL(val, VAL4);
+
+    /* test an invalid string */
+    c = wrap_getint32(STR5, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+
+    /* test the corner case where we encounter EOF
+     * at the end of a valid string of digits */
+    c = wrap_getint32(STR6, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    CU_ASSERT_EQUAL(val, VAL6);
+
+    /* test a leading - */
+    c = wrap_getint32(STR7, &val);
+    /* this would have succeeded if getint32() weren't broken */
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+
+    /* test a leading + */
+    c = wrap_getint32(STR8, &val);
+    /* this would have succeeded if getint32() weren't broken */
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+}
+
+int wrap_getsint32(const char *s, int32_t *valp)
+{
+    struct protstream *prot;
+    char *b;
+    int c;
+
+    b = xstrdup(s);	/* work around bug in prot_ungetc */
+    prot = prot_readmap(b, strlen(b));
+    *valp = CANARY;
+    c = getsint32(prot, valp);
+    free(b);
+    prot_free(prot);
+
+    return c;
+}
+
+static void test_getsint32(void)
+{
+    static const char STR1 = "0 ";
+    static const int32_t VAL1 = 0;
+    static const char STR2 = "1234567890 ";
+    static const int32_t VAL2 = 1234567890;
+//     static const char STR3 = "12345678901234567890 ";
+    static const char STR4 = "123)";
+    static const int32_t VAL4 = 123;
+    static const char STR5 = "y&+123 ";
+    static const char STR6 = "123";
+    static const int32_t VAL6 = 123;
+    static const char STR7 = "-123 ";
+    static const int32_t VAL7 = -123;
+    static const char STR8 = "+123 ";
+    static const int32_t VAL8 = 123;
+    int32_t val;
+    int c;
+
+    /* test a valid zero value */
+    c = wrap_getsint32(STR1, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL1);
+
+    /* test a valid value with all the digits */
+    c = wrap_getsint32(STR2, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL2);
+
+// This test fatal()s which we cannot catch for now
+//     /* test a string with too many digits */
+//     c = wrap_getsint32(STR3, &val);
+//     CU_ASSERT_EQUAL(c, EOF);
+//     CU_ASSERT_EQUAL(val, CANARY);
+
+    /* test a valid value with a different terminator */
+    c = wrap_getsint32(STR4, &val);
+    CU_ASSERT_EQUAL(c, ')');
+    CU_ASSERT_EQUAL(val, VAL4);
+
+    /* test an invalid string */
+    c = wrap_getsint32(STR5, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+
+    /* test the corner case where we encounter EOF
+     * at the end of a valid string of digits */
+    c = wrap_getsint32(STR6, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    CU_ASSERT_EQUAL(val, VAL6);
+
+    /* test a leading - */
+    c = wrap_getsint32(STR7, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL7);
+
+    /* test a leading + */
+    c = wrap_getsint32(STR8, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL8);
+}
+
+int wrap_getmodseq(const char *s, modseq_t *valp)
+{
+    struct protstream *prot;
+    char *b;
+    int c;
+
+    b = xstrdup(s);	/* work around bug in prot_ungetc */
+    prot = prot_readmap(b, strlen(b));
+    *valp = CANARY64;
+    c = getmodseq(prot, valp);
+    free(b);
+    prot_free(prot);
+
+    return c;
+}
+
+static void test_getmodseq(void)
+{
+    static const char STR1 = "0 ";
+    static const modseq_t VAL1 = 0;
+    static const char STR2 = "1234567890 ";
+    static const modseq_t VAL2 = 1234567890;
+    static const char STR3 = "12345678901234567890 ";
+    static const modseq_t VAL3 = 12345678901234567890ULL;
+//     static const char STR3a = "123456789012345678901234567890 ";
+    static const char STR4 = "123)";
+    static const modseq_t VAL4 = 123;
+    static const char STR5 = "y&+123 ";
+    static const char STR6 = "123";
+    static const modseq_t VAL6 = 123;
+    static const char STR7 = "-123 ";
+    static const char STR8 = "+123 ";
+    modseq_t val;
+    int c;
+
+    /* test a valid zero value */
+    c = wrap_getmodseq(STR1, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL1);
+
+    /* test a valid value with all the digits */
+    c = wrap_getmodseq(STR2, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL2);
+
+    /* test a valid value >32b */
+    c = wrap_getmodseq(STR3, &val);
+    CU_ASSERT_EQUAL(c, ' ');
+    CU_ASSERT_EQUAL(val, VAL3);
+
+// This test fatal()s which we cannot catch for now
+//     /* test a string with too many digits */
+//     c = wrap_getmodseq(STR3a, &val);
+//     CU_ASSERT_EQUAL(c, EOF);
+//     CU_ASSERT_EQUAL(val, CANARY64);
+
+    /* test a valid value with a different terminator */
+    c = wrap_getmodseq(STR4, &val);
+    CU_ASSERT_EQUAL(c, ')');
+    CU_ASSERT_EQUAL(val, VAL4);
+
+    /* test an invalid string */
+    c = wrap_getmodseq(STR5, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+
+    /* test the corner case where we encounter EOF
+     * at the end of a valid string of digits */
+    c = wrap_getmodseq(STR6, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    CU_ASSERT_EQUAL(val, VAL6);
+
+    /* test a leading - */
+    c = wrap_getmodseq(STR7, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+
+    /* test a leading + */
+    c = wrap_getmodseq(STR8, &val);
+    CU_ASSERT_EQUAL(c, EOF);
+    /* sadly, val is undefined at this point */
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/parseaddr.testc Added

@@ -0,0 +1,624 @@
+#include <malloc.h>
+#include "cunit/cunit.h"
+#include "parseaddr.h"
+
+static void test_single(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_noname(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("fbloggs@fastmail.fm", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_PTR_NULL(a->name);
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+
+ a = NULL;
+ parseaddr_list("<fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_PTR_NULL(a->name);
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+
+ a = NULL;
+ parseaddr_list(" <fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_PTR_NULL(a->name);
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+
+}
+
+static void test_single_append(void)
+{
+ struct address *a;
+ struct address *origa;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+ origa = a;
+
+ parseaddr_list("Sarah Jane Smith <sjsmith@gmail.com>", &a);
+ CU_ASSERT_PTR_EQUAL_FATAL(a, origa);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a->next);
+ CU_ASSERT_STRING_EQUAL(a->next->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(a->next->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(a->next->domain, "gmail.com");
+ CU_ASSERT_PTR_NULL(a->next->next);
+
+ parseaddr_free(a);
+}
+
+static void test_multiple(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@fastmail.fm>, Sarah Jane Smith <sjsmith@gmail.com>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a->next);
+ CU_ASSERT_STRING_EQUAL(a->next->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(a->next->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(a->next->domain, "gmail.com");
+ CU_ASSERT_PTR_NULL(a->next->next);
+
+ parseaddr_free(a);
+}
+
+static void test_quoted_name(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("\"Fred Bloggs\" <fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_quoted_name_comma(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("\"Bloggs, Fred\" <fbloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Bloggs, Fred");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_quoted_name_unbalanced(void)
+{
+ struct address *a;
+
+ /* If a quoted string is not terminated, we are parsing a header
+ * field with an unbalanced " and should fail. */
+
+ a = NULL;
+ parseaddr_list("\"Charles Manson <forever@prison.ca.us>", &a);
+ CU_ASSERT_PTR_NULL_FATAL(a);
+}
+
+static void test_quoted_name_folded(void)
+{
+ struct address *a;
+
+ /* If a quoted string contains an embedded CR+LF+WSP, because we're
+ * parsing a header value directly, the CR+LF should be stripped out
+ * and the WSP and any following WSP* should be preserved (i.e. we
+ * should perform header field unfolding per RFC2822) */
+
+ a = NULL;
+ parseaddr_list("\"Akira\r\n \t Yoshizawa\" <akira@origami.jp>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Akira \t Yoshizawa");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "akira");
+ CU_ASSERT_STRING_EQUAL(a->domain, "origami.jp");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_quoted_name_crlf(void)
+{
+ struct address *a;
+
+ /* If a quoted string contains an embedded CR+LF *without* trailing
+ * WSP, then we have walked off the end of the header field and thus
+ * we're parsing a header field which has an unbalanced ", and
+ * should fail. */
+
+ a = NULL;
+ parseaddr_list("\"Akira\r\nYoshizawa\" <akira@origami.jp>", &a);
+ CU_ASSERT_PTR_NULL_FATAL(a);
+
+ /* CR+LF+CR+LF is a subcase of that, for the last header field. */
+ a = NULL;
+ parseaddr_list("\"Akira\r\n\r\nYoshizawa\" <akira@origami.jp>", &a);
+ CU_ASSERT_PTR_NULL_FATAL(a);
+
+ /* A lone CR is invalid and the parse should fail */
+ a = NULL;
+ parseaddr_list("\"Akira\rYoshizawa\" <akira@origami.jp>", &a);
+ CU_ASSERT_PTR_NULL_FATAL(a);
+
+ /* A lone LF is invalid and the parse should fail */
+ a = NULL;
+ parseaddr_list("\"Akira\nYoshizawa\" <akira@origami.jp>", &a);
+ CU_ASSERT_PTR_NULL_FATAL(a);
+}
+
+
+static void test_comment_name(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("fbloggs@fastmail.fm (Fred Bloggs)", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_quoted_mailbox(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <\"fred bloggs\"@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fred bloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_mailbox_comment(void)
+{
+ struct address *a;
+
+ /* This example is from the RFC822 text */
+ a = NULL;
+ parseaddr_list("Wilt . (the Stilt) Chamberlain@NBA.US", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_PTR_NULL(a->name);
+// CU_ASSERT_STRING_EQUAL(a->mailbox, "Wilt.Chamberlain");
+ CU_ASSERT_STRING_EQUAL(a->domain, "NBA.US");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_domain_literal(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@192.168.0.1>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "192.168.0.1");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_dotted_mailbox(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <Fred.Bloggs@fastmail.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "Fred.Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_long_domain(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@a.really.quite.surprisingly.long.domain.name.com>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "a.really.quite.surprisingly.long.domain.name.com");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+static void test_rfc2047_text(void)
+{
+ struct address *a;
+
+ /* RFC2047 MIME-encoded text in an address is passed through
+ * unmolested, to be decoded by upper layers, or not, on demand */
+
+ a = NULL;
+ parseaddr_list("=?UTF-8?Q?=F0=92=8C=89=F0=92=8B=9B?= <Dumusi@lagash.sm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "=?UTF-8?Q?=F0=92=8C=89=F0=92=8B=9B?=");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "Dumusi");
+ CU_ASSERT_STRING_EQUAL(a->domain, "lagash.sm");
+ CU_ASSERT_PTR_NULL(a->next);
+
+ parseaddr_free(a);
+}
+
+
+static void test_group(void)
+{
+ struct address *a;
+
+ a = NULL;
+ parseaddr_list("Buddies: Fred Bloggs <fbloggs@fastmail.fm>, Sarah Jane Smith <sjsmith@gmail.com>;", &a);
+
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_PTR_NULL(a->name);
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "Buddies");
+ CU_ASSERT_PTR_NULL(a->domain);
+
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a->next);
+ CU_ASSERT_STRING_EQUAL(a->next->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->next->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->next->domain, "fastmail.fm");
+
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a->next->next);
+ CU_ASSERT_STRING_EQUAL(a->next->next->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(a->next->next->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(a->next->next->domain, "gmail.com");
+
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a->next->next->next);
+ CU_ASSERT_PTR_NULL(a->next->next->next->name);
+ CU_ASSERT_PTR_NULL(a->next->next->next->mailbox);
+ CU_ASSERT_PTR_NULL(a->next->next->next->domain);
+
+ CU_ASSERT_PTR_NULL(a->next->next->next->next);
+
+ parseaddr_free(a);
+}
+
+static void test_multi_group(void)
+{
+ struct address *a;
+ struct address *cur;
+
+ a = NULL;
+ parseaddr_list("group: g1@d1.org, g2@d2.org;, group2: g3@d3.org;", &a);
+
+ cur = a;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "group");
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "g1");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "d1.org");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "g2");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "d2.org");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_PTR_NULL(cur->mailbox);
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "group2");
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "g3");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "d3.org");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_PTR_NULL(cur->mailbox);
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NULL(cur);
+
+ parseaddr_free(a);
+}
+
+static void test_multi_group_mixed(void)
+{
+ struct address *a;
+ struct address *cur;
+
+ a = NULL;
+ parseaddr_list("Buddies: Fred Bloggs <fbloggs@fastmail.fm>, "
+		 "Sarah Jane Smith <sjsmith@gmail.com>;, "
+		 "foobar@fastmail.fm, "
+		 "group2: Fred Bloggs Junior <fbloggs_jr@fastmail.fm>;",
+		 &a);
+
+ cur = a;
+
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "Buddies");
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_STRING_EQUAL(cur->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "fastmail.fm");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_STRING_EQUAL(cur->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "gmail.com");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_PTR_NULL(cur->mailbox);
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "foobar");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "fastmail.fm");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "group2");
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_STRING_EQUAL(cur->name, "Fred Bloggs Junior");
+ CU_ASSERT_STRING_EQUAL(cur->mailbox, "fbloggs_jr");
+ CU_ASSERT_STRING_EQUAL(cur->domain, "fastmail.fm");
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NOT_NULL_FATAL(cur);
+ CU_ASSERT_PTR_NULL(cur->name);
+ CU_ASSERT_PTR_NULL(cur->mailbox);
+ CU_ASSERT_PTR_NULL(cur->domain);
+
+ cur = cur->next;
+ CU_ASSERT_PTR_NULL(cur);
+
+ parseaddr_free(a);
+}
+
+/* TODO: test the source routing feature */
+
+/* Test the iterator interface */
+static void test_iterator(void)
+{
+ struct address_itr ai;
+ const struct address *a;
+
+ address_itr_init(&ai, "");
+ a = address_itr_next(&ai);
+ CU_ASSERT_PTR_NULL(a);
+ address_itr_fini(&ai);
+
+ address_itr_init(&ai, "Fred Bloggs <fbloggs@fastmail.fm>, Sarah Jane Smith <sjsmith@gmail.com>");
+ a = address_itr_next(&ai);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Fred Bloggs");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "fbloggs");
+ CU_ASSERT_STRING_EQUAL(a->domain, "fastmail.fm");
+ a = address_itr_next(&ai);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+ CU_ASSERT_STRING_EQUAL(a->name, "Sarah Jane Smith");
+ CU_ASSERT_STRING_EQUAL(a->mailbox, "sjsmith");
+ CU_ASSERT_STRING_EQUAL(a->domain, "gmail.com");
+ CU_ASSERT_PTR_NULL(a->next);
+ address_itr_fini(&ai);
+}
+
+static void test_canonicalise(void)
+{
+ char *addr;
+
+ addr = address_canonicalise("Fred Bloggs <F.Bloggs@FastMAIL.fm>");
+ CU_ASSERT_STRING_EQUAL(addr, "F.Bloggs@fastmail.fm");
+ free(addr);
+}
+
+/*
+ * Test getting parts of a fully featured address
+ */
+static void test_getparts(void)
+{
+ struct address *a;
+ char *s;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs+foo@FastMAIL.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+
+ s = address_get_all(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs+foo@FastMAIL.fm");
+ free(s);
+
+ s = address_get_all(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs+foo@fastmail.fm");
+ free(s);
+
+ s = address_get_localpart(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs+foo");
+ free(s);
+
+ s = address_get_domain(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "FastMAIL.fm");
+ free(s);
+
+ s = address_get_domain(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "fastmail.fm");
+ free(s);
+
+ s = address_get_user(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs");
+ free(s);
+
+ s = address_get_detail(a);
+ CU_ASSERT_STRING_EQUAL(s, "foo");
+ free(s);
+
+ parseaddr_free(a);
+}
+
+/*
+ * Test getting parts of an address with no detail part
+ */
+static void test_getparts_nodetail(void)
+{
+ struct address *a;
+ char *s;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs@FastMAIL.fm>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+
+ s = address_get_all(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs@FastMAIL.fm");
+ free(s);
+
+ s = address_get_all(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs@fastmail.fm");
+ free(s);
+
+ s = address_get_localpart(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs");
+ free(s);
+
+ s = address_get_domain(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "FastMAIL.fm");
+ free(s);
+
+ s = address_get_domain(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "fastmail.fm");
+ free(s);
+
+ s = address_get_user(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs");
+ free(s);
+
+ s = address_get_detail(a);
+ CU_ASSERT_PTR_NULL(s);
+
+ parseaddr_free(a);
+}
+
+/*
+ * Test getting parts of an address with no domain part
+ */
+static void test_getparts_nodomain(void)
+{
+ struct address *a;
+ char *s;
+
+ a = NULL;
+ parseaddr_list("Fred Bloggs <fbloggs>", &a);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(a);
+
+ s = address_get_all(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs@unspecified-domain");
+ free(s);
+
+ s = address_get_all(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs@unspecified-domain");
+ free(s);
+
+ s = address_get_localpart(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs");
+ free(s);
+
+ s = address_get_domain(a, 0);
+ CU_ASSERT_STRING_EQUAL(s, "unspecified-domain");
+ free(s);
+
+ s = address_get_domain(a, 1);
+ CU_ASSERT_STRING_EQUAL(s, "unspecified-domain");
+ free(s);
+
+ s = address_get_user(a);
+ CU_ASSERT_STRING_EQUAL(s, "fbloggs");
+ free(s);
+
+ s = address_get_detail(a);
+ CU_ASSERT_PTR_NULL(s);
+
+ parseaddr_free(a);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/prot.testc Added

@@ -0,0 +1,243 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include <sys/stat.h>
+#include "xmalloc.h"
+#include "prot.h"
+#include "imap/global.h"
+
+
+#define PROLOG \
+ char *_fname = xstrdup("/tmp/cyrus-protXXXXXX"); \
+ int _fd = mkstemp(_fname)
+#define BEGIN \
+ { \
+	int r = ftruncate(_fd, 0); \
+	CU_ASSERT_EQUAL_FATAL(r, 0); \
+	lseek(_fd, (off_t)0, SEEK_SET); \
+ }
+#define END(b, n) \
+ { \
+	struct stat _sb; \
+	lseek(_fd, (off_t)0, SEEK_SET); \
+	if (fstat(_fd, &_sb) < 0) CU_FAIL_FATAL("fstat"); \
+	(n) = read(_fd, (b), _sb.st_size); \
+	if ((n) < _sb.st_size) CU_FAIL_FATAL("short read"); \
+	if ((n) >= 0) (b)(n) = '\0'; \
+ }
+#define EPILOG \
+ unlink(_fname); \
+ free(_fname); \
+ close(_fd)
+
+static void test_printstring(void)
+{
+ PROLOG;
+ struct protstream *p;
+ int len;
+ struct buf b = BUF_INITIALIZER;
+ int i;
+ char str2600;
+
+ p = prot_new(_fd, 1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(p);
+
+ /* NULL string */
+ BEGIN;
+ prot_printstring(p, NULL);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 3);
+ CU_ASSERT_STRING_EQUAL(str, "NIL");
+
+ /* Zero length string */
+ BEGIN;
+ prot_printstring(p, "");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 2);
+ CU_ASSERT_STRING_EQUAL(str, "\"\"");
+
+ /* Boring string */
+ BEGIN;
+ prot_printstring(p, "Hello");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 7);
+ CU_ASSERT_STRING_EQUAL(str, "\"Hello\"");
+
+ /* String with non-dangerous whitespace */
+ BEGIN;
+ prot_printstring(p, "Hello World\tagain");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 19);
+ CU_ASSERT_STRING_EQUAL(str, "\"Hello World\tagain\"");
+
+ /* String with dangerous whitespace */
+ BEGIN;
+ prot_printstring(p, "Good\rBye\nEarth");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 20);
+ CU_ASSERT_STRING_EQUAL(str, "{14}\r\nGood\rBye\nEarth");
+
+ /* String with embedded dquote */
+ BEGIN;
+ prot_printstring(p, "Quot\"able");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 14);
+ CU_ASSERT_STRING_EQUAL(str, "{9}\r\nQuot\"able");
+
+ /* String with embedded percent */
+ BEGIN;
+ prot_printstring(p, "per%ent");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 12);
+ CU_ASSERT(!strcmp(str, "{7}\r\nper%ent"));
+
+ /* String with embedded backslash */
+ BEGIN;
+ prot_printstring(p, "slash\\dot");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 14);
+ CU_ASSERT_STRING_EQUAL(str, "{9}\r\nslash\\dot");
+
+ /* String with embedded 8-bit chars */
+ BEGIN;
+ prot_printstring(p, "Hi I'm \330l\345f");
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 17);
+ CU_ASSERT_STRING_EQUAL(str, "{11}\r\nHi I'm \330l\345f");
+
+ /* Boring but overly long string */
+ for (i = 0 ; i<500 ; i++)
+	buf_appendcstr(&b, "blah ");
+ buf_cstring(&b);
+ BEGIN;
+ prot_printstring(p, b.s);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, b.len+8);
+ CU_ASSERT_STRING_EQUAL(str+8, b.s);
+ str8 = '\0';
+ CU_ASSERT_STRING_EQUAL(str, "{2500}\r\n");
+
+ buf_free(&b);
+ prot_free(p);
+ EPILOG;
+}
+
+static void test_printmap(void)
+{
+ PROLOG;
+ struct protstream *p;
+ int len;
+ struct buf b = BUF_INITIALIZER;
+ int i;
+ char str2600;
+
+ p = prot_new(_fd, 1);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(p);
+
+ /* NULL string */
+ BEGIN;
+ prot_printmap(p, NULL, 0);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 3);
+ CU_ASSERT_STRING_EQUAL(str, "NIL");
+
+ /* Zero length string */
+ BEGIN;
+ prot_printmap(p, "", 0);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 2);
+ CU_ASSERT_STRING_EQUAL(str, "\"\"");
+
+ /* Boring string */
+ BEGIN;
+ prot_printmap(p, "Hello", 5);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 7);
+ CU_ASSERT_STRING_EQUAL(str, "\"Hello\"");
+
+ /* Boring string with short length */
+ BEGIN;
+ prot_printmap(p, "Hello", 3);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 5);
+ CU_ASSERT_STRING_EQUAL(str, "\"Hel\"");
+
+ /* String with non-dangerous whitespace */
+ BEGIN;
+ prot_printmap(p, "Hello World\tagain", 17);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 19);
+ CU_ASSERT_STRING_EQUAL(str, "\"Hello World\tagain\"");
+
+ /* String with dangerous whitespace */
+ BEGIN;
+ prot_printmap(p, "Good\rBye\nEarth", 14);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 20);
+ CU_ASSERT_STRING_EQUAL(str, "{14}\r\nGood\rBye\nEarth");
+
+ /* String with embedded dquote */
+ BEGIN;
+ prot_printmap(p, "Quot\"able", 9);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 14);
+ CU_ASSERT_STRING_EQUAL(str, "{9}\r\nQuot\"able");
+
+ /* String with embedded percent */
+ BEGIN;
+ prot_printmap(p, "per%ent", 7);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 12);
+ CU_ASSERT(!strcmp(str, "{7}\r\nper%ent"));
+
+ /* String with embedded backslash */
+ BEGIN;
+ prot_printmap(p, "slash\\dot", 9);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 14);
+ CU_ASSERT_STRING_EQUAL(str, "{9}\r\nslash\\dot");
+
+ /* String with embedded 8-bit chars */
+ BEGIN;
+ prot_printmap(p, "Hi I'm \330l\345f", 11);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, 17);
+ CU_ASSERT_STRING_EQUAL(str, "{11}\r\nHi I'm \330l\345f");
+
+ /* Boring but overly long string */
+ for (i = 0 ; i<500 ; i++)
+	buf_appendcstr(&b, "blah ");
+ buf_cstring(&b);
+ BEGIN;
+ prot_printmap(p, b.s, b.len);
+ prot_flush(p);
+ END(str, len);
+ CU_ASSERT_EQUAL(len, b.len+8);
+ CU_ASSERT_STRING_EQUAL(str+8, b.s);
+ str8 = '\0';
+ CU_ASSERT_STRING_EQUAL(str, "{2500}\r\n");
+
+ buf_free(&b);
+ prot_free(p);
+ EPILOG;
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/ptrarray.testc Added

@@ -0,0 +1,526 @@
+#include <stdlib.h>
+
+#include "cunit/cunit.h"
+#include "ptrarray.h"
+
+#define PTR0	 ((void *)0xcafebabe)
+#define PTR1	 ((void *)0xcafebabf)
+#define PTR2	 ((void *)0xcafebac0)
+#define PTR3	 ((void *)0xcafebac1)
+#define PTR4	 ((void *)0xcafebac2)
+#define PTR5	 ((void *)0xcafebac3)
+
+#define PTR0REP	 ((void *)0xc0ffee00)
+#define PTR0REP2 ((void *)0xc0ffee01)
+#define PTR2REP	 ((void *)0xc0ffee02)
+
+#define PTRNOTHERE ((void *)0xdefaced0)
+
+static void test_fini_null(void)
+{
+ /* _fini(NULL) is harmless */
+ ptrarray_fini(NULL);
+ /* _free(NULL) is harmless */
+ ptrarray_free(NULL);
+}
+
+static void test_auto(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+ void *p1;
+ void *p2;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ p1 = PTR0;
+ ptrarray_append(&pa, p1);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), p1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, -1), p1);
+
+ p2 = PTR0;
+ ptrarray_append(&pa, p2);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), p1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), p2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, -1), p2);
+
+ ptrarray_fini(&pa);
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT_EQUAL(pa.alloc, 0);
+ CU_ASSERT_PTR_NULL(pa.data);
+}
+
+static void test_heap(void)
+{
+ ptrarray_t *pa = ptrarray_new();
+ void *p1;
+ void *p2;
+
+ CU_ASSERT_EQUAL(pa->count, 0);
+ CU_ASSERT(pa->alloc >= pa->count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(pa, -1));
+
+ p1 = PTR0;
+ ptrarray_append(pa, p1);
+ CU_ASSERT_EQUAL(pa->count, 1);
+ CU_ASSERT(pa->alloc >= pa->count);
+ CU_ASSERT_PTR_NOT_NULL(pa->data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 0), p1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, -1), p1);
+
+ p2 = PTR1;
+ ptrarray_append(pa, p2);
+ CU_ASSERT_EQUAL(pa->count, 2);
+ CU_ASSERT(pa->alloc >= pa->count);
+ CU_ASSERT_PTR_NOT_NULL(pa->data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 0), p1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 1), p2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, -1), p2);
+
+ ptrarray_free(pa);
+}
+
+static void test_set(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_append(&pa, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+
+ ptrarray_set(&pa, 0, PTR0REP);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0REP);
+
+ ptrarray_set(&pa, -1, PTR0REP2);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0REP2);
+
+ ptrarray_append(&pa, PTR1);
+ ptrarray_append(&pa, PTR2);
+ ptrarray_append(&pa, PTR3);
+ ptrarray_append(&pa, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 5);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0REP2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+
+ ptrarray_set(&pa, 2, PTR2REP);
+ CU_ASSERT_EQUAL(pa.count, 5);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0REP2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2REP);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+
+ ptrarray_fini(&pa);
+}
+
+static void test_insert(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_insert(&pa, 0, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+
+ ptrarray_insert(&pa, -1, PTR1);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR0);
+
+ ptrarray_insert(&pa, 0, PTR2);
+ CU_ASSERT_EQUAL(pa.count, 3);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR0);
+
+ ptrarray_insert(&pa, -1, PTR3);
+ CU_ASSERT_EQUAL(pa.count, 4);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR0);
+
+ ptrarray_insert(&pa, 2, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 5);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR4);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR0);
+
+ ptrarray_fini(&pa);
+}
+
+/* test that _set() and _insert() of a bad
+ * index will fail silently and leave no side effects */
+static void test_bad_index(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ /* when the ptrarray is empty, -1 is a bad index */
+
+ ptrarray_set(&pa, -1, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_insert(&pa, -1, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ /* a negative number larger than the (non-zero) count is a bad index */
+ ptrarray_append(&pa, PTR1);
+ ptrarray_append(&pa, PTR2);
+
+ ptrarray_set(&pa, -4, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, -1), PTR2);
+
+ ptrarray_insert(&pa, -4, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, -1), PTR2);
+
+ ptrarray_fini(&pa);
+}
+
+static void test_remove(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+ void *p;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_append(&pa, PTR0);
+ ptrarray_append(&pa, PTR1);
+ ptrarray_append(&pa, PTR2);
+ ptrarray_append(&pa, PTR3);
+ ptrarray_append(&pa, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 5);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+
+ p = ptrarray_remove(&pa, 2);
+ CU_ASSERT_PTR_EQUAL(p, PTR2);
+ CU_ASSERT_EQUAL(pa.count, 4);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR4);
+
+ p = ptrarray_remove(&pa, 0);
+ CU_ASSERT_PTR_EQUAL(p, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 3);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR4);
+
+ p = ptrarray_remove(&pa, -1);
+ CU_ASSERT_PTR_EQUAL(p, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR3);
+
+ p = ptrarray_remove(&pa, 1);
+ CU_ASSERT_PTR_EQUAL(p, PTR3);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR1);
+
+ p = ptrarray_remove(&pa, 0);
+ CU_ASSERT_PTR_EQUAL(p, PTR1);
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+
+ p = ptrarray_remove(&pa, 0);
+ CU_ASSERT_PTR_NULL(p);
+
+ ptrarray_fini(&pa);
+}
+
+static void test_takevf(void)
+{
+ ptrarray_t *pa;
+ void **pp;
+
+ pa = ptrarray_new();
+ CU_ASSERT_PTR_NOT_NULL(pa);
+ ptrarray_append(pa, PTR0);
+ ptrarray_append(pa, PTR1);
+ ptrarray_append(pa, PTR2);
+ ptrarray_append(pa, PTR3);
+ ptrarray_append(pa, PTR4);
+ CU_ASSERT_EQUAL(pa->count, 5);
+ CU_ASSERT(pa->alloc >= pa->count);
+ CU_ASSERT_PTR_NOT_NULL(pa->data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(pa, 4), PTR4);
+
+ pp = ptrarray_takevf(pa);
+ /* note: takevf frees the ptrarray itself */
+ CU_ASSERT_PTR_NOT_NULL(pp);
+ CU_ASSERT_PTR_EQUAL(pp0, PTR0);
+ CU_ASSERT_PTR_EQUAL(pp1, PTR1);
+ CU_ASSERT_PTR_EQUAL(pp2, PTR2);
+ CU_ASSERT_PTR_EQUAL(pp3, PTR3);
+ CU_ASSERT_PTR_EQUAL(pp4, PTR4);
+ CU_ASSERT_PTR_NULL(pp5);
+
+ free(pp);
+}
+
+static void test_truncate(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_append(&pa, PTR0);
+ ptrarray_append(&pa, PTR1);
+ ptrarray_append(&pa, PTR2);
+ ptrarray_append(&pa, PTR3);
+ ptrarray_append(&pa, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 5);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+
+ /* expand the array */
+ ptrarray_truncate(&pa, 7);
+ CU_ASSERT_EQUAL(pa.count, 7);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 5));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 6));
+
+ /* truncate to the existing size is a no-op */
+ ptrarray_truncate(&pa, 7);
+ CU_ASSERT_EQUAL(pa.count, 7);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR4);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 5));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 6));
+
+ /* shrink the array */
+ ptrarray_truncate(&pa, 4);
+ CU_ASSERT_EQUAL(pa.count, 4);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+
+ /* shrink the array harder */
+ ptrarray_truncate(&pa, 3);
+ CU_ASSERT_EQUAL(pa.count, 3);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+
+ /* shrink the array to nothing */
+ ptrarray_truncate(&pa, 0);
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ /* whether pa.data is NULL is undefined at this time */
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_fini(&pa);
+}
+
+static void test_find(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+ int i;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ ptrarray_append(&pa, PTR0);
+ ptrarray_append(&pa, PTR1);
+ ptrarray_append(&pa, PTR2);
+ ptrarray_append(&pa, PTR3);
+ ptrarray_append(&pa, PTR0);
+ ptrarray_append(&pa, PTR4);
+ CU_ASSERT_EQUAL(pa.count, 6);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 2), PTR2);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 3), PTR3);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 4), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 5), PTR4);
+
+ /* search for something which isn't there */
+ i = ptrarray_find(&pa, PTRNOTHERE, 0);
+ CU_ASSERT_EQUAL(i, -1);
+
+ /* search for something which isn't there, starting off the end */
+ i = ptrarray_find(&pa, PTRNOTHERE, 7);
+ CU_ASSERT_EQUAL(i, -1);
+
+ /* search for something which is there */
+ i = ptrarray_find(&pa, PTR1, 0);
+ CU_ASSERT_EQUAL(i, 1);
+ i = ptrarray_find(&pa, PTR1, i+1);
+ CU_ASSERT_EQUAL(i, -1);
+
+ /* search for something which is there, starting off the end */
+ i = ptrarray_find(&pa, PTR1, 7);
+ CU_ASSERT_EQUAL(i, -1);
+
+ /* search for something which is there multiple times */
+ i = ptrarray_find(&pa, PTR0, 0);
+ CU_ASSERT_EQUAL(i, 0);
+ i = ptrarray_find(&pa, PTR0, i+1);
+ CU_ASSERT_EQUAL(i, 4);
+ i = ptrarray_find(&pa, PTR0, i+1);
+ CU_ASSERT_EQUAL(i, -1);
+
+ ptrarray_fini(&pa);
+}
+
+static void test_add(void)
+{
+ ptrarray_t pa = PTRARRAY_INITIALIZER;
+
+ CU_ASSERT_EQUAL(pa.count, 0);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, 0));
+ CU_ASSERT_PTR_NULL(ptrarray_nth(&pa, -1));
+
+ /* _add() on an empty array appends */
+ ptrarray_add(&pa, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+
+ /* _add() of an item already present is a no-op */
+ ptrarray_add(&pa, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 1);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+
+ /* _add() of an item not already present appends */
+ ptrarray_add(&pa, PTR1);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+
+ /* _add() of an item already present is a no-op */
+ ptrarray_add(&pa, PTR0);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+
+ ptrarray_add(&pa, PTR1);
+ CU_ASSERT_EQUAL(pa.count, 2);
+ CU_ASSERT(pa.alloc >= pa.count);
+ CU_ASSERT_PTR_NOT_NULL(pa.data);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 0), PTR0);
+ CU_ASSERT_PTR_EQUAL(ptrarray_nth(&pa, 1), PTR1);
+
+ ptrarray_fini(&pa);
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/quota.testc Added

@@ -0,0 +1,1063 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include "config.h"
+#include "cunit/cunit.h"
+#include "imap/quota.h"
+#include "xmalloc.h"
+#include "retry.h"
+#include "imap/global.h"
+#include "imap/imap_err.h"
+#include "cyrusdb.h"
+#include "libcyr_cfg.h"
+#include "libconfig.h"
+#include "hash.h"
+
+#define DBDIR			"test-mb-dbdir"
+#define QUOTAROOT		"user.smurf"
+#define QUOTAROOT_NONEXISTANT	"no-such-quotaroot"
+
+static char *backend = CUNIT_PARAM("quotalegacy,skiplist");
+
+static void test_names(void)
+{
+ int r;
+
+ CU_ASSERT_STRING_EQUAL(quota_namesQUOTA_STORAGE,
+			 "STORAGE");
+ r = quota_name_to_resource("STORAGE");
+ CU_ASSERT_EQUAL(r, QUOTA_STORAGE);
+ r = quota_name_to_resource("storage");
+ CU_ASSERT_EQUAL(r, QUOTA_STORAGE);
+ r = quota_name_to_resource("StOrAge");
+ CU_ASSERT_EQUAL(r, QUOTA_STORAGE);
+
+ CU_ASSERT_STRING_EQUAL(quota_namesQUOTA_ANNOTSTORAGE,
+			 "X-ANNOTATION-STORAGE");
+ r = quota_name_to_resource("X-ANNOTATION-STORAGE");
+ CU_ASSERT_EQUAL(r, QUOTA_ANNOTSTORAGE);
+ r = quota_name_to_resource("x-annotation-storage");
+ CU_ASSERT_EQUAL(r, QUOTA_ANNOTSTORAGE);
+ r = quota_name_to_resource("X-AnNotAtiOn-StOragE");
+ CU_ASSERT_EQUAL(r, QUOTA_ANNOTSTORAGE);
+
+ r = quota_name_to_resource("nonesuch");
+ CU_ASSERT_EQUAL(r, -1);
+
+}
+
+/*
+ * Trying to read quota for a quotaroot which is NULL, an empty string,
+ * or a string which is not found in the database.
+ */
+static void test_read_no_root(void)
+{
+ struct quota q;
+ struct txn *txn = NULL;
+ int r;
+
+ q.root = NULL;
+ r = quota_read(&q, NULL, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ q.root = "";
+ r = quota_read(&q, NULL, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ /* Also, for NULL or "" no txn is started */
+ q.root = NULL;
+ r = quota_read(&q, &txn, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ CU_ASSERT_PTR_NULL(txn);
+
+ q.root = "";
+ r = quota_read(&q, &txn, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ CU_ASSERT_PTR_NULL(txn);
+
+ q.root = QUOTAROOT_NONEXISTANT;
+ r = quota_read(&q, NULL, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+}
+
+static void test_write_no_root(void)
+{
+ struct quota q;
+ struct txn *txn = NULL;
+ int r;
+
+ q.root = NULL;
+ r = quota_write(&q, NULL);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ q.root = "";
+ r = quota_write(&q, NULL);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ /* Also, for NULL or "" no txn is started */
+ q.root = NULL;
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ CU_ASSERT_PTR_NULL(txn);
+
+ q.root = "";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ CU_ASSERT_PTR_NULL(txn);
+}
+
+
+static void test_read_write(void)
+{
+ struct quota q;
+ struct quota q2;
+ struct txn *txn = NULL;
+ struct txn *oldtxn = NULL;
+ int res;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+
+ r = quota_read(&q, &txn, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ /* we went to the db and started a transaction */
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ q.usedsQUOTA_STORAGE = 12345;
+ q.limitsQUOTA_STORAGE = 678;
+ q.usedsQUOTA_MESSAGE = 2345;
+ q.limitsQUOTA_MESSAGE = 78;
+ q.usedsQUOTA_ANNOTSTORAGE = 345;
+ q.limitsQUOTA_ANNOTSTORAGE = 8;
+
+ oldtxn = txn;
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ CU_ASSERT_PTR_EQUAL(oldtxn, txn);
+
+ /* reading in the same txn gets the new values */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	CU_ASSERT_EQUAL(q2.usedsres, q.usedsres);
+	CU_ASSERT_EQUAL(q2.limitsres, q.limitsres);
+ }
+
+ /* commit the txn */
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /* reading in a new txn gets the new values */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	CU_ASSERT_EQUAL(q2.usedsres, q.usedsres);
+	CU_ASSERT_EQUAL(q2.limitsres, q.limitsres);
+ }
+
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+}
+
+static void test_abort(void)
+{
+ struct quota q;
+ struct quota q2;
+ struct txn *txn = NULL;
+ struct txn *oldtxn = NULL;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+
+ r = quota_read(&q, &txn, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ /* we went to the db and started a transaction */
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ q.usedsQUOTA_STORAGE = 12345;
+ q.limitsQUOTA_STORAGE = 678;
+
+ oldtxn = txn;
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ CU_ASSERT_PTR_EQUAL(oldtxn, txn);
+
+ /* reading in the same txn gets the new values */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q2.usedsQUOTA_STORAGE, q.usedsQUOTA_STORAGE);
+ CU_ASSERT_EQUAL(q2.limitsQUOTA_STORAGE, q.limitsQUOTA_STORAGE);
+
+ /* abort the txn */
+ quota_abort(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /* reading in a new txn gets no result */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+}
+
+static void test_abort2(void)
+{
+ struct quota q;
+ struct quota oldq;
+ struct quota q2;
+ struct txn *txn = NULL;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+
+ r = quota_read(&q, &txn, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+ /* we went to the db and started a transaction */
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ q.usedsQUOTA_STORAGE = 12345;
+ q.limitsQUOTA_STORAGE = 678;
+
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ /* commit some old values */
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /* write some new values */
+ oldq = q;
+ q.usedsQUOTA_STORAGE = 23456;
+ q.limitsQUOTA_STORAGE = 789;
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* reading in the same txn gets the new values */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q2.usedsQUOTA_STORAGE, q.usedsQUOTA_STORAGE);
+ CU_ASSERT_EQUAL(q2.limitsQUOTA_STORAGE, q.limitsQUOTA_STORAGE);
+
+ /* abort the txn */
+ quota_abort(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /* reading in a new txn gets old values */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, &txn, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ CU_ASSERT_EQUAL(q2.usedsQUOTA_STORAGE, oldq.usedsQUOTA_STORAGE);
+ CU_ASSERT_EQUAL(q2.limitsQUOTA_STORAGE, oldq.limitsQUOTA_STORAGE);
+
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+}
+
+static void test_check_use(void)
+{
+ struct quota q;
+ unsigned int i;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.limitsQUOTA_STORAGE = 100;
+
+ for (i = 1 ; i <= 63 ; i++)
+ {
+	quota_t diff = (1ULL<<i)-1;
+	r = quota_check(&q, QUOTA_STORAGE, diff);
+	CU_ASSERT_EQUAL(r, (diff > 100*1024 ? IMAP_QUOTA_EXCEEDED : 0));
+	CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+ }
+
+ r = quota_check(&q, QUOTA_STORAGE, 10*1024);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+
+ quota_use(&q, QUOTA_STORAGE, 10*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 10*1024);
+
+ r = quota_check(&q, QUOTA_STORAGE, 80*1024);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 10*1024);
+
+ quota_use(&q, QUOTA_STORAGE, 80*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, (10+80)*1024);
+
+ r = quota_check(&q, QUOTA_STORAGE, 15*1024);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTA_EXCEEDED);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, (10+80)*1024);
+
+ /* test the zero limit */
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.limitsQUOTA_STORAGE = 0;
+
+ r = quota_check(&q, QUOTA_STORAGE, 15*1024);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTA_EXCEEDED);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+
+ r = quota_check(&q, QUOTA_STORAGE, 1);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTA_EXCEEDED);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+
+ /* test the special limit QUOTA_UNLIMITED */
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.limitsQUOTA_STORAGE = QUOTA_UNLIMITED;
+
+ for (i = 1 ; i <= 63 ; i++)
+ {
+	quota_t diff = (1ULL<<i)-1;
+	r = quota_check(&q, QUOTA_STORAGE, diff);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+ }
+
+ /* test negative diffs in quota_check */
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.usedsQUOTA_STORAGE = 80*1024;	/* used 80 KiB */
+ q.limitsQUOTA_STORAGE = 100;	/* limit 100 KiB */
+
+ r = quota_check(&q, QUOTA_STORAGE, -1);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 80*1024);
+
+ r = quota_check(&q, QUOTA_STORAGE, -10*1024);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 80*1024);
+
+ r = quota_check(&q, QUOTA_STORAGE, -80*1024);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 80*1024);
+
+ r = quota_check(&q, QUOTA_STORAGE, -1000*1024);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 80*1024);
+
+ /* test negative diffs in quota_use */
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.usedsQUOTA_STORAGE = 80*1024;	/* used 80 KiB */
+ q.limitsQUOTA_STORAGE = 100;	/* limit 100 KiB */
+
+ quota_use(&q, QUOTA_STORAGE, -1);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 80*1024-1);
+
+ q.usedsQUOTA_STORAGE = 80*1024;	/* used 80 KiB */
+ quota_use(&q, QUOTA_STORAGE, -10*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 70*1024);
+
+ q.usedsQUOTA_STORAGE = 80*1024;	/* used 80 KiB */
+ quota_use(&q, QUOTA_STORAGE, -80*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);
+
+ /* test underflow in quota_use */
+ CU_SYSLOG_MATCH("Quota underflow");
+ q.usedsQUOTA_STORAGE = 80*1024;	/* used 80 KiB */
+ quota_use(&q, QUOTA_STORAGE, -1000*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 0);	/* clamped */
+ CU_ASSERT_SYSLOG(/*all*/0, 1);		/* whined */
+}
+
+static void test_check_overquota(void)
+{
+ struct quota q;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.limitsQUOTA_STORAGE = 100;
+ q.limitsQUOTA_MESSAGE = 2;
+ 
+ /* test not overquota */
+ quota_use(&q, QUOTA_STORAGE, 10*1024);
+ quota_use(&q, QUOTA_MESSAGE, 1);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 10*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_MESSAGE, 1);
+ CU_ASSERT_EQUAL(0, quota_is_overquota(&q, QUOTA_STORAGE, NULL));
+ CU_ASSERT_EQUAL(0, quota_is_overquota(&q, QUOTA_MESSAGE, NULL));
+ 
+ /* test now overquota */
+ quota_use(&q, QUOTA_STORAGE, 90*1024);
+ quota_use(&q, QUOTA_MESSAGE, 1);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 100*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_MESSAGE, 2);
+ CU_ASSERT_EQUAL(1, quota_is_overquota(&q, QUOTA_STORAGE, NULL));
+ CU_ASSERT_EQUAL(1, quota_is_overquota(&q, QUOTA_MESSAGE, NULL));
+ 
+ /* test under quota */ 
+ quota_use(&q, QUOTA_STORAGE, -10*1024);
+ quota_use(&q, QUOTA_MESSAGE, -1);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_STORAGE, 90*1024);
+ CU_ASSERT_EQUAL(q.usedsQUOTA_MESSAGE, 1);
+ CU_ASSERT_EQUAL(0, quota_is_overquota(&q, QUOTA_STORAGE, NULL));
+ CU_ASSERT_EQUAL(0, quota_is_overquota(&q, QUOTA_MESSAGE, NULL));
+}
+
+static void test_update_useds(void)
+{
+ struct quota q;
+ struct quota q2;
+ struct txn *txn = NULL;
+ int res;
+ quota_t quota_diffQUOTA_NUMRESOURCES;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ memset(quota_diff, 0, sizeof(quota_diff));
+
+ /* updating a NULL or empty or non-existant root returns the error */
+ quota_diffQUOTA_STORAGE = 10*1024;
+ quota_diffQUOTA_MESSAGE = 2;
+ quota_diffQUOTA_ANNOTSTORAGE = 1*1024;
+ r = quota_update_useds(NULL, quota_diff, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_update_useds("", quota_diff, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_update_useds(QUOTAROOT_NONEXISTANT, quota_diff, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ /* set limits */
+ q.limitsQUOTA_STORAGE = 100; /* limit storage to 100 KiB */
+ q.limitsQUOTA_MESSAGE = 20; /* limit messages to 20 */
+ q.limitsQUOTA_ANNOTSTORAGE = 10; /* limit annotations storage to 10 KiB */
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+#define TESTCASE(d0, d1, d2, e0, e1, e2) { \
+ static const quota_t diffQUOTA_NUMRESOURCES = { d0, d1, d2 }; \
+ static const quota_t expusedQUOTA_NUMRESOURCES = { e0, e1, e2 }; \
+ r = quota_update_useds(QUOTAROOT, diff, 0); \
+ CU_ASSERT_EQUAL(r, 0); \
+ memset(&q2, 0, sizeof(q2)); \
+ q2.root = QUOTAROOT; \
+ r = quota_read(&q2, NULL, 0); \
+ CU_ASSERT_EQUAL(r, 0); \
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) { \
+ CU_ASSERT_EQUAL(q2.usedsres, expusedres); \
+ CU_ASSERT_EQUAL(q2.limitsres, q.limitsres) \
+ } \
+}
+
+ /* updating a root which has a record, succeeds */
+ TESTCASE(10*1024, 2, 1*1024,
+	 10*1024, 2, 1*1024);
+
+ /* updating some more adds to the used value */
+ TESTCASE(80*1024, 16, 8*1024,
+	 90*1024, 18, 9*1024);
+
+ /* updating with a zero diff does not change the used value */
+ TESTCASE(0, 0, 0,
+	 90*1024, 18, 9*1024);
+
+ /* quota_update_useds() does not enforce the limit */
+ TESTCASE(20*1024, 4, 2*1024,
+	 110*1024,		/* used 110 KiB limit 100 KiB */
+	 22,		/* used 22 limit 20 */
+	 11*1024);		/* used 11 KiB limit 10 KiB */
+
+ /* updating with a negative value */
+ TESTCASE(-70*1024, -14, -7*1024,
+	 40*1024, 8, 4*1024);
+
+ /* underflow is prevented */
+ TESTCASE(-50*1024, -10, -5*1024,
+	 0, 0, 0);
+
+#undef TESTCASE
+}
+
+static void test_delete(void)
+{
+ struct quota q;
+ struct quota q2;
+ struct txn *txn = NULL;
+ int r;
+
+ /* first, deleteroot() behaviour with nothing in the db */
+ r = quota_deleteroot(NULL);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_deleteroot("");
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_deleteroot(QUOTAROOT_NONEXISTANT);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = quota_deleteroot(QUOTAROOT);
+ CU_ASSERT_EQUAL(r, 0);
+
+
+ /* add a record to the db and check it's there */
+ memset(&q, 0, sizeof(q));
+ q.root = QUOTAROOT;
+ q.usedsQUOTA_STORAGE = 12345;
+ q.limitsQUOTA_STORAGE = 678;
+
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_PTR_NOT_NULL(txn);
+
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, NULL, 0);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(q2.usedsQUOTA_STORAGE, q.usedsQUOTA_STORAGE);
+ CU_ASSERT_EQUAL(q2.limitsQUOTA_STORAGE, q.limitsQUOTA_STORAGE);
+
+ /* check behaviour with a record in the db */
+ r = quota_deleteroot(NULL);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_deleteroot("");
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+
+ r = quota_deleteroot(QUOTAROOT_NONEXISTANT);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = quota_deleteroot(QUOTAROOT);
+ CU_ASSERT_EQUAL(r, 0);
+
+ /* record should now be gone */
+ memset(&q2, 0, sizeof(q2));
+ q2.root = QUOTAROOT;
+ r = quota_read(&q2, NULL, 0);
+ CU_ASSERT_EQUAL(r, IMAP_QUOTAROOT_NONEXISTENT);
+}
+
+#if 0
+static void count_cb(const char *key __attribute__((unused)),
+		 void *data __attribute__((unused)),
+		 void *rock)
+{
+ unsigned int *np = (unsigned int *)rock;
+ (*np)++;
+}
+
+static unsigned int hash_count(hash_table *ht)
+{
+ unsigned int n = 0;
+ hash_enumerate(ht, count_cb, &n);
+ return n;
+}
+
+static const char *nth_quotaroot(unsigned int n)
+{
+ static char buf100;
+ static const char * const ones10 = {
+	".around", ".defend", ".failure", ".develop", ".nader",
+	".fuels", ".mixtec", ".bunting", ".energy", ".orlons" };
+ static const char * const tens10 = {
+	"", ".blob", ".flakier", ".freda", ".garbs",
+	".debug", ".ava", ".dumbing", ".addend", ".apaches" };
+ static const char * const hundreds10 = {
+	"", ".volcker", ".genies", ".spiro", ".alone",
+	".drawer", ".eighth", ".micheal", ".coheres", ".garrick" };
+ static const char * const thousands10 = {
+	"", ".epilogs", ".cue", ".cahoots", ".decking",
+	".gypsum", ".gratis", ".dimple", ".pedro", ".fading" };
+
+ snprintf(buf, sizeof(buf), "user%s%s%s%s",
+	 thousands(n / 1000) % 10,
+	 hundreds(n / 100) % 10,
+	 tens(n / 10) % 10,
+	 onesn % 10);
+ return buf;
+}
+
+static quota_t nth_used(unsigned int n)
+{
+ quota_t u = n;
+
+ if (n % 7 == 0)
+	u *= 1023;
+ else if (n % 17 == 0)
+	u |= (u << 53);
+ return u;
+}
+
+static int nth_limit(unsigned int n)
+{
+ return n * 1024 * 1023;
+}
+
+static int found_cb(struct quota *q, void *rock)
+{
+ hash_table *exphash = (hash_table *)rock;
+ struct quota *expected = hash_lookup(q->root, exphash);
+
+ CU_ASSERT_PTR_NOT_NULL(expected);
+ CU_ASSERT_STRING_EQUAL(q->root, expected->root);
+ CU_ASSERT_EQUAL(q->usedsQUOTA_STORAGE,
+		 expected->usedsQUOTA_STORAGE);
+ CU_ASSERT_EQUAL(q->limitsQUOTA_STORAGE,
+		 expected->limitsQUOTA_STORAGE);
+
+ hash_del(q->root, exphash);
+ return 0;
+}
+
+#define FOREACH_PRECONDITION(condition, expcount) \
+{ \
+ unsigned int nsubset = 0; \
+ unsigned int i; \
+ for (i = 0 ; i <= MAXN ; i++) { \
+	if ((condition)) { \
+	 hash_insert(expectedi.root, &expectedi, &exphash); \
+	 nsubset++; \
+	} \
+ } \
+ CU_ASSERT_EQUAL(nsubset, expcount); \
+ CU_ASSERT_EQUAL(hash_count(&exphash), nsubset); \
+}
+
+#define FOREACH_POSTCONDITION() \
+ CU_ASSERT_EQUAL(r, 0); \
+ CU_ASSERT_EQUAL(hash_count(&exphash), 0);
+
+#define FOREACH_TEST(prefix, condition, expcount) \
+ FOREACH_PRECONDITION(condition, expcount); \
+ r = quota_foreach(prefix, found_cb, &exphash, NULL); \
+ FOREACH_POSTCONDITION()
+
+static void notest_foreach(void)
+{
+ struct quota q;
+ struct quota q2;
+ struct txn *txn = NULL;
+ unsigned int n;
+ struct quota *expected;
+ hash_table exphash = HASH_TABLE_INITIALIZER;
+#define MAXN	4095
+ int r;
+
+ expected = (struct quota *)xzmalloc((MAXN+1) * sizeof(struct quota));
+ for (n = 0 ; n <= MAXN ; n++) {
+	expectedn.root = xstrdup(nth_quotaroot(n));
+	expectedn.usedsQUOTA_STORAGE = nth_used(n);
+	expectedn.limitsQUOTA_STORAGE = nth_limit(n);
+ }
+ construct_hash_table(&exphash, (MAXN+1)*4, 0);
+
+ /* add records to the db */
+ for (n = 0 ; n <= MAXN ; n++)
+ {
+	q = expectedn;
+	r = quota_write(&q, &txn);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_PTR_NOT_NULL(txn);
+ }
+
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /* check the records all made it */
+ for (n = 0 ; n <= MAXN ; n++)
+ {
+	memset(&q2, 0, sizeof(q2));
+	q2.root = nth_quotaroot(n);
+	r = quota_read(&q2, NULL, 0);
+	CU_ASSERT_EQUAL(r, 0);
+	CU_ASSERT_EQUAL(q2.usedsQUOTA_STORAGE,
+			expectedn.usedsQUOTA_STORAGE);
+	CU_ASSERT_EQUAL(q2.limitsQUOTA_STORAGE,
+			expectedn.limitsQUOTA_STORAGE);
+ }
+
+ /* prefix=NULL: iterate all the records */
+ FOREACH_TEST(NULL, 1, MAXN+1);
+
+ /* prefix="": iterate all the records */
+ FOREACH_TEST("", 1, MAXN+1);
+
+ /* prefix=a common prefix: iterate all the records */
+ FOREACH_TEST("user.", 1, MAXN+1);
+
+ /* prefix=an uncommon prefix: iterate some of the records */
+ FOREACH_TEST("user.epilogs", i / 1000 == 1, 1000);
+
+ /* delete records one by one, checking that foreach
+ * walks over the expected number at each point */
+ for (n = 0 ; n <= MAXN ; n++) {
+	r = quota_deleteroot(nth_quotaroot(n));
+	CU_ASSERT_EQUAL(r, 0);
+
+	if (n && n % 301 == 0) {
+	 FOREACH_TEST("user.", i > n, MAXN-n);
+	}
+ }
+
+ free_hash_table(&exphash, NULL);
+ for (n = 0 ; n <= MAXN ; n++)
+	free((char *)expectedn.root);
+ free(expected);
+#undef MAXN
+}
+#endif
+
+/*
+ * TODO: should test for quota_foreach() iteration order,
+ * with and without IMAPOPT_IMPROVED_MBOXLIST_SORT set.
+ * There is code that depends on it, e.g. for quota -f.
+ */
+
+
+/* Note that quota_findroot() returns 0 (not found)
+ * or 1 (found) and never an error code. */
+#define TESTCASE(in, exp) \
+{ \
+ const char *expected = (exp); \
+ int r; \
+ char res1024; \
+ r = quota_findroot(res, sizeof(res), (in)); \
+ if (expected) { \
+	CU_ASSERT_EQUAL(r, 1); \
+	CU_ASSERT_STRING_EQUAL(res, expected); \
+ } \
+ else { \
+	CU_ASSERT_EQUAL(r, 0); \
+	/* contents of res not defined */ \
+ } \
+}
+
+static void test_findroot(void)
+{
+ struct quota q;
+ struct txn *txn = NULL;
+ int r;
+
+ memset(&q, 0, sizeof(q));
+ q.usedsQUOTA_STORAGE = 123;
+ q.limitsQUOTA_STORAGE = 456;
+
+ /*
+ * behaviour when the database is empty:
+ * there is no root to be found
+ */
+ TESTCASE("user.foo.bar.baz", NULL);
+ TESTCASE("user.foo.quux", NULL);
+ TESTCASE("user.foo", NULL);
+ TESTCASE("user.foonly", NULL);
+ TESTCASE("user.fo", NULL);
+ TESTCASE("user.smeg", NULL);
+ TESTCASE("user.smeg.fridge", NULL);
+ TESTCASE("user.farnarkle", NULL);
+
+ /* add some db entries, but not the "user." */
+ q.root = "user.foo";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ q.root = "user.smeg";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /*
+ * behaviour with these new entries
+ */
+ /* "user.foo" and its subfolders match the "user.foo" root */
+ TESTCASE("user.foo.bar.baz", "user.foo");
+ TESTCASE("user.foo.quux", "user.foo");
+ TESTCASE("user.foo", "user.foo");
+ /* "user.foonly" doesn't match "user.foo" despite the leading
+ * 8 characters being the same */
+ TESTCASE("user.foonly", NULL);
+ /* "user.fo" doesn't match "user.foo" despite the leading
+ * 7 characters being the same */
+ TESTCASE("user.fo", NULL);
+ /* "user.smeg" and its subfolders matches the "user.smeg" root */
+ TESTCASE("user.smeg", "user.smeg");
+ TESTCASE("user.smeg.fridge", "user.smeg");
+ /* no root matches at all for "user.farnarkle" */
+ TESTCASE("user.farnarkle", NULL);
+
+ /* add a catch-all "user" record */
+ q.root = "user";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /*
+ * behaviour with these new entries
+ */
+ /* "user.foo" unchanged */
+ TESTCASE("user.foo.bar.baz", "user.foo");
+ TESTCASE("user.foo.quux", "user.foo");
+ TESTCASE("user.foo", "user.foo");
+ /* "user.foonly" matches the catch-all */
+ TESTCASE("user.foonly", "user");
+ /* "user.fo" ditto */
+ TESTCASE("user.fo", "user");
+ /* "user.smeg" unchanged */
+ TESTCASE("user.smeg", "user.smeg");
+ TESTCASE("user.smeg.fridge", "user.smeg");
+ /* "user.farnarkle" matches the catch-all */
+ TESTCASE("user.farnarkle", "user");
+}
+
+static void test_findroot_virtdomains(void)
+{
+ struct quota q;
+ struct txn *txn = NULL;
+ int r;
+
+ config_virtdomains = IMAP_ENUM_VIRTDOMAINS_ON;
+ /* this shouldn't matter, quota_findroot() doesn't use it */
+ config_defdomain = "smaak.nl";
+
+ memset(&q, 0, sizeof(q));
+ q.usedsQUOTA_STORAGE = 123;
+ q.limitsQUOTA_STORAGE = 456;
+
+ /*
+ * behaviour when the database is empty:
+ * there is no root to be found
+ */
+ TESTCASE("bloggs.com!user.foo.bar.baz", NULL);
+ TESTCASE("bloggs.com!user.foo.quux", NULL);
+ TESTCASE("bloggs.com!user.foo", NULL);
+ TESTCASE("fnarp.org!user.foo.bar.baz", NULL);
+ TESTCASE("fnarp.org!user.foo.quux", NULL);
+ TESTCASE("fnarp.org!user.foo", NULL);
+ TESTCASE("user.foo.bar.baz", NULL);
+ TESTCASE("user.foo.quux", NULL);
+ TESTCASE("user.foo", NULL);
+ TESTCASE("bloggs.com!user.smeg", NULL);
+ TESTCASE("bloggs.com!user.smeg.fridge", NULL);
+ TESTCASE("fnarp.org!user.smeg", NULL);
+ TESTCASE("fnarp.org!user.smeg.fridge", NULL);
+ TESTCASE("user.smeg", NULL);
+ TESTCASE("user.smeg.fridge", NULL);
+ TESTCASE("bloggs.com!user.farnarkle", NULL);
+ TESTCASE("fnarp.org!user.farnarkle", NULL);
+ TESTCASE("user.farnarkle", NULL);
+
+ /* add some db entries for bloggs.com, but not fnarp.org,
+ * not the default domain, and not the "user." */
+ q.root = "bloggs.com!user.foo";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ q.root = "bloggs.com!user.smeg";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /*
+ * behaviour with these new entries
+ */
+ /* foo@bloggs.com's home and its subfolders match
+ * the "bloggs.com!user.foo" root */
+ TESTCASE("bloggs.com!user.foo.bar.baz", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo.quux", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo", "bloggs.com!user.foo");
+ /* foo@fnarp.org's home and its subfolders don't match anything */
+ TESTCASE("fnarp.org!user.foo.bar.baz", NULL);
+ TESTCASE("fnarp.org!user.foo.quux", NULL);
+ TESTCASE("fnarp.org!user.foo", NULL);
+ /* foo's home and its subfolders don't match anything */
+ TESTCASE("user.foo.bar.baz", NULL);
+ TESTCASE("user.foo.quux", NULL);
+ TESTCASE("user.foo", NULL);
+ /* smeg@bloggs.com's home and its subfolders match
+ * the "bloggs.com!user.smeg" root */
+ TESTCASE("bloggs.com!user.smeg", "bloggs.com!user.smeg");
+ TESTCASE("bloggs.com!user.smeg.fridge", "bloggs.com!user.smeg");
+ /* smeg@fnarp.org's home and its subfolders don't match anything */
+ TESTCASE("fnarp.org!user.smeg", NULL);
+ TESTCASE("fnarp.org!user.smeg.fridge", NULL);
+ /* smeg's home and its subfolders don't match anything */
+ TESTCASE("user.smeg", NULL);
+ TESTCASE("user.smeg.fridge", NULL);
+ /* no root matches at all for "user.farnarkle" in any domain */
+ TESTCASE("bloggs.com!user.farnarkle", NULL);
+ TESTCASE("fnarp.org!user.farnarkle", NULL);
+ TESTCASE("user.farnarkle", NULL);
+
+ /* add a catch-all "bloggs.com" record */
+ q.root = "bloggs.com!";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /*
+ * behaviour with these new entries
+ */
+ /* foo@bloggs.com unchanged */
+ TESTCASE("bloggs.com!user.foo.bar.baz", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo.quux", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo", "bloggs.com!user.foo");
+ /* foo@fnarp.org's unchanged */
+ TESTCASE("fnarp.org!user.foo.bar.baz", NULL);
+ TESTCASE("fnarp.org!user.foo.quux", NULL);
+ TESTCASE("fnarp.org!user.foo", NULL);
+ /* foo unchanged */
+ TESTCASE("user.foo.bar.baz", NULL);
+ TESTCASE("user.foo.quux", NULL);
+ TESTCASE("user.foo", NULL);
+ /* smeg@bloggs.com unchanged */
+ TESTCASE("bloggs.com!user.smeg", "bloggs.com!user.smeg");
+ TESTCASE("bloggs.com!user.smeg.fridge", "bloggs.com!user.smeg");
+ /* smeg@fnarp.org unchanged */
+ TESTCASE("fnarp.org!user.smeg", NULL);
+ TESTCASE("fnarp.org!user.smeg.fridge", NULL);
+ /* smeg unchanged */
+ TESTCASE("user.smeg", NULL);
+ TESTCASE("user.smeg.fridge", NULL);
+ /* farnarkle@bloggs.com matches the bloggs.com catch-all */
+ TESTCASE("bloggs.com!user.farnarkle", "bloggs.com!");
+ /* farnarkle at other domains unchanged */
+ TESTCASE("fnarp.org!user.farnarkle", NULL);
+ TESTCASE("user.farnarkle", NULL);
+
+ /* add a catch-all "fnarp.org!user" record */
+ q.root = "fnarp.org!user";
+ r = quota_write(&q, &txn);
+ CU_ASSERT_EQUAL(r, 0);
+
+ CU_ASSERT_PTR_NOT_NULL(txn);
+ quota_commit(&txn);
+ CU_ASSERT_PTR_NULL(txn);
+
+ /*
+ * behaviour with these new entries
+ */
+ /* foo@bloggs.com unchanged */
+ TESTCASE("bloggs.com!user.foo.bar.baz", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo.quux", "bloggs.com!user.foo");
+ TESTCASE("bloggs.com!user.foo", "bloggs.com!user.foo");
+ /* foo@fnarp.org's matches the fnarp.org catch-all */
+ TESTCASE("fnarp.org!user.foo.bar.baz", "fnarp.org!user");
+ TESTCASE("fnarp.org!user.foo.quux", "fnarp.org!user");
+ TESTCASE("fnarp.org!user.foo", "fnarp.org!user");
+ /* foo unchanged */
+ TESTCASE("user.foo.bar.baz", NULL);
+ TESTCASE("user.foo.quux", NULL);
+ TESTCASE("user.foo", NULL);
+ /* smeg@bloggs.com unchanged */
+ TESTCASE("bloggs.com!user.smeg", "bloggs.com!user.smeg");
+ TESTCASE("bloggs.com!user.smeg.fridge", "bloggs.com!user.smeg");
+ /* smeg@fnarp.org matches the fnarp.org catch-all */
+ TESTCASE("fnarp.org!user.smeg", "fnarp.org!user");
+ TESTCASE("fnarp.org!user.smeg.fridge", "fnarp.org!user");
+ /* smeg unchanged */
+ TESTCASE("user.smeg", NULL);
+ TESTCASE("user.smeg.fridge", NULL);
+ /* farnarkle@bloggs.com matches the bloggs.com catch-all */
+ TESTCASE("bloggs.com!user.farnarkle", "bloggs.com!");
+ /* farnarkle@fnarp.org matches the fnarp.org catch-all */
+ TESTCASE("fnarp.org!user.farnarkle", "fnarp.org!user");
+ /* farnarkle in the default domain unchanged */
+ TESTCASE("user.farnarkle", NULL);
+}
+#undef TESTCASE
+
+static void config_read_string(const char *s)
+{
+ char *fname = xstrdup("/tmp/cyrus-cunit-configXXXXXX");
+ int fd = mkstemp(fname);
+ retry_write(fd, s, strlen(s));
+ config_reset();
+ config_read(fname, 0);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static int set_up(void)
+{
+ int r;
+ const char * const *d;
+ static const char * const dirs = {
+	DBDIR,
+	DBDIR"/db",
+	NULL
+ };
+
+ r = system("rm -rf " DBDIR);
+ if (r)
+	return r;
+
+ for (d = dirs ; *d ; d++) {
+	r = mkdir(*d, 0777);
+	if (r < 0) {
+	 int e = errno;
+	 perror(*d);
+	 return e;
+	}
+ }
+
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, DBDIR);
+ config_read_string(
+	"configdirectory: "DBDIR"/conf\n"
+ );
+
+ cyrusdb_init();
+ config_quota_db = "skiplist";
+
+ quotadb_init(0);
+ quotadb_open(NULL);
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ int r;
+
+ quotadb_close();
+ quotadb_done();
+ cyrusdb_done();
+ config_quota_db = NULL;
+ config_reset();
+
+ r = system("rm -rf " DBDIR);
+ if (r) r = -1;
+
+ return r;
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/rfc822tok.testc Added

@@ -0,0 +1,514 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "rfc822tok.h"
+
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD2A	"do"
+#define WORD2B	"lor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+#define BADPOINTER  ((void *)0xdeadbeef)
+
+static void test_simple(void)
+{
+    static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD2);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+/* test that ceasing to call rfc822tok_next() before the end
+ * of the tokens does not leak memory as long as rfc822tok_fini()
+ * is called; we rely on Valgrind to find memleaks */
+static void test_stopearly(void)
+{
+    static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    rfc822tok_fini(&tok);
+}
+
+/* tokenizing an empty string just returns EOF */
+static void test_blank(void)
+{
+    static const char PHRASE = "";
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+/* tokenizing a NULL string just returns EOF */
+static void test_null(void)
+{
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, NULL, 0, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+/* non-trivial whitespace between atoms */
+static void test_whitespace(void)
+{
+    static const char PHRASE = WORD0"    "WORD1"\t"WORD2" \t \v \t "WORD3"\r\n\t"WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD2);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+/* whitespace and non-trivial comments between atoms */
+static void test_comments(void)
+{
+    static const char PHRASE = WORD0"()"
+				 WORD1"( hello world )"
+				 WORD2" ( he\\l\\lo \\) world\r\n and friends) "
+				 WORD3" (hell(o( (w)or)ld))"
+				 WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD2);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+static void test_quoted_strings(void)
+{
+    static const char PHRASE = "\""WORD0"\""
+				 "\""WORD1"\\x\" "
+				 "\""WORD2A"\\\""WORD2B"\" "
+				 "\""WORD3"  \r\n\t   \t"WORD4"\"";
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_QSTRING);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_QSTRING);
+    CU_ASSERT_STRING_EQUAL(p, WORD1"x");
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_QSTRING);
+    CU_ASSERT_STRING_EQUAL(p, WORD2A"\""WORD2B);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_QSTRING);
+    CU_ASSERT_STRING_EQUAL(p, WORD3"  \t   \t"WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+static void test_special_dot(void)
+{
+    static const char PHRASE = WORD0" "
+				 WORD1"."WORD2"."WORD3" "
+				 WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    /* by default '.' are not special */
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1"."WORD2"."WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+
+    /* with the flag, '.' are special */
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, RFC822_SPECIAL_DOT);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, '.');
+    CU_ASSERT_PTR_NULL(p);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD2);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, '.');
+    CU_ASSERT_PTR_NULL(p);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+static void test_special_equal(void)
+{
+    static const char PHRASE = WORD0" "
+				 WORD1"="WORD2"="WORD3" "
+				 WORD4;
+    rfc822tok_t tok = RFC822TOK_INITIALIZER;
+    char *p;
+    int t;
+
+    /* by default '=' are not special */
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, 0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1"="WORD2"="WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+
+    /* with the flag, '=' are special */
+    rfc822tok_init(&tok, PHRASE, sizeof(PHRASE)-1, RFC822_SPECIAL_EQUAL);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD1);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, '=');
+    CU_ASSERT_PTR_NULL(p);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD2);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, '=');
+    CU_ASSERT_PTR_NULL(p);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD3);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, RFC822_ATOM);
+    CU_ASSERT_STRING_EQUAL(p, WORD4);
+
+    p = BADPOINTER;
+    t = rfc822tok_next(&tok, &p);
+    CU_ASSERT_EQUAL(t, EOF);
+    CU_ASSERT_PTR_NULL(p);
+
+    rfc822tok_fini(&tok);
+}
+
+struct token
+{
+    int token;
+    const char *text;
+};
+
+#define TESTCASE(in, inlen, exp) \
+    do { \
+	const struct token *_exp = (exp); \
+	rfc822tok_t _tok = RFC822TOK_INITIALIZER; \
+	rfc822tok_init(&_tok, (in), (inlen), RFC822_SPECIAL_EQUAL); \
+	for (;; _exp++) { \
+	    char *_p = BADPOINTER; \
+	    int _t = rfc822tok_next(&_tok, &_p); \
+	    CU_ASSERT_EQUAL(_t, _exp->token); \
+	    CU_ASSERT_PTR_NOT_EQUAL(_p, BADPOINTER); \
+	    if (_t > 255) { \
+		CU_ASSERT_STRING_EQUAL(_p, _exp->text); \
+	    } \
+	    else { \
+		CU_ASSERT_PTR_NULL(_p); \
+	    } \
+	    if (_exp->token == EOF) break; \
+	} \
+	rfc822tok_fini(&_tok); \
+    } while(0)
+
+/* a real-world example */
+static void test_content_type(void)
+{
+    /* Examples from RFC2045 */
+    {
+	static const char PHRASE = "Content-Type: text/plain; charset=us-ascii\r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_ATOM, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_ATOM, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+    {
+	static const char PHRASE = "Content-Type: text/plain; charset=us-ascii (Plain text)\r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_ATOM, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_ATOM, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+    {
+	static const char PHRASE = "Content-Type: text/plain; charset=\"us-ascii\"\r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_ATOM, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_QSTRING, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+    {
+	static const char PHRASE = "Content-Type: \"text/plain\"; charset=\"us-ascii\"\r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_QSTRING, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_QSTRING, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+    /* some made-up examples */
+    {
+	static const char PHRASE = "Content-Type  : text/plain ; charset = \"us-ascii\" \r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_ATOM, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_QSTRING, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+    {
+	static const char PHRASE = "Content-Type: text/plain\r\n ; charset = us-ascii \r\n";
+	static const struct token EXP = {
+	    { RFC822_ATOM, "Content-Type" },
+	    { ':', NULL },
+	    { RFC822_ATOM, "text/plain" },
+	    { ';', NULL },
+	    { RFC822_ATOM, "charset" },
+	    { '=', NULL },
+	    { RFC822_ATOM, "us-ascii" },
+	    { EOF, NULL }};
+	TESTCASE(PHRASE, sizeof(PHRASE)-1, EXP);
+    }
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/search_expr.testc Added

@@ -0,0 +1,1348 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "prot.h"
+#include "xmalloc.h"
+#include "imap/imapd.h"
+#include "imap/index.h"
+#include "imap/imapparse.h"
+#include "util.h"
+#include "cunit/timezones.h"
+#include "cunit/timeofday.h"
+
+static struct namespace ns;
+static const char *userid = "fred";
+static struct auth_state *authstate = NULL;
+static int isadmin = 0;
+
+#define DATE1_RFC3501	"8-Dec-2012"
+#define DATE1_BEGIN	"1354885200"
+#define DATE1_MID	"1354928400"
+#define DATE1_END	"1354971600"
+#define DATE1_MID_TIME	1354928400
+
+static void test_get_search_program(void)
+{
+/*TODO: test initial state */
+/*TODO: test charset */
+#define TESTCASE(in, exp_out) \
+ { \
+	static const char _in = in; \
+	static const char expected_out = exp_out; \
+	static const char expected_errs = ""; \
+	struct searchargs *searchargs; \
+	int c; \
+	char *actual_out = NULL; \
+	struct protstream *pin; \
+	struct protstream *pout; \
+	struct buf actual_errs = BUF_INITIALIZER; \
+ \
+	searchargs = new_searchargs(".", 0, &ns, userid, authstate, isadmin); \
+	pin = prot_readmap(_in, sizeof(_in)-1); \
+	pout = prot_writebuf(&actual_errs); \
+	c = get_search_program(pin, pout, searchargs); \
+	CU_ASSERT_EQUAL(c, '\r'); \
+	buf_cstring(&actual_errs); \
+	CU_ASSERT_STRING_EQUAL(actual_errs.s, expected_errs); \
+	if (c != EOF) { \
+	 CU_ASSERT_EQUAL(searchargs->charset, 0); \
+	 CU_ASSERT_PTR_NOT_NULL(searchargs->root); \
+	 actual_out = search_expr_serialise(searchargs->root); \
+	 CU_ASSERT_STRING_EQUAL(actual_out, expected_out); \
+	} \
+ \
+	free(actual_out); \
+	buf_free(&actual_errs); \
+	prot_free(pin); \
+	prot_free(pout); \
+	freesearchargs(searchargs); \
+ }
+
+ /*
+ * Search criteria from RFC 3501
+ */
+
+ /* <sequence set> */
+ TESTCASE("1\r\n",
+	 "(and (match msgno 1))");
+ TESTCASE("1:4\r\n",
+	 "(and (match msgno 1:4))");
+ TESTCASE("1:*\r\n",
+	 "(and (match msgno 1:*))");
+ TESTCASE("1,3,5\r\n",
+	 "(and (match msgno 1,3,5))");
+ TESTCASE("1,3,5:7\r\n",
+	 "(and (match msgno 1,3,5:7))");
+
+ /* ALL */
+ TESTCASE("all\r\n",
+	 "(and (true))");
+
+ /* ANSWERED */
+ TESTCASE("answered\r\n",
+	 "(and (match systemflags \\Answered))");
+
+ /* BCC <string> */
+ TESTCASE("bcc \"shoreditch\"\r\n",
+	 "(and (match bcc \"SHOREDITCH\"))");
+
+ /* BEFORE <date> */
+ TESTCASE("before "DATE1_RFC3501"\r\n",
+	 "(and (lt internaldate "DATE1_BEGIN"))");
+
+ /* BODY <string> */
+ TESTCASE("body \"williamsburg\"\r\n",
+	 "(and (match body \"WILLIAMSBURG\"))");
+
+ /* CC <string> */
+ TESTCASE("cc \"brooklyn\"\r\n",
+	 "(and (match cc \"BROOKLYN\"))");
+
+ /* DELETED */
+ TESTCASE("deleted\r\n",
+	 "(and (match systemflags \\Deleted))");
+
+ /* DRAFT */
+ TESTCASE("draft\r\n",
+	 "(and (match systemflags \\Draft))");
+
+ /* FLAGGED */
+ TESTCASE("flagged\r\n",
+	 "(and (match systemflags \\Flagged))");
+
+ /* FROM <string> */
+ TESTCASE("from \"dreamcatcher\"\r\n",
+	 "(and (match from \"DREAMCATCHER\"))");
+
+ /* HEADER <field-name> <string> */
+ TESTCASE("header \"Cosby\" \"Sweater\"\r\n",
+	 "(and (match header:cosby \"SWEATER\"))");
+
+ /* KEYWORD <flag> */
+ TESTCASE("keyword $Mustache\r\n",
+	 "(and (match keyword \"$Mustache\"))");
+
+ /* LARGER <n> */
+ TESTCASE("larger 123\r\n",
+	 "(and (gt size 123))");
+
+ /* NEW */
+ TESTCASE("new\r\n",
+	 "(and "
+		"(and "
+		 "(not "
+			"(match indexflags \\Seen)"
+		 ")"
+		 " "
+		 "(match indexflags \\Recent)"
+		")"
+	 ")");
+
+ /* NOT <search-key> */
+ TESTCASE("not subject \"tumblr\"\r\n",
+	 "(and (not (match subject \"TUMBLR\")))");
+
+ /* OLD */
+ /* inexplicably, the RFC specifies OLD != NOT NEW */
+ TESTCASE("old\r\n",
+	 "(and (not (match indexflags \\Recent)))");
+
+ /* ON <date> */
+ TESTCASE("on "DATE1_RFC3501"\r\n",
+	 "(and "
+		 "(and "
+		 "(lt internaldate "DATE1_END")"
+		 " "
+		 "(ge internaldate "DATE1_BEGIN")"
+		 ")"
+	 ")");
+
+ /* OR <search-key> <search-key> */
+ TESTCASE("or subject \"black\" subject \"white\"\r\n",
+	 "(and "
+		"(or "
+		 "(match subject \"BLACK\")"
+		 " "
+		 "(match subject \"WHITE\")"
+		")"
+	 ")");
+
+ /* RECENT */
+ TESTCASE("recent\r\n",
+	 "(and (match indexflags \\Recent))");
+
+ /* SEEN */
+ TESTCASE("seen\r\n",
+	 "(and (match indexflags \\Seen))");
+
+ /* SENTBEFORE <date> */
+ TESTCASE("sentbefore "DATE1_RFC3501"\r\n",
+	 "(and (lt sentdate "DATE1_BEGIN"))");
+
+ /* SENTON <date> */
+ TESTCASE("senton "DATE1_RFC3501"\r\n",
+	 "(and "
+		 "(and "
+		 "(lt sentdate "DATE1_END")"
+		 " "
+		 "(ge sentdate "DATE1_BEGIN")"
+		 ")"
+	 ")");
+
+ /* SENTSINCE <date> */
+ /* SENTSINCE, like SINCE, includes the given date */
+ TESTCASE("sentsince "DATE1_RFC3501"\r\n",
+	 "(and (ge sentdate "DATE1_BEGIN"))");
+
+ /* SINCE <date> */
+ /* Note: BEFORE excludes the date, SINCE includes it */
+ TESTCASE("since "DATE1_RFC3501"\r\n",
+	 "(and (ge internaldate "DATE1_BEGIN"))");
+
+ /* SMALLER <n> */
+ /* Note: neither LARGER nor SMALLER includes the exact size */
+ TESTCASE("smaller 456\r\n",
+	 "(and (lt size 456))");
+
+ /* SUBJECT <string> */
+ TESTCASE("subject \"selvage\"\r\n",
+	 "(and (match subject \"SELVAGE\"))");
+
+ /* TEXT <string> */
+ TESTCASE("text \"letterpress\"\r\n",
+	 "(and (match text \"LETTERPRESS\"))");
+
+ /* TO <string> */
+ TESTCASE("to \"readymade\"\r\n",
+	 "(and (match to \"READYMADE\"))");
+
+ /* UID <sequence set> */
+ TESTCASE("uid 1\r\n",
+	 "(and (match uid 1))");
+ TESTCASE("uid 1:4\r\n",
+	 "(and (match uid 1:4))");
+ TESTCASE("uid 1:*\r\n",
+	 "(and (match uid 1:*))");
+ TESTCASE("uid 1,3,5\r\n",
+	 "(and (match uid 1,3,5))");
+ TESTCASE("uid 1,3,5:7\r\n",
+	 "(and (match uid 1,3,5:7))");
+
+ /* UNANSWERED */
+ TESTCASE("unanswered\r\n",
+	 "(and (not (match systemflags \\Answered)))");
+
+ /* UNDELETED */
+ TESTCASE("undeleted\r\n",
+	 "(and (not (match systemflags \\Deleted)))");
+
+ /* UNDRAFT */
+ TESTCASE("undraft\r\n",
+	 "(and (not (match systemflags \\Draft)))");
+
+ /* UNFLAGGED */
+ TESTCASE("unflagged\r\n",
+	 "(and (not (match systemflags \\Flagged)))");
+
+ /* UNKEYWORD <flag> */
+ TESTCASE("unkeyword $Viral\r\n",
+	 "(and (not (match keyword \"$Viral\")))");
+
+ /* UNSEEN */
+ TESTCASE("unseen\r\n",
+	 "(and (not (match indexflags \\Seen)))");
+
+ /* ( <search-key>* ) */
+ TESTCASE("(subject \"bicycle\" to \"rights\")\r\n",
+	 "(and "
+		"(and "
+		 "(match subject \"BICYCLE\")"
+		 " "
+		 "(match to \"RIGHTS\")"
+		")"
+	 ")");
+ TESTCASE("not (subject \"bicycle\" to \"rights\")\r\n",
+	 "(and "
+		"(not "
+		 "(and "
+			"(match subject \"BICYCLE\")"
+			" "
+			"(match to \"RIGHTS\")"
+		 ")"
+		")"
+	 ")");
+ TESTCASE("or (subject \"bicycle\" to \"rights\") from \"quinoa\"\r\n",
+	 "(and "
+		"(or "
+		 "(and "
+			"(match subject \"BICYCLE\")"
+			" "
+			"(match to \"RIGHTS\")"
+		 ")"
+		 " "
+		 "(match from \"QUINOA\")"
+		")"
+	 ")");
+
+ /*
+ * Search criteria from RFC 4551
+ */
+
+ /* MODSEQ <modseq>
+ * Note, the full RFC syntax is
+ * MODSEQ <entry-name> <entry-type-req> <mod-sequence-valzer>
+ * but we don't support the optional but in the middle */
+/*TODO: negative should fail*/
+ TESTCASE("modseq 0\r\n",	 /* not a valid modseq but we can search on it */
+	 "(and (ge modseq 0))");
+ TESTCASE("modseq 1\r\n",
+	 "(and (ge modseq 1))");
+ TESTCASE("modseq 12345\r\n",
+	 "(and (ge modseq 12345))");
+ TESTCASE("modseq 12345678\r\n",
+	 "(and (ge modseq 12345678))");
+ /* MODSEQ is a 64b value */
+ TESTCASE("modseq 12345678901\r\n",
+	 "(and (ge modseq 12345678901))");
+ TESTCASE("modseq 2147483647\r\n",	/* 0x7fff_ffff */
+	 "(and (ge modseq 2147483647))");
+ TESTCASE("modseq 2147483648\r\n",	/* 0x8000_0000 */
+	 "(and (ge modseq 2147483648))");
+ TESTCASE("modseq 4294967295\r\n",	/* 0xffff_ffff */
+	 "(and (ge modseq 4294967295))");
+ TESTCASE("modseq 4294967296\r\n",	/* 0x1_0000_0000 */
+	 "(and (ge modseq 4294967296))");
+ TESTCASE("modseq 12345678901234\r\n",
+	 "(and (ge modseq 12345678901234))");
+ TESTCASE("modseq 18446744073709551615\r\n", /* 0xffff_ffff_ffff_ffff */
+	 "(and (ge modseq 18446744073709551615))");
+
+ /*
+ * Search criteria from RFC 5032
+ */
+
+ /* OLDER <nz-number> in seconds ago */
+ /* YOUNGER <nz-number> in seconds ago */
+ /* Inexplicably, the RFC defines that *both* YOUNGER and OLDER
+ * include the specified second */
+ time_push_fixed(DATE1_MID_TIME);
+ TESTCASE("older 0\r\n",
+	 "(and (le internaldate "DATE1_MID"))");
+ TESTCASE("older 43200\r\n",
+	 "(and (le internaldate "DATE1_BEGIN"))");
+ TESTCASE("younger 0\r\n",
+	 "(and (ge internaldate "DATE1_MID"))");
+ TESTCASE("younger 43200\r\n",
+	 "(and (ge internaldate "DATE1_BEGIN"))");
+ time_pop();
+
+ /*
+ * Search criteria from RFC 5257
+ */
+ /* ANNOTATION <entry> <attrib> </value> */
+ TESTCASE("annotation /comment value \"stumptown\"\r\n",
+	 "(and (match annotation (entry \"/comment\" attrib \"value\" value \"stumptown\")))");
+ TESTCASE("annotation /comment value.priv \"stumptown\"\r\n",
+	 "(and (match annotation (entry \"/comment\" attrib \"value.priv\" value \"stumptown\")))");
+ TESTCASE("annotation /comment value.shared \"stumptown\"\r\n",
+	 "(and (match annotation (entry \"/comment\" attrib \"value.shared\" value \"stumptown\")))");
+
+ /*
+ * Cyrus vendor specific search criteria
+ */
+ /* FOLDER <mboxname> */
+ TESTCASE("folder INBOX\r\n",
+	 "(and (match folder \"user.fred\"))");
+ TESTCASE("folder inbox\r\n",
+	 "(and (match folder \"user.fred\"))");
+ TESTCASE("folder inbox.GastroPub\r\n",
+	 "(and (match folder \"user.fred.GastroPub\"))");
+
+ /* XLISTID <string> */
+ TESTCASE("xlistid \"semiotics\"\r\n",
+	 "(and (match listid \"SEMIOTICS\"))");
+
+ /* XCONTENTTYPE <string> */
+ TESTCASE("xcontenttype text\r\n",
+	 "(and (match contenttype \"TEXT\"))");
+ TESTCASE("xcontenttype \"text\"\r\n",
+	 "(and (match contenttype \"TEXT\"))");
+ TESTCASE("xcontenttype \"plain\"\r\n",
+	 "(and (match contenttype \"PLAIN\"))");
+ TESTCASE("xcontenttype \"text_plain\"\r\n",
+	 "(and (match contenttype \"TEXT_PLAIN\"))");
+
+/* TODO: test that conv* are rejected if conversations:off */
+ /* CONVFLAG <flag> */
+ TESTCASE("convflag $Forage\r\n",
+	 "(and (match convflags \"$forage\"))");
+
+ /* CONVREAD */
+ TESTCASE("convread\r\n",
+	 "(and (match convflags \"\\Seen\"))");
+
+ /* CONVUNREAD */
+ TESTCASE("convunread\r\n",
+	 "(and (not (match convflags \"\\Seen\")))");
+
+ /* CONVSEEN */
+ TESTCASE("convseen\r\n",
+	 "(and (match convflags \"\\Seen\"))");
+
+ /* CONVUNSEEN */
+ TESTCASE("convunseen\r\n",
+	 "(and (not (match convflags \"\\Seen\")))");
+
+ /* CONVMODSEQ <modseq> */
+ TESTCASE("convmodseq 0\r\n",	 /* not a valid modseq but we can search on it */
+	 "(and (ge convmodseq 0))");
+ TESTCASE("convmodseq 1\r\n",
+	 "(and (ge convmodseq 1))");
+ TESTCASE("convmodseq 12345\r\n",
+	 "(and (ge convmodseq 12345))");
+ TESTCASE("convmodseq 12345678\r\n",
+	 "(and (ge convmodseq 12345678))");
+ /* MODSEQ is a 64b value */
+ TESTCASE("convmodseq 12345678901\r\n",
+	 "(and (ge convmodseq 12345678901))");
+ TESTCASE("convmodseq 2147483647\r\n",	/* 0x7fff_ffff */
+	 "(and (ge convmodseq 2147483647))");
+ TESTCASE("convmodseq 2147483648\r\n",	/* 0x8000_0000 */
+	 "(and (ge convmodseq 2147483648))");
+ TESTCASE("convmodseq 4294967295\r\n",	/* 0xffff_ffff */
+	 "(and (ge convmodseq 4294967295))");
+ TESTCASE("convmodseq 4294967296\r\n",	/* 0x1_0000_0000 */
+	 "(and (ge convmodseq 4294967296))");
+ TESTCASE("convmodseq 12345678901234\r\n",
+	 "(and (ge convmodseq 12345678901234))");
+ TESTCASE("convmodseq 18446744073709551615\r\n", /* 0xffff_ffff_ffff_ffff */
+	 "(and (ge convmodseq 18446744073709551615))");
+
+ /* CID <cid> */
+ TESTCASE("cid NIL\r\n",
+	 "(and (match cid NIL))");
+ TESTCASE("cid 0000000000000000\r\n",
+	 "(and (match cid NIL))");
+ TESTCASE("cid 0123456789abcdef\r\n",
+	 "(and (match cid 0123456789abcdef))");
+
+ /* TODO: charset */
+ /* TODO: return */
+ /* TODO: return */
+
+#undef TESTCASE
+}
+
+static void test_unserialise(void)
+{
+ search_expr_t *e;
+
+ e = search_expr_unserialise("(true)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_TRUE);
+ CU_ASSERT_PTR_NULL(e->attr);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(false)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_FALSE);
+ CU_ASSERT_PTR_NULL(e->attr);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(not (false))");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_NOT);
+ CU_ASSERT_PTR_NULL(e->attr);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ CU_ASSERT_EQUAL(e->children->op, SEOP_FALSE);
+ CU_ASSERT_PTR_NULL(e->children->attr);
+ CU_ASSERT_PTR_NULL(e->children->next);
+ CU_ASSERT_PTR_NULL(e->children->children);
+ CU_ASSERT_PTR_EQUAL(e->children->parent, e);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(and (false) (true))");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_AND);
+ CU_ASSERT_PTR_NULL(e->attr);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ CU_ASSERT_EQUAL(e->children->op, SEOP_FALSE);
+ CU_ASSERT_PTR_NULL(e->children->attr);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->children->next);
+ CU_ASSERT_PTR_NULL(e->children->children);
+ CU_ASSERT_PTR_EQUAL(e->children->parent, e);
+ CU_ASSERT_EQUAL(e->children->next->op, SEOP_TRUE);
+ CU_ASSERT_PTR_NULL(e->children->next->attr);
+ CU_ASSERT_PTR_NULL(e->children->next->next);
+ CU_ASSERT_PTR_NULL(e->children->next->children);
+ CU_ASSERT_PTR_EQUAL(e->children->next->parent, e);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(or (false) (true))");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_OR);
+ CU_ASSERT_PTR_NULL(e->attr);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ CU_ASSERT_EQUAL(e->children->op, SEOP_FALSE);
+ CU_ASSERT_PTR_NULL(e->children->attr);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->children->next);
+ CU_ASSERT_PTR_NULL(e->children->children);
+ CU_ASSERT_PTR_EQUAL(e->children->parent, e);
+ CU_ASSERT_EQUAL(e->children->next->op, SEOP_TRUE);
+ CU_ASSERT_PTR_NULL(e->children->next->attr);
+ CU_ASSERT_PTR_NULL(e->children->next->next);
+ CU_ASSERT_PTR_NULL(e->children->next->children);
+ CU_ASSERT_PTR_EQUAL(e->children->next->parent, e);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(match subject ETSY)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_MATCH);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->attr);
+ CU_ASSERT_STRING_EQUAL(e->attr->name, "subject");
+ CU_ASSERT_STRING_EQUAL(e->value.s, "ETSY");
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(fuzzymatch subject ETSY)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_FUZZYMATCH);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->attr);
+ CU_ASSERT_STRING_EQUAL(e->attr->name, "subject");
+ CU_ASSERT_STRING_EQUAL(e->value.s, "ETSY");
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(ge size 123)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_GE);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->attr);
+ CU_ASSERT_STRING_EQUAL(e->attr->name, "size");
+ CU_ASSERT_EQUAL(e->value.u, 123);
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(match uid 1:4,7:*)");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_MATCH);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->attr);
+ CU_ASSERT_STRING_EQUAL(e->attr->name, "uid");
+ CU_ASSERT_STRING_EQUAL(e->value.s, "1:4,7:*");
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+
+ e = search_expr_unserialise("(match annotation (entry \"/comment\" attrib \"value\" value \"Brooklyn\"))");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e);
+ CU_ASSERT_EQUAL(e->op, SEOP_MATCH);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->attr);
+ CU_ASSERT_STRING_EQUAL(e->attr->name, "annotation");
+ CU_ASSERT_PTR_NOT_NULL_FATAL(e->value.annot);
+ CU_ASSERT_STRING_EQUAL(e->value.annot->entry, "/comment");
+ CU_ASSERT_STRING_EQUAL(e->value.annot->attrib, "value");
+ CU_ASSERT_STRING_EQUAL(e->value.annot->value.s, "Brooklyn");
+ CU_ASSERT_PTR_NULL(e->next);
+ CU_ASSERT_PTR_NULL(e->children);
+ CU_ASSERT_PTR_NULL(e->parent);
+ search_expr_free(e);
+}
+
+static void test_duplicate(void)
+{
+#define TESTCASE(in) \
+ { \
+	static const char _in = (in); \
+	search_expr_t *e; \
+	search_expr_t *edup; \
+	char *s; \
+	char *sdup; \
+ \
+	e = search_expr_unserialise(_in); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(e); \
+	edup = search_expr_duplicate(e); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(edup); \
+	CU_ASSERT_PTR_NOT_EQUAL(e, edup); \
+	s = search_expr_serialise(e); \
+	CU_ASSERT_STRING_EQUAL(s, _in); \
+	free(s); \
+	sdup = search_expr_serialise(edup); \
+	CU_ASSERT_STRING_EQUAL(sdup, _in); \
+	free(sdup); \
+	search_expr_free(e); \
+	sdup = search_expr_serialise(edup); \
+	CU_ASSERT_STRING_EQUAL(sdup, _in); \
+	free(sdup); \
+	search_expr_free(edup); \
+ }
+
+ TESTCASE("(false)");
+ TESTCASE("(true)");
+ TESTCASE("(not (false))");
+ TESTCASE("(and (false) (true))");
+ TESTCASE("(or (false) (true))");
+ TESTCASE("(match subject \"ETSY\")");
+ TESTCASE("(ge size 123)");
+ TESTCASE("(gt size 456)");
+ TESTCASE("(le size 789)");
+ TESTCASE("(lt size 120)");
+ TESTCASE("(match uid 1:4,7:*)");
+ TESTCASE("(match annotation (entry \"/comment\" attrib \"value\" value \"Brooklyn\"))");
+
+#undef TESTCASE
+}
+
+
+static void test_normalise(void)
+{
+#define TESTCASE(in, exp_out) \
+ { \
+	static const char _in = (in); \
+	static const char expected_out = (exp_out); \
+	search_expr_t *e; \
+	char *s; \
+ \
+	e = search_expr_unserialise(_in); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(e); \
+	search_expr_normalise(&e); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(e); \
+	s = search_expr_serialise(e); \
+	CU_ASSERT_STRING_EQUAL(s, expected_out); \
+	search_expr_free(e); \
+ }
+
+ /*
+ * A tree comprising a single comparison node
+ * is already in DNF.
+ */
+ TESTCASE("(false)",
+	 "(false)");
+ TESTCASE("(true)",
+	 "(true)");
+ TESTCASE("(match subject \"ETSY\")",
+	 "(match subject \"ETSY\")");
+ TESTCASE("(le size 123)",
+	 "(le size 123)");
+ TESTCASE("(lt size 123)",
+	 "(lt size 123)");
+ TESTCASE("(ge size 123)",
+	 "(ge size 123)");
+ TESTCASE("(gt size 123)",
+	 "(gt size 123)");
+
+ /*
+ * A tree comprising a single comparison node
+ * under a NOT node is already in DNF.
+ */
+ TESTCASE("(not (false))",
+	 "(not (false))");
+ TESTCASE("(not (true))",
+	 "(not (true))");
+ TESTCASE("(not (match subject \"ETSY\"))",
+	 "(not (match subject \"ETSY\"))");
+ TESTCASE("(not (le size 123))",
+	 "(not (le size 123))");
+ TESTCASE("(not (lt size 123))",
+	 "(not (lt size 123))");
+ TESTCASE("(not (ge size 123))",
+	 "(not (ge size 123))");
+ TESTCASE("(not (gt size 123))",
+	 "(not (gt size 123))");
+
+ /*
+ * Ordering of nodes.
+ */
+ TESTCASE("(and "
+		"(match subject \"ALPHA\")"
+		" "
+		"(match subject \"BETA\")"
+		" "
+		"(match subject \"GAMMA\")"
+	 ")",
+	 "(and "
+		"(match subject \"ALPHA\")"
+		" "
+		"(match subject \"BETA\")"
+		" "
+		"(match subject \"GAMMA\")"
+	 ")");
+ TESTCASE("(and "
+		"(match subject \"GAMMA\")"
+		" "
+		"(match subject \"BETA\")"
+		" "
+		"(match subject \"ALPHA\")"
+	 ")",
+	 "(and "
+		"(match subject \"ALPHA\")"
+		" "
+		"(match subject \"BETA\")"
+		" "
+		"(match subject \"GAMMA\")"
+	 ")");
+ TESTCASE("(and "
+		"(match subject \"GAMMA\")"
+		" "
+		"(match subject \"ALPHA\")"
+		" "
+		"(match subject \"BETA\")"
+	 ")",
+	 "(and "
+		"(match subject \"ALPHA\")"
+		" "
+		"(match subject \"BETA\")"
+		" "
+		"(match subject \"GAMMA\")"
+	 ")");
+
+ /*
+ * A tree comprising a single conjunctive node
+ * whose children are all comparison nodes or
+ * negations of comparison nodes, is already in DNF.
+ */
+ TESTCASE("(and (le size 123) (match subject \"ETSY\"))",
+	 "(and (le size 123) (match subject \"ETSY\"))");
+ TESTCASE("(and (not (le size 123)) (match subject \"ETSY\"))",
+	 "(and (match subject \"ETSY\") (not (le size 123)))");
+ TESTCASE("(and (le size 123) (not (match subject \"ETSY\")))",
+	 "(and (le size 123) (not (match subject \"ETSY\")))");
+
+ /*
+ * A tree comprising a single disjunctive node
+ * whose children are all comparison nodes or
+ * negations of comparison nodes, is already in DNF.
+ */
+ TESTCASE("(or (le size 123) (match subject \"ETSY\"))",
+	 "(or (le size 123) (match subject \"ETSY\"))");
+ TESTCASE("(or (not (le size 123)) (match subject \"ETSY\"))",
+	 "(or (match subject \"ETSY\") (not (le size 123)))");
+ TESTCASE("(or (le size 123) (not (match subject \"ETSY\")))",
+	 "(or (le size 123) (not (match subject \"ETSY\")))");
+
+ /*
+ * A tree already in fully populated DNF: one disjunctive
+ * node, then multiple conjunctive nodes, then negations,
+ * then comparisons.
+ */
+ TESTCASE("(or "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(not "
+			"(match subject \"ETSY\")"
+		 ")"
+		")"
+		" "
+		"(and "
+		 "(not "
+			"(le size 456)"
+		 ")"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+	 ")",
+	 "(or "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(not "
+			"(match subject \"ETSY\")"
+		 ")"
+		")"
+		" "
+		"(and "
+		 "(match subject \"TUMBLR\")"
+		 " "
+		 "(not "
+			"(le size 456)"
+		 ")"
+		")"
+	 ")");
+
+ /*
+ * Elimination of trivial nodes
+ */
+ TESTCASE("(and "
+		"(match subject \"COSBY\")"
+	 ")",
+	 "(match subject \"COSBY\")");
+ TESTCASE("(or "
+		"(match subject \"COSBY\")"
+	 ")",
+	 "(match subject \"COSBY\")");
+ TESTCASE("(and (not) (match subject \"COSBY\"))",
+	 "(match subject \"COSBY\")");
+ TESTCASE("(or (not) (match subject \"COSBY\"))",
+	 "(match subject \"COSBY\")");
+
+ /*
+ * Combining similar parent & child nodes
+ */
+ TESTCASE("(and "
+		"(match subject \"COSBY\")"
+		" "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+		" "
+		"(match subject \"SWEATER\")"
+	 ")",
+	 "(and "
+		"(le size 123)"
+		" "
+		"(match subject \"COSBY\")"
+		" "
+		"(match subject \"SWEATER\")"
+		" "
+		"(match subject \"TUMBLR\")"
+	 ")");
+ TESTCASE("(or "
+		"(match subject \"COSBY\")"
+		" "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+		" "
+		"(match subject \"SWEATER\")"
+	 ")",
+	 "(or "
+		"(le size 123)"
+		" "
+		"(match subject \"COSBY\")"
+		" "
+		"(match subject \"SWEATER\")"
+		" "
+		"(match subject \"TUMBLR\")"
+	 ")");
+ TESTCASE("(not "
+		"(not "
+		 "(match subject \"SELVAGE\")"
+		")"
+	 ")",
+	 "(match subject \"SELVAGE\")");
+ TESTCASE("(not "
+		"(not "
+		 "(not "
+			"(match subject \"SELVAGE\")"
+		 ")"
+		")"
+	 ")",
+	 "(not "
+		"(match subject \"SELVAGE\")"
+	 ")");
+ TESTCASE("(not "
+		"(not "
+		 "(not "
+			"(not "
+			 "(match subject \"SELVAGE\")"
+			")"
+		 ")"
+		")"
+	 ")",
+	 "(match subject \"SELVAGE\")");
+
+ /*
+ * Applying DeMorgan's laws to invert an AND or OR
+ * which is a child or a NOT.
+ */
+ TESTCASE("(not "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(or "
+		"(not "
+		 "(le size 123)"
+		")"
+		" "
+		"(not "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")");
+ TESTCASE("(not "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(and "
+		"(not "
+		 "(le size 123)"
+		")"
+		" "
+		"(not "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")");
+
+ /*
+ * DeMorgan's laws plus combination of similar nodes
+ */
+ TESTCASE("(not "
+		"(and "
+		 "(not "
+			"(le size 123)"
+		 ")"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(or "
+		"(le size 123)"
+		" "
+		"(not "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")");
+ TESTCASE("(not "
+		"(or "
+		 "(not "
+			"(le size 123)"
+		 ")"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(and "
+		"(le size 123)"
+		" "
+		"(not "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")");
+
+ /*
+ * Distribution.
+ */
+ TESTCASE("(and "
+		"(match subject \"TUMBLR\")"
+		" "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(or "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+		" "
+		"(and "
+		 "(match subject \"ETSY\")"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+	 ")");
+ TESTCASE("(and "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+		" "
+		"(match subject \"TUMBLR\")"
+	 ")",
+	 "(or "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+		" "
+		"(and "
+		 "(match subject \"ETSY\")"
+		 " "
+		 "(match subject \"TUMBLR\")"
+		")"
+	 ")");
+ TESTCASE("(and "
+		"(match subject \"COSBY\")"
+		" "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+		" "
+		"(match subject \"SWEATER\")"
+	 ")",
+	 "(or "
+		"(and "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"COSBY\")"
+		 " "
+		 "(match subject \"SWEATER\")"
+		")"
+		" "
+		"(and "
+		 "(match subject \"COSBY\")"
+		 " "
+		 "(match subject \"ETSY\")"
+		 " "
+		 "(match subject \"SWEATER\")"
+		")"
+	 ")");
+
+ /*
+ * Distribution plus elimination of trivial nodes
+ */
+ TESTCASE("(and "
+		"(or "
+		 "(le size 123)"
+		 " "
+		 "(match subject \"ETSY\")"
+		")"
+	 ")",
+	 "(or "
+		"(le size 123)"
+		" "
+		"(match subject \"ETSY\")"
+	 ")");
+
+#undef TESTCASE
+}
+
+static void test_countability(void)
+{
+#define TESTCASE(in, exp) \
+ { \
+	static const char _in = (in); \
+	unsigned int expected = (exp); \
+	search_expr_t *e; \
+	unsigned int actual; \
+ \
+	e = search_expr_unserialise(_in); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(e); \
+	actual = search_expr_get_countability(e); \
+	CU_ASSERT_EQUAL(actual, expected); \
+	search_expr_free(e); \
+ }
+
+ TESTCASE("(true)", SEC_EXISTS);
+ TESTCASE("(not (true))", SEC_EXISTS|SEC_NOT);
+ // The case (not (false)) doesn't work properly, but this
+ // doesn't matter because it will not occur in trees
+ // generated from IMAP syntax.
+ TESTCASE("(match indexflags \\Recent)", SEC_RECENT);
+ TESTCASE("(not (match indexflags \\Recent))", SEC_RECENT|SEC_NOT);
+ TESTCASE("(match indexflags \\Seen)", SEC_SEEN);
+ TESTCASE("(not (match indexflags \\Seen))", SEC_SEEN|SEC_NOT);
+ TESTCASE("(match convflags \\Seen)", SEC_CONVSEEN);
+ TESTCASE("(not (match convflags \\Seen))", SEC_CONVSEEN|SEC_NOT);
+ TESTCASE("(match subject \"ETSY\")", SEC_UNCOUNTED);
+ TESTCASE("(not (match subject \"ETSY\"))", SEC_UNCOUNTED|SEC_NOT);
+ TESTCASE("(and (match indexflags \\Seen) (match subject \"ETSY\"))",
+	 SEC_UNCOUNTED|SEC_SEEN);
+ TESTCASE("(not (and (match indexflags \\Seen) (match subject \"ETSY\")))",
+	 SEC_UNCOUNTED|SEC_SEEN|SEC_NOT);
+ TESTCASE("(and (not (match indexflags \\Seen)) (match subject \"ETSY\"))",
+	 SEC_UNCOUNTED|SEC_SEEN|SEC_NOT);
+
+#undef TESTCASE
+}
+
+static void add_subquery(const char *mboxname, search_expr_t *indexed, search_expr_t *e, void *rock)
+{
+ struct buf *buf = rock;
+ char *s;
+
+ if (mboxname)
+	buf_printf(buf, "mboxname \"%s\" ", mboxname);
+
+ if (indexed) {
+	s = search_expr_serialise(indexed);
+	buf_printf(buf, "indexed %s ", s);
+	free(s);
+ }
+
+ s = search_expr_serialise(e);
+ buf_appendcstr(buf, s);
+ free(s);
+
+ buf_putc(buf, '\n');
+ buf_cstring(buf);
+
+ search_expr_free(e);
+ search_expr_free(indexed);
+}
+
+static void test_split_by_folder_and_index(void)
+{
+#define TESTCASE(in, exp) \
+ { \
+	static const char _in = (in); \
+	static const char expected = (exp); \
+	search_expr_t *e; \
+	struct buf actual = BUF_INITIALIZER; \
+ \
+	e = search_expr_unserialise(_in); \
+	CU_ASSERT_PTR_NOT_NULL_FATAL(e); \
+	search_expr_split_by_folder_and_index(e, add_subquery, &actual); \
+	CU_ASSERT_STRING_EQUAL(actual.s, expected); \
+	buf_free(&actual); \
+ }
+
+ /* Note, we expect that a (match message-id) node is NOT indexable
+ * whereas a (fuzzymatch subject) node IS indexable */
+
+ /* comparison nodes and negations of comparison nodes, which don't
+ * match any folders, get a NULL mboxname */
+ TESTCASE("(false)",
+	 "(false)\n");
+ TESTCASE("(true)",
+	 "(true)\n");
+ TESTCASE("(match message-id \"ETSY\")",
+	 "(match message-id \"ETSY\")\n");
+ TESTCASE("(not (match message-id \"ETSY\"))",
+	 "(not (match message-id \"ETSY\"))\n");
+
+ /* a folder match node a (true) node and that mboxname */
+ TESTCASE("(match folder \"inbox.Cosby.Sweater\")",
+	 "mboxname \"inbox.Cosby.Sweater\" (true)\n");
+
+ /* negation of a folder match node gets a NULL mboxname - it's
+ * supposed to match every folder *EXCEPT* the named one */
+ TESTCASE("(not (match folder \"inbox.Cosby.Sweater\"))",
+	 "(not (match folder \"inbox.Cosby.Sweater\"))\n");
+ TESTCASE("(and (match message-id \"ETSY\") (not (match folder \"inbox.Cosby.Sweater\")))",
+	 "(and (match message-id \"ETSY\") (not (match folder \"inbox.Cosby.Sweater\")))\n");
+
+ /* a conjuctive node which doesn't match folders
+ * gets a NULL mboxname */
+ TESTCASE("(and (match message-id \"ETSY\") (le size 123))",
+	 "(and (le size 123) (match message-id \"ETSY\"))\n");
+ TESTCASE("(and (match message-id \"ETSY\") (not (le size 123)))",
+	 "(and (match message-id \"ETSY\") (not (le size 123)))\n");
+ TESTCASE("(and (le size 123) (not (match message-id \"ETSY\")))",
+	 "(and (le size 123) (not (match message-id \"ETSY\")))\n");
+
+ /* a conjuctive node which does match a folder gets the remainder
+ * of the expression and that named mboxname */
+ TESTCASE("(and (match folder \"inbox.Cosby.Sweater\") (match message-id \"ETSY\"))",
+	 "mboxname \"inbox.Cosby.Sweater\" (match message-id \"ETSY\")\n");
+ TESTCASE("(and (match folder \"inbox.Cosby.Sweater\") (not (match message-id \"ETSY\")))",
+	 "mboxname \"inbox.Cosby.Sweater\" (not (match message-id \"ETSY\"))\n");
+ TESTCASE("(and (match message-id \"ETSY\") (match folder \"inbox.Cosby.Sweater\"))",
+	 "mboxname \"inbox.Cosby.Sweater\" (match message-id \"ETSY\")\n");
+ TESTCASE("(and (not (match message-id \"ETSY\")) (match folder \"inbox.Cosby.Sweater\"))",
+	 "mboxname \"inbox.Cosby.Sweater\" (not (match message-id \"ETSY\"))\n");
+
+ /* a disjunctive node which doesn't match folders
+ * or indexable attrs is untouched */
+ TESTCASE("(or (match message-id \"ETSY\") (le size 123))",
+	 "(or (le size 123) (match message-id \"ETSY\"))\n");
+ TESTCASE("(or (match message-id \"ETSY\") (not (le size 123)))",
+	 "(or (match message-id \"ETSY\") (not (le size 123)))\n");
+ TESTCASE("(or (le size 123) (not (match message-id \"ETSY\")))",
+	 "(or (le size 123) (not (match message-id \"ETSY\")))\n");
+
+ /* a disjuctive node which does match folders gets
+ * split into two expressions each with the given mboxname*/
+ TESTCASE("(or (match folder \"inbox.Cosby.Sweater\") (le size 123))",
+	 "mboxname \"inbox.Cosby.Sweater\" (true)\n"
+	 "(le size 123)\n");
+ TESTCASE("(or (match folder \"inbox.Mlkshk\") (match folder \"inbox.Tumblr\"))",
+	 "mboxname \"inbox.Mlkshk\" (true)\n"
+	 "mboxname \"inbox.Tumblr\" (true)\n");
+ TESTCASE("(or (and (ge size 456) (match folder \"inbox.Mlkshk\")) (and (le size 123) (match folder \"inbox.Tumblr\")))",
+	 "mboxname \"inbox.Mlkshk\" (ge size 456)\n"
+	 "mboxname \"inbox.Tumblr\" (le size 123)\n");
+
+ /* indexed comparison nodes and their negations, which don't
+ * match any folders, get a NULL mboxname and a trivial scan. */
+ TESTCASE("(fuzzymatch subject \"ETSY\")",
+	 "indexed (fuzzymatch subject \"ETSY\") (true)\n");
+ TESTCASE("(not (fuzzymatch subject \"ETSY\"))",
+	 "indexed (not (fuzzymatch subject \"ETSY\")) (true)\n");
+
+ /* conjunctions of indexed comparison nodes and their negations, which
+ * don't match any folders, get a NULL mboxname and a trivial scan. */
+ TESTCASE("(and (fuzzymatch subject \"ETSY\") (fuzzymatch subject \"TUMBLR\"))",
+	 "indexed (and (fuzzymatch subject \"ETSY\") (fuzzymatch subject \"TUMBLR\")) (true)\n");
+
+ /* conjunctions of indexed comparison nodes and their negations, with
+ * non-indexed nodes, which don't match any folders, get a NULL mboxname
+ * two trees with the indexed nodes separated out */
+ TESTCASE("(and (fuzzymatch subject \"ETSY\") (match message-id \"TUMBLR\"))",
+	 "indexed (fuzzymatch subject \"ETSY\") (match message-id \"TUMBLR\")\n");
+ TESTCASE("(and (match message-id \"TUMBLR\") (fuzzymatch subject \"ETSY\"))",
+	 "indexed (fuzzymatch subject \"ETSY\") (match message-id \"TUMBLR\")\n");
+
+ /* conjunctions of indexed comparison nodes and their negations, which
+ * do match folders either positively or negatively, get a NULL mboxname
+ * because we favour the index */
+ TESTCASE("(and (fuzzymatch subject \"ETSY\") (match folder \"inbox.Tumblr\"))",
+	 "indexed (fuzzymatch subject \"ETSY\") (match folder \"inbox.Tumblr\")\n");
+ TESTCASE("(and (match folder \"inbox.Tumblr\") (fuzzymatch subject \"ETSY\"))",
+	 "indexed (fuzzymatch subject \"ETSY\") (match folder \"inbox.Tumblr\")\n");
+ TESTCASE("(and (fuzzymatch subject \"ETSY\") (not (match folder \"inbox.Tumblr\")))",
+	 "indexed (fuzzymatch subject \"ETSY\") (not (match folder \"inbox.Tumblr\"))\n");
+ TESTCASE("(and (not (match folder \"inbox.Tumblr\")) (fuzzymatch subject \"ETSY\"))",
+	 "indexed (fuzzymatch subject \"ETSY\") (not (match folder \"inbox.Tumblr\"))\n");
+
+ /* a disjuctive node where one side contains indexed matches,
+ * is split into multiple callbacks, some indexed, some not */
+ TESTCASE("(or (match folder \"inbox.Cosby.Sweater\") (fuzzymatch subject \"ETSY\"))",
+	 "mboxname \"inbox.Cosby.Sweater\" (true)\n"
+	 "indexed (fuzzymatch subject \"ETSY\") (true)\n");
+ TESTCASE("(or (match folder \"inbox.Cosby.Sweater\") (fuzzymatch subject \"ETSY\"))",
+	 "mboxname \"inbox.Cosby.Sweater\" (true)\n"
+	 "indexed (fuzzymatch subject \"ETSY\") (true)\n");
+ TESTCASE("(or (fuzzymatch subject \"MLKSHK\") (fuzzymatch subject \"TUMBLR\"))",
+	 "indexed (fuzzymatch subject \"MLKSHK\") (true)\n"
+	 "indexed (fuzzymatch subject \"TUMBLR\") (true)\n");
+ TESTCASE("(or (and (le size 123) (fuzzymatch subject \"TUMBLR\")) (and (ge size 456) (fuzzymatch subject \"MLKSHK\")))",
+	 "indexed (fuzzymatch subject \"TUMBLR\") (le size 123)\n"
+	 "indexed (fuzzymatch subject \"MLKSHK\") (ge size 456)\n");
+}
+
+/* a large un-normalised expression containing lots of ORs but no
+ * folder or indexable matches is split without being normalised,
+ * avoiding combinatorial explosion. */
+static void test_bigun(void)
+{
+#define BIGUN \
+"(and " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"Lorem\") " \
+		 "(match cc \"Lorem\")) " \
+		"(match bcc \"Lorem\")) " \
+	 "(match from \"Lorem\")) " \
+	"(match subject \"Lorem\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"ipsum\") " \
+		 "(match cc \"ipsum\")) " \
+		"(match bcc \"ipsum\")) " \
+	 "(match from \"ipsum\")) " \
+	"(match subject \"ipsum\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"dolor\") " \
+		 "(match cc \"dolor\")) " \
+		"(match bcc \"dolor\")) " \
+	 "(match from \"dolor\")) " \
+	"(match subject \"dolor\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"sit\") " \
+		 "(match cc \"sit\")) " \
+		"(match bcc \"sit\")) " \
+	 "(match from \"sit\")) " \
+	"(match subject \"sit\")))"
+
+ TESTCASE(BIGUN, BIGUN "\n");
+#undef BIGUN
+}
+
+/* a large un-normalised expression containing lots of ORs and a
+ * FOLDER match, is too complex to normalise without exceeding a
+ * resource limit, and ends up un-normalised. */
+static void test_bigun2(void)
+{
+#define BIGUN \
+"(and " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match folder \"INBOX.Lorem\") " \
+		 "(match cc \"Lorem\")) " \
+		"(match bcc \"Lorem\")) " \
+	 "(match from \"Lorem\")) " \
+	"(match subject \"Lorem\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"ipsum\") " \
+		 "(match cc \"ipsum\")) " \
+		"(match bcc \"ipsum\")) " \
+	 "(match from \"ipsum\")) " \
+	"(match subject \"ipsum\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"dolor\") " \
+		 "(match cc \"dolor\")) " \
+		"(match bcc \"dolor\")) " \
+	 "(match from \"dolor\")) " \
+	"(match subject \"dolor\")) " \
+ "(or " \
+	"(or " \
+	 "(or " \
+		"(or " \
+		 "(match to \"sit\") " \
+		 "(match folder \"INBOX.sit\")) " \
+		"(match bcc \"sit\")) " \
+	 "(match from \"sit\")) " \
+	"(match subject \"sit\")))"
+
+ TESTCASE(BIGUN, BIGUN "\n");
+#undef BIGUN
+}
+#undef TESTCASE
+
+static int set_up(void)
+{
+ int r;
+
+ search_attr_init();
+
+ r = mboxname_init_namespace(&ns, isadmin);
+ if (r) return r;
+
+ push_tz(TZ_MELBOURNE);
+
+ imapoptsIMAPOPT_CONVERSATIONS.val.b = 1;
+
+ return 0;
+}
+
+static int tear_down(void)
+{
+ imapoptsIMAPOPT_CONVERSATIONS.val.b = 0;
+ restore_tz();
+ time_restore();
+ return 0;
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/seqset.testc Added

@@ -0,0 +1,505 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "xmalloc.h"
+#include "util.h"
+#include "imap/sequence.h"
+
+static void test_empty(void)
+{
+    struct seqset *seq;
+    char *s;
+
+    seq = seqset_init(/*maxval*/0, SEQ_SPARSE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 0);
+    CU_ASSERT_EQUAL(seqset_first(seq), 0);
+    CU_ASSERT_EQUAL(seqset_last(seq), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "");
+    free(s);
+
+    seqset_free(seq);
+}
+
+static void test_add_contiguous(void)
+{
+    struct seqset *seq;
+    char *s;
+
+    seq = seqset_init(/*maxval*/0, SEQ_SPARSE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 0);
+    CU_ASSERT_EQUAL(seqset_first(seq), 0);
+    CU_ASSERT_EQUAL(seqset_last(seq), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "");
+    free(s);
+
+    seqset_add(seq, 1, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1");
+    free(s);
+
+    seqset_add(seq, 2, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 2);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:2");
+    free(s);
+
+    seqset_add(seq, 3, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 3);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:3");
+    free(s);
+
+    seqset_add(seq, 4, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 4);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:4");
+    free(s);
+
+    seqset_free(seq);
+}
+
+static void test_add_noncontiguous(void)
+{
+    struct seqset *seq;
+    char *s;
+
+    seq = seqset_init(/*maxval*/0, SEQ_SPARSE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 0);
+    CU_ASSERT_EQUAL(seqset_first(seq), 0);
+    CU_ASSERT_EQUAL(seqset_last(seq), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "");
+    free(s);
+
+    seqset_add(seq, 1, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1");
+    free(s);
+
+    /* The seqset API is fundamentally broken in that we need
+     * to call seqset_add() with ismember=0 instead of just
+     * ignoring the non-member number and calling seqset_add()
+     * for the next member number.  Duh. */
+    seqset_add(seq, 2, /*ismember*/0);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1");
+    free(s);
+
+    seqset_add(seq, 3, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 3);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3");
+    free(s);
+
+    seqset_add(seq, 4, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 4);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:4");
+    free(s);
+
+    seqset_add(seq, 5, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:5");
+    free(s);
+
+    seqset_free(seq);
+}
+
+static void test_dup(void)
+{
+    struct seqset *seq;
+    struct seqset *seq2;
+    char *s;
+
+    seq = seqset_init(/*maxval*/0, SEQ_SPARSE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    seqset_add(seq, 1, /*ismember*/1);
+    seqset_add(seq, 2, /*ismember*/0);
+    seqset_add(seq, 3, /*ismember*/1);
+    seqset_add(seq, 4, /*ismember*/1);
+    seqset_add(seq, 5, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:5");
+    free(s);
+
+    seq2 = seqset_dup(seq);
+    CU_ASSERT_PTR_NOT_NULL(seq2);
+    CU_ASSERT_PTR_NOT_EQUAL(seq, seq2);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:5");
+    free(s);
+
+    CU_ASSERT_EQUAL(seq2->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq2), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq2), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq2, 6), 0);
+    s = seqset_cstring(seq2);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:5");
+    free(s);
+
+    seqset_free(seq);
+    seqset_free(seq2);
+}
+
+static void test_iteration(void)
+{
+    struct seqset *seq;
+    unsigned i;
+    char *s;
+
+    seq = seqset_init(/*maxval*/0, SEQ_SPARSE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    seqset_add(seq, 1, /*ismember*/1);
+    seqset_add(seq, 2, /*ismember*/0);
+    seqset_add(seq, 3, /*ismember*/1);
+    seqset_add(seq, 4, /*ismember*/1);
+    seqset_add(seq, 5, /*ismember*/1);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1,3:5");
+    free(s);
+
+    /* HACK */
+    seq->prev = 0;
+    seq->current = 0;
+
+    i = seqset_getnext(NULL);
+    CU_ASSERT_EQUAL(i, 0);
+
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 1);
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 3);
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 4);
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 5);
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 0);
+    i = seqset_getnext(seq);
+    CU_ASSERT_EQUAL(i, 0);
+
+    seqset_free(seq);
+}
+
+static void test_parse(void)
+{
+    struct seqset *seq;
+    char *s;
+
+    seq = seqset_parse("1", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1");
+    free(s);
+
+    seqset_free(seq);
+
+    /* ----- */
+
+    seq = seqset_parse("1:3", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 3);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:3");
+    free(s);
+
+    seqset_free(seq);
+
+    /* ----- */
+
+    seq = seqset_parse("1:3,5", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 5);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:3,5");
+    free(s);
+
+    seqset_free(seq);
+
+    /* ----- */
+
+    seq = seqset_parse("1:3,5,8:11", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 3);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), 11);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 7), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 8), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 9), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 10), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 11), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 12), 0);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:3,5,8:11");
+    free(s);
+
+    seqset_free(seq);
+
+    /* ----- */
+
+    seq = seqset_parse("1:*", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), UINT_MAX);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 1);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:*");
+    free(s);
+
+    seqset_free(seq);
+
+    /* ----- */
+
+    seq = seqset_parse("1:3,5:*", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 2);
+    CU_ASSERT_EQUAL(seqset_first(seq), 1);
+    CU_ASSERT_EQUAL(seqset_last(seq), UINT_MAX);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 7), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 8), 1);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "1:3,5:*");
+    free(s);
+
+    seqset_free(seq);
+}
+
+#if 0
+// XXX - this is test is correct AFAICS
+// but it is currently failing, presumably due to some
+// subtly buggy corner case in Cyrus.  So just ignore.
+static void XXX_test_star(void)
+{
+    struct seqset *seq;
+    char *s;
+
+    /* The "*" character is specified in RFC 3501 with what might be
+     * considered odd semantics.  It doesn't mean "infinity", it means
+     * a specific finite number which is the highest matchable number.
+     * This only matters in a few interesting corner cases. */
+
+    seq = seqset_parse("*", NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(seq);
+
+    CU_ASSERT_EQUAL(seq->len, 1);
+    CU_ASSERT_EQUAL(seqset_first(seq), UINT_MAX);
+    CU_ASSERT_EQUAL(seqset_last(seq), UINT_MAX);
+    s = seqset_cstring(seq);
+    CU_ASSERT_STRING_EQUAL(s, "*");
+    free(s);
+
+    /* maxval not specified - will not match anything yet */
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 7), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 8), 0);
+
+    /* maxval specified - will match maxval only */
+    seq->maxval = 1;
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 7), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 8), 0);
+
+    /* maxval specified - will match maxval only */
+    seq->maxval = 3;
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 0), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 1), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 2), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 3), 1);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 4), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 5), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 6), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 7), 0);
+    CU_ASSERT_EQUAL(seqset_ismember(seq, 8), 0);
+
+    seqset_free(seq);
+}
+#endif
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/sieve.testc Added

@@ -0,0 +1,983 @@
+/* Unit test for sieve */
+/* Heavily based on the old sieve/test.c which bore this message:
+ *
+ * - * test.c -- tester for libcyrus_sieve
+ * - * Larry Greenfield
+ *
+ */
+#include "cunit/cunit.h"
+#include <malloc.h>
+#include "sieve/bytecode.h"
+#include "sieve/comparator.h"
+#include "sieve/message.h"
+#include "sieve/sieve_interface.h"
+#include "imap/message.h"
+#include "prot.h"
+#include "retry.h"
+#include "imap/spool.h"
+#include "map.h"
+#include "cyrusdb.h"
+#include "libcyr_cfg.h"
+#include "libconfig.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+#include "xmalloc.h"
+
+#define DBDIR "test-sieve-dbdir"
+#define PARTITION "default"
+
+typedef struct {
+ sieve_interp_t *interp;
+ sieve_execute_t *exe;
+ struct {
+	unsigned int actions;
+	unsigned int errors;
+	unsigned int redirects;
+	unsigned int discards;
+	unsigned int rejects;
+	unsigned int fileintos;
+	unsigned int keeps;
+	unsigned int notifies;
+	unsigned int vaction_responses;
+ } stats;
+ char *redirected_to;
+ char *reject_message;
+ char *filed_mailbox;
+ char *filed_flags;
+ char *notify_method;
+ char *notify_priority;
+ char *notify_options;
+ char *vacation_message;
+ char *vacation_subject;
+ char *vacation_to;
+ char *vacation_from;
+ strarray_t *compile_errors;
+ strarray_t *run_errors;
+} sieve_test_context_t;
+
+typedef struct {
+ const char *text;
+ int length;
+ struct message_content content;
+ hdrcache_t headers;
+ char *filename;
+} sieve_test_message_t;
+
+/* set to SIEVE_DONE if you want to test "already responded */
+int autorespond_reponse = SIEVE_OK;
+
+extern int verbose;
+
+#define TESTCASE(_comp, _mode, _pat, _text, _result)		\
+ comprock = NULL;						\
+ c = lookup_comp(_comp, _mode, -1, &comprock);		\
+ CU_ASSERT_PTR_NOT_NULL(c);					\
+ if (c) {							\
+	res = c(_text, strlen(_text), _pat, comprock);		\
+	CU_ASSERT_EQUAL(res, _result);				\
+ }
+
+static void test_comparator(void)
+{
+ void *comprock;
+ comparator_t *c;
+ int res;
+
+ TESTCASE( B_OCTET, B_IS, "", "", 1 );
+ TESTCASE( B_OCTET, B_IS, "a", "", 0 );
+ TESTCASE( B_OCTET, B_IS, "", "a", 0 );
+ TESTCASE( B_OCTET, B_IS, "a", "a", 1 );
+ TESTCASE( B_OCTET, B_IS, "a", "A", 0 );
+
+ TESTCASE( B_ASCIICASEMAP, B_IS, "", "", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_IS, "a", "", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_IS, "", "a", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_IS, "a", "a", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_IS, "a", "A", 1 );
+
+ TESTCASE( B_ASCIINUMERIC, B_IS, "123", "123", 1 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "123", "-123", 0 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "abc", "123", 0 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "abc", "abc", 1 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "12345678900", "3755744308", 0 ); /* test for 32bit overflow */
+ TESTCASE( B_ASCIINUMERIC, B_IS, "1567", "1567pounds", 1 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "", "", 1 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "123456789", "567", 0 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "567", "123456789", 0 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "123456789", "00000123456789", 1 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "102", "1024", 0 );
+ TESTCASE( B_ASCIINUMERIC, B_IS, "1567M", "1567 arg", 1 );
+
+ TESTCASE( B_OCTET, B_CONTAINS, "", "", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "", "a", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "", 0 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "a", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "ab", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "ba", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "aba", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "bab", 1 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "bb", 0 );
+ TESTCASE( B_OCTET, B_CONTAINS, "a", "bbb", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "", "", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "a", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a", "bbb", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "*", "", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*", "a", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "a", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "ab", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "ba", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "aba", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "bab", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a*", "bbb", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "a", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "ba", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "aba", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "*a", "bbb", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "a", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "ab", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "aba", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*", "bbb", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "ab", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "bbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "abbb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "acb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*b", "acbc", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "bbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "abbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "acb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?b", "acbc", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "bbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "abbb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "acb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?b", "acbc", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "bbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "abbb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "acb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a?*b", "acbc", 0 );
+
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "a", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "ab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "ba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "aba", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "bab", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "bb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "bbb", 0 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "abbb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b", "acb", 1 );
+ TESTCASE( B_OCTET, B_MATCHES, "a*?*b?", "acbc", 1 );
+
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "a", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "ab", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "ba", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "aba", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "bab", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "bb", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "bbb", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "abbb", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "acb", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "acbc", 0 );
+
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "A", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "Ab", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "BA", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "ABA", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "BAb", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "BB", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "BBB", 0 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "aBBB", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "ACB", 1 );
+ TESTCASE( B_ASCIICASEMAP, B_MATCHES, "a*b", "ACBC", 0 );
+}
+
+
+/* gets the header "head" from msg. */
+static int getheader(void *mc, const char *name, const char ***body)
+{
+ sieve_test_message_t *msg = (sieve_test_message_t *)mc;
+
+ *body = spool_getheader(msg->headers, name);
+ if (!*body)
+	return SIEVE_FAIL;
+ return SIEVE_OK;
+}
+
+static int getsize(void *mc, int *size)
+{
+ sieve_test_message_t *msg = (sieve_test_message_t *)mc;
+
+ *size = msg->length;
+ return SIEVE_OK;
+}
+
+static int getbody(void *mc, const char **content_types, sieve_bodypart_t ***parts)
+{
+ sieve_test_message_t *msg = (sieve_test_message_t *)mc;
+ int r = 0;
+
+ if (!msg->content.body) {
+	/* parse the message body if we haven't already */
+	FILE *fp = fopen(msg->filename, "r");
+	CU_ASSERT_PTR_NOT_NULL(fp);
+	r = message_parse_file(fp,
+			 &msg->content.base,
+			 &msg->content.len,
+			 &msg->content.body);
+	CU_ASSERT_EQUAL(r, 0);
+	fclose(fp);
+ }
+
+ /* XXX currently struct bodypart as defined in message.h is the same as
+ sieve_bodypart_t as defined in sieve_interface.h, so we can typecast */
+ if (!r)
+	message_fetch_part(&msg->content, content_types,
+			 (struct bodypart ***) parts);
+
+ if (r)
+	return SIEVE_FAIL;
+ return SIEVE_OK;
+}
+
+static int getinclude(void *sc __attribute__((unused)),
+		 const char *script,
+		 int isglobal __attribute__((unused)),
+		 char *fpath, size_t size)
+{
+ strlcpy(fpath, script, size);
+ strlcat(fpath, ".bc", size);
+ return SIEVE_OK;
+}
+
+static int redirect(void *ac, void *ic, void *sc __attribute__((unused)),
+		 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
+{
+ sieve_redirect_context_t *rc = (sieve_redirect_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.redirects++;
+ free(ctx->redirected_to);
+ ctx->redirected_to = xstrdup(rc->addr);
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int discard(void *ac __attribute__((unused)),
+		 void *ic, void *sc __attribute__((unused)),
+		 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
+{
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.discards++;
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int reject(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
+{
+ sieve_reject_context_t *rc = (sieve_reject_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.rejects++;
+ free(ctx->reject_message);
+ ctx->reject_message = xstrdup(rc->msg);
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int fileinto(void *ac, void *ic, void *sc __attribute__((unused)),
+		 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
+{
+ sieve_fileinto_context_t *fc = (sieve_fileinto_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.fileintos++;
+ free(ctx->filed_mailbox);
+ ctx->filed_mailbox = xstrdup(fc->mailbox);
+ free(ctx->filed_flags);
+ ctx->filed_flags = strarray_join(fc->imapflags, " ");
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int keep(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc __attribute__((unused)),
+		const char **errmsg __attribute__((unused)))
+{
+ sieve_keep_context_t *kc = (sieve_keep_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.keeps++;
+ free(ctx->filed_flags);
+ ctx->filed_flags = strarray_join(kc->imapflags, " ");
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int notify(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc __attribute__((unused)),
+	 const char **errmsg __attribute__((unused)))
+{
+ sieve_notify_context_t *nc = (sieve_notify_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+ struct buf opts = BUF_INITIALIZER;
+ const char **p;
+
+ for (p = nc->options ; *p ; p++) {
+	if (opts.len)
+	 buf_putc(&opts, ' ');
+	buf_appendcstr(&opts, *p);
+ }
+
+ ctx->stats.actions++;
+ ctx->stats.notifies++;
+ free(ctx->notify_options);
+ ctx->notify_options = buf_release(&opts);
+ free(ctx->notify_method);
+ ctx->notify_method = xstrdup(nc->method);
+ free(ctx->notify_priority);
+ ctx->notify_method = xstrdup(nc->priority);
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+static int mysieve_error(int lineno, const char *msg,
+			 void *ic,
+		 void *sc __attribute__((unused)))
+{
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+ struct buf buf = BUF_INITIALIZER;
+
+ ctx->stats.errors++;
+ buf_printf(&buf, "line %d: %s", lineno, msg);
+ strarray_appendm(ctx->compile_errors, buf_release(&buf));
+
+ return SIEVE_OK;
+}
+
+static int mysieve_execute_error(const char *msg,
+				 void *ic,
+			 void *sc __attribute__((unused)),
+			 void *mc __attribute__((unused)))
+{
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.errors++;
+ strarray_append(ctx->run_errors, msg);
+
+ return SIEVE_OK;
+}
+
+static int autorespond(void *ac __attribute__((unused)),
+		 void *ic __attribute__((unused)),
+		 void *sc __attribute__((unused)),
+		 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
+{
+ return autorespond_reponse;
+}
+
+static int send_response(void *ac, void *ic, void *sc __attribute__((unused)),
+			 void *mc __attribute__((unused)),
+			 const char **errmsg __attribute__((unused)))
+{
+ sieve_send_response_context_t *src = (sieve_send_response_context_t *)ac;
+ sieve_test_context_t *ctx = (sieve_test_context_t *)ic;
+
+ ctx->stats.actions++;
+ ctx->stats.vaction_responses++;
+ free(ctx->vacation_message);
+ ctx->vacation_message = xstrdup(src->msg);
+ free(ctx->vacation_subject);
+ ctx->vacation_subject = xstrdup(src->subj);
+ free(ctx->vacation_to);
+ ctx->vacation_to = xstrdup(src->addr);
+ free(ctx->vacation_from);
+ ctx->vacation_from = xstrdup(src->fromaddr);
+
+ /* TODO: test returning SIEVE_FAIL */
+ return SIEVE_OK;
+}
+
+#ifndef HAVE_FMEMOPEN
+static FILE *fmemopen(const void *buf, size_t len, const char *mode)
+{
+ FILE *fp;
+
+ fp = fopen("/dev/null", mode);
+ if (!fp)
+	return NULL;
+ setbuffer(fp, buf, len);
+ return fp;
+}
+#endif
+
+static void config_read_string(const char *s)
+{
+ char *fname = xstrdup("/tmp/cyrus-cunit-configXXXXXX");
+ int fd = mkstemp(fname);
+ retry_write(fd, s, strlen(s));
+ config_reset();
+ config_read(fname, 0);
+ unlink(fname);
+ free(fname);
+ close(fd);
+}
+
+static int set_up(void)
+{
+ libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, DBDIR);
+ config_read_string(
+	"configdirectory: "DBDIR"/conf\n"
+	"defaultpartition: "PARTITION"\n"
+	"partition-"PARTITION": "DBDIR"/data\n"
+	"sievenotifier: mailto\n"
+	"sieve_extensions: fileinto reject vacation imapflags notify" \
+	 " envelope body relational regex subaddress copy\n"
+ );
+ libcyrus_init();
+ return 0;
+}
+
+static int tear_down(void)
+{
+ libcyrus_done();
+ return 0;
+}
+
+static void context_setup(sieve_test_context_t *ctx,
+			 const char *script)
+{
+ int r;
+ static strarray_t mark = STRARRAY_INITIALIZER;
+ static sieve_vacation_t vacation = {
+	0,			/* min response */
+	0,			/* max response */
+	&autorespond,		/* autorespond() */
+	&send_response		/* send_response() */
+ };
+ int len = strlen(script);
+ int fd;
+ FILE *fp;
+ sieve_script_t *scr = NULL;
+ bytecode_info_t *bytecode = NULL;
+ char tempfile32;
+
+ memset(ctx, 0, sizeof(*ctx));
+ if (!mark.count)
+	strarray_append(&mark, "\\flagged");
+
+ ctx->compile_errors = strarray_new();
+ ctx->run_errors = strarray_new();
+
+ ctx->interp = sieve_interp_alloc(ctx);
+ sieve_register_redirect(ctx->interp, redirect);
+ sieve_register_discard(ctx->interp, discard);
+ sieve_register_reject(ctx->interp, reject);
+ sieve_register_fileinto(ctx->interp, fileinto);
+ sieve_register_keep(ctx->interp, keep);
+ sieve_register_size(ctx->interp, getsize);
+ sieve_register_header(ctx->interp, getheader);
+ sieve_register_envelope(ctx->interp, getheader);
+ sieve_register_body(ctx->interp, getbody);
+ sieve_register_include(ctx->interp, getinclude);
+ sieve_register_vacation(ctx->interp, &vacation);
+ sieve_register_imapflags(ctx->interp, &mark);
+ sieve_register_notify(ctx->interp, notify);
+ sieve_register_parse_error(ctx->interp, mysieve_error);
+ sieve_register_execute_error(ctx->interp, mysieve_execute_error);
+
+ /* Here we pretend to be the sieve compiler, and generate
+ * a file of compiled bytecode from the script string */
+ fp = fmemopen((void *)script, len, "r");
+ r = sieve_script_parse(ctx->interp, fp, ctx, &scr);
+ CU_ASSERT_EQUAL(r, SIEVE_OK);
+ fclose(fp);
+
+ r = sieve_generate_bytecode(&bytecode, scr);
+ CU_ASSERT(r > 0);
+ strcpy(tempfile, "/tmp/sievetest-BC-XXXXXX");
+ fd = mkstemp(tempfile);
+ CU_ASSERT(fd >= 0);
+ r = sieve_emit_bytecode(fd, bytecode);
+ CU_ASSERT(r > 0);
+ sieve_free_bytecode(&bytecode);
+ sieve_script_free(&scr);
+
+ /* Now load the compiled bytecode */
+ r = sieve_script_load(tempfile, &ctx->exe);
+ CU_ASSERT_EQUAL(r, SIEVE_OK);
+ unlink(tempfile);
+}
+
+static void context_cleanup(sieve_test_context_t *ctx)
+{
+ int r;
+
+ if (verbose > 1) {
+	int i;
+
+	fprintf(stderr, "sieve test context\n");
+	fprintf(stderr, " actions: %u\n", ctx->stats.actions);
+	fprintf(stderr, " errors: %u\n", ctx->stats.errors);
+	fprintf(stderr, " redirects: %u\n", ctx->stats.redirects);
+	fprintf(stderr, " discards: %u\n", ctx->stats.discards);
+	fprintf(stderr, " rejects: %u\n", ctx->stats.rejects);
+	fprintf(stderr, " fileintos: %u\n", ctx->stats.fileintos);
+	fprintf(stderr, " keeps: %u\n", ctx->stats.keeps);
+	fprintf(stderr, " notifies: %u\n", ctx->stats.notifies);
+	fprintf(stderr, " vaction_responses: %u\n", ctx->stats.vaction_responses);
+	if (ctx->redirected_to)
+	 fprintf(stderr, " redirected_to: %s\n", ctx->redirected_to);
+	if (ctx->reject_message)
+	 fprintf(stderr, " reject_message: %s\n", ctx->reject_message);
+	if (ctx->filed_mailbox)
+	 fprintf(stderr, " filed_mailbox: %s\n", ctx->filed_mailbox);
+	if (ctx->filed_flags)
+	 fprintf(stderr, " filed_flags: %s\n", ctx->filed_flags);
+	if (ctx->notify_method)
+	 fprintf(stderr, " notify_method: %s\n", ctx->notify_method);
+	if (ctx->notify_priority)
+	 fprintf(stderr, " notify_priority: %s\n", ctx->notify_priority);
+	if (ctx->notify_options)
+	 fprintf(stderr, " notify_options: %s\n", ctx->notify_options);
+	if (ctx->vacation_message)
+	 fprintf(stderr, " vacation_message: %s\n", ctx->vacation_message);
+	if (ctx->vacation_subject)
+	 fprintf(stderr, " vacation_subject: %s\n", ctx->vacation_subject);
+	if (ctx->vacation_to)
+	 fprintf(stderr, " vacation_to: %s\n", ctx->vacation_to);
+	if (ctx->vacation_from)
+	 fprintf(stderr, " vacation_from: %s\n", ctx->vacation_from);
+	if (ctx->compile_errors->count) {
+	 fprintf(stderr, " compile_errors:\n");
+	 for (i = 0 ; i < ctx->compile_errors->count ; i++)
+		fprintf(stderr, "\t%d %s\n", i, ctx->compile_errors->datai);
+	}
+	if (ctx->run_errors->count) {
+	 fprintf(stderr, " run_errors:\n");
+	 for (i = 0 ; i < ctx->run_errors->count ; i++)
+		fprintf(stderr, "\t%d %s\n", i, ctx->run_errors->datai);
+	}
+ }
+
+ /*used to be sieve_script_free*/
+ r = sieve_script_unload(&ctx->exe);
+ CU_ASSERT_EQUAL(r, SIEVE_OK);
+ CU_ASSERT_PTR_NULL(ctx->exe);
+
+ r = sieve_interp_free(&ctx->interp);
+ CU_ASSERT_EQUAL(r, SIEVE_OK);
+
+ free(ctx->redirected_to);
+ free(ctx->reject_message);
+ free(ctx->filed_mailbox);
+ free(ctx->filed_flags);
+ free(ctx->notify_method);
+ free(ctx->notify_priority);
+ free(ctx->notify_options);
+ free(ctx->vacation_message);
+ free(ctx->vacation_subject);
+ free(ctx->vacation_to);
+ free(ctx->vacation_from);
+ strarray_free(ctx->compile_errors);
+ strarray_free(ctx->run_errors);
+}
+
+
+static sieve_test_message_t *sieve_test_message_new(const char *text, int len)
+{
+ sieve_test_message_t *msg;
+ struct protstream *pin;
+ FILE *fout;
+ int fd;
+ int r;
+ char tempfile32;
+
+ msg = xzmalloc(sizeof(sieve_test_message_t));
+ msg->text = text;
+ msg->length = len;
+ msg->headers = spool_new_hdrcache();
+
+ strcpy(tempfile, "/tmp/sievetest-MS-XXXXXX");
+ fd = mkstemp(tempfile);
+ CU_ASSERT(fd >= 0);
+ msg->filename = xstrdup(tempfile);
+ r = retry_write(fd, text, len);
+ CU_ASSERT_EQUAL(r, len);
+ lseek(fd, SEEK_SET, 0);
+
+ pin = prot_new(fd, /*read*/0);
+ CU_ASSERT_PTR_NOT_NULL(pin);
+
+ fout = fopen("/dev/null", "w");
+ CU_ASSERT_PTR_NOT_NULL(fout);
+
+ r = spool_fill_hdrcache(pin, fout, msg->headers, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ fclose(fout);
+ prot_free(pin);
+
+ return msg;
+}
+
+static void message_free(sieve_test_message_t *msg)
+{
+ spool_free_hdrcache(msg->headers);
+ if (msg->content.body)
+	message_free_body(msg->content.body);
+ if (msg->content.base)
+	map_free(&msg->content.base, &msg->content.len);
+ unlink(msg->filename);
+ free(msg->filename);
+ free(msg);
+}
+
+
+static void run_message(sieve_test_context_t *ctx,
+		 const char *text)
+{
+ sieve_test_message_t *msg;
+ int r;
+
+ msg = sieve_test_message_new(text, strlen(text));
+ CU_ASSERT_PTR_NOT_NULL(msg);
+
+ r = sieve_execute_bytecode(ctx->exe, ctx->interp, ctx, msg);
+ CU_ASSERT_EQUAL(r, SIEVE_OK);
+
+ message_free(msg);
+}
+
+static void test_address_all(void)
+{
+ static const char SCRIPT_IS =
+ "if address :all :is \"from\" \"zme@true.com\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+ static const char SCRIPT_CONTAINS =
+ "if address :all :contains \"from\" \"true.com\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+ static const char SCRIPT_MATCHES =
+ "if address :all :matches \"from\" \"*true.com\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+
+ static const char MSG_TRUE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@true.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ static const char MSG_FALSE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@false.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ sieve_test_context_t ctx;
+
+ /* Test :is */
+ context_setup(&ctx, SCRIPT_IS);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+
+ /* Test :contains */
+ context_setup(&ctx, SCRIPT_CONTAINS);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+
+ /* Test :matches */
+ context_setup(&ctx, SCRIPT_MATCHES);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+}
+
+static void test_exists(void)
+{
+ static const char SCRIPT =
+ "if exists \"flooglewart\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+ static const char MSG_TRUE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@true.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "Flooglewart: fnarp fmeh oogedyboogedy\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ static const char MSG_FALSE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: yme@false.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ sieve_test_context_t ctx;
+
+ context_setup(&ctx, SCRIPT);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+}
+
+static void test_address_domain(void)
+{
+ static const char SCRIPT =
+ "if address :domain :is \"from\" \"true.com\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+ static const char MSG_TRUE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@true.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ static const char MSG_FALSE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@false.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ sieve_test_context_t ctx;
+
+ context_setup(&ctx, SCRIPT);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+}
+
+static void test_address_localpart(void)
+{
+ static const char SCRIPT =
+ "if address :localpart :is \"from\" \"zme\"\n"
+ "{redirect \"me@blah.com\";}\n"
+ ;
+ static const char MSG_TRUE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: zme@true.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ static const char MSG_FALSE =
+ "Date: Mon, 25 Jan 2003 08:51:06 -0500\r\n"
+ "From: yme@false.com\r\n"
+ "To: you\r\n"
+ "Subject: simple address test\r\n"
+ "\r\n"
+ "blah\n"
+ ;
+ sieve_test_context_t ctx;
+
+ context_setup(&ctx, SCRIPT);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+
+ run_message(&ctx, MSG_TRUE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 1);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 0);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ run_message(&ctx, MSG_FALSE);
+ CU_ASSERT_EQUAL(ctx.stats.errors, 0);
+ CU_ASSERT_EQUAL(ctx.stats.actions, 2);
+ CU_ASSERT_EQUAL(ctx.stats.redirects, 1);
+ CU_ASSERT_EQUAL(ctx.stats.keeps, 1);
+ CU_ASSERT_STRING_EQUAL(ctx.redirected_to, "me@blah.com");
+
+ context_cleanup(&ctx);
+}
+
+// TODO: test
+// if size :over 10K { redirect "me@blah.com"; }
+// TODO: test
+// if true {...}
+//
+// if false {...}
+//
+// if not false {...}
+//
+// if true {...} else {...}
+//
+// if false {...} elsif true {...} else {...}
+//
+// if false {...} elsif false {...} else {...}
+//
+// if false {} else {...}
+//
+// if true { if true { if true { ... } } }
+//
+// if allof(false, false) {...} else {...}
+//
+// if allof(false,true) {...} else {...}
+//
+// if allof(true,false) {...} else {...}
+//
+// if allof(true,true) {...} else {...}
+//
+// if anyof(false, false) {...} else {...}
+//
+// if anyof(false,true) {...} else {...}
+//
+// if anyof(true,false) {...} else {...}
+//
+// if anyof(true,true) {...} else {...}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/spool.testc Added

@@ -0,0 +1,329 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "imap/imap_err.h"
+#include "prot.h"
+#include "retry.h"
+#include "xmalloc.h"
+#include "imap/spool.h"
+
+#define DELIVERED "Fri, 29 Oct 2010 13:07:07 +1100"
+#define FIRST_RX "Fri, 29 Oct 2010 13:05:01 +1100"
+#define SECOND_RX "Fri, 29 Oct 2010 13:03:03 +1100"
+#define THIRD_RX "Fri, 29 Oct 2010 13:01:01 +1100"
+#define SENT	 "Thu, 28 Oct 2010 18:37:26 +1100"
+#define HFROM	 "Fred Bloggs <fbloggs@fastmail.fm>"
+#define HFROM2	 "Antoine Lavoisier <lavoisier@chemistry.fr>"
+#define HTO	 "Sarah Jane Smith <sjsmith@gmail.com>"
+#define HDATE	 SENT
+#define HSUBJECT "Simple testing email"
+#define HMESSAGEID "<fake1000@fastmail.fm>"
+#define HRECEIVED1 "from mail.quux.com (mail.quux.com 10.0.0.1) by mail.gmail.com (Software); " FIRST_RX
+#define HRECEIVED2 "from mail.bar.com (mail.bar.com 10.0.0.1) by mail.quux.com (Software); " SECOND_RX
+#define HRECEIVED3 "from mail.fastmail.fm (mail.fastmail.fm 10.0.0.1) by mail.bar.com (Software); " THIRD_RX
+
+static void test_simple(void)
+{
+ hdrcache_t cache;
+ const char **val;
+
+ cache = spool_new_hdrcache();
+ CU_ASSERT_PTR_NOT_NULL(cache);
+
+ val = spool_getheader(cache, "Nonesuch");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "fRoM");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "from");
+ CU_ASSERT_PTR_NULL(val);
+
+ spool_cache_header(xstrdup("From"), xstrdup(HFROM), cache);
+ val = spool_getheader(cache, "Nonesuch");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "fRoM");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "from");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+
+ spool_cache_header(xstrdup("To"), xstrdup(HTO), cache);
+ spool_cache_header(xstrdup("Date"), xstrdup(HDATE), cache);
+ spool_cache_header(xstrdup("Subject"), xstrdup(HSUBJECT), cache);
+ spool_cache_header(xstrdup("Message-ID"), xstrdup(HMESSAGEID), cache);
+ spool_cache_header(xstrdup("Received"), xstrdup(HRECEIVED1), cache);
+ spool_cache_header(xstrdup("Received"), xstrdup(HRECEIVED2), cache);
+ spool_cache_header(xstrdup("Received"), xstrdup(HRECEIVED3), cache);
+
+ val = spool_getheader(cache, "Nonesuch");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "fRoM");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "from");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "To");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HTO);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "Subject");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HSUBJECT);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "message-id");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HMESSAGEID);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "received");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HRECEIVED1);
+ CU_ASSERT_STRING_EQUAL(val1, HRECEIVED2);
+ CU_ASSERT_STRING_EQUAL(val2, HRECEIVED3);
+ CU_ASSERT_PTR_NULL(val3);
+
+ spool_free_hdrcache(cache);
+}
+
+static void test_fill(void)
+{
+ static const char MSG =
+"From: " HFROM "\r\n"
+"To: " HTO "\r\n"
+"Date: " HDATE "\r\n"
+"Subject: " HSUBJECT "\r\n"
+"Message-ID: " HMESSAGEID "\r\n"
+"Received: " HRECEIVED1 "\r\n"
+"Received: " HRECEIVED2 "\r\n"
+"Received: " HRECEIVED3 "\r\n"
+"\r\n"
+"Hello, World\r\n";
+
+ hdrcache_t cache;
+ const char **val;
+ int fd;
+ char tempfile32;
+ int r;
+ struct protstream *pin;
+ FILE *fout;
+
+ /* Setup @pin to point to the start of a file open for (at least)
+ * reading containing the message. */
+ strcpy(tempfile, "/tmp/spooltestAXXXXXX");
+ fd = mkstemp(tempfile);
+ CU_ASSERT(fd >= 0);
+ r = retry_write(fd, MSG, sizeof(MSG)-1);
+ CU_ASSERT_EQUAL(r, sizeof(MSG)-1);
+ lseek(fd, SEEK_SET, 0);
+ pin = prot_new(fd, /*read*/0);
+ CU_ASSERT_PTR_NOT_NULL(pin);
+
+ /* Setup @fout to ignore data written to it */
+ fout = fopen("/dev/null", "w");
+ CU_ASSERT_PTR_NOT_NULL(fout);
+
+ cache = spool_new_hdrcache();
+ CU_ASSERT_PTR_NOT_NULL(cache);
+
+ /* TODO: test non-NULL skipheaders */
+ r = spool_fill_hdrcache(pin, fout, cache, NULL);
+ CU_ASSERT_EQUAL(r, 0);
+
+ val = spool_getheader(cache, "Nonesuch");
+ CU_ASSERT_PTR_NULL(val);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "fRoM");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+ val = spool_getheader(cache, "from");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "To");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HTO);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "Subject");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HSUBJECT);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "message-id");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HMESSAGEID);
+ CU_ASSERT_PTR_NULL(val1);
+
+ val = spool_getheader(cache, "received");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HRECEIVED1);
+ CU_ASSERT_STRING_EQUAL(val1, HRECEIVED2);
+ CU_ASSERT_STRING_EQUAL(val2, HRECEIVED3);
+ CU_ASSERT_PTR_NULL(val3);
+
+ spool_free_hdrcache(cache);
+ fclose(fout);
+ prot_free(pin);
+ unlink(tempfile);
+}
+
+/* BZ3640: headers with NULL bytes shall be rejected. */
+static void test_fill_null(void)
+{
+ static const char MSG =
+"From: " HFROM "\r\n"
+"To: " HTO "\r\n"
+"Date: " HDATE "\r\n"
+"Subject: " HSUBJECT "\r\n"
+"Message-ID: " HMESSAGEID "\r\n"
+"Received: " HRECEIVED1 "\r\n"
+"Received:\0" HRECEIVED2 "\r\n"
+"Received: " HRECEIVED3 "\r\n"
+"\r\n"
+"Hello, World\r\n";
+
+ hdrcache_t cache;
+ int fd;
+ char tempfile32;
+ int r;
+ struct protstream *pin;
+ FILE *fout;
+
+ /* Setup @pin to point to the start of a file open for (at least)
+ * reading containing the message. */
+ strcpy(tempfile, "/tmp/spooltestAXXXXXX");
+ fd = mkstemp(tempfile);
+ CU_ASSERT(fd >= 0);
+ r = retry_write(fd, MSG, sizeof(MSG)-1);
+ CU_ASSERT_EQUAL(r, sizeof(MSG)-1);
+ lseek(fd, SEEK_SET, 0);
+ pin = prot_new(fd, /*read*/0);
+ CU_ASSERT_PTR_NOT_NULL(pin);
+
+ /* Setup @fout to ignore data written to it */
+ fout = fopen("/dev/null", "w");
+ CU_ASSERT_PTR_NOT_NULL(fout);
+
+ cache = spool_new_hdrcache();
+ CU_ASSERT_PTR_NOT_NULL(cache);
+
+ r = spool_fill_hdrcache(pin, fout, cache, NULL);
+ CU_ASSERT_EQUAL(r, IMAP_MESSAGE_CONTAINSNULL);
+
+ spool_free_hdrcache(cache);
+ fclose(fout);
+ prot_free(pin);
+ unlink(tempfile);
+}
+
+/* BZ3386: insert more unique headers than the internal limit of 4009
+ * headers, and see what happens. */
+static void test_bz3386(void)
+{
+ hdrcache_t cache;
+#define N 5000
+ int i;
+ char name32;
+ char body128;
+ char body2128;	/* use a different buffer Just In Case */
+ const char **val;
+
+ cache = spool_new_hdrcache();
+ CU_ASSERT_PTR_NOT_NULL(cache);
+
+ for (i = 0 ; i < N ; i++) {
+	snprintf(name, sizeof(name), "X-Foo-%d-%c", i, 'A'+(i%26));
+	snprintf(body, sizeof(body), "value %d %c", i, 'A'+(i%26));
+	spool_cache_header(xstrdup(name), xstrdup(body), cache);
+ }
+
+ strcpy(body, "Old Buffer");
+
+ for (i = 0 ; i < N ; i++) {
+	snprintf(name, sizeof(name), "X-Foo-%d-%c", i, 'A'+(i%26));
+	snprintf(body2, sizeof(body2), "value %d %c", i, 'A'+(i%26));
+	val = spool_getheader(cache, name);
+	CU_ASSERT_PTR_NOT_NULL(val);
+	CU_ASSERT_STRING_EQUAL(val0, body2);
+	CU_ASSERT_PTR_NULL(val1);
+ }
+
+ spool_free_hdrcache(cache);
+#undef N
+}
+
+static void test_replace(void)
+{
+#define FOOBAR1	 "If music be the foo of love"
+#define FOOBAR2	 "Foo glorious foo"
+#define FOOBAR3	 "Foo is an important part of a balanced diet"
+		 /* apologies to Fran Liebowitz */
+#define FOOBAR4	 "Foo and Drug Administration"
+ hdrcache_t cache;
+ const char **val;
+
+ cache = spool_new_hdrcache();
+ CU_ASSERT_PTR_NOT_NULL(cache);
+
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NULL(val);
+
+ /* replace a single line */
+ spool_cache_header(xstrdup("From"), xstrdup(HFROM), cache);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM);
+ CU_ASSERT_PTR_NULL(val1);
+
+ spool_replace_header(xstrdup("From"), xstrdup(HFROM2), cache);
+ val = spool_getheader(cache, "From");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, HFROM2);
+ CU_ASSERT_PTR_NULL(val1);
+
+ /* replace multiple lines with one */
+ spool_cache_header(xstrdup("X-FooBar"), xstrdup(FOOBAR1), cache);
+ spool_cache_header(xstrdup("X-FooBar"), xstrdup(FOOBAR2), cache);
+ spool_cache_header(xstrdup("X-FooBar"), xstrdup(FOOBAR3), cache);
+ val = spool_getheader(cache, "X-FooBar");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, FOOBAR1);
+ CU_ASSERT_STRING_EQUAL(val1, FOOBAR2);
+ CU_ASSERT_STRING_EQUAL(val2, FOOBAR3);
+ CU_ASSERT_PTR_NULL(val3);
+
+ spool_replace_header(xstrdup("X-FooBar"), xstrdup(FOOBAR4), cache);
+ val = spool_getheader(cache, "X-FooBar");
+ CU_ASSERT_PTR_NOT_NULL(val);
+ CU_ASSERT_STRING_EQUAL(val0, FOOBAR4);
+ CU_ASSERT_PTR_NULL(val1);
+
+ spool_free_hdrcache(cache);
+#undef FOOBAR1
+#undef FOOBAR2
+#undef FOOBAR3
+#undef FOOBAR4
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/squat.testc Added

@@ -0,0 +1,131 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "imap/squat_internal.h"
+
+static void test_coding_int32(void)
+{
+ SquatInt32 out;
+ char *r;
+ char buf4;
+#define TESTCASE(value) \
+{ \
+ SquatInt32 _v = (value); \
+ memset(buf, 0xa5, sizeof(buf)); \
+ r = squat_encode_32(buf, _v); \
+ CU_ASSERT_PTR_EQUAL(r, buf+4); \
+ out = squat_decode_32(buf); \
+ CU_ASSERT_EQUAL(out, _v); \
+}
+
+ TESTCASE(0x0);
+ TESTCASE(0x1);
+ TESTCASE(0x100);
+ TESTCASE(0x10000);
+ TESTCASE(0x1000000);
+ TESTCASE(0x80);
+ TESTCASE(0x8000);
+ TESTCASE(0x800000);
+ TESTCASE(0x80000000);
+ TESTCASE(0xff);
+ TESTCASE(0xffff);
+ TESTCASE(0xffffff);
+ TESTCASE(0xffffffff);
+ TESTCASE(0xcafebabe);
+ TESTCASE(0xbdefaced);
+#undef TESTCASE
+}
+
+static void test_coding_int64(void)
+{
+ SquatInt64 out;
+ char *r;
+ char buf8;
+#define TESTCASE(value) \
+{ \
+ SquatInt64 _v = (value); \
+ memset(buf, 0xa5, sizeof(buf)); \
+ r = squat_encode_64(buf, _v); \
+ CU_ASSERT_PTR_EQUAL(r, buf+8); \
+ out = squat_decode_64(buf); \
+ CU_ASSERT_EQUAL(out, _v); \
+}
+
+ TESTCASE(0x0);
+ TESTCASE(0x1);
+ TESTCASE(0x100);
+ TESTCASE(0x10000);
+ TESTCASE(0x1000000);
+ TESTCASE(0x100000000ULL);
+ TESTCASE(0x10000000000ULL);
+ TESTCASE(0x1000000000000ULL);
+ TESTCASE(0x100000000000000ULL);
+ TESTCASE(0x80);
+ TESTCASE(0x8000);
+ TESTCASE(0x800000);
+ TESTCASE(0x80000000);
+ TESTCASE(0x8000000000ULL);
+ TESTCASE(0x800000000000ULL);
+ TESTCASE(0x80000000000000ULL);
+ TESTCASE(0x8000000000000000ULL);
+ TESTCASE(0xff);
+ TESTCASE(0xffff);
+ TESTCASE(0xffffff);
+ TESTCASE(0xffffffff);
+ TESTCASE(0xffffffffffULL);
+ TESTCASE(0xffffffffffffULL);
+ TESTCASE(0xffffffffffffffULL);
+ TESTCASE(0xffffffffffffffffULL);
+ TESTCASE(0xcafebabebdefacedULL);
+#undef TESTCASE
+}
+
+/* test the variable-length int encoding */
+static void test_coding_I(void)
+{
+ SquatInt64 out;
+ int count;
+ const char *s;
+ char *r;
+ char buf9;
+#define TESTCASE(value) \
+{ \
+ SquatInt64 _v = (value); \
+ memset(buf, 0xa5, sizeof(buf)); \
+ count = squat_count_encode_I(_v); \
+ CU_ASSERT(count >= 1); \
+ CU_ASSERT(count <= 9); \
+ r = squat_encode_I(buf, _v); \
+ CU_ASSERT_PTR_EQUAL(r, buf+count); \
+ s = buf; \
+ out = squat_decode_I(&s); \
+ CU_ASSERT_EQUAL(out, _v); \
+ CU_ASSERT_PTR_EQUAL((char *)s, buf+count); \
+}
+
+ TESTCASE(0x0);
+ TESTCASE(0x1);
+ TESTCASE(0x100);
+ TESTCASE(0x10000);
+ TESTCASE(0x1000000);
+ TESTCASE(0x100000000ULL);
+ TESTCASE(0x10000000000ULL);
+ TESTCASE(0x1000000000000ULL);
+ TESTCASE(0x100000000000000ULL);
+ TESTCASE(0x80);
+ TESTCASE(0x8000);
+ TESTCASE(0x800000);
+ TESTCASE(0x80000000);
+ TESTCASE(0x8000000000ULL);
+ TESTCASE(0x800000000000ULL);
+ TESTCASE(0x80000000000000ULL);
+ TESTCASE(0xff);
+ TESTCASE(0xffff);
+ TESTCASE(0xffffff);
+ TESTCASE(0xffffffff);
+ TESTCASE(0xffffffffffULL);
+ TESTCASE(0xffffffffffffULL);
+ TESTCASE(0xffffffffffffffULL);
+ TESTCASE(0x4afebabebdefacedULL);
+#undef TESTCASE
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/strarray.testc Added

@@ -0,0 +1,1512 @@
+#include "cunit/cunit.h"
+#include "xmalloc.h"
+#include "bsearch.h"
+#include "strarray.h"
+
+static void test_fini_null(void)
+{
+    /* _fini(NULL) is harmless */
+    strarray_fini(NULL);
+    /* _free(NULL) is harmless */
+    strarray_free(NULL);
+}
+
+static void test_auto(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    char *s1;
+    char *s2;
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    s1 = xstrdup("lorem ipsum");
+    strarray_appendm(&sa, s1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(&sa, 0), s1);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(&sa, -1), s1);
+
+    s2 = xstrdup("dolor sit");
+    strarray_appendm(&sa, s2);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(&sa, 0), s1);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(&sa, 1), s2);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(&sa, -1), s2);
+
+    strarray_fini(&sa);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT_EQUAL(sa.alloc, 0);
+    CU_ASSERT_PTR_NULL(sa.data);
+}
+
+static void test_heap(void)
+{
+    strarray_t *sa = strarray_new();
+    char *s1;
+    char *s2;
+
+    CU_ASSERT_EQUAL(sa->count, 0);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NULL((char *)strarray_nth(sa, 0));
+    CU_ASSERT_PTR_NULL((char *)strarray_nth(sa, -1));
+
+    s1 = xstrdup("lorem ipsum");
+    strarray_appendm(sa, s1);
+    CU_ASSERT_EQUAL(sa->count, 1);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(sa, 0), s1);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(sa, -1), s1);
+
+    s2 = xstrdup("dolor sit");
+    strarray_appendm(sa, s2);
+    CU_ASSERT_EQUAL(sa->count, 2);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(sa, 0), s1);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(sa, 1), s2);
+    CU_ASSERT_PTR_EQUAL((char *)strarray_nth(sa, -1), s2);
+
+    strarray_free(sa);
+}
+
+static void test_set(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD0REP "DeLorean"
+#define WORD0REP2 "Jiggawatts"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD2REP "DOLORES"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_append(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    strarray_set(&sa, 0, WORD0REP);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP);
+
+    strarray_set(&sa, -1, WORD0REP2);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    strarray_set(&sa, 2, WORD2REP);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2REP);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD0REP
+#undef WORD0REP2
+#undef WORD1
+#undef WORD2
+#undef WORD2REP
+#undef WORD3
+#undef WORD4
+}
+
+static void test_setm(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD0REP "DeLorean"
+#define WORD0REP2 "Jiggawatts"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD2REP "DOLORES"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_appendm(&sa, xstrdup(WORD0));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    strarray_setm(&sa, 0, xstrdup(WORD0REP));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP);
+
+    strarray_setm(&sa, -1, xstrdup(WORD0REP2));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+
+    strarray_appendm(&sa, xstrdup(WORD1));
+    strarray_appendm(&sa, xstrdup(WORD2));
+    strarray_appendm(&sa, xstrdup(WORD3));
+    strarray_appendm(&sa, xstrdup(WORD4));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    strarray_setm(&sa, 2, xstrdup(WORD2REP));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0REP2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2REP);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD0REP
+#undef WORD0REP2
+#undef WORD1
+#undef WORD2
+#undef WORD2REP
+#undef WORD3
+#undef WORD4
+}
+
+static void test_insert(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_insert(&sa, 0, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    strarray_insert(&sa, -1, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+
+    strarray_insert(&sa, 0, WORD2);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD0);
+
+    strarray_insert(&sa, -1, WORD3);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD0);
+
+    strarray_insert(&sa, 2, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD4);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_insertm(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_insertm(&sa, 0, xstrdup(WORD0));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    strarray_insertm(&sa, -1, xstrdup(WORD1));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+
+    strarray_insertm(&sa, 0, xstrdup(WORD2));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD0);
+
+    strarray_insertm(&sa, -1, xstrdup(WORD3));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD0);
+
+    strarray_insertm(&sa, 2, xstrdup(WORD4));
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD4);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+/* test that _set(), _setm(), _insert() and _insertm() of a bad
+ * index will fail silently and leave no side effects including
+ * memory leaks */
+static void test_bad_index(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+    char *s = xstrdup(WORD0);
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    /* when the strarray is empty, -1 is a bad index */
+
+    strarray_setm(&sa, -1, s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_set(&sa, -1, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_insertm(&sa, -1, s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_insert(&sa, -1, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    /* a negative number larger than the (non-zero) count is a bad index */
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+
+    strarray_setm(&sa, -4, s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, -1), WORD2);
+
+    strarray_set(&sa, -4, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, -1), WORD2);
+
+    strarray_insertm(&sa, -4, s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, -1), WORD2);
+
+    strarray_insert(&sa, -4, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, -1), WORD2);
+
+    free(s);
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+
+/* test building a sparse array with _set() and _setm() */
+static void test_sparse_set(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_set(&sa, 3, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 1));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 2));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, -1), WORD0);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+}
+
+static void test_join(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    char *s;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    s = strarray_join(&sa, NULL);
+    CU_ASSERT_PTR_NULL(s);
+
+    s = strarray_join(&sa, " ");
+    CU_ASSERT_PTR_NULL(s);
+
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    s = strarray_join(&sa, NULL);
+    CU_ASSERT_STRING_EQUAL(s, WORD0""WORD1""WORD2""WORD3""WORD4);
+    free(s);
+
+    s = strarray_join(&sa, " ");
+    CU_ASSERT_STRING_EQUAL(s, WORD0" "WORD1" "WORD2" "WORD3" "WORD4);
+    free(s);
+
+    s = strarray_join(&sa, "-X-");
+    CU_ASSERT_STRING_EQUAL(s, WORD0"-X-"WORD1"-X-"WORD2"-X-"WORD3"-X-"WORD4);
+    free(s);
+
+    /* check that sa is unharmed by the join */
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+/* regression test for a bug discovered while reading the
+ * strarray source when triaging Coverity defects. */
+static void test_join_initial_null(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    char *s;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    /* 0 element is NULL */
+    strarray_set(&sa, 1, WORD0);
+    strarray_set(&sa, 2, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    s = strarray_join(&sa, NULL);
+    CU_ASSERT_STRING_EQUAL(s, WORD0""WORD1);
+    free(s);
+
+    s = strarray_join(&sa, " ");
+    CU_ASSERT_STRING_EQUAL(s, WORD0" "WORD1);
+    free(s);
+
+    s = strarray_join(&sa, "-X-");
+    CU_ASSERT_STRING_EQUAL(s, WORD0"-X-"WORD1);
+    free(s);
+
+    /* check that sa is unharmed by the join */
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+}
+
+static void test_split(void)
+{
+    strarray_t *sa;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    /* 5 words, space separator */
+    sa = strarray_split(WORD0" "WORD1" "WORD2" "WORD3" "WORD4, " ", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+    strarray_free(sa);
+
+    /* 5 words, NULL separator (whitespace) */
+    sa = strarray_split(WORD0" "WORD1"\t"WORD2"\r"WORD3"\n"WORD4, NULL, 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+    strarray_free(sa);
+
+    /* 5 words, several separators */
+    sa = strarray_split(WORD0"("WORD1")"WORD2""WORD3""WORD4, "()", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+    strarray_free(sa);
+
+    /* splitm - takes ownership of a strdup()d argument */
+    sa = strarray_splitm(xstrdup(WORD0" "WORD1" "WORD2" "WORD3" "WORD4), " ", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+    strarray_free(sa);
+
+    /* nsplit - specify a byte range to copy and split */
+    sa = strarray_nsplit(WORD0" "WORD1" "WORD2" "WORD3" "WORD4,
+			 sizeof(WORD0)+sizeof(WORD1)+sizeof(WORD2), " ", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 3);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    strarray_free(sa);
+
+    /* split with surrounding whitespace */
+    sa = strarray_split(WORD0"| "WORD1" | "WORD2" |"WORD3" | "WORD4"| ", "|", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 6);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), " "WORD1" ");
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), " "WORD2" ");
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3" ");
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), " "WORD4);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 5), " ");
+    strarray_free(sa);
+
+    /* trim surrounding whitespace */
+    sa = strarray_split(WORD0"| "WORD1" | "WORD2" |"WORD3" | "WORD4"| ", "|", STRARRAY_TRIM);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+    strarray_free(sa);
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_remove(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    char *s;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    s = strarray_remove(&sa, 2);
+    CU_ASSERT_STRING_EQUAL(s, WORD2);
+    free(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD4);
+
+    s = strarray_remove(&sa, 0);
+    CU_ASSERT_STRING_EQUAL(s, WORD0);
+    free(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD4);
+
+    s = strarray_remove(&sa, -1);
+    CU_ASSERT_STRING_EQUAL(s, WORD4);
+    free(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD3);
+
+    s = strarray_remove(&sa, 1);
+    CU_ASSERT_STRING_EQUAL(s, WORD3);
+    free(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD1);
+
+    s = strarray_remove(&sa, 0);
+    CU_ASSERT_STRING_EQUAL(s, WORD1);
+    free(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+
+    s = strarray_remove(&sa, 0);
+    CU_ASSERT_PTR_NULL(s);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_takevf(void)
+{
+    strarray_t *sa;
+    char **ss;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    /* 5 words, space separator */
+    sa = strarray_split(WORD0" "WORD1" "WORD2" "WORD3" "WORD4, " ", 0);
+    CU_ASSERT_PTR_NOT_NULL(sa);
+    CU_ASSERT_EQUAL(sa->count, 5);
+    CU_ASSERT(sa->alloc >= sa->count);
+    CU_ASSERT_PTR_NOT_NULL(sa->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(sa, 4), WORD4);
+
+    ss = strarray_takevf(sa);
+    /* note: takevf frees the strarray itself */
+    CU_ASSERT_PTR_NOT_NULL(ss);
+    CU_ASSERT_STRING_EQUAL(ss0, WORD0);
+    CU_ASSERT_STRING_EQUAL(ss1, WORD1);
+    CU_ASSERT_STRING_EQUAL(ss2, WORD2);
+    CU_ASSERT_STRING_EQUAL(ss3, WORD3);
+    CU_ASSERT_STRING_EQUAL(ss4, WORD4);
+    CU_ASSERT_PTR_NULL(ss5);
+
+    free(ss0);
+    free(ss1);
+    free(ss2);
+    free(ss3);
+    free(ss4);
+    free(ss);
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_truncate(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    /* expand the array */
+    strarray_truncate(&sa, 7);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 7);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 5));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 6));
+
+    /* shrink the array */
+    strarray_truncate(&sa, 4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+
+    /* shrink the array harder */
+    strarray_truncate(&sa, 3);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+
+    /* shrink the array to nothing */
+    strarray_truncate(&sa, 0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    /* whether sa.data is NULL is undefined at this time */
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_find(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    int i;
+#define WORD0	"lorem"
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD1u	"IPSUM"
+#define WORD1c	"Ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 6);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD4);
+
+    /* search for something which isn't there */
+    i = strarray_find(&sa, "NotHere", 0);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which isn't there, starting off the end */
+    i = strarray_find(&sa, "NotHere", 7);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there */
+    i = strarray_find(&sa, WORD1, 0);
+    CU_ASSERT_EQUAL(i, 1);
+    i = strarray_find(&sa, WORD1, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which isn't there but whose case analogue is */
+    i = strarray_find(&sa, WORD1u, 0);
+    CU_ASSERT_EQUAL(i, -1);
+    i = strarray_find(&sa, WORD1c, 0);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there, starting off the end */
+    i = strarray_find(&sa, WORD1, 7);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there multiple times */
+    i = strarray_find(&sa, WORD0, 0);
+    CU_ASSERT_EQUAL(i, 0);
+    i = strarray_find(&sa, WORD0, i+1);
+    CU_ASSERT_EQUAL(i, 4);
+    i = strarray_find(&sa, WORD0, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD1u
+#undef WORD1c
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_find_case(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    int i;
+#define WORD0	"Lorem"
+#define WORD0u	"LOREM"
+#define WORD0l	"lorem"
+#define WORD0i	"lOREM"
+#define WORD1	"iPSum"
+#define WORD1u	"IPSUM"
+#define WORD1l	"ipsum"
+#define WORD1i	"IpsUM"
+#define WORD2	"DOLOR"
+#define WORD3	"sit"
+#define WORD4	"ameT"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 6);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD4);
+
+    /* search for something which isn't there */
+    i = strarray_find_case(&sa, "NotHere", 0);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which isn't there, starting off the end */
+    i = strarray_find_case(&sa, "NotHere", 7);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there ... */
+
+    /* ... original capitalisation */
+    i = strarray_find_case(&sa, WORD1, 0);
+    CU_ASSERT_EQUAL(i, 1);
+    i = strarray_find_case(&sa, WORD1, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... lowercase key */
+    i = strarray_find_case(&sa, WORD1l, 0);
+    CU_ASSERT_EQUAL(i, 1);
+    i = strarray_find_case(&sa, WORD1l, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... uppercase key */
+    i = strarray_find_case(&sa, WORD1u, 0);
+    CU_ASSERT_EQUAL(i, 1);
+    i = strarray_find_case(&sa, WORD1u, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... inverted case key */
+    i = strarray_find_case(&sa, WORD1i, 0);
+    CU_ASSERT_EQUAL(i, 1);
+    i = strarray_find_case(&sa, WORD1i, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there, starting off the end ... */
+    /* ... original capitalisation */
+    i = strarray_find_case(&sa, WORD1, 7);
+    CU_ASSERT_EQUAL(i, -1);
+    /* ... lowercase key */
+    i = strarray_find_case(&sa, WORD1u, 7);
+    CU_ASSERT_EQUAL(i, -1);
+    /* ... uppercase key */
+    i = strarray_find_case(&sa, WORD1l, 7);
+    CU_ASSERT_EQUAL(i, -1);
+    /* ... inverted case key */
+    i = strarray_find_case(&sa, WORD1i, 7);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* search for something which is there multiple times ... */
+
+    /* ... original capitalisation */
+    i = strarray_find_case(&sa, WORD0, 0);
+    CU_ASSERT_EQUAL(i, 0);
+    i = strarray_find_case(&sa, WORD0, i+1);
+    CU_ASSERT_EQUAL(i, 4);
+    i = strarray_find_case(&sa, WORD0, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... lowercase key */
+    i = strarray_find_case(&sa, WORD0u, 0);
+    CU_ASSERT_EQUAL(i, 0);
+    i = strarray_find_case(&sa, WORD0u, i+1);
+    CU_ASSERT_EQUAL(i, 4);
+    i = strarray_find_case(&sa, WORD0u, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... uppercase key */
+    i = strarray_find_case(&sa, WORD0l, 0);
+    CU_ASSERT_EQUAL(i, 0);
+    i = strarray_find_case(&sa, WORD0l, i+1);
+    CU_ASSERT_EQUAL(i, 4);
+    i = strarray_find_case(&sa, WORD0l, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    /* ... inverted case key */
+    i = strarray_find_case(&sa, WORD0i, 0);
+    CU_ASSERT_EQUAL(i, 0);
+    i = strarray_find_case(&sa, WORD0i, i+1);
+    CU_ASSERT_EQUAL(i, 4);
+    i = strarray_find_case(&sa, WORD0i, i+1);
+    CU_ASSERT_EQUAL(i, -1);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD0u
+#undef WORD0l
+#undef WORD0i
+#undef WORD1
+#undef WORD1u
+#undef WORD1l
+#undef WORD1i
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+
+static void test_dup(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    strarray_t *dup;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    /* dup an empty array */
+    dup = strarray_dup(&sa);
+    CU_ASSERT_PTR_NOT_NULL(dup);
+    CU_ASSERT_PTR_NOT_EQUAL(dup, &sa);
+    CU_ASSERT_EQUAL(dup->count, 0);
+    CU_ASSERT(dup->alloc >= dup->count);
+    strarray_free(dup);
+
+    /* dup a non-empty array */
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 6);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD4);
+
+    dup = strarray_dup(&sa);
+    CU_ASSERT_PTR_NOT_NULL(dup);
+    CU_ASSERT_PTR_NOT_EQUAL(dup, &sa);
+    CU_ASSERT_EQUAL(dup->count, 6);
+    CU_ASSERT(dup->alloc >= dup->count);
+    CU_ASSERT_PTR_NOT_NULL(dup->data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 0), WORD0);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 0), (void *)strarray_nth(&sa, 0));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 1), WORD1);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 1), (void *)strarray_nth(&sa, 1));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 2), WORD2);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 2), (void *)strarray_nth(&sa, 2));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 3), WORD3);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 3), (void *)strarray_nth(&sa, 3));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 4), WORD0);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 4), (void *)strarray_nth(&sa, 4));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(dup, 5), WORD4);
+    CU_ASSERT_PTR_NOT_EQUAL((void *)strarray_nth(dup, 5), (void *)strarray_nth(&sa, 5));
+    strarray_free(dup);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_remove_all(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    /* removing from an empty array */
+    strarray_remove_all(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    /* removing a single item from a non-empty array */
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 6);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD4);
+
+    strarray_remove_all(&sa, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD4);
+
+    /* removing an item that appears more than once */
+    strarray_remove_all(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD4);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_pop(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+    char *s;
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    /* pop from an empty array */
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    /* popping items from a non-empty array */
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD4);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 6);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD4);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 5);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD0);
+    CU_ASSERT_STRING_EQUAL(s, WORD4);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD3);
+    CU_ASSERT_STRING_EQUAL(s, WORD0);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(s, WORD3);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+    CU_ASSERT_STRING_EQUAL(s, WORD2);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(s, WORD1);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NOT_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_STRING_EQUAL(s, WORD0);
+    free(s);
+
+    s = strarray_pop(&sa);
+    CU_ASSERT_PTR_NULL(s);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+#undef WORD4
+}
+
+static void test_sortuniq(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"INBOX"
+#define WORD1	"INBOX.a folder"
+#define WORD2	"INBOX.a.sub"
+#define WORD3	"INBOX.a.aaa"
+
+    /* initialise */
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD1);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD3);
+    /* duplicates */
+    strarray_append(&sa, WORD0);
+    strarray_append(&sa, WORD2);
+    strarray_append(&sa, WORD1);
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 7);
+
+    /* normal sort */
+    strarray_sort(&sa, cmpstringp_raw);
+
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 6), WORD2);
+
+    /* mbox order sort */
+    strarray_sort(&sa, cmpstringp_mbox);
+
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 4), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 5), WORD1);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 6), WORD1);
+
+    strarray_uniq(&sa);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 4);
+
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD3);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD2);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 3), WORD1);
+
+#undef WORD0
+#undef WORD1
+#undef WORD2
+#undef WORD3
+}
+
+static void test_add(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD0u	"LOREM"
+#define WORD1	"ipsum"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    /* _add() on an empty array appends */
+    strarray_add(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    /* _add() of an item already present is a no-op */
+    strarray_add(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    /* _add() of an item not already present (but whose case
+     * analogue is present) appends */
+    strarray_add(&sa, WORD0u);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0u);
+
+    /* _add() of an item not already present appends */
+    strarray_add(&sa, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0u);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    /* _add() of an item already present is a no-op */
+    strarray_add(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0u);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    strarray_add(&sa, WORD0u);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0u);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    strarray_add(&sa, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 3);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD0u);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 2), WORD1);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD0u
+#undef WORD1
+}
+
+static void test_add_case(void)
+{
+    strarray_t sa = STRARRAY_INITIALIZER;
+#define WORD0	"lorem"
+#define WORD0u	"LOREM"
+#define WORD1	"ipsum"
+
+    CU_ASSERT_EQUAL(strarray_size(&sa), 0);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, 0));
+    CU_ASSERT_PTR_NULL(strarray_nth(&sa, -1));
+
+    /* _add_case() on an empty array appends */
+    strarray_add_case(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    /* _add_case() of an item already present is a no-op */
+    strarray_add_case(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    /* _add_case() of an item not already present (but whose case
+     * analogue is present) is a no-op */
+    strarray_add_case(&sa, WORD0u);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 1);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+
+    /* _add_case() of an item not already present appends */
+    strarray_add_case(&sa, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+
+    /* _add_case() of an item already present is a no-op */
+    strarray_add_case(&sa, WORD0);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+
+    strarray_add_case(&sa, WORD0u);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+
+    strarray_add_case(&sa, WORD1);
+    CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+    CU_ASSERT(sa.alloc >= strarray_size(&sa));
+    CU_ASSERT_PTR_NOT_NULL(sa.data);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 0), WORD0);
+    CU_ASSERT_STRING_EQUAL(strarray_nth(&sa, 1), WORD1);
+
+    strarray_fini(&sa);
+#undef WORD0
+#undef WORD0u
+#undef WORD1
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/strconcat.testc Added

@@ -0,0 +1,83 @@
+#include <malloc.h>
+#include "cunit/cunit.h"
+#include "util.h"
+
+static void test_null(void)
+{
+ char *s;
+
+ s = strconcat((char *)NULL);
+ CU_ASSERT_PTR_NULL(s);
+}
+
+static void test_single(void)
+{
+ static const char word1 = "lorem";
+ char *s;
+
+ s = strconcat(word1, (char *)NULL);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, "lorem");
+ free(s);
+}
+
+static void test_multiple(void)
+{
+ static const char word1 = "lorem";
+ static const char word2 = "ipsum";
+ static const char word3 = "dolor";
+ static const char word4 = "sit";
+ static const char word5 = "amet";
+ static const char word6 = "consectetur adipisicing elit";
+ char *s;
+
+ s = strconcat(word1, " ", word2, " ", word3, " ",
+		 word4, " ", word5, ", ", word6,
+		 (char *)NULL);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, "lorem ipsum dolor sit amet, consectetur adipisicing elit");
+ free(s);
+}
+
+static void test_uncast_null(void)
+{
+ static const char word1 = "foo";
+ static const char word2 = "bar";
+ char *s;
+
+ /*
+ * On some platforms, a combination of the ABI model, default
+ * type of the "NULL" define, and the behaviour of varargs
+ * can screw up the usage of an uncast NULL as a terminator.
+ * This will tell us if we're on one of those.
+ */
+ s = strconcat(word1, NULL, word2, (char *)NULL);
+ CU_ASSERT_PTR_NOT_NULL(s);
+ CU_ASSERT_STRING_EQUAL(s, "foo");
+ free(s);
+}
+
+/* This doesn't really belong in this .c file
+ * but it's the least worst choice */
+static void test_strcmpsafe(void)
+{
+ /* chosen so word1 < word2 lexically */
+ static const char word1 = "bar";
+ static const char word2 = "foo";
+
+ /* basic behaviour is identical to strcmp() */
+ CU_ASSERT_EQUAL(strcmpsafe(word1, word1), 0);
+ CU_ASSERT_EQUAL(strcmpsafe(word2, word2), 0);
+ CU_ASSERT(strcmpsafe(word1, word2) < 0);
+ CU_ASSERT(strcmpsafe(word2, word1) > 0);
+
+ /* but it's safe with NULLs */
+ CU_ASSERT_EQUAL(strcmpsafe(NULL, NULL), 0);
+ CU_ASSERT_EQUAL(strcmpsafe("", NULL), 0);
+ CU_ASSERT_EQUAL(strcmpsafe(NULL, ""), 0);
+ CU_ASSERT(strcmpsafe(word1, NULL) > 0);
+ CU_ASSERT(strcmpsafe(word2, NULL) > 0);
+ CU_ASSERT(strcmpsafe(NULL, word1) < 0);
+ CU_ASSERT(strcmpsafe(NULL, word2) < 0);
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/syslog.c Added

@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <regex.h>
+#include <memory.h>
+#include <CUnit/CUnit.h>
+#include "cunit-syslog.h"
+
+#if !HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+extern int verbose;
+
+struct slmatch
+{
+ const char *re;	 /* NULL => disabled */
+ unsigned int count;
+ regex_t cre;	 /* compiled regex */
+};
+#define MAX_SLMATCH 32
+static unsigned int nslmatches = 0;
+static struct slmatch slmatchesMAX_SLMATCH;
+
+#if !defined(va_copy)
+# if defined(__va_copy)
+# define va_copy __va_copy
+# else
+# define va_copy(d,s) (d) = (s)
+# endif
+#endif
+
+static char *match_error(struct slmatch *sl, int r)
+{
+ static char buf2048;
+ int n;
+
+ buf0 = '\0';
+ if (sl->re)
+	snprintf(buf, sizeof(buf)-100, "/%s/: ", sl->re);
+
+ n = strlen(buf);
+ regerror(r, &sl->cre, buf+n, sizeof(buf)-n-1);
+ strcat(buf, "\n");
+
+ return buf;
+}
+
+static void vlog(int prio, const char *fmt, va_list args)
+{
+ if (nslmatches) {
+	int e = errno;	 /* save errno Just In Case */
+	va_list args2;
+	unsigned int i;
+	int r;
+	char line2048;
+
+	/* This only works for all cases because of the glibc
+	 * extension which supports %m in printf() */
+	va_copy(args2, args);
+	vsnprintf(line, sizeof(line), fmt, args2);
+	va_end(args2);
+
+	for (i = 0 ; i < MAX_SLMATCH ; i++) {
+	 if (!slmatchesi.re)
+		continue; /* empty slot */
+	 r = regexec(&slmatchesi.cre, line, 0, NULL, 0);
+	 if (!r) {
+		/* found */
+		if (verbose >= 2)
+		 fprintf(stderr, "\nSYSLOG matched /%s/\n", slmatchesi.re);
+		slmatchesi.count++;
+		break;
+	 }
+	 if (r != REG_NOMATCH) {
+		/* error */
+		const char *msg = match_error(&slmatchesi, r);
+		CU_assertImplementation(0, __LINE__, msg, __FILE__, NULL, CU_TRUE);
+		/* NOTREACHED */
+		break;
+	 }
+	}
+
+	errno = e;
+ }
+
+ /* glibc handles %m in vfprintf() so we don't need to do
+ * anything special to simulate that feature of syslog() */
+ /* TODO: find and expand %m on non-glibc platforms */
+
+ if (verbose < 2)
+	return;
+ fprintf(stderr, "\nSYSLOG %d", prio & LOG_PRIMASK);
+ vfprintf(stderr, fmt, args);
+ fprintf(stderr, "\n");
+ fflush(stderr);
+}
+
+#if defined(__GLIBC__)
+/* Under some but not all combinations of options, glibc
+ * defines syslog() as an inline that calls this function */
+void __syslog_chk(int prio, int whatever __attribute__((unused)),
+		 const char *fmt, ...)
+{
+ va_list args;
+
+ va_start(args, fmt);
+ vlog(prio, fmt, args);
+ va_end(args);
+}
+#endif
+
+void syslog(int prio, const char *fmt, ...)
+{
+ va_list args;
+
+ va_start(args, fmt);
+ vlog(prio, fmt, args);
+ va_end(args);
+}
+
+unsigned int CU_syslogMatchBegin(const char *re, const char *filename,
+				 unsigned int lineno)
+{
+ unsigned int i;
+ int r;
+
+ /* find an empty slot */
+ for (i = 0 ; i < MAX_SLMATCH ; i++) {
+	if (!slmatchesi.re) {
+	 /* found */
+	 slmatchesi.re = re;
+	 slmatchesi.count = 0;
+	 r = regcomp(&slmatchesi.cre, re, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+	 if (r) {
+		const char *msg = match_error(&slmatchesi, r);
+		memset(&slmatchesi, 0, sizeof(slmatchesi));
+		CU_assertImplementation(0, lineno, msg, filename, NULL, CU_TRUE);
+		/* NOTREACHED */
+		return 0;
+	 }
+	 nslmatches++;
+	 return i+1;
+	}
+ }
+ CU_assertImplementation(0, lineno, "No free syslog match slots", filename, NULL, CU_TRUE);
+ /* NOTREACHED */
+ return 0;
+}
+
+unsigned int CU_syslogMatchEnd(unsigned int match, const char **sp)
+{
+ unsigned int i;
+ unsigned int count = 0;
+ const char *s = NULL;
+
+ for (i = 0 ; i < MAX_SLMATCH ; i++) {
+	if (!slmatchesi.re)
+	 continue; /* empty slot */
+	if (match && match != i+1)
+	 continue; /* not the slot for @match */
+
+	if (!s)
+	 s = slmatchesi.re;
+	else
+	 s = "(multiple matches)";
+
+	count += slmatchesi.count;
+	regfree(&slmatchesi.cre);
+	memset(&slmatchesi, 0, sizeof(slmatchesi));
+	nslmatches--;
+	if (match)
+	 break;	/* only looking for a single slot */
+ }
+
+ if (match && !s) {
+	s = "invalid match number";
+	count = ~0U;
+ }
+
+ if (sp)
+	*sp = s;
+ return count;
+}
+
+/* Meta-test code for CU_*SYSLOG* macros. */
+
+#if 0
+static void test_syslog(void)
+{
+ int m1, m2;
+
+// /* invalid regular expression, 1st macro fails */
+// CU_SYSLOG_MATCH("foo");
+// syslog(LOG_ERR, "fnarp");
+// CU_ASSERT_SYSLOG(/*all*/0, 0);
+
+// /* no syslog messages => count is 0 */
+// CU_SYSLOG_MATCH("foo.*baz");
+// CU_ASSERT_SYSLOG(/*all*/0, 0);
+
+// /* one syslog message which doesn't match => count is 0,
+// * both macros succeed */
+// CU_SYSLOG_MATCH("foo.*baz");
+// syslog(LOG_ERR, "fnarp");
+// CU_ASSERT_SYSLOG(/*all*/0, 0);
+
+// /* one syslog message which does match => count is 1,
+// * both macros succeed */
+// CU_SYSLOG_MATCH("foo.*baz");
+// syslog(LOG_ERR, "foo bar baz");
+// CU_ASSERT_SYSLOG(/*all*/0, 1);
+
+// /* one syslog message which does match => count is 1,
+// * we check for 5, 2nd macro fails */
+// CU_SYSLOG_MATCH("foo.*baz");
+// syslog(LOG_ERR, "foo bar baz");
+// CU_ASSERT_SYSLOG(/*all*/0, 5);
+
+// /* one syslog message with multiple matches => count is 1,
+// * all 3 macros succeed */
+// CU_SYSLOG_MATCH("fuu.*bas");
+// CU_SYSLOG_MATCH("bleah");
+// syslog(LOG_ERR, "fuu bleah bas");
+// CU_ASSERT_SYSLOG(/*all*/0, 1);
+
+// /* one syslog message with multiple matches which are tracked
+// * separately => count is 1, all 4 macros succeed */
+// m1 = CU_SYSLOG_MATCH("fuu.*bas");
+// m2 = CU_SYSLOG_MATCH("bleah");
+// syslog(LOG_ERR, "fuu bleah bas");
+// CU_ASSERT_SYSLOG(m1, 1);
+// CU_ASSERT_SYSLOG(m2, 0);
+}
+#endif

cyrus-imapd-2.5.tar.gz/cunit/timeofday.c Added

@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <assert.h>
+#include <time.h>
+#include "timeofday.h"
+
+extern int verbose;
+
+#define MICROSEC_PER_SEC (1000000)
+
+struct trans
+{
+ /*
+ * We transform time using the formula
+ *
+ * reported_time = (actual_time - start) * factor + epoch;
+ *
+ * where 'factor' is actually fractional. Yes, I realise that
+ * 'start' is mathematically redundant but it makes the code
+ * marginally easier to write and read.
+ */
+ int64_t start;
+ int64_t epoch;
+ long factor_num;
+ long factor_den;
+};
+
+static int real_gettimeofday(struct timeval *, ...);
+
+#define MAX_TRANS_STACK	5
+static int n_trans_stack = 0;
+static struct trans trans_stackMAX_TRANS_STACK;
+static const struct trans identity = { 0, 0, 1, 1 };
+
+/*
+ * Basic time manipulation.
+ *
+ * Internal time format is microseconds since the Unix epoch
+ * in a signed 64b integer which is convenient to use and
+ * allows some headroom for scaling.
+ */
+
+static int64_t from_timeval(const struct timeval *tv)
+{
+ return (int64_t)tv->tv_usec + (int64_t)tv->tv_sec * MICROSEC_PER_SEC;
+}
+
+static void to_timeval(int64_t t, struct timeval *tv)
+{
+ tv->tv_sec = t / MICROSEC_PER_SEC;
+ tv->tv_usec = t % MICROSEC_PER_SEC;
+}
+
+static int64_t from_time_t(time_t tt)
+{
+ return (int64_t)tt * MICROSEC_PER_SEC;
+}
+
+static time_t to_time_t(int64_t t)
+{
+ return t / MICROSEC_PER_SEC;
+}
+
+static int64_t now(void)
+{
+ struct timeval tv = { 0xffffffff, 0xffffffff };
+ int r = real_gettimeofday(&tv, NULL);
+ assert(r == 0);
+ assert(tv.tv_sec != 0xffffffff);
+ assert(tv.tv_usec != 0xffffffff);
+ return from_timeval(&tv);
+}
+
+/*
+ * Time transform stack handling.
+ */
+
+static const struct trans *trans_top(void)
+{
+ return (n_trans_stack ? &trans_stackn_trans_stack-1 : &identity);
+}
+
+static int64_t transform(int64_t t)
+{
+ const struct trans *tr = trans_top();
+ int64_t tt = ((t - tr->start) * tr->factor_num) / tr->factor_den + tr->epoch;
+ return tt;
+}
+
+static void trans_push(const struct trans *tr)
+{
+ assert(n_trans_stack < MAX_TRANS_STACK);
+ trans_stackn_trans_stack++ = *tr;
+}
+
+/*
+ * Make the reported time go faster or slower from now on.
+ * Reported times are continuous across this function.
+ */
+void time_push_rate(long n, long d)
+{
+ struct trans tr = *trans_top();
+ tr.start = now();
+ tr.epoch = transform(tr.start);
+ tr.factor_num *= n;
+ tr.factor_den *= d;
+ trans_push(&tr);
+}
+
+/*
+ * Stop the flow of reported time
+ */
+void time_push_stop(void)
+{
+ time_push_rate(0, 1);
+}
+
+/*
+ * Report a given fixed time
+ */
+void time_push_fixed(time_t fixed)
+{
+ struct trans tr = *trans_top();
+ tr.start = 0;
+ tr.epoch = from_time_t(fixed);
+ tr.factor_num = 0;
+ tr.factor_den = 1;
+ trans_push(&tr);
+}
+
+void time_pop(void)
+{
+ assert(n_trans_stack > 0);
+ --n_trans_stack;
+}
+
+void time_restore(void)
+{
+ n_trans_stack = 0;
+}
+
+/*
+ * Platform-specific libc interception code
+ */
+
+#if defined(__GLIBC__)
+
+/* call the real libc function */
+static int real_gettimeofday(struct timeval *tv, ...)
+{
+ extern int __gettimeofday(struct timeval *, ...);
+ return __gettimeofday(tv, NULL);
+}
+
+/* provide a function to hide the libc weak alias */
+int gettimeofday(struct timeval *tv, ...)
+{
+ to_timeval(transform(now()), tv);
+ return 0;
+}
+
+time_t time(time_t *tp)
+{
+ time_t tt = to_time_t(transform(now()));
+ if (tp) *tp = tt;
+ return tt;
+}
+
+#else
+#error "Don't know how to intercept gettimeofday for this libc"
+#endif
+
+
+/*
+ * Tests - not usefully runnable, sorry.
+ */
+#if 0
+static void test_time_speedup(void)
+{
+ time_t clock;
+
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_push_rate(5, 1)\n", stderr);
+ time_push_rate(10, 1);
+
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_pop()\n", stderr);
+ time_pop();
+
+ time(&clock); fputs(ctime(&clock), stderr);
+}
+
+static void test_time_slowdown(void)
+{
+ time_t clock;
+ int i;
+
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_push_rate(1, 10)\n", stderr);
+ time_push_rate(1, 5);
+
+ for (i = 0 ; i < 20 ; i++) {
+	time(&clock); fputs(ctime(&clock), stderr);
+	sleep(1);
+ }
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_pop()\n", stderr);
+ time_pop();
+
+ time(&clock); fputs(ctime(&clock), stderr);
+}
+
+static void test_time_fixed(void)
+{
+ time_t clock;
+
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_push_fixed(1354928400)\n", stderr);
+ time_push_fixed(1354928400);
+
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+ sleep(1);
+ time(&clock); fputs(ctime(&clock), stderr);
+
+ fputs("time_pop()\n", stderr);
+ time_pop();
+
+ time(&clock); fputs(ctime(&clock), stderr);
+}
+
+static void test_time_fixed2(void)
+{
+ struct timeval tv;
+
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+
+ fputs("time_push_fixed(1354928400)\n", stderr);
+ time_push_fixed(1354928400);
+
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+ sleep(1);
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+ sleep(1);
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+ sleep(1);
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+ sleep(1);
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+
+ fputs("time_pop()\n", stderr);
+ time_pop();
+
+ gettimeofday(&tv, NULL); fputs(ctime(&tv.tv_sec), stderr);
+}
+#endif
+

cyrus-imapd-2.5.tar.gz/cunit/timeofday.h Added

@@ -0,0 +1,54 @@
+/* timeofday.c - time of day warping utilities for unit tests
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_CUNIT_TIMEOFDAY_H__
+#define __CYRUS_CUNIT_TIMEOFDAY_H__
+
+#include <sys/types.h>
+
+extern void time_push_rate(long n, long d);
+extern void time_push_stop(void);
+extern void time_push_fixed(time_t fixed);
+extern void time_pop(void);
+extern void time_restore(void);
+
+#endif /* __CYRUS_CUNIT_TIMEOFDAY_H__ */

cyrus-imapd-2.5.tar.gz/cunit/timeout.c Added

@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <memory.h>
+#include <sys/poll.h>
+#include <sys/wait.h>
+#include <sys/signal.h>
+#include <errno.h>
+#include "timeout.h"
+
+static void (*timeout_callback)(void);
+static pid_t timeout_pid = -1;
+static int timeout_fd = -1;
+
+#define PIPE_READ	0
+#define PIPE_WRITE	1
+#define CMD_BEGIN	'B'
+#define CMD_END		'E'
+
+static void sigusr1_handler(int sig __attribute__((unused)))
+{
+// fprintf(stderr, "timeout: received SIGUSR1\n");
+ if (timeout_callback)
+	timeout_callback();
+}
+
+static void timeout_mainloop(int fd, pid_t pid)
+{
+ struct pollfd pfd;
+ char c;
+ int r;
+ int timeout = -1;
+
+ for (;;) {
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+
+// if (timeout < 0)
+// fprintf(stderr, "timeout: waiting for command\n");
+// else
+// fprintf(stderr, "timeout: waiting for command or %d.%03d sec\n", timeout/1000, timeout % 1000);
+
+	/* wait for command from the parent or timeout */
+	r = poll(&pfd, 1, timeout);
+// fprintf(stderr, "timeout: awoke, r=%d\n", r);
+	if (r < 0) {
+	 perror("timeout: poll");
+	 exit(1);
+	}
+	if (r == 0) {
+	 /* timed out */
+// fprintf(stderr, "timeout: sending USR1 to %d\n", (int)pid);
+	 kill(pid, SIGUSR1);
+	 timeout = -1;
+	 continue;
+	}
+	if (r != 1 || !pfd.revents) {
+	 /* WTF?? */
+	 fprintf(stderr, "timeout: weirdness from poll: "
+			 "r=%d pfd.revents=%d\n",
+			 r, pfd.revents);
+	 exit(1);
+	}
+
+	r = read(fd, &c, 1);
+	if (r < 0) {
+	 perror("timeout: read");
+	 exit(1);
+	}
+	if (r == 0) {
+	 /* EOF: parent closed pipe */
+	 exit(0);
+	}
+	if (r != 1) {
+	 fprintf(stderr, "timeout: short read\n");
+	 exit(1);
+	}
+
+	switch (c) {
+	case CMD_BEGIN:
+	 timeout = -1;
+	 r = read(fd, &timeout, sizeof(timeout));
+	 if (r < 0) {
+		perror("timeout: read");
+		exit(1);
+	 }
+	 if (r == 0) {
+		/* EOF: parent closed pipe */
+		exit(0);
+	 }
+	 if (r != sizeof(timeout)) {
+		fprintf(stderr, "timeout: short read\n");
+		exit(1);
+	 }
+	 break;
+
+	case CMD_END:
+	 timeout = -1;
+	 break;
+
+	default:
+	 fprintf(stderr, "timeout: Unknown command '%c'\n", c);
+	 exit(1);
+	}
+ }
+}
+
+int timeout_init(void (*cb)(void))
+{
+ int pipefd2;
+ pid_t pid;
+ struct sigaction sa;
+ int r;
+
+ timeout_callback = cb;
+
+ /* set up a pipe to communicate with the
+ * timeout process */
+ r = pipe(pipefd);
+ if (r < 0) {
+	perror("timeout: pipe");
+	return -1;
+ }
+
+ /* fork the timeout process */
+ pid = fork();
+ if (pid < 0) {
+	perror("timeout: fork");
+	return -1;
+ }
+ if (pid) {
+	/* parent */
+	timeout_pid = pid;
+	timeout_fd = dup2(pipefdPIPE_WRITE, 253);
+	if (timeout_fd < 0) {
+	 perror("timeout: dup2");
+	 return -1;
+	}
+	close(pipefdPIPE_READ);
+	close(pipefdPIPE_WRITE);
+
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = sigusr1_handler;
+	sa.sa_flags = SA_NODEFER;
+	sigaction(SIGUSR1, &sa, NULL);
+ } else {
+	/* child */
+	close(pipefdPIPE_WRITE);
+	timeout_mainloop(pipefdPIPE_READ, getppid());
+	exit(0);
+ }
+
+ return 0;
+}
+
+int timeout_begin(int millisec)
+{
+ int c;
+ int r;
+
+// fprintf(stderr, "timeout_begin\n");
+ if (timeout_fd < 0)
+	return -1;
+
+ c = CMD_BEGIN;
+ r = write(timeout_fd, &c, 1);
+ if (r < 0) {
+	perror("timeout: write");
+	return -1;
+ }
+ r = write(timeout_fd, &millisec, sizeof(millisec));
+ if (r < 0) {
+	perror("timeout: write");
+	return -1;
+ }
+ return 0;
+}
+
+int timeout_end(void)
+{
+ int c;
+ int r;
+
+// fprintf(stderr, "timeout_end\n");
+ if (timeout_fd < 0)
+	return -1;
+
+ c = CMD_END;
+ r = write(timeout_fd, &c, 1);
+ if (r < 0) {
+	perror("timeout: write");
+	return -1;
+ }
+ return 0;
+}
+
+void timeout_fini(void)
+{
+ int r;
+ int status;
+
+ if (timeout_fd >= 0) {
+	close(timeout_fd);
+	timeout_fd = -1;
+ }
+
+ if (timeout_pid > 0) {
+	r = kill(timeout_pid, SIGTERM);
+	if (r < 0 && errno != ESRCH)
+	 perror("timeout: kill");
+	else
+	 waitpid(timeout_pid, &status, 0);
+	timeout_pid = -1;
+ }
+
+ signal(SIGUSR1, SIG_IGN);
+}
+

cyrus-imapd-2.5.tar.gz/cunit/timeout.h Added

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CUNIT_TIMEOUT_H__
+#define __CUNIT_TIMEOUT_H__ 1
+
+extern int timeout_init(void (*cb)(void));
+extern int timeout_begin(int millisec);
+extern int timeout_end(void);
+extern void timeout_fini(void);
+
+#endif /* __CUNIT_TIMEOUT_H__ */

cyrus-imapd-2.5.tar.gz/cunit/times.testc Added

@@ -0,0 +1,445 @@
+/* test_time.c -- regression test for cyrus time routines
+ *
+ * Copyright (c) 2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <assert.h>
+#include "cunit/cunit.h"
+#include "times.h"
+#include "cunit/timezones.h"
+
+#define UNINIT_TIMET ((time_t)0xdeadbeef)
+
+static int set_up(void)
+{
+ /*
+ * Ensure that libc's idea of which timezone we're in is
+ * predictable, in case any of the tests here depend on
+ * it. The timezone is faked up to simulate Australian
+ * Eastern Standard time, only because I live there.
+ */
+ push_tz(TZ_MELBOURNE);
+ return 0;
+}
+
+static int tear_down(void)
+{
+ restore_tz();
+ return 0;
+}
+
+
+static void
+test_rfc3501(void)
+{
+ time_t t;
+ int r;
+
+ /* Well-formed full RFC3501 format with 2-digit day
+ * "dd-mmm-yyyy HH:MM:SS zzzzz" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-2010 03:19:52 +1100", &t);
+ CU_ASSERT_EQUAL(r, 26);
+ CU_ASSERT_EQUAL(t, 1287073192);
+
+ /* Well-formed full RFC3501 format with 1-digit day
+ * " d-mmm-yyyy HH:MM:SS zzzzz" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501(" 5-Oct-2010 03:19:52 +1100", &t);
+ CU_ASSERT_EQUAL(r, 26);
+ CU_ASSERT_EQUAL(t, 1286209192);
+}
+
+static void
+test_military_timezones(void)
+{
+ time_t t;
+ int r;
+ time_t zulu = 813727192;
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = UTC, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-Z", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * lowercase 1-char timezone = UTC, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-z", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = +0100, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-A", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu-1*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = +0200, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-B", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu-2*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = +0900, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-I", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu-9*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * erroneous uppercase 1-char timezone, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-J", &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = +1000, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-K", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu-10*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * 1-char timezone = +1200, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-M", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu-12*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * uppercase 1-char timezone = -0100, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-N", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu+1*3600);
+
+ /* Well-formed legacy format with 2-digit day, 2-digit year,
+ * 1-char timezone = -1200, "dd-mmm-yy HH:MM:SS-z" */
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501("15-Oct-95 03:19:52-Y", &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, zulu+12*3600);
+}
+
+/* " d-mmm-yy HH:MM:SS-z" */
+/* "dd-mmm-yy HH:MM:SS-zz" */
+/* " d-mmm-yy HH:MM:SS-zz" */
+/* "dd-mmm-yy HH:MM:SS-zzz" */
+/* " d-mmm-yy HH:MM:SS-zzz" */
+
+/*
+ * Test time_from_rfc822()
+ */
+static void test_parse_rfc822(void)
+{
+ static const char DATETIME = "Tue, 16 Nov 2010 12:46:49 +1100";
+ static const time_t TIMET = 1289872009;
+ time_t t;
+ int r;
+
+ /*
+ * Convert the datetime string into a time_t, which is always
+ * expressed in UTC regardless of the current timezone.
+ */
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME, &t);
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_EQUAL(t, TIMET);
+
+ push_tz(TZ_UTC);
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME, &t);
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_EQUAL(t, TIMET);
+ pop_tz();
+
+ push_tz(TZ_NEWYORK);
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME, &t);
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_EQUAL(t, TIMET);
+ pop_tz();
+}
+
+/*
+ * Test time_to_rfc822()
+ */
+static void test_gen_rfc822(void)
+{
+ static const char DATETIME_MEL = "Fri, 26 Nov 2010 14:22:02 +1100";
+ static const char DATETIME_UTC = "Fri, 26 Nov 2010 03:22:02 +0000";
+ static const char DATETIME_NYC = "Thu, 25 Nov 2010 22:22:02 -0500";
+ static const time_t TIMET = 1290741722;
+ int r;
+ char bufRFC822_DATETIME_MAX+1;
+
+ memset(buf, 0x45, sizeof(buf));
+ r = time_to_rfc822(TIMET, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_MEL);
+
+ push_tz(TZ_UTC);
+ memset(buf, 0x45, sizeof(buf));
+ r = time_to_rfc822(TIMET, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_UTC);
+ pop_tz();
+
+ push_tz(TZ_NEWYORK);
+ memset(buf, 0x45, sizeof(buf));
+ r = time_to_rfc822(TIMET, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_NYC);
+ pop_tz();
+}
+
+
+static void test_ctime(void)
+{
+ static const char DATETIME = "16-Nov-2010 13:15:25 +1100";
+ static const time_t TIMET = 1289873725;
+ char bufRFC3501_DATETIME_MAX+1;
+
+ memset(buf, 0, sizeof(buf));
+ time_to_rfc3501(TIMET, buf, sizeof(buf));
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME);
+}
+
+
+/*
+ * Seen in the wild, generated by Apple Mail: a date
+ * which is a valid UNIX time_t because it's in the first
+ * hour of 1970 in UTC, but expressed in a timezone which
+ * makes it be in the last day of 1969. This is weird
+ * and probably technically valid but does not need to
+ * be supported, but we do need to fail gracefully.
+ */
+static void test_zerohour(void)
+{
+ static const char DATETIME_NY = "Wed, 31 Dec 1969 19:36:29 -0500";
+ static const char DATETIME_MEL = " 1-Jan-1970 11:36:29 +1100";
+ static const time_t TIMET = 2189;
+ time_t t;
+ int r;
+ char bufRFC3501_DATETIME_MAX+1;
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME_NY, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET); /* fail gracefully */
+
+ push_tz(TZ_UTC);
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME_NY, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET); /* fail gracefully */
+ pop_tz();
+
+ push_tz(TZ_NEWYORK);
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(DATETIME_NY, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET); /* fail gracefully */
+ pop_tz();
+
+ memset(buf, 0, sizeof(buf));
+ time_to_rfc3501(TIMET, buf, sizeof(buf));
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_MEL);
+}
+
+static void
+test_parse_iso8601(void)
+{
+ static const char DATETIME_MEL = "2010-11-26T14:22:02+11:00";
+ static const char DATETIME_UTC = "2010-11-26T03:22:02Z";
+ static const char DATETIME_NYC = "2010-11-25T22:22:02-05:00";
+ static const time_t TIMET = 1290741722;
+ time_t t;
+ int r;
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(DATETIME_MEL, &t);
+ CU_ASSERT_EQUAL(r, 25);
+ CU_ASSERT_EQUAL(t, TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(DATETIME_UTC, &t);
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_EQUAL(t, TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(DATETIME_NYC, &t);
+ CU_ASSERT_EQUAL(r, 25);
+ CU_ASSERT_EQUAL(t, TIMET);
+}
+
+static void
+test_gen_iso8601(void)
+{
+ static const char DATETIME_UTC = "2010-11-26T03:22:02Z";
+ static const time_t TIMET = 1290741722;
+ char buf30;
+ int r;
+
+ r = time_to_iso8601(TIMET, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, 20);
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_UTC);
+}
+
+static void
+test_gen_iso8601_secfrac(void)
+{
+ static const char DATETIME_STR = "2010-11-26T14:22:02.123+11:00";
+ static const struct timeval TIMEVAL = { 1290741722, 123456 };
+ char buf33;
+ int r;
+ 
+ r = timeval_to_iso8601(&TIMEVAL, timeval_ms, buf, sizeof(buf));
+ CU_ASSERT_EQUAL(r, strlen(DATETIME_STR));
+ CU_ASSERT_STRING_EQUAL(buf, DATETIME_STR);
+}
+
+/* Test that the 29 Feb works in some actual leap years,
+ * and not in some not-leap years */
+static void
+test_leapyear_rfc3501(void)
+{
+ /* 2000 is a leapyear */
+ static const char FEB2000_STR = "29-Feb-2000 11:22:33 +1100";
+ static const time_t FEB2000_TIMET = 951783753;
+ /* 2001 is not a leapyear */
+ static const char FEB2001_STR = "29-Feb-2001 11:22:33 +1100";
+ /* 2004 is a leapyear */
+ static const char FEB2004_STR = "29-Feb-2004 11:22:33 +1100";
+ static const time_t FEB2004_TIMET = 1078014153;
+ time_t t;
+ int r;
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501(FEB2000_STR, &t);
+ CU_ASSERT_EQUAL(r, 26);
+ CU_ASSERT_EQUAL(t, FEB2000_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501(FEB2001_STR, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc3501(FEB2004_STR, &t);
+ CU_ASSERT_EQUAL(r, 26);
+ CU_ASSERT_EQUAL(t, FEB2004_TIMET);
+}
+
+static void
+test_leapyear_iso8601(void)
+{
+ /* 2000 is a leapyear */
+ static const char FEB2000_STR = "2000-02-29T11:22:33+11:00";
+ static const time_t FEB2000_TIMET = 951783753;
+ /* 2001 is not a leapyear */
+ static const char FEB2001_STR = "2001-02-29T11:22:33+11:00";
+ /* 2004 is a leapyear */
+ static const char FEB2004_STR = "2004-02-29T11:22:33+11:00";
+ static const time_t FEB2004_TIMET = 1078014153;
+ time_t t;
+ int r;
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(FEB2000_STR, &t);
+ CU_ASSERT_EQUAL(r, 25);
+ CU_ASSERT_EQUAL(t, FEB2000_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(FEB2001_STR, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_iso8601(FEB2004_STR, &t);
+ CU_ASSERT_EQUAL(r, 25);
+ CU_ASSERT_EQUAL(t, FEB2004_TIMET);
+}
+
+static void
+test_leapyear_rfc822(void)
+{
+ /* 2000 is a leapyear */
+ static const char FEB2000_STR = "Tue, 29 Feb 2000 11:22:33 +1100";
+ static const time_t FEB2000_TIMET = 951783753;
+ /* 2001 is not a leapyear */
+ static const char FEB2001_STR = "Thu, 29 Feb 2001 11:22:33 +1100";
+ /* 2004 is a leapyear */
+ static const char FEB2004_STR = "Sun, 29 Feb 2004 11:22:33 +1100";
+ static const time_t FEB2004_TIMET = 1078014153;
+ time_t t;
+ int r;
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(FEB2000_STR, &t);
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_EQUAL(t, FEB2000_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(FEB2001_STR, &t);
+ CU_ASSERT_EQUAL(r, -1);
+ CU_ASSERT_EQUAL(t, UNINIT_TIMET);
+
+ t = UNINIT_TIMET;
+ r = time_from_rfc822(FEB2004_STR, &t);
+ CU_ASSERT_EQUAL(r, 31);
+ CU_ASSERT_EQUAL(t, FEB2004_TIMET);
+}
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/timezones.c Added

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <assert.h>
+#include <time.h>
+#include "timezones.h"
+
+extern int verbose;
+
+#define MAX_TZ_STACK	5
+static int n_tz_stack = 0;
+static char *tz_stackMAX_TZ_STACK;
+
+static inline void xxputenv(char *s, const char *f)
+{
+ if (verbose > 1)
+	fprintf(stderr, "\n%s:putenv(\"%s\")\n", f, s);
+ putenv(s);
+}
+#define putenv(s) xxputenv((s), __FUNCTION__)
+
+static char *stash_tz(const char *tz)
+{
+ char *s = malloc(4+(tz == NULL ? 0 : strlen(tz)));
+ assert(s);
+ sprintf(s, "TZ=%s", (tz == NULL ? "" : tz));
+ assert(n_tz_stack < MAX_TZ_STACK-1);
+ return tz_stackn_tz_stack++ = s;
+}
+
+void push_tz(const char *tz)
+{
+ if (n_tz_stack == 0)
+	stash_tz(getenv("TZ"));
+ putenv(stash_tz(tz));
+ tzset();
+}
+
+void pop_tz(void)
+{
+ char *old;
+ assert(n_tz_stack > 1);
+ old = tz_stack--n_tz_stack;
+ putenv(tz_stackn_tz_stack-1);
+ tzset();
+ free(old);
+}
+
+void restore_tz(void)
+{
+ while (n_tz_stack > 1)
+	pop_tz();
+}

cyrus-imapd-2.5.tar.gz/cunit/timezones.h Added

@@ -0,0 +1,57 @@
+/* timezones.h - timezone utilities for unit tests
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_CUNIT_TIMEZONES_H__
+#define __CYRUS_CUNIT_TIMEZONES_H__
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#define TZ_UTC		"UTC+00"
+#define TZ_NEWYORK	"EST+05"
+#define TZ_MELBOURNE	"AEST-11"
+
+extern void push_tz(const char *tz);
+extern void pop_tz(void);
+extern void restore_tz(void);
+
+#endif /* __CYRUS_CUNIT_TIMEZONES_H__ */

cyrus-imapd-2.5.tar.gz/cunit/tok.testc Added

@@ -0,0 +1,415 @@
+#include "config.h"
+#include "cunit/cunit.h"
+#include "tok.h"
+#include "xmalloc.h"
+
+#define WORD0	"lorem"
+#define WORD1	"ipsum"
+#define WORD2	"dolor"
+#define WORD3	"sit"
+#define WORD4	"amet"
+
+static void test_simple(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_init(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok;
+ char *p;
+
+ tok_init(&tok, PHRASE, NULL, 0);
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_initm(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok;
+ char *p;
+ char buf1024;
+
+ strcpy(buf, PHRASE);
+ tok_initm(&tok, buf, NULL, 0);
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_freebuffer(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok;
+ char *p;
+
+ tok_initm(&tok, xstrdup(PHRASE), NULL, TOK_FREEBUFFER);
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+
+}
+
+static void test_multiple_delim(void)
+{
+ static const char PHRASE = WORD0" "WORD1" \t "WORD2"\r"WORD3"\r\n \t\t\t "WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_nondefault_delim(void)
+{
+ static const char PHRASE = WORD0","WORD1","WORD2","WORD3","WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, ",", 0);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_empty(void)
+{
+ static const char PHRASE = ","WORD0","WORD1",,,"WORD2","WORD3","WORD4",";
+ tok_t tok = TOK_INITIALIZER(PHRASE, ",", TOK_EMPTY);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, "");
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, "");
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, "");
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, "");
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_trimleft(void)
+{
+ static const char PHRASE = " "WORD0",\t"WORD1" ,\r\n "WORD2", "WORD3","WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, ",", TOK_TRIMLEFT);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1" ");
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_trimright(void)
+{
+ static const char PHRASE = WORD0","WORD1"\t, "WORD2"\r\n ,"WORD3" ,"WORD4" ";
+ tok_t tok = TOK_INITIALIZER(PHRASE, ",", TOK_TRIMRIGHT);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, " "WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_trimboth(void)
+{
+ static const char PHRASE = " "WORD0" \t,"WORD1"\t, "WORD2"\r\n , "WORD3" \t ,"WORD4"\r\n";
+ tok_t tok = TOK_INITIALIZER(PHRASE, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_offset(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ CU_ASSERT_EQUAL(tok_offset(&tok), 0);
+
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ CU_ASSERT_EQUAL(tok_offset(&tok), 0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ CU_ASSERT_EQUAL(tok_offset(&tok), sizeof(WORD0" ")-1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ CU_ASSERT_EQUAL(tok_offset(&tok), sizeof(WORD0" "WORD1" ")-1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ CU_ASSERT_EQUAL(tok_offset(&tok),
+		 sizeof(WORD0" "WORD1" "WORD2" ")-1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ CU_ASSERT_EQUAL(tok_offset(&tok),
+		 sizeof(WORD0" "WORD1" "WORD2" "WORD3" " )-1);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_stopearly(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ /* test that ceasing to call tok_next() before the end
+ * of the tokens does not leak memory as long as tok_fini()
+ * is called; we rely on Valgrind to find memleaks */
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+
+ tok_fini(&tok);
+}
+
+static void test_nofini(void)
+{
+ static const char PHRASE = WORD0" "WORD1" "WORD2" "WORD3" "WORD4;
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ /* test the converse of stopearly, i.e. that tok_fini() is
+ * not necessary if all the tokens are read with tok_next();
+ * again we rely on Valgrind to find memleaks */
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD0);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD1);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD2);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD3);
+ p = tok_next(&tok);
+ CU_ASSERT_STRING_EQUAL(p, WORD4);
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ /* no tok_fini */
+}
+
+static void test_blank(void)
+{
+ static const char PHRASE = "";
+ tok_t tok = TOK_INITIALIZER(PHRASE, NULL, 0);
+ char *p;
+
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_initnull(void)
+{
+ tok_t tok;
+ char *p;
+
+ tok_init(&tok, NULL, NULL, 0);
+
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+static void test_initmnull(void)
+{
+ tok_t tok;
+ char *p;
+
+ tok_initm(&tok, NULL, NULL, 0);
+
+ p = tok_next(&tok);
+ CU_ASSERT_PTR_NULL(p);
+
+ tok_fini(&tok);
+}
+
+/* Test some portability stubs */
+static void test_memmem(void)
+{
+#define TESTCASEN(haystack, haystacklen, needle, expoff) \
+ { \
+	static const char _haystack = (haystack); \
+	int _haystacklen = (haystacklen); \
+	static const char _needle = (needle); \
+	int _expoff = (expoff); \
+	void *p; \
+ \
+	p = memmem(_haystack, _haystacklen, \
+		 _needle, sizeof(_needle)-1); \
+	if (_expoff < 0) { \
+	 CU_ASSERT_PTR_NULL(p); \
+	} \
+	else { \
+	 CU_ASSERT_PTR_NOT_NULL(p); \
+	 CU_ASSERT((const char *)p >= _haystack); \
+	 CU_ASSERT((const char *)p < \
+	 _haystack+sizeof(_haystack)-1); \
+	 CU_ASSERT_PTR_EQUAL(p, _haystack+_expoff); \
+	} \
+ }
+#define TESTCASE(haystack, needle, expoff) \
+	TESTCASEN(haystack, sizeof(haystack)-1, needle, expoff)
+
+ /* needle easily found */
+ TESTCASE("quinoa etsy dreamcatcher", "etsy", 7);
+
+ /* needle not found */
+ TESTCASE("quinoa etsy dreamcatcher", "cosby", -1);
+
+ /* first character of needle not found */
+ TESTCASE("quinoa etsy dreamcatcher", "xylem", -1);
+
+ /* haystack length is obeyed */
+ TESTCASEN("quinoa etsy dreamcatcher", 6, "etsy", -1);
+
+ /* needle first character is repeated in haystack */
+ TESTCASE("eeeeeeeeeeeeeeeeeepeeeeeeee", "ep", 17);
+
+ /* needle first character is repeated in needle & haystack */
+ TESTCASE("eeeeeeeeeeeeeeeeeepeeeeeeee", "eeep", 15);
+
+ /* no false match near end of haystack */
+ TESTCASE("quinoa etsy dreamcatcher", "hermes", -1);
+
+ /* partial matches precede actual match */
+ TESTCASE("qququiquqquinquinoa", "quinoa", 13);
+
+ /* match is after embedded nul */
+ TESTCASE("locavore\0vegan", "vegan", 9);
+
+#undef TESTCASE
+}
+
+/* vim: set ft=c: */

cyrus-imapd-2.5.tar.gz/cunit/unit.c Added

@@ -0,0 +1,511 @@
+/*
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <CUnit/CUnit.h>
+#include <CUnit/Basic.h>
+#include <CUnit/Automated.h>
+#if HAVE_VALGRIND_VALGRIND_H
+#include <valgrind/valgrind.h>
+#endif
+#include <setjmp.h>
+#include "timeout.h"
+#include "cunit.h"
+#include "xmalloc.h"
+
+#include "registers.h"
+
+#if !HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+int verbose = 0;
+int num_testspecs = 0;
+const char **testspecs;
+enum { RUN, LIST } mode = RUN;
+int xml_flag = 0;
+int timeouts_flag = 1;
+
+#if HAVE_VALGRIND_VALGRIND_H
+#define log1(fmt, a1) \
+ VALGRIND_PRINTF_BACKTRACE(fmt"\n", (a1))
+#define log2(fmt, a1, a2) \
+ VALGRIND_PRINTF_BACKTRACE(fmt"\n", (a1), (a2))
+#else
+#define log1(fmt, a1) \
+ fprintf(stderr, "\nunit: "fmt"\n", (a1))
+#define log2(fmt, a1, a2) \
+ fprintf(stderr, "\nunit: "fmt"\n", (a1), (a2))
+#endif
+
+EXPORTED void fatal(const char *s, int code __attribute__((unused)))
+{
+ log1("fatal(%s)", s);
+ exit(1);
+}
+
+/*
+ * Accumulate the RunSummary between tests. We need to do this
+ * only because all the external CUnit interfaces for running
+ * tests will explicitly zero the summary first. Meh.
+ *
+ * Fortunately we don't need to accumulate the failure records
+ * between test runs, as the Basic interface's all_complete
+ * handler does nothing with them anyway.
+ */
+static void accumulate_summary(CU_RunSummary *summp)
+{
+ const CU_RunSummary *ss = CU_get_run_summary();
+
+ summp->nSuitesRun += ss->nSuitesRun;
+ summp->nSuitesFailed += ss->nSuitesFailed;
+ summp->nTestsRun += ss->nTestsRun;
+ summp->nTestsFailed += ss->nTestsFailed;
+ summp->nAsserts += ss->nAsserts;
+ summp->nAssertsFailed += ss->nAssertsFailed;
+ summp->nFailureRecords += ss->nFailureRecords;
+}
+
+/* Each test gets a maximum of 20 seconds. */
+#define TEST_TIMEOUT_MS (20*1000)
+
+static jmp_buf jbuf;
+static const char *code;
+static enum { IDLE, INTEST, INFIXTURE } running = IDLE;
+static struct cunit_param *current_params;
+
+void exit(int status)
+{
+ switch (running) {
+ case IDLE:
+	break;
+ case INTEST:
+	log2("code under test (%s) exited with status %d", code, status);
+	running = IDLE;
+	CU_FAIL_FATAL("Code under test exited");
+	break;
+ case INFIXTURE:
+	log2("fixture code (%s) exited with status %d", code, status);
+	running = IDLE;
+	longjmp(jbuf, status);
+	break;
+ }
+ /* had atexit() handlers? stiff! */
+ _exit(status);
+}
+
+static void handle_timeout(void)
+{
+ switch (running) {
+ case INTEST:
+	log1("code under test (%s) timed out", code);
+	running = IDLE;
+	CU_FAIL_FATAL("Code under test timed out");
+	break;
+ case INFIXTURE:
+	log1("fixture code (%s) timed out", code);
+	running = IDLE;
+	longjmp(jbuf, -1);
+	break;
+ default:
+	log1("unexpected timeout running=%d", running);
+	_exit(1);
+ }
+}
+
+void __cunit_wrap_test(const char *name, void (*fn)(void))
+{
+ code = name;
+ running = INTEST;
+ if (timeouts_flag && timeout_begin(TEST_TIMEOUT_MS) < 0)
+	exit(1);
+ fn();
+ if (timeouts_flag && timeout_end() < 0)
+	exit(1);
+ running = IDLE;
+}
+
+int __cunit_wrap_fixture(const char *name, int (*fn)(void))
+{
+ int r = setjmp(jbuf);
+ if (r)
+	return r;
+ code = name;
+ running = INFIXTURE;
+ if (timeouts_flag && timeout_begin(TEST_TIMEOUT_MS) < 0)
+	exit(1);
+ r = fn();
+ if (timeouts_flag && timeout_end() < 0)
+	exit(1);
+ running = IDLE;
+ return r;
+}
+
+static void describe_params(const struct cunit_param *params,
+			 char *buf, int maxlen)
+{
+ const struct cunit_param *p;
+ int n;
+
+ if (maxlen <= 4)
+	return;
+ if (!params || !params->name)
+	return;
+
+ for (p = params ; p->name ; p++) {
+	n = snprintf(buf, maxlen, "%s%s=%s",
+		 (p == params ? "" : ","),
+		 p->name, p->valuesp->idx);
+	if (n >= maxlen) {
+	 /* truncated */
+	 strcpy(buf+maxlen-4, "...");
+	 return;
+	}
+	buf += n;
+	maxlen -= n;
+ }
+}
+
+static void params_assign(struct cunit_param *params)
+{
+ struct cunit_param *p;
+
+ for (p = params ; p->name ; p++)
+	*(p->variable) = p->valuesp->idx;
+
+ if (verbose) {
+	char buf1024;
+	buf0 = '\0';
+	describe_params(params, buf, sizeof(buf));
+	fprintf(stderr, "%s ", buf);
+	fflush(stderr);
+ }
+}
+
+void __cunit_params_begin(struct cunit_param *params)
+{
+ struct cunit_param *p;
+
+ if (!params || !params0.name)
+	return;
+
+ if (!params0.values) {
+	/* first call: split the original value of the
+	 * variable up into the ->values array */
+	for (p = params ; p->name ; p++) {
+	 char *v;
+	 static const char sep = ",";
+	 p->freeme1 = xstrdup(*(p->variable));
+	 for (v = strtok(p->freeme1, sep) ;
+		 v ;
+		 v = strtok(NULL, sep)) {
+		p->values = (p->nvalues ?
+			 xrealloc(p->values, sizeof(char*) * (p->nvalues+1)) :
+			 xmalloc(sizeof(char *)));
+		p->valuesp->nvalues++ = v;
+	 }
+	}
+ }
+ for (p = params ; p->name ; p++)
+	p->idx = 0;
+ params_assign(params);
+ current_params = params;
+}
+
+int __cunit_params_next(struct cunit_param *params)
+{
+ struct cunit_param *p;
+
+ if (!params || !params0.name)
+	return 0;
+
+ for (p = params ; p->name ; p++) {
+	if (++p->idx < p->nvalues)
+	 break;
+	p->idx = 0;
+ }
+ if (!p->name)
+	return 0;	/* incremented off the end */
+ params_assign(params);
+ return 1;
+}
+
+void __cunit_params_end(void)
+{
+ current_params = NULL;
+}
+
+
+CU_BOOL CU_assertFormatImplementation(
+ CU_BOOL bValue,
+ unsigned int uiLine,
+ char strFile,
+ char strFunction,
+ CU_BOOL bFatal,
+ char strConditionFormat,
+ ...)
+{
+ va_list args;
+ char buf1024;
+
+ va_start(args, strConditionFormat);
+ vsnprintf(buf, sizeof(buf), strConditionFormat, args);
+ va_end(args);
+
+ if (current_params) {
+	strncat(buf, " ", sizeof(buf)-strlen(buf)-1);
+	describe_params(current_params, buf+strlen(buf), sizeof(buf)-strlen(buf)-1);
+	strncat(buf, "", sizeof(buf)-strlen(buf)-1);
+	bufsizeof(buf)-1 = '\0';
+ }
+
+ if (verbose > 1 && bValue)
+	fprintf(stderr, " %s:%u %s\n", strFile, uiLine, buf);
+
+ return CU_assertImplementation(bValue, uiLine, buf, strFile, strFunction, bFatal);
+}
+
+static void run_tests(void)
+{
+ int i;
+ CU_Suite *suite;
+ CU_Test *test;
+ CU_ErrorCode err;
+ int failed = 0;
+ char *testname;
+ char suitename256;
+ CU_RunSummary summ;
+ CU_FailureRecord *failures = NULL;
+ CU_AllTestsCompleteMessageHandler all_complete;
+
+ /* Setup to catch long-running tests. This seems to be
+ * particularly a problem on CentOS 5.5. */
+ if (timeouts_flag && timeout_init(handle_timeout) < 0)
+	exit(1);
+
+ if (xml_flag) {
+	if (num_testspecs == 0) {
+	 /* not specified: run all tests in order listed */
+	 CU_automated_run_tests();
+	 if (timeouts_flag)
+		timeout_fini();
+	 return;
+	}
+	fprintf(stderr, "unit: test specifications not "
+			"supported in XML mode, sorry\n");
+	exit(1);
+ }
+
+ if (verbose)
+	CU_basic_set_mode(CU_BRM_VERBOSE);
+
+ if (num_testspecs == 0) {
+	/* not specified: run all tests in order listed */
+	err = CU_basic_run_tests();
+	running = IDLE;	/* Just In Case */
+	if (timeouts_flag)
+	 timeout_fini();
+	if (err != CUE_SUCCESS || CU_get_run_summary()->nAssertsFailed)
+	 exit(1);
+	return;
+ }
+
+ /*
+ * Run the specified suites and/or tests.
+ *
+ * Newer versions of CUnit have an 'active' flag in the suite
+ * and test structures which could be used to implement this
+ * behaviour. However, this method works with older CUnits
+ * and also allows the user to specify that a test be run
+ * multiple times, which I think is a useful feature.
+ */
+
+ /* This is a hack: it runs no tests but has the side effects
+ * of emitting the CUnit blurb and initialising the Basic
+ * interface's global callbacks. */
+ CU_basic_run_suite(NULL);
+
+ /* More hackery: disable the all_complete handler temporarily */
+ all_complete = CU_get_all_test_complete_handler();
+ CU_set_all_test_complete_handler(NULL);
+
+ memset(&summ, 0, sizeof(summ));
+
+ for (i = 0 ; i < num_testspecs ; i++) {
+	strncpy(suitename, testspecsi, sizeof(suitename));
+	if ((testname = strchr(suitename, ':')) != NULL) {
+	 *testname++ = '\0';
+	 if (*testname == '\0')
+		testname = NULL;
+	}
+
+	suite = CU_get_suite_by_name(suitename, CU_get_registry());
+	if (suite == NULL) {
+	 fprintf(stderr, "unit: no such suite \"%s\"\n", suitename);
+	 failed++;
+	 continue;
+	}
+
+	if (testname == NULL) {
+	 /* Run each test */
+	 for (test = suite->pTest ; test != NULL ; test = test->pNext) {
+		err = CU_run_test(suite, test);
+		running = IDLE;	/* Just In Case */
+		accumulate_summary(&summ);
+		if (err != CUE_SUCCESS)
+		 failed++;
+	 }
+	} else {
+	 /* run the named test in the named suite */
+	 test = CU_get_test_by_name(testname, suite);
+	 if (test == NULL) {
+		fprintf(stderr, "unit: no such test \"%s\" in suite \"%s\"\n",
+			testname, suitename);
+		err = CUE_NOTEST;
+	 } else {
+		err = CU_run_test(suite, test);
+		running = IDLE;	/* Just In Case */
+		accumulate_summary(&summ);
+	 }
+	 if (err != CUE_SUCCESS)
+		failed++;
+	}
+ }
+
+ if (timeouts_flag)
+	timeout_fini();
+
+ *(CU_RunSummary *)CU_get_run_summary() = summ;
+ if (all_complete)
+	all_complete(failures);
+
+ if (failed || summ.nAssertsFailed)
+	exit(1);
+}
+
+static void list_tests(void)
+{
+ CU_Suite *suite;
+ CU_Test *test;
+
+ for (suite = CU_get_registry()->pSuite ;
+	 suite != NULL ;
+	 suite = suite->pNext) {
+	for (test = suite->pTest ;
+	 test != NULL ;
+	 test = test->pNext) {
+	 printf("%s:%s\n", suite->pName, test->pName);
+	}
+ }
+}
+
+static void usage(int ec)
+ __attribute__((noreturn));
+
+static void usage(int ec)
+{
+ static const char usage_str =
+"Usage: cunit/unit options suite|suite:test ...\n"
+"options are:\n"
+" -l list all tests\n"
+" -t disable per-test timeouts\n"
+" -v be more verbose\n"
+" -h print this message\n"
+ ;
+
+ fputs(usage_str, stderr);
+ fflush(stderr);
+
+ exit(ec);
+}
+
+static void parse_args(int argc, char **argv)
+{
+ int c;
+
+ while ((c = getopt(argc, argv, "hltvx")) > 0)
+ {
+	switch (c)
+	{
+	case 'h':
+	 usage(0);
+	 break;
+	case 'l':
+	 mode = LIST;
+	 break;
+	case 't':
+	 timeouts_flag = 0;
+	 break;
+	case 'v':
+	 verbose++;
+	 break;
+	case 'x':
+	 xml_flag = 1;
+	 break;
+	case '?':
+	 usage(1);
+	 exit(1);
+	}
+ }
+ num_testspecs = argc - optind;
+ testspecs = (const char **)(argv + optind);
+}
+
+int main(int argc, char **argv)
+{
+ CU_initialize_registry();
+ register_cunit_suites();
+ parse_args(argc, argv);
+ switch (mode) {
+ case RUN:
+	run_tests();
+	break;
+ case LIST:
+	list_tests();
+	break;
+ }
+ return 0;
+}
+

cyrus-imapd-2.5.tar.gz/cunit/vg.supp Added

@@ -0,0 +1,182 @@
+# Valgrind suppressions file for Cyrus unit tests
+#
+# Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+{
+   bdb_environment_leak
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:__env_config
+   fun:__env_open
+   ...
+   fun:init
+   fun:cyrusdb_init
+   ...
+}
+{
+   getpwnam_leak
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:__nss_database_lookup
+   ...
+   fun:getpwnam
+   ...
+}
+{
+   getgrouplist_leak
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:__nss_database_lookup
+   ...
+   fun:getgrouplist
+   ...
+}
+{
+   getpwuid_leak
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:__nss_database_lookup
+   ...
+   fun:getpwuid
+   ...
+}
+{
+   zlib_inflateInit2_cond
+   Memcheck:Cond
+   fun:inflateReset2
+   fun:inflateInit2_
+   fun:prot_setcompress
+   ...
+}
+{
+   zlib_inflateInit2_cond
+   Memcheck:Cond
+   fun:inflateReset2
+   fun:inflateInit2_
+   fun:buf_inflate
+   ...
+}
+{
+    zlib_deflate_cond
+    Memcheck:Cond
+    fun:memcpy
+    ...
+    fun:deflate
+    fun:prot_flush_encode
+    ...
+}
+{
+    zlib_deflate_data4
+    Memcheck:Value4
+    fun:memcpy
+    ...
+    fun:deflate
+    fun:prot_flush_encode
+    ...
+}
+{
+    zlib_deflate_data8
+    Memcheck:Value8
+    fun:memcpy
+    ...
+    fun:deflate
+    fun:prot_flush_encode
+    ...
+}
+{
+    libcrypto_bugs_1
+    Memcheck:Cond
+    ...
+    fun:X509_verify
+    ...
+}
+{
+    libcrypto_bugs_2
+    Memcheck:Cond
+    ...
+    fun:RSA_sign
+    ...
+}
+{
+    libcrypto_bugs_3
+    Memcheck:Cond
+    ...
+    fun:DH_generate_key
+    ...
+}
+{
+    libcrypto_bugs_4
+    Memcheck:Cond
+    ...
+    fun:DH_compute_key
+    ...
+}
+{
+    libcrypto_bugs_5
+    Memcheck:Cond
+    ...
+    fun:RSA_setup_blinding
+    ...
+}
+{
+    libcrypto_bugs_6
+    Memcheck:Leak
+    fun:malloc
+    ...
+    fun:get_dh1024
+    ...
+    fun:tls_init_serverengine
+    ...
+}
+{
+    # This function is part of the unit tests and deliberately
+    # passes bogus mappings to msync() in the expectation of
+    # generating an error from the kernel.
+    is_valid_mapping
+    Memcheck:Param
+    msync(start)
+    fun:__msync_nocancel
+    fun:is_valid_mapping
+    ...
+}

cyrus-imapd-2.5.tar.gz/doc/README.autocreate Added

@@ -0,0 +1,216 @@
+Original documentation for the merged autocomplete patch below.
+It would be great to tidy this up.
+
+Cyrus IMAP autocreate Inbox patch
+----------------------------------
+
+NOTE : This patch has been created at the University of Athens. For more info, as well 
+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ 
+
+NOTE : Patch updated for Cyrus IMAP 2.4.x by Martin Matuska <mm@FreeBSD.org>
+
+The design of Cyrus IMAP server does not predict the automatic creation of users'
+INBOX folders. The creation of a user's INBOX is considered to be an external task,
+that has to be completed as part of the user email account creation procedure. 
+Hence, to create a new email account the site administrator has to:
+
+ a) Include the new account in the user database for the authentication procedure
+ (e.g. sasldb, shadow, mysql, ldap).
+ b) Create the corresponding INBOX folder. 
+
+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder,
+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf).
+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't 
+lead to the automatic INBOX folder creation by Cyrus IMAP server.
+In fact, "autocreate" means that the IMAP clients are allowed to automatically create 
+the user INBOX. 
+
+This patch adds the functionality of automatic creation of the users' INBOX folders into
+the Cyrus IMAP server. It is implemented as two features, namely the "create on login"
+and "create on post".
+ 
+
+
+Create on login
+===============
+This feauture provides automatic creation of a user's INBOX folder when all of the 
+following requirements are met:
+
+i) The user has succesfully passed the authentication procedure.
+
+ii) The user's authorisation ID (typically the same as the user's
+authentication ID) doesn't belong to the imap_admins or admins
+accounts (see imapd.conf).
+
+iii) The "autocreatequota" option in the imap configuration file 
+has been set to a non zero value. 
+
+iv) The corresponding to the user's authorisation ID INBOX folder
+does not exist.
+
+The user's first login is the most typical case when all four requirements are met. 
+Note that if the authenticated ID is allowed to proxy to another account for which 
+all of the above requirements are met, the corresponding INBOX folder for that account 
+will be created.
+
+
+
+Create on post
+==============
+This feauture provides automatic creation of a user's INBOX folder when all of the 
+following requirements are met. 
+
+i) An email message addressed to the user has been received. 
+
+ii) The recipient is not any of the imap_admins or admins accounts. 
+Note that passing emails to admins or imap_admins accounts from 
+the MTA to LMTP should be avoided in any case.
+
+iii) The recipient's INBOX does not exist.
+
+iv) The "autocreatequota" option in the imap configuration file 
+has been set to a non zero value. 
+
+v) The "createonpost" option in the imap configuration file 
+has been switched on. 
+
+
+Besides the automatic creation of INBOX folder, additional functionalities are
+provided:
+
+ (A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders"
+configuration option. eg 
+
+autocreateinboxfolders: sent|drafts|spam|templates
+
+ (B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders"
+configuration option. eg
+
+autosubscribeinboxfolders: sent|spam
+
+Obviously, only subscription to subfolders included in the "autocreateinboxfolder"
+list is meaningful. 
+
+ (C) Automatic subscription to shared folders (bulletin boards). The user gets
+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders"
+configuration option in imapd.conf.
+eg autosubscribesharedfolders: public_folder | public_folder.subfolder
+
+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation
+and the user must have the appropriate permissions in order to be able to subscribe to the
+shared folder.
+
+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no
+option. When set to yes, the user is automatically subscribed to all shared folders one 
+has permission to subscribe to. Please, note that when this option is set to yes, then
+'autosubscribesharedfolders' option is overriden.
+
+ (D) Automatic creation of a predefined default sieve script.
+
+This is very useful when a default sieve script is used for every user. Usually, a
+default anti-spam script may me be written in a file and copied to each user
+sieve scripts upon the INBOX creation. The imapd.conf options that have been added
+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and 
+'generate_compiled_sieve_script'. 
+
+autocreate_sieve_script configuration option refers to the full path of the file 
+that contains the sieve script. The default value is null and if no file is defined,
+then no default script is created upon INBOX creation. (The feature is disabled)
+eg autocreate_sieve_script: /etc/default_sieve_script
+
+autocreate_sieve_compiledscript configuration option refers to the full path of the
+file that contains the bytecode compiled sieve script. If this filename is defined
+in imapd.conf and the file exists, then it is automatically copied in the user's sieve
+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled
+by the daemon. 
+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc
+
+generate_compiled_sieve_script is a boolean option that triggers the compilation of the 
+source sieve script to bytecode sieve script. The file that the bytecode script will
+be saved is pointed by autocreate_sieve_compiledscript.
+
+Ways of compiling a sieve script : 
+1. Compile a sieve script using the standard sievec utility, distributed by CMU
+2. Compile a sieve script using the compile_sieve utility, released by UoA. This 
+ tool is almost identical to the sievec utility, with the difference that it 
+ reads the input and output file from autocreate_sieve_script and 
+ autocreate_sieve_compiledscript options in imapd.conf
+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be
+ instructed to save the compiled script any time a compiled script does not exist.
+
+NOTES : 
+1. In order this functionality to work, the following requirements must have been met:
+ - 'sieveusehomedir' option must be 'no' in the configuration (default).
+ - 'sievedir' option must have a valid value.
+2. Currently, this patch checks the validity of the source script while generating a 
+ bytecode compiled script, but not the validity of the bytecode sieve script file.
+ The administrator should make sure that the provided files contain a valid sieve
+ script as well as the compiled script is updated every time the source script changes.
+
+
+ (E) The administrator may control for which users and/or groups may the INBOXes 
+automatically be created. The autocreate_users option restricts the groups
+for which the patch will create the mailboxes. 
+
+The default value of autocreate_users is anyone. So, if not set at all, the patch will 
+work for all users. However, one may set:
+
+autocreate_users: user1 user2 group:group1 group:group2
+
+In that case, the INBOX will be created only for user1, user2 and the users that belong 
+to group1 and group2. 
+
+More refined control per service is provided by the options imap_autocreate_users,
+pop3_autocreate_users and lmtp_autocreate_users. These options override the 
+autocreate_users option and offer per service control.
+
+Example: 
+One may want to restrict the create on post functionality only for a specific group
+of users. To achieve this, the following lines must be added in the imapd.conf file:
+
+createonpost: yes
+lmtp_autocreate_users: group:groupname
+
+
+
+Issues to be considered 
+=======================
+
+I) In order to use the create on post feauture one should be absolutely sure that: 
+a) The MTA checks the validity of the email recipient before sending the email to
+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be 
+able to use the account database as user mailbox database". 
+b) Only authorised accounts/services can talk to LMTP.
+
+II) Especially in the case of imap logins, the current patch implementation checks
+for the INBOX folder existence upon login, causing an extra mailbox lookup in most 
+of the cases. 
+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and
+check if the error is associated with an INBOX folder. However, this would mess up
+Cyrus code. The way it was implemented may not have been the most performance
+optimised, but it produces a much cleaner and simple patch.
+
+
+
+Virtual Domains Support
+=======================
+
+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and 
+later. However, it is not possible to declare different INBOX subfolders to be created or 
+shared folders to be subscribed to for every domain.
+
+
+
+Things to be done
+=================
+
+1. Support MUPDATE
+
+It is within the developers' intentions to support the mupdate protocol, but serious 
+design issues on future cyrus releases have to resolved first.
+
+2. Select different attributes (quota, partition, sieve filter, etc) depending on the group
+a user belongs to. 
+
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
+

cyrus-imapd-2.5.tar.gz/doc/README.autosievefolder Added

@@ -0,0 +1,46 @@
+Original documentation for the merged autosieve patch below.
+It would be great to tidy this up.
+
+Cyrus IMAP autosievefolder patch
+----------------------------------
+
+NOTE : This patch has been created at the University of Athens. For more info, as well 
+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr 
+
+NOTE : Patch updated to Cyrus IMAPD 2.4.x by Martin Matuska <mm@FreeBSD.org>
+
+ When the lmtpd daemon receives an email message prior to delivering it to the 
+INBOX folder of the user, checks if the user has specified sieve filters. If the
+user has specified sieve filters the filters are evaluated. If the message matches
+any of the filters the action that is specified in the filter is executed. If the action 
+is FileInto it is stored in the subfolder specified in the filter. If the 
+subfolder doesn't exist then the message is sent to the INBOX folder of the user.
+
+ With this patch if the folder doesn't exist AND the name of the subfolder is 
+specified in the autosievefolders option, OR the anysievefolder is set to 
+yes in the cyrus-imap configuration file then the subfolder is created and the mail 
+is stored there.
+
+
+Check the following options of the imapd.conf file
+==================================================
+
+* anysievefolder : It must be "yes" in order to permit the autocreation of any 
+INBOX subfolder requested by a sieve filter, through the "fileinto" action. (default = no)
+* autosievefolders : It is a "|" separated list of subfolders of INBOX that will be 
+automatically created, if requested by a sieve filter, through the "fileinto" 
+action. (default = null)
+	i.e. autosievefolders: Junk | Spam
+
+WARNING: anysievefolder, takes precedence over autosievefolders . Which means that if 
+anysievefolder is set to "yes", cyrus will create any INBOX subfolder requested, no-matter what the value of autosievefolders is.
+
+
+Things to be done
+=================
+
+1. Support cyrus wildcards in the autosievefolders option. 
+
+
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
+

cyrus-imapd-2.4.17.tar.gz/doc/ag.html -> cyrus-imapd-2.5.tar.gz/doc/ag.html Changed

@@ -1,4 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title>Cyrus IMAP Server: Cyrus Murder Concepts</title>
 
 </HEAD><BODY>
@@ -12,7 +15,6 @@
 <li><a href="#analysis">Analysis</a></li>
 <li><a href="#futures">Futures</a></li>
 </ul>
-</div> 
 
 <div class="bodytext">
 
@@ -121,7 +123,7 @@
 The list of mailboxes in the murder is maintained by the MUPDATE
 server. The MUPDATE protocol is described at <a
 href="http://www.ietf.org/rfc/rfc3656.txt">
-RFC3656</a>. 
+RFC3656</a>.
 
 For IMAP service on a frontend, there are two main types of processes,
 the <tt>proxyd</tt> and the <tt>mupdate</tt> (slave mode) synchronization
@@ -215,13 +217,13 @@
 To help protect the backends from a compromised frontends, all
 administrative actions (creating users, top level mailboxes, quota
 changes, etc) must be done directly from the client to the backend, as
-administrative permissions are not granted to any of the proxy servers. 
+administrative permissions are not granted to any of the proxy servers.
 IMAP Referrals provide a way to accomplish this with minimal
 client UI changes.
 
 <h3>3.3 Subscriptions</h3>
 
-<tt>LSUB, SUBSCRIBE, UNSUBSCRIBE</tt> 
+<tt>LSUB, SUBSCRIBE, UNSUBSCRIBE</tt> 
 
 The front end server directs the <tt>LSUB</tt> to the back end server
 that has the user's <tt>INBOX</tt>. As such, the back end server may
@@ -238,23 +240,23 @@
 
 <h3>3.4 Finding a Mailbox</h3>
 
-<tt>SETQUOTA, GETQUOTA, EXAMINE, STATUS</tt> 
+<tt>SETQUOTA, GETQUOTA, EXAMINE, STATUS</tt> 
 
 The front end machine looks up the location of the mailbox,
 connects via IMAP to the back end server, and issues the equivalent
-command there. 
+command there.
 
 
 A quota root is not allowed to span across multiple servers. Atleast,
 not with the semantics that it will be inclusive across the murder.
 
-<tt>SELECT</tt> 
+<tt>SELECT</tt> 
 
 To <tt>SELECT</tt> a mailbox:
 <ol >
 <li><tt>proxyd</tt>: lookup foo.bar in local mailboxes database</li>
-<li>if yes, <tt>proxyd</tt> -> back end: send SELECT</li>
-<li>if no, <tt>proxyd</tt> -> <tt>mupdate slave</tt> -> mupdate master:
+<li>if yes, <tt>proxyd</tt> -&gt; back end: send SELECT</li>
+<li>if no, <tt>proxyd</tt> -&gt; <tt>mupdate slave</tt> -&gt; mupdate master:
 send a ping along the UPDATE channel in order to ensure that we have received
 the latest data from the MUPDATE master.</li>
 
@@ -269,7 +271,7 @@
 
 <h3>3.5 Operations within a Mailbox</h3>
 
-<tt>APPEND, CHECK, CLOSE, EXPUNGE, SEARCH, FETCH, STORE, UID</tt> 
+<tt>APPEND, CHECK, CLOSE, EXPUNGE, SEARCH, FETCH, STORE, UID</tt> 
 
 These commands are sent to the appropriate back end server. The
 aggregator does not need to modify any of these commands before
@@ -294,7 +296,7 @@
 
 <h3>3.7 Operations on the Mailbox List</h3>
 
-<tt>CREATE, DELETE, RENAME, SETACL</tt> 
+<tt>CREATE, DELETE, RENAME, SETACL</tt> 
 
 These commands are all done by the back end server using the MUPDATE
 server as a lock manager. Changes are then propogated to the frontend
@@ -302,13 +304,13 @@
 
 <tt>LIST</tt>
 
- 
+ 
 
 <tt>LIST</tt> is handled by the front end servers; no interaction
 is required with the back end server as the front ends have a local
 database that is never more than a few seconds out of date.
 
-<tt>CREATE</tt> 
+<tt>CREATE</tt> 
 
 <tt>CREATE</tt> creates the mailbox on the same back end server as the
 parent mailbox. If the parent exists but exists on multiple back end
@@ -330,7 +332,7 @@
 of the parent mailbox, as top level mailboxes cannot be created
 by the proxies).</li>
 
-<li><tt>proxyd</tt> -> back end: duplicate CREATE command and verifies
+<li><tt>proxyd</tt> -&gt; back end: duplicate CREATE command and verifies
 that the <tt>CREATE</tt> does not create an inconsistency in
 the mailbox list (i.e. the folder name is still unique).</li>
 </ol>
@@ -342,7 +344,7 @@
 
 <li><tt>imapd</tt> may have to open an MUPDATE connection here if one
 doesn't already exist
-<li><tt>imapd</tt> -> MUPDATE: set foo.bar reserved (CRASH: MUPDATE externally
+<li><tt>imapd</tt> -&gt; MUPDATE: set foo.bar reserved (CRASH: MUPDATE externally
 inconsistent)
 <li><tt>imapd</tt>: create foo.bar in spool disk (CRASH: MUPDATE externally
 inconsistent, back end externally inconsistent, this can be resolved
@@ -351,7 +353,7 @@
 <li><tt>imapd</tt>: add foo.bar to mailboxes dataset (CRASH: ditto)
 <li><tt>imapd</tt>: commit transaction (CRASH: ditto, but the
 recovery can activate the mailbox in mupdate instead)
-<li><tt>imapd</tt> -> MUPDATE: set foo.bar active (CRASH: committed)
+<li><tt>imapd</tt> -&gt; MUPDATE: set foo.bar active (CRASH: committed)
 </ol>
 
 Failure modes: Above, all back end inconsistencies result in the
@@ -361,7 +363,7 @@
 is safer than potentially having the mailbox appaear in two places when
 the failed backend comes back up.
 
-<tt>RENAME</tt> 
+<tt>RENAME</tt> 
 
 <tt>RENAME</tt> is only interesting in the cross-server case. In this
 case it issues a (non-standard) XFER command to the backend that currently
@@ -422,7 +424,7 @@
 (as backends inform it of updates). The slave makes these modifications on
 the local copy of the mailboxes database.
 
-<a name="analysis"><h3>4.0 Analysis</h3></a>
+<h3><a name="analysis">4.0 Analysis</a></h3>
 
 ??? Add timing info? Random load testing?
 
@@ -505,7 +507,7 @@
 
 </ul>
 
-<a name="futures"><h3>5.0 Futures</h3></a>
+<h3><a name="futures">5.0 Futures</a></h3>
 
 <ul>
 <li>It would be nice to be able to replicate the messages in a
@@ -514,7 +516,7 @@
 
 <li>We are also evaluating using the aggregator to be able to provide
 mailboxes to the user with a different backup policy or even different
-"quality of service." Foe example, we are looking to give users a
+"quality of service." For example, we are looking to give users a
 larger quota than default but not back up the servers where these
 mailboxes exist.
 
@@ -523,7 +525,7 @@
 insufficient for the needs of the Aggregator
 
 <li>It would be nice if quotaroots had some better semantics with
-respect to the murder (either make them first-class entities, or 
+respect to the murder (either make them first-class entities, or
 have them apply across servers).
 
 </ul>
@@ -572,7 +574,7 @@
 server but it creates a problem where a user can not share a folder
 with a user on a different back end server.
 
-Multiplexors references: 
+Multiplexors references:
 <ul >
 <li><a href="http://www.bluetail.com/big/common/wp11.pdf">BLUETAIL Mail
 Robustifier</a> - Note this link broken due to the acquisition of
@@ -641,7 +643,7 @@
 
 Murder of IMAP servers</dt>
 <dd>A grouping of IMAP servers. It sounded cool for crows so we
-decided to use it for IMAP servers as well. 
+decided to use it for IMAP servers as well.
 </dd>
 
 <dt>quota operations</dt>
@@ -662,7 +664,7 @@
 
 
 <tt>LSUB, SUBSCRIBE, UNSUBSCRIBE, SETQUOTA, GETQUOTA, EXAMINE,
- STATUS</tt> 
+ STATUS</tt> 
 
 All these commands could be handled by the mailboxes
 dataset.MBOXDSET This would mainly be a client enhancement. For
@@ -681,7 +683,7 @@
 
 <blockquote>
 i would have called it an atlas.... or iatlas (pronounced "yatlas")
- 
+ 
 it is a collection of (i)maps.
 </blockquote>
 
@@ -723,7 +725,7 @@
 <li>1.0 - Initial revision.
 </ul>
 
-</div> 
+</div>
 
 </body>
 </html>

cyrus-imapd-2.4.17.tar.gz/doc/altnamespace.html -> cyrus-imapd-2.5.tar.gz/doc/altnamespace.html Changed

@@ -1,18 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title>Cyrus IMAP Server: Altername Namespace</title>
-
 </HEAD><BODY>
 <H1> Cyrus IMAP Server: Alternate Namespace</H1>
 
 This document describes the alternatives to the <a
-href=overview.html#mboxname> standard</a> mailbox presentation
+href="overview.html#mboxname"> standard</a> mailbox presentation
 method. These alternatives may be used together or independently.
 
 The namespace options do NOT change the rules governing the behavior of
-mailboxes (as described in <a href=overview.html#mboxname>
+mailboxes (as described in <a href="overview.html#mboxname">
 overview.html</a>) or how mailboxes are stored on the filesystem. The
-mailboxes are ALWAYS stored using the <a href=overview.html#mboxname>
-<tt>netnews</tt> convention</a> and <a href=overview.html#mboxnamestd>
+mailboxes are ALWAYS stored using the <a href="overview.html#mboxname">
+<tt>netnews</tt> convention</a> and <a href="overview.html#mboxnamestd">
 internal namespace</a>. When configured to use one (or both) of the
 options below, the server simply translates mailbox names between the
 internal names and the external names when used by the client in the
@@ -38,19 +40,19 @@
 "<TT>bovik</TT>" had a personal "<TT>work</TT>" mailbox, it would
 appear to user "<TT>bovik</TT>" as "<TT>work</TT>" instead of
 "<TT>INBOX.work</TT>" as it would in the <a
-href=overview.html#mboxnamestd> standard namespace</a>.
+href="overview.html#mboxnamestd"> standard namespace</a>.
 
 This configuration requires that a special prefix be used for
 shared folders (to distinguish them from personal folders) and for
 accessing other users' folders. By default, the prefix for shared
 folders is "<tt>Shared Folders</tt>" and the prefix for other users
 folders is "<tt>Other Users</tt>". For example, a shared folder
-"<tt>foo</tt>" in the <a href=overview.html#mboxnamestd> standard
+"<tt>foo</tt>" in the <a href="overview.html#mboxnamestd"> standard
 namespace</a> would be presented as "<tt>Shared Folders.foo</tt>" in
 the alternate namespace.
 
 NOTE: All tools for administering the server, including
-admins using cyradm, always use the <a href=overview.html#mboxnamestd>
+admins using cyradm, always use the <a href="overview.html#mboxnamestd">
 internal namespace</a>.
 
 <H3><a name="altnameconfig">Configuring the Alternate
@@ -69,17 +71,17 @@
 the <tt>netnews</tt> character ("."). For example, if user
 "<tt>bovik</tt>" had a personal "<tt>work</tt>" mailbox, it would
 appear to user "<tt>bovik</tt>" as "<tt>INBOX/work</tt>" in the
-<a href=overview.html#mboxnamestd>standard namespace</a>.
+<a href="overview.html#mboxnamestd">standard namespace</a>.
 
 When the UNIX hierarchy convention is used, the "." character MAY
 be used in mailbox names, including user names. In order to maintain
 backwards compatibility with the <a
-href=overview.html#mboxnamestd>internal namespace</a>, all "."
+href="overview.html#mboxnamestd">internal namespace</a>, all "."
 characters are translated to a benign character (currently
 "^") before any data is stored to disk. For example, if user
 "<tt>elmer.fudd</tt>" had a personal "<tt>rabbit.holes</tt>" mailbox,
 it would be stored as "<tt>user.elmer^fud.rabbit^holes</tt>" in the <a
-href=overview.html#mboxnamestd>internal namespace</a>. It is
+href="overview.html#mboxnamestd">internal namespace</a>. It is
 important to remember this phenomenon if/when reverting back to the
 <tt>netnews</tt> hierarchy convention.

cyrus-imapd-2.4.17.tar.gz/doc/anoncvs.html -> cyrus-imapd-2.5.tar.gz/doc/anoncvs.html Changed

@@ -1,17 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <html>
+ <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title> Cyrus IMAP: Anonymous CVS Access </title>
- 
- 
 <body>
 <h1>Cyrus IMAP: Anonymous CVS Access</h1>
 
 This file is for those who are reading Cyrus sources via anonymous CVS,
 or those who would like to.
- 
+
 If you're someone who would like to work with the source code and get more
 frequent updates, keeping in mind that we take some liberties with proper
 CVS use, you might want to get Cyrus via anonymous CVS.
- 
+
 <blockquote>
 
 	If you're not a programmer, please don't do this. If you're not at
@@ -19,7 +20,7 @@
 	with the tarball releases at ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
 
 </blockquote>
- 
+
 
 To get to the repository, get a version of CVS with client-server support
 (anything remotely recent has this, I think) and do this:
@@ -37,7 +38,7 @@
 path to the CVS repository; co says "check out", -d says "and stick it
 in the directory cyrus-imapd", and "cyrus" specifies the "cyrus"
 collection). The password is "anonymous".
- 
+
 
 You will need autoconf, yacc (bison) and lex (flex) to build CVS
 from the repository because we don't keep generated files in the
@@ -50,31 +51,31 @@
 autoheader
 autoconf
 </kbd></pre>
- 
- 
+
+
 
 Read access to the repository is availible to anyone via
 cvs.andrew.cmu.edu. Write access is availible to only a few people at
 CMU.
- 
+
 
 Please note that the version in the repository is not the version we are
 running. We have a seperate system that resembles version control for
 releases of software on the Andrew system, and sometimes changes don't
 get propigated back to CVS.
- 
+
 
 What is here is supposed to be stable. It's supposed to work, and
 compile, and not have amazingly broken changes that can't possibly work.
 But that may not be the case--and since you decided to use CVS, you
 shouldn't complain when something doesn't work. You should submit a
 patch.
- 
+
 
 There is no warranty on the Cyrus software.
 There is no warranty on anything in CVS, and even less of a guarantee
 of it working. (There. You've been warned.)
- 
+
 Please refer to <a href="feedback.html">Sending Feedback</a> if you
 would like to submit a bug, feature request or (best of all) patch.

cyrus-imapd-2.4.17.tar.gz/doc/bugs.html -> cyrus-imapd-2.5.tar.gz/doc/bugs.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/changes.html -> cyrus-imapd-2.5.tar.gz/doc/changes.html Changed

@@ -1,13 +1,101 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org" />
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 <title>Changes to the Cyrus IMAP Server</title>
 </head>
 <body>
 
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta7</h1>
+<ul>
+<li>Added support for returning jCal data in GET/PROPFIND/REPORT
+ response.</li>
+<li>Added support for accepting jCal data in PUT request.</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta6</h1>
+<ul>
+<li>Plugged several memory leaks found by Valgrind</li>
+<li>Less verbose reconnect communication between frontend and
+ backend</li>
+<li>GET on calendar-home-set now returns a list of subscribe-able
+ calendars</li>
+<li>Auto-provisioning of calendars/addressbooks now works via a
+ frontend proxy</li>
+<li>Fixed several conformance bugs detected by CalDAVTester</li>
+<li>Added support for optionally adding Content-MD5 header to
+ responses (see <tt>httpcontentmd5</tt> option)</li>
+<li>Fixed time-based queries for components other than VEVENT</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta5</h1>
+<ul>
+<li>RSS module now produces Atom 1.0 output rather than RSS 2.0 (we
+ prefer IETF standards)</li>
+<li>PROPFIND/REPORT allprop/propname requests are now supported</li>
+<li><tt>unixhierarchysep</tt> is now supported by all HTTP
+ modules</li>
+<li>Completely rewrote write_body() - Range requests are now supported
+ on non-chunked Content-Encoded data</li>
+<li>Added cache control response headers where appropriate to make
+ Redbot happy</li>
+<li>Fixed handling of telemetry log file descriptors and
+ truncation</li>
+<li>Allow GET on calendar collections for "exporting" entire
+ calendar</li>
+<li>Fixed POST on calendar collection (add-member)</li>
+<li>Fixed parsing of calendar-query filter</li>
+<li>Added several CalDAV/iCalendar validation checks based on
+ CalDAVTester results</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta4</h1>
+<ul>
+<li>Always verify authorization credentials supplied by the client (a
+ proxy may be reusing an existing connection as a different user)</li>
+<li>Don't bother supporting Digest qop=auth-int since no clients seem
+ to use it</li>
+<li>Don't show addressbook mailboxes in IMAP LIST output</li>
+<li>Plugged leaked memory found by Valgrind</li>
+<li>Better handling of request/response bodies</li>
+<li>Added <tt>httpprettytelemetry</tt> option</li>
+<li>Added <tt>httpallowcors</tt> option (Cross-Origin Resource Sharing)</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta3</h1>
+<ul>
+<li>Plugged leaked memory found by Valgrind</li>
+<li>Rewrote list_feeds() to not use memmem()</li>
+<li>OPTIONS method can be used without authentication</li>
+<li>Better handling of Connection:keep-alive</li>
+<li>Added <tt>httpallowedurls</tt> option</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta2</h1>
+<ul>
+<li>Fixed security bug where a user-agent could access files
+ outside of <tt>httpdocroot</tt>.
+<li>Changed annotation entry name scheme to be
+ "/vendor/cmu/cyrus-httpd/<" ns-href ">" prop</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17-caldav-beta1</h1>
+<ul>
+<li>Fixed Bug #3792: Build failures on Solaris 10</li>
+<li>Path to user's DAV DB will be created, if necessary</li>
+<li>Fixed bug where calendars and addressbooks were using the same
+ mailbox type flag</li>
+<li>Fixed unsigned int / size_t mismatches in formatted output</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.4.17</h1>
+<ul>
+<li>Added httpd service with CalDAV, CardDAV, RSS, and iSchedule
+ modules</li>
+</ul>
+
 <h1>Changes to the Cyrus IMAP Server since 2.4.16</h1>
 <ul>
 <li>A bunch of cleanups and fixes to compiling</li>
@@ -36,8 +124,6 @@
 <li>Fixed bug #3742: reconstruct can now fix multiple folders
 with the same uniqueid again (regression from 2.3) and also
 sync_client avoids a crash in that broken case.</li>
-<li>Fixed bug #3711: detect the buggy /usr/bin/compile_et shipped
- on MacOS X and fall back to our bundled copy.</li>
 </ul>
 
 <h1>Changes to the Cyrus IMAP Server since 2.4.15</h1>
@@ -366,11 +452,11 @@
 <h1>Changes to the Cyrus IMAP Server since 2.4.4</h1>
 <ul>
 <li>Tidy up of the git version number added to the ID response</li>
-<li>Fixed incorrect time field in date searches (Bug #3339) 
+<li>Fixed incorrect time field in date searches (Bug #3339)
 - thanks Greg Banks for noticing this one</li>
-<li>Fixed reconstruct crash and other potential issues (Bug #3353) 
+<li>Fixed reconstruct crash and other potential issues (Bug #3353)
 - first reported Paul Dekkers</li>
-<li>Fixed ACL passing for rename/delete on murder backends (Bug #3342) 
+<li>Fixed ACL passing for rename/delete on murder backends (Bug #3342)
 - first reported by Robert Spellman</li>
 <li>Fixed corruption of long (&gt;1024 byte) seen records on replica
 (Bug #3344) - found at FastMail by Bron Gondwana</li>
@@ -379,7 +465,7 @@
 <li>Fixed crash on message with incomplete final boundary (Bug #3345)
 - found at FastMail by Bron Gondwana</li>
 <li>Regression: sync_crc was being set to 00000000 on repack - introduced
- in 2.4.4 (Bug #3347) - first found at FastMail, but also seen at 
+ in 2.4.4 (Bug #3347) - first found at FastMail, but also seen at
 multiple other sites</li>
 <li>Always print CLOSED response when selecting a new mailbox, even
 if a CONDSTORE enabling command has not been sent (Bug #3352) - reported
@@ -466,7 +552,7 @@
 <li>Fix cyrdump to work with -C for alternate config</li>
 <li>Change master to process all pending child messages once per
 loop, which fixes a DoS situation if there is too much message churn
- in a slower box - thanks to Henrique de Moraes Holschuh 
+ in a slower box - thanks to Henrique de Moraes Holschuh
 &lt;hmh@debian.org&gt;</li>
 <li>Reconstruct added flags -R, -U, -o, -O to give options
 handling corrupt or missing files</li>
@@ -496,7 +582,7 @@
 consistency checking, and recovery from "split-brain" scenarios.</li>
 <li>Added support for LIST-EXTENDED IMAP extension. Removed
 support for deprecated (compile-time) LISTEXT IMAP extension.
-Based on work by Martin Konold &lt;martin.konold@erfrakon.de&gt;</li> 
+Based on work by Martin Konold &lt;martin.konold@erfrakon.de&gt;</li>
 <li>Added support for ESEARCH IMAP extension.</li>
 <li>Added support for WITHIN extension to IMAP SEARCH.</li>
 <li>Added support for ENABLE IMAP extension.</li>
@@ -513,10 +599,10 @@
 </ul>
 
 <h1>Changes to the Cyrus IMAP Server since 2.3.17</h1>
-<ul> 
+<ul>
 <li>Fix for incomplete authentication checks in nntpd,
- reported by Secunia as SA46093 - thanks Stefan Cornelius, 
- Secunia Research</li> 
+ reported by Secunia as SA46093 - thanks Stefan Cornelius,
+ Secunia Research</li>
 </ul>
 
 <h1>Changes to the Cyrus IMAP Server since 2.3.16</h1>
@@ -532,7 +618,7 @@
 <li>Added <tt>disconnect_on_vanished_mailbox</tt> option.
 See <tt>imapd.conf(5)</tt> for details</li>
 <li>Reworked SQL detection code in configure.
- See <a href=install-upgrade.html>install-upgrade.html</a> for more
+ See <a href="install-upgrade.html">install-upgrade.html</a> for more
 details.</li>
 <li>Added <tt>popuseimapflags</tt> option which enables setting and
 obeying IMAP flags in the POP server.</li>
@@ -541,12 +627,12 @@
 Cyril Servant &lt;elfejoyeux@gmail.com&gt;) </li>
 <li>Added <tt>annotation_definitions</tt> option for specifying
 external (third-party) annotations. (courtesy of Thomas
- Viehmann <tv@beamnet.de>)</li>
+ Viehmann &lt;tv@beamnet.de&gt;)</li>
 <li>Added <tt>sync_compress</tt> option to compress replication traffic</li>
 <li>Added <tt>user_folder_limit</tt> option to limit the number of
 folders a non-admin user is allowed to create.</li>
 <li>Added <tt>-x</tt> option to <tt>cyr_expire</tt> to disable expunge</li>
-<li>Track idle state so a shutdown doesn't leave idled killing random other 
+<li>Track idle state so a shutdown doesn't leave idled killing random other
 processes on a busy system</li>
 <li>Fix missing closedir() - bug #3159 (thanks Simon Matter)</li>
 <li>Make Cyrus compile with older GCC (thanks Simon Matter)</li>
@@ -583,7 +669,7 @@
 <li>Fixed incorrect quota calculations on sync_server when replicating
 unexpunged messages (thanks David Carter)</li>
 <li>Allow user rename to succeed even if the user is over quota</li>
-<li>Fixed a skiplist foreach bug and various datatype size issues that 
+<li>Fixed a skiplist foreach bug and various datatype size issues that
 caused problems on some 64 bit architectures</li>
 <li>Added additional logging of mailbox events if condstore is enabled
 to ensure modseq values are always correctly replicated</li>
@@ -670,7 +756,7 @@
 -- based on work of David Carter.</li>
 <li>Implemented incremental squat updates (see <tt>squatter.8</tt>)
 -- courtesy of David Carter.</li>
-<li>Fixed major bugs in <tt>reconstruct -k</tt> implementation 
+<li>Fixed major bugs in <tt>reconstruct -k</tt> implementation
 -- courtesy of David Carter.</li>
 <li>Added code to promote transaction safety and to track the lock
 status of skiplist databases -- courtesy of Fastmail.fm.</li>
@@ -724,7 +810,7 @@
 removed at a later time by <tt>cyr_expire</tt>. The new
 <tt>delete_mode</tt> and <tt>deletedprefix</tt> options in
 <tt>imapd.conf</tt> controls whether deletes are "immediate" or
-"delayed" and the mailbox hierarchy for "delayed" deletes. 
+"delayed" and the mailbox hierarchy for "delayed" deletes.
 -- courtesy of David Carter and FastMail.fm.</li>
 <li>Fixed the special case of RENAMEing an Inbox, so that it doesn't
 keep the same mailbox uniqueid, thus allowing it to replicate
@@ -787,14 +873,14 @@
 <tt>BODYSTRUCTURE</tt> response (per RFC 3501). -- inspired by
 Fastmail.fm</li>
 <li>Fixed <tt>flushseenstate</tt> bug which was causing unsolicited
-EXPUNGE responses during FETCH/STORE. -- courtesy of David 
+EXPUNGE responses during FETCH/STORE. -- courtesy of David
 Carter</li>
 <li>Added option to <tt>ctl_mboxlist</tt> to verify the consistency of
 the mailbox list database and the spool partition(s). See
 <tt>ctl_mboxlist.8</tt> for details.</li>
 <li>RENAME now copies <tt>cyrus.expunge</tt> index file as well as
 expunged message files.</li>
-<li>Fixed replication of 64-bit quotas. -- courtesy of David 
+<li>Fixed replication of 64-bit quotas. -- courtesy of David
 Carter</li>
 <li>Fixed miscellaneous bugs, memory leaks, and build issues.</li>
 </ul>
@@ -835,19 +921,19 @@
 <li>Fixed miscellaneous bugs and build issues.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.5</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.5</h1>
+<ul>
 <li>Fixed COPY code so that clients display new messages (added MODSEQ).</li>
 <li>Fixed imtest to be compatible with SASL 2.1.22.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.4</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.4</h1>
+<ul>
 <li>Fixed append/delivery code so that clients display new messages.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.3</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.3</h1>
+<ul>
 <li>Added support for BINARY APPEND (including CATENATE).
 Based on contributions from Tom Esh &lt;esh@lucent.com&gt;.</li>
 <li>Added support for CONDSTORE (must be enabled on a per-mailbox
@@ -863,13 +949,13 @@
 <li>Fixed miscellaneous bugs and build issues.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.2</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.2</h1>
+<ul>
 <li>Fixed broken berkeley (btree) backend.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.1</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.1</h1>
+<ul>
 <li>Added more extensive output to arbitron.</li>
 <li>Allow responses of any length from backend when proxing
 IMAP/POP3/NNTP traffic.</li>
@@ -884,8 +970,8 @@
 <li>Fixed miscellaneous bugs and build issues.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.3.0</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.3.0</h1>
+<ul>
 <li>Updated ACL code to RFC 4314 (separate rights for message delete,
 mailbox delete, and expunge).</li>
 <li>Fixed IDLE to use idled for local mailboxes.</li>
@@ -902,7 +988,7 @@
 "replicated" servers can serve the same mailboxes from a shared
 filesystem. The new <tt>mupdate_config</tt> option in
 <tt>imapd.conf</tt> is used to determine whether a Murder is using a
-"traditional", "unified" or "replicated" configuration.</li> 
+"traditional", "unified" or "replicated" configuration.</li>
 <li>Ported/rewrote/integrated David Carter's mailspool replication
 code. Development sponsored by Columbia University.</li>
 <li>Added support for "delayed" expunge, in which messages are
@@ -951,27 +1037,27 @@
 <li>The Sieve "copy" extension is now supported.</li>
 <li>The IMAP "CATENATE" and "URLAUTH" extensions are now supported.</li>
 <li>Updated Sieve "vacation" extension to draft-ietf-sieve-vacation-04.</li>
-<li>Added support for Sieve scripts on shared mailboxes via the 
+<li>Added support for Sieve scripts on shared mailboxes via the
 /vendor/cmu/cyrus-imapd/sieve annotation.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1>
+<ul>
 <li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
 making it useful for remote mailboxes.</li>
 <li>Added <tt>sieve_allowreferrals</tt> option to control whether
 <tt>timsieved</tt> issues referrals or proxys traffic to backends.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.2.12</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.2.12</h1>
+<ul>
 <li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
 annotation).</li>
 <li>Updated <tt>nntpd</tt> to be compliant with latest draft (soon to be
 RFC3977).</li>
 <li>Updated IMAP UIDPLUS extension to be compliant with latest
 specification (RFC4315).</li>
-<li>Performance improvements to <tt>quota</tt> utility.<li>
+<li>Performance improvements to <tt>quota</tt> utility.</li>
 <li>Fixed possible race condition in IMAP IDLE.</li>
 <li>Made <tt>ptloader</tt> runtime configurable.</li>
 <li>Added more extensive output to <tt>arbitron</tt>.</li>
@@ -986,8 +1072,8 @@
 <li>Fixed miscellaneous bugs and build issues.</li>
 </ul>
 
-<h1>Changes to the Cyrus IMAP Server since 2.2.11</h1> 
-<ul> 
+<h1>Changes to the Cyrus IMAP Server since 2.2.11</h1>
+<ul>
 <li>Revert index change which wasn't supposed to make it into 2.2.11</li>
 </ul>
 
@@ -1010,7 +1096,7 @@
 <h1>Changes to the Cyrus IMAP Server since 2.2.8</h1>
 <ul>
 <li>Change ACLs correctly when renaming a user</li>
-<li>Do not abandon std{in,out,err} file descriptors; syslog assumes it can 
+<li>Do not abandon std{in,out,err} file descriptors; syslog assumes it can
 use stderr if syslogd isn't running.</li>
 <li>Clean up imap magic plus to avoid buffer overrun (CAN-2004-1011)</li>
 <li>Fix lack of bounds checking in PARTIAL and FETCH (CAN-2004-1012, CAN-2004-1013)</li>
@@ -1094,7 +1180,7 @@
 <li>Runtime configuration of the Cyrus databases. The cyrudb backend
 used for each database can be specified with an <tt>imapd.conf</tt>
 option. NOTE: You MUST convert the database using
-<tt>cvt_cyrusdb</tt> BEFORE changing the backend in <tt>imapd.conf</tt>.
+<tt>cvt_cyrusdb</tt> BEFORE changing the backend in <tt>imapd.conf</tt>.</li>
 <li>Sendmail socket map support (<tt>smmapd</tt>) for verifying that
 mailboxes exist and are deliverable before accepting the message and
 sending it to Cyrus.</li>
@@ -1125,7 +1211,7 @@
 &lt;hmh@debian.org&gt;)</li>
 <li>Significantly improved message header caching (based in large part
 on code supplied by David Carter &lt;David.Carter@ucs.cam.ac.uk&gt; from
-the University of Cambridge)
+the University of Cambridge)</li>
 <li>The sieve bytecode format has been updated once more, to correctly
 handle short-circuiting of the allof and anyof operators</li>
 <li>Support for warning quota based on absolute mailbox size</li>
@@ -1147,7 +1233,7 @@
 <li><tt>expirenews</tt> has been replaced by <tt>cyr_expire</tt> which
 uses annotations for fine-grained mailbox expiration.</li>
 <li><tt>squatter</tt> can now use annotations for fine-grained mailbox
-indexing.</li> 
+indexing.</li>
 <li>Many nntpd enhancements including: reader-only and feeder-only
 modes, support for LIST NEWSGROUPS (via mailbox annotations) and
 gatewaying news to mail (via mailbox annotations).</li>
@@ -1201,7 +1287,7 @@
 to skiplist from Berkeley and Flat, respectively. </li>
 
 <li> ptloader is now a regular cyrus service. This has several implications,
-see <a href=install-upgrade.html>install-upgrade.html</a> for more details.</li>
+see <a href="install-upgrade.html">install-upgrade.html</a> for more details.</li>
 
 <li> NNTP support. Usenet news can now be fed to and read from Cyrus
 directly via NNTP, without the need for a local news server. See <a
@@ -1211,7 +1297,7 @@
 
 <li> Sieve scripts are now compiled to bytecode to allow for faster
 execution (and lmtpd no longer needs lex or yacc). See
-<a href=install-upgrade.html>install-upgrade.html</a> for more details.</li>
+<a href="install-upgrade.html">install-upgrade.html</a> for more details.</li>
 
 <li> The functionality of pop3proxyd has been merged into pop3d. Be
 sure to update <tt>cyrus.conf</tt> on your frontend machines accordingly.</li>
@@ -1308,19 +1394,19 @@
 
 <h2>Changes to the Cyrus IMAP Server since 2.1.9</h2>
 <ul>
-<li>support Berkley DB 4.1
-<li>more portable use of errno throughout
-<li>timsieved now does telemetry logging
-<li>libcyrus.a no longer supplies fs_get() and fs_give()
+<li>support Berkley DB 4.1</li>
+<li>more portable use of errno throughout</li>
+<li>timsieved now does telemetry logging</li>
+<li>libcyrus.a no longer supplies fs_get() and fs_give()</li>
 </ul>
 
 <h2>Changes to the Cyrus IMAP Server since 2.1.8</h2>
 <ul>
-<li>Fix a strlcpy() off-by-one error.
+<li>Fix a strlcpy() off-by-one error.</li>
 <li>Better handling of errors in connecting to LMTP servers for deliver and
-lmtpproxyd.
-<li>Fix bug in pop3proxyd's pop3s handling.
-<li>Fix Exim install documentation.
+lmtpproxyd.</li>
+<li>Fix bug in pop3proxyd's pop3s handling.</li>
+<li>Fix Exim install documentation.</li>
 </ul>
 
 <h2>Changes to the Cyrus IMAP Server since 2.1.7</h2>
@@ -1370,7 +1456,7 @@
 to be the same as the other test utilities. <tt>imtest</tt> also
 includes new MANAGESIEVE functionality (sivtest) as well as the
 ability to reconnect to the same server multiple times (useful for testing
-SSL/TLS session caching and DIGEST-MD5 fast reauth).</li> 
+SSL/TLS session caching and DIGEST-MD5 fast reauth).</li>
 
 <li>snmpgen generates stubbed out code so we don't waste resources on
 something that just doesn't work. At some point in time, we'll make it
@@ -1453,7 +1539,7 @@
 Currently off (it seems to hurt performance on Linux). </li>
 
 <li> <tt>master</tt> has preliminary code to avoid forking
-storms. </li> 
+storms. </li>
 
 <li> <tt>sieveshell</tt> should now loop through all available SASL
 mechanisms before conceding defeat. </li>
@@ -1466,7 +1552,7 @@
 
 <ul>
 <li> fud now runs from the Cyrus master process; more generally, the
-Cyrus master process can deal with UDP services. (Amos Gouaux, 
+Cyrus master process can deal with UDP services. (Amos Gouaux,
 <tt>amos@utdallas.edu</tt>)</li>
 
 <li> Sieve has been updated to be compliant with RFC 3028 and
@@ -2128,7 +2214,7 @@
 
 <li>The default format for reading information from INN has
 changed. If you use INN to feed imapd news, you must change your
-"<tt>newsfeeds</tt>" file to contain 
+"<tt>newsfeeds</tt>" file to contain
 
 <pre>
 collectnews!:*:Tf,WO:collectnews
@@ -2297,7 +2383,7 @@
 <h2>Changes to the Cyrus IMAP Server Since Version 1.5.14</h2>
 
 <ul>
-<li>LIST now honors the reference argument. 
+<li>LIST now honors the reference argument.
 
 This behavior can be turned off by a configuration option
 imapd.conf--which may be desirable because of certain clients that
@@ -2340,7 +2426,7 @@
 
 <li>A few configure tweaks.</li>
 
-<li>Duplicate delivery changes: 
+<li>Duplicate delivery changes:
 
 <ul>
 <li>Split out duplicate delivery elimination to multiple files.

cyrus-imapd-2.4.17.tar.gz/doc/cyrusv2.mc -> cyrus-imapd-2.5.tar.gz/doc/cyrusv2.mc Changed

cyrus-imapd-2.4.17.tar.gz/doc/faq.html -> cyrus-imapd-2.5.tar.gz/doc/faq.html Changed

@@ -4,7 +4,6 @@
 <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org" />
 <title>Cyrus IMAP Server FAQ</title>
-
 </head>
 <body>
 <h1>Cyrus IMAP Server FAQ</h1>
@@ -56,16 +55,16 @@
 which will deliver to the user's INBOX.mailfolder folder (or altnamespace
 equivalent). This submailbox must allow the posting user the 'p' right
 (generally, this means 'anyone' must have the 'p' right), otherwise the
-message will just be filed into the user's INBOX.
+message will just be filed into the user's INBOX.
 
 The second way is to form an address like postuser+mailfolder@domain.
 This will deliver into the mailbox 'mailfolder'. postuser is the string
 specified in the imapd.conf option of the same name, and may be the
 empty string. As before, the posting user will need to have the 'p' right on
-the mailbox.
+the mailbox.
 
 For both methods, if 'mailfolder' is more than one level deep, you will
-need to conform to the hierarchy separator appropriate to your site.
+need to conform to the hierarchy separator appropriate to your site.
 </li>
 
 <li>Performance/Capacity/Scaling - See <a
@@ -86,20 +85,20 @@
 the MTA will get a separate response for each recipient and
 will only have to reattempt to deliver it to the second recipient.
 If using SMTP, only a single temporary failure response would be
- returned, and the entire transaction would have to be reattempted.
+ returned, and the entire transaction would have to be reattempted.
 Furthermore, LMTP is superior to invoking command-line delivery
 agents from the MTA in that most ESMTP extensions are supported by
-LMTP, without having to extend any interfaces.
+LMTP, without having to extend any interfaces.
 Lastly, because LMTP can be run over TCP, it allows you to run SMTP
 (and spam/virus scanning) and mailbox access on separate servers, thus
-allowing better scalability.
+allowing better scalability.
 </dd>
 
 <dt>Q: How do I configure my MTA?</dt>
 
 <dd>
 A: See <a href="install-configure.html#mta">Configuring the
-Mail Transfer Agent</a>
+Mail Transfer Agent</a>
 </dd>
 
 <dt>Q: How should I configure partitions to deal
@@ -113,12 +112,12 @@
 the number of users a partition can serve. To benefit from multiple
 partitions, each should be on its own set of disks, served by an
 unsaturated interface (FC, SCSI, SAS, SATA, etc) to the host running
-Cyrus.
+Cyrus.
 See <a href="install-perf.html">the performance guide</a> or general
 performance guidelines. Also see <tt>metapartition_files</tt> and
 <tt>metapartition-name</tt> in <tt>imapd.conf.5</tt> for additional
 configuration options which can help with performance, especially if
-you have access to high-speed storage (faster than disks).
+you have access to high-speed storage (faster than disks).
 </dd>
 </dl>
 
@@ -133,7 +132,7 @@
 PLAIN or plaintext login commands on encrypted connections
 (SSL-wrapped connections or after a successful STARTTLS command).
 This behavior can be changed with the use of the
-<tt>allowplaintext</tt> option in <tt>imapd.conf.5</tt>.
+<tt>allowplaintext</tt> option in <tt>imapd.conf.5</tt>.
 </dd>
 
 <dt>Q: I'm getting syslog'd messages from the master process
@@ -169,7 +168,7 @@
 </pre>
 
 Make sure that <tt>saslauthd</tt> is running and that the cyrus
-user can access the unix domain socket (defaults to <tt>/var/run/mux</tt>).
+user can access the unix domain socket (defaults to <tt>/var/run/mux</tt>).
 
 </dd>
 
@@ -248,14 +247,8 @@
 </pre>
 </dd>
 
-<dt>Q: I'm getting messages in <tt>imapd.log</tt> like:
-<pre>
-Sep 11 17:23:55 ogg lmtpd773: DBERROR db3: 16 lockers
-Sep 11 17:23:55 ogg lmtpd1409: DBERROR db3: 17 lockers
-Sep 11 17:23:56 ogg lmtpd1508: DBERROR db3: 9 lockers
-Sep 11 17:23:56 ogg lmtpd776: DBERROR db3: 9 lockers
-</pre>
-What's wrong?
+<dt>Q: I'm getting messages in <tt>imapd.log</tt> like
+"DBERROR db3: 16 lockers". What's wrong?
 </dt>
 
 <dd>
@@ -296,13 +289,13 @@
 client implementations will get stuck in a situation where they cannot
 delete a message from a mailbox because they try to COPY it to the trash
 folder before deleting the message. This operation will fail due to the
-mailbox being over quota. This is separate from the fact that a specific 
+mailbox being over quota. This is separate from the fact that a specific
 mailbox name is not interoperable between clients (one might call it 'trash',
 another 'Trash', another 'Recycle Bin', etc)
 
 Given the lack of protocol support for a trash folder, this is mostly a
 quality-of-implementation issue on the client side. There
-are a few options here:
+are a few options here:
 <ul>
 <li>Contact your client vendor to have
 the broken client fixed (one possibility is to have the client ask the user
@@ -313,7 +306,6 @@
 it assumes that all clients that make use of a trash folder do so with the
 same folder name.</li>
 </ul>
-
 </dd>
 
 <dt>Q: How do I stop Cyrus from advertising the DIGEST-MD5 and

cyrus-imapd-2.4.17.tar.gz/doc/feedback.html -> cyrus-imapd-2.5.tar.gz/doc/feedback.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Sending Feedback on the Cyrus IMAP Server</TITLE>
 
 </HEAD>
@@ -22,7 +24,7 @@
 When reporting problems, be sure to include the relevant
 information. For example, you must include:
 <ul>
-	 <li> the version of imapd 
+	 <li> the version of imapd
 	 <li> the version of libsasl
 	 <li> your system type (<tt>uname -a</tt> often provides
 	 the right information).
@@ -32,16 +34,16 @@
 	 <li> the options you passed to <tt>./configure</tt>
 	 <li> the errors from <tt>make</tt> (if any)
 	 <li> the <tt>config.status</tt> file generated by
-	 <tt>configure</tt> 
+	 <tt>configure</tt>
 </ul>
 
 NOTE: If you are able to connect to the imap server, all of this
-information can be gathered by using the <tt>version</tt> 
+information can be gathered by using the <tt>version</tt>
 command in <tt>cyradm</tt>. If you cannot use <tt>cyradm</tt>
 because you are having perl problems, you can connect using
 <tt>imtest</tt> and then run the following IMAP command:
 <ul>
-<tt>a ID NIL</tt>
+<li><tt>a ID NIL</tt>
 </ul>

cyrus-imapd-2.4.17.tar.gz/doc/index.html -> cyrus-imapd-2.5.tar.gz/doc/index.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/install-admin-mb.html -> cyrus-imapd-2.5.tar.gz/doc/install-admin-mb.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/install-auth.html -> cyrus-imapd-2.5.tar.gz/doc/install-auth.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Authenticating Users
 </title>
 </head>
@@ -11,7 +13,7 @@
 <h2>Introduction</h2>
 
 The Cyrus IMAP Server uses the Cyrus SASL library to authenticate
-users. Please refer to the Cyrus SASL documentation for specific 
+users. Please refer to the Cyrus SASL documentation for specific
 details on SASL. This section focuses specifically on the server processes
 distributed with Cyrus IMAPd.
 
@@ -23,7 +25,7 @@
 STARTTLS using client-side certificates and the EXTERNAL
 authentication method.
 
-GSSAPI is specific to Kerberos version 5. Additionally, STARTTLS client 
+GSSAPI is specific to Kerberos version 5. Additionally, STARTTLS client
 side certificates have not been extensively tested.
 
 When STARTTLS is enabled, the PLAIN SASL mechanism (if installed)
@@ -50,7 +52,7 @@
 we or someone else might provide that feature.
 
 <li>If you have more than one mail server, we recommend that you
-configure the system to use GSSAPI and Kerberos5. 
+configure the system to use GSSAPI and Kerberos5.
 
 <li>If you have some other authentication mechanism that requires the
 clear text password, you should use <tt>saslauthd</tt>.
@@ -74,7 +76,7 @@
 href="http://www.kernel.org/pub/linux/libs/pam/FAQ">
 http://www.kernel.org/pub/linux/libs/pam/FAQ</a> for more information
 on PAM. By using a PAM module, all the other applications on your
-system can take advantage of it -- for example, login, xlock, etc. 
+system can take advantage of it -- for example, login, xlock, etc.
 
 Keep in mind that when you use PLAIN or LOGIN you should encrypt
 the stream so a user's password cannot be trivially sniffed off of
@@ -89,7 +91,7 @@
 <tt>pwcheck_method</tt> becomes <tt>sasl_pwcheck_method</tt>).
 
 <h3>/etc/sasldb2</h3>
-	
+
 The easiest method for authenticating users is to use the libsasl
 authentication database and create users using the
 "<tt>saslpasswd2</tt>" utility. Set "<tt>sasl_pwcheck_method:
@@ -116,7 +118,7 @@
 Cyrus IMAP supports Kerberos v4 if the SASL library was compiled
 with KERBEROS_V4 support.
 
-You'll have to 
+You'll have to
 create a Kerberos v4 identity for the server and add the server's key to
 the "<tt>srvtab</tt>" file. The file must be readable by the cyrus
 user. The server's Kerberos identity is "<tt>imap.HOST@REALM</tt>",
@@ -133,18 +135,18 @@
 
 Here is the information "<tt>ksrvutil</tt>" requests. Respond by
 filling in values or by pressing <KBD>RETURN</KBD>. In this example,
-the host name is "<tt>foobar</tt>" and the realm is 
+the host name is "<tt>foobar</tt>" and the realm is
 "<tt>ANDREW.CMU.EDU</tt>".
 
 <pre>
 Name: <kbd>imap</kbd>
 Instance: <KBD>foobar</KBD>
 Realm: <KBD>ANDREW.CMU.EDU</KBD>
- Version number: 
+ Version number:
 New principal: imap.foobar@ANDREW.CMU.EDU; version 0
- Is this correct? (y,n) y 
- Password: 
- Verifying, please re-enter Password: 
+ Is this correct? (y,n) y
+ Password:
+ Verifying, please re-enter Password:
 Key successfully added.
 Would you like to add another key? (y,n) y <KBD>n</KBD>
 </pre></li>

cyrus-imapd-2.4.17.tar.gz/doc/install-compile.html -> cyrus-imapd-2.5.tar.gz/doc/install-compile.html Changed

@@ -1,12 +1,13 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Compiling the IMAP Server
 </title>
 </head>
-<h1>Compiling the IMAP Server
-</h1>
 <body>
+<h1>Compiling the IMAP Server</h1>
 
 Once you have unpacked the files by extracting the tar archive,
 "<TT>cd</TT>" to the "<tt>cyrus-imapd-NNNN</tt>" directory
@@ -71,7 +72,7 @@
 <dt><tt>--with-auth=METHOD</tt>
 <dd>Specifies the authorization (group membership) module to use.
 Currently implemented authorization modules are:
-<dl compact> 
+<dl compact>
 <DT><tt>unix</tt>
 <DD>Unix <tt>/etc/passwd</tt> and <tt>/etc/group</tt> file
 <DT><tt>krb</tt>
@@ -132,7 +133,7 @@
 <dt><tt>--with-idle=METHOD</tt>
 <dd>Specifies the IMAP IDLE method to use.
 Currently implemented IDLE methods are:
-<dl compact> 
+<dl compact>
 <DT><tt>idled</tt>
 <DD>Use the IDLE daemon. The IDLE daemon listens on a UNIX socket for
 messages from lmtpd/imapd/pop3d that a mailbox has been updated. The
@@ -171,12 +172,12 @@
 <dd>Specifies where to find the Perl binary (full path, including
 name of binary).
 
-<dt><tt>--with-sasl=PATH</tt> 
+<dt><tt>--with-sasl=PATH</tt>
 <dd>Specifies the path to the directories containing the library
 (<tt>.../lib</tt>) and include (<tt>.../include</tt>)
 files for libsasl. 
 
-<dt><tt>--with-statedir=PATH</tt> 
+<dt><tt>--with-statedir=PATH</tt>
 <dd>Specifies the directory used for communicating with various
 daemons. By default, configure uses "<TT>/var</TT>". 
 
@@ -251,7 +252,7 @@
 <DT><TT>LDFLAGS</TT>
 <DD>Stripping ("<TT>-s</TT>") and any other miscellaneous options for the
 linker. If it is not set in the environment when "<tt>configure</tt>" runs,
-the default value is empty. 
+the default value is empty.
 
 <DT><TT>DEFS</TT>
 <DD>Configuration options, in the form "<tt>-Dfoo -Dbar ...</tt>" 
@@ -266,9 +267,9 @@
 If you need to do unusual things to compile the package, we encourage
 you to figure out how "<tt>configure</tt>" could check whether to do
 them. After doing so, please send us a patch! Instructions for doing
-so can be found on the <a href="feedback.html">feedback</a> page. 
+so can be found on the <a href="feedback.html">feedback</a> page.
 
-The file "<tt>configure.in</tt>" is used as a template to create
+The file "<tt>configure.ac</tt>" is used as a template to create
 "<tt>configure</tt>" by a program called "<tt>autoconf</tt>". You
 will only need it if you want to regenerate "<tt>configure</tt>" using
 a newer version of "<tt>autoconf</tt>".
@@ -277,7 +278,7 @@
 following commands:
 
 <pre>
-<kbd> make depend
+<kbd>
 make all CFLAGS=-O
 </kbd></pre>

cyrus-imapd-2.4.17.tar.gz/doc/install-configure.html -> cyrus-imapd-2.5.tar.gz/doc/install-configure.html Changed

@@ -1,14 +1,15 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Installing and configuring the IMAP Server
 </title>
 </head>
-<h1>Installing and configuring the IMAP Server
-</h1>
 <body>
+<h1>Installing and configuring the IMAP Server</h1>
 
-This section describes the shell scripts to run and the configuration 
+This section describes the shell scripts to run and the configuration
 files to modify once "<tt>configure</tt>" and "<tt>make</tt>" have run.
 
 <ol> <li>Create a user and group for the Cyrus subsystem. The
@@ -42,7 +43,7 @@
 mv syslog.conf /etc/syslog.conf
 </kbd></pre>
 
-If you do not copy the "<tt>syslog/syslog.conf</tt>" file to the 
+If you do not copy the "<tt>syslog/syslog.conf</tt>" file to the
 "<tt>/etc</tt>" directory, be sure to add support for
 "<tt>local6.debug</tt>". The file should include a line like:
 
@@ -115,7 +116,7 @@
 <li>Create the default partition directories specified in the
 "<tt>/etc/imapd.conf</tt>" file.
 
-This document uses a default partition directory of 
+This document uses a default partition directory of
 "<tt>/var/spool/imap</tt>" in the following example:
 
 <pre>
@@ -180,7 +181,7 @@
 <li>To enable STARTTLS support, see <a href="#openssl">how to
 configure OpenSSL</a> below.
 
-<li>Add the following lines to the "<tt>/etc/services</tt>" file if they 
+<li>Add the following lines to the "<tt>/etc/services</tt>" file if they
 aren't already there.
 
 <pre>
@@ -193,8 +194,8 @@
 imaps 993/tcp
 pop3s 995/tcp
 kpop 1109/tcp
- sieve 2000/tcp
 lmtp 2003/tcp
+ sieve 4190/tcp
 fud 4201/udp
 </pre>
 
@@ -205,7 +206,7 @@
 restarted.
 </ol>
 
-<a name="master"><h3>Configuring the Master Process</h3></a>
+<h3><a name="master">Configuring the Master Process</a></h3>
 
 <ol>
 <li> Choose a configuration from the <tt>master/conf</tt> directory:
@@ -280,7 +281,7 @@
 </pre>
 </ol>
 
-<a name="mta"><h3>Configuring the Mail Transfer Agent</h3></a>
+<h3><a name="mta">Configuring the Mail Transfer Agent</a></h3>
 
 In order to deliver mail to the Cyrus system, you'll have to
 configure your MTA (Sendmail, Postfix, Exim, etc.) to use LMTP.
@@ -310,11 +311,11 @@
 define <tt>CYRUSV2_MAILER_ARGS</tt> appropriately as described in
 <TT>cf/README</TT>.</li>
 
-<li> For Sendmail 8.10 - 8.12.3, use the <a
+<li> For Sendmail 8.10 - 8.12.3, use the <a
 href="cyrusv2.mc">cyrusv2.mc</a> file as a template to create a
 Sendmail configuration file.</li>
 
-<li> For Sendmail 8.9.x and earlier, use the <tt>cyrus</tt> mailer
+<li> For Sendmail 8.9.x and earlier, use the <tt>cyrus</tt> mailer
 definition in the Sendmail distribution:
 
 <pre>
@@ -353,7 +354,7 @@
 was more crucial when the use of Cyrus' "<tt>deliver</tt>" was more
 prevalent, but it is still a good idea to follow this policy.)
 
-Another thing to note is the location of your "<tt>sendmail</tt>" 
+Another thing to note is the location of your "<tt>sendmail</tt>"
 command. On some platforms this will be "<tt>/usr/sbin/sendmail</tt>",
 on others, "<tt>/usr/lib/sendmail</tt>". Cyrus will need to know where
 this command is. See <a href="install-sieve.html">Installing Sieve</a>
@@ -387,12 +388,12 @@
 used to control how many simultaneous LMTP sessions will be
 permitted to the Cyrus message store.
 
-Additional examples are included in the Postfix 
+Additional examples are included in the Postfix
 file "<tt>README_FILES/LMTP_README</tt>".
 
 <h4>Configuring <a href="http://www.exim.org/">Exim 4</a></h4>
 
-Generate an Exim configuration file which delivers local mail to the
+Generate an Exim configuration file which delivers local mail to the
 IMAP server. See the Exim documentation for information on how to
 create a complete configuration file.
 
@@ -400,20 +401,18 @@
 are usually no local user accounts. As a result, you must define the
 following "router":
 
-<ul>
 <pre>
 localuser:
 driver = accept
 transport = local_delivery
 </pre>
-</ul>
 
 The following "transports" assume that you are using either the
 <tt>lmtpunix</tt> or <tt>lmtp</tt> service from one of the sample
 <tt>cyrus.conf</tt> files discussed above.
 
 <ul>
-<li> Using <tt>lmtpunix</tt> (UNIX socket):
+<li> Using <tt>lmtpunix</tt> (UNIX socket):
 
 <pre>
 local_delivery:
@@ -424,7 +423,7 @@
 </pre>
 </li>
 
-<li> Using <tt>lmtp</tt> (TCP socket -- Exim and Cyrus on same host):
+<li> Using <tt>lmtp</tt> (TCP socket -- Exim and Cyrus on same host):
 
 <pre>
 local_delivery:
@@ -442,9 +441,9 @@
 <h3>Exporting Netnews via IMAP</h3>
 
 If you wish to use export Netnews via IMAP, consult <a
-href=install-netnews.html>install-netnews.html</a>.
+href="install-netnews.html">install-netnews.html</a>.
 
-<a name="openssl"><h2>SSL, TLS, and OpenSSL</h2></a>
+<h2><a name="openssl">SSL, TLS, and OpenSSL</a></h2>
 
 Transport Layer Security (TLS), is a standardized version of the Secure
 Sockets Layer (SSL v3) standard. IMAP can make use of two different
@@ -471,7 +470,7 @@
 <li>OpenSSL requires the certificate and key in PEM format. You can
 create the server's private key and certificate yourself using
 OpenSSL. Here, we create a self-signed key for the machine
-"<tt>foobar.andrew.cmu.edu</tt>" and put both the certificate and key 
+"<tt>foobar.andrew.cmu.edu</tt>" and put both the certificate and key
 in the file "<tt>/var/imap/server.pem</tt>".
 
 Please do not blindly enter in the information to OpenSSL
@@ -565,12 +564,12 @@
 authenticate DN (distinguished name) to a SASL authentication
 name.
 
-<a name="altnamespace"><h2>Alternate Namespace and UNIX Hierarchy
-Convention</h2></a>
+<h2><a name="altnamespace">Alternate Namespace and UNIX Hierarchy
+Convention</a></h2>
 
 If you wish to use the alternate namespace and/or the UNIX hierarchy
 convention, consult <a
-href=altnamespace.html#altnameconfig>altnamespace.html</a>.
+href="altnamespace.html#altnameconfig">altnamespace.html</a>.
 
 <HR>
 last modified: $Date: 2010/01/06 17:01:29 $

cyrus-imapd-2.5.tar.gz/doc/install-http.html Added

@@ -0,0 +1,1070 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<title>Cyrus HTTP</title>
+</head>
+<body>
+
+<h1>Cyrus HTTP (RSS, CalDAV, CardDAV, iSchedule, DomainKey)</h1>
+
+Note that the HTTP service and associated modules in Cyrus are
+ still under development. This release should be considered beta
+ quality.
+
+<h2>Introduction</h2>
+
+Cyrus <tt>http</tt> service has the ability to:
+
+<ul>
+<li>Serve IMAP mailboxes as RSS feeds.</li>
+<li>Act as a calendar and scheduling (CalDAV) server by using IMAP
+ mailboxes as calendar collections and RFC 5322 messages to store
+ iCalendar data.</li>
+<li>Act as a contacts (CardDAV) server by using IMAP mailboxes as
+ addressbook collections and RFC 5322 messages to store vCard
+ data.</li>
+<li>Allow scheduling transactions between separate calendaring and
+ scheduling systems via the iSchedule protocol (currently only used
+ within a Cyrus Murder).</li>
+</ul>
+
+Unlike the <a href="http://httpd.apache.org/">Apache HTTP
+ Server</a>, Cyrus HTTP is NOT a general purpose HTTP server. Its
+ feature set is limited to what is required to support the
+ facilities listed above.
+
+This document assumes that you are familiar with building and
+ configuring a Cyrus server. If you have not already done so, please
+ read and understand the rest of the <a href="install.html">installation</a>
+ documentation before continuing. Note: The
+ "<a href="#install">Installation</a>" section below augments the
+ "<a href="install-compile.html">Compiling the IMAP Server</a>"
+ document. The remaining sections assume that your Cyrus server has
+ already been
+ successfully <a href="install-configure.html">configured</a>.
+
+This document also assumes that you are familiar with RSS, WebDAV,
+ calendaring, and contacts.
+
+
+<h2 id="install">Installation</h2>
+
+You will need to build Cyrus with 
+ the <tt>--enable-http</tt> configure option. This builds httpd
+ and the associated modules and utilities based on the availability
+ of the prerequisites listed below.
+
+<h3>General Requirements</h3>
+
+<ul>
+<li>Must have <a href="http://xmlsoft.org/">libxml2</a>
+ installed.</li>
+<li>Must have a recent SASL build (v2.1.26 or later) in order to
+ support HTTP Digest, Negotiate, and NTLM authentication.
+ Otherwise, only HTTP Basic authentication will be available</li>
+</ul>
+
+<h3>CalDAV / CardDAV Requirements</h3>
+<ul>
+<li>Must
+ have <a href="http://freeassociation.sourceforge.net/">libical</a>
+ installed.</li>
+<li>Must have <a href="http://www.sqlite.org/">SQLite</a> v3.x (or
+ later) installed.</li>
+<li>Optionally
+ install <a href="https://github.com/jehiah/json-c">json-c</a> for
+ jCal/jCard support.</li>
+</ul>
+
+
+
+<h2 id="config">General Configuration</h2>
+
+The Cyrus <tt>httpd</tt> service is configurable via several
+ options in <tt>imapd.conf</tt>. Several of those options are
+ discussed in the sections below. Admins should consult
+ the <tt>imapd.conf(5)</tt> manpage for the full list of options used
+ by the <tt>httpd</tt> service and its various modules.
+
+The support for RSS, CalDAV, and CardDAV is divided into separate
+ modules which run as part of the Cyrus <tt>httpd</tt>
+ service. Selection of which module(s) are enabled is
+ done by setting the <tt>httpmodules</tt> option accordingly. By
+ default, no modules are enabled.
+
+Cyrus <tt>httpd</tt> also can serve static content, the
+ location of which is set by the <tt>httpdocroot</tt> option. Any
+ content contained in the specified directory (including
+ sub-directories) will be served as static content only.
+ Cyrus <tt>httpd</tt> does NOT have the ability to execute any
+ server-side scripts.
+
+<h3>HTTP Authentication</h3>
+
+As with other Cyrus services, the Cyrus <tt>httpd</tt> service uses
+ Cyrus SASL to perform its authentication. Cyrus supports the
+ following HTTP authentication schemes: Basic, Digest, Negotiate
+ (Kerberos only), and NTLM. While Basic is available in all versions
+ of SASL, the remaining schemes are only available in Cyrus SASL
+ 2.1.16 (and higher).
+
+Similar to plaintext login commands supported by the other Cyrus
+ services (IMAP LOGIN, POP3 USER/PASS), the Cyrus <tt>httpd</tt>
+ service determines whether to advertise the HTTP Basic
+ authentication scheme based on the <tt>allowplaintext</tt> option
+ and whether the client has connected over a TLS protected connection
+ (HTTPS).
+
+The availability of the other HTTP authentication schemes is
+ controlled by the <tt>sasl_mech_list</tt> option. For
+ Cyrus <tt>httpd</tt> the <tt>DIGEST-MD5</tt>, <tt>GSS-SPNEGO</tt>,
+ and <tt>NTLM</tt> SASL plugins support the Digest, Negotiate,
+ and NTLM authentication schemes respectively, provided that these
+ plugins are installed on the server.
+
+<h2>RSS Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the RSS module will default to serving ALL mailboxes
+ to which the authenticated user has access as RSS feeds.
+ The <tt>rss_feeds</tt> option can be used to limit the set of
+ mailboxes that can be served as RSS feeds. For example,
+ setting <tt>rss_feeds</tt> to <tt>*,!user</tt> will serve all shared
+ mailboxes, but no personal mailboxes.
+
+The list of available RSS feeds can be obtained by clients by
+ accessing the <tt>/rss/</tt> URL on the Cyrus server. By default,
+ the server will present the list as a simple unordered list in an
+ HTML document. To customize the look and feel of the feed list,
+ the <tt>rss_feedlist_template</tt> option can be used to point to a
+ HTML template file. This file can utilize Cascading Style Sheets,
+ JavaScript, etc. Any and all content that the template file
+ references MUST reside under the <tt>httpdocroot</tt> as set above.
+ Consult the <tt>imapd.conf(5)</tt> manpage for specifics on the
+ required contents of this custom file. Note that for sites
+ running Cyrus Murder, <tt>rss_feedlist_template</tt> only needs to
+ be set on frontend servers, since only those servers have the
+ complete mailbox list.
+
+<h2>CalDAV Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the CalDAV module allows Cyrus to function as a
+ calendar and scheduling server. This module uses a subset of the
+ mailbox hierarchy as calendar collections, the toplevel of which is
+ specified by the <tt>calendarprefix</tt> option. The public
+ calendar hierarchy will reside at the toplevel of the shared mailbox
+ namespace. A user's personal calendar hierarchy will be a child of
+ their Inbox. For example, using the default value
+ for <tt>calendarprefix</tt>, a calendar named <tt>Default</tt> for
+ user <tt>murch</tt> would reside in the mailbox
+ named <tt>user.murch.#calendars.Default</tt>.
+
+Note that mailboxes in the calendar hierarchies (those
+ under <tt>calendarprefix</tt>) SHOULD NOT be accessed with an IMAP
+ client as doing so will leave a mailbox in a state unsuitable
+ for CalDAV. To this end, calendar mailboxes will not returned by
+ Cyrus <tt>imapd</tt> in response to an IMAP client's request for the
+ available mailbox list, but Cyrus <tt>imapd</tt> will not otherwise
+ prevent an IMAP client from accessing them.
+
+By default, the CalDAV module will automatically perform scheduling
+ operations when a scheduling object (invite or reply) is stored
+ on or deleted from the server. Support for the calendar-auto-schedule
+ feature can be disabled with the <tt>caldav_allowscheduling</tt>
+ option.
+
+
+<h3>Administration</h3>
+
+<h4>Calendar provisioning</h4>
+
+The CalDAV module will automatically create the required calendars
+ for a user the first time that the user authenticates to the CalDAV
+ server. Note that the user MUST have an
+ existing <a href="install-admin-mb.html">IMAP Inbox</a> in order for
+ the calendars to be created.
+
+<h4 id="ACLs">Calendar access controls</h4>
+
+The CalDAV module uses the same access controls as the other Cyrus
+ services. The <tt>cyradm(1)</tt> tool can be used to adjust ACLs on
+ calendars as needed. The tables below show how the access controls
+ are used by the CalDAV module.
+
+ 
+<table border>
+ <caption>Mapping of IMAP Rights to WebDAV Privileges & HTTP Methods</caption>
+ <tr>
+ <th>IMAP right</th>
+ <th>WebDAV privilege</th>
+ <th>HTTP methods</th>
+ </tr>
+ <tr>
+ <td>l - lookup</td>
+ <td rowspan=2>DAV:read
+ (aggregates DAV:read-current-user-privilege-set,
+ CALDAV:read-free-busy)</td>
+ <td rowspan=2>GET/HEAD, PROPFIND, REPORT,
+ COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>r - read</td>
+ </tr>
+ <tr>
+ <td>s - seen</td>
+ <td colspan=2/>
+ </tr>
+ <tr>
+ <td>w - write</td>
+ <td>DAV:write-properties</td>
+ <td>PROPPATCH, COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>i - insert</td>
+ <td>DAV:write-content</td>
+ <td>PUT, LOCK, COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>p - post</td>
+ <td>CYRUS:add-resource (aggregated under DAV:bind)</td>
+ <td>POST</td>
+ </tr>
+ <tr>
+ <td>k - create mailbox</td>
+ <td>CYRUS:make-collection (aggregated under DAV:bind)</td>
+ <td>MKCOL, MKCALENDAR</td>
+ </tr>
+ <tr>
+ <td>x - delete mailbox</td>
+ <td>CYRUS:remove-collection (aggregated under DAV:unbind)</td>
+ <td>DELETE</td>
+ </tr>
+ <tr>
+ <td>t - delete message</td>
+ <td>CYRUS:remove-resource (aggregated under DAV:unbind)</td>
+ <td>DELETE, MOVE (on source)</td>
+ </tr>
+ <tr>
+ <td>e - expunge</td>
+ <td colspan=2/>
+ </tr>
+ <tr>
+ <td>a - admin</td>
+ <td>CYRUS:admin
+ (aggregates DAV:read-acl, DAV:write-acl, DAV:unlock)</td>
+ <td>ACL, UNLOCK, PROPFIND (DAV:acl only)</td>
+ </tr>
+ <tr>
+ <td rowspan=3>9 - free/busy</td>
+ <td>CALDAV:read-free-busy (regular calendar collection only)</td>
+ <td>REPORT (CALDAV:free-busy-query only)<td/>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-query-freebusy (Scheduling Inbox only)</td>
+ <td rowspan=6/>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-freebusy (Scheduling Outbox only)</td>
+ <tr>
+ <td rowspan=2>8 - invite</td>
+ <td>CALDAV:schedule-deliver-invite (Scheduling Inbox only)</td>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-invite (Scheduling Outbox only)</td>
+ </tr>
+ <tr>
+ <td rowspan=2>7 - reply</td>
+ <td>CALDAV:schedule-deliver-reply (Scheduling Inbox only)</td>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-reply (Scheduling Outbox only)</td>
+ </tr>
+</table>
+ 
+
+ 
+<table border>
+ <caption>Default WebDAV Privileges by Collection</caption>
+ <tr>
+ <th>Collection</th>
+ <th>ACL</th>
+ </tr>
+ <tr>
+ <td>Regular Calendar</td>
+ <td>owner - DAV:all + CALDAV:read-free-busy (lrwipkxta9)
+ anyone - CALDAV:read-free-busy (9)</td>
+ </tr>
+ <tr>
+ <td>Scheduling Inbox</td>
+ <td>owner - DAV:all + CALDAV:schedule-deliver (lrwipkxta789)
+ anyone - CALDAV:schedule-deliver (789)</td>
+ </tr>
+ <tr>
+ <td>Scheduling Outbox</td>
+ <td>owner - DAV:all + CALDAV:schedule-send (lrwipkxta789)</td>
+ </tr>
+</table>
+ 
+
+
+<h3>Client Setup</h3>
+
+<h4>Mozilla Lightning</h4>
+
+For each calendar that you would like to add to this client,
+ perform the following steps:
+
+<ol>
+<li>Select the "File -> New -> Calendar..." menu option.</li>
+<li>Select the "On the Network" option and click Continue.</li>
+<li>Select "CalDAV" as the Format.</li>
+<li>Enter a URL of the following form as
+ the Location: <tt>https://&lt;servername&gt;/dav/calendars/user/&lt;userid&gt;/&lt;calendar&gt;/</tt></li>
+</ol>
+
+Cyrus will auto-provision a calendar with name "Default" which can
+ be used in the URL above.
+
+<h4>Apple iCal</h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Select the "Calendar -> Preferences" menu option.</li>
+<li>Select the "Accounts" tab.</li>
+<li>Click the "+" button.</li>
+<li>Select "CalDAV" as the Account Type.
+<li>Fill in User Name, Password, and Server Address accordingly.</li>
+<li>Click Create.</li>
+</ol>
+
+
+<h4>Apple iOS Calendar</h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Run the "Settings" app.</li>
+<li>Select the "Mail, Contacts, Calendars" menu.</li>
+<li>Select the "Add Account..." menu.</li>
+<li>Select the "Other" menu.</li>
+<li>Select the "Add CalDAV Account" menu.</li>
+<li>Fill in Server, User Name, Password, and Description accordingly.</li>
+<li>Click Next.</li>
+</ol>
+
+
+<h4>Evolution</h4>
+
+This client will autodetect all available calendars on a server.
+ For each calendar that you would like to add to this client,
+ perform the following steps:
+
+<ol>
+<li>Select the "New -> Calendar" menu option.</li>
+<li>Select "CalDAV" as the Type.</li>
+<li>Fill in Server and User accordingly.</li>
+<li>Click "Find Calendars".</li>
+<li>Select the desired calendar from the list.</li>
+<li>Click "Apply".</li>
+<li>Click "OK".</li>
+</ol>
+
+
+<h4><a href="http://www.acal.me">aCal</a></h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Press the Andoid "Menu" button.</li>
+<li>Select "Settings".</li>
+<li>Select "Servers".</li>
+<li>Select "Add Server".</li>
+<li>Select "Manual Configuration".</li>
+<li>Fill in Username, Password, and User URL (servername) accordingly.</li>
+<li>Press "Apply".</li>
+</ol>
+
+
+<h4><a href="http://www.inf-it.com/open-source/clients/caldavzap/">
+ CalDavZAP</a></h4>
+
+This client will autodetect all available calendars on a server.
+ To configure this client for a Cyrus server, edit <tt>config.js</tt> as
+ follows:
+
+<ol>
+<li>Set the <tt>href</tt> value in
+ the <tt>globalNetworkCheckSettings</tt> array to a URL of the following
+ form: <tt>https://&lt;servername&gt;/dav/principals/user/</tt> 
+ Note that the trailing "/" is REQUIRED.</li>
+<li>Set the <tt>globalSettingsType</tt> option
+ to <tt>calendar-home-set</tt></li>
+<li>Set any other options as desired
+ (e.g. <tt>globalDatepickerFirstDayOfWeek</tt>, <tt>globalTimeZone</tt>).</li>
+</ol>
+
+
+
+<h2>CardDAV Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the CardDAV module allows Cyrus to function as a
+ contacts server. This module uses a subset of the
+ mailbox hierarchy as addressbook collections, the toplevel of which is
+ specified by the <tt>addressbookprefix</tt> option. The public
+ addressbook hierarchy will reside at the toplevel of the shared mailbox
+ namespace. A user's personal addressbook hierarchy will be a child of
+ their Inbox. For example, using the default value
+ for <tt>addressbookprefix</tt>, an addressbook named <tt>Default</tt> for
+ user <tt>murch</tt> would reside in the mailbox
+ named <tt>user.murch.#addressbooks.Default</tt>.
+
+Note that mailboxes in the addressbook hierarchies (those
+ under <tt>addressbookprefix</tt>) SHOULD NOT be accessed with an IMAP
+ client as doing so will leave a mailbox in a state unsuitable
+ for CardDAV. To this end, addressbook mailboxes will not returned by
+ Cyrus <tt>imapd</tt> in response to an IMAP client's request for the
+ available mailbox list, but Cyrus <tt>imapd</tt> will not otherwise
+ prevent an IMAP client from accessing them.
+
+<h3>Administration</h3>
+
+<h4>Addressbook provisioning</h4>
+
+The CardDAV module will automatically create a default addressbook
+ for a user the first time that the user authenticates to the CardDAV
+ server. Note that the user MUST have an
+ existing <a href="install-admin-mb.html">IMAP Inbox</a> in order for
+ the addressbook to be created.
+
+<h4>Addressbook access controls</h4>
+
+Cyrus uses the same access controls for addressbooks as it does for
+ <a href="#ACLs">calendars</a>, except that the scheduling rights (7,
+ 8, 9) have no use with addressbooks and are ignored.
+
+<h3>Client Setup</h3>
+
+<h4>Apple Contacts</h4>
+
+This client will autodetect all available addressbooks on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Select the "Contacts -> Preferences" menu option.</li>
+<li>Select the "Accounts" tab.</li>
+<li>Click the "+" button.</li>
+<li>Select "CardDAV" as the Account Type.
+<li>Fill in User Name, Password, and Server Address accordingly.</li>
+<li>Click Create.</li>
+</ol>
+
+
+<h4>Apple iOS Contacts</h4>
+
+This client will autodetect all available addressbooks on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Run the "Settings" app.</li>
+<li>Select the "Mail, Contacts, Calendars" menu.</li>
+<li>Select the "Add Account..." menu.</li>
+<li>Select the "Other" menu.</li>
+<li>Select the "Add CardDAV Account" menu.</li>
+<li>Fill in Server, User Name, Password, and Description accordingly.</li>
+<li>Click Next.</li>
+</ol>
+
+
+<h4><a href="http://www.inf-it.com/open-source/clients/carddavmate/">
+ CardDavMATE</a></h4>
+
+This client will autodetect all available addressbooks on a server.
+ To configure this client for a Cyrus server, edit <tt>config.js</tt> as
+ follows:
+
+<ol>
+<li>Set the <tt>href</tt> value in
+ the <tt>globalNetworkCheckSettings</tt> array to a URL of the following
+ form: <tt>https://&lt;servername&gt;/dav/principals/user/</tt> 
+ Note that the trailing "/" is REQUIRED.</li>
+<li>Set the <tt>globalSettingsType</tt> option
+ to <tt>addressbook-home-set</tt></li>
+<li>Set any other options as desired.</li>
+</ol>
+
+
+
+<h2>iSchedule Module</h2>
+
+This module will be automatically enabled if and only if both the
+ CalDAV module and the <tt>caldav_allowscheduling</tt> options are
+ enabled in a Cyrus Murder.
+
+Support for scheduling with external servers is currently under
+ development and will require a future release of OpenDKIM.
+
+
+
+<h2>DomainKey Module</h2>
+
+Currently unavailable. Will be available once iSchedule support to
+ external servers is available.
+
+</body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<title>Cyrus HTTP</title>
+</head>
+<body>
+
+<h1>Cyrus HTTP (RSS, CalDAV, CardDAV, iSchedule, DomainKey)</h1>
+
+Note that the HTTP service and associated modules in Cyrus are
+ still under development. This release should be considered beta
+ quality.
+
+<h2>Introduction</h2>
+
+Cyrus <tt>http</tt> service has the ability to:
+
+<ul>
+<li>Serve IMAP mailboxes as RSS feeds.</li>
+<li>Act as a calendar and scheduling (CalDAV) server by using IMAP
+ mailboxes as calendar collections and RFC 5322 messages to store
+ iCalendar data.</li>
+<li>Act as a contacts (CardDAV) server by using IMAP mailboxes as
+ addressbook collections and RFC 5322 messages to store vCard
+ data.</li>
+<li>Allow scheduling transactions between separate calendaring and
+ scheduling systems via the iSchedule protocol (currently only used
+ within a Cyrus Murder).</li>
+</ul>
+
+Unlike the <a href="http://httpd.apache.org/">Apache HTTP
+ Server</a>, Cyrus HTTP is NOT a general purpose HTTP server. Its
+ feature set is limited to what is required to support the
+ facilities listed above.
+
+This document assumes that you are familiar with building and
+ configuring a Cyrus server. If you have not already done so, please
+ read and understand the rest of the <a href="install.html">installation</a>
+ documentation before continuing. Note: The
+ "<a href="#install">Installation</a>" section below augments the
+ "<a href="install-compile.html">Compiling the IMAP Server</a>"
+ document. The remaining sections assume that your Cyrus server has
+ already been
+ successfully <a href="install-configure.html">configured</a>.
+
+This document also assumes that you are familiar with RSS, WebDAV,
+ calendaring, and contacts.
+
+
+<h2 id="install">Installation</h2>
+
+You will need to build Cyrus with 
+ the <tt>--enable-http</tt> configure option. This builds httpd
+ and the associated modules and utilities based on the availability
+ of the prerequisites listed below.
+
+<h3>General Requirements</h3>
+
+<ul>
+<li>Must have <a href="http://xmlsoft.org/">libxml2</a>
+ installed.</li>
+<li>Must have a recent SASL build (v2.1.26 or later) in order to
+ support HTTP Digest, Negotiate, and NTLM authentication.
+ Otherwise, only HTTP Basic authentication will be available</li>
+</ul>
+
+<h3>CalDAV / CardDAV Requirements</h3>
+<ul>
+<li>Must
+ have <a href="http://freeassociation.sourceforge.net/">libical</a>
+ installed.</li>
+<li>Must have <a href="http://www.sqlite.org/">SQLite</a> v3.x (or
+ later) installed.</li>
+<li>Optionally
+ install <a href="https://github.com/jehiah/json-c">json-c</a> for
+ jCal/jCard support.</li>
+</ul>
+
+
+
+<h2 id="config">General Configuration</h2>
+
+The Cyrus <tt>httpd</tt> service is configurable via several
+ options in <tt>imapd.conf</tt>. Several of those options are
+ discussed in the sections below. Admins should consult
+ the <tt>imapd.conf(5)</tt> manpage for the full list of options used
+ by the <tt>httpd</tt> service and its various modules.
+
+The support for RSS, CalDAV, and CardDAV is divided into separate
+ modules which run as part of the Cyrus <tt>httpd</tt>
+ service. Selection of which module(s) are enabled is
+ done by setting the <tt>httpmodules</tt> option accordingly. By
+ default, no modules are enabled.
+
+Cyrus <tt>httpd</tt> also can serve static content, the
+ location of which is set by the <tt>httpdocroot</tt> option. Any
+ content contained in the specified directory (including
+ sub-directories) will be served as static content only.
+ Cyrus <tt>httpd</tt> does NOT have the ability to execute any
+ server-side scripts.
+
+<h3>HTTP Authentication</h3>
+
+As with other Cyrus services, the Cyrus <tt>httpd</tt> service uses
+ Cyrus SASL to perform its authentication. Cyrus supports the
+ following HTTP authentication schemes: Basic, Digest, Negotiate
+ (Kerberos only), and NTLM. While Basic is available in all versions
+ of SASL, the remaining schemes are only available in Cyrus SASL
+ 2.1.16 (and higher).
+
+Similar to plaintext login commands supported by the other Cyrus
+ services (IMAP LOGIN, POP3 USER/PASS), the Cyrus <tt>httpd</tt>
+ service determines whether to advertise the HTTP Basic
+ authentication scheme based on the <tt>allowplaintext</tt> option
+ and whether the client has connected over a TLS protected connection
+ (HTTPS).
+
+The availability of the other HTTP authentication schemes is
+ controlled by the <tt>sasl_mech_list</tt> option. For
+ Cyrus <tt>httpd</tt> the <tt>DIGEST-MD5</tt>, <tt>GSS-SPNEGO</tt>,
+ and <tt>NTLM</tt> SASL plugins support the Digest, Negotiate,
+ and NTLM authentication schemes respectively, provided that these
+ plugins are installed on the server.
+
+<h2>RSS Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the RSS module will default to serving ALL mailboxes
+ to which the authenticated user has access as RSS feeds.
+ The <tt>rss_feeds</tt> option can be used to limit the set of
+ mailboxes that can be served as RSS feeds. For example,
+ setting <tt>rss_feeds</tt> to <tt>*,!user</tt> will serve all shared
+ mailboxes, but no personal mailboxes.
+
+The list of available RSS feeds can be obtained by clients by
+ accessing the <tt>/rss/</tt> URL on the Cyrus server. By default,
+ the server will present the list as a simple unordered list in an
+ HTML document. To customize the look and feel of the feed list,
+ the <tt>rss_feedlist_template</tt> option can be used to point to a
+ HTML template file. This file can utilize Cascading Style Sheets,
+ JavaScript, etc. Any and all content that the template file
+ references MUST reside under the <tt>httpdocroot</tt> as set above.
+ Consult the <tt>imapd.conf(5)</tt> manpage for specifics on the
+ required contents of this custom file. Note that for sites
+ running Cyrus Murder, <tt>rss_feedlist_template</tt> only needs to
+ be set on frontend servers, since only those servers have the
+ complete mailbox list.
+
+<h2>CalDAV Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the CalDAV module allows Cyrus to function as a
+ calendar and scheduling server. This module uses a subset of the
+ mailbox hierarchy as calendar collections, the toplevel of which is
+ specified by the <tt>calendarprefix</tt> option. The public
+ calendar hierarchy will reside at the toplevel of the shared mailbox
+ namespace. A user's personal calendar hierarchy will be a child of
+ their Inbox. For example, using the default value
+ for <tt>calendarprefix</tt>, a calendar named <tt>Default</tt> for
+ user <tt>murch</tt> would reside in the mailbox
+ named <tt>user.murch.#calendars.Default</tt>.
+
+Note that mailboxes in the calendar hierarchies (those
+ under <tt>calendarprefix</tt>) SHOULD NOT be accessed with an IMAP
+ client as doing so will leave a mailbox in a state unsuitable
+ for CalDAV. To this end, calendar mailboxes will not returned by
+ Cyrus <tt>imapd</tt> in response to an IMAP client's request for the
+ available mailbox list, but Cyrus <tt>imapd</tt> will not otherwise
+ prevent an IMAP client from accessing them.
+
+By default, the CalDAV module will automatically perform scheduling
+ operations when a scheduling object (invite or reply) is stored
+ on or deleted from the server. Support for the calendar-auto-schedule
+ feature can be disabled with the <tt>caldav_allowscheduling</tt>
+ option.
+
+
+<h3>Administration</h3>
+
+<h4>Calendar provisioning</h4>
+
+The CalDAV module will automatically create the required calendars
+ for a user the first time that the user authenticates to the CalDAV
+ server. Note that the user MUST have an
+ existing <a href="install-admin-mb.html">IMAP Inbox</a> in order for
+ the calendars to be created.
+
+<h4 id="ACLs">Calendar access controls</h4>
+
+The CalDAV module uses the same access controls as the other Cyrus
+ services. The <tt>cyradm(1)</tt> tool can be used to adjust ACLs on
+ calendars as needed. The tables below show how the access controls
+ are used by the CalDAV module.
+
+ 
+<table border>
+ <caption>Mapping of IMAP Rights to WebDAV Privileges & HTTP Methods</caption>
+ <tr>
+ <th>IMAP right</th>
+ <th>WebDAV privilege</th>
+ <th>HTTP methods</th>
+ </tr>
+ <tr>
+ <td>l - lookup</td>
+ <td rowspan=2>DAV:read
+ (aggregates DAV:read-current-user-privilege-set,
+ CALDAV:read-free-busy)</td>
+ <td rowspan=2>GET/HEAD, PROPFIND, REPORT,
+ COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>r - read</td>
+ </tr>
+ <tr>
+ <td>s - seen</td>
+ <td colspan=2/>
+ </tr>
+ <tr>
+ <td>w - write</td>
+ <td>DAV:write-properties</td>
+ <td>PROPPATCH, COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>i - insert</td>
+ <td>DAV:write-content</td>
+ <td>PUT, LOCK, COPY/MOVE (on target)</td>
+ </tr>
+ <tr>
+ <td>p - post</td>
+ <td>CYRUS:add-resource (aggregated under DAV:bind)</td>
+ <td>POST</td>
+ </tr>
+ <tr>
+ <td>k - create mailbox</td>
+ <td>CYRUS:make-collection (aggregated under DAV:bind)</td>
+ <td>MKCOL, MKCALENDAR</td>
+ </tr>
+ <tr>
+ <td>x - delete mailbox</td>
+ <td>CYRUS:remove-collection (aggregated under DAV:unbind)</td>
+ <td>DELETE</td>
+ </tr>
+ <tr>
+ <td>t - delete message</td>
+ <td>CYRUS:remove-resource (aggregated under DAV:unbind)</td>
+ <td>DELETE, MOVE (on source)</td>
+ </tr>
+ <tr>
+ <td>e - expunge</td>
+ <td colspan=2/>
+ </tr>
+ <tr>
+ <td>a - admin</td>
+ <td>CYRUS:admin
+ (aggregates DAV:read-acl, DAV:write-acl, DAV:unlock)</td>
+ <td>ACL, UNLOCK, PROPFIND (DAV:acl only)</td>
+ </tr>
+ <tr>
+ <td rowspan=3>9 - free/busy</td>
+ <td>CALDAV:read-free-busy (regular calendar collection only)</td>
+ <td>REPORT (CALDAV:free-busy-query only)<td/>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-query-freebusy (Scheduling Inbox only)</td>
+ <td rowspan=6/>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-freebusy (Scheduling Outbox only)</td>
+ <tr>
+ <td rowspan=2>8 - invite</td>
+ <td>CALDAV:schedule-deliver-invite (Scheduling Inbox only)</td>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-invite (Scheduling Outbox only)</td>
+ </tr>
+ <tr>
+ <td rowspan=2>7 - reply</td>
+ <td>CALDAV:schedule-deliver-reply (Scheduling Inbox only)</td>
+ </tr>
+ <tr>
+ <td>CALDAV:schedule-send-reply (Scheduling Outbox only)</td>
+ </tr>
+</table>
+ 
+
+ 
+<table border>
+ <caption>Default WebDAV Privileges by Collection</caption>
+ <tr>
+ <th>Collection</th>
+ <th>ACL</th>
+ </tr>
+ <tr>
+ <td>Regular Calendar</td>
+ <td>owner - DAV:all + CALDAV:read-free-busy (lrwipkxta9)
+ anyone - CALDAV:read-free-busy (9)</td>
+ </tr>
+ <tr>
+ <td>Scheduling Inbox</td>
+ <td>owner - DAV:all + CALDAV:schedule-deliver (lrwipkxta789)
+ anyone - CALDAV:schedule-deliver (789)</td>
+ </tr>
+ <tr>
+ <td>Scheduling Outbox</td>
+ <td>owner - DAV:all + CALDAV:schedule-send (lrwipkxta789)</td>
+ </tr>
+</table>
+ 
+
+
+<h3>Client Setup</h3>
+
+<h4>Mozilla Lightning</h4>
+
+For each calendar that you would like to add to this client,
+ perform the following steps:
+
+<ol>
+<li>Select the "File -> New -> Calendar..." menu option.</li>
+<li>Select the "On the Network" option and click Continue.</li>
+<li>Select "CalDAV" as the Format.</li>
+<li>Enter a URL of the following form as
+ the Location: <tt>https://&lt;servername&gt;/dav/calendars/user/&lt;userid&gt;/&lt;calendar&gt;/</tt></li>
+</ol>
+
+Cyrus will auto-provision a calendar with name "Default" which can
+ be used in the URL above.
+
+<h4>Apple iCal</h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Select the "Calendar -> Preferences" menu option.</li>
+<li>Select the "Accounts" tab.</li>
+<li>Click the "+" button.</li>
+<li>Select "CalDAV" as the Account Type.
+<li>Fill in User Name, Password, and Server Address accordingly.</li>
+<li>Click Create.</li>
+</ol>
+
+
+<h4>Apple iOS Calendar</h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Run the "Settings" app.</li>
+<li>Select the "Mail, Contacts, Calendars" menu.</li>
+<li>Select the "Add Account..." menu.</li>
+<li>Select the "Other" menu.</li>
+<li>Select the "Add CalDAV Account" menu.</li>
+<li>Fill in Server, User Name, Password, and Description accordingly.</li>
+<li>Click Next.</li>
+</ol>
+
+
+<h4>Evolution</h4>
+
+This client will autodetect all available calendars on a server.
+ For each calendar that you would like to add to this client,
+ perform the following steps:
+
+<ol>
+<li>Select the "New -> Calendar" menu option.</li>
+<li>Select "CalDAV" as the Type.</li>
+<li>Fill in Server and User accordingly.</li>
+<li>Click "Find Calendars".</li>
+<li>Select the desired calendar from the list.</li>
+<li>Click "Apply".</li>
+<li>Click "OK".</li>
+</ol>
+
+
+<h4><a href="http://www.acal.me">aCal</a></h4>
+
+This client will autodetect all available calendars on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Press the Andoid "Menu" button.</li>
+<li>Select "Settings".</li>
+<li>Select "Servers".</li>
+<li>Select "Add Server".</li>
+<li>Select "Manual Configuration".</li>
+<li>Fill in Username, Password, and User URL (servername) accordingly.</li>
+<li>Press "Apply".</li>
+</ol>
+
+
+<h4><a href="http://www.inf-it.com/open-source/clients/caldavzap/">
+ CalDavZAP</a></h4>
+
+This client will autodetect all available calendars on a server.
+ To configure this client for a Cyrus server, edit <tt>config.js</tt> as
+ follows:
+
+<ol>
+<li>Set the <tt>href</tt> value in
+ the <tt>globalNetworkCheckSettings</tt> array to a URL of the following
+ form: <tt>https://&lt;servername&gt;/dav/principals/user/</tt> 
+ Note that the trailing "/" is REQUIRED.</li>
+<li>Set the <tt>globalSettingsType</tt> option
+ to <tt>calendar-home-set</tt></li>
+<li>Set any other options as desired
+ (e.g. <tt>globalDatepickerFirstDayOfWeek</tt>, <tt>globalTimeZone</tt>).</li>
+</ol>
+
+
+
+<h2>CardDAV Module</h2>
+
+<h3>Configuration</h3>
+
+When enabled, the CardDAV module allows Cyrus to function as a
+ contacts server. This module uses a subset of the
+ mailbox hierarchy as addressbook collections, the toplevel of which is
+ specified by the <tt>addressbookprefix</tt> option. The public
+ addressbook hierarchy will reside at the toplevel of the shared mailbox
+ namespace. A user's personal addressbook hierarchy will be a child of
+ their Inbox. For example, using the default value
+ for <tt>addressbookprefix</tt>, an addressbook named <tt>Default</tt> for
+ user <tt>murch</tt> would reside in the mailbox
+ named <tt>user.murch.#addressbooks.Default</tt>.
+
+Note that mailboxes in the addressbook hierarchies (those
+ under <tt>addressbookprefix</tt>) SHOULD NOT be accessed with an IMAP
+ client as doing so will leave a mailbox in a state unsuitable
+ for CardDAV. To this end, addressbook mailboxes will not returned by
+ Cyrus <tt>imapd</tt> in response to an IMAP client's request for the
+ available mailbox list, but Cyrus <tt>imapd</tt> will not otherwise
+ prevent an IMAP client from accessing them.
+
+<h3>Administration</h3>
+
+<h4>Addressbook provisioning</h4>
+
+The CardDAV module will automatically create a default addressbook
+ for a user the first time that the user authenticates to the CardDAV
+ server. Note that the user MUST have an
+ existing <a href="install-admin-mb.html">IMAP Inbox</a> in order for
+ the addressbook to be created.
+
+<h4>Addressbook access controls</h4>
+
+Cyrus uses the same access controls for addressbooks as it does for
+ <a href="#ACLs">calendars</a>, except that the scheduling rights (7,
+ 8, 9) have no use with addressbooks and are ignored.
+
+<h3>Client Setup</h3>
+
+<h4>Apple Contacts</h4>
+
+This client will autodetect all available addressbooks on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Select the "Contacts -> Preferences" menu option.</li>
+<li>Select the "Accounts" tab.</li>
+<li>Click the "+" button.</li>
+<li>Select "CardDAV" as the Account Type.
+<li>Fill in User Name, Password, and Server Address accordingly.</li>
+<li>Click Create.</li>
+</ol>
+
+
+<h4>Apple iOS Contacts</h4>
+
+This client will autodetect all available addressbooks on a server.
+ To add a Cyrus server to this client, perform the following steps:
+
+<ol>
+<li>Run the "Settings" app.</li>
+<li>Select the "Mail, Contacts, Calendars" menu.</li>
+<li>Select the "Add Account..." menu.</li>
+<li>Select the "Other" menu.</li>
+<li>Select the "Add CardDAV Account" menu.</li>
+<li>Fill in Server, User Name, Password, and Description accordingly.</li>
+<li>Click Next.</li>
+</ol>
+
+
+<h4><a href="http://www.inf-it.com/open-source/clients/carddavmate/">
+ CardDavMATE</a></h4>
+
+This client will autodetect all available addressbooks on a server.
+ To configure this client for a Cyrus server, edit <tt>config.js</tt> as
+ follows:
+
+<ol>
+<li>Set the <tt>href</tt> value in
+ the <tt>globalNetworkCheckSettings</tt> array to a URL of the following
+ form: <tt>https://&lt;servername&gt;/dav/principals/user/</tt> 
+ Note that the trailing "/" is REQUIRED.</li>
+<li>Set the <tt>globalSettingsType</tt> option
+ to <tt>addressbook-home-set</tt></li>
+<li>Set any other options as desired.</li>
+</ol>
+
+
+
+<h2>iSchedule Module</h2>
+
+This module will be automatically enabled if and only if both the
+ CalDAV module and the <tt>caldav_allowscheduling</tt> options are
+ enabled in a Cyrus Murder.
+
+Support for scheduling with external servers is currently under
+ development and will require a future release of OpenDKIM.
+
+
+
+<h2>DomainKey Module</h2>
+
+Currently unavailable. Will be available once iSchedule support to
+ external servers is available.
+
+</body></html>

cyrus-imapd-2.4.17.tar.gz/doc/install-murder.html -> cyrus-imapd-2.5.tar.gz/doc/install-murder.html Changed

@@ -1,15 +1,16 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Installing The Cyrus Murder
 </title>
 </head>
-<h1>Installing The Cyrus Murder
-</h1>
 <body>
+<h1>Installing The Cyrus Murder</h1>
 
 The Cyrus Murder provides the ability to horizontally scale your Cyrus
-IMAP environment across multiple servers. It is similar in nature to 
+IMAP environment across multiple servers. It is similar in nature to
 various proxy solutions such as nginx or perdition with the difference
 being that Murder offers a uniform namespace. If you're not currently
 using shared mailboxes and you don't intend to use shared mailboxes in the
@@ -34,7 +35,7 @@
 
 <h2>Installation</h2>
 You will need to build Cyrus IMAPd with the <tt>--enable-murder</tt> configure
-option. This builds the proxyds and the associated utilities. 
+option. This builds the proxyds and the associated utilities.
 
 <h3>Requirements</h3>
 <ul>
@@ -79,7 +80,7 @@
 your enviornment.
 
 <h3>Setting up the backends to push changes to the MUPDATE Master</h3>
-On the backends, configuration to be a part of a murder is easy. You just 
+On the backends, configuration to be a part of a murder is easy. You just
 need to configure the backend to be a part of the murder. To do this,
 set the <tt>mupdate_server</tt> option in imapd.conf. Depending on what
 authentication mechanisms you are using, you may also want to set some
@@ -160,7 +161,7 @@
 
 <pre>
 # mupdate database service - must prefork atleast 1
- mupdate cmd="mupdate" listen=3905 prefork=1 
+ mupdate cmd="mupdate" listen=3905 prefork=1
 </pre>
 
 Note that as this is a threaded service, you must prefork atleast 1 of them
@@ -174,7 +175,7 @@
 section that looks more like this now:
 
 <pre>
- mupdate cmd="/usr/cyrus/bin/mupdate" listen=3905 prefork=1 
+ mupdate cmd="/usr/cyrus/bin/mupdate" listen=3905 prefork=1
 
 imap cmd="proxyd" listen="imap" prefork=5
 imaps cmd="proxyd -s" listen="imaps" prefork=1

cyrus-imapd-2.4.17.tar.gz/doc/install-netnews.html -> cyrus-imapd-2.5.tar.gz/doc/install-netnews.html Changed

@@ -1,12 +1,13 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Cyrus and Netnews
 </title>
 </head>
-<h1>Cyrus and Netnews
-</h1>
 <body>
+<h1>Cyrus and Netnews</h1>
 
 Note that the NNTP support in Cyrus is still relatively young in
 the grand scheme of things, and has not been tested under a heavy
@@ -24,7 +25,7 @@
 to the rest of the documentation. This document also assumes that you
 are familiar with Usenet and shared IMAP mailboxes.
 
-There is a <a href=netnews.png>diagram</a> that shows the interactions of
+There is a <a href="netnews.png">diagram</a> that shows the interactions of
 the various components of the NNTP support in Cyrus which may be
 helpful in understanding the "big picture".
 
@@ -77,7 +78,7 @@
 15 minutes, etc).
 
 As an alternative to <tt>fetchnews</tt>, you can also use the
- <a href=http://home.comcast.net/~bobyetman/><tt>suck</tt></a> program
+ <a href="http://home.comcast.net/~bobyetman/"><tt>suck</tt></a> program
 to pull articles from your peer.
 
 <h4>imapfeed</h4>
@@ -149,7 +150,7 @@
 In order for these email messages to be fed into your news server
 (and subsequently to the outside world) you need to use an email to
 news gateway, such as <a
-href=http://www.ossp.org/pkg/tool/lmtp2nntp/><tt>lmtp2nntp</tt></a>. You need
+href="http://www.ossp.org/pkg/tool/lmtp2nntp/"><tt>lmtp2nntp</tt></a>. You need
 to configure your MTA (Sendmail, Postfix, etc) so that
 <tt>lmtp2nntp</tt> is used as the local mailer whenever it receives a
 news article. A simple rule for doing this in Sendmail is shown

cyrus-imapd-2.4.17.tar.gz/doc/install-perf.html -> cyrus-imapd-2.5.tar.gz/doc/install-perf.html Changed

@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org" />
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 <title>Performance Notes</title>
 </head>
 <body>
@@ -12,7 +12,7 @@
 Cyrus presents various performance issues for you to consider. If you never expect to have
 more than 100 simultaneous users, chances are any hardware you have
 will be fine. If you plan on having thousands or more users, please
-be sure to review this section. 
+be sure to review this section.
 
 If your configuration directory is not <tt>/var/imap</tt>,
 adjust accordingly.
@@ -21,7 +21,7 @@
 <li><tt>/var/imap/proc</tt> - After a successful login, the
 <tt>imapd</tt> creates a file in <tt>var/imap/proc</tt> that is its unix
 process id. It also contains the name of any <tt>SELECT</tt>ed
-mailbox. The file is deleted when the user logs out. 
+mailbox. The file is deleted when the user logs out.
 
 Given the potential load, this is a good candidate to move
 elsewhere. This can be done by symlink'ing the directory to another
@@ -55,7 +55,7 @@
 (<tt>/lib/cyrusdb_db3.c</tt>, the setting is commented out) or you can put
 a <tt>DB_CONFIG</tt> file under <tt>/var/imap/db</tt> with the appropriate
 setting. Read more about this in the Berkeley docs before trying it - typos
-and incorrect settings can wreak havoc.
+and incorrect settings can wreak havoc.</li>
 
 <li><tt>/var/imap/deliverdb</tt> - Unless you disable
 duplicate delivery suppression, each time a mail message is

cyrus-imapd-2.4.17.tar.gz/doc/install-prereq.html -> cyrus-imapd-2.5.tar.gz/doc/install-prereq.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Prerequisites and other notes
 </title>
 </head>
@@ -38,14 +40,6 @@
 will be disabled.
 
 <ul>
-<LI> makedepend. A version is included in the
-<TT>makedepend</TT> subdirectory of the distribution. Try and install
-it before installing the Cyrus IMAPd. If it fails, the <tt>configure</tt>
-script will use a dummy shell script instead of <code>makedepend</code>, and you
-should be sure to always give the command "<TT>make clean</TT>" before
-"<TT>make all</TT>". If you don't mind builds taking longer, this
-isn't a big deal and you can ignore any <code>makedepend</code> errors.
-
 <LI> Perl, version 5. To obtain Perl, see the <a
 href="http://www.cpan.org/">Comprehensive Perl Archive</a>. This
 is required for <tt>cyradm</tt> (written by Brandon Allbery). It is
@@ -83,7 +77,7 @@
 The following programs and/or packages are recommended:
 
 <ul>
-<li><a href="ftp://ftp.gnu.org/non-gnu/flex">flex</a> - libsieve has
+<li><a href="ftp://ftp.gnu.org/non-gnu/flex">flex</a> - libcyrus_sieve has
 two different lexical analyzers, and that's hard to do with
 traditional <tt>lex</tt>.

cyrus-imapd-2.4.17.tar.gz/doc/install-replication.html -> cyrus-imapd-2.5.tar.gz/doc/install-replication.html Changed

@@ -1,18 +1,19 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Cyrus replication
 </title>
 </head>
-<h1>Cyrus replication
-</h1>
 <body>
+<h1>Cyrus replication</h1>
 
 Note that Cyrus replication is still relatively young in the
 grand scheme of things, and if you choose to deploy you are doing so
 at your own risk. The core of the replication code has been used
 successfully in production at <a
-href="http://www-uxsup.csx.cam.ac.uk/~dpc22/cyrus/replication.html">Cambridge 
+href="http://www-uxsup.csx.cam.ac.uk/~dpc22/cyrus/replication.html">Cambridge
 University</a> since the summer of 2003, but it has been rewritten extensively
 as part of the integration into the mainstream Cyrus codebase.
 The replication code as integrated into Cyrus 2.3 has been running in
@@ -43,7 +44,7 @@
 
 <h2>Installation</h2>
 You will need to build Cyrus IMAPd with the
-<tt>--enable-replication</tt> configure option. This builds the 
+<tt>--enable-replication</tt> configure option. This builds the
 replication client/server applications and utilities.
 
 <h3>Requirements</h3>
@@ -62,10 +63,10 @@
 point at which it replaces a failed backend "master").
 
 <ol>
-<li>Configure a standalone server as described in the rest
+<li>Configure a standalone server as described in the rest
 of the documentation.
 
-<li>Add the following line to the "<tt>/etc/services</tt>" file.
+<li>Add the following line to the "<tt>/etc/services</tt>" file.
 
 <pre>
 csync 2005/tcp
@@ -92,7 +93,7 @@
 configured to synchronize its mailstore with a "replica" server.
 
 <ol>
-<li>Add the following line to the "<tt>/etc/services</tt>" file.
+<li>Add the following line to the "<tt>/etc/services</tt>" file.
 
 <pre>
 csync 2005/tcp
@@ -101,15 +102,15 @@
 Note that the port number MUST be the same as that used on the
 "replica" server.
 
-<li>
+<li>
 Specify the hostname of the "replica" server and how to authenticate
 to it using the following imap.conf options:
 
 <ul>
-<li><tt>sync_host</tt></li>
-<li><tt>sync_authname</tt></li>
-<li><tt>sync_realm</tt></li>
-<li><tt>sync_password</tt></li>
+<li><tt>sync_host</tt>
+<li><tt>sync_authname</tt>
+<li><tt>sync_realm</tt>
+<li><tt>sync_password</tt>
 </ul>
 
 Note that <tt>sync_authname</tt> MUST be an admin on the "replica"
@@ -127,7 +128,7 @@
 'sync_compress' imapd.conf value, or pass the '-z' flag to sync_client.
 
 <ol>
-<li><tt>sync_compress: 1</tt></li>
+<li><tt>sync_compress: 1</tt>
 </ol>
 
 <h4>"Rolling" replication</h4>
@@ -137,21 +138,21 @@
 replication, perform the following:
 
 <ol>
-<li>Enable the <tt>sync_log</tt> option in imapd.conf. This allows
+<li>Enable the <tt>sync_log</tt> option in imapd.conf. This allows
 the <tt>imapd</tt>, <tt>pop3d</tt>, <tt>nntpd</tt>, and <tt>lmtpd</tt>
 services to log synchonization actions which will be periodically
 serviced by <tt>sync_client</tt>.
 
-<li>Optionally, adjust the <tt>sync_repeat_interval</tt> in imapd.conf.
+<li>Optionally, adjust the <tt>sync_repeat_interval</tt> in imapd.conf.
 
-<li>
-Add a line similar to the following in the STARTUP section of cyrus.conf:
+<li>
+Add a line similar to the following in the STARTUP section of cyrus.conf:
 
 <pre>
 syncclient cmd="/usr/cyrus/bin/sync_client -r"
 </pre>
 
-<li>Start/restart <tt>"/usr/cyrus/bin/master"</tt>.
+<li>Start/restart <tt>"/usr/cyrus/bin/master"</tt>.
 
 </ol>

cyrus-imapd-2.4.17.tar.gz/doc/install-sieve.html -> cyrus-imapd-2.5.tar.gz/doc/install-sieve.html Changed

@@ -1,21 +1,18 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Installing Sieve
 </title>
 </head>
-<h1>Installing Sieve
-</h1>
 <body>
+<h1>Installing Sieve</h1>
 
 This section assumes that you compiled Cyrus with sieve support. If
 you specified <tt>--disable-sieve</tt> when running
 <tt>./configure</tt>, you did NOT compile the server with sieve
-support. 
-
-A <a href="http://www.cyrusoft.com/sieve">brief introduction</a> to
-Sieve at is available from <a href="http://www.cyrusoft.com/">Cyrusoft
-International</a>.
+support.
 
 <h3>Configure outgoing mail</h3>
 
@@ -23,13 +20,13 @@
 
 You'll need to make sure that "<tt>lmtpd</tt>" can send outgoing
 messages. Currently, it invokes "<tt>/usr/lib/sendmail</tt>" by
-default to send messages. Change this by adding a line like:
+default to send messages. Change this by adding a line like:
 
 <pre>
 sendmail: /usr/sbin/sendmail
 </pre>
 
-in your "<tt>/etc/imapd.conf</tt>". If you're using Postfix or another
+in your "<tt>/etc/imapd.conf</tt>". If you're using Postfix or another
 MTA, make sure that the sendmail referenced in
 "<tt>/etc/imapd.conf</tt>" is Sendmail-compatible.
 
@@ -47,14 +44,12 @@
 <h3>Testing the sieve server</h3>
 <ol>
 
-
-<li>The Sieve server, "<tt>timsieved</tt>", is used for transporting
+<li>"<tt>timsieved</tt>", is a ManageSieve server used for transporting
 user Sieve scripts to the sealed IMAP server. It is incompatible with
 the "<tt>sieveusehomedir</tt>" option. It is named after the
 principal author, Tim Martin, who desperately wanted something named
 after him in the Cyrus distribution.
 
-
 <li>From your normal account, telnet to the sieve port on the
 server you're setting up:
 
@@ -62,7 +57,7 @@
 <kbd> telnet foobar sieve
 </kbd></pre>
 
-If your server is running, you'll get a message similar to the following one:
+If your server is running, you'll get a message similar to the following one:
 
 <pre>
 Trying 128.2.10.192...
@@ -81,11 +76,10 @@
 "<tt>imapd</tt>" earlier. Next terminate the connection, by typing
 "<kbd>logout</kbd>".
 
-
 <li>Next test authenticating to the sieve server. To do this run the
 "<tt>sieveshell</tt>" utility. You must specify the server. If you
 run this utility from a different machine without the "sieve" entry in
-"/etc/services", port 2000 will be used.
+"/etc/services", port 4190 will be used.
 
 <pre>
 "<kbd>sieveshell foobar</kbd>"

cyrus-imapd-2.4.17.tar.gz/doc/install-snmpmon.html -> cyrus-imapd-2.5.tar.gz/doc/install-snmpmon.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/install-testing.html -> cyrus-imapd-2.5.tar.gz/doc/install-testing.html Changed

@@ -1,12 +1,13 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Testing the IMAP Server
 </title>
 </head>
-<h1>Testing the IMAP Server
-</h1>
 <body>
+<h1>Testing the IMAP Server</h1>
 
 To test the IMAP server, reboot and perform the following steps (all
 of these samples use "<tt>foobar</tt>" as the IMAP server name). A
@@ -56,11 +57,11 @@
 <kbd>% /usr/local/bin/imtest -m login foobar</kbd>
 S: * OK mail1.andrew.cmu.edu Cyrus IMAP4 v2.0.0 server ready
 C: C01 CAPABILITY
- S: * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS 
- X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=GSSAPI AUTH=ANONYMOUS 
+ S: * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS
+ X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=GSSAPI AUTH=ANONYMOUS
 AUTH=KERBEROS_V4 UNSELECT
 S: C01 OK Completed
- Password: 
+ Password:
 + go ahead
 L01 OK User logged in
 Authenticated.
@@ -77,7 +78,7 @@
 are listed in the CAPABILITY line:
 
 <pre>
- * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS 
+ * CAPABILITY IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ NAMESPACE UIDPLUS
 X-NON-HIERARCHICAL-RENAME NO_ATOMIC_RENAME AUTH=ANONYMOUS
 AUTH=KERBEROS_V4 AUTH=DIGEST-MD5 AUTH=CRAM-MD5 UNSELECT
 . OK Completed

cyrus-imapd-2.4.17.tar.gz/doc/install-upgrade.html -> cyrus-imapd-2.5.tar.gz/doc/install-upgrade.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Upgrading From Previous Versions
 </title>
 </head>
@@ -8,21 +10,12 @@
 
 <h1>Upgrading From Previous Versions</h1>
 
-<h2>Upgrading from 2.4.15</h2>
+<h2>Upgrading from 2.4.17-caldav-beta6 or earlier</h2>
 <ul>
-<li>The tools/rehash utility has been fixed, we recommend ALL sites
- with the fulldirhash option enabled to run tools/rehash on their
- mailspools.</li>
-</ul>
-
-<h2>Upgrading from 2.4.14</h2>
-<ul>
-<li>We recommend that ALL sites with fulldirhash enabled run
- tools/rehash on their mail spools after upgrading from
- 2.4.14. There were serious 32 vs 64 bit hashing bugs
- which were made worse with 2.4.14. NOTE: the syntax of
- tools/rehash has changed. Run it without arguments to
- see a usage statement.</li>
+<li>The time span calculations for various VCALENDAR components,
+ especially VTODO (tasks), have been fixed. We recommend ALL sites
+ run the <tt>dav_reconstruct</tt> utility for each of their CalDAV
+ users.</li>
 </ul>
 
 <h2>Upgrading from 2.4.12</h2>
@@ -112,7 +105,7 @@
 
 <h2>Upgrading from 2.4.5</h2>
 <ul>
-<li>New config option: <tt>suppress_capabilities</tt>, which 
+<li>New config option: <tt>suppress_capabilities</tt>, which
 takes a space separated list of capabilities which will NOT
 be given in any imap capability response. This can be used
 on frontends to not display capabilities that older backends
@@ -142,8 +135,8 @@
 <h2>Upgrading from 2.4.2</h2>
 <ul>
 <li>The AFS ptloader configure options have changed. If you were
- previously specifying --with-afs when you built, you'll now 
- want to use --enable-afs instead. Additionally, you may 
+ previously specifying --with-afs when you built, you'll now
+ want to use --enable-afs instead. Additionally, you may
 now specify --with-afs-libdir and --with-afs-incdir to
 facilitate finding the AFS libraries and header files.</li>
 <li>The sync_log_names option has been replaced with
@@ -400,7 +393,7 @@
 </pre>
 Note that the use of full paths to the database files is important. You
 should also backup your old mailboxes database before moving the new one
-in. 
+in. 
 
 For the seen state databases, the command to get them all in one fell swoop
 looks like:
@@ -433,11 +426,11 @@
 extention but do not require it. Cyrus 2.1's <tt>timsieved</tt> did
 not do appropriate checking that the optional envelope test was
 required before it was used.
-</li> 
+</li>
 
-<li> Configuration subsystem changes: 
+<li> Configuration subsystem changes:
 
-<ul> 
+<ul>
 <li>The tls_service_* configuration options have been removed. Now
 use servicename_tls_*, where servicename is the service identifier
 from <tt>cyrus.conf</tt> for that particular process.</li>
@@ -561,11 +554,11 @@
 You can safely remove the entire <tt>/var/imap/deliverdb</tt>
 directory structure after shutting down the server.
 
-<li>All of the Cyrus databases have been unified under a single BDB 
-environment. A new <tt>ctl_cyrusdb</tt> tool is now used for database 
-recovery and checkpointing instead of <tt>ctl_mboxlist</tt> and 
-<tt>ctl_deliver</tt>. You should replace the appropriate <tt>START</tt> and 
-<tt>EVENTS</tt> entries in <tt>cyrus.conf</tt> with those in the 
+<li>All of the Cyrus databases have been unified under a single BDB
+environment. A new <tt>ctl_cyrusdb</tt> tool is now used for database
+recovery and checkpointing instead of <tt>ctl_mboxlist</tt> and
+<tt>ctl_deliver</tt>. You should replace the appropriate <tt>START</tt> and
+<tt>EVENTS</tt> entries in <tt>cyrus.conf</tt> with those in the
 sample configurations in the <tt>master/conf</tt> directory.
 
 <li> Cyrus now caches SSL/TLS sessions in an external database. If you

cyrus-imapd-2.4.17.tar.gz/doc/install-virtdomains.html -> cyrus-imapd-2.5.tar.gz/doc/install-virtdomains.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Configuring Virtual Domains
 </title>
 </head>
@@ -96,7 +98,7 @@
 
 Even for new installations, it is recommended that the
 "real" domain of the server (domain of its primary hostname), be set
-to the <tt>defaultdomain</tt>. See <a href=#admins>Administrators</a>
+to the <tt>defaultdomain</tt>. See <a href="#admins">Administrators</a>
 below for further discussion.
 
 Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
@@ -148,7 +150,7 @@
 
 <h4>Configuring Sendmail</h4>
 
-In general, follow the basic <a href=install-configure.html>configuration
+In general, follow the basic <a href="install-configure.html">configuration
 instructions</a>. Here are a few caveats:
 
 <ul>
@@ -178,7 +180,7 @@
 need to reconfigure their clients (as unqualified userids are assumed to
 be in the default domain).
 
-<a name="admins"><h3>Administration</h3></a>
+<h3><a name="admins">Administration</a></h3>
 
 The Cyrus virtual domains implementation supports per-domain
 administrators as well as "global" (inter-domain) administrators.
@@ -213,7 +215,7 @@
 cm user.test@example.com
 </kbd></pre>
 
-To list all mailboxes in domain 'example.com':
+To list all mailboxes in domain 'example.com':
 
 <pre><kbd>
 lm *@example.com

cyrus-imapd-2.4.17.tar.gz/doc/install.html -> cyrus-imapd-2.5.tar.gz/doc/install.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Installing and Configuring the Cyrus IMAP Server</TITLE>
 
 </HEAD>
@@ -16,11 +18,11 @@
 href="faq.html">doc/faq.html</a> contains some answers that we have
 thought of. Please feel free to contribute!
 
-Please refer to <a href="feedback.html">Sending Feedback</a> if 
-	 you would like to submit a bug, feature request or patch. 
+Please refer to <a href="feedback.html">Sending Feedback</a> if
+	 you would like to submit a bug, feature request or patch.
 
 For detailed changes, refer to the file <a
-HREF="changes.html"><TT>doc/changes</TT></a> in the distribution. 
+HREF="changes.html"><TT>doc/changes</TT></a> in the distribution.
 
 <h2>Contents</h2>
 
@@ -35,6 +37,7 @@
 <li><a href="install-sieve.html">Installing SIEVE</a>
 <li><a href="install-snmpmon.html">SNMP Monitoring</a>
 <li><a href="install-netnews.html">Cyrus and Netnews</a>
+<li><a href="install-http.html">Cyrus HTTP (RSS, CalDAV, CardDAV)</a>
 <li><a href="install-virtdomains.html">Virtual Domains</a>
 <li><a href="install-replication.html">Cyrus Replication</a>
 <li><a href="install-murder.html">Cyrus Murder: The IMAP

cyrus-imapd-2.4.17.tar.gz/doc/internal/bytecode.html -> cyrus-imapd-2.5.tar.gz/doc/internal/bytecode.html Changed

@@ -58,7 +58,7 @@
 located elsewhere in memory. The entry point is bc_generate: sieve_generate_bytecode()
 / bc_action_generate().
 
-bc_action_generate traverses the commandlist_t tree and emits opcodes in 
+bc_action_generate traverses the commandlist_t tree and emits opcodes in
 sequence.
 
 Simple actions (STOP, DISCARD, KEEP, MARK, UNMARK) have no arguments,
@@ -69,10 +69,10 @@
 
 For example, single argument commands such as REJECT, FILEINTO, REDIRECT
 are followed by a bytecode_t for a string's length, and then a bytecode_t
-which contains a pointer to a string.
+which contains a pointer to a string.
 
 Commands such as ADDFLAG, SETFLAG, REMOVEFLAG, which take a stringlist,
- format the stringlist as (using bc_stringlist_generate):
+ format the stringlist as (using bc_stringlist_generate):
 
 <pre>
 {Number of Strings}{String 1 Length}{String 1 Ptr}{String 2 Length}....
@@ -119,10 +119,10 @@
 Two new opcodes exist: NULL and JUMP (which performs an unconditional
 jump).
 
-Stringlists and testslists now include a precomputed byte length of 
+Stringlists and testslists now include a precomputed byte length of
 the entire list, so it can be skipped over as needed.
 
-So as to be executable without a stack, the IF statements are designed as 
+So as to be executable without a stack, the IF statements are designed as
 follows:
 
 <pre>
@@ -156,8 +156,8 @@
 
 <h2>Other things to consider</h2>
 
-The Bytecode can be extended to contain other extensions. This could require 
-regeneration of older scripts. In many cases this can be avoided by putting 
+The Bytecode can be extended to contain other extensions. This could require
+regeneration of older scripts. In many cases this can be avoided by putting
 the new commands at the end of the proper enum in bytecode.h
 
 </body>

cyrus-imapd-2.5.tar.gz/doc/internal/cyrus.css Added

cyrus-imapd-2.5.tar.gz/doc/internal/cyrusdb-api.html Added

@@ -0,0 +1,333 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="author" content="Bron Gondwana" />
+
+<title>cyrusdb API</title>
+</head>
+
+<body>
+<h1>cyrusdb API</h1>
+
+<h2>Intro</h2>
+
+The <tt>cyrusdb</tt> API is a common interface to a key-value store, used
+throughout the Cyrus code. It allows a choice of different backends for
+different access patterns, while ensuring a consistent interface.
+
+This document will describe the interface, and how to use the cyrusdb
+interface from within parts of Cyrus code, as well as how to implement
+your own backend
+
+If you pass incorrect values to these APIs, you will get an assertion
+failure in most cases. That's generally considered safer than silenty
+breaking things. Exceptions are noted below.
+
+<h2>Code Layout</h2>
+
+The implementation of each interface is in <tt>lib/cyrusdb_NAME.c</tt>,
+for example lib/cyrusdb_flat.c. General functions are in
+<tt>lib/cyrusdb.c</tt> and the interface in <tt>lib/cyrusdb.h</tt>.
+
+<h2>Configuration</h2>
+
+The name of the backend for each of the main internal databases can be
+configured in imapd.conf, for example: <tt>annotation_db: skiplist</tt>.
+This is then read in imap/global.h and imap/global.c during startup, so
+that the global variable <tt>config_annotation_db</tt> gets set to the actual
+database backend:
+
+<pre>
+ config_annotation_db =
+ cyrusdb_fromname(config_getstring(IMAPOPT_ANNOTATION_DB));
+</pre>
+
+<tt>cyrusdb_fromname</tt> uses the database name to find the
+<tt>struct cyrusdb_backend *</tt> of the actual database.
+
+The main module for each database then sets up a "short name" to
+refer to the struct containing the funtion pointers for each action
+on that database type, giving an "object oriented" API to the database,
+for example:
+
+<pre>
+ #define DB config_annotation_db
+
+ r = DB-&gt;open(fname, dbflags, &amp;db);
+
+ r = DB-&gt;fetch(&amp;db, key, keylen, &amp;data, &amp;datalen, &amp;tid);
+</pre>
+
+<h2>A full example</h2>
+
+<pre>
+ struct cyrusdb_backend *BE = NULL;
+ struct db *db = NULL;
+ struct txn *tid = NULL;
+
+ cyrus_init(alt_config, "toolname", 0);
+
+ BE = cyrusdb_fromname("skiplist");
+
+ r = BE-&gt;open(filename, flags, &amp;db);
+
+ r = BE-&gt;fetch(db, key, keylen, &amp;data, &amp;datalen, &amp;tid);
+
+ r = BE-&gt;commit(db, tid);
+
+ r = DB-&gt;close(db);
+
+ cyrus_done();
+</pre>
+
+Note that you always open a database first, and close it at the end.
+You must always call cyrus_init() and cyrus_done() to properly intialise
+and clean up the DB environments.
+
+This example also uses a transaction, meaning that the database is locked
+in exclusive mode between the 'fetch' (the first use of the transaction)
+and the commit.
+
+<h2>About Transactions</h2>
+
+The cyrusdb interface works in two modes - transactional and
+non-transactional. The value of the 'tid' parameter decides which
+mode is used. There are three possible values:
+
+<ul>
+ <li>NULL - non-transactional. Will create a temporary lock for the
+ duration of the current action - either a write lock for "store"
+ or a read lock for "fetch". If you call "foreach", the lock will
+ be dropped between each record fetched</li>
+ <li>Pointer to NULL - transactional, transaction not yet started. Will
+ always take a write lock on the database, and update the pointer to
+ point to the new transaction.</li>
+ <li>Pointer to a valid transaction. Will keep using this transaction</li>
+</ul>
+
+If you are currently in a transaction, you MUST pass the same transaction
+to every database call. It is not possible to mix or nest transactions.
+There is one exception in the skiplist backend: If you pass NULL to a
+fetch or foreach while the database is in a transaction, it will silently
+do the read in the current transaction rather than returning an error
+
+<h2>API Reference</h2>
+
+All functions follow the normal C API of returning '0' on success,
+and an error code on failure
+
+<h3>init(const char *dbdir, int flags)</h3>
+
+Is called once per process. Don't call this yourself, use cyrus_init().
+No other calls will be made until this is called. Dbdir is the directory
+where database log files and other "state information" is stored.
+
+
+Flags:
+<ul>
+ <li>CYRUSDB_RECOVER - called by <tt>ctl_cyrusdb -r</tt> during startup to
+ do initial setup after a restart</li>
+</ul>
+
+<h3>done()</h3>
+
+The opposite of <tt>init()</tt> - called once per process to do any cleaning
+up after all database usage is finished
+
+<h3>sync()</h3>
+
+Perform a checkpoint of the database environment. Used by berkeley
+backend. Is called by <tt>ctl_cyrusdb -c</tt> on a regular basis
+
+<h3>archive(const char **fnames, const char *dirname)</h3>
+
+Archives the database environment and named database files into
+the named directory. Called by <tt>ctl_cyrusdb -c</tt> to take
+backups of important databases.
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - if an error occurs copying a file</li>
+</ul>
+
+<h3>open(const char *fname, int flags, struct db **retdb)</h3>
+
+Opens the database with the specified 'file name' (or other descriptor,
+for example the sql backend is not a filename), and if successful returns
+an opaque database structure
+
+Flags:
+<ul>
+ <li>CYRUSDB_CREATE - create the database if it doesn't exist</li>
+ <li>CYRUSDB_MBOXSORT - sort '.' first, so folder listing is correct</li>
+</ul>
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - if there is any error reading the file, or any
+ corruption detected while loading the file</li>
+</ul>
+
+<h3>close(struct db *db)</h3>
+
+Close the named database. Will release any locks if they are still
+held, but it's bad practice to close without committing or aborting, so
+the backend should log an error
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - if there are any errors during close</li>
+</ul>
+
+<h3>fetch(struct db *db, const char *key, size_t keylen,
+ const char **data, size_t *datalen, struct txn **tidptr)</h3>
+<h3>fetchlock(struct db *db, const char *key, size_t keylen,
+ const char **data, size_t *datalen, struct txn **tidptr)</h3>
+
+Fetch the value for the exact key given by key and keylen. If data
+is not NULL, set datalen and return a valid pointer to the start of
+the value.
+
+Fetchlock is identical to fetch, but gives a hint to the database
+that the record is likely to be modified soon.
+
+NOTE: it is possible to store a key with a zero length data record,
+in which case *datalen will be set to zero, and *data will be set to
+a non-NULL value
+
+It is an error to call fetch with a NULL key or a zero keylen
+
+It is an error to call fetch with a NULL datalen and a non-NULL data,
+however it is acceptable to call with a NULL data and a non-NULL datalen
+if you are only interested in the length
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - if any error occurs reading from the database</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+ <li>CYRUSDB_NOTFOUND - if there is no record that matches the key</li>
+</ul>
+
+<h3>foreach(struct db *db, const char *prefix, size_t prefixlen,
+ foreach_p *goodp, foreach_p *procp, void *rock, struct txn **tidptr)</h3>
+
+Iterate over all records matching the given prefix, in database
+order (which may be MBOXLIST sort, depending on the parameters given
+to open
+
+It is legal to give a NULL pointer as prefix if prefixlen is zero, in
+which case it will return all records in the database. It is an error
+to give a non-zero prefixlen with a NULL prefix.
+
+<tt>goodp</tt> - this function is only used for deciding if the record
+needs to be further processed. It can be used for basic filtering, and
+returns true (non-zero) to process, or zero to skip and move straight to
+the next record. Because goodp can't make any database changes, it doesn't
+break the lock, so it's faster to use goodp to filter records if you
+don't need to process all of them. NULL is a legal value for goodp, and
+means that all records will be processed.
+
+<tt>procp</tt> - procp is the main callback function. If you use foreach
+in non-transactional mode, the database is unlocked before calling procp,
+and locked again afterwards. You are allowed to add, delete or modify
+values in the same database from within procp. If procp returns non-zero,
+the foreach loop breaks at this point, and the return value of the foreach
+becomes the return value of procp. If procp returns zero, the foreach loop
+will continue at the NEXT record by sort order, regardless of whether the
+current record has changed or been removed. procp MUST NOT be NULL.
+
+Errors:
+<ul>
+ <li>procp_result - whatever your callback returns</li>
+ <li>CYRUSDB_IOERROR - if any error occurs while reading</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+</ul>
+
+<h3>create(struct db *db, const char *key, size_t keylen, const char *data,
+ size_t datalen, struct txn **tidptr)</h3>
+<h3>store(struct db *db, const char *key, size_t keylen, const char *data,
+ size_t datalen, struct txn **tidptr)</h3>
+
+Create a new record or replace an existing one. The only difference
+between these two is that <tt>create</tt> will return an error if the record
+already exists, while <tt>store</tt> will replace it
+
+If tidptr is NULL, create/store will take a write lock for the duration
+of the action.
+
+Any failure during create/store will abort the current transaction as well
+as returning an error
+
+It is legal to pass NULL for the data field ONLY if datalen is zero. It
+is not legal to pass NULL for key or zero for keylen
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - any error to write to the database</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+ <li>CYRUSDB_EXISTS - if <tt>create</tt> is called on an existing key</li>
+ <li>CYRUSDB_AGAIN - if a deadlock is created. The current transaction has
+ been aborted, but a retry may succeed</li>
+</ul>
+
+<h3>delete(struct db *db, const char *key, size_t keylen,
+ struct txn **tidptr, int force)</h3>
+
+Delete the given record from the database. If force is true, then
+succeed even if the record doesn't currently exist.
+
+It is not legal to pass NULL for key or zero for keylen
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - any error to write to the database</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+ <li>CYRUSDB_NOTFOUND - if force is not set and the key doesn't exist</li>
+ <li>CYRUSDB_AGAIN - if a deadlock is created. The current transaction has
+ been aborted, but a retry may succeed</li>
+</ul>
+
+
+<h3>commit(struct db *db, struct txn *tid)</h3>
+
+Commit the current transaction. tid will not be valid after this call,
+regardless of success
+
+If the commit fails, it will attempt to abort the transaction
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - any error to write to the database</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+ <li>CYRUSDB_AGAIN - if a deadlock is created. The current transaction has
+ been aborted, but a retry may succeed</li>
+</ul>
+
+<h3>abort(struct db *db, struct txn *tid)</h3>
+
+Abort the current transaction. tid will not be valid after this call,
+regardless of success
+
+Attempt to roll back all changes made in the current transaction.
+
+Errors:
+<ul>
+ <li>CYRUSDB_IOERROR - any error to write to the database</li>
+ <li>CYRUSDB_LOCKED - if tidptr is incorrect</li>
+</ul>
+
+<h3>dump(struct db *db, int detail)</h3>
+
+Optional function to dump the internal structure of the database to stdout
+for debugging purposes. Don't use.
+
+<h3>consistent(struct db *db)</h3>
+
+Check if the DB is internally consistent. Looks pretty bogus, and isn't
+used anywhere. Don't use.
+
+</body>
+</html>

cyrus-imapd-2.4.17.tar.gz/doc/internal/database-formats.html -> cyrus-imapd-2.5.tar.gz/doc/internal/database-formats.html Changed

@@ -4,7 +4,6 @@
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: database-formats.html,v 1.8 2010/01/06 17:01:29 murch Exp $" />
 <meta name="author" content="Ken Murchison" />
 
 <title>Database Formats</title>
@@ -77,7 +76,7 @@
 </pre>
 
 The translation to/from this data record format is handled by the
-quota_legacy cyrusdb backend.
+quota_legacy cyrusdb backend.
 
 <h2>Duplicate Delivery (deliver.db)</h2>
 
@@ -90,7 +89,7 @@
 follows:
 
 <pre>
-Key: &lt;Message-ID&gt\0&lt;Recipient&gt;\0
+Key: &lt;Message-ID&gt;\0&lt;Recipient&gt;\0
 
 Data: &lt;Timestamp (4 bytes)&gt;&lt;Message UID (4 bytes)&gt;
 </pre>
@@ -161,7 +160,7 @@
 
 <h2>Seen State (&lt;userid&gt;.seen)</h2>
 
-This database is a per-user database and maintains the list of
+This database is a per-user database and maintains the list of
 messages that the user has read in each mailbox. The database is
 indexed by mailbox unique-id and each data record contains the
 database version number, the timestamp of when a message was last
@@ -177,7 +176,7 @@
 
 <h2>Subscriptions (&lt;userid&gt;.sub)</h2>
 
-This database is a per-user database and contains the list of
+This database is per-user and contains the list of
 mailboxes to which the user has subscribed. The database is indexed
 by mailbox name and each data record contains no data. The format of
 each record is follows:
@@ -191,7 +190,7 @@
 
 <h2>Mailbox Keys (&lt;userid&gt;.mboxkey)</h2>
 
-This database is a per-user database and contains the list of
+This database is per-user and contains the list of
 mailbox access keys which are used for generating URLAUTH-authorized
 URLs. The database is indexed by mailbox name and each data record
 contains the database version number and the associated access key.
@@ -203,5 +202,76 @@
 Data: &lt;Version (2 bytes)&gt;&lt;Access Key (multi-byte)&gt;
 </pre>
 
+
+<h2>DAV Index (&lt;userid&gt;.dav)</h2>
+
+This SQLite database is per-user and primarily maintains a
+ mapping from DAV resource names (URLs) to the corresponding Cyrus
+ mailboxes and IMAP message UIDs. The database is designed to have
+ one table per resource type (iCalendar, vCard, etc) with each table
+ containing metadata specific to that resource type.
+
+<h3>CalDAV</h3>
+
+The format of the iCalendar table used by CalDAV is as follows:
+
+<pre>
+CREATE TABLE ical_objs (
+ rowid INTEGER PRIMARY KEY,
+ creationdate INTEGER,
+ mailbox TEXT NOT NULL,
+ resource TEXT NOT NULL,
+ imap_uid INTEGER,
+ lock_token TEXT,
+ lock_owner TEXT,
+ lock_ownerid TEXT,
+ lock_expire INTEGER,
+ comp_type INTEGER,
+ ical_uid TEXT,
+ organizer TEXT,
+ dtstart TEXT,
+ dtend TEXT,
+ recurring INTEGER,
+ transp INTEGER,
+ sched_tag TEXT,
+ UNIQUE( mailbox, resource )
+);
+</pre>
+
+Because CalDAV Scheduling requires the server to locate a resource
+ by iCalendar UID regardless of which calendar collection (mailbox)
+ it resides in, the iCalendar table has an additional index as follows:
+
+<pre>
+CREATE INDEX idx_ical_uid ON ical_objs ( ical_uid );
+</pre>
+
+<h3>CardDAV</h3>
+
+The format of the vCard table used by CardDAV is as follows (work
+ in progress):
+
+<pre>
+CREATE TABLE vcard_objs (
+ rowid INTEGER PRIMARY KEY,
+ creationdate INTEGER,
+ mailbox TEXT NOT NULL,
+ resource TEXT NOT NULL,
+ imap_uid INTEGER,
+ lock_token TEXT,
+ lock_owner TEXT,
+ lock_ownerid TEXT,
+ lock_expire INTEGER,
+ version INTEGER,
+ vcard_uid TEXT,
+ kind INTEGER,
+ fullname TEXT,
+ name TEXT,
+ nickname TEXT,
+ email TEXT,
+ UNIQUE( mailbox, resource )
+);
+</pre>
+
 </body>
 </html>

cyrus-imapd-2.4.17.tar.gz/doc/internal/hacking -> cyrus-imapd-2.5.tar.gz/doc/internal/hacking Changed

@@ -69,7 +69,7 @@
 - Command line apps should link cli_fatal.o so they all fatal()
 in the same way, unless there is a really good reason they need to do
 something unique.
-- If you call config_init() you must call cyrus_done() before you exit.
+- If you call cyrus_init() you must call cyrus_done() before you exit.
 - No one should ever call DB->init() or DB->done() cyrusdb functions
 except for in libcyrus_init()
 - I've been trying to keep #include statements for libcyrus and libimap
@@ -85,3 +85,254 @@
 in case). Similarly, commandline utilities probably don't need a shut_down().
 
 
+
+- Coding Standards
+
+These are the generally agreed upon coding standards as thrashed
+out on the cyrus-devel list in June 2010.
+
+ - Spacing is 4 characters with soft tabs at 8 - mixed tabs and spaces
+ This corresponds to the vi settings sw=4 sts=4 ts=8 et.
+
+ - Group the '*' character with the variable not the type, i.e.
+ char *foo; /* correct */
+ char* foo; /* WRONG */
+
+ - The keywords 'if', 'for', and 'while' take a space after the keyword.
+ The parentheses around the following expression are not closely
+ connected to the expression without any spaces. The ';' inside
+ the 'for' expression have a space after them and not before.
+ For example:
+
+ if (condition) /* correct */
+ if(condition) /* WRONG */
+ if( condition ) /* WRONG */
+
+ for (i = 0; i < x; i++) /* correct */
+ for(i = 0; i < x; i++) /* WRONG */
+ for (i = 0 ;i < x ;i++) /* WRONG */
+ for(i = 0 ;i < x ;i++) /* WRONG */
+
+ while (foo) /* correct */
+ while(foo) /* WRONG */
+ while( foo ) /* WRONG */
+
+ - Use spaces around the double-character logical operator
+ '||' but don't use spaces around single-character bitwise
+ operator '|'.
+
+ int flags = FOO|BAR; /* correct */
+ int flags = FOO | BAR; /* WRONG */
+ if (itchy || scratchy) /* correct */
+ if (itchy||scratchy) /* WRONG */
+
+ - Function definitions are followed by a brace on a line by itself,
+ all other braces are inline. Return types are inline with function
+ definition. Old K&R style function definitions are not allowed.
+
+ void thing(int val) /* correct */
+ { /* correct */
+ ...body...
+ } /* correct */
+
+ void /* WRONG */
+ thing(int val) /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ void /* WRONG */
+ thing( /* WRONG */
+ int val) /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ void /* WRONG */
+ antique(val) /* WRONG */
+ int val; /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ void thing(int val) { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ void noargs(void) /* correct */
+ { /* correct */
+ ...body...
+ } /* correct */
+
+ void noargs() /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+
+ Long argument lists should be split across multiple lines,
+ with the second and subsequent lines indented so that they
+ line up with the start of the first line of arguments.
+
+ void toomanyargs(int arg1, const char *arg2, /* correct */
+ struct whatever *arg3, int arg4) /* correct */
+ { /* correct */
+ ...body...
+ } /* correct */
+
+ void toomanyargs(int arg1, const char *arg2, /* WRONG */
+ struct whatever *arg3, int arg4) /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ void toomanyargs( /* WRONG */
+ int arg1, /* WRONG */
+ const char *arg2, /* WRONG */
+ struct whatever *arg3, /* WRONG */
+ int arg4) /* WRONG */
+ { /* WRONG */
+ ...body...
+ } /* WRONG */
+
+ - Within a function, braces are used in old-fashioned K&R style.
+ Specifically:
+
+ - open braces are placed at the end of the line containing the
+ statement (such as an 'if') to which they belong, after a
+ single space.
+
+ - closing braces are placed on a line by themselves, aligned
+ with the start of the statement to which their matching
+ open brace belongs.
+
+ - this applies even when the closing brace is followed by
+ an 'else' keyword.
+
+ Yes, it's ugly and hard to read, but you get used to it and
+ most of the code is currently like that. Deal with it.
+
+ while (cond) { /* correct */
+ ...body... /* correct */
+ } /* correct */
+
+ while (cond){ /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+
+ while (cond) { ...body... } /* WRONG */
+
+ while (cond) { /* WRONG */
+ ...body... } /* WRONG */
+
+ while (cond) /* WRONG */
+ { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+
+ while (cond) /* WRONG */
+ { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+
+ if (cond) { /* correct */
+ ...body... /* correct */
+ } /* correct */
+ else if (othercond) { /* correct */
+ ...body... /* correct */
+ } /* correct */
+ else { /* correct */
+ ...body... /* correct */
+ } /* correct */
+
+ if (cond) { /* WRONG */
+ ...body... /* WRONG */
+ } else if (othercond) { /* WRONG */
+ ...body... /* WRONG */
+ } else { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+
+ if (cond) /* WRONG */
+ { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+ else if (othercond) /* WRONG */
+ { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+ else /* WRONG */
+ { /* WRONG */
+ ...body... /* WRONG */
+ } /* WRONG */
+
+ - The braces around a block used in an 'if'...'else if'...'else'
+ may be omitted if the statement is very simple and clear, such
+ as a single function call. This is a judgement call though,
+ so play it safe and use braces.
+
+ if (cond) /* correct, maybe */
+ function(); /* correct, maybe */
+ else /* correct, maybe */
+ other_function(); /* correct, maybe */
+
+ - The 'goto' keyword needs to be used very very sparingly and only
+ with forethought. The only clearly good example is to goto
+ a label at the end of a function to do cleanup under error
+ conditions.
+
+ void foo(struct bar *b) /* correct */
+ { /* correct */
+ char *x = xmalloc(...); /* correct */
+
+ if (b == NULL) /* correct */
+ goto error; /* correct */
+
+ if (b->quux != 42) /* correct */
+ goto error; /* correct */
+
+ ...do useful things... /* correct */
+ error: /* correct */
+ free(x); /* correct */
+ } /* correct */
+
+
+ Very occasionally, it may be permissable to use 'goto' from within
+ a complicated or multiply-nested loop, to the top of a loop, but
+ only if using another control structure is *less* clear.
+
+ - Generally, zero return is SUCCESS and integer return is an error code.
+
+ - Use "const char *" where possible.
+
+ int is_tacky(const char *name) /* correct */
+ { /* correct */
+ return !strcmp(name, "britney"); /* correct */
+ } /* correct */
+
+ int is_tacky(char *name) /* WRONG */
+ { /* WRONG */
+ return !strcmp(name, "britney"); /* WRONG */
+ } /* WRONG */
+
+ - Use 'struct buf' for variable length strings where possible.
+
+ - RAII http://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization
+ In practice, this means each structure should have a single cleanup
+ function which handles all possible states of the structure and
+ is called whenever the structure needs cleaning up. Likewise,
+ any resources allocated during a function should be cleaned up
+ in the same function, in a single code block at the end of the
+ function (see the comments on 'goto').
+
+ - If you find yourself passing the same multiple parameters through many
+ functions, create a struct and pass around a pointer to that instead.
+
+ - DON'T EVER REUSE THE SAME VARIABLE FOR TWO DIFFERENT PURPOSES IN THE SAME
+ FUNCTION. IN FACT, DON'T REUSE THE SAME VARIABLE _NAME_ FOR DIFFERENT
+ PURPOSES. KTHXBYE. (note: this doesn't apply to 'i', 'n', etc which are
+ used in multiple loops. It applies to using the same name for an absolute
+ offset and a "within this mmap" offset though, and it also applies to
+ using the same variable name for native order and network order numbers,
+ which is where I've seen it a few times and been super frustrated!)
+

cyrus-imapd-2.4.17.tar.gz/doc/internal/index-api.html -> cyrus-imapd-2.5.tar.gz/doc/internal/index-api.html Changed

@@ -4,7 +4,6 @@
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: mailbox-format.html,v 1.9 2010/01/06 17:01:29 murch Exp $" />
 <meta name="author" content="Bron Gondwana" />
 
 <title>Index API</title>
@@ -17,9 +16,9 @@
 
 The Index API is implemented in <tt>imap/index.h</tt> and
 <tt>imap/index.c</tt>. It provides a snapshot view into the
-underlying mailbox (see <a href="mailbox-api.html">the 
+underlying mailbox (see <a href="mailbox-api.html">the
 Mailbox API documentation</a> which obeys IMAP semantics,
-as well as all the searching and sorting logic.
+as well as all the searching and sorting logic.
 
 <h2>Opening and closing</h2>
 
@@ -50,7 +49,7 @@
 
 Ok - I think a few words about the index model and how it differs
 from direct mailbox access are needed! In the past, index.c used
-pointers directly into the mmaped <tt>cyrus.index</tt> file and 
+pointers directly into the mmaped <tt>cyrus.index</tt> file and
 maintained the old mmaped copy if an expunge took place. Under the
 namelock regime, this is no longer required because namelocks will
 avoid the file being re-written.
@@ -72,11 +71,12 @@
 non-peek body fetch, expunge) then cycle through the refreshed
 state map and update the records which are affected.</li>
 <li>call <tt>index_unlock</tt> (unlock the underlying mailbox and
- commit the statuscache changes)</li>
+ commit the statuscache changes)
 
 At this point the index lock is released and we have not
 yet generated any network traffic. Now start generating the
 response.
+</li>
 
 <li>if expunges are allowed, call <tt>index_tellexpunge</tt></li>
 <li>call <tt>index_tellchanges</tt> to tell about all other changes</li>

cyrus-imapd-2.4.17.tar.gz/doc/internal/index.html -> cyrus-imapd-2.5.tar.gz/doc/internal/index.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/internal/internationalization.html -> cyrus-imapd-2.5.tar.gz/doc/internal/internationalization.html Changed

@@ -1,460 +1,459 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" 
-content="$Id: internationalization.html,v 1.7 2003/10/22 18:50:05 rjs3 Exp $" />
-<meta name="author" content="Larry Greenfield" />
-
-<title>internationalization</title>
-</head>
-
-<body>
-<h1>charset code</h1>
-
-<h2>introduction</h2>
-
-Cyrus currently transcodes characters to a canonical UTF-8 form for
-searching. The base spec of IMAP4 only requires understanding multiple
-character sets to properly implement SEARCH. Since the base spec came
-out, several extensions have been proposed that require further
-charset support: SORT, THREAD, and the Sieve subsystem. As of this
-writing, Cyrus doesn't correctly support these other commands.
-
-Cyrus currently only believes in 16-bit characters. Technically,
-Unicode has up to 21-bit characters (expressible in UTF-16 and 3-byte
-UTF-8) and ISO 10646 allows up to 31-bit characters (though ISO's
-current policy is to not allocate any characters outside of the 21-bit
-Unicode range). The lower 16-bit characters make up the basic
-multilingual plane (BMP) where the majority of languages live. This
-restriction is apparent in <tt>charset.c:writeutf8()</tt>, the UTF-8
-decoders, and the Unicode canonicalization table used by Cyrus. Since
-Cyrus's known character sets (except for UTF-8) don't contain any
-characters off of the BMP this isn't seen to be a major problem.
-
-Throughout this text, Unicode and ISO 10646 will be used
-interchangible to refer to the 16-bit character set of the BMP,
-regardless of encoding. "Character", unless otherwise specified,
-refers to a single Unicode character <tt>ffff</tt> or under. 
-
-<h2>cyrus canonical form</h2>
-
-Since when users search e-mail messages it's much easier for them
-to eliminate false positives than realize there are hits that aren't
-displayed, the Cyrus searching algorithm errs on the side of more
-matches. Before comparing any two strings, Cyrus puts them in a
-canonical form. Logically, the process works as follows:
-
-<ul>
-<li> the input string is translated into a sequence of Unicode
-characters. </li>
-
-<li> each character is transformed into lowercase. (For some
-characters, a single uppercase character may transform into multiple
-lowercase characters.) </li>
-
-<li> each character is fully decomposed. </li>
-
-<li> all whitespace (Unicode general categories starting with
-<tt>Z</tt>) is removed. </li>
-
-<li> combining diacritical marks, such as the accent on é, are
-removed. (These are Unicode characters <tt>0300</tt>-<tt>03ff</tt>.)
-</li>
-
-<li> certain characters are expanded to alternative spellings using
-ASCII characters, such as "æ" to "ae". </li>
-
-<li> the output characters are then encoded in UTF-8. </li>
-
-</ul>
-
-The actual transcoding does all of these steps at once with the aid
-of tables, carefully built at compile-time.
-
-The central part of Cyrus's internationalization support is it's
-transcoding routines in <tt>lib/charset.ch</tt>, and
-<tt>lib/chartable.ch</tt>. Cyrus's transcoding routines are very
-elegant and very compact, thus somewhat intimidating. During
-compilation, Cyrus builds up a large number of tables (see <a
-href="#mkchartable">mkchartable</a>) and uses them so that it never
-has to consider more than a single octet at a time while outputing the
-Cyrus canonical form for an input string.
-
-<h2>external interface</h2>
-
-
-<tt>lib/charset.h</tt> is the public interface for Cyrus lib clients
-to get character canonicalization and searching support. In contains
-the following functions:
-
-<dl>
-<dt><tt>char *charset_convert(const char *s, int charset, char *buf,
-int bufsz)</tt></dt>
-
-<dd> Given a string s in charset charset, decode it into
-canonical form in buf. buf must be reallocable and
-currently at least size bufsz.</dd>
-
-<dt><tt>char *charset_decode_mimeheader(const char *s, char *buf, int
-bufsz)</tt></dt> <dd> Given a string s containing possible MIME
-encoded substrings (per RFC 2047), decode into canonical form in
-buf. buf must be reallocable and currently at least size
-bufsz.</dd>
-
-<dt><tt>charset_index charset_lookupname(const char *name)</tt></dt>
-<dd> Given name return the Cyrus charset index. 0 always
-represents US-ASCII. The returned charset_index may be saved in a
-file; it is stable and is an integer. If this version of Cyrus does
-not support the charset, <tt>CHARSET_UNKNOWN_CHARSET</tt> is
-returned.</dd>
-
-<dt><tt>comp_pat *charset_compilepat(const char *s)</tt></dt> 
-<dd>
-Compiles a NUL-terminated canonicalized string s into a
-Boyer-Moore table for fast searching. I'll describe these <a
-href="#comp_pat">compiled patterns</a> later. </dd>
-
-<dt><tt>void charset_freepat(comp_pat *pat)</tt></dt>
-<dd> Frees a pattern previously return by <tt>charset_compilepat()</tt>.</dd>
-
-<dt><tt>int charset_searchstring(const char *substr, comp_pat *pat,
- const char *s, int len)</tt></dt>
-<dd> Searches for a canonicalized string substr in the
- canonicalized string s. s is of length len.
- substr must have been previously compiled into pat. 
- Returns non-zero for a hit, zero for no match.
-</dd>
-
-<dt><tt>int charset_searchfile(const char *substr, comp_pat *pat,
- const char *msg_base, int mapnl, int len, 
- charset_index charset, int encoding)</tt></dt>
-
-<dd> 
-Searches for the canonicalized string substr with compiled
-pattern pat in a large buffer starting at msg_base of
-length len. The large buffer is of charset charset with
-the encoding encoding. <tt>charset_searchfile()</tt> will
-dynamically unencode and canonicalize the search text looking for
-substr. (If mapnl is set, the buffer has only <tt>\n</tt>
-instead of <tt>\r\n</tt>, but the length assumes that each <tt>\n</tt>
-is dynamically converted to <tt>\r\n</tt>. This feature is deprecated.)
-</dd>
-
-<dt><tt>char *charset_decode_mimebody(const char *msg_base, int len,
- int encoding, char **buf, int *bufsz,
- int *outlen)</tt></dt>
-<dd>
-Decode the MIME body part (per RFC 2045) located in the large buffer
-starting at msg_base of length len. The large buffer is of
-encoding encoding. <tt>charset_decode_mimebody()</tt> will decode 
-into buf. buf must be reallocable and currently at least size
-bufsz. The number of decoded bytes is returned in outlen.</dd>
-
-<dt><tt>charset_extractfile()</tt></dt>
-<dd> Used by <tt>squatter</tt> and possibly other text indexing engines,
-but not described here.</dd>
-
-</dl>
-
-<h2>the TRANSLATE macro: using the transcoding tables</h2>
-
-The external interface is implemented with the help of the
-<tt>START</tt> and <tt>TRANSLATE</tt> macros:
-
-<dl>
-<dt><tt>void START(struct decode_state *state, const unsigned char
-(*table)2564)</tt></dt>
-
-<dd>
-<tt>START</tt> initializes state to be ready for transcoding of the
-charset translation table given with table. The starting active
-table is always the first one in the list passed in.</dd>
-
-<dt><tt>void TRANSLATE(struct decode_state *state, unsigned char
-input, unsigned char *outbuf, unsigned outindex)</tt></dt>
-
-<dd>
-<tt>TRANSLATE</tt> takes four parameters: state is the current
-state of the translation; it must have been initialized with
-<tt>START</tt> and is modified by <tt>TRANSLATE</tt>; input is
-one octet of input from the stream to be transcoded; outbuf is
-a pointer to the start of the buffer to write output characters;
-outindex is the index where this translation should be
-written. The size of outbuf must be at least outindex +
-charset_max_translation.
-</dd>
-</dl>
-
-Each charset consists of a set of one or more tables; the
-table parameter passed into <tt>START</tt> is the first of
-these tables and the others are adjacent in memory. Characters are
-transcoded by indexing into the active table with input and
-examining the 4 octet translation. The 4 octet translation may consist
-of 0–3 character translations followed by a control code or a
-series of control codes. In effect, the translation for a given octet
-is a mini-program that consists either of UTF-8 octets or control
-codes. One of the control codes RET, END, JSR, or JMP must occur in
-the 4 octet translation.
-
-<h3>control codes</h3>
-
-Control codes are represented by uppercase US-ASCII characters
-since no uppercase characters can appear in the output translation
-(recall that Cyrus canonical form downcases). Any uppercase US-ASCII
-character (<tt>A .. Z</tt>) is thus interpreted specially by the
-<tt>TRANSLATE</tt> virtual machine. Any other octet encountered as an
-output translation is presumed to be part of the UTF-8 output
-sequence and copied to the output.
-
-The names of control codes are actually C pre-processor defines to
-uppercase US-ASCII characters. As the mnenomics are easier to
-understand, I use them in discussing their semantics.
-
-<h3>control code reference</h3>
-
-<tt>TRANSLATE</tt> recognizes the following "normal" control
-codes:
-
-<dl>
-<dt>XLT</dt>
-
-<dd>This is the first octet of the four octet sequence, indicating
-that the desired translation is larger than 3 UTF-8 octets. The next
-two octets represent an offset to look up in the special
-chartables_long_translations table. After that translation is copied
-to the outbuf, the final octet is interpreted (it must be either a RET
-or an END).</dd>
-
-<dt>JSR</dt>
-
-<dd>The <tt>TRANSLATE</tt> virtual machine has a stack, fixed at size
-1. A JSR copies address of the current active table to the stack and
-transitions to the active table given by the next two octets. (For
-instance, table 1 would be the next table after the table given as a
-parameter to <tt>START</tt>.) Translation of the current octet stops
-after encountering a JSR.
-
-JSRs are useful for converting a two octet input character: the
-first octet in the character will make a JSR to some table; the second
-octet will produce a translation and RET to the current table.
- 
-
-Since the virtual machine has a fixed size stack, it would be
-highly unusual for the virtual machine to encounter two different JSRs
-without an intervening RET.</dd>
-
-<dt>JMP</dt>
-
-<dd> Similiar to JSR, but does not change the stack. It is the
-equivalent of a goto. JMPs are useful to deal with modal input
-character sets (such as an escape in ISO-2022-JP, see <a
-href="#mkchartable">how the tables are generated</a>).</dd>
-
-<dt>RET</dt>
-
-<dd>Indicates that we are done translating this input octet and we should
-return to the previous active table. It might appear as the first of
-the 4 translation octets, in which case this input character
-translates into nothing (it might be whitespace, for instance).</dd>
-
-<dt>END</dt>
-
-<dd>Indicates we are done translating this input octet. When
-<tt>TRANSLATE</tt> is next called, that input octet will be
-interpreted against the current active table; the stack does not
-change. </dd>
-
-</dl>
-
-In addition, it recognizes the following "special" control codes
-for charsets that aren't easily represented by a set of tables, UTF-8
-and UTF-7:
-
-<dl>
-<dt>U7F </dt>
-
-<dd>UTF-7 consists of US-ASCII characters and a special escape
-character that indicates a transition to base-64 encoded UTF-16
-characters. The virtual machine has built in code to handle the base64
-decoding. In UTF-7's base64, 8 input octets result in 3 characters, so
-the tables would be rather large.</dd>
-
-<dt>U7N</dt>
-
-<dd>This indicates that the current octet is the continuation of the
-base-64 section.</dd>
-
-<dt>U83</dt>
-
-<dd>One and two character UTF-8 sequences are handled normally in the
-charset code. To keep the table size down, 3 octet sequences are
-handled specially. U83 indicates that the current input octet is the
-start of a three character sequence. It is also an implicit jump to
-the 2nd table in the UTF-8 sequence, ending this translation.</dd>
-
-<dt>U83_2</dt>
-
-<dd>This input octet 2nd of 3-octet UTF-8 input, with an implicit
-jump to the 3rd table. </dd>
-
-<dt>U83_3</dt>
-
-<dd>3rd octet of a 3-octet UTF-8 input. This produces the output
-characters and has an implicit jump to the 1st table of UTF-8.</dd>
-
-</dl>
-
-Finally, it's useful to mention the special character
-<tt>EMPTY</tt> which is guaranteed not to match any character. It is
-also represented by an uppercase US-ASCII character.
-
-<h2 id="comp_pat">searching and compiled patterns</h2>
-
-<h3>boyer-moore</h3>
-
-brief description of boyer-moore xxx
-
-<h3>cyrus implementation</h3>
-
-why two arrays? us-ascii optimization, really kinda useless now
-xxx
-
-meta-data stored at the end xxx
-
-<h2 id="mkchartable">generating the tables: <tt>mkchartable</tt></h2>
-
-The program <tt>mkchartable</tt> is used to generate the charset
-transcoding tables used by TRANSLATE. These tables are carefully
-constructed so no more than a single octet need be examined at a time;
-this octet results in either an output stream of UTF-8 characters
-being generated or some sort of state change.
-
-<tt>mkchartable</tt> uses three different sorts of input files to
-generate these tables. These files are located in the
-<tt>lib/charset</tt> directory.
-
-<h3 id="charset_tables">charset tables</h3>
-
-Each charset file maps a single charset to the corresponding
-Unicode characters. For the US-ASCII and ISO-8859-x character sets
-this is trivial: each input byte corresponds to a single Unicode
-character. (Actually, some ISO-8859-x octets do not map to any Unicode
-character. In that case, the file either does not contain that octet
-or map it to "<tt>????</tt>".)
-
-Other character sets are trickier. For instance, GB-2312 has both 
-single and double byte characters, but is still a simple map from
-input character to output character. More complicated are modal
-character encodings. For instance, ISO-2022-JP starts in US-ASCII mode
-and uses <tt>1B</tt> as an escape character followed by another two
-characters to select a new mode.
-
-The input charset labels modes with "<tt>:</tt>" followed by the
-mode name. The starting mode "<tt>US-ASCII</tt>" in ISO-2022-JP is
-preceeded by "<tt>:US-ASCII</tt>". Mode transitions are denoted by a
-Unicode conversion of "<tt>&gt;newmode</tt>" or
-"<tt>:newmode</tt>". To denote that the octet <tt>42</tt> transitions
-into the "<tt>US-ASCII</tt>" mode, the charset file has "<tt>42
-&gt;US-ASCII</tt>". The mode names themselves are arbitrary labels and
-have no effect on the output.
-
-The input charset labels modes with ":" followed by the mode name.
-The mode name is optionally followed by a space and the
-"<tt>&lt;</tt>" character. If the "<tt>&lt;</tt>" character is
-present, then all translations will be followed by a RET instruction
-instead of an END instruction.
-
-The transition "<tt>&gt;newmode</tt>" results in a JSR instruction
-being generated. A JMP instruction is generated by a transition of
-"<tt>:newmode</tt>".
-
-The input byte can be specified as "<tt>*</tt>". This is used to
-define the "default action" which is used for input bytes that are not
-otherwise defined for the mode. If the default action is not
-explicitly stated, it is a translation to EMPTY.
-
-<h3>unicode data table</h3>
-
-The <tt>unidata2.txt</tt> file is verbatim from the Unicode
-standard. More recent versions should be available <a
-href="http://www.unicode.org/xxx">from their website</a>. Each entry
-in the file describers a Unicode character by the following
-properties, seperated by semicolons:
-
-<ul>
-<li>code point (16-bit character value) in hex</li>
-<li>character name (unused by Cyrus)</li>
-<li>general category, such as whitespace or puncuation</li>
-<li>the canonical combining class (unused)</li>
-<li>bidirection chategory (unused)</li>
-<li>character decomposition</li>
-<li>decimal digit value (unused)</li>
-<li>digit value (unused, and, no, I don't know the difference)</li>
-<li>numeric value including fractions (unused)</li>
-<li>mirrored character (unused)</li>
-<li>Unicode 1.0 name (unused)</li>
-<li>comment (unused)</li>
-<li>upper case equivalent (unused)</li>
-<li>lower case equivalent</li>
-</ul>
-
-In general, Cyrus uses the lower case equivalent if there is one,
-and the decomposed value otherwise.
-
-<h3>unicode fixup table</h3>
-
-The <tt>unifix.txt</tt> file contains Cyrus-specific mappings for
-characters. It overrides the <tt>unidata2.txt</tt> table. Each rule in
-the file is explained with a comment. It's helpful to remember that
-the Unicode general categories starting with <tt>Z</tt> represent
-whitespace, and whitespace is always removed.
-
-<h3>generating <tt>chartable.c</tt></h3>
-
-how <tt>mkchartable</tt> works: collapses the encoding modes, the
-unicode translations, and other normalizations into the output tables
-described above xxx
-
-<h2>for the future</h2>
-
-<h3>Sieve/ACAP comparators</h3>
-
-<h3>adjustable normalization?</h3>
-
-The use of uppercase US-ASCII characters is one of the annoyances
-in trying to generalize the charset transcoding. If we continue to
-restrict the characters under consideration to the BMP, switching to
-UTF-8 control codes that start 4 or 5 byte sequences is possible.
-
-Another possibility is to use a NUL character as an escape
-sequence, though this increases the size of each control code by 1
-octet.
-
-<h3>handle &gt;2 octet input characters</h3>
-
-<h3>make UTF-8 more regular</h3>
-
-consider whether we really need U83, U83_2, U83_3. also consider
-changing <tt>{ U83, 0, 0, 0 }</tt> translations to <tt>{ U83, JMP, 0, 1
-}</tt> sequences to at least eliminate the implicit jump.
-
-<h3>require minimal UTF-8 characters</h3>
-
-<h2>references</h2>
-
-xxx
-
-<ul>
-<li>UNICODE Unicode / ISO 10646</li>
-<li>UTF-8 utf-8 RFC</li>
-<li>UTF-7 utf-7 RFC</li>
-<li>BM boyer-moore</li>
-<li>ACAP the comparators reference. see section XXX of RFC 2244.</li>
-</ul>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="revision"
+<meta name="author" content="Larry Greenfield" />
+
+<title>internationalization</title>
+</head>
+
+<body>
+<h1>charset code</h1>
+
+<h2>introduction</h2>
+
+Cyrus currently transcodes characters to a canonical UTF-8 form for
+searching. The base spec of IMAP4 only requires understanding multiple
+character sets to properly implement SEARCH. Since the base spec came
+out, several extensions have been proposed that require further
+charset support: SORT, THREAD, and the Sieve subsystem. As of this
+writing, Cyrus doesn't correctly support these other commands.
+
+Cyrus currently only believes in 16-bit characters. Technically,
+Unicode has up to 21-bit characters (expressible in UTF-16 and 3-byte
+UTF-8) and ISO 10646 allows up to 31-bit characters (though ISO's
+current policy is to not allocate any characters outside of the 21-bit
+Unicode range). The lower 16-bit characters make up the basic
+multilingual plane (BMP) where the majority of languages live. This
+restriction is apparent in <tt>charset.c:writeutf8()</tt>, the UTF-8
+decoders, and the Unicode canonicalization table used by Cyrus. Since
+Cyrus's known character sets (except for UTF-8) don't contain any
+characters off of the BMP this isn't seen to be a major problem.
+
+Throughout this text, Unicode and ISO 10646 will be used
+interchangible to refer to the 16-bit character set of the BMP,
+regardless of encoding. "Character", unless otherwise specified,
+refers to a single Unicode character <tt>ffff</tt> or under. 
+
+<h2>cyrus canonical form</h2>
+
+Since when users search e-mail messages it's much easier for them
+to eliminate false positives than realize there are hits that aren't
+displayed, the Cyrus searching algorithm errs on the side of more
+matches. Before comparing any two strings, Cyrus puts them in a
+canonical form. Logically, the process works as follows:
+
+<ul>
+<li> the input string is translated into a sequence of Unicode
+characters. </li>
+
+<li> each character is transformed into lowercase. (For some
+characters, a single uppercase character may transform into multiple
+lowercase characters.) </li>
+
+<li> each character is fully decomposed. </li>
+
+<li> all whitespace (Unicode general categories starting with
+<tt>Z</tt>) is removed. </li>
+
+<li> combining diacritical marks, such as the accent on é, are
+removed. (These are Unicode characters <tt>0300</tt>-<tt>03ff</tt>.)
+</li>
+
+<li> certain characters are expanded to alternative spellings using
+ASCII characters, such as "æ" to "ae". </li>
+
+<li> the output characters are then encoded in UTF-8. </li>
+
+</ul>
+
+The actual transcoding does all of these steps at once with the aid
+of tables, carefully built at compile-time.
+
+The central part of Cyrus's internationalization support is it's
+transcoding routines in <tt>lib/charset.ch</tt>, and
+<tt>lib/chartable.ch</tt>. Cyrus's transcoding routines are very
+elegant and very compact, thus somewhat intimidating. During
+compilation, Cyrus builds up a large number of tables (see <a
+href="#mkchartable">mkchartable</a>) and uses them so that it never
+has to consider more than a single octet at a time while outputing the
+Cyrus canonical form for an input string.
+
+<h2>external interface</h2>
+
+
+<tt>lib/charset.h</tt> is the public interface for Cyrus lib clients
+to get character canonicalization and searching support. In contains
+the following functions:
+
+<dl>
+<dt><tt>char *charset_convert(const char *s, int charset, char *buf,
+int bufsz)</tt></dt>
+
+<dd> Given a string s in charset charset, decode it into
+canonical form in buf. buf must be reallocable and
+currently at least size bufsz.</dd>
+
+<dt><tt>char *charset_decode_mimeheader(const char *s, char *buf, int
+bufsz)</tt></dt> <dd> Given a string s containing possible MIME
+encoded substrings (per RFC 2047), decode into canonical form in
+buf. buf must be reallocable and currently at least size
+bufsz.</dd>
+
+<dt><tt>charset_index charset_lookupname(const char *name)</tt></dt>
+<dd> Given name return the Cyrus charset index. 0 always
+represents US-ASCII. The returned charset_index may be saved in a
+file; it is stable and is an integer. If this version of Cyrus does
+not support the charset, <tt>CHARSET_UNKNOWN_CHARSET</tt> is
+returned.</dd>
+
+<dt><tt>comp_pat *charset_compilepat(const char *s)</tt></dt>
+<dd>
+Compiles a NUL-terminated canonicalized string s into a
+Boyer-Moore table for fast searching. I'll describe these <a
+href="#comp_pat">compiled patterns</a> later. </dd>
+
+<dt><tt>void charset_freepat(comp_pat *pat)</tt></dt>
+<dd> Frees a pattern previously return by <tt>charset_compilepat()</tt>.</dd>
+
+<dt><tt>int charset_searchstring(const char *substr, comp_pat *pat,
+ const char *s, int len)</tt></dt>
+<dd> Searches for a canonicalized string substr in the
+ canonicalized string s. s is of length len.
+ substr must have been previously compiled into pat.
+ Returns non-zero for a hit, zero for no match.
+</dd>
+
+<dt><tt>int charset_searchfile(const char *substr, comp_pat *pat,
+			 const char *msg_base, int mapnl, int len,
+ charset_index charset, int encoding)</tt></dt>
+
+<dd>
+Searches for the canonicalized string substr with compiled
+pattern pat in a large buffer starting at msg_base of
+length len. The large buffer is of charset charset with
+the encoding encoding. <tt>charset_searchfile()</tt> will
+dynamically unencode and canonicalize the search text looking for
+substr. (If mapnl is set, the buffer has only <tt>\n</tt>
+instead of <tt>\r\n</tt>, but the length assumes that each <tt>\n</tt>
+is dynamically converted to <tt>\r\n</tt>. This feature is deprecated.)
+</dd>
+
+<dt><tt>char *charset_decode_mimebody(const char *msg_base, int len,
+ int encoding, char **buf, int *bufsz,
+ int *outlen)</tt></dt>
+<dd>
+Decode the MIME body part (per RFC 2045) located in the large buffer
+starting at msg_base of length len. The large buffer is of
+encoding encoding. <tt>charset_decode_mimebody()</tt> will decode
+into buf. buf must be reallocable and currently at least size
+bufsz. The number of decoded bytes is returned in outlen.</dd>
+
+<dt><tt>charset_extractfile()</tt></dt>
+<dd> Used by <tt>squatter</tt> and possibly other text indexing engines,
+but not described here.</dd>
+
+</dl>
+
+<h2>the TRANSLATE macro: using the transcoding tables</h2>
+
+The external interface is implemented with the help of the
+<tt>START</tt> and <tt>TRANSLATE</tt> macros:
+
+<dl>
+<dt><tt>void START(struct decode_state *state, const unsigned char
+(*table)2564)</tt></dt>
+
+<dd>
+<tt>START</tt> initializes state to be ready for transcoding of the
+charset translation table given with table. The starting active
+table is always the first one in the list passed in.</dd>
+
+<dt><tt>void TRANSLATE(struct decode_state *state, unsigned char
+input, unsigned char *outbuf, unsigned outindex)</tt></dt>
+
+<dd>
+<tt>TRANSLATE</tt> takes four parameters: state is the current
+state of the translation; it must have been initialized with
+<tt>START</tt> and is modified by <tt>TRANSLATE</tt>; input is
+one octet of input from the stream to be transcoded; outbuf is
+a pointer to the start of the buffer to write output characters;
+outindex is the index where this translation should be
+written. The size of outbuf must be at least outindex +
+charset_max_translation.
+</dd>
+</dl>
+
+Each charset consists of a set of one or more tables; the
+table parameter passed into <tt>START</tt> is the first of
+these tables and the others are adjacent in memory. Characters are
+transcoded by indexing into the active table with input and
+examining the 4 octet translation. The 4 octet translation may consist
+of 0–3 character translations followed by a control code or a
+series of control codes. In effect, the translation for a given octet
+is a mini-program that consists either of UTF-8 octets or control
+codes. One of the control codes RET, END, JSR, or JMP must occur in
+the 4 octet translation.
+
+<h3>control codes</h3>
+
+Control codes are represented by uppercase US-ASCII characters
+since no uppercase characters can appear in the output translation
+(recall that Cyrus canonical form downcases). Any uppercase US-ASCII
+character (<tt>A .. Z</tt>) is thus interpreted specially by the
+<tt>TRANSLATE</tt> virtual machine. Any other octet encountered as an
+output translation is presumed to be part of the UTF-8 output
+sequence and copied to the output.
+
+The names of control codes are actually C pre-processor defines to
+uppercase US-ASCII characters. As the mnenomics are easier to
+understand, I use them in discussing their semantics.
+
+<h3>control code reference</h3>
+
+<tt>TRANSLATE</tt> recognizes the following "normal" control
+codes:
+
+<dl>
+<dt>XLT</dt>
+
+<dd>This is the first octet of the four octet sequence, indicating
+that the desired translation is larger than 3 UTF-8 octets. The next
+two octets represent an offset to look up in the special
+chartables_long_translations table. After that translation is copied
+to the outbuf, the final octet is interpreted (it must be either a RET
+or an END).</dd>
+
+<dt>JSR</dt>
+
+<dd>The <tt>TRANSLATE</tt> virtual machine has a stack, fixed at size
+1. A JSR copies address of the current active table to the stack and
+transitions to the active table given by the next two octets. (For
+instance, table 1 would be the next table after the table given as a
+parameter to <tt>START</tt>.) Translation of the current octet stops
+after encountering a JSR.
+
+JSRs are useful for converting a two octet input character: the
+first octet in the character will make a JSR to some table; the second
+octet will produce a translation and RET to the current table.
+ 
+
+Since the virtual machine has a fixed size stack, it would be
+highly unusual for the virtual machine to encounter two different JSRs
+without an intervening RET.</dd>
+
+<dt>JMP</dt>
+
+<dd> Similiar to JSR, but does not change the stack. It is the
+equivalent of a goto. JMPs are useful to deal with modal input
+character sets (such as an escape in ISO-2022-JP, see <a
+href="#mkchartable">how the tables are generated</a>).</dd>
+
+<dt>RET</dt>
+
+<dd>Indicates that we are done translating this input octet and we should
+return to the previous active table. It might appear as the first of
+the 4 translation octets, in which case this input character
+translates into nothing (it might be whitespace, for instance).</dd>
+
+<dt>END</dt>
+
+<dd>Indicates we are done translating this input octet. When
+<tt>TRANSLATE</tt> is next called, that input octet will be
+interpreted against the current active table; the stack does not
+change. </dd>
+
+</dl>
+
+In addition, it recognizes the following "special" control codes
+for charsets that aren't easily represented by a set of tables, UTF-8
+and UTF-7:
+
+<dl>
+<dt>U7F </dt>
+
+<dd>UTF-7 consists of US-ASCII characters and a special escape
+character that indicates a transition to base-64 encoded UTF-16
+characters. The virtual machine has built in code to handle the base64
+decoding. In UTF-7's base64, 8 input octets result in 3 characters, so
+the tables would be rather large.</dd>
+
+<dt>U7N</dt>
+
+<dd>This indicates that the current octet is the continuation of the
+base-64 section.</dd>
+
+<dt>U83</dt>
+
+<dd>One and two character UTF-8 sequences are handled normally in the
+charset code. To keep the table size down, 3 octet sequences are
+handled specially. U83 indicates that the current input octet is the
+start of a three character sequence. It is also an implicit jump to
+the 2nd table in the UTF-8 sequence, ending this translation.</dd>
+
+<dt>U83_2</dt>
+
+<dd>This input octet 2nd of 3-octet UTF-8 input, with an implicit
+jump to the 3rd table. </dd>
+
+<dt>U83_3</dt>
+
+<dd>3rd octet of a 3-octet UTF-8 input. This produces the output
+characters and has an implicit jump to the 1st table of UTF-8.</dd>
+
+</dl>
+
+Finally, it's useful to mention the special character
+<tt>EMPTY</tt> which is guaranteed not to match any character. It is
+also represented by an uppercase US-ASCII character.
+
+<h2 id="comp_pat">searching and compiled patterns</h2>
+
+<h3>boyer-moore</h3>
+
+brief description of boyer-moore xxx
+
+<h3>cyrus implementation</h3>
+
+why two arrays? us-ascii optimization, really kinda useless now
+xxx
+
+meta-data stored at the end xxx
+
+<h2 id="mkchartable">generating the tables: <tt>mkchartable</tt></h2>
+
+The program <tt>mkchartable</tt> is used to generate the charset
+transcoding tables used by TRANSLATE. These tables are carefully
+constructed so no more than a single octet need be examined at a time;
+this octet results in either an output stream of UTF-8 characters
+being generated or some sort of state change.
+
+<tt>mkchartable</tt> uses three different sorts of input files to
+generate these tables. These files are located in the
+<tt>lib/charset</tt> directory.
+
+<h3 id="charset_tables">charset tables</h3>
+
+Each charset file maps a single charset to the corresponding
+Unicode characters. For the US-ASCII and ISO-8859-x character sets
+this is trivial: each input byte corresponds to a single Unicode
+character. (Actually, some ISO-8859-x octets do not map to any Unicode
+character. In that case, the file either does not contain that octet
+or map it to "<tt>????</tt>".)
+
+Other character sets are trickier. For instance, GB-2312 has both
+single and double byte characters, but is still a simple map from
+input character to output character. More complicated are modal
+character encodings. For instance, ISO-2022-JP starts in US-ASCII mode
+and uses <tt>1B</tt> as an escape character followed by another two
+characters to select a new mode.
+
+The input charset labels modes with "<tt>:</tt>" followed by the
+mode name. The starting mode "<tt>US-ASCII</tt>" in ISO-2022-JP is
+preceeded by "<tt>:US-ASCII</tt>". Mode transitions are denoted by a
+Unicode conversion of "<tt>&gt;newmode</tt>" or
+"<tt>:newmode</tt>". To denote that the octet <tt>42</tt> transitions
+into the "<tt>US-ASCII</tt>" mode, the charset file has "<tt>42
+&gt;US-ASCII</tt>". The mode names themselves are arbitrary labels and
+have no effect on the output.
+
+The input charset labels modes with ":" followed by the mode name.
+The mode name is optionally followed by a space and the
+"<tt>&lt;</tt>" character. If the "<tt>&lt;</tt>" character is
+present, then all translations will be followed by a RET instruction
+instead of an END instruction.
+
+The transition "<tt>&gt;newmode</tt>" results in a JSR instruction
+being generated. A JMP instruction is generated by a transition of
+"<tt>:newmode</tt>".
+
+The input byte can be specified as "<tt>*</tt>". This is used to
+define the "default action" which is used for input bytes that are not
+otherwise defined for the mode. If the default action is not
+explicitly stated, it is a translation to EMPTY.
+
+<h3>unicode data table</h3>
+
+The <tt>unidata2.txt</tt> file is verbatim from the Unicode
+standard. More recent versions should be available <a
+href="http://www.unicode.org/xxx">from their website</a>. Each entry
+in the file describers a Unicode character by the following
+properties, seperated by semicolons:
+
+<ul>
+<li>code point (16-bit character value) in hex</li>
+<li>character name (unused by Cyrus)</li>
+<li>general category, such as whitespace or puncuation</li>
+<li>the canonical combining class (unused)</li>
+<li>bidirection chategory (unused)</li>
+<li>character decomposition</li>
+<li>decimal digit value (unused)</li>
+<li>digit value (unused, and, no, I don't know the difference)</li>
+<li>numeric value including fractions (unused)</li>
+<li>mirrored character (unused)</li>
+<li>Unicode 1.0 name (unused)</li>
+<li>comment (unused)</li>
+<li>upper case equivalent (unused)</li>
+<li>lower case equivalent</li>
+</ul>
+
+In general, Cyrus uses the lower case equivalent if there is one,
+and the decomposed value otherwise.
+
+<h3>unicode fixup table</h3>
+
+The <tt>unifix.txt</tt> file contains Cyrus-specific mappings for
+characters. It overrides the <tt>unidata2.txt</tt> table. Each rule in
+the file is explained with a comment. It's helpful to remember that
+the Unicode general categories starting with <tt>Z</tt> represent
+whitespace, and whitespace is always removed.
+
+<h3>generating <tt>chartable.c</tt></h3>
+
+how <tt>mkchartable</tt> works: collapses the encoding modes, the
+unicode translations, and other normalizations into the output tables
+described above xxx
+
+<h2>for the future</h2>
+
+<h3>Sieve/ACAP comparators</h3>
+
+<h3>adjustable normalization?</h3>
+
+The use of uppercase US-ASCII characters is one of the annoyances
+in trying to generalize the charset transcoding. If we continue to
+restrict the characters under consideration to the BMP, switching to
+UTF-8 control codes that start 4 or 5 byte sequences is possible.
+
+Another possibility is to use a NUL character as an escape
+sequence, though this increases the size of each control code by 1
+octet.
+
+<h3>handle &gt;2 octet input characters</h3>
+
+<h3>make UTF-8 more regular</h3>
+
+consider whether we really need U83, U83_2, U83_3. also consider
+changing <tt>{ U83, 0, 0, 0 }</tt> translations to <tt>{ U83, JMP, 0, 1
+}</tt> sequences to at least eliminate the implicit jump.
+
+<h3>require minimal UTF-8 characters</h3>
+
+<h2>references</h2>
+
+xxx
+
+<ul>
+<li>UNICODE Unicode / ISO 10646</li>
+<li>UTF-8 utf-8 RFC</li>
+<li>UTF-7 utf-7 RFC</li>
+<li>BM boyer-moore</li>
+<li>ACAP the comparators reference. see section XXX of RFC 2244.</li>
+</ul>
+
+</body>
+</html>

cyrus-imapd-2.4.17.tar.gz/doc/internal/locking -> cyrus-imapd-2.5.tar.gz/doc/internal/locking Changed

cyrus-imapd-2.4.17.tar.gz/doc/internal/mailbox-api.html -> cyrus-imapd-2.5.tar.gz/doc/internal/mailbox-api.html Changed

@@ -4,7 +4,6 @@
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: mailbox-format.html,v 1.9 2010/01/06 17:01:29 murch Exp $" />
 <meta name="author" content="Bron Gondwana" />
 
 <title>Mailbox API</title>
@@ -101,7 +100,7 @@
 r = mailbox_lock_index(mailbox, LOCK_EXCLUSIVE);
 </pre>
 
-For example, <tt>mailbox_unlock_index</tt> and 
+For example, <tt>mailbox_unlock_index</tt> and
 <tt>mailbox_lock_index</tt> are used extensively
 by the index module, allowing an imap client to
 maintain a long lived connection selected to a
@@ -176,7 +175,7 @@
 <tt>mailbox_close</tt>. See below under "delayed actions".
 
 <tt>mailbox_delete</tt> requires an exclusive index lock, but
-can complete quite happily with only a shared namelock.
+can complete quite happily with only a shared namelock.
 
 <h2>Reading and writing records</h2>
 
@@ -231,7 +230,7 @@
 tracking counts and quota data are updated as well. They will
 be committed at unlock time, see "delayed actions"
 
-If you don't set the <tt>record.silent<tt> field to a true value
+If you don't set the <tt>record.silent</tt> field to a true value
 before rewriting or appending, the <tt>record.modseq</tt> and
 <tt>record.last_updated</tt> values will be changed. This allows
 condstore to work correctly.

cyrus-imapd-2.4.17.tar.gz/doc/internal/mailbox-format.html -> cyrus-imapd-2.5.tar.gz/doc/internal/mailbox-format.html Changed

@@ -4,7 +4,6 @@
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: mailbox-format.html,v 1.9 2010/01/06 17:01:29 murch Exp $" />
 <meta name="author" content="Rob Siemborski" />
 
 <title>Mailbox File Formats</title>
@@ -66,14 +65,14 @@
 
 <h3>Locking Considerations</h3>
 
-The <tt>cyrus.index</tt> file must be locked in exclusive mode 
-while making changes to the <tt>cyrus.header</tt> file to ensure 
+The <tt>cyrus.index</tt> file must be locked in exclusive mode
+while making changes to the <tt>cyrus.header</tt> file to ensure
 consistency. All changes are made by rewriting the entire file
 and renaming the new version into place.
 
 <h2><tt>cyrus.cache</tt></h2>
 
-The <tt>cyrus.cache</tt> file is a pure cache of information that's 
+The <tt>cyrus.cache</tt> file is a pure cache of information that's
 also present in the message files. It exists to make ENVELOPE and
 specific header fetches more efficient, as well as to assist with
 searches and sorts.
@@ -147,7 +146,7 @@
 zero *or* number of sub-parts in the case of a multipart.
 if nonzero, this is a recursion into the top structure
 (repeat for each part)
- 
+ 
 </pre>
 
 
@@ -311,7 +310,7 @@
 rewritten or deleted) unless there's an exclusive namelock held
 for the mailbox name. This is to avoid race conditions and simplify
 the use of mailboxes. Whenever a mailbox is opened, the caller
-holds a shared namelock on the mailbox name for the duration of 
+holds a shared namelock on the mailbox name for the duration of
 the "mailbox object"'s existence.
 
 All reads of a <tt>cyrus.index</tt> file must be done with a
@@ -374,7 +373,7 @@
 <dt>Deleted, Answered, and Flagged (4 bytes each)</dt>
 <dd> Counts of how many messages have each flag.</dd>
 
-<dt>Mailbox Options (4 bytes)</dt> 
+<dt>Mailbox Options (4 bytes)</dt>
 
 <dd> Bitmask of mailbox options, consisting of any combination of the
 following:
@@ -395,7 +394,7 @@
 <dt>MAILBOX_NEEDS_REPACK</dt>
 <dd> Flag signalling that the mailbox is due to be repacked. During
 mailbox_close() every process will attempt to take an exclusive namelock
-on the mailbox and repack.
+on the mailbox and repack.</dd>
 
 <dt>MAILBOX_DELETED</dt>
 <dd> Flag signalling that the mailbox is deleted. This can be set with
@@ -404,16 +403,16 @@
 the mailbox will perform the final cleanup under an exclusive namelock,
 giving the other processes a chance to finish their current operation
 first without files disappearing from under them!
+</dd>
 </dl>
 </dd>
 
-<dt>Leaked Cache (4 bytes)</dt> 
+<dt>Leaked Cache (4 bytes)</dt>
 <dd> Number of leaked records in the cache file.</dd>
 
 <dt>Highest ModSeq (8 bytes)</dt>
 <dd> Highest Modification Sequence of all the messages in the
 mailbox (CONDSTORE).</dd>
-</dl>
 
 <dt>Deleted ModSeq (8 bytes)</dt>
 <dd> Lowest Modification Sequence before which expunged message data
@@ -437,7 +436,7 @@
 <dd> CRC32 value of the bytes in the <tt>cyrus.header</tt> file for
 this mailbox. Must be rewritten whenever the cyrus.header file is
 changed (see locking considerations above - this is why the
-cyrus.index must be exclusively locked!)
+cyrus.index must be exclusively locked!)</dd>
 
 <dt>Sync CRC (4 bytes)</dt>
 <dd> An XOR of the CRC32 of a specially generated value for each of
@@ -459,7 +458,7 @@
 <dd> Must always be the LAST record of the header. This is the CRC32
 of the actual bytes on disk (network order format) for the rest of the
 cyrus.index. By keeping it last, it can be easily calculated with
-the following snippet of code: 
+the following snippet of code:
 <tt>crc = crc32_map(buf, OFFSET_HEADER_CRC);</tt> - i.e. crc32 from
 the start of the buffer to just before this field.</dd>
 
@@ -509,7 +508,7 @@
 
 <dt>USER FLAGS (MAX_USER_FLAGS / 32 bytes)</dt>
 <dd> Bitmask showing which user flags are set/unset (bits correspond to
- positions in the cyrus.header flag list, i.e. 
+ positions in the cyrus.header flag list, i.e.
 (1&lt;&lt;0) == the flag name</dd>
 
 <dt>CONTENT_LINES (4 bytes)</dt>

cyrus-imapd-2.4.17.tar.gz/doc/internal/namelocks.html -> cyrus-imapd-2.5.tar.gz/doc/internal/namelocks.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/internal/prot.html -> cyrus-imapd-2.5.tar.gz/doc/internal/prot.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/internal/replication_examples.html -> cyrus-imapd-2.5.tar.gz/doc/internal/replication_examples.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/internal/replication_protocol.html -> cyrus-imapd-2.5.tar.gz/doc/internal/replication_protocol.html Changed

@@ -1,5 +1,5 @@
-CTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Cyrus IMAP Server: Replication Protocol</title>
@@ -11,11 +11,11 @@
 <h2>Replication Wire protocol : types</h2>
 <pre>
 ulong::
- Unsigned long integer 0 <= x <= (2^32)-1
+ Unsigned long integer 0 &lt;= x &lt;= (2^32)-1
 
-quota_t:: 
- EITHER : Unsigned long integer :: 0 <= x <= (2^32)-1
- OR : Unsigned long long integer :: 0 <= x <= (2^64)-1
+quota_t::
+ EITHER : Unsigned long integer :: 0 &lt;= x &lt;= (2^32)-1
+ OR : Unsigned long long integer :: 0 &lt;= x &lt;= (2^64)-1
 
 time_t::
 Timestamp (currently 32 bit unsigned integer, offset into Unix epoch)
@@ -37,13 +37,15 @@
 <h3>Return values</h3>
 
 Each command sent to the server is a single logical line of arbitrary length
-(literal encoding may make the single logical line span multiple lines).
+(literal encoding may make the single logical line span multiple lines).
 
 Responses follow the IMAP three state module:
 
+<pre>
 OK English text\r\n -- Operation completed okay
 NO English text\r\n -- Operation failed: reason attached
 BAD English text\r\n -- replication protocol error.
+</pre>
 
 <h3>Unsolicited/Multiline responses</h3>
 
@@ -57,86 +59,86 @@
 
 The replication protocol defines 32 verbs at the time of writing.
 
-<hr>
+<hr/>
 <h4>ADDSUB</h4>
 <pre> subscription :: astring</pre>
 
-Add string to list of subscription on server.
+Add string to list of subscription on server.
 
-<hr>
+<hr/>
 <h4>ACTIVATE_SIEVE</h4>
 <pre> sieve_name :: astring</pre>
 
-Activate sieve file of given name for this user.
+Activate sieve file of given name for this user.
 
-<hr>
+<hr/>
 <h4>CREATE</h4>
 <pre>
 mailboxname :: astring -- e.g: user.dpc22.zzz
 uniqueid :: astring -- Cyrus UniqueID (currently 64bit hex number)
 acl :: astring -- Initial ACL for this mailbox
- mbtype :: int 
+ mbtype :: int
 uidvalidity :: ulong
 </pre>
 
-Create mailbox with given name. UniqueID currently derived from
+Create mailbox with given name. UniqueID currently derived from
 UIDvalidity and mailbox name, but no guarantee that this will always
-be the case.
+be the case.
 
-Special value "NIL" for ACL means that mailbox has come from UW world or
-some other location without ACL. We construct appropriate default ACL:
+Special value "NIL" for ACL means that mailbox has come from UW world or
+some other location without ACL. We construct appropriate default ACL:
 
 <pre>
- userid --> "lrswipcda" 
- anonymous --> "0" (for FUD daemon)
-</pre> 
+ userid --&gt; "lrswipcda"
+ anonymous --&gt; "0" (for FUD daemon)
+</pre>
 
-<hr>
+<hr/>
 <h4>CONTENTS</h4>
 
-Dump complete contents of current folder to output screen. Used for
-downloading messages from Cyrus into UW world.
+Dump complete contents of current folder to output screen. Used for
+downloading messages from Cyrus into UW world.
 
-Response is series of lines of the form:
+Response is series of lines of the form:
 
 <pre>
- * uid internaldate 
+ * uid internaldate
 flags :: flag_list_t
 message body :: literal
 </pre>
 
-followed by final "OK" line. flag_list includes \Seen state for current
-users, unlike STATUS, USER_ALL and USER_SOME.
+followed by final "OK" line. flag_list includes \Seen state for current
+users, unlike STATUS, USER_ALL and USER_SOME.
 
-<hr>
+<hr/>
 <h4>DEACTIVATE_SIEVE</h4>
 
-Deactivate the active sieve file for this user.
+Deactivate the active sieve file for this user.
 
-<hr>
+<hr/>
 <h4>DELETE</h4>
 <pre> mailbox :: astring.</pre>
 
-Delete mailbox with given name.
+Delete mailbox with given name.
 
-<hr>
+<hr/>
 <h4>DELSUB</h4>
 <pre> mailbox :: astring</pre>
 
-Delete subscription with given name
+Delete subscription with given name
 
-<hr>
+<hr/>
 <h4>DELETE_SIEVE</h4>
 <pre> sieve_name :: astring</pre>
 
-Delete sieve file with given name.
+Delete sieve file with given name.
 
-<hr>
+<hr/>
 <h4>EXIT</h4>
 
-Shut down sync_server
+Shut down sync_server
 
-<hr>
+<hr/>
 <h4>EXPUNGE</h4>
 <pre>
 uid0 :: ulong
@@ -144,19 +146,19 @@
 uidn :: ulong
 </pre>
 
-Remove messages matching given list of UIDS from currently selected
-folder. Will return single line "OK Expunge Complete" on success.
+Remove messages matching given list of UIDS from currently selected
+folder. Will return single line "OK Expunge Complete" on success.
 
-<hr>
+<hr/>
 <h4>ENDUSER</h4>
 
-Unlock current user and call auth_freestate() to discard current
-authentication.
+Unlock current user and call auth_freestate() to discard current
+authentication.
 
-<hr>
+<hr/>
 <h4>GET_SIEVE sieve_name :: astring</h4>
 
-Get sieve script with given name. Successful response is of form:
+Get sieve script with given name. Successful response is of form:
 
 <pre>
 OK {%lu+}\r\n
@@ -164,11 +166,11 @@
 \r\n
 </pre>
 
-<hr>
-<h4>INFO</h4> 
+<hr/>
+<h4>INFO</h4>
 
-Get meta information for currently selected folder. Response is single line
-of the form:
+Get meta information for currently selected folder. Response is single line
+of the form:
 
 <pre>
 OK
@@ -177,13 +179,14 @@
 Flags :: flag_list_t
 </pre>
 
-"INFO" command is almost certainly historical baggage and should be removed.
+"INFO" command is almost certainly historical baggage and should be
+removed.
 
-<hr>
+<hr/>
 <h4>LIST</h4>
 
-List mail folders for currently selected list. Multiline response of
-the form:
+List mail folders for currently selected list. Multiline response of
+the form:
 
 <pre>
 * Uniqueid :: astring Name :: astring Acl :: astring
@@ -192,14 +195,14 @@
 OK List complete
 </pre>
 
-List command probably obsolete with advent of USER_ALL and USER_SOME
-commands.
+List command probably obsolete with advent of USER_ALL and USER_SOME
+commands.
 
-<hr>
+<hr/>
 <h4>LSUB</h4>
 
-List subscriptions for currently selected user. Multiline response of the
-form:
+List subscriptions for currently selected user. Multiline response of the
+form:
 
 <pre>
 * Subscription :: astring
@@ -208,49 +211,50 @@
 OK Lsub complete
 </pre>
 
-<hr>
+<hr/>
 <h4>LIST_SIEVE</h4>
 
-List available sieve files for currently selected users. Multiline
-response of the form:
+List available sieve files for currently selected users. Multiline
+response of the form:
 
 <pre>
- * Sieve_name :: astring * <-- "*" for active sieve file
+ * Sieve_name :: astring * &lt;-- "*" for active sieve file
 . . .
 * Sieve_name :: astring
 OK List_sieve complete
 </pre>
 
-<hr>
+<hr/>
 <h4>QUOTA</h4>
 <pre> quota_root :: astring</pre>
 
-Get quota root information. Response is single line of the form:
+Get quota root information. Response is single line of the form:
 
 <pre>
 OK
 Limit :: quota_t (Kbytes)
- Expunged_timeout :: ulong (seconds) 
+ Expunged_timeout :: ulong (seconds)
 Expunged_vol_min :: quota_t (KBytes)
 Expunged_vol_max :: quota_t (KBytes)
 Expunged_vol_overflow :: quota_t (KBytes)
 Mailbox_limit :: ulong (KBytes)
 </pre>
 
-<hr>
+<hr/>
 <h4>RENAME</h4>
 <pre>
 old_name :: astring
 new_name :: astring
 </pre>
 
-Rename mailbox old_name --> new_name
+Rename mailbox old_name --&gt; new_name
 
-<hr>
+<hr/>
 <h4>RESET</h4>
 <pre> account :: astring</pre>
 
-Reset named account back to initial state. Wipes all of the following:
+Reset named account back to initial state. Wipes all of the
+following:
 <ul>
 <li>mailboxes</li>
 <li>subscriptions</li>
@@ -258,7 +262,7 @@
 <li>Sieve files.</li>
 </ul>
 
-<hr>
+<hr/>
 <h4>RESERVE</h4>
 <pre>
 mailbox :: astring
@@ -267,10 +271,10 @@
 guidn :: ulong
 </pre>
 
-Reserves collection of messages matching list of GUIDs in given mailbox.
+Reserves collection of messages matching list of GUIDs in given mailbox.
 Message data is linked into /var/spool/imap/sync. staging directory
 so that we can later link the messages into other folders even if the
-original has been expunged. Multiline response of the form:
+original has been expunged. Multiline response of the form:
 
 <pre>
 * GUID :: astring
@@ -279,31 +283,31 @@
 OK Reserve complete
 </pre>
 
-so that client knows which reserve operations have been complete and which
-have failed.
+so that client knows which reserve operations have been complete and which
+have failed.
 
-<hr>
+<hr/>
 <h4>RESTART</h4>
 
-sync_client wants to negotiate a restart to clear up. Clears out all staged
+sync_client wants to negotiate a restart to clear up. Clears out all staged
 messages causes by upload and reserve sync_server child process exits
-cleanly, parent forks off a new child to resolve any memory leaks.
+cleanly, parent forks off a new child to resolve any memory leaks.
 
 Responds:
 <pre>
 OK restarting.
 </pre>
 
-<hr>
+<hr/>
 <h4>SELECT</h4>
 <pre> mailbox :: astring</pre>
 
-Select named mailbox as current folder (calls mailbox_open()).
+Select named mailbox as current folder (calls mailbox_open()).
 
-<hr>
+<hr/>
 <h4>STATUS</h4>
 
-Return complete status of currently selected mailbox. Multiline response:
+Return complete status of currently selected mailbox. Multiline response:
 
 <pre>
 * uid :: ulong guid :: astring flags :: flag_list
@@ -312,10 +316,10 @@
 OK last_uid :: ulong
 </pre>
 
-Believe that this command has been obsoleted by USER_ALL and USER_SOME.
-Occasionally useful for debugging purposes.
+Believe that this command has been obsoleted by USER_ALL and USER_SOME.
+Occasionally useful for debugging purposes.
 
-<hr>
+<hr/>
 <h4>SETFLAGS</h4>
 <pre>
 
@@ -324,10 +328,10 @@
 +
 </pre>
 
-Set flags for messages with given series of UIDs. SETFLAGS can take
-an arbitrary number of "uid (flags) " pairs on a single line.
+Set flags for messages with given series of UIDs. SETFLAGS can take
+an arbitrary number of "uid (flags) " pairs on a single line.
 
-<hr>
+<hr/>
 <h4>SETSEEN</h4>
 <pre>
 user :: astring
@@ -337,32 +341,32 @@
 seenuid :: astring
 </pre>
 
-Update seen database for current selected mailbox + nominated userid.
+Update seen database for current selected mailbox + nominated userid.
 seenuid is opaque string used by seendb code. The replication engine
 doesn't attempt to decompose seenuid strings to work out if anything
 has changed, it just uses the lastchange timestamp to work out if
-the seenuid string should be updated.
+the seenuid string should be updated.
 
 Successful Response:
 <pre>
 OK Setseen Succeeded
 </pre>
 
-<hr>
+<hr/>
 <h4>SETACL</h4>
 <pre>
 mailbox :: astring
 acl :: astring
 </pre>
 
-Set ACL on given mailbox. ACL will typically contain tab characters,
-so the astring will be the quoted form e.g:
+Set ACL on given mailbox. ACL will typically contain tab characters,
+so the astring will be the quoted form e.g:
 
 <pre>
 "dpc22\ttlrswipcda\tanonymous\t0\t"
 </pre>
 
-<hr>
+<hr/>
 <h4>SETQUOTA</h4>
 <pre>
 quotaroot :: astring
@@ -374,21 +378,21 @@
 mailbox_limit :: ulong (KBytes)
 </pre>
 
-Set limits and overrides for given quota root.
+Set limits and overrides for given quota root.
 
-<hr>
+<hr/>
 <h4>UPLOAD</h4>
 <pre>
 newlastuid :: ulong
 last_appenddate :: time_t
 </pre>
 
- Arbitrary list of messages on single logical line , with three forms:
+Arbitrary list of messages on single logical line , with three forms:
 
 <pre>
 SIMPLE # Unparsed message that we need to parse
 GUID :: astring
- UID :: ulong # "NIL" => Use GUID 0.
+ UID :: ulong # "NIL" =&gt; Use GUID 0.
 internaldate :: time_t
 sentdate :: time_t
 last_updated :: time_t
@@ -412,72 +416,72 @@
 sentdate :: time_t
 </pre>
 
-Upload an arbitrary list of messages to the currently selected folder.
+Upload an arbitrary list of messages to the currently selected folder.
 
-Will normally only add messages to the end of the mailfolder in current use
+Will normally only add messages to the end of the mailfolder in current use
 (and the code has special optimised path for that case). However if
 message list contains UIDs which belong in the middle of a mailbox, or a
 given UID exists on both client and server but the GUID values don't match
 (which normally indicates the two ends have lost sync with each other),
-the the UPLOAD command will merge in new and replacement messages.
+the the UPLOAD command will merge in new and replacement messages.
 
 Response:
 <pre>
 OK Upload %lu messages okay
 </pre>
 
-<hr>
+<hr/>
 <h4>UIDLAST</h4>
 <pre>
 last_uid :: ulong
 last_appenddate :: ulong
 </pre>
 
-Update last_uid and last_appenddate timestamps on mailfolder. Typically
+Update last_uid and last_appenddate timestamps on mailfolder. Typically
 used when new messages have been arrived and then been expunged between
-replication runs. Essentially UPLOAD operation with an empty message list.
+replication runs. Essentially UPLOAD operation with an empty message list.
 
-<hr>
+<hr/>
 <h4>USER</h4>
 <pre>
- user ::astring 
+ user ::astring
 </pre>
 
-Select given user: locks out concurrent access from other replication
-runners and calls auth_newstate to authenticate us as the user in question.
+Select given user: locks out concurrent access from other replication
+runners and calls auth_newstate to authenticate us as the user in question.
 
 Response:
 <pre>
 OK Locked username
 </pre>
 
-<hr>
+<hr/>
 <h4>USER_ALL</h4>
 <pre>
- user ::astring 
+ user ::astring
 </pre>
 
-Select given user: locks out concurrent access from other replication
-runners and calls auth_newstate to authenticate us as the user in question.
+Select given user: locks out concurrent access from other replication
+runners and calls auth_newstate to authenticate us as the user in question.
 
-Response is a complete list of _everything_ in the target account on
+Response is a complete list of _everything_ in the target account on
 the replica system in a single round trip. Multi line response,
 with various kinds of "*" response indicating different objects.
 Format should be familiar from other commands which examine only a
-portion of the target account.
+portion of the target account.
 
 <pre>
 **** Sieve script. Single line response of the form:
 
- **** name :: astring 
- last_update :: time_t 
+ **** name :: astring
+ last_update :: time_t
 * - if active Sieve
 
 *** Subscription. Single line response of the form:
 
 *** name :: astring
 
-** Mailbox. Single line response of the form: 
+** Mailbox. Single line response of the form:
 
 ** uniqueid :: astring
 name :: astring
@@ -493,39 +497,40 @@
 flags :: flag_list_t
 </pre>
 
-Final line of successful response is used to report QUOTA information
-in the same format:
+Final line of successful response is used to report QUOTA information
+in the same format:
 
 <pre>
 OK
 Limit :: quota_t (Kbytes)
- expunged_timeout :: ulong (seconds) 
+ expunged_timeout :: ulong (seconds)
 expunged_vol_min :: quota_t (KBytes)
 expunged_vol_max :: quota_t (KBytes)
 expunged_vol_overflow :: quota_t (KBytes)
 mailbox_limit :: ulong (KBytes)
 </pre>
- 
-<hr>
+
+<hr/>
 <h4>USER_SOME</h4>
 <pre>
- user :: astring 
+ user :: astring
 mailbox1 :: astring
 . . .
 mailboxn :: astring
 </pre>
 
-Similar to USER_ALL command, but only returns mailbox and message lists
-for given set of mailboxes. Doesn't return sieve or subscription info.
+Similar to USER_ALL command, but only returns mailbox and message lists
+for given set of mailboxes. Doesn't return sieve or subscription
+info.
 
-<hr>
+<hr/>
 <h4>UPLOAD_SIEVE</h4>
 <pre>
 sieve_name :: astring
 sieve_file :: literal+
 </pre>
 
-Response on success:
+Response on success:
 <pre>
 Upload_sieve completed.
 </pre>

cyrus-imapd-2.4.17.tar.gz/doc/internal/specials.html -> cyrus-imapd-2.5.tar.gz/doc/internal/specials.html Changed

@@ -12,7 +12,7 @@
 used in Cyrus naming of users, folders, directory paths, etc.
 
 <h2>Current Uses</h2>
- 
+ 
 Character: +
 <ul>
 <li>(LMTP) Separation of postuser and target mailbox for delivery</li>
@@ -21,40 +21,42 @@
 return LSUB results (when imapmagicplus is set)</li>
 <li>(POP3) POP a subfolder directly (e.g. rjs3+foo POPs user.rjs3.foo)</li>
 </ul>
- 
+ 
 
 Character: . /
- 
+ 
 <ul>
 <li>mailbox names Hierarchy separators</li>
 </ul>
- 
+ 
 
 Character: ^
- 
+ 
 <ul>
 <li>mailbox names In unixhierarchysep, ^ is the part of the internal
 name that represents a '.'</li>
 </ul>
- 
+ 
 
 Characters: @ %
- 
+ 
 <ul>
 <li>usernames These are realm separators for the purposes of authentication</li>
 </ul>
- 
+ 
 
 <h2>Future Uses</h2>
 
 Character: +
- 
+ 
 <ul>
 <li>IMAP LIST filters (e.g. rjs3+foo will only list folders that match foo*)</li>
 <li>possibly other interpretations here:
- 
+ 
 - rjs3+foo will do an effective chroot(foo.)
- 
+ 
 - rjs3+foo will only list folders in user.rjs3.foo*</li>
+</ul>
+
 </body>
 </html>

cyrus-imapd-2.5.tar.gz/doc/internal/unit-tests.html Added

@@ -0,0 +1,673 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="author" content="Greg Banks" />
+<link rel="stylesheet" type="text/css" href="cyrus.css"/>
+
+<title>Unit Tests</title>
+</head>
+
+<body>
+<h1>Unit Tests</h1>
+
+<h2>Table of Contents</h2>
+
+<ul class="toc">
+<li><a href="#introduction">1. Introduction</a></li>
+<li><a href="#what-is-a-unit-test">2. What Is A Unit Test?</a></li>
+<li><a href="#running-the-tests">3. Running The Tests</a>
+ <ul class="toc">
+ <li><a href="#setting-up-the-machine">3.1. Setting Up The Machine</a></li>
+ <li><a href="#configure-scripts">3.2 Configure Script</a></li>
+ <li><a href="#running-the-tests">3.3 Make</a></li>
+ <li><a href="#using-valgrind">3.4 Using Valgrind</a></li>
+ <li><a href="#the-tests-are-failing">3.5 The Tests Are Failing</a></li>
+ <li><a href="#debugging-a-test">3.6 Debugging A Test</a></li>
+ </ul>
+</li>
+<li><a href="#adding-your-own-tests">4. Adding Your Own Tests</a>
+ <ul class="toc">
+ <li><a href="#where-to-put-your-tests">4.1 Where To Put Your Tests</a></li>
+ <li><a href="#adding-a-new-suite">4.1 Adding A New Suite</a></li>
+ <li><a href="#adding-a-test-to-a-suite">4.2 Adding A Test To A Suite</a></li>
+ <li><a href="#suite-init-and-cleanup">4.3 Suite Init And Cleanup</a></li>
+ </ul>
+</li>
+</ul>
+
+<a name="introduction"/><h2>1. Introduction</h2>
+
+Recently, a set of regression unit tests has been added to Cyrus. This
+document explains the purpose implementation of those unit tests, and gives
+an example of how to add more unit tests (because there are never enough
+unit tests!).
+
+<a name="what-is-a-unit-test"/><h2>2. What Is A Unit Test?</h2>
+
+The
+<a href="http://en.wikipedia.org/wiki/Unit_test">definition on Wikipedia</a>
+sheds some light:
+
+<blockquote>
+...unit testing is a method by which individual units of source code are
+tested to determine if they are fit for use. A unit is the smallest
+testable part of an application.
+</blockquote>
+
+In other words, unit testing is about verifying that small pieces of code,
+like individual functions, modules, or classes, work in isolation. It is
+not about testing the system as a whole.
+
+The tests implemenented here are also regression tests, which in
+<a href="http://en.wikipedia.org/wiki/Regression_testing">Wikipedia&apos;s words</a>
+means:
+
+<blockquote>
+Regression testing is any type of software testing that seeks to
+uncover software errors after changes to the program (e.g. bugfixes
+or new functionality) have been made, by retesting the program. The
+intent of regression testing is to assure that a change, such as a
+bugfix, did not introduce new bugs.
+</blockquote>
+
+In other words, the tests are designed to be easy to run and to
+work out fully automatically whether they have passed or failed,
+so that they can be run usefully by people who didn&apos;t write
+them.
+
+<a name="running-the-tests"/><h2>3. Running The Tests</h2>
+
+This section takes you through the process of running Cyrus&apos;
+unit tests.
+
+<a name="setting-up-the-machine"/><h3>3.1. Setting Up The Machine</h3>
+
+Cyrus&apos; unit tests are all located in a new directory,
+<tt>cyrus-imapd/cunit/</tt>. They're written in C, like the remainder of
+Cyrus, and use the
+<a href="http://cunit.sourceforge.net/">CUnit library from SourceForge</a>,
+with some home grown wrappers and other improvements to make our
+lives easier.
+
+Your first step is step is to ensure that the CUnit library (including
+the headers) is installed. Some modern operating systems already have
+CUnit, for example on Ubuntu you can just do:
+
+<blockquote class="cmds">me@ubuntu&gt; sudo apt-get install libcunit1-dev
+</blockquote>
+
+Alternately, you can download the CUnit source, build it and install it.
+It&apos;s not a complicated or difficult library, this shouldn&apos;t take
+long. When you&apos;ve done, install it in <tt>/usr/include</tt> and
+<tt>/usr/lib</tt>.
+
+<a name="configure-scripts"/><h3>3.2 Configure Script</h3>
+
+Because of the dependency on the CUnit library, the tests are disabled by
+default; this means you need enable them with an option to the
+<tt>configure</tt> script:
+
+<blockquote class="cmds">me@mybox&gt; ./configure --enable-unit-tests
+...
+checking for CU_initialize_registry in -lcunit... yes
+checking CUnit/CUnit.h usability... yes
+checking CUnit/CUnit.h presence... yes
+checking for CUnit/CUnit.h... yes
+...
+</blockquote>
+
+<a name="running-the-tests"/><h3>3.3 Make</h3>
+
+First you need to build Cyrus itself, using the traditional <tt>all:</tt>
+target.
+
+<blockquote class="cmds">me@mybox&gt; make all
+...
+</blockquote>
+
+Then, use the new <tt>check:</tt> target to build and run the unit
+tests.
+
+<blockquote class="cmds">me@mybox&gt; make check
+ cd . &amp;&amp; /bin/bash /home/me/cyrus-imapd/missing --run automake-1.11 --foreign Makefile
+ cd . &amp;&amp; /bin/bash ./config.status Makefile depfiles (a)
+config.status: creating Makefile
+config.status: executing depfiles commands
+...
+make3: Entering directory `/home/me/cyrus-imapd'
+make3: `sieve/test' is up to date.
+cunit/cunit.pl --project cunit/default.cunit --generate-wrapper cunit/mboxname.testc (b)
+gcc -DHAVE_CONFIG_H ... -c -o cunit/mboxname.o cunit/mboxname.testc-cunit.c
+rm -f cunit/mboxname.testc-cunit.c
+/bin/bash ./libtool --tag=CC --mode=link gcc -fPIC -g -O2 -o cunit/unit
+cunit/unit.o ... lib/libcyrus_min.la ... (c)
+...
+Running unit tests		(d)
+
+
+ CUnit - A Unit testing framework for C - Version 2.1-0
+ http://cunit.sourceforge.net/
+
+...
+Suite: mboxname (e)
+ Test: dir_hash_c ... passed
+ Test: to_parts ... passed
+ Test: to_userid ... passed
+ Test: to_usermbox ... passed
+...
+--Run Summary: Type Total Ran Passed Failed (f)
+ suites 34 34 n/a 0
+ tests 323 323 323 0
+ asserts 1079745 1079745 1079745 0
+make1: Leaving directory `/home/me/cyrus-imapd/cunit'
+</blockquote>
+
+Let&apos;s take a closer look at what's happening here.
+
+<dl>
+
+<dt>(a)</dt>
+<dd>The <tt>check:</tt> target causes automake to re-run itself. This
+is normal automake behaviour. Note that the older build system used
+to run make recursively in sub-directories, the newer automake-based
+system builds everything from the top directory.</dd>
+
+<dt>(b)</dt>
+<dd>The <tt>cunit/</tt> directory contains a number of C source files
+(called, for reasons too complicated to explain here, whatever.testc)
+with test code in them. For each of those, a small wrapper C source
+file is generated and then compiled into an object file.</dd>
+
+<dt>(c)</dt>
+<dd>Finally, all the compiled object files are linked into an executable,
+with a <tt>main()</tt> routine from <tt>unit.c</tt>, and a number of
+libraries and object files from other parts of the Cyrus tree.</dd>
+
+<dt>(d)</dt>
+<dd>The resulting executable is then run.</dd>
+
+<dt>(e)</dt>
+<dd>The test executable runs all the built tests one by one, telling
+us which ones passed and which ones failed as it runs them.
+You can also run it manually with the name of a test as an argument,
+and it will run only the named test.</dd>
+
+<dt>(f)</dt>
+<dd>At the end, the text executable prints a summary of how many
+tests it ran and how many passed and failed. The key thing to look
+at here is the rightmost column, it should be all zero.</dd>
+
+</dl>
+
+<a name="using-valgrind"/><h3>3.4 Using Valgrind</h3>
+
+Some failure modes are subtle, and cannot be detected in the C code
+itself; this is where
+<a href="http://valgrind.org/">the Valgrind program</a>
+comes in very handy. It detects buffer overruns and memory leaks and
+various other kinds of subtle errors.
+
+To run the unit tests with Valgrind, use the new
+<tt>valgrind:</tt> target.
+
+<blockquote class="cmds">me@mybox&gt; make valgrind
+...
+valgrind --tool=memcheck --leak-check=full ./unit -v (a)
+==2999== Memcheck, a memory error detector
+==2999== Copyright (C) 2002-2010, and GNU GPL'd, by Julian Seward et al.
+==2999== Using Valgrind-3.6.0.SVN-Debian and LibVEX; ...
+==2999== Command: ./unit -v
+==2999==
+...
+--Run Summary: Type Total Ran Passed Failed (b)
+ suites 9 9 n/a 0
+ tests 51 51 50 1
+ asserts 474 474 473 1
+...
+==2999== HEAP SUMMARY: (c)
+==2999== in use at exit: 4,489 bytes in 134 blocks
+==2999== total heap usage: 715 allocs, 581 frees, 352,763 bytes allocated
+==2999==
+==2999== 4 bytes in 1 blocks are definitely lost in loss record 3 of 50
+==2999== at 0x4C2815C: malloc (vg_replace_malloc.c:236)
+==2999== by 0x44A0CA: xmalloc (xmalloc.c:57)
+==2999== by 0x4399D8: strconcat (util.c:631)
+==2999== by 0x40C059: test_uncast_null (strconcat.c:51)
+==2999== by 0x61B32A9: ??? (in /usr/lib/libcunit.so.1.0.1)
+==2999== by 0x61B36ED: ??? (in /usr/lib/libcunit.so.1.0.1)
+==2999== by 0x61B3827: CU_run_all_tests (in /usr/lib/libcunit.so.1.0.1)
+==2999== by 0x4066CC: run_tests (unit.c:144)
+==2999== by 0x406806: main (unit.c:283)
+==2999==
+...
+</blockquote>
+
+Here's an explanation of what's happening in the example.
+
+<dl>
+
+<dt>(a)</dt>
+<dd>The test executable is run as before, but using the <tt>valgrind</tt>
+program. The first thing we see is Valgrind's banner message.</dd>
+
+<dt>(b)</dt>
+<dd>The test executable proceeds as normal and eventually emits it's
+run summary, then exits.</dd>
+
+<dt>(c)</dt>
+<dd>After the test executable exits, Valgrind checks for memory leaks
+and prints both a summary of all leaks and a stack trace showing where
+each block of leaked memory was allocated.</dd>
+
+</dl>
+
+I'd just like to say that I love Valgrind and I think it's immensely
+useful. I would have made running the tests under Valgrind the only
+option for the <tt>check:</tt> target, except that Valgrind is not
+available on all of Cyrus' supported platforms.
+
+<a name="the-tests-are-failing"/><h3>3.5 The Tests Are Failing</h3>
+
+So you've noticed that some of the tests are failing. Let me make
+the guiding principle of unit testing as clear as possible:
+THE UNIT TESTS SHOULD NOT FAIL. All of the tests are designed to
+pass all the time, in everyone's environment. The unit tests are
+run automatically every twelve hours on the Cyrus
+<a href="http://ci.cyrusimap.org/">Continuous Integration server</a>,
+and a failing test fails the whole build and makes people unhappy.
+
+There are a few rules which you should follow to help
+us all get the most benefit out of unit testing
+
+<ul>
+<li>If you see a test failing, investigate it.
+<li>If you can't investigate, complain on the mailing list or raise a bug
+ so that somebody else can investigate.
+<li>When writing tests, write them to work in all environments and all
+ combinations of <tt>configure</tt> script options. It's ok to
+ have a test which is empty in some circumstances; it's not ok
+ to have a test that fails.
+<li>When adding code, write new tests for the new code.
+<li>When modifying code, write new tests for the new behaviour.
+<li>When looking at old code, also take a look at the
+ <a href="http://ci.cyrusimap.org/job/cyrus-imapd-master/887/cobertura/">coverage report</a>
+ and consider writing tests for the existing code.
+</ul>
+
+<a name="debugging-a-test"/><h2>3.6 Debugging A Test</h2>
+
+With the new Cyrus build system, the file <tt>cunit/unit</tt> is no longer
+an executable, it's a shell script which sets up some environment variables
+before running the real executable which is hidden away. This makes debugging
+a failing test somewhat challenging. The solution is:
+
+<blockquote class="cmds">me@mybox&gt; ( cd cunit ; libtool --mode=execute gdb --args unit -t crc32 )
+...
+Reading symbols from /home/me/cyrus-imapd/cunit/.libs/lt-unit...done.
+(gdb) list crc32.testc:1
+1	/* Unit test for lib/crc32.c */
+2	#include "cunit/cunit.h"
+3	#include "crc32.h"
+...
+(gdb) break test_map
+Breakpoint 1 at 0x44a2f8: file ./cunit/crc32.testc, line 11.
+(gdb) run
+Starting program: /home/me/cyrus-imapd/cunit/.libs/lt-unit -t -v crc32
+Thread debugging using libthread_db enabled
+
+
+ CUnit - A Unit testing framework for C - Version 2.1-0
+ http://cunit.sourceforge.net/
+
+
+Suite: crc32
+ Test: map ... 
+Breakpoint 1, test_map () at ./cunit/crc32.testc:11
+11	 c = crc32_map(TEXT, sizeof(TEXT)-1);
+(gdb) 
+</blockquote>
+
+Note the -t option. This turns off test timeouts, which is very useful
+for manual debugging.
+
+<a name="adding-your-own-tests"/><h2>4. Adding Your Own Tests</h2>
+
+Adding your own tests is quite simple. Here's how.
+
+<a name="where-to-put-your-tests"/><h2>4.1 Where To Put Your Tests</h2>
+
+The unit test code in Cyrus is contained in a set of C source files
+in the <tt>cunit</tt> directory. For reasons too complex to go into
+here, these are named whatever.testc instead of the more usual
+whatever.c. If you look closely, you will see
+that each of those C source files maps to a "Suite" in CUnit parlance.
+For example, <tt>cunit/glob.testc</tt> is listed as the Suite "glob" in
+CUnit's runtime output.
+
+Typically, each Suite tests a single module or a related set of
+functions; for example, <tt>cunit/glob.testc</tt> contains tests for
+the glob module in <tt>lib/glob.c</tt>.
+
+So, if you want to add a new test for a module which already has
+some existing tests, the sensible thing to do is to
+<a href="#adding-a-test-to-a-suite">add a new test to the existing suite</a>.
+Otherwise, you'll need to
+<a href="#adding-a-new-suite">add a new Suite</a>.
+
+<a name="adding-a-new-suite"/><h2>4.1 Adding A New Suite</h2>
+
+Each Suite is a single C source file in the <tt>cunit/</tt> directory.
+Your first step is to create a new C source file. For this example,
+you'll create a new Suite to test the CRC32 routines which live
+in <tt>lib/crc32.c</tt>.
+
+<blockquote class="cmds">me@mybox&gt; vi cunit/crc32.testc
+...
+</blockquote>
+
+The file should contain something like this.
+
+<blockquote class="src">/* Unit test for lib/crc32.c */
+#include "cunit/cunit.h" (a)
+#include "crc32.h" (b)
+
+static void test_map(void) (c)
+{
+ static const char TEXT = "lorem ipsum"; (d)
+ static uint32_t CRC32 = 0x0;
+ uint32_t c; (e)
+
+ c = crc32_map(TEXT, sizeof(TEXT)-1); (f)
+ CU_ASSERT_EQUAL(c, CRC32); (g)
+}
+</blockquote>
+
+Here's an explanation of what all these bits are for.
+
+<dl>
+
+<dt>(a)</dt>
+<dd>You need to include the header <tt>"cunit/cunit.h"</tt>,
+which is a thin Cyrus wrapper around the CUnit's library's
+header, <tt>&lt;CUnit/CUnit.h&gt;</tt> with some extra
+conveniences.</dd>
+
+<dt>(b)</dt>
+<dd>You should also include any headers you need for declarations
+of the functions which you'll be testing. Note that the Cyrus
+<tt>lib/</tt> and <tt>imap/</tt> directories are already in the
+include path, so any header in there can be included without
+the directory prefix, e.g. <tt>"crc32.h"</tt> for <tt>lib/crc32.h</tt>.</dd>
+
+<dt>(c)</dt>
+<dd>You need to have at least one function which looks like this:
+it takes no arguments, returns void, and is named <tt>test_whatever</tt>.
+It may be <tt>static</tt> or <tt>extern</tt>, but I recommend <tt>static</tt>.
+Functions with this signature are automatically discovered in the source
+code by the Cyrus unit test infrastructure, so all you have to do is
+write the function. Later, a CUnit test named "whatever" will be
+created automatically for your <tt>test_whatever</tt> function.
+</dd>
+
+<dt>(d)</dt>
+<dd>Here's a good place to define the test inputs and expected outputs.
+Note that for this example you have no idea of the actual correct output.
+The right thing to do there is to manually calculate the expected result
+from first principles, or to use a different piece of software which
+you believe to be working. For this example, let's just use a known
+incorrect value and see what happens.</dd>
+
+<dt>(e)</dt>
+<dd>Here's a good place for local variables you need during the test.</dd>
+
+<dt>(f)</dt>
+<dd>Call the function under test (<tt>crc32_map()</tt> in this example)
+with known inputs, and capture the results in a local variable
+<tt>c</tt>.</dd>
+
+<dt>(g)</dt>
+<dd>Compare the actual result in <tt>c</tt> with the expected
+result in <tt>CRC32</tt>. The <tt>CU_ASSERT_EQUAL()</tt> macro
+checks that it's two arguments are equal (using an integer
+comparison), and if they're different it prints a message and
+records a failure. Note that unlike the libc <tt>assert()</tt>
+macro, control will continue even if the assert fails. The CUnit
+library provides a whole family of similar macros, see
+<a href="http://cunit.sourceforge.net/doc/writing_tests.html#assertions">the
+online CUnit documentation</a> for more details.
+</dd>
+
+</dl>
+
+Now you need to tell the Cyrus build system about your new Suite.
+
+<blockquote class="cmds">me@mybox&gt; vi Makefile.am
+...
+</blockquote>
+
+You need to add the filename of your new test to the definition
+of the <tt>cunit_TESTS</tt> variable.
+
+<blockquote class="src">cunit_TESTS = \
+ cunit/annotate.testc \
+ cunit/backend.testc \
+ cunit/binhex.testc \
+ cunit/bitvector.testc \
+ cunit/buf.testc \
+ cunit/byteorder64.testc \
+ cunit/charset.testc \
+ cunit/crc32.testc \
+ cunit/db.testc \
+ cunit/dlist.testc \
+ cunit/duplicate.testc \
+</blockquote>
+
+At this point you should be able to just rebuild and rerun using make check.
+You can also just rebuild without rerunning by using the command make cunit/unit.
+
+
+
+Note that sometimes this doesn't quite work right, and you may be able to work
+around this problem using the command rm cunit/default.cunit.
+
+
+<blockquote class="cmds">me@mybox&gt; make check
+...
+../cunit/cunit.pl ... --add-sources ... crc32.testc
+...
+../cunit/cunit.pl ... --generate-wrapper crc32.testc
+gcc -c ... -g -O2 .cunit-crc32.c
+gcc ... -o unit ... .cunit-crc32.o ...
+Running unit tests
+
+
+ CUnit - A Unit testing framework for C - Version 2.1-0
+ http://cunit.sourceforge.net/
+
+...
+Suite: crc32
+ Test: map ... FAILED
+ 1. crc32.testc:12 - CU_ASSERT_EQUAL(c=1926722702,CRC32=0)
+
+</blockquote>
+
+Note how the test failure told us which in source file and
+at what line number the failure occurred, and what the actual
+and expected values were. Let's go and fix that up now.
+
+<blockquote class="src"> static const char TEXT = "lorem ipsum";
+ static uint32_t CRC32 = 0x72d7748e;
+</blockquote>
+
+Re-run <tt>make check</tt> and you'll see your test being
+rebuilt and rerun, and this time passing.
+
+<blockquote class="cmds">me@mybox&gt; make check
+...
+../cunit/cunit.pl ... --generate-wrapper crc32.testc
+gcc -c ... -g -O2 .cunit-crc32.c
+gcc ... -o unit ... .cunit-crc32.o ...
+Running unit tests
+
+
+ CUnit - A Unit testing framework for C - Version 2.1-0
+ http://cunit.sourceforge.net/
+
+...
+Suite: crc32
+ Test: map ... passed
+</blockquote>
+
+<a name="adding-a-test-to-a-suite"/><h2>4.2 Adding A Test To A Suite</h2>
+
+Adding a new test to an existing test is easy: all you have to
+do is add a new function to an existing C source file in the
+<tt>cunit/</tt> directory. As an example, let's add a test for
+the <tt>crc_iovec()</tt> function.
+
+<blockquote class="cmds">me@mybox&gt; vi cunit/crc32.testc
+...
+</blockquote>
+
+<blockquote class="src">static void test_iovec(void) (a)
+{
+ static const char TEXT1 = "lorem"; (b)
+ static const char TEXT2 = " ipsum";
+ static uint32_t CRC32 = 0x72d7748e;
+ uint32_t c; (c)
+ struct iovec iov2;
+
+ memset(iov, 0, sizeof(iov)); (d)
+ iov0.iov_base = TEXT1;
+ iov0.iov_len = sizeof(TEXT1)-1;
+ iov1.iov_base = TEXT2;
+ iov1.iov_len = sizeof(TEXT2)-1;
+
+ c = crc32_iovec(iov, 2); (e)
+ CU_ASSERT_EQUAL(c, CRC32); (f)
+}
+</blockquote>
+
+Here's an explanation of what all these bits are for.
+
+<dl>
+
+<dt>(a)</dt>
+<dd>Your new test function should look like this:
+it takes no arguments, returns void, and is named <tt>test_whatever</tt>.
+It may be <tt>static</tt> or <tt>extern</tt>, but I recommend <tt>static</tt>.
+Functions with this signature are automatically discovered in the source
+code by the Cyrus unit test infrastructure, so all you have to do is
+write the function. Later, a CUnit test named "whatever" will be
+created automatically for your <tt>test_whatever</tt> function.
+</dd>
+
+<dt>(b)</dt>
+<dd>Here's a good place to define the test inputs and expected outputs.
+</dd>
+
+<dt>(c)</dt>
+<dd>Here's a good place for local variables you need during the test.</dd>
+
+<dt>(d)</dt>
+<dd>Here you set up the input conditions for the function under test.</dd>
+
+<dt>(e)</dt>
+<dd>Call the function under test with your known inputs, and capture the
+results in a local variable, here <tt>c</tt>.</dd>
+
+<dt>(f)</dt>
+<dd>Compare the actual result in <tt>c</tt> with the expected
+result in <tt>CRC32</tt>. The <tt>CU_ASSERT_EQUAL()</tt> macro
+checks that it's two arguments are equal (using an integer
+comparison), and if they're different it prints a message and
+records a failure. Note that unlike the libc <tt>assert()</tt>
+macro, control will continue even if the assert fails. The CUnit
+library provides a whole family of similar macros, see
+<a href="http://cunit.sourceforge.net/doc/writing_tests.html#assertions">the
+online CUnit documentation</a> for more details.
+</dd>
+
+</dl>
+
+Now run <tt>make check</tt> and you'll see your test being built and run.
+
+<blockquote class="cmds">me@mybox&gt; make check
+...
+../cunit/cunit.pl ... --generate-wrapper crc32.testc
+gcc -c ... -g -O2 .cunit-crc32.c
+gcc ... -o unit ... .cunit-crc32.o ...
+Running unit tests
+
+
+ CUnit - A Unit testing framework for C - Version 2.1-0
+ http://cunit.sourceforge.net/
+
+...
+Suite: crc32
+ Test: map ... passed
+ Test: iovec ... passed
+
+</blockquote>
+
+<a name="suite-init-and-cleanup"/><h2>4.3 Suite Setup And Teardown</h2>
+
+Sometimes the behaviour of the functions under test depend on
+external influences such as environment variables, global variables,
+or the presence of certain files.
+
+These kinds of functions need special treatment to ensure that their
+behaviour is locked down during the running of your tests. Otherwise,
+all sorts of strange behaviour may confuse the results of the tests.
+For example, a test might succeed the first time it's run in a given
+directory and fail the next time. Or a test might succeed when run
+by the author of the test but fail when run by another user.
+
+CUnit provides a special arrangement which helps you in such
+cases: the suite initialisation and cleanup functions. These are
+two functions that you write and which live in the suite source.
+They are called from CUnit respectively before any of the tests in
+the suite is run, and after all tests from that suite are run.
+
+Here's how to use them. The suite setup function should
+set up any global state that the functions under test rely on, in
+such a way that their state is predictable and always the same no
+matter who runs the test or when or how many times. Similarly the
+suite teardown function should clean up any state which might possibly
+interfere with other test suites. Note that some suites will need
+an setup function but not necessarily a teardown function.
+
+Adding these functions is very easy: you just write functions
+of the appropriate signature (names, arguments and return type) and
+the Cyrus unit test infrastructure will automatically discover them
+and arrange for them to be called. The functions should look like
+(actual example taken from <tt>cunit/mboxname.testc</tt>) this:
+
+<blockquote class="cmds">static enum enum_value old_config_virtdomains;
+
+static int set_up(void)
+{
+ old_config_virtdomains = config_virtdomains;
+ config_virtdomains = IMAP_ENUM_VIRTDOMAINS_ON;
+ return 0;
+}
+
+static int tear_down(void)
+{
+ config_virtdomains = old_config_virtdomains;
+ return 0;
+}
+</blockquote>
+
+The functions should return 0 on success, and non-zero on error. They
+must not call and <tt>CU_*</tt> functions or macros.
+
+Good luck and good testing!
+
+
+
+</body>
+</html>

cyrus-imapd-2.4.17.tar.gz/doc/internal/var_directory_structure.html -> cyrus-imapd-2.5.tar.gz/doc/internal/var_directory_structure.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/mailing-list.html -> cyrus-imapd-2.5.tar.gz/doc/mailing-list.html Changed

@@ -1,7 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <html> <head>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title>info-cyrus mailing list</title>
-
 </head>
 
 <body>
@@ -17,7 +18,7 @@
 To subscribe: Send mail to <a
 href=
 "mailto:info-cyrus-subscribe@lists.andrew.cmu.edu">
-<TT>info-cyrus-subscribe@lists.andrew.cmu.edu</TT></a> 
+<TT>info-cyrus-subscribe@lists.andrew.cmu.edu</TT></a>
 
 to subscribe (or just click
 the link above and that should just work).
@@ -29,7 +30,7 @@
 A web archive is also available at
 <a href="http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists#Archives">
 http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists#Archives</a>
- 
+
 If you are not subscribed to the list (or you are sending the
 message from a different address than the one which you are subscribed
 under), your message is directed to a human for
@@ -44,7 +45,7 @@
 Detailed contact information can be found at <a
 href="http://www.cyrusimap.org/mediawiki/index.php/Contact">
 http://www.cyrusimap.org/mediawiki/index.php/Contact</a>
- 
+
 <HR>
 last modified: $Date: 2010/01/06 17:01:29 $

cyrus-imapd-2.4.17.tar.gz/doc/man.html -> cyrus-imapd-2.5.tar.gz/doc/man.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/notes.html -> cyrus-imapd-2.5.tar.gz/doc/notes.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/os.html -> cyrus-imapd-2.5.tar.gz/doc/os.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/overview.html -> cyrus-imapd-2.5.tar.gz/doc/overview.html Changed

@@ -1,18 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title>Cyrus IMAP Server: Overview and Concepts</title>
-
 </HEAD><BODY>
 <H1>Cyrus IMAP Server: Overview and Concepts</H1>
 
 This document gives an overview of the Cyrus IMAP server. The
-Cyrus IMAP (Internet Message Access Protocol) server provides 
-access to personal mail and system-wide bulletin boards through 
-the IMAP protocol. The Cyrus IMAP server is a scalable 
-enterprise mail system designed for use from small to 
-large enterprise environments using 
-standards-based technologies. 
-
-A full Cyrus IMAP implementation allows a seamless mail and 
+Cyrus IMAP (Internet Message Access Protocol) server provides
+access to personal mail and system-wide bulletin boards through
+the IMAP protocol. The Cyrus IMAP server is a scalable
+enterprise mail system designed for use from small to
+large enterprise environments using
+standards-based technologies.
+
+A full Cyrus IMAP implementation allows a seamless mail and
 bulletin board environment to be set up across
 multiple servers. It differs from other IMAP server
 implementations in that it is run on "sealed" servers,
@@ -43,7 +45,7 @@
 <li><A href="#aclauth">Kerberos vs. Unix Authorization</A>
 <LI><A HREF="#aclneg">Negative Rights</A>
 <li><A href="#acluser">Calculating Users' Rights</A>
-<li><A HREF="#acladm">Implicit Rights for Administrators on Personal 
+<li><A HREF="#acladm">Implicit Rights for Administrators on Personal
 Mailboxes</A>
 <li><A href="#aclmbox">Initial ACLs for Newly Created Mailboxes</A>
 </UL>
@@ -103,7 +105,7 @@
 metacharacters are not permitted in mailbox names.
 
 Optionally, the server can present mailboxes using the <a
-href=altnamespace.html#unixhiersep> UNIX hierarchy convention</a>.
+href="altnamespace.html#unixhiersep"> UNIX hierarchy convention</a>.
 
 <H3><A NAME="mboxnamestd">Standard (Internal) Namespace</A></H3>
 
@@ -137,26 +139,26 @@
 With the one notable exception of <TT>INBOX</TT>, all mailbox names are
 system-wide--they refer to the same mailbox regardless of the user.
 <A HREF="#acl">Access control lists</A> determine which users can
-access or see which mailboxes. Using 
+access or see which mailboxes. Using
 
 In contexts which permit relative mailbox names, the mailbox namespace
 works as follows:
 
 <UL>
-<LI> Names that do not start with "." are fully qualified. 
+<LI> Names that do not start with "." are fully qualified.
 <LI> Names that start with "." are relative to the current context.
 </UL>
 
 Thus, if you are working with folder names and the top of the
-hierarchy is named "<TT>cmu.</TT>", the name "<TT>comp.infosystems.www</TT>" 
-resolves to "<TT>comp.infosystems.www</TT>" and the name 
+hierarchy is named "<TT>cmu.</TT>", the name "<TT>comp.infosystems.www</TT>"
+resolves to "<TT>comp.infosystems.www</TT>" and the name
 "<TT>.comp.infosystems.www</TT>" resolves to
 "<TT>cmu.comp.infosystems.www</TT>".
 
 <H3><A NAME="mboxnamealt">Alternate Namespace</A></H3>
 
 The Cyrus IMAP server can also use an <a
-href=altnamespace.html#altname> alternate namespace</a> which allows
+href="altnamespace.html#altname"> alternate namespace</a> which allows
 a user's personal mailboxes to appear as if they reside at the same
 level as that user's <TT>INBOX</TT> as opposed to children of it. With
 this feature, it may appear that there are non-unique names for mailboxes
@@ -180,24 +182,24 @@
 The defined rights are:
 
 <DL compact>
-<DT><TT>l<dd>lookup </TT> - The user may see that the mailbox exists.
-<dt><TT>r<dd>read </TT> - The user may read the mailbox.
+<DT><TT>l</TT><dd><TT>lookup</TT> - The user may see that the mailbox exists.
+<dt><TT>r</TT><dd><TT>read</TT> - The user may read the mailbox.
 The user may select the mailbox, fetch data, perform searches,
 and copy messages from the mailbox.
-<dt><TT>s<dd>seen </TT> - Keep per-user seen state.
+<dt><TT>s</TT><dd><TT>seen</TT> - Keep per-user seen state.
 The "Seen" and "Recent" flags are preserved for the user.
-<dt><TT>w<dd>write </TT> - The user may modify flags and keywords other than
+<dt><TT>w</TT><dd><TT>write</TT> - The user may modify flags and keywords other than
 "Seen" and "Deleted" (which are controlled by other sets of rights).
-<dt><TT>i<dd>insert </TT> - The user may insert new messages into the mailbox.
-<dt><TT>p<dd>post </TT> - The user may send mail to the submission address for
+<dt><TT>i</TT><dd><TT>insert</TT> - The user may insert new messages into the mailbox.
+<dt><TT>p</TT><dd><TT>post</TT> - The user may send mail to the submission address for
 the mailbox. This right differs from the "<TT>i</TT>" right in that
 the delivery system inserts trace information into submitted
 messages.
-<dt><TT>c<dd>create </TT> - The user may create new sub-mailboxes
+<dt><TT>c</TT><dd><TT>create</TT> - The user may create new sub-mailboxes
 of the mailbox, or delete or rename the current mailbox.
-<dt><TT>d<dd>delete </TT> - The user may store the "Deleted" flag,
+<dt><TT>d</TT><dd><TT>delete</TT> - The user may store the "Deleted" flag,
 and perform expunges.
-<dt><TT>a<dd>administer </TT> - The user may change the ACL on the mailbox.
+<dt><TT>a</TT><dd><TT>administer</TT> - The user may change the ACL on the mailbox.
 </DL>
 
 You can combine access rights in different ways. For example:
@@ -207,12 +209,12 @@
 <DD>The user can read the mailbox.
 </DL>
 
-<DL> 
-<DT><TT>lrsp</TT> 
+<DL>
+<DT><TT>lrsp</TT>
 <DD>The user can read the mailbox, and can
 post to it through the delivery system. Most delivery
 systems do not provide authentication, so the "<TT>p</TT>" right usually has
-meaning only for the "anonymous" user. 
+meaning only for the "anonymous" user.
 </DL>
 
 <DL>
@@ -238,11 +240,11 @@
 
 <H3><A name="aclident">Identifiers</A></H3>
 
-The identifier part of an ACL entry specifies the user or group 
+The identifier part of an ACL entry specifies the user or group
 for which the entry applies.
 
 There are two special identifiers,
-"anonymous", and "anyone", which are explained below. The meaning of 
+"anonymous", and "anyone", which are explained below. The meaning of
 other identifiers usually depends on the authorization mechanism being used
 (selected by <tt>--with-auth</tt> at compile time, defaulting to Unix).
 
@@ -267,7 +269,7 @@
 <a href="#login">Login Authentication</a> part of this document.
 
 In the Unix authorization mechanism, identifiers are either a
-valid userid or the string "<tt>group</tt>": 
+valid userid or the string "<tt>group</tt>":
 followed by a group listed in "<tt>/etc/group</tt>". Thus:
 
 <pre>
@@ -308,7 +310,7 @@
 <tt>auth_whatever</tt> module), it will dictate its own form and meaning
 of identifiers.
 
-<H3><A name="aclneg">Negative Rights</A></H3> 
+<H3><A name="aclneg">Negative Rights</A></H3>
 
 Any of the above defined identifiers may be prefixed with a "<TT>-</TT>"
 character. The associated rights are then removed from that
@@ -333,7 +335,7 @@
 The user "<TT>fred</TT>" will be granted the rights "<TT>lrswip</TT>"
 and the anonymous user will be granted the rights "<TT>lrp</TT>".
 
-<H4><A name="acladm">Implicit Rights for Administrators on Personal 
+<H4><A name="acladm">Implicit Rights for Administrators on Personal
 Mailboxes</A></H4>
 
 Regardless of the ACL on a mailbox, users who are listed in the
@@ -446,7 +448,7 @@
 <h2><a name="quota">Quotas</a></h2>
 
 Quotas allow server administrators to limit resources used by
-hierarchies of mailboxes on the server. 
+hierarchies of mailboxes on the server.
 
 <h3><a name="quotasup">Supports Quotas on Storage</a></h3>
 
@@ -480,7 +482,7 @@
 exist and the quota roots
 
 <pre>
- user.bovik 
+ user.bovik
 user.bovik.list
 user.bovik.saved
 </pre>
@@ -542,7 +544,7 @@
 supports multiple mechanisms for notifying users of new mail.
 Notifications can be configured to be sent upon normal delivery
 (<tt>"MAIL"</tt> class) and/or sent as requested by a <a
-href=specs.html#sieve>Sieve</a> script (<tt>"SIEVE"</tt> class).
+href="specs.html#sieve">Sieve</a> script (<tt>"SIEVE"</tt> class).
 
 By default, both types of notifications are disabled.
 Notifications are enabled by using one or both of the following
@@ -551,13 +553,13 @@
 <ul>
 <li>
 the "<TT>mailnotifier</TT>" option selects the <a
-href=man/notifyd.8.html>notifyd</a> method to use for
+href="man/notifyd.8.html">notifyd</a> method to use for
 "<tt>MAIL</tt>" class notifications
 </li>
 
 <li>
 the "<TT>sievenotifier</TT>" option selects the <a
-href=man/notifyd.8.html>notifyd</a> method to use for
+href="man/notifyd.8.html">notifyd</a> method to use for
 "<tt>SIEVE</tt>" class notifications (when no method is specified by
 the Sieve action)
 </li>
@@ -627,9 +629,9 @@
 
 <UL>
 <LI><TT>CRIT</TT> - Critical errors which probably require prompt administrator action
-<LI><TT>ERR</TT> - I/O errors, including failure to update quota usage. 
+<LI><TT>ERR</TT> - I/O errors, including failure to update quota usage.
 The syslog message includes the specific file and Unix error.
-<LI><TT>WARNING</TT> - Protection mechanism failures, client inactivity 
+<LI><TT>WARNING</TT> - Protection mechanism failures, client inactivity
 timeouts
 <LI><TT>NOTICE</TT> - Authentications, both successful and unsuccessful
 <LI><TT>INFO</TT> - Mailbox openings, duplicate delivery suppression
@@ -647,16 +649,16 @@
 mailbox directory contains the following files:
 
 <DL>
-<DT>message files 
+<DT>message files
 <DD> There is one file per message, containing the
 message in RFC 822 format. Lines in the message are separated by
 CRLF, not just LF. The file name of each message is the message's
- UID followed by a dot (.). 
+ UID followed by a dot (.).
 
 In netnews newsgroups, the message files instead follow the
 format and naming conventions imposed by the netnews software. 
 
-<DT><TT>cyrus.header</TT> 
+<DT><TT>cyrus.header</TT>
 <DD>This file contains a magic number and variable-length
 information about the mailbox itself. 
 
@@ -670,7 +672,7 @@
 
 <DT><TT>cyrus.seen</TT>
 <DD>This file contains variable-length state information about
- each reader of the mailbox who has "<TT>s</TT>" permissions. 
+ each reader of the mailbox who has "<TT>s</TT>" permissions.
 </DL>
 
 The "<TT>reconstruct</TT>" program can be used to recover from
@@ -723,7 +725,7 @@
 
 <h4><a name="recoveryquotasrm">Removing Quota Roots</a></h4>
 
-To remove a quota root, remove the quota root's file. Then run 
+To remove a quota root, remove the quota root's file. Then run
 "<TT>quota -f</TT>" to make the quota files consistent again.
 
 <h3><a name="recoverysubs">Subscriptions</a></h3>
@@ -755,7 +757,7 @@
 
 <h3><a name="configdirproc">"<TT>proc</TT>" Directory</a></h3>
 
-The subdirectory "<TT>proc</TT>" under the configuration directory 
+The subdirectory "<TT>proc</TT>" under the configuration directory
 contains one file per active server process. The file name is the ASCII
 representation of the process id and the file contains the following
 tab-separated fields:
@@ -803,7 +805,7 @@
 Alternatively you may deliver via LMTP to a unix domain socket, and the
 connection will be preauthenticated as an administrative user (and access
 control is accomplished by controlling access to the socket).
- 
+
 Note that if a user has a sieve script, the sieve script runs authorized
 as *that* user, and the rights of the posting user are ignored for the purposes
 of determining the outcome of the sieve script.
@@ -824,7 +826,7 @@
 A message is considered a duplicate if two copies of a message with
 the same message-id and the same envelope receipient are received.
 Cyrus uses the duplicate delivery database to hold this information,
-and it looks approximately 3 days back in the default install. 
+and it looks approximately 3 days back in the default install.
 
 Duplicate delivery suppression can be turned off by using the
 "duplicatesuppression" flag in the configuration file.

cyrus-imapd-2.4.17.tar.gz/doc/questions.html -> cyrus-imapd-2.5.tar.gz/doc/questions.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/readme.html -> cyrus-imapd-2.5.tar.gz/doc/readme.html Changed

@@ -1,9 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD>
+ <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Cyrus IMAP Server Release Information</TITLE>
- 
 </HEAD><BODY>
 <H1> Cyrus IMAP Server Release Information</H1>
- 
+
 
 IMAP (Internet Message Access Protocol) is an Internet standards-track
 protocol for accessing messages (mail, bboards, news, etc). The Cyrus
@@ -12,7 +14,7 @@
 users are not permitted to log in. The mailbox database is stored in
 parts of the filesystem that are private to the Cyrus IMAP system.
 All user access to mail is through the IMAP, NNTP, POP3, or KPOP protocols.
- 
+
 The private mailbox database design gives the server large
 advantages in efficiency, scalability, and administratability.
 Multiple concurrent read/write connections to the same mailbox are
@@ -29,14 +31,14 @@
 iso-8859-7, iso-8859-8, iso-8859-9, koi8-r, iso-2022-jp,
 iso-2022-kr, gb2312, big5, iso-8859-15, windows-1252, windows-1256. The
 character mapping tables most likely contain errors.
- 
+
 The server supports any authentication mechanism available from
 the SASL library. Currently, support includes: KERBEROS_V4, GSSAPI,
 CRAM-MD5, DIGEST-MD5, OTP, PLAIN, and STARTTLS.
 
 The server supports imaps/pop3s/nntps (IMAP/POP3/NNTP encrypted using SSL).
 
- The server makes an attempt to do single instance store where 
+ The server makes an attempt to do single instance store where
 possible when an email message is addressed to multiple recipients.
 
 We current support the following IMAP capabilities:
@@ -61,7 +63,7 @@
 
 
 <h2>Installation Overview</h2>
-	
+
 This system should be expected to have the same order-of-magnitude
 installation complexity as a netnews system. Maintenance should have
 similar complexity, except administrators will have to deal with <A
@@ -79,7 +81,7 @@
 
 This server has been successfully installed on a number of Unix
 systems. We run the software under SPARC Solaris 8. Please refer
-to <a href="os.html">os.html</a> for operating system specific issues. 
+to <a href="os.html">os.html</a> for operating system specific issues.
 
 
 <h2>Server Notes</h2>
@@ -89,7 +91,7 @@
 may only be created by an administrator. Mailboxes with a parent may
 be created as the ACL (Access Control List) on the parent mailbox
 permits.
- 
+
 Users' personal mailboxes are under the "<tt>user</tt>" hierarchy.
 The names of the personal mailboxes for user "<tt>bovik</tt>" all
 start with the prefix "<tt>user.bovik.</tt>". The mailbox
@@ -153,8 +155,8 @@
 Intellectual contributions in the form of code or constructive
 collaboration can be directed via the <a href="feedback.html">feedback
 page</a>.
- 
-If you wish to provide financial support to the Cyrus Project, 
+
+If you wish to provide financial support to the Cyrus Project,
 send a check payable to "Carnegie Mellon University" to
 <pre>
 Project Cyrus
@@ -169,11 +171,11 @@
 
 If you want to install the server, be sure to read the installation
 instructions in <a
-href="install.html">install.html</a>. 
+href="install.html">install.html</a>.
 
 More details about the server implementation is in the <a
 href="overview.html">server overview</a> document.
-	
+
 Please refer to <a href="feedback.html">Sending Feedback</a> if you
 would like to submit a bug, feature request or (best of all) patch.
 
@@ -187,7 +189,7 @@
 href="http://www.oreilly.com/catalog/mimap/">Managing IMAP</a>. While
 	 the book does not directly talk about the 2.0 code base, it
 	 provides very good information on the configuration and
-	 setup that can be applied to the newer code. 
+	 setup that can be applied to the newer code.
 
 <HR>
 last modified: 2001/08/03 21:18:05

cyrus-imapd-2.4.17.tar.gz/doc/sieve-protocol.html -> cyrus-imapd-2.5.tar.gz/doc/sieve-protocol.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/sieve.html -> cyrus-imapd-2.5.tar.gz/doc/sieve.html Changed

cyrus-imapd-2.4.17.tar.gz/doc/specs.html -> cyrus-imapd-2.5.tar.gz/doc/specs.html Changed

@@ -1,6 +1,8 @@
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <TITLE>Cyrus IMAP Server Protocol Specifications</TITLE>
 </HEAD>
 <BODY>
@@ -74,7 +76,7 @@
 Extensions</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc5524.txt">RFC 5524</A></TD>
 <TD>Extended URLFETCH for Binary and Converted Parts</TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/internet-drafts/draft-daboo-imap-annotatemore-11.txt">
+<TR><TD><A HREF="http://tools.ietf.org/id/draft-daboo-imap-annotatemore-11.txt">
 draft-daboo-imap-annotatemore</A></TD>
 <TD>ANNOTATEMORE Draft</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc5464.txt">RFC 5464</A></TD>
@@ -88,6 +90,7 @@
 <TD>Display-Based Address Sorting for the IMAP4 SORT Extension</TD></TR>
 
 
+
 <TR><TD COLSPAN=2> <h2>POP</h2></TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc1939.txt">RFC 1939</A></TD>
 <TD>Post Office Protocol - Version 3 (POP3)</TD></TR>
@@ -105,7 +108,7 @@
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc3977.txt">RFC 3977</A></TD>
 <TD>Network News Transfer Protocol (NNTP)</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc4642.txt">RFC 4642</A></TD>
-<TD>Using Transport Layer Security (TLS) with 
+<TD>Using Transport Layer Security (TLS) with
 Network News Transfer Protocol (NNTP)</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc4643.txt">RFC 4643</A></TD>
 <TD>Network News Transfer Protocol (NNTP) Extension for Authentication</TD></TR>
@@ -187,14 +190,14 @@
 <TD>Sieve Extension: Copying Without Side Effects</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc2298.txt">RFC 2298</A></TD>
 <TD>Extensible Message Format for Message Disposition Notifications (MDNs)</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc6131.txt">RFC 6131</A></TD>
+<TD>Sieve Vacation Extension: "Seconds" Parameter</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc6609.txt">RFC 6609</A></TD>
+<TD>Sieve Email Filtering: Include Extension</TD></TR>
 <TR><TD><A
 HREF="http://www.ietf.org/internet-drafts/draft-ietf-sieve-regex-00.txt">
 draft-ietf-sieve-regex</A></TD>
-<TD>Sieve Email FIltering -- Regular Expression Extension</TD></TR>
-<TR><TD><A
-HREF="http://www.ietf.org/internet-drafts/draft-ietf-sieve-include-03.txt">
-draft-ietf-sieve-include</A></TD>
-<TD>Sieve Email Filtering: Include Extension</TD></TR>
+<TD>Sieve Email Filtering -- Regular Expression Extension</TD></TR>
 <TR><TD><A
 HREF="http://www.oceana.com/ftp/drafts/draft-melnikov-sieve-imapflags-03.txt">
 draft-melnikov-sieve-imapflags</A></TD>
@@ -208,7 +211,65 @@
 draft-ietf-sieve-managesieve</A></TD>
 <TD>A Protocol for Remotely Managing Sieve Scripts</TD></TR>
 
+<TR><TD COLSPAN=2> <h2>HTTP</h2></TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc2616">RFC 2616</A></TD>
+<TD>Hypertext Transfer Protocol -- HTTP/1.1
+ being revised by
+<A HREF="http://tools.ietf.org/id/draft-ietf-httpbis">
+draft-ietf-httpbis-*</A></TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc2617">RFC 2617</A></TD>
+<TD>HTTP Authentication: Basic and Digest Access Authentication</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc4559">RFC 4559</A></TD>
+<TD>SPNEGO-based Kerberos and NTLM HTTP Authentication in Microsoft Windows</TD></TR>
+<TR><TD><A HREF="http://download.microsoft.com/download/a/e/6/ae6e4142-aa58-45c6-8dcf-a657e5900cd3/MS-NTHT.pdf">MS-NTHT</A></TD>
+<TD>NTLM Over HTTP Protocol Specification</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc2817">RFC 2817</A></TD>
+<TD>HTTP Upgrading to TLS Within HTTP/1.1</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc2818">RFC 2818</A></TD>
+<TD>HTTP Over TLS</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6797">RFC 6797</A></TD>
+<TD>HTTP Strict Transport Security (HSTS)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc4918">RFC 4918</A></TD>
+<TD>HTTP Extensions for Web Distributed Authoring and Versioning (WebDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc3253">RFC 3253</A></TD>
+<TD>Versioning Extensions to WebDAV (Web Distributed Authoring and Versioning)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc3744">RFC 3744</A></TD>
+<TD>Web Distributed Authoring and Versioning (WebDAV) Access Control Protocol</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc4331">RFC 4331</A></TD>
+<TD>Quota and Size Properties for Distributed Authoring and Versioning (DAV) Collections</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc5397">RFC 5397</A></TD>
+<TD>WebDAV Current Principal Extension</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc5689">RFC 5689</A></TD>
+<TD>Extended MKCOL for Web Distributed Authoring and Versioning (WebDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc5995">RFC 5995</A></TD>
+<TD>Using POST to Add Members to Web Distributed Authoring and Versioning (WebDAV) Collections</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6578">RFC 6578</A></TD>
+<TD>Collection Synchronization for Web Distributed Authoring and Versioning (WebDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc4791">RFC 4791</A></TD>
+<TD>Calendaring Extensions to WebDAV (CalDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6638">RFC 6638</a></TD>
+<TD>Scheduling Extensions to CalDAV</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6352">RFC 6352</a></TD>
+<TD>CardDAV: vCard Extensions to Web Distributed Authoring and Versioning (WebDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6764">RFC 6764</A></TD>
+<TD>Locating Services for Calendaring Extensions to WebDAV (CalDAV) and vCard Extensions to WebDAV (CardDAV)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/draft-desruisseaux-ischedule">draft-desruisseaux-ischedule</A></TD>
+<TD>Internet Calendar Scheduling Protocol (iSchedule)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/draft-thomson-hybi-http-timeout">draft-thomson-hybi-http-timeout</A></TD>
+<TD>Hypertext Transfer Protocol (HTTP) Keep-Alive Header</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/draft-ietf-appsawg-http-forwarded">draft-ietf-appsawg-http-forwarded</A></TD>
+<TD>Forwarded HTTP Extension</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/draft-snell-http-prefer">draft-snell-http-prefer</A></TD>
+<TD>Prefer Header for HTTP</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/draft-murchison-webdav-prefer">draft-murchison-webdav-prefer</A></TD>
+<TD>Use of the Prefer Header Field in Web Distributed Authoring and Versioning (WebDAV)</TD></TR>
+<TR><TD><A HREF="http://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk/doc/Extensions/caldav-ctag.txt">caldav-ctag</A></TD>
+<TD>Calendar Collection Entity Tag (CTag) in CalDAV</TD></TR>
+<TR><TD><A HREF="http://msdn.microsoft.com/en-us/library/aa142743%28v=exchg.65%29.aspx">Brief Header</A></TD><TD>Microsoft 'Brief' header extension</TD></TR>
+
 <TR><TD COLSPAN=2> <h2>Other</h2></TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc3656.txt">RFC 3656</a></TD>
+<TD>MUPDATE Protocol (For Cyrus Murder)</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc5322.txt">RFC 5322</A></TD>
 <TD>Internet Message Format</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc5536.txt">RFC 5536</A></TD>
@@ -217,4 +278,20 @@
 <TD>Netnews Architecture and Protocols</TD></TR>
 <TR><TD><A HREF="http://www.ietf.org/rfc/rfc3656.txt">RFC 3656</a></TD>
 <TD>MUPDATE Protocol (For Cyrus Murder)</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc5423.txt">RFC 5423</A></TD>
+<TD>Internet Message Store Events</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc4287">RFC 4287</a></TD>
+<TD>The Atom Syndication Format</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc5545">RFC 5545</a></TD>
+<TD>Internet Calendaring and Scheduling Core Object Specification (iCalendar)
+</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc5546">RFC 5546</a></TD>
+<TD>iCalendar Transport-Independent Interoperability Protocol (iTIP)
+</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6047">RFC 6047</a></TD>
+<TD>iCalendar Message-Based Interoperability Protocol (iMIP)</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6350">RFC 6350</a></TD>
+<TD>vCard Format Specification</TD></TR>
+<TR><TD><A HREF="http://tools.ietf.org/html/rfc6376">RFC 6376</a></TD>
+<TD>DomainKeys Identified Mail (DKIM) Signatures</TD></TR>
 </TABLE>

cyrus-imapd-2.5.tar.gz/doc/text/.gitignore Added

cyrus-imapd-2.4.17.tar.gz/doc/text/htmlstrip.c -> cyrus-imapd-2.5.tar.gz/doc/text/htmlstrip.c Changed

@@ -38,14 +38,13 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: htmlstrip.c,v 1.12 2010/01/06 17:01:29 murch Exp $
 */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #define MODE_PRE 1		/* Preformatted */
 #define MODE_IGNORETXT 2	/* Discard text */
@@ -63,7 +62,7 @@
 int startline;
 };
 
-struct mode modestack100 = {"TOPLEVEL", 4};
+struct mode modestack100 = {{"TOPLEVEL", 4, 0, 0, 0, 0}};
 int curmode = 0;
 int didparagraph = 1;
 
@@ -119,10 +118,10 @@
 { "td",	0,		0,		0, },
 };
 
+static void parse(FILE *infile);
+static int lex(FILE *infile, int *cmdptr, int *endtagptr, int *linenoptr);
 
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
 FILE *infile;
 
@@ -141,8 +140,7 @@
 exit(0);
 }
 
-parse(infile)
-FILE *infile;
+static void parse(FILE *infile)
 {
 char outputbuf1024;
 int outpos = 0;
@@ -345,15 +343,11 @@
 }
 }
 
-int lex(infile, cmdptr, endtagptr, linenoptr)
-FILE *infile;
-int *cmdptr;
-int *endtagptr;
-int *linenoptr;
+static int lex(FILE *infile, int *cmdptr, int *endtagptr, int *linenoptr)
 {
 int c;
 static char buf1024;
- int i = 0;
+ unsigned int i = 0;
 int lineno = *linenoptr;
 char *p;
 
@@ -416,7 +410,7 @@
 	exit(1);
 }
 
- if (p = strchr(buf, ' ')) *p = '\0';
+ if ((p = strchr(buf, ' '))) *p = '\0';
 
 p = buf;
 if (*p == '/') {

cyrus-imapd-2.4.17.tar.gz/imap/annotate.c -> cyrus-imapd-2.5.tar.gz/imap/annotate.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: annotate.c,v 1.47 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
@@ -66,33 +64,200 @@
 #include "hash.h"
 #include "imapd.h"
 #include "global.h"
-#include "imap_err.h"
+#include "times.h"
+#include "imap/imap_err.h"
 #include "mboxlist.h"
 #include "util.h"
 #include "xmalloc.h"
+#include "ptrarray.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
+#include "tok.h"
+#include "quota.h"
 
 #include "annotate.h"
 #include "sync_log.h"
 
+#define DEBUG 0
+
+#define ANNOTATION_SCOPE_UNKNOWN (-1)
+enum {
+ ANNOTATION_SCOPE_SERVER = 1,
+ ANNOTATION_SCOPE_MAILBOX = 2,
+ ANNOTATION_SCOPE_MESSAGE = 3
+};
+
+typedef struct annotate_entrydesc annotate_entrydesc_t;
+
+struct annotate_entry_list
+{
+ struct annotate_entry_list *next;
+ const annotate_entrydesc_t *desc;
+ char *name;
+ /* used for storing */
+ struct buf shared;
+ struct buf priv;
+ int have_shared;
+ int have_priv;
+};
+
+/* Encapsulates all the state involved in providing the scope
+ * for setting or getting a single annotation */
+struct annotate_state
+{
+ /*
+ * Common between storing and fetching
+ */
+ int which;			/* ANNOTATION_SCOPE_* */
+ mbentry_t *mbentry; /* for _MAILBOX */
+ int mbentry_is_ours;
+ struct mailbox *mailbox;	/* for _MAILBOX, _MESSAGE */
+ int mailbox_is_ours;
+ unsigned int uid;		/* for _MESSAGE */
+ const char *acl;		/* for _MESSAGE */
+ annotate_db_t *d;
+
+ /* authentication state */
+ const char *userid;
+ int isadmin;
+ struct auth_state *auth_state;
+
+ struct annotate_entry_list *entry_list;
+ /* for proxies */
+ struct hash_table entry_table;
+ struct hash_table server_table;
+
+ /*
+ * Fetching.
+ */
+ unsigned attribs;
+ struct entryattlist **entryatts;
+ unsigned found;
+
+ /* For proxies (a null entry_list indicates that we ONLY proxy) */
+ /* if these are NULL, we have had a local exact match, and we
+ DO NOT proxy */
+ const char *orig_mailbox;
+ const strarray_t *orig_entry;
+ const strarray_t *orig_attribute;
+ int maxsize;
+ int *sizeptr;
+
+ /* state for output_entryatt */
+ struct attvaluelist *attvalues;
+ char lastnameMAX_MAILBOX_BUFFER;	/* internal */
+ char lastentryMAX_MAILBOX_BUFFER;
+ uint32_t lastuid;
+ annotate_fetch_cb_t callback;
+ void *callback_rock;
+
+ /*
+ * Storing.
+ */
+ /* number of mailboxes matching the pattern */
+ unsigned count;
+};
+
+enum {
+ ATTRIB_VALUE_SHARED =		(1<<0),
+ ATTRIB_VALUE_PRIV =			(1<<1),
+ ATTRIB_SIZE_SHARED =		(1<<2),
+ ATTRIB_SIZE_PRIV =			(1<<3),
+ ATTRIB_DEPRECATED =			(1<<4)
+};
+
+typedef enum {
+ ANNOTATION_PROXY_T_INVALID = 0,
+
+ PROXY_ONLY = 1,
+ BACKEND_ONLY = 2,
+ PROXY_AND_BACKEND = 3
+} annotation_proxy_t;
+
+enum {
+ ATTRIB_TYPE_STRING,
+ ATTRIB_TYPE_BOOLEAN,
+ ATTRIB_TYPE_UINT,
+ ATTRIB_TYPE_INT
+};
+#define ATTRIB_NO_FETCH_ACL_CHECK (1<<30)
+
+struct annotate_entrydesc
+{
+ const char *name;		/* entry name */
+ int type;			/* entry type */
+ annotation_proxy_t proxytype; /* mask of allowed server types */
+ int attribs;		/* mask of allowed attributes */
+ int extra_rights;		/* for set of shared mailbox annotations */
+		/* function to get the entry */
+ void (*get)(annotate_state_t *state,
+	 struct annotate_entry_list *entry);
+	 /* function to set the entry */
+ int (*set)(annotate_state_t *state,
+	 struct annotate_entry_list *entry);
+ void *rock;			/* rock passed to get() function */
+};
+
+struct annotate_db
+{
+ annotate_db_t *next;
+ int refcount;
+ char *mboxname;
+ char *filename;
+ struct db *db;
+ struct txn *txn;
+ int in_txn;
+};
+
 #define DB config_annotation_db
 
-struct db *anndb;
-static int annotate_dbopen = 0;
-int (*proxy_fetch_func)(const char *server, const char *mbox_pat,
-			struct strlist *entry_pat,
-			struct strlist *attribute_pat) = NULL;
-int (*proxy_store_func)(const char *server, const char *mbox_pat,
+static annotate_db_t *all_dbs_head = NULL;
+static annotate_db_t *all_dbs_tail = NULL;
+#define tid(d)	((d)->in_txn ? &(d)->txn : NULL)
+static int (*proxy_fetch_func)(const char *server, const char *mbox_pat,
+			const strarray_t *entry_pat,
+			const strarray_t *attribute_pat) = NULL;
+static int (*proxy_store_func)(const char *server, const char *mbox_pat,
 			struct entryattlist *entryatts) = NULL;
-
-void init_annotation_definitions();
+static ptrarray_t message_entries = PTRARRAY_INITIALIZER;
+static ptrarray_t mailbox_entries = PTRARRAY_INITIALIZER;
+static ptrarray_t server_entries = PTRARRAY_INITIALIZER;
+
+static void annotate_state_unset_scope(annotate_state_t *state);
+static int annotate_state_set_scope(annotate_state_t *state,
+				 mbentry_t *mbentry,
+				 struct mailbox *mailbox,
+				 unsigned int uid);
+static void init_annotation_definitions(void);
+static int annotation_set_tofile(annotate_state_t *state,
+			 struct annotate_entry_list *entry);
+static int annotation_set_todb(annotate_state_t *state,
+			 struct annotate_entry_list *entry);
+static int annotation_set_mailboxopt(annotate_state_t *state,
+			 struct annotate_entry_list *entry);
+static int annotation_set_pop3showafter(annotate_state_t *state,
+			 struct annotate_entry_list *entry);
+static int annotation_set_specialuse(annotate_state_t *state,
+				 struct annotate_entry_list *entry);
+static int _annotate_rewrite(struct mailbox *oldmailbox,
+			 uint32_t olduid,
+			 const char *olduserid,
+			 struct mailbox *newmailbox,
+			 uint32_t newuid,
+			 const char *newuserid,
+			 int copy);
+static int _annotate_may_store(annotate_state_t *state,
+			 int is_shared,
+			 const annotate_entrydesc_t *desc);
+static void annotate_begin(annotate_db_t *d);
+static void annotate_abort(annotate_db_t *d);
+static int annotate_commit(annotate_db_t *d);
 
 /* String List Management */
 /*
- * Append 's' to the strlist 'l'. Possibly include metadata.
+ * Append 's' to the strlist 'l'.
 */
-void appendstrlist_withdata(struct strlist **l, char *s, void *d, size_t size)
+EXPORTED void appendstrlist(struct strlist **l, char *s)
 {
 struct strlist **tail = l;
 
@@ -101,28 +266,14 @@
 *tail = (struct strlist *)xmalloc(sizeof(struct strlist));
 (*tail)->s = xstrdup(s);
 (*tail)->p = 0;
- if(d && size) {
-	(*tail)->rock = xmalloc(size);
-	memcpy((*tail)->rock, d, size);
- } else {
-	(*tail)->rock = NULL;
- }
 (*tail)->next = 0;
 }
 
 /*
- * Append 's' to the strlist 'l'.
- */
-void appendstrlist(struct strlist **l, char *s) 
-{
- appendstrlist_withdata(l, s, NULL, 0);
-}
-
-/*
 * Append 's' to the strlist 'l', compiling it as a pattern.
 * Caller must pass in memory that is freed when the strlist is freed.
 */
-void appendstrlistpat(struct strlist **l, char *s)
+EXPORTED void appendstrlistpat(struct strlist **l, char *s)
 {
 struct strlist **tail = l;
 
@@ -130,7 +281,6 @@
 
 *tail = (struct strlist *)xmalloc(sizeof(struct strlist));
 (*tail)->s = s;
- (*tail)->rock = NULL;
 (*tail)->p = charset_compilepat(s);
 (*tail)->next = 0;
 }
@@ -138,7 +288,7 @@
 /*
 * Free the strlist 'l'
 */
-void freestrlist(struct strlist *l)
+EXPORTED void freestrlist(struct strlist *l)
 {
 struct strlist *n;
 
@@ -146,7 +296,6 @@
 	n = l->next;
 	free(l->s);
 	if (l->p) charset_freepat(l->p);
-	if (l->rock) free(l->rock);
 	free((char *)l);
 	l = n;
 }
@@ -157,29 +306,41 @@
 /*
 * Append the 'attrib'/'value' pair to the attvaluelist 'l'.
 */
-void appendattvalue(struct attvaluelist **l, const char *attrib, const char *value)
+EXPORTED void appendattvalue(struct attvaluelist **l,
+		 const char *attrib,
+		 const struct buf *value)
 {
 struct attvaluelist **tail = l;
 
 while (*tail) tail = &(*tail)->next;
 
- *tail = (struct attvaluelist *)xmalloc(sizeof(struct attvaluelist));
+ *tail = xzmalloc(sizeof(struct attvaluelist));
 (*tail)->attrib = xstrdup(attrib);
- (*tail)->value = xstrdup(value);
- (*tail)->next = 0;
+ buf_copy(&(*tail)->value, value);
+}
+
+/*
+ * Duplicate the attvaluelist @src to @dst.
+ */
+void dupattvalues(struct attvaluelist **dst,
+		 const struct attvaluelist *src)
+{
+ for ( ; src ; src = src->next)
+	appendattvalue(dst, src->attrib, &src->value);
 }
 
 /*
 * Free the attvaluelist 'l'
 */
-void freeattvalues(struct attvaluelist *l)
+EXPORTED void freeattvalues(struct attvaluelist *l)
 {
 struct attvaluelist *n;
 
 while (l) {
 	n = l->next;
 	free(l->attrib);
-	free(l->value);
+	buf_free(&l->value);
+	free(l);
 	l = n;
 }
 }
@@ -187,7 +348,7 @@
 /*
 * Append the 'entry'/'attvalues' pair to the entryattlist 'l'.
 */
-void appendentryatt(struct entryattlist **l, const char *entry,
+EXPORTED void appendentryatt(struct entryattlist **l, const char *entry,
 		 struct attvaluelist *attvalues)
 {
 struct entryattlist **tail = l;
@@ -200,96 +361,437 @@
 (*tail)->next = NULL;
 }
 
+EXPORTED void setentryatt(struct entryattlist **l, const char *entry,
+		 const char *attrib, const struct buf *value)
+{
+ struct entryattlist *ee;
+
+ for (ee = *l ; ee ; ee = ee->next) {
+	if (!strcmp(ee->entry, entry))
+	 break;
+ }
+
+ if (!ee) {
+	struct attvaluelist *atts = NULL;
+	appendattvalue(&atts, attrib, value);
+	appendentryatt(l, entry, atts);
+ }
+ else {
+	struct attvaluelist *av;
+	for (av = ee->attvalues ; av ; av = av->next) {
+	 if (!strcmp(av->attrib, attrib))
+		break;
+	}
+	if (av)
+	 buf_copy(&av->value, value);
+	else
+	 appendattvalue(&ee->attvalues, attrib, value);
+ }
+}
+
+EXPORTED void clearentryatt(struct entryattlist **l, const char *entry,
+		 const char *attrib)
+{
+ struct entryattlist *ea, **pea;
+ struct attvaluelist *av, **pav;
+
+ for (pea = l ; *pea ; pea = &(*pea)->next) {
+	if (!strcmp((*pea)->entry, entry))
+	 break;
+ }
+ ea = *pea;
+ if (!ea)
+	return;	/* entry not found */
+
+ for (pav = &(*pea)->attvalues ; *pav ; pav = &(*pav)->next) {
+	if (!strcmp((*pav)->attrib, attrib))
+	 break;
+ }
+ av = *pav;
+ if (!av)
+	return;	/* attrib not found */
+
+ /* detach and free attvaluelist */
+ *pav = av->next;
+ free(av->attrib);
+ buf_free(&av->value);
+ free(av);
+
+ if (!ea->attvalues) {
+	/* ->attvalues is now empty, so we can detach and free *pea too */
+	*pea = ea->next;
+	free(ea->entry);
+	free(ea);
+ }
+}
+
+/*
+ * Duplicate the entryattlist @src to @dst.
+ */
+void dupentryatt(struct entryattlist **dst,
+		 const struct entryattlist *src)
+{
+ for ( ; src ; src = src->next) {
+	struct attvaluelist *attvalues = NULL;
+	dupattvalues(&attvalues, src->attvalues);
+	appendentryatt(dst, src->entry, attvalues);
+ }
+}
+
+/*
+ * Count the storage used by entryattlist 'l'
+ */
+EXPORTED size_t sizeentryatts(const struct entryattlist *l)
+{
+ size_t sz = 0;
+ struct attvaluelist *av;
+
+ for ( ; l ; l = l->next)
+	for (av = l->attvalues ; av ; av = av->next)
+	 sz += av->value.len;
+ return sz;
+}
+
 /*
 * Free the entryattlist 'l'
 */
-void freeentryatts(struct entryattlist *l)
+EXPORTED void freeentryatts(struct entryattlist *l)
 {
 struct entryattlist *n;
 
 while (l) {
 	n = l->next;
 	free(l->entry);
-	if (l->attvalues) freeattvalues(l->attvalues);
+	freeattvalues(l->attvalues);
+	free(l);
 	l = n;
 }
 }
 
 /* must be called after cyrus_init */
-void annotatemore_init(int myflags,
-		 int (*fetch_func)(const char *, const char *,
-					 struct strlist *, struct strlist *),
-		 int (*store_func)(const char *, const char *,
-					 struct entryattlist *))
+EXPORTED void annotate_init(int (*fetch_func)(const char *, const char *,
+				 const strarray_t *, const strarray_t *),
+		 int (*store_func)(const char *, const char *,
+				 struct entryattlist *))
 {
- int r;
-
- if (myflags & ANNOTATE_SYNC) {
-	r = DB->sync();
- }
-
 if (fetch_func) {
 	proxy_fetch_func = fetch_func;
 }
 if (store_func) {
 	proxy_store_func = store_func;
 }
- 
+
 init_annotation_definitions();
 }
 
-void annotatemore_open(const char *fname)
+/* detach the db_t from the global list */
+static void detach_db(annotate_db_t *prev, annotate_db_t *d)
 {
- int ret;
- char *tofree = NULL;
+ if (prev)
+	prev->next = d->next;
+ else
+	all_dbs_head = d->next;
+ if (all_dbs_tail == d)
+	all_dbs_tail = prev;
+}
 
- if (!fname)
-	fname = config_getstring(IMAPOPT_ANNOTATION_DB_PATH);
+/* append the db_t to the global list */
+static void append_db(annotate_db_t *d)
+{
+ if (all_dbs_tail)
+	all_dbs_tail->next = d;
+ else
+	all_dbs_head = d;
+ all_dbs_tail = d;
+ d->next = NULL;
+}
 
- /* create db file name */
- if (!fname) {
-	tofree = strconcat(config_dir, FNAME_ANNOTATIONS, (char *)NULL);
-	fname = tofree;
+/*
+ * Generate a new string containing the db filename
+ * for the given @mboxname, (or the global db if
+ * @mboxname is NULL). Returns the new string in
+ * *@fnamep. Returns an error code.
+ */
+static int annotate_dbname_mbentry(const mbentry_t *mbentry,
+				 char **fnamep)
+{
+ const char *conf_fname;
+
+ if (mbentry) {
+	/* per-mbox database */
+	conf_fname = mboxname_metapath(mbentry->partition, mbentry->name,
+				 META_ANNOTATIONS, /*isnew*/0);
+	if (!conf_fname)
+	 return IMAP_MAILBOX_BADNAME;
+	*fnamep = xstrdup(conf_fname);
+ }
+ else {
+	/* global database */
+	conf_fname = config_getstring(IMAPOPT_ANNOTATION_DB_PATH);
+
+	if (conf_fname)
+	 *fnamep = xstrdup(conf_fname);
+	else
+	 *fnamep = strconcat(config_dir, FNAME_GLOBALANNOTATIONS, (char *)NULL);
 }
 
- ret = (DB->open)(fname, CYRUSDB_CREATE, &anndb);
- if (ret != 0) {
-	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
-	 cyrusdb_strerror(ret));
-	fatal("can't read annotations file", EC_TEMPFAIL);
- } 
+ return 0;
+}
+
+static int annotate_dbname_mailbox(struct mailbox *mailbox, char **fnamep)
+{
+ const char *conf_fname;
+
+ if (!mailbox) return annotate_dbname_mbentry(NULL, fnamep);
+
+ conf_fname = mboxname_metapath(mailbox->part, mailbox->name,
+				 META_ANNOTATIONS, /*isnew*/0);
+ if (!conf_fname) return IMAP_MAILBOX_BADNAME;
+ *fnamep = xstrdup(conf_fname);
 
- free(tofree);
+ return 0;
+}
+ 
+
+static int annotate_dbname(const char *mboxname, char **fnamep)
+{
+ int r = 0;
+ mbentry_t *mbentry = NULL;
+
+ if (mboxname) {
+	r = mboxlist_lookup(mboxname, &mbentry, NULL);
+	if (r) goto out;
+ }
 
- annotate_dbopen = 1;
+ r = annotate_dbname_mbentry(mbentry, fnamep);
+
+out:
+ mboxlist_entry_free(&mbentry);
+ return r;
 }
 
-void annotatemore_close(void)
+static int _annotate_getdb(const char *mboxname,
+			 unsigned int uid,
+			 int dbflags,
+			 annotate_db_t **dbp)
 {
+ annotate_db_t *d, *prev = NULL;
+ char *fname = NULL;
+ struct db *db;
 int r;
 
- if (annotate_dbopen) {
-	r = (DB->close)(anndb);
-	if (r) {
-	 syslog(LOG_ERR, "DBERROR: error closing annotations: %s",
-		 cyrusdb_strerror(r));
+ *dbp = NULL;
+
+ /*
+ * The incoming (mboxname,uid) tuple tells us which scope we
+ * need a database for. Translate into the mboxname used to
+ * key annotate_db_t's, which is slightly different: message
+ * scope goes into a per-mailbox db, others in the global db.
+ */
+ if (!strcmpsafe(mboxname, NULL) /*server scope*/ ||
+ !uid /* mailbox scope*/)
+	mboxname = NULL;
+
+ /* try to find an existing db for the mbox */
+ for (d = all_dbs_head ; d ; prev = d, d = d->next) {
+	if (!strcmpsafe(mboxname, d->mboxname)) {
+	 /* found it, bump the refcount */
+	 d->refcount++;
+	 *dbp = d;
+	 /*
+	 * Splay the db_t to the end of the global list.
+	 * This ensures the list remains in getdb() call
+	 * order, and in particular that the dbs are
+	 * committed in getdb() call order. This is
+	 * necessary to ensure safety should a commit fail
+	 * while moving annotations between per-mailbox dbs
+	 */
+	 detach_db(prev, d);
+	 append_db(d);
+	 return 0;
 	}
-	annotate_dbopen = 0;
 }
+ /* not found, open/create a new one */
+
+ r = annotate_dbname(mboxname, &fname);
+ if (r)
+	goto error;
+#if DEBUG
+ syslog(LOG_ERR, "Opening annotations db %s\n", fname);
+#endif
+
+ r = cyrusdb_open(DB, fname, dbflags | CYRUSDB_CONVERT, &db);
+ if (r != 0) {
+	if (!(dbflags & CYRUSDB_CREATE) && r == CYRUSDB_NOTFOUND)
+	 goto error;
+	syslog(LOG_ERR, "DBERROR: opening %s: %s",
+			fname, cyrusdb_strerror(r));
+	goto error;
+ }
+
+ /* record all the above */
+ d = xzmalloc(sizeof(*d));
+ d->refcount = 1;
+ d->mboxname = xstrdupnull(mboxname);
+ d->filename = fname;
+ d->db = db;
+
+ append_db(d);
+
+ *dbp = d;
+ return 0;
+
+error:
+ free(fname);
+ *dbp = NULL;
+ return r;
+}
+
+HIDDEN int annotate_getdb(const char *mboxname, annotate_db_t **dbp)
+{
+ if (!mboxname || !*mboxname) {
+	syslog(LOG_ERR, "IOERROR: annotate_getdb called with no mboxname");
+	return IMAP_INTERNAL;	/* we don't return the global db */
+ }
+ /* synthetic UID '1' forces per-mailbox mode */
+ return _annotate_getdb(mboxname, 1, CYRUSDB_CREATE, dbp);
+}
+
+static void annotate_closedb(annotate_db_t *d)
+{
+ annotate_db_t *dx, *prev = NULL;
+ int r;
+
+ /* detach from the global list */
+ for (dx = all_dbs_head ; dx && dx != d ; prev = dx, dx = dx->next)
+	;
+ assert(dx);
+ assert(d == dx);
+ detach_db(prev, d);
+
+#if DEBUG
+ syslog(LOG_ERR, "Closing annotations db %s\n", d->filename);
+#endif
+
+ r = cyrusdb_close(d->db);
+ if (r)
+	syslog(LOG_ERR, "DBERROR: error closing annotations %s: %s",
+	 d->filename, cyrusdb_strerror(r));
+
+ free(d->filename);
+ free(d->mboxname);
+ memset(d, 0, sizeof(*d));	/* JIC */
+ free(d);
+}
+
+HIDDEN void annotate_putdb(annotate_db_t **dbp)
+{
+ annotate_db_t *d;
+
+ if (!dbp || !(d = *dbp))
+	return;
+ assert(d->refcount > 0);
+ if (--d->refcount == 0) {
+	if (d->in_txn && d->txn) {
+	 syslog(LOG_ERR, "IOERROR: dropped last reference on "
+			 "database %s with uncommitted updates, "
+			 "aborting - DATA LOST!",
+			 d->filename);
+	 annotate_abort(d);
+	}
+	assert(!d->in_txn);
+	annotate_closedb(d);
+ }
+ *dbp = NULL;
+}
+
+EXPORTED void annotatemore_open(void)
+{
+ int r;
+ annotate_db_t *d = NULL;
+
+ /* force opening the global annotations db */
+ r = _annotate_getdb(NULL, 0, CYRUSDB_CREATE, &d);
+ if (r)
+	fatal("can't open global annotations database", EC_TEMPFAIL);
+}
+
+EXPORTED void annotatemore_close(void)
+{
+ /* close all the open databases */
+ while (all_dbs_head)
+	annotate_closedb(all_dbs_head);
+}
+
+/* Begin a txn if one is not already started. Can be called multiple
+ * times */
+static void annotate_begin(annotate_db_t *d)
+{
+ if (d)
+	d->in_txn = 1;
 }
 
-void annotatemore_done(void)
+static void annotate_abort(annotate_db_t *d)
+{
+ /* don't double-abort */
+ if (!d || !d->in_txn) return;
+
+ if (d->txn) {
+#if DEBUG
+	syslog(LOG_ERR, "Aborting annotations db %s\n", d->filename);
+#endif
+	cyrusdb_abort(d->db, d->txn);
+ }
+ d->txn = NULL;
+ d->in_txn = 0;
+}
+
+static int annotate_commit(annotate_db_t *d)
+{
+ int r = 0;
+
+ /* silently succeed if not in a txn */
+ if (!d || !d->in_txn) return 0;
+
+ if (d->txn) {
+#if DEBUG
+	syslog(LOG_ERR, "Committing annotations db %s\n", d->filename);
+#endif
+	r = cyrusdb_commit(d->db, d->txn);
+	if (r)
+	 r = IMAP_IOERROR;
+	d->txn = NULL;
+ }
+ d->in_txn = 0;
+
+ return r;
+}
+
+EXPORTED void annotate_done(void)
 {
 /* DB->done() handled by cyrus_done() */
 }
 
-static int make_key(const char *mboxname, const char *entry,
-		 const char *userid, char *key, size_t keysize)
+static int make_key(const char *mboxname,
+		 unsigned int uid,
+		 const char *entry,
+		 const char *userid,
+		 char *key, size_t keysize)
 {
 int keylen = 0;
 
- strlcpy(key+keylen, mboxname, keysize-keylen);
- keylen += strlen(mboxname) + 1;
+ if (!uid) {
+	strlcpy(key+keylen, mboxname, keysize-keylen);
+	keylen += strlen(mboxname) + 1;
+ }
+ else if (uid == ANNOTATE_ANY_UID) {
+	strlcpy(key+keylen, "*", keysize-keylen);
+	keylen += strlen(key+keylen) + 1;
+ }
+ else {
+	snprintf(key+keylen, keysize-keylen, "%u", uid);
+	keylen += strlen(key+keylen) + 1;
+ }
 strlcpy(key+keylen, entry, keysize-keylen);
 keylen += strlen(entry);
 /* if we don't have a userid, we're doing a foreach() */
@@ -302,207 +804,454 @@
 return keylen;
 }
 
+static int split_key(const annotate_db_t *d,
+		 const char *key, int keysize,
+		 const char **mboxnamep,
+		 unsigned int *uidp,
+		 const char **entryp,
+		 const char **useridp)
+{
+#define NFIELDS 3
+ const char *fieldsNFIELDS;
+ int nfields = 0;
+ const char *p;
+ unsigned int uid = 0;
+ const char *mboxname = "";
+
+ /* paranoia: ensure the last character in the key is
+ * a NUL, which it should be because of the way we
+ * always build keys */
+ if (keykeysize-1)
+	return IMAP_ANNOTATION_BADENTRY;
+ keysize--;
+ /*
+ * paranoia: split the key into fields on NUL characters.
+ * We would use strarray_nsplit() for this, except that
+ * by design that function cannot split on NULs and does
+ * not handle embedded NULs.
+ */
+ fieldsnfields++ = key;
+ for (p = key ; (p-key) < keysize ; p++) {
+	if (!*p) {
+	 if (nfields == NFIELDS)
+		return IMAP_ANNOTATION_BADENTRY;
+	 fieldsnfields++ = p+1;
+	}
+ }
+ if (nfields != NFIELDS)
+	return IMAP_ANNOTATION_BADENTRY;
+
+ if (d->mboxname) {
+	/* per-folder db for message scope annotations */
+	char *end = NULL;
+	uid = strtoul(fields0, &end, 10);
+	if (uid == 0 || end == NULL || *end)
+	 return IMAP_ANNOTATION_BADENTRY;
+	mboxname = d->mboxname;
+ }
+ else {
+	/* global db for mailnbox & server scope annotations */
+	uid = 0;
+	mboxname = fields0;
+ }
+
+ if (mboxnamep) *mboxnamep = mboxname;
+ if (uidp) *uidp = uid;
+ if (entryp) *entryp = fields1;
+ if (useridp) *useridp = fields2;
+ return 0;
+#undef NFIELDS
+}
+
+#if DEBUG
+static const char *key_as_string(const annotate_db_t *d,
+			 const char *key, int keylen)
+{
+ const char *mboxname, *entry, *userid;
+ unsigned int uid;
+ int r;
+ static struct buf buf = BUF_INITIALIZER;
+
+ buf_reset(&buf);
+ r = split_key(d, key, keylen, &mboxname, &uid, &entry, &userid);
+ if (r)
+	buf_appendcstr(&buf, "invalid");
+ else
+	buf_printf(&buf, "{ mboxname=\"%s\" uid=%u entry=\"%s\" userid=\"%s\" }",
+		 mboxname, uid, entry, userid);
+ return buf_cstring(&buf);
+}
+#endif
+
 static int split_attribs(const char *data, int datalen __attribute__((unused)),
-			 struct annotation_data *attrib)
+			 struct buf *value)
 {
 unsigned long tmp; /* for alignment */
 
 /* xxx use datalen? */
 /* xxx sanity check the data? */
+ /*
+ * Sigh...this is dumb. We take care to be machine independent by
+ * storing the length in network byte order...but the size of the
+ * length field depends on whether we're running on a 32b or 64b
+ * platform.
+ */
 memcpy(&tmp, data, sizeof(unsigned long));
- attrib->size = (size_t) ntohl(tmp);
 data += sizeof(unsigned long); /* skip to value */
 
- attrib->value = data;
- data += strlen(data) + 1; /* skip to contenttype */
-
- attrib->contenttype = data;
- data += strlen(data) + 1; /* skip to modifiedsince */
-
- memcpy(&tmp, data, sizeof(unsigned long));
- attrib->modifiedsince = (size_t) ntohl(tmp);
- data += sizeof(unsigned long); /* skip to optional attribs */
+ buf_init_ro(value, data, ntohl(tmp));
 
+ /*
+ * In records written by older versions of Cyrus, there will be
+ * binary encoded content-type and modifiedsince values after the
+ * data. We don't care about those anymore, so we just ignore them.
+ */
 return 0;
 }
 
 struct find_rock {
 struct glob *mglob;
 struct glob *eglob;
- int (*proc)();
+ unsigned int uid;
+ annotate_db_t *d;
+ annotatemore_find_proc_t proc;
 void *rock;
 };
 
-static int find_p(void *rock, const char *key,
-		int keylen __attribute__((unused)),
+static int find_p(void *rock, const char *key, size_t keylen,
 		const char *data __attribute__((unused)),
-		int datalen __attribute__((unused)))
+		size_t datalen __attribute__((unused)))
 {
 struct find_rock *frock = (struct find_rock *) rock;
 const char *mboxname, *entry, *userid;
+ unsigned int uid;
+ int r;
 
- mboxname = key;
- entry = mboxname + strlen(mboxname) + 1;
- userid = entry + strlen(entry) + 1;
+ r = split_key(frock->d, key, keylen, &mboxname,
+		 &uid, &entry, &userid);
+ if (r < 0)
+	return 0;
 
- return ((GLOB_TEST(frock->mglob, mboxname) != -1) &&
-	 (GLOB_TEST(frock->eglob, entry) != -1));
+ if (frock->uid &&
+	frock->uid != ANNOTATE_ANY_UID &&
+	frock->uid != uid)
+	return 0;
+ if (GLOB_TEST(frock->mglob, mboxname) == -1)
+	return 0;
+ if (GLOB_TEST(frock->eglob, entry) == -1)
+	return 0;
+ return 1;
 }
 
-static int find_cb(void *rock, const char *key,
-		 int keylen __attribute__((unused)),
-		 const char *data, int datalen)
+static int find_cb(void *rock, const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct find_rock *frock = (struct find_rock *) rock;
 const char *mboxname, *entry, *userid;
- struct annotation_data attrib;
+ unsigned int uid;
+ struct buf value = BUF_INITIALIZER;
+ char keycopyMAX_MAILBOX_PATH+1;
 int r;
 
- mboxname = key;
- entry = mboxname + strlen(mboxname) + 1;
- userid = entry + strlen(entry) + 1;
+ assert(keylen < MAX_MAILBOX_PATH);
 
- r = split_attribs(data, datalen, &attrib);
+ /* take a copy, we may be deleting this record, so the key
+ * pointer will no longer be valid */
+ memcpy(keycopy, key, keylen);
+
+#if DEBUG
+ syslog(LOG_ERR, "find_cb: found key %s in %s",
+	 key_as_string(frock->d, keycopy, keylen), frock->d->filename);
+#endif
 
- if (!r) r = frock->proc(mboxname, entry, userid, &attrib, frock->rock);
+ r = split_key(frock->d, keycopy, keylen, &mboxname,
+		 &uid, &entry, &userid);
+ if (r)
+	return r;
+
+ r = split_attribs(data, datalen, &value);
+
+ if (!r) r = frock->proc(mboxname, uid, entry, userid, &value, frock->rock);
 
 return r;
 }
 
-int annotatemore_findall(const char *mailbox, const char *entry,
-			 int (*proc)(), void *rock, struct txn **tid)
+EXPORTED int annotatemore_findall(const char *mboxname,	/* internal */
+			 unsigned int uid,
+			 const char *entry,
+			 annotatemore_find_proc_t proc,
+			 void *rock)
 {
 char keyMAX_MAILBOX_PATH+1, *p;
- int keylen, r;
+ size_t keylen;
+ int r;
 struct find_rock frock;
 
- frock.mglob = glob_init(mailbox, GLOB_HIERARCHY);
+ assert(mboxname);
+ assert(entry);
+ frock.mglob = glob_init(mboxname, GLOB_HIERARCHY);
 frock.eglob = glob_init(entry, GLOB_HIERARCHY);
 GLOB_SET_SEPARATOR(frock.eglob, '/');
+ frock.uid = uid;
 frock.proc = proc;
 frock.rock = rock;
+ r = _annotate_getdb(mboxname, uid, 0, &frock.d);
+ if (r) {
+	if (r == CYRUSDB_NOTFOUND)
+	 r = 0;
+	goto out;
+ }
 
 /* Find fixed-string pattern prefix */
- keylen = make_key(mailbox, entry, NULL, key, sizeof(key));
+ keylen = make_key(mboxname, uid,
+		 entry, NULL, key, sizeof(key));
 
 for (p = key; keylen; p++, keylen--) {
 	if (*p == '*' || *p == '%') break;
 }
 keylen = p - key;
 
- r = DB->foreach(anndb, key, keylen, &find_p, &find_cb, &frock, tid);
+ r = cyrusdb_foreach(frock.d->db, key, keylen, &find_p, &find_cb,
+			&frock, tid(frock.d));
 
+out:
 glob_free(&frock.mglob);
 glob_free(&frock.eglob);
+ annotate_putdb(&frock.d);
 
 return r;
 }
 
-enum {
- ATTRIB_VALUE_SHARED =		(1<<0),
- ATTRIB_VALUE_PRIV =			(1<<1),
- ATTRIB_SIZE_SHARED =		(1<<2),
- ATTRIB_SIZE_PRIV =			(1<<3),
- ATTRIB_MODIFIEDSINCE_SHARED =	(1<<4),
- ATTRIB_MODIFIEDSINCE_PRIV =		(1<<5),
- ATTRIB_CONTENTTYPE_SHARED = 	(1<<6),
- ATTRIB_CONTENTTYPE_PRIV = 		(1<<7)
-};
+/*************************** Annotate State Management ***************************/
 
-typedef enum {
- ANNOTATION_PROXY_T_INVALID = 0,
+EXPORTED annotate_state_t *annotate_state_new(void)
+{
+ annotate_state_t *state;
 
- PROXY_ONLY = 1,
- BACKEND_ONLY = 2,
- PROXY_AND_BACKEND = 3
-} annotation_proxy_t;
+ state = xzmalloc(sizeof(*state));
+ state->which = ANNOTATION_SCOPE_UNKNOWN;
+
+ return state;
+}
 
-struct mailbox_annotation_rock
+static void annotate_state_start(annotate_state_t *state)
 {
- char *server, *partition, *acl, *path, *mpath;
-};
+ /* xxx better way to determine a size for this table? */
+ construct_hash_table(&state->entry_table, 100, 1);
+ construct_hash_table(&state->server_table, 10, 1);
+}
 
-const struct annotate_info_t annotate_mailbox_flags =
+static void annotate_state_finish(annotate_state_t *state)
 {
- { "/vendor/cmu/cyrus-imapd/pop3newuidl",
- OPT_POP3_NEW_UIDL },
- { "/vendor/cmu/cyrus-imapd/duplicatedeliver",
- OPT_IMAP_DUPDELIVER },
- { "/vendor/cmu/cyrus-imapd/sharedseen",
- OPT_IMAP_SHAREDSEEN },
- { NULL, 0 }
-};
+ /* Free the entry list */
+ while (state->entry_list) {
+	struct annotate_entry_list *ee = state->entry_list;
+	state->entry_list = ee->next;
+	buf_free(&ee->shared);
+	buf_free(&ee->priv);
+	free(ee->name);
+	free(ee);
+ }
+
+ free_hash_table(&state->entry_table, NULL);
+ free_hash_table(&state->server_table, NULL);
+}
+
 
-/* To free values in the mailbox_annotation_rock as needed */
-static void cleanup_mbrock(struct mailbox_annotation_rock *mbrock __attribute__((unused))) 
+static void annotate_state_free(annotate_state_t **statep)
 {
- /* Don't free server and partition, since they're straight from the
- * output of mboxlist_lookup() */
- return;
+ annotate_state_t *state = *statep;
+
+ if (!state)
+	return;
+
+ annotate_state_finish(state);
+ annotate_state_unset_scope(state);
+ free(state);
+ *statep = NULL;
 }
 
-static void get_mb_data(const char *mboxname,
-			struct mailbox_annotation_rock *mbrock) 
+EXPORTED void annotate_state_begin(annotate_state_t *state)
 {
- if(!mbrock->server && !mbrock->partition) {
-	struct mboxlist_entry mbentry;
-	int r = mboxlist_lookup(mboxname, &mbentry, NULL);
-	if (r) return;
-	mbrock->server = mbentry.partition;
-	mbrock->acl = mbentry.acl;
+ annotate_begin(state->d);
+}
 
-	mbrock->partition = strchr(mbrock->server, '!');
-	if (mbrock->partition) {
-	 *(mbrock->partition)++ = '\0';
-	} else {
-	 mbrock->partition = mbrock->server;
-	 mbrock->server = NULL;
-	}
- }
+EXPORTED void annotate_state_abort(annotate_state_t **statep)
+{
+ if (*statep)
+	annotate_abort((*statep)->d);
+
+ annotate_state_free(statep);
 }
 
-/*************************** Annotation Fetching ***************************/
+EXPORTED int annotate_state_commit(annotate_state_t **statep)
+{
+ int r = 0;
+ if (*statep)
+	r = annotate_commit((*statep)->d);
 
-struct fetchdata {
- struct namespace *namespace;
- struct protstream *pout;
- char *userid;
- int isadmin;
- struct auth_state *auth_state;
- struct annotate_f_entry_list *entry_list;
- unsigned attribs;
- struct entryattlist **entryatts;
- struct hash_table entry_table;
+ annotate_state_free(statep);
+ return r;
+}
 
- /* For proxies (a null entry_list indicates that we ONLY proxy) */
- /* if these are NULL, we have had a local exact match, and we
- DO NOT proxy */
- struct hash_table server_table;
- const char *orig_mailbox;
- struct strlist *orig_entry;
- struct strlist *orig_attribute;
-};
 
-static void output_attlist(struct protstream *pout, struct attvaluelist *l) 
+static struct annotate_entry_list *
+_annotate_state_add_entry(annotate_state_t *state,
+		 const annotate_entrydesc_t *desc,
+		 const char *name)
+{
+ struct annotate_entry_list *ee;
+
+ ee = xzmalloc(sizeof(*ee));
+ ee->name = xstrdup(name);
+ ee->desc = desc;
+
+ ee->next = state->entry_list;
+ state->entry_list = ee;
+
+ return ee;
+}
+
+EXPORTED void annotate_state_set_auth(annotate_state_t *state,
+		 int isadmin, const char *userid,
+		 struct auth_state *auth_state)
+{
+ /* Note: lmtpd sometimes calls through the append code with
+ * auth_state=NULL, so we cannot rely on it being non-NULL */
+ state->userid = userid;
+ state->isadmin = isadmin;
+ state->auth_state = auth_state;
+}
+
+EXPORTED int annotate_state_set_server(annotate_state_t *state)
+{
+ return annotate_state_set_scope(state, NULL, NULL, 0);
+}
+
+EXPORTED int annotate_state_set_mailbox(annotate_state_t *state,
+				struct mailbox *mailbox)
+{
+ return annotate_state_set_scope(state, NULL, mailbox, 0);
+}
+
+EXPORTED int annotate_state_set_mailbox_mbe(annotate_state_t *state,
+				 mbentry_t *mbentry)
 {
- int flag = 0;
- 
- assert(l);
- 
- prot_putc('(',pout);
- 
- while(l) {
-	if (flag) prot_putc(' ', pout);
-	else flag = 1;
+ return annotate_state_set_scope(state, mbentry, NULL, 0);
+}
 
-	prot_printstring(pout, l->attrib);
-	prot_putc(' ', pout);
-	prot_printstring(pout, l->value);
+HIDDEN int annotate_state_set_message(annotate_state_t *state,
+			 struct mailbox *mailbox,
+			 unsigned int uid)
+{
+ return annotate_state_set_scope(state, NULL, mailbox, uid);
+}
 
-	l = l->next;
+/* unset any state from a previous scope */
+static void annotate_state_unset_scope(annotate_state_t *state)
+{
+ if (state->mailbox && state->mailbox_is_ours)
+	mailbox_close(&state->mailbox);
+ state->mailbox = NULL;
+ state->mailbox_is_ours = 0;
+
+ if (state->mbentry && state->mbentry_is_ours)
+	mboxlist_entry_free(&state->mbentry);
+ state->mbentry = NULL;
+ state->mbentry_is_ours = 0;
+
+ state->uid = 0;
+ state->which = ANNOTATION_SCOPE_UNKNOWN;
+ annotate_putdb(&state->d);
+}
+
+static int annotate_state_set_scope(annotate_state_t *state,
+				 mbentry_t *mbentry,
+				 struct mailbox *mailbox,
+				 unsigned int uid)
+{
+ int r = 0;
+ annotate_db_t *oldd = NULL;
+ int oldwhich = state->which;
+
+ /* Carefully preserve the reference on the old DB just in case it
+ * turns out to be the same as the new DB, so we avoid the overhead
+ * of an unnecessary cyrusdb_open/close pair. */
+ oldd = state->d;
+ state->d = NULL;
+
+ annotate_state_unset_scope(state);
+
+ if (mbentry) {
+	if (!mailbox && !mbentry->server) {
+	 /* local mailbox */
+	 r = mailbox_open_iwl(mbentry->name, &mailbox);
+	 if (r)
+		goto out;
+	 state->mailbox_is_ours = 1;
+	}
+	assert(mailbox);
+	state->mbentry = mbentry;
+ }
+
+ if (uid) {
+	assert(mailbox);
+	state->which = ANNOTATION_SCOPE_MESSAGE;
+ }
+ else if (mailbox) {
+	assert(!uid);
+	state->which = ANNOTATION_SCOPE_MAILBOX;
+ }
+ else {
+	assert(!mailbox);
+	assert(!uid);
+	state->which = ANNOTATION_SCOPE_SERVER;
 }
+ assert(oldwhich == ANNOTATION_SCOPE_UNKNOWN ||
+	 oldwhich == state->which);
+ state->mailbox = mailbox;
+ state->uid = uid;
 
- prot_putc(')',pout);
+ r = _annotate_getdb(mailbox ? mailbox->name : NULL, uid,
+			CYRUSDB_CREATE, &state->d);
+
+out:
+ annotate_putdb(&oldd);
+ return r;
+}
+
+static int annotate_state_need_mbentry(annotate_state_t *state)
+{
+ int r = 0;
+
+ if (!state->mbentry && state->mailbox) {
+	r = mboxlist_lookup(state->mailbox->name, &state->mbentry, NULL);
+	if (r) {
+	 syslog(LOG_ERR, "Failed to lookup mbentry for %s: %s",
+		 state->mailbox->name, error_message(r));
+	 goto out;
+	}
+	state->mbentry_is_ours = 1;
+ }
+
+out:
+ return r;
+}
+
+/*************************** Annotation Fetching ***************************/
+
+static void flush_entryatt(annotate_state_t *state)
+{
+ if (!state->attvalues)
+	return;	 /* nothing to flush */
+
+ state->callback(state->lastname,
+		 state->lastuid,
+		 state->lastentry,
+		 state->attvalues,
+		 state->callback_rock);
+ freeattvalues(state->attvalues);
+ state->attvalues = NULL;
 }
 
 /* Output a single entry and attributes for a single mailbox.
@@ -512,539 +1261,758 @@
 * The cache is reset by calling with a NULL mboxname or entry.
 * The last entry is flushed by calling with a NULL attrib.
 */
-static void output_entryatt(const char *mboxname, const char *entry,
-			 const char *userid, struct annotation_data *attrib,
-			 struct fetchdata *fdata)
+static void output_entryatt(annotate_state_t *state, const char *entry,
+			 const char *userid, const struct buf *value)
 {
- static struct attvaluelist *attvalues = NULL;
- static char lastnameMAX_MAILBOX_BUFFER;
- static char lastentryMAX_MAILBOX_BUFFER;
+ const char *mboxname;
 char keyMAX_MAILBOX_BUFFER; /* XXX MAX_MAILBOX_NAME + entry + userid */
- char buf100;
-
- /* We have to reset before each GETANNOTATION command.
- * Handle it as a dirty hack.
- */
- if (!mboxname || !entry) {
-	attvalues = NULL;
-	lastname0 = '\0';
-	lastentry0 = '\0';
-	return;
- }
+ struct buf buf = BUF_INITIALIZER;
+ int vallen;
+
+ /* We don't put any funny interpretations on NULL values for
+ * some of these anymore, now that the dirty hacks are gone. */
+ assert(state);
+ assert(entry);
+ assert(userid);
+ assert(value);
+
+ if (state->mailbox)
+	mboxname = state->mailbox->name;
+ else
+	mboxname = "";
+ /* @mboxname is now an internal mailbox name */
 
 /* Check if this is a new entry.
- * If so, flush our current entry. Otherwise append the entry.
- *
- * We also need a way to flush the last cached entry when we're done.
- * Handle it as a dirty hack.
+ * If so, flush our current entry.
 */
- if ((!attrib || strcmp(mboxname, lastname) || strcmp(entry, lastentry))
-	&& attvalues) {
-	prot_printf(fdata->pout, "* ANNOTATION \"%s\" \"%s\" ",
-		 lastname, lastentry);
-	output_attlist(fdata->pout, attvalues);
-	prot_printf(fdata->pout, "\r\n");
-	
-	freeattvalues(attvalues);
-	attvalues = NULL;
- }
- if (!attrib) return;
+ if (state->uid != state->lastuid ||
+	strcmp(mboxname, state->lastname) ||
+	strcmp(entry, state->lastentry))
+	flush_entryatt(state);
 
- strlcpy(lastname, mboxname, sizeof(lastname));
- strlcpy(lastentry, entry, sizeof(lastentry));
+ strlcpy(state->lastname, mboxname, sizeof(state->lastname));
+ strlcpy(state->lastentry, entry, sizeof(state->lastentry));
+ state->lastuid = state->uid;
 
 /* check if we already returned this entry */
 strlcpy(key, mboxname, sizeof(key));
+ if (state->uid) {
+	char uidbuf32;
+	snprintf(uidbuf, sizeof(uidbuf), "/UID%u/", state->uid);
+	strlcat(key, uidbuf, sizeof(key));
+ }
 strlcat(key, entry, sizeof(key));
 strlcat(key, userid, sizeof(key));
- if (hash_lookup(key, &(fdata->entry_table))) return;
- hash_insert(key, (void *)0xDEADBEEF, &(fdata->entry_table));
+ if (hash_lookup(key, &state->entry_table)) return;
+ hash_insert(key, (void *)0xDEADBEEF, &state->entry_table);
+
+ vallen = value->len;
+ if (state->sizeptr && state->maxsize < vallen) {
+	/* too big - track the size of the largest */
+	int *sp = state->sizeptr;
+	if (*sp < vallen) *sp = vallen;
+	return;
+ }
 
 if (!userid0) { /* shared annotation */
-	if ((fdata->attribs & ATTRIB_VALUE_SHARED) && attrib->value) {
-	 appendattvalue(&attvalues, "value.shared", attrib->value);
-	}
-
-	if ((fdata->attribs & ATTRIB_CONTENTTYPE_SHARED)
-	 && attrib->value && attrib->contenttype) {
-	 appendattvalue(&attvalues, "content-type.shared",
-			 attrib->contenttype);
+	if ((state->attribs & ATTRIB_VALUE_SHARED)) {
+	 appendattvalue(&state->attvalues, "value.shared", value);
+	 state->found |= ATTRIB_VALUE_SHARED;
 	}
 
-	/* Base the return of the size attribute on whether or not there is
-	 * an attribute, not whether size is nonzero. */
-	if ((fdata->attribs & ATTRIB_SIZE_SHARED) && attrib->value) {
-	 snprintf(buf, sizeof(buf), SIZE_T_FMT, attrib->size);
-	 appendattvalue(&attvalues, "size.shared", buf);
-	}
-
-	/* For this one we need both a value for the entry *and* a nonzero
-	 * modifiedsince time */
-	if ((fdata->attribs & ATTRIB_MODIFIEDSINCE_SHARED)
-	 && attrib->value && attrib->modifiedsince) {
-	 snprintf(buf, sizeof(buf), "%ld", attrib->modifiedsince);
-	 appendattvalue(&attvalues, "modifiedsince.shared", buf);
+	if ((state->attribs & ATTRIB_SIZE_SHARED)) {
+	 buf_reset(&buf);
+	 buf_printf(&buf, SIZE_T_FMT, value->len);
+	 appendattvalue(&state->attvalues, "size.shared", &buf);
+	 state->found |= ATTRIB_SIZE_SHARED;
 	}
 }
 else { /* private annotation */
-	if ((fdata->attribs & ATTRIB_VALUE_PRIV) && attrib->value) {
-	 appendattvalue(&attvalues, "value.priv", attrib->value);
+	if ((state->attribs & ATTRIB_VALUE_PRIV)) {
+	 appendattvalue(&state->attvalues, "value.priv", value);
+	 state->found |= ATTRIB_VALUE_PRIV;
 	}
 
-	if ((fdata->attribs & ATTRIB_CONTENTTYPE_PRIV)
-	 && attrib->value && attrib->contenttype) {
-	 appendattvalue(&attvalues, "content-type.priv",
-			 attrib->contenttype);
+	if ((state->attribs & ATTRIB_SIZE_PRIV)) {
+	 buf_reset(&buf);
+	 buf_printf(&buf, SIZE_T_FMT, value->len);
+	 appendattvalue(&state->attvalues, "size.priv", &buf);
+	 state->found |= ATTRIB_SIZE_PRIV;
 	}
+ }
+ buf_free(&buf);
+}
 
-	/* Base the return of the size attribute on whether or not there is
-	 * an attribute, not whether size is nonzero. */
-	if ((fdata->attribs & ATTRIB_SIZE_PRIV) && attrib->value) {
-	 snprintf(buf, sizeof(buf), SIZE_T_FMT, attrib->size);
-	 appendattvalue(&attvalues, "size.priv", buf);
-	}
+/* Note that unlike store access control, fetch access control
+ * is identical between shared and private annotations */
+static int _annotate_may_fetch(annotate_state_t *state,
+			 const annotate_entrydesc_t *desc)
+{
+ unsigned int my_rights;
+ unsigned int needed = 0;
+ const char *acl = NULL;
+
+ /* Admins can do anything */
+ if (state->isadmin)
+	return 1;
+
+ /* Some entries need to do their own access control */
+ if ((desc->type & ATTRIB_NO_FETCH_ACL_CHECK))
+	return 1;
+
+ if (state->which == ANNOTATION_SCOPE_SERVER) {
+	/* RFC5464 doesn't mention access control for server
+	 * annotations, but this seems a sensible practice and is
+	 * consistent with past Cyrus behaviour */
+	return 1;
+ }
+ else if (state->which == ANNOTATION_SCOPE_MAILBOX) {
+	assert(state->mailbox);
+
+	/* Make sure its a local mailbox annotation */
+	if (state->mbentry && state->mbentry->server)
+	 return 0;
+
+	acl = state->mailbox->acl;
+	/* RFC5464 is a trifle vague about access control for mailbox
+	 * annotations but this seems to be compliant */
+	needed = ACL_LOOKUP|ACL_READ;
+	/* fall through to ACL check */
+ }
+ else if (state->which == ANNOTATION_SCOPE_MESSAGE) {
+	assert(state->mailbox);
+	acl = state->mailbox->acl;
+	/* RFC5257: reading from a private annotation needs 'r'.
+	 * Reading from a shared annotation needs 'r' */
+	needed = ACL_READ;
+	/* fall through to ACL check */
+ }
+
+ if (!acl)
+	return 0;
 
-	/* For this one we need both a value for the entry *and* a nonzero
-	 * modifiedsince time */
-	if ((fdata->attribs & ATTRIB_MODIFIEDSINCE_PRIV)
-	 && attrib->value && attrib->modifiedsince) {
-	 snprintf(buf, sizeof(buf), "%ld", attrib->modifiedsince);
-	 appendattvalue(&attvalues, "modifiedsince.priv", buf);
-	}
- }
+ my_rights = cyrus_acl_myrights(state->auth_state, acl);
+
+ return ((my_rights & needed) == needed);
 }
 
-static void annotation_get_fromfile(const char *int_mboxname __attribute__((unused)),
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock __attribute__((unused)),
-				 void *rock)
+static void annotation_get_fromfile(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
- const char *filename = (const char *) rock;
- char pathMAX_MAILBOX_PATH+1, bufMAX_MAILBOX_PATH+1, *p;
+ const char *filename = (const char *) entry->desc->rock;
+ char pathMAX_MAILBOX_PATH+1;
+ struct buf value = BUF_INITIALIZER;
 FILE *f;
- struct stat statbuf;
- struct annotation_data attrib;
 
 snprintf(path, sizeof(path), "%s/msg/%s", config_dir, filename);
- if ((f = fopen(path, "r")) && fgets(buf, sizeof(buf), f)) {
-	if ((p = strchr(buf, '\r'))!=NULL) *p = 0;
-	if ((p = strchr(buf, '\n'))!=NULL) *p = 0;
-
-	memset(&attrib, 0, sizeof(attrib));
-
-	attrib.value = buf;
-	attrib.size = strlen(buf);
-	attrib.contenttype = "text/plain";
-	if (!fstat(fileno(f), &statbuf))
-	 attrib.modifiedsince = statbuf.st_mtime;
+ if ((f = fopen(path, "r")) && buf_getline(&value, f)) {
 
-	output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+	/* TODO: we need a buf_chomp() */
+	if (value.svalue.len-1 == '\r')
+	 buf_truncate(&value, value.len-1);
 }
 if (f) fclose(f);
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
 }
 
-static void annotation_get_freespace(const char *int_mboxname __attribute__((unused)),
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock __attribute__((unused)),
-				 void *rock __attribute__((unused)))
+static void annotation_get_freespace(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
 unsigned long tavail;
- char value21;
- struct annotation_data attrib;
+ struct buf value = BUF_INITIALIZER;
 
 (void) find_free_partition(&tavail);
-
- if (snprintf(value, sizeof(value), "%lu", tavail) == -1) return;
-
- memset(&attrib, 0, sizeof(attrib));
-
- attrib.value = value;
- attrib.size = strlen(value);
- attrib.contenttype = "text/plain";
-
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ buf_printf(&value, "%lu", tavail);
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
 }
 
-static void annotation_get_server(const char *int_mboxname,
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock __attribute__((unused))) 
+static void annotation_get_server(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
- struct annotation_data attrib;
-
- if(!int_mboxname || !ext_mboxname || !fdata || !mbrock)
-	fatal("annotation_get_server called with bad parameters", EC_TEMPFAIL);
- 
- get_mb_data(int_mboxname, mbrock);
+ struct buf value = BUF_INITIALIZER;
+ int r;
 
- /* Make sure its a remote mailbox */
- if (!mbrock->server) return;
+ assert(state);
+ assert(state->which == ANNOTATION_SCOPE_MAILBOX);
+ r = annotate_state_need_mbentry(state);
+ assert(r == 0);
 
 /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP)))
-	return;
-
- memset(&attrib, 0, sizeof(attrib));
-
- attrib.value = mbrock->server;
- if(mbrock->server) {
-	attrib.size = strlen(mbrock->server);
-	attrib.contenttype = "text/plain";
- }
-
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ /* Note that we use a weaker form of access control than
+ * normal - we only check for ACL_LOOKUP and we don't refuse
+ * access if the mailbox is not local */
+ if (!state->mbentry->acl ||
+ !(cyrus_acl_myrights(state->auth_state, state->mbentry->acl) & ACL_LOOKUP))
+	goto out;
+
+ if (state->mbentry->server)
+	buf_appendcstr(&value, state->mbentry->server);
+
+ output_entryatt(state, entry->name, "", &value);
+out:
+ buf_free(&value);
 }
 
-static void annotation_get_partition(const char *int_mboxname,
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock __attribute__((unused))) 
+static void annotation_get_partition(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
- struct annotation_data attrib;
-
- if(!int_mboxname || !ext_mboxname || !fdata || !mbrock)
-	fatal("annotation_get_partition called with bad parameters",
-	 EC_TEMPFAIL);
- 
- get_mb_data(int_mboxname, mbrock);
+ struct buf value = BUF_INITIALIZER;
+ int r;
 
- /* Make sure its a local mailbox */
- if (mbrock->server) return;
+ assert(state);
+ assert(state->which == ANNOTATION_SCOPE_MAILBOX);
+ r = annotate_state_need_mbentry(state);
+ assert(r == 0);
 
 /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP)))
-	return;
-
- memset(&attrib, 0, sizeof(attrib));
+ if (!state->mbentry->acl ||
+ !(cyrus_acl_myrights(state->auth_state, state->mbentry->acl) & ACL_LOOKUP))
+	goto out;
 
- attrib.value = mbrock->partition;
- if(mbrock->partition) {
-	attrib.size = strlen(mbrock->partition);
-	attrib.contenttype = "text/plain";
- }
+ if (!state->mbentry->server)
+	buf_appendcstr(&value, state->mbentry->partition);
 
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ output_entryatt(state, entry->name, "", &value);
+out:
+ buf_free(&value);
 }
 
-static void annotation_get_size(const char *int_mboxname,
-				const char *ext_mboxname,
-				const char *entry,
-				struct fetchdata *fdata,
-				struct mailbox_annotation_rock *mbrock,
-				void *rock __attribute__((unused))) 
+static void annotation_get_size(annotate_state_t *state,
+			 struct annotate_entry_list *entry)
 {
- struct mailbox *mailbox = NULL;
- char value21;
- struct annotation_data attrib;
-
- if (!int_mboxname || !ext_mboxname || !fdata || !mbrock)
-	fatal("annotation_get_size called with bad parameters",
-	 EC_TEMPFAIL);
- 
- get_mb_data(int_mboxname, mbrock);
-
- /* Make sure its a local mailbox */
- if (mbrock->server) return;
-
- /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_READ)))
-	return;
-
- if (mailbox_open_irl(int_mboxname, &mailbox))
-	return;
-
- if (snprintf(value, sizeof(value), QUOTA_T_FMT, mailbox->i.quota_mailbox_used) == -1)
-	return;
-
- mailbox_close(&mailbox);
-
- memset(&attrib, 0, sizeof(attrib));
+ struct mailbox *mailbox = state->mailbox;
+ struct buf value = BUF_INITIALIZER;
 
- attrib.value = value;
- attrib.size = strlen(value);
- attrib.contenttype = "text/plain";
+ assert(mailbox);
 
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ buf_printf(&value, QUOTA_T_FMT, mailbox->i.quota_mailbox_used);
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
 }
 
-static void annotation_get_lastupdate(const char *int_mboxname,
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock __attribute__((unused))) 
+static void annotation_get_lastupdate(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
 struct stat sbuf;
- char valuebuf128;
- struct annotation_data attrib;
+ char valuebufRFC3501_DATETIME_MAX+1;
+ struct buf value = BUF_INITIALIZER;
 char *fname;
+ int r;
 
- if(!int_mboxname || !ext_mboxname || !fdata || !mbrock)
-	fatal("annotation_get_lastupdate called with bad parameters",
-	 EC_TEMPFAIL);
- 
- get_mb_data(int_mboxname, mbrock);
-
- /* Make sure its a local mailbox */
- if (mbrock->server) return;
+ r = annotate_state_need_mbentry(state);
+ if (r)
+	goto out;
 
- /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_READ)))
-	return;
-
- fname = mboxname_metapath(mbrock->partition, int_mboxname, META_INDEX, 0);
- if (!fname) return;
- if (stat(fname, &sbuf) == -1) return;
- 
- cyrus_ctime(sbuf.st_mtime, valuebuf);
- 
- memset(&attrib, 0, sizeof(attrib));
+ fname = mboxname_metapath(state->mbentry->partition,
+			 state->mbentry->name, META_INDEX, 0);
+ if (!fname)
+	goto out;
+ if (stat(fname, &sbuf) == -1)
+	goto out;
 
- attrib.value = valuebuf;
- attrib.size = strlen(valuebuf);
- attrib.contenttype = "text/plain";
+ time_to_rfc3501(sbuf.st_mtime, valuebuf, sizeof(valuebuf));
+ buf_appendcstr(&value, valuebuf);
 
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ output_entryatt(state, entry->name, "", &value);
+out:
+ buf_free(&value);
 }
 
-static void annotation_get_lastpop(const char *int_mboxname,
- const char *ext_mboxname,
- const char *entry,
- struct fetchdata *fdata,
- struct mailbox_annotation_rock *mbrock,
- void *rock __attribute__((unused)))
-{ 
- struct mailbox *mailbox = NULL;
- char value40;
- struct annotation_data attrib;
- 
- if(!int_mboxname || !ext_mboxname || !fdata || !mbrock)
- fatal("annotation_get_lastpop called with bad parameters",
- EC_TEMPFAIL);
-
- get_mb_data(int_mboxname, mbrock);
-
- /* Make sure its a local mailbox */
- if (mbrock->server) return;
-
- /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_READ)))
- return;
-
+static void annotation_get_lastpop(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct mailbox *mailbox = state->mailbox;
+ char valuebufRFC3501_DATETIME_MAX+1;
+ struct buf value = BUF_INITIALIZER;
 
- if (mailbox_open_irl(int_mboxname, &mailbox) != 0)
- return;
+ assert(mailbox);
 
- if (mailbox->i.pop3_last_login == 0) {
-	strcpy (value, " ");
- } else {
-	cyrus_ctime(mailbox->i.pop3_last_login, value);
+ if (mailbox->i.pop3_last_login) {
+	time_to_rfc3501(mailbox->i.pop3_last_login, valuebuf,
+			sizeof(valuebuf));
+	buf_appendcstr(&value, valuebuf);
 }
 
- mailbox_close(&mailbox);
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
+}
 
- memset(&attrib, 0, sizeof(attrib));
+static void annotation_get_mailboxopt(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct mailbox *mailbox = state->mailbox;
+ uint32_t flag = (unsigned long)entry->desc->rock;
+ struct buf value = BUF_INITIALIZER;
 
- attrib.value = value;
- attrib.size = strlen(value);
- attrib.contenttype = "text/plain";
+ assert(mailbox);
 
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ buf_appendcstr(&value,
+		 (mailbox->i.options & flag ? "true" : "false"));
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
 }
 
-static void annotation_get_mailboxopt(const char *int_mboxname,
-				 const char *ext_mboxname,
-				 const char *entry,
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock __attribute__((unused)))
-{ 
- struct mailbox *mailbox = NULL;
- int flag = 0, i;
- char value40;
- struct annotation_data attrib;
- 
- if(!int_mboxname || !ext_mboxname || !entry || !fdata || !mbrock)
- fatal("annotation_get_mailboxopt called with bad parameters",
- EC_TEMPFAIL);
-
- get_mb_data(int_mboxname, mbrock);
-
- /* Make sure its a local mailbox */
- if (mbrock->server) return;
-
- /* check that this is a mailboxopt annotation */
- for (i = 0; annotate_mailbox_flagsi.name; i++) {
-	if (!strcmp(entry, annotate_mailbox_flagsi.name)) {
-	 flag = annotate_mailbox_flagsi.flag;
-	 break;
-	}
- }
- if (!flag) return;
- 
- /* Check ACL */
- if(!fdata->isadmin &&
- (!mbrock->acl ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
- !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_READ)))
- return;
-
+static void annotation_get_pop3showafter(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct mailbox *mailbox = state->mailbox;
+ char valuebufRFC3501_DATETIME_MAX+1;
+ struct buf value = BUF_INITIALIZER;
 
- if (mailbox_open_irl(int_mboxname, &mailbox) != 0)
- return;
+ assert(mailbox);
 
- if (mailbox->i.options & flag) {
-	strcpy(value, "true");
- } else {
-	strcpy(value, "false");
+ if (mailbox->i.pop3_show_after)
+ {
+	time_to_rfc3501(mailbox->i.pop3_show_after, valuebuf, sizeof(valuebuf));
+	buf_appendcstr(&value, valuebuf);
 }
 
- mailbox_close(&mailbox);
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
+}
+
+static void annotation_get_usermodseq(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct buf value = BUF_INITIALIZER;
+ modseq_t modseq;
+ char *mboxname = NULL;
 
- memset(&attrib, 0, sizeof(attrib));
+ assert(state);
+ assert(state->userid);
 
- attrib.value = value;
- attrib.size = strlen(value);
- attrib.contenttype = "text/plain";
+ mboxname = mboxname_user_mbox(state->userid, NULL);
+ modseq = mboxname_readmodseq(mboxname);
 
- output_entryatt(ext_mboxname, entry, "", &attrib, fdata);
+ buf_printf(&value, "%llu", modseq);
+
+ output_entryatt(state, entry->name, state->userid, &value);
+ free(mboxname);
+ buf_free(&value);
 }
 
-struct rw_rock {
- const char *ext_mboxname;
- struct fetchdata *fdata;
-};
+static void annotation_get_uniqueid(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct buf value = BUF_INITIALIZER;
+
+ assert(state->mailbox);
+
+ if (state->mailbox->uniqueid)
+	buf_appendcstr(&value, state->mailbox->uniqueid);
+
+ output_entryatt(state, entry->name, "", &value);
+ buf_free(&value);
+}
 
 static int rw_cb(const char *mailbox __attribute__((unused)),
+		 uint32_t uid __attribute__((unused)),
 		 const char *entry, const char *userid,
-		 struct annotation_data *attrib, void *rock)
+		 const struct buf *value, void *rock)
 {
- struct rw_rock *rw_rock = (struct rw_rock *) rock;
+ annotate_state_t *state = (annotate_state_t *)rock;
 
- if (!userid0 || !strcmp(userid, rw_rock->fdata->userid)) {
-	output_entryatt(rw_rock->ext_mboxname, entry, userid, attrib,
-			rw_rock->fdata);
+ if (!userid0 || !strcmp(userid, state->userid)) {
+	output_entryatt(state, entry, userid, value);
 }
 
 return 0;
 }
 
-static void annotation_get_fromdb(const char *int_mboxname,
-				 const char *ext_mboxname,
-				 const char *entry __attribute__((unused)),
-				 struct fetchdata *fdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock)
+static void annotation_get_fromdb(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
- struct rw_rock rw_rock;
- const char *entrypat = (const char *) rock;
-
- if(!int_mboxname || !ext_mboxname || !entrypat || !fdata ||
- (int_mboxname0 && !mbrock)) {
-	fatal("annotation_get_fromdb called with bad parameters", EC_TEMPFAIL);
- }
-
- if (!int_mboxname0) {
-	/* server annotation */
-
-	/* XXX any kind of access controls for reading? */
- }
- else {
-	/* mailbox annotation */
-	get_mb_data(int_mboxname, mbrock);
-
-	/* Make sure its a local mailbox */
-	if (mbrock->server) return;
-
-	/* Check ACL */
-	if(!fdata->isadmin &&
-	 (!mbrock->acl ||
-	 !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
-	 !(cyrus_acl_myrights(fdata->auth_state, mbrock->acl) & ACL_READ)))
-	 return;
+ const char *mboxname = (state->mailbox ? state->mailbox->name : "");
+ state->found = 0;
+
+ annotatemore_findall(mboxname, state->uid, entry->name, &rw_cb, state);
+
+ if (state->found != state->attribs &&
+	(!strchr(entry->name, '%') && !strchr(entry->name, '*'))) {
+	/* some results not found for an explicitly specified entry,
+	 * make sure we emit explicit NILs */
+	struct buf empty = BUF_INITIALIZER;
+	if (!(state->found & (ATTRIB_VALUE_PRIV|ATTRIB_SIZE_PRIV)) &&
+	 (state->attribs & (ATTRIB_VALUE_PRIV|ATTRIB_SIZE_PRIV))) {
+	 /* store up value.priv and/or size.priv */
+	 output_entryatt(state, entry->name, state->userid, &empty);
+	}
+	if (!(state->found & (ATTRIB_VALUE_SHARED|ATTRIB_SIZE_SHARED)) &&
+	 (state->attribs & (ATTRIB_VALUE_SHARED|ATTRIB_SIZE_SHARED))) {
+	 /* store up value.shared and/or size.shared */
+	 output_entryatt(state, entry->name, "", &empty);
+	}
+	/* flush any stored attribute-value pairs */
+	flush_entryatt(state);
 }
-
- rw_rock.ext_mboxname = ext_mboxname;
- rw_rock.fdata = fdata;
-
- annotatemore_findall(int_mboxname, entrypat, &rw_cb, &rw_rock, NULL);
 }
 
-struct annotate_f_entry
+/* TODO: need to handle /<section-part>/ somehow */
+static const annotate_entrydesc_t message_builtin_entries =
 {
- const char *name;		/* entry name */
- annotation_proxy_t proxytype; /* mask of allowed server types */
- void (*get)(const char *int_mboxname, const char *ext_mboxname,
-		const char *name, struct fetchdata *fdata,
-		struct mailbox_annotation_rock *mbrock,
-		void *rock);	/* function to get the entry */
- void *rock;			/* rock passed to get() function */
+ {
+	/* RFC5257 defines /altsubject with both .shared & .priv */
+	"/altsubject",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/* RFC5257 defines /comment with both .shared & .priv */
+	"/comment",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{ NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL, NULL }
 };
 
-struct annotate_f_entry_list
+static const annotate_entrydesc_t message_db_entry =
+ {
+	NULL,
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ };
+
+static const annotate_entrydesc_t mailbox_builtin_entries =
 {
- const struct annotate_f_entry *entry;
- const char *entrypat;
- struct annotate_f_entry_list *next;
-};
-
-const struct annotate_f_entry mailbox_ro_entries =
-{
- { "/vendor/cmu/cyrus-imapd/partition", BACKEND_ONLY,
- annotation_get_partition, NULL },
- { "/vendor/cmu/cyrus-imapd/server", PROXY_ONLY,
- annotation_get_server, NULL },
- { "/vendor/cmu/cyrus-imapd/size", BACKEND_ONLY,
- annotation_get_size, NULL },
- { "/vendor/cmu/cyrus-imapd/lastupdate", BACKEND_ONLY,
- annotation_get_lastupdate, NULL },
- { "/vendor/cmu/cyrus-imapd/lastpop", BACKEND_ONLY,
- annotation_get_lastpop, NULL },
- { "/vendor/cmu/cyrus-imapd/pop3newuidl", BACKEND_ONLY,
- annotation_get_mailboxopt, NULL },
- { "/vendor/cmu/cyrus-imapd/sharedseen", BACKEND_ONLY,
- annotation_get_mailboxopt, NULL },
- { "/vendor/cmu/cyrus-imapd/duplicatedeliver", BACKEND_ONLY,
- annotation_get_mailboxopt, NULL },
- { NULL, ANNOTATION_PROXY_T_INVALID, NULL, NULL }
+ {
+	/*
+	 * This entry was defined in the early ANNOTATMORE drafts but
+	 * disappeared as of draft 13 and didn't make it into the final
+	 * RFC. We keep it around because it's not too hard to
+	 * implement.
+	 */
+	"/check",
+	ATTRIB_TYPE_BOOLEAN,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/*
+	 * This entry was defined in the early ANNOTATMORE drafts but
+	 * disappeared as of draft 13 and didn't make it into the final
+	 * RFC. We keep it around because it's not too hard to
+	 * implement.
+	 */
+	"/checkperiod",
+	ATTRIB_TYPE_UINT,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/* RFC5464 defines /shared/comment and /private/comment */
+	"/comment",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/*
+	 * This entry was defined in the early ANNOTATMORE drafts but
+	 * disappeared as of draft 13 and didn't make it into the final
+	 * RFC. We keep it around because it's not too hard to
+	 * implement, even though we don't check the format.
+	 */
+	"/sort",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/*
+	 * RFC6154 defines /private/specialuse.
+	 */
+	"/specialuse",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_specialuse,
+	NULL
+ },{
+	/*
+	 * This entry was defined in the early ANNOTATMORE drafts but
+	 * disappeared as of draft 13 and didn't make it into the final
+	 * RFC. We keep it around because it's not too hard to
+	 * implement, even though we don't check the format.
+	 */
+	"/thread",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/duplicatedeliver",
+	ATTRIB_TYPE_BOOLEAN,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_mailboxopt,
+	annotation_set_mailboxopt,
+	(void *)OPT_IMAP_DUPDELIVER
+ },{
+	"/vendor/cmu/cyrus-imapd/expire",
+	ATTRIB_TYPE_UINT,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/lastpop",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_lastpop,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/lastupdate",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_lastupdate,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/news2mail",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/partition",
+	/* _get_partition does its own access control check */
+	ATTRIB_TYPE_STRING | ATTRIB_NO_FETCH_ACL_CHECK,
+ BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+ annotation_get_partition,
+	/*set*/NULL,
+ NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/pop3newuidl",
+	ATTRIB_TYPE_BOOLEAN,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_mailboxopt,
+	annotation_set_mailboxopt,
+	(void *)OPT_POP3_NEW_UIDL
+ },{
+	"/vendor/cmu/cyrus-imapd/pop3showafter",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_pop3showafter,
+	annotation_set_pop3showafter,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/server",
+	/* _get_server does its own access control check */
+	ATTRIB_TYPE_STRING | ATTRIB_NO_FETCH_ACL_CHECK,
+	PROXY_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_server,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/sharedseen",
+	ATTRIB_TYPE_BOOLEAN,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_mailboxopt,
+	annotation_set_mailboxopt,
+ (void *)OPT_IMAP_SHAREDSEEN
+ },{
+	"/vendor/cmu/cyrus-imapd/sieve",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/size",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+ annotation_get_size,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/squat",
+	ATTRIB_TYPE_BOOLEAN,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/uniqueid",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_uniqueid,
+	NULL,
+	NULL
+ },{ NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL, NULL }
 };
 
-const struct annotate_f_entry mailbox_rw_entry =
- { NULL, BACKEND_ONLY, annotation_get_fromdb, NULL };
-
-const struct annotate_f_entry server_legacy_entries =
+static const annotate_entrydesc_t mailbox_db_entry =
+ {
+	NULL,
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ };
+
+static const annotate_entrydesc_t server_builtin_entries =
 {
- { "/motd", PROXY_AND_BACKEND, annotation_get_fromfile, "motd" },
- { "/vendor/cmu/cyrus-imapd/shutdown", PROXY_AND_BACKEND,
- annotation_get_fromfile, "shutdown" },
- { "/vendor/cmu/cyrus-imapd/freespace", BACKEND_ONLY,
- annotation_get_freespace, NULL },
- { NULL, ANNOTATION_PROXY_T_INVALID, NULL, NULL }
+ {
+	/* RFC5464 defines /shared/admin. */
+	"/admin",
+	ATTRIB_TYPE_STRING,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/* RFC5464 defines /shared/comment. */
+	"/comment",
+	ATTRIB_TYPE_STRING,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	/*
+	 * This entry was defined in the early ANNOTATMORE drafts but
+	 * disappeared as of draft 13 and didn't make it into the final
+	 * RFC. We keep it around because it's not too hard to
+	 * implement.
+	 */
+	"/motd",
+	ATTRIB_TYPE_STRING,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_fromfile,
+	annotation_set_tofile,
+	(void *)"motd"
+ },{
+	/* The "usemodseq" was added with conversations support, to allow
+	 * a single value to show any changes to anything about a user */
+	"/vendor/cmu/cyrus-imapd/usermodseq",
+	ATTRIB_TYPE_UINT,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_usermodseq,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/expire",
+	ATTRIB_TYPE_UINT,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/freespace",
+	ATTRIB_TYPE_STRING,
+	BACKEND_ONLY,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_freespace,
+	/*set*/NULL,
+	NULL
+ },{
+	"/vendor/cmu/cyrus-imapd/shutdown",
+	ATTRIB_TYPE_STRING,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED,
+	0,
+	annotation_get_fromfile,
+	annotation_set_tofile,
+	(void *)"shutdown"
+ },{
+	"/vendor/cmu/cyrus-imapd/squat",
+	ATTRIB_TYPE_BOOLEAN,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED,
+	ACL_ADMIN,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ },{ NULL, 0, ANNOTATION_PROXY_T_INVALID,
+	0, 0, NULL, NULL, NULL }
 };
 
-const struct annotate_f_entry server_entry =
- { NULL, PROXY_AND_BACKEND, annotation_get_fromdb, NULL };
+static const annotate_entrydesc_t server_db_entry =
+ {
+	NULL,
+	ATTRIB_TYPE_STRING,
+	PROXY_AND_BACKEND,
+	ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
+	0,
+	annotation_get_fromdb,
+	annotation_set_todb,
+	NULL
+ };
 
 /* Annotation attributes and their flags */
 struct annotate_attrib
@@ -1053,7 +2021,7 @@
 int entry;
 };
 
-const struct annotate_attrib annotation_attributes = 
+static const struct annotate_attrib annotation_attributes =
 {
 { "value", ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV },
 { "value.shared", ATTRIB_VALUE_SHARED },
@@ -1061,188 +2029,153 @@
 { "size", ATTRIB_SIZE_SHARED | ATTRIB_SIZE_PRIV },
 { "size.shared", ATTRIB_SIZE_SHARED },
 { "size.priv", ATTRIB_SIZE_PRIV },
- { "modifiedsince", ATTRIB_MODIFIEDSINCE_SHARED | ATTRIB_MODIFIEDSINCE_PRIV },
- { "modifiedsince.shared", ATTRIB_MODIFIEDSINCE_SHARED },
- { "modifiedsince.priv", ATTRIB_MODIFIEDSINCE_PRIV },
- { "content-type", ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV },
- { "content-type.shared", ATTRIB_CONTENTTYPE_SHARED },
- { "content-type.priv", ATTRIB_CONTENTTYPE_PRIV },
+ /*
+ * The following attribute names appeared in the first drafts of the
+ * ANNOTATEMORE extension but did not make it to the final RFC, or
+ * even to draft 11 which we also officially support. They might
+ * appear in old annotation definition files, so we map them to
+ * ATTRIB_DEPRECATED and issue a warning rather then remove them
+ * entirely.
+ */
+ { "modifiedsince", ATTRIB_DEPRECATED },
+ { "modifiedsince.shared", ATTRIB_DEPRECATED },
+ { "modifiedsince.priv", ATTRIB_DEPRECATED },
+ { "content-type", ATTRIB_DEPRECATED },
+ { "content-type.shared", ATTRIB_DEPRECATED },
+ { "content-type.priv", ATTRIB_DEPRECATED },
 { NULL, 0 }
 };
 
-static int fetch_cb(char *name, int matchlen,
-		 int maycreate __attribute__((unused)), void* rock)
+static void _annotate_fetch_entries(annotate_state_t *state,
+				 int proxy_check)
 {
- struct fetchdata *fdata = (struct fetchdata *) rock;
- struct annotate_f_entry_list *entries_ptr;
- static char lastnameMAX_MAILBOX_BUFFER;
- static int sawuser = 0;
- int c;
- char int_mboxnameMAX_MAILBOX_BUFFER, ext_mboxnameMAX_MAILBOX_BUFFER;
- struct mailbox_annotation_rock mbrock;
-
- /* We have to reset the sawuser flag before each fetch command.
- * Handle it as a dirty hack.
- */
- if (name == NULL) {
-	sawuser = 0;
-	lastname0 = '\0';
-	return 0;
- }
- /* Suppress any output of a partial match */
- if (namematchlen && strncmp(lastname, name, matchlen) == 0) {
-	return 0;
- }
-
- /*
- * We can get a partial match for "user" multiple times with
- * other matches inbetween. Handle it as a special case
- */
- if (matchlen == 4 && strncasecmp(name, "user", 4) == 0) {
-	if (sawuser) return 0;
-	sawuser = 1;
- }
-
- strlcpy(lastname, name, sizeof(lastname));
- lastnamematchlen = '\0';
-
- if (!strncasecmp(lastname, "INBOX", 5)) {
-	(*fdata->namespace->mboxname_tointernal)(fdata->namespace, "INBOX",
-						 fdata->userid, int_mboxname);
-	strlcat(int_mboxname, lastname+5, sizeof(int_mboxname));
- }
- else
-	strlcpy(int_mboxname, lastname, sizeof(int_mboxname));
-
- c = namematchlen;
- if (c) namematchlen = '\0';
- (*fdata->namespace->mboxname_toexternal)(fdata->namespace, name,
-					 fdata->userid, ext_mboxname);
- if (c) namematchlen = c;
-
- memset(&mbrock, 0, sizeof(struct mailbox_annotation_rock));
-
- if (proxy_fetch_func && fdata->orig_entry) {
-	get_mb_data(int_mboxname, &mbrock);
- }
+ struct annotate_entry_list *ee;
 
 /* Loop through the list of provided entries to get */
- for (entries_ptr = fdata->entry_list;
-	 entries_ptr;
-	 entries_ptr = entries_ptr->next) {
-	
-	entries_ptr->entry->get(int_mboxname, ext_mboxname,
-				entries_ptr->entry->name, fdata,
-				&mbrock, (entries_ptr->entry->rock ?
-					 entries_ptr->entry->rock :
-					 (void*) entries_ptr->entrypat));
- }
+ for (ee = state->entry_list; ee; ee = ee->next) {
 
- if (proxy_fetch_func && fdata->orig_entry && mbrock.server &&
-	!hash_lookup(mbrock.server, &(fdata->server_table))) {
-	/* xxx ignoring result */
-	proxy_fetch_func(mbrock.server, fdata->orig_mailbox,
-			 fdata->orig_entry, fdata->orig_attribute);
-	hash_insert(mbrock.server, (void *)0xDEADBEEF, &(fdata->server_table));
- }
+	if (proxy_check) {
+	 if (ee->desc->proxytype == BACKEND_ONLY &&
+	 proxy_fetch_func &&
+		!config_getstring(IMAPOPT_PROXYSERVERS))
+		continue;
+	}
 
- cleanup_mbrock(&mbrock);
+	if (!_annotate_may_fetch(state, ee->desc))
+	 continue;
 
- return 0;
+	ee->desc->get(state, ee);
+ }
 }
 
-int annotatemore_fetch(char *mailbox,
-		 struct strlist *entries, struct strlist *attribs,
-		 struct namespace *namespace, int isadmin, char *userid,
-		 struct auth_state *auth_state, struct protstream *pout)
+EXPORTED int annotate_state_fetch(annotate_state_t *state,
+		 const strarray_t *entries, const strarray_t *attribs,
+		 annotate_fetch_cb_t callback, void *rock,
+		 int *maxsizeptr)
 {
- struct strlist *e = entries;
- struct strlist *a = attribs;
- struct fetchdata fdata;
+ int i;
 struct glob *g;
- const struct annotate_f_entry *non_db_entries;
- const struct annotate_f_entry *db_entry;
-
- memset(&fdata, 0, sizeof(struct fetchdata));
- fdata.pout = pout;
- fdata.namespace = namespace;
- fdata.userid = userid;
- fdata.isadmin = isadmin;
- fdata.auth_state = auth_state;
+ const ptrarray_t *non_db_entries;
+ const annotate_entrydesc_t *db_entry;
+ int r = 0;
 
- /* Reset state in output_entryatt() */
- output_entryatt(NULL, NULL, NULL, NULL, NULL);
+ annotate_state_start(state);
+ state->callback = callback;
+ state->callback_rock = rock;
+ if (maxsizeptr) {
+	state->maxsize = *maxsizeptr; /* copy to check against */
+ state->sizeptr = maxsizeptr; /* pointer to push largest back */
+ }
 
 /* Build list of attributes to fetch */
- while (a) {
+ for (i = 0 ; i < attribs->count ; i++)
+ {
+	const char *s = attribs->datai;
 	int attribcount;
 
-	g = glob_init(a->s, GLOB_HIERARCHY);
+	/*
+	 * TODO: this is bogus. The * and % wildcard characters applied
+	 * to attributes in the early drafts of the ANNOTATEMORE
+	 * extension, but not in later drafts where those characters are
+	 * actually illegal in attribute names.
+	 */
+	g = glob_init(s, GLOB_HIERARCHY);
 	
 	for (attribcount = 0;
 	 annotation_attributesattribcount.name;
 	 attribcount++) {
 	 if (GLOB_TEST(g, annotation_attributesattribcount.name) != -1) {
-		fdata.attribs |= annotation_attributesattribcount.entry;
+		if (annotation_attributesattribcount.entry & ATTRIB_DEPRECATED) {
+		 if (strcmp(s, "*"))
+			syslog(LOG_WARNING, "annotatemore_fetch: client used "
+					 "deprecated attribute \"%s\", ignoring",
+					 annotation_attributesattribcount.name);
+		}
+		else
+		 state->attribs |= annotation_attributesattribcount.entry;
 	 }
 	}
 	
 	glob_free(&g);
-
-	a = a->next;
 }
 
- if (!fdata.attribs) return 0;
+ if (!state->attribs)
+	goto out;
 
- if (!mailbox0) {
-	/* server annotation(s) */
-	non_db_entries = server_legacy_entries;
-	db_entry = &server_entry;
+ if (state->which == ANNOTATION_SCOPE_SERVER) {
+	non_db_entries = &server_entries;
+	db_entry = &server_db_entry;
+ }
+ else if (state->which == ANNOTATION_SCOPE_MAILBOX) {
+	non_db_entries = &mailbox_entries;
+	db_entry = &mailbox_db_entry;
+ }
+ else if (state->which == ANNOTATION_SCOPE_MESSAGE) {
+	non_db_entries = &message_entries;
+	db_entry = &message_db_entry;
 }
 else {
-	/* mailbox annotation(s) */
-	non_db_entries = mailbox_ro_entries;
-	db_entry = &mailbox_rw_entry;
+	syslog(LOG_ERR, "IOERROR: unknown annotation scope %d", state->which);
+	r = IMAP_INTERNAL;
+	goto out;
 }
 
 /* Build a list of callbacks for fetching the annotations */
- while (e) {
-	int entrycount;
+ for (i = 0 ; i < entries->count ; i++)
+ {
+	const char *s = entries->datai;
+	int j;
 	int check_db = 0; /* should we check the db for this entry? */
 
-	g = glob_init(e->s, GLOB_HIERARCHY);
+	g = glob_init(s, GLOB_HIERARCHY);
 	GLOB_SET_SEPARATOR(g, '/');
 
-	for (entrycount = 0;
-	 non_db_entriesentrycount.name;
-	 entrycount++) {
+	for (j = 0 ; j < non_db_entries->count ; j++) {
+	 const annotate_entrydesc_t *desc = non_db_entries->dataj;
+
+	 if (!desc->get)
+		continue;
 
-	 if (GLOB_TEST(g, non_db_entriesentrycount.name) != -1) {
+	 if (GLOB_TEST(g, desc->name) != -1) {
 		/* Add this entry to our list only if it
 		 applies to our particular server type */
-		if ((non_db_entriesentrycount.proxytype != PROXY_ONLY)
-		 || proxy_fetch_func) {
-		 struct annotate_f_entry_list *nentry =
-			xmalloc(sizeof(struct annotate_f_entry_list));
-
-		 nentry->next = fdata.entry_list;
-		 nentry->entry = &(non_db_entriesentrycount);
-		 fdata.entry_list = nentry;
-		}
+		if ((desc->proxytype != PROXY_ONLY)
+		 || proxy_fetch_func)
+		 _annotate_state_add_entry(state, desc, desc->name);
 	 }
 
-	 if (!strcmp(e->s, non_db_entriesentrycount.name)) {
+	 if (!strcmp(s, desc->name)) {
 		/* exact match */
-		if (non_db_entriesentrycount.proxytype != PROXY_ONLY) {
-		 fdata.orig_entry = entries; /* proxy it */
+		if (desc->proxytype != PROXY_ONLY) {
+		 state->orig_entry = entries; /* proxy it */
 		}
 		break;
 	 }
 	}
-		
-	if (!non_db_entriesentrycount.name) {
+
+	if (j == non_db_entries->count) {
 	 /* no exact match */
-	 fdata.orig_entry = entries; /* proxy it */
+	 state->orig_entry = entries; /* proxy it */
 	 check_db = 1;
 	}
 
@@ -1251,710 +2184,774 @@
 	if (check_db &&
 	 ((db_entry->proxytype != PROXY_ONLY) || proxy_fetch_func)) {
 	 /* Add the db entry to our list */
-	 struct annotate_f_entry_list *nentry =
-		xmalloc(sizeof(struct annotate_f_entry_list));
-
-	 nentry->next = fdata.entry_list;
-	 nentry->entry = db_entry;
-	 nentry->entrypat = e->s;
-	 fdata.entry_list = nentry;
+	 _annotate_state_add_entry(state, db_entry, s);
 	}
 	 
 	glob_free(&g);
-
-	e = e->next;
 }
 
- if (!mailbox0) {
-	/* server annotation(s) */
-
-	if (fdata.entry_list) {
-	 struct annotate_f_entry_list *entries_ptr;
-
-	 /* xxx better way to determine a size for this table? */
-	 construct_hash_table(&fdata.entry_table, 100, 1);
-
-	 /* Loop through the list of provided entries to get */
-	 for (entries_ptr = fdata.entry_list;
-		 entries_ptr;
-		 entries_ptr = entries_ptr->next) {
-	
-		if (!(entries_ptr->entry->proxytype == BACKEND_ONLY &&
-		 proxy_fetch_func && !config_getstring(IMAPOPT_PROXYSERVERS))) {
-		entries_ptr->entry->get("", "", entries_ptr->entry->name,
-					&fdata, NULL,
-					(entries_ptr->entry->rock ?
-					 entries_ptr->entry->rock :
-					 (void*) entries_ptr->entrypat));
-		}
-	 }
-
-	 free_hash_table(&fdata.entry_table, NULL);
-	}
+ if (state->which == ANNOTATION_SCOPE_SERVER) {
+	_annotate_fetch_entries(state, /*proxy_check*/1);
 }
- else {
-	/* mailbox annotation(s) */
-
-	if (fdata.entry_list || proxy_fetch_func) {
-	 char mboxpatMAX_MAILBOX_BUFFER;
-
-	 /* Reset state in fetch_cb */
-	 fetch_cb(NULL, 0, 0, 0);
+ else if (state->which == ANNOTATION_SCOPE_MAILBOX) {
 
-	 /* xxx better way to determine a size for this table? */
-	 construct_hash_table(&fdata.entry_table, 100, 1);
-
-	 if(proxy_fetch_func && fdata.orig_entry) {
-		fdata.orig_mailbox = mailbox;
-		fdata.orig_attribute = attribs;
-		/* xxx better way to determine a size for this table? */
-		construct_hash_table(&fdata.server_table, 10, 1);
+	if (state->entry_list || proxy_fetch_func) {
+	 if (proxy_fetch_func) {
+		r = annotate_state_need_mbentry(state);
+		if (r)
+		 goto out;
+		assert(state->mbentry);
 	 }
 
-	 /* copy the pattern so we can change hiersep */
-	 strlcpy(mboxpat, mailbox, sizeof(mboxpat));
-	 mboxname_hiersep_tointernal(namespace, mboxpat,
-					config_virtdomains ?
-					strcspn(mboxpat, "@") : 0);
+	 if (proxy_fetch_func && state->orig_entry) {
+		state->orig_mailbox = state->mbentry->name;
+		state->orig_attribute = attribs;
+	 }
 
-	 (*namespace->mboxlist_findall)(namespace, mboxpat,
-					 isadmin, userid,
-					 auth_state, fetch_cb,
-					 &fdata);
-	 free_hash_table(&fdata.entry_table, NULL);
+	 _annotate_fetch_entries(state, /*proxy_check*/0);
 
-	 if(proxy_fetch_func && fdata.orig_entry) {
-		free_hash_table(&fdata.server_table, NULL);
+	 if (proxy_fetch_func && state->orig_entry && state->mbentry->server &&
+		!hash_lookup(state->mbentry->server, &state->server_table)) {
+		/* xxx ignoring result */
+		proxy_fetch_func(state->mbentry->server, state->orig_mailbox,
+				 state->orig_entry, state->orig_attribute);
+		hash_insert(state->mbentry->server, (void *)0xDEADBEEF, &state->server_table);
 	 }
 	}
 }
+ else if (state->which == ANNOTATION_SCOPE_MESSAGE) {
+	_annotate_fetch_entries(state, /*proxy_check*/0);
+ }
 
 /* Flush last cached entry in output_entryatt() */
- output_entryatt("", "", "", NULL, &fdata);
-
- /* Free the entry list, if needed */
- while(fdata.entry_list) {
-	struct annotate_f_entry_list *freeme = fdata.entry_list;
-	fdata.entry_list = fdata.entry_list->next;
-	free(freeme);
- }
+ flush_entryatt(state);
 
- return 0;
+out:
+ annotate_state_finish(state);
+ return r;
 }
 
 /************************** Annotation Storing *****************************/
 
-int annotatemore_lookup(const char *mboxname, const char *entry,
-			const char *userid, struct annotation_data *attrib)
+EXPORTED int annotatemore_lookup(const char *mboxname, const char *entry,
+			const char *userid, struct buf *value)
+{
+ return annotatemore_msg_lookup(mboxname, /*uid*/0, entry, userid, value);
+}
+
+EXPORTED int annotatemore_msg_lookup(const char *mboxname, uint32_t uid, const char *entry,
+			 const char *userid, struct buf *value)
 {
 char keyMAX_MAILBOX_PATH+1;
- int keylen, datalen, r;
+ size_t keylen, datalen;
+ int r;
 const char *data;
+ annotate_db_t *d = NULL;
 
- memset(attrib, 0, sizeof(struct annotation_data));
+ r = _annotate_getdb(mboxname, uid, 0, &d);
+ if (r)
+	return (r == CYRUSDB_NOTFOUND ? 0 : r);
 
- keylen = make_key(mboxname, entry, userid, key, sizeof(key));
+ keylen = make_key(mboxname, uid, entry, userid, key, sizeof(key));
 
 do {
-	r = DB->fetch(anndb, key, keylen, &data, &datalen, NULL);
+	r = cyrusdb_fetch(d->db, key, keylen, &data, &datalen, tid(d));
 } while (r == CYRUSDB_AGAIN);
 
 if (!r && data) {
-	r = split_attribs(data, datalen, attrib);
+	r = split_attribs(data, datalen, value);
+	if (!r) {
+	 /* Force a copy, in case the putdb() call destroys
+	 * the per-db data area that @data points to. */
+	 buf_cstring(value);
+	}
 }
 else if (r == CYRUSDB_NOTFOUND) r = 0;
 
+ annotate_putdb(&d);
+ return r;
+}
+
+static int read_old_value(annotate_db_t *d,
+			 const char *key, int keylen,
+			 struct buf *valp)
+{
+ int r;
+ size_t datalen;
+ const char *data;
+
+ do {
+	r = cyrusdb_fetch(d->db, key, keylen, &data, &datalen, tid(d));
+ } while (r == CYRUSDB_AGAIN);
+
+ if (r == CYRUSDB_NOTFOUND) {
+	r = 0;
+	goto out;
+ }
+ if (r || !data)
+	goto out;
+
+ r = split_attribs(data, datalen, valp);
+
+out:
 return r;
 }
 
-static int write_entry(const char *mboxname, const char *entry,
-		 const char *userid, struct annotation_data *attrib,
-		 struct txn **tid)
+static int write_entry(struct mailbox *mailbox,
+		 unsigned int uid,
+		 const char *entry,
+		 const char *userid,
+		 const struct buf *value,
+		 int ignorequota)
 {
 char keyMAX_MAILBOX_PATH+1;
 int keylen, r;
+ annotate_db_t *d = NULL;
+ struct buf oldval = BUF_INITIALIZER;
+ const char *mboxname = mailbox ? mailbox->name : "";
+
+ r = _annotate_getdb(mboxname, uid, CYRUSDB_CREATE, &d);
+ if (r)
+	return r;
 
- keylen = make_key(mboxname, entry, userid, key, sizeof(key));
+ /* must be in a transaction to modify the db */
+ annotate_begin(d);
+
+ keylen = make_key(mboxname, uid, entry, userid, key, sizeof(key));
+
+ if (mailbox) {
+	r = read_old_value(d, key, keylen, &oldval);
+	if (r)
+	 goto out;
+ }
+
+ if (!ignorequota && mailbox) {
+	quota_t qdiffsQUOTA_NUMRESOURCES =
+		QUOTA_DIFFS_DONTCARE_INITIALIZER;
+	qdiffsQUOTA_ANNOTSTORAGE = value->len - (quota_t)oldval.len;
+	r = mailbox_quota_check(mailbox, qdiffs);
+	if (r)
+	 goto out;
+ }
+
+ /* do the annot-changed here before altering the DB */
+ if (mailbox)
+	mailbox_annot_changed(mailbox, uid, entry, userid, &oldval, value);
+
+ if (value->s == NULL) {
+
+#if DEBUG
+	syslog(LOG_ERR, "write_entry: deleting key %s from %s",
+		key_as_string(d, key, keylen), d->filename);
+#endif
 
- if (!strcmp(attrib->value, "NIL")) {
 	do {
-	 r = DB->delete(anndb, key, keylen, tid, 0);
+	 r = cyrusdb_delete(d->db, key, keylen, tid(d), /*force*/1);
 	} while (r == CYRUSDB_AGAIN);
 }
 else {
-	char dataMAX_MAILBOX_PATH+1;
-	int datalen = 0;
+	struct buf data = BUF_INITIALIZER;
 	unsigned long l;
+	static const char contenttype = "text/plain"; /* fake */
 
-	l = htonl(strlen(attrib->value));
-	memcpy(data+datalen, &l, sizeof(l));
-	datalen += sizeof(l);
+	l = htonl(value->len);
+	buf_appendmap(&data, (const char *)&l, sizeof(l));
 
-	strlcpy(data+datalen, attrib->value, sizeof(data)-datalen);
-	datalen += strlen(attrib->value) + 1;
+	buf_appendmap(&data, value->s, value->len);
+	buf_putc(&data, '\0');
 
-	if (!attrib->contenttype || !strcmp(attrib->contenttype, "NIL")) {
-	 attrib->contenttype = "text/plain";
-	}
-	strlcpy(data+datalen, attrib->contenttype, sizeof(data)-datalen);
-	datalen += strlen(attrib->contenttype) + 1;
+	/*
+	 * Older versions of Cyrus expected content-type and
+	 * modifiedsince fields after the value. We don't support those
+	 * but we write out default values just in case the database
+	 * needs to be read by older versions of Cyrus
+	 */
+	buf_appendcstr(&data, contenttype);
+	buf_putc(&data, '\0');
+
+	l = 0;	/* fake modifiedsince */
+	buf_appendmap(&data, (const char *)&l, sizeof(l));
 
-	l = htonl(attrib->modifiedsince);
-	memcpy(data+datalen, &l, sizeof(l));
-	datalen += sizeof(l);
+#if DEBUG
+	syslog(LOG_ERR, "write_entry: storing key %s to %s",
+		key_as_string(d, key, keylen), d->filename);
+#endif
 
 	do {
-	 r = DB->store(anndb, key, keylen, data, datalen, tid);
+	 r = cyrusdb_store(d->db, key, keylen, data.s, data.len, tid(d));
 	} while (r == CYRUSDB_AGAIN);
-	sync_log_annotation(mboxname);
+	buf_free(&data);
 }
 
+ if (!mailbox)
+	sync_log_annotation("");
+
+out:
+ annotate_putdb(&d);
+ buf_free(&oldval);
+
 return r;
 }
 
-int annotatemore_write_entry(const char *mboxname, const char *entry,
-			 const char *userid,
-			 const char *value, const char *contenttype,
-			 size_t size, time_t modifiedsince,
-			 struct txn **tid) 
+EXPORTED int annotatemore_rawwrite(const char *mboxname, const char *entry,
+				 const char *userid, const struct buf *value)
 {
- struct annotation_data theentry;
- 
- theentry.size = size;
- theentry.modifiedsince = modifiedsince ? modifiedsince : time(NULL);
- theentry.contenttype = contenttype ? contenttype : "text/plain";
- theentry.value = value ? value : "NIL";
+ char keyMAX_MAILBOX_PATH+1;
+ int keylen, r;
+ annotate_db_t *d = NULL;
+ uint32_t uid = 0;
 
- return write_entry(mboxname, entry, userid, &theentry, tid);
-}
+ r = _annotate_getdb(mboxname, uid, CYRUSDB_CREATE, &d);
+ if (r) goto done;
+
+ /* must be in a transaction to modify the db */
+ annotate_begin(d);
+
+ keylen = make_key(mboxname, uid, entry, userid, key, sizeof(key));
+
+ if (value->s == NULL) {
+	do {
+	 r = cyrusdb_delete(d->db, key, keylen, tid(d), /*force*/1);
+	} while (r == CYRUSDB_AGAIN);
+ }
+ else {
+	struct buf data = BUF_INITIALIZER;
+	unsigned long l;
+	static const char contenttype = "text/plain"; /* fake */
+
+	l = htonl(value->len);
+	buf_appendmap(&data, (const char *)&l, sizeof(l));
+
+	buf_appendmap(&data, value->s, value->len);
+	buf_putc(&data, '\0');
+
+	/*
+	 * Older versions of Cyrus expected content-type and
+	 * modifiedsince fields after the value. We don't support those
+	 * but we write out default values just in case the database
+	 * needs to be read by older versions of Cyrus
+	 */
+	buf_appendcstr(&data, contenttype);
+	buf_putc(&data, '\0');
+
+	l = 0;	/* fake modifiedsince */
+	buf_appendmap(&data, (const char *)&l, sizeof(l));
+
+	do {
+	 r = cyrusdb_store(d->db, key, keylen, data.s, data.len, tid(d));
+	} while (r == CYRUSDB_AGAIN);
+
+	buf_free(&data);
+ }
 
-int annotatemore_commit(struct txn *tid) {
- return tid ? DB->commit(anndb, tid) : 0;
+ if (r) goto done;
+ r = annotate_commit(d);
+
+done:
+ annotate_putdb(&d);
+
+ return r;
 }
 
-int annotatemore_abort(struct txn *tid) {
- return tid ? DB->abort(anndb, tid) : 0;
+EXPORTED int annotatemore_write(const char *mboxname, const char *entry,
+				const char *userid, const struct buf *value)
+{
+ return annotatemore_msg_write(mboxname, /*uid*/0, entry, userid, value);
 }
 
-struct storedata {
- struct namespace *namespace;
- const char *userid;
- int isadmin;
- struct auth_state *auth_state;
- struct annotate_st_entry_list *entry_list;
+EXPORTED int annotatemore_msg_write(const char *mboxname, uint32_t uid, const char *entry,
+				 const char *userid, const struct buf *value)
+{
+ struct mailbox *mailbox = NULL;
+ int r = 0;
+ annotate_db_t *d = NULL;
 
- /* number of mailboxes matching the pattern */
- unsigned count;
+ r = _annotate_getdb(mboxname, uid, CYRUSDB_CREATE, &d);
+ if (r) goto done;
 
- /* for backends only */
- struct txn *tid;
+ if (mboxname) {
+	r = mailbox_open_iwl(mboxname, &mailbox);
+	if (r) goto done;
+ }
 
- /* for proxies only */
- struct hash_table server_table;
-};
+ r = write_entry(mailbox, uid, entry, userid, value, /*ignorequota*/1);
+ if (r) goto done;
 
-enum {
- ATTRIB_TYPE_CONTENTTYPE,
- ATTRIB_TYPE_STRING,
- ATTRIB_TYPE_BOOLEAN,
- ATTRIB_TYPE_UINT,
- ATTRIB_TYPE_INT
-};
+ r = annotate_commit(d);
 
-struct annotate_st_entry {
- const char *name;		/* entry name */
- int type;			/* entry type */
- annotation_proxy_t proxytype; /* mask of allowed server types */
- int attribs;		/* mask of allowed attributes */
- int acl;			/* add'l required ACL for .shared */
- int (*set)(const char *int_mboxname, struct annotate_st_entry_list *entry,
-	 struct storedata *sdata, struct mailbox_annotation_rock *mbrock,
-	 void *rock);	/* function to set the entry */
- void *rock;			/* rock passed to set() function */
-};
+done:
+ annotate_putdb(&d);
+ mailbox_close(&mailbox);
 
-struct annotate_st_entry_list
-{
- const struct annotate_st_entry *entry;
- struct annotation_data shared;
- struct annotation_data priv;
+ return r;
+}
 
- struct annotate_st_entry_list *next;
-};
+EXPORTED int annotate_state_write(annotate_state_t *state,
+			 const char *entry,
+			 const char *userid,
+			 const struct buf *value)
+{
+ return write_entry(state->mailbox, state->uid,
+		 entry, userid, value, /*ignorequota*/1);
+}
 
-static const char *annotate_canon_value(const char *value, int type)
+static int annotate_canon_value(struct buf *value, int type)
 {
 char *p = NULL;
- unsigned long n;
+ unsigned long uwhatever;
+ long whatever;
 
- /* check for "NIL" */
- if (!strcasecmp(value, "NIL")) return "NIL";
+ /* check for NIL */
+ if (value->s == NULL)
+	return 0;
 
 switch (type) {
- case ATTRIB_TYPE_CONTENTTYPE:
-	/* XXX how do we check this? */
-	break;
-
 case ATTRIB_TYPE_STRING:
 	/* free form */
 	break;
 
 case ATTRIB_TYPE_BOOLEAN:
 	/* make sure its "true" or "false" */
-	if (!strcasecmp(value, "true")) return "true";
-	else if (!strcasecmp(value, "false")) return "false";
-	else return NULL;
+	if (value->len == 4 && !strncasecmp(value->s, "true", 4)) {
+	 buf_reset(value);
+	 buf_appendcstr(value, "true");
+	 buf_cstring(value);
+	}
+	else if (value->len == 5 && !strncasecmp(value->s, "false", 5)) {
+	 buf_reset(value);
+	 buf_appendcstr(value, "false");
+	 buf_cstring(value);
+	}
+	else return IMAP_ANNOTATION_BADVALUE;
 	break;
 
 case ATTRIB_TYPE_UINT:
 	/* make sure its a valid ulong ( >= 0 ) */
 	errno = 0;
-	n = strtoul(value, &p, 10);
-	if ((p == value)		/* no value */
+	uwhatever = strtoul(value->s, &p, 10);
+	if ((p == value->s)		/* no value */
 	 || (*p != '\0')		/* illegal char */
+	 || (unsigned)(p - value->s) != value->len
+					/* embedded NUL */
 	 || errno			/* overflow */
-	 || strchr(value, '-')) {	/* negative number */
-	 return NULL;
+	 || strchr(value->s, '-')) {	/* negative number */
+	 return IMAP_ANNOTATION_BADVALUE;
 	}
 	break;
 
 case ATTRIB_TYPE_INT:
 	/* make sure its a valid long */
 	errno = 0;
-	n = strtol(value, &p, 10);
-	if ((p == value)		/* no value */
+	whatever = strtol(value->s, &p, 10);
+	if ((p == value->s)		/* no value */
 	 || (*p != '\0')		/* illegal char */
+	 || (unsigned)(p - value->s) != value->len
+					/* embedded NUL */
 	 || errno) {			/* underflow/overflow */
-	 return NULL;
+	 return IMAP_ANNOTATION_BADVALUE;
 	}
 	break;
 
 default:
 	/* unknown type */
-	return NULL;
-	break;
+	return IMAP_ANNOTATION_BADVALUE;
 }
 
- return value;
+ if (whatever || uwhatever) /* filthy compiler magic */
+	return 0;
+
+ return 0;
 }
 
-static int store_cb(const char *name, int matchlen,
-		 int maycreate __attribute__((unused)), void *rock)
+static int _annotate_store_entries(annotate_state_t *state)
 {
- struct storedata *sdata = (struct storedata *) rock;
- struct annotate_st_entry_list *entries_ptr;
- static char lastnameMAX_MAILBOX_PATH+1;
- static int sawuser = 0;
- char int_mboxnameMAX_MAILBOX_BUFFER;
- struct mailbox_annotation_rock mbrock;
- int r = 0;
+ struct annotate_entry_list *ee;
+ int r;
 
- /* We have to reset the sawuser flag before each fetch command.
- * Handle it as a dirty hack.
- */
- if (name == NULL) {
-	sawuser = 0;
-	lastname0 = '\0';
-	return 0;
- }
- /* Suppress any output of a partial match */
- if (namematchlen && strncmp(lastname, name, matchlen) == 0) {
-	return 0;
- }
+ /* Loop through the list of provided entries to get */
+ for (ee = state->entry_list ; ee ; ee = ee->next) {
 
- /*
- * We can get a partial match for "user" multiple times with
- * other matches inbetween. Handle it as a special case
- */
- if (matchlen == 4 && strncasecmp(name, "user", 4) == 0) {
-	if (sawuser) return 0;
-	sawuser = 1;
- }
+	if (ee->have_shared &&
+	 !_annotate_may_store(state, /*shared*/1, ee->desc))
+	 return IMAP_PERMISSION_DENIED;
 
- strlcpy(lastname, name, sizeof(lastname));
- lastnamematchlen = '\0';
+	if (ee->have_priv &&
+	 !_annotate_may_store(state, /*shared*/0, ee->desc))
+	 return IMAP_PERMISSION_DENIED;
 
- if (!strncasecmp(lastname, "INBOX", 5)) {
-	(*sdata->namespace->mboxname_tointernal)(sdata->namespace, "INBOX",
-						 sdata->userid, int_mboxname);
-	strlcat(int_mboxname, lastname+5, sizeof(int_mboxname));
+	r = ee->desc->set(state, ee);
+	if (r)
+	 return r;
 }
- else
-	strlcpy(int_mboxname, lastname, sizeof(int_mboxname));
+ return 0;
+}
+
 
- memset(&mbrock, 0, sizeof(struct mailbox_annotation_rock));
- get_mb_data(int_mboxname, &mbrock);
+struct proxy_rock {
+ const char *mbox_pat;
+ struct entryattlist *entryatts;
+};
 
- for (entries_ptr = sdata->entry_list;
-	 entries_ptr;
-	 entries_ptr = entries_ptr->next) {
+static void store_proxy(const char *server, void *data __attribute__((unused)),
+			void *rock)
+{
+ struct proxy_rock *prock = (struct proxy_rock *) rock;
 
-	r = entries_ptr->entry->set(int_mboxname, entries_ptr, sdata, &mbrock,
-				 entries_ptr->entry->rock);
-	if (r) goto cleanup;
- }
+ proxy_store_func(server, prock->mbox_pat, prock->entryatts);
+}
+
+static int _annotate_may_store(annotate_state_t *state,
+			 int is_shared,
+			 const annotate_entrydesc_t *desc)
+{
+ unsigned int my_rights;
+ unsigned int needed = 0;
+ const char *acl = NULL;
+
+ /* Admins can do anything */
+ if (state->isadmin)
+	return 1;
+
+ if (state->which == ANNOTATION_SCOPE_SERVER) {
+	/* RFC5464 doesn't mention access control for server
+	 * annotations, but this seems a sensible practice and is
+	 * consistent with past Cyrus behaviour */
+	return !is_shared;
+ }
+ else if (state->which == ANNOTATION_SCOPE_MAILBOX) {
+	assert(state->mailbox);
+
+	/* Make sure its a local mailbox annotation */
+	if (state->mbentry && state->mbentry->server)
+	 return 0;
+
+	acl = state->mailbox->acl;
+	/* RFC5464 is a trifle vague about access control for mailbox
+	 * annotations but this seems to be compliant */
+	needed = ACL_LOOKUP;
+	if (is_shared)
+	 needed |= ACL_READ|ACL_WRITE|desc->extra_rights;
+	/* fall through to ACL check */
+ }
+ else if (state->which == ANNOTATION_SCOPE_MESSAGE) {
+	assert(state->mailbox);
+	acl = state->mailbox->acl;
+	/* RFC5257: writing to a private annotation needs 'r'.
+	 * Writing to a shared annotation needs 'n' */
+	needed = (is_shared ? ACL_ANNOTATEMSG : ACL_READ);
+	/* fall through to ACL check */
+ }
+
+ if (!acl)
+	return 0;
+
+ my_rights = cyrus_acl_myrights(state->auth_state, acl);
+
+ return ((my_rights & needed) == needed);
+}
 
- sync_log_annotation(int_mboxname);
+static int annotation_set_tofile(annotate_state_t *state
+				 __attribute__((unused)),
+				 struct annotate_entry_list *entry)
+{
+ const char *filename = (const char *)entry->desc->rock;
+ char pathMAX_MAILBOX_PATH+1;
+ int r;
+ FILE *f;
 
- sdata->count++;
+ snprintf(path, sizeof(path), "%s/msg/%s", config_dir, filename);
 
- if (proxy_store_func && mbrock.server &&
-	!hash_lookup(mbrock.server, &(sdata->server_table))) {
-	hash_insert(mbrock.server, (void *)0xDEADBEEF, &(sdata->server_table));
+ /* XXX how do we do this atomically with other annotations? */
+ if (entry->shared.s == NULL)
+	return unlink(path);
+ else {
+	r = cyrus_mkdir(path, 0755);
+	if (r)
+	 return r;
+	f = fopen(path, "w");
+	if (!f) {
+	 syslog(LOG_ERR, "cannot open %s for writing: %m", path);
+	 return IMAP_IOERROR;
+	}
+	fwrite(entry->shared.s, 1, entry->shared.len, f);
+	fputc('\n', f);
+	return fclose(f);
 }
 
- cleanup:
- cleanup_mbrock(&mbrock);
+ return IMAP_IOERROR;
+}
+
+static int annotation_set_todb(annotate_state_t *state,
+			 struct annotate_entry_list *entry)
+{
+ int r = 0;
+
+ if (entry->have_shared)
+	r = write_entry(state->mailbox, state->uid,
+			entry->name, "",
+			&entry->shared, 0);
+ if (!r && entry->have_priv)
+	r = write_entry(state->mailbox, state->uid,
+			entry->name, state->userid,
+			&entry->priv, 0);
 
 return r;
 }
 
-struct proxy_rock {
- const char *mbox_pat;
- struct entryattlist *entryatts;
-};
-
-static void store_proxy(char *server, void *data __attribute__((unused)),
-			void *rock)
+static int annotation_set_mailboxopt(annotate_state_t *state,
+			 struct annotate_entry_list *entry)
 {
- struct proxy_rock *prock = (struct proxy_rock *) rock;
+ struct mailbox *mailbox = state->mailbox;
+ uint32_t flag = (unsigned long)entry->desc->rock;
+ unsigned long newopts;
 
- proxy_store_func(server, prock->mbox_pat, prock->entryatts);
+ assert(mailbox);
+
+ newopts = mailbox->i.options;
+
+ if (entry->shared.s &&
+	!strcmp(entry->shared.s, "true")) {
+	newopts |= flag;
+ } else {
+	newopts &= ~flag;
+ }
+
+ /* only mark dirty if there's been a change */
+ if (mailbox->i.options != newopts) {
+	mailbox_index_dirty(mailbox);
+	mailbox->i.options = newopts;
+ }
+
+ return 0;
 }
 
-static int annotation_set_tofile(const char *int_mboxname __attribute__((unused)),
-				 struct annotate_st_entry_list *entry,
-				 struct storedata *sdata,
-				 struct mailbox_annotation_rock *mbrock __attribute__((unused)),
-				 void *rock)
+static int annotation_set_pop3showafter(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
 {
- const char *filename = (const char *) rock;
- char pathMAX_MAILBOX_PATH+1;
- FILE *f;
+ struct mailbox *mailbox = state->mailbox;
+ int r = 0;
+ time_t date;
 
- /* Check ACL */
- if (!sdata->isadmin) return IMAP_PERMISSION_DENIED;
+ assert(mailbox);
 
- snprintf(path, sizeof(path), "%s/msg/%s", config_dir, filename);
+ if (entry->shared.s == NULL) {
+	/* Effectively removes the annotation */
+	date = 0;
+ }
+ else {
+	r = time_from_rfc3501(buf_cstring(&entry->shared), &date);
+	if (r < 0)
+	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+ }
 
- /* XXX how do we do this atomically with other annotations? */
- if (!strcmp(entry->shared.value, "NIL"))
-	return unlink(path);
- else if ((f = fopen(path, "w"))) {
-	fprintf(f, "%s\n", entry->shared.value);
-	return fclose(f);
+ if (date != mailbox->i.pop3_show_after) {
+	mailbox->i.pop3_show_after = date;
+	mailbox_index_dirty(mailbox);
 }
 
- return IMAP_IOERROR;
+ return 0;
 }
 
-static int annotation_set_todb(const char *int_mboxname,
-			 struct annotate_st_entry_list *entry,
-			 struct storedata *sdata,
-			 struct mailbox_annotation_rock *mbrock,
-			 void *rock __attribute__((unused)))
+EXPORTED int specialuse_validate(const char *src, struct buf *dest)
 {
+ const char *specialuse_extra_opt = config_getstring(IMAPOPT_SPECIALUSE_EXTRA);
+ char *strval = NULL;
+ strarray_t *valid = NULL;
+ strarray_t *values = NULL;
+ int i, j;
 int r = 0;
 
- if (entry->shared.value || entry->shared.contenttype) {
-	/* Check ACL
-	 *
-	 * Must be an admin to set shared server annotations and
-	 * must have the required rights for shared mailbox annotations.
-	 */
-	int acl = ACL_READ | ACL_WRITE | entry->entry->acl;
+ if (!src) {
+	buf_reset(dest);
+	return 0;
+ }
 
-	if (!sdata->isadmin &&
-	 (!int_mboxname0 || !mbrock->acl ||
-	 ((cyrus_acl_myrights(sdata->auth_state,
-				 mbrock->acl) & acl) != acl))) {
-	 return IMAP_PERMISSION_DENIED;
-	}
+ /* check specialuse_extra option if set */
+ if (specialuse_extra_opt)
+	valid = strarray_split(specialuse_extra_opt, NULL, 0);
+ else
+	valid = strarray_new();
 
-	/* Make sure its a server or local mailbox annotation */
-	if (!int_mboxname0 || !mbrock->server) {
-	 /* if we don't have a value, retrieve the existing entry */
-	 if (!entry->shared.value) {
-		struct annotation_data shared;
+ /* strarray_add(valid, "\\All"); -- we don't support virtual folders right now */
+ strarray_add(valid, "\\Archive");
+ strarray_add(valid, "\\Drafts");
+ /* strarray_add(valid, "\\Flagged"); -- we don't support virtual folders right now */
+ strarray_add(valid, "\\Junk");
+ strarray_add(valid, "\\Sent");
+ strarray_add(valid, "\\Trash");
 
-		r = annotatemore_lookup(int_mboxname, entry->entry->name,
-					"", &shared);
-		if (r) return r;
+ values = strarray_split(src, NULL, 0);
 
-		entry->shared.value = shared.value;
-	 }
+ for (i = 0; i < values->count; i++) {
+	const char *item = strarray_nth(values, i);
 
-	 r = write_entry(int_mboxname, entry->entry->name, "",
-			 &(entry->shared), &(sdata->tid));
+	for (j = 0; j < valid->count; j++) { /* can't use find here */
+	 if (!strcasecmp(strarray_nth(valid, j), item))
+		break;
+	 /* or without the leading '\' */
+	 if (!strcasecmp(strarray_nth(valid, j) + 1, item))
+		break;
 	}
+	if (j >= valid->count) {
+	 r = IMAP_ANNOTATION_BADENTRY;
+	 goto done;
+	}
+
+	/* normalise the value */
+	strarray_set(values, i, strarray_nth(valid, j));
 }
- if (entry->priv.value || entry->priv.contenttype) {
-	/* Check ACL
-	 *
-	 * XXX We don't actually need to check anything here,
-	 * since we don't have any access control for server annotations
-	 * and all we need for private mailbox annotations is ACL_LOOKUP,
-	 * and we wouldn't be in this callback without it.
-	 */
 
-	/* Make sure its a server or local mailbox annotation */
-	if (!int_mboxname0 || !mbrock->server) {
-	 /* if we don't have a value, retrieve the existing entry */
-	 if (!entry->priv.value) {
-		struct annotation_data priv;
+ strval = strarray_join(values, " ");
+ buf_setcstr(dest, strval);
 
-		r = annotatemore_lookup(int_mboxname, entry->entry->name,
-					sdata->userid, &priv);
-		if (r) return r;
+done:
+ free(strval);
+ strarray_free(valid);
+ strarray_free(values);
+ return r;
+}
 
-		entry->priv.value = priv.value;
-	 }
+static int annotation_set_specialuse(annotate_state_t *state,
+				 struct annotate_entry_list *entry)
+{
+ struct buf res = BUF_INITIALIZER;
+ int r = IMAP_PERMISSION_DENIED;
 
-	 r = write_entry(int_mboxname, entry->entry->name, sdata->userid,
-			 &(entry->priv), &(sdata->tid));
-	}
+ assert(state->mailbox);
+
+ /* Effectively removes the annotation */
+ if (entry->priv.s == NULL) {
+	r = write_entry(state->mailbox, state->uid, entry->name, state->userid, &entry->priv, 0);
+	goto done;
 }
 
+ r = specialuse_validate(buf_cstring(&entry->priv), &res);
+ if (r) goto done;
+
+ r = write_entry(state->mailbox, state->uid, entry->name, state->userid, &res, 0);
+
+done:
+ buf_free(&res);
+
 return r;
 }
 
-static int annotation_set_mailboxopt(const char *int_mboxname,
-				 struct annotate_st_entry_list *entry,
-				 struct storedata *sdata,
-				 struct mailbox_annotation_rock *mbrock,
-				 void *rock __attribute__((unused)))
+static int find_desc_store(int scope,
+			 const char *name,
+			 const annotate_entrydesc_t **descp)
 {
- struct mailbox *mailbox = NULL;
- int flag = 0, r = 0, i;
- unsigned long newopts;
+ const ptrarray_t *descs;
+ const annotate_entrydesc_t *db_entry;
+ annotate_entrydesc_t *desc;
+ int i;
 
- /* Check entry */
- for (i = 0; annotate_mailbox_flagsi.name; i++) {
-	if (!strcmp(entry->entry->name, annotate_mailbox_flagsi.name)) {
-	 flag = annotate_mailbox_flagsi.flag;
-	 break;
-	}
+ if (scope == ANNOTATION_SCOPE_SERVER) {
+	descs = &server_entries;
+	db_entry = &server_db_entry;
 }
- if (!flag) return IMAP_PERMISSION_DENIED;
- 
- /* Check ACL */
- if(!sdata->isadmin &&
- (!mbrock->acl ||
-	!(cyrus_acl_myrights(sdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
-	!(cyrus_acl_myrights(sdata->auth_state, mbrock->acl) & ACL_WRITE))) {
-	return IMAP_PERMISSION_DENIED;
+ else if (scope == ANNOTATION_SCOPE_MAILBOX) {
+	descs = &mailbox_entries;
+	db_entry = &mailbox_db_entry;
 }
-
- r = mailbox_open_iwl(int_mboxname, &mailbox);
- if (r) return r;
-
- newopts = mailbox->i.options;
-
- if (!strcmp(entry->shared.value, "true")) {
-	newopts |= flag;
- } else {
-	newopts &= ~flag;
+ else if (scope == ANNOTATION_SCOPE_MESSAGE) {
+	descs = &message_entries;
+	db_entry = &message_db_entry;
 }
-
- /* only commit if there's been a change */
- if (mailbox->i.options != newopts) {
-	mailbox_index_dirty(mailbox);
-	mailbox->i.options = newopts;
+ else {
+	syslog(LOG_ERR, "IOERROR: unknown scope in find_desc_store %d", scope);
+	return IMAP_INTERNAL;
 }
 
- mailbox_close(&mailbox);
+ for (i = 0 ; i < descs->count ; i++) {
+	desc = descs->datai;
+	if (strcmp(name, desc->name))
+	 continue;
+	if (!desc->set) {
+	 /* read-only annotation */
+	 return IMAP_PERMISSION_DENIED;
+	}
+	*descp = desc;
+	return 0;
+ }
 
- return 0;
-}
+ /* unknown annotation */
+ if (!config_getswitch(IMAPOPT_ANNOTATION_ALLOW_UNDEFINED))
+	return IMAP_PERMISSION_DENIED;
 
-const struct annotate_st_entry server_entries =
-{
- { "/comment", ATTRIB_TYPE_STRING, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/motd", ATTRIB_TYPE_STRING, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_tofile, "motd" },
- { "/admin", ATTRIB_TYPE_STRING, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/shutdown", ATTRIB_TYPE_STRING, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_tofile, "shutdown" },
- { "/vendor/cmu/cyrus-imapd/squat", ATTRIB_TYPE_BOOLEAN, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/expire", ATTRIB_TYPE_UINT, PROXY_AND_BACKEND,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
-};
+ /* check for /flags and /vendor/cyrus */
+ if (scope == ANNOTATION_SCOPE_MESSAGE &&
+	!strncmp(name, "/flags/", 7))
+	return IMAP_PERMISSION_DENIED;
 
-const struct annotate_st_entry mailbox_rw_entries =
-{
- { "/comment", ATTRIB_TYPE_STRING, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- 0, annotation_set_todb, NULL },
- { "/sort", ATTRIB_TYPE_STRING, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- 0, annotation_set_todb, NULL },
- { "/thread", ATTRIB_TYPE_STRING, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- 0, annotation_set_todb, NULL },
- { "/check", ATTRIB_TYPE_BOOLEAN, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- 0, annotation_set_todb, NULL },
- { "/checkperiod", ATTRIB_TYPE_UINT, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV
- | ATTRIB_CONTENTTYPE_SHARED | ATTRIB_CONTENTTYPE_PRIV,
- 0, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/squat", ATTRIB_TYPE_BOOLEAN, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/expire", ATTRIB_TYPE_UINT, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/news2mail", ATTRIB_TYPE_STRING, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/sieve", ATTRIB_TYPE_STRING, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_todb, NULL },
- { "/vendor/cmu/cyrus-imapd/pop3newuidl", ATTRIB_TYPE_BOOLEAN, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_mailboxopt, NULL },
- { "/vendor/cmu/cyrus-imapd/sharedseen", ATTRIB_TYPE_BOOLEAN, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_mailboxopt, NULL },
- { "/vendor/cmu/cyrus-imapd/duplicatedeliver", ATTRIB_TYPE_BOOLEAN, BACKEND_ONLY,
- ATTRIB_VALUE_SHARED | ATTRIB_CONTENTTYPE_SHARED,
- ACL_ADMIN, annotation_set_mailboxopt, NULL },
- { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
-};
+ if (!strncmp(name, "/vendor/cmu/cyrus-imapd/", 24))
+	return IMAP_PERMISSION_DENIED;
 
-struct annotate_st_entry_list *server_entries_list = NULL;
-struct annotate_st_entry_list *mailbox_rw_entries_list = NULL;
+ *descp = db_entry;
+ return 0;
+}
 
-int annotatemore_store(const char *mboxname,
-		 struct entryattlist *l,
-		 struct namespace *namespace,
-		 int isadmin,
-		 const char *userid,
-		 struct auth_state *auth_state)
+EXPORTED int annotate_state_store(annotate_state_t *state, struct entryattlist *l)
 {
 int r = 0;
 struct entryattlist *e = l;
 struct attvaluelist *av;
- struct storedata sdata;
- const struct annotate_st_entry_list *entries, *currententry;
- time_t now = time(0);
-
- memset(&sdata, 0, sizeof(struct storedata));
- sdata.namespace = namespace;
- sdata.userid = userid;
- sdata.isadmin = isadmin;
- sdata.auth_state = auth_state;
 
- if (!mboxname0) {
-	/* server annotations */
-	entries = server_entries_list;
- }
- else {
-	/* mailbox annotation(s) */
-	entries = mailbox_rw_entries_list;
- }
+ annotate_state_start(state);
 
 /* Build a list of callbacks for storing the annotations */
 while (e) {
 	int attribs;
-	struct annotate_st_entry_list *nentry = NULL;
+	const annotate_entrydesc_t *desc = NULL;
+	struct annotate_entry_list *nentry = NULL;
 
 	/* See if we support this entry */
-	for (currententry = entries;
-	 currententry;
-	 currententry = currententry->next) {
-	 if (!strcmp(e->entry, currententry->entry->name)) {
-		break;
-	 }
-	}
-	if (!currententry) {
-	 /* unknown annotation */
-	 return IMAP_PERMISSION_DENIED;
-	}
+	r = find_desc_store(state->which, e->entry, &desc);
+	if (r)
+	 goto cleanup;
 
 	/* Add this entry to our list only if it
 	 applies to our particular server type */
-	if ((currententry->entry->proxytype != PROXY_ONLY)
-	 || proxy_store_func) {
-	 nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
-	 nentry->next = sdata.entry_list;
-	 nentry->entry = currententry->entry;
-	 nentry->shared.modifiedsince = now;
-	 nentry->priv.modifiedsince = now;
-	 sdata.entry_list = nentry;
-	}
+	if ((desc->proxytype != PROXY_ONLY)
+	 || proxy_store_func)
+	 nentry = _annotate_state_add_entry(state, desc, e->entry);
 
 	/* See if we are allowed to set the given attributes. */
-	attribs = currententry->entry->attribs;
+	attribs = desc->attribs;
 	av = e->attvalues;
 	while (av) {
-	 const char *value;
 	 if (!strcmp(av->attrib, "value.shared")) {
 		if (!(attribs & ATTRIB_VALUE_SHARED)) {
 		 r = IMAP_PERMISSION_DENIED;
 		 goto cleanup;
 		}
-		value = annotate_canon_value(av->value,
-					 currententry->entry->type);
-		if (!value) {
-		 r = IMAP_ANNOTATION_BADVALUE;
+		r = annotate_canon_value(&av->value,
+					 desc->type);
+		if (r)
 		 goto cleanup;
+		if (nentry) {
+		 buf_init_ro(&nentry->shared, av->value.s, av->value.len);
+		 nentry->have_shared = 1;
 		}
-		if (nentry) nentry->shared.value = value;
 	 }
-	 else if (!strcmp(av->attrib, "content-type.shared")) {
-		if (!(attribs & ATTRIB_CONTENTTYPE_SHARED)) {
-		 r = IMAP_PERMISSION_DENIED;
-		 goto cleanup;
-		}
-		value = annotate_canon_value(av->value,
-					 ATTRIB_TYPE_CONTENTTYPE);
-		if (!value) {
-		 r = IMAP_ANNOTATION_BADVALUE;
-		 goto cleanup;
-		}
-		if (nentry) nentry->shared.contenttype = value;
+	 else if (!strcmp(av->attrib, "content-type.shared") ||
+	 !strcmp(av->attrib, "content-type.priv")) {
+		syslog(LOG_WARNING, "annotatemore_store: client used "
+				 "deprecated attribute \"%s\", ignoring",
+				 av->attrib);
 	 }
 	 else if (!strcmp(av->attrib, "value.priv")) {
 		if (!(attribs & ATTRIB_VALUE_PRIV)) {
 		 r = IMAP_PERMISSION_DENIED;
 		 goto cleanup;
 		}
-		value = annotate_canon_value(av->value,
-					 currententry->entry->type);
-		if (!value) {
-		 r = IMAP_ANNOTATION_BADVALUE;
-		 goto cleanup;
-		}
-		if (nentry) nentry->priv.value = value;
-	 }
-	 else if (!strcmp(av->attrib, "content-type.priv")) {
-		if (!(attribs & ATTRIB_CONTENTTYPE_PRIV)) {
-		 r = IMAP_PERMISSION_DENIED;
-		 goto cleanup;
-		}
-		value = annotate_canon_value(av->value,
-					 ATTRIB_TYPE_CONTENTTYPE);
-		if (!value) {
-		 r = IMAP_ANNOTATION_BADVALUE;
+		r = annotate_canon_value(&av->value,
+					 desc->type);
+		if (r)
 		 goto cleanup;
+		if (nentry) {
+		 buf_init_ro(&nentry->priv, av->value.s, av->value.len);
+		 nentry->have_priv = 1;
 		}
-		if (nentry) nentry->priv.contenttype = value;
 	 }
 	 else {
 		r = IMAP_PERMISSION_DENIED;
@@ -1967,175 +2964,283 @@
 	e = e->next;
 }
 
- if (!mboxname0) {
-	/* server annotations */
-
-	if (sdata.entry_list) {
-	 struct annotate_st_entry_list *entries_ptr;
-
-	 /* Loop through the list of provided entries to get */
-	 for (entries_ptr = sdata.entry_list;
-		 entries_ptr;
-		 entries_ptr = entries_ptr->next) {
-	
-		r = entries_ptr->entry->set("", entries_ptr, &sdata, NULL,
-					 entries_ptr->entry->rock);
-		if (r) break;
-	 }
-
-	 if (!r) sync_log_annotation("");
-	}
+ if (state->which == ANNOTATION_SCOPE_SERVER) {
+	r = _annotate_store_entries(state);
 }
 
- else {
-	/* mailbox annotations */
-
-	char mboxpatMAX_MAILBOX_BUFFER;
-
-	/* Reset state in store_cb */
-	store_cb(NULL, 0, 0, 0);
-
+ else if (state->which == ANNOTATION_SCOPE_MAILBOX) {
 	if (proxy_store_func) {
-	 /* xxx better way to determine a size for this table? */
-	 construct_hash_table(&sdata.server_table, 10, 1);
+	 r = annotate_state_need_mbentry(state);
+	 if (r)
+		goto cleanup;
+	 assert(state->mbentry);
 	}
+	assert(state->mailbox);
+
+	r = _annotate_store_entries(state);
+	if (r)
+	 goto cleanup;
 
-	/* copy the pattern so we can change hiersep */
-	strlcpy(mboxpat, mboxname, sizeof(mboxpat));
-	mboxname_hiersep_tointernal(namespace, mboxpat,
-				 config_virtdomains ?
-				 strcspn(mboxpat, "@") : 0);
+	state->count++;
 
-	r = (*namespace->mboxlist_findall)(namespace, mboxpat,
-					 isadmin, userid,
-					 auth_state, store_cb,
-					 &sdata);
+	if (proxy_store_func && state->mbentry->server &&
+	 !hash_lookup(state->mbentry->server, &state->server_table)) {
+	 hash_insert(state->mbentry->server, (void *)0xDEADBEEF, &state->server_table);
+	}
 
-	if (!r && !sdata.count) r = IMAP_MAILBOX_NONEXISTENT;
+	if (!r && !state->count) r = IMAP_MAILBOX_NONEXISTENT;
 
 	if (proxy_store_func) {
 	 if (!r) {
 		/* proxy command to backends */
 		struct proxy_rock prock = { NULL, NULL };
-		prock.mbox_pat = mboxname;
+		prock.mbox_pat = state->mbentry->name;
 		prock.entryatts = l;
-		hash_enumerate(&sdata.server_table, store_proxy, &prock);
+		hash_enumerate(&state->server_table, store_proxy, &prock);
 	 }
-	 free_hash_table(&sdata.server_table, NULL);
-	}
- }
-
- if (sdata.tid) {
-	if (!r) {
-	 /* commit txn */
-	 DB->commit(anndb, sdata.tid);
-	}
-	else {
-	 /* abort txn */
-	 DB->abort(anndb, sdata.tid);
 	}
 }
-
- cleanup:
- /* Free the entry list */
- while (sdata.entry_list) {
-	struct annotate_st_entry_list *freeme = sdata.entry_list;
-	sdata.entry_list = sdata.entry_list->next;
-	free(freeme);
+ else if (state->which == ANNOTATION_SCOPE_MESSAGE) {
+	r = _annotate_store_entries(state);
+	if (r)
+	 goto cleanup;
 }
 
+cleanup:
+ annotate_state_finish(state);
 return r;
 }
 
 struct rename_rock {
- const char *newmboxname;
+ struct mailbox *oldmailbox;
+ struct mailbox *newmailbox;
 const char *olduserid;
 const char *newuserid;
- struct txn *tid;
+ uint32_t olduid;
+ uint32_t newuid;
+ int copy;
 };
 
-static int rename_cb(const char *mailbox, const char *entry,
-		 const char *userid, struct annotation_data *attrib,
+static int rename_cb(const char *mboxname __attribute__((unused)),
+		 uint32_t uid,
+		 const char *entry,
+		 const char *userid, const struct buf *value,
 		 void *rock)
 {
 struct rename_rock *rrock = (struct rename_rock *) rock;
 int r = 0;
 
- if (rrock->newmboxname) {
+ if (rrock->newmailbox) {
 	/* create newly renamed entry */
+	const char *newuserid = userid;
 
-	if (rrock->olduserid && rrock->newuserid &&
+	if (rrock->olduserid && rrock->newuserid &&
 	 !strcmp(rrock->olduserid, userid)) {
 	 /* renaming a user, so change the userid for priv annots */
-	 r = write_entry(rrock->newmboxname, entry, rrock->newuserid,
-			 attrib, &rrock->tid);
-	}
-	else {
-	 r = write_entry(rrock->newmboxname, entry, userid,
-			 attrib, &rrock->tid);
+	 newuserid = rrock->newuserid;
 	}
+	r = write_entry(rrock->newmailbox, rrock->newuid, entry, newuserid, value, 0);
 }
 
- if (!r) {
+ if (!rrock->copy && !r) {
 	/* delete existing entry */
-	attrib->value = "NIL";
-	r = write_entry(mailbox, entry, userid, attrib, &rrock->tid);
+	struct buf dattrib = BUF_INITIALIZER;
+	r = write_entry(rrock->oldmailbox, uid, entry, userid, &dattrib, 0);
+ }
+
+ return r;
+}
+
+EXPORTED int annotate_rename_mailbox(struct mailbox *oldmailbox,
+			 struct mailbox *newmailbox)
+{
+ /* rename one mailbox */
+ char *olduserid = xstrdupnull(mboxname_to_userid(oldmailbox->name));
+ char *newuserid = xstrdupnull(mboxname_to_userid(newmailbox->name));
+ annotate_db_t *d = NULL;
+ int r = 0;
+
+ /* rewrite any per-folder annotations from the global db */
+ r = _annotate_getdb(NULL, 0, /*don't create*/0, &d);
+ if (r == CYRUSDB_NOTFOUND) {
+	/* no global database, must not be anything to rename */
+	r = 0;
+	goto done;
 }
+ if (r) goto done;
+
+ annotate_begin(d);
+
+ /* copy here - delete will dispose of old records later */
+ r = _annotate_rewrite(oldmailbox, 0, olduserid,
+ newmailbox, 0, newuserid,
+ /*copy*/1);
+ if (r) goto done;
+
+ r = annotate_commit(d);
+ if (r) goto done;
+
+ /*
+ * The per-folder database got moved or linked by mailbox_copy_files().
+ */
+
+ done:
+ annotate_putdb(&d);
+ free(olduserid);
+ free(newuserid);
 
 return r;
 }
 
-int annotatemore_rename(const char *oldmboxname, const char *newmboxname,
-			const char *olduserid, const char *newuserid)
+
+/*
+ * Perform a scan-and-rewrite through the database(s) for
+ * a given set of criteria; common code for several higher
+ * level operations.
+ */
+static int _annotate_rewrite(struct mailbox *oldmailbox,
+			 uint32_t olduid,
+			 const char *olduserid,
+			 struct mailbox *newmailbox,
+			 uint32_t newuid,
+			 const char *newuserid,
+			 int copy)
 {
 struct rename_rock rrock;
- int r;
 
- rrock.newmboxname = newmboxname;
+ rrock.oldmailbox = oldmailbox;
+ rrock.newmailbox = newmailbox;
 rrock.olduserid = olduserid;
 rrock.newuserid = newuserid;
- rrock.tid = NULL;
+ rrock.olduid = olduid;
+ rrock.newuid = newuid;
+ rrock.copy = copy;
 
- r = annotatemore_findall(oldmboxname, "*", &rename_cb, &rrock, &rrock.tid);
+ return annotatemore_findall(oldmailbox->name, olduid, "*", &rename_cb, &rrock);
+}
 
- if (rrock.tid) {
-	if (!r) {
-	 /* commit txn */
-	 DB->commit(anndb, rrock.tid);
-	}
-	else {
-	 /* abort txn */
-	 DB->abort(anndb, rrock.tid);
-	}
+EXPORTED int annotate_delete_mailbox(struct mailbox *mailbox)
+{
+ int r = 0;
+ char *fname = NULL;
+ annotate_db_t *d = NULL;
+
+ assert(mailbox);
+
+ /* remove any per-folder annotations from the global db */
+ r = _annotate_getdb(NULL, 0, /*don't create*/0, &d);
+ if (r == CYRUSDB_NOTFOUND) {
+	/* no global database, must not be anything to rename */
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+
+ annotate_begin(d);
+
+ r = _annotate_rewrite(mailbox,
+			 /*olduid*/0, /*olduserid*/NULL,
+			 /*newmailbox*/NULL,
+			 /*newuid*/0, /*newuserid*/NULL,
+			 /*copy*/0);
+ if (r) goto out;
+
+ /* remove the entire per-folder database */
+ r = annotate_dbname_mailbox(mailbox, &fname);
+ if (r) goto out;
+
+ /* (gnb)TODO: do we even need to do this?? */
+ if (unlink(fname) < 0 && errno != ENOENT) {
+	syslog(LOG_ERR, "cannot unlink %s: %m", fname);
 }
 
+ r = annotate_commit(d);
+
+out:
+ annotate_putdb(&d);
+ free(fname);
+ return r;
+}
+
+EXPORTED int annotate_msg_copy(struct mailbox *oldmailbox, uint32_t olduid,
+		 struct mailbox *newmailbox, uint32_t newuid,
+		 const char *userid)
+{
+ annotate_db_t *d = NULL;
+ int r;
+
+ r = _annotate_getdb(newmailbox->name, newuid, CYRUSDB_CREATE, &d);
+ if (r) return r;
+
+ annotate_begin(d);
+
+ /* If these are not true, nobody will ever commit the data we're
+ * about to copy, and that would be sad */
+ assert(newmailbox->annot_state != NULL);
+ assert(newmailbox->annot_state->d == d);
+
+ r = _annotate_rewrite(oldmailbox, olduid, userid,
+			 newmailbox, newuid, userid,
+			 /*copy*/1);
+
+ annotate_putdb(&d);
 return r;
 }
 
-int annotatemore_delete(const char *mboxname)
+static int cleanup_cb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)), 
+		 size_t datalen __attribute__((unused)))
+{
+ annotate_db_t *d = (annotate_db_t *)rock;
+
+ return cyrusdb_delete(d->db, key, keylen, tid(d), /*force*/1);
+}
+
+/* clean up WITHOUT counting usage again, we already removed that when
+ * we expunged the record */
+HIDDEN int annotate_msg_cleanup(struct mailbox *mailbox, unsigned int uid)
 {
- /* we treat a deleteion as a rename without a new name */
+ char keyMAX_MAILBOX_PATH+1;
+ size_t keylen;
+ int r = 0;
+ annotate_db_t *d = NULL;
+
+ assert(uid);
+
+ r = _annotate_getdb(mailbox->name, uid, 0, &d);
+ if (r) return r;
+
+ /* must be in a transaction to modify the db */
+ annotate_begin(d);
+
+ /* If these are not true, nobody will ever commit the data we're
+ * about to copy, and that would be sad */
+ assert(mailbox->annot_state != NULL);
+ assert(mailbox->annot_state->d == d);
+
+ keylen = make_key(mailbox->name, uid, "", NULL, key, sizeof(key));
+
+ r = cyrusdb_foreach(d->db, key, keylen, NULL, &cleanup_cb, d, tid(d));
 
- return annotatemore_rename(mboxname, NULL, NULL, NULL);
+ annotate_putdb(&d);
+ return r;
 }
 
 /************************* Annotation Initialization ************************/
 
 /* The following code is courtesy of Thomas Viehmann <tv@beamnet.de> */
 
-enum {
- ANNOTATION_SCOPE_SERVER = 1,
- ANNOTATION_SCOPE_MAILBOX = 2
-};
 
-const struct annotate_attrib annotation_scope_names =
+static const struct annotate_attrib annotation_scope_names =
 {
 { "server", ANNOTATION_SCOPE_SERVER },
 { "mailbox", ANNOTATION_SCOPE_MAILBOX },
+ { "message", ANNOTATION_SCOPE_MESSAGE },
 { NULL, 0 }
 };
 
-const struct annotate_attrib annotation_proxy_type_names =
+static const struct annotate_attrib annotation_proxy_type_names =
 {
 { "proxy", PROXY_ONLY },
 { "backend", BACKEND_ONLY },
@@ -2143,9 +3248,15 @@
 { NULL, 0 }
 };
 
-const struct annotate_attrib attribute_type_names = 
+static const struct annotate_attrib attribute_type_names =
 {
- { "content-type", ATTRIB_TYPE_CONTENTTYPE },
+ /*
+ * The "content-type" type was only used for protocol features which
+ * were dropped before the RFCs became final. We accept it in
+ * annotation definition files only for backwards compatibility with
+ * earlier Cyrus versions.
+ */
+ { "content-type", ATTRIB_TYPE_STRING },
 { "string", ATTRIB_TYPE_STRING },
 { "boolean", ATTRIB_TYPE_BOOLEAN },
 { "uint", ATTRIB_TYPE_UINT },
@@ -2154,45 +3265,85 @@
 };
 
 #define ANNOT_DEF_MAXLINELEN 1024
+#define ANNOT_MAX_ERRORS 64
 
-/* Search in table for the value given by name and namelen
- * (name is null-terminated, but possibly more than just the key).
- * errmsg is used to hint the user where we failed
- */
-int table_lookup(const struct annotate_attrib *table,
-		 char *name, size_t namelen, char *errmsg) 
+struct parse_state
 {
- char errbufANNOT_DEF_MAXLINELEN*2;
- int entry;
+ const char *filename;
+ const char *context;
+ unsigned int lineno;
+ unsigned int nerrors;
+ tok_t tok;
+};
+
+static void parse_error(struct parse_state *state, const char *err)
+{
+ if (++state->nerrors < ANNOT_MAX_ERRORS)
+ {
+	struct buf msg = BUF_INITIALIZER;
 
- for (entry = 0; tableentry.name &&
-	 (strncasecmp(tableentry.name, name, namelen)
-	 || tableentry.namenamelen != '\0'); entry++);
+	buf_printf(&msg, "%s:%u:%u:error: %s",
+		 state->filename, state->lineno,
+		 tok_offset(&state->tok), err);
+	if (state->context && *state->context)
+	 buf_printf(&msg, ", at or near '%s'", state->context);
+	syslog(LOG_ERR, "%s", buf_cstring(&msg));
+	buf_free(&msg);
+ }
+
+ state->context = NULL;
+}
 
- if (! tableentry.name) {
-	sprintf(errbuf, "invalid %s at '%s'", errmsg, name);
-	fatal(errbuf, EC_CONFIG);
+/* Search in table for the value given by @name and return
+ * the corresponding enum value, or -1 on error.
+ * @state and @errmsg is used to hint the user where we failed.
+ */
+static int table_lookup(const struct annotate_attrib *table,
+		 const char *name)
+{
+ for ( ; table->name ; table++) {
+	 if (!strcasecmp(table->name, name))
+	 return table->entry;
 }
- return tableentry.entry;
+ return -1;
 }
 
-/* Advance beyond the next ',', skipping whitespace,
- * fail if next non-space is no comma.
+
+/*
+ * Parse and return the next token from the line buffer. Tokens are
+ * separated by comma ',' characters but leading and trailing whitespace
+ * is trimmed. Tokens are made up of alphanumeric characters (as
+ * defined by libc's isalnum()) plus additional allowable characters
+ * defined by @extra.
+ *
+ * At start *@state points into the buffer, and will be adjusted to
+ * point further along in the buffer. Returns the beginning of the
+ * token or NULL (and whines to syslog) if an error was encountered.
 */
-char *consume_comma(char* p)
+static char *get_token(struct parse_state *state, const char *extra)
 {
- char errbufANNOT_DEF_MAXLINELEN*2;
+ char *token;
+ char *p;
 
- for (; *p && isspace(*p); p++); 
- if (*p != ',') {
-	sprintf(errbuf,
-		"',' expected, '%s' found parsing annotation definition", p);
-	fatal(errbuf, EC_CONFIG);
+ token = tok_next(&state->tok);
+ if (!token) {
+	parse_error(state, "short line");
+	return NULL;
+ }
+
+ /* check the token */
+ if (extra == NULL)
+	extra = "";
+ for (p = token ; *p && (isalnum(*p) || strchr(extra, *p)) ; p++)
+	;
+ if (*p) {
+	state->context = p;
+	parse_error(state, "invalid character");
+	return NULL;
 }
- p++;
- for (; *p && isspace(*p); p++); 
 
- return p;
+ state->context = token;
+ return token;
 }
 
 /* Parses strings of the form value1 value2 ... .
@@ -2202,147 +3353,184 @@
 * s is advanced to '\0' or ','.
 * On error errmsg is used to identify item to be parsed.
 */
-int parse_table_lookup_bitmask(const struct annotate_attrib *table,
- char** s, char* errmsg) 
+static int parse_table_lookup_bitmask(const struct annotate_attrib *table,
+ struct parse_state *state)
 {
+ char *token = get_token(state, ".-_/ ");
+ char *p;
+ int i;
 int result = 0;
- char *p, *p2;
+ tok_t tok;
+
+ if (!token)
+	return -1;
+ tok_initm(&tok, token, NULL, 0);
+
+ while ((p = tok_next(&tok))) {
+	state->context = p;
+	i = table_lookup(table, p);
+	if (i < 0)
+	 return i;
+	result |= i;
+ }
 
- p = *s;
- do {
-	p2 = p;
-	for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');
-	 p++);
-	result |= table_lookup(table, p2, p-p2, errmsg);
-	for (; *p && isspace(*p); p++);
- } while (*p && *p != ',');
-
- *s = p;
 return result;
 }
 
+static int normalise_attribs(struct parse_state *state, int attribs)
+{
+ int nattribs = 0;
+ static int deprecated_warnings = 0;
+
+ /* always provide size.shared if value.shared specified */
+ if ((attribs & ATTRIB_VALUE_SHARED))
+	nattribs |= ATTRIB_VALUE_SHARED|ATTRIB_SIZE_SHARED;
+
+ /* likewise size.priv */
+ if ((attribs & ATTRIB_VALUE_PRIV))
+	nattribs |= ATTRIB_VALUE_PRIV|ATTRIB_SIZE_PRIV;
+
+ /* ignore any other specified attributes */
+
+ if ((attribs & ATTRIB_DEPRECATED)) {
+	if (!deprecated_warnings++)
+	 parse_error(state, "deprecated attribute names such as "
+				"content-type or modified-since (ignoring)");
+ }
+
+ return nattribs;
+}
+
 /* Create array of allowed annotations, both internally & externally defined */
-void init_annotation_definitions()
+static void init_annotation_definitions(void)
 {
- char *p, *p2, *tmp;
- const char *filename;
+ char *p;
 char alineANNOT_DEF_MAXLINELEN;
- char errbufANNOT_DEF_MAXLINELEN*2;
- struct annotate_st_entry_list *se, *me;
- struct annotate_st_entry *ae;
+ annotate_entrydesc_t *ae;
 int i;
 FILE* f;
+ struct parse_state state;
+ ptrarray_t *entries = NULL;
 
- /* NOTE: we assume # static entries > 0 */
- server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
- mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
- se = server_entries_list;
- me = mailbox_rw_entries_list;
+ /* copy static entries into list */
+ for (i = 0 ; server_builtin_entriesi.name ; i++)
+	ptrarray_append(&server_entries, (void *)&server_builtin_entriesi);
 
 /* copy static entries into list */
- for (i = 0; server_entriesi.name;i++) {
-	se->entry = &server_entriesi;
-	if (server_entriesi+1.name) {
-	 se->next = xmalloc(sizeof(struct annotate_st_entry_list));
-	 se = se->next;
-	}
- }
+ for (i = 0 ; mailbox_builtin_entriesi.name ; i++)
+	ptrarray_append(&mailbox_entries, (void *)&mailbox_builtin_entriesi);
 
 /* copy static entries into list */
- for (i = 0; mailbox_rw_entriesi.name;i++) {
-	me->entry = &mailbox_rw_entriesi;
-	if (mailbox_rw_entriesi+1.name) {
-	 me->next = xmalloc(sizeof(struct annotate_st_entry_list));
-	 me = me->next;
-	}
- }
+ for (i = 0 ; message_builtin_entriesi.name ; i++)
+	ptrarray_append(&message_entries, (void *)&message_builtin_entriesi);
+
+ memset(&state, 0, sizeof(state));
 
 /* parse config file */
- filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS);
+ state.filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS);
 
- if (! filename) {
-	se->next = NULL;
-	me->next = NULL;
+ if (!state.filename)
+	return;
+
+ f = fopen(state.filename,"r");
+ if (!f) {
+	syslog(LOG_ERR, "%s: could not open annotation definition file: %m",
+	 state.filename);
 	return;
 }
- 
- f = fopen(filename,"r");
- if (! f) {
-	sprintf(errbuf, "could not open annotation definiton %s", filename);
-	fatal(errbuf, EC_CONFIG);
- }
- 
+
 while (fgets(aline, sizeof(aline), f)) {
 	/* remove leading space, skip blank lines and comments */
+	state.lineno++;
 	for (p = aline; *p && isspace(*p); p++);
 	if (!*p || *p == '#') continue;
+	tok_initm(&state.tok, aline, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT|TOK_EMPTY);
 
 	/* note, we only do the most basic validity checking and may
 	 be more restrictive than neccessary */
 
-	ae = xmalloc(sizeof(struct annotate_st_entry));
+	ae = xzmalloc(sizeof(*ae));
 
-	p2 = p;
-	for (; *p && (isalnum(*p) ||
-		 *p=='.' || *p=='-' || *p=='_' || *p=='/' || *p==':');
-	 p++);
+	if (!(p = get_token(&state, ".-_/:"))) goto bad;
 	/* TV-TODO: should test for empty */
-	ae->name = xstrndup(p2, p-p2);
-
-	p = consume_comma(p);
- 
-	p2 = p;
-	for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');
-	 p++);
-
-	if (table_lookup(annotation_scope_names, p2, p-p2,
-			 "annotation scope")==ANNOTATION_SCOPE_SERVER) {
-	 se->next = xmalloc(sizeof(struct annotate_st_entry_list));
-	 se = se->next;
-	 se->entry = ae;
+
+	if (!strncmp(p, "/vendor/cmu/cyrus-imapd/", 24)) {
+	 parse_error(&state, "annotation under /vendor/cmu/cyrus-imapd/");
+	 goto bad;
+	}
+	ae->name = xstrdup(p);
+
+	if (!(p = get_token(&state, ".-_/"))) goto bad;
+	switch (table_lookup(annotation_scope_names, p)) {
+	case ANNOTATION_SCOPE_SERVER:
+	 entries = &server_entries;
+	 break;
+	case ANNOTATION_SCOPE_MAILBOX:
+	 entries = &mailbox_entries;
+	 break;
+	case ANNOTATION_SCOPE_MESSAGE:
+	 if (!strncmp(ae->name, "/flags/", 7)) {
+		/* RFC5257 reserves the /flags/ hierarchy for future use */
+		state.context = ae->name;
+		parse_error(&state, "message entry under /flags/");
+		goto bad;
+	 }
+	 entries = &message_entries;
+	 break;
+	case -1:
+	 parse_error(&state, "invalid annotation scope");
+	 goto bad;
 	}
-	else {
-	 me->next = xmalloc(sizeof(struct annotate_st_entry_list));
-	 me = me->next; 
-	 me->entry = ae;
+
+	if (!(p = get_token(&state, NULL))) goto bad;
+	i = table_lookup(attribute_type_names, p);
+	if (i < 0) {
+	 parse_error(&state, "invalid annotation type");
+	 goto bad;
+	}
+	ae->type = i;
+
+	i = parse_table_lookup_bitmask(annotation_proxy_type_names, &state);
+	if (i < 0) {
+	 parse_error(&state, "invalid annotation proxy type");
+	 goto bad;
+	}
+	ae->proxytype = i;
+
+	i = parse_table_lookup_bitmask(annotation_attributes, &state);
+	if (i < 0) {
+	 parse_error(&state, "invalid annotation attributes");
+	 goto bad;
 	}
+	ae->attribs = normalise_attribs(&state, i);
+
+	if (!(p = get_token(&state, NULL))) goto bad;
+	ae->extra_rights = cyrus_acl_strtomask(p);
 
-	p = consume_comma(p);
-	p2 = p;
-	for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');
-	 p++);
-	ae->type = table_lookup(attribute_type_names, p2, p-p2,
-				"attribute type");
-
-	p = consume_comma(p);
-	ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names,
-						 &p,
-						 "annotation proxy type");
-
-	p = consume_comma(p);
-	ae->attribs = parse_table_lookup_bitmask(annotation_attributes,
-						 &p,
-						 "annotation attributes");
-
-	p = consume_comma(p);
-	p2 = p;
-	for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');
-	 p++);
-	tmp = xstrndup(p2, p-p2);
-	ae->acl = cyrus_acl_strtomask(tmp);
-	free(tmp);
-
-	for (; *p && isspace(*p); p++);
-	if (*p) {
-	 sprintf(errbuf, "junk at end of line: '%s'", p);
-	 fatal(errbuf, EC_CONFIG);
+	p = tok_next(&state.tok);
+	if (p) {
+	 parse_error(&state, "junk at end of line");
+	 goto bad;
 	}
 
+	ae->get = annotation_get_fromdb;
 	ae->set = annotation_set_todb;
 	ae->rock = NULL;
+	ptrarray_append(entries, ae);
+	continue;
+
+bad:
+	free((char *)ae->name);
+	free(ae);
+	tok_fini(&state.tok);
+	continue;
 }
 
+ if (state.nerrors)
+	syslog(LOG_ERR, "%s: encountered %u errors. Struggling on, but "
+			"some of your annotation definitions may be "
+			"ignored. Please fix this file!",
+			state.filename, state.nerrors);
+
 fclose(f);
- se->next = NULL;
- me->next = NULL;
 }

cyrus-imapd-2.4.17.tar.gz/imap/annotate.h -> cyrus-imapd-2.5.tar.gz/imap/annotate.h Changed

@@ -38,31 +38,34 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: annotate.h,v 1.13 2010/01/06 17:01:30 murch Exp $
 */
 
 #ifndef ANNOTATE_H
 #define ANNOTATE_H
 
+#include "auth.h"
 #include "charset.h" /* for comp_pat */
 #include "imapd.h"
-#include "mboxname.h"
-#include "prot.h"
-#include "cyrusdb.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "util.h"
+#include "strarray.h"
+
+#define FNAME_GLOBALANNOTATIONS "/annotations.db"
 
 /* List of strings, for fetch and search argument blocks */
 struct strlist {
 char *s; /* String */
 comp_pat *p; /* Compiled pattern, for search */
- void *rock; /* Associated metadata */
 struct strlist *next;
 };
 
+typedef struct annotate_db annotate_db_t;
+
 /* List of attrib-value pairs */
 struct attvaluelist {
 char *attrib;
- char *value;
+ struct buf value;
 struct attvaluelist *next;
 };
 
@@ -73,93 +76,171 @@
 struct entryattlist *next;
 };
 
+typedef struct annotate_state annotate_state_t;
+typedef struct annotate_recalc_state annotate_recalc_state_t;
+
+annotate_state_t *annotate_state_new(void);
+/* either of these close */
+void annotate_state_abort(annotate_state_t **statep);
+int annotate_state_commit(annotate_state_t **statep);
+void annotate_state_begin(annotate_state_t *state);
+void annotate_state_set_auth(annotate_state_t *state,
+		 int isadmin, const char *userid,
+		 struct auth_state *auth_state);
+int annotate_state_set_server(annotate_state_t *state);
+int annotate_state_set_mailbox(annotate_state_t *state,
+			 struct mailbox *mailbox);
+int annotate_state_set_mailbox_mbe(annotate_state_t *state,
+				 mbentry_t *);
+int annotate_state_set_message(annotate_state_t *state,
+			 struct mailbox *mailbox,
+			 unsigned int uid);
+
 /* String List Management */
 void appendstrlist(struct strlist **l, char *s);
 void appendstrlistpat(struct strlist **l, char *s);
-void appendstrlist_withdata(struct strlist **l, char *s, void *d, size_t size);
 void freestrlist(struct strlist *l);
 
 /* Attribute Management (also used by ID) */
-void appendattvalue(struct attvaluelist **l, const char *attrib, const char *value);
+void appendattvalue(struct attvaluelist **l, const char *attrib,
+		 const struct buf *value);
+void dupattvalues(struct attvaluelist **dst,
+		 const struct attvaluelist *src);
 void freeattvalues(struct attvaluelist *l);
 
 /* Entry Management */
 void appendentryatt(struct entryattlist **l, const char *entry,
 		 struct attvaluelist *attvalues);
+void setentryatt(struct entryattlist **l, const char *entry,
+		 const char *attrib, const struct buf *value);
+void clearentryatt(struct entryattlist **l, const char *entry,
+		 const char *attrib);
+void dupentryatt(struct entryattlist **l,
+		 const struct entryattlist *);
+size_t sizeentryatts(const struct entryattlist *);
 void freeentryatts(struct entryattlist *l);
 
-/* name of the annotation database */
-#define FNAME_ANNOTATIONS "/annotations.db"
-
 /* initialize database structures */
-#define ANNOTATE_SYNC (1 << 1)
-void annotatemore_init(int myflags,
+void annotate_init(
 		 int (*fetch_func)(const char *, const char *,
-					 struct strlist *, struct strlist *),
+					 const strarray_t *, const strarray_t *),
 		 int (*store_func)(const char *, const char *,
 					 struct entryattlist *));
 
 /* open the annotation db */
-void annotatemore_open(const char *fname);
+void annotatemore_open(void);
+
+typedef int (*annotatemore_find_proc_t)(const char *mailbox,
+		 uint32_t uid,
+		 const char *entry, const char *userid,
+		 const struct buf *value, void *rock);
 
+/* For findall(), matches any non-zero uid */
+#define ANNOTATE_ANY_UID ((unsigned int)~0)
 /* 'proc'ess all annotations matching 'mailbox' and 'entry' */
-int annotatemore_findall(const char *mailbox, const char *entry,
-			 int (*proc)(), void *rock, struct txn **tid);
+int annotatemore_findall(const char *mboxname, uint32_t uid, const char *entry,
+			 annotatemore_find_proc_t proc, void *rock);
 
 /* fetch annotations and output results */
-int annotatemore_fetch(char *mailbox,
-		 struct strlist *entries, struct strlist *attribs,
-		 struct namespace *namespace, int isadmin, char *userid,
-		 struct auth_state *auth_state, struct protstream *pout);
-
-struct annotation_data {
- const char *value;
- size_t size;
- time_t modifiedsince;
- const char *contenttype;
-};
+typedef void (*annotate_fetch_cb_t)(const char *mboxname, /* internal */
+				 uint32_t uid,
+				 const char *entry,
+				 struct attvaluelist *,
+				 void *rock);
+int annotate_state_fetch(annotate_state_t *state,
+		 const strarray_t *entries, const strarray_t *attribs,
+		 annotate_fetch_cb_t callback, void *rock,
+		 int *maxsizeptr);
+
+/* write a single annotation, avoiding all ACL checks and etc */
+int annotatemore_write(const char *mboxname, const char *entry,
+		 const char *userid, const struct buf *value);
+int annotatemore_msg_write(const char *mboxname, uint32_t uid, const char *entry,
+			 const char *userid, const struct buf *value);
+/* flat out ignore modseq and quota and everything */
+int annotatemore_rawwrite(const char *mboxname, const char *entry,
+		 const char *userid, const struct buf *value);
 
-struct annotate_info_t
-{
- const char *name;
- int flag;
-};
-
-extern const struct annotate_info_t annotate_mailbox_flags;
 
 /* lookup a single annotation and return result */
 int annotatemore_lookup(const char *mboxname, const char *entry,
-			const char *userid, struct annotation_data *attrib);
-
-/* store annotations */
-int annotatemore_store(const char *mboxname,
-		 struct entryattlist *l, struct namespace *namespace,
-		 int isadmin, const char *userid,
-		 struct auth_state *auth_state);
-
-/* low-level interface for use by mbdump routines */
-int annotatemore_write_entry(const char *mboxname, const char *entry,
-			 const char *userid,
-			 const char *value, const char *contenttype,
-			 size_t size, time_t modifiedsince,
-			 struct txn **tid);
-int annotatemore_commit(struct txn *tid);
-int annotatemore_abort(struct txn *tid);
+			const char *userid, struct buf *value);
+/* lookup a single per-message annotation and return result */
+int annotatemore_msg_lookup(const char *mboxname, uint32_t uid, const char *entry,
+			 const char *userid, struct buf *value);
+
+/* store annotations. Requires an open transaction */
+int annotate_state_store(annotate_state_t *state, struct entryattlist *l);
+
+/* low-level interface for use by mbdump routines.
+ * Requires an open transaction. */
+int annotate_state_write(annotate_state_t *, const char *entry,
+			 const char *userid, const struct buf *value);
 
 /* rename the annotations for 'oldmboxname' to 'newmboxname'
 * if 'olduserid' is non-NULL then the private annotations
 * for 'olduserid' are renamed to 'newuserid'
+ * Uses its own transaction.
+ */
+int annotate_rename_mailbox(struct mailbox *oldmailbox,
+			 struct mailbox *newmailbox);
+/* Handle a message COPY, by copying all the appropriate
+ * per-message annotations. */
+int annotate_msg_copy(struct mailbox *oldmailbox, uint32_t olduid,
+		 struct mailbox *newmailbox, uint32_t newuid,
+		 const char *userid);
+/* delete the annotations for the given message */
+int annotate_msg_cleanup(struct mailbox *mailbox, uint32_t uid);
+
+/* delete the annotations for 'mailbox'
+ * Uses its own transaction. */
+int annotate_delete_mailbox(struct mailbox *mailbox);
+
+/* recalc APIs */
+int annotate_recalc_begin(struct mailbox *mailbox,
+			 annotate_recalc_state_t **arsp,
+			 int reconstruct);
+void annotate_recalc_add(annotate_recalc_state_t *ars,
+			 uint32_t uid);
+int annotate_recalc_commit(annotate_recalc_state_t *ars);
+void annotate_recalc_abort(annotate_recalc_state_t *ars);
+
+/*
+ * Annotation DB transactions used to be opened and closed explicitly.
+ * Now they're opened whenever they're needed as a side effect of
+ * calling an API function which needs to modify the database. Closing
+ * the transaction, however, is now a lot more complicated:
+ *
+ * scope | to commit | to abort
+ * --------+----------------------------+----------------------------
+ * global | annotate_state_commit() | annotate_state_abort()
+ * | |
+ * mailbox | annotate_state_commit() | annotate_state_abort()
+ * | |
+ * message | mailbox_unlock() or | annotate_state_abort(
+ * | mailbox_commit() | &mailbox->annot_state)
+ * --------+----------------------------+----------------------------
 */
-int annotatemore_rename(const char *oldmboxname, const char *newmboxname,
-			const char *olduserid, const char *newuserid);
-
-/* delete the annotations for 'mboxname' */
-int annotatemore_delete(const char *mboxname);
 
 /* close the database */
 void annotatemore_close(void);
 
 /* done with database stuff */
-void annotatemore_done(void);
+void annotate_done(void);
+
+/* These APIs allow calling code to hold an extra reference to a
+ * per-message database for an extended period of time, which can be a
+ * useful performance optimisation when doing lots of annotate
+ * operations that might otherwise spend a lot of time opening and
+ * closing databases. Also, if annotate_getdb() does not returns zero
+ * (success) then calling code can assume there are no per-message
+ * annotations at all on the mailbox. These APIs are for performance
+ * optimisations only; the other annotate APIs will manage their own
+ * references internally. */
+int annotate_getdb(const char *mboxname, annotate_db_t **dbp);
+void annotate_putdb(annotate_db_t **dbp);
+
+/* Maybe this isn't the right place - move later */
+int specialuse_validate(const char *src, struct buf *dest);
 
 #endif /* ANNOTATE_H */

cyrus-imapd-2.4.17.tar.gz/imap/append.c -> cyrus-imapd-2.5.tar.gz/imap/append.c Changed

@@ -38,31 +38,32 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: append.c,v 1.122 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
 
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdio.h>
-#include <ctype.h>
-#include <utime.h>
 #include <string.h>
 #include <sys/types.h>
 #include <syslog.h>
 #include <sys/stat.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
 
 #include "acl.h"
 #include "assert.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "message.h"
 #include "append.h"
 #include "global.h"
 #include "prot.h"
+#include "sync_log.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
@@ -72,21 +73,15 @@
 #include "quota.h"
 #include "util.h"
 
+#include "annotate.h"
 #include "message_guid.h"
+#include "strarray.h"
+#include "conversations.h"
 
 struct stagemsg {
 char fname1024;
 
- /* the parts buffer consists of
- /part1/stage./file \0
- /part2/stage./file \0
- ... \0
- \0
- 
- the main invariant is double \0 at the end
- */
- char *parts; /* buffer of current stage parts */
- char *partend; /* end of buffer */
+ strarray_t parts; /* buffer of current stage parts */
 struct message_guid guid;
 };
 
@@ -102,18 +97,20 @@
 * Arguments:
 *	name	 - name of mailbox directory
 *	aclcheck - user must have these rights on mailbox ACL
- *	quotacheck - mailbox must have this much quota left
+ *	quotastorage_check - mailbox must have this much storage quota left
+ *		 (-1 means don't care about quota)
+ *	quotamessage_check - mailbox must have this much message quota left
 *		 (-1 means don't care about quota)
 *
 */
-int append_check(const char *name,
+EXPORTED int append_check(const char *name,
 		 struct auth_state *auth_state,
-		 long aclcheck, quota_t quotacheck)
+		 long aclcheck,
+		 const quota_t quotacheckQUOTA_NUMRESOURCES)
 {
 struct mailbox *mailbox = NULL;
 int myrights;
 int r;
- struct quota q;
 
 r = mailbox_open_irl(name, &mailbox);
 if (r) return r;
@@ -126,15 +123,8 @@
 	goto done;
 }
 
- q.root = mailbox->quotaroot;
- r = quota_read(&q, NULL, 0);
- if (!r) {
-	if (q.limit >= 0 && quotacheck >= 0 &&
-	 q.used + quotacheck > ((uquota_t) q.limit * QUOTA_UNITS)) {
-	 r = IMAP_QUOTA_EXCEEDED;
-	}
- }
- else if (r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
+ if (quotacheck)
+	r = mailbox_quota_check(mailbox, quotacheck);
 
 done:
 mailbox_close(&mailbox);
@@ -148,45 +138,62 @@
 * Arguments:
 *	name	 - name of mailbox directory
 *	aclcheck - user must have these rights on mailbox ACL
- *	quotacheck - mailbox must have this much quota left
+ *	quotastorage_check - mailbox must have this much storage quota left
 *		 (-1 means don't care about quota)
- *
+ *	quotamessage_check - mailbox must have this much message quota left
+ *		 (-1 means don't care about quota)
+ *	event_type - the event among MessageNew, MessageAppend and
+ *		 vnd.cmu.MessageCopy (zero means don't send notification)
 * On success, the struct pointed to by 'as' is set up.
 *
+ * when you commit or abort, the mailbox is closed
 */
-int append_setup(struct appendstate *as, const char *name,
+EXPORTED int append_setup(struct appendstate *as, const char *name,
 		 const char *userid, struct auth_state *auth_state,
-		 long aclcheck, quota_t quotacheck)
+		 long aclcheck, const quota_t quotacheckQUOTA_NUMRESOURCES,
+		 struct namespace *namespace, int isadmin, enum event_type event_type)
 {
 int r;
- struct quota q;
+ struct mailbox *mailbox = NULL;
 
- as->mailbox = NULL;
- r = mailbox_open_iwl(name, &as->mailbox);
+ r = mailbox_open_iwl(name, &mailbox);
 if (r) return r;
 
- as->myrights = cyrus_acl_myrights(auth_state, as->mailbox->acl);
+ r = append_setup_mbox(as, mailbox, userid, auth_state,
+			 aclcheck, quotacheck, namespace, isadmin, event_type);
+ if (r) mailbox_close(&mailbox);
+ else as->close_mailbox_when_done = 1;
+
+ return r;
+}
+
+/* setup for append with an existing mailbox
+ *
+ * same as append_setup, but when you commit, the mailbox remains open and locked.
+ *
+ * Requires as write locked mailbox (of course)
+ */
+EXPORTED int append_setup_mbox(struct appendstate *as, struct mailbox *mailbox,
+			 const char *userid, struct auth_state *auth_state,
+			 long aclcheck, const quota_t quotacheckQUOTA_NUMRESOURCES,
+			 struct namespace *namespace, int isadmin,
+			 enum event_type event_type)
+{
+ int r;
+
+ memset(as, 0, sizeof(*as));
+
+ as->myrights = cyrus_acl_myrights(auth_state, mailbox->acl);
 
 if ((as->myrights & aclcheck) != aclcheck) {
 	r = (as->myrights & ACL_LOOKUP) ?
 	 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
-	mailbox_close(&as->mailbox);
 	return r;
 }
 
- q.root = as->mailbox->quotaroot;
- r = quota_read(&q, NULL, 0);
- if (!r) {
-	if (q.limit >= 0 && quotacheck >= 0 &&
-	 q.used + quotacheck > ((uquota_t) q.limit * QUOTA_UNITS)) {
-	 r = IMAP_QUOTA_EXCEEDED;
-	}
- }
- else if (r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
-
- if (r) {
-	mailbox_close(&as->mailbox);
-	return r;
+ if (quotacheck) {
+	r = mailbox_quota_check(mailbox, quotacheck);
+	if (r) return r;
 }
 
 if (userid) {
@@ -194,54 +201,69 @@
 } else {
 	as->userid0 = '\0';
 }
-
- /* we'll need the cache file open */
- r = mailbox_open_cache(as->mailbox);
- if (r) {
-	mailbox_close(&as->mailbox);
-	return r;
- }
+ as->namespace = namespace;
+ as->auth_state = auth_state;
+ as->isadmin = isadmin;
 
 /* initialize seen list creator */
- as->internalseen = mailbox_internal_seen(as->mailbox, as->userid);
+ as->internalseen = mailbox_internal_seen(mailbox, as->userid);
 as->seen_seq = seqset_init(0, SEQ_SPARSE);
 
 /* zero out metadata */
 as->nummsg = 0;
- as->baseuid = as->mailbox->i.last_uid + 1;
+ as->baseuid = mailbox->i.last_uid + 1;
 as->s = APPEND_READY;
- 
+
+ as->event_type = event_type;
+ as->mboxevents = NULL;
+
+ as->mailbox = mailbox;
+
 return 0;
 }
 
+EXPORTED uint32_t append_uidvalidity(struct appendstate *as)
+{
+ return as->mailbox->i.uidvalidity;
+}
+
+static void append_free(struct appendstate *as)
+{
+ if (!as) return;
+ if (as->s == APPEND_DONE) return;
+
+ seqset_free(as->seen_seq);
+ as->seen_seq = NULL;
+
+ mboxevent_freequeue(&as->mboxevents);
+ as->event_type = 0;
+
+ if (as->close_mailbox_when_done)
+	mailbox_close(&as->mailbox);
+
+ as->s = APPEND_DONE;
+}
+
 /* may return non-zero, indicating that the entire append has failed
 and the mailbox is probably in an inconsistent state. */
-int append_commit(struct appendstate *as, 
-		 quota_t quotacheck __attribute__((unused)),
-		 unsigned long *uidvalidity, 
-		 unsigned long *start,
-		 unsigned long *num,
-		 struct mailbox **mailboxptr)
+EXPORTED int append_commit(struct appendstate *as)
 {
 int r = 0;
- 
+
 if (as->s == APPEND_DONE) return 0;
 
- if (start) *start = as->baseuid;
- if (num) *num = as->nummsg;
- if (uidvalidity) *uidvalidity = as->mailbox->i.uidvalidity;
+ if (as->nummsg) {
+	/* Calculate new index header information */
+	as->mailbox->i.last_appenddate = time(0);
 
- /* Calculate new index header information */
- as->mailbox->i.last_appenddate = time(0);
+	/* log the append so rolling squatter can index this mailbox */
+	sync_log_append(as->mailbox->name);
 
- /* the cache will be dirty even if we hand added the records */
- as->mailbox->cache_dirty = 1;
+	/* set seen state */
+	if (as->userid0)
+	 append_addseen(as->mailbox, as->userid, as->seen_seq);
+ }
 
- /* set seen state */
- if (as->userid0)
-	append_addseen(as->mailbox, as->userid, as->seen_seq);
- seqset_free(as->seen_seq);
- 
 /* We want to commit here to guarantee mailbox on disk vs
 * duplicate DB consistency */
 r = mailbox_commit(as->mailbox);
@@ -252,34 +274,20 @@
 	return r;
 }
 
- if (mailboxptr) {
-	*mailboxptr = as->mailbox;
- }
- else {
-	mailbox_close(&as->mailbox);
- }
-
- as->s = APPEND_DONE;
+ /* send the list of MessageCopy or MessageAppend event notifications at once */
+ mboxevent_notify(as->mboxevents);
 
+ append_free(as);
 return 0;
 }
 
 /* may return non-zero, indicating an internal error of some sort. */
-int append_abort(struct appendstate *as)
+EXPORTED int append_abort(struct appendstate *as)
 {
- int r = 0;
-
 if (as->s == APPEND_DONE) return 0;
- as->s = APPEND_DONE;
-
- /* XXX - clean up neatly so we don't crash and burn here... */
-
- /* close mailbox */
- mailbox_close(&as->mailbox);
+ append_free(as);
 
- seqset_free(as->seen_seq);
-
- return r;
+ return 0;
 }
 
 /*
@@ -287,7 +295,7 @@
 * with the file for the given mailboxname and returns the open file
 * so it can double as the spool file
 */
-FILE *append_newstage(const char *mailboxname, time_t internaldate,
+EXPORTED FILE *append_newstage(const char *mailboxname, time_t internaldate,
 		 int msgnum, struct stagemsg **stagep)
 {
 struct stagemsg *stage;
@@ -301,8 +309,7 @@
 *stagep = NULL;
 
 stage = xmalloc(sizeof(struct stagemsg));
- stage->parts = xzmalloc(5 * (MAX_MAILBOX_PATH+1) * sizeof(char));
- stage->partend = stage->parts + 5 * (MAX_MAILBOX_PATH+1) * sizeof(char);
+ strarray_init(&stage->parts);
 
 snprintf(stage->fname, sizeof(stage->fname), "%d-%d-%d",
 	 (int) getpid(), (int) internaldate, msgnum);
@@ -333,69 +340,555 @@
 if (!f) {
 	syslog(LOG_ERR, "IOERROR: creating message file %s: %m", 
 	 stagefile);
+	strarray_fini(&stage->parts);
 	free(stage);
 	return NULL;
 }
 
- strlcpy(stage->parts, stagefile, MAX_MAILBOX_PATH+1);
- /* make sure there's a NUL NUL at the end */
- stage->partsstrlen(stagefile) + 1 = '\0';
+ strarray_append(&stage->parts, stagefile);
 
 *stagep = stage;
 return f;
 }
 
 /*
+ * Send the args down a socket. We use a counted encoding
+ * similar in concept to HTTP chunked encoding, with a decimal
+ * ASCII encoded length followed by that many bytes of data.
+ * A zero length indicates end of message.
+ */
+static int callout_send_args(int fd, const struct buf *args)
+{
+ char lenbuf32;
+ int r = 0;
+
+ snprintf(lenbuf, sizeof(lenbuf), "%u\n", (unsigned)args->len);
+ r = retry_write(fd, lenbuf, strlen(lenbuf));
+ if (r < 0)
+	goto out;
+
+ if (args->len) {
+	r = retry_write(fd, args->s, args->len);
+	if (r < 0)
+	 goto out;
+	r = retry_write(fd, "0\n", 2);
+ }
+
+out:
+ return (r < 0 ? IMAP_SYS_ERROR : 0);
+}
+
+#define CALLOUT_TIMEOUT_MS	(10*1000)
+
+static int callout_receive_reply(const char *callout,
+				 int fd, struct dlist **results)
+{
+ struct protstream *p = NULL;
+ int r;
+ int c;
+ struct pollfd pfd;
+
+ memset(&pfd, 0, sizeof(pfd));
+ pfd.fd = fd;
+ pfd.events = POLLIN;
+
+ r = poll(&pfd, 1, CALLOUT_TIMEOUT_MS);
+ if (r < 0) {
+	syslog(LOG_ERR, "cannot poll() waiting for callout %s: %m",
+	 callout);
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+ if (r == 0) {
+	syslog(LOG_ERR, "timed out waiting for callout %s",
+	 callout);
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ p = prot_new(fd, /*write*/0);
+ prot_setisclient(p, 1);
+
+ /* read and parse the reply as a dlist */
+ c = dlist_parse(results, /*parsekeys*/0, p);
+ r = (c == EOF ? IMAP_SYS_ERROR : 0);
+
+out:
+ if (p)
+	prot_free(p);
+ return r;
+}
+
+/*
+ * Handle the callout as a service listening on a UNIX domain socket.
+ * Send the encoded arguments down the socket; capture the reply and
+ * decode it as a dlist.
+ */
+static int callout_run_socket(const char *callout,
+			 const struct buf *args,
+			 struct dlist **results)
+{
+ int sock = -1;
+ struct sockaddr_un mysun;
+ int r;
+
+ sock = socket(PF_UNIX, SOCK_STREAM, 0);
+ if (sock < 0) {
+	syslog(LOG_ERR, "cannot create socket for callout: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ memset(&mysun, 0, sizeof(mysun));
+ mysun.sun_family = AF_UNIX;
+ strncpy(mysun.sun_path, callout, sizeof(mysun.sun_path));
+ r = connect(sock, (struct sockaddr *)&mysun, sizeof(mysun));
+ if (r < 0) {
+	syslog(LOG_ERR, "cannot connect socket for callout: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ r = callout_send_args(sock, args);
+ if (r)
+	goto out;
+
+ r = callout_receive_reply(callout, sock, results);
+
+out:
+ if (sock >= 0)
+	close(sock);
+ return r;
+}
+
+/*
+ * Handle the callout as an executable. Fork and exec the callout as an
+ * executable, with the encoded arguments appearing on stdin and the
+ * stdout captured as a dlist.
+ */
+static int callout_run_executable(const char *callout,
+				 const struct buf *args,
+				 struct dlist **results)
+{
+ pid_t pid, reaped;
+#define PIPE_READ 0
+#define PIPE_WRITE 1
+ int inpipe2 = { -1, -1 };
+ int outpipe2 = { -1, -1 };
+ int status;
+ int r;
+
+ r = pipe(inpipe);
+ if (!r)
+	r = pipe(outpipe);
+ if (r < 0) {
+	syslog(LOG_ERR, "cannot create pipe for callout: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ pid = fork();
+ if (pid < 0) {
+	syslog(LOG_ERR, "cannot fork for callout: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ if (pid == 0) {
+	/* child process */
+
+	close(inpipePIPE_WRITE);
+	dup2(inpipePIPE_READ, /*FILENO_STDIN*/0);
+	close(inpipePIPE_READ);
+
+	close(outpipePIPE_READ);
+	dup2(outpipePIPE_WRITE, /*FILENO_STDOUT*/1);
+	close(outpipePIPE_WRITE);
+
+	execl(callout, callout, (char *)NULL);
+	syslog(LOG_ERR, "cannot exec callout %s: %m", callout);
+	exit(1);
+ }
+ /* parent process */
+ close(inpipePIPE_READ);
+ inpipePIPE_READ = -1;
+ close(outpipePIPE_WRITE);
+ outpipePIPE_WRITE = -1;
+
+ r = callout_send_args(inpipePIPE_WRITE, args);
+ if (r)
+	goto out;
+
+ r = callout_receive_reply(callout, outpipePIPE_READ, results);
+ if (r)
+	goto out;
+
+ /* reap the child process */
+ do {
+	reaped = waitpid(pid, &status, 0);
+	if (reaped < 0) {
+	 if (errno == EINTR)
+		continue;
+	 if (errno == ESRCH)
+		break;
+	 if (errno == ECHILD)
+		break;
+	 syslog(LOG_ERR, "error reaping callout pid %d: %m",
+		 (int)pid);
+	 r = IMAP_SYS_ERROR;
+	 goto out;
+	}
+ }
+ while (reaped != pid);
+ r = 0;
+
+out:
+ if (inpipePIPE_READ >= 0)
+	close(inpipePIPE_READ);
+ if (inpipePIPE_WRITE >= 0)
+	close(inpipePIPE_WRITE);
+ if (outpipePIPE_READ >= 0)
+	close(outpipePIPE_READ);
+ if (outpipePIPE_WRITE >= 0)
+	close(outpipePIPE_WRITE);
+ return r;
+#undef PIPE_READ
+#undef PIPE_WRITE
+}
+
+/*
+ * Encode the arguments for a callout into @buf.
+ */
+static void callout_encode_args(struct buf *args,
+				const char *fname,
+				const struct body *body,
+				struct entryattlist *annotations,
+				strarray_t *flags)
+{
+ struct entryattlist *ee;
+ int i;
+
+ buf_putc(args, '(');
+
+ buf_printf(args, "FILENAME ");
+ message_write_nstring(args, fname);
+
+ buf_printf(args, " ANNOTATIONS (");
+ for (ee = annotations ; ee ; ee = ee->next) {
+	struct attvaluelist *av;
+	message_write_nstring(args, ee->entry);
+	buf_putc(args, ' ');
+	buf_putc(args, '(');
+	for (av = ee->attvalues ; av ; av = av->next) {
+	 message_write_nstring(args, av->attrib);
+	 buf_putc(args, ' ');
+	 message_write_nstring_map(args, av->value.s, av->value.len);
+	 if (av->next)
+		buf_putc(args, ' ');
+	}
+	buf_putc(args, ')');
+	if (ee->next)
+	 buf_putc(args, ' ');
+ }
+ buf_putc(args, ')');
+
+ buf_printf(args, " FLAGS (");
+ for (i = 0 ; i < flags->count ; i++) {
+	if (i)
+	 buf_putc(args, ' ');
+	buf_appendcstr(args, flags->datai);
+ }
+ buf_putc(args, ')');
+
+ buf_appendcstr(args, " BODY ");
+ message_write_body(args, body, 2);
+
+ buf_printf(args, " GUID %s", message_guid_encode(&body->guid));
+ buf_putc(args, ')');
+ buf_cstring(args);
+}
+
+/*
+ * Parse the reply from the callout. This designed to be similar to the
+ * arguments of the STORE command, except that we can have multiple
+ * items one after the other and the whole thing is in a list.
+ *
+ * Examples:
+ * (+FLAGS \Flagged)
+ * (+FLAGS (\Flagged \Seen))
+ * (-FLAGS \Flagged)
+ * (ANNOTATION (/comment (value.shared "Hello World")))
+ * (+FLAGS \Flagged ANNOTATION (/comment (value.shared "Hello")))
+ *
+ * The result is merged into @user_annots, @system_annots, and @flags.
+ * User-set annotations are kept separate from system-set annotations
+ * for two reasons: a) system-set annotations need to bypass the ACL
+ * check to allow them to work during local delivery, and b) failure
+ * to set system-set annotations needs to be logged but must not cause
+ * the append to fail.
+ */
+static void callout_decode_results(const char *callout,
+				 const struct dlist *results,
+			 struct entryattlist **user_annots,
+			 struct entryattlist **system_annots,
+				 strarray_t *flags)
+{
+ struct dlist *dd;
+
+ for (dd = results->head ; dd ; dd = dd->next) {
+	const char *key = dlist_cstring(dd);
+	const char *val;
+	dd = dd->next;
+	if (!dd)
+	 goto error;
+
+	if (!strcasecmp(key, "+FLAGS")) {
+	 if (dd->head) {
+		struct dlist *dflag;
+		for (dflag = dd->head ; dflag ; dflag = dflag->next)
+		 if ((val = dlist_cstring(dflag)))
+			strarray_add_case(flags, val);
+	 }
+	 else if ((val = dlist_cstring(dd))) {
+		strarray_add_case(flags, val);
+	 }
+	}
+	else if (!strcasecmp(key, "-FLAGS")) {
+	 if (dd->head) {
+		struct dlist *dflag;
+		for (dflag = dd->head ; dflag ; dflag = dflag->next) {
+		 if ((val = dlist_cstring(dflag)))
+			strarray_remove_all_case(flags, val);
+		}
+	 }
+	 else if ((val = dlist_cstring(dd))) {
+		strarray_remove_all_case(flags, val);
+	 }
+	}
+	else if (!strcasecmp(key, "ANNOTATION")) {
+	 const char *entry;
+	 struct dlist *dx = dd->head;
+
+	 if (!dx)
+		goto error;
+	 entry = dlist_cstring(dx);
+	 if (!entry)
+		goto error;
+
+	 for (dx = dx->next ; dx ; dx = dx->next) {
+		const char *attrib;
+		const char *valmap;
+		size_t vallen;
+		struct buf value = BUF_INITIALIZER;
+
+		/* must be a list with exactly two elements,
+		 * an attrib and a value */
+		if (!dx->head || !dx->head->next || dx->head->next->next)
+		 goto error;
+		attrib = dlist_cstring(dx->head);
+		if (!attrib)
+		 goto error;
+		if (!dlist_tomap(dx->head->next, &valmap, &vallen))
+		 goto error;
+		buf_init_ro(&value, valmap, vallen);
+		clearentryatt(user_annots, entry, attrib);
+		setentryatt(system_annots, entry, attrib, &value);
+		buf_free(&value);
+	 }
+	}
+	else {
+	 goto error;
+	}
+ }
+
+ return;
+error:
+ syslog(LOG_WARNING, "Unexpected data in response from callout %s",
+	 callout);
+}
+
+static int callout_run(const char *fname,
+		 const struct body *body,
+		 struct entryattlist **user_annots,
+		 struct entryattlist **system_annots,
+		 strarray_t *flags)
+{
+ const char *callout;
+ struct stat sb;
+ struct buf args = BUF_INITIALIZER;
+ struct dlist *results = NULL;
+ int r;
+
+ callout = config_getstring(IMAPOPT_ANNOTATION_CALLOUT);
+ assert(callout);
+ assert(flags);
+
+ callout_encode_args(&args, fname, body, *user_annots, flags);
+
+ if (stat(callout, &sb) < 0) {
+	syslog(LOG_ERR, "cannot stat annotation_callout %s: %m", callout);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ if (S_ISSOCK(sb.st_mode)) {
+	/* UNIX domain socket on which a service is listening */
+	r = callout_run_socket(callout, &args, &results);
+	if (r)
+	 goto out;
+ }
+ else if (S_ISREG(sb.st_mode) &&
+	 (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH))) {
+	/* regular file, executable */
+	r = callout_run_executable(callout, &args, &results);
+	if (r)
+	 goto out;
+ }
+ else {
+	syslog(LOG_ERR, "cannot classify annotation_callout %s", callout);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ if (results) {
+	/* We have some results, parse them and merge them back into
+	 * the annotations and flags we were given */
+	callout_decode_results(callout, results,
+			 user_annots, system_annots, flags);
+ }
+
+out:
+ buf_free(&args);
+ dlist_free(&results);
+
+ return r;
+}
+
+static int append_apply_flags(struct appendstate *as,
+ struct mboxevent *mboxevent,
+			 struct index_record *record,
+			 const strarray_t *flags)
+{
+ int userflag;
+ int i, r = 0;
+
+ assert(flags);
+
+ for (i = 0; i < flags->count; i++) {
+	const char *flag = strarray_nth(flags, i);
+	if (!strcasecmp(flag, "\\seen")) {
+	 append_setseen(as, record);
+	 mboxevent_add_flag(mboxevent, flag);
+	}
+	else if (!strcasecmp(flag, "\\deleted")) {
+	 if (as->myrights & ACL_DELETEMSG) {
+		record->system_flags |= FLAG_DELETED;
+		mboxevent_add_flag(mboxevent, flag);
+	 }
+	}
+	else if (!strcasecmp(flag, "\\draft")) {
+	 if (as->myrights & ACL_WRITE) {
+		record->system_flags |= FLAG_DRAFT;
+		mboxevent_add_flag(mboxevent, flag);
+	 }
+	}
+	else if (!strcasecmp(flag, "\\flagged")) {
+	 if (as->myrights & ACL_WRITE) {
+		record->system_flags |= FLAG_FLAGGED;
+		mboxevent_add_flag(mboxevent, flag);
+	 }
+	}
+	else if (!strcasecmp(flag, "\\answered")) {
+	 if (as->myrights & ACL_WRITE) {
+		record->system_flags |= FLAG_ANSWERED;
+		mboxevent_add_flag(mboxevent, flag);
+	 }
+	}
+	else if (as->myrights & ACL_WRITE) {
+	 r = mailbox_user_flag(as->mailbox, flag, &userflag, 1);
+	 if (r) goto out;
+	 record->user_flagsuserflag/32 |= 1<<(userflag&31);
+	 mboxevent_add_flag(mboxevent, flag);
+	}
+ }
+
+out:
+ return r;
+}
+
+static void append_make_flags(struct appendstate *as,
+			 struct index_record *record,
+			 strarray_t *flags)
+{
+ int i;
+
+ assert(flags);
+
+ /* Note: we don't handle the external seen db here, on
+ * the grounds that it would add complexity without
+ * actually being useful to annotators */
+ if (as->internalseen && (record->system_flags & FLAG_SEEN))
+	strarray_append(flags, "\\Seen");
+
+ if ((record->system_flags & FLAG_DELETED))
+	strarray_append(flags, "\\Deleted");
+ if ((record->system_flags & FLAG_DRAFT))
+	strarray_append(flags, "\\Draft");
+ if ((record->system_flags & FLAG_FLAGGED))
+	strarray_append(flags, "\\Flagged");
+ if ((record->system_flags & FLAG_ANSWERED))
+	strarray_append(flags, "\\Answered");
+
+ for (i = 0 ; i < MAX_USER_FLAGS ; i++) {
+	if (as->mailbox->flagnamei &&
+	 (record->user_flagsi/32 & 1<<(i&31)))
+	 strarray_append(flags, as->mailbox->flagnamei);
+ }
+}
+
+/*
 * staging, to allow for single-instance store. the complication here
 * is multiple partitions.
+ *
+ * Note: @user_annots needs to be freed by the caller but
+ * may be modified during processing of callout responses.
 */
-int append_fromstage(struct appendstate *as, struct body **body,
+EXPORTED int append_fromstage(struct appendstate *as, struct body **body,
 		 struct stagemsg *stage, time_t internaldate,
-		 const char **flag, int nflags, int nolink)
+		 const strarray_t *flags, int nolink,
+		 struct entryattlist *user_annots)
 {
 struct mailbox *mailbox = as->mailbox;
- struct index_record message_index;
- char *fname;
+ struct index_record record;
+ const char *fname;
 FILE *destfile;
 int i, r;
- int userflag;
+ strarray_t *newflags = NULL;
+ struct entryattlist *system_annots = NULL;
+ struct mboxevent *mboxevent = NULL;
 
 /* for staging */
 char stagefileMAX_MAILBOX_PATH+1;
- int sflen;
- char *p;
 
- assert(stage != NULL && stage->parts0 != '\0');
+ assert(stage != NULL && stage->parts.count);
 
- zero_index(message_index);
+ zero_index(record);
 
 /* xxx check errors */
 mboxlist_findstage(mailbox->name, stagefile, sizeof(stagefile));
 strlcat(stagefile, stage->fname, sizeof(stagefile));
- sflen = strlen(stagefile);
-
- p = stage->parts;
- while (p < stage->partend) {
-	int sl = strlen(p);
 
-	if (sl == 0) {
-	 /* our partition isn't here */
-	 break;
-	}
-	if (!strcmp(stagefile, p)) {
+ for (i = 0 ; i < stage->parts.count ; i++) {
+	if (!strcmp(stagefile, stage->parts.datai)) {
 	 /* aha, this is us */
 	 break;
 	}
-	
-	p += sl + 1;
 }
 
- if (*p == '\0') {
-	/* ok, create this file, and copy the name of it into 'p'.
-	 make sure not to overwrite stage->partend */
+ if (i == stage->parts.count) {
+	/* ok, create this file, and copy the name of it into stage->parts. */
 
 	/* create the new staging file from the first stage part */
-	r = mailbox_copyfile(stage->parts, stagefile, 0);
+	r = mailbox_copyfile(stage->parts.data0, stagefile, 0);
 	if (r) {
 	 /* maybe the directory doesn't exist? */
 	 char stagedirMAX_MAILBOX_PATH+1;
@@ -408,7 +901,7 @@
 	 } else {
 		syslog(LOG_NOTICE, "created stage directory %s",
 		 stagedir);
-		r = mailbox_copyfile(stage->parts, stagefile, 0);
+		r = mailbox_copyfile(stage->parts.data0, stagefile, 0);
 	 }
 	}
 	if (r) {
@@ -419,39 +912,38 @@
 	 unlink(stagefile);
 	 return r;
 	}
-	
-	if (p + sflen > stage->partend - 5) {
-	 int cursize = stage->partend - stage->parts;
-	 int curp = p - stage->parts;
-
-	 /* need more room; double the buffer */
-	 stage->parts = xrealloc(stage->parts, 2 * cursize);
-	 stage->partend = stage->parts + 2 * cursize;
-	 p = stage->parts + curp;
-	}
-	strcpy(p, stagefile);
-	/* make sure there's a NUL NUL at the end */
-	psflen + 1 = '\0';
+
+	strarray_append(&stage->parts, stagefile);
 }
 
- /* 'p' contains the message and is on the same partition
+ /* 'stagefile' contains the message and is on the same partition
 as the mailbox we're looking at */
 
 /* Setup */
- message_index.uid = as->baseuid + as->nummsg;
- message_index.internaldate = internaldate;
+ record.uid = as->baseuid + as->nummsg;
+ record.internaldate = internaldate;
+
+ /* prepare a new notification for this appended message
+ * the event type must be set with MessageNew or MessageAppend */
+ if (as->event_type) {
+	mboxevent = mboxevent_enqueue(as->event_type, &as->mboxevents);
+ }
 
 /* Create message file */
 as->nummsg++;
- fname = mailbox_message_fname(mailbox, message_index.uid);
+ fname = mailbox_record_fname(mailbox, &record);
 
- r = mailbox_copyfile(p, fname, nolink);
+ r = mailbox_copyfile(stagefile, fname, nolink);
 destfile = fopen(fname, "r");
 if (!r && destfile) {
 	/* ok, we've successfully created the file */
 	if (!*body || (as->nummsg - 1))
 	 r = message_parse_file(destfile, NULL, NULL, body);
-	if (!r) r = message_create_record(&message_index, *body);
+	if (!r) r = message_create_record(&record, *body);
+
+	/* messageContent may be included with MessageAppend and MessageNew */
+	if (!r)
+	 mboxevent_extract_content(mboxevent, &record, destfile);
 }
 if (destfile) {
 	/* this will hopefully ensure that the link() actually happened
@@ -459,69 +951,85 @@
 	fsync(fileno(destfile));
 	fclose(destfile);
 }
- if (r) {
-	append_abort(as);
-	return r;
- }
 
- /* Handle flags the user wants to set in the message */
- for (i = 0; i < nflags; i++) {
-	if (!strcmp(flagi, "\\seen")) {
-	 append_setseen(as, &message_index);
-	}
-	else if (!strcmp(flagi, "\\deleted")) {
-	 if (as->myrights & ACL_DELETEMSG) {
-		message_index.system_flags |= FLAG_DELETED;
-	 }
-	}
-	else if (!strcmp(flagi, "\\draft")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_DRAFT;
-	 }
+ if (!r && config_getstring(IMAPOPT_ANNOTATION_CALLOUT)) {
+	if (flags)
+	 newflags = strarray_dup(flags);
+	else
+	 newflags = strarray_new();
+	r = callout_run(fname, *body, &user_annots, &system_annots, newflags);
+	if (r) {
+	 syslog(LOG_ERR, "Annotation callout failed, ignoring\n");
+	 r = 0;
 	}
-	else if (!strcmp(flagi, "\\flagged")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_FLAGGED;
-	 }
+	flags = newflags;
+ }
+ if (!r && (user_annots || system_annots)) {
+	annotate_state_t *astate = NULL;
+	r = mailbox_get_annotate_state(as->mailbox, record.uid, &astate);
+	if (r) goto out;
+	if (user_annots) {
+	 annotate_state_set_auth(astate, as->isadmin,
+				 as->userid, as->auth_state);
+	 r = annotate_state_store(astate, user_annots);
 	}
-	else if (!strcmp(flagi, "\\answered")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_ANSWERED;
+	if (!r && system_annots) {
+	 /* pretend to be admin to avoid ACL checks */
+	 annotate_state_set_auth(astate, /*isadmin*/1,
+				 as->userid, as->auth_state);
+	 r = annotate_state_store(astate, system_annots);
+	 if (r) {
+		syslog(LOG_ERR, "Setting annnotations from annotator "
+				"callout failed (%s), ignoring\n",
+				error_message(r));
+		r = 0;
 	 }
 	}
-	else if (as->myrights & ACL_WRITE) {
-	 /* User flag */
-	 r = mailbox_user_flag(mailbox, flagi, &userflag);
-	 if (!r) 
-		message_index.user_flagsuserflag/32 |= 1<<(userflag&31);
-	}
 }
+
+ /* Handle flags the user wants to set in the message */
+ if (!r && flags) {
+	r = append_apply_flags(as, mboxevent, &record, flags);
+	if (r) goto out;
+ }
+
 /* Write out index file entry */
- r = mailbox_append_index_record(mailbox, &message_index);
+ if (!r) r = mailbox_append_index_record(mailbox, &record);
+
+out:
+ if (newflags)
+	strarray_free(newflags);
+ freeentryatts(system_annots);
 if (r) {
 	append_abort(as);
 	return r;
 }
 
+ /* finish filling the event notification */
+ /* XXX avoid to parse ENVELOPE record since Message-Id is already
+ * present in body structure ? */
+ mboxevent_extract_record(mboxevent, mailbox, &record);
+ mboxevent_extract_mailbox(mboxevent, mailbox);
+ mboxevent_set_numunseen(mboxevent, mailbox, -1);
+
 return 0;
 }
 
-int append_removestage(struct stagemsg *stage)
+EXPORTED int append_removestage(struct stagemsg *stage)
 {
 char *p;
 
 if (stage == NULL) return 0;
 
- p = stage->parts;
- while (*p != '\0' && p < stage->partend) {
+ while ((p = strarray_pop(&stage->parts))) {
 	/* unlink the staging file */
 	if (unlink(p) != 0) {
 	 syslog(LOG_ERR, "IOERROR: error unlinking file %s: %m", p);
 	}
-	p += strlen(p) + 1;
+	free(p);
 }
- 
- free(stage->parts);
+
+ strarray_fini(&stage->parts);
 free(stage);
 return 0;
 }
@@ -540,37 +1048,42 @@
 * unlocked) until append_commit() is called. multiple
 * append_onefromstream()s can be aborted by calling append_abort().
 */
-int append_fromstream(struct appendstate *as, struct body **body,
+EXPORTED int append_fromstream(struct appendstate *as, struct body **body,
 		 struct protstream *messagefile,
 		 unsigned long size,
 		 time_t internaldate,
-		 const char **flag,
-		 int nflags)
+		 const strarray_t *flags)
 {
 struct mailbox *mailbox = as->mailbox;
- struct index_record message_index;
- char *fname;
+ struct index_record record;
+ const char *fname;
 FILE *destfile;
- int i, r;
- int userflag;
+ int r;
+ struct mboxevent *mboxevent = NULL;
 
 assert(size != 0);
 
- zero_index(message_index);
+ zero_index(record);
 /* Setup */
- message_index.uid = as->baseuid + as->nummsg;
- message_index.internaldate = internaldate;
+ record.uid = as->baseuid + as->nummsg;
+ record.internaldate = internaldate;
 
 /* Create message file */
- fname = mailbox_message_fname(mailbox, message_index.uid);
+ fname = mailbox_record_fname(mailbox, &record);
 as->nummsg++;
 
 unlink(fname);
 destfile = fopen(fname, "w+");
 if (!destfile) {
 	syslog(LOG_ERR, "IOERROR: creating message file %s: %m", fname);
-	append_abort(as);
-	return IMAP_IOERROR;
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* prepare a new notification for this appended message
+ * the event type must be set with MessageNew or MessageAppend */
+ if (as->event_type) {
+	mboxevent = mboxevent_enqueue(as->event_type, &as->mboxevents);
 }
 
 /* Copy and parse message */
@@ -578,57 +1091,129 @@
 if (!r) {
 	if (!*body || (as->nummsg - 1))
 	 r = message_parse_file(destfile, NULL, NULL, body);
-	if (!r) r = message_create_record(&message_index, *body);
+	if (!r) r = message_create_record(&record, *body);
+
+	/* messageContent may be included with MessageAppend and MessageNew */
+	if (!r)
+	 mboxevent_extract_content(mboxevent, &record, destfile);
 }
 fclose(destfile);
- if (r) {
-	append_abort(as);
-	return r;
- }
+ if (r) goto out;
 
 /* Handle flags the user wants to set in the message */
- for (i = 0; i < nflags; i++) {
-	if (!strcmp(flagi, "\\seen")) {
-	 append_setseen(as, &message_index);
-	}
-	else if (!strcmp(flagi, "\\deleted")) {
-	 if (as->myrights & ACL_DELETEMSG) {
-		message_index.system_flags |= FLAG_DELETED;
-	 }
-	}
-	else if (!strcmp(flagi, "\\draft")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_DRAFT;
-	 }
-	}
-	else if (!strcmp(flagi, "\\flagged")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_FLAGGED;
-	 }
-	}
-	else if (!strcmp(flagi, "\\answered")) {
-	 if (as->myrights & ACL_WRITE) {
-		message_index.system_flags |= FLAG_ANSWERED;
-	 }
-	}
-	else if (as->myrights & ACL_WRITE) {
-	 r = mailbox_user_flag(mailbox, flagi, &userflag);
-	 if (!r)
-		message_index.user_flagsuserflag/32 |= 1<<(userflag&31);
-	}
+ if (flags) {
+	r = append_apply_flags(as, mboxevent, &record, flags);
+	if (r) goto out;
 }
 
 /* Write out index file entry; if we abort later, it's not
 important */
- r = mailbox_append_index_record(mailbox, &message_index);
+ r = mailbox_append_index_record(mailbox, &record);
+
+out:
 if (r) {
 	append_abort(as);
 	return r;
 }
 
+ /* finish filling the event notification */
+ /* XXX avoid to parse ENVELOPE record since Message-Id is already
+ * present in body structure */
+ mboxevent_extract_record(mboxevent, mailbox, &record);
+ mboxevent_extract_mailbox(mboxevent, mailbox);
+ mboxevent_set_numunseen(mboxevent, mailbox, -1);
+
+ return 0;
+}
+
+static int load_annot_cb(const char *mailbox __attribute__((unused)),
+			 uint32_t uid __attribute__((unused)),
+			 const char *entry, const char *userid,
+			 const struct buf *value, void *rock)
+{
+ struct entryattlist **eal = (struct entryattlist **)rock;
+ const char *attrib = (userid0 ? "value.priv" : "value.shared");
+ setentryatt(eal, entry, attrib, value);
 return 0;
 }
 
+HIDDEN int append_run_annotator(struct appendstate *as,
+			 struct index_record *record)
+{
+ FILE *f = NULL;
+ const char *fname;
+ struct entryattlist *user_annots = NULL;
+ struct entryattlist *system_annots = NULL;
+ strarray_t flags = STRARRAY_INITIALIZER;
+ annotate_state_t *astate = NULL;
+ struct body *body = NULL;
+ int r;
+
+ if (!config_getstring(IMAPOPT_ANNOTATION_CALLOUT))
+	return 0;
+
+ append_make_flags(as, record, &flags);
+
+ r = annotatemore_findall(as->mailbox->name, record->uid, "*",
+			 load_annot_cb, &user_annots);
+ if (r) goto out;
+
+ fname = mailbox_record_fname(as->mailbox, record);
+ if (!fname) goto out;
+
+ f = fopen(fname, "r");
+ if (!f) {
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ r = message_parse_file(f, NULL, NULL, &body);
+ if (r) goto out;
+
+ fclose(f);
+ f = NULL;
+
+ r = callout_run(fname, body, &user_annots, &system_annots, &flags);
+ if (r) goto out;
+
+ record->system_flags &= (FLAG_SEEN | FLAGS_INTERNAL);
+ memset(&record->user_flags, 0, sizeof(record->user_flags));
+ r = append_apply_flags(as, NULL, record, &flags);
+ if (r) goto out;
+
+ r = mailbox_get_annotate_state(as->mailbox, record->uid, &astate);
+ if (r) goto out;
+ if (user_annots) {
+	annotate_state_set_auth(astate, as->isadmin,
+				as->userid, as->auth_state);
+	r = annotate_state_store(astate, user_annots);
+	if (r) goto out;
+ }
+ if (system_annots) {
+	/* pretend to be admin to avoid ACL checks */
+	annotate_state_set_auth(astate, /*isadmin*/1,
+				as->userid, as->auth_state);
+	r = annotate_state_store(astate, system_annots);
+	if (r) {
+	 syslog(LOG_ERR, "Setting annnotations from annotator "
+			 "callout failed (%s)",
+			 error_message(r));
+	 goto out;
+	}
+ }
+
+out:
+ if (f) fclose(f);
+ freeentryatts(user_annots);
+ freeentryatts(system_annots);
+ strarray_fini(&flags);
+ if (body) {
+	message_free_body(body);
+	free(body);
+ }
+ return r;
+}
+
 /*
 * Append to 'as->mailbox' the 'nummsg' messages from the
 * mailbox 'mailbox' listed in the array pointed to by 'copymsg'.
@@ -636,7 +1221,7 @@
 * flag is to be set anywhere then 'userid' passed to append_setup()
 * contains the name of the user whose \Seen flag gets set. 
 */
-int append_copy(struct mailbox *mailbox, 
+EXPORTED int append_copy(struct mailbox *mailbox,
 		struct appendstate *as,
 		int nummsg, 
 		struct copymsg *copymsg,
@@ -644,41 +1229,48 @@
 {
 int msg;
 struct index_record record;
- char *srcfname, *destfname;
 int r = 0;
- int flag, userflag;
- 
+ int userflag;
+ int i;
+ char *srcfname, *destfname;
+ annotate_state_t *astate = NULL;
+ struct mboxevent *mboxevent = NULL;
+
 if (!nummsg) {
 	append_abort(as);
 	return 0;
 }
 
+ /* prepare a single vnd.cmu.MessageCopy notification for all messages */
+ if (as->event_type) {
+	mboxevent = mboxevent_enqueue(as->event_type, &as->mboxevents);
+ }
+
 /* Copy/link all files and cache info */
 for (msg = 0; msg < nummsg; msg++) {
-	zero_index(record);
+	record = copymsgmsg.record;
+
+	/* renumber the message into the new mailbox */
 	record.uid = as->mailbox->i.last_uid + 1;
 	as->nummsg++;
 
-	/* copy the parts that are the same regardless */
-	record.internaldate = copymsgmsg.internaldate;
-	message_guid_copy(&record.guid, &copymsgmsg.guid);
-
-	/* Handle any flags that need to be copied */
+	/* user flags are special - different numbers, so look them up */
 	if (as->myrights & ACL_WRITE) {
-	 /* deleted is special, different ACL */
-	 record.system_flags =
-	 copymsgmsg.system_flags & ~FLAG_DELETED;
-
-	 for (flag = 0; copymsgmsg.flagflag; flag++) {
-		r = mailbox_user_flag(as->mailbox, 
-				 copymsgmsg.flagflag, &userflag);
-		if (!r)
-		 record.user_flagsuserflag/32 |= 1<<(userflag&31);
+	 for (i = 0; i < strarray_size(&copymsgmsg.flags); i++) {
+		const char *flag = strarray_nth(&copymsgmsg.flags, i);
+		r = mailbox_user_flag(as->mailbox, flag, &userflag, 1);
+		if (r) goto out;
+		record.user_flagsuserflag/32 |= 1<<(userflag&31);
 	 }
 	}
-	/* deleted flag copy as well */
-	if (as->myrights & ACL_DELETEMSG) {
-	 record.system_flags |= copymsgmsg.system_flags & FLAG_DELETED;
+	else {
+	 /* only flag allow to be kept without ACL_WRITE is DELETED */
+	 record.system_flags &= FLAG_DELETED;
+	}
+
+	/* deleted flag has its own ACL */
+	if (!(as->myrights & ACL_DELETEMSG)) {
+	 record.system_flags &= ~FLAG_DELETED;
 	}
 
 	/* should this message be marked \Seen? */
@@ -687,32 +1279,45 @@
 	}
 
 	/* Link/copy message file */
-	srcfname = xstrdup(mailbox_message_fname(mailbox, copymsgmsg.uid));
-	destfname = xstrdup(mailbox_message_fname(as->mailbox, record.uid));
+	srcfname = xstrdup(mailbox_record_fname(mailbox, &copymsgmsg.record));
+	destfname = xstrdup(mailbox_record_fname(as->mailbox, &record));
 	r = mailbox_copyfile(srcfname, destfname, nolink);
-	free(srcfname);
 	free(destfname);
-	if (r) goto fail;
-
-	/* Write out cache info, copy other info */
-	record.sentdate = copymsgmsg.sentdate;
-	record.size = copymsgmsg.size;
-	record.header_size = copymsgmsg.header_size;
-	record.gmtime = copymsgmsg.gmtime;
-	record.content_lines = copymsgmsg.content_lines;
-	record.cache_version = copymsgmsg.cache_version;
-	record.cache_crc = copymsgmsg.cache_crc;
-	record.crec = copymsgmsg.crec;
+	free(srcfname);
+	if (r) goto out;
+
+	/* wipe out the cache offset so it rewrites */
+	record.cache_offset = 0;
 
 	/* Write out index file entry */
 	r = mailbox_append_index_record(as->mailbox, &record);
-	if (r) goto fail;
+	if (r) goto out;
+
+	/* ensure we have an astate connected to the destination
+	 * mailbox, so that the annotation txn will be committed
+	 * when we close the mailbox */
+	r = mailbox_get_annotate_state(as->mailbox, record.uid, &astate);
+	if (r) goto out;
+
+	r = annotate_msg_copy(mailbox, copymsgmsg.olduid,
+			 as->mailbox, record.uid,
+			 as->userid);
+	if (r) goto out;
+
+	mboxevent_extract_record(mboxevent, as->mailbox, &record);
+	mboxevent_extract_copied_record(mboxevent, mailbox, copymsgmsg.olduid);
 }
 
- fail:
- if (r) append_abort(as);
+out:
+ if (r) {
+	append_abort(as);
+	return r;
+ }
 
- return r;
+ mboxevent_extract_mailbox(mboxevent, as->mailbox);
+ mboxevent_set_numunseen(mboxevent, as->mailbox, -1);
+
+ return 0;
 }
 
 void append_setseen(struct appendstate *as, struct index_record *record)

cyrus-imapd-2.4.17.tar.gz/imap/append.h -> cyrus-imapd-2.5.tar.gz/imap/append.h Changed

@@ -38,33 +38,25 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: append.h,v 1.34 2010/01/06 17:01:30 murch Exp $
  */
 
 #ifndef INCLUDED_APPEND_H
 #define INCLUDED_APPEND_H
 
 #include "mailbox.h"
+#include "mboxevent.h"
 #include "message.h"
 #include "prot.h"
 #include "sequence.h"
+#include "strarray.h"
+#include "annotate.h"
+#include "conversations.h"
 
 struct copymsg {
-    unsigned long uid;
-    time_t internaldate;
-    time_t sentdate;
-    time_t gmtime;
-    unsigned long size;
-    unsigned long header_size;
-    unsigned long content_lines;
-    unsigned long cache_version;
-    unsigned long cache_crc;
-    struct cacherecord crec;
-    int seen;
-    struct message_guid guid;
-    bit32 system_flags;
-    char *flagMAX_USER_FLAGS+1;
+    uint32_t olduid;
+    int seen:1;
+    struct index_record record;
+    strarray_t flags;
 };
 
 /* it's ridiculous i have to expose this structure if i want to allow
@@ -72,6 +64,8 @@
 struct appendstate {
     /* mailbox we're appending to */
     struct mailbox *mailbox;
+    /* do we own it? */
+    int close_mailbox_when_done:1;
     int myrights;
     char useridMAX_MAILBOX_BUFFER;
 
@@ -85,6 +79,15 @@
     /* set seen on these message on commit */
     int internalseen;
     struct seqset *seen_seq;
+
+    /* for annotations */
+    struct namespace *namespace;
+    struct auth_state *auth_state;
+    int isadmin;
+
+    /* one event notification to send per appended message */
+    enum event_type event_type;
+    struct mboxevent *mboxevents;
 };
 
 /* add helper function to determine uid range appended? */
@@ -93,19 +96,26 @@
 
 extern int append_check(const char *name,
 			struct auth_state *auth_state,
-			long aclcheck, quota_t quotacheck);
+			long aclcheck,
+			const quota_t quotacheckQUOTA_NUMRESOURCES);
 
 /* appendstate must be allocated by client */
 extern int append_setup(struct appendstate *as, const char *name,
 			const char *userid, struct auth_state *auth_state,
-			long aclcheck, quota_t quotacheck);
-
-extern int append_commit(struct appendstate *as,
-			 quota_t quotacheck,
-			 unsigned long *uidvalidity, 
-			 unsigned long *startuid, 
-			 unsigned long *num,
-			 struct mailbox **mailboxptr);
+			long aclcheck,
+			const quota_t quotacheckQUOTA_NUMRESOURCES,
+			struct namespace *, int isadmin, enum event_type event_type);
+extern int append_setup_mbox(struct appendstate *as, struct mailbox *mailbox,
+			     const char *userid,
+			     struct auth_state *auth_state,
+			     long aclcheck,
+			     const quota_t quotacheckQUOTA_NUMRESOURCES,
+			     struct namespace *namespace,
+			     int isadmin, enum event_type event_type);
+
+extern uint32_t append_uidvalidity(struct appendstate *as);
+
+extern int append_commit(struct appendstate *as);
 extern int append_abort(struct appendstate *as);
 
 /* creates a new stage and returns stage file corresponding to mailboxname */
@@ -115,7 +125,8 @@
 /* adds a new mailbox to the stage initially created by append_newstage() */
 extern int append_fromstage(struct appendstate *mailbox, struct body **body,
 			    struct stagemsg *stage, time_t internaldate,
-			    const char **flag, int nflags, int nolink);
+			    const strarray_t *flags, int nolink,
+			    struct entryattlist *annotations);
 
 /* removes the stage (frees memory, deletes the staging files) */
 extern int append_removestage(struct stagemsg *stage);
@@ -123,7 +134,7 @@
 extern int append_fromstream(struct appendstate *as, struct body **body,
 			     struct protstream *messagefile,
 			     unsigned long size, time_t internaldate,
-			     const char **flag, int nflags);
+			     const strarray_t *flags);
 
 extern int append_copy(struct mailbox *mailbox,
 		       struct appendstate *append_mailbox,
@@ -135,4 +146,7 @@
 #define append_getuidvalidity(as) ((as)->m.uidvalidity);
 #define append_getlastuid(as) ((as)->m.last_uid);
 
+extern int append_run_annotator(struct appendstate *as,
+				struct index_record *record);
+
 #endif /* INCLUDED_APPEND_H */

cyrus-imapd-2.4.17.tar.gz/imap/arbitron.c -> cyrus-imapd-2.5.tar.gz/imap/arbitron.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: arbitron.c,v 1.48 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
@@ -50,31 +48,23 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <dirent.h>
-#include <errno.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
 
-#include "assert.h"
 #include "global.h"
 #include "exitcodes.h"
 #include "hash.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "mpool.h"
 #include "mboxlist.h"
-#include "convert_code.h"
 #include "seen.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
-
-/* config.c stuff */
-const int config_need_data = 0;
 
 #define DB (config_seenstate_db)
 #define SUBDB (config_subscription_db)
@@ -96,25 +86,24 @@
 struct user_list *subscribers;
 };
 
-struct mpool *arb_pool;
-hash_table mailbox_table, mboxname_table;
+static struct mpool *arb_pool;
+static hash_table mailbox_table, mboxname_table;
 
-time_t report_start_time = -1, report_end_time, prune_time = 0;
-int code = 0;
-int dosubs = 1;
-int dousers = 0;
-int long_report = 0;
+static time_t report_start_time = -1, report_end_time, prune_time = 0;
+static int dosubs = 1;
+static int dousers = 0;
+static int long_report = 0;
 
 /* current namespace */
 static struct namespace arb_namespace;
 
 /* forward declarations */
-void usage(void);
-void run_users(void);
-void make_report(char *key, void *data, void *rock);
-void process_seen(const char *path, const char *user);
-void process_subs(const char *path, const char *user);
-int do_mailbox(const char *name, int matchlen, int maycreate, void *rock);
+static void usage(void);
+static void run_users(void);
+static void make_report(const char *key, void *data, void *rock);
+static void process_seen(const char *path, const char *user);
+static void process_subs(const char *path, const char *user);
+static int do_mailbox(const char *name, int matchlen, int maycreate, void *rock);
 
 int main(int argc,char **argv)
 {
@@ -127,7 +116,7 @@
 
 strcpy(pattern, "*");
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -196,7 +185,7 @@
 }
 
 /* Init Cyrus Backend Foo */
- cyrus_init(alt_config, "arbitron", 0);
+ cyrus_init(alt_config, "arbitron", 0, 0);
 
 mboxlist_init(0);
 mboxlist_open(NULL);
@@ -248,10 +237,10 @@
 
 cyrus_done();
 
- return code;
+ return 0;
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "usage: arbitron -o -u -l -C alt_config "
@@ -260,9 +249,9 @@
 exit(EC_USAGE);
 } 
 
-int do_mailbox(const char *name, int matchlen __attribute__((unused)),
-	 int maycreate __attribute__((unused)),
-	 void *rock __attribute__((unused)))
+static int do_mailbox(const char *name, int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
 {
 int r;
 struct mailbox *mailbox = NULL;
@@ -286,7 +275,7 @@
 return 0;
 }
 
-void run_users() 
+static void run_users(void)
 {
 char prefixMAX_MAILBOX_PATH+1,pathMAX_MAILBOX_PATH+1,
 	fileMAX_MAILBOX_PATH+1; 
@@ -355,14 +344,14 @@
 }
 
 static int process_user_cb(void *rockp,
-			 const char *key, int keylen,
+			 const char *key, size_t keylen,
 			 const char *tmpdata __attribute__((unused)),
-			 int tmpdatalen __attribute__((unused))) 
+			 size_t tmpdatalen __attribute__((unused))) 
 {
 /* Only called to do deletes */
 /* printf("pruning entry\n"); */
 
- DB->delete((struct db *)rockp, key, keylen, NULL, 0); 
+ cyrusdb_delete((struct db *)rockp, key, keylen, NULL, 0); 
 
 return 0; 
 }
@@ -370,9 +359,9 @@
 /* We can cheat and do all we need to in this function */
 static int process_user_p(void *rockp,
 			 const char *key,
-			 int keylen,
+			 size_t keylen,
 			 const char *data,
-			 int datalen __attribute__((unused))) 
+			 size_t datalen __attribute__((unused))) 
 {
 int ret = 0; 
 long version, lastread;
@@ -383,6 +372,7 @@
 
 /* remember that 'data' may not be null terminated ! */
 version = strtol(data, &p, 10); data = p;
+ if (version < 0) abort();
 /* xxx not checking version */
 lastread = strtol(data, &p, 10); data = p;
 
@@ -414,34 +404,34 @@
 return ret; 
 }
 
-void process_seen(const char *path, const char *user) 
+static void process_seen(const char *path, const char *user)
 {
 int r; 
 struct db *tmp = NULL;
 
- r = (DB->open)(path, 0, &tmp);
+ r = cyrusdb_open(DB, path, 0, &tmp);
 if(r) goto done;
 
- DB->foreach(tmp, "", 0, process_user_p, process_user_cb,
+ cyrusdb_foreach(tmp, "", 0, process_user_p, process_user_cb,
 		(void *) user, NULL);
 
 done:
- if(tmp) (DB->close)(tmp);
+ if(tmp) cyrusdb_close(tmp);
 }
 
 static int process_subs_cb(void *rockp __attribute__((unused)),
 			 const char *key __attribute__((unused)),
-			 int keylen __attribute__((unused)),
+			 size_t keylen __attribute__((unused)),
 			 const char *tmpdata __attribute__((unused)),
-			 int tmpdatalen __attribute__((unused))) 
+			 size_t tmpdatalen __attribute__((unused))) 
 {
 return 0;
 }
 
 static int process_subs_p(void *rockp,
-			 const char *key, int keylen,
+			 const char *key, size_t keylen,
 			 const char *tmpdata __attribute__((unused)),
-			 int tmpdatalen __attribute__((unused))) 
+			 size_t tmpdatalen __attribute__((unused))) 
 {
 struct arb_mailbox_data *mbox;
 char bufMAX_MAILBOX_BUFFER;
@@ -470,22 +460,22 @@
 return 0; /* never do callback */
 }
 
-void process_subs(const char *path, const char *user) 
+static void process_subs(const char *path, const char *user)
 {
 int r; 
 struct db *tmp = NULL;
 
- r = (SUBDB->open)(path, 0, &tmp);
+ r = cyrusdb_open(SUBDB, path, 0, &tmp);
 if(r) goto done;
 
- SUBDB->foreach(tmp, "", 0, process_subs_p, process_subs_cb,
+ cyrusdb_foreach(tmp, "", 0, process_subs_p, process_subs_cb,
 		 (void *) user, NULL);
 
 done:
- if(tmp) (SUBDB->close)(tmp);
+ if(tmp) cyrusdb_close(tmp);
 }
 
-void report_users(struct user_list *u)
+static void report_users(struct user_list *u)
 {
 char sep = ':';
 
@@ -496,7 +486,7 @@
 }
 }
 
-void long_report_users(struct user_list *u, const char *mbox, char type)
+static void long_report_users(struct user_list *u, const char *mbox, char type)
 {
 char buf100;
 struct tm *tm;
@@ -514,15 +504,18 @@
 }
 }
 
-void make_report(char *key, void *data, void *rock __attribute__((unused))) 
+static void make_report(const char *key, void *data, void *rock __attribute__((unused)))
 {
 struct arb_mailbox_data *mbox = (struct arb_mailbox_data *)data;
+ char *extkey;
 
 /* Skip underread user mailboxes */
 if(!strncasecmp(key, "user.", 5) && mbox->nreaders <= 1)
 	return; 
 
- mboxname_hiersep_toexternal(&arb_namespace, key, 0);
+ extkey = xstrdup(key);
+ mboxname_hiersep_toexternal(&arb_namespace, extkey, 0);
+ key = extkey;
 
 if (long_report) {
 	long_report_users(mbox->readers, key, 'r');
@@ -537,4 +530,5 @@
 	}
 	printf("\n");
 }
+ free(extkey);
 }

cyrus-imapd-2.5.tar.gz/imap/autocreate.c Added

@@ -0,0 +1,799 @@
+/* autocreate.c -- Mailbox list manipulation routines
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+#include <time.h>
+#include <syslog.h>
+
+#include "global.h"
+#include "util.h"
+#include "user.h"
+#include "xmalloc.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "imap/imap_err.h"
+
+#ifdef USE_SIEVE
+
+#include "sieve/sieve_interface.h"
+#include "sieve/script.h"
+
+#define TIMSIEVE_FAIL 	-1
+#define TIMSIEVE_OK 	0
+#define MAX_FILENAME	1024
+
+static void foo(void);
+static int sieve_notify(void *ac __attribute__((unused)),
+			void *interp_context __attribute__((unused)),
+			void *script_context __attribute__((unused)),
+			void *message_context __attribute__((unused)),
+			const char **errmsg __attribute__((unused)));
+static int mysieve_error(int lineno, const char *msg,
+		 void *i __attribute__((unused)), void *s);
+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
+
+
+static sieve_vacation_t vacation2 = {
+ 0,				/* min response */
+ 0,				/* max response */
+ (sieve_callback *) &foo,	/* autorespond() */
+ (sieve_callback *) &foo	/* send_response() */
+};
+
+
+/*
+ * Find the name of the sieve script
+ * given the source script and compiled script names
+ */
+static const char *get_script_name(const char *filename)
+{
+ const char *p;
+
+ p = strrchr(filename, '/');
+ if (p == NULL)
+	return filename;
+ else
+	return p + 1;
+}
+
+static int autocreate_sieve(const char *userid, const char *source_script)
+{
+ /* XXX - this is really ugly, but too much work to tidy up right now -- Bron */
+ const char *sieve_dir = NULL;
+ sieve_script_t *s = NULL;
+ bytecode_info_t *bc = NULL;
+ char *err = NULL;
+ FILE *in_stream, *out_fp;
+ int out_fd, in_fd, r, k;
+ int do_compile = 0;
+ const char *compiled_source_script = NULL;
+ const char *sievename = get_script_name(source_script);
+ char sieve_script_nameMAX_FILENAME;
+ char sieve_script_dirMAX_FILENAME;
+ char sieve_bcscript_nameMAX_FILENAME;
+ char sieve_defaultMAX_FILENAME;
+ char sieve_tmpnameMAX_FILENAME;
+ char sieve_bctmpnameMAX_FILENAME;
+ char sieve_bclink_nameMAX_FILENAME;
+ char buf4096;
+ mode_t oldmask;
+ struct stat statbuf;
+
+ /* We don't support using the homedirectory, like timsieved */
+ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) {
+	syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf");
+	return 1;
+ }
+
+ /* Check if sievedir is defined in imapd.conf */
+ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) {
+	syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf");
+	return 1;
+ }
+
+ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */
+ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) {
+	syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it");
+	do_compile = 1;
+ }
+
+ if(snprintf(sieve_tmpname, MAX_FILENAME, "%s%s.script.NEW",sieve_script_dir, sievename) >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+ if(snprintf(sieve_bctmpname, MAX_FILENAME, "%s%s.bc.NEW",sieve_script_dir, sievename) >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+ if(snprintf(sieve_script_name, MAX_FILENAME, "%s%s.script",sieve_script_dir, sievename) >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+ if(snprintf(sieve_bcscript_name, MAX_FILENAME, "%s%s.bc",sieve_script_dir, sievename) >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+ if(snprintf(sieve_default, MAX_FILENAME, "%s%s",sieve_script_dir,"defaultbc") >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+ if(snprintf(sieve_bclink_name, MAX_FILENAME, "%s.bc", sievename) >= MAX_FILENAME) {
+	syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
+	return 1;
+ }
+
+ /* Check if a default sieve filter alrady exists */
+ if(!stat(sieve_default,&statbuf)) {
+	syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists");
+	return 1;
+ }
+
+ /* Open the source script. if there is a problem with that exit */
+ in_stream = fopen(source_script, "r");
+ if(!in_stream) {
+	syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script);
+	return 1;
+ }
+
+ /*
+ * At this point we start the modifications of the filesystem
+ */
+
+ /* Create the directory where the sieve scripts will reside */
+ r = cyrus_mkdir(sieve_script_dir, 0755);
+ if(r == -1) {
+	/* If this fails we just leave */
+	syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name);
+	fclose(in_stream);
+	return 1;
+ }
+
+ /*
+ * We open the file that will be used as the bc file. If this file exists, overwrite it 
+ * since something bad has happened. We open the file here so that this error checking is
+ * done before we try to open the rest of the files to start copying etc.
+ */
+ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+ if(out_fd < 0) {
+	if(errno == EEXIST) {
+	 syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname);
+	} else if (errno == EACCES) {
+	 syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname);
+	 fclose(in_stream);
+	 return 1;
+	} else {
+	 syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname);
+	 fclose(in_stream);
+	 return 1;
+	}
+ }
+
+ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) {
+	while((r = read(in_fd, buf, sizeof(buf))) > 0) {
+	 if((k=write(out_fd, buf,r)) < 0) {
+		syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno);
+		close(out_fd);
+		close(in_fd);
+		fclose(in_stream);
+		unlink(sieve_bctmpname);
+		return 1;
+	 }
+	}
+
+	if(r == 0) { /* EOF */
+	 xclose(out_fd);
+	 xclose(in_fd);
+	} else if (r < 0) {
+	 syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", 
+			 compiled_source_script);
+	 xclose(in_fd);
+	 do_compile = 1;
+	 if(lseek(out_fd, 0, SEEK_SET)) {
+		syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting");
+		xclose(out_fd);
+		return 1;
+	 }
+	}
+	xclose(in_fd);
+ } else {
+	if(compiled_source_script)
+	 syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script);
+	do_compile = 1;
+ }
+
+
+ /* Because we failed to open a precompiled bc sieve script, we compile one */
+ if(do_compile) {
+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) {
+	 if(err && *err) {
+	 syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err);
+	 free(err);
+	 } else
+		syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script");
+
+	 unlink(sieve_bctmpname);
+	 fclose(in_stream);
+	 close(out_fd);
+	 return 1;
+	}
+
+	/* generate the bytecode */
+	if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) {
+	 syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script");
+	 /* removing the copied script and cleaning up memory */
+	 unlink(sieve_bctmpname);
+	 sieve_script_free(&s);
+	 fclose(in_stream);
+	 close(out_fd);
+	 return 1;
+	}
+
+	if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) {
+	 syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script");
+	 /* removing the copied script and cleaning up memory */
+	 unlink(sieve_bctmpname);
+	 sieve_free_bytecode(&bc);
+	 sieve_script_free(&s);
+	 fclose(in_stream);
+	 close(out_fd);
+	 return 1;
+	}
+
+	/* clean up the memory */
+	sieve_free_bytecode(&bc);
+	sieve_script_free(&s);
+ }
+
+ xclose(out_fd);
+ rewind(in_stream);
+
+ /* Copy the initial script */
+ oldmask = umask(077);
+ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) {
+	syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname);
+	unlink(sieve_bctmpname);
+	umask(oldmask);
+	fclose(in_stream);
+	return 1;
+ }
+ umask(oldmask);
+
+ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream)) > 0) {
+	if( fwrite(buf,sizeof(char), r, out_fp) != (unsigned)r) {
+	 syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname);
+	 fclose(out_fp);
+	 unlink(sieve_tmpname);
+	 unlink(sieve_bctmpname);
+	 fclose(in_stream);
+	 return 1;
+	}
+ }
+
+ if(feof(in_stream)) {
+	fclose(out_fp);
+	fclose(in_stream);
+ } else { /* ferror */
+	fclose(out_fp);
+	unlink(sieve_tmpname);
+	unlink(sieve_bctmpname);
+	fclose(in_stream);
+	return 1;
+ }
+
+ /* Renaming the necessary stuff */
+ if(rename(sieve_tmpname, sieve_script_name)) {
+	unlink(sieve_tmpname);
+	unlink(sieve_bctmpname);
+	return 1;
+ }
+
+ if(rename(sieve_bctmpname, sieve_bcscript_name)) {
+	unlink(sieve_bctmpname);
+	unlink(sieve_bcscript_name);
+	return 1;
+ }
+
+ /* end now with the symlink */
+ if(symlink(sieve_bclink_name, sieve_default)) {
+	if(errno != EEXIST) {
+	 syslog(LOG_WARNING, "autocreate_sieve: problem making the default link.");
+	 /* Lets delete the files */
+	 unlink(sieve_script_name);
+	 unlink(sieve_bcscript_name);
+	}
+ }
+
+ /*
+ * If everything has succeeded AND we have compiled the script AND we have requested
+ * to generate the global script so that it is not compiled each time then we create it.
+ */
+ if(do_compile &&
+	 config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) {
+
+	if(!compiled_source_script) {
+	 syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf");
+	 return 0;
+	}
+
+	if(snprintf(sieve_tmpname, MAX_FILENAME, "%s.NEW", compiled_source_script) >= MAX_FILENAME)
+	 return 0;
+
+	/*
+	 * Copy everything from the newly created bc sieve sieve script.
+	 */
+	if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) {
+	 return 0;
+	}
+
+	if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) {
+	 if(errno == EEXIST) {
+	 /* Someone is already doing this so just bail out. */
+	 syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname);
+		close(in_fd);
+		return 0;
+	 } else if (errno == EACCES) {
+		syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname);
+		close(in_fd);
+		return 0;
+	 } else {
+		syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname);
+		close(in_fd);
+		return 0;
+	 }
+	}
+
+	while((r = read(in_fd, buf, sizeof(buf))) > 0) {
+	 if((k = write(out_fd,buf,r)) < 0) {
+		syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
+		close(out_fd);
+		close(in_fd);
+		unlink(sieve_tmpname);
+		return 0;
+	 }
+	}
+
+	if(r == 0 ) { /*EOF */
+	 xclose(out_fd);
+	 xclose(in_fd);
+	} else if (r < 0) {
+		syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
+		xclose(out_fd);
+		xclose(in_fd);
+		unlink(sieve_tmpname);
+		return 0;
+	}
+
+	/* Rename the temporary created sieve script to its final name. */
+	if(rename(sieve_tmpname, compiled_source_script)) {
+	 if(errno != EEXIST) {
+	 unlink(sieve_tmpname);
+	 unlink(compiled_source_script);
+	}
+	 return 0;
+	}
+
+	syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script);
+ }
+
+ return 0;
+}
+
+/* to make larry's stupid functions happy :) */
+static void foo(void)
+{
+ fatal("stub function called", 0);
+}
+
+static int sieve_notify(void *ac __attribute__((unused)),
+			void *interp_context __attribute__((unused)),
+			void *script_context __attribute__((unused)),
+			void *message_context __attribute__((unused)),
+			const char **errmsg __attribute__((unused)))
+{
+ fatal("stub function called", 0);
+ return SIEVE_FAIL;
+}
+
+static int mysieve_error(int lineno, const char *msg,
+		 void *i __attribute__((unused)), void *s)
+{
+ struct buf *errors = (struct buf *)s;
+ buf_printf(errors, "line %d: %s\r\n", lineno, msg);
+ return SIEVE_OK;
+}
+
+/* end the boilerplate */
+
+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
+{
+ sieve_interp_t *i;
+ sieve_script_t *s;
+ struct buf errors = BUF_INITIALIZER;
+ int res;
+
+ i = sieve_interp_alloc(NULL);
+
+ sieve_register_redirect(i, (sieve_callback *) &foo);
+ sieve_register_discard(i, (sieve_callback *) &foo);
+ sieve_register_reject(i, (sieve_callback *) &foo);
+ sieve_register_fileinto(i, (sieve_callback *) &foo);
+ sieve_register_keep(i, (sieve_callback *) &foo);
+ sieve_register_imapflags(i, NULL);
+ sieve_register_size(i, (sieve_get_size *) &foo);
+ sieve_register_header(i, (sieve_get_header *) &foo);
+ sieve_register_envelope(i, (sieve_get_envelope *) &foo);
+
+ res = sieve_register_vacation(i, &vacation2);
+ if (res != SIEVE_OK) {
+	syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res);
+	goto out;
+ }
+
+ sieve_register_notify(i, &sieve_notify);
+ sieve_register_parse_error(i, &mysieve_error);
+
+ rewind(stream);
+
+ buf_appendcstr(&errors, "script errors:\r\n");
+ *errstr = NULL;
+
+ res = sieve_script_parse(i, stream, &errors, &s);
+
+ if (res == SIEVE_OK) {
+	if(ret) {
+	 *ret = s;
+	} else {
+	 sieve_script_free(&s);
+	}
+ }
+ else {
+	sieve_script_free(&s);
+	*errstr = buf_release(&errors);
+ }
+ buf_free(&errors);
+
+out:
+ /* free interpreter */
+ sieve_interp_free(&i);
+
+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
+}
+
+#endif /* USE_SIEVE */
+
+/*
+ * Struct needed to be passed as void *rock to
+ * mboxlist_autochangesub();
+ */
+struct changesub_rock_st {
+ const char *userid;
+ struct auth_state *auth_state;
+ int was_explicit;
+};
+
+/*
+ * Automatically subscribe user to *ALL* shared folders,
+ * one has permissions to be subscribed to.
+ * INBOX subfolders are excluded.
+ */
+static int autochangesub(const char *name,
+			 int matchlen __attribute__((unused)),
+			 int maycreate __attribute__((unused)),
+			 void *rock)
+{
+ struct changesub_rock_st *crock = (struct changesub_rock_st *)rock;
+ const char *userid = crock->userid;
+ struct auth_state *auth_state = crock->auth_state;
+ int was_explicit = crock->was_explicit;
+ int r;
+
+ /* ignore all user mailboxes, we only want shared */
+ if (mboxname_isusermailbox(name, 0)) return 0;
+
+ r = mboxlist_changesub(name, userid, auth_state, 1, 0, 1);
+
+ /* unless this name was explicitly chosen, ignore the failure */
+ if (!was_explicit) return 0;
+
+ if (r) {
+	syslog(LOG_WARNING,
+	 "autosubscribe: User %s to folder %s, subscription failed: %s",
+	 userid, name, error_message(r));
+ } else {
+	syslog(LOG_NOTICE,
+	 "autosubscribe: User %s to folder %s, subscription succeeded",
+	 userid, name);
+ }
+
+ return 0;
+}
+
+/* string for strarray_split */
+#define SEP "|"
+
+/*
+ * Automatically subscribe user to a shared folder.
+ * Subscription is done successfully, if the shared
+ * folder exists and the user has the necessary
+ * permissions.
+ */
+static void autosubscribe_sharedfolders(struct namespace *namespace,
+					const char *userid,
+					struct auth_state *auth_state)
+{
+ strarray_t *folders = NULL;
+ const char *sub;
+ int i;
+ struct changesub_rock_st changesub_rock;
+
+ changesub_rock.userid = userid;
+ changesub_rock.auth_state = auth_state;
+ changesub_rock.was_explicit = 0;
+
+ /*
+ * If subscribeallsharedfolders is set to yes in imapd.conf, then
+ * subscribe user to every shared folder one has the apropriate
+ * permissions.
+ */
+ if (config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS)) {
+	/* don't care about errors here, the sub will log them */
+	mboxlist_findall(namespace, "*", 0, userid, auth_state,
+			 autochangesub, &changesub_rock);
+	return;
+ }
+
+ /* otherwise, check if there are particular folders to subscribe */
+
+ sub = config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS);
+ if (!sub) return;
+
+ changesub_rock.was_explicit = 1;
+
+ folders = strarray_split(sub, SEP, STRARRAY_TRIM);
+
+ for (i = 0; i < folders->count; i++) {
+	const char *mboxname = strarray_nth(folders, i);
+	autochangesub(mboxname, 0, 0, &changesub_rock);
+ }
+
+ strarray_free(folders);
+
+ return;
+}
+
+int autocreate_user(struct namespace *namespace,
+		 const char *userid)
+{
+ int r = IMAP_MAILBOX_NONEXISTENT; /* default error if we break early */
+ int autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA);
+ int autocreatequotamessage = config_getint(IMAPOPT_AUTOCREATEQUOTAMSG);
+ int n;
+ char *inboxname = mboxname_user_mbox(userid, NULL);
+ struct auth_state *auth_state = NULL;
+ strarray_t *create = NULL;
+ strarray_t *subscribe = NULL;
+ int numcrt = 0;
+ int numsub = 0;
+#ifdef USE_SIEVE
+ const char *source_script;
+#endif
+
+ /* check for anonymous */
+ if (!strcmp(userid, "anonymous"))
+	return IMAP_MAILBOX_NONEXISTENT;
+
+ auth_state = auth_newstate(userid);
+
+ /* Added this for debug information. */
+ syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", userid);
+
+ /*
+ * While this is not needed for admins
+ * and imap_admins accounts, it would be
+ * better to separate *all* admins and
+ * proxyservers from normal accounts
+ * (accounts that have mailboxes).
+ * UOA Specific note(1): Even if we do not
+ * exclude these servers-classes here,
+ * UOA specific code, will neither return
+ * role, nor create INBOX, because none of these
+ * administrative accounts belong to the
+ * mailRecipient objectclass, or have imapPartition.
+ * UOA Specific note(2): Another good reason for doing
+ * this, is to prevent the code, from getting into
+ * cyrus_ldap.c because of the continues MSA logins to LMTPd.
+ */
+
+ /*
+ * we need to exclude admins here
+ */
+
+ /*
+ * Do we really need group membership
+ * for admins or service_admins?
+ */
+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) goto done;
+
+ /*
+ * Do we really need group membership
+ * for proxyservers?
+ */
+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) goto done;
+
+ /*
+ * Check if user belongs to the autocreate_users group. This option
+ * controls for whom the mailbox may be automatically created. Default
+ * value for this option is 'anyone'. So, if not declared, all mailboxes
+ * will be created.
+ */
+ if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) {
+	syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created",
+	 userid);
+	goto done;
+ }
+
+ r = mboxlist_createmailbox(inboxname, /*mbtype*/0, /*partition*/NULL,
+			 /*isadmin*/1, userid, auth_state,
+			 /*localonly*/0, /*forceuser*/0,
+			 /*dbonly*/0, /*notify*/1,
+			 /*mailboxptr*/NULL);
+
+ if (!r) r = mboxlist_changesub(inboxname, userid, auth_state, 1, 1, 1);
+ if (r) {
+	syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s",
+	 userid, error_message(r));
+	goto done;
+ }
+
+ if (autocreatequota >= 0 || autocreatequotamessage >= 0) {
+	int newquotasQUOTA_NUMRESOURCES;
+	int res;
+
+	for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+	 newquotasres = QUOTA_UNLIMITED;
+
+	newquotasQUOTA_STORAGE = autocreatequota;
+	newquotasQUOTA_MESSAGE = autocreatequotamessage;
+
+	r = mboxlist_setquotas(inboxname, newquotas, 0);
+	if (r) {
+	 syslog(LOG_ERR, "autocreateinbox: User %s, QUOTA failed. %s",
+		 userid, error_message(r));
+	 goto done;
+	}
+ }
+
+ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created", 
+	 userid);
+
+ create = strarray_split(config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS), SEP, STRARRAY_TRIM);
+ subscribe = strarray_split(config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS), SEP, STRARRAY_TRIM);
+
+ /* need to convert all names to internal namespace first */
+ for (n = 0; n < create->count; n++)
+	mboxname_hiersep_tointernal(namespace, create->datan, 0);
+
+ for (n = 0; n < subscribe->count; n++)
+	mboxname_hiersep_tointernal(namespace, subscribe->datan, 0);
+
+ for (n = 0; n < create->count; n++) {
+	const char *name = strarray_nth(create, n);
+	char *foldername = mboxname_user_mbox(userid, name);
+
+	r = mboxlist_createmailbox(foldername, /*mbtype*/0, /*partition*/NULL,
+				 /*isadmin*/1, userid, auth_state,
+				 /*localonly*/0, /*forceuser*/0,
+				 /*dbonly*/0, /*notify*/1,
+				 /*mailboxptr*/NULL);
+
+	if (!r) {
+	 numcrt++;
+	 syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", 
+		 userid, name);
+	} else {
+	 syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", 
+		 userid, name, error_message(r));
+	 r = 0;
+	 continue;
+	}
+
+	/* skip to next if not subscribing */
+	if (strarray_find(subscribe, name, 0) < 0)
+	 continue;
+
+	r = mboxlist_changesub(foldername, userid, auth_state, 1, 1, 1);
+	if (!r) {
+	 numsub++;
+	 syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded",
+		 userid, name);
+	} else {
+	 syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s",
+		 userid, name, error_message(r));
+	 r = 0;
+	}
+ }
+
+ if (numcrt)
+	syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", 
+	 userid, numcrt, numsub);
+
+ /*
+ * Check if shared folders are available for subscription.
+ */
+ autosubscribe_sharedfolders(namespace, userid, auth_state);
+
+#ifdef USE_SIEVE
+ /*
+ * Here the autocreate sieve script feature is iniated from.
+ */
+ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT);
+
+ if (source_script) {
+	if (!autocreate_sieve(userid, source_script))
+	 syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", userid);
+	else
+	 syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", userid);
+ }
+#endif
+
+ done:
+ free(inboxname);
+ strarray_free(create);
+ strarray_free(subscribe);
+ auth_freestate(auth_state);
+
+ return r;
+}

cyrus-imapd-2.5.tar.gz/imap/autocreate.h Added

@@ -0,0 +1,51 @@
+/* autocreate.h -- auto-creation routines for mailboxes
+ *
+ * Copyright (c) 2012 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef INCLUDED_AUTOCREATE_H
+#define INCLUDED_AUTOCREATE_H
+
+#include "config.h"
+#include "mboxname.h"
+
+extern int autocreate_user(struct namespace *namespace, const char *userid);
+
+#endif /* INCLUDED_AUTOCREATE_H */

cyrus-imapd-2.4.17.tar.gz/imap/backend.c -> cyrus-imapd-2.5.tar.gz/imap/backend.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: backend.c,v 1.63 2010/08/04 18:57:36 wescraig Exp $
 */
 
 #include <config.h>
@@ -66,88 +64,389 @@
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
-#include "assert.h"
-#include "prot.h"
 #include "backend.h"
+#include "exitcodes.h"
 #include "global.h"
+#include "iptostring.h"
+#include "nonblock.h"
+#include "tok.h"
+#include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
-#include "iptostring.h"
-#include "util.h"
 
 enum {
 AUTO_CAPA_BANNER = -1,
 AUTO_CAPA_NO = 0,
 };
 
-static char *parse_capability(const char str,
-			 struct protocol_t *prot, unsigned long *capa)
+static void forget_capabilities(struct backend *s)
+{
+ int i;
+
+ for (i = 0 ; i < s->num_cap_params ; i++)
+	free(s->cap_paramsi.params);
+ s->capability = 0;
+ free(s->cap_params);
+ s->cap_params = NULL;
+ s->num_cap_params = 0;
+}
+
+static char *append_word(char *w1, const char *w2)
+{
+ int len1 = strlen(w1);
+ int len2 = strlen(w2);
+ w1 = xrealloc(w1, len1 + len2 + 2);
+ w1len1 = ' ';
+ strcpy(w1+len1+1, w2);
+ return w1;
+}
+
+/*
+ * Save the capability. Updates @s->capability so that the CAPA() macro
+ * will find the flag. Saves the @param string if not NULL.
+ */
+static void save_capability(struct backend *s,
+			 const struct capa_t *c,
+			 const char *param)
+{
+ int i;
+
+ if (s->prot->type != TYPE_STD) return;
+
+ s->capability |= c->flag;
+
+ if (param) {
+	/* find the matching cap_params entry */
+	for (i = 0 ; i < s->num_cap_params ; i++)
+	 if (s->cap_paramsi.capa == c->flag)
+		break;
+
+	if (i == s->num_cap_params) {
+	 /* not found, expand the array and add a params */
+	 s->num_cap_params++;
+	 s->cap_params = xrealloc(s->cap_params,
+		 sizeof(*s->cap_params) * s->num_cap_params);
+
+	 s->cap_paramsi.capa = c->flag;
+	 s->cap_paramsi.params = xstrdup(param);
+	} else {
+	 /* append to the existing params */
+	 s->cap_paramsi.params = append_word(s->cap_paramsi.params, param);
+	}
+ }
+}
+
+/*
+ * We have been given a @name and optionally a @value by the server,
+ * check to see if the protocol_t knows about this specific capability.
+ * If known, save the capability.
+ */
+static int match_capability(struct backend *s,
+			 const char *name, const char *value)
 {
- char *ret = NULL, *tmp;
- struct capa_t *c;
-
- /* look for capabilities in the string */
- for (c = prot->capa_cmd.capa; c->str; c++) {
-	if ((tmp = strstr(str, c->str)) != NULL) {
-	 *capa = *capa | c->flag;
-
-	 if (c->flag == CAPA_AUTH) {
-		if (prot->capa_cmd.parse_mechlist)
-		 ret = prot->capa_cmd.parse_mechlist(str, prot);
-		else
-		 ret = xstrdup(tmp+strlen(c->str));
+ const struct capa_t *c;
+ const char *cend;
+
+ if (s->prot->type != TYPE_STD) return 0;
+
+ for (c = s->prot->u.std.capa_cmd.capa; c->str; c++) {
+	cend = strchr(c->str, '=');
+
+	if (cend) {
+	 /* c->str is of the form NAME=VALUE, we want to match
+	 * @name against the the NAME part and @value against
+	 * the VALUE part */
+	 if (strlen(name) == (unsigned)(cend - c->str) &&
+		!strncasecmp(name, c->str, (int)(cend - c->str)) &&
+		value &&
+		!strcasecmp(value, cend+1)) {
+		save_capability(s, c, NULL);
+		return 1; /* full match, stop calling me with this @name */
+	 }
+	} else {
+	 /* c->str is a bare NAME, just try to match it against @name */
+	 if (!strcasecmp(c->str, name)) {
+		save_capability(s, c, value);
+		return 2; /* partial match, keep calling with new @value
+			 * for this @name */
 	 }
 	}
 }
 
- return ret;
+ return 0;	/* no match, stop calling me with this @name */
+}
+
+/*
+ * Given a line buffer @buf, find the IMAP response code named by @code,
+ * isolate it and return the start of it, or NULL if not found.
+ */
+static char *find_response_code(char *buf, const char *code)
+{
+ char *start;
+ char *end;
+ int codelen = strlen(code);
+
+ /* Try to find the first response code */
+ start = strchr(buf, '');
+ if (!start)
+	return NULL;	/* no response codes */
+
+ start++;
+ for (;;) {
+	while (*start && Uisspace(*start))
+	 start++;
+	if (!*start)
+	 break;	/* nothing to see here */
+	/* response codes are delineated by */
+	if (!(end = strchr(start, '')))
+	 break;	/* unbalanced response code */
+	if (!strncasecmp(start, code, codelen) && Uisspace(startcodelen)) {
+	 *end = '\0';
+	 start += codelen+1;
+	 return start;
+	} else {
+	 start = end+1;
+	}
+ }
+
+ return NULL;
 }
 
-static char *ask_capability(struct protstream *pout, struct protstream *pin,
-			 struct protocol_t *prot, unsigned long *capa,
-			 char *banner, int automatic)
+/* Tokenize on whitespace, for parse_capability */
+static char *ws_tok(char *buf)
 {
+ return strtok(buf, " \t\r\n");
+}
+
+/* Tokenize on whitespace OR dash, for parse_capability */
+static char *dash_tok(char *buf)
+{
+ return strtok(buf, " \t\r\n-");
+}
+
+/* Tokenize on alternate "quoted-words", for parse_capability.
+ * Note that we probably don't need the general case with escapes. */
+static char *quote_tok(char *buf)
+{
+ char *p;
+ static const char sep = "\"";
+
+ p = strtok(buf, sep);
+ if (p)
+	strtok(NULL, sep);
+ return p;
+}
+
+
+/*
+ * Parse a line of text from the wire which might contain
+ * capabilities, using various details in the capa_cmd field of
+ * the protocol_t to decode capabilities. Only capabilities
+ * explicitly named in an entry in the capa_cmd.capa array
+ * are detected; any others present on the wire are ignored.
+ * All string matches are case-insensitive. Entries are
+ * matched thus:
+ *
+ * { "NAME", FLAG }
+ *	If a capability named NAME is present on the wire,
+ *	the corresponding FLAG will be set where the CAPA()
+ *	macro will test it. Furthermore, if any parameters
+ *	are present on the wire they will be saved where
+ *	the backend_get_cap_params() function will find them.
+ *	If multiple parameters are present on the wire, all
+ *	of them will be saved, separated by space characters.
+ *
+ * { "NAME=VALUE", FLAG }
+ *	If a capability named NAME is present on the wire,
+ *	*and* a parameter which matches VALUE is also present,
+ *	the corresponding FLAG will be set where the CAPA()
+ *	macro will test it. VALUE is not saved	anywhere and
+ *	backend_get_cap_params() will not return it.
+ *
+ * Returns: 1 if any capabilities were found in the string,
+ *	 0 otherwise.
+ */
+static int parse_capability(struct backend *s, const char *str)
+{
+ char *buf;
+ char *word;
+ char *param;
+ int matches = 0;
+ char *(*tok)(char *) = ws_tok;
+ static const char code = "CAPABILITY";
+
+ if (s->prot->type != TYPE_STD) return 0;
+
+ /* save the buffer, we're going to be destructively parsing it */
+ buf = xstrdup(str);
+
+ if ((s->prot->u.std.capa_cmd.formatflags & CAPAF_ONE_PER_LINE)) {
+	/*
+	 * POP3, LMTP and sync protocol style: one capability per line.
+	 */
+	if ((s->prot->u.std.capa_cmd.formatflags & CAPAF_QUOTE_WORDS))
+	 tok = quote_tok;
+
+	if ((s->prot->u.std.capa_cmd.formatflags & CAPAF_DASH_STUFFING))
+	 word = dash_tok(buf);
+	else
+	 word = tok(buf);
+
+	/* Ignore the first word of the line. Used for LMTP and POP3 */
+	if (word && (s->prot->u.std.capa_cmd.formatflags & CAPAF_SKIP_FIRST_WORD))
+	 word = tok(NULL);
+
+	if (!word)
+	 goto out;
+	/* @word is the capability name. Any remaining atoms are parameters */
+	param = tok(NULL);
+
+	if (!param) {
+	 /* no parameters */
+	 matches |= match_capability(s, word, NULL);
+	} else {
+	 /* 1 or more parameters */
+	 for ( ; param ; param = tok(NULL)) {
+		int r = match_capability(s, word, param);
+		matches |= r;
+		if (r != 2)
+		 break;
+	 }
+	}
+
+ } else {
+	/*
+	 * IMAP style: one humungous line with a list of atoms
+	 * of the form NAME or NAME=PARAM, preceeded by the atom
+	 * CAPABILITY, and either surrounded by or being an
+	 * untagged response like "* CAPABILITY ...atoms... CRLF"
+	 */
+	char *start;
+
+	if ((start = find_response_code(buf, code))) {
+	 /* The line is probably a PREAUTH or OK response, possibly
+	 * containing a CAPABILITY response code, and possibly
+	 * containing some other response codes we don't care about. */
+	 word = tok(start);
+	} else {
+	 /* The line is probably an untagged response to a CAPABILITY
+	 * command. Tokenize until we find the CAPABILITY atom */
+	 for (word = tok(buf) ;
+		 word && strcasecmp(word, code) ;
+		 word = tok(NULL))
+		;
+	 if (word)
+		word = tok(NULL); /* skip the CAPABILITY atom itself */
+	}
+
+	/* `word' now points to the first capability; parse it and
+	 * each remaining word as a NAME or NAME=VALUE capability */
+	for ( ; word ; word = tok(NULL)) {
+	 param = strchr(word, '=');
+	 if (param)
+		*param++ = '\0';
+	 matches |= match_capability(s, word, param);
+	}
+ }
+
+out:
+ free(buf);
+ return !!matches;
+}
+
+static void post_parse_capability(struct backend *s)
+{
+ if (s->prot->type != TYPE_STD) return;
+
+ if (s->prot->u.std.capa_cmd.postcapability)
+	s->prot->u.std.capa_cmd.postcapability(s);
+}
+
+/*
+ * Get capabilities from the server, and parse them according to
+ * details in the protocol_t, so that the CAPA() macro and perhaps
+ * the backend_get_cap_params() function will notice them. Any
+ * capabilities previously parsed are forgotten.
+ *
+ * The server might give us capabilities for free just because we
+ * connected (or did a STARTTLS or logged in); in this case, call
+ * with a non-zero value for @automatic. Otherwise, we send a
+ * protocol-specific command to the server to tickle it into
+ * disgorging some capabilities.
+ *
+ * Returns: 1 if any capabilities were found, 0 otherwise.
+ */
+static int ask_capability(struct backend *s, int dobanner, int automatic)
+{
+ struct protstream *pout = s->out, *pin = s->in;
+ const struct protocol_t *prot = s->prot;
+ int matches = 0;
 char str4096;
- char *mechlist = NULL, *ret;
 const char *resp;
 
+ if (prot->type != TYPE_STD) return 0;
+
 resp = (automatic == AUTO_CAPA_BANNER) ?
-	prot->banner.resp : prot->capa_cmd.resp;
+	prot->u.std.banner.resp : prot->u.std.capa_cmd.resp;
 
 if (!automatic) {
 	/* no capability command */
-	if (!prot->capa_cmd.cmd) return NULL;
-	
+	if (!prot->u.std.capa_cmd.cmd) return -1;
+
 	/* request capabilities of server */
-	prot_printf(pout, "%s", prot->capa_cmd.cmd);
-	if (prot->capa_cmd.arg) prot_printf(pout, " %s", prot->capa_cmd.arg);
+	prot_printf(pout, "%s", prot->u.std.capa_cmd.cmd);
+	if (prot->u.std.capa_cmd.arg)
+	 prot_printf(pout, " %s", prot->u.std.capa_cmd.arg);
 	prot_printf(pout, "\r\n");
 	prot_flush(pout);
 }
 
- *capa = 0;
- 
+ forget_capabilities(s);
+
 do {
 	if (prot_fgets(str, sizeof(str), pin) == NULL) break;
 
-	if ((ret = parse_capability(str, prot, capa))) {
-	 if (mechlist) free(mechlist);
-	 mechlist = ret;
-	}
+	matches |= parse_capability(s, str);
 
 	if (!resp) {
 	 /* multiline response with no distinct end (IMAP banner) */
 	 prot_NONBLOCK(pin);
 	}
 
-	if (banner) strncpy(banner, str, 2048);
+	if (dobanner) xstrncpy(s->banner, str, sizeof(s->banner));
 
 	/* look for the end of the capabilities */
 } while (!resp || strncasecmp(str, resp, strlen(resp)));
- 
+
 prot_BLOCK(pin);
- return mechlist;
+ post_parse_capability(s);
+ return matches;
+}
+
+/*
+ * Return the parameters reported by the server for the given
+ * capability. @capa must be a single capability flag, as given in the
+ * protocol_t. Return value is a string, comprising all the parameters
+ * for the given capability, in their original string form, in the order
+ * seen on the wire, separated by a single space character. If the
+ * capability was not reported by the server, or was reported with no
+ * parameters, NULL is returned.
+ */
+EXPORTED char *backend_get_cap_params(const struct backend *s, unsigned long capa)
+{
+ int i;
+
+ if (!(s->capability & capa))
+	return NULL;
+
+ for (i = 0 ; i < s->num_cap_params ; i++) {
+	if (s->cap_paramsi.capa == capa) {
+	 return xstrdup(s->cap_paramsi.params);
+	}
+ }
+
+ return NULL;
 }
 
 static int do_compress(struct backend *s, struct simple_cmd_t *compress_cmd)
@@ -173,49 +472,54 @@
 #endif /* HAVE_ZLIB */
 }
 
-static int do_starttls(struct backend *s, struct tls_cmd_t *tls_cmd)
+EXPORTED int backend_starttls(struct backend *s, struct tls_cmd_t *tls_cmd)
 {
 #ifndef HAVE_SSL
 return -1;
 #else
- char buf2048;
- int r;
- int *layerp;
- char *auth_id;
- sasl_ssf_t ssf;
-
- /* send starttls command */
- prot_printf(s->out, "%s\r\n", tls_cmd->cmd);
- prot_flush(s->out);
-
- /* check response */
- if (!prot_fgets(buf, sizeof(buf), s->in) ||
-	strncmp(buf, tls_cmd->ok, strlen(tls_cmd->ok)))
-	return -1;
+ char *auth_id = NULL;
+ int *layerp = NULL;
+ int r = 0;
+
+ if (tls_cmd) {
+	char buf2048;
+	/* send starttls command */
+	prot_printf(s->out, "%s\r\n", tls_cmd->cmd);
+	prot_flush(s->out);
+
+	/* check response */
+	if (!prot_fgets(buf, sizeof(buf), s->in) ||
+	 strncmp(buf, tls_cmd->ok, strlen(tls_cmd->ok)))
+	 return -1;
+ }
 
 r = tls_init_clientengine(5, "", "");
 if (r == -1) return -1;
 
 /* SASL and openssl have different ideas about whether ssf is signed */
- layerp = (int *) &ssf;
+ layerp = (int *) &s->ext_ssf;
 r = tls_start_clienttls(s->in->fd, s->out->fd, layerp, &auth_id,
 			 &s->tlsconn, &s->tlssess);
 if (r == -1) return -1;
 
- r = sasl_setprop(s->saslconn, SASL_SSF_EXTERNAL, &ssf);
- if (r == SASL_OK)
-	r = sasl_setprop(s->saslconn, SASL_AUTH_EXTERNAL, auth_id);
- if (auth_id) free(auth_id);
- if (r != SASL_OK) return -1;
+ if (s->saslconn) {
+	r = sasl_setprop(s->saslconn, SASL_SSF_EXTERNAL, &s->ext_ssf);
+	if (r == SASL_OK)
+	 r = sasl_setprop(s->saslconn, SASL_AUTH_EXTERNAL, auth_id);
+	if (auth_id) free(auth_id);
+	if (r != SASL_OK) return -1;
+ }
 
 prot_settls(s->in, s->tlsconn);
 prot_settls(s->out, s->tlsconn);
 
+ ask_capability(s, /*dobanner*/1, tls_cmd->auto_capa);
+
 return 0;
 #endif /* HAVE_SSL */
 }
 
-static char *intersect_mechlists( char *config, char *server )
+EXPORTED char *intersect_mechlists( char *config, char *server )
 {
 char *newmechlist = xzmalloc( strlen( config ) + 1 );
 char *cmech = NULL, *smech = NULL, *s;
@@ -274,62 +578,58 @@
 return( newmechlist );
 }
 
-static int backend_authenticate(struct backend *s, struct protocol_t *prot,
-				char **mechlist, const char *userid,
+static int backend_authenticate(struct backend *s, const char *userid,
 				sasl_callback_t *cb, const char **status)
 {
+ struct protocol_t *prot = s->prot;
 int r;
+ char *mechlist;
 sasl_security_properties_t secprops =
 	{ 0, 0xFF, PROT_BUFSIZE, 0, NULL, NULL }; /* default secprops */
 struct sockaddr_storage saddr_l, saddr_r;
 char remoteip60, localip60;
 socklen_t addrsize;
- int local_cb = 0;
 char buf2048, optstr128, *p;
 const char *mech_conf, *pass;
 
+ if (prot->type != TYPE_STD) return SASL_FAIL;
+
 /* set the IP addresses */
- addrsize=sizeof(struct sockaddr_storage);
+ addrsize = sizeof(struct sockaddr_storage);
 if (getpeername(s->sock, (struct sockaddr *)&saddr_r, &addrsize) != 0)
 	return SASL_FAIL;
- if(iptostring((struct sockaddr *)&saddr_r, addrsize, remoteip, 60) != 0)
+ if (iptostring((struct sockaddr *)&saddr_r, addrsize, remoteip, 60) != 0)
 	return SASL_FAIL;
- 
- addrsize=sizeof(struct sockaddr_storage);
+
+ addrsize = sizeof(struct sockaddr_storage);
 if (getsockname(s->sock, (struct sockaddr *)&saddr_l, &addrsize)!=0)
 	return SASL_FAIL;
- if(iptostring((struct sockaddr *)&saddr_l, addrsize, localip, 60) != 0)
+ if (iptostring((struct sockaddr *)&saddr_l, addrsize, localip, 60) != 0)
 	return SASL_FAIL;
 
 if (!cb) {
-	local_cb = 1;
 	strlcpy(optstr, s->hostname, sizeof(optstr));
 	p = strchr(optstr, '.');
 	if (p) *p = '\0';
 	strlcat(optstr, "_password", sizeof(optstr));
 	pass = config_getoverflowstring(optstr, NULL);
 	if(!pass) pass = config_getstring(IMAPOPT_PROXY_PASSWORD);
-	cb = mysasl_callbacks(userid, 
+	cb = mysasl_callbacks(userid,
 			 config_getstring(IMAPOPT_PROXY_AUTHNAME),
 			 config_getstring(IMAPOPT_PROXY_REALM),
 			 pass);
+	s->sasl_cb = cb;
 }
 
 /* Require proxying if we have an "interesting" userid (authzid) */
 r = sasl_client_new(prot->sasl_service, s->hostname, localip, remoteip, cb,
 			(userid && *userid ? SASL_NEED_PROXY : 0) |
-			(prot->sasl_cmd.parse_success ? SASL_SUCCESS_DATA : 0),
+			(prot->u.std.sasl_cmd.parse_success ? SASL_SUCCESS_DATA : 0),
 			&s->saslconn);
- if (r != SASL_OK) {
-	if (local_cb) free_callbacks(cb);
-	return r;
- }
+ if (r != SASL_OK) return r;
 
 r = sasl_setprop(s->saslconn, SASL_SEC_PROPS, &secprops);
- if (r != SASL_OK) {
-	if (local_cb) free_callbacks(cb);
-	return r;
- }
+ if (r != SASL_OK) return r;
 
 /* Get SASL mechanism list. We can force a particular
 mechanism using a <shorthost>_mechs option */
@@ -339,15 +639,16 @@
 strcat(buf, "_mechs");
 mech_conf = config_getoverflowstring(buf, NULL);
 
- if(!mech_conf) {
+ if (!mech_conf)
 	mech_conf = config_getstring(IMAPOPT_FORCE_SASL_CLIENT_MECH);
- }
+
+ mechlist = backend_get_cap_params(s, CAPA_AUTH);
 
 do {
 	/* If we have a mech_conf, use it */
-	if (mech_conf && *mechlist) {
+	if (mech_conf && mechlist) {
 	 char *conf = xstrdup(mech_conf);
-	 char *newmechlist = intersect_mechlists( conf, *mechlist );
+	 char *newmechlist = intersect_mechlists( conf, mechlist );
 
 	 if ( newmechlist == NULL ) {
 		syslog( LOG_INFO, "%s did not offer %s", s->hostname,
@@ -355,163 +656,51 @@
 	 }
 
 	 free(conf);
-	 free(*mechlist);
-	 *mechlist = newmechlist;
+	 free(mechlist);
+	 mechlist = newmechlist;
 	}
 
-	if (*mechlist) {
+	if (mechlist) {
 	 /* we now do the actual SASL exchange */
-	 saslclient(s->saslconn, &prot->sasl_cmd, *mechlist,
+	 saslclient(s->saslconn, &prot->u.std.sasl_cmd, mechlist,
 		 s->in, s->out, &r, status);
 
 	 /* garbage collect */
-	 free(*mechlist);
-	 *mechlist = NULL;
+	 free(mechlist);
+	 mechlist = NULL;
 	}
 	else r = SASL_NOMECH;
 
 	/* If we don't have a usable mech, do TLS and try again */
 } while (r == SASL_NOMECH && CAPA(s, CAPA_STARTTLS) &&
-	 do_starttls(s, &prot->tls_cmd) != -1 &&
-	 (*mechlist = ask_capability(s->out, s->in, prot,
-					 &s->capability, NULL,
-					 prot->tls_cmd.auto_capa)));
-
- /* xxx unclear that this is correct */
- if (local_cb) free_callbacks(cb);
+	 backend_starttls(s, &prot->u.std.tls_cmd) != -1 &&
+	 (mechlist = backend_get_cap_params(s, CAPA_AUTH)));
 
 if (r == SASL_OK) {
 	prot_setsasl(s->in, s->saslconn);
 	prot_setsasl(s->out, s->saslconn);
 }
 
- /* r == SASL_OK on success */
- return r;
-}
-
-static volatile sig_atomic_t timedout = 0;
+ if (mechlist) free(mechlist);
 
-static void timed_out(int sig) 
-{
- if (sig == SIGALRM) {
-	timedout = 1;
- } else {
-	fatal("Bad signal in timed_out", EC_SOFTWARE);
- }
+ return SASL_OK;
 }
 
-struct backend *backend_connect(struct backend *ret_backend, const char *server,
-				struct protocol_t *prot, const char *userid,
-				sasl_callback_t *cb, const char **auth_status)
+static int backend_login(struct backend *ret, const char *userid,
+			 sasl_callback_t *cb, const char **auth_status,
+			 int noauth)
 {
- /* need to (re)establish connection to server or create one */
- int sock = -1;
- int r;
- int err = -1;
+ int r = 0;
 int ask = 1; /* should we explicitly ask for capabilities? */
- struct addrinfo hints, *res0 = NULL, *res;
- struct sockaddr_un sunsock;
- char buf2048, *mechlist = NULL;
- struct sigaction action;
- struct backend *ret;
- char rsessionidMAX_SESSIONID_SIZE;
-
- if (!ret_backend) {
-	ret = xzmalloc(sizeof(struct backend));
-	strlcpy(ret->hostname, server, sizeof(ret->hostname));
-	ret->timeout = NULL;
- }
- else
-	ret = ret_backend;
-
- if (server0 == '/') { /* unix socket */
-	res0 = &hints;
-	memset(res0, 0, sizeof(struct addrinfo));
-	res0->ai_family = PF_UNIX;
-	res0->ai_socktype = SOCK_STREAM;
-
- 	res0->ai_addr = (struct sockaddr *) &sunsock;
- 	res0->ai_addrlen = sizeof(sunsock.sun_family) + strlen(server) + 1;
-#ifdef SIN6_LEN
- 	res0->ai_addrlen += sizeof(sunsock.sun_len);
- 	sunsock.sun_len = res0->ai_addrlen;
-#endif
-	sunsock.sun_family = AF_UNIX;
-	strlcpy(sunsock.sun_path, server, sizeof(sunsock.sun_path));
-
-	/* XXX set that we are preauthed */
-
-	/* change hostname to 'config_servername' */
-	strlcpy(ret->hostname, config_servername, sizeof(ret->hostname));
- }
- else { /* inet socket */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-	err = getaddrinfo(server, prot->service, &hints, &res0);
-	if (err) {
-	 syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
-		 server, gai_strerror(err));
-	 if (!ret_backend) free(ret);
-	 return NULL;
-	}
- }
-
- /* Setup timeout */
- timedout = 0;
- action.sa_flags = 0;
- action.sa_handler = timed_out;
- sigemptyset(&action.sa_mask);
- if(sigaction(SIGALRM, &action, NULL) < 0) 
- {
-	syslog(LOG_ERR, "Setting timeout in backend_connect failed: sigaction: %m");
-	/* continue anyway */
- }
- 
- for (res = res0; res; res = res->ai_next) {
-	sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-	if (sock < 0)
-	 continue;
-	alarm(config_getint(IMAPOPT_CLIENT_TIMEOUT));
-	if (connect(sock, res->ai_addr, res->ai_addrlen) >= 0)
-	 break;
-	if(errno == EINTR && timedout == 1)
-	 errno = ETIMEDOUT;
-	close(sock);
-	sock = -1;
- }
-
- /* Remove timeout code */
- alarm(0);
- signal(SIGALRM, SIG_IGN);
- 
- if (sock < 0) {
-	if (res0 != &hints)
-	 freeaddrinfo(res0);
-	syslog(LOG_ERR, "connect(%s) failed: %m", server);
-	if (!ret_backend) free(ret);
-	return NULL;
- }
- memcpy(&ret->addr, res->ai_addr, res->ai_addrlen);
- if (res0 != &hints)
-	freeaddrinfo(res0);
+ char buf2048;
+ struct protocol_t *prot = ret->prot;
 
- ret->in = prot_new(sock, 0);
- ret->out = prot_new(sock, 1);
- ret->sock = sock;
- prot_setflushonread(ret->in, ret->out);
- ret->prot = prot;
+ if (prot->type != TYPE_STD) return -1;
 
- /* use literal+ to send literals */
- prot_setisclient(ret->in, 1);
- prot_setisclient(ret->out, 1);
- 
- if (prot->banner.auto_capa) {
+ if (prot->u.std.banner.auto_capa) {
 	/* try to get the capabilities from the banner */
-	mechlist = ask_capability(ret->out, ret->in, prot,
-				 &ret->capability, ret->banner,
-				 AUTO_CAPA_BANNER);
-	if (mechlist || ret->capability) {
+	r = ask_capability(ret, /*dobanner*/1, AUTO_CAPA_BANNER);
+	if (r) {
 	 /* found capabilities in banner -> don't ask */
 	 ask = 0;
 	}
@@ -520,42 +709,31 @@
 	do { /* read the initial greeting */
 	 if (!prot_fgets(buf, sizeof(buf), ret->in)) {
 		syslog(LOG_ERR,
-		 "backend_connect(): couldn't read initial greeting: %s",
+		 "backend_login(): couldn't read initial greeting: %s",
 		 ret->in->error ? ret->in->error : "(null)");
-		if (!ret_backend) free(ret);
-		close(sock);
-		return NULL;
+		return -1;
 	 }
-	} while (strncasecmp(buf, prot->banner.resp,
-			 strlen(prot->banner.resp)));
-	strncpy(ret->banner, buf, 2048);
+	} while (strncasecmp(buf, prot->u.std.banner.resp,
+			 strlen(prot->u.std.banner.resp)));
+	xstrncpy(ret->banner, buf, 2048);
 }
 
 if (ask) {
 	/* get the capabilities */
-	mechlist = ask_capability(ret->out, ret->in, prot,
-				 &ret->capability, NULL, AUTO_CAPA_NO);
+	ask_capability(ret, /*dobanner*/0, AUTO_CAPA_NO);
 }
 
 /* now need to authenticate to backend server,
 unless we're doing LMTP/CSYNC on a UNIX socket (deliver/sync_client) */
- if ((server0 != '/') ||
-	(strcmp(prot->sasl_service, "lmtp") &&
-	 strcmp(prot->sasl_service, "csync"))) {
-	char *mlist = NULL;
+ if (!noauth) {
+	char *old_mechlist = backend_get_cap_params(ret, CAPA_AUTH);
 	const char *my_status;
 
- if ( mechlist ) {
- mlist = xstrdup(mechlist); /* backend_auth is destructive */
- }
-
-	if ((r = backend_authenticate(ret, prot, &mlist, userid,
-				 cb, &my_status))) {
+	if ((r = backend_authenticate(ret, userid, cb, &my_status))) {
 	 syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
 		 sasl_errstring(r, NULL, NULL));
-	 if (!ret_backend) free(ret);
-	 close(sock);
-	 ret = NULL;
+	 free(old_mechlist);
+	 return -1;
 	}
 	else {
 	 const void *ssf;
@@ -565,7 +743,7 @@
 		/* if we have a SASL security layer, compare SASL mech lists
 		 before/after AUTH to check for a MITM attack */
 		char *new_mechlist;
-		int auto_capa = (prot->sasl_cmd.auto_capa == AUTO_CAPA_AUTH_SSF);
+		int auto_capa = (prot->u.std.sasl_cmd.auto_capa == AUTO_CAPA_AUTH_SSF);
 
 		if (!strcmp(prot->service, "sieve")) {
 		 /* XXX Hack to handle ManageSieve servers.
@@ -586,111 +764,307 @@
 		 prot_BLOCK(ret->in);
 		}
 
- /*
- * A flawed check: backend_authenticate() may be given a
- * NULL mechlist, negotiate SSL, and get a new mechlist.
- * This new, correct mechlist won't be visible here.
- */
-		new_mechlist = ask_capability(ret->out, ret->in, prot,
-					 &ret->capability, NULL, auto_capa);
-		if (new_mechlist && strcmp(new_mechlist, mechlist)) {
+		ask_capability(ret, /*dobanner*/0, auto_capa);
+		new_mechlist = backend_get_cap_params(ret, CAPA_AUTH);
+		if (new_mechlist &&
+		 old_mechlist &&
+		 strcmp(new_mechlist, old_mechlist)) {
 		 syslog(LOG_ERR, "possible MITM attack:"
 			 "list of available SASL mechanisms changed");
-		 if (!ret_backend) free(ret);
-		 close(sock);
-		 ret = NULL;
+		 free(new_mechlist);
+		 free(old_mechlist);
+		 return -1;
 		}
-
-		if (new_mechlist) free(new_mechlist);
+		free(new_mechlist);
 	 }
-	 else if (prot->sasl_cmd.auto_capa == AUTO_CAPA_AUTH_OK) {
+	 else if (prot->u.std.sasl_cmd.auto_capa == AUTO_CAPA_AUTH_OK) {
 		/* try to get the capabilities from the AUTH success response */
-		ret->capability = 0;
-		if (mechlist) free(mechlist);
-		mechlist = parse_capability(my_status, prot,
-						&ret->capability);
+		forget_capabilities(ret);
+		parse_capability(ret, my_status);
+		post_parse_capability(ret);
 	 }
 
 	 if (!(strcmp(prot->service, "imap") &&
 		 (strcmp(prot->service, "pop3")))) {
+		char rsessionidMAX_SESSIONID_SIZE;
 		parse_sessionid(my_status, rsessionid);
 		syslog(LOG_NOTICE, "proxy %s sessionid=<%s> remote=<%s>", userid, session_id(), rsessionid);
 	 }
 	}
 
-	if (mlist) free(mlist);
 	if (auth_status) *auth_status = my_status;
+	free(old_mechlist);
 }
 
- if (mechlist) free(mechlist);
-
 /* start compression if requested and both client/server support it */
- if (config_getswitch(IMAPOPT_PROXY_COMPRESS) && ret &&
+ if (config_getswitch(IMAPOPT_PROXY_COMPRESS) &&
 	CAPA(ret, CAPA_COMPRESS) &&
-	prot->compress_cmd.cmd &&
-	do_compress(ret, &prot->compress_cmd)) {
+	prot->u.std.compress_cmd.cmd) {
+	r = do_compress(ret, &prot->u.std.compress_cmd);
+	if (r) {
+	 syslog(LOG_NOTICE, "couldn't enable compression on backend server: %s", error_message(r));
+	 r = 0; /* not a fail-level error */
+	}
+ }
+
+ return 0;
+}
+
+
+EXPORTED struct backend *backend_connect(struct backend *ret_backend, const char *server,
+				struct protocol_t *prot, const char *userid,
+				sasl_callback_t *cb, const char **auth_status,
+				int logfd)
+
+{
+ /* need to (re)establish connection to server or create one */
+ int sock = -1;
+ int r;
+ int err = -1;
+ int do_tls = 0;
+ int noauth = 0;
+ struct addrinfo hints, *res0 = NULL, *res;
+ struct sockaddr_un sunsock;
+ struct backend *ret;
+
+ if (!ret_backend) {
+	ret = xzmalloc(sizeof(struct backend));
+	strlcpy(ret->hostname, server, sizeof(ret->hostname));
+	ret->timeout = NULL;
+ }
+ else
+	ret = ret_backend;
+
+ if (server0 == '/') { /* unix socket */
+	res0 = &hints;
+	memset(res0, 0, sizeof(struct addrinfo));
+	res0->ai_family = PF_UNIX;
+	res0->ai_socktype = SOCK_STREAM;
+
+	res0->ai_addr = (struct sockaddr *) &sunsock;
+	res0->ai_addrlen = sizeof(sunsock.sun_family) + strlen(server) + 1;
+#ifdef SIN6_LEN
+	res0->ai_addrlen += sizeof(sunsock.sun_len);
+	sunsock.sun_len = res0->ai_addrlen;
+#endif
+	sunsock.sun_family = AF_UNIX;
+	strlcpy(sunsock.sun_path, server, sizeof(sunsock.sun_path));
+
+	if (!strcmp(prot->sasl_service, "lmtp") ||
+	 !strcmp(prot->sasl_service, "csync")) {
+	 noauth = 1;
+	}
+ }
+ else { /* inet socket */
+	char host1024, *p;
+	const char *service = prot->service;
+
+	/* Parse server string for possible port and options */
+	strlcpy(host, server, sizeof(host));
+	if ((p = strchr(host, ':'))) {
+	 *p++ = '\0';
+	 service = p;
+
+	 if ((p = strchr(service, '/'))) {
+		tok_t tok;
+		char *opt;
+
+		*p++ = '\0';
+		tok_initm(&tok, p, "/", 0);
+		while ((opt = tok_next(&tok))) {
+		 if (!strcmp(opt, "tls")) do_tls = 1;
+		 else if (!strcmp(opt, "noauth")) noauth = 1;
+		}
+		tok_fini(&tok);
+	 }
+	}
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	err = getaddrinfo(host, service, &hints, &res0);
+	if (err) {
+	 syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
+		 server, gai_strerror(err));
+	 goto error;
+	}
+ }
+
+ for (res = res0; res; res = res->ai_next) {
+	sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	if (sock < 0)
+	 continue;
+
+	/* Do a non-blocking connect() */
+	nonblock(sock, 1);
+	if (!connect(sock, res->ai_addr, res->ai_addrlen)) {
+	 /* connect() succeeded immediately */
+	 break;
+	}
+	else if (errno == EINPROGRESS) {
+	 /* connect() in progress */
+	 int n;
+	 fd_set wfds, rfds;
+	 time_t now = time(NULL);
+	 time_t timeout = now + config_getint(IMAPOPT_CLIENT_TIMEOUT);
+	 struct timeval waitfor;
+
+	 /* select() socket for writing until we succeed, fail, or timeout */
+	 do {
+		FD_ZERO(&wfds);
+		FD_SET(sock, &wfds);
+		rfds = wfds;
+		waitfor.tv_sec = timeout - now;
+		waitfor.tv_usec = 0;
+
+		n = select(sock + 1, &rfds, &wfds, NULL, &waitfor);
+		now = time(NULL);
+
+		/* Retry select() if interrupted */
+	 } while (n < 0 && errno == EINTR && now < timeout);
+
+	 if (!n) {
+		/* select() timed out */
+		errno = ETIMEDOUT;
+	 }
+	 else if (FD_ISSET(sock, &rfds) || FD_ISSET(sock, &wfds)) {
+		/* Socket is ready for I/O - get SO_ERROR to determine status */
+		socklen_t errlen = sizeof(err);
+
+		if (!getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen) &&
+		 !(errno = err)) {
+		 /* connect() succeeded */
+		 break;
+		}
+	 }
+	}
 
-	syslog(LOG_ERR, "couldn't enable compression on backend server");
-	if (!ret_backend) free(ret);
 	close(sock);
-	ret = NULL;
+	sock = -1;
+ }
+
+ if (sock < 0) {
+	if (res0 != &hints) freeaddrinfo(res0);
+	syslog(LOG_ERR, "connect(%s) failed: %m", server);
+	goto error;
+ }
+
+ /* Reset socket to blocking */
+ nonblock(sock, 0);
+
+ memcpy(&ret->addr, res->ai_addr, res->ai_addrlen);
+ if (res0 != &hints)
+	freeaddrinfo(res0);
+
+ ret->in = prot_new(sock, 0);
+ ret->out = prot_new(sock, 1);
+ ret->sock = sock;
+ prot_setflushonread(ret->in, ret->out);
+ ret->prot = prot;
+
+ /* use literal+ to send literals */
+ prot_setisclient(ret->in, 1);
+ prot_setisclient(ret->out, 1);
+
+ /* Start TLS if required */
+ if (do_tls) r = backend_starttls(ret, NULL);
+
+ /* Login to the server */
+ if (prot->type == TYPE_SPEC)
+	r = prot->u.spec.login(ret, userid, cb, auth_status, noauth);
+ else
+	r = backend_login(ret, userid, cb, auth_status, noauth);
+
+ if (r) goto error;
+
+ if (logfd >= 0) {
+	prot_setlog(ret->in, logfd);
+	prot_setlog(ret->out, logfd);
 }
 
- if (!ret_backend) ret_backend = ret;
-	 
 return ret;
+
+error:
+ forget_capabilities(ret);
+ if (ret->in) {
+	prot_free(ret->in);
+	ret->in = NULL;
+ }
+ if (ret->out) {
+	prot_free(ret->out);
+	ret->out = NULL;
+ }
+ if (sock >= 0)
+	close(sock);
+ if (ret->saslconn) {
+	sasl_dispose(&ret->saslconn);
+	ret->saslconn = NULL;
+ }
+ if (!ret_backend)
+	free(ret);
+ return NULL;
 }
 
-int backend_ping(struct backend *s)
+EXPORTED int backend_ping(struct backend *s, const char *userid)
 {
 char buf1024;
+ struct simple_cmd_t *ping_cmd;
 
- if (!s || !s->prot->ping_cmd.cmd) return 0;
+ if (!s) return 0;
 if (s->sock == -1) return -1; /* Disconnected Socket */
- 
- prot_printf(s->out, "%s\r\n", s->prot->ping_cmd.cmd);
+
+ if (s->prot->type == TYPE_SPEC) return s->prot->u.spec.ping(s, userid);
+
+ ping_cmd = &s->prot->u.std.ping_cmd;
+ if (!ping_cmd->cmd) return 0;
+
+ prot_printf(s->out, "%s\r\n", ping_cmd->cmd);
 prot_flush(s->out);
 
 for (;;) {
 	if (!prot_fgets(buf, sizeof(buf), s->in)) {
 	 /* connection closed? */
 	 return -1;
-	} else if (s->prot->ping_cmd.unsol &&
-		 !strncmp(s->prot->ping_cmd.unsol, buf,
-			 strlen(s->prot->ping_cmd.unsol))) {
+	} else if (ping_cmd->unsol &&
+		 !strncmp(ping_cmd->unsol, buf,
+			 strlen(ping_cmd->unsol))) {
 	 /* unsolicited response */
 	 continue;
 	} else {
 	 /* success/fail response */
-	 return strncmp(s->prot->ping_cmd.ok, buf,
-			 strlen(s->prot->ping_cmd.ok));
+	 return strncmp(ping_cmd->ok, buf, strlen(ping_cmd->ok));
 	}
 }
 }
 
-void backend_disconnect(struct backend *s)
+EXPORTED void backend_disconnect(struct backend *s)
 {
- char buf1024;
-
 if (!s || s->sock == -1) return;
- 
- if (!prot_error(s->in)) {
-	if (s->prot->logout_cmd.cmd) {
-	 prot_printf(s->out, "%s\r\n", s->prot->logout_cmd.cmd);
-	 prot_flush(s->out);
 
-	 for (;;) {
-		if (!prot_fgets(buf, sizeof(buf), s->in)) {
-		 /* connection closed? */
-		 break;
-		} else if (s->prot->logout_cmd.unsol &&
-			 !strncmp(s->prot->logout_cmd.unsol, buf,
-				 strlen(s->prot->logout_cmd.unsol))) {
-		 /* unsolicited response */
-		 continue;
-		} else {
-		 /* success/fail response -- don't care either way */
-		 break;
+ if (!prot_error(s->in)) {
+ if (s->prot->type == TYPE_SPEC) s->prot->u.spec.logout(s);
+ else {
+	 struct simple_cmd_t *logout_cmd = &s->prot->u.std.logout_cmd;
+
+	 if (logout_cmd->cmd) {
+		prot_printf(s->out, "%s\r\n", logout_cmd->cmd);
+		prot_flush(s->out);
+
+		for (;;) {
+		 char buf1024;
+
+		 if (!prot_fgets(buf, sizeof(buf), s->in)) {
+			/* connection closed? */
+			break;
+		 } else if (logout_cmd->unsol &&
+			 !strncmp(logout_cmd->unsol, buf,
+					strlen(logout_cmd->unsol))) {
+			/* unsolicited response */
+			continue;
+		 } else {
+			/* success/fail response -- don't care either way */
+			break;
+		 }
 		}
 	 }
 	}
@@ -711,17 +1085,27 @@
 /* close/free socket & prot layer */
 cyrus_close_sock(s->sock);
 s->sock = -1;
- 
+
 prot_free(s->in);
 prot_free(s->out);
 s->in = s->out = NULL;
 
 /* Free saslconn */
- if(s->saslconn) {
+ if (s->saslconn) {
 	sasl_dispose(&(s->saslconn));
 	s->saslconn = NULL;
 }
 
+ /* Free any SASL callbacks */
+ if (s->sasl_cb) {
+	free_callbacks(s->sasl_cb);
+	s->sasl_cb = NULL;
+ }
+
+
+
 /* free last_result buffer */
 buf_free(&s->last_result);
+
+ forget_capabilities(s);
 }

cyrus-imapd-2.4.17.tar.gz/imap/backend.h -> cyrus-imapd-2.5.tar.gz/imap/backend.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: backend.h,v 1.15 2010/01/06 17:01:30 murch Exp $
  */
 
 #ifndef _INCLUDED_BACKEND_H
@@ -53,6 +51,11 @@
 
 /* Functionality to bring up/down connections to backend servers */
 
+struct backend_cap_params {
+    unsigned long capa;
+    char *params;	/* each BAR from FOO=BAR, in order, space separated */
+};
+
 struct backend {
     char hostnameMAX_PARTITION_LEN;
     char banner2048;
@@ -71,12 +74,16 @@
     struct prot_waitevent *timeout; /* event for idle timeout */
 
     sasl_conn_t *saslconn;
+    sasl_callback_t *sasl_cb;
+    sasl_ssf_t ext_ssf;
 #ifdef HAVE_SSL
     SSL *tlsconn;
     SSL_SESSION *tlssess;
 #endif /* HAVE_SSL */
 
     unsigned long capability;
+    int num_cap_params;
+    struct backend_cap_params *cap_params;
 
     struct buf last_result;
     struct protstream *in; /* from the be server to me, the proxy */
@@ -87,9 +94,13 @@
  * cache on success (and returns NULL on failure, but leaves cache alone) */
 struct backend *backend_connect(struct backend *cache, const char *server,
 				struct protocol_t *prot, const char *userid,
-				sasl_callback_t *cb, const char **auth_status);
-int backend_ping(struct backend *s);
+				sasl_callback_t *cb, const char **auth_status,
+				int logfd);
+int backend_starttls(struct backend *s, struct tls_cmd_t *tls_cmd);
+int backend_ping(struct backend *s, const char *userid);
 void backend_disconnect(struct backend *s);
+char *intersect_mechlists(char *config, char *server);
+char *backend_get_cap_params(const struct backend *, unsigned long capa);
 
 #define CAPA(s, c) ((s)->capability & (c))

cyrus-imapd-2.5.tar.gz/imap/caldav_db.c Added

@@ -0,0 +1,807 @@
+/* caldav_db.c -- implementation of per-user CalDAV database
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#include <syslog.h>
+#include <string.h>
+
+#include <libical/ical.h>
+
+#include "caldav_db.h"
+#include "cyrusdb.h"
+#include "exitcodes.h"
+#include "httpd.h"
+#include "http_dav.h"
+#include "libconfig.h"
+#include "mboxname.h"
+#include "util.h"
+#include "xstrlcat.h"
+#include "xmalloc.h"
+
+
+enum {
+ STMT_SELRSRC,
+ STMT_SELUID,
+ STMT_SELMBOX,
+ STMT_INSERT,
+ STMT_UPDATE,
+ STMT_DELETE,
+ STMT_DELMBOX,
+ STMT_BEGIN,
+ STMT_COMMIT,
+ STMT_ROLLBACK
+};
+
+#define NUM_STMT 10
+
+struct caldav_db {
+ sqlite3 *db;			/* DB handle */
+ char sched_inboxMAX_MAILBOX_BUFFER;/* DB owner's scheduling Inbox */
+ sqlite3_stmt *stmtNUM_STMT;	/* prepared statements */
+ struct buf mailbox;			/* buffers for copies of column text */
+ struct buf resource;
+ struct buf lock_token;
+ struct buf lock_owner;
+ struct buf lock_ownerid;
+ struct buf ical_uid;
+ struct buf organizer;
+ struct buf dtstart;
+ struct buf dtend;
+ struct buf sched_tag;
+};
+
+
+static struct namespace caldav_namespace;
+
+EXPORTED int caldav_init(void)
+{
+ int r;
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&caldav_namespace, 1))) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ return dav_init();
+}
+
+
+EXPORTED int caldav_done(void)
+{
+ return dav_done();
+}
+
+
+#define CMD_DROP "DROP TABLE IF EXISTS ical_objs;"
+
+#define CMD_CREATE							\
+ "CREATE TABLE IF NOT EXISTS ical_objs ("				\
+ " rowid INTEGER PRIMARY KEY,"					\
+ " creationdate INTEGER,"						\
+ " mailbox TEXT NOT NULL,"						\
+ " resource TEXT NOT NULL,"						\
+ " imap_uid INTEGER,"						\
+ " lock_token TEXT,"							\
+ " lock_owner TEXT,"							\
+ " lock_ownerid TEXT,"						\
+ " lock_expire INTEGER,"						\
+ " comp_type INTEGER,"						\
+ " ical_uid TEXT,"							\
+ " organizer TEXT,"							\
+ " dtstart TEXT,"							\
+ " dtend TEXT,"							\
+ " recurring INTEGER,"						\
+ " transp INTEGER,"							\
+ " sched_tag TEXT,"							\
+ " UNIQUE( mailbox, resource ) );"					\
+ "CREATE INDEX IF NOT EXISTS idx_ical_uid ON ical_objs ( ical_uid );"
+
+/* Open DAV DB corresponding to userid */
+EXPORTED struct caldav_db *caldav_open(const char *userid, int flags)
+{
+ sqlite3 *db;
+ struct caldav_db *caldavdb = NULL;
+ const char *cmds = CMD_CREATE;
+
+ if (flags & CALDAV_TRUNC) cmds = CMD_DROP CMD_CREATE;
+
+ db = dav_open(userid, cmds);
+
+ if (db) {
+	caldavdb = xzmalloc(sizeof(struct caldav_db));
+	caldavdb->db = db;
+
+	/* Construct mailbox name corresponding to userid's scheduling Inbox */
+	strcpy(caldavdb->sched_inbox, caldav_mboxname(userid, SCHED_INBOX));
+ }
+
+ return caldavdb;
+}
+
+
+/* Close DAV DB */
+EXPORTED int caldav_close(struct caldav_db *caldavdb)
+{
+ int i, r = 0;
+
+ if (!caldavdb) return 0;
+
+ buf_free(&caldavdb->mailbox);
+ buf_free(&caldavdb->resource);
+ buf_free(&caldavdb->lock_token);
+ buf_free(&caldavdb->lock_owner);
+ buf_free(&caldavdb->lock_ownerid);
+ buf_free(&caldavdb->ical_uid);
+ buf_free(&caldavdb->organizer);
+ buf_free(&caldavdb->dtstart);
+ buf_free(&caldavdb->dtend);
+ buf_free(&caldavdb->sched_tag);
+
+ for (i = 0; i < NUM_STMT; i++) {
+	sqlite3_stmt *stmt = caldavdb->stmti;
+	if (stmt) sqlite3_finalize(stmt);
+ }
+
+ r = dav_close(caldavdb->db);
+
+ free(caldavdb);
+
+ return r;
+}
+
+
+#define CMD_BEGIN "BEGIN TRANSACTION;"
+
+EXPORTED int caldav_begin(struct caldav_db *caldavdb)
+{
+ return dav_exec(caldavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &caldavdb->stmtSTMT_BEGIN);
+}
+
+
+#define CMD_COMMIT "COMMIT TRANSACTION;"
+
+EXPORTED int caldav_commit(struct caldav_db *caldavdb)
+{
+ return dav_exec(caldavdb->db, CMD_COMMIT, NULL, NULL, NULL,
+		 &caldavdb->stmtSTMT_COMMIT);
+}
+
+
+#define CMD_ROLLBACK "ROLLBACK TRANSACTION;"
+
+EXPORTED int caldav_abort(struct caldav_db *caldavdb)
+{
+ return dav_exec(caldavdb->db, CMD_ROLLBACK, NULL, NULL, NULL,
+		 &caldavdb->stmtSTMT_ROLLBACK);
+}
+
+
+struct read_rock {
+ struct caldav_db *db;
+ struct caldav_data *cdata;
+ int (*cb)(void *rock, void *data);
+ void *rock;
+};
+
+static const char *column_text_to_buf(const char *text, struct buf *buf)
+{
+ if (text) {
+	buf_setcstr(buf, text);
+	text = buf_cstring(buf);
+ }
+
+ return text;
+}
+
+static int read_cb(sqlite3_stmt *stmt, void *rock)
+{
+ struct read_rock *rrock = (struct read_rock *) rock;
+ struct caldav_db *db = rrock->db;
+ struct caldav_data *cdata = rrock->cdata;
+ int r = 0;
+
+ memset(cdata, 0, sizeof(struct caldav_data));
+
+ cdata->dav.rowid = sqlite3_column_int(stmt, 0);
+ cdata->dav.creationdate = sqlite3_column_int(stmt, 1);
+ cdata->dav.imap_uid = sqlite3_column_int(stmt, 4);
+ cdata->dav.lock_expire = sqlite3_column_int(stmt, 8);
+ cdata->comp_type = sqlite3_column_int(stmt, 9);
+ cdata->recurring = sqlite3_column_int(stmt, 14);
+ cdata->transp = sqlite3_column_int(stmt, 15);
+
+ if (rrock->cb) {
+	/* We can use the column data directly for the callback */
+	cdata->dav.mailbox = (const char *) sqlite3_column_text(stmt, 2);
+	cdata->dav.resource = (const char *) sqlite3_column_text(stmt, 3);
+	cdata->dav.lock_token = (const char *) sqlite3_column_text(stmt, 5);
+	cdata->dav.lock_owner = (const char *) sqlite3_column_text(stmt, 6);
+	cdata->dav.lock_ownerid = (const char *) sqlite3_column_text(stmt, 7);
+	cdata->ical_uid = (const char *) sqlite3_column_text(stmt, 10);
+	cdata->organizer = (const char *) sqlite3_column_text(stmt, 11);
+	cdata->dtstart = (const char *) sqlite3_column_text(stmt, 12);
+	cdata->dtend = (const char *) sqlite3_column_text(stmt, 13);
+	cdata->sched_tag = (const char *) sqlite3_column_text(stmt, 16);
+	r = rrock->cb(rrock->rock, cdata);
+ }
+ else {
+	/* For single row SELECTs like caldav_read(),
+	 * we need to make a copy of the column data before
+	 * it gets flushed by sqlite3_step() or sqlite3_reset() */
+	cdata->dav.mailbox =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 2),
+			 &db->mailbox);
+	cdata->dav.resource =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 3),
+			 &db->resource);
+	cdata->dav.lock_token =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 5),
+			 &db->lock_token);
+	cdata->dav.lock_owner =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 6),
+			 &db->lock_owner);
+	cdata->dav.lock_ownerid =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 7),
+			 &db->lock_ownerid);
+	cdata->ical_uid =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 10),
+			 &db->ical_uid);
+	cdata->organizer =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 11),
+			 &db->organizer);
+	cdata->dtstart =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 12),
+			 &db->dtstart);
+	cdata->dtend =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 13),
+			 &db->dtend);
+	cdata->sched_tag =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 16),
+			 &db->sched_tag);
+ }
+
+ return r;
+}
+
+
+#define CMD_SELRSRC							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " comp_type, ical_uid, organizer, dtstart, dtend,"			\
+ " recurring, transp, sched_tag"					\
+ " FROM ical_objs"							\
+ " WHERE ( mailbox = :mailbox AND resource = :resource );"
+
+EXPORTED int caldav_lookup_resource(struct caldav_db *caldavdb,
+			 const char *mailbox, const char *resource,
+			 int lock, struct caldav_data **result)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox	 } },
+	{ ":resource", SQLITE_TEXT, { .s = resource	 } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL		 } } };
+ static struct caldav_data cdata;
+ struct read_rock rrock = { caldavdb, &cdata, NULL, NULL };
+ int r;
+
+ *result = memset(&cdata, 0, sizeof(struct caldav_data));
+
+ if (lock) {
+	/* begin a transaction */
+	r = dav_exec(caldavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &caldavdb->stmtSTMT_BEGIN);
+	if (r) return r;
+ }
+
+ r = dav_exec(caldavdb->db, CMD_SELRSRC, bval, &read_cb, &rrock,
+		 &caldavdb->stmtSTMT_SELRSRC);
+ if (!r && !cdata.dav.rowid) r = CYRUSDB_NOTFOUND;
+
+ return r;
+}
+
+
+#define CMD_SELUID							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " comp_type, ical_uid, organizer, dtstart, dtend,"			\
+ " recurring, transp, sched_tag"					\
+ " FROM ical_objs"							\
+ " WHERE ( ical_uid = :ical_uid AND mailbox != :inbox);"
+
+EXPORTED int caldav_lookup_uid(struct caldav_db *caldavdb, const char *ical_uid,
+		 int lock, struct caldav_data **result)
+{
+ struct bind_val bval = {
+	{ ":ical_uid", SQLITE_TEXT, { .s = ical_uid		 } },
+	{ ":inbox", SQLITE_TEXT, { .s = caldavdb->sched_inbox } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL			 } } };
+ static struct caldav_data cdata;
+ struct read_rock rrock = { caldavdb, &cdata, NULL, NULL };
+ int r;
+
+ *result = memset(&cdata, 0, sizeof(struct caldav_data));
+
+ if (lock) {
+	/* begin a transaction */
+	r = dav_exec(caldavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &caldavdb->stmtSTMT_BEGIN);
+	if (r) return r;
+ }
+
+ r = dav_exec(caldavdb->db, CMD_SELUID, bval, &read_cb, &rrock,
+		 &caldavdb->stmtSTMT_SELUID);
+ if (!r && !cdata.dav.rowid) r = CYRUSDB_NOTFOUND;
+
+ return r;
+}
+
+
+#define CMD_SELMBOX							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " comp_type, ical_uid, organizer, dtstart, dtend,"			\
+ " recurring, transp, sched_tag"					\
+ " FROM ical_objs WHERE mailbox = :mailbox;"
+
+EXPORTED int caldav_foreach(struct caldav_db *caldavdb, const char *mailbox,
+		 int (*cb)(void *rock, void *data),
+		 void *rock)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ struct caldav_data cdata;
+ struct read_rock rrock = { caldavdb, &cdata, cb, rock };
+
+ return dav_exec(caldavdb->db, CMD_SELMBOX, bval, &read_cb, &rrock,
+		 &caldavdb->stmtSTMT_SELMBOX);
+}
+
+
+#define CMD_INSERT							\
+ "INSERT INTO ical_objs ("						\
+ " creationdate, mailbox, resource, imap_uid,"			\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " comp_type, ical_uid, organizer, dtstart, dtend,"			\
+ " recurring, transp, sched_tag )" 	 		 	 	\
+ " VALUES ("								\
+ " :creationdate, :mailbox, :resource, :imap_uid,"			\
+ " :lock_token, :lock_owner, :lock_ownerid, :lock_expire,"		\
+ " :comp_type, :ical_uid, :organizer, :dtstart, :dtend,"		\
+ " :recurring, :transp, :sched_tag );"
+
+#define CMD_UPDATE		 	\
+ "UPDATE ical_objs SET"		\
+ " imap_uid = :imap_uid,"	\
+ " lock_token = :lock_token,"	\
+ " lock_owner = :lock_owner,"	\
+ " lock_ownerid = :lock_ownerid,"	\
+ " lock_expire = :lock_expire,"	\
+ " comp_type = :comp_type,"	\
+ " ical_uid = :ical_uid,"	\
+ " organizer = :organizer,"	\
+ " dtstart = :dtstart,"	\
+ " dtend = :dtend,"		\
+ " recurring = :recurring,"	\
+ " transp = :transp,"		\
+ " sched_tag = :sched_tag"	\
+ " WHERE rowid = :rowid;"
+
+EXPORTED int caldav_write(struct caldav_db *caldavdb, struct caldav_data *cdata,
+		 int commit)
+{
+ struct bind_val bval = {
+	{ ":imap_uid",	 SQLITE_INTEGER, { .i = cdata->dav.imap_uid	 } },
+	{ ":lock_token", SQLITE_TEXT,	 { .s = cdata->dav.lock_token	 } },
+	{ ":lock_owner", SQLITE_TEXT,	 { .s = cdata->dav.lock_owner	 } },
+	{ ":lock_ownerid", SQLITE_TEXT,	 { .s = cdata->dav.lock_ownerid } },
+	{ ":lock_expire", SQLITE_INTEGER, { .i = cdata->dav.lock_expire } },
+	{ ":comp_type",	 SQLITE_INTEGER, { .i = cdata->comp_type	 } },
+	{ ":ical_uid",	 SQLITE_TEXT,	 { .s = cdata->ical_uid	 } },
+	{ ":organizer",	 SQLITE_TEXT,	 { .s = cdata->organizer	 } },
+	{ ":dtstart",	 SQLITE_TEXT,	 { .s = cdata->dtstart	 } },
+	{ ":dtend",	 SQLITE_TEXT,	 { .s = cdata->dtend		 } },
+	{ ":recurring",	 SQLITE_INTEGER, { .i = cdata->recurring	 } },
+	{ ":transp",	 SQLITE_INTEGER, { .i = cdata->transp		 } },
+	{ ":sched_tag",	 SQLITE_TEXT,	 { .s = cdata->sched_tag	 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } } };
+ const char *cmd;
+ sqlite3_stmt **stmt;
+ int r;
+
+ if (cdata->dav.rowid) {
+	cmd = CMD_UPDATE;
+	stmt = &caldavdb->stmtSTMT_UPDATE;
+
+	bval13.name = ":rowid";
+	bval13.type = SQLITE_INTEGER;
+	bval13.val.i = cdata->dav.rowid;
+ }
+ else {
+	cmd = CMD_INSERT;
+	stmt = &caldavdb->stmtSTMT_INSERT;
+
+	bval13.name = ":creationdate";
+	bval13.type = SQLITE_INTEGER;
+	bval13.val.i = cdata->dav.creationdate;
+	bval14.name = ":mailbox";
+	bval14.type = SQLITE_TEXT;
+	bval14.val.s = cdata->dav.mailbox;
+	bval15.name = ":resource";
+	bval15.type = SQLITE_TEXT;
+	bval15.val.s = cdata->dav.resource;
+ }
+
+ r = dav_exec(caldavdb->db, cmd, bval, NULL, NULL, stmt);
+
+ if (!r && commit) {
+	/* commit transaction */
+	return dav_exec(caldavdb->db, CMD_COMMIT, NULL, NULL, NULL,
+			&caldavdb->stmtSTMT_COMMIT);
+ }
+
+ return r;
+}
+
+
+#define CMD_DELETE "DELETE FROM ical_objs WHERE rowid = :rowid;"
+
+EXPORTED int caldav_delete(struct caldav_db *caldavdb, unsigned rowid, int commit)
+{
+ struct bind_val bval = {
+	{ ":rowid", SQLITE_INTEGER, { .i = rowid } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ int r;
+
+ r = dav_exec(caldavdb->db, CMD_DELETE, bval, NULL, NULL,
+		 &caldavdb->stmtSTMT_DELETE);
+
+ if (!r && commit) {
+	/* commit transaction */
+	return dav_exec(caldavdb->db, CMD_COMMIT, NULL, NULL, NULL,
+			&caldavdb->stmtSTMT_COMMIT);
+ }
+
+ return r;
+}
+
+
+#define CMD_DELMBOX "DELETE FROM ical_objs WHERE mailbox = :mailbox;"
+
+EXPORTED int caldav_delmbox(struct caldav_db *caldavdb, const char *mailbox, int commit)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ int r;
+
+ r = dav_exec(caldavdb->db, CMD_DELMBOX, bval, NULL, NULL,
+		 &caldavdb->stmtSTMT_DELMBOX);
+
+ if (!r && commit) {
+	/* commit transaction */
+	return dav_exec(caldavdb->db, CMD_COMMIT, NULL, NULL, NULL,
+			&caldavdb->stmtSTMT_COMMIT);
+ }
+
+ return r;
+}
+
+
+/* Get time period (start/end) of a component based in RFC 4791 Sec 9.9 */
+static void get_period(icalcomponent *comp, icalcomponent_kind kind,
+		 struct icalperiodtype *period)
+{
+ icaltimezone *utc = icaltimezone_get_utc_timezone();
+
+ period->start =
+	icaltime_convert_to_zone(icalcomponent_get_dtstart(comp), utc);
+ period->end =
+	icaltime_convert_to_zone(icalcomponent_get_dtend(comp), utc);
+
+ switch (kind) {
+ case ICAL_VEVENT_COMPONENT:
+	if (icaltime_is_null_time(period->end)) {
+	 /* No DTEND or DURATION */
+	 memcpy(&period->end, &period->start,
+		 sizeof(struct icaltimetype));
+
+	 if (icaltime_is_date(period->start)) {
+		/* DTSTART is not DATE-TIME */
+		struct icaldurationtype dur;
+
+		dur = icaldurationtype_from_int(60*60*24 - 1); /* P1D */
+		icaltime_add(period->end, dur);
+	 }
+	}
+	break;
+
+ case ICAL_VTODO_COMPONENT: {
+	struct icaltimetype due = icalcomponent_get_due(comp);
+
+	if (!icaltime_is_null_time(period->start)) {
+	 /* Has DTSTART */
+	 if (icaltime_is_null_time(period->end)) {
+		/* No DURATION */
+		memcpy(&period->end, &period->start,
+		 sizeof(struct icaltimetype));
+
+		if (!icaltime_is_null_time(due)) {
+		 /* Has DUE */
+		 if (icaltime_compare(due, period->start) < 0)
+			memcpy(&period->start, &due, sizeof(struct icaltimetype));
+		 if (icaltime_compare(due, period->end) > 0)
+			memcpy(&period->end, &due, sizeof(struct icaltimetype));
+		}
+	 }
+	}
+	else {
+	 icalproperty *prop;
+
+	 /* No DTSTART */
+	 if (!icaltime_is_null_time(due)) {
+		/* Has DUE */
+		memcpy(&period->start, &due, sizeof(struct icaltimetype));
+		memcpy(&period->end, &due, sizeof(struct icaltimetype));
+	 }
+	 else if ((prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_COMPLETED_PROPERTY))) {
+		/* Has COMPLETED */
+		period->start =
+		 icaltime_convert_to_zone(icalproperty_get_completed(prop),
+					 utc);
+		memcpy(&period->end, &period->start, sizeof(struct icaltimetype));
+
+		if ((prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_CREATED_PROPERTY))) {
+		 /* Has CREATED */
+		 struct icaltimetype created =
+			icaltime_convert_to_zone(icalproperty_get_created(prop),
+						 utc);
+		 if (icaltime_compare(created, period->start) < 0)
+			memcpy(&period->start, &created, sizeof(struct icaltimetype));
+		 if (icaltime_compare(created, period->end) > 0)
+			memcpy(&period->end, &created, sizeof(struct icaltimetype));
+		}
+	 }
+	 else if ((prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_CREATED_PROPERTY))) {
+		/* Has CREATED */
+		period->start =
+		 icaltime_convert_to_zone(icalproperty_get_created(prop),
+					 utc);
+		memcpy(&period->end, &period->start, sizeof(struct icaltimetype));
+	 }
+	 else {
+		/* Always */
+		period->start =
+		 icaltime_from_timet_with_zone(INT_MIN, 0, NULL);
+		period->end =
+		 icaltime_from_timet_with_zone(INT_MAX, 0, NULL);
+	 }
+	}
+	break;
+ }
+
+ case ICAL_VJOURNAL_COMPONENT:
+	if (!icaltime_is_null_time(period->start)) {
+	 /* Has DTSTART */
+	 memcpy(&period->end, &period->start,
+		 sizeof(struct icaltimetype));
+
+	 if (icaltime_is_date(period->start)) {
+		/* DTSTART is not DATE-TIME */
+		struct icaldurationtype dur;
+
+		dur = icaldurationtype_from_int(60*60*24 - 1); /* P1D */
+		icaltime_add(period->end, dur);
+	 }
+	}
+	else {
+	 /* Never */
+	 period->start =
+		icaltime_from_timet_with_zone(INT_MAX, 0, NULL);
+	 period->end =
+		icaltime_from_timet_with_zone(INT_MIN, 0, NULL);
+	}
+	break;
+
+ case ICAL_VFREEBUSY_COMPONENT:
+	if (icaltime_is_null_time(period->start) ||
+	 icaltime_is_null_time(period->end)) {
+	 /* No DTSTART or DTEND */
+	 icalproperty *fb =
+		icalcomponent_get_first_property(comp,
+						 ICAL_FREEBUSY_PROPERTY);
+
+
+	 if (fb) {
+		/* Has FREEBUSY */
+		/* XXX Convert FB period into our period */
+	 }
+	 else {
+		/* Never */
+		period->start =
+		 icaltime_from_timet_with_zone(INT_MAX, 0, NULL);
+		period->end =
+		 icaltime_from_timet_with_zone(INT_MIN, 0, NULL);
+	 }
+	}
+	break;
+
+ default:
+	break;
+ }
+}
+
+
+/* icalcomponent_foreach_recurrence() callback to find earliest/latest time */
+static void recur_cb(icalcomponent *comp, struct icaltime_span *span,
+		 void *rock)
+{
+ struct icalperiodtype *period = (struct icalperiodtype *) rock;
+ int is_date = icaltime_is_date(icalcomponent_get_dtstart(comp));
+ icaltimezone *utc = icaltimezone_get_utc_timezone();
+ struct icaltimetype start =
+	icaltime_from_timet_with_zone(span->start, is_date, utc);
+ struct icaltimetype end =
+	icaltime_from_timet_with_zone(span->end, is_date, utc);
+
+ if (icaltime_compare(start, period->start) < 0)
+	memcpy(&period->start, &start, sizeof(struct icaltimetype));
+
+ if (icaltime_compare(end, period->end) > 0)
+	memcpy(&period->end, &end, sizeof(struct icaltimetype));
+}
+
+
+EXPORTED void caldav_make_entry(icalcomponent *ical, struct caldav_data *cdata)
+{
+ icalcomponent *comp = icalcomponent_get_first_real_component(ical);
+ icalcomponent_kind kind;
+ icalproperty *prop;
+ unsigned mykind = 0, recurring = 0, transp = 0;
+ struct icalperiodtype span;
+
+ /* Get iCalendar UID */
+ cdata->ical_uid = icalcomponent_get_uid(comp);
+
+ /* Get component type */
+ kind = icalcomponent_isa(comp);
+ switch (kind) {
+ case ICAL_VEVENT_COMPONENT: mykind = CAL_COMP_VEVENT; break;
+ case ICAL_VTODO_COMPONENT: mykind = CAL_COMP_VTODO; break;
+ case ICAL_VJOURNAL_COMPONENT: mykind = CAL_COMP_VJOURNAL; break;
+ case ICAL_VFREEBUSY_COMPONENT: mykind = CAL_COMP_VFREEBUSY; break;
+ default: break;
+ }
+ cdata->comp_type = mykind;
+
+ /* Get organizer */
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ if (prop) cdata->organizer = icalproperty_get_organizer(prop)+7;
+
+ /* Get transparency */
+ prop = icalcomponent_get_first_property(comp, ICAL_TRANSP_PROPERTY);
+ if (prop) {
+	icalvalue *transp_val = icalproperty_get_value(prop);
+
+	switch (icalvalue_get_transp(transp_val)) {
+	case ICAL_TRANSP_TRANSPARENT:
+	case ICAL_TRANSP_TRANSPARENTNOCONFLICT:
+	 transp = 1;
+	 break;
+
+	default:
+	 transp = 0;
+	 break;
+	}
+ }
+ cdata->transp = transp;
+
+ /* Get base dtstart and dtend */
+ get_period(comp, kind, &span);
+
+ /* See if its a recurring event */
+ if (icalcomponent_get_first_property(comp,ICAL_RRULE_PROPERTY) ||
+	icalcomponent_get_first_property(comp,ICAL_RDATE_PROPERTY) ||
+	icalcomponent_get_first_property(comp,ICAL_EXDATE_PROPERTY)) {
+	/* Recurring - find widest time range that includes events */
+	recurring = 1;
+
+	icalcomponent_foreach_recurrence(
+	 comp,
+	 icaltime_from_timet_with_zone(INT_MIN, 0, NULL),
+	 icaltime_from_timet_with_zone(INT_MAX, 0, NULL),
+	 recur_cb,
+	 &span);
+
+	/* Handle overridden recurrences */
+	while ((comp = icalcomponent_get_next_component(ical, kind))) {
+	 struct icalperiodtype period;
+
+	 get_period(comp, kind, &period);
+
+	 if (icaltime_compare(period.start, span.start) < 0)
+		memcpy(&span.start, &period.start, sizeof(struct icaltimetype));
+
+	 if (icaltime_compare(period.end, span.end) > 0)
+		memcpy(&span.end, &period.end, sizeof(struct icaltimetype));
+	}
+ }
+
+ cdata->dtstart = icaltime_as_ical_string(span.start);
+ cdata->dtend = icaltime_as_ical_string(span.end);
+ cdata->recurring = recurring;
+}
+
+
+EXPORTED const char *caldav_mboxname(const char *userid, const char *name)
+{
+ struct buf boxbuf = BUF_INITIALIZER;
+ const char *res = NULL;
+
+ buf_setcstr(&boxbuf, config_getstring(IMAPOPT_CALENDARPREFIX));
+
+ if (name) {
+	size_t len = strcspn(name, "/");
+	buf_putc(&boxbuf, '.');
+	buf_appendmap(&boxbuf, name, len);
+ }
+
+ res = mboxname_user_mbox(userid, buf_cstring(&boxbuf));
+
+ buf_free(&boxbuf);
+
+ return res;
+}

cyrus-imapd-2.5.tar.gz/imap/caldav_db.h Added

@@ -0,0 +1,122 @@
+/* caldav_db.h -- abstract interface for per-user CalDAV database
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef CALDAV_DB_H
+#define CALDAV_DB_H
+
+#include <config.h>
+
+#include <libical/ical.h>
+
+#include "dav_db.h"
+
+struct caldav_db;
+
+#define CALDAV_CREATE 0x01
+#define CALDAV_TRUNC 0x02
+
+struct caldav_data {
+ struct dav_data dav; /* MUST be first so we can typecast */
+ unsigned comp_type;
+ const char *ical_uid;
+ const char *organizer;
+ const char *dtstart;
+ const char *dtend;
+ unsigned recurring;
+ unsigned transp;
+ const char *sched_tag;
+};
+
+/* prepare for caldav operations in this process */
+int caldav_init(void);
+
+/* done with all caldav operations for this process */
+int caldav_done(void);
+
+/* get a database handle corresponding to userid */
+struct caldav_db *caldav_open(const char *userid, int flags);
+
+/* close this handle */
+int caldav_close(struct caldav_db *caldavdb);
+
+/* lookup an entry from 'caldavdb' by resource
+ (optionally inside a transaction for updates) */
+int caldav_lookup_resource(struct caldav_db *caldavdb,
+			 const char *mailbox, const char *resource,
+			 int lock, struct caldav_data **result);
+
+/* lookup an entry from 'caldavdb' by iCal UID
+ (optionally inside a transaction for updates) */
+int caldav_lookup_uid(struct caldav_db *caldavdb, const char *ical_uid,
+		 int lock, struct caldav_data **result);
+
+/* process each entry for 'mailbox' in 'caldavdb' with cb() */
+int caldav_foreach(struct caldav_db *caldavdb, const char *mailbox,
+		 int (*cb)(void *rock, void *data),
+		 void *rock);
+
+/* write an entry to 'caldavdb' */
+int caldav_write(struct caldav_db *caldavdb, struct caldav_data *cdata,
+		 int commit);
+
+/* delete an entry from 'caldavdb' */
+int caldav_delete(struct caldav_db *caldavdb, unsigned rowid, int commit);
+
+/* delete all entries for 'mailbox' from 'caldavdb' */
+int caldav_delmbox(struct caldav_db *caldavdb, const char *mailbox, int commit);
+
+/* begin transaction */
+int caldav_begin(struct caldav_db *caldavdb);
+
+/* commit transaction */
+int caldav_commit(struct caldav_db *caldavdb);
+
+/* abort transaction */
+int caldav_abort(struct caldav_db *caldavdb);
+
+/* create caldav_data from icalcomponent */
+void caldav_make_entry(icalcomponent *ical, struct caldav_data *cdata);
+
+const char *caldav_mboxname(const char *userid, const char *name);
+
+#endif /* CALDAV_DB_H */

cyrus-imapd-2.5.tar.gz/imap/carddav_db.c Added

@@ -0,0 +1,609 @@
+/* carddav_db.c -- implementation of per-user CardDAV database
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#include <syslog.h>
+#include <string.h>
+
+#include "carddav_db.h"
+#include "cyrusdb.h"
+#include "httpd.h"
+#include "http_dav.h"
+#include "libconfig.h"
+#include "util.h"
+#include "xstrlcat.h"
+#include "xmalloc.h"
+
+
+enum {
+ STMT_SELRSRC,
+ STMT_SELUID,
+ STMT_SELMBOX,
+ STMT_INSERT,
+ STMT_DELETE,
+ STMT_DELMBOX,
+ STMT_BEGIN,
+ STMT_COMMIT,
+ STMT_ROLLBACK,
+ STMT_INSERT_EMAIL,
+ STMT_INSERT_GROUP,
+ STMT_GETEMAIL,
+ STMT_GETGROUP,
+ NUM_STMT
+};
+
+#define NUM_BUFS 10
+
+struct carddav_db {
+ sqlite3 *db;			/* DB handle */
+ sqlite3_stmt *stmtNUM_STMT;	/* prepared statements */
+ struct buf bufsNUM_BUFS;		/* buffers for copies of column text */
+};
+
+
+EXPORTED int carddav_init(void)
+{
+ return dav_init();
+}
+
+
+EXPORTED int carddav_done(void)
+{
+ return dav_done();
+}
+
+
+#define CMD_DROP_OBJ "DROP TABLE IF EXISTS vcard_objs;"
+
+#define CMD_CREATE_OBJ							\
+ "CREATE TABLE IF NOT EXISTS vcard_objs ("				\
+ " rowid INTEGER PRIMARY KEY,"					\
+ " creationdate INTEGER,"						\
+ " mailbox TEXT NOT NULL,"						\
+ " resource TEXT NOT NULL,"						\
+ " imap_uid INTEGER,"						\
+ " lock_token TEXT,"							\
+ " lock_owner TEXT,"							\
+ " lock_ownerid TEXT,"						\
+ " lock_expire INTEGER,"						\
+ " version INTEGER,"							\
+ " vcard_uid TEXT,"							\
+ " kind INTEGER,"							\
+ " fullname TEXT,"							\
+ " name TEXT,"							\
+ " nickname TEXT,"							\
+ " UNIQUE( mailbox, resource ) );"					\
+ "CREATE INDEX IF NOT EXISTS idx_vcard_fn ON vcard_objs ( fullname );" \
+ "CREATE INDEX IF NOT EXISTS idx_vcard_uid ON vcard_objs ( vcard_uid );"
+
+#define CMD_DROP_EM "DROP TABLE IF EXISTS vcard_emails;"
+
+#define CMD_CREATE_EM							\
+ "CREATE TABLE IF NOT EXISTS vcard_emails ("				\
+ " rowid INTEGER PRIMARY KEY,"					\
+ " objid INTEGER,"							\
+ " pos INTEGER NOT NULL," /* for sorting */				\
+ " email TEXT NOT NULL,"						\
+ " FOREIGN KEY (objid) REFERENCES vcard_objs (rowid) ON DELETE CASCADE );" \
+ "CREATE INDEX IF NOT EXISTS idx_vcard_email ON vcard_emails ( email );"
+
+#define CMD_DROP_GR "DROP TABLE IF EXISTS vcard_groups;"
+
+#define CMD_CREATE_GR							\
+ "CREATE TABLE IF NOT EXISTS vcard_groups ("				\
+ " rowid INTEGER PRIMARY KEY,"					\
+ " objid INTEGER,"							\
+ " pos INTEGER NOT NULL," /* for sorting */				\
+ " member_uid TEXT NOT NULL,"					\
+ " FOREIGN KEY (objid) REFERENCES vcard_objs (rowid) ON DELETE CASCADE );"
+
+#define CMD_DROP CMD_DROP_OBJ CMD_DROP_EM CMD_DROP_GR
+#define CMD_CREATE CMD_CREATE_OBJ CMD_CREATE_EM CMD_CREATE_GR
+
+/* Open DAV DB corresponding to userid */
+struct carddav_db *carddav_open(const char *userid, int flags)
+{
+ sqlite3 *db;
+ struct carddav_db *carddavdb = NULL;
+ const char *cmds = CMD_CREATE;
+
+ if (flags & CARDDAV_TRUNC) cmds = CMD_DROP CMD_CREATE;
+
+ db = dav_open(userid, cmds);
+
+ if (db) {
+	carddavdb = xzmalloc(sizeof(struct carddav_db));
+	carddavdb->db = db;
+ }
+
+ return carddavdb;
+}
+
+
+/* Close DAV DB */
+EXPORTED int carddav_close(struct carddav_db *carddavdb)
+{
+ int i, r = 0;
+
+ if (!carddavdb) return 0;
+
+ for (i = 0; i < NUM_BUFS; i++) {
+	buf_free(&carddavdb->bufsi);
+ }
+
+ for (i = 0; i < NUM_STMT; i++) {
+	sqlite3_stmt *stmt = carddavdb->stmti;
+	if (stmt) sqlite3_finalize(stmt);
+ }
+
+ r = dav_close(carddavdb->db);
+
+ free(carddavdb);
+
+ return r;
+}
+
+
+#define CMD_BEGIN "BEGIN TRANSACTION;"
+
+EXPORTED int carddav_begin(struct carddav_db *carddavdb)
+{
+ return dav_exec(carddavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &carddavdb->stmtSTMT_BEGIN);
+}
+
+
+#define CMD_COMMIT "COMMIT TRANSACTION;"
+
+EXPORTED int carddav_commit(struct carddav_db *carddavdb)
+{
+ return dav_exec(carddavdb->db, CMD_COMMIT, NULL, NULL, NULL,
+		 &carddavdb->stmtSTMT_COMMIT);
+}
+
+
+#define CMD_ROLLBACK "ROLLBACK TRANSACTION;"
+
+EXPORTED int carddav_abort(struct carddav_db *carddavdb)
+{
+ return dav_exec(carddavdb->db, CMD_ROLLBACK, NULL, NULL, NULL,
+		 &carddavdb->stmtSTMT_ROLLBACK);
+}
+
+
+struct read_rock {
+ struct carddav_db *db;
+ struct carddav_data *cdata;
+ int (*cb)(void *rock, void *data);
+ void *rock;
+};
+
+static const char *column_text_to_buf(const char *text, struct buf *buf)
+{
+ if (text) {
+	buf_setcstr(buf, text);
+	text = buf_cstring(buf);
+ }
+
+ return text;
+}
+
+static int read_cb(sqlite3_stmt *stmt, void *rock)
+{
+ struct read_rock *rrock = (struct read_rock *) rock;
+ struct carddav_db *db = rrock->db;
+ struct carddav_data *cdata = rrock->cdata;
+ int r = 0;
+
+ memset(cdata, 0, sizeof(struct carddav_data));
+
+ cdata->dav.rowid = sqlite3_column_int(stmt, 0);
+ cdata->dav.creationdate = sqlite3_column_int(stmt, 1);
+ cdata->dav.imap_uid = sqlite3_column_int(stmt, 4);
+ cdata->dav.lock_expire = sqlite3_column_int(stmt, 8);
+ cdata->version = sqlite3_column_int(stmt, 9);
+ cdata->kind = sqlite3_column_int(stmt, 11);
+
+ if (rrock->cb) {
+	/* We can use the column data directly for the callback */
+	cdata->dav.mailbox = (const char *) sqlite3_column_text(stmt, 2);
+	cdata->dav.resource = (const char *) sqlite3_column_text(stmt, 3);
+	cdata->dav.lock_token = (const char *) sqlite3_column_text(stmt, 5);
+	cdata->dav.lock_owner = (const char *) sqlite3_column_text(stmt, 6);
+	cdata->dav.lock_ownerid = (const char *) sqlite3_column_text(stmt, 7);
+	cdata->vcard_uid = (const char *) sqlite3_column_text(stmt, 10);
+	cdata->fullname = (const char *) sqlite3_column_text(stmt, 12);
+	cdata->name = (const char *) sqlite3_column_text(stmt, 13);
+	cdata->nickname = (const char *) sqlite3_column_text(stmt, 14);
+	r = rrock->cb(rrock->rock, cdata);
+ }
+ else {
+	/* For single row SELECTs like carddav_read(),
+	 * we need to make a copy of the column data before
+	 * it gets flushed by sqlite3_step() or sqlite3_reset() */
+	cdata->dav.mailbox =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 2),
+			 &db->bufs0);
+	cdata->dav.resource =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 3),
+			 &db->bufs1);
+	cdata->dav.lock_token =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 5),
+			 &db->bufs2);
+	cdata->dav.lock_owner =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 6),
+			 &db->bufs3);
+	cdata->dav.lock_ownerid =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 7),
+			 &db->bufs4);
+	cdata->vcard_uid =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 10),
+			 &db->bufs5);
+	cdata->fullname =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 12),
+			 &db->bufs6);
+	cdata->name =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 13),
+			 &db->bufs7);
+	cdata->nickname =
+	 column_text_to_buf((const char *) sqlite3_column_text(stmt, 14),
+			 &db->bufs8);
+ }
+
+ return r;
+}
+
+
+#define CMD_SELRSRC							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " version, vcard_uid, kind, fullname, name, nickname"		\
+ " FROM vcard_objs"							\
+ " WHERE ( mailbox = :mailbox AND resource = :resource );"
+
+EXPORTED int carddav_lookup_resource(struct carddav_db *carddavdb,
+			 const char *mailbox, const char *resource,
+			 int lock, struct carddav_data **result)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox	 } },
+	{ ":resource", SQLITE_TEXT, { .s = resource	 } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL		 } } };
+ static struct carddav_data cdata;
+ struct read_rock rrock = { carddavdb, &cdata, NULL, NULL };
+ int r;
+
+ *result = memset(&cdata, 0, sizeof(struct carddav_data));
+
+ if (lock) {
+	/* begin a transaction */
+	r = dav_exec(carddavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &carddavdb->stmtSTMT_BEGIN);
+	if (r) return r;
+ }
+
+ r = dav_exec(carddavdb->db, CMD_SELRSRC, bval, &read_cb, &rrock,
+		 &carddavdb->stmtSTMT_SELRSRC);
+ if (!r && !cdata.dav.rowid) r = CYRUSDB_NOTFOUND;
+
+ return r;
+}
+
+
+#define CMD_SELUID							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " version, vcard_uid, kind, fullname, name, nickname"		\
+ " FROM vcard_objs"							\
+ " WHERE ( vcard_uid = :vcard_uid );"
+
+EXPORTED int carddav_lookup_uid(struct carddav_db *carddavdb, const char *vcard_uid,
+		 int lock, struct carddav_data **result)
+{
+ struct bind_val bval = {
+	{ ":vcard_uid", SQLITE_TEXT, { .s = vcard_uid		 } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL		 } } };
+ static struct carddav_data cdata;
+ struct read_rock rrock = { carddavdb, &cdata, NULL, NULL };
+ int r;
+
+ *result = memset(&cdata, 0, sizeof(struct carddav_data));
+
+ if (lock) {
+	/* begin a transaction */
+	r = dav_exec(carddavdb->db, CMD_BEGIN, NULL, NULL, NULL,
+		 &carddavdb->stmtSTMT_BEGIN);
+	if (r) return r;
+ }
+
+ r = dav_exec(carddavdb->db, CMD_SELUID, bval, &read_cb, &rrock,
+		 &carddavdb->stmtSTMT_SELUID);
+ if (!r && !cdata.dav.rowid) r = CYRUSDB_NOTFOUND;
+
+ return r;
+}
+
+
+#define CMD_SELMBOX							\
+ "SELECT rowid, creationdate, mailbox, resource, imap_uid,"		\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " version, vcard_uid, kind, fullname, name, nickname"		\
+ " FROM vcard_objs WHERE mailbox = :mailbox;"
+
+EXPORTED int carddav_foreach(struct carddav_db *carddavdb, const char *mailbox,
+		 int (*cb)(void *rock, void *data),
+		 void *rock)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ struct carddav_data cdata;
+ struct read_rock rrock = { carddavdb, &cdata, cb, rock };
+
+ return dav_exec(carddavdb->db, CMD_SELMBOX, bval, &read_cb, &rrock,
+		 &carddavdb->stmtSTMT_SELMBOX);
+}
+
+#define CMD_GETEMAIL							\
+ "SELECT rowid"							\
+ " FROM vcard_emails"						\
+ " WHERE ( email = :email );"
+
+static int foundemail_cb(sqlite3_stmt *stmt, void *rock)
+{
+ int *foundp = (int *)rock;
+ if (sqlite3_column_int(stmt, 0))
+	*foundp = 1;
+ return 0;
+}
+
+EXPORTED int carddav_getemail(struct carddav_db *carddavdb, const char *email)
+{
+ struct bind_val bval = {
+	{ ":email", SQLITE_TEXT, { .s = email } },
+	{ NULL, SQLITE_NULL, { .s = NULL } }
+ };
+ int found = 0;
+ int r;
+
+ r = dav_exec(carddavdb->db, CMD_GETEMAIL, bval, &foundemail_cb, &found,
+		 &carddavdb->stmtSTMT_GETEMAIL);
+ if (r) {
+	/* XXX syslog */
+ }
+
+ return found;
+}
+
+#define CMD_GETGROUP \
+ "SELECT E.email FROM vcard_emails E" \
+ " JOIN vcard_objs CO JOIN vcard_groups G JOIN vcard_objs GO" \
+ " WHERE E.objid = CO.rowid AND CO.vcard_uid = G.member_uid AND G.objid = GO.rowid" \
+ " AND E.pos = 0 AND GO.fullname = :group"
+
+static int foundgroup_cb(sqlite3_stmt *stmt, void *rock)
+{
+ strarray_t *array = (strarray_t *)rock;
+ strarray_add(array, (const char *)sqlite3_column_text(stmt, 0));
+ return 0;
+}
+
+EXPORTED strarray_t *carddav_getgroup(struct carddav_db *carddavdb, const char *group)
+{
+ struct bind_val bval = {
+	{ ":group", SQLITE_TEXT, { .s = group } },
+	{ NULL, SQLITE_NULL, { .s = NULL } }
+ };
+ strarray_t *found = strarray_new();
+ int r;
+
+ r = dav_exec(carddavdb->db, CMD_GETGROUP, bval, &foundgroup_cb, found,
+		 &carddavdb->stmtSTMT_GETGROUP);
+ if (r) {
+	/* XXX syslog */
+ }
+
+ if (!strarray_size(found)) {
+	strarray_free(found);
+	return NULL;
+ }
+
+ return found;
+}
+
+
+#define CMD_INSERT_EMAIL						\
+ "INSERT INTO vcard_emails ( objid, pos, email )"			\
+ " VALUES ( :objid, :pos, :email );"
+
+/* no commit */
+static int carddav_write_emails(struct carddav_db *carddavdb, struct carddav_data *cdata)
+{
+ struct bind_val bval = {
+	{ ":objid",	 SQLITE_INTEGER, { .i = cdata->dav.rowid	 } },
+	{ ":pos",	 SQLITE_INTEGER, { .i = 0			 } },
+	{ ":email",	 SQLITE_TEXT,	 { .s = NULL			 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } } };
+ int r;
+ int i;
+
+ for (i = 0; i < strarray_size(&cdata->emails); i++) {
+	bval1.val.i = i;
+	bval2.val.s = strarray_nth(&cdata->emails, i);
+	r = dav_exec(carddavdb->db, CMD_INSERT_EMAIL, bval, NULL, NULL,
+		 &carddavdb->stmtSTMT_INSERT_EMAIL);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+#define CMD_INSERT_GROUP						\
+ "INSERT INTO vcard_groups ( objid, pos, member_uid )"		\
+ " VALUES ( :objid, :pos, :member_uid );"
+
+/* no commit */
+static int carddav_write_groups(struct carddav_db *carddavdb, struct carddav_data *cdata)
+{
+ struct bind_val bval = {
+	{ ":objid",	 SQLITE_INTEGER, { .i = cdata->dav.rowid	 } },
+	{ ":pos",	 SQLITE_INTEGER, { .i = 0			 } },
+	{ ":member_uid", SQLITE_TEXT,	 { .s = NULL			 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } } };
+ int r;
+ int i;
+
+ for (i = 0; i < strarray_size(&cdata->member_uids); i++) {
+	bval1.val.i = i;
+	bval2.val.s = strarray_nth(&cdata->member_uids, i);
+	r = dav_exec(carddavdb->db, CMD_INSERT_GROUP, bval, NULL, NULL,
+		 &carddavdb->stmtSTMT_INSERT_GROUP);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+#define CMD_INSERT							\
+ "INSERT INTO vcard_objs ("						\
+ " creationdate, mailbox, resource, imap_uid,"			\
+ " lock_token, lock_owner, lock_ownerid, lock_expire,"		\
+ " version, vcard_uid, kind, fullname, name, nickname)"		\
+ " VALUES ("								\
+ " :creationdate, :mailbox, :resource, :imap_uid,"			\
+ " :lock_token, :lock_owner, :lock_ownerid, :lock_expire,"		\
+ " :version, :vcard_uid, :kind, :fullname, :name, :nickname );"
+
+EXPORTED int carddav_write(struct carddav_db *carddavdb, struct carddav_data *cdata,
+		 int commit)
+{
+ struct bind_val bval = {
+	{ ":creationdate", SQLITE_INTEGER, { .i = cdata->dav.creationdate } },
+	{ ":mailbox",	 SQLITE_TEXT,	 { .s = cdata->dav.mailbox	 } },
+	{ ":resource",	 SQLITE_TEXT,	 { .s = cdata->dav.resource	 } },
+	{ ":imap_uid",	 SQLITE_INTEGER, { .i = cdata->dav.imap_uid	 } },
+	{ ":lock_token", SQLITE_TEXT,	 { .s = cdata->dav.lock_token	 } },
+	{ ":lock_owner", SQLITE_TEXT,	 { .s = cdata->dav.lock_owner	 } },
+	{ ":lock_ownerid", SQLITE_TEXT,	 { .s = cdata->dav.lock_ownerid } },
+	{ ":lock_expire", SQLITE_INTEGER, { .i = cdata->dav.lock_expire } },
+	{ ":version",	 SQLITE_INTEGER, { .i = cdata->version	 } },
+	{ ":vcard_uid",	 SQLITE_TEXT,	 { .s = cdata->vcard_uid	 } },
+	{ ":kind",	 SQLITE_INTEGER, { .i = cdata->kind		 } },
+	{ ":fullname",	 SQLITE_TEXT,	 { .s = cdata->fullname	 } },
+	{ ":name",	 SQLITE_TEXT,	 { .s = cdata->name		 } },
+	{ ":nickname",	 SQLITE_TEXT,	 { .s = cdata->nickname	 } },
+	{ NULL,		 SQLITE_NULL,	 { .s = NULL			 } } };
+ int r;
+
+ if (cdata->dav.rowid) {
+	r = carddav_delete(carddavdb, cdata->dav.rowid, /*commit*/0);
+	if (r) return r;
+ }
+
+ r = dav_exec(carddavdb->db, CMD_INSERT, bval, NULL, NULL,
+		 &carddavdb->stmtSTMT_INSERT);
+ if (r) return r;
+
+ cdata->dav.rowid = sqlite3_last_insert_rowid(carddavdb->db);
+
+ r = carddav_write_emails(carddavdb, cdata);
+ if (r) return r;
+
+ r = carddav_write_groups(carddavdb, cdata);
+ if (r) return r;
+
+ /* commit transaction */
+ if (commit) {
+	r = carddav_commit(carddavdb);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+
+#define CMD_DELETE "DELETE FROM vcard_objs WHERE rowid = :rowid;"
+
+EXPORTED int carddav_delete(struct carddav_db *carddavdb, unsigned rowid, int commit)
+{
+ struct bind_val bval = {
+	{ ":rowid", SQLITE_INTEGER, { .i = rowid } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ int r;
+
+ r = dav_exec(carddavdb->db, CMD_DELETE, bval, NULL, NULL,
+		 &carddavdb->stmtSTMT_DELETE);
+ if (r) return r;
+
+ /* commit transaction */
+ if (commit) {
+	r = carddav_commit(carddavdb);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+
+#define CMD_DELMBOX "DELETE FROM vcard_objs WHERE mailbox = :mailbox;"
+
+EXPORTED int carddav_delmbox(struct carddav_db *carddavdb, const char *mailbox, int commit)
+{
+ struct bind_val bval = {
+	{ ":mailbox", SQLITE_TEXT, { .s = mailbox } },
+	{ NULL,	 SQLITE_NULL, { .s = NULL } } };
+ int r;
+
+ r = dav_exec(carddavdb->db, CMD_DELMBOX, bval, NULL, NULL,
+		 &carddavdb->stmtSTMT_DELMBOX);
+ if (r) return r;
+
+ /* commit transaction */
+ if (commit) {
+	r = carddav_commit(carddavdb);
+	if (r) return r;
+ }
+
+ return 0;
+}

cyrus-imapd-2.5.tar.gz/imap/carddav_db.h Added

@@ -0,0 +1,120 @@
+/* carddav_db.h -- abstract interface for per-user CardDAV database
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef CARDDAV_DB_H
+#define CARDDAV_DB_H
+
+#include <config.h>
+
+#include "dav_db.h"
+#include "strarray.h"
+
+struct carddav_db;
+
+#define CARDDAV_CREATE 0x01
+#define CARDDAV_TRUNC 0x02
+
+struct carddav_data {
+ struct dav_data dav; /* MUST be first so we can typecast */
+ unsigned version;
+ const char *vcard_uid;
+ unsigned kind;
+ const char *fullname;
+ const char *name;
+ const char *nickname;
+ strarray_t emails;
+ strarray_t member_uids;
+};
+
+/* prepare for carddav operations in this process */
+int carddav_init(void);
+
+/* done with all carddav operations for this process */
+int carddav_done(void);
+
+/* get a database handle corresponding to userid */
+struct carddav_db *carddav_open(const char *userid, int flags);
+
+/* close this handle */
+int carddav_close(struct carddav_db *carddavdb);
+
+/* lookup an entry from 'carddavdb' by resource
+ (optionally inside a transaction for updates) */
+int carddav_lookup_resource(struct carddav_db *carddavdb,
+			 const char *mailbox, const char *resource,
+			 int lock, struct carddav_data **result);
+
+/* lookup an entry from 'carddavdb' by iCal UID
+ (optionally inside a transaction for updates) */
+int carddav_lookup_uid(struct carddav_db *carddavdb, const char *ical_uid,
+		 int lock, struct carddav_data **result);
+
+/* check if an email address exists on any card */
+int carddav_getemail(struct carddav_db *carddavdb, const char *key);
+strarray_t *carddav_getgroup(struct carddav_db *carddavdb, const char *key);
+
+/* process each entry for 'mailbox' in 'carddavdb' with cb() */
+int carddav_foreach(struct carddav_db *carddavdb, const char *mailbox,
+		 int (*cb)(void *rock, void *data),
+		 void *rock);
+
+/* write an entry to 'carddavdb' */
+int carddav_write(struct carddav_db *carddavdb, struct carddav_data *cdata,
+		 int commit);
+
+/* delete an entry from 'carddavdb' */
+int carddav_delete(struct carddav_db *carddavdb, unsigned rowid, int commit);
+
+/* delete all entries for 'mailbox' from 'carddavdb' */
+int carddav_delmbox(struct carddav_db *carddavdb, const char *mailbox, int commit);
+
+/* begin transaction */
+int carddav_begin(struct carddav_db *carddavdb);
+
+/* commit transaction */
+int carddav_commit(struct carddav_db *carddavdb);
+
+/* abort transaction */
+int carddav_abort(struct carddav_db *carddavdb);
+
+#endif /* CARDDAV_DB_H */

cyrus-imapd-2.4.17.tar.gz/imap/chk_cyrus.c -> cyrus-imapd-2.5.tar.gz/imap/chk_cyrus.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: chk_cyrus.c,v 1.20 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
@@ -52,9 +50,6 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <syslog.h>
-#include <errno.h>
-#include <ctype.h>
 #include <limits.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -67,19 +62,14 @@
 #include "mailbox.h"
 #include "map.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
-
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr, "chk_cyrus -C <altconfig> partition\n");
 exit(-1);
 }
 
-const char *check_part = NULL; /* partition we are checking */
+static const char *check_part = NULL; /* partition we are checking */
 
 static int chkmbox(char *name,
 		 int matchlen __attribute__((unused)),
@@ -87,7 +77,7 @@
 		 void *rock __attribute__((unused))) 
 {
 int r;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 
 r = mboxlist_lookup(name, &mbentry, NULL);
 
@@ -99,13 +89,17 @@
 }
 
 /* are we on the partition we are checking? */
- if (check_part && strcmp(mbentry.partition, check_part))
+ if (check_part && strcmp(mbentry->partition, check_part)) {
+	mboxlist_entry_free(&mbentry);
 	return 0;
+ }
 
 fprintf(stderr, "checking: %s\n", name);
 
 mailbox_reconstruct(name, 0); /* no changes allowed */
 
+ mboxlist_entry_free(&mbentry);
+
 return 0;
 }
 
@@ -146,7 +140,7 @@
 	}
 }
 
- cyrus_init(alt_config, "chk_cyrus", 0);
+ cyrus_init(alt_config, "chk_cyrus", 0, CONFIG_NEED_PARTITION_DATA);
 
 mboxlist_init(0);
 mboxlist_open(NULL);

cyrus-imapd-2.4.17.tar.gz/imap/cli_fatal.c -> cyrus-imapd-2.5.tar.gz/imap/cli_fatal.c Changed

cyrus-imapd-2.5.tar.gz/imap/conversations.c Added

@@ -0,0 +1,1954 @@
+/* conversations.c -- Routines for dealing with the conversation database
+ *
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <errno.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "acl.h"
+#include "annotate.h"
+#include "append.h"
+#include "assert.h"
+#include "charset.h"
+#include "dlist.h"
+#include "exitcodes.h"
+#include "hash.h"
+#include "imap_err.h"
+#include "global.h"
+#include "imapd.h"
+#include "lsort.h"
+#include "mailbox.h"
+#include "map.h"
+#include "mboxname.h"
+#include "message.h"
+#include "parseaddr.h"
+#include "search_engines.h"
+#include "seen.h"
+#include "strhash.h"
+#include "stristr.h"
+#include "sync_log.h"
+#include "syslog.h"
+#include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "xstats.h"
+#include "times.h"
+
+#include "conversations.h"
+
+#define CONVERSATION_ID_STRMAX	 (1+sizeof(conversation_id_t)*2)
+
+/* per user conversations db extension */
+#define FNAME_CONVERSATIONS_SUFFIX "conversations"
+#define FNKEY "$FOLDER_NAMES"
+#define CFKEY "$COUNTED_FLAGS"
+
+#define DB config_conversations_db
+
+#define CONVERSATIONS_VERSION 0
+
+static char *convdir = NULL;
+static char *suffix = NULL;
+
+static int check_msgid(const char *msgid, size_t len, size_t *lenp);
+static int _conversations_parse(const char *data, size_t datalen,
+				arrayu64_t *cids, time_t *stampp);
+static int _conversations_set_key(struct conversations_state *state,
+				 const char *key, size_t keylen,
+				 const arrayu64_t *cids, time_t stamp);
+
+EXPORTED void conversations_set_directory(const char *dir)
+{
+ free(convdir);
+ convdir = xstrdupnull(dir);
+}
+
+EXPORTED void conversations_set_suffix(const char *suff)
+{
+ free(suffix);
+ suffix = xstrdupnull(suff);
+}
+
+static char *conversations_path(struct mboxname_parts *parts)
+{
+ const char *suff = (suffix ? suffix : FNAME_CONVERSATIONS_SUFFIX);
+ /* only users have conversations. Later we may introduce the idea of
+ * "conversationroot" in the same way we have quotaroot, but for now
+ * it's hard-coded as the user */
+ if (!parts->userid)
+	return NULL;
+ if (convdir)
+	return strconcat(convdir, "/", parts->userid, ".", suff, (char *)NULL);
+ return mboxname_conf_getpath(parts, suff);
+}
+
+EXPORTED char *conversations_getuserpath(const char *username)
+{
+ struct mboxname_parts parts;
+ char *fname;
+
+ if (mboxname_userid_to_parts(username, &parts))
+	return NULL;
+ fname = conversations_path(&parts);
+ mboxname_free_parts(&parts);
+
+ return fname;
+}
+
+EXPORTED char *conversations_getmboxpath(const char *mboxname)
+{
+ struct mboxname_parts parts;
+ char *fname;
+
+ if (mboxname_to_parts(mboxname, &parts))
+	return NULL;
+ fname = conversations_path(&parts);
+ mboxname_free_parts(&parts);
+
+ return fname;
+}
+
+static int _init_counted(struct conversations_state *state,
+			 const char *val, int vallen)
+{
+ int r;
+
+ if (!vallen) {
+	val = config_getstring(IMAPOPT_CONVERSATIONS_COUNTED_FLAGS);
+	if (!val) val = "";
+	vallen = strlen(val);
+	r = cyrusdb_store(state->db, CFKEY, strlen(CFKEY),
+			 val, vallen, &state->txn);
+	if (r) {
+	 syslog(LOG_ERR, "Failed to write counted_flags");
+	 return r;
+	}
+ }
+
+ /* remove any existing value */
+ if (state->counted_flags) {
+	strarray_free(state->counted_flags);
+	state->counted_flags = NULL;
+ }
+
+ /* add the value only if there's some flags set */
+ if (vallen) {
+	state->counted_flags = strarray_nsplit(val, vallen, " ", /*flags*/0);
+ }
+
+ return 0;
+}
+
+EXPORTED int conversations_open_path(const char *fname, struct conversations_state **statep)
+{
+ struct conversations_open *open = NULL;
+ const char *val = NULL;
+ size_t vallen = 0;
+ int r = 0;
+
+ if (!fname)
+	return IMAP_MAILBOX_BADNAME;
+
+ for (open = open_conversations; open; open = open->next) {
+	if (!strcmp(open->s.path, fname))
+	 return IMAP_CONVERSATIONS_ALREADY_OPEN;
+ }
+
+ open = xzmalloc(sizeof(struct conversations_open));
+
+ r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &open->s.db);
+ if (r || open->s.db == NULL) {
+	free(open);
+	return IMAP_IOERROR;
+ }
+
+ open->s.path = xstrdup(fname);
+ open->next = open_conversations;
+ open_conversations = open;
+
+ /* ensure a write lock immediately, and also load the counted flags */
+ cyrusdb_fetchlock(open->s.db, CFKEY, strlen(CFKEY),
+		 &val, &vallen, &open->s.txn);
+ _init_counted(&open->s, val, vallen);
+
+ /* we should just read the folder names up front too */
+ open->s.folder_names = strarray_new();
+
+ /* if there's a value, parse as a dlist */
+ if (!cyrusdb_fetch(open->s.db, FNKEY, strlen(FNKEY),
+		 &val, &vallen, &open->s.txn)) {
+	struct dlist *dl = NULL;
+	struct dlist *dp;
+	dlist_parsemap(&dl, 0, val, vallen);
+	for (dp = dl->head; dp; dp = dp->next) {
+	 strarray_append(open->s.folder_names, dlist_cstring(dp));
+	}
+	dlist_free(&dl);
+ }
+
+ /* create the status cache */
+ construct_hash_table(&open->s.folderstatus, open->s.folder_names->count/4+4, 0);
+
+ /* create the cid rename table */
+ construct_hashu64_table(&open->s.cidrenames, 1023, 0);
+
+ *statep = &open->s;
+
+ return 0;
+}
+
+EXPORTED int conversations_open_user(const char *username, struct conversations_state **statep)
+{
+ char *path = conversations_getuserpath(username);
+ int r;
+ if (!path) return IMAP_MAILBOX_BADNAME;
+ r = conversations_open_path(path, statep);
+ free(path);
+ return r;
+}
+
+EXPORTED int conversations_open_mbox(const char *mboxname, struct conversations_state **statep)
+{
+ char *path = conversations_getmboxpath(mboxname);
+ int r;
+ if (!path) return IMAP_MAILBOX_BADNAME;
+ r = conversations_open_path(path, statep);
+ free(path);
+ return r;
+}
+
+EXPORTED struct conversations_state *conversations_get_path(const char *fname)
+{
+ struct conversations_open *open = NULL;
+
+ for (open = open_conversations; open; open = open->next) {
+	if (!strcmp(open->s.path, fname))
+	 return &open->s;
+ }
+ 
+ return NULL;
+}
+
+EXPORTED struct conversations_state *conversations_get_user(const char *username)
+{
+ struct conversations_state *state;
+ char *path = conversations_getuserpath(username);
+ if (!path) return NULL;
+ state = conversations_get_path(path);
+ free(path);
+ return state;
+}
+
+EXPORTED struct conversations_state *conversations_get_mbox(const char *mboxname)
+{
+ struct conversations_state *state;
+ char *path = conversations_getmboxpath(mboxname);
+ if (!path) return NULL;
+ state = conversations_get_path(path);
+ free(path);
+ return state;
+}
+
+
+static void _conv_remove(struct conversations_state *state)
+{
+ struct conversations_open **prevp = &open_conversations;
+ struct conversations_open *cur;
+
+ for (cur = open_conversations; cur; cur = cur->next) {
+	if (state == &cur->s) {
+	 /* found it! */
+	 *prevp = cur->next;
+	 free(cur->s.path);
+	 if (cur->s.counted_flags)
+		strarray_free(cur->s.counted_flags);
+	 if (cur->s.folder_names)
+		strarray_free(cur->s.folder_names);
+	 free(cur);
+	 return;
+	}
+	prevp = &cur->next;
+ }
+
+ fatal("unknown conversation db closed", EC_SOFTWARE);
+}
+
+static void conversations_abortcache(struct conversations_state *state)
+{
+ /* still gotta clean up */
+ free_hash_table(&state->folderstatus, free);
+}
+
+static void conversations_abortcidrenames(struct conversations_state *state)
+{
+ /* still gotta clean up */
+ free_hashu64_table(&state->cidrenames, free);
+}
+
+static void commitstatus_cb(const char *key, void *data, void *rock)
+{
+ conv_status_t *status = (conv_status_t *)data;
+ struct conversations_state *state = (struct conversations_state *)rock;
+
+ conversation_storestatus(state, key, strlen(key), status);
+ sync_log_mailbox(key+1); /* skip the leading F */
+}
+
+static void conversations_commitcache(struct conversations_state *state)
+{
+ hash_enumerate(&state->folderstatus, commitstatus_cb, state);
+ free_hash_table(&state->folderstatus, free);
+}
+
+struct rename_rock {
+ struct conversations_state *state;
+ conversation_id_t from_cid;
+ conversation_id_t to_cid;
+ unsigned long entries_seen;
+ unsigned long entries_renamed;
+};
+
+static int do_one_rename(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct rename_rock *rrock = (struct rename_rock *)rock;
+ arrayu64_t cids = ARRAYU64_INITIALIZER;
+ time_t stamp;
+ int r;
+ int removed;
+
+ r = check_msgid(key, keylen, NULL);
+ if (r) return r;
+
+ r = _conversations_parse(data, datalen, &cids, &stamp);
+ if (r) goto done;
+
+ rrock->entries_seen++;
+
+ removed = arrayu64_remove_all(&cids, rrock->from_cid);
+ if (!removed) goto done;
+
+ arrayu64_add(&cids, rrock->to_cid);
+
+ rrock->entries_renamed++;
+
+ r = _conversations_set_key(rrock->state, key, keylen,
+			 &cids, stamp);
+
+done:
+ arrayu64_fini(&cids);
+ return r;
+}
+
+EXPORTED void conversations_rename_cidentry(struct conversations_state *state,
+					 conversation_id_t from,
+					 conversation_id_t to)
+{
+ struct rename_rock rrock;
+
+ if (from == to) return;
+
+ memset(&rrock, 0, sizeof(rrock));
+ rrock.state = state;
+ rrock.from_cid = from;
+ rrock.to_cid = to;
+
+ cyrusdb_foreach(state->db, "<", 1, NULL, do_one_rename, &rrock, &state->txn);
+
+ syslog(LOG_NOTICE, "conversations_rename_cid: saw %lu entries, renamed %lu"
+		 " from " CONV_FMT " to " CONV_FMT,
+			rrock.entries_seen, rrock.entries_renamed,
+			from, to);
+}
+
+static void commitrename_cb(uint64_t fromval, void *data, void *rock)
+{
+ conversation_id_t to = *((conversation_id_t *)data);
+ conversation_id_t from = (conversation_id_t)fromval;
+ struct conversations_state *state = (struct conversations_state *)rock;
+
+ conv_folder_t *folder = NULL;
+ conversation_t *conv = NULL;
+ int r = 0;
+
+ while ((data = hashu64_lookup(to, &state->cidrenames))) {
+	/* got renamed again! */
+	to = *((uint64_t *)data);
+ }
+
+ /* Use the B record to find the mailboxes for a CID rename.
+ * The rename events will decrease the NUM_RECORDS count back
+ * to zero, and the record will delete itself! */
+ r = conversation_load(state, from, &conv);
+ if (r) return;
+ if (!conv) return;
+
+ for (folder = conv->folders ; folder ; folder = folder->next) {
+	const char *mboxname = strarray_nth(state->folder_names, folder->number);
+	struct mailbox *mailbox = NULL;
+
+	r = mailbox_open_iwl(mboxname, &mailbox);
+	if (r) break;
+
+	r = mailbox_cid_rename(mailbox, from, to);
+	mailbox_close(&mailbox);
+
+	if (r) break;
+ }
+
+ conversation_free(conv);
+
+ /* XXX - COULD try to read the B key and confirm that it doesn't exist any more... */
+}
+
+static void conversations_commitcidrenames(struct conversations_state *state)
+{
+ hashu64_enumerate(&state->cidrenames, commitrename_cb, state);
+ free_hashu64_table(&state->cidrenames, free);
+}
+
+EXPORTED int conversations_abort(struct conversations_state **statep)
+{
+ struct conversations_state *state = *statep;
+
+ if (!state) return 0;
+
+ *statep = NULL;
+
+ /* clean up hashes */
+ conversations_abortcidrenames(state);
+ conversations_abortcache(state);
+
+ if (state->db) {
+	if (state->txn)
+	 cyrusdb_abort(state->db, state->txn);
+	cyrusdb_close(state->db);
+ }
+
+ _conv_remove(state);
+
+ return 0;
+}
+
+EXPORTED int conversations_commit(struct conversations_state **statep)
+{
+ struct conversations_state *state = *statep;
+ int r = 0;
+
+ if (!state) return 0;
+
+ *statep = NULL;
+
+ /* clean up the renames first, it will update the cache */
+ conversations_commitcidrenames(state);
+ /* cache second - also writes to to DB */
+ conversations_commitcache(state);
+
+ /* finally it's safe to commit the DB itself */
+ if (state->db) {
+	if (state->txn)
+	 r = cyrusdb_commit(state->db, state->txn);
+	cyrusdb_close(state->db);
+ }
+
+ _conv_remove(state);
+
+ return r;
+}
+
+static int check_msgid(const char *msgid, size_t len, size_t *lenp)
+{
+ if (msgid == NULL)
+	return IMAP_INVALID_IDENTIFIER;
+
+ if (!len)
+	len = strlen(msgid);
+
+ if (msgid0 != '<' || msgidlen-1 != '>' || strchr(msgid, '@') == NULL)
+	return IMAP_INVALID_IDENTIFIER;
+
+ if (lenp)
+	*lenp = len;
+
+ return 0;
+}
+
+static int _conversations_set_key(struct conversations_state *state,
+				 const char *key, size_t keylen,
+				 const arrayu64_t *cids, time_t stamp)
+{
+ int r;
+ struct buf buf;
+ int version = CONVERSATIONS_VERSION;
+ int i;
+
+ /* XXX: should this be a delete operation? */
+ assert(cids->count);
+
+ buf_init(&buf);
+
+ if (state->db == NULL)
+	return IMAP_IOERROR;
+
+ buf_printf(&buf, "%d ", version);
+ for (i = 0; i < cids->count; i++) {
+	conversation_id_t cid = arrayu64_nth(cids, i);
+	if (i) buf_putc(&buf, ',');
+	buf_printf(&buf, CONV_FMT, cid);
+ }
+ buf_printf(&buf, " %lu", stamp);
+
+ r = cyrusdb_store(state->db,
+		 key, keylen,
+		 buf.s, buf.len,
+		 &state->txn);
+
+ buf_free(&buf);
+ if (r)
+	return IMAP_IOERROR;
+
+ return 0;
+}
+
+static int _sanity_check_counts(conversation_t *conv)
+{
+ conv_folder_t *folder;
+ uint32_t num_records = 0;
+ uint32_t exists = 0;
+
+ for (folder = conv->folders; folder; folder = folder->next) {
+	num_records += folder->num_records;
+	exists += folder->exists;
+ }
+
+ if (num_records != conv->num_records)
+	return IMAP_INTERNAL;
+
+ if (exists != conv->exists)
+	return IMAP_INTERNAL;
+
+ return 0;
+}
+
+
+EXPORTED int conversations_add_msgid(struct conversations_state *state,
+				 const char *msgid,
+				 conversation_id_t cid)
+{
+ arrayu64_t cids = ARRAYU64_INITIALIZER;
+ size_t keylen;
+ int r = 0;
+
+ r = check_msgid(msgid, 0, &keylen);
+ if (r) goto done;
+
+ r = conversations_get_msgid(state, msgid, &cids);
+
+ /* read failure will mean cids is empty, but we can still add this one */
+ if (r || arrayu64_find(&cids, cid, 0) < 0) {
+	arrayu64_append(&cids, cid);
+	r = _conversations_set_key(state, msgid, keylen, &cids, time(NULL));
+ }
+
+done:
+ arrayu64_fini(&cids);
+ return r;
+}
+
+static int _conversations_parse(const char *data, size_t datalen,
+				arrayu64_t *cids, time_t *stampp)
+{ 
+ const char *rest;
+ size_t restlen;
+ int r;
+ conversation_id_t cid;
+ bit64 tval;
+ bit64 version;
+
+ /* make sure we don't leak old data */
+ arrayu64_truncate(cids, 0);
+
+ r = parsenum(data, &rest, datalen, &version);
+ if (r) return IMAP_MAILBOX_BADFORMAT;
+
+ if (rest0 != ' ')
+	return IMAP_MAILBOX_BADFORMAT;
+ rest++; /* skip space */
+ restlen = datalen - (rest - data);
+
+ if (version != CONVERSATIONS_VERSION) {
+	/* XXX - an error code for "incorrect version"? */
+	return IMAP_MAILBOX_BADFORMAT;
+ }
+
+ if (restlen < 17)
+	return IMAP_MAILBOX_BADFORMAT;
+
+ while (1) {
+	r = parsehex(rest, &rest, 16, &cid);
+	if (r) return IMAP_MAILBOX_BADFORMAT;
+	arrayu64_append(cids, cid);
+	if (rest0 == ' ') break;
+	if (rest0 != ',') return IMAP_MAILBOX_BADFORMAT;
+	rest++; /* skip comma */
+ }
+
+ if (rest0 != ' ')
+	return IMAP_MAILBOX_BADFORMAT;
+ rest++; /* skip space */
+ restlen = datalen - (rest - data);
+
+ r = parsenum(rest, &rest, restlen, &tval);
+ if (r) return IMAP_MAILBOX_BADFORMAT;
+
+ /* should have parsed to the end of the string */
+ if (rest - data != (int)datalen)
+	return IMAP_MAILBOX_BADFORMAT;
+
+ if (stampp) *stampp = tval;
+
+ return 0;
+}
+
+EXPORTED int conversations_get_msgid(struct conversations_state *state,
+				 const char *msgid,
+				 arrayu64_t *cids)
+{
+ size_t keylen;
+ size_t datalen = 0;
+ const char *data;
+ int r;
+
+ r = check_msgid(msgid, 0, &keylen);
+ if (r)
+	return r;
+
+ r = cyrusdb_fetch(state->db,
+		 msgid, keylen,
+		 &data, &datalen,
+		 &state->txn);
+
+ if (!r) r = _conversations_parse(data, datalen, cids, NULL);
+
+ if (r) arrayu64_truncate(cids, 0);
+
+ return 0;
+}
+
+/*
+ * Normalise a subject string, to a form which can be used for deciding
+ * whether a message belongs in the same conversation as it's antecedent
+ * messages. What we're doing here is the same idea as the "base
+ * subject" algorithm described in RFC5256 but slightly adapted from
+ * experience. Differences are:
+ *
+ * - We eliminate all whitespace; RFC5256 normalises any sequence
+ * of whitespace characters to a single SP. We do this because
+ * we have observed combinations of buggy client software both
+ * add and remove whitespace around folding points.
+ *
+ * - Because we eliminate whitespace entirely, and whitespace helps
+ * delimit some of our other replacements, we do that whitespace
+ * step last instead of first.
+ *
+ * - We eliminate leading tokens like Re: and Fwd: using a simpler
+ * and more generic rule than RFC5256's; this rule catches a number
+ * of semantically identical prefixes in other human languages, but
+ * unfortunately also catches lots of other things. We think we can
+ * get away with this because the normalised subject is never directly
+ * seen by human eyes, so some information loss is acceptable as long
+ * as the subjects in different messages match correctly.
+ */
+EXPORTED void conversation_normalise_subject(struct buf *s)
+{
+ static int initialised_res = 0;
+ static regex_t whitespace_re;
+ static regex_t relike_token_re;
+ static regex_t blob_re;
+ int r;
+
+ if (!initialised_res) {
+	r = regcomp(&whitespace_re, " \t\r\n+", REG_EXTENDED);
+	assert(r == 0);
+	r = regcomp(&relike_token_re, "^ \t*A-Za-z0-9+:", REG_EXTENDED);
+	assert(r == 0);
+	r = regcomp(&blob_re, "^ \t*\\^+\\", REG_EXTENDED);
+	assert(r == 0);
+	initialised_res = 1;
+ }
+
+ /* step 1 is to decode any RFC2047 MIME encoding of the header
+ * field, but we assume that has already happened */
+
+ /* step 2 is to eliminate all "Re:"-like tokens and blobs
+ * at the start */
+ while (buf_replace_one_re(s, &relike_token_re, NULL) ||
+	 buf_replace_one_re(s, &blob_re, NULL))
+	;
+
+ /* step 3 is eliminating whitespace. */
+ buf_replace_all_re(s, &whitespace_re, NULL);
+}
+
+static int write_folders(struct conversations_state *state)
+{
+ struct dlist *dl = dlist_newlist(NULL, NULL);
+ struct buf buf = BUF_INITIALIZER;
+ int r;
+ int i;
+
+ for (i = 0; i < state->folder_names->count; i++) {
+	const char *fname = strarray_nth(state->folder_names, i);
+	dlist_setatom(dl, NULL, fname);
+ }
+
+ dlist_printbuf(dl, 0, &buf);
+ dlist_free(&dl);
+
+ r = cyrusdb_store(state->db, FNKEY, strlen(FNKEY),
+		 buf.s, buf.len, &state->txn);
+
+ buf_free(&buf);
+
+ return r;
+}
+
+static int folder_number(struct conversations_state *state,
+			 const char *name,
+			 int create_flag)
+{
+ int pos = strarray_find(state->folder_names, name, 0);
+ int r;
+
+ /* if we have to add it, then save the keys back */
+ if (pos < 0 && create_flag) {
+	/* replace the first unused if there is one */
+	pos = strarray_find(state->folder_names, "-", 0);
+	if (pos >= 0)
+	 strarray_set(state->folder_names, pos, name);
+	/* otherwise append */
+	else
+	 pos = strarray_append(state->folder_names, name);
+
+	/* store must succeed */
+	r = write_folders(state);
+	if (r) abort();
+ }
+
+ return pos;
+}
+
+static int folder_number_rename(struct conversations_state *state,
+				const char *from_name,
+				const char *to_name)
+{
+ int pos = strarray_find(state->folder_names, from_name, 0);
+
+ if (pos < 0) return 0; /* nothing to do! */
+
+ /* replace the name - set to '-' if deleted */
+ strarray_set(state->folder_names, pos, to_name ? to_name : "-");
+
+ return write_folders(state);
+}
+
+EXPORTED int conversation_storestatus(struct conversations_state *state,
+			 const char *key, size_t keylen,
+			 const conv_status_t *status)
+{
+ struct dlist *dl = NULL;
+ struct buf buf = BUF_INITIALIZER;
+ int version = CONVERSATIONS_VERSION;
+ int r;
+
+ dl = dlist_newlist(NULL, NULL);
+ dlist_setnum64(dl, "MODSEQ", status->modseq);
+ dlist_setnum32(dl, "EXISTS", status->exists);
+ dlist_setnum32(dl, "UNSEEN", status->unseen);
+
+ buf_printf(&buf, "%d ", version);
+ dlist_printbuf(dl, 0, &buf);
+ dlist_free(&dl);
+
+ r = cyrusdb_store(state->db,
+		 key, keylen,
+		 buf.s, buf.len,
+		 &state->txn);
+
+ buf_free(&buf);
+
+ return r;
+}
+
+EXPORTED int conversation_setstatus(struct conversations_state *state,
+				 const char *mboxname,
+				 const conv_status_t *status)
+{
+ char *key = strconcat("F", mboxname, (char *)NULL);
+ conv_status_t *cachestatus = NULL;
+
+ cachestatus = hash_lookup(key, &state->folderstatus);
+ if (!cachestatus) {
+	cachestatus = xzmalloc(sizeof(conv_status_t));
+	hash_insert(key, cachestatus, &state->folderstatus);
+ }
+
+ /* either way it's in the hash, update the value */
+ *cachestatus = *status;
+
+ free(key);
+
+ return 0;
+}
+
+EXPORTED int conversation_store(struct conversations_state *state,
+		 const char *key, int keylen,
+		 conversation_t *conv)
+{
+ struct dlist *dl, *n, *nn;
+ struct buf buf = BUF_INITIALIZER;
+ const conv_folder_t *folder;
+ const conv_sender_t *sender;
+ int version = CONVERSATIONS_VERSION;
+ int i;
+ int r;
+
+ dl = dlist_newlist(NULL, NULL);
+ dlist_setnum64(dl, "MODSEQ", conv->modseq);
+ dlist_setnum32(dl, "NUMRECORDS", conv->num_records);
+ dlist_setnum32(dl, "EXISTS", conv->exists);
+ dlist_setnum32(dl, "UNSEEN", conv->unseen);
+ n = dlist_newlist(dl, "COUNTS");
+ if (state->counted_flags) {
+	for (i = 0; i < state->counted_flags->count; i++) {
+	 const char *flag = strarray_nth(state->counted_flags, i);
+	 dlist_setnum32(n, flag, conv->countsi);
+	}
+ }
+
+ n = dlist_newlist(dl, "FOLDER");
+ for (folder = conv->folders ; folder ; folder = folder->next) {
+	if (!folder->num_records)
+	 continue;
+	nn = dlist_newlist(n, "FOLDER");
+	dlist_setnum32(nn, "FOLDERNUM", folder->number);
+	dlist_setnum64(nn, "MODSEQ", folder->modseq);
+	dlist_setnum32(nn, "NUMRECORDS", folder->num_records);
+	dlist_setnum32(nn, "EXISTS", folder->exists);
+	dlist_setnum32(nn, "UNSEEN", folder->unseen);
+ }
+
+ n = dlist_newlist(dl, "SENDER");
+ i = 0;
+ for (sender = conv->senders ; sender ; sender = sender->next) {
+	if (!sender->exists)
+	 continue;
+	/* don't ever store more than 100 senders */
+	if (++i >= 100) break;
+	nn = dlist_newlist(n, "SENDER");
+	/* envelope form */
+	dlist_setatom(nn, "NAME", sender->name);
+	dlist_setatom(nn, "ROUTE", sender->route);
+	dlist_setatom(nn, "MAILBOX", sender->mailbox);
+	dlist_setatom(nn, "DOMAIN", sender->domain);
+	dlist_setnum32(nn, "LASTSEEN", sender->lastseen);
+	dlist_setnum32(nn, "EXISTS", sender->exists);
+ }
+
+ dlist_setatom(dl, "SUBJECT", conv->subject);
+
+ dlist_setnum32(dl, "SIZE", conv->size);
+
+ buf_printf(&buf, "%d ", version);
+ dlist_printbuf(dl, 0, &buf);
+ dlist_free(&dl);
+
+ if (_sanity_check_counts(conv)) {
+	syslog(LOG_ERR, "IOERROR: conversations_audit on store: %s %.*s %.*s",
+	 state->path, keylen, key, (int)buf.len, buf.s);
+ }
+
+ r = cyrusdb_store(state->db, key, keylen, buf.s, buf.len, &state->txn);
+
+ buf_free(&buf);
+
+ return r;
+}
+
+static int _conversation_save(struct conversations_state *state,
+			 const char *key, int keylen,
+			 conversation_t *conv)
+{
+ const conv_folder_t *folder;
+ int r;
+
+ /* see if any 'F' keys need to be changed */
+ for (folder = conv->folders ; folder ; folder = folder->next) {
+	const char *mboxname = strarray_nth(state->folder_names, folder->number);
+	int exists_diff = 0;
+	int unseen_diff = 0;
+	conv_status_t status = CONV_STATUS_INIT;
+
+	/* case: full removal of conversation - make sure to remove
+	 * unseen as well */
+	if (folder->exists) {
+	 if (folder->prev_exists) {
+		/* both exist, just check for unseen changes */
+		unseen_diff = !!conv->unseen - !!conv->prev_unseen;
+	 }
+	 else {
+		/* adding, check if it's unseen */
+		exists_diff = 1;
+		if (conv->unseen) unseen_diff = 1;
+	 }
+	}
+	else if (folder->prev_exists) {
+	 /* removing, check if it WAS unseen */
+	 exists_diff = -1;
+	 if (conv->prev_unseen) unseen_diff = -1;
+	}
+	else {
+	 /* we don't care about unseen if the cid is not registered
+	 * in this folder, and wasn't previously either */
+	}
+
+	/* XXX - it's super inefficient to be doing this for
+	 * every cid in every folder in the transaction. Big
+	 * wins available by caching these in memory and writing
+	 * once at the end of the transaction */
+	r = conversation_getstatus(state, mboxname, &status);
+	if (r) goto done;
+	if (exists_diff || unseen_diff || status.modseq < conv->modseq) {
+	 if (status.modseq < conv->modseq)
+		status.modseq = conv->modseq;
+	 status.exists += exists_diff;
+	 status.unseen += unseen_diff;
+	 r = conversation_setstatus(state, mboxname, &status);
+	 if (r) goto done;
+	}
+ }
+
+ if (conv->num_records) {
+	r = conversation_store(state, key, keylen, conv);
+ }
+ else {
+	/* last existing record removed - clean up the 'B' record */
+	r = cyrusdb_delete(state->db, key, keylen, &state->txn, 1);
+ }
+
+
+done:
+ if (!r)
+	conv->dirty = 0;
+
+ return r;
+}
+
+EXPORTED int conversation_save(struct conversations_state *state,
+		 conversation_id_t cid,
+		 conversation_t *conv)
+{
+ char bkeyCONVERSATION_ID_STRMAX+2;
+
+ if (!conv)
+	return IMAP_INTERNAL;
+ if (!conv->dirty)
+	return 0;
+
+ /* old pre-conversations message, nothing to do */
+ if (!cid)
+	return 0;
+ xstats_inc(CONV_SAVE);
+
+ snprintf(bkey, sizeof(bkey), "B" CONV_FMT, cid);
+
+ return _conversation_save(state, bkey, strlen(bkey), conv);
+}
+
+EXPORTED int conversation_parsestatus(const char *data, size_t datalen,
+				 conv_status_t *status)
+{
+ bit64 version;
+ const char *rest;
+ size_t restlen;
+ struct dlist *dl = NULL;
+ struct dlist *n;
+ int r;
+
+ status->modseq = 0;
+ status->exists = 0;
+ status->unseen = 0;
+
+ r = parsenum(data, &rest, datalen, &version);
+ if (r) return IMAP_MAILBOX_BADFORMAT;
+
+ if (rest0 != ' ')
+	return IMAP_MAILBOX_BADFORMAT;
+ rest++; /* skip space */
+ restlen = datalen - (rest - data);
+
+ if (version != CONVERSATIONS_VERSION) {
+	/* XXX - an error code for "incorrect version"? */
+	return IMAP_MAILBOX_BADFORMAT;
+ }
+
+ r = dlist_parsemap(&dl, 0, rest, restlen);
+ if (r) return r;
+
+ n = dl->head;
+ if (n) {
+	status->modseq = dlist_num(n);
+	n = n->next;
+ }
+ if (n) {
+	status->exists = dlist_num(n);
+	n = n->next;
+ }
+ if (n) {
+	status->unseen = dlist_num(n);
+ }
+
+ dlist_free(&dl);
+ return 0;
+}
+
+EXPORTED int conversation_getstatus(struct conversations_state *state,
+				 const char *mboxname,
+				 conv_status_t *status)
+{
+ char *key = strconcat("F", mboxname, (char *)NULL);
+ const char *data;
+ size_t datalen;
+ int r = 0;
+ conv_status_t *cachestatus = NULL;
+
+ cachestatus = hash_lookup(key, &state->folderstatus);
+ if (cachestatus) {
+	*status = *cachestatus;
+	goto done;
+ }
+
+ if (!state->db) {
+	r = IMAP_IOERROR;
+	goto done;
+ }
+
+ r = cyrusdb_fetch(state->db,
+		 key, strlen(key),
+		 &data, &datalen,
+		 &state->txn);
+
+ if (r == CYRUSDB_NOTFOUND) {
+	/* not existing is not an error */
+	r = 0;
+	goto done;
+ }
+ if (r) goto done;
+
+ r = conversation_parsestatus(data, datalen, status);
+
+ done:
+ if (r)
+	syslog(LOG_ERR, "IOERROR: conversations invalid status %s", mboxname);
+
+ free(key);
+
+ return r;
+}
+
+EXPORTED conv_folder_t *conversation_get_folder(conversation_t *conv,
+				 int number, int create_flag)
+{
+ conv_folder_t *folder, **nextp = &conv->folders;
+
+ if (number < 0)
+	return NULL;
+
+ /* first check if it already exists */
+ for (folder = conv->folders ; folder ; folder = folder->next) {
+	if (folder->number < number)
+	 nextp = &folder->next;
+	else if (folder->number == number)
+	 return folder;
+	else
+	 break;
+ }
+
+ if (!create_flag)
+	return NULL;
+
+ /* not found, create a new one */
+ folder = xzmalloc(sizeof(*folder));
+ folder->number = number;
+ folder->next = *nextp;
+ *nextp = folder;
+ conv->dirty = 1;
+
+ return folder;
+}
+
+EXPORTED int conversation_parse(struct conversations_state *state,
+		 const char *data, size_t datalen,
+		 conversation_t **convp)
+{
+ const char *rest;
+ int i;
+ int restlen;
+ bit64 version;
+ struct dlist *dl = NULL;
+ struct dlist *n, *nn;
+ conversation_t *conv;
+ conv_folder_t *folder;
+ int r;
+
+ *convp = NULL;
+
+ r = parsenum(data, &rest, datalen, &version);
+ if (r) return IMAP_MAILBOX_BADFORMAT;
+
+ if (rest0 != ' ') return IMAP_MAILBOX_BADFORMAT;
+ rest++; /* skip space */
+ restlen = datalen - (rest - data);
+
+ if (version != CONVERSATIONS_VERSION) return IMAP_MAILBOX_BADFORMAT;
+
+ r = dlist_parsemap(&dl, 0, rest, restlen);
+ if (r) return r;
+
+ conv = conversation_new(state);
+
+ n = dlist_getchildn(dl, 0);
+ if (n)
+	conv->modseq = dlist_num(n);
+ n = dlist_getchildn(dl, 1);
+ if (n)
+	conv->num_records = dlist_num(n);
+ n = dlist_getchildn(dl, 2);
+ if (n)
+	conv->exists = dlist_num(n);
+ n = dlist_getchildn(dl, 3);
+ if (n)
+	conv->unseen = dlist_num(n);
+ n = dlist_getchildn(dl, 4);
+ if (state->counted_flags) {
+	nn = n ? n->head : NULL;
+	for (i = 0; i < state->counted_flags->count; i++) {
+	 if (nn) {
+		conv->countsi = dlist_num(nn);
+		nn = nn->next;
+	 }
+	 else
+		conv->countsi = 0;
+	}
+ }
+
+ n = dlist_getchildn(dl, 5);
+ for (n = (n ? n->head : NULL) ; n ; n = n->next) {
+	int number;
+	nn = dlist_getchildn(n, 0);
+	if (!nn)
+	 continue;
+	number = dlist_num(nn);
+	folder = conversation_get_folder(conv, number, 1);
+
+	nn = dlist_getchildn(n, 1);
+	if (nn)
+	 folder->modseq = dlist_num(nn);
+	nn = dlist_getchildn(n, 2);
+	if (nn)
+	 folder->num_records = dlist_num(nn);
+	nn = dlist_getchildn(n, 3);
+	if (nn)
+	 folder->exists = dlist_num(nn);
+	nn = dlist_getchildn(n, 4);
+	if (nn)
+	 folder->unseen = dlist_num(nn);
+
+	folder->prev_exists = folder->exists;
+ }
+
+ n = dlist_getchildn(dl, 6);
+ for (n = (n ? n->head : NULL) ; n ; n = n->next) {
+	struct dlist *nn2, *nn3, *nn4, *nn5, *nn6;
+	nn = dlist_getchildn(n, 0);
+	nn2 = dlist_getchildn(n, 1);
+	nn3 = dlist_getchildn(n, 2);
+	nn4 = dlist_getchildn(n, 3);
+	nn5 = dlist_getchildn(n, 4);
+	nn6 = dlist_getchildn(n, 5);
+	if (nn6)
+	 conversation_update_sender(conv, nn->sval, nn2->sval,
+				 nn3->sval, nn4->sval,
+				 dlist_num(nn5), dlist_num(nn6));
+	else if (nn4) /* XXX: remove when cleaned up - handle old-style too */
+	 conversation_update_sender(conv, nn->sval, nn2->sval,
+				 nn3->sval, nn4->sval,
+				 0/*time_t*/, (1<<30)/*exists*/);
+	/* INSANE EXISTS NUMBER MEANS IT NEVER GETS CLEANED UP */
+ }
+
+ n = dlist_getchildn(dl, 7);
+ if (n) conv->subject = xstrdupnull(dlist_cstring(n));
+
+ n = dlist_getchildn(dl, 8);
+ if (n) conv->size = dlist_num(n);
+
+ conv->prev_unseen = conv->unseen;
+
+ dlist_free(&dl);
+ conv->dirty = 0;
+ *convp = conv;
+ return 0;
+}
+
+EXPORTED int conversation_load(struct conversations_state *state,
+		 conversation_id_t cid,
+		 conversation_t **convp)
+{
+ const char *data;
+ size_t datalen;
+ char bkeyCONVERSATION_ID_STRMAX+2;
+ int r;
+
+ snprintf(bkey, sizeof(bkey), "B" CONV_FMT, cid);
+ r = cyrusdb_fetch(state->db,
+		 bkey, strlen(bkey),
+		 &data, &datalen,
+		 &state->txn);
+
+ if (r == CYRUSDB_NOTFOUND) {
+	*convp = NULL;
+	return 0;
+ } else if (r != CYRUSDB_OK) {
+	return r;
+ }
+ xstats_inc(CONV_LOAD);
+
+ r = conversation_parse(state, data, datalen, convp);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: conversations invalid conversation "
+	 CONV_FMT, cid);
+	*convp = NULL;
+ }
+
+ if (_sanity_check_counts(*convp)) {
+	syslog(LOG_ERR, "IOERROR: conversations_audit on load: %s %s %.*s",
+	 state->path, bkey, (int)datalen, data);
+ }
+
+ return 0;
+}
+
+/* Parse just enough of the B record to retrieve the modseq.
+ * Fortunately the modseq is the first field after the record version
+ * number, given the way that _conversation_save() and dlist works. See
+ * _conversation_load() for the full shebang. */
+static int _conversation_load_modseq(const char *data, int datalen,
+				 modseq_t *modseqp)
+{
+ const char *p = data;
+ const char *end = data + datalen;
+ bit64 version = ~0ULL;
+ int r;
+
+ r = parsenum(p, &p, (end-p), &version);
+ if (r || version != CONVERSATIONS_VERSION)
+	return IMAP_MAILBOX_BADFORMAT;
+
+ if ((end - p) < 4 || p0 != ' ' || p1 != '(')
+	return IMAP_MAILBOX_BADFORMAT;
+ p += 2; /* skip space and left parenthesis */
+
+ r = parsenum(p, &p, (end-p), modseqp);
+ if ((end - p) < 1 || *p != ' ')
+	return IMAP_MAILBOX_BADFORMAT;
+
+ return 0;
+}
+
+EXPORTED int conversation_get_modseq(struct conversations_state *state,
+			 conversation_id_t cid,
+			 modseq_t *modseqp)
+{
+ const char *data;
+ size_t datalen;
+ char bkeyCONVERSATION_ID_STRMAX+2;
+ int r;
+
+ snprintf(bkey, sizeof(bkey), "B" CONV_FMT, cid);
+ r = cyrusdb_fetch(state->db,
+		 bkey, strlen(bkey),
+		 &data, &datalen,
+		 &state->txn);
+
+ if (r == CYRUSDB_NOTFOUND) {
+	*modseqp = 0;
+	return 0;
+ } else if (r != CYRUSDB_OK) {
+	return r;
+ }
+ xstats_inc(CONV_GET_MODSEQ);
+
+ r = _conversation_load_modseq(data, datalen, modseqp);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: conversation_get_modseq: invalid conversation "
+	 CONV_FMT, cid);
+	*modseqp = 0;
+ }
+
+ return 0;
+}
+
+EXPORTED conv_folder_t *conversation_find_folder(struct conversations_state *state,
+					conversation_t *conv,
+					const char *mboxname)
+{
+ int number = folder_number(state, mboxname, /*create*/0);
+ return conversation_get_folder(conv, number, /*create*/0);
+}
+
+/* Compare a sender vs a new sender key (mailbox and domain).
+ * Returns 0 if identical, nonzero if different (sign indicates
+ * sort order, like strcmp()).
+ *
+ * This is not quite RFC compliant: we are comparing the
+ * localpart case insensitively even though the RFC says the
+ * interpretation is up to the domain itself. However this
+ * seems to yield better results. IRIS-1484 */
+static int sender_cmp(const conv_sender_t *sender,
+		 const char *mailbox,
+		 const char *domain)
+{
+ int d = strcasecmp(sender->domain, domain);
+ if (!d)
+	d = strcasecmp(sender->mailbox, mailbox);
+ return d;
+}
+
+/* Choose a preferred mailbox. Returns <0 if @a is preferred,
+ * 0 if we don't care, and >0 if @b is preferred */
+static int sender_preferred_mailbox(const char *a, const char *b)
+{
+ /* choosing the lexically earlier string tends to keep
+ * capital letters, which is an arbitrary asthetic */
+ return strcmpsafe(a, b);
+}
+
+/* Choose a preferred domain. Returns <0 if @a is preferred,
+ * 0 if we don't care, and >0 if @b is preferred */
+static int sender_preferred_domain(const char *a, const char *b)
+{
+ /* choosing the lexically earlier string tends to keep
+ * capital letters, which is an arbitrary asthetic */
+ return strcmpsafe(a, b);
+}
+
+/* Choose a preferred route. Returns <0 if @a is preferred,
+ * 0 if we don't care, and >0 if @b is preferred */
+static int sender_preferred_route(const char *a, const char *b)
+{
+ /* choosing the lexically earlier string tends to keep
+ * capital letters, which is an arbitrary asthetic */
+ return strcmpsafe(a, b);
+}
+
+static int has_non_ascii(const char *s)
+{
+ for ( ; *s ; s++) {
+	if (*(unsigned char *)s > 0x7f)
+	 return 1;
+ }
+ return 0;
+}
+
+/* Choose a preferred name. Returns <0 if @a is preferred,
+ * 0 if we don't care, and >0 if @b is preferred */
+static int sender_preferred_name(const char *a, const char *b)
+{
+ int d;
+ char *sa = NULL;
+ char *sb = NULL;
+
+ sa = charset_parse_mimeheader((a ? a : ""));
+ sb = charset_parse_mimeheader((b ? b : ""));
+
+ /* A name with characters > 0x7f is preferred to a flat
+ * ascii one, on the assumption that this is more likely to
+ * contain an actual name rather than a romanisation. */
+ d = has_non_ascii(sb) - has_non_ascii(sa);
+
+ /* A longer name is preferred over a shorter. */
+ if (!d)
+	d = strlen(sb) - strlen(sa);
+
+ /* The lexically earlier name is preferred (earlier on the grounds
+ * that's more likely to start with a capital letter) */
+ if (!d)
+	d = strcmp(sa, sb);
+
+ if (!d)
+	d = strcmpsafe(a, b);
+
+ free(sa);
+ free(sb);
+ return d;
+}
+
+EXPORTED void conversation_update_sender(conversation_t *conv,
+					 const char *name,
+					 const char *route,
+					 const char *mailbox,
+					 const char *domain,
+					 time_t lastseen,
+					 int delta_exists)
+{
+ conv_sender_t *sender, *ptr, **nextp = &conv->senders;
+
+ if (!mailbox || !domain) return;
+
+ /* always re-stitch the found record, it's just simpler */
+ for (sender = conv->senders; sender; sender = sender->next) {
+	if (!sender_cmp(sender, mailbox, domain))
+	 break;
+	nextp = &sender->next;
+ }
+
+ if (sender) {
+	/* unstitch */
+	*nextp = sender->next;
+ }
+ else {
+	/* we start with zero */
+	sender = xzmalloc(sizeof(*sender));
+ }
+
+ /* counts first, may be just removing it */
+ if (delta_exists <= 0 && (uint32_t)(- delta_exists) >= sender->exists) {
+	conv->dirty = 1;
+	free(sender->name);
+	free(sender->route);
+	free(sender->mailbox);
+	free(sender->domain);
+	free(sender);
+	return;
+ }
+
+ /* otherwise update the counter */
+ sender->exists += delta_exists;
+
+ /* ensure the database is consistent regardless
+ * of message arrival order, update the record if the newly
+ * seen values are more preferred */
+ if (!sender->name || sender_preferred_name(sender->name, name) > 0) {
+	free(sender->name);
+	sender->name = xstrdupnull(name);
+ }
+
+ if (!sender->route || sender_preferred_route(sender->route, route) > 0) {
+	free(sender->route);
+	sender->route = xstrdupnull(route);
+ }
+
+ if (!sender->mailbox || sender_preferred_mailbox(sender->mailbox, mailbox) > 0) {
+	free(sender->mailbox);
+	sender->mailbox = xstrdup(mailbox);
+ }
+
+ if (!sender->domain || sender_preferred_domain(sender->domain, domain) > 0) {
+	free(sender->domain);
+	sender->domain = xstrdup(domain);
+ }
+
+ /* last seen for display sorting */
+ if (sender->lastseen < lastseen) {
+	sender->lastseen = lastseen;
+ }
+
+ /* now re-stitch it into place */
+ nextp = &conv->senders;
+ for (ptr = conv->senders; ptr; ptr = ptr->next) {
+	if (ptr->lastseen < sender->lastseen)
+	 break;
+	if (sender->lastseen == ptr->lastseen && 
+	 sender_cmp(ptr, mailbox, domain) > 0)
+	 break;
+	nextp = &ptr->next;
+ }
+
+ sender->next = *nextp;
+ *nextp = sender;
+
+ conv->dirty = 1;
+}
+
+static void _apply_delta(uint32_t *valp, int delta)
+{
+ if (delta >= 0) {
+	*valp += delta;
+ }
+ else {
+	uint32_t decrease = -delta;
+	/* let us die where it broke */
+	if (decrease <= *valp)
+	 *valp -= decrease;
+	else
+	 *valp = 0;
+ }
+}
+
+EXPORTED void conversation_update(struct conversations_state *state,
+			 conversation_t *conv, const char *mboxname,
+			 int delta_num_records,
+			 int delta_exists, int delta_unseen,
+			 int delta_size, int *delta_counts,
+			 modseq_t modseq)
+{
+ conv_folder_t *folder;
+ int number = folder_number(state, mboxname, /*create*/1);
+ int i;
+
+ folder = conversation_get_folder(conv, number, /*create*/1);
+
+ if (delta_num_records) {
+	_apply_delta(&conv->num_records, delta_num_records);
+	_apply_delta(&folder->num_records, delta_num_records);
+	conv->dirty = 1;
+ }
+ if (delta_exists) {
+	_apply_delta(&conv->exists, delta_exists);
+	_apply_delta(&folder->exists, delta_exists);
+	conv->dirty = 1;
+ }
+ if (delta_unseen) {
+	_apply_delta(&conv->unseen, delta_unseen);
+	_apply_delta(&folder->unseen, delta_unseen);
+	conv->dirty = 1;
+ }
+ if (delta_size) {
+	_apply_delta(&conv->size, delta_size);
+	conv->dirty = 1;
+ }
+ if (state->counted_flags) {
+	for (i = 0; i < state->counted_flags->count; i++) {
+	 if (delta_countsi) {
+		_apply_delta(&conv->countsi, delta_countsi);
+		conv->dirty = 1;
+	 }
+	}
+ }
+ if (modseq > conv->modseq) {
+	conv->modseq = modseq;
+	conv->dirty = 1;
+ }
+ if (modseq > folder->modseq) {
+	folder->modseq = modseq;
+	conv->dirty = 1;
+ }
+}
+
+EXPORTED conversation_t *conversation_new(struct conversations_state *state)
+{
+ conversation_t *conv;
+
+ conv = xzmalloc(sizeof(conversation_t));
+ if (state->counted_flags)
+	conv->counts = xzmalloc(sizeof(uint32_t) * state->counted_flags->count);
+ conv->dirty = 1;
+ xstats_inc(CONV_NEW);
+
+ return conv;
+}
+
+EXPORTED void conversation_free(conversation_t *conv)
+{
+ conv_folder_t *folder;
+ conv_sender_t *sender;
+
+ if (!conv) return;
+
+ while ((folder = conv->folders)) {
+	conv->folders = folder->next;
+	free(folder);
+ }
+
+ while ((sender = conv->senders)) {
+	conv->senders = sender->next;
+	free(sender->name);
+	free(sender->route);
+	free(sender->mailbox);
+	free(sender->domain);
+	free(sender);
+ }
+
+ free(conv->subject);
+ free(conv->counts);
+ free(conv);
+}
+
+
+struct prune_rock {
+ struct conversations_state *state;
+ time_t thresh;
+ unsigned int nseen;
+ unsigned int ndeleted;
+};
+
+static int prunecb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct prune_rock *prock = (struct prune_rock *)rock;
+ arrayu64_t cids = ARRAYU64_INITIALIZER;
+ time_t stamp;
+ int r;
+
+ prock->nseen++;
+ r = check_msgid(key, keylen, NULL);
+ if (r) goto done;
+
+ r = _conversations_parse(data, datalen, &cids, &stamp);
+ if (r) goto done;
+
+ /* keep records newer than the threshold */
+ if (stamp >= prock->thresh)
+	goto done;
+
+ prock->ndeleted++;
+
+ r = cyrusdb_delete(prock->state->db,
+		 key, keylen,
+		 &prock->state->txn,
+		 /*force*/1);
+
+done:
+ arrayu64_fini(&cids);
+ return r;
+}
+
+EXPORTED int conversations_prune(struct conversations_state *state,
+				 time_t thresh, unsigned int *nseenp,
+				 unsigned int *ndeletedp)
+{
+ struct prune_rock rock = { state, thresh, 0, 0 };
+
+ cyrusdb_foreach(state->db, "<", 1, NULL, prunecb, &rock, &state->txn);
+
+ if (nseenp)
+	*nseenp = rock.nseen;
+ if (ndeletedp)
+	*ndeletedp = rock.ndeleted;
+
+ return 0;
+}
+
+/* NOTE: this makes an "ATOM" return */
+EXPORTED const char *conversation_id_encode(conversation_id_t cid)
+{
+ static char text2*sizeof(cid)+1;
+
+ if (cid != NULLCONVERSATION) {
+	snprintf(text, sizeof(text), CONV_FMT, cid);
+ } else {
+	strncpy(text, "NIL", sizeof(text));
+ }
+
+ return text;
+}
+
+EXPORTED int conversation_id_decode(conversation_id_t *cid, const char *text)
+{
+ if (!strcmp(text, "NIL")) {
+	*cid = NULLCONVERSATION;
+ } else {
+	if (strlen(text) != 16) return 0;
+	*cid = strtoull(text, 0, 16);
+ }
+ return 1;
+}
+
+EXPORTED void conversations_rename_cid(struct conversations_state *state,
+			 conversation_id_t from_cid,
+			 conversation_id_t to_cid)
+{
+ uint64_t *valptr;
+
+ if (!from_cid)
+	return;
+
+ if (from_cid == to_cid)
+	return;
+
+ /* we never rename down! */
+ assert(from_cid < to_cid);
+
+ valptr = hashu64_lookup(from_cid, &state->cidrenames);
+ if (valptr) {
+	/* already there or better? */
+	if (*valptr >= to_cid)
+	 return;
+	free(valptr);
+ }
+
+ valptr = xmalloc(sizeof(uint64_t));
+ *valptr = to_cid;
+
+ hashu64_insert(from_cid, valptr, &state->cidrenames);
+}
+
+static int folder_key_rename(struct conversations_state *state,
+			 const char *from_name,
+			 const char *to_name)
+{
+ const char *val;
+ size_t vallen;
+ char *oldkey = strconcat("F", from_name, (void *)NULL);
+ int r = 0;
+
+ r = cyrusdb_fetch(state->db, oldkey, strlen(oldkey),
+		 &val, &vallen, &state->txn);
+ if (r) {
+	if (r == CYRUSDB_NOTFOUND) r = 0; /* nothing to delete */
+	goto done;
+ }
+
+ /* create before deleting so val is still valid */
+ if (to_name) {
+	char *newkey = strconcat("F", to_name, (void *)NULL);
+	r = cyrusdb_store(state->db, newkey, strlen(newkey),
+			 val, vallen, &state->txn);
+	free(newkey);
+	if (r) goto done;
+ }
+
+ r = cyrusdb_delete(state->db, oldkey, strlen(oldkey), &state->txn, 1);
+
+ done:
+ free(oldkey);
+
+ return r;
+}
+
+EXPORTED int conversations_rename_folder(struct conversations_state *state,
+			 const char *from_name,
+			 const char *to_name)
+{
+ int r;
+
+ assert(from_name);
+
+ r = folder_number_rename(state, from_name, to_name);
+ if (r) return r;
+
+ r = folder_key_rename(state, from_name, to_name);
+ if (r) return r;
+
+ if (to_name) {
+	syslog(LOG_NOTICE, "conversations_rename_folder: renamed %s to %s",
+	 from_name, to_name);
+ }
+ else {
+	syslog(LOG_NOTICE, "conversations_rename_folder: deleted %s",
+	 from_name);
+ }
+
+ return 0;
+}
+
+
+static int zero_b_cb(void *rock,
+		 const char *key,
+		 size_t keylen,
+		 const char *val,
+		 size_t vallen)
+{
+ struct conversations_state *state = (struct conversations_state *)rock;
+ conversation_t *conv = NULL;
+ conv_folder_t *folder;
+ conv_sender_t *sender;
+ int r;
+ int i;
+
+ r = conversation_parse(state, val, vallen, &conv);
+ if (r) {
+	r = cyrusdb_delete(state->db, key, keylen, &state->txn, /*force*/1);
+	return r;
+ }
+
+ /* leave modseq untouched */
+ conv->num_records = 0;
+ conv->exists = 0;
+ conv->unseen = 0;
+
+ /* zero out all the counted counts */
+ if (state->counted_flags) {
+	for (i = 0; i < state->counted_flags->count; i++)
+	 conv->countsi = 0;
+ }
+
+ for (folder = conv->folders; folder; folder = folder->next) {
+	/* keep the modseq */
+	folder->num_records = 0;
+	folder->exists = 0;
+	folder->unseen = 0;
+ }
+
+ /* just zero out senders */
+ while ((sender = conv->senders)) {
+	conv->senders = sender->next;
+	free(sender->name);
+	free(sender->route);
+	free(sender->mailbox);
+	free(sender->domain);
+	free(sender);
+ }
+
+ /* keep the subject of course */
+
+ conv->size = 0;
+
+ r = conversation_store(state, key, keylen, conv);
+ conversation_free(conv);
+
+ return r;
+}
+
+static int zero_f_cb(void *rock,
+		 const char *key,
+		 size_t keylen,
+		 const char *val,
+		 size_t vallen)
+{
+ struct conversations_state *state = (struct conversations_state *)rock;
+ conv_status_t status;
+ int r;
+
+ r = conversation_parsestatus(val, vallen, &status);
+ if (r) {
+	r = cyrusdb_delete(state->db, key, keylen, &state->txn, /*force*/1);
+	return r;
+ }
+
+ /* leave modseq unchanged */
+ status.exists = 0;
+ status.unseen = 0;
+
+ return conversation_storestatus(state, key, keylen, &status);
+}
+
+EXPORTED int conversations_zero_counts(struct conversations_state *state)
+{
+ int r = 0;
+
+ /* wipe B counts */
+ r = cyrusdb_foreach(state->db, "B", 1, NULL, zero_b_cb,
+			state, &state->txn);
+ if (r) return r;
+
+ /* wipe F counts */
+ r = cyrusdb_foreach(state->db, "F", 1, NULL, zero_f_cb,
+			state, &state->txn);
+ if (r) return r;
+
+ /* re-init the counted flags */
+ r = _init_counted(state, NULL, 0);
+ if (r) return r;
+
+ return r;
+}
+
+static int cleanup_b_cb(void *rock,
+			const char *key,
+			size_t keylen,
+			const char *val,
+			size_t vallen)
+{
+ struct conversations_state *state = (struct conversations_state *)rock;
+ conversation_t *conv = NULL;
+ int r;
+
+ r = conversation_parse(state, val, vallen, &conv);
+ if (r) return r;
+
+ /* should be gone, wipe it */
+ if (!conv->num_records)
+	r = cyrusdb_delete(state->db, key, keylen, &state->txn, 1);
+
+ conversation_free(conv);
+
+ return r;
+}
+
+EXPORTED int conversations_cleanup_zero(struct conversations_state *state)
+{
+ /* check B counts */
+ return cyrusdb_foreach(state->db, "B", 1, NULL, cleanup_b_cb,
+			 state, &state->txn);
+}
+
+EXPORTED void conversations_dump(struct conversations_state *state, FILE *fp)
+{
+ cyrusdb_dumpfile(state->db, "", 0, fp, &state->txn);
+}
+
+EXPORTED int conversations_truncate(struct conversations_state *state)
+{
+ return cyrusdb_truncate(state->db, &state->txn);
+}
+
+EXPORTED int conversations_undump(struct conversations_state *state, FILE *fp)
+{
+ return cyrusdb_undumpfile(state->db, fp, &state->txn);
+}
+
+
+
+#undef DB

cyrus-imapd-2.5.tar.gz/imap/conversations.h Added

@@ -0,0 +1,242 @@
+/* conversations.h -- Routines for dealing with the conversations database
+ *
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_CONVERSATIONS_H_
+#define __CYRUS_CONVERSATIONS_H_ 1
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include "arrayu64.h"
+#include "hash.h"
+#include "hashu64.h"
+#include "strarray.h"
+#include "util.h"
+
+typedef bit64	conversation_id_t;
+#define CONV_FMT "%016llx"
+#define NULLCONVERSATION	(0ULL)
+
+struct conversations_state {
+ struct db *db;
+ struct txn *txn;
+ strarray_t *counted_flags;
+ strarray_t *folder_names;
+ hash_table folderstatus;
+ struct hashu64_table cidrenames;
+ char *path;
+};
+
+struct conversations_open {
+ struct conversations_state s;
+ struct conversations_open *next;
+};
+
+struct conversations_open *open_conversations;
+
+typedef struct conversation conversation_t;
+typedef struct conv_folder conv_folder_t;
+typedef struct conv_sender conv_sender_t;
+typedef struct conv_status conv_status_t;
+
+#define MAX_CONVERSATION_FLAGS 256
+
+struct conv_folder {
+ conv_folder_t *next;
+ int		 number;
+ modseq_t	 modseq;
+ uint32_t	 num_records;
+ uint32_t	 exists;
+ uint32_t	 unseen;
+ uint32_t	 prev_exists;
+};
+
+struct conv_sender {
+ conv_sender_t *next;
+ char	 *name;
+ char	 *route;
+ char	 *mailbox;
+ char	 *domain;
+ time_t	 lastseen;
+ uint32_t	 exists;
+};
+
+struct conv_status {
+ modseq_t modseq;
+ uint32_t exists;
+ uint32_t unseen;
+};
+#define CONV_STATUS_INIT {0, 0, 0}
+
+struct conversation {
+ modseq_t	 modseq;
+ uint32_t	 num_records;
+ uint32_t	 exists;
+ uint32_t	 unseen;
+ uint32_t	 prev_unseen;
+ uint32_t	 size;
+ uint32_t	 *counts;
+ conv_folder_t *folders;
+ conv_sender_t *senders;
+ char	 *subject;
+ int		 dirty;
+};
+
+/* Sets the suffix used for conversations db filenames. Only needed
+ * when doing special weird stuff like the conversations audit mode */
+extern void conversations_set_directory(const char *dir);
+extern void conversations_set_suffix(const char *suff);
+extern char *conversations_getmboxpath(const char *mboxname);
+extern char *conversations_getuserpath(const char *username);
+
+extern int conversations_open_path(const char *path,
+				 struct conversations_state **statep);
+extern int conversations_open_user(const char *username,
+				 struct conversations_state **statep);
+extern int conversations_open_mbox(const char *mboxname,
+				 struct conversations_state **statep);
+extern struct conversations_state *conversations_get_path(const char *path);
+extern struct conversations_state *conversations_get_user(const char *username);
+extern struct conversations_state *conversations_get_mbox(const char *mboxname);
+
+/* either of these close */
+extern int conversations_abort(struct conversations_state **state);
+extern int conversations_commit(struct conversations_state **state);
+
+/* functions for CONVDB_MSGID database only */
+extern int conversations_add_msgid(struct conversations_state *state,
+				 const char *msgid,
+				 conversation_id_t cid);
+extern int conversations_get_msgid(struct conversations_state *state,
+				 const char *msgid,
+				 arrayu64_t *cids);
+extern conv_folder_t *conversation_get_folder(conversation_t *conv,
+					 int number, int create_flag);
+
+extern void conversation_normalise_subject(struct buf *);
+
+/* F record items */
+extern int conversation_getstatus(struct conversations_state *state,
+				 const char *mboxname,
+				 conv_status_t *status);
+extern int conversation_setstatus(struct conversations_state *state,
+				 const char *mboxname,
+				 const conv_status_t *status);
+extern int conversation_storestatus(struct conversations_state *state,
+				 const char *key, size_t keylen,
+				 const conv_status_t *status);
+extern int conversation_parsestatus(const char *data, size_t datalen,
+				 conv_status_t *status);
+
+/* B record items */
+extern int conversation_get_modseq(struct conversations_state *state,
+				 conversation_id_t cid,
+				 modseq_t *modseqp);
+extern int conversation_save(struct conversations_state *state,
+			 conversation_id_t cid,
+			 conversation_t *conv);
+extern int conversation_load(struct conversations_state *state,
+			 conversation_id_t cid,
+			 conversation_t **convp);
+extern int conversation_parse(struct conversations_state *state,
+			 const char *data, size_t datalen,
+			 conversation_t **convp);
+extern int conversation_store(struct conversations_state *state,
+			 const char *key, int keylen,
+			 conversation_t *conv);
+/* Update the internal data about a conversation, enforcing
+ * consistency rules (e.g. the conversation's modseq is the
+ * maximum of all the per-folder modseqs). Sets conv->dirty
+ * if any data actually changed. */
+extern void conversation_update(struct conversations_state *state,
+			 conversation_t *conv,
+			 const char *mboxname,
+			 int delta_num_records,
+			 int delta_exists,
+			 int delta_unseen,
+			 int delta_size,
+			 int *delta_counts,
+			 modseq_t modseq);
+extern conv_folder_t *conversation_find_folder(struct conversations_state *state,
+					 conversation_t *,
+					 const char *mboxname);
+extern conversation_t *conversation_new(struct conversations_state *state);
+extern void conversation_free(conversation_t *);
+
+extern void conversation_update_sender(conversation_t *conv,
+				 const char *name,
+				 const char *route,
+				 const char *mailbox,
+				 const char *domain,
+				 time_t lastseen,
+				 int delta_exists);
+
+extern int conversations_prune(struct conversations_state *state,
+			 time_t thresh, unsigned int *,
+			 unsigned int *);
+extern void conversations_dump(struct conversations_state *, FILE *);
+extern int conversations_undump(struct conversations_state *, FILE *);
+
+extern int conversations_truncate(struct conversations_state *);
+
+extern const char *conversation_id_encode(conversation_id_t cid);
+extern int conversation_id_decode(conversation_id_t *cid, const char *text);
+
+extern void conversations_rename_cid(struct conversations_state *state,
+				 conversation_id_t from_cid,
+				 conversation_id_t to_cid);
+extern void conversations_rename_cidentry(struct conversations_state *state,
+					 conversation_id_t from,
+					 conversation_id_t to);
+
+
+extern int conversations_zero_counts(struct conversations_state *state);
+extern int conversations_cleanup_zero(struct conversations_state *state);
+
+extern int conversations_rename_folder(struct conversations_state *state,
+			 const char *from_name,
+			 const char *to_name);
+
+#endif /* __CYRUS_CONVERSATIONS_H_ */

cyrus-imapd-2.4.17.tar.gz/imap/convert_code.c -> cyrus-imapd-2.5.tar.gz/imap/convert_code.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/convert_code.h -> cyrus-imapd-2.5.tar.gz/imap/convert_code.h Changed

cyrus-imapd-2.5.tar.gz/imap/ctl_conversationsdb.c Added

@@ -0,0 +1,1021 @@
+/*
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/* cyrus includes */
+#include "assert.h"
+#include "bsearch.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "imap_err.h"
+#include "index.h"
+#include "conversations.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "message.h"
+#include "sync_log.h"
+#include "sysexits.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#if !HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+/* config.c stuff */
+const int config_need_data = CONFIG_NEED_PARTITION_DATA;
+static struct namespace conv_namespace;
+
+enum { UNKNOWN, DUMP, UNDUMP, ZERO, BUILD, RECALC, AUDIT, CHECKFOLDERS };
+
+int verbose = 0;
+
+char *prev_userid;
+int mode = UNKNOWN;
+static const char *audit_temp_directory;
+
+static int do_dump(const char *fname)
+{
+ struct conversations_state *state = NULL;
+ struct stat sb;
+ int r;
+
+ /* What we really want here is read-only database access without
+ * the create-if-nonexistant semantics. However, the cyrusdb
+ * interface makes it difficult to do that properly. In the
+ * meantime, we can just check if the file exists here. */
+ r = stat(fname, &sb);
+ if (r < 0) {
+	perror(fname);
+	return -1;
+ }
+
+ r = conversations_open_path(fname, &state);
+ if (r) {
+	fprintf(stderr, "Failed to open conversations database %s: %s\n",
+		fname, error_message(r));
+	return -1;
+ }
+
+ conversations_dump(state, stdout);
+
+ conversations_commit(&state);
+ return 0;
+}
+
+static int do_undump(const char *fname)
+{
+ struct conversations_state *state;
+ int r;
+
+ r = conversations_open_path(fname, &state);
+ if (r) {
+	fprintf(stderr, "Failed to open conversations database %s: %s\n",
+		fname, error_message(r));
+	return -1;
+ }
+
+ r = conversations_truncate(state);
+ if (r) {
+	fprintf(stderr, "Failed to truncate conversations database %s: %s\n",
+		fname, error_message(r));
+	goto out;
+ }
+
+ r = conversations_undump(state, stdin);
+ if (r) {
+	fprintf(stderr, "Failed to undump to conversations database %s: %s\n",
+		fname, error_message(r));
+	goto out;
+ }
+
+ r = conversations_commit(&state);
+ if (r)
+	fprintf(stderr, "Failed to commit conversations database %s: %s\n",
+		fname, error_message(r));
+
+out:
+ conversations_abort(&state);
+ return r;
+}
+
+static int zero_cid_cb(const char *mboxname,
+		 int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
+{
+ struct mailbox *mailbox = NULL;
+ struct index_record record;
+ int r;
+ uint32_t recno;
+
+ r = mailbox_open_iwl(mboxname, &mailbox);
+ if (r) return r;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) goto done;
+
+	/* already zero, fine */
+	if (record.cid == NULLCONVERSATION)
+	 continue;
+ 
+	record.cid = NULLCONVERSATION;
+	r = mailbox_rewrite_index_record(mailbox, &record);
+	if (r) goto done;
+ }
+
+ done:
+ mailbox_close(&mailbox);
+ return r;
+}
+
+static int do_zero(const char *inboxname)
+{
+ char bufMAX_MAILBOX_NAME;
+ int r;
+ struct conversations_state *state = NULL;
+
+ r = conversations_open_mbox(inboxname, &state);
+
+ r = zero_cid_cb(inboxname, 0, 0, NULL);
+ if (r) return r;
+
+ snprintf(buf, sizeof(buf), "%s.*", inboxname);
+ r = mboxlist_findall(NULL, buf, 1, NULL,
+			 NULL, zero_cid_cb, NULL);
+
+ conversations_commit(&state);
+
+ return r;
+}
+
+static int build_cid_cb(const char *mboxname,
+		 int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
+{
+ struct mailbox *mailbox = NULL;
+ struct index_record record;
+ uint32_t recno;
+ int r;
+ struct conversations_state *cstate = conversations_get_mbox(mboxname);
+
+ if (!cstate) return IMAP_CONVERSATIONS_NOT_OPEN;
+
+ r = mailbox_open_iwl(mboxname, &mailbox);
+ if (r) return r;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) goto done;
+
+	/* already assigned, fine */
+	if (record.cid != NULLCONVERSATION)
+	 continue;
+
+	/* no file, can't calculate */
+	if (record.system_flags & FLAG_UNLINKED)
+	 continue;
+
+	r = mailbox_cacherecord(mailbox, &record);
+	if (r) goto done;
+
+	r = message_update_conversations(cstate, &record, NULL);
+	if (r) goto done;
+
+	r = mailbox_rewrite_index_record(mailbox, &record);
+	if (r) goto done;
+ }
+
+ done:
+ mailbox_close(&mailbox);
+ return r;
+}
+
+static int do_build(const char *inboxname)
+{
+ char bufMAX_MAILBOX_NAME;
+ int r;
+ struct conversations_state *state = NULL;
+
+ r = conversations_open_mbox(inboxname, &state);
+
+ r = build_cid_cb(inboxname, 0, 0, NULL);
+ if (r) return r;
+
+ snprintf(buf, sizeof(buf), "%s.*", inboxname);
+ r = mboxlist_findall(NULL, buf, 1, NULL,
+			 NULL, build_cid_cb, NULL);
+
+ conversations_commit(&state);
+ return r;
+}
+
+static int recalc_counts_cb(const char *mboxname,
+			 int matchlen __attribute__((unused)),
+			 int maycreate __attribute__((unused)),
+			 void *rock __attribute__((unused)))
+{
+ struct mailbox *mailbox = NULL;
+ int r;
+
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r) return r;
+
+ if (verbose)
+	printf("%s\n", mboxname);
+
+ r = mailbox_add_conversations(mailbox);
+
+ mailbox_close(&mailbox);
+ return r;
+}
+
+static int audit_counts_cb(const char *mboxname,
+			 int matchlen __attribute__((unused)),
+			 int maycreate __attribute__((unused)),
+			 void *rock __attribute__((unused)))
+{
+ struct mailbox *mailbox = NULL;
+ int r;
+
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r) return r;
+
+ if (verbose)
+	printf("%s\n", mboxname);
+
+ r = mailbox_add_conversations(mailbox);
+
+ mailbox_close(&mailbox);
+ return r;
+}
+
+static int do_recalc(const char *inboxname)
+{
+ char bufMAX_MAILBOX_NAME;
+ int r;
+ struct conversations_state *state = NULL;
+
+ r = conversations_open_mbox(inboxname, &state);
+ if (r) return r;
+
+ r = conversations_zero_counts(state);
+ if (r) goto err;
+
+ r = recalc_counts_cb(inboxname, 0, 0, NULL);
+ if (r) goto err;
+
+ snprintf(buf, sizeof(buf), "%s.*", inboxname);
+ r = mboxlist_findall(NULL, buf, 1, NULL,
+			 NULL, recalc_counts_cb, NULL);
+ if (r) goto err;
+
+ r = conversations_cleanup_zero(state);
+ if (r) goto err;
+
+ conversations_commit(&state);
+ return 0;
+
+err:
+ conversations_abort(&state);
+ return r;
+}
+
+struct cursor
+{
+ struct db *db;
+ struct txn **txnp;
+ const char *key; size_t keylen;
+ const char *data; size_t datalen;
+ int err;
+};
+
+static void cursor_init(struct cursor *c,
+			struct db *db, struct txn **txnp)
+{
+ memset(c, 0, sizeof(*c));
+ c->db = db;
+ c->txnp = txnp;
+}
+
+static int cursor_next(struct cursor *c)
+{
+ if (!c->err)
+	c->err = cyrusdb_fetchnext(c->db,
+				 c->key, c->keylen,
+				 &c->key, &c->keylen,
+				 &c->data, &c->datalen,
+				 c->txnp);
+ return c->err;
+}
+
+static int blob_compare(const char *a, size_t alen,
+			const char *b, size_t blen)
+{
+ int d = memcmp(a, b, MIN(alen, blen));
+ if (!d)
+	d = alen - blen;
+ return d;
+}
+
+static int next_diffable_record(struct cursor *c)
+{
+ for (;;)
+ {
+	int r = cursor_next(c);
+	if (r) return r;
+
+	/* skip < records, they won't be in the
+	 * temp database and we don't care so much */
+	if (c->key0 == '<')
+	 continue;
+
+	/* Subject, not re-calculated */
+	if (c->key0 == 'S')
+	 continue;
+
+	return 0;
+ }
+}
+
+static unsigned int diff_records(struct conversations_state *a,
+				 struct conversations_state *b)
+{
+ unsigned int ndiffs = 0;
+ int ra, rb;
+ struct cursor ca, cb;
+ int keydelta;
+ int delta;
+
+ cursor_init(&ca, a->db, &a->txn);
+ ra = cursor_next(&ca);
+
+ cursor_init(&cb, b->db, &b->txn);
+ rb = cursor_next(&cb);
+
+ while (!ra || !rb) {
+	keydelta = blob_compare(ca.key, ca.keylen, cb.key, cb.keylen);
+	if (rb || keydelta < 0) {
+	 if (ra) break;
+	 ndiffs++;
+	 if (verbose)
+		printf("REALONLY: \"%.*s\" data \"%.*s\"\n",
+		 (int)ca.keylen, ca.key, (int)ca.datalen, ca.data);
+	 ra = next_diffable_record(&ca);
+	 continue;
+	}
+	if (ra || keydelta > 0) {
+	 if (rb) break;
+	 ndiffs++;
+	 if (verbose)
+		printf("TEMPONLY: \"%.*s\" data \"%.*s\"\n",
+		 (int)cb.keylen, cb.key, (int)cb.datalen, cb.data);
+	 rb = next_diffable_record(&cb);
+	 continue;
+	}
+
+	/* both exist an are the same key */
+	delta = blob_compare(ca.data, ca.datalen, cb.data, cb.datalen);
+	if (delta) {
+	 ndiffs++;
+	 if (verbose)
+		printf("REAL: \"%.*s\" data \"%.*s\"\n"
+		 "TEMP: \"%.*s\" data \"%.*s\"\n",
+		 (int)ca.keylen, ca.key, (int)ca.datalen, ca.data,
+		 (int)cb.keylen, cb.key, (int)cb.datalen, cb.data);
+	}
+
+	ra = next_diffable_record(&ca);
+	rb = next_diffable_record(&cb);
+ }
+
+ return ndiffs;
+}
+
+static int fix_modseqs(struct conversations_state *a,
+		 struct conversations_state *b)
+{
+ int ra, rb;
+ struct cursor ca, cb;
+ int keydelta;
+ int r;
+
+ cursor_init(&ca, a->db, &a->txn);
+ ra = cursor_next(&ca);
+
+ cursor_init(&cb, b->db, &b->txn);
+ rb = cursor_next(&cb);
+
+ while (!ra || !rb) {
+	keydelta = blob_compare(ca.key, ca.keylen, cb.key, cb.keylen);
+	if (rb || keydelta < 0) {
+	 if (ra) break;
+	 if (ca.key0 == 'F') {
+		conv_status_t status = CONV_STATUS_INIT;
+		/* need to add record if it's zero */
+		r = conversation_parsestatus(ca.data, ca.datalen, &status);
+		if (r) return r;
+		if (status.exists == 0) {
+		 r = conversation_storestatus(b, ca.key, ca.keylen, &status);
+		 if (r) {
+			fprintf(stderr, "Failed to store conversations "
+					"record \"%.*s\" to %s: %s, giving up\n",
+					(int)ca.keylen, ca.key,
+					b->path, error_message(r));
+			return r;
+		 }
+		}
+		/* otherwise it's a bug, so leave it in for reporting */
+	 }
+	 ra = cursor_next(&ca);
+	 continue;
+	}
+	if (ra || keydelta > 0) {
+	 if (rb) break;
+	 rb = cursor_next(&cb);
+	 continue;
+	}
+
+	/* folders? Just modseq check */
+	if (ca.key0 == 'F') {
+	 /* check if modseq is higher for real */
+	 conv_status_t statusa = CONV_STATUS_INIT;
+	 conv_status_t statusb = CONV_STATUS_INIT;
+	 /* need to add record if it's zero */
+	 r = conversation_parsestatus(ca.data, ca.datalen, &statusa);
+	 if (r) {
+		fprintf(stderr, "Failed to parse conversations "
+				"record \"%.*s\" in %s: %s\n",
+				(int)ca.keylen, ca.key,
+				a->path, error_message(r));
+		/* There's no need to report failure to the caller - the
+		 * record diffing passing that occurs after this will
+		 * also pick up the same problem */
+		goto next;
+	 }
+	 r = conversation_parsestatus(cb.data, cb.datalen, &statusb);
+	 if (r) {
+		fprintf(stderr, "Failed to parse conversations "
+				"record \"%.*s\" in %s: %s\n",
+				(int)cb.keylen, cb.key,
+				b->path, error_message(r));
+		goto next;
+	 }
+	 if (statusa.modseq > statusb.modseq) {
+		statusb.modseq = statusa.modseq;
+		r = conversation_storestatus(b, cb.key, cb.keylen, &statusb);
+		if (r) {
+		 fprintf(stderr, "Failed to store conversations "
+				 "record \"%.*s\" to %s: %s, giving up\n",
+				 (int)cb.keylen, cb.key,
+				 b->path, error_message(r));
+		 /* If we cannot write to the temp DB, something is
+		 * drastically wrong and we need to report a failure */
+		 return r;
+		}
+	 }
+	}
+	if (ca.key0 == 'B') {
+	 /* B keys - check all the modseqs, both top level and per folder */
+	 conversation_t *conva = NULL;
+	 conversation_t *convb = NULL;
+	 conv_folder_t *foldera;
+	 conv_folder_t *folderb;
+	 conv_sender_t *sendera;
+
+	 r = conversation_parse(a, ca.data, ca.datalen, &conva);
+	 if (r) {
+		fprintf(stderr, "Failed to parse conversations "
+				"record \"%.*s\" in %s: %s\n",
+				(int)ca.keylen, ca.key,
+				a->path, error_message(r));
+		goto next;
+	 }
+	 r = conversation_parse(b, cb.data, cb.datalen, &convb);
+	 if (r) {
+		fprintf(stderr, "Failed to parse conversations "
+				"record \"%.*s\" in %s: %s\n",
+				(int)cb.keylen, cb.key,
+				b->path, error_message(r));
+		conversation_free(conva);
+		goto next;
+	 }
+
+	 /* because expunged messages could have had higher modseqs,
+	 * we need to re-copy any higher modseqs in */
+	 if (conva->modseq > convb->modseq)
+		convb->modseq = conva->modseq;
+
+	 for (foldera = conva->folders; foldera; foldera = foldera->next) {
+		folderb = conversation_get_folder(convb, foldera->number, 1);
+		if (folderb->modseq < foldera->modseq)
+		 folderb->modseq = foldera->modseq;
+	 }
+
+	 /* senders are timestamped, and the timestamp might be for a
+	 * deleted message! */
+	 for (sendera = conva->senders; sendera; sendera = sendera->next) {
+		/* always update! The delta logic will ensure we don't add
+		 * the record if it's not already at least present in the
+		 * other conversation */
+		conversation_update_sender(convb, sendera->name, sendera->route,
+					 sendera->mailbox, sendera->domain,
+					 sendera->lastseen, /*delta_count*/0);
+	 }
+
+	 /* be nice to know if this is needed, but at least twoskip
+	 * will dedup for us */
+	 r = conversation_store(b, cb.key, cb.keylen, convb);
+
+	 /* free first before checking for errors */
+	 conversation_free(conva);
+	 conversation_free(convb);
+
+	 if (r) {
+		fprintf(stderr, "Failed to store conversations "
+				"record \"%.*s\" to %s: %s, giving up\n",
+				(int)cb.keylen, cb.key,
+				b->path, error_message(r));
+		return r;
+	 }
+	}
+
+next:
+	ra = cursor_next(&ca);
+	rb = cursor_next(&cb);
+ }
+
+ return 0;
+}
+
+int do_checkfolders(const char *inboxname)
+{
+ int r;
+ struct conversations_state *state = NULL;
+ strarray_t *copy1, *copy2;
+
+ /* open the DB */
+ r = conversations_open_mbox(inboxname, &state);
+ if (r) {
+	fprintf(stderr, "Cannot open conversations db %s: %s\n",
+		inboxname, error_message(r));
+	goto out;
+ }
+
+ /* don't mess with the original */
+ copy1 = strarray_dup(state->folder_names);
+ /* remove empty folders first, they will duplicate for sure */
+ strarray_remove_all(copy1, "-");
+ copy2 = strarray_dup(copy1);
+ strarray_sort(copy2, cmpstringp_raw);
+ strarray_uniq(copy2);
+ if (copy1->count != copy2->count) {
+	printf("DUPLICATE %s\n", inboxname);
+ }
+ else {
+	printf("OK %s\n", inboxname);
+ }
+ strarray_free(copy1);
+ strarray_free(copy2);
+
+out:
+ conversations_abort(&state);
+ return r;
+}
+
+static int do_audit(const char *inboxname)
+{
+ char bufMAX_MAILBOX_NAME;
+ int r;
+ char temp_suffix64;
+ char *filename_temp = NULL;
+ char *filename_real = NULL;
+ struct conversations_state *state_temp = NULL;
+ struct conversations_state *state_real = NULL;
+ unsigned int ndiffs = 0;
+
+ if (verbose)
+	printf("Inbox %s\n", inboxname);
+
+ if (verbose)
+	printf("Pass 1: recalculate counts into temporary db\n");
+
+ /* Generate a unique suffix for the temp db */
+ snprintf(temp_suffix, sizeof(temp_suffix),
+	 "conversations.audit.%d", (int)getpid());
+
+ /* Get the filenames */
+ filename_real = conversations_getmboxpath(inboxname);
+ conversations_set_suffix(temp_suffix);
+ conversations_set_directory(audit_temp_directory);
+ filename_temp = conversations_getmboxpath(inboxname);
+ conversations_set_suffix(NULL);
+ conversations_set_directory(NULL);
+ assert(strcmp(filename_temp, filename_real));
+
+ /* Initialise the temp copy of the database */
+ unlink(filename_temp);
+ r = cyrusdb_copyfile(filename_real, filename_temp);
+ if (r) {
+	fprintf(stderr, "Cannot make temp copy of conversations db %s: %s\n",
+		filename_real, error_message(r));
+	goto out;
+ }
+
+ /* Begin recalculating in the temp db */
+ r = conversations_open_path(filename_temp, &state_temp);
+ if (r) {
+	fprintf(stderr, "Cannot open conversations db %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ r = conversations_zero_counts(state_temp);
+ if (r) {
+	fprintf(stderr, "Failed to zero counts in %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ /*
+ * Set the conversations db suffix during the recalc pass, so that
+ * calls to conversations_open_mbox() from the mailbox code get
+ * redirected to the temporary db.
+ */
+ conversations_set_suffix(temp_suffix);
+ conversations_set_directory(audit_temp_directory);
+
+ r = audit_counts_cb(inboxname, 0, 0, NULL);
+ if (r) {
+	fprintf(stderr, "Failed to recalculate counts in %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ snprintf(buf, sizeof(buf), "%s.*", inboxname);
+ r = mboxlist_findall(NULL, buf, 1, NULL,
+			 NULL, audit_counts_cb, NULL);
+ if (r) {
+	fprintf(stderr, "Failed to recalculate counts in %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ r = conversations_cleanup_zero(state_temp);
+ if (r) {
+	fprintf(stderr, "Failed to cleanup zero counts in %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ conversations_set_suffix(NULL);
+ conversations_set_directory(NULL);
+
+ r = conversations_commit(&state_temp);
+ if (r) {
+	fprintf(stderr, "Cannot commit conversations db %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ if (verbose)
+	printf("Pass 2: find differences from recalculated to live dbs\n");
+
+ r = conversations_open_path(filename_temp, &state_temp);
+ if (r) {
+	fprintf(stderr, "Cannot open conversations db %s: %s\n",
+		filename_temp, error_message(r));
+	goto out;
+ }
+
+ r = conversations_open_path(filename_real, &state_real);
+ if (r) {
+	fprintf(stderr, "Cannot open conversations db %s: %s\n",
+		filename_real, error_message(r));
+	goto out;
+ }
+
+ r = fix_modseqs(state_real, state_temp);
+ if (r) {
+	/* Error reported in fix_modseqs() */
+	goto out;
+ }
+
+ ndiffs += diff_records(state_real, state_temp);
+ if (ndiffs)
+	printf("%s is BROKEN (%u differences)\n", inboxname, ndiffs);
+ else if (verbose)
+	printf("%s is OK\n", inboxname);
+
+out:
+ if (state_temp)
+	conversations_abort(&state_temp);
+ if (state_real)
+	conversations_abort(&state_real);
+ conversations_set_suffix(NULL);
+ conversations_set_directory(NULL);
+ if (filename_temp)
+	unlink(filename_temp);
+ free(filename_temp);
+ free(filename_real);
+ return r;
+}
+
+static int usage(const char *name)
+ __attribute__((noreturn));
+
+static int do_user(const char *userid)
+{
+ char *inboxname;
+ char *fname;
+ int r;
+
+ fname = conversations_getuserpath(userid);
+ if (fname == NULL) {
+	fprintf(stderr, "Unable to get conversations database "
+			"filename for userid \"%s\"\n",
+			userid);
+	return EC_USAGE;
+ }
+
+ inboxname = mboxname_user_mbox(userid, NULL);
+ if (inboxname == NULL) {
+	free(fname);
+	fprintf(stderr, "Invalid userid %s", userid);
+	return EC_USAGE;
+ }
+
+ switch (mode)
+ {
+ case DUMP:
+	if (do_dump(fname))
+	 r = EC_NOINPUT;
+	break;
+
+ case UNDUMP:
+	if (do_undump(fname))
+	 r = EC_NOINPUT;
+	break;
+
+ case ZERO:
+	if (do_zero(inboxname))
+	 r = EC_NOINPUT;
+	break;
+
+ case BUILD:
+	if (do_build(inboxname))
+	 r = EC_NOINPUT;
+	break;
+
+ case RECALC:
+	if (do_recalc(inboxname))
+	 r = EC_NOINPUT;
+	break;
+
+ case AUDIT:
+	if (do_audit(inboxname))
+	 r = EC_NOINPUT;
+	break;
+
+ case CHECKFOLDERS:
+	if (do_checkfolders(inboxname))
+	 r = EC_NOINPUT;
+	break;
+
+ case UNKNOWN:
+	fatal("UNKNOWN MODE", EC_SOFTWARE);
+ }
+
+ free(fname);
+ free(inboxname);
+
+ return r;
+}
+
+static int do_mailbox(char *name,
+		 int namelen,
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
+{
+ char *mboxname = xstrndup(name, namelen);
+ const char *userid = mboxname_to_userid(mboxname);
+
+ if (mboxname_isdeletedmailbox(mboxname, NULL))
+	goto done;
+
+ if (userid && strcmp(userid, prev_userid)) {
+	printf("%s\n", userid);
+	do_user(userid);
+	free(prev_userid);
+	prev_userid = xstrdup(userid);
+ }
+
+done:
+ free(mboxname);
+
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ int c;
+ const char *alt_config = NULL;
+ const char *userid = NULL;
+ int r = 0;
+ int recursive = 0;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*ismaster*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((c = getopt(argc, argv, "durzAbvRFC:T:")) != EOF) {
+	switch (c) {
+	case 'd':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = DUMP;
+	 break;
+
+	case 'r':
+	 recursive = 1;
+	 break;
+
+	case 'u':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = UNDUMP;
+	 break;
+
+	case 'z':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = ZERO;
+	 break;
+
+	case 'b':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = BUILD;
+	 break;
+
+	case 'R':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = RECALC;
+	 break;
+
+	case 'A':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = AUDIT;
+	 break;
+
+	case 'F':
+	 if (mode != UNKNOWN)
+		usage(argv0);
+	 mode = CHECKFOLDERS;
+	 break;
+
+	case 'v':
+	 verbose++;
+	 break;
+
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'T': /* tmpfs directory for audit */
+	 audit_temp_directory = optarg;
+	 break;
+
+	default:
+	 usage(argv0);
+	 break;
+	}
+ }
+
+ if (mode == UNKNOWN)
+	usage(argv0);
+
+ if (optind == argc-1)
+	userid = argvoptind;
+ else if (recursive)
+	userid = "";
+ else
+	usage(argv0);
+
+ cyrus_init(alt_config, "ctl_conversationsdb", 0, 0);
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ sync_log_init();
+
+ if (recursive) {
+	char *buf = xmalloc(strlen(userid) + 2);
+	prev_userid = xstrdup("");
+	strcpy(buf, userid);
+	strcat(buf, "*");
+
+	if ((r = mboxname_init_namespace(&conv_namespace, 1)) != 0) {
+	 syslog(LOG_ERR, "%s", error_message(r));
+	 fatal(error_message(r), EC_CONFIG);
+	}
+
+	(*conv_namespace.mboxlist_findall)(&conv_namespace, buf, 1, 0, 0,
+					 do_mailbox, NULL);
+
+	free(prev_userid);
+	free(buf);
+ }
+ else
+	do_user(userid);
+
+ sync_log_done();
+
+ mboxlist_close();
+ mboxlist_done();
+
+ cyrus_done();
+
+ return r;
+}
+
+static int usage(const char *name)
+{
+ fprintf(stderr, "usage: %s options -u|-d|-z|-f -r username\n", name);
+ fprintf(stderr, "\n");
+ fprintf(stderr, "options are:\n");
+ fprintf(stderr, " -v be more verbose\n");
+ fprintf(stderr, " -C altconfig use altconfig instead of imapd.conf\n");
+ fprintf(stderr, " -u undump the conversations database from stdin\n");
+ fprintf(stderr, " -d dump the conversations database to stdout\n");
+ fprintf(stderr, " -z zero the conversations DB (make all NULLs)\n");
+ fprintf(stderr, " -b build conversations entries for any NULL records\n");
+ fprintf(stderr, " -R recalculate all counts\n");
+ fprintf(stderr, " -A audit conversations DB counts\n");
+ fprintf(stderr, " -F check folder names\n");
+ fprintf(stderr, " -T dir store temporary data for audit in dir\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, " -r recursive mode: username is a prefix\n");
+
+ exit(EC_USAGE);
+}
+
+void fatal(const char* s, int code)
+{
+ fprintf(stderr, "ctl_conversationsdb: %s\n", s);
+ cyrus_done();
+ exit(code);
+}
+

cyrus-imapd-2.4.17.tar.gz/imap/ctl_cyrusdb.c -> cyrus-imapd-2.5.tar.gz/imap/ctl_cyrusdb.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ctl_cyrusdb.c,v 1.33 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
@@ -50,7 +48,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <syslog.h>
@@ -88,36 +85,32 @@
 
 #define N(a) (sizeof(a) / sizeof(a0))
 
-/* config.c stuff */
-const int config_need_data = 0;
-
-struct cyrusdb {
+static struct cyrusdb {
 const char *name;
- struct cyrusdb_backend **backendptr;
- int archive;
+ const char **configptr;
+ cyrusdb_archiver *archiver;
+ int doarchive;
 } dblist = {
- { FNAME_MBOXLIST,		&config_mboxlist_db,	1 },
- { FNAME_QUOTADB,		&config_quota_db,	1 },
- { FNAME_ANNOTATIONS,	&config_annotation_db,	1 },
- { FNAME_DELIVERDB,		&config_duplicate_db,	0 },
- { FNAME_TLSSESSIONS,	&config_tlscache_db,	0 },
- { FNAME_PTSDB,		&config_ptscache_db,	0 },
- { FNAME_STATUSCACHEDB,	&config_statuscache_db,	0 },
- { NULL,			NULL,			0 }
+ { FNAME_MBOXLIST,		&config_mboxlist_db,	NULL,	1 },
+ { FNAME_QUOTADB,		&config_quota_db,	NULL,	1 },
+ { FNAME_GLOBALANNOTATIONS,	&config_annotation_db,	NULL,	1 },
+ { FNAME_DELIVERDB,		&config_duplicate_db,	NULL,	0 },
+ { FNAME_TLSSESSIONS,	&config_tlscache_db,	NULL,	0 },
+ { FNAME_PTSDB,		&config_ptscache_db,	NULL,	0 },
+ { FNAME_STATUSCACHEDB,	&config_statuscache_db,	NULL,	0 },
+ { NULL,			NULL,			NULL,	0 }
 };
 
 static int compdb(const void *v1, const void *v2)
 {
 struct cyrusdb *db1 = (struct cyrusdb *) v1;
 struct cyrusdb *db2 = (struct cyrusdb *) v2;
- struct cyrusdb_backend *b1 = *db1->backendptr;
- struct cyrusdb_backend *b2 = *db2->backendptr;
 
 /* compare archive pointers for sort */
- return (b1->archive - b2->archive);
+ return ((char *)db1->archiver - (char *)db2->archiver);
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr, "ctl_cyrusdb -C <altconfig> -c\n");
 fprintf(stderr, "ctl_cyrusdb -C <altconfig> -r -x\n");
@@ -130,40 +123,56 @@
 		 int maycreate __attribute__((unused)),
 		 void *rock __attribute__((unused)))
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 
- r = mboxlist_lookup(name, &mbentry, NULL);
+ r = mboxlist_lookup_allow_reserved(name, &mbentry, NULL);
+ if (r) return 0;
+
+ if (mbentry->legacy_specialuse) {
+	const char *userid = mboxname_to_userid(name);
+	if (userid) {
+	 struct buf buf = BUF_INITIALIZER;
+	 buf_setcstr(&buf, mbentry->legacy_specialuse);
+	 annotatemore_rawwrite(name, "/specialuse", userid, &buf);
+	 buf_free(&buf);
+	}
+	free(mbentry->legacy_specialuse);
+	mbentry->legacy_specialuse = NULL;
+	mboxlist_update(mbentry, /*localonly*/1);
+ }
 
 /* if MBTYPE_RESERVED, unset it & call mboxlist_delete */
- if(!r && (mbentry.mbtype & MBTYPE_RESERVE)) {
-	if(!r) {
-	 r = mboxlist_deletemailbox(name, 1, NULL, NULL, 0, 0, 1);
-	 if(r) {
-		/* log the error */
-		syslog(LOG_ERR,
-		 "could not remove reserved mailbox '%s': %s",
-		 name, error_message(r));
-	 } else {
-		syslog(LOG_ERR,
-		 "removed reserved mailbox '%s'",
-		 name);
-	 }
+ if (mbentry->mbtype & MBTYPE_RESERVE) {
+	r = mboxlist_deletemailbox(name, 1, NULL, NULL, NULL, 0, 0, 1);
+	if (r) {
+	 /* log the error */
+	 syslog(LOG_ERR,
+		 "could not remove reserved mailbox '%s': %s",
+		 name, error_message(r));
+	} else {
+	 syslog(LOG_ERR,
+		 "removed reserved mailbox '%s'",
+		 name);
 	}
 }
 
+ mboxlist_entry_free(&mbentry);
+
 return 0;
 }
-void recover_reserved() 
+
+static void recover_reserved(void)
 {
 char pattern2 = { '*', '\0' };
- 
+
 mboxlist_init(0);
 mboxlist_open(NULL);
 
- /* Need annotations.db for mboxlist_deletemailbox() */
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ /* Need annotations.db for mboxlist_deletemailbox() and also
+ * for fixing legacy specialuse support */
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 /* Need quotadb for deleting mailboxes with quotas */
 quotadb_init(0);
@@ -177,7 +186,7 @@
 quotadb_done();
 
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 
 mboxlist_close();
 mboxlist_done();
@@ -192,18 +201,16 @@
 
 static void check_convert(struct cyrusdb *db, const char *fname)
 {
- struct cyrusdb_backend *backend = *db->backendptr;
- struct cyrusdb_backend *oldbe;
 const char *detectname = cyrusdb_detect(fname);
- char newfnameMAX_MAILBOX_PATH;
 char backendbuf100;
 char *p;
+ int r;
 
 /* unable to detect current type, assume all is good */
 if (!detectname) return;
 
 /* strip the -nosync from the name if present */
- strncpy(backendbuf, backend->name, 100);
+ xstrncpy(backendbuf, *db->configptr, 100);
 p = strstr(backendbuf, "-nosync");
 if (p) *p = '\0';
 
@@ -212,14 +219,11 @@
 
 /* otherwise we need to upgrade! */
 syslog(LOG_NOTICE, "converting %s from %s to %s",
-	 fname, detectname, backend->name);
+	 fname, detectname, *db->configptr);
 
- oldbe = cyrusdb_fromname(detectname);
-
- snprintf(newfname, MAX_MAILBOX_PATH, "%s.NEW", fname);
- cyrusdb_convert(fname, newfname, oldbe, backend);
- if (rename(newfname, fname) == -1)
-	syslog(LOG_ERR, "failed to rename upgraded file %s", fname);
+ r = cyrusdb_convert(fname, fname, detectname, *db->configptr);
+ if (r)
+	syslog(LOG_NOTICE, "conversion failed %s", fname);
 }
 
 int main(int argc, char *argv)
@@ -229,12 +233,12 @@
 char *alt_config = NULL;
 int reserve_flag = 1;
 enum { RECOVER, CHECKPOINT, NONE } op = NONE;
- char dirname1024, backup11024, backup21024;
- char *archive_filesN(dblist);
+ char *dirname = NULL, *backup1 = NULL, *backup2 = NULL;
+ strarray_t files = STRARRAY_INITIALIZER;
 char *msg = "";
- int i, j, rotated = 0;
+ int i, rotated = 0;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 r = r2 = 0;
@@ -273,40 +277,38 @@
 	/* NOTREACHED */
 }
 
- cyrus_init(alt_config, "ctl_cyrusdb", 0);
+ cyrus_init(alt_config, "ctl_cyrusdb", 0, 0);
 
 /* create the name of the db directory */
 /* (used by backup directory names) */
- strcpy(dirname, config_dir);
- strcat(dirname, FNAME_DBDIR);
+ dirname = strconcat(config_dir, FNAME_DBDIR, (char *)NULL);
 
 /* create the names of the backup directories */
- strcpy(backup1, dirname);
- strcat(backup1, ".backup1");
- strcpy(backup2, dirname);
- strcat(backup2, ".backup2");
+ backup1 = strconcat(dirname, ".backup1", (char *)NULL);
+ backup2 = strconcat(dirname, ".backup2", (char *)NULL);
 
 syslog(LOG_NOTICE, "%s", msg);
 
+ /* detect backends */
+ for (i = 0; dblisti.name != NULL; i++)
+	dblisti.archiver = cyrusdb_getarchiver(*dblisti.configptr);
+
 /* sort dbenvs */
 qsort(dblist, N(dblist)-1, sizeof(struct cyrusdb), &compdb);
 
- memset(archive_files, 0, N(dblist) * sizeof(char*));
- for (i = 0, j = 0; dblisti.name != NULL; i++) {
+ for (i = 0; dblisti.name; i++) {
 	const char *fname = dbfname(&dblisti);
-	struct cyrusdb_backend *backend = *dblisti.backendptr;
 
 	if (op == RECOVER)
 	 check_convert(&dblisti, fname);
 
 	/* if we need to archive this db, add it to the list */
-	if (dblisti.archive) {
-	 archive_filesj++ = xstrdup(fname);
-	}
+	if (dblisti.doarchive)
+	 strarray_add(&files, fname);
 
 	/* deal with each dbenv once */
-	if (dblisti+1.backendptr &&
-	 (*(dblisti+1.backendptr))->archive == backend->archive) continue;
+	if (dblisti+1.archiver == dblisti.archiver)
+	 continue;
 
 	r = r2 = 0;
 	switch (op) {
@@ -314,7 +316,7 @@
 	 break;
 	 
 	case CHECKPOINT:
-	 r2 = backend->sync();
+	 r2 = cyrusdb_sync(*dblisti.configptr);
 	 if (r2) {
 		syslog(LOG_ERR, "DBERROR: sync %s: %s", dirname,
 		 cyrusdb_strerror(r2));
@@ -327,27 +329,23 @@
 
 	 if (!rotated) {
 		/* rotate the backup directories -- ONE time only */
-		char *tail;
+		char *file;
 		DIR *dirp;
 		struct dirent *dirent;
 
-		tail = backup2 + strlen(backup2);
-
 		/* remove db.backup2 */
 		dirp = opendir(backup2);
-		strcat(tail++, "/");
 
 		if (dirp) {
 		 while ((dirent = readdir(dirp)) != NULL) {
 			if (dirent->d_name0 == '.') continue;
-
-			strcpy(tail, dirent->d_name);
-			unlink(backup2);
+			file = strconcat(backup2, "/", dirent->d_name, (char *)NULL);
+			unlink(file);
+			free(file);
 		 }
 
 		 closedir(dirp);
 		}
-		tail-1 = '\0';
 		r2 = rmdir(backup2);
 
 		/* move db.backup1 to db.backup2 */
@@ -363,7 +361,7 @@
 
 	 /* do the archive */
 	 if (r2 == 0)
-		r2 = backend->archive((const char**) archive_files, backup1);
+		r2 = dblisti.archiver(&files, backup1);
 
 	 if (r2) {
 		syslog(LOG_ERR, "DBERROR: archive %s: %s", dirname,
@@ -372,22 +370,24 @@
 			"ctl_cyrusdb: unable to archive environment\n");
 	 }
 
+
 	 break;
-	 
+
 	default:
 	 break;
 	}
 
-	/* free the archive_list */
-	while (j > 0) {
-	 free(archive_files--j);
-	 archive_filesj = NULL;
-	}
+	strarray_truncate(&files, 0);
 }
 
+ strarray_fini(&files);
+
 if(op == RECOVER && reserve_flag)
 	recover_reserved();
 
+ free(dirname);
+ free(backup1);
+ free(backup2);
 cyrus_done();
 
 syslog(LOG_NOTICE, "done %s", msg);

cyrus-imapd-2.4.17.tar.gz/imap/ctl_deliver.c -> cyrus-imapd-2.5.tar.gz/imap/ctl_deliver.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ctl_deliver.c,v 1.25 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -50,14 +48,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <syslog.h>
-#include <errno.h>
 #include <signal.h>
 
-#include "cyrusdb.h"
 #include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
@@ -65,10 +59,7 @@
 #include "util.h"
 #include "xmalloc.h"
 
-/* global state */
-const int config_need_data = 0;
-
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "ctl_deliver -C <altconfig> -d -f <dbfile>\n");
@@ -82,10 +73,9 @@
 char *alt_file = NULL;
 char *alt_config = NULL;
 char *days = NULL;
- int flag = 0;
 enum { DUMP, PRUNE, NONE } op = NONE;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -125,7 +115,7 @@
 	fprintf(stderr, "ctl_deliver -E is deprecated: "
 		"using cyr_expire -E instead\n");
 
-	r = snprintf(buf, sizeof(buf), "%s/cyr_expire", SERVICE_PATH);
+	r = snprintf(buf, sizeof(buf), "%s/cyr_expire", SERVICE_DIR);
 	if(r < 0 || r >= (int) sizeof(buf)) {
 	 fatal("cyr_expire command buffer not sufficiently big", EC_CONFIG);
 	}
@@ -139,9 +129,9 @@
 }
 
 case DUMP:
-	cyrus_init(alt_config, "ctl_deliver", 0);
+	cyrus_init(alt_config, "ctl_deliver", 0, 0);
 
-	if (duplicate_init(alt_file, flag) != 0) {
+	if (duplicate_init(alt_file) != 0) {
 	 fprintf(stderr, 
 		 "ctl_deliver: unable to init duplicate delivery database\n");
 	 exit(1);

cyrus-imapd-2.4.17.tar.gz/imap/ctl_mboxlist.c -> cyrus-imapd-2.5.tar.gz/imap/ctl_mboxlist.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ctl_mboxlist.c,v 1.68 2010/06/15 03:10:53 selsky Exp $
 */
 
 /* currently doesn't catch signals; probably SHOULD */
@@ -67,7 +65,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
@@ -76,7 +73,7 @@
 #include "assert.h"
 #include "annotate.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "libcyr_cfg.h"
 #include "mboxlist.h"
@@ -84,12 +81,6 @@
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
-
-#include "sync_log.h"
-
-/* config.c stuff */
-const int config_need_data = 0;
 
 extern int optind;
 extern char *optarg;
@@ -180,8 +171,8 @@
 }
 
 static int dump_cb(void *rockp,
-		 const char *key, int keylen,
-		 const char *data, int datalen)
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct dumprock *d = (struct dumprock *) rockp;
 int r = 0;
@@ -216,7 +207,7 @@
 	if(!d->partition || !strcmp(d->partition, part)) {
 	 printf("%s\t%d %s %s\n", name, mbtype, part, acl);
 	 if(d->purge) {
-		config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0);
+		cyrusdb_delete(mbdb, key, keylen, &(d->tid), 0);
 	 }
 	}
 	break;
@@ -425,7 +416,7 @@
 * mupdate.
 */
 
-void do_dump(enum mboxop op, const char *part, int purge)
+static void do_dump(enum mboxop op, const char *part, int purge)
 {
 struct dumprock d;
 int ret;
@@ -478,22 +469,21 @@
 }
 
 /* Dump Database */
- config_mboxlist_db->foreach(mbdb, "", 0, NULL, &dump_cb, &d, NULL);
+ cyrusdb_foreach(mbdb, "", 0, NULL, &dump_cb, &d, NULL);
 
- if(d.tid) {
-	config_mboxlist_db->commit(mbdb, d.tid);
+ if (d.tid) {
+	cyrusdb_commit(mbdb, d.tid);
 	d.tid = NULL;
 }
 
- if(op == M_POPULATE) {
+ if (op == M_POPULATE) {
 	/* Remove MBTYPE_MOVING flags (unflag_head) */
-	while(unflag_head) {
-	 struct mboxlist_entry mbentry;
+	while (unflag_head) {
+	 mbentry_t *mbentry = NULL;
 	 struct mb_node *me = unflag_head;
-	 char *newpart;
-	 
+
 	 unflag_head = unflag_head->next;
-	 
+
 	 ret = mboxlist_lookup(me->mailbox, &mbentry, NULL);
 	 if(ret) {
 		fprintf(stderr,
@@ -503,30 +493,28 @@
 	 }
 
 	 /* Reset the partition! */
-	 newpart = strchr(mbentry.partition, '!');
-	 if(!newpart) newpart = mbentry.partition;
-	 else newpart++;
-
-	 /* XXX - FIXME, pull uniqueid from detail */
-	 ret = mboxlist_update(me->mailbox, mbentry.mbtype & ~MBTYPE_MOVING,
-				 newpart, mbentry.acl, 1);
-	 if(ret) {
+	 free(mbentry->server);
+	 mbentry->server = NULL;
+	 mbentry->mbtype &= ~(MBTYPE_MOVING|MBTYPE_REMOTE);
+	 ret = mboxlist_update(mbentry, 1);
+	 if (ret) {
 		fprintf(stderr,
 			"couldn't perform update to un-remote-flag %s\n",
 			me->mailbox);
 		exit(1);
 	 } 
-	 
+
 	 /* force a push to mupdate */
-	 snprintf(buf, sizeof(buf), "%s!%s", config_servername, newpart);
-	 ret = mupdate_activate(d.h, me->mailbox, buf, mbentry.acl);
-	 if(ret) {
+	 snprintf(buf, sizeof(buf), "%s!%s", config_servername, mbentry->partition);
+	 ret = mupdate_activate(d.h, me->mailbox, buf, mbentry->acl);
+	 if (ret) {
 		fprintf(stderr,
 			"couldn't perform mupdatepush to un-remote-flag %s\n",
 			me->mailbox);
 		exit(1);
 	 }
-	 
+
+	 mboxlist_entry_free(&mbentry);
 	 free(me);
 	}
 
@@ -550,8 +538,7 @@
 	 struct mb_node *me = wipe_head;
 	 
 	 wipe_head = wipe_head->next;
-	 
-	 ret = mboxlist_deletemailbox(me->mailbox, 1, "", NULL, 0, 1, 1);
+	 ret = mboxlist_deletemailbox(me->mailbox, 1, "", NULL, NULL, 0, 1, 1);
 	 if (ret) {
 		fprintf(stderr, "couldn't delete defunct mailbox %s\n",
 			me->mailbox);
@@ -569,7 +556,7 @@
 return;
 }
 
-void do_undump(void)
+static void do_undump(void)
 {
 int r = 0;
 char buf16384;
@@ -586,7 +573,8 @@
 	char *name, *partition, *acl;
 	char *p;
 	int mbtype = 0, tries = 0;
-	
+	mbentry_t *newmbentry = NULL;
+
 	line++;
 
 	name = buf;
@@ -623,13 +611,23 @@
 	 continue;
 	}
 
-	key = name; keylen = strlen(key);
-	data = mboxlist_makeentry(mbtype, partition, acl);
+	key = name;
+	keylen = strlen(key);
+
+	/* generate a new entry */
+	newmbentry = mboxlist_entry_create();
+	newmbentry->mbtype = mbtype;
+	newmbentry->partition = xstrdupnull(partition);
+	newmbentry->acl = xstrdupnull(acl);
+
+	data = mboxlist_entry_cstring(newmbentry);
 	datalen = strlen(data);
-	
+
+	mboxlist_entry_free(&newmbentry);
+
 	tries = 0;
 retry:
-	r = config_mboxlist_db->store(mbdb, key, keylen, data, datalen, &tid);
+	r = cyrusdb_store(mbdb, key, keylen, data, datalen, &tid);
 	switch (r) {
 	case 0:
 	 break;
@@ -644,12 +642,12 @@
 	 r = IMAP_IOERROR;
 	 break;
 	}
-	
+
 	free(data);
 
 	if(--untilCommit == 0) {
 	 /* commit */
-	 r = config_mboxlist_db->commit(mbdb, tid);
+	 r = cyrusdb_commit(mbdb, tid);
 	 if(r) break;
 	 tid = NULL;
 	 untilCommit = PER_COMMIT;
@@ -661,11 +659,11 @@
 
 if(!r && tid) {
 	/* commit the last transaction */
-	r=config_mboxlist_db->commit(mbdb, tid);
+	r=cyrusdb_commit(mbdb, tid);
 }
 
 if (r) {
-	if(tid) config_mboxlist_db->abort(mbdb, tid);
+	if(tid) cyrusdb_abort(mbdb, tid);
 	fprintf(stderr, "db error: %s\n", cyrusdb_strerror(r));
 	if(key) fprintf(stderr, "was processing mailbox: %s\n", key);
 	if(last_commit0) fprintf(stderr, "last commit was at: %s\n",
@@ -697,7 +695,7 @@
 struct found_data *data;
 };
 
-void add_path(struct found_list *found, int type,
+static void add_path(struct found_list *found, int type,
 	 const char *name, const char *part, const char *path)
 {
 struct found_data *new;
@@ -717,7 +715,7 @@
 strcpy(new->path, path);
 }
 
-void add_part(struct found_list *found,
+static void add_part(struct found_list *found,
 	 const char *part, const char *path, int override)
 {
 int i;
@@ -740,7 +738,7 @@
 add_path(found, ROOT, "", part, path);
 }
 
-void get_partitions(const char *key, const char *value, void *rock)
+static void get_partitions(const char *key, const char *value, void *rock)
 {
 static int check_meta = -1;
 struct found_list *found = (struct found_list *) rock;
@@ -760,7 +758,7 @@
 /* skip any other overflow strings */
 }
 
-int compar_mbox(const void *v1, const void *v2)
+static int compar_mbox(const void *v1, const void *v2)
 {
 struct found_data *d1 = (struct found_data *) v1;
 struct found_data *d2 = (struct found_data *) v2;
@@ -776,8 +774,8 @@
 }
 
 static int verify_cb(void *rockp,
-		 const char *key, int keylen,
-		 const char *data, int datalen __attribute__((unused)))
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen __attribute__((unused)))
 {
 struct found_list *found = (struct found_list *) rockp;
 int r;
@@ -790,6 +788,9 @@
 
 /* Get mailbox type */
 mbtype = strtol(data, &p, 10);
+ if (mbtype < 0) { /* impossible, but keeps the compiler happy */
+	abort();
+ }
 
 p = strchr(data, ' ');
 if (p == NULL) {
@@ -826,7 +827,7 @@
 return 0;
 }
 
-void do_verify(void)
+static void do_verify(void)
 {
 struct found_list found;
 int i;
@@ -927,10 +928,10 @@
 
 qsort(found.data, found.size, sizeof(struct found_data), compar_mbox);
 
- config_mboxlist_db->foreach(mbdb, "", 0, NULL, &verify_cb, &found, NULL);
+ cyrusdb_foreach(mbdb, "", 0, NULL, &verify_cb, &found, NULL);
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr, "DUMP:\n");
 fprintf(stderr, " ctl_mboxlist -C <alt_config> -d -x -p partition -f filename\n");
@@ -954,7 +955,7 @@
 enum mboxop op = NONE;
 char *alt_config = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -1047,7 +1048,7 @@
 	libcyrus_config_setint(CYRUSOPT_DB_INIT_FLAGS, CYRUSDB_RECOVER);
 }
 
- cyrus_init(alt_config, "ctl_mboxlist", 0);
+ cyrus_init(alt_config, "ctl_mboxlist", 0, 0);
 global_sasl_init(1,0,NULL);
 
 switch (op) {
@@ -1070,13 +1071,13 @@
 	quotadb_init(0);
 	quotadb_open(NULL);
 
-	annotatemore_init(0, NULL, NULL);
-	annotatemore_open(NULL);
+	annotate_init(NULL, NULL);
+	annotatemore_open();
 
 	do_dump(op, partition, dopurge);
 
 	annotatemore_close();
-	annotatemore_done();
+	annotate_done();
 
 	quotadb_close();
 	quotadb_done();
@@ -1092,13 +1093,13 @@
 	quotadb_init(0);
 	quotadb_open(NULL);
 
-	annotatemore_init(0, NULL, NULL);
-	annotatemore_open(NULL);
+	annotate_init(NULL, NULL);
+	annotatemore_open();
 
 	do_undump();
 
 	annotatemore_close();
-	annotatemore_done();
+	annotate_done();
 
 	quotadb_close();
 	quotadb_done();

cyrus-imapd-2.4.17.tar.gz/imap/cvt_cyrusdb.c -> cyrus-imapd-2.5.tar.gz/imap/cvt_cyrusdb.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cvt_cyrusdb.c,v 1.20 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -50,35 +48,25 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <ctype.h>
-#include <syslog.h>
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
 
-#include "acl.h"
-#include "assert.h"
-#include "auth.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
-#include "glob.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "mailbox.h"
 #include "util.h"
 #include "xmalloc.h"
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 int main(int argc, char *argv)
 {
- struct cyrusdb_backend *DB_OLD = NULL, *DB_NEW = NULL;
+ const char *OLDDB = NULL, *NEWDB = NULL;
 const char *old_db, *new_db;
 int i;
 int opt;
@@ -91,23 +79,20 @@
 	 break;
 	}
 }
-	
- if((argc - optind) != 4) {
+
+ if ((argc - optind) != 4) {
+	strarray_t *backends = cyrusdb_backends();
+	char sep;
+
 	fprintf(stderr, "Usage: %s -C altconfig <old db> <old db backend> <new db> <new db backend>\n", argv0);
 	fprintf(stderr, "Usable Backends: ");
 
-	/* The following is commented out because its an over-paranoid
-	 check (cyrusdb_backends is statically defined to be non-empty)
-	 and causes a compiler warning
-
-	if(!cyrusdb_backends || !cyrusdb_backends0)
-	 fatal("we don't seem to have any db backends available", EC_OSERR);
-	*/
+	for(i=0, sep = ':'; i < backends->count; i++) {
+	 fprintf(stderr, "%c %s", sep, strarray_nth(backends, i));
+	 sep = ',';
+	}
+	strarray_free(backends);
 
-	fprintf(stderr, "%s", cyrusdb_backends0->name);
-	for(i=1; cyrusdb_backendsi; i++)
-	 fprintf(stderr, ", %s", cyrusdb_backendsi->name);
-	
 	fprintf(stderr, "\n");
 	exit(-1);
 }
@@ -115,7 +100,7 @@
 old_db = argvoptind;
 new_db = argvoptind+2;
 
- if(old_db0 != '/' || new_db0 != '/') {
+ if (old_db0 != '/' || new_db0 != '/') {
 	printf("\nSorry, you cannot use this tool with relative path names.\n"
 	 "This is because some database backends (mainly berkeley) do not\n"
 	 "always do what you would expect with them.\n"
@@ -123,34 +108,19 @@
 	exit(EC_OSERR);
 }
 
- for(i=0; cyrusdb_backendsi; i++) {
-	if(!strcmp(cyrusdb_backendsi->name, argvoptind+1)) {
-	 DB_OLD = cyrusdb_backendsi; break;
-	}
- }
- if(!cyrusdb_backendsi) {
-	fatal("unknown old backend", EC_TEMPFAIL);
- } 
-
- for(i=0; cyrusdb_backendsi; i++) {
-	if(!strcmp(cyrusdb_backendsi->name, argvoptind+3)) {
-	 DB_NEW = cyrusdb_backendsi; break;
-	}
- }
- if(!cyrusdb_backendsi) {
-	fatal("unknown new backend", EC_TEMPFAIL);
- }
+ OLDDB = argvoptind+1;
+ NEWDB = argvoptind+3;
 
- if(DB_NEW == DB_OLD) {
+ if (NEWDB == OLDDB) {
 	fatal("no conversion required", EC_TEMPFAIL);
 }
 
- cyrus_init(alt_config, "cvt_cyrusdb", 0);
+ cyrus_init(alt_config, "cvt_cyrusdb", 0, 0);
 
- printf("Converting from %s (%s) to %s (%s)\n", old_db, DB_OLD->name,
-	 new_db, DB_NEW->name);
+ printf("Converting from %s (%s) to %s (%s)\n", old_db, OLDDB,
+	 new_db, NEWDB);
 
- cyrusdb_convert(old_db, new_db, DB_OLD, DB_NEW);
+ cyrusdb_convert(old_db, new_db, OLDDB, NEWDB);
 
 cyrus_done();

cyrus-imapd-2.4.17.tar.gz/imap/cyr_dbtool.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_dbtool.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyr_dbtool.c,v 1.8 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -50,40 +48,29 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <ctype.h>
-#include <syslog.h>
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
 
-#include "acl.h"
 #include "assert.h"
-#include "auth.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
-#include "glob.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "mailbox.h"
 #include "util.h"
 #include "xmalloc.h"
 
 #define STACKSIZE 64000
-char stackSTACKSIZE+1;
-
-/* config.c stuff */
-const int config_need_data = 0;
+static char stackSTACKSIZE+1;
 
-struct cyrusdb_backend *DB_OLD = NULL;
+static struct db *db = NULL;
 
-struct db *odb = NULL;
-
-int read_key_value(char **keyptr, int *keylen, char **valptr, int *vallen) {
+static int read_key_value(char **keyptr, size_t *keylen, char **valptr, size_t *vallen) {
 int c,res,inkey;
 res = 0;
 inkey = 1;
@@ -117,21 +104,127 @@
 return res;
 }
 
-int printer_cb(void *rock __attribute__((unused)),
- const char *key, int keylen,
- const char *data, int datalen)
+static int printer_cb(void *rock __attribute__((unused)),
+ const char *key, size_t keylen,
+ const char *data, size_t datalen)
 {
- printf("%.*s\t%.*s\n", keylen, key, datalen, data);
+ printf("%.*s\t%.*s\n", (int)keylen, key, (int)datalen, data);
 return 0;
 }
 
+/* use IMAP literals for all communications */
+static int aprinter_cb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct protstream *out = (struct protstream *)rock;
+
+ prot_printamap(out, key, keylen);
+ prot_putc(' ', out);
+ prot_printamap(out, data, datalen);
+ prot_putc('\n', out);
+
+ return 0;
+}
+
+static void batch_commands(struct db *db)
+{
+ struct buf cmd = BUF_INITIALIZER;
+ struct buf key = BUF_INITIALIZER;
+ struct buf val = BUF_INITIALIZER;
+ struct txn *tid = NULL;
+ struct txn **tidp = NULL;
+ struct protstream *in = prot_new(0, 0); // stdin
+ struct protstream *out = prot_new(1, 1); // stdout
+ int line = 0;
+ char c = '-';
+ int r = 0;
+
+ while (c != EOF) {
+	buf_reset(&cmd);
+	buf_reset(&key);
+	buf_reset(&val);
+	line++;
+	c = getword(in, &cmd);
+	if (c == ' ')
+	 c = getastring(in, NULL, &key);
+	if (c == ' ')
+	 c = getastring(in, NULL, &val);
+	if (c == '\r') c = prot_getc(in);
+	if (cmd.len) {
+	 /* got a command! */
+	 if (!strcmp(cmd.s, "BEGIN")) {
+		if (tidp) {
+		 r = IMAP_MAILBOX_LOCKED;
+		 goto done;
+		}
+		tidp = &tid;
+	 }
+	 else if (!strcmp(cmd.s, "SHOW")) {
+		r = cyrusdb_foreach(db, key.s, key.len, NULL, aprinter_cb, out, tidp);
+		if (r) goto done;
+		prot_flush(out);
+	 }
+	 else if (!strcmp(cmd.s, "SET")) {
+		r = cyrusdb_store(db, key.s, key.len, val.s, val.len, tidp);
+		if (r) goto done;
+	 }
+	 else if (!strcmp(cmd.s, "GET")) {
+		const char *res;
+		size_t reslen;
+		r = cyrusdb_fetch(db, key.s, key.len, &res, &reslen, tidp);
+		if (r) goto done;
+		aprinter_cb(out, key.s, key.len, res, reslen);
+		prot_flush(out);
+	 }
+	 else if (!strcmp(cmd.s, "DELETE")) {
+		r = cyrusdb_delete(db, key.s, key.len, tidp, 1);
+		if (r) goto done;
+	 }
+	 else if (!strcmp(cmd.s, "COMMIT")) {
+		if (!tidp) {
+		 r = IMAP_NOTFOUND;
+		 goto done;
+		}
+		r = cyrusdb_commit(db, tid);
+		if (r) goto done;
+		tid = NULL;
+		tidp = NULL;
+	 }
+	 else if (!strcmp(cmd.s, "ABORT")) {
+		if (!tidp) {
+		 r = IMAP_NOTFOUND;
+		 goto done;
+		}
+		r = cyrusdb_abort(db, tid);
+		if (r) goto done;
+		tid = NULL;
+		tidp = NULL;
+	 }
+	 else {
+		r = IMAP_MAILBOX_NONEXISTENT;
+		goto done;
+	 }
+	}
+	if (c != '\n') break;
+ }
+ 
+done:
+ if (r) {
+	if (tid) cyrusdb_abort(db, tid);
+	fprintf(stderr, "FAILED: line %d at cmd %.*s with error %s\n",
+	 line, (int)cmd.len, cmd.s, error_message(r));
+ }
+}
+
 int main(int argc, char *argv)
 {
- const char *old_db;
+ const char *fname;
 const char *action;
 char *key;
 char *value;
- int i,r,keylen,vallen,reslen;
+ int i,r;
+ size_t keylen,vallen,reslen;
 int opt,loop;
 char *alt_config = NULL;
 const char *res = NULL;
@@ -141,8 +234,9 @@
 int use_stdin = 0;
 int db_flags = 0;
 struct txn *tid = NULL;
+ struct txn **tidp = NULL;
 
- while ((opt = getopt(argc, argv, "C:n")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:ntT")) != EOF) {
 	switch (opt) {
 	case 'C': /* alt config file */
 	 alt_config = optarg;
@@ -150,20 +244,28 @@
 	case 'n': /* create new */
 	 db_flags |= CYRUSDB_CREATE;
 	 break;
+	case 't': /* legacy - now the default, but don't break existing users */
+	 tidp = NULL;
+	 break;
+	case 'T':
+	 tidp = &tid;
+	 break;
 	}
 }
-	
- if((argc - optind) < 3) {
+
+ if ((argc - optind) < 3) {
 	char sep;
+	strarray_t *backends = cyrusdb_backends();
 
-	fprintf(stderr, "Usage: %s -C altconfig <old db> <old db backend> <action> <key> <value>\n", argv0);
+	fprintf(stderr, "Usage: %s -C altconfig <db file> <db backend> <action> <key> <value>\n", argv0);
 	fprintf(stderr, "Usable Backends");
 
-	for(i=0, sep = ':'; cyrusdb_backendsi; i++) {
-	 fprintf(stderr, "%c %s", sep, cyrusdb_backendsi->name);
+	for(i=0, sep = ':'; i < backends->count; i++) {
+	 fprintf(stderr, "%c %s", sep, strarray_nth(backends, i));
 	 sep = ',';
 	}
-	
+	strarray_free(backends);
+
 	fprintf(stderr, "\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Actions:\n");
@@ -171,15 +273,20 @@
 	fprintf(stderr, "* get <key>\n");
 	fprintf(stderr, "* set <key> <value>\n");
 	fprintf(stderr, "* delete <key>\n");
+	fprintf(stderr, "* dump - internal format dump\n");
+	fprintf(stderr, "* consistent - check consistency\n");
+	fprintf(stderr, "* repack - repack/checkpoint the DB (if supported)\n");
+	fprintf(stderr, "* damage - start a commit then die during\n");
+	fprintf(stderr, "* batch - read from stdin and execute commands\n");
 	fprintf(stderr, "You may omit key or key/value and specify one per line on stdin\n");
 	fprintf(stderr, "keys are terminated by tab or newline, values are terminated by newline\n");
 	exit(-1);
 }
 
- old_db = argvoptind;
+ fname = argvoptind;
 action = argvoptind+2;
 
- if(old_db0 != '/') {
+ if(fname0 != '/') {
 	printf("\nSorry, you cannot use this tool with relative path names.\n"
 	 "This is because some database backends (mainly berkeley) do not\n"
 	 "always do what you would expect with them.\n"
@@ -187,19 +294,9 @@
 	exit(EC_OSERR);
 }
 
- for(i=0; cyrusdb_backendsi; i++) {
-	if(!strcmp(cyrusdb_backendsi->name, argvoptind+1)) {
-	 DB_OLD = cyrusdb_backendsi; break;
-	}
- }
- if(!cyrusdb_backendsi) {
-	fatal("unknown backend", EC_TEMPFAIL);
- } 
-
- cyrus_init(alt_config, "cyr_dbtool", 0);
-
+ cyrus_init(alt_config, "cyr_dbtool", 0, 0);
 
- r = (DB_OLD->open)(old_db, db_flags, &odb);
+ r = cyrusdb_open(argvoptind+1, fname, db_flags, &db);
 if(r != CYRUSDB_OK)
 	fatal("can't open database", EC_TEMPFAIL);
 
@@ -220,40 +317,59 @@
 }
 while ( loop ) {
 if (is_get) {
- DB_OLD->fetch(odb, key, keylen, &res, &reslen, &tid);
- printf("%.*s\n", reslen, res);
+ cyrusdb_fetch(db, key, keylen, &res, &reslen, tidp);
+ printf("%.*s\n", (int)reslen, res);
 } else if (is_set) {
- DB_OLD->store(odb, key, keylen, value, vallen, &tid);
+ cyrusdb_store(db, key, keylen, value, vallen, tidp);
 } else if (is_delete) {
- DB_OLD->delete(odb, key, keylen, &tid, 1);
+ cyrusdb_delete(db, key, keylen, tidp, 1);
 }
 loop = 0;
 if ( use_stdin ) {
 loop = read_key_value( &key, &keylen, &value, &vallen );
 }
 }
+ } else if (!strcmp(action, "batch")) {
+	batch_commands(db);
 } else if (!strcmp(action, "show")) {
 if ((argc - optind) < 4) {
- DB_OLD->foreach(odb, "", 0, NULL, printer_cb, NULL, &tid);
+ cyrusdb_foreach(db, "", 0, NULL, printer_cb, NULL, tidp);
 } else {
 key = argvoptind+3;
 keylen = strlen(key);
- DB_OLD->foreach(odb, key, keylen, NULL, printer_cb, NULL, &tid);
+ cyrusdb_foreach(db, key, keylen, NULL, printer_cb, NULL, tidp);
 }
 } else if (!strcmp(action, "consistency")) {
- if (DB_OLD->consistent(odb)) {
- printf("Consistency Error for %s\n", old_db);
+ if (cyrusdb_consistent(db)) {
+ printf("Consistency Error for %s\n", fname);
 }
+ } else if (!strcmp(action, "dump")) {
+	int level = 1;
+	if ((argc - optind) > 3)
+	 level = atoi(argvoptind+3);
+	cyrusdb_dump(db, level);
+ } else if (!strcmp(action, "consistent")) {
+	if (cyrusdb_consistent(db)) {
+	 printf("No, not consistent\n");
+	} else {
+	 printf("Yes, consistent\n");
+	}
+ } else if (!strcmp(action, "repack")) {
+	if (cyrusdb_repack(db))
+	 printf("Failed to repack\n");
+ } else if (!strcmp(action, "damage")) {
+	cyrusdb_store(db, "INVALID", 7, "CRASHME", 7, &tid);
+	assert(!tid);
 } else {
 printf("Unknown action %s\n", action);
 }
 if (tid) {
- DB_OLD->commit(odb, tid);
+ cyrusdb_commit(db, tid);
 tid = NULL;
 }
 
- (DB_OLD->close)(odb);
- 
+ cyrusdb_close(db);
+
 cyrus_done();
 
 return 0;

cyrus-imapd-2.5.tar.gz/imap/cyr_deny.c Added

@@ -0,0 +1,274 @@
+/* cyr_deny.c - tool to manipulate the deny database
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <syslog.h>
+#include <signal.h>
+
+#include "global.h"
+#include "exitcodes.h"
+#include "libcyr_cfg.h"
+#include "proc.h"
+#include "userdeny.h"
+#include "imap/imap_err.h"
+#include "util.h"
+#include "ptrarray.h"
+#include "xmalloc.h"
+
+static void usage(void)
+{
+ fprintf(stderr, "Usage: cyr_deny -C <altconfig> -s services -m message user\n");
+ fprintf(stderr, " cyr_deny -C <altconfig> -a user\n");
+ fprintf(stderr, " cyr_deny -C <altconfig> -l\n");
+ exit(EC_USAGE);
+}
+
+static int list_one(const char *user, const char *services,
+		 const char *message,
+		 void *rock __attribute__((unused)))
+{
+ printf("%-30s %-20s %s\n", user, services, message);
+ return 0;
+}
+
+struct kill_rock
+{
+ const char *user;
+ ptrarray_t pids;
+};
+
+/*
+ * We use proc_foreach() to kill any existing servers which are serving
+ * the user. There are two problems with this approach.
+ *
+ * - proc_foreach() reads a directory full of files, which is inherently racy
+ *
+ * - the proc file does not contain the service identifier of the process that
+ * wrote it; the only mapping between those and pids is in those processes
+ * themselves and in the master process.
+ *
+ * The first problem we can live with, the raciness is no worse than
+ * running 'cyr_info proc' and grepping the results.
+ *
+ * The second problem means that we have no way cleanly to support the
+ * existing userdeny feature of denying users access to only some services.
+ * Without a clear idea of which service a pid represents, we cannot helpfully
+ * kill the existing processes for only some of the services. Instead we have
+ * to kill all the processes for the user, and hope any others will reconnect.
+ */
+static int gather_one(pid_t pid,
+		 const char *servicename __attribute__((unused)),
+		 const char *clienthost __attribute__((unused)),
+		 const char *userid,
+		 const char *mailbox __attribute__((unused)),
+		 const char *cmdname __attribute__((unused)),
+		 void *rock)
+{
+ struct kill_rock *kr = (struct kill_rock *)rock;
+
+ if (!strcmp(userid, kr->user))
+	ptrarray_append(&kr->pids, xmemdup(&pid, sizeof(pid)));
+ return 0;
+}
+
+static void kill_existing_services(const char *user)
+{
+ struct kill_rock kr = { NULL, PTRARRAY_INITIALIZER };
+ int delay = 1;
+ int i;
+ int *pidp;
+ int sig;
+ int prejudice = 0;
+ int probing = 0;
+ int r;
+
+ kr.user = user;
+ proc_foreach(gather_one, &kr);
+
+ /*
+ * Send a graceful shutdown message to all the processes and wait
+ * for them to die. This is a poor approximation of the correct
+ * behaviour, which can only be done in the master process (but we
+ * currently have no way to tell it to do so).
+ */
+ for (;;) {
+
+	/* send all the pids a signal */
+	for (i = 0 ; i < kr.pids.count ; i++) {
+	 pidp = (int *)kr.pids.datai;
+	 sig = (probing ? 0 : (prejudice ? SIGKILL : SIGTERM));
+	 r = kill(*pidp, sig);
+	 if (r < 0) {
+		/* gone (yay!) or some error */
+		ptrarray_remove(&kr.pids, i);
+		free(pidp);
+		continue;
+	 }
+	}
+	if (!kr.pids.count)
+	 break;
+
+	probing = 1;
+
+	sleep(delay);
+	delay *= 2;
+	if (delay > 8) {
+	 if (prejudice++) {
+		syslog(LOG_ALERT, "cannot kill some processes even with SIGKILL");
+		break;
+	 }
+	 delay = 1;
+	 probing = 0;
+	}
+ }
+
+ ptrarray_fini(&kr.pids);
+}
+
+int main(int argc, char **argv)
+{
+ int opt;
+ enum { DENY, ALLOW, LIST } mode = DENY;
+ const char *alt_config = NULL;
+ const char *user = NULL;
+ const char *message = NULL;
+ const char *services = NULL;
+ int r;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((opt = getopt(argc, argv, "C:alm:s:")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'a':
+	 if (mode != DENY) usage();
+	 mode = ALLOW;
+	 break;
+
+	case 'l':
+	 if (mode != DENY) usage();
+	 mode = LIST;
+	 break;
+
+	case 'm':
+	 message = optarg;
+	 break;
+
+	case 's':
+	 services = optarg;
+	 break;
+
+	default:
+	 usage();
+	 break;
+	}
+ }
+ if (mode != DENY && (message || services))
+	usage();
+
+ if (mode == LIST) {
+	if (optind != argc)
+	 usage();
+ }
+ else {
+	if (optind != argc-1)
+	 usage();
+	user = argvoptind;
+ }
+
+ cyrus_init(alt_config, "cyr_deny", 0, 0);
+
+ denydb_init(0);
+
+ r = denydb_open(/*create*/(mode == DENY));
+ if (r) {
+	if (mode != DENY && r == IMAP_NOTFOUND)
+	 r = 0;
+	else
+	 fprintf(stderr, "cyr_deny: failed to open deny db: %s\n",
+		 error_message(r));
+	goto out;
+ }
+
+ switch (mode) {
+ case ALLOW:
+	r = denydb_delete(user);
+	if (r)
+	 fprintf(stderr, "cyr_deny: failed to allow access for %s: %s\n",
+		 user, error_message(r));
+	break;
+ case DENY:
+	r = denydb_set(user, services, message);
+	if (r)
+	 fprintf(stderr, "cyr_deny: failed to deny access for %s: %s\n",
+		 user, error_message(r));
+	else
+	 kill_existing_services(user);
+	break;
+ case LIST:
+	printf("%-30s %-20s %s\n", "Username", "Service(s)", "Message");
+	r = denydb_foreach(list_one, NULL);
+	if (r)
+	 fprintf(stderr, "cyr_deny: failed to list entries: %s\n",
+		 error_message(r));
+	break;
+ }
+
+ denydb_close();
+out:
+ denydb_done();
+ return !!r;
+}

cyrus-imapd-2.4.17.tar.gz/imap/cyr_df.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_df.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyr_df.c,v 1.2 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -61,12 +59,9 @@
 extern int optind;
 extern char *optarg;
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 /* forward declarations */
-void usage(void);
-void get_part_stats(const char *key, const char *val, void *rock);
+static void usage(void);
+static void get_part_stats(const char *key, const char *val, void *rock);
 
 int main(int argc, char *argv)
 {
@@ -74,7 +69,7 @@
 char *alt_config = NULL;
 int meta = 0;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -93,7 +88,7 @@
 	}
 }
 
- cyrus_init(alt_config, "cyr_df", 0);
+ cyrus_init(alt_config, "cyr_df", 0, 0);
 
 printf("%-12s %12s %12s %12s %3s %s\n", "Partition",
 	 "1k-blocks", "Used", "Available", "Use%", "Location");
@@ -106,7 +101,7 @@
 }
 
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "usage: cyr_df -C <alt_config> -m\n");
@@ -118,7 +113,7 @@
 * config_foreachoverflowstring() callback function to find partition-
 * options and print filesystem stats
 */
-void get_part_stats(const char *key, const char *val, void *rock)
+static void get_part_stats(const char *key, const char *val, void *rock)
 {
 int meta = *((int*) rock);
 const char *part, *path;

cyrus-imapd-2.4.17.tar.gz/imap/cyr_expire.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_expire.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyr_expire.c,v 1.25 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -50,62 +48,68 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <syslog.h>
-#include <errno.h>
 #include <signal.h>
 
 #include <sasl/sasl.h>
 
 #include "annotate.h"
-#include "cyrusdb.h"
 #include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
 #include "hash.h"
+#include "imap_err.h"
 #include "libcyr_cfg.h"
+#include "mboxevent.h"
 #include "mboxlist.h"
+#include "conversations.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
+#include "strarray.h"
 
 /* global state */
-const int config_need_data = 0;
-static int sigquit = 0;
+static volatile sig_atomic_t sigquit = 0;
+static int verbose = 0;
+static int keep_flagged = 1;
+static size_t max_archive_size = 0;
+
+/* current namespace */
+static struct namespace expire_namespace;
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
-	 "cyr_expire -C <altconfig> -E <days> -X <expunge-days> -p prefix -a -v\n");
+	 "cyr_expire -C <altconfig> -E <expire-duration> -D <delete-duration -X <expunge-duration> -p prefix -a -v -x\n");
 exit(-1);
 }
 
 struct expire_rock {
- struct hash_table *table;
+ struct hash_table table;
 time_t expire_mark;
 time_t expunge_mark;
- unsigned long mailboxes;
- unsigned long messages;
- unsigned long deleted;
- int verbose;
+ unsigned long mailboxes_seen;
+ unsigned long messages_seen;
+ unsigned long messages_expired;
+ unsigned long messages_expunged;
 int skip_annotate;
+ bit32 userflagsMAX_USER_FLAGS/32;
+ int do_userflags;
+ unsigned long userflags_expunged;
 };
 
-struct delete_node {
- struct delete_node *next;
- char *name;
+struct conversations_rock {
+ struct hash_table seen;
+ time_t expire_mark;
+ unsigned long databases_seen;
+ unsigned long msgids_seen;
+ unsigned long msgids_expired;
 };
 
 struct delete_rock {
- char prefix100;
- int prefixlen;
 time_t delete_mark;
- struct delete_node *head;
- struct delete_node *tail;
- int verbose;
+ strarray_t to_delete;
 };
 
 /*
@@ -125,7 +129,7 @@
 
 /* no negative or empty numbers please */
 if (!*s || *s == '-')
- return 0;
+	return 0;
 
 val = strtod(s, &end);
 /* Allow 'd', 'h', 'm' and 's' as end, else return error. */
@@ -155,26 +159,144 @@
 return 1;
 }
 
+static int expunge_userflags(struct mailbox *mailbox, struct expire_rock *erock)
+{
+ unsigned int i;
+ int r;
+
+ for (i = 0; i < MAX_USER_FLAGS; i++) {
+	if (erock->userflagsi/32 & 1<<(i&31))
+	 continue;
+	if (verbose)
+	 fprintf(stderr, "Expunging userflag %u (%s) from %s\n",
+		 i, mailbox->flagnamei, mailbox->name);
+	r = mailbox_remove_user_flag(mailbox, i);
+	if (r) return r;
+	erock->userflags_expunged++;
+ }
+
+ return 0;
+}
+
 /*
 * mailbox_expunge() callback to expunge expired articles.
 */
-static unsigned expire_cb(struct mailbox *mailbox __attribute__((unused)), 
-			 struct index_record *record, 
+static unsigned expire_cb(struct mailbox *mailbox __attribute__((unused)),
+			 struct index_record *record,
 			 void *rock)
 {
 struct expire_rock *erock = (struct expire_rock *) rock;
-
- erock->messages++;
+ unsigned int i;
 
 /* otherwise, we're expiring messages by sent date */
 if (record->gmtime < erock->expire_mark) {
-	erock->deleted++;
+	erock->messages_expired++;
 	return 1;
 }
 
+ /* record which user flags are set */
+ for (i = 0; i < (MAX_USER_FLAGS/32); i++)
+	erock->userflagsi |= record->user_flagsi;
+
+ return 0;
+}
+
+/*
+ * mailbox_expunge() callback to *only* count userflags.
+ */
+static unsigned userflag_cb(struct mailbox *mailbox __attribute__((unused)),
+			 struct index_record *record,
+			 void *rock)
+{
+ struct expire_rock *erock = (struct expire_rock *) rock;
+ unsigned int i;
+
+ /* record which user flags are set */
+ for (i = 0; i < (MAX_USER_FLAGS/32); i++)
+	erock->userflagsi |= record->user_flagsi;
+
+ return 0;	/* always keep the message */
+}
+
+static unsigned archive_cb(struct mailbox *mailbox,
+			 struct index_record *record,
+			 void *rock)
+{
+ time_t cutoff = *((time_t *)rock);
+
+ /* never pull messages back from the archives */
+ if (record->system_flags & FLAG_ARCHIVED)
+	return 1;
+
+ /* always archive big messages */
+ if (max_archive_size && max_archive_size <= record->size)
+	return 1;
+
+ /* archive everything in DELETED mailboxes */
+ if (mboxname_isdeletedmailbox(mailbox->name, NULL))
+	return 1;
+
+ /* Calendar and Addressbook are small files and need to be hot */
+ if (mailbox->mbtype & MBTYPE_ADDRESSBOOK)
+	return 0;
+ if (mailbox->mbtype & MBTYPE_CALENDAR)
+	return 0;
+
+ /* don't archive flagged messages - XXX, optional? */
+ if (keep_flagged && (record->system_flags & FLAG_FLAGGED))
+	return 0;
+
+ /* archive all other old messages */
+ if (record->internaldate < cutoff)
+	return 1;
+
+ /* and don't archive anything else! */
 return 0;
 }
 
+static int archive(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)),
+		 size_t datalen __attribute__((unused)))
+{
+ char *name = xstrndup(key, keylen);
+ int r;
+ mbentry_t *mbentry = NULL;
+ struct mailbox *mailbox = NULL;
+
+ if (sigquit)
+	return 1;
+
+ /* Skip mailboxes with errors */
+ r = mboxlist_lookup(name, &mbentry, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT)
+	goto done;
+ if (r) {
+	if (verbose)
+	 printf("error looking up %s: %s\n", name, error_message(r));
+	goto done;
+ }
+
+ if (mbentry->mbtype & MBTYPE_REMOTE)
+	goto done;
+
+ r = mailbox_open_iwl(name, &mailbox);
+ if (r) {
+	/* mailbox corrupt/nonexistent -- skip it */
+	syslog(LOG_WARNING, "unable to open mailbox %s: %s",
+	 name, error_message(r));
+	goto done;
+ }
+
+ mailbox_archive(mailbox, archive_cb, rock);
+
+done:
+ mboxlist_entry_free(&mbentry);
+ mailbox_close(&mailbox);
+
+ /* move on to the next mailbox regardless of errors */
+ return 0;
+}
 
 /*
 * mboxlist_findall() callback function to:
@@ -182,179 +304,206 @@
 * - build a hash table of mailboxes in which we expired messages,
 * - and perform a cleanup of expunged messages
 */
-int expire(char *name, int matchlen, int maycreate __attribute__((unused)),
-	 void *rock)
+static int expire(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)),
+		 size_t datalen __attribute__((unused)))
 {
- struct mboxlist_entry mbentry;
+ char *name = xstrndup(key, keylen);
+ mbentry_t *mbentry = NULL;
 struct expire_rock *erock = (struct expire_rock *) rock;
- char bufMAX_MAILBOX_BUFFER = "", *p;
- struct annotation_data attrib;
- int r, domainlen = 0;
+ char *buf;
+ struct buf attrib = BUF_INITIALIZER;
+ int r;
 struct mailbox *mailbox = NULL;
- unsigned numdeleted = 0;
+ unsigned numexpunged = 0;
+ int expire_seconds = 0;
+ int did_expunge = 0;
 
 if (sigquit) {
 	return 1;
 }
- /* Skip remote mailboxes */
 r = mboxlist_lookup(name, &mbentry, NULL);
+
+ /* Skip deleted mailboxes */
+ if (r == IMAP_MAILBOX_NONEXISTENT)
+	return 0;
+
 if (r) {
-	if (erock->verbose) {
+	if (verbose) {
 	 printf("error looking up %s: %s\n", name, error_message(r));
 	}
-	return 1;
+	syslog(LOG_ERR, "IOERROR: error looking up %s: %s\n", name, error_message(r));
+	return 0; /* still keep going */
 }
- if (mbentry.mbtype & MBTYPE_REMOTE) return 0;
 
- if (config_virtdomains && (p = strchr(name, '!')))
-	domainlen = p - name + 1;
+ /* Skip remote mailboxes */
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	mboxlist_entry_free(&mbentry);
+	return 0;
+ }
+ mboxlist_entry_free(&mbentry);
 
- strncpy(buf, name, matchlen);
- bufmatchlen = '\0';
+ buf = xstrdup(name);
 
 /* see if we need to expire messages.
 * since mailboxes inherit /vendor/cmu/cyrus-imapd/expire,
 * we need to iterate all the way up to "" (server entry)
 */
- if (erock->skip_annotate) {
- /* we don't want to check for annotations, so we didn't find any */
- attrib.value = 0;
- }
- else {
- while (1) {
+ if (!erock->skip_annotate) {
+	do {
+	 buf_free(&attrib);
 	 r = annotatemore_lookup(buf, "/vendor/cmu/cyrus-imapd/expire", "",
 				 &attrib);
- 
+
 	 if (r ||				/* error */
-	 attrib.value ||			/* found an entry */
-	 !buf0 ||				/* done recursing */
-	 !strcmp(buf+domainlen, "user")) {	/* server entry doesn't apply
-						 to personal mailboxes */
-	 break;
-	 }
- 
-	 p = strrchr(buf, '.');			/* find parent mailbox */
- 
-	 if (p && (p - buf > domainlen))		/* don't split subdomain */
-	 *p = '\0';
-	 else if (!bufdomainlen)		/* server entry */
-	 buf0 = '\0';
-	 else					/* domain entry */
-	 bufdomainlen = '\0';
- }
+		attrib.s)			/* found an entry */
+		break;
+
+	} while (mboxname_make_parent(buf));
 }
+ free(buf);
+
+ memset(erock->userflags, 0, sizeof(erock->userflags));
 
 r = mailbox_open_iwl(name, &mailbox);
 if (r) {
 	/* mailbox corrupt/nonexistent -- skip it */
-	syslog(LOG_WARNING, "unable to open mailbox %s", name);
+	syslog(LOG_WARNING, "unable to open mailbox %s: %s",
+	 name, error_message(r));
 	return 0;
 }
 
- if (attrib.value) {
-	/* XXX - stats are bound to be bogus... */
-	erock->mailboxes++;
-	erock->expire_mark = 0;
-
-	if (attrib.value) {
-	 /* add mailbox to table */
-	 unsigned long expire_days = strtoul(attrib.value, NULL, 10);
-	 time_t *expire_mark = (time_t *) xmalloc(sizeof(time_t));
-
-	 *expire_mark = expire_days ?
-		time(0) - (expire_days * 60 * 60 * 24) : 0 /* never */ ;
-	 hash_insert(name, (void *) expire_mark, erock->table);
+ if (attrib.s && parse_duration(attrib.s, &expire_seconds)) {
+	/* add mailbox to table */
+	erock->expire_mark = expire_seconds ?
+			 time(0) - expire_seconds : 0 /* never */ ;
+	hash_insert(name,
+		 xmemdup(&erock->expire_mark, sizeof(erock->expire_mark)),
+		 &erock->table);
 
-	 if (erock->verbose) {
+	if (expire_seconds) {
+	 if (verbose) {
 		fprintf(stderr,
-			"expiring messages in %s older than %ld days\n",
-			name, expire_days);
+			"expiring messages in %s older than %0.2f days\n",
+			name, ((double)expire_seconds/86400));
 	 }
 
-	 erock->expire_mark = *expire_mark;
-	}
-
-	r = mailbox_expunge(mailbox, expire_cb, erock, NULL);
-	if (r) {
-	 syslog(LOG_ERR, "failed to expire old messages: %s", mailbox->name);
+	 r = mailbox_expunge(mailbox, expire_cb, erock, NULL,
+				EVENT_MESSAGE_EXPIRE);
+	 if (r)
+		syslog(LOG_ERR, "failed to expire old messages: %s", mailbox->name);
+	 did_expunge = 1;
 	}
 }
+ buf_free(&attrib);
+
+ if (!did_expunge && erock->do_userflags) {
+	r = mailbox_expunge(mailbox, userflag_cb, erock, NULL,
+			 EVENT_MESSAGE_EXPIRE);
+	if (r)
+	 syslog(LOG_ERR, "failed to scan user flags for %s: %s",
+		 mailbox->name, error_message(r));
+ }
 
- r = mailbox_expunge_cleanup(mailbox, erock->expunge_mark, &numdeleted);
+ erock->messages_seen += mailbox->i.num_records;
 
- erock->deleted += numdeleted;
- erock->mailboxes++;
- erock->messages += mailbox->i.num_records;
+ if (erock->do_userflags)
+	expunge_userflags(mailbox, erock);
 
- mailbox_close(&mailbox);
+ r = mailbox_expunge_cleanup(mailbox, erock->expunge_mark, &numexpunged);
+
+ erock->messages_expunged += numexpunged;
+ erock->mailboxes_seen++;
 
 if (r) {
 	syslog(LOG_WARNING, "failure expiring %s: %s", name, error_message(r));
+	annotate_state_abort(&mailbox->annot_state);
 }
 
+ mailbox_close(&mailbox);
+
 /* Even if we had a problem with one mailbox, continue with the others */
 return 0;
 }
 
-int delete(char *name,
-	 int matchlen __attribute__((unused)),
-	 int maycreate __attribute__((unused)),
-	 void *rock)
+static int delete(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)),
+		 size_t datalen __attribute__((unused)))
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
+ char *name = xstrndup(key, keylen);
 struct delete_rock *drock = (struct delete_rock *) rock;
- char *p;
- int i, r, domainlen = 0;
- struct delete_node *node;
+ int r;
 time_t timestamp;
 
 if (sigquit) {
 	return 1;
 }
- if (config_virtdomains && (p = strchr(name, '!')))
-	domainlen = p - name + 1;
 
 /* check if this is a mailbox we want to examine */
- if (strncmp(name+domainlen, drock->prefix, drock->prefixlen))
+ if (!mboxname_isdeletedmailbox(name, &timestamp))
 	return 0;
 
 /* Skip remote mailboxes */
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) {
-	if (drock->verbose) {
+	if (verbose) {
 	 printf("error looking up %s: %s\n", name, error_message(r));
 	}
 	return 1;
 }
- if (mbentry.mbtype & MBTYPE_REMOTE) return 0;
 
- /* Sanity check for 8 hex digits only at the end */
- p = strrchr(name, '.');
- if (!p) return(0);
- p++;
-
- for (i = 0 ; i < 7; i++) {
- if (!Uisxdigit(pi)) return(0);
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	mboxlist_entry_free(&mbentry);
+	return 0;
 }
- if (p8 != '\0') return(0);
+ mboxlist_entry_free(&mbentry);
 
- timestamp = strtoul(p, NULL, 16);
 if ((timestamp == 0) || (timestamp > drock->delete_mark))
- return(0);
+	return 0;
 
 /* Add this mailbox to list of mailboxes to delete */
- node = xmalloc(sizeof(struct delete_node));
- node->next = NULL;
- node->name = xstrdup(name);
-
- if (drock->tail) {
-	drock->tail->next = node;
-	drock->tail = node;
- } else {
-	drock->head = drock->tail = node;
- }
+ strarray_append(&drock->to_delete, name);
+
 return(0);
 }
+
+static int expire_conversations(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)),
+		 size_t datalen __attribute__((unused)))
+{
+ char *name = xstrndup(key, keylen);
+ struct conversations_rock *crock = (struct conversations_rock *)rock;
+ char *filename = conversations_getmboxpath(name);
+ struct conversations_state *state = NULL;
+ unsigned int nseen = 0, ndeleted = 0;
+
+ if (!filename) goto out;
+
+ if (hash_lookup(filename, &crock->seen))
+	goto out;
+ hash_insert(filename, (void *)1, &crock->seen);
+
+ if (verbose)
+	fprintf(stderr, "Pruning conversations from db %s\n", filename);
+
+ if (!conversations_open_path(filename, &state)) {
+	conversations_prune(state, crock->expire_mark, &nseen, &ndeleted);
+	conversations_commit(&state);
+ }
+
+ crock->databases_seen++;
+ crock->msgids_seen += nseen;
+ crock->msgids_expired += ndeleted;
+
+out:
+ free(filename);
+ return 0;
+}
+
 static void sighandler (int sig __attribute((unused)))
 {
 sigquit = 1;
@@ -364,33 +513,45 @@
 int main(int argc, char *argv)
 {
 extern char *optarg;
- int opt, r = 0, do_expunge = 1;
+ int opt, r = 0;
+ int do_expunge = 1;	/* gnb:TODO bool */
 int expunge_seconds = -1;
+ int archive_seconds = -1;
 int delete_seconds = -1;
 int expire_seconds = 0;
+ int cid_expire_seconds;
+ int do_cid_expire = -1;
 char *alt_config = NULL;
- char *find_prefix = NULL;
- char buf100;
- struct hash_table expire_table;
+ const char *find_prefix = NULL;
+ const char *do_user = NULL;
 struct expire_rock erock;
 struct delete_rock drock;
- const char *deletedprefix;
+ struct conversations_rock crock;
 struct sigaction action;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
 /* zero the expire_rock & delete_rock */
 memset(&erock, 0, sizeof(erock));
+ construct_hash_table(&erock.table, 10000, 1);
 memset(&drock, 0, sizeof(drock));
+ strarray_init(&drock.to_delete);
+ memset(&crock, 0, sizeof(crock));
+ construct_hash_table(&crock.seen, 100, 1);
 
- while ((opt = getopt(argc, argv, "C:D:E:X:p:vax")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:D:E:X:A:p:u:vaxtcFS:")) != EOF) {
 	switch (opt) {
 	case 'C': /* alt config file */
 	 alt_config = optarg;
 	 break;
 
+	case 'A':
+	 if (archive_seconds >= 0) usage();
+	 if (!parse_duration(optarg, &archive_seconds)) usage();
+	 break;
+
 	case 'D':
 	 if (delete_seconds >= 0) usage();
 	 if (!parse_duration(optarg, &delete_seconds)) usage();
@@ -406,44 +567,75 @@
 	 if (!parse_duration(optarg, &expunge_seconds)) usage();
 	 break;
 
-	case 'x':
-	 if (!do_expunge) usage();
-	 do_expunge = 0;
+	case 'F':
+	 keep_flagged = 0;
+	 break;
+
+	case 'S':
+	 max_archive_size = atoi(optarg); /* bytes, yo */
 	 break;
 
 	case 'p':
 	 find_prefix = optarg;
 	 break;
 
+	case 'u':
+	 do_user = optarg;
+	 break;
+
 	case 'v':
-	 erock.verbose++;
-	 drock.verbose++;
+	 verbose++;
 	 break;
 
 	case 'a':
 	 erock.skip_annotate = 1;
 	 break;
 
+	case 'x':
+	 if (!do_expunge) usage();
+	 do_expunge = 0;
+	 break;
+
+	case 't':
+	 erock.do_userflags = 1;
+	 break;
+
+	case 'c':
+	 if (!do_cid_expire) usage();
+	 do_cid_expire = 0;
+	 break;
+
 	default:
 	 usage();
 	 break;
 	}
 }
 
- if (!expire_seconds) usage();
+ if (!expire_seconds &&
+	delete_seconds == -1 &&
+	expunge_seconds == -1 &&
+	archive_seconds == -1 &&
+	!erock.do_userflags)
+	usage();
 
 sigemptyset(&action.sa_mask);
 action.sa_flags = 0;
 action.sa_handler = sighandler;
- if (sigaction(SIGQUIT, &action, NULL) < 0) {
- fatal("unable to install signal handler for %d: %m", SIGQUIT);
- }
-
- cyrus_init(alt_config, "cyr_expire", 0);
+ if (sigaction(SIGQUIT, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGQUIT", EC_TEMPFAIL);
+ if (sigaction(SIGINT, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGINT", EC_TEMPFAIL);
+ if (sigaction(SIGTERM, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGTERM", EC_TEMPFAIL);
+
+ cyrus_init(alt_config, "cyr_expire", 0, 0);
 global_sasl_init(1, 0, NULL);
 
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ if (do_cid_expire < 0)
+	do_cid_expire = config_getswitch(IMAPOPT_CONVERSATIONS);
+
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 mboxlist_init(0);
 mboxlist_open(NULL);
@@ -452,109 +644,171 @@
 quotadb_init(0);
 quotadb_open(NULL);
 
- if (duplicate_init(NULL, 0) != 0) {
-	fprintf(stderr, 
+ /* setup for mailbox event notifications */
+ mboxevent_init();
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&expire_namespace, 1)) != 0) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ mboxevent_setnamespace(&expire_namespace);
+
+ if (duplicate_init(NULL) != 0) {
+	fprintf(stderr,
 		"cyr_expire: unable to init duplicate delivery database\n");
 	exit(1);
 }
 
- /* xxx better way to determine a size for this table? */
- construct_hash_table(&expire_table, 10000, 1);
+ if (archive_seconds >= 0) {
+	time_t archive_mark = time(0) - archive_seconds;
+	if (do_user)
+	 mboxlist_allusermbox(do_user, archive, &archive_mark, /*include_deleted*/1);
+	else
+	 mboxlist_allmbox(find_prefix, archive, &archive_mark, /*include_deleted*/1);
+	/* XXX - add syslog? */
+ }
 
- if (do_expunge) {
+ if (do_expunge && (expunge_seconds >= 0 || expire_seconds || erock.do_userflags)) {
+	/* xxx better way to determine a size for this table? */
 
 	/* expire messages from mailboxes,
 	 * build a hash table of mailboxes in which we expired messages,
-	 * so we can prune those immediately from the duplicate db.
+	 * and perform a cleanup of expunged messages
 	 */
-	erock.table = &expire_table;
 	if (expunge_seconds < 0) {
 	 erock.expunge_mark = 0;
 	} else {
 	 erock.expunge_mark = time(0) - expunge_seconds;
 
-	 if (erock.verbose) {
+	 if (verbose) {
 		fprintf(stderr,
 			"Expunging deleted messages in mailboxes older than %0.2f days\n",
 			((double)expunge_seconds/86400));
 	 }
 	}
 
-	if (find_prefix) {
-	 strlcpy(buf, find_prefix, sizeof(buf));
-	} else {
-	 strlcpy(buf, "*", sizeof(buf));
+	if (do_user)
+	 mboxlist_allusermbox(do_user, expire, &erock, /*include_deleted*/1);
+	else
+	 mboxlist_allmbox(find_prefix, expire, &erock, /*include_deleted*/1);
+
+	syslog(LOG_NOTICE, "Expired %lu and expunged %lu out of %lu "
+			 "messages from %lu mailboxes",
+			 erock.messages_expired,
+			 erock.messages_expunged,
+			 erock.messages_seen,
+			 erock.mailboxes_seen);
+	if (erock.do_userflags)
+	 syslog(LOG_NOTICE, "Expunged %lu user flags",
+			 erock.userflags_expunged);
+	if (verbose) {
+	 fprintf(stderr, "\nExpired %lu and expunged %lu out of %lu "
+			 "messages from %lu mailboxes\n",
+			 erock.messages_expired,
+			 erock.messages_expunged,
+			 erock.messages_seen,
+			 erock.mailboxes_seen);
+	 if (erock.do_userflags)
+		fprintf(stderr, "Expunged %lu user flags\n",
+			 erock.userflags_expunged);
 	}
+ }
+ if (sigquit) {
+	goto finish;
+ }
 
-	mboxlist_findall(NULL, buf, 1, 0, 0, &expire, &erock);
-
-	syslog(LOG_NOTICE, "Expunged %lu out of %lu messages from %lu mailboxes",
-	 erock.deleted, erock.messages, erock.mailboxes);
-	if (erock.verbose) {
-	 fprintf(stderr, "\nExpunged %lu out of %lu messages from %lu mailboxes\n",
-		 erock.deleted, erock.messages, erock.mailboxes);
-	}
+ if (do_cid_expire) {
+	cid_expire_seconds = config_getint(IMAPOPT_CONVERSATIONS_EXPIRE_DAYS) * 86400;
+	crock.expire_mark = time(0) - cid_expire_seconds;
+
+	if (verbose)
+	 fprintf(stderr,
+		 "Removing conversation entries older than %0.2f days\n",
+		 (double)(cid_expire_seconds/86400));
+
+	if (do_user)
+	 mboxlist_allusermbox(do_user, expire_conversations, &crock, /*include_deleted*/1);
+	else
+	 mboxlist_allmbox(find_prefix, expire_conversations, &crock, /*include_deleted*/1);
+
+	syslog(LOG_NOTICE, "Expired %lu entries of %lu entries seen "
+			 "in %lu conversation databases",
+			 crock.msgids_expired,
+			 crock.msgids_seen,
+			 crock.databases_seen);
+	if (verbose)
+	 fprintf(stderr, "Expired %lu entries of %lu entries seen "
+			 "in %lu conversation databases\n",
+			 crock.msgids_expired,
+			 crock.msgids_seen,
+			 crock.databases_seen);
 }
+
 if (sigquit) {
 	goto finish;
 }
 
 if ((delete_seconds >= 0) && mboxlist_delayed_delete_isenabled() &&
-	(deletedprefix = config_getstring(IMAPOPT_DELETEDPREFIX))) {
- struct delete_node *node;
- int count = 0;
+	config_getstring(IMAPOPT_DELETEDPREFIX)) {
+	int count = 0;
+	int i;
 
- if (drock.verbose) {
- fprintf(stderr,
+	if (verbose) {
+	 fprintf(stderr,
 		 "Removing deleted mailboxes older than %0.2f days\n",
 		 ((double)delete_seconds/86400));
- }
+	}
 
- strlcpy(drock.prefix, deletedprefix, sizeof(drock.prefix));
- strlcat(drock.prefix, ".", sizeof(drock.prefix));
- drock.prefixlen = strlen(drock.prefix);
- drock.delete_mark = time(0) - delete_seconds;
- drock.head = NULL;
- drock.tail = NULL;
+	drock.delete_mark = time(0) - delete_seconds;
 
- mboxlist_findall(NULL, buf, 1, 0, 0, &delete, &drock);
+	if (do_user)
+	 mboxlist_allusermbox(do_user, delete, &drock, /*include_deleted*/1);
+	else
+	 mboxlist_allmbox(find_prefix, delete, &drock, /*include_deleted*/1);
+
+	for (i = 0 ; i < drock.to_delete.count ; i++) {
+	 char *name = drock.to_delete.datai;
 
- for (node = drock.head ; node ; node = node->next) {
 	 if (sigquit) {
 		goto finish;
 	 }
- if (drock.verbose) {
- fprintf(stderr, "Removing: %s\n", node->name);
- }
- r = mboxlist_deletemailbox(node->name, 1, NULL, NULL, 0, 0, 0);
- count++;
- }
-
- if (drock.verbose) {
- if (count != 1) {
- fprintf(stderr, "Removed %d deleted mailboxes\n", count);
- } else {
- fprintf(stderr, "Removed 1 deleted mailbox\n");
- }
- }
- syslog(LOG_NOTICE, "Removed %d deleted mailboxes", count);
+	 if (verbose) {
+		fprintf(stderr, "Removing: %s\n", name);
+	 }
+	 r = mboxlist_deletemailbox(name, 1, NULL, NULL, NULL, 0, 0, 0);
+	 count++;
+	}
+
+	if (verbose) {
+	 if (count != 1) {
+		fprintf(stderr, "Removed %d deleted mailboxes\n", count);
+	 } else {
+		fprintf(stderr, "Removed 1 deleted mailbox\n");
+	 }
+	}
+	syslog(LOG_NOTICE, "Removed %d deleted mailboxes", count);
 }
 if (sigquit) {
 	goto finish;
 }
 
 /* purge deliver.db entries of expired messages */
- r = duplicate_prune(expire_seconds, &expire_table);
+ if (expire_seconds > 0)
+	r = duplicate_prune(expire_seconds, &erock.table);
 
 finish:
- free_hash_table(&expire_table, free);
+ free_hash_table(&erock.table, free);
+ free_hash_table(&crock.seen, NULL);
+ strarray_fini(&drock.to_delete);
 
 quotadb_close();
 quotadb_done();
 mboxlist_close();
 mboxlist_done();
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 duplicate_done();
 sasl_done();
 cyrus_done();

cyrus-imapd-2.5.tar.gz/imap/cyr_info.c Added

@@ -0,0 +1,374 @@
+/* ctl_info.c - tool to get information about cyrus
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "global.h"
+#include "exitcodes.h"
+#include "libcyr_cfg.h"
+#include "proc.h"
+#include "util.h"
+#include "../master/masterconf.h"
+#include "xmalloc.h"
+
+/* config.c stuff */
+const char *MASTER_CONFIG_FILENAME = DEFAULT_MASTER_CONFIG_FILENAME;
+
+struct service_item {
+ char *prefix;
+ int prefixlen;
+ struct service_item *next;
+};
+
+static void usage(void)
+{
+ fprintf(stderr, "cyr_info -C <altconfig> -M <cyrus.conf> -n servicename command\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "If you give a service name, it will show config as if you were\n");
+ fprintf(stderr, "running that service, i.e. imap\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Where command is one of:\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, " * proc - listing of all open processes\n");
+ fprintf(stderr, " * allconf - listing of all config values\n");
+ fprintf(stderr, " * conf - listing of non-default config values\n");
+ fprintf(stderr, " * lint - unknown config keys\n");
+ cyrus_done();
+ exit(-1);
+}
+
+static int print_procinfo(pid_t pid,
+			 const char *servicename, const char *host,
+			 const char *user, const char *mailbox,
+			 const char *cmdname,
+			 void *rock __attribute__((unused)))
+{
+ printf("%d %s %s", (int)pid, servicename, host);
+ if (user) printf(" %s", user);
+ if (mailbox) printf(" %s", mailbox);
+ if (cmdname) printf(" %s", cmdname);
+ printf("\n");
+ return 0;
+}
+
+static void do_proc(void)
+{
+ proc_foreach(print_procinfo, NULL);
+}
+
+static void print_overflow(const char *key, const char *val,
+			 void *rock __attribute__((unused)))
+{
+ printf("%s: %s\n", key, val);
+}
+
+static void do_conf(int only_changed)
+{
+ int i;
+ unsigned j;
+
+ /* XXX: this is semi-sorted, but the overflow strings aren't sorted at all */
+
+ for (i = 1; i < IMAPOPT_LAST; i++) {
+	switch (imapoptsi.t) {
+	case OPT_STRING:
+	case OPT_STRINGLIST:
+	 if (only_changed) {
+		const char *defvalue = imapoptsi.def.s;
+		char *freeme = NULL;
+
+		if (defvalue &&
+		 !strncasecmp(defvalue, "{configdirectory}", 17))
+		{
+		 freeme = strconcat(imapoptsIMAPOPT_CONFIGDIRECTORY.val.s,
+				 defvalue+17, (char *)NULL);
+		 defvalue = freeme;
+		}
+		if (!strcmpsafe(defvalue, imapoptsi.val.s)) {
+		 free(freeme);
+		 break;
+		}
+		free(freeme);
+	 }
+	 printf("%s: %s\n", imapoptsi.optname, imapoptsi.val.s ? imapoptsi.val.s : "");
+	 break;
+	case OPT_INT:
+	 if (only_changed) {
+		if (imapoptsi.def.i == imapoptsi.val.i) break;
+	 }
+	 printf("%s: %ld\n", imapoptsi.optname, imapoptsi.val.i);
+	 break;
+	case OPT_SWITCH:
+	 if (only_changed) {
+		if (imapoptsi.def.b == imapoptsi.val.b) break;
+	 }
+	 printf("%s: %s\n", imapoptsi.optname, imapoptsi.val.b ? "yes" : "no");
+	 break;
+	case OPT_ENUM:
+	 if (only_changed) {
+		if (imapoptsi.def.e == imapoptsi.val.e) break;
+	 }
+	 printf("%s:", imapoptsi.optname);
+	 for (j = 0; imapoptsi.enum_optionsj.name; j++) {
+		if (imapoptsi.val.e == imapoptsi.enum_optionsj.val) {
+		 printf(" %s", imapoptsi.enum_optionsj.name);
+		 break;
+		}
+	 }
+	 printf("\n");
+	 break;
+	case OPT_BITFIELD:
+	 if (only_changed) {
+		if (imapoptsi.def.x == imapoptsi.val.x) break;
+	 }
+	 printf("%s:", imapoptsi.optname);
+	 for (j = 0; imapoptsi.enum_optionsj.name; j++) {
+		if (imapoptsi.val.x & (1<<j)) {
+		 printf(" %s", imapoptsi.enum_optionsj.name);
+		}
+	 }
+	 printf("\n");
+	 break;
+	default:
+	 abort();
+	}
+ }
+
+ /* and the overflows */
+ config_foreachoverflowstring(print_overflow, NULL);
+}
+
+static int known_overflowkey(const char *key)
+{
+ const char *match;
+ /* any partition is OK (XXX: are there name restrictions to check?) */
+ if (!strncmp(key, "partition-", 10)) return 1;
+
+ /* only valid if there's a partition with the same name */
+ if (!strncmp(key, "metapartition-", 14)) {
+	if (config_getoverflowstring(key+4, NULL))
+	 return 1;
+ }
+
+ match = strstr(key, "searchpartition-");
+ if (match) {
+	if (config_getoverflowstring(match+6, NULL))
+	 return 1;
+ }
+
+ return 0;
+}
+
+static int known_regularkey(const char *key)
+{
+ int i;
+
+ for (i = 1; i < IMAPOPT_LAST; i++) {
+	if (!strcmp(imapoptsi.optname, key))
+	 return 1;
+ }
+
+ return 0;
+}
+
+static int known_saslkey(const char *key __attribute__((unused)))
+{
+ /* XXX - we don't know all the sasl keys, assume it's OK! */
+ return 1;
+} 
+
+static void lint_callback(const char *key, const char *val, void *rock) 
+{
+ struct service_item *known_services = (struct service_item *)rock;
+ struct service_item *svc;
+
+ if (known_overflowkey(key)) return;
+
+ if (!strncmp(key, "sasl_", 5)) {
+	if (known_saslkey(key+5)) return;
+ }
+
+ for (svc = known_services; svc; svc = svc->next) {
+	if (!strncmp(key, svc->prefix, svc->prefixlen)) {
+	 /* check if it's a known key */
+	 if (known_regularkey(key+svc->prefixlen)) return;
+	 if (known_overflowkey(key+svc->prefixlen)) return;
+	}
+ }
+
+ printf("%s: %s\n", key, val);
+}
+
+static void add_service(const char *name,
+			struct entry *e __attribute__((unused)),
+			void *rock)
+{
+ struct service_item **ksp = (struct service_item **)rock;
+ struct service_item *knew = xmalloc(sizeof(struct service_item));
+ knew->prefix = strconcat(name, "_", (char *)NULL);
+ knew->prefixlen = strlen(knew->prefix);
+ knew->next = *ksp;
+ *ksp = knew;
+}
+
+static void do_lint(void)
+{
+ struct service_item *ks = NULL;
+
+ /* pull the config from cyrus.conf to get service names */
+ masterconf_getsection("SERVICES", &add_service, &ks);
+
+ /* check all overflow strings */
+ config_foreachoverflowstring(lint_callback, ks);
+
+ /* XXX - check directories and permissions? */
+
+ /* clean up */
+ while (ks) {
+	struct service_item *next = ks->next;
+	free(ks->prefix);
+	free(ks);
+	ks = next;
+ }
+}
+
+static void do_reid(const char *mboxname)
+{
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ int r;
+
+ annotate_init(NULL, NULL);
+ annotatemore_open();
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ r = mailbox_open_iwl(mboxname, &mailbox);
+ if (r) return;
+
+ mailbox_make_uniqueid(mailbox);
+
+ r = mboxlist_lookup(mboxname, &mbentry, NULL);
+ if (r) return;
+
+ free(mbentry->uniqueid);
+ mbentry->uniqueid = xstrdup(mailbox->uniqueid);
+
+ mboxlist_update(mbentry, 0);
+
+ mailbox_close(&mailbox);
+
+ mboxlist_close();
+ mboxlist_done();
+
+ annotatemore_close();
+ annotate_done();
+
+ printf("did reid %s\n", mboxname);
+}
+
+int main(int argc, char *argv)
+{
+ extern char *optarg;
+ int opt;
+ char *alt_config = NULL;
+ char *srvname = "cyr_info";
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((opt = getopt(argc, argv, "C:M:n:")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'M': /* alt cyrus.conf file */
+	 MASTER_CONFIG_FILENAME = optarg;
+	 break;
+
+	case 'n':
+	 srvname = optarg;
+	 break;
+
+	default:
+	 usage();
+	 break;
+	}
+ }
+
+ cyrus_init(alt_config, srvname, 0, 0);
+
+ if (optind >= argc)
+	usage();
+
+ if (!strcmp(argvoptind, "proc"))
+	do_proc();
+ else if (!strcmp(argvoptind, "allconf"))
+	do_conf(0);
+ else if (!strcmp(argvoptind, "conf"))
+	do_conf(1);
+ else if (!strcmp(argvoptind, "lint"))
+	do_lint();
+ else if (!strcmp(argvoptind, "reid")) {
+	if (optind + 1 >= argc)
+	 usage();
+	do_reid(argvoptind+1);
+ }
+ else
+	usage();
+
+ cyrus_done();
+
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/cyr_sequence.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_sequence.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyr_dbtool.c,v 1.8 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -50,29 +48,18 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <ctype.h>
-#include <syslog.h>
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
 
-#include "acl.h"
-#include "assert.h"
 #include "sequence.h"
-#include "auth.h"
-#include "exitcodes.h"
-#include "glob.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "util.h"
-#include "xmalloc.h"
-
-const int config_need_data = 0;
 
 static void usage(const char *name)
 {
@@ -116,7 +103,8 @@
 	
 if ((argc - optind) < 1) usage(argv0);
 
- cyrus_init(alt_config, "cyr_sequence", 0);
+
+ cyrus_init(alt_config, "cyr_sequence", 0, 0);
 
 /* special case */
 if (!strcmp(argvoptind, "create")) {

cyrus-imapd-2.5.tar.gz/imap/cyr_sphinxmgr.c Added

@@ -0,0 +1,1380 @@
+/* cyr_sphinxmgr.c - daemon for managing Sphinx index daemons
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <syslog.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdlib.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/poll.h>
+
+#include "mboxname.h"
+#include "mboxlist.h"
+#include "imap/imap_err.h"
+#include "global.h"
+#include "retry.h"
+#include "command.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+#include "xmalloc.h"
+#include "hash.h"
+#include "exitcodes.h"
+
+/* Various locations, relative to the Sphinx base directory */
+#define SOCKET_PATH	 "/searchd.sock"
+#define SPHINX_CONFIG	 "/sphinx.conf"
+#define SPHINX_PIDFILE	 "/searchd.pid"
+#define SEARCHD		 "/usr/bin/searchd"
+
+#define STOPWAIT_DELAY_MS 50	/* 50 millisec */
+#define STOPWAIT_MAX_TRIES (20*1000/STOPWAIT_DELAY_MS)	/* 20 sec */
+
+extern int optind;
+extern char *optarg;
+
+static int verbose = 0;
+static int server_sock;
+static int sphinx_timeout;
+static int max_children;
+static int num_started;	/* number of children in STARTED state */
+static const char *syslog_prefix;
+
+typedef struct indexd indexd_t;
+struct indexd {
+ /* There is no visible STARTING state because
+ * starting searchd is synchronous */
+ enum { STOPPED, STARTED, STOPPING } state;
+ char *basedir;	/* also used as the key */
+ char *socketpath;
+ time_t started;	/* for debugging */
+ time_t used;
+ time_t stopped;	/* when entered STOPPING state; for debugging */
+ struct indexd *prev;
+ struct indexd *next;
+};
+static struct hash_table itable;
+
+static struct indexd indexroot;
+
+static void shut_down(int code) __attribute__((noreturn));
+static int indexd_is_running(indexd_t *id);
+
+void fatal(const char *msg, int err)
+{
+ syslog(LOG_ERR, "Fatal error %s, exiting", msg);
+ shut_down(err);
+}
+
+static void indexd_free(indexd_t *id)
+{
+ free(id->basedir);
+ free(id->socketpath);
+ free(id);
+}
+
+static void indexd_set_state(indexd_t *id, unsigned state)
+{
+ if (id->state != state) {
+	if (id->state == STARTED)
+	 num_started--;
+
+	id->state = state;
+
+	if (id->state == STARTED)
+	 num_started++;
+ }
+}
+
+static int indexd_setup_tree(indexd_t *id)
+{
+ static const char * const tobuild = {
+	"",
+	"/binlog",
+	NULL
+ };
+ const char * const *dp;
+ char *path = NULL;
+ int r;
+
+ if (verbose > 1)
+	syslog(LOG_INFO, "setting up tree");
+ for (dp = tobuild ; *dp ; dp++) {
+	free(path);
+	path = strconcat(id->basedir, *dp, "/filename", (char *)NULL);
+	r = cyrus_mkdir(path, 0700);
+	if (r < 0 && errno != EEXIST) {
+	 syslog(LOG_ERR, "IOERROR: unable to mkdir %s: %m", path);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+ }
+ r = 0;
+
+out:
+ free(path);
+ return r;
+}
+
+static int indexd_setup_config(indexd_t *id)
+{
+ static const char config =
+	"index rt\n"
+	"{\n"
+	" type = rt\n"
+	" source = fmindex\n"
+	" path = $sphinxdir/rt\n"
+	" morphology = stem_en\n"
+	" charset_type = utf-8\n"
+	" charset_table = 0..9, A..Z->a..z, _, a..z, \\\n"
+	/* Support for Cyrillic from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cyrillic */
+	"	U+0400->U+0435, U+0401->U+0435, U+0402->U+0452, U+0452, \\\n"
+	"	U+0403->U+0433, U+0404->U+0454, U+0454, U+0405->U+0455, \\\n"
+	"	U+0455, U+0406->U+0456, U+0407->U+0456, U+0457->U+0456, \\\n"
+	"	U+0456, U+0408..U+040B->U+0458..U+045B, U+0458..U+045B, \\\n"
+	"	U+040C->U+043A, U+040D->U+0438, U+040E->U+0443, U+040F->U+045F, \\\n"
+	"	U+045F, U+0450->U+0435, U+0451->U+0435, U+0453->U+0433, \\\n"
+	"	U+045C->U+043A, U+045D->U+0438, U+045E->U+0443, U+0460->U+0461, \\\n"
+	"	U+0461, U+0462->U+0463, U+0463, U+0464->U+0465, U+0465, \\\n"
+	"	U+0466->U+0467, U+0467, U+0468->U+0469, U+0469, U+046A->U+046B, \\\n"
+	"	U+046B, U+046C->U+046D, U+046D, U+046E->U+046F, U+046F, \\\n"
+	"	U+0470->U+0471, U+0471, U+0472->U+0473, U+0473, U+0474->U+0475, \\\n"
+	"	U+0476->U+0475, U+0477->U+0475, U+0475, U+0478->U+0479, U+0479, \\\n"
+	"	U+047A->U+047B, U+047B, U+047C->U+047D, U+047D, U+047E->U+047F, \\\n"
+	"	U+047F, U+0480->U+0481, U+0481, U+048A->U+0438, U+048B->U+0438, \\\n"
+	"	U+048C->U+044C, U+048D->U+044C, U+048E->U+0440, U+048F->U+0440, \\\n"
+	"	U+0490->U+0433, U+0491->U+0433, U+0490->U+0433, U+0491->U+0433, \\\n"
+	"	U+0492->U+0433, U+0493->U+0433, U+0494->U+0433, U+0495->U+0433, \\\n"
+	"	U+0496->U+0436, U+0497->U+0436, U+0498->U+0437, U+0499->U+0437, \\\n"
+	"	U+049A->U+043A, U+049B->U+043A, U+049C->U+043A, U+049D->U+043A, \\\n"
+	"	U+049E->U+043A, U+049F->U+043A, U+04A0->U+043A, U+04A1->U+043A, \\\n"
+	"	U+04A2->U+043D, U+04A3->U+043D, U+04A4->U+043D, U+04A5->U+043D, \\\n"
+	"	U+04A6->U+043F, U+04A7->U+043F, U+04A8->U+04A9, U+04A9, \\\n"
+	"	U+04AA->U+0441, U+04AB->U+0441, U+04AC->U+0442, U+04AD->U+0442, \\\n"
+	"	U+04AE->U+0443, U+04AF->U+0443, U+04B0->U+0443, U+04B1->U+0443, \\\n"
+	"	U+04B2->U+0445, U+04B3->U+0445, U+04B4->U+04B5, U+04B5, \\\n"
+	"	U+04B6->U+0447, U+04B7->U+0447, U+04B8->U+0447, U+04B9->U+0447, \\\n"
+	"	U+04BA->U+04BB, U+04BB, U+04BC->U+04BD, U+04BE->U+04BD, \\\n"
+	"	U+04BF->U+04BD, U+04BD, U+04C0->U+04CF, U+04CF, U+04C1->U+0436, \\\n"
+	"	U+04C2->U+0436, U+04C3->U+043A, U+04C4->U+043A, U+04C5->U+043B, \\\n"
+	"	U+04C6->U+043B, U+04C7->U+043D, U+04C8->U+043D, U+04C9->U+043D, \\\n"
+	"	U+04CA->U+043D, U+04CB->U+0447, U+04CC->U+0447, U+04CD->U+043C, \\\n"
+	"	U+04CE->U+043C, U+04D0->U+0430, U+04D1->U+0430, U+04D2->U+0430, \\\n"
+	"	U+04D3->U+0430, U+04D4->U+00E6, U+04D5->U+00E6, U+04D6->U+0435, \\\n"
+	"	U+04D7->U+0435, U+04D8->U+04D9, U+04DA->U+04D9, U+04DB->U+04D9, \\\n"
+	"	U+04D9, U+04DC->U+0436, U+04DD->U+0436, U+04DE->U+0437, \\\n"
+	"	U+04DF->U+0437, U+04E0->U+04E1, U+04E1, U+04E2->U+0438, \\\n"
+	"	U+04E3->U+0438, U+04E4->U+0438, U+04E5->U+0438, U+04E6->U+043E, \\\n"
+	"	U+04E7->U+043E, U+04E8->U+043E, U+04E9->U+043E, U+04EA->U+043E, \\\n"
+	"	U+04EB->U+043E, U+04EC->U+044D, U+04ED->U+044D, U+04EE->U+0443, \\\n"
+	"	U+04EF->U+0443, U+04F0->U+0443, U+04F1->U+0443, U+04F2->U+0443, \\\n"
+	"	U+04F3->U+0443, U+04F4->U+0447, U+04F5->U+0447, U+04F6->U+0433, \\\n"
+	"	U+04F7->U+0433, U+04F8->U+044B, U+04F9->U+044B, U+04FA->U+0433, \\\n"
+	"	U+04FB->U+0433, U+04FC->U+0445, U+04FD->U+0445, U+04FE->U+0445, \\\n"
+	"	U+04FF->U+0445, U+0410..U+0418->U+0430..U+0438, U+0419->U+0438, \\\n"
+	"	U+0430..U+0438, U+041A..U+042F->U+043A..U+044F, U+043A..U+044F,\\\n"
+	/* and this one was missing dammit */
+	"	U+0418->U+0438, U+0439->U+0438, \\\n"
+	/* Sumerian cuneiform which is fun for testing but seems
+	 * to be broken in Spinx. */
+	/*
+	"	U+12000..U+1237F, \\\n"
+	*/
+	/* Support for Chinese/Japanese/Korean, from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cjk */
+	" U+F900->U+8C48, U+F901->U+66F4, U+F902->U+8ECA, U+F903->U+8CC8, \\\n"
+	" U+F904->U+6ED1, U+F905->U+4E32, U+F906->U+53E5, U+F907->U+9F9C, \\\n"
+	" U+F908->U+9F9C, U+F909->U+5951, U+F90A->U+91D1, U+F90B->U+5587, \\\n"
+	" U+F90C->U+5948, U+F90D->U+61F6, U+F90E->U+7669, U+F90F->U+7F85, \\\n"
+	" U+F910->U+863F, U+F911->U+87BA, U+F912->U+88F8, U+F913->U+908F, \\\n"
+	" U+F914->U+6A02, U+F915->U+6D1B, U+F916->U+70D9, U+F917->U+73DE, \\\n"
+	" U+F918->U+843D, U+F919->U+916A, U+F91A->U+99F1, U+F91B->U+4E82, \\\n"
+	" U+F91C->U+5375, U+F91D->U+6B04, U+F91E->U+721B, U+F91F->U+862D, \\\n"
+	" U+F920->U+9E1E, U+F921->U+5D50, U+F922->U+6FEB, U+F923->U+85CD, \\\n"
+	" U+F924->U+8964, U+F925->U+62C9, U+F926->U+81D8, U+F927->U+881F, \\\n"
+	" U+F928->U+5ECA, U+F929->U+6717, U+F92A->U+6D6A, U+F92B->U+72FC, \\\n"
+	" U+F92C->U+90CE, U+F92D->U+4F86, U+F92E->U+51B7, U+F92F->U+52DE, \\\n"
+	" U+F930->U+64C4, U+F931->U+6AD3, U+F932->U+7210, U+F933->U+76E7, \\\n"
+	" U+F934->U+8001, U+F935->U+8606, U+F936->U+865C, U+F937->U+8DEF, \\\n"
+	" U+F938->U+9732, U+F939->U+9B6F, U+F93A->U+9DFA, U+F93B->U+788C, \\\n"
+	" U+F93C->U+797F, U+F93D->U+7DA0, U+F93E->U+83C9, U+F93F->U+9304, \\\n"
+	" U+F940->U+9E7F, U+F941->U+8AD6, U+F942->U+58DF, U+F943->U+5F04, \\\n"
+	" U+F944->U+7C60, U+F945->U+807E, U+F946->U+7262, U+F947->U+78CA, \\\n"
+	" U+F948->U+8CC2, U+F949->U+96F7, U+F94A->U+58D8, U+F94B->U+5C62, \\\n"
+	" U+F94C->U+6A13, U+F94D->U+6DDA, U+F94E->U+6F0F, U+F94F->U+7D2F, \\\n"
+	" U+F950->U+7E37, U+F951->U+964B, U+F952->U+52D2, U+F953->U+808B, \\\n"
+	" U+F954->U+51DC, U+F955->U+51CC, U+F956->U+7A1C, U+F957->U+7DBE, \\\n"
+	" U+F958->U+83F1, U+F959->U+9675, U+F95A->U+8B80, U+F95B->U+62CF, \\\n"
+	" U+F95C->U+6A02, U+F95D->U+8AFE, U+F95E->U+4E39, U+F95F->U+5BE7, \\\n"
+	" U+F960->U+6012, U+F961->U+7387, U+F962->U+7570, U+F963->U+5317, \\\n"
+	" U+F964->U+78FB, U+F965->U+4FBF, U+F966->U+5FA9, U+F967->U+4E0D, \\\n"
+	" U+F968->U+6CCC, U+F969->U+6578, U+F96A->U+7D22, U+F96B->U+53C3, \\\n"
+	" U+F96C->U+585E, U+F96D->U+7701, U+F96E->U+8449, U+F96F->U+8AAA, \\\n"
+	" U+F970->U+6BBA, U+F971->U+8FB0, U+F972->U+6C88, U+F973->U+62FE, \\\n"
+	" U+F974->U+82E5, U+F975->U+63A0, U+F976->U+7565, U+F977->U+4EAE, \\\n"
+	" U+F978->U+5169, U+F979->U+51C9, U+F97A->U+6881, U+F97B->U+7CE7, \\\n"
+	" U+F97C->U+826F, U+F97D->U+8AD2, U+F97E->U+91CF, U+F97F->U+52F5, \\\n"
+	" U+F980->U+5442, U+F981->U+5973, U+F982->U+5EEC, U+F983->U+65C5, \\\n"
+	" U+F984->U+6FFE, U+F985->U+792A, U+F986->U+95AD, U+F987->U+9A6A, \\\n"
+	" U+F988->U+9E97, U+F989->U+9ECE, U+F98A->U+529B, U+F98B->U+66C6, \\\n"
+	" U+F98C->U+6B77, U+F98D->U+8F62, U+F98E->U+5E74, U+F98F->U+6190, \\\n"
+	" U+F990->U+6200, U+F991->U+649A, U+F992->U+6F23, U+F993->U+7149, \\\n"
+	" U+F994->U+7489, U+F995->U+79CA, U+F996->U+7DF4, U+F997->U+806F, \\\n"
+	" U+F998->U+8F26, U+F999->U+84EE, U+F99A->U+9023, U+F99B->U+934A, \\\n"
+	" U+F99C->U+5217, U+F99D->U+52A3, U+F99E->U+54BD, U+F99F->U+70C8, \\\n"
+	" U+F9A0->U+88C2, U+F9A1->U+8AAA, U+F9A2->U+5EC9, U+F9A3->U+5FF5, \\\n"
+	" U+F9A4->U+637B, U+F9A5->U+6BAE, U+F9A6->U+7C3E, U+F9A7->U+7375, \\\n"
+	" U+F9A8->U+4EE4, U+F9A9->U+56F9, U+F9AA->U+5BE7, U+F9AB->U+5DBA, \\\n"
+	" U+F9AC->U+601C, U+F9AD->U+73B2, U+F9AE->U+7469, U+F9AF->U+7F9A, \\\n"
+	" U+F9B0->U+8046, U+F9B1->U+9234, U+F9B2->U+96F6, U+F9B3->U+9748, \\\n"
+	" U+F9B4->U+9818, U+F9B5->U+4F8B, U+F9B6->U+79AE, U+F9B7->U+91B4, \\\n"
+	" U+F9B8->U+96B8, U+F9B9->U+60E1, U+F9BA->U+4E86, U+F9BB->U+50DA, \\\n"
+	" U+F9BC->U+5BEE, U+F9BD->U+5C3F, U+F9BE->U+6599, U+F9BF->U+6A02, \\\n"
+	" U+F9C0->U+71CE, U+F9C1->U+7642, U+F9C2->U+84FC, U+F9C3->U+907C, \\\n"
+	" U+F9C4->U+9F8D, U+F9C5->U+6688, U+F9C6->U+962E, U+F9C7->U+5289, \\\n"
+	" U+F9C8->U+677B, U+F9C9->U+67F3, U+F9CA->U+6D41, U+F9CB->U+6E9C, \\\n"
+	" U+F9CC->U+7409, U+F9CD->U+7559, U+F9CE->U+786B, U+F9CF->U+7D10, \\\n"
+	" U+F9D0->U+985E, U+F9D1->U+516D, U+F9D2->U+622E, U+F9D3->U+9678, \\\n"
+	" U+F9D4->U+502B, U+F9D5->U+5D19, U+F9D6->U+6DEA, U+F9D7->U+8F2A, \\\n"
+	" U+F9D8->U+5F8B, U+F9D9->U+6144, U+F9DA->U+6817, U+F9DB->U+7387, \\\n"
+	" U+F9DC->U+9686, U+F9DD->U+5229, U+F9DE->U+540F, U+F9DF->U+5C65, \\\n"
+	" U+F9E0->U+6613, U+F9E1->U+674E, U+F9E2->U+68A8, U+F9E3->U+6CE5, \\\n"
+	" U+F9E4->U+7406, U+F9E5->U+75E2, U+F9E6->U+7F79, U+F9E7->U+88CF, \\\n"
+	" U+F9E8->U+88E1, U+F9E9->U+91CC, U+F9EA->U+96E2, U+F9EB->U+533F, \\\n"
+	" U+F9EC->U+6EBA, U+F9ED->U+541D, U+F9EE->U+71D0, U+F9EF->U+7498, \\\n"
+	" U+F9F0->U+85FA, U+F9F1->U+96A3, U+F9F2->U+9C57, U+F9F3->U+9E9F, \\\n"
+	" U+F9F4->U+6797, U+F9F5->U+6DCB, U+F9F6->U+81E8, U+F9F7->U+7ACB, \\\n"
+	" U+F9F8->U+7B20, U+F9F9->U+7C92, U+F9FA->U+72C0, U+F9FB->U+7099, \\\n"
+	" U+F9FC->U+8B58, U+F9FD->U+4EC0, U+F9FE->U+8336, U+F9FF->U+523A, \\\n"
+	" U+FA00->U+5207, U+FA01->U+5EA6, U+FA02->U+62D3, U+FA03->U+7CD6, \\\n"
+	" U+FA04->U+5B85, U+FA05->U+6D1E, U+FA06->U+66B4, U+FA07->U+8F3B, \\\n"
+	" U+FA08->U+884C, U+FA09->U+964D, U+FA0A->U+898B, U+FA0B->U+5ED3, \\\n"
+	" U+FA0C->U+5140, U+FA0D->U+55C0, U+FA10->U+585A, U+FA12->U+6674, \\\n"
+	" U+FA15->U+51DE, U+FA16->U+732A, U+FA17->U+76CA, U+FA18->U+793C, \\\n"
+	" U+FA19->U+795E, U+FA1A->U+7965, U+FA1B->U+798F, U+FA1C->U+9756, \\\n"
+	" U+FA1D->U+7CBE, U+FA1E->U+7FBD, U+FA20->U+8612, U+FA22->U+8AF8, \\\n"
+	" U+FA25->U+9038, U+FA26->U+90FD, U+FA2A->U+98EF, U+FA2B->U+98FC, \\\n"
+	" U+FA2C->U+9928, U+FA2D->U+9DB4, U+FA30->U+4FAE, U+FA31->U+50E7, \\\n"
+	" U+FA32->U+514D, U+FA33->U+52C9, U+FA34->U+52E4, U+FA35->U+5351, \\\n"
+	" U+FA36->U+559D, U+FA37->U+5606, U+FA38->U+5668, U+FA39->U+5840, \\\n"
+	" U+FA3A->U+58A8, U+FA3B->U+5C64, U+FA3C->U+5C6E, U+FA3D->U+6094, \\\n"
+	" U+FA3E->U+6168, U+FA3F->U+618E, U+FA40->U+61F2, U+FA41->U+654F, \\\n"
+	" U+FA42->U+65E2, U+FA43->U+6691, U+FA44->U+6885, U+FA45->U+6D77, \\\n"
+	" U+FA46->U+6E1A, U+FA47->U+6F22, U+FA48->U+716E, U+FA49->U+722B, \\\n"
+	" U+FA4A->U+7422, U+FA4B->U+7891, U+FA4C->U+793E, U+FA4D->U+7949, \\\n"
+	" U+FA4E->U+7948, U+FA4F->U+7950, U+FA50->U+7956, U+FA51->U+795D, \\\n"
+	" U+FA52->U+798D, U+FA53->U+798E, U+FA54->U+7A40, U+FA55->U+7A81, \\\n"
+	" U+FA56->U+7BC0, U+FA57->U+7DF4, U+FA58->U+7E09, U+FA59->U+7E41, \\\n"
+	" U+FA5A->U+7F72, U+FA5B->U+8005, U+FA5C->U+81ED, U+FA5D->U+8279, \\\n"
+	" U+FA5E->U+8279, U+FA5F->U+8457, U+FA60->U+8910, U+FA61->U+8996, \\\n"
+	" U+FA62->U+8B01, U+FA63->U+8B39, U+FA64->U+8CD3, U+FA65->U+8D08, \\\n"
+	" U+FA66->U+8FB6, U+FA67->U+9038, U+FA68->U+96E3, U+FA69->U+97FF, \\\n"
+	" U+FA6A->U+983B, U+FA70->U+4E26, U+FA71->U+51B5, U+FA72->U+5168, \\\n"
+	" U+FA73->U+4F80, U+FA74->U+5145, U+FA75->U+5180, U+FA76->U+52C7, \\\n"
+	" U+FA77->U+52FA, U+FA78->U+559D, U+FA79->U+5555, U+FA7A->U+5599, \\\n"
+	" U+FA7B->U+55E2, U+FA7C->U+585A, U+FA7D->U+58B3, U+FA7E->U+5944, \\\n"
+	" U+FA7F->U+5954, U+FA80->U+5A62, U+FA81->U+5B28, U+FA82->U+5ED2, \\\n"
+	" U+FA83->U+5ED9, U+FA84->U+5F69, U+FA85->U+5FAD, U+FA86->U+60D8, \\\n"
+	" U+FA87->U+614E, U+FA88->U+6108, U+FA89->U+618E, U+FA8A->U+6160, \\\n"
+	" U+FA8B->U+61F2, U+FA8C->U+6234, U+FA8D->U+63C4, U+FA8E->U+641C, \\\n"
+	" U+FA8F->U+6452, U+FA90->U+6556, U+FA91->U+6674, U+FA92->U+6717, \\\n"
+	" U+FA93->U+671B, U+FA94->U+6756, U+FA95->U+6B79, U+FA96->U+6BBA, \\\n"
+	" U+FA97->U+6D41, U+FA98->U+6EDB, U+FA99->U+6ECB, U+FA9A->U+6F22, \\\n"
+	" U+FA9B->U+701E, U+FA9C->U+716E, U+FA9D->U+77A7, U+FA9E->U+7235, \\\n"
+	" U+FA9F->U+72AF, U+FAA0->U+732A, U+FAA1->U+7471, U+FAA2->U+7506, \\\n"
+	" U+FAA3->U+753B, U+FAA4->U+761D, U+FAA5->U+761F, U+FAA6->U+76CA, \\\n"
+	" U+FAA7->U+76DB, U+FAA8->U+76F4, U+FAA9->U+774A, U+FAAA->U+7740, \\\n"
+	" U+FAAB->U+78CC, U+FAAC->U+7AB1, U+FAAD->U+7BC0, U+FAAE->U+7C7B, \\\n"
+	" U+FAAF->U+7D5B, U+FAB0->U+7DF4, U+FAB1->U+7F3E, U+FAB2->U+8005, \\\n"
+	" U+FAB3->U+8352, U+FAB4->U+83EF, U+FAB5->U+8779, U+FAB6->U+8941, \\\n"
+	" U+FAB7->U+8986, U+FAB8->U+8996, U+FAB9->U+8ABF, U+FABA->U+8AF8, \\\n"
+	" U+FABB->U+8ACB, U+FABC->U+8B01, U+FABD->U+8AFE, U+FABE->U+8AED, \\\n"
+	" U+FABF->U+8B39, U+FAC0->U+8B8A, U+FAC1->U+8D08, U+FAC2->U+8F38, \\\n"
+	" U+FAC3->U+9072, U+FAC4->U+9199, U+FAC5->U+9276, U+FAC6->U+967C, \\\n"
+	" U+FAC7->U+96E3, U+FAC8->U+9756, U+FAC9->U+97DB, U+FACA->U+97FF, \\\n"
+	" U+FACB->U+980B, U+FACC->U+983B, U+FACD->U+9B12, U+FACE->U+9F9C, \\\n"
+	" U+FACF->U+2284A, U+FAD0->U+22844, U+FAD1->U+233D5, U+FAD2->U+3B9D, \\\n"
+	" U+FAD3->U+4018, U+FAD4->U+4039, U+FAD5->U+25249, U+FAD6->U+25CD0, \\\n"
+	" U+FAD7->U+27ED3, U+FAD8->U+9F43, U+FAD9->U+9F8E, U+2F800->U+4E3D, \\\n"
+	" U+2F801->U+4E38, U+2F802->U+4E41, U+2F803->U+20122, U+2F804->U+4F60, \\\n"
+	" U+2F805->U+4FAE, U+2F806->U+4FBB, U+2F807->U+5002, U+2F808->U+507A, \\\n"
+	" U+2F809->U+5099, U+2F80A->U+50E7, U+2F80B->U+50CF, U+2F80C->U+349E, \\\n"
+	" U+2F80D->U+2063A, U+2F80E->U+514D, U+2F80F->U+5154, U+2F810->U+5164, \\\n"
+	" U+2F811->U+5177, U+2F812->U+2051C, U+2F813->U+34B9, U+2F814->U+5167, \\\n"
+	" U+2F815->U+518D, U+2F816->U+2054B, U+2F817->U+5197, U+2F818->U+51A4, \\\n"
+	" U+2F819->U+4ECC, U+2F81A->U+51AC, U+2F81B->U+51B5, U+2F81C->U+291DF, \\\n"
+	" U+2F81D->U+51F5, U+2F81E->U+5203, U+2F81F->U+34DF, U+2F820->U+523B, \\\n"
+	" U+2F821->U+5246, U+2F822->U+5272, U+2F823->U+5277, U+2F824->U+3515, \\\n"
+	" U+2F825->U+52C7, U+2F826->U+52C9, U+2F827->U+52E4, U+2F828->U+52FA, \\\n"
+	" U+2F829->U+5305, U+2F82A->U+5306, U+2F82B->U+5317, U+2F82C->U+5349, \\\n"
+	" U+2F82D->U+5351, U+2F82E->U+535A, U+2F82F->U+5373, U+2F830->U+537D, \\\n"
+	" U+2F831->U+537F, U+2F832->U+537F, U+2F833->U+537F, U+2F834->U+20A2C, \\\n"
+	" U+2F835->U+7070, U+2F836->U+53CA, U+2F837->U+53DF, U+2F838->U+20B63, \\\n"
+	" U+2F839->U+53EB, U+2F83A->U+53F1, U+2F83B->U+5406, U+2F83C->U+549E, \\\n"
+	" U+2F83D->U+5438, U+2F83E->U+5448, U+2F83F->U+5468, U+2F840->U+54A2, \\\n"
+	" U+2F841->U+54F6, U+2F842->U+5510, U+2F843->U+5553, U+2F844->U+5563, \\\n"
+	" U+2F845->U+5584, U+2F846->U+5584, U+2F847->U+5599, U+2F848->U+55AB, \\\n"
+	" U+2F849->U+55B3, U+2F84A->U+55C2, U+2F84B->U+5716, U+2F84C->U+5606, \\\n"
+	" U+2F84D->U+5717, U+2F84E->U+5651, U+2F84F->U+5674, U+2F850->U+5207, \\\n"
+	" U+2F851->U+58EE, U+2F852->U+57CE, U+2F853->U+57F4, U+2F854->U+580D, \\\n"
+	" U+2F855->U+578B, U+2F856->U+5832, U+2F857->U+5831, U+2F858->U+58AC, \\\n"
+	" U+2F859->U+214E4, U+2F85A->U+58F2, U+2F85B->U+58F7, U+2F85C->U+5906, \\\n"
+	" U+2F85D->U+591A, U+2F85E->U+5922, U+2F85F->U+5962, U+2F860->U+216A8, \\\n"
+	" U+2F861->U+216EA, U+2F862->U+59EC, U+2F863->U+5A1B, U+2F864->U+5A27, \\\n"
+	" U+2F865->U+59D8, U+2F866->U+5A66, U+2F867->U+36EE, U+2F868->U+36FC, \\\n"
+	" U+2F869->U+5B08, U+2F86A->U+5B3E, U+2F86B->U+5B3E, U+2F86C->U+219C8, \\\n"
+	" U+2F86D->U+5BC3, U+2F86E->U+5BD8, U+2F86F->U+5BE7, U+2F870->U+5BF3, \\\n"
+	" U+2F871->U+21B18, U+2F872->U+5BFF, U+2F873->U+5C06, U+2F874->U+5F53, \\\n"
+	" U+2F875->U+5C22, U+2F876->U+3781, U+2F877->U+5C60, U+2F878->U+5C6E, \\\n"
+	" U+2F879->U+5CC0, U+2F87A->U+5C8D, U+2F87B->U+21DE4, U+2F87C->U+5D43, \\\n"
+	" U+2F87D->U+21DE6, U+2F87E->U+5D6E, U+2F87F->U+5D6B, U+2F880->U+5D7C, \\\n"
+	" U+2F881->U+5DE1, U+2F882->U+5DE2, U+2F883->U+382F, U+2F884->U+5DFD, \\\n"
+	" U+2F885->U+5E28, U+2F886->U+5E3D, U+2F887->U+5E69, U+2F888->U+3862, \\\n"
+	" U+2F889->U+22183, U+2F88A->U+387C, U+2F88B->U+5EB0, U+2F88C->U+5EB3, \\\n"
+	" U+2F88D->U+5EB6, U+2F88E->U+5ECA, U+2F88F->U+2A392, U+2F890->U+5EFE, \\\n"
+	" U+2F891->U+22331, U+2F892->U+22331, U+2F893->U+8201, U+2F894->U+5F22, \\\n"
+	" U+2F895->U+5F22, U+2F896->U+38C7, U+2F897->U+232B8, U+2F898->U+261DA, \\\n"
+	" U+2F899->U+5F62, U+2F89A->U+5F6B, U+2F89B->U+38E3, U+2F89C->U+5F9A, \\\n"
+	" U+2F89D->U+5FCD, U+2F89E->U+5FD7, U+2F89F->U+5FF9, U+2F8A0->U+6081, \\\n"
+	" U+2F8A1->U+393A, U+2F8A2->U+391C, U+2F8A3->U+6094, U+2F8A4->U+226D4, \\\n"
+	" U+2F8A5->U+60C7, U+2F8A6->U+6148, U+2F8A7->U+614C, U+2F8A8->U+614E, \\\n"
+	" U+2F8A9->U+614C, U+2F8AA->U+617A, U+2F8AB->U+618E, U+2F8AC->U+61B2, \\\n"
+	" U+2F8AD->U+61A4, U+2F8AE->U+61AF, U+2F8AF->U+61DE, U+2F8B0->U+61F2, \\\n"
+	" U+2F8B1->U+61F6, U+2F8B2->U+6210, U+2F8B3->U+621B, U+2F8B4->U+625D, \\\n"
+	" U+2F8B5->U+62B1, U+2F8B6->U+62D4, U+2F8B7->U+6350, U+2F8B8->U+22B0C, \\\n"
+	" U+2F8B9->U+633D, U+2F8BA->U+62FC, U+2F8BB->U+6368, U+2F8BC->U+6383, \\\n"
+	" U+2F8BD->U+63E4, U+2F8BE->U+22BF1, U+2F8BF->U+6422, U+2F8C0->U+63C5, \\\n"
+	" U+2F8C1->U+63A9, U+2F8C2->U+3A2E, U+2F8C3->U+6469, U+2F8C4->U+647E, \\\n"
+	" U+2F8C5->U+649D, U+2F8C6->U+6477, U+2F8C7->U+3A6C, U+2F8C8->U+654F, \\\n"
+	" U+2F8C9->U+656C, U+2F8CA->U+2300A, U+2F8CB->U+65E3, U+2F8CC->U+66F8, \\\n"
+	" U+2F8CD->U+6649, U+2F8CE->U+3B19, U+2F8CF->U+6691, U+2F8D0->U+3B08, \\\n"
+	" U+2F8D1->U+3AE4, U+2F8D2->U+5192, U+2F8D3->U+5195, U+2F8D4->U+6700, \\\n"
+	" U+2F8D5->U+669C, U+2F8D6->U+80AD, U+2F8D7->U+43D9, U+2F8D8->U+6717, \\\n"
+	" U+2F8D9->U+671B, U+2F8DA->U+6721, U+2F8DB->U+675E, U+2F8DC->U+6753, \\\n"
+	" U+2F8DD->U+233C3, U+2F8DE->U+3B49, U+2F8DF->U+67FA, U+2F8E0->U+6785, \\\n"
+	" U+2F8E1->U+6852, U+2F8E2->U+6885, U+2F8E3->U+2346D, U+2F8E4->U+688E, \\\n"
+	" U+2F8E5->U+681F, U+2F8E6->U+6914, U+2F8E7->U+3B9D, U+2F8E8->U+6942, \\\n"
+	" U+2F8E9->U+69A3, U+2F8EA->U+69EA, U+2F8EB->U+6AA8, U+2F8EC->U+236A3, \\\n"
+	" U+2F8ED->U+6ADB, U+2F8EE->U+3C18, U+2F8EF->U+6B21, U+2F8F0->U+238A7, \\\n"
+	" U+2F8F1->U+6B54, U+2F8F2->U+3C4E, U+2F8F3->U+6B72, U+2F8F4->U+6B9F, \\\n"
+	" U+2F8F5->U+6BBA, U+2F8F6->U+6BBB, U+2F8F7->U+23A8D, U+2F8F8->U+21D0B, \\\n"
+	" U+2F8F9->U+23AFA, U+2F8FA->U+6C4E, U+2F8FB->U+23CBC, U+2F8FC->U+6CBF, \\\n"
+	" U+2F8FD->U+6CCD, U+2F8FE->U+6C67, U+2F8FF->U+6D16, U+2F900->U+6D3E, \\\n"
+	" U+2F901->U+6D77, U+2F902->U+6D41, U+2F903->U+6D69, U+2F904->U+6D78, \\\n"
+	" U+2F905->U+6D85, U+2F906->U+23D1E, U+2F907->U+6D34, U+2F908->U+6E2F, \\\n"
+	" U+2F909->U+6E6E, U+2F90A->U+3D33, U+2F90B->U+6ECB, U+2F90C->U+6EC7, \\\n"
+	" U+2F90D->U+23ED1, U+2F90E->U+6DF9, U+2F90F->U+6F6E, U+2F910->U+23F5E, \\\n"
+	" U+2F911->U+23F8E, U+2F912->U+6FC6, U+2F913->U+7039, U+2F914->U+701E, \\\n"
+	" U+2F915->U+701B, U+2F916->U+3D96, U+2F917->U+704A, U+2F918->U+707D, \\\n"
+	" U+2F919->U+7077, U+2F91A->U+70AD, U+2F91B->U+20525, U+2F91C->U+7145, \\\n"
+	" U+2F91D->U+24263, U+2F91E->U+719C, U+2F91F->U+243AB, U+2F920->U+7228, \\\n"
+	" U+2F921->U+7235, U+2F922->U+7250, U+2F923->U+24608, U+2F924->U+7280, \\\n"
+	" U+2F925->U+7295, U+2F926->U+24735, U+2F927->U+24814, U+2F928->U+737A, \\\n"
+	" U+2F929->U+738B, U+2F92A->U+3EAC, U+2F92B->U+73A5, U+2F92C->U+3EB8, \\\n"
+	" U+2F92D->U+3EB8, U+2F92E->U+7447, U+2F92F->U+745C, U+2F930->U+7471, \\\n"
+	" U+2F931->U+7485, U+2F932->U+74CA, U+2F933->U+3F1B, U+2F934->U+7524, \\\n"
+	" U+2F935->U+24C36, U+2F936->U+753E, U+2F937->U+24C92, U+2F938->U+7570, \\\n"
+	" U+2F939->U+2219F, U+2F93A->U+7610, U+2F93B->U+24FA1, U+2F93C->U+24FB8, \\\n"
+	" U+2F93D->U+25044, U+2F93E->U+3FFC, U+2F93F->U+4008, U+2F940->U+76F4, \\\n"
+	" U+2F941->U+250F3, U+2F942->U+250F2, U+2F943->U+25119, U+2F944->U+25133, \\\n"
+	" U+2F945->U+771E, U+2F946->U+771F, U+2F947->U+771F, U+2F948->U+774A, \\\n"
+	" U+2F949->U+4039, U+2F94A->U+778B, U+2F94B->U+4046, U+2F94C->U+4096, \\\n"
+	" U+2F94D->U+2541D, U+2F94E->U+784E, U+2F94F->U+788C, U+2F950->U+78CC, \\\n"
+	" U+2F951->U+40E3, U+2F952->U+25626, U+2F953->U+7956, U+2F954->U+2569A, \\\n"
+	" U+2F955->U+256C5, U+2F956->U+798F, U+2F957->U+79EB, U+2F958->U+412F, \\\n"
+	" U+2F959->U+7A40, U+2F95A->U+7A4A, U+2F95B->U+7A4F, U+2F95C->U+2597C, \\\n"
+	" U+2F95D->U+25AA7, U+2F95E->U+25AA7, U+2F95F->U+7AEE, U+2F960->U+4202, \\\n"
+	" U+2F961->U+25BAB, U+2F962->U+7BC6, U+2F963->U+7BC9, U+2F964->U+4227, \\\n"
+	" U+2F965->U+25C80, U+2F966->U+7CD2, U+2F967->U+42A0, U+2F968->U+7CE8, \\\n"
+	" U+2F969->U+7CE3, U+2F96A->U+7D00, U+2F96B->U+25F86, U+2F96C->U+7D63, \\\n"
+	" U+2F96D->U+4301, U+2F96E->U+7DC7, U+2F96F->U+7E02, U+2F970->U+7E45, \\\n"
+	" U+2F971->U+4334, U+2F972->U+26228, U+2F973->U+26247, U+2F974->U+4359, \\\n"
+	" U+2F975->U+262D9, U+2F976->U+7F7A, U+2F977->U+2633E, U+2F978->U+7F95, \\\n"
+	" U+2F979->U+7FFA, U+2F97A->U+8005, U+2F97B->U+264DA, U+2F97C->U+26523, \\\n"
+	" U+2F97D->U+8060, U+2F97E->U+265A8, U+2F97F->U+8070, U+2F980->U+2335F, \\\n"
+	" U+2F981->U+43D5, U+2F982->U+80B2, U+2F983->U+8103, U+2F984->U+440B, \\\n"
+	" U+2F985->U+813E, U+2F986->U+5AB5, U+2F987->U+267A7, U+2F988->U+267B5, \\\n"
+	" U+2F989->U+23393, U+2F98A->U+2339C, U+2F98B->U+8201, U+2F98C->U+8204, \\\n"
+	" U+2F98D->U+8F9E, U+2F98E->U+446B, U+2F98F->U+8291, U+2F990->U+828B, \\\n"
+	" U+2F991->U+829D, U+2F992->U+52B3, U+2F993->U+82B1, U+2F994->U+82B3, \\\n"
+	" U+2F995->U+82BD, U+2F996->U+82E6, U+2F997->U+26B3C, U+2F998->U+82E5, \\\n"
+	" U+2F999->U+831D, U+2F99A->U+8363, U+2F99B->U+83AD, U+2F99C->U+8323, \\\n"
+	" U+2F99D->U+83BD, U+2F99E->U+83E7, U+2F99F->U+8457, U+2F9A0->U+8353, \\\n"
+	" U+2F9A1->U+83CA, U+2F9A2->U+83CC, U+2F9A3->U+83DC, U+2F9A4->U+26C36, \\\n"
+	" U+2F9A5->U+26D6B, U+2F9A6->U+26CD5, U+2F9A7->U+452B, U+2F9A8->U+84F1, \\\n"
+	" U+2F9A9->U+84F3, U+2F9AA->U+8516, U+2F9AB->U+273CA, U+2F9AC->U+8564, \\\n"
+	" U+2F9AD->U+26F2C, U+2F9AE->U+455D, U+2F9AF->U+4561, U+2F9B0->U+26FB1, \\\n"
+	" U+2F9B1->U+270D2, U+2F9B2->U+456B, U+2F9B3->U+8650, U+2F9B4->U+865C, \\\n"
+	" U+2F9B5->U+8667, U+2F9B6->U+8669, U+2F9B7->U+86A9, U+2F9B8->U+8688, \\\n"
+	" U+2F9B9->U+870E, U+2F9BA->U+86E2, U+2F9BB->U+8779, U+2F9BC->U+8728, \\\n"
+	" U+2F9BD->U+876B, U+2F9BE->U+8786, U+2F9BF->U+45D7, U+2F9C0->U+87E1, \\\n"
+	" U+2F9C1->U+8801, U+2F9C2->U+45F9, U+2F9C3->U+8860, U+2F9C4->U+8863, \\\n"
+	" U+2F9C5->U+27667, U+2F9C6->U+88D7, U+2F9C7->U+88DE, U+2F9C8->U+4635, \\\n"
+	" U+2F9C9->U+88FA, U+2F9CA->U+34BB, U+2F9CB->U+278AE, U+2F9CC->U+27966, \\\n"
+	" U+2F9CD->U+46BE, U+2F9CE->U+46C7, U+2F9CF->U+8AA0, U+2F9D0->U+8AED, \\\n"
+	" U+2F9D1->U+8B8A, U+2F9D2->U+8C55, U+2F9D3->U+27CA8, U+2F9D4->U+8CAB, \\\n"
+	" U+2F9D5->U+8CC1, U+2F9D6->U+8D1B, U+2F9D7->U+8D77, U+2F9D8->U+27F2F, \\\n"
+	" U+2F9D9->U+20804, U+2F9DA->U+8DCB, U+2F9DB->U+8DBC, U+2F9DC->U+8DF0, \\\n"
+	" U+2F9DD->U+208DE, U+2F9DE->U+8ED4, U+2F9DF->U+8F38, U+2F9E0->U+285D2, \\\n"
+	" U+2F9E1->U+285ED, U+2F9E2->U+9094, U+2F9E3->U+90F1, U+2F9E4->U+9111, \\\n"
+	" U+2F9E5->U+2872E, U+2F9E6->U+911B, U+2F9E7->U+9238, U+2F9E8->U+92D7, \\\n"
+	" U+2F9E9->U+92D8, U+2F9EA->U+927C, U+2F9EB->U+93F9, U+2F9EC->U+9415, \\\n"
+	" U+2F9ED->U+28BFA, U+2F9EE->U+958B, U+2F9EF->U+4995, U+2F9F0->U+95B7, \\\n"
+	" U+2F9F1->U+28D77, U+2F9F2->U+49E6, U+2F9F3->U+96C3, U+2F9F4->U+5DB2, \\\n"
+	" U+2F9F5->U+9723, U+2F9F6->U+29145, U+2F9F7->U+2921A, U+2F9F8->U+4A6E, \\\n"
+	" U+2F9F9->U+4A76, U+2F9FA->U+97E0, U+2F9FB->U+2940A, U+2F9FC->U+4AB2, \\\n"
+	" U+2F9FD->U+29496, U+2F9FE->U+980B, U+2F9FF->U+980B, U+2FA00->U+9829, \\\n"
+	" U+2FA01->U+295B6, U+2FA02->U+98E2, U+2FA03->U+4B33, U+2FA04->U+9929, \\\n"
+	" U+2FA05->U+99A7, U+2FA06->U+99C2, U+2FA07->U+99FE, U+2FA08->U+4BCE, \\\n"
+	" U+2FA09->U+29B30, U+2FA0A->U+9B12, U+2FA0B->U+9C40, U+2FA0C->U+9CFD, \\\n"
+	" U+2FA0D->U+4CCE, U+2FA0E->U+4CED, U+2FA0F->U+9D67, U+2FA10->U+2A0CE, \\\n"
+	" U+2FA11->U+4CF8, U+2FA12->U+2A105, U+2FA13->U+2A20E, U+2FA14->U+2A291, \\\n"
+	" U+2FA15->U+9EBB, U+2FA16->U+4D56, U+2FA17->U+9EF9, U+2FA18->U+9EFE, \\\n"
+	" U+2FA19->U+9F05, U+2FA1A->U+9F0F, U+2FA1B->U+9F16, U+2FA1C->U+9F3B, \\\n"
+	" U+2FA1D->U+2A600, U+2F00->U+4E00, U+2F01->U+4E28, U+2F02->U+4E36, \\\n"
+	" U+2F03->U+4E3F, U+2F04->U+4E59, U+2F05->U+4E85, U+2F06->U+4E8C, \\\n"
+	" U+2F07->U+4EA0, U+2F08->U+4EBA, U+2F09->U+513F, U+2F0A->U+5165, \\\n"
+	" U+2F0B->U+516B, U+2F0C->U+5182, U+2F0D->U+5196, U+2F0E->U+51AB, \\\n"
+	" U+2F0F->U+51E0, U+2F10->U+51F5, U+2F11->U+5200, U+2F12->U+529B, \\\n"
+	" U+2F13->U+52F9, U+2F14->U+5315, U+2F15->U+531A, U+2F16->U+5338, \\\n"
+	" U+2F17->U+5341, U+2F18->U+535C, U+2F19->U+5369, U+2F1A->U+5382, \\\n"
+	" U+2F1B->U+53B6, U+2F1C->U+53C8, U+2F1D->U+53E3, U+2F1E->U+56D7, \\\n"
+	" U+2F1F->U+571F, U+2F20->U+58EB, U+2F21->U+5902, U+2F22->U+590A, \\\n"
+	" U+2F23->U+5915, U+2F24->U+5927, U+2F25->U+5973, U+2F26->U+5B50, \\\n"
+	" U+2F27->U+5B80, U+2F28->U+5BF8, U+2F29->U+5C0F, U+2F2A->U+5C22, \\\n"
+	" U+2F2B->U+5C38, U+2F2C->U+5C6E, U+2F2D->U+5C71, U+2F2E->U+5DDB, \\\n"
+	" U+2F2F->U+5DE5, U+2F30->U+5DF1, U+2F31->U+5DFE, U+2F32->U+5E72, \\\n"
+	" U+2F33->U+5E7A, U+2F34->U+5E7F, U+2F35->U+5EF4, U+2F36->U+5EFE, \\\n"
+	" U+2F37->U+5F0B, U+2F38->U+5F13, U+2F39->U+5F50, U+2F3A->U+5F61, \\\n"
+	" U+2F3B->U+5F73, U+2F3C->U+5FC3, U+2F3D->U+6208, U+2F3E->U+6236, \\\n"
+	" U+2F3F->U+624B, U+2F40->U+652F, U+2F41->U+6534, U+2F42->U+6587, \\\n"
+	" U+2F43->U+6597, U+2F44->U+65A4, U+2F45->U+65B9, U+2F46->U+65E0, \\\n"
+	" U+2F47->U+65E5, U+2F48->U+66F0, U+2F49->U+6708, U+2F4A->U+6728, \\\n"
+	" U+2F4B->U+6B20, U+2F4C->U+6B62, U+2F4D->U+6B79, U+2F4E->U+6BB3, \\\n"
+	" U+2F4F->U+6BCB, U+2F50->U+6BD4, U+2F51->U+6BDB, U+2F52->U+6C0F, \\\n"
+	" U+2F53->U+6C14, U+2F54->U+6C34, U+2F55->U+706B, U+2F56->U+722A, \\\n"
+	" U+2F57->U+7236, U+2F58->U+723B, U+2F59->U+723F, U+2F5A->U+7247, \\\n"
+	" U+2F5B->U+7259, U+2F5C->U+725B, U+2F5D->U+72AC, U+2F5E->U+7384, \\\n"
+	" U+2F5F->U+7389, U+2F60->U+74DC, U+2F61->U+74E6, U+2F62->U+7518, \\\n"
+	" U+2F63->U+751F, U+2F64->U+7528, U+2F65->U+7530, U+2F66->U+758B, \\\n"
+	" U+2F67->U+7592, U+2F68->U+7676, U+2F69->U+767D, U+2F6A->U+76AE, \\\n"
+	" U+2F6B->U+76BF, U+2F6C->U+76EE, U+2F6D->U+77DB, U+2F6E->U+77E2, \\\n"
+	" U+2F6F->U+77F3, U+2F70->U+793A, U+2F71->U+79B8, U+2F72->U+79BE, \\\n"
+	" U+2F73->U+7A74, U+2F74->U+7ACB, U+2F75->U+7AF9, U+2F76->U+7C73, \\\n"
+	" U+2F77->U+7CF8, U+2F78->U+7F36, U+2F79->U+7F51, U+2F7A->U+7F8A, \\\n"
+	" U+2F7B->U+7FBD, U+2F7C->U+8001, U+2F7D->U+800C, U+2F7E->U+8012, \\\n"
+	" U+2F7F->U+8033, U+2F80->U+807F, U+2F81->U+8089, U+2F82->U+81E3, \\\n"
+	" U+2F83->U+81EA, U+2F84->U+81F3, U+2F85->U+81FC, U+2F86->U+820C, \\\n"
+	" U+2F87->U+821B, U+2F88->U+821F, U+2F89->U+826E, U+2F8A->U+8272, \\\n"
+	" U+2F8B->U+8278, U+2F8C->U+864D, U+2F8D->U+866B, U+2F8E->U+8840, \\\n"
+	" U+2F8F->U+884C, U+2F90->U+8863, U+2F91->U+897E, U+2F92->U+898B, \\\n"
+	" U+2F93->U+89D2, U+2F94->U+8A00, U+2F95->U+8C37, U+2F96->U+8C46, \\\n"
+	" U+2F97->U+8C55, U+2F98->U+8C78, U+2F99->U+8C9D, U+2F9A->U+8D64, \\\n"
+	" U+2F9B->U+8D70, U+2F9C->U+8DB3, U+2F9D->U+8EAB, U+2F9E->U+8ECA, \\\n"
+	" U+2F9F->U+8F9B, U+2FA0->U+8FB0, U+2FA1->U+8FB5, U+2FA2->U+9091, \\\n"
+	" U+2FA3->U+9149, U+2FA4->U+91C6, U+2FA5->U+91CC, U+2FA6->U+91D1, \\\n"
+	" U+2FA7->U+9577, U+2FA8->U+9580, U+2FA9->U+961C, U+2FAA->U+96B6, \\\n"
+	" U+2FAB->U+96B9, U+2FAC->U+96E8, U+2FAD->U+9751, U+2FAE->U+975E, \\\n"
+	" U+2FAF->U+9762, U+2FB0->U+9769, U+2FB1->U+97CB, U+2FB2->U+97ED, \\\n"
+	" U+2FB3->U+97F3, U+2FB4->U+9801, U+2FB5->U+98A8, U+2FB6->U+98DB, \\\n"
+	" U+2FB7->U+98DF, U+2FB8->U+9996, U+2FB9->U+9999, U+2FBA->U+99AC, \\\n"
+	" U+2FBB->U+9AA8, U+2FBC->U+9AD8, U+2FBD->U+9ADF, U+2FBE->U+9B25, \\\n"
+	" U+2FBF->U+9B2F, U+2FC0->U+9B32, U+2FC1->U+9B3C, U+2FC2->U+9B5A, \\\n"
+	" U+2FC3->U+9CE5, U+2FC4->U+9E75, U+2FC5->U+9E7F, U+2FC6->U+9EA5, \\\n"
+	" U+2FC7->U+9EBB, U+2FC8->U+9EC3, U+2FC9->U+9ECD, U+2FCA->U+9ED1, \\\n"
+	" U+2FCB->U+9EF9, U+2FCC->U+9EFD, U+2FCD->U+9F0E, U+2FCE->U+9F13, \\\n"
+	" U+2FCF->U+9F20, U+2FD0->U+9F3B, U+2FD1->U+9F4A, U+2FD2->U+9F52, \\\n"
+	" U+2FD3->U+9F8D, U+2FD4->U+9F9C, U+2FD5->U+9FA0, U+3042->U+3041, \\\n"
+	" U+3044->U+3043, U+3046->U+3045, U+3048->U+3047, U+304A->U+3049, \\\n"
+	" U+304C->U+304B, U+304E->U+304D, U+3050->U+304F, U+3052->U+3051, \\\n"
+	" U+3054->U+3053, U+3056->U+3055, U+3058->U+3057, U+305A->U+3059, \\\n"
+	" U+305C->U+305B, U+305E->U+305D, U+3060->U+305F, U+3062->U+3061, \\\n"
+	" U+3064->U+3063, U+3065->U+3063, U+3067->U+3066, U+3069->U+3068, \\\n"
+	" U+3070->U+306F, U+3071->U+306F, U+3073->U+3072, U+3074->U+3072, \\\n"
+	" U+3076->U+3075, U+3077->U+3075, U+3079->U+3078, U+307A->U+3078, \\\n"
+	" U+307C->U+307B, U+307D->U+307B, U+3084->U+3083, U+3086->U+3085, \\\n"
+	" U+3088->U+3087, U+308F->U+308E, U+3094->U+3046, U+3095->U+304B, \\\n"
+	" U+3096->U+3051, U+30A2->U+30A1, U+30A4->U+30A3, U+30A6->U+30A5, \\\n"
+	" U+30A8->U+30A7, U+30AA->U+30A9, U+30AC->U+30AB, U+30AE->U+30AD, \\\n"
+	" U+30B0->U+30AF, U+30B2->U+30B1, U+30B4->U+30B3, U+30B6->U+30B5, \\\n"
+	" U+30B8->U+30B7, U+30BA->U+30B9, U+30BC->U+30BB, U+30BE->U+30BD, \\\n"
+	" U+30C0->U+30BF, U+30C2->U+30C1, U+30C5->U+30C4, U+30C7->U+30C6, \\\n"
+	" U+30C9->U+30C8, U+30D0->U+30CF, U+30D1->U+30CF, U+30D3->U+30D2, \\\n"
+	" U+30D4->U+30D2, U+30D6->U+30D5, U+30D7->U+30D5, U+30D9->U+30D8, \\\n"
+	" U+30DA->U+30D8, U+30DC->U+30DB, U+30DD->U+30DB, U+30E4->U+30E3, \\\n"
+	" U+30E6->U+30E5, U+30E8->U+30E7, U+30EF->U+30EE, U+30F4->U+30A6, \\\n"
+	" U+30AB->U+30F5, U+30B1->U+30F6, U+30F7->U+30EF, U+30F8->U+30F0, \\\n"
+	" U+30F9->U+30F1, U+30FA->U+30F2, U+30AF->U+31F0, U+30B7->U+31F1, \\\n"
+	" U+30B9->U+31F2, U+30C8->U+31F3, U+30CC->U+31F4, U+30CF->U+31F5, \\\n"
+	" U+30D2->U+31F6, U+30D5->U+31F7, U+30D8->U+31F8, U+30DB->U+31F9, \\\n"
+	" U+30E0->U+31FA, U+30E9->U+31FB, U+30EA->U+31FC, U+30EB->U+31FD, \\\n"
+	" U+30EC->U+31FE, U+30ED->U+31FF, U+FF66->U+30F2, U+FF67->U+30A1, \\\n"
+	" U+FF68->U+30A3, U+FF69->U+30A5, U+FF6A->U+30A7, U+FF6B->U+30A9, \\\n"
+	" U+FF6C->U+30E3, U+FF6D->U+30E5, U+FF6E->U+30E7, U+FF6F->U+30C3, \\\n"
+	" U+FF71->U+30A1, U+FF72->U+30A3, U+FF73->U+30A5, U+FF74->U+30A7, \\\n"
+	" U+FF75->U+30A9, U+FF76->U+30AB, U+FF77->U+30AD, U+FF78->U+30AF, \\\n"
+	" U+FF79->U+30B1, U+FF7A->U+30B3, U+FF7B->U+30B5, U+FF7C->U+30B7, \\\n"
+	" U+FF7D->U+30B9, U+FF7E->U+30BB, U+FF7F->U+30BD, U+FF80->U+30BF, \\\n"
+	" U+FF81->U+30C1, U+FF82->U+30C3, U+FF83->U+30C6, U+FF84->U+30C8, \\\n"
+	" U+FF85->U+30CA, U+FF86->U+30CB, U+FF87->U+30CC, U+FF88->U+30CD, \\\n"
+	" U+FF89->U+30CE, U+FF8A->U+30CF, U+FF8B->U+30D2, U+FF8C->U+30D5, \\\n"
+	" U+FF8D->U+30D8, U+FF8E->U+30DB, U+FF8F->U+30DE, U+FF90->U+30DF, \\\n"
+	" U+FF91->U+30E0, U+FF92->U+30E1, U+FF93->U+30E2, U+FF94->U+30E3, \\\n"
+	" U+FF95->U+30E5, U+FF96->U+30E7, U+FF97->U+30E9, U+FF98->U+30EA, \\\n"
+	" U+FF99->U+30EB, U+FF9A->U+30EC, U+FF9B->U+30ED, U+FF9C->U+30EF, \\\n"
+	" U+FF9D->U+30F3, U+FFA0->U+3164, U+FFA1->U+3131, U+FFA2->U+3132, \\\n"
+	" U+FFA3->U+3133, U+FFA4->U+3134, U+FFA5->U+3135, U+FFA6->U+3136, \\\n"
+	" U+FFA7->U+3137, U+FFA8->U+3138, U+FFA9->U+3139, U+FFAA->U+313A, \\\n"
+	" U+FFAB->U+313B, U+FFAC->U+313C, U+FFAD->U+313D, U+FFAE->U+313E, \\\n"
+	" U+FFAF->U+313F, U+FFB0->U+3140, U+FFB1->U+3141, U+FFB2->U+3142, \\\n"
+	" U+FFB3->U+3143, U+FFB4->U+3144, U+FFB5->U+3145, U+FFB6->U+3146, \\\n"
+	" U+FFB7->U+3147, U+FFB8->U+3148, U+FFB9->U+3149, U+FFBA->U+314A, \\\n"
+	" U+FFBB->U+314B, U+FFBC->U+314C, U+FFBD->U+314D, U+FFBE->U+314E, \\\n"
+	" U+FFC2->U+314F, U+FFC3->U+3150, U+FFC4->U+3151, U+FFC5->U+3152, \\\n"
+	" U+FFC6->U+3153, U+FFC7->U+3154, U+FFCA->U+3155, U+FFCB->U+3156, \\\n"
+	" U+FFCC->U+3157, U+FFCD->U+3158, U+FFCE->U+3159, U+FFCF->U+315A, \\\n"
+	" U+FFD2->U+315B, U+FFD3->U+315C, U+FFD4->U+315D, U+FFD5->U+315E, \\\n"
+	" U+FFD6->U+315F, U+FFD7->U+3160, U+FFDA->U+3161, U+FFDB->U+3162, \\\n"
+	" U+FFDC->U+3163, U+3131->U+1100, U+3132->U+1101, U+3133->U+11AA, \\\n"
+	" U+3134->U+1102, U+3135->U+11AC, U+3136->U+11AD, U+3137->U+1103, \\\n"
+	" U+3138->U+1104, U+3139->U+1105, U+313A->U+11B0, U+313B->U+11B1, \\\n"
+	" U+313C->U+11B2, U+313D->U+11B3, U+313E->U+11B4, U+313F->U+11B5, \\\n"
+	" U+3140->U+111A, U+3141->U+1106, U+3142->U+1107, U+3143->U+1108, \\\n"
+	" U+3144->U+1121, U+3145->U+1109, U+3146->U+110A, U+3147->U+110B, \\\n"
+	" U+3148->U+110C, U+3149->U+110D, U+314A->U+110E, U+314B->U+110F, \\\n"
+	" U+314C->U+1110, U+314D->U+1111, U+314E->U+1112, U+314F->U+1161, \\\n"
+	" U+3150->U+1162, U+3151->U+1163, U+3152->U+1164, U+3153->U+1165, \\\n"
+	" U+3154->U+1166, U+3155->U+1167, U+3156->U+1168, U+3157->U+1169, \\\n"
+	" U+3158->U+116A, U+3159->U+116B, U+315A->U+116C, U+315B->U+116D, \\\n"
+	" U+315C->U+116E, U+315D->U+116F, U+315E->U+1170, U+315F->U+1171, \\\n"
+	" U+3160->U+1172, U+3161->U+1173, U+3162->U+1174, U+3163->U+1175, \\\n"
+	" U+3165->U+1114, U+3166->U+1115, U+3167->U+11C7, U+3168->U+11C8, \\\n"
+	" U+3169->U+11CC, U+316A->U+11CE, U+316B->U+11D3, U+316C->U+11D7, \\\n"
+	" U+316D->U+11D9, U+316E->U+111C, U+316F->U+11DD, U+3170->U+11DF, \\\n"
+	" U+3171->U+111D, U+3172->U+111E, U+3173->U+1120, U+3174->U+1122, \\\n"
+	" U+3175->U+1123, U+3176->U+1127, U+3177->U+1129, U+3178->U+112B, \\\n"
+	" U+3179->U+112C, U+317A->U+112D, U+317B->U+112E, U+317C->U+112F, \\\n"
+	" U+317D->U+1132, U+317E->U+1136, U+317F->U+1140, U+3180->U+1147, \\\n"
+	" U+3181->U+114C, U+3182->U+11F1, U+3183->U+11F2, U+3184->U+1157, \\\n"
+	" U+3185->U+1158, U+3186->U+1159, U+3187->U+1184, U+3188->U+1185, \\\n"
+	" U+3189->U+1188, U+318A->U+1191, U+318B->U+1192, U+318C->U+1194, \\\n"
+	" U+318D->U+119E, U+318E->U+11A1, U+A490->U+A408, U+A491->U+A1B9, \\\n"
+	" U+4E00..U+9FBB, U+3400..U+4DB5, U+20000..U+2A6D6, U+FA0E, U+FA0F, \\\n"
+	" U+FA11, U+FA13, U+FA14, U+FA1F, U+FA21, U+FA23, U+FA24, U+FA27, U+FA28, \\\n"
+	" U+FA29, U+3105..U+312C, U+31A0..U+31B7, U+3041, U+3043, U+3045, U+3047, \\\n"
+	" U+3049, U+304B, U+304D, U+304F, U+3051, U+3053, U+3055, U+3057, U+3059, \\\n"
+	" U+305B, U+305D, U+305F, U+3061, U+3063, U+3066, U+3068, U+306A..U+306F, \\\n"
+	" U+3072, U+3075, U+3078, U+307B, U+307E..U+3083, U+3085, U+3087, \\\n"
+	" U+3089..U+308E, U+3090..U+3093, U+30A1, U+30A3, U+30A5, U+30A7, U+30A9, \\\n"
+	" U+30AD, U+30AF, U+30B3, U+30B5, U+30BB, U+30BD, U+30BF, U+30C1, U+30C3, \\\n"
+	" U+30C4, U+30C6, U+30CA, U+30CB, U+30CD, U+30CE, U+30DE, U+30DF, U+30E1, \\\n"
+	" U+30E2, U+30E3, U+30E5, U+30E7, U+30EE, U+30F0..U+30F3, U+30F5, U+30F6, \\\n"
+	" U+31F0, U+31F1, U+31F2, U+31F3, U+31F4, U+31F5, U+31F6, U+31F7, U+31F8, \\\n"
+	" U+31F9, U+31FA, U+31FB, U+31FC, U+31FD, U+31FE, U+31FF, U+AC00..U+D7A3, \\\n"
+	" U+1100..U+1159, U+1161..U+11A2, U+11A8..U+11F9, U+A000..U+A48C, \\\n"
+	" U+A492..U+A4C6\n"
+	"	ngram_chars = \\\n"
+	/* Support for Chinese/Japanese/Korean, from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cjk */
+	"	U+4E00..U+9FBB, U+3400..U+4DB5, U+20000..U+2A6D6, U+FA0E, U+FA0F, \\\n"
+	"	U+FA11, U+FA13, U+FA14, U+FA1F, U+FA21, U+FA23, U+FA24, U+FA27, U+FA28, \\\n"
+	"	U+FA29, U+3105..U+312C, U+31A0..U+31B7, U+3041, U+3043, U+3045, U+3047, \\\n"
+	"	U+3049, U+304B, U+304D, U+304F, U+3051, U+3053, U+3055, U+3057, U+3059, \\\n"
+	"	U+305B, U+305D, U+305F, U+3061, U+3063, U+3066, U+3068, U+306A..U+306F, \\\n"
+	"	U+3072, U+3075, U+3078, U+307B, U+307E..U+3083, U+3085, U+3087, \\\n"
+	"	U+3089..U+308E, U+3090..U+3093, U+30A1, U+30A3, U+30A5, U+30A7, U+30A9, \\\n"
+	"	U+30AD, U+30AF, U+30B3, U+30B5, U+30BB, U+30BD, U+30BF, U+30C1, U+30C3, \\\n"
+	"	U+30C4, U+30C6, U+30CA, U+30CB, U+30CD, U+30CE, U+30DE, U+30DF, U+30E1, \\\n"
+	"	U+30E2, U+30E3, U+30E5, U+30E7, U+30EE, U+30F0..U+30F3, U+30F5, U+30F6, \\\n"
+	"	U+31F0, U+31F1, U+31F2, U+31F3, U+31F4, U+31F5, U+31F6, U+31F7, U+31F8, \\\n"
+	"	U+31F9, U+31FA, U+31FB, U+31FC, U+31FD, U+31FE, U+31FF, U+AC00..U+D7A3, \\\n"
+	"	U+1100..U+1159, U+1161..U+11A2, U+11A8..U+11F9, U+A000..U+A48C, \\\n"
+	"	U+A492..U+A4C6\n"
+	"	ngram_len = 1\n"
+	"\n"
+	" rt_attr_string = cyrusid\n"
+	" rt_field = header_from\n"
+	" rt_field = header_to\n"
+	" rt_field = header_cc\n"
+	" rt_field = header_bcc\n"
+	" rt_field = header_subject\n"
+	" rt_field = headers\n"
+	" rt_field = body\n"
+	" preopen = 0\n"
+	"}\n"
+	"\n"
+	"searchd\n"
+	"{\n"
+	" listen = $sphinxsock:mysql41\n"
+	" log = syslog\n"
+	" pid_file = $sphinxdir" SPHINX_PIDFILE "\n"
+	" binlog_path = $sphinxdir/binlog\n"
+	" compat_sphinxql_magics = 0\n"
+	" workers = threads\n"
+	" max_matches = " SPHINX_MAX_MATCHES "\n"
+	" preopen_indexes = 0\n"
+	"}\n"
+	"\n"
+	"source fmindex\n"
+	"{\n"
+	" type = xmlpipe2\n"
+	" xmlpipe_command = cat $sphinxdir/fmindex.xml\n"
+	" xmlpipe_attr_string = cyrusid\n"
+	" xmlpipe_field = header_from\n"
+	" xmlpipe_field = header_to\n"
+	" xmlpipe_field = header_cc\n"
+	" xmlpipe_field = header_bcc\n"
+	" xmlpipe_field = header_subject\n"
+	" xmlpipe_field = headers\n"
+	" xmlpipe_field = body\n"
+	"}\n";
+ char *sphinx_config = NULL;
+ int fd = -1;
+ struct buf buf = BUF_INITIALIZER;
+ int r;
+
+ sphinx_config = strconcat(id->basedir, SPHINX_CONFIG, (char *)NULL);
+ if (verbose > 1)
+	syslog(LOG_INFO, "setting up config \"%s\"", sphinx_config);
+
+/* the searchd.log entry changed, so force a rewrite of the config file */
+#if 0
+ struct stat sb;
+ if (stat(sphinx_config, &sb) == 0 &&
+	S_ISREG(sb.st_mode) &&
+	sb.st_size > 0) {
+	r = 0;
+	goto out;	/* a non-zero file already exists */
+ }
+#endif
+
+ if (verbose)
+	syslog(LOG_INFO, "Sphinx writing config file %s", sphinx_config);
+
+ fd = open(sphinx_config, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+ if (fd < 0) {
+	syslog(LOG_ERR, "IOERROR: unable to open %s for writing: %m",
+	 sphinx_config);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ buf_init_ro_cstr(&buf, config);
+ buf_replace_all(&buf, "$sphinxsock", id->socketpath);
+ buf_replace_all(&buf, "$sphinxdir", id->basedir);
+
+ r = retry_write(fd, buf.s, buf.len);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: error writing %s: %m", sphinx_config);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ r = 0;
+
+out:
+ if (fd >= 0) close(fd);
+ free(sphinx_config);
+ buf_free(&buf);
+ return r;
+}
+
+/* Wait until the searchd finishes shutting down.
+ * Returns 0 if all went well, or a system error code. */
+static int indexd_stopwait(indexd_t *id)
+{
+ int tries = 0;
+
+ while (tries++ < STOPWAIT_MAX_TRIES) {
+	if (indexd_is_running(id) != 0)
+	 return 0;
+	poll(NULL, 0, STOPWAIT_DELAY_MS);
+ }
+ return ETIMEDOUT;
+}
+
+static int indexd_start(indexd_t *id)
+{
+ char *config_file = NULL;
+ int r;
+
+ assert(id->state == STOPPED);
+
+ if (verbose)
+	syslog(LOG_INFO, "Sphinx starting searchd %s", id->basedir);
+
+ config_file = strconcat(id->basedir, SPHINX_CONFIG, (char *)NULL);
+ r = run_command(SEARCHD, "--config", config_file,
+		 "--syslog-prefix", syslog_prefix, (char *)NULL);
+ if (r) goto out;
+
+ id->started = time(NULL);
+ indexd_set_state(id, STARTED);
+ r = 0;
+
+out:
+ free(config_file);
+ return r;
+}
+
+static int indexd_stop(indexd_t *id)
+{
+ char *config_file = NULL;
+ int r;
+
+ if (id->state != STARTED) return 0;	/* nothing to do */
+
+ if (verbose)
+	syslog(LOG_INFO, "Sphinx stopping searchd %s",
+			 id->basedir);
+
+ config_file = strconcat(id->basedir, SPHINX_CONFIG, (char *)NULL);
+ r = run_command(SEARCHD, "--config", config_file,
+		 "--syslog-prefix", syslog_prefix,
+		 "--stop", (char *)NULL);
+ if (r) goto out;
+
+ unlink(id->socketpath);
+ indexd_set_state(id, STOPPING);
+ id->stopped = time(NULL);
+
+ r = 0;
+
+out:
+ free(config_file);
+ return r;
+}
+
+/* Returns in *basedir and *sockname, two new strings which must be free()d */
+static int sphinx_paths_from_mboxname(const char *mboxname,
+				 char **basedirp,
+				 char **socknamep)
+{
+ char *confkey = NULL;
+ const char *root;
+ struct mboxlist_entry *mbentry = NULL;
+ char *basedir = NULL;
+ struct mboxname_parts parts;
+ char *sockname = NULL;
+ char c2, d2;
+ int r;
+
+ mboxname_init_parts(&parts);
+
+ r = mboxlist_lookup(mboxname, &mbentry, /*tid*/NULL);
+ if (r) goto out;
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ confkey = strconcat("sphinxpartition-", mbentry->partition, NULL);
+ root = config_getoverflowstring(confkey, NULL);
+ if (!root) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ r = mboxname_to_parts(mboxname, &parts);
+ if (r) goto out;
+ if (!parts.userid) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ if (parts.domain)
+	basedir = strconcat(root,
+			 FNAME_DOMAINDIR,
+			 dir_hash_b(parts.domain, config_fulldirhash, d),
+			 "/", parts.domain,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts.userid, config_fulldirhash, c),
+			 "/", parts.userid,
+			 (char *)NULL);
+ else
+	basedir = strconcat(root,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts.userid, config_fulldirhash, c),
+			 "/", parts.userid,
+			 (char *)NULL);
+
+ if (parts.domain)
+	sockname = strconcat(config_dir,
+			 "/socket/sphinx.",
+			 parts.userid,
+			 "@",
+			 parts.domain,
+			 (char *)NULL);
+ else
+	sockname = strconcat(config_dir,
+			 "/socket/sphinx.",
+			 parts.userid,
+			 (char *)NULL);
+ r = 0;
+
+out:
+ if (r) {
+	free(basedir);
+	free(sockname);
+ }
+ else {
+	*basedirp = basedir;
+	*socknamep = sockname;
+ }
+ free(confkey);
+ mboxname_free_parts(&parts);
+ mboxlist_entry_free(&mbentry);
+ return r;
+}
+
+static void indexd_detach(indexd_t *id)
+{
+ if (id->state != STOPPED)
+	syslog(LOG_ERR, "IOERROR: internal error, state=%d in "
+			"indexd_detach for basedir %s",
+			id->state, id->basedir);
+
+ /* unstitch */
+ id->prev->next = id->next;
+ id->next->prev = id->prev;
+ hash_del(id->basedir, &itable);
+}
+
+/* Checks to see if the searchd is still running.
+ * Returns 0 if still running or a system error code */
+static int indexd_is_running(indexd_t *id)
+{
+ char *pidfile = strconcat(id->basedir, SPHINX_PIDFILE, (char *)NULL);
+ int r;
+ struct stat sb;
+
+ do {
+	r = stat(pidfile, &sb);
+ } while (r < 0 && errno == EINTR);
+
+ if (r < 0) {
+	r = errno;
+	if (errno != ENOENT)
+	 syslog(LOG_ERR, "cannot stat %s: %m", pidfile);
+ }
+
+ /* TODO: could also read the pidfile send the process named there a
+ * signal 0 to see if it's still alive. But that would be a lot of
+ * work to detect and hide abnormal shutdowns, which don't seem to
+ * happen; sphinx seems pretty good about cleaning up after itself.
+ * So just check for the existance of the pidfile. */
+
+ free(pidfile);
+ return r;
+}
+
+#define ID_NONE		0
+#define ID_SETUP	1
+#define ID_START	2
+static int indexd_get(const char *mboxname, indexd_t **idp, int action)
+{
+ indexd_t *id;
+ char *basedir = NULL;
+ char *socketpath = NULL;
+ int r;
+
+ r = sphinx_paths_from_mboxname(mboxname, &basedir, &socketpath);
+ if (r) return r;
+
+ id = (indexd_t *)hash_lookup(basedir, &itable);
+
+ if (id && id->state == STOPPING) {
+	syslog(LOG_NOTICE, "searchd %s is still shutting down, "
+			 "waiting to start a new one",
+			 id->basedir);
+	r = indexd_stopwait(id);
+	if (r) {
+	 syslog(LOG_ERR, "IOERROR: failed to wait for "
+			 "searchd %s to shut down: %s",
+			 id->basedir, error_message(r));
+	 return r;
+	}
+	indexd_set_state(id, STOPPED);
+	indexd_detach(id);
+	indexd_free(id);
+	id = NULL;
+ }
+
+ if (id && indexd_is_running(id) != 0) {
+	syslog(LOG_NOTICE, "searchd %s is no longer running, forgetting",
+			 id->basedir);
+	indexd_set_state(id, STOPPED);
+	indexd_detach(id);
+	indexd_free(id);
+	id = NULL;
+ }
+
+ if (!id) {
+	if (action == ID_NONE) {
+	 r = IMAP_NOTFOUND;
+	 goto out;
+	}
+	if (action == ID_START && max_children && num_started >= max_children) {
+	 /* stop the oldest STARTED child */
+	 indexd_t *oldest;
+	 for (oldest = indexroot.next ;
+		 oldest != &indexroot && oldest->state != STARTED ;
+		 oldest = oldest->next)
+		;
+	 if (oldest->state == STARTED) {
+		syslog(LOG_NOTICE, "hit limit %d, killing oldest %s",
+		 max_children, oldest->basedir);
+		if (indexd_is_running(oldest) != 0 || indexd_stop(oldest) != 0) {
+		 /* not running or failed to initiate shut down */
+		 indexd_set_state(oldest, STOPPED);
+		 indexd_detach(oldest);
+		 indexd_free(oldest);
+		}
+		/* will be detached and freed later */
+	 }
+	}
+	id = xzmalloc(sizeof(*id));
+	id->basedir = basedir;
+	basedir = NULL;
+	id->socketpath = socketpath;
+	socketpath = NULL;
+
+	r = indexd_setup_tree(id);
+	if (r) {
+	 indexd_free(id);
+	 return r;
+	}
+
+	r = indexd_setup_config(id);
+	if (r) {
+	 indexd_free(id);
+	 return r;
+	}
+
+	if (action == ID_START) {
+	 r = indexd_start(id);
+	 if (r) {
+		indexd_free(id);
+		return r;
+	 }
+	}
+
+	hash_insert(id->basedir, id, &itable);
+	id->prev = indexroot.prev;
+	id->next = &indexroot;
+	id->prev->next = id;
+	id->next->prev = id;
+ }
+ else {
+	/* remove from the list */
+	id->prev->next = id->next;
+	id->next->prev = id->prev;
+	/* move to the end */
+	id->prev = indexroot.prev;
+	id->next = &indexroot;
+	id->prev->next = id;
+	id->next->prev = id;
+ }
+
+ id->used = time(NULL);
+ *idp = id;
+ r = 0;
+out:
+ free(basedir);
+ free(socketpath);
+ return r;
+}
+
+static void expire_indexd(const char *key __attribute__((unused)),
+			 void *data, void *rock)
+{
+ indexd_t *id = (indexd_t *)data;
+ time_t now = *(time_t *)rock;
+
+ switch (id->state) {
+ case STARTED:
+	if (now > id->used + sphinx_timeout) {
+	 if (verbose)
+		syslog(LOG_INFO, "searchd %s has been idle for %d sec",
+				 id->basedir, (int)(now - id->used));
+	 if (indexd_is_running(id) != 0 || indexd_stop(id) != 0) {
+		/* not running or failed to initiate shut down */
+		indexd_set_state(id, STOPPED);
+		indexd_detach(id);
+		indexd_free(id);
+	 }
+	 /* or, will be detached and freed later */
+	}
+	break;
+ case STOPPING:
+	if (indexd_is_running(id) != 0) {
+	 if (verbose)
+		syslog(LOG_INFO, "searchd %s finished shutting down after %d sec",
+				 id->basedir,
+				 (int)(now - id->stopped));
+	 indexd_set_state(id, STOPPED);
+	 indexd_detach(id);
+	 indexd_free(id);
+	}
+	break;
+ case STOPPED:
+	abort();
+ }
+}
+
+static int create_server_socket(void)
+{
+ const char *sockname = config_getstring(IMAPOPT_SPHINXMGR_SOCKET);
+ struct sockaddr_un asun;
+ int r;
+ int s;
+
+ s = socket(PF_UNIX, SOCK_STREAM, 0);
+ if (s < 0) {
+	perror("socket(PF_UNIX)");
+	shut_down(1);
+ }
+
+ r = unlink(sockname);
+ if (r < 0 && errno != ENOENT) {
+	perror(sockname);
+	shut_down(1);
+ }
+
+ memset(&asun, 0, sizeof(asun));
+ asun.sun_family = AF_UNIX;
+ strlcpy(asun.sun_path, sockname, sizeof(asun.sun_path));
+
+ r = bind(s, (struct sockaddr *)&asun, sizeof(asun));
+ if (r < 0) {
+	perror(sockname);
+	shut_down(1);
+ }
+
+ r = listen(s, 100);
+ if (r < 0) {
+	perror("listen");
+	shut_down(1);
+ }
+
+ return s;
+}
+
+/*
+ * Command is: GETSOCK <internal-mboxname>
+ */
+static int handle_getsock(char *mboxname, char *reply, size_t maxreply)
+{
+ indexd_t *id = NULL;
+ int r;
+
+ if (!mboxname || !*mboxname) return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ r = indexd_get(mboxname, &id, ID_START);
+ if (!r)
+	snprintf(reply, maxreply, "%s", id->socketpath);
+ return r;
+}
+
+/*
+ * Command is: GETCONF <internal-mboxname>
+ */
+static int handle_getconf(char *mboxname, char *reply, size_t maxreply)
+{
+ indexd_t *id = NULL;
+ int r;
+
+ if (!mboxname || !*mboxname) return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ r = indexd_get(mboxname, &id, ID_SETUP);
+ if (!r)
+	snprintf(reply, maxreply, "%s%s", id->basedir, SPHINX_CONFIG);
+ if (id->state == STOPPED) {
+	/* This index_t was just created to return the basedir to us */
+	indexd_detach(id);
+	indexd_free(id);
+ }
+ return r;
+}
+
+/*
+ * Command is: STOP <internal-mboxname>
+ */
+static int handle_stop(char *mboxname,
+		 char *reply __attribute__((unused)),
+		 size_t maxreply __attribute__((unused)))
+{
+ indexd_t *id = NULL;
+ int r;
+
+ if (!mboxname || !*mboxname) return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ r = indexd_get(mboxname, &id, ID_NONE);
+ if (!r)
+	indexd_stop(id);
+ return r;
+}
+
+static void process_command(int ss)
+{
+ int s;
+ int r;
+ int i;
+ char *cmd;
+ char *arg;
+ int (*handler)(char *arg, char *reply, size_t maxreply) = NULL;
+ char buf1024;
+ static const char sep = " \t\r\n";
+
+ s = accept(ss, NULL, NULL);
+ if (s < 0) {
+	syslog(LOG_ERR, "accept(): %m");
+	return;
+ }
+
+ r = read(s, buf, sizeof(buf)-1);
+ if (r < 0) {
+	syslog(LOG_ERR, "read(): %m");
+	goto out;
+ }
+ if (r == 0) {
+	/* what, eof already? whatever */
+	goto out;
+ }
+ bufr = '\0';
+
+ /* trim trailing CR or LF from the line */
+ while (r > 0 && (bufr-1 == '\r' || bufr-1 == '\n'))
+	buf--r = '\0';
+
+ /* split into command and argument, preserving whitespace
+ * inside the argument */
+ cmd = buf;
+ i = strcspn(buf, sep);
+ if (i <= 0 || i >= r) {
+	syslog(LOG_ERR, "Malformed command received, ignoring");
+	goto out;
+ }
+ while (i < r && isspace(bufi))
+	bufi++ = '\0';
+
+ ucase(cmd);
+ arg = buf+i;
+
+ if (verbose > 1)
+	syslog(LOG_INFO, "parsed command, cmd=\"%s\" arg=\"%s\"", cmd, arg);
+
+ if (!strcmp(cmd, "GETSOCK"))
+	handler = handle_getsock;
+ if (!strcmp(cmd, "GETCONF"))
+	handler = handle_getconf;
+ else if (!strcmp(cmd, "STOP"))
+	handler = handle_stop;
+
+ if (handler) {
+	snprintf(buf, sizeof(buf), "OK ");
+	r = handler(arg, buf+strlen(buf), sizeof(buf)-strlen(buf)-2);
+	if (!r)
+	 strlcat(buf, "\r\n", sizeof(buf));
+	else
+	 snprintf(buf, sizeof(buf), "NO %s\r\n", error_message(r));
+ }
+ else
+	snprintf(buf, sizeof(buf), "BAD Unrecognized command\r\n");
+
+ if (verbose > 1)
+	syslog(LOG_INFO, "sending reply \"%s\"", buf);
+
+ retry_write(s, buf, strlen(buf));
+
+ /* we always shut down the connection after one command */
+out:
+ close(s);
+}
+
+static void kill_indexd(const char *key __attribute__((unused)),
+			void *data,
+			void *rock __attribute__((unused)))
+{
+ indexd_t *id = (indexd_t *)data;
+
+ indexd_stop(id);
+}
+
+static void shut_down(int code)
+{
+ if (server_sock >= 0) close(server_sock);
+ hash_enumerate(&itable, kill_indexd, NULL);
+
+ /* mboxlist might not have been opened yet, but that's harmless */
+ mboxlist_close();
+ mboxlist_done();
+
+ cyrus_done();
+
+ exit(code);
+}
+
+int main(int argc, char **argv)
+{
+ char *p = NULL;
+ int opt;
+ struct pollfd pfd;
+ char *alt_config = NULL;
+ int background = 1;
+ int init_flags = CYRUSINIT_PERROR;
+
+ p = getenv("CYRUS_VERBOSE");
+ if (p) verbose = atoi(p) + 1;
+
+ while ((opt = getopt(argc, argv, "C:fv")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+	case 'f': /* run in foreground for debugging */
+	 background = 0;
+	 break;
+	case 'v': /* be more verbose */
+	 verbose++;
+	 break;
+	default:
+	 fprintf(stderr, "invalid argument\n");
+	 exit(EC_USAGE);
+	 break;
+	}
+ }
+
+ cyrus_init(alt_config, "cyr_sphinxmgr", 0, 0);
+
+ syslog_prefix = config_getstring(IMAPOPT_SYSLOG_PREFIX);
+ if (!syslog_prefix)
+	syslog_prefix = "cyrus";
+
+ /* Set inactivity timer (convert from minutes to seconds) */
+ sphinx_timeout = config_getint(IMAPOPT_SPHINXMGR_TIMEOUT);
+ max_children = config_getint(IMAPOPT_SPHINXMGR_MAX_CHILDREN);
+
+ signals_add_handlers(0);
+ signals_set_shutdown(shut_down);
+
+ /* create idle table */
+ construct_hash_table(&itable, 1024, 1);
+
+ /* initialise the linked list */
+ indexroot.prev = &indexroot;
+ indexroot.next = &indexroot;
+
+ server_sock = create_server_socket();
+
+ /* fork unless we were given the -f option */
+ if (background) {
+	pid_t pid;
+	int nullfd;
+
+	nullfd = open("/dev/null", O_RDWR, 0);
+	if (nullfd < 0) {
+	 perror("/dev/null");
+	 exit(1);
+	}
+	dup2(nullfd, 0);
+	dup2(nullfd, 1);
+	dup2(nullfd, 2);
+	close(nullfd);
+	init_flags &= ~CYRUSINIT_PERROR;
+
+	pid = fork();
+	if (pid == -1) {
+	 perror("fork");
+	 exit(1);
+	}
+
+	if (pid)
+	 exit(0);/* parent */
+	/* child */
+ }
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ syslog(LOG_INFO, "cyr_sphinxmgr running");
+
+ for (;;) {
+	int n;
+	time_t now = time(NULL);
+
+	signals_poll();
+
+	/* check for shutdown file */
+	if (shutdown_file(NULL, 0))
+	 shut_down(0);
+
+	hash_enumerate(&itable, expire_indexd, &now);
+
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.fd = server_sock;
+	pfd.events = POLLIN;
+
+	n = poll(&pfd, 1, /*1 second timeout*/1000);
+	if (n < 0) {
+	 if (errno == EAGAIN || errno == EINTR) continue;
+	 syslog(LOG_ERR, "poll(): %m");
+	 fatal("poll failed", EC_TEMPFAIL);
+	}
+
+	if (n > 0 && (pfd.revents & POLLIN))
+	 process_command(server_sock);
+ }
+
+ shut_down(0);
+}
+

cyrus-imapd-2.4.17.tar.gz/imap/cyr_synclog.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_synclog.c Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: cyr_synclog.c,v 1.7 2010/01/06 17:01:31 murch Exp $
- *
 * Originally written by Bron Gondwana <brong@fastmail.fm>
 */
 
@@ -52,25 +50,23 @@
 #include <unistd.h>
 #endif
 
+#include "exitcodes.h"
 #include "global.h"
 #include "sync_log.h"
 #include "util.h"
 #include "xmalloc.h"
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 int main(int argc, char *argv)
 {
 char *alt_config = NULL;
 char cmd = '\0';
 char opt;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
- while ((opt = getopt(argc, argv, "C:uvmacqnsb")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:uUvmMacqnsb")) != EOF) {
 	switch (opt) {
 	case 'C': /* alt config file */
 	 alt_config = optarg;
@@ -78,12 +74,18 @@
 	case 'u': /* User */
 	 cmd = 'u';
 	 break;
+	case 'U': /* UnUser */
+	 cmd = 'U';
+	 break;
 	case 'v': /* sieVe */
 	 cmd = 'v';
 	 break;
 	case 'm': /* Mailbox */
 	 cmd = 'm';
 	 break;
+	case 'M': /* UnMailbox */
+	 cmd = 'M';
+	 break;
 	case 'a': /* Append */
 	 cmd = 'a';
 	 break;
@@ -112,8 +114,10 @@
 	fprintf(stderr, "\n");
 	fprintf(stderr, "types:\n");
 	fprintf(stderr, " -u USER\n");
+	fprintf(stderr, " -U UNUSER\n");
 	fprintf(stderr, " -v SIEVE\n");
 	fprintf(stderr, " -m MAILBOX\n");
+	fprintf(stderr, " -M UNMAILBOX\n");
 	fprintf(stderr, " -q QUOTA\n");
 	fprintf(stderr, " -n ANNOTATION\n");
 	fprintf(stderr, " -s SEEN\n");
@@ -124,19 +128,25 @@
 	exit(-1);
 }
 
- cyrus_init(alt_config, "cyr_synclog", 0);
+ cyrus_init(alt_config, "cyr_synclog", 0, 0);
 sync_log_init();
 
 switch(cmd) {
 	case 'u': /* User */
 	 sync_log_user(argvoptind);
 	 break;
+	case 'U': /* UnUser */
+	 sync_log_unuser(argvoptind);
+	 break;
 	case 'v': /* sieVe */
 	 sync_log_sieve(argvoptind);
 	 break;
 	case 'm': /* Mailbox */
 	 sync_log_mailbox(argvoptind);
 	 break;
+	case 'M': /* UnMailbox */
+	 sync_log_unmailbox(argvoptind);
+	 break;
 	case 'q': /* Quota */
 	 sync_log_quota(argvoptind);
 	 break;

cyrus-imapd-2.4.17.tar.gz/imap/cyr_userseen.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_userseen.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ctl_cyrusdb.c,v 1.33 2010/01/06 17:01:30 murch Exp $
 */
 
 #include <config.h>
@@ -50,13 +48,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <syslog.h>
-#include <errno.h>
 
-#include "cyrusdb.h"
 #include "global.h"
 #include "exitcodes.h"
 #include "libcyr_cfg.h"
@@ -67,10 +61,9 @@
 #include "xmalloc.h"
 
 /* config.c stuff */
-const int config_need_data = 0;
 static int do_remove = 0;
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr, "cyr_userseen -C <altconfig> -d\n");
 exit(-1);
@@ -107,7 +100,7 @@
 int opt;
 char *alt_config = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -127,7 +120,7 @@
 	}
 }
 
- cyrus_init(alt_config, "cyr_userseen", 0);
+ cyrus_init(alt_config, "cyr_userseen", 0, 0);
 
 mboxlist_init(0);
 mboxlist_open(NULL);

cyrus-imapd-2.4.17.tar.gz/imap/cyr_virusscan.c -> cyrus-imapd-2.5.tar.gz/imap/cyr_virusscan.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyr_virusscan.c,v 1.9 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -55,10 +53,9 @@
 
 /* cyrus includes */
 #include "global.h"
-#include "sysexits.h"
 #include "exitcodes.h"
 #include "append.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "index.h"
 #include "mailbox.h"
 #include "xmalloc.h"
@@ -66,10 +63,7 @@
 #include "prot.h"
 #include "util.h"
 #include "sync_log.h"
-#include "rfc822date.h"
-
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
+#include "times.h"
 
 struct infected_msg {
 char *mboxname;
@@ -124,7 +118,6 @@
 
 struct clamav_state {
 struct cl_engine *av_engine;
- struct cl_limits av_limits;
 };
 
 void *clamav_init()
@@ -133,9 +126,17 @@
 int r;
 
 struct clamav_state *st = xzmalloc(sizeof(struct clamav_state));
+ if (st == NULL) {
+ fatal("memory allocation failed", EC_SOFTWARE);
+ }
 
+ st->av_engine = cl_engine_new();
+ if ( ! st->av_engine ) {
+ fatal("Failed to initialize AV engine", EC_SOFTWARE);
+ }
+ 
 /* load all available databases from default directory */
- if ((r = cl_load(cl_retdbdir(), &st->av_engine, &sigs, CL_DB_STDOPT))) {
+ if ((r = cl_load(cl_retdbdir(), st->av_engine, &sigs, CL_DB_STDOPT))) {
 	syslog(LOG_ERR, "cl_load: %s", cl_strerror(r));
 	fatal(cl_strerror(r), EC_SOFTWARE);
 }
@@ -143,25 +144,26 @@
 if (verbose) printf("Loaded %d virus signatures.\n", sigs);
 
 /* build av_engine */
- if((r = cl_build(st->av_engine))) {
+ if((r = cl_engine_compile(st->av_engine))) {
 	syslog(LOG_ERR,
 	 "Database initialization error: %s", cl_strerror(r));
-	cl_free(st->av_engine);
+	cl_engine_free(st->av_engine);
 	fatal(cl_strerror(r), EC_SOFTWARE);
 }
 
 /* set up archive av_limits */
- st->av_limits.maxfiles = 10000; /* max files */
- st->av_limits.maxscansize = 100 * 1048576; /* during the scanning of
-						* archives
-						* this size (100 MB) will never
-						* be exceeded
-						*/
- st->av_limits.maxfilesize = 10 * 1048576; /* compressed files will only be
-					 * decompressed and scanned up to
-					 * this size (10 MB)
-					 */
- st->av_limits.maxreclevel = 16; /* maximum recursion level for archives */
+ /* max files */
+ cl_engine_set_num(st->av_engine, CL_ENGINE_MAX_FILES, 10000);
+ /* during the scanning of archives, this size (100 MB) will
+ * never be exceeded
+ */
+ cl_engine_set_num(st->av_engine, CL_ENGINE_MAX_SCANSIZE, 100 * 1048576);
+ /* compressed files will only be decompressed and scanned up to 
+ * this size (10 MB)
+ */
+ cl_engine_set_num(st->av_engine, CL_ENGINE_MAX_FILESIZE, 10 * 1048576);
+ /* maximum recursion level for archives */
+ cl_engine_set_num(st->av_engine, CL_ENGINE_MAX_RECURSION, 16);
 
 return (void *) st;
 }
@@ -174,7 +176,7 @@
 int r;
 
 /* scan file */
- r = cl_scanfile(fname, virname, NULL, st->av_engine, &st->av_limits,
+ r = cl_scanfile(fname, virname, NULL, st->av_engine,
 		 CL_SCAN_STDOPT);
 
 switch (r) {
@@ -200,7 +202,7 @@
 
 if (st->av_engine) {
 	/* free memory */
-	cl_free(st->av_engine);
+	cl_engine_free(st->av_engine);
 }
 free(st);
 }
@@ -232,7 +234,7 @@
 char *alt_config = NULL;
 int r;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -255,7 +257,7 @@
 	}
 }
 
- cyrus_init(alt_config, "cyr_virusscan", 0);
+ cyrus_init(alt_config, "cyr_virusscan", 0, CONFIG_NEED_PARTITION_DATA);
 
 if (!engine.name) {
 	fatal("no virus scanner configured", EC_SOFTWARE);
@@ -280,6 +282,10 @@
 
 sync_log_init();
 
+ /* setup for mailbox event notifications */
+ mboxevent_init();
+ mboxevent_setnamespace(&scan_namespace);
+
 if (optind == argc) { /* do the whole partition */
 	strcpy(buf, "*");
 	(*scan_namespace.mboxlist_findall)(&scan_namespace, buf, 1, 0, 0,
@@ -342,7 +348,7 @@
 	printf("Working on %s...\n", mboxname);
 }
 
- r = mailbox_open_iwl(name, 0, &mailbox);
+ r = mailbox_open_iwl(name, &mailbox);
 if (r) { /* did we find it? */
 	syslog(LOG_ERR, "Couldn't find %s, check spelling", name);
 	return 0;
@@ -380,7 +386,7 @@
 	if (i_mbox) i_mbox->recno = 1;
 }
 
- mailbox_expunge(mailbox, virus_check, i_mbox, 0, NULL);
+ mailbox_expunge(mailbox, virus_check, i_mbox, NULL, EVENT_MESSAGE_EXPUNGE);
 mailbox_close(&mailbox);
 
 return 0;
@@ -418,7 +424,7 @@
 const char *virname;
 int r = 0;
 
- fname = mailbox_message_fname(mailbox, record->uid);
+ fname = mailbox_record_fname(mailbox, record);
 
 if ((r = engine.scanfile(engine.state, fname, &virname))) {
 	if (verbose) {
@@ -448,7 +454,7 @@
 	 FILE *f = fdopen(fd, "w+");
 	 size_t ownerlen;
 	 struct infected_msg *msg;
-	 char buf8192, datestr80;
+	 char buf8192, datestrRFC822_DATETIME_MAX+1;
 	 time_t t;
 	 struct protstream *pout;
 	 struct appendstate as;
@@ -461,7 +467,7 @@
 		 (int) p, (int) t, 
 		 outgoing_count++, config_servername);
 	 fprintf(f, "Message-ID: %s\r\n", buf);
-	 rfc822date_gen(datestr, sizeof(datestr), t);
+	 time_to_rfc822(t, datestr, sizeof(datestr));
 	 fprintf(f, "Date: %s\r\n", datestr);
 	 fprintf(f, "From: Mail System Administrator <%s>\r\n",
 		 config_getstring(IMAPOPT_POSTMASTER));
@@ -498,11 +504,14 @@
 	 fflush(f);
 	 msgsize = ftell(f);
 
-	 append_setup(&as, i_mbox->owner, NULL, NULL, 0, -1);
+	 /* send MessageAppend event notification */
+	 append_setup(&as, i_mbox->owner, NULL, NULL, 0, NULL, NULL, 0,
+			 EVENT_MESSAGE_APPEND);
+
 	 pout = prot_new(fd, 0);
 	 prot_rewind(pout);
-	 append_fromstream(&as, &body, pout, msgsize, t, NULL, 0);
-	 append_commit(&as, -1, NULL, NULL, NULL);
+	 append_fromstream(&as, &body, pout, msgsize, t, NULL);
+	 append_commit(&as);
 
 	 if (body) {
 		message_free_body(body);

cyrus-imapd-2.4.17.tar.gz/imap/cyrdump.c -> cyrus-imapd-2.5.tar.gz/imap/cyrdump.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrdump.c,v 1.23 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -56,26 +54,21 @@
 #include "exitcodes.h"
 #include "global.h"
 #include "index.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "imapurl.h"
 #include "mailbox.h"
 #include "mboxlist.h"
-#include "sysexits.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
-
 
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
 
-int verbose = 0;
+static int verbose = 0;
 
 static int dump_me(char *name, int matchlen, int maycreate, void *rock);
 static void print_seq(const char *tag, const char *attrib, 
 		 unsigned *seq, int n);
-int usage(const char *name);
+static int usage(const char *name);
 
 /* current namespace */
 static struct namespace dump_namespace;
@@ -92,7 +85,7 @@
 char *alt_config = NULL;
 struct incremental_record irec;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -116,7 +109,7 @@
 	usage(argv0);
 }
 
- cyrus_init(alt_config, "dump", 0);
+ cyrus_init(alt_config, "dump", 0, CONFIG_NEED_PARTITION_DATA);
 mboxlist_init(0);
 mboxlist_open(NULL);
 
@@ -145,7 +138,7 @@
 return 0;
 }
 
-int usage(const char *name)
+static int usage(const char *name)
 {
 fprintf(stderr, "usage: %s -v mboxpattern ...\n", name);
 
@@ -160,6 +153,14 @@
 	 (long) getpid(), (long) time(NULL), (long) rand());
 }
 
+static search_expr_t *systemflag_match(int flag)
+{
+ search_expr_t *e = search_expr_new(NULL, SEOP_MATCH);
+ e->attr = search_attr_find("systemflags");
+ e->value.u = flag;
+ return e;
+}
+
 static int dump_me(char *name, int matchlen __attribute__((unused)),
 		 int maycreate __attribute__((unused)), void *rock)
 {
@@ -173,6 +174,7 @@
 unsigned *uids;
 unsigned *uidseq;
 int i, n, numuids;
+ unsigned msgno;
 
 r = index_open(name, NULL, &state);
 if (r) {
@@ -202,28 +204,29 @@
 printf("\n");
 
 memset(&searchargs, 0, sizeof(struct searchargs));
+ searchargs.root = search_expr_new(NULL, SEOP_TRUE);
 numuids = index_getuidsequence(state, &searchargs, &uids);
 print_seq("uidlist", NULL, uids, numuids);
 printf("\n");
 
 printf(" <flags>\n");
 
- searchargs.system_flags_set = FLAG_ANSWERED;
+ searchargs.root = systemflag_match(FLAG_ANSWERED);
 n = index_getuidsequence(state, &searchargs, &uidseq);
 print_seq("flag", "name=\"\\Answered\" user=\"*\"", uidseq, n);
 if (uidseq) free(uidseq);
 
- searchargs.system_flags_set = FLAG_DELETED;
+ searchargs.root = systemflag_match(FLAG_DELETED);
 n = index_getuidsequence(state, &searchargs, &uidseq);
 print_seq("flag", "name=\"\\Deleted\" user=\"*\"", uidseq, n);
 if (uidseq) free(uidseq);
 
- searchargs.system_flags_set = FLAG_DRAFT;
+ searchargs.root = systemflag_match(FLAG_DRAFT);
 n = index_getuidsequence(state, &searchargs, &uidseq);
 print_seq("flag", "name=\"\\Draft\" user=\"*\"", uidseq, n);
 if (uidseq) free(uidseq);
 
- searchargs.system_flags_set = FLAG_FLAGGED;
+ searchargs.root = systemflag_match(FLAG_FLAGGED);
 n = index_getuidsequence(state, &searchargs, &uidseq);
 print_seq("flag", "name=\"\\Flagged\" user=\"*\"", uidseq, n);
 if (uidseq) free(uidseq);
@@ -232,31 +235,46 @@
 
 printf("</imapdump>\n");
 
- for (i = 0; i < numuids; i++) {
-	const char *base;
-	unsigned long len;
+ i = 0;
+ while (uidsi < irec->incruid && i < numuids) {
+	/* already dumped this message */
+	/* xxx could do binary search to get to the first
+	 undumped uid */
+	i++;
+ }
+
+ for (msgno = 1; msgno <= state->exists; msgno++) {
+	struct index_map *im = &state->mapmsgno-1;
+	struct buf msg = BUF_INITIALIZER;
+	struct index_record record;
+
+	while (im->uid > uidsi && i < numuids)
+	 i++;
+	if (i >= numuids)
+	 break;
+
+	if (im->uid < uidsi)
+	 continue;
 
-	if (uidsi < irec->incruid) {
-	 /* already dumped this message */
-	 /* xxx could do binary search to get to the first
-	 undumped uid */
+	/* got a match */
+	i++;
+	if (mailbox_read_index_record(state->mailbox, im->recno, &record))
 	 continue;
-	}
 
 	printf("\n--%s\n", boundary);
 	printf("Content-Type: message/rfc822\n");
 	printf("Content-ID: %d\n", uidsi);
 	printf("\n");
-	r = mailbox_map_message(state->mailbox, uidsi, &base, &len);
+	r = mailbox_map_record(state->mailbox, &record, &msg);
 	if (r) {
 	 if (verbose) {
-		printf("error mapping message %d: %s\n", uidsi, 
+		printf("error mapping message %u: %s\n", record.uid,
 		 error_message(r));
 	 }
 	 break;
 	}
-	fwrite(base, 1, len, stdout);
-	mailbox_unmap_message(state->mailbox, uidsi, &base, &len);
+	fwrite(msg.s, 1, msg.len, stdout);
+	buf_free(&msg);
 }
 
 printf("\n--%s--\n", boundary);

cyrus-imapd-2.5.tar.gz/imap/dav_db.c Added

@@ -0,0 +1,309 @@
+/* dav_db.c -- implementation of per-user DAV database
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "assert.h"
+#include "cyrusdb.h"
+#include "dav_db.h"
+#include "global.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#define FNAME_DAVSUFFIX ".dav" /* per-user DAV DB extension */
+
+struct open_davdb {
+ sqlite3 *db;
+ char *path;
+ unsigned refcount;
+ struct open_davdb *next;
+};
+
+static struct open_davdb *open_davdbs;
+
+static int dbinit = 0;
+
+EXPORTED int dav_init(void)
+{
+ if (!dbinit++) {
+#if SQLITE_VERSION_NUMBER >= 3006000
+	sqlite3_initialize();
+#endif
+ }
+
+ assert(!open_davdbs);
+
+ return 0;
+}
+
+
+EXPORTED int dav_done(void)
+{
+ if (--dbinit) {
+#if SQLITE_VERSION_NUMBER >= 3006000
+	sqlite3_shutdown();
+#endif
+ }
+
+ /* XXX - report the problems? */
+ assert(!open_davdbs);
+
+ return 0;
+}
+
+
+/* Create filename corresponding to userid's DAV DB */
+EXPORTED void dav_getpath(struct buf *fname, const char *userid)
+{
+ char c, *domain;
+
+ buf_reset(fname);
+ if (config_virtdomains && (domain = strchr(userid, '@'))) {
+	char d = (char) dir_hash_c(domain+1, config_fulldirhash);
+	*domain = '\0'; /* split user@domain */
+	c = (char) dir_hash_c(userid, config_fulldirhash);
+	buf_printf(fname, "%s%s%c/%s%s%c/%s%s", config_dir, FNAME_DOMAINDIR, d,
+		 domain+1, FNAME_USERDIR, c, userid, FNAME_DAVSUFFIX);
+	*domain = '@'; /* reassemble user@domain */
+ }
+ else {
+	c = (char) dir_hash_c(userid, config_fulldirhash);
+	buf_printf(fname, "%s%s%c/%s%s", config_dir, FNAME_USERDIR, c, userid,
+		 FNAME_DAVSUFFIX);
+ }
+}
+
+
+static void dav_debug(void *userid, const char *sql)
+{
+ syslog(LOG_DEBUG, "dav_exec(%s%s): %s",
+	 (const char *) userid, FNAME_DAVSUFFIX, sql);
+}
+
+static void free_dav_open(struct open_davdb *open)
+{
+ free(open->path);
+ free(open);
+}
+
+
+/* Open DAV DB corresponding to userid */
+EXPORTED sqlite3 *dav_open(const char *userid, const char *cmds)
+{
+ int rc = SQLITE_OK;
+ struct buf fname = BUF_INITIALIZER;
+ struct stat sbuf;
+ struct open_davdb *open;
+
+ dav_getpath(&fname, userid);
+
+ for (open = open_davdbs; open; open = open->next) {
+	if (!strcmp(open->path, buf_cstring(&fname))) {
+	 /* already open! */
+	 open->refcount++;
+	 goto docmds;
+	}
+ }
+
+ open = xzmalloc(sizeof(struct open_davdb));
+ open->path = buf_release(&fname);
+
+ rc = stat(open->path, &sbuf);
+ if (rc == -1 && errno == ENOENT) {
+	rc = cyrus_mkdir(open->path, 0755);
+ }
+
+#if SQLITE_VERSION_NUMBER >= 3006000
+ rc = sqlite3_open_v2(open->path, &open->db,
+			 SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+#else
+ rc = sqlite3_open(open->path, &open->db);
+#endif
+ if (rc != SQLITE_OK) {
+	syslog(LOG_ERR, "dav_open(%s) open: %s",
+	 open->path, open->db ? sqlite3_errmsg(open->db) : "failed");
+	sqlite3_close(open->db);
+	free_dav_open(open);
+	return NULL;
+ }
+ else {
+#if SQLITE_VERSION_NUMBER >= 3006000
+	sqlite3_extended_result_codes(open->db, 1);
+#endif
+	sqlite3_trace(open->db, dav_debug, (void *) userid);
+ }
+
+ /* stitch on up */
+ open->refcount = 1;
+ open->next = open_davdbs;
+ open_davdbs = open;
+
+docmds:
+ if (cmds) {
+	rc = sqlite3_exec(open->db, cmds, NULL, NULL, NULL);
+	if (rc != SQLITE_OK) {
+	 /* XXX - fatal? */
+	 syslog(LOG_ERR, "dav_open(%s) cmds: %s",
+		 open->path, sqlite3_errmsg(open->db));
+	}
+ }
+
+ buf_free(&fname);
+
+ return open->db;
+}
+
+
+/* Close DAV DB */
+EXPORTED int dav_close(sqlite3 *davdb)
+{
+ int rc, r = 0;;
+ struct open_davdb *open, *prev = NULL;
+
+ if (!davdb) return 0;
+
+ for (open = open_davdbs; open; open = open->next) {
+	if (davdb == open->db) {
+	 if (--open->refcount) return 0; /* still in use */
+	 if (prev)
+		prev->next = open->next;
+	 else
+		open_davdbs = open->next;
+	 break;
+	}
+	prev = open;
+ }
+
+ assert(open);
+
+ rc = sqlite3_close(open->db);
+ if (rc != SQLITE_OK) {
+	syslog(LOG_ERR, "dav_close(%s): %s", open->path, sqlite3_errmsg(open->db));
+	r = CYRUSDB_INTERNAL;
+ }
+
+ free_dav_open(open);
+
+ return r;
+}
+
+
+EXPORTED int dav_exec(sqlite3 *davdb, const char *cmd, struct bind_val bval,
+	 int (*cb)(sqlite3_stmt *stmt, void *rock), void *rock,
+	 sqlite3_stmt **stmt)
+{
+ int rc, r = 0;
+
+ if (!*stmt) {
+	/* prepare new statement */
+#if SQLITE_VERSION_NUMBER >= 3006000
+	rc = sqlite3_prepare_v2(davdb, cmd, -1, stmt, NULL);
+#else
+	rc = sqlite3_prepare(davdb, cmd, -1, stmt, NULL);
+#endif
+	if (rc != SQLITE_OK) {
+	 syslog(LOG_ERR, "dav_exec() prepare: %s", sqlite3_errmsg(davdb));
+	 return CYRUSDB_INTERNAL;
+	}
+ }
+
+ /* bind values */
+ for (; bval && bval->name; bval++) {
+	int cidx = sqlite3_bind_parameter_index(*stmt, bval->name);
+
+	switch (bval->type) {
+	case SQLITE_INTEGER:
+	 sqlite3_bind_int(*stmt, cidx, bval->val.i);
+	 break;
+
+	case SQLITE_TEXT:
+	 sqlite3_bind_text(*stmt, cidx, bval->val.s, -1, NULL);
+	 break;
+	}
+ }
+
+ /* execute and process the results */
+ while ((rc = sqlite3_step(*stmt)) == SQLITE_ROW) {
+	if (cb && (r = cb(*stmt, rock))) break;
+ }
+
+ /* reset statement and clear all bindings */
+ sqlite3_reset(*stmt);
+#if SQLITE_VERSION_NUMBER >= 3006000
+ sqlite3_clear_bindings(*stmt);
+#endif
+
+ if (!r && rc != SQLITE_DONE) {
+	syslog(LOG_ERR, "dav_exec() step: %s", sqlite3_errmsg(davdb));
+	r = CYRUSDB_INTERNAL;
+ }
+
+ return r;
+}
+
+
+EXPORTED int dav_delete(const char *userid)
+{
+ struct buf fname = BUF_INITIALIZER;
+ int r = 0;
+
+ dav_getpath(&fname, userid);
+ if (unlink(buf_cstring(&fname)) && errno != ENOENT) {
+	syslog(LOG_ERR, "dav_db: error unlinking %s: %m", buf_cstring(&fname));
+	r = CYRUSDB_INTERNAL;
+ }
+
+ buf_free(&fname);
+
+ return r;
+}

cyrus-imapd-2.5.tar.gz/imap/dav_db.h Added

@@ -0,0 +1,95 @@
+/* dav_db.h -- abstract interface for per-user DAV database
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef DAV_DB_H
+#define DAV_DB_H
+
+#include <sqlite3.h>
+
+#include "util.h"
+
+struct dav_data {
+ unsigned rowid;
+ time_t creationdate;
+ const char *mailbox;
+ const char *resource;
+ uint32_t imap_uid;		/* zero (0) until URL is mapped */
+ const char *lock_token;
+ const char *lock_owner;
+ const char *lock_ownerid;
+ time_t lock_expire;
+};
+
+struct bind_val {
+ const char *name;
+ int type;
+ union {
+	int i;
+	const char *s;
+ } val;
+};
+
+/* prepare for DAV operations in this process */
+int dav_init(void);
+
+/* done with all DAV operations for this process */
+int dav_done(void);
+
+void dav_getpath(struct buf *buf, const char *userid);
+
+/* get a database handle corresponding to userid */
+sqlite3 *dav_open(const char *userid, const char *cmds);
+
+/* close this handle */
+int dav_close(sqlite3 *davdb);
+
+/* execute 'cmd' and process results with 'cb'
+ 'cmd' is prepared as 'stmt' with 'bval' as bound values */
+int dav_exec(sqlite3 *davdb, const char *cmd, struct bind_val bval,
+	 int (*cb)(sqlite3_stmt *stmt, void *rock), void *rock,
+	 sqlite3_stmt **stmt);
+
+/* delete database corresponding to userid */
+int dav_delete(const char *userid);
+
+#endif /* DAV_DB_H */

cyrus-imapd-2.5.tar.gz/imap/dav_reconstruct.c Added

@@ -0,0 +1,216 @@
+/* dav_reconstruct.c - (re)build DAV DB for a user
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+
+#include <libical/ical.h>
+
+#include "annotate.h"
+#include "caldav_db.h"
+#include "carddav_db.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "http_dav.h"
+#include "imap_err.h"
+#include "mailbox.h"
+#include "message.h"
+#include "message_guid.h"
+#include "mboxname.h"
+#include "mboxlist.h"
+#include "util.h"
+#include "xmalloc.h"
+
+extern int optind;
+extern char *optarg;
+
+/* current namespace */
+static struct namespace recon_namespace;
+
+/* config.c stuff */
+const int config_need_data = 0;
+
+/* forward declarations */
+static int do_reconstruct(void *rock,
+			 const char *key,
+			 size_t keylen,
+			 const char *data,
+			 size_t datalen);
+void usage(void);
+void shut_down(int code);
+
+static int code = 0;
+static struct caldav_db *caldavdb = NULL;
+
+
+int main(int argc, char **argv)
+{
+ int opt, r;
+ char *alt_config = NULL, *userid;
+ struct buf fnamebuf = BUF_INITIALIZER;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ /* Ensure we're up-to-date on the index file format */
+ assert(INDEX_HEADER_SIZE == (OFFSET_HEADER_CRC+4));
+ assert(INDEX_RECORD_SIZE == (OFFSET_RECORD_CRC+4));
+
+ while ((opt = getopt(argc, argv, "C:")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	default:
+	 usage();
+	}
+ }
+
+ cyrus_init(alt_config, "dav_reconstruct", 0, 0);
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&recon_namespace, 1)) != 0) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ signals_set_shutdown(&shut_down);
+ signals_add_handlers(0);
+
+ if (optind == argc) usage();
+
+ userid = argvoptind;
+
+ printf("Reconstructing DAV DB for %s...\n", userid);
+ caldav_init();
+ carddav_init();
+
+ /* remove existing database entirely */
+ /* XXX - build a new file and rename into place? */
+ dav_getpath(&fnamebuf, userid);
+ if (buf_len(&fnamebuf))
+	unlink(buf_cstring(&fnamebuf));
+
+ mboxlist_allusermbox(userid, do_reconstruct, NULL, 0);
+
+ caldav_close(caldavdb);
+ caldav_done();
+
+ mboxlist_close();
+ mboxlist_done();
+
+ buf_free(&fnamebuf);
+
+ exit(code);
+}
+
+
+void usage(void)
+{
+ fprintf(stderr,
+	 "usage: dav_reconstruct -C <alt_config> userid\n");
+ exit(EC_USAGE);
+}
+
+/*
+ * mboxlist_findall() callback function to create DAV DB entries for a mailbox
+ */
+static int do_reconstruct(void *rock __attribute__((unused)),
+			 const char *key,
+			 size_t keylen,
+			 const char *data,
+			 size_t datalen)
+{
+ int r = 0;
+ char ext_name_bufMAX_MAILBOX_PATH+1;
+ mbentry_t *mbentry = NULL;
+ struct mailbox *mailbox = NULL;
+
+ signals_poll();
+
+ r = mboxlist_parse_entry(&mbentry, key, keylen, data, datalen);
+ if (r) return 0;
+
+ /* Convert internal name to external */
+ (*recon_namespace.mboxname_toexternal)(&recon_namespace, mbentry->name,
+					 "cyrus", ext_name_buf);
+
+ if (mbentry->mbtype & (MBTYPE_CALENDAR|MBTYPE_ADDRESSBOOK)) {
+	printf("Inserting DAV DB entries for %s...\n", ext_name_buf);
+
+	/* Open/lock header */
+	r = mailbox_open_irl(mbentry->name, &mailbox);
+	if (!r) r = mailbox_add_dav(mailbox);
+	mailbox_close(&mailbox);
+ }
+
+ mboxlist_entry_free(&mbentry);
+ return r;
+}
+
+/*
+ * Cleanly shut down and exit
+ */
+void shut_down(int code) __attribute__((noreturn));
+void shut_down(int code)
+{
+ in_shutdown = 1;
+
+ mboxlist_close();
+ mboxlist_done();
+ caldav_done();
+ exit(code);
+}

cyrus-imapd-2.4.17.tar.gz/imap/deliver.c -> cyrus-imapd-2.5.tar.gz/imap/deliver.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: deliver.c,v 1.183 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -52,10 +50,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <syslog.h>
 #include <errno.h>
 #include <pwd.h>
 #include <sys/types.h>
@@ -68,7 +64,7 @@
 
 #include "global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
@@ -77,9 +73,6 @@
 #include "proxy.h"
 #include "version.h"
 
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 extern int optind;
 extern char *optarg;
 
@@ -90,19 +83,20 @@
 static const char *sockaddr;
 
 static struct protocol_t lmtp_protocol =
-{ "lmtp", "lmtp",
- { 0, "220 " },
- { "LHLO", "deliver", "250 ", NULL,
- { { "AUTH ", CAPA_AUTH },
- { "STARTTLS", CAPA_STARTTLS },
- { "PIPELINING", CAPA_PIPELINING },
- { "IGNOREQUOTA", CAPA_IGNOREQUOTA },
- { NULL, 0 } } },
- { "STARTTLS", "220", "454", 0 },
- { "AUTH", 512, 0, "235", "5", "334 ", "*", NULL, 0 },
- { NULL, NULL, NULL },
- { "NOOP", NULL, "250" },
- { "QUIT", NULL, "221" }
+{ "lmtp", "lmtp", TYPE_STD,
+ { { { 0, "220 " },
+ { "LHLO", "deliver", "250 ", NULL,
+	CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD,
+	{ { "AUTH", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { "PIPELINING", CAPA_PIPELINING },
+	 { "IGNOREQUOTA", CAPA_IGNOREQUOTA },
+	 { NULL, 0 } } },
+ { "STARTTLS", "220", "454", 0 },
+ { "AUTH", 512, 0, "235", "5", "334 ", "*", NULL, 0 },
+ { NULL, NULL, NULL },
+ { "NOOP", NULL, "250" },
+ { "QUIT", NULL, "221" } } }
 };
 
 /* unused for deliver.c, but needed to make lmtpengine.c happy */
@@ -114,7 +108,7 @@
 		 char **users, int numusers, char *mailbox);
 static struct backend *init_net(const char *sockaddr);
 
-static void usage()
+static void usage(void)
 {
 fprintf(stderr, 
 	 "421-4.3.0 usage: deliver -C <alt_config> -m mailbox"
@@ -123,7 +117,7 @@
 exit(EC_USAGE);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 
@@ -243,7 +237,7 @@
 prot_setflushonread(deliver_in, deliver_out);
 prot_settimeout(deliver_in, 300);
 
- cyrus_init(alt_config, "deliver", CYRUSINIT_NODB);
+ cyrus_init(alt_config, "deliver", CYRUSINIT_NODB, CONFIG_NEED_PARTITION_DATA);
 
 sockaddr = config_getstring(IMAPOPT_LMTPSOCKET);
 if (!sockaddr) {	
@@ -277,7 +271,7 @@
 return r;
 }
 
-void just_exit(const char *msg)
+static void just_exit(const char *msg)
 {
 com_err(msg, 0, "%s", error_message(errno));
 
@@ -332,7 +326,7 @@
 
 /* connect */
 conn = backend_connect(NULL, sockaddr, &lmtp_protocol,
-			 "", NULL, NULL);
+			 "", NULL, NULL, -1);
 if (!conn) {
 	just_exit("couldn't connect to lmtpd");
 }

cyrus-imapd-2.4.17.tar.gz/imap/dlist.c -> cyrus-imapd-2.5.tar.gz/imap/dlist.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sync_support.c,v 1.25 2010/01/06 17:01:41 murch Exp $
 */
 
 #include <config.h>
@@ -56,45 +54,39 @@
 #include <syslog.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <errno.h>
-#include <ctype.h>
 #include <dirent.h>
-#include <utime.h>
 
 #include "global.h"
 #include "assert.h"
 #include "mboxlist.h"
-#include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
-#include "xstrlcat.h"
-#include "xstrlcpy.h"
-#include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
 #include "map.h"
 #include "imapd.h"
-#include "imparse.h"
 #include "message.h"
 #include "util.h"
-#include "retry.h"
-#include "cyr_lock.h"
 #include "prot.h"
 
 #include "dlist.h"
 
 /* Parse routines */
 
-const char *lastkey = NULL;
+static const char *lastkey = NULL;
 
 static void printfile(struct protstream *out, const struct dlist *dl)
 {
- char buf4096;
 struct stat sbuf;
 FILE *f;
 unsigned long size;
+ struct message_guid guid2;
+ const char *msg_base = NULL;
+ size_t msg_len = 0;
+
+ assert(dlist_isfile(dl));
 
 f = fopen(dl->sval, "r");
 if (!f) {
@@ -117,31 +109,44 @@
 	return;
 }
 
+ map_refresh(fileno(f), 1, &msg_base, &msg_len, sbuf.st_size,
+		"new message", 0);
+
+ message_guid_generate(&guid2, msg_base, msg_len);
+
+ if (!message_guid_equal(&guid2, dl->gval)) {
+	syslog(LOG_ERR, "IOERROR: GUID mismatch %s",
+	 dl->sval);
+	prot_printf(out, "NIL");
+	fclose(f);
+	map_free(&msg_base, &msg_len);
+	return;
+ }
+
 prot_printf(out, "%%{");
 prot_printastring(out, dl->part);
 prot_printf(out, " ");
- prot_printastring(out, message_guid_encode(&dl->gval));
+ prot_printastring(out, message_guid_encode(dl->gval));
 prot_printf(out, " %lu}\r\n", size);
- while (size) {
-	int n = fread(buf, 1, (size > 4096 ? 4096 : size), f);
-	if (n <= 0) break;
-	prot_write(out, buf, n);
-	size -= n;
- }
+ prot_write(out, msg_base, msg_len);
 fclose(f);
-
- if (size) fatal("failed to finish reading file!", EC_IOERR);
+ map_free(&msg_base, &msg_len);
 }
 
 /* XXX - these two functions should be out in append.c or reserve.c
 * or something more general */
-const char *dlist_reserve_path(const char *part, struct message_guid *guid)
+EXPORTED const char *dlist_reserve_path(const char *part, struct message_guid *guid)
 {
 static char bufMAX_MAILBOX_PATH;
- snprintf(buf, MAX_MAILBOX_PATH, "%s/sync./%lu/%s", 
+ snprintf(buf, MAX_MAILBOX_PATH, "%s/sync./%lu/%s",
 		 config_partitiondir(part), (unsigned long)getpid(),
 		 message_guid_encode(guid));
- cyrus_mkdir(buf, 0755);
+ /* gotta make sure we can create files */
+ if (cyrus_mkdir(buf, 0755)) {
+	/* it's going to fail later, but at least this will help */
+	syslog(LOG_ERR, "IOERROR: failed to create %s/%lu/ for reserve: %m",
+	 config_partitiondir(part), (unsigned long)getpid());
+ }
 return buf;
 }
 
@@ -152,13 +157,16 @@
 FILE *file;
 char buf8192+1;
 int r = 0, n;
- 
+
 /* XXX - write to a temporary file then move in to place! */
 *fname = dlist_reserve_path(part, guid);
 
+ /* remove any duplicates if they're still here */
+ unlink(*fname);
+
 file = fopen(*fname, "w+");
 if (!file) {
-	syslog(LOG_ERR, "Failed to upload file %s", message_guid_encode(guid));
+	syslog(LOG_ERR, "IOERROR: failed to upload file %s", message_guid_encode(guid));
 	r = IMAP_IOERROR;
 	/* Note: we still read the file's data from the wire,
 	 * to avoid losing protocol sync */
@@ -207,129 +215,368 @@
 
 /* DLIST STUFF */
 
-void dlist_stitch(struct dlist *dl, struct dlist *child)
+EXPORTED void dlist_stitch(struct dlist *parent, struct dlist *child)
 {
- if (dl->tail)
-	dl->tail = dl->tail->next = child;
- else
-	dl->head = dl->tail = child;
+ assert(!child->next);
+
+ if (parent->tail) {
+	parent->tail->next = child;
+	parent->tail = child;
+ }
+ else {
+	parent->head = parent->tail = child;
+ }
+}
+
+void dlist_unstitch(struct dlist *parent, struct dlist *child)
+{
+ struct dlist *prev = NULL;
+ struct dlist *replace = NULL;
+
+ /* find old record */
+ for (replace = parent->head; replace; replace = replace->next) {
+	if (replace == child) break;
+	prev = replace;
+ }
+
+ assert(replace);
+
+ if (prev) prev->next = child->next;
+ else parent->head = child->next;
+
+ if (parent->tail == child) parent->tail = prev;
+
+ child->next = NULL;
 }
 
 static struct dlist *dlist_child(struct dlist *dl, const char *name)
 {
 struct dlist *i = xzmalloc(sizeof(struct dlist));
- i->name = xstrdup(name);
+ if (name) i->name = xstrdup(name);
 i->type = DL_NIL;
 if (dl)
 	dlist_stitch(dl, i);
 return i;
 }
 
-struct dlist *dlist_atom(struct dlist *dl, const char *name, const char *val)
+static void _dlist_free_children(struct dlist *dl)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_ATOM;
- i->sval = xstrdup(val);
- return i;
+ struct dlist *next;
+ struct dlist *i;
+
+ if (!dl) return;
+
+ i = dl->head;
+ while (i) {
+	next = i->next;
+	dlist_free(&i);
+	i = next;
+ }
+
+ dl->head = dl->tail = NULL;
 }
 
-struct dlist *dlist_flag(struct dlist *dl, const char *name, const char *val)
+static void _dlist_clean(struct dlist *dl)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_FLAG;
- i->sval = xstrdup(val);
- return i;
+ if (!dl) return;
+
+ /* remove any children */
+ _dlist_free_children(dl);
+
+ /* clean out values */
+ free(dl->part);
+ dl->part = NULL;
+ free(dl->sval);
+ dl->sval = NULL;
+ free(dl->gval);
+ dl->gval = NULL;
+ dl->nval = 0;
 }
 
-struct dlist *dlist_num(struct dlist *dl, const char *name, unsigned long val)
+
+void dlist_makeatom(struct dlist *dl, const char *val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_NUM;
- i->nval = (modseq_t)val;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ if (val) {
+	dl->type = DL_ATOM;
+	dl->sval = xstrdup(val);
+	dl->nval = strlen(val);
+ }
+ else
+	dl->type = DL_NIL;
 }
 
-struct dlist *dlist_date(struct dlist *dl, const char *name, time_t val)
+void dlist_makeflag(struct dlist *dl, const char *val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_DATE;
- i->nval = (modseq_t)val;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ if (val) {
+	dl->type = DL_FLAG;
+	dl->sval = xstrdup(val);
+	dl->nval = strlen(val);
+ }
+ else
+	dl->type = DL_NIL;
 }
 
-struct dlist *dlist_modseq(struct dlist *dl, const char *name, modseq_t val)
+void dlist_makenum32(struct dlist *dl, uint32_t val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_MODSEQ;
- i->nval = val;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ dl->type = DL_NUM;
+ dl->nval = val;
 }
 
-struct dlist *dlist_guid(struct dlist *dl, const char *name,
-			 struct message_guid *guid)
+void dlist_makenum64(struct dlist *dl, bit64 val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_GUID,
- message_guid_copy(&i->gval, guid);
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ dl->type = DL_NUM;
+ dl->nval = val;
 }
 
-struct dlist *dlist_file(struct dlist *dl, const char *name,
-			 const char *part,
-			 struct message_guid *guid,
-			 unsigned long size,
-			 const char *fname)
+void dlist_makedate(struct dlist *dl, time_t val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_FILE;
- message_guid_copy(&i->gval, guid);
- i->sval = xstrdup(fname);
- i->nval = size;
- i->part = xstrdup(part);
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ dl->type = DL_DATE;
+ dl->nval = val;
 }
 
-struct dlist *dlist_buf(struct dlist *dl, const char *name,
-		 const char *val, size_t len)
+void dlist_makehex64(struct dlist *dl, bit64 val)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_BUF;
- i->sval = xmalloc(len+1);
- memcpy(i->sval, val, len);
- i->svallen = '\0'; /* make it string safe too */
- i->nval = len;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ dl->type = DL_HEX;
+ dl->nval = val;
 }
 
-struct dlist *dlist_kvlist(struct dlist *dl, const char *name)
+void dlist_makeguid(struct dlist *dl, struct message_guid *guid)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_KVLIST;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ if (guid) {
+	dl->type = DL_GUID,
+	dl->gval = xzmalloc(sizeof(struct message_guid));
+	message_guid_copy(dl->gval, guid);
+ }
+ else
+	dl->type = DL_NIL;
 }
 
-struct dlist *dlist_list(struct dlist *dl, const char *name)
+void dlist_makefile(struct dlist *dl,
+		 const char *part, struct message_guid *guid,
+		 unsigned long size, const char *fname)
 {
- struct dlist *i = dlist_child(dl, name);
- i->type = DL_ATOMLIST;
- return i;
+ if (!dl) return;
+ _dlist_clean(dl);
+ if (part && guid && fname) {
+	dl->type = DL_FILE;
+	dl->gval = xzmalloc(sizeof(struct message_guid));
+	message_guid_copy(dl->gval, guid);
+	dl->sval = xstrdup(fname);
+	dl->nval = size;
+	dl->part = xstrdup(part);
+ }
+ else
+	dl->type = DL_NIL;
+}
+
+EXPORTED void dlist_makemap(struct dlist *dl, const char *val, size_t len)
+{
+ if (!dl) return;
+ _dlist_clean(dl);
+ if (val) {
+	dl->type = DL_BUF;
+	/* WARNING - DO NOT replace this with xstrndup - the
+	 * data may be binary, and xstrndup does not copy
+	 * binary data correctly - but we still want to NULL
+	 * terminate for non-binary data */
+	dl->sval = xmalloc(len+1);
+	memcpy(dl->sval, val, len);
+	dl->svallen = '\0'; /* make it string safe too */
+	dl->nval = len;
+ }
+ else
+	dl->type = DL_NIL;
+}
+
+EXPORTED struct dlist *dlist_newkvlist(struct dlist *parent, const char *name)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dl->type = DL_KVLIST;
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_newlist(struct dlist *parent, const char *name)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dl->type = DL_ATOMLIST;
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_newpklist(struct dlist *parent, const char *name)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dl->type = DL_ATOMLIST;
+ dl->nval = 1;
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setatom(struct dlist *parent, const char *name, const char *val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makeatom(dl, val);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setflag(struct dlist *parent, const char *name, const char *val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makeflag(dl, val);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setnum64(struct dlist *parent, const char *name, bit64 val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makenum64(dl, val);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setnum32(struct dlist *parent, const char *name, uint32_t val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makenum32(dl, val);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setdate(struct dlist *parent, const char *name, time_t val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makedate(dl, val);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_sethex64(struct dlist *parent, const char *name, bit64 val)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makehex64(dl, val);
+ return dl;
 }
 
-struct dlist *dlist_new(const char *name)
+EXPORTED struct dlist *dlist_setmap(struct dlist *parent, const char *name,
+			 const char *val, size_t len)
 {
- return dlist_kvlist(NULL, name);
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makemap(dl, val, len);
+ return dl;
 }
 
-static void dlist_print_helper(const struct dlist *dl, int printkeys,
-			 struct protstream *out, int level)
+EXPORTED struct dlist *dlist_setguid(struct dlist *parent, const char *name,
+			 struct message_guid *guid)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makeguid(dl, guid);
+ return dl;
+}
+
+EXPORTED struct dlist *dlist_setfile(struct dlist *parent, const char *name,
+			 const char *part, struct message_guid *guid,
+			 size_t size, const char *fname)
+{
+ struct dlist *dl = dlist_child(parent, name);
+ dlist_makefile(dl, part, guid, size, fname);
+ return dl;
+}
+
+static struct dlist *dlist_updatechild(struct dlist *parent, const char *name)
+{
+ struct dlist *dl = dlist_getchild(parent, name);
+ if (!dl) dl = dlist_child(parent, name);
+ return dl;
+}
+
+struct dlist *dlist_updateatom(struct dlist *parent, const char *name, const char *val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makeatom(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updateflag(struct dlist *parent, const char *name, const char *val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makeflag(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updatenum64(struct dlist *parent, const char *name, bit64 val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makenum64(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updatenum32(struct dlist *parent, const char *name, uint32_t val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makenum32(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updatedate(struct dlist *parent, const char *name, time_t val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makedate(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updatehex64(struct dlist *parent, const char *name, bit64 val)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makehex64(dl, val);
+ return dl;
+}
+
+struct dlist *dlist_updatemap(struct dlist *parent, const char *name,
+			 const char *val, size_t len)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makemap(dl, val, len);
+ return dl;
+}
+
+struct dlist *dlist_updateguid(struct dlist *parent, const char *name,
+			 struct message_guid *guid)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makeguid(dl, guid);
+ return dl;
+}
+
+struct dlist *dlist_updatefile(struct dlist *parent, const char *name,
+			 const char *part, struct message_guid *guid,
+			 size_t size, const char *fname)
+{
+ struct dlist *dl = dlist_updatechild(parent, name);
+ dlist_makefile(dl, part, guid, size, fname);
+ return dl;
+}
+
+EXPORTED void dlist_print(const struct dlist *dl, int printkeys,
+		 struct protstream *out)
 {
 struct dlist *di;
- int i;
 
 if (printkeys)
 	prot_printf(out, "%s ", dl->name);
 
 switch (dl->type) {
+ case DL_NIL:
+	prot_printf(out, "NIL");
+	break;
 case DL_ATOM:
 	prot_printastring(out, dl->sval);
 	break;
@@ -338,8 +585,7 @@
 	break;
 case DL_NUM:
 case DL_DATE: /* for now, we will format it later */
- case DL_MODSEQ:
-	prot_printf(out, MODSEQ_FMT, dl->nval);
+	prot_printf(out, "%llu", dl->nval);
 	break;
 case DL_FILE:
 	printfile(out, dl);
@@ -347,15 +593,20 @@
 case DL_BUF:
 	prot_printliteral(out, dl->sval, dl->nval);
 	break;
- case DL_KVLIST:
-	if (level) {
-	 prot_printf(out, "\r\n");
-	 for (i = 0; i <= level; i++)
-		prot_printf(out, " ");
+ case DL_GUID: 
+	prot_printf(out, "%s", message_guid_encode(dl->gval));
+	break;
+ case DL_HEX:
+	{
+	 char buf17;
+	 snprintf(buf, 17, "%016llx", dl->nval);
+	 prot_printf(out, "%s", buf);
 	}
+	break;
+ case DL_KVLIST:
 	prot_printf(out, "%%(");
 	for (di = dl->head; di; di = di->next) {
-	 dlist_print_helper(di, 1, out, level);
+	 dlist_print(di, 1, out);
 	 if (di->next) {
 		prot_printf(out, " ");
 	 }
@@ -365,7 +616,7 @@
 case DL_ATOMLIST:
 	prot_printf(out, "(");
 	for (di = dl->head; di; di = di->next) {
-	 dlist_print_helper(di, 0, out, di->type == DL_KVLIST ? level + 1 : level);
+	 dlist_print(di, dl->nval, out);
 	 if (di->next)
 		prot_printf(out, " ");
 	}
@@ -374,51 +625,37 @@
 }
 }
 
-void dlist_print(const struct dlist *dl, int printkeys, struct protstream *out)
+EXPORTED void dlist_printbuf(const struct dlist *dl, int printkeys, struct buf *outbuf)
 {
- dlist_print_helper(dl, printkeys, out, 0);
+ struct protstream *outstream;
+
+ outstream = prot_writebuf(outbuf);
+ dlist_print(dl, printkeys, outstream);
+ prot_flush(outstream);
+ prot_free(outstream);
 }
 
-void dlist_free(struct dlist **dlp)
+EXPORTED void dlist_free(struct dlist **dlp)
 {
- struct dlist *i, *next;
 if (!*dlp) return;
- i = (*dlp)->head;
- while (i) {
-	free(i->name);
-	next = i->next;
-	switch (i->type) {
-	case DL_KVLIST:
-	case DL_ATOMLIST:
-	 dlist_free(&i);
-	 break;
-	case DL_FILE:
-	 free(i->part);
-	 /* drop through */
-	default:
-	 free(i->sval);
-	}
-	free(i);
-	i = next;
- }
+ _dlist_clean(*dlp);
+ free((*dlp)->name);
 free(*dlp);
 *dlp = NULL;
 }
 
 static char next_nonspace(struct protstream *in, char c)
 {
- while (Uisspace(c)) {
-	c = prot_getc(in);
- }
+ while (Uisspace(c)) c = prot_getc(in);
 return c;
 }
 
-char dlist_parse(struct dlist **dlp, int parsekey, struct protstream *in)
+EXPORTED char dlist_parse(struct dlist **dlp, int parsekey, struct protstream *in)
 {
 struct dlist *dl = NULL;
 static struct buf kbuf;
 static struct buf vbuf;
- char c;
+ int c;
 
 /* handle the key if wanted */
 if (parsekey) {
@@ -429,13 +666,13 @@
 	buf_setcstr(&kbuf, "");
 	c = prot_getc(in);
 }
- 
+
 /* connection dropped? */
 if (c == EOF) goto fail;
 
 /* check what sort of value we have */
 if (c == '(') {
-	dl = dlist_list(NULL, kbuf.s);
+	dl = dlist_newlist(NULL, kbuf.s);
 	c = next_nonspace(in, ' ');
 	while (c != ')') {
 	 struct dlist *di = NULL;
@@ -451,7 +688,7 @@
 	/* no whitespace allowed here */
 	c = prot_getc(in);
 	if (c == '(') {
-	 dl = dlist_list(NULL, kbuf.s);
+	 dl = dlist_newkvlist(NULL, kbuf.s);
 	 c = next_nonspace(in, ' ');
 	 while (c != ')') {
 		struct dlist *di = NULL;
@@ -478,7 +715,7 @@
 	 if (c != '\n') goto fail;
 	 if (!message_guid_decode(&tmp_guid, gbuf.s)) goto fail;
 	 if (reservefile(in, pbuf.s, &tmp_guid, size, &fname)) goto fail;
-	 dl = dlist_file(NULL, kbuf.s, pbuf.s, &tmp_guid, size, fname);
+	 dl = dlist_setfile(NULL, kbuf.s, pbuf.s, &tmp_guid, size, fname);
 	 /* file literal */
 	}
 	else {
@@ -491,14 +728,17 @@
 	prot_ungetc(c, in);
 	/* could be binary in a literal */
 	c = getbastring(in, NULL, &vbuf);
-	dl = dlist_buf(NULL, kbuf.s, vbuf.s, vbuf.len);
+	dl = dlist_setmap(NULL, kbuf.s, vbuf.s, vbuf.len);
 }
- else {
+ else if (c == '\\') { /* special case for flags */
 	prot_ungetc(c, in);
 	c = getastring(in, NULL, &vbuf);
-	dl = dlist_atom(NULL, kbuf.s, vbuf.s);
-	if (imparse_isnumber(vbuf.s))
-	 dl->nval = atomodseq_t(vbuf.s);
+	dl = dlist_setflag(NULL, kbuf.s, vbuf.s);
+ }
+ else {
+	prot_ungetc(c, in);
+	c = getnastring(in, NULL, &vbuf);
+	dl = dlist_setatom(NULL, kbuf.s, vbuf.s);
 }
 
 /* success */
@@ -510,99 +750,485 @@
 return EOF;
 }
 
-static struct dlist *dlist_getchild(struct dlist *dl, const char *name)
+EXPORTED char dlist_parse_asatomlist(struct dlist **dlp, int parsekey,
+			 struct protstream *in)
+{
+ char c = dlist_parse(dlp, parsekey, in);
+
+ /* make a list with one item */
+ if (*dlp && !dlist_isatomlist(*dlp)) {
+	struct dlist *tmp = dlist_newlist(NULL, "");
+	dlist_stitch(tmp, *dlp);
+	*dlp = tmp;
+ }
+
+ return c;
+}
+
+EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey,
+		 const char *base, unsigned len)
+{
+ struct protstream *stream;
+ char c;
+ struct dlist *dl = NULL;
+
+ stream = prot_readmap(base, len);
+ prot_setisclient(stream, 1); /* don't sync literals */
+ c = dlist_parse(&dl, parsekey, stream);
+ prot_free(stream);
+
+ if (c != EOF) {
+	dlist_free(&dl);
+	return IMAP_IOERROR; /* failed to slurp entire buffer */
+ }
+
+ *dlp = dl;
+
+ return 0;
+}
+
+EXPORTED struct dlist *dlist_getchild(struct dlist *dl, const char *name)
 {
 struct dlist *i;
 
 if (!dl) return NULL;
 
 for (i = dl->head; i; i = i->next) {
-	if (!strcmp(name, i->name))
+	if (i->name && !strcmp(name, i->name))
 	 return i;
 }
 lastkey = name;
 return NULL;
 }
 
-/* XXX - type coercion logic here */
+EXPORTED struct dlist *dlist_getchildn(struct dlist *dl, int num)
+{
+ struct dlist *i;
+
+ if (!dl) return NULL;
+
+ for (i = dl->head; i && num; i = i->next)
+	num--;
+
+ return i;
+}
 
-int dlist_getatom(struct dlist *dl, const char *name, const char **val)
+/* duplicate the parent list as a new list, and then move @num
+ * of the children from the parent onto the new list */
+EXPORTED struct dlist *dlist_splice(struct dlist *dl, int num)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- *val = i->sval;
- return 1;
+ struct dlist *ret = dlist_newlist(NULL, dl->name);
+
+ /* clone exact type */
+ ret->type = dl->type;
+ ret->nval = dl->nval;
+
+ if (num > 0) {
+	struct dlist *end = dlist_getchildn(dl, num - 1);
+
+	/* take the start of the list */
+	ret->head = dl->head;
+
+	/* leave the end (if any) */
+	if (end) {
+	 ret->tail = end;
+	 dl->head = end->next;
+	 end->next = NULL;
+	}
+	else {
+	 ret->tail = dl->tail;
+	 dl->head = NULL;
+	 dl->tail = NULL;
+	}
+ }
+
+ return ret;
 }
 
-int dlist_getbuf(struct dlist *dl, const char *name, const char **val, size_t *len)
+EXPORTED void dlist_splat(struct dlist *parent, struct dlist *child)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- *val = i->sval;
- *len = (size_t)i->nval;
+ struct dlist *prev = NULL;
+ struct dlist *replace;
+
+ /* find old record */
+ for (replace = parent->head; replace; replace = replace->next) {
+	if (replace == child) break;
+	prev = replace;
+ }
+
+ assert(replace);
+
+ if (child->head) {
+	/* stitch in children */
+	if (prev) prev->next = child->head;
+	else parent->head = child->head;
+	if (child->next) child->tail->next = child->next;
+	else parent->tail = child->tail;
+ }
+ else {
+	/* just remove the record */
+	if (prev) prev->next = child->next;
+	else parent->head = child->next;
+	if (!child->next) parent->tail = prev;
+ }
+ /* remove the node itself, carefully blanking out
+ * the now unlinked children */
+ child->head = NULL;
+ child->tail = NULL;
+ dlist_free(&child);
+}
+
+struct dlist *dlist_getkvchild_bykey(struct dlist *dl,
+				 const char *key, const char *val)
+{
+ struct dlist *i;
+ struct dlist *tmp;
+
+ if (!dl) return NULL;
+
+ for (i = dl->head; i; i = i->next) {
+	tmp = dlist_getchild(i, key);
+	if (tmp && !strcmp(tmp->sval, val))
+	 return i;
+ }
+
+ return NULL;
+}
+
+int dlist_toatom(struct dlist *dl, const char **valp)
+{
+ const char *str;
+ size_t len;
+
+ /* tomap always adds a trailing \0 */
+ if (!dlist_tomap(dl, &str, &len))
+	return 0;
+
+ /* got NULLs? */
+ if (dl->type == DL_BUF && strlen(str) != len)
+	return 0;
+
+ if (valp) *valp = str;
+
 return 1;
 }
 
-int dlist_getnum(struct dlist *dl, const char *name, uint32_t *val)
+HIDDEN int dlist_tomap(struct dlist *dl, const char **valp, size_t *lenp)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- *val = (uint32_t)i->nval;
+ char tmp30;
+
+ if (!dl) return 0;
+
+ switch (dl->type) {
+ case DL_NUM:
+ case DL_DATE:
+	snprintf(tmp, 30, "%llu", dl->nval);
+	dlist_makeatom(dl, tmp);
+	break;
+
+ case DL_HEX:
+	snprintf(tmp, 30, "%016llx", dl->nval);
+	dlist_makeatom(dl, tmp);
+	break;
+
+ case DL_GUID:
+	dlist_makeatom(dl, message_guid_encode(dl->gval));
+	break;
+
+ case DL_ATOM:
+ case DL_FLAG:
+ case DL_BUF:
+	break;
+
+ default:
+	return 0;
+ }
+
+ if (valp) *valp = dl->sval;
+ if (lenp) *lenp = dl->nval;
+
 return 1;
 }
 
-int dlist_getdate(struct dlist *dl, const char *name, time_t *val)
+/* ensure value is exactly one number */
+static int dlist_tonum64(struct dlist *dl, bit64 *valp)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- /* XXX: string parse when the date format changes */
- *val = (time_t)i->nval;
+ const char *end;
+ bit64 newval;
+
+ if (!dl) return 0;
+
+ switch (dl->type) {
+ case DL_ATOM:
+ case DL_BUF:
+	if (parsenum(dl->sval, &end, dl->nval, &newval))
+	 return 0;
+	if (end - dl->sval != (int)dl->nval)
+	 return 0;
+	/* successfully parsed - switch to a numeric value */
+	dlist_makenum64(dl, newval);
+	break;
+
+ case DL_NUM:
+ case DL_HEX:
+ case DL_DATE:
+	break;
+
+ default:
+	return 0;
+ }
+
+ if (valp) *valp = dl->nval;
+
 return 1;
 }
 
-int dlist_getmodseq(struct dlist *dl, const char *name, modseq_t *val)
+EXPORTED int dlist_tonum32(struct dlist *dl, uint32_t *valp)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- *val = (modseq_t)i->nval;
+ bit64 v;
+
+ if (dlist_tonum64(dl, &v)) {
+	if (valp) *valp = (uint32_t)v;
+	return 1;
+ }
+
+ return 0;
+}
+
+int dlist_todate(struct dlist *dl, time_t *valp)
+{
+ bit64 v;
+
+ if (dlist_tonum64(dl, &v)) {
+	if (valp) *valp = (time_t)v;
+	dl->type = DL_DATE;
+	return 1;
+ }
+
+ return 0;
+}
+
+static int dlist_tohex64(struct dlist *dl, bit64 *valp)
+{
+ const char *end = NULL;
+ bit64 newval;
+
+ if (!dl) return 0;
+
+ switch (dl->type) {
+ case DL_ATOM:
+ case DL_BUF:
+	if (parsehex(dl->sval, &end, dl->nval, &newval))
+	 return 0;
+	if (end - dl->sval != (int)dl->nval)
+	 return 0;
+	/* successfully parsed - switch to a numeric value */
+	dlist_makehex64(dl, newval);
+	break;
+
+ case DL_NUM:
+ case DL_HEX:
+ case DL_DATE:
+	dl->type = DL_HEX;
+	break;
+
+ default:
+	return 0;
+ }
+
+ if (valp) *valp = dl->nval;
+
 return 1;
 }
 
-int dlist_getguid(struct dlist *dl, const char *name, struct message_guid **val)
+EXPORTED int dlist_toguid(struct dlist *dl, struct message_guid **valp)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- /* XXX - maybe malloc like strings? would save some in the general case */
- if (!message_guid_decode(&i->gval, i->sval)) return 0;
- *val = &i->gval;
+ struct message_guid tmpguid;
+
+ if (!dl) return 0;
+
+ switch (dl->type) {
+ case DL_ATOM:
+ case DL_BUF:
+	if (dl->nval != 40)
+	 return 0;
+	if (!message_guid_decode(&tmpguid, dl->sval))
+	 return 0;
+	/* successfully parsed - switch to guid value */
+	dlist_makeguid(dl, &tmpguid);
+	break;
+
+ case DL_GUID:
+	break;
+
+ default:
+	return 0;
+ }
+
+ if (valp) *valp = dl->gval;
+
 return 1;
 }
 
-int dlist_getfile(struct dlist *dl, const char *name,
-		 const char **part,
-		 struct message_guid **guid,
-		 unsigned long *size,
-		 const char **fname)
+EXPORTED int dlist_tofile(struct dlist *dl,
+		 const char **partp, struct message_guid **guidp,
+		 unsigned long *sizep, const char **fnamep)
 {
- struct dlist *i = dlist_getchild(dl, name);
- if (!i) return 0;
- if (!message_guid_decode(&i->gval, i->sval)) return 0;
- *guid = &i->gval;
- *size = i->nval;
- *fname = i->sval;
- *part = i->part;
+ if (!dlist_isfile(dl)) return 0;
+
+ if (guidp) *guidp = dl->gval;
+ if (sizep) *sizep = dl->nval;
+ if (fnamep) *fnamep = dl->sval;
+ if (partp) *partp = dl->part;
+
 return 1;
 }
 
-int dlist_getlist(struct dlist *dl, const char *name, struct dlist **val)
+EXPORTED int dlist_isatomlist(const struct dlist *dl)
+{
+ if (!dl) return 0;
+ return (dl->type == DL_ATOMLIST);
+}
+
+int dlist_iskvlist(const struct dlist *dl)
+{
+ if (!dl) return 0;
+
+ return (dl->type == DL_KVLIST);
+}
+
+int dlist_isfile(const struct dlist *dl)
+{
+ if (!dl) return 0;
+
+ return (dl->type == DL_FILE);
+}
+
+/* XXX - these ones aren't const, because they can change
+ * things... */
+int dlist_isnum(struct dlist *dl)
+{
+ bit64 tmp;
+
+ if (!dl) return 0;
+
+ /* see if it can be parsed as a number */
+ return dlist_tonum64(dl, &tmp);
+}
+
+/* XXX - these ones aren't const, because they can change
+ * things... */
+EXPORTED int dlist_ishex64(struct dlist *dl)
+{
+ bit64 tmp;
+
+ if (!dl) return 0;
+
+ /* see if it can be parsed as a number */
+ return dlist_tohex64(dl, &tmp);
+}
+
+/* XXX - these ones aren't const, because they can change
+ * things... */
+int dlist_isguid(struct dlist *dl)
+{
+ struct message_guid *tmp = NULL;
+
+ if (!dl) return 0;
+
+ return dlist_toguid(dl, &tmp);
+}
+
+/* XXX - this stuff is all shitty, rationalise later */
+EXPORTED bit64 dlist_num(struct dlist *dl)
+{
+ bit64 v;
+
+ if (!dl) return 0;
+
+ if (dlist_tonum64(dl, &v))
+	return v;
+
+ return 0;
+}
+
+/* XXX - this stuff is all shitty, rationalise later */
+EXPORTED const char *dlist_cstring(struct dlist *dl)
+{
+ static char zerochar = '\0';
+
+ if (dl) {
+	const char *res = NULL;
+	dlist_toatom(dl, &res);
+	if (res) return res;
+ }
+
+ return &zerochar;
+}
+
+EXPORTED int dlist_getatom(struct dlist *parent, const char *name, const char **valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_toatom(child, valp);
+}
+
+EXPORTED int dlist_getnum32(struct dlist *parent, const char *name, uint32_t *valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_tonum32(child, valp);
+}
+
+EXPORTED int dlist_getnum64(struct dlist *parent, const char *name, bit64 *valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_tonum64(child, valp);
+}
+
+EXPORTED int dlist_getdate(struct dlist *parent, const char *name, time_t *valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_todate(child, valp);
+}
+
+EXPORTED int dlist_gethex64(struct dlist *parent, const char *name, bit64 *valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_tohex64(child, valp);
+}
+
+EXPORTED int dlist_getguid(struct dlist *parent, const char *name,
+		 struct message_guid **valp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_toguid(child, valp);
+}
+
+EXPORTED int dlist_getmap(struct dlist *parent, const char *name,
+		 const char **valp, size_t *lenp)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_tomap(child, valp, lenp);
+}
+
+int dlist_getfile(struct dlist *parent, const char *name,
+		 const char **partp,
+		 struct message_guid **guidp,
+		 unsigned long *sizep,
+		 const char **fnamep)
+{
+ struct dlist *child = dlist_getchild(parent, name);
+ return dlist_tofile(child, partp, guidp, sizep, fnamep);
+}
+
+EXPORTED int dlist_getlist(struct dlist *dl, const char *name, struct dlist **valp)
 {
 struct dlist *i = dlist_getchild(dl, name);
 if (!i) return 0;
- *val = i;
+ *valp = i;
 return 1;
 }
 
-const char *dlist_lastkey()
+EXPORTED const char *dlist_lastkey(void)
 {
 return lastkey;
 }

cyrus-imapd-2.4.17.tar.gz/imap/dlist.h -> cyrus-imapd-2.5.tar.gz/imap/dlist.h Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_support.h,v 1.12 2010/01/06 17:01:42 murch Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -51,6 +49,7 @@
 #include "util.h"
 #include "prot.h"
 #include "mailbox.h"
+#include "message_guid.h"
 
 enum dlist_t {
 DL_NIL = 0,
@@ -58,7 +57,7 @@
 DL_FLAG,
 DL_NUM,
 DL_DATE,
- DL_MODSEQ,
+ DL_HEX,
 DL_BUF,
 DL_GUID,
 DL_FILE,
@@ -73,49 +72,149 @@
 struct dlist *next;
 int type;
 char *sval;
- modseq_t nval; /* biggest type we need, more or less */
- struct message_guid gval; /* guid if any */
+ bit64 nval;
+ struct message_guid *gval; /* guid if any */
 char *part; /* so what if we're big! */
 };
 
 const char *dlist_reserve_path(const char *part, struct message_guid *guid);
 
-struct dlist *dlist_atom(struct dlist *dl, const char *name, const char *val);
-struct dlist *dlist_flag(struct dlist *dl, const char *name, const char *val);
-struct dlist *dlist_num(struct dlist *dl, const char *name, unsigned long val);
-struct dlist *dlist_date(struct dlist *dl, const char *name, time_t val);
-struct dlist *dlist_modseq(struct dlist *dl, const char *name, modseq_t val);
-struct dlist *dlist_buf(struct dlist *dl,
-			const char *name, const char *val, size_t len);
-struct dlist *dlist_list(struct dlist *dl, const char *name);
-struct dlist *dlist_kvlist(struct dlist *dl, const char *name);
-struct dlist *dlist_guid(struct dlist *dl,
-			 const char *name, struct message_guid *guid);
-struct dlist *dlist_file(struct dlist *dl,
-			 const char *name, const char *part,
-			 struct message_guid *guid,
-			 unsigned long size, const char *fname);
-struct dlist *dlist_new(const char *name);
+/* set fields */
+void dlist_makeatom(struct dlist *dl, const char *val);
+void dlist_makeflag(struct dlist *dl, const char *val);
+void dlist_makenum32(struct dlist *dl, uint32_t val);
+void dlist_makenum64(struct dlist *dl, bit64 val);
+void dlist_makedate(struct dlist *dl, time_t val);
+void dlist_makehex64(struct dlist *dl, bit64 val);
+void dlist_makemap(struct dlist *dl, const char *val, size_t len);
+void dlist_makeguid(struct dlist *dl, struct message_guid *guid);
+void dlist_makefile(struct dlist *dl,
+		 const char *part, struct message_guid *guid,
+		 unsigned long size, const char *fname);
+
+/* parse fields */
+int dlist_toatom(struct dlist *dl, const char **valp);
+int dlist_toflag(struct dlist *dl, const char **valp);
+int dlist_tonum32(struct dlist *dl, uint32_t *valp);
+int dlist_tonum(struct dlist *dl, bit64 *valp);
+int dlist_todate(struct dlist *dl, time_t *valp);
+int dlist_tohex32(struct dlist *dl, uint32_t *valp);
+int dlist_tohex(struct dlist *dl, bit64 *valp);
+int dlist_tomap(struct dlist *dl, const char **valp, size_t *lenp);
+/* these two don't actually do anything except check type */
+int dlist_tolist(struct dlist *dl, struct dlist **valp);
+int dlist_tokvlist(struct dlist *dl, struct dlist **valp);
+int dlist_toguid(struct dlist *dl, struct message_guid **valp);
+int dlist_tofile(struct dlist *dl,
+		 const char **partp, struct message_guid **guidp,
+		 unsigned long *sizep, const char **fnamep);
+
+int dlist_isatomlist(const struct dlist *dl);
+int dlist_iskvlist(const struct dlist *dl);
+int dlist_isfile(const struct dlist *dl);
+/* XXX - these two aren't const, they can fiddle internals */
+int dlist_isnum(struct dlist *dl);
+int dlist_ishex64(struct dlist *dl);
+int dlist_isguid(struct dlist *dl);
+
+/* special number and string readers - return 0 and "" if nothing */
+bit64 dlist_num(struct dlist *dl);
+const char *dlist_cstring(struct dlist *dl);
+
+/* wrappers for use in a kvlist */
+struct dlist *dlist_newlist(struct dlist *parent, const char *name);
+struct dlist *dlist_newpklist(struct dlist *parent, const char *name);
+struct dlist *dlist_newkvlist(struct dlist *parent, const char *name);
+
+struct dlist *dlist_setatom(struct dlist *parent, const char *name,
+			 const char *val);
+struct dlist *dlist_setflag(struct dlist *parent, const char *name,
+			 const char *val);
+struct dlist *dlist_setnum32(struct dlist *parent, const char *name,
+			 uint32_t val);
+struct dlist *dlist_setnum64(struct dlist *parent, const char *name,
+			 bit64 val);
+struct dlist *dlist_setdate(struct dlist *parent, const char *name,
+			 time_t val);
+struct dlist *dlist_sethex64(struct dlist *parent, const char *name,
+			 bit64 val);
+struct dlist *dlist_setmap(struct dlist *parent, const char *name,
+			 const char *val, size_t len);
+struct dlist *dlist_setguid(struct dlist *parent, const char *name,
+			 struct message_guid *guid);
+struct dlist *dlist_setfile(struct dlist *parent, const char *name,
+			 const char *part, struct message_guid *guid,
+			 size_t size, const char *fname);
+
+struct dlist *dlist_updateatom(struct dlist *parent, const char *name,
+			 const char *val);
+struct dlist *dlist_updateflag(struct dlist *parent, const char *name,
+			 const char *val);
+struct dlist *dlist_updatenum32(struct dlist *parent, const char *name,
+			 uint32_t val);
+struct dlist *dlist_updatenum64(struct dlist *parent, const char *name,
+			 bit64 val);
+struct dlist *dlist_updatedate(struct dlist *parent, const char *name,
+			 time_t val);
+struct dlist *dlist_updatehex64(struct dlist *parent, const char *name,
+				bit64 val);
+struct dlist *dlist_updatemap(struct dlist *parent, const char *name,
+			 const char *val, size_t len);
+struct dlist *dlist_updateguid(struct dlist *parent, const char *name,
+			 struct message_guid *guid);
+struct dlist *dlist_updatefile(struct dlist *parent, const char *name,
+			 const char *part, struct message_guid *guid,
+			 size_t size, const char *fname);
+
+int dlist_getatom(struct dlist *parent, const char *name,
+		 const char **valp);
+int dlist_getflag(struct dlist *parent, const char *name,
+		 const char **valp);
+int dlist_getnum32(struct dlist *parent, const char *name,
+		 uint32_t *valp);
+int dlist_getnum64(struct dlist *parent, const char *name,
+		 bit64 *valp);
+int dlist_getdate(struct dlist *parent, const char *name,
+		 time_t *valp);
+int dlist_gethex64(struct dlist *parent, const char *name,
+		 bit64 *valp);
+int dlist_getmap(struct dlist *parent, const char *name,
+		 const char **valp, size_t *lenp);
+int dlist_getlist(struct dlist *parent, const char *name,
+		 struct dlist **valp);
+int dlist_getkvlist(struct dlist *parent, const char *name,
+		 struct dlist **valp);
+int dlist_getguid(struct dlist *parent, const char *name,
+		 struct message_guid **valp);
+int dlist_getfile(struct dlist *parent, const char *name,
+		 const char **partp, struct message_guid **guidp,
+		 unsigned long *sizep, const char **fnamep);
+
 void dlist_free(struct dlist **dlp);
 
-void dlist_print(const struct dlist *dl, int printkeys, struct protstream *out);
-char dlist_parse(struct dlist **dlp, int parsekeys, struct protstream *in);
-
-void dlist_stitch(struct dlist *dl, struct dlist *child);
-int dlist_getatom(struct dlist *dl, const char *name, const char **val);
-int dlist_getbuf(struct dlist *dl,
-		 const char *name, const char **val, size_t *len);
-int dlist_getnum(struct dlist *dl, const char *name, uint32_t *val);
-int dlist_getdate(struct dlist *dl, const char *name, time_t *val);
-int dlist_getmodseq(struct dlist *dl, const char *name, modseq_t *val);
-int dlist_getlist(struct dlist *dl, const char *name, struct dlist **val);
-int dlist_getguid(struct dlist *dl,
-		 const char *name, struct message_guid **guid);
-int dlist_getfile(struct dlist *dl,
-		 const char *name, const char **part,
-		 struct message_guid **guid,
-		 unsigned long *size, const char **fname);
-
-const char *dlist_lastkey();
+void dlist_print(const struct dlist *dl, int printkeys,
+		 struct protstream *out);
+void dlist_printbuf(const struct dlist *dl, int printkeys,
+		 struct buf *outbuf);
+char dlist_parse(struct dlist **dlp, int parsekeys,
+		 struct protstream *in);
+char dlist_parse_asatomlist(struct dlist **dlp, int parsekey,
+			 struct protstream *in);
+int dlist_parsemap(struct dlist **dlp, int parsekeys,
+		 const char *base, unsigned len);
+
+void dlist_stitch(struct dlist *parent, struct dlist *child);
+void dlist_unstitch(struct dlist *parent, struct dlist *child);
+struct dlist *dlist_splice(struct dlist *parent, int num);
+
+/* splat: convert a list into its child elements */
+void dlist_splat(struct dlist *parent, struct dlist *child);
+
+struct dlist *dlist_getchild(struct dlist *dl, const char *name);
+struct dlist *dlist_getchildn(struct dlist *dl, int num);
+struct dlist *dlist_getkvchild_bykey(struct dlist *dl,
+				 const char *key, const char *val);
+
+const char *dlist_lastkey(void);
 
 #endif /* INCLUDED_DLIST_H */

cyrus-imapd-2.4.17.tar.gz/imap/duplicate.c -> cyrus-imapd-2.5.tar.gz/imap/duplicate.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: duplicate.c,v 1.48 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -68,11 +66,10 @@
 # include <ndir.h>
 # endif
 #endif
-#include <errno.h>
 
 #include "assert.h"
 #include "xmalloc.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "exitcodes.h"
 #include "util.h"
@@ -88,66 +85,94 @@
 static int duplicate_dbopen = 0;
 
 /* must be called after cyrus_init */
-int duplicate_init(const char *fname, int myflags __attribute__((unused)))
+EXPORTED int duplicate_init(const char *fname)
 {
- char buf1024;
 int r = 0;
+ char *tofree = NULL;
 
- if (r != 0)
-	syslog(LOG_ERR, "DBERROR: init %s: %s", buf,
-	 cyrusdb_strerror(r));
- else {
-	char *tofree = NULL;
-
-	if (!fname)
-	 fname = config_getstring(IMAPOPT_DUPLICATE_DB_PATH);
-
-	/* create db file name */
-	if (!fname) {
-	 tofree = xmalloc(strlen(config_dir)+sizeof(FNAME_DELIVERDB));
-	 strcpy(tofree, config_dir);
-	 strcat(tofree, FNAME_DELIVERDB);
-	 fname = tofree;
-	}
+ if (!fname)
+	fname = config_getstring(IMAPOPT_DUPLICATE_DB_PATH);
 
-	r = (DB->open)(fname, CYRUSDB_CREATE, &dupdb);
-	if (r != 0)
-	 syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
-		 cyrusdb_strerror(r));
-	else
-	 duplicate_dbopen = 1;
+ /* create db file name */
+ if (!fname) {
+	tofree = strconcat(config_dir, FNAME_DELIVERDB, (char *)NULL);
+	fname = tofree;
+ }
 
-	free(tofree);
+ r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &dupdb);
+ if (r != 0) {
+	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
+	 cyrusdb_strerror(r));
+	goto out;
 }
+ duplicate_dbopen = 1;
+
+out:
+ free(tofree);
 
 return r;
 }
 
-time_t duplicate_check(duplicate_key_t *dkey)
+static int make_key(struct buf *key, const duplicate_key_t *dkey)
 {
- char buf1024;
- int idlen = strlen(dkey->id);
- int tolen = strlen(dkey->to);
- int datelen = strlen(dkey->date); 
+ if (!dkey ||
+ !dkey->id ||
+	!dkey->to ||
+	!dkey->date)
+	return IMAP_INTERNAL;
+
+ buf_reset(key);
+ buf_appendmap(key, dkey->id, strlen(dkey->id)+1);
+ buf_appendmap(key, dkey->to, strlen(dkey->to)+1);
+ buf_appendmap(key, dkey->date, strlen(dkey->date)+1);
+ /* We have three concatenated values now, all parts ending with '\0' */
+
+ return 0;
+}
+
+static int split_key(const char *key, int keylen, duplicate_key_t *dkey)
+{
+#define MAXFIELDS 3
+ const char *fieldsMAXFIELDS;
+ int n = 0;
+ const char *p;
+
+ /* check the key as a whole is nul-terminated */
+ if (keykeylen-1 != '\0')
+	return IMAP_INTERNAL;
+
+ /* find the \0 field boundaries */
+ for (p = key ; p < (key+keylen) ; p += strlen(p)+1) {
+	if (n == MAXFIELDS)
+	 return IMAP_INTERNAL;
+	fieldsn++ = p;
+ }
+
+ if (n != 3)
+	return IMAP_INTERNAL;
+ dkey->id = fields0;
+ dkey->to = fields1;
+ dkey->date = fields2;
+
+ return 0;
+#undef MAXFIELDS
+}
+
+EXPORTED time_t duplicate_check(const duplicate_key_t *dkey)
+{
+ struct buf key = BUF_INITIALIZER;
 int r;
 const char *data = NULL;
- int len = 0;
+ size_t len = 0;
 time_t mark = 0;
 
 if (!duplicate_dbopen) return 0;
 
- if (idlen + tolen + datelen > (int) sizeof(buf) - 30) return 0;
- memcpy(buf, dkey->id, idlen);
- bufidlen = '\0';
- memcpy(buf + idlen + 1, dkey->to, tolen);
- bufidlen + tolen + 1 = '\0';
- assert(dkey->date != NULL);
- memcpy(buf + idlen + tolen + 2, dkey->date, datelen);
- bufidlen + tolen + datelen + 2 = '\0';
+ r = make_key(&key, dkey);
+ if (r) return 0;
 
 do {
-	r = DB->fetch(dupdb, buf,
-		 idlen + tolen + datelen + 3, /* We have three concatenated values now, all parts ending with '\0' */
+	r = cyrusdb_fetch(dupdb, key.s, key.len,
 		 &data, &len, NULL);
 } while (r == CYRUSDB_AGAIN);
 
@@ -160,106 +185,90 @@
 } else if (r != CYRUSDB_OK) {
 	if (r != CYRUSDB_NOTFOUND) {
 	 syslog(LOG_ERR, "duplicate_check: error looking up %s/%s/%s: %s",
-		 dkey->id, dkey->to, dkey->date, 
-		 cyrusdb_strerror(r)); 
+		 dkey->id, dkey->to, dkey->date,
+		 cyrusdb_strerror(r));
 	}
 	mark = 0;
 }
 
 #if DEBUG
 syslog(LOG_DEBUG, "duplicate_check: %-40s %-20s %-40s %ld",
-	 buf, buf+idlen+1, buf+idlen+tolen+2, mark);
+	 dkey->id, dkey->to, dkey->date, mark);
 #endif
 
+ buf_free(&key);
 return mark;
 }
 
-void duplicate_log(duplicate_key_t *dkey, char *action) 
+EXPORTED void duplicate_log(const duplicate_key_t *dkey, const char *action)
 {
 assert(dkey->date != NULL);
 syslog(LOG_INFO, "dupelim: eliminated duplicate message to %s id %s date %s (%s)",
- dkey->to, dkey->id, dkey->date, action); 
+ dkey->to, dkey->id, dkey->date, action);
 if (config_auditlog)
 	syslog(LOG_NOTICE, "auditlog: duplicate sessionid=<%s> action=<%s> message-id=%s user=<%s> date=<%s>",
-	 session_id(), action, dkey->id, dkey->to, dkey->date); 
+	 session_id(), action, dkey->id, dkey->to, dkey->date);
 }
 
-void duplicate_mark(duplicate_key_t *dkey, time_t mark, unsigned long uid)
+EXPORTED void duplicate_mark(const duplicate_key_t *dkey, time_t mark, unsigned long uid)
 {
- char buf1024, data100;
- int idlen = strlen(dkey->id);
- int tolen = strlen(dkey->to);
- int datelen = strlen(dkey->date); 
+ struct buf key = BUF_INITIALIZER;
+ char data100;
 int r;
 
 if (!duplicate_dbopen) return;
 
- if (idlen + tolen + datelen > (int) sizeof(buf) - 30) return; 
- memcpy(buf, dkey->id, idlen);
- bufidlen = '\0';
- memcpy(buf + idlen + 1, dkey->to, tolen);
- bufidlen + tolen + 1 = '\0';
- assert(dkey->date != NULL);
- memcpy(buf + idlen + tolen + 2, dkey->date, datelen);
- bufidlen + tolen + datelen + 2 = '\0';
+ r = make_key(&key, dkey);
+ if (r) return;
 
 memcpy(data, &mark, sizeof(mark));
 memcpy(data + sizeof(mark), &uid, sizeof(uid));
 
 do {
-	r = DB->store(dupdb, buf,
-		 idlen + tolen + datelen + 3, /* We have three concatenated values now, all parts ending with '\0' */
+	r = cyrusdb_store(dupdb, key.s, key.len,
 		 data, sizeof(mark)+sizeof(uid), NULL);
 } while (r == CYRUSDB_AGAIN);
 
 #if DEBUG
 syslog(LOG_DEBUG, "duplicate_mark: %-40s %-20s %-40s %ld %lu",
-	 buf, buf+idlen+1, buf+idlen+tolen+2, mark, uid); 
+	 dkey->id, dkey->to, dkey->date, mark, uid);
 #endif
+ buf_free(&key);
 }
 
 struct findrock {
- int (*proc)();
+ duplicate_find_proc_t proc;
 void *rock;
 };
 
-static int find_p(void *rock __attribute__((unused)),
-		 const char *id,
-		 int idlen __attribute__((unused)),
-		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused)))
-{
- const char *rcpt;
-
- /* grab the rcpt and make sure its a mailbox */
- rcpt = id + strlen(id) + 1;
- return (rcpt0 != '.');
-}
-
-static int find_cb(void *rock, const char *id,
-		 int idlen __attribute__((unused)),
-		 const char *data, int datalen)
+static int find_cb(void *rock, const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct findrock *frock = (struct findrock *) rock;
- const char *rcpt;
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
 time_t mark;
 unsigned long uid = 0;
 int r;
 
- /* grab the rcpt */
- rcpt = id + strlen(id) + 1;
+ r = split_key(key, keylen, &dkey);
+ if (r) return 0;	/* ignore broken records */
+
+ /* make sure its a mailbox */
+ if (dkey.to0 == '.') return 0;
 
 /* grab the mark and uid */
 memcpy(&mark, data, sizeof(time_t));
 if (datalen > (int) sizeof(mark))
 	memcpy(&uid, data + sizeof(mark), sizeof(unsigned long));
 
- r = (*frock->proc)(id, rcpt, mark, uid, frock->rock);
+ r = (*frock->proc)(&dkey, mark, uid, frock->rock);
 
 return r;
 }
 
-int duplicate_find(char *msgid, int (*proc)(), void *rock)
+EXPORTED int duplicate_find(const char *msgid,
+		 duplicate_find_proc_t proc,
+		 void *rock)
 {
 struct findrock frock;
 
@@ -269,7 +278,7 @@
 frock.rock = rock;
 
 /* check each entry in our database */
- DB->foreach(dupdb, msgid, strlen(msgid), &find_p, &find_cb, &frock, NULL);
+ cyrusdb_foreach(dupdb, msgid, strlen(msgid), NULL, find_cb, &frock, NULL);
 
 return 0;
 }
@@ -283,19 +292,22 @@
 };
 
 static int prune_p(void *rock,
-		 const char *id, int idlen __attribute__((unused)),
-		 const char *data, int datalen __attribute__((unused)))
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen __attribute__((unused)))
 {
 struct prunerock *prock = (struct prunerock *) rock;
- const char *rcpt;
 time_t mark, *expmark = NULL;
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
+ int r;
 
 prock->count++;
 
+ r = split_key(key, keylen, &dkey);
+ if (r) return 1;	/* broken record, want to prune it */
+
 /* grab the rcpt, make sure its a mailbox and lookup its expire time */
- rcpt = id + strlen(id) + 1;
- if (prock->expire_table && rcpt0 && rcpt0 != '.') {
-	expmark = (time_t *) hash_lookup(rcpt, prock->expire_table);
+ if (prock->expire_table && dkey.to0 && dkey.to0 != '.') {
+	expmark = (time_t *) hash_lookup(dkey.to, prock->expire_table);
 }
 
 /* grab the mark */
@@ -305,9 +317,9 @@
 return (mark < (expmark ? *expmark : prock->expmark));
 }
 
-static int prune_cb(void *rock, const char *id, int idlen,
+static int prune_cb(void *rock, const char *id, size_t idlen,
 		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused)))
+		 size_t datalen __attribute__((unused)))
 {
 struct prunerock *prock = (struct prunerock *) rock;
 int r;
@@ -315,14 +327,14 @@
 prock->deletions++;
 
 do {
-	r = DB->delete(prock->db, id, idlen, NULL, 0);
+	r = cyrusdb_delete(prock->db, id, idlen, NULL, 0);
 } while (r == CYRUSDB_AGAIN);
 
 
 return 0;
 }
 
-int duplicate_prune(int seconds, struct hash_table *expire_table)
+EXPORTED int duplicate_prune(int seconds, struct hash_table *expire_table)
 {
 struct prunerock prock;
 
@@ -336,7 +348,7 @@
 
 /* check each entry in our database */
 prock.db = dupdb;
- DB->foreach(dupdb, "", 0, &prune_p, &prune_cb, &prock, NULL);
+ cyrusdb_foreach(dupdb, "", 0, &prune_p, &prune_cb, &prock, NULL);
 
 syslog(LOG_NOTICE, "duplicate_prune: purged %d out of %d entries",
 	 prock.deletions, prock.count);
@@ -349,15 +361,15 @@
 int count;
 };
 
-static const char hexcodes = "0123456789ABCDEF";
-
 static int dump_cb(void *rock,
-		 const char *key, int keylen __attribute__((unused)),
-		 const char *data, int datalen)
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct dumprock *drock = (struct dumprock *) rock;
 time_t mark;
- char *id, *to, *freeme;
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
+ char *freeme = NULL;
+ int r;
 int idlen, i;
 unsigned long uid = 0;
 
@@ -369,36 +381,32 @@
 memcpy(&mark, data, sizeof(time_t));
 if (datalen > (int) sizeof(mark))
 	memcpy(&uid, data + sizeof(mark), sizeof(unsigned long));
- to = (char*) key + strlen(key) + 1;
- id = (char *) key;
- idlen = strlen(id);
+
+ r = split_key(key, keylen, &dkey);
+ if (r) goto out;
+ idlen = strlen(dkey.id);
 
 for (i = 0; i < idlen; i++) {
-	if (!isprint((unsigned char) idi)) break;
+	if (!isprint((unsigned char) dkey.idi)) break;
 }
 
 if (i != idlen) {
 	/* change to hexadecimal */
-	freeme = (char *) xmalloc(sizeof(char) * idlen * 2 + 1);
-	for (i = 0; i < idlen; i++) {
-	 freeme2 * i = hexcodes(idi >> 4) & 0xf;
-	 freeme2 * i + 1 = hexcodesidi & 0xf;
-	}
-	freeme2 * idlen = '\0';
-	id = freeme;
- } else {
-	freeme = NULL;
+	freeme = xmalloc(idlen * 2 + 1);
+	bin_to_hex(dkey.id, idlen, freeme, BH_UPPER);
+	dkey.id = freeme;
 }
 
 fprintf(drock->f, "id: %-40s\tto: %-20s\tat: %ld\tuid: %lu\n",
-	 id, to, (long) mark, uid);
+	 dkey.id, dkey.to, (long) mark, uid);
 
+out:
 if (freeme) free(freeme);
 
 return 0;
 }
 
-int duplicate_dump(FILE *f)
+EXPORTED int duplicate_dump(FILE *f)
 {
 struct dumprock drock;
 
@@ -406,17 +414,17 @@
 drock.count = 0;
 
 /* check each entry in our database */
- DB->foreach(dupdb, "", 0, NULL, &dump_cb, &drock, NULL);
+ cyrusdb_foreach(dupdb, "", 0, NULL, &dump_cb, &drock, NULL);
 
 return drock.count;
 }
 
-int duplicate_done(void)
+EXPORTED int duplicate_done(void)
 {
 int r = 0;
 
 if (duplicate_dbopen) {
-	r = (DB->close)(dupdb);
+	r = cyrusdb_close(dupdb);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing deliverdb: %s",
 		 cyrusdb_strerror(r));

cyrus-imapd-2.4.17.tar.gz/imap/duplicate.h -> cyrus-imapd-2.5.tar.gz/imap/duplicate.h Changed

@@ -37,8 +37,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: duplicate.h,v 1.18 2010/01/06 17:01:31 murch Exp $
  */
 
 #ifndef DUPLICATE_H
@@ -57,12 +55,14 @@
 
 #define DUPLICATE_INITIALIZER { NULL, NULL, NULL }
 
-int duplicate_init(const char *fname, int myflags);
+int duplicate_init(const char *fname);
 
-time_t duplicate_check(duplicate_key_t *dkey);
-void duplicate_log(duplicate_key_t *dkey, char *action);
-void duplicate_mark(duplicate_key_t *dkey, time_t mark, unsigned long uid);
-int duplicate_find(char *msgid, int (*proc)(), void *rock);
+time_t duplicate_check(const duplicate_key_t *dkey);
+void duplicate_log(const duplicate_key_t *dkey, const char *action);
+void duplicate_mark(const duplicate_key_t *dkey, time_t mark, unsigned long uid);
+typedef int (*duplicate_find_proc_t)(const duplicate_key_t *, time_t,
+				     unsigned long, void *);
+int duplicate_find(const char *msgid, duplicate_find_proc_t, void *rock);
 
 int duplicate_prune(int seconds, struct hash_table *expire_table);
 int duplicate_dump(FILE *f);

cyrus-imapd-2.4.17.tar.gz/imap/fetchnews.c -> cyrus-imapd-2.5.tar.gz/imap/fetchnews.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: fetchnews.c,v 1.22 2010/01/06 17:01:31 murch Exp $
 */
 
 #include <config.h>
@@ -67,18 +65,16 @@
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
-
-/* global state */
-const int config_need_data = 0;
+#include "strarray.h"
 
 #define FNAME_NEWSRCDB "/fetchnews.db"
-#define DB (&cyrusdb_flat)
+#define DB ("flat")
 
 static struct db *newsrc_db = NULL;
 static int newsrc_dbopen = 0;
 
 /* must be called after cyrus_init */
-int newsrc_init(const char *fname, int myflags __attribute__((unused)))
+static int newsrc_init(const char *fname, int myflags __attribute__((unused)))
 {
 char buf1024;
 int r = 0;
@@ -98,7 +94,7 @@
 	 fname = tofree;
 	}
 
-	r = (DB->open)(fname, CYRUSDB_CREATE, &newsrc_db);
+	r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &newsrc_db);
 	if (r != 0)
 	 syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
 		 cyrusdb_strerror(r));
@@ -111,12 +107,12 @@
 return r;
 }
 
-int newsrc_done(void)
+static int newsrc_done(void)
 {
 int r = 0;
 
 if (newsrc_dbopen) {
-	r = (DB->close)(newsrc_db);
+	r = cyrusdb_close(newsrc_db);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing fetchnews.db: %s",
 		 cyrusdb_strerror(r));
@@ -127,7 +123,7 @@
 return r;
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "fetchnews -C <altconfig> -s <server> -n -y -w <wildmat> -f <tstamp file>\n"
@@ -172,7 +168,7 @@
 return sock;
 }
 
-int fetch(char *msgid, int bymsgid,
+static int fetch(char *msgid, int bymsgid,
 	 struct protstream *pin, struct protstream *pout,
 	 struct protstream *sin, struct protstream *sout,
 	 int *rejected, int *accepted, int *failed)
@@ -251,7 +247,6 @@
 return 0;
 }
 
-#define RESP_GROW 100
 #define BUFFERSIZE 4096
 
 int main(int argc, char *argv)
@@ -265,13 +260,13 @@
 struct protstream *pin, *pout, *sin, *sout;
 char bufBUFFERSIZE;
 char sfile1024 = "";
- int fd = -1, i, n, offered, rejected, accepted, failed;
+ int fd = -1, i, offered, rejected, accepted, failed;
 time_t stamp;
- char **resp = NULL;
+ strarray_t resp = STRARRAY_INITIALIZER;
 int newnews = 1;
 char *datefmt = "%y%m%d %H%M%S";
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -325,7 +320,7 @@
 
 peer = argvoptind++;
 
- cyrus_init(alt_config, "fetchnews", 0);
+ cyrus_init(alt_config, "fetchnews", 0, 0);
 
 /* connect to the peer */
 /* xxx configurable port number? */
@@ -412,7 +407,7 @@
 	 syslog(LOG_ERR, "cannot open %s", sfile);
 	 goto quit;
 	}
-	if (lock_nonblocking(fd) == -1) {
+	if (lock_nonblocking(fd, sfile) == -1) {
 	 syslog(LOG_ERR, "cannot lock %s: %m", sfile);
 	 goto quit;
 	}
@@ -455,15 +450,9 @@
 }
 
 /* process the NEWNEWS/LIST ACTIVE list */
- n = 0;
 while (prot_fgets(buf, sizeof(buf), pin)) {
 	if (buf0 == '.') break;
-
-	if (!(n % RESP_GROW)) { /* time to alloc more */
-	 resp = (char **)
-		xrealloc(resp, (n + RESP_GROW) * sizeof(char *));
-	}
-	respn++ = xstrdup(buf);
+	strarray_append(&resp, buf);
 }
 if (buf0 != '.') {
 	syslog(LOG_ERR, "%s terminated abnormally",
@@ -471,7 +460,7 @@
 	goto quit;
 }
 
- if (!n) {
+ if (!resp.count) {
 	/* nothing matches our wildmat */
 	goto quit;
 }
@@ -492,12 +481,12 @@
 offered = rejected = accepted = failed = 0;
 if (newnews) {
 	/* response is a list of msgids */
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < resp.count; i++) {
 	 /* find the end of the msgid */
-	 *(strrchr(respi, '>') + 1) = '\0';
+	 *(strrchr(resp.datai, '>') + 1) = '\0';
 
 	 offered++;
-	 if (fetch(respi, 1, pin, pout, sin, sout,
+	 if (fetch(resp.datai, 1, pin, pout, sin, sout,
 		 &rejected, &accepted, &failed)) {
 		goto quit;
 	 }
@@ -507,7 +496,7 @@
 	lseek(fd, 0, SEEK_SET);
 	if (write(fd, &stamp, sizeof(stamp)) < (int) sizeof(stamp))
 	 syslog(LOG_ERR, "error writing %s", sfile);
-	lock_unlock(fd);
+	lock_unlock(fd, sfile);
 	close(fd);
 }
 else {
@@ -515,7 +504,7 @@
 	const char *data;
 	unsigned long low, high, last, cur;
 	int start;
-	int datalen;
+	size_t datalen;
 	struct txn *tid = NULL;
 
 	newsrc_init(NULL, 0);
@@ -524,12 +513,12 @@
 	 * response is a list of groups.
 	 * select each group, and STAT each article we haven't seen yet.
 	 */
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < resp.count; i++) {
 	 /* parse the LIST ACTIVE response */
-	 sscanf(respi, "%s %lu %lu", group, &high, &low);
+	 sscanf(resp.datai, "%s %lu %lu", group, &high, &low);
 
 	 last = 0;
-	 if (!DB->fetchlock(newsrc_db, group, strlen(group),
+	 if (!cyrusdb_fetchlock(newsrc_db, group, strlen(group),
 			 &data, &datalen, &tid)) {
 		last = strtoul(data, NULL, 10);
 	 }
@@ -578,11 +567,11 @@
 	 }
 
 	 snprintf(lastbuf, sizeof(lastbuf), "%lu", cur);
-	 DB->store(newsrc_db, group, strlen(group),
+	 cyrusdb_store(newsrc_db, group, strlen(group),
 		 lastbuf, strlen(lastbuf)+1, &tid);
 	}
 
-	if (tid) DB->commit(newsrc_db, tid);
+	if (tid) cyrusdb_commit(newsrc_db, tid);
 	newsrc_done();
 }

cyrus-imapd-2.4.17.tar.gz/imap/fud.c -> cyrus-imapd-2.5.tar.gz/imap/fud.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: fud.c,v 1.59 2010/06/28 12:04:16 brong Exp $
 */
 
 #include <config.h>
@@ -50,7 +48,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <syslog.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -64,19 +61,16 @@
 #include <pwd.h>
 
 #include "acl.h"
-#include "assert.h"
 #include "mboxlist.h"
 #include "global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "map.h"
 #include "mboxname.h"
 #include "proc.h"
 #include "seen.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 #define REQ_OK		0
 #define REQ_DENY	1
@@ -91,66 +85,50 @@
 * only if we're not on a frontend, so we won't flat-out require it here */
 const int config_need_data = 0;
 
-int handle_request(const char *who, const char *name, 
-		 struct sockaddr_storage sfrom, socklen_t sfromsiz);
+static int handle_request(const char *who, const char *name,
+			 struct sockaddr *sfrom, socklen_t sfromsiz);
 
-void send_reply(struct sockaddr_storage sfrom, socklen_t sfromsiz, int status,
+static void send_reply(struct sockaddr *sfrom, socklen_t sfromsiz, int status,
 		const char *user, const char *mbox,
 		int numrecent, time_t lastread, time_t lastarrived);
 
-int soc = 0; /* inetd (master) has handed us the port as stdin */
-
-char who16;
+static int soc = 0; /* inetd (master) has handed us the port as stdin */
 
 #define MAXLOGNAME 16		/* should find out for real */
 #define MAXDOMNAME 20		/* should find out for real */
 
-int begin_handling(void)
+static int begin_handling(void)
 {
- struct sockaddr_storage sfrom;
- socklen_t sfromsiz = sizeof(sfrom);
- int r;
- char bufMAXLOGNAME + MAXDOMNAME + MAX_MAILBOX_BUFFER;
- char usernameMAXLOGNAME + MAXDOMNAME + 1;
- char mboxMAX_MAILBOX_BUFFER;
- char *q;
- int off;
-	int maxuserlen = MAXLOGNAME;
-
-	if (config_virtdomains) 
-	 maxuserlen += MAXDOMNAME + 1; /* @ + DOM */
-
- while(1) {
- /* For safety */
- memset(buf, 0, sizeof(buf));
- memset(username, 0, sizeof(username));
- memset(mbox, 0, sizeof(mbox));
-
-	 if (signals_poll() == SIGHUP) {
-		/* caught a SIGHUP, return */
-		return 0;
-	 }
- r = recvfrom(soc, buf, 511, 0, 
-			 (struct sockaddr *) &sfrom, &sfromsiz);
- if (r == -1) {
-		return(errno);
-	 }
- for(off = 0; bufoff != '|' && off < maxuserlen; off++);
- if(off > 0 && off < maxuserlen) {
-		strncpy(username,buf,off);
-		usernameoff = '\0';
- } else {
-		continue;
- }
+ struct sockaddr_storage sfrom_storage;
+ struct sockaddr *sfrom = (struct sockaddr *)&sfrom_storage;
+ socklen_t sfromsiz;
+ char bufMAXLOGNAME + MAXDOMNAME + MAX_MAILBOX_BUFFER;
+ char *mbox;
+ int r;
 
-	 /* Copy what is past the | to the mailbox name */
- q = buf + off + 1;
- strlcpy(mbox, q, sizeof(mbox));
+ while(1) {
+	if (signals_poll() == SIGHUP) {
+	 /* caught a SIGHUP, return */
+	 return 0;
+	}
+
+	memset(buf, 0, sizeof(buf));
+
+	sfromsiz = sizeof(struct sockaddr_storage);
+	r = recvfrom(soc, buf, 511, 0, sfrom, &sfromsiz);
+	if (r < 0) return errno;
 
- handle_request(username,mbox,sfrom,sfromsiz);
+	mbox = strchr(buf, '|');
+	if (mbox) {
+	 *mbox++ = 0;
+ } else {
+	 continue;
 }
 
-	/* never reached */
+ handle_request(buf, mbox, sfrom, sfromsiz);
+ }
+
+ /* never reached */
 }
 
 void shut_down(int code) __attribute__((noreturn));
@@ -239,35 +217,43 @@
 
 
 /* Send a proxy request to the backend, send their reply to sfrom */
-int do_proxy_request(const char *who, const char *name,
-		 const char *backend_host,
-		 struct sockaddr_storage sfrom, socklen_t sfromsiz) 
+static int do_proxy_request(const char *who, const char *name,
+			 const char *backend_host,
+			 struct sockaddr *sfrom, socklen_t sfromsiz) 
 {
 char tmpbuf1024;
- int rc;
+ int replysize;
+ int r = 0;
 int csoc = -1;
- int error;
- struct sockaddr_storage cin, cout;
- struct addrinfo hints, *res0, *res;
+ int error = 0;
 socklen_t cinsiz, coutsiz;
- static char *backend_port = NULL; /* fud port */
+ struct sockaddr_storage cin_storage, cout_storage;
+ struct sockaddr *cin = (struct sockaddr *)&cin_storage;
+ struct sockaddr *cout = (struct sockaddr *)&cout_storage;
+ static const char *backend_port = NULL; /* fud port */
+ struct addrinfo hints;
+ struct addrinfo *res, *res0;
 
 /* Open a UDP socket to the Cyrus mail server */
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = PF_UNSPEC;
 hints.ai_socktype = SOCK_DGRAM;
- if (!backend_port) {
+
+ if (backend_port) {
+	error = getaddrinfo(backend_host, backend_port, &hints, &res0);
+ }
+ else {
 	backend_port = "fud";
 	error = getaddrinfo(backend_host, backend_port, &hints, &res0);
 	if (error == EAI_SERVICE) {
 	 backend_port = "4201"; /* default fud port */
 	 error = getaddrinfo(backend_host, backend_port, &hints, &res0);
 	}
- } else
-	error = getaddrinfo(backend_host, backend_port, &hints, &res0);
- if (error != 0) {
+ }
+
+ if (error) {
 	send_reply(sfrom, sfromsiz, REQ_UNK, who, name, 0, 0, 0);
-	rc = IMAP_SERVER_UNAVAILABLE;
+	r = IMAP_SERVER_UNAVAILABLE;
 	goto done;
 }
 
@@ -279,14 +265,14 @@
 */
 csoc = -1;
 for (res = res0; res; res = res->ai_next) {
-	if (res->ai_family == sfrom.ss_family) {
+	if (res->ai_family == sfrom->sa_family) {
 	 csoc = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 	 break;
 	}
 }
 if (csoc < 0) {
 	for (res = res0; res; res = res->ai_next) {
-	 if (res->ai_family != sfrom.ss_family &&
+	 if (res->ai_family != sfrom->sa_family &&
 		(res->ai_family == AF_INET || res->ai_family == AF_INET6)) {
 		csoc = socket(res->ai_family, res->ai_socktype,
 			 res->ai_protocol);
@@ -296,57 +282,57 @@
 }
 if (csoc < 0) {
 	send_reply(sfrom, sfromsiz, REQ_UNK, who, name, 0, 0, 0);
-	rc = IMAP_SERVER_UNAVAILABLE;
-	freeaddrinfo(res0);	
+	r = IMAP_SERVER_UNAVAILABLE;
+	freeaddrinfo(res0);
 	goto done;
 }
 
- memcpy(&cin, res->ai_addr, res->ai_addrlen);
 cinsiz = res->ai_addrlen;
+ memcpy(cin, res->ai_addr, cinsiz);
 freeaddrinfo(res0);
 
 /* Write a Cyrus query into *tmpbuf */
- memset (tmpbuf, '\0', sizeof(tmpbuf));
- snprintf (tmpbuf, sizeof(tmpbuf), "%s|%s", who, name);
+ memset(tmpbuf, '\0', sizeof(tmpbuf));
+ snprintf(tmpbuf, sizeof(tmpbuf), "%s|%s", who, name);
 
 /* Send the query and wait for a reply */
- sendto (csoc, tmpbuf, strlen (tmpbuf), 0,
-	 (struct sockaddr *) &cin, cinsiz);
- memset (tmpbuf, '\0', strlen (tmpbuf));
+ sendto(csoc, tmpbuf, strlen (tmpbuf), 0, cin, cinsiz);
 
 if (setsigalrm(1) < 0) {
-	rc = IMAP_SERVER_UNAVAILABLE;
+	r = IMAP_SERVER_UNAVAILABLE;
 	send_reply(sfrom, sfromsiz, REQ_UNK, who, name, 0, 0, 0);
 	goto done;
 }
 
- rc = 0;
- coutsiz = sizeof(cout);
- alarm (1);
- rc = recvfrom (csoc, tmpbuf, sizeof(tmpbuf), 0,
-		 (struct sockaddr *) &cout, &coutsiz);
- alarm (0);
+ r = 0;
+ alarm(1);
+
+ memset(tmpbuf, '\0', strlen (tmpbuf));
+
+ coutsiz = sizeof(struct sockaddr_storage);
+ replysize = recvfrom(csoc, tmpbuf, sizeof(tmpbuf), 0, cout, &coutsiz);
+ alarm(0);
 
 setsigalrm(0); /* Failure isn't really terrible here */
 
- if (rc < 1) {
-	rc = IMAP_SERVER_UNAVAILABLE;
+ if (replysize < 1) {
+	r = IMAP_SERVER_UNAVAILABLE;
 	send_reply(sfrom, sfromsiz, REQ_UNK, who, name, 0, 0, 0);
 	goto done;
 }
 
 /* Send reply back */
- /* rc is size */
- sendto(soc, tmpbuf, rc, 0, (struct sockaddr *) &sfrom, sfromsiz);
- rc = 0;
+ /* r is size */
+ sendto(soc, tmpbuf, replysize, 0, sfrom, sfromsiz);
+ r = 0;
 
 done:
- if(csoc != -1) close(csoc);
- return rc;
+ if (csoc != -1) close(csoc);
+ return r;
 }
 
-int handle_request(const char *who, const char *name,
-		 struct sockaddr_storage sfrom, socklen_t sfromsiz)
+static int handle_request(const char *who, const char *name,
+			 struct sockaddr *sfrom, socklen_t sfromsiz)
 {
 int r;
 struct mailbox *mailbox = NULL;
@@ -355,7 +341,7 @@
 unsigned recentuid;
 unsigned numrecent;
 char mboxnameMAX_MAILBOX_BUFFER;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 struct auth_state *mystate;
 int internalseen;
 
@@ -367,33 +353,33 @@
 if (r) return r; 
 
 r = mboxlist_lookup(mboxname, &mbentry, NULL);
- if(r || mbentry.mbtype & MBTYPE_RESERVE) {
+ if (r || mbentry->mbtype & MBTYPE_RESERVE) {
 	send_reply(sfrom, sfromsiz, REQ_UNK, who, name, 0, 0, 0);
+	mboxlist_entry_free(&mbentry);
 	return r;
 }
 
 mystate = auth_newstate("anonymous");
 
- if(mbentry.mbtype & MBTYPE_REMOTE) {
-	char *p = NULL;
-
-	/* xxx hide that we are storing partitions */
-	p = strchr(mbentry.partition, '!');
-	if(p) *p = '\0';
-
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
 	/* Check the ACL */
-	if(cyrus_acl_myrights(mystate, mbentry.acl) & ACL_USER0) {
+	if(cyrus_acl_myrights(mystate, mbentry->acl) & ACL_USER0) {
 	 /* We want to proxy this one */
 	 auth_freestate(mystate);
-	 return do_proxy_request(who, name, mbentry.partition, sfrom, sfromsiz);
+	 r = do_proxy_request(who, name, mbentry->server, sfrom, sfromsiz);
+	 mboxlist_entry_free(&mbentry);
+	 return r;
 	} else {
 	 /* Permission Denied */
 	 auth_freestate(mystate);
+	 mboxlist_entry_free(&mbentry);
 	 send_reply(sfrom, sfromsiz, REQ_DENY, who, name, 0, 0, 0);
 	 return 0;
 	}
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /*
 * Open/lock header 
 */
@@ -455,11 +441,11 @@
 send_reply(sfrom, sfromsiz, REQ_OK, who, name, numrecent,
 	 lastread, lastarrived);
 
- return(0);
+ return 0;
 }
 
-void
-send_reply(struct sockaddr_storage sfrom, socklen_t sfromsiz,
+static void
+send_reply(struct sockaddr *sfrom, socklen_t sfromsiz,
 	 int status, const char *user, const char *mbox,
 	 int numrecent, time_t lastread, time_t lastarrived)
 {
@@ -468,21 +454,21 @@
 
 switch(status) {
 case REQ_DENY:
- sendto(soc,"PERMDENY",9,0,(struct sockaddr *) &sfrom, sfromsiz); 
+ sendto(soc, "PERMDENY", 9, 0, sfrom, sfromsiz); 
 break;
 case REQ_OK:
 siz = snprintf(buf, sizeof(buf), "%s|%s|%d|%u|%u",
 			 user, mbox, numrecent,
 			 (uint32_t)lastread, (uint32_t)lastarrived);
- sendto(soc,buf,siz,0,(struct sockaddr *) &sfrom, sfromsiz); 
+ sendto(soc, buf, siz, 0, sfrom, sfromsiz); 
 break;
 case REQ_UNK:
- sendto(soc,"UNKNOWN",8,0,(struct sockaddr *) &sfrom, sfromsiz);
+ sendto(soc,"UNKNOWN", 8, 0, sfrom, sfromsiz);
 break;
 } 
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 if (recurse_code) {
@@ -495,9 +481,3 @@
 shut_down(code);
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for FUD!",
-	 EC_SOFTWARE);
-}

cyrus-imapd-2.4.17.tar.gz/imap/global.c -> cyrus-imapd-2.5.tar.gz/imap/global.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: global.c,v 1.35 2010/04/22 17:29:53 murch Exp $
 */
 
 #include <config.h>
@@ -57,19 +55,19 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <errno.h>
 
 #include "acl.h"
-#include "cyrusdb.h"
+#include "assert.h"
+#include "charset.h"
 #include "exitcodes.h"
 #include "gmtoff.h"
-#include "hash.h"
-#include "imap_err.h"
+#include "iptostring.h"
+#include "imap/imap_err.h"
 #include "global.h"
 #include "libconfig.h"
 #include "libcyr_cfg.h"
 #include "mboxlist.h"
-#include "mupdate_err.h"
+#include "imap/mupdate_err.h"
 #include "mutex.h"
 #include "prot.h" /* for PROT_BUFSIZE */
 #include "strarray.h"
@@ -77,7 +75,6 @@
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 static enum {
 NOT_RUNNING = 0,
@@ -87,37 +84,76 @@
 
 static int cyrus_init_nodb = 0;
 
-int in_shutdown = 0;
-
-int config_fulldirhash;				/* 0 */
-int config_implicitrights;			/* "lkxa" */
-unsigned long config_metapartition_files;	/* 0 */
-struct cyrusdb_backend *config_mboxlist_db;
-struct cyrusdb_backend *config_quota_db;
-struct cyrusdb_backend *config_subscription_db;
-struct cyrusdb_backend *config_annotation_db;
-struct cyrusdb_backend *config_seenstate_db;
-struct cyrusdb_backend *config_mboxkey_db;
-struct cyrusdb_backend *config_duplicate_db;
-struct cyrusdb_backend *config_tlscache_db;
-struct cyrusdb_backend *config_ptscache_db;
-struct cyrusdb_backend *config_statuscache_db;
-struct cyrusdb_backend *config_userdeny_db;
-
-char session_id_bufMAX_SESSIONID_SIZE;
-int session_id_time = 0;
-int session_id_count = 0;
-
-strarray_t *suppressed_capabilities = NULL;
+EXPORTED int in_shutdown = 0;
+
+EXPORTED int config_fulldirhash;				/* 0 */
+EXPORTED int config_implicitrights;			/* "lkxa" */
+EXPORTED unsigned long config_metapartition_files;	/* 0 */
+EXPORTED const char *config_mboxlist_db;
+EXPORTED const char *config_quota_db;
+EXPORTED const char *config_subscription_db;
+EXPORTED const char *config_annotation_db;
+EXPORTED const char *config_seenstate_db;
+HIDDEN const char *config_mboxkey_db;
+EXPORTED const char *config_duplicate_db;
+EXPORTED const char *config_tlscache_db;
+EXPORTED const char *config_ptscache_db;
+EXPORTED const char *config_statuscache_db;
+HIDDEN const char *config_userdeny_db;
+EXPORTED const char *config_conversations_db;
+EXPORTED int charset_flags;
+
+static char session_id_bufMAX_SESSIONID_SIZE;
+static int session_id_time = 0;
+static int session_id_count = 0;
+
+static strarray_t *suppressed_capabilities = NULL;
+
+static int get_facility(const char *name)
+{
+ if (!strcasecmp(name, "DAEMON"))
+	return LOG_DAEMON;
+ if (!strcasecmp(name, "MAIL"))
+	return LOG_MAIL;
+ if (!strcasecmp(name, "NEWS"))
+	return LOG_NEWS;
+ if (!strcasecmp(name, "USER"))
+	return LOG_USER;
+ if (!strcasecmp(name, "LOCAL0"))
+	return LOG_LOCAL0;
+ if (!strcasecmp(name, "LOCAL1"))
+	return LOG_LOCAL1;
+ if (!strcasecmp(name, "LOCAL2"))
+	return LOG_LOCAL2;
+ if (!strcasecmp(name, "LOCAL3"))
+	return LOG_LOCAL3;
+ if (!strcasecmp(name, "LOCAL4"))
+	return LOG_LOCAL4;
+ if (!strcasecmp(name, "LOCAL5"))
+	return LOG_LOCAL5;
+ if (!strcasecmp(name, "LOCAL6"))
+	return LOG_LOCAL6;
+ if (!strcasecmp(name, "LOCAL7"))
+	return LOG_LOCAL7;
+
+ /* fall back to the default. This will work because we already have
+ this log open when we call out */
+
+ syslog(LOG_ERR, "config error: syslog name %s not recognised", name);
+
+ return SYSLOG_FACILITY;
+}
 
 /* Called before a cyrus application starts (but after command line parameters
 * are read) */
-int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+EXPORTED int cyrus_init(const char *alt_config, const char *ident, unsigned flags, int config_need_data)
 {
 char *p;
 const char *val;
 const char *prefix;
 int umaskval = 0;
+ int syslog_opts = LOG_PID;
+ const char *facility;
 
 if(cyrus_init_run != NOT_RUNNING) {
 	fatal("cyrus_init called twice!", EC_CONFIG);
@@ -126,6 +162,10 @@
 }
 
 cyrus_init_nodb = (flags & CYRUSINIT_NODB);
+#ifdef LOG_PERROR
+ if ((flags & CYRUSINIT_PERROR))
+	syslog_opts |= LOG_PERROR;
+#endif
 
 initialize_imap_error_table();
 initialize_mupd_error_table();
@@ -137,28 +177,34 @@
 
 /* xxx we lose here since we can't have the prefix until we load the
 * config file */
- openlog(config_ident, LOG_PID, SYSLOG_FACILITY);
+ openlog(config_ident, syslog_opts, SYSLOG_FACILITY);
 
 /* Load configuration file. This will set config_dir when it finds it */
- config_read(alt_config);
+ config_read(alt_config, config_need_data);
 
 prefix = config_getstring(IMAPOPT_SYSLOG_PREFIX);
+ facility = config_getstring(IMAPOPT_SYSLOG_FACILITY);
 
- /* Reopen the log with the new prefix, if needed */ 
- if(prefix) {
-	int size = strlen(prefix) + 1 + strlen(ident) + 1;
-	char *ident_buf = xmalloc(size);
-	
-	strlcpy(ident_buf, prefix, size);
-	strlcat(ident_buf, "/", size);
-	strlcat(ident_buf, ident, size);
+ /* Reopen the log with the new prefix, if needed */
+ if (prefix || facility) {
+	char *ident_buf;
+	int facnum = facility ? get_facility(facility) : SYSLOG_FACILITY;
+
+	if (prefix)
+	 ident_buf = strconcat(prefix, "/", ident, (char *)NULL);
+	else
+	 ident_buf = xstrdup(ident);
 
 	closelog();
-	openlog(ident_buf, LOG_PID, SYSLOG_FACILITY);
+	openlog(ident_buf, syslog_opts, facnum);
 
 	/* don't free the openlog() string! */
 }
 
+ /* allow debug logging */
+ if (!config_debug)
+	setlogmask(~LOG_MASK(LOG_DEBUG));
+
 /* Look up default partition */
 config_defpartition = config_getstring(IMAPOPT_DEFAULTPARTITION);
 for (p = (char *)config_defpartition; p && *p; p++) {
@@ -186,32 +232,39 @@
 
 val = config_getstring(IMAPOPT_SUPPRESS_CAPABILITIES);
 if (val)
-	suppressed_capabilities = strarray_split(val, NULL);
+	suppressed_capabilities = strarray_split(val, NULL, 0);
+ if (config_getswitch(IMAPOPT_SEARCH_SKIPDIACRIT))
+	charset_flags |= CHARSET_SKIPDIACRIT;
+
+ switch (config_getenum(IMAPOPT_SEARCH_WHITESPACE)) {
+	case IMAP_ENUM_SEARCH_WHITESPACE_MERGE:
+	 charset_flags |= CHARSET_MERGESPACE;
+	 break;
+	case IMAP_ENUM_SEARCH_WHITESPACE_SKIP:
+	 charset_flags |= CHARSET_SKIPSPACE;
+	 break;
+	default:
+	 break;
+ }
+
+ if (config_getswitch(IMAPOPT_SEARCH_SKIPHTML))
+	charset_flags |= CHARSET_SKIPHTML;
+
 
 if (!cyrus_init_nodb) {
 	/* lookup the database backends */
-	config_mboxlist_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_MBOXLIST_DB));
-	config_quota_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_QUOTA_DB));
-	config_subscription_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_SUBSCRIPTION_DB));
-	config_annotation_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_ANNOTATION_DB));
-	config_seenstate_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_SEENSTATE_DB));
-	config_mboxkey_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_MBOXKEY_DB));
-	config_duplicate_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_DUPLICATE_DB));
-	config_tlscache_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_TLSCACHE_DB));
-	config_ptscache_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB));
-	config_statuscache_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_STATUSCACHE_DB));
-	config_userdeny_db =
-	 cyrusdb_fromname(config_getstring(IMAPOPT_USERDENY_DB));
+	config_mboxlist_db = config_getstring(IMAPOPT_MBOXLIST_DB);
+	config_quota_db = config_getstring(IMAPOPT_QUOTA_DB);
+	config_subscription_db = config_getstring(IMAPOPT_SUBSCRIPTION_DB);
+	config_annotation_db = config_getstring(IMAPOPT_ANNOTATION_DB);
+	config_seenstate_db = config_getstring(IMAPOPT_SEENSTATE_DB);
+	config_mboxkey_db = config_getstring(IMAPOPT_MBOXKEY_DB);
+	config_duplicate_db = config_getstring(IMAPOPT_DUPLICATE_DB);
+	config_tlscache_db = config_getstring(IMAPOPT_TLSCACHE_DB);
+	config_ptscache_db = config_getstring(IMAPOPT_PTSCACHE_DB);
+	config_statuscache_db = config_getstring(IMAPOPT_STATUSCACHE_DB);
+	config_userdeny_db = config_getstring(IMAPOPT_USERDENY_DB);
+	config_conversations_db = config_getstring(IMAPOPT_CONVERSATIONS_DB);
 
 	/* configure libcyrus as needed */
 	libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
@@ -257,6 +310,8 @@
 				 config_getstring(IMAPOPT_SQL_PASSWD));
 	libcyrus_config_setswitch(CYRUSOPT_SQL_USESSL,
 				 config_getswitch(IMAPOPT_SQL_USESSL));
+	libcyrus_config_setswitch(CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
+				 config_getswitch(IMAPOPT_SKIPLIST_ALWAYS_CHECKPOINT));
 
 	/* Not until all configuration parameters are set! */
 	libcyrus_init();
@@ -265,7 +320,7 @@
 return 0;
 }
 
-void global_sasl_init(int client, int server, const sasl_callback_t *callbacks)
+EXPORTED void global_sasl_init(int client, int server, const sasl_callback_t *callbacks)
 {
 static int called_already = 0;
 
@@ -275,9 +330,9 @@
 called_already = 1;
 
 /* set the SASL allocation functions */
- sasl_set_alloc((sasl_malloc_t *) &xmalloc, 
-		 (sasl_calloc_t *) &calloc, 
-		 (sasl_realloc_t *) &xrealloc, 
+ sasl_set_alloc((sasl_malloc_t *) &xmalloc,
+		 (sasl_calloc_t *) &xcalloc,
+		 (sasl_realloc_t *) &xrealloc,
 		 (sasl_free_t *) &free);
 
 /* set the SASL mutex functions */
@@ -296,15 +351,13 @@
 }
 
 /* this is a wrapper to call the cyrus configuration from SASL */
-int mysasl_config(void *context __attribute__((unused)), 
+EXPORTED int mysasl_config(void *context __attribute__((unused)),
 		 const char *plugin_name,
 		 const char *option,
 		 const char **result,
 		 unsigned *len)
 {
- char opt1024;
-
- if (!strcmp(option, "srvtab")) { 
+ if (!strcmp(option, "srvtab")) {
 	/* we don't transform srvtab! */
 	*result = config_getstring(IMAPOPT_SRVTAB);
 } else {
@@ -312,18 +365,16 @@
 
 	if (plugin_name) {
 	 /* first try it with the plugin name */
-	 strlcpy(opt, "sasl_", sizeof(opt));
-	 strlcat(opt, plugin_name, sizeof(opt));
-	 strlcat(opt, "_", sizeof(opt));
-	 strlcat(opt, option, sizeof(opt));
+	 char *opt = strconcat("sasl_", plugin_name, "_", option, (char*)NULL);
 	 *result = config_getoverflowstring(opt, NULL);
+	 free(opt);
 	}
 
 	if (*result == NULL) {
 	 /* try without the plugin name */
-	 strlcpy(opt, "sasl_", sizeof(opt));
-	 strlcat(opt, option, sizeof(opt));
+	 char *opt = strconcat("sasl_", option, (char *)NULL);
 	 *result = config_getoverflowstring(opt, NULL);
+	 free(opt);
 	}
 }
 
@@ -331,14 +382,14 @@
 	if (len) { *len = strlen(*result); }
 	return SASL_OK;
 }
- 
+
 return SASL_FAIL;
 }
 
 /* This creates a structure that defines the allowable
 * security properties 
 */
-sasl_security_properties_t *mysasl_secprops(int flags)
+EXPORTED sasl_security_properties_t *mysasl_secprops(int flags)
 {
 static sasl_security_properties_t ret;
 
@@ -362,7 +413,7 @@
 }
 
 /* true if 'authstate' is in 'opt' */
-int global_authisa(struct auth_state *authstate, enum imapopt opt)
+EXPORTED int global_authisa(struct auth_state *authstate, enum imapopt opt)
 {
 char buf1024;
 const char *val = config_getstring(opt);
@@ -393,7 +444,8 @@
 
 /* Note: This function is not idempotent! Only call it once for a given ID
 * or you will be unhappy (think IP hosting). */
-char *canonify_userid(char *user, char *loginid, int *domain_from_ip)
+EXPORTED const char *canonify_userid(char *user, const char *loginid,
+			 int *domain_from_ip)
 {
 char *domain = NULL;
 int len = strlen(user);
@@ -453,7 +505,7 @@
 return auth_canonifyid(user, 0);
 }
 
-int mysasl_canon_user(sasl_conn_t *conn,
+EXPORTED int mysasl_canon_user(sasl_conn_t *conn,
 		 void *context,
 		 const char *user, unsigned ulen,
 		 unsigned flags __attribute__((unused)),
@@ -461,13 +513,19 @@
 		 char *out,
 		 unsigned out_max, unsigned *out_ulen)
 {
- char *canonuser = NULL;
+ const char *canonuser = NULL;
 
 if (ulen+1 > out_max) {
 	sasl_seterror(conn, 0, "buffer overflow while canonicalizing");
 	return SASL_BUFOVER;
 }
- memcpy(out, user, ulen);
+ if (out != user) {
+	/* There are some paths through libsasl which result in our
+	 * being called with parameters 'user' and 'out' being the
+	 * same buffer. We can handle that case just fine, but this
+	 * memcpy() is redundant and causes a warning in Valgrind. */
+	memcpy(out, user, ulen);
+ }
 outulen = '\0';
 
 canonuser = canonify_userid(out, NULL, (int*) context);
@@ -486,7 +544,7 @@
 return SASL_OK;
 }
 
-int is_userid_anonymous(const char *user) 
+EXPORTED int is_userid_anonymous(const char *user)
 {
 int len = strlen(user);
 const char *domain;
@@ -515,7 +573,7 @@
 static int acl_ok(const char *user, struct auth_state *authstate)
 {
 struct namespace namespace;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 char bufuserMAX_MAILBOX_BUFFER, inboxnameMAX_MAILBOX_BUFFER;
 int r;
 
@@ -524,7 +582,7 @@
 	syslog(LOG_ERR, "%s", error_message(r));
 	fatal(error_message(r), EC_CONFIG);
 }
- 
+
 strlcpy(bufuser, user, sizeof(bufuser));
 
 /* Translate any separators in userid */
@@ -541,14 +599,15 @@
 	r = 0; /* Failed so assume no proxy access */
 }
 else {
-	r = (cyrus_acl_myrights(authstate, mbentry.acl) & ACL_ADMIN) != 0;
+	r = (cyrus_acl_myrights(authstate, mbentry->acl) & ACL_ADMIN) != 0;
 }
+ mboxlist_entry_free(&mbentry);
 return r;
 }
 
 /* should we allow users to proxy? return SASL_OK if yes,
 SASL_BADAUTH otherwise */
-int mysasl_proxy_policy(sasl_conn_t *conn,
+EXPORTED int mysasl_proxy_policy(sasl_conn_t *conn,
 			void *context,
 			const char *requested_user, unsigned rlen,
 			const char *auth_identity, unsigned alen,
@@ -652,51 +711,28 @@
 return SASL_OK;
 }
 
-/* covert a time_t date to an IMAP-style date
- * datebuf needs to be >= 30 bytes */
-void cyrus_ctime(time_t date, char *datebuf) 
-{
- struct tm *tm = localtime(&date);
- long gmtoff = gmtoff_of(tm, date);
- int gmtnegative = 0;
- static const char *monthname = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-
- if (date == 0 || tm->tm_year < 69) {
-	abort();
- }
-
- if (gmtoff < 0) {
-	gmtoff = -gmtoff;
-	gmtnegative = 1;
- }
- gmtoff /= 60;
- sprintf(datebuf,
-	 "%2u-%s-%u %.2u:%.2u:%.2u %c%.2lu%.2lu",
-	 tm->tm_mday, monthnametm->tm_mon, tm->tm_year+1900,
-	 tm->tm_hour, tm->tm_min, tm->tm_sec,
-	 gmtnegative ? '-' : '+', gmtoff/60, gmtoff%60);
-}
 
 /* call before a cyrus application exits */
-void cyrus_done() 
+EXPORTED void cyrus_done(void)
 {
- if(cyrus_init_run != RUNNING) return;
+ if (cyrus_init_run != RUNNING)
+	return;
 cyrus_init_run = DONE;
- 
- if (!cyrus_init_nodb) libcyrus_done();
+
+ if (!cyrus_init_nodb)
+	libcyrus_done();
 }
 
 /*
 * Returns 1 if we have a shutdown file, with the first line in buf.
 * Otherwise returns 0, and the contents of buf is undefined.
 */
-int shutdown_file(char *buf, int size)
+EXPORTED int shutdown_file(char *buf, int size)
 {
 FILE *f;
 static char shutdownfilename1024 = "";
 char *p;
+ char tmpbuf1024;
 
 if (!shutdownfilename0)
 	snprintf(shutdownfilename, sizeof(shutdownfilename), 
@@ -705,6 +741,11 @@
 f = fopen(shutdownfilename, "r");
 if (!f) return 0;
 
+ if (!buf) {
+	buf = tmpbuf;
+	size = sizeof(tmpbuf);
+ }
+
 if (!fgets(buf, size, f)) {
 	*buf = '\0';
 
@@ -772,7 +813,7 @@
 * Optionally returns the total amount of available space on the server
 * (all partitions) in 1k blocks.
 */
-char *find_free_partition(unsigned long *tavail)
+HIDDEN char *find_free_partition(unsigned long *tavail)
 {
 static struct part_stats stats;
 
@@ -784,7 +825,7 @@
 }
 
 /* Set up the Session ID Buffer */
-void session_new_id()
+EXPORTED void session_new_id(void)
 {
 const char *base;
 int now = time(NULL);
@@ -800,7 +841,7 @@
 }
 
 /* Return the session id */
-const char *session_id()
+EXPORTED const char *session_id(void)
 {
 if (!session_id_count) 
 session_new_id();
@@ -808,7 +849,7 @@
 }
 
 /* parse sessionid out of protocol answers */
-void parse_sessionid(const char *str, char *sessionid)
+EXPORTED void parse_sessionid(const char *str, char *sessionid)
 {
 char *sp, *ep;
 int len;
@@ -830,9 +871,178 @@
 	strcpy(sessionid, "unknown");
 }
 
-int capa_is_disabled(const char *str)
+EXPORTED int capa_is_disabled(const char *str)
 {
 if (!suppressed_capabilities) return 0;
 
 return (strarray_find_case(suppressed_capabilities, str, 0) >= 0);
 }
+
+
+/* Find a message-id looking thingy in a string. Returns a pointer to the
+ * alloc'd id and the remaining string is returned in the **loc parameter.
+ *
+ * This is a poor-man's way of finding the message-id. We simply look for
+ * any string having the format "< ... @ ... >" and assume that the mail
+ * client created a properly formatted message-id.
+ */
+#define MSGID_SPECIALS "<> @\\"
+
+EXPORTED char *find_msgid(char *str, char **rem)
+{
+ char *msgid, *src, *dst, *cp;
+
+ if (!str) return NULL;
+
+ msgid = NULL;
+ src = str;
+
+ /* find the start of a msgid (don't go past the end of the header) */
+ while ((cp = src = strpbrk(src, "<\r")) != NULL) {
+
+	/* check for fold or end of header
+	 *
+	 * Per RFC 2822 section 2.2.3, a long header may be folded by
+	 * inserting CRLF before any WSP (SP and HTAB, per section 2.2.2).
+	 * Any other CRLF is the end of the header.
+	 */
+	if (*cp++ == '\r') {
+	 if (*cp++ == '\n' && !(*cp == ' ' || *cp == '\t')) {
+		/* end of header, we're done */
+		break;
+	 }
+
+	 /* skip fold (or junk) */
+	 src++;
+	 continue;
+	}
+
+	/* see if we have (and skip) a quoted localpart */
+	if (*cp == '\"') {
+	 /* find the endquote, making sure it isn't escaped */
+	 do {
+		++cp; cp = strchr(cp, '\"');
+	 } while (cp && *(cp-1) == '\\');
+
+	 /* no endquote, so bail */
+	 if (!cp) {
+		src++;
+		continue;
+	 }
+	}
+
+	/* find the end of the msgid */
+	if ((cp = strchr(cp, '>')) == NULL)
+	 return NULL;
+
+	/* alloc space for the msgid */
+	dst = msgid = (char*) xrealloc(msgid, cp - src + 2);
+
+	*dst++ = *src++;
+
+	/* quoted string */
+	if (*src == '\"') {
+	 src++;
+	 while (*src != '\"') {
+		if (*src == '\\') {
+		 src++;
+		}
+		*dst++ = *src++;
+	 }
+	 src++;
+	}
+	/* atom */
+	else {
+	 while (!strchr(MSGID_SPECIALS, *src))
+		*dst++ = *src++;
+	}
+
+	if (*src != '@' || *(dst-1) == '<') continue;
+	*dst++ = *src++;
+
+	/* domain atom */
+	while (!strchr(MSGID_SPECIALS, *src))
+	 *dst++ = *src++;
+
+	if (*src != '>' || *(dst-1) == '@') continue;
+	*dst++ = *src++;
+	*dst = '\0';
+
+	if (rem) *rem = src;
+	return msgid;
+ }
+
+ if (msgid) free(msgid);
+ return NULL;
+}
+
+/*
+ * Get name of client host on socket 's'.
+ * Also returns local IP port and remote IP port on inet connections.
+ */
+EXPORTED const char *get_clienthost(int s, const char **localip, const char **remoteip)
+{
+#define IPBUF_SIZE (NI_MAXHOST+NI_MAXSERV+2)
+ socklen_t salen;
+ struct sockaddr_storage localaddr, remoteaddr;
+ struct sockaddr *localsock = (struct sockaddr *)&localaddr;
+ struct sockaddr *remotesock = (struct sockaddr *)&remoteaddr;
+ static struct buf clientbuf = BUF_INITIALIZER;
+ static char lipbufIPBUF_SIZE, ripbufIPBUF_SIZE;
+ char hbufNI_MAXHOST;
+ int niflags;
+
+ buf_reset(&clientbuf);
+ *localip = *remoteip = NULL;
+
+ /* determine who we're talking to */
+
+ salen = sizeof(struct sockaddr_storage);
+ if (getpeername(s, remotesock, &salen) == 0 &&
+	(remotesock->sa_family == AF_INET ||
+	 remotesock->sa_family == AF_INET6)) {
+	/* connected to an internet socket */
+	if (getnameinfo(remotesock, salen,
+			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
+	 buf_printf(&clientbuf, "%s ", hbuf);
+	}
+
+	niflags = NI_NUMERICHOST;
+#ifdef NI_WITHSCOPEID
+	if (remotesock->sa_family == AF_INET6)
+	 niflags |= NI_WITHSCOPEID;
+#endif
+	if (getnameinfo(remotesock, salen,
+			hbuf, sizeof(hbuf), NULL, 0, niflags) != 0) {
+	 strlcpy(hbuf, "unknown", sizeof(hbuf));
+	}
+	buf_printf(&clientbuf, "%s", hbuf);
+
+	salen = sizeof(struct sockaddr_storage);
+	if (getsockname(s, localsock, &salen) == 0) {
+	 /* set the ip addresses here */
+	 if (iptostring(localsock, salen,
+			 lipbuf, sizeof(lipbuf)) == 0) {
+		*localip = lipbuf;
+ }
+ if (iptostring(remotesock, salen,
+			 ripbuf, sizeof(ripbuf)) == 0) {
+		*remoteip = ripbuf;
+ }
+	} else {
+	 fatal("can't get local addr", EC_SOFTWARE);
+	}
+ } else {
+	/* we're not connected to a internet socket! */
+	buf_setcstr(&clientbuf, UNIX_SOCKET);
+ }
+
+ return buf_cstring(&clientbuf);
+}
+
+EXPORTED int cmd_cancelled()
+{
+ if (signals_cancelled())
+	return IMAP_CANCELLED;
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/global.h -> cyrus-imapd-2.5.tar.gz/imap/global.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: global.h,v 1.16 2010/06/28 12:03:42 brong Exp $
 */
 
 #ifndef INCLUDED_GLOBAL_H
@@ -51,13 +49,18 @@
 #include "prot.h"
 #include "mboxname.h"
 #include "signals.h"
+#include "imapparse.h"
 #include "util.h"
 
 #define MAX_SESSIONID_SIZE 256
 
+/* This is a string because we only ever use it as a string */
+#define SPHINX_MAX_MATCHES	 "1000000"
+
 /* Flags for cyrus_init() */
 enum {
- CYRUSINIT_NODB =	(1<<0)
+ CYRUSINIT_NODB =	(1<<0),
+ CYRUSINIT_PERROR =	(1<<1)
 };
 
 /* Startup the configuration subsystem */
@@ -65,12 +68,12 @@
 * for any libimap/libcyrus process, and should be called fairly early
 * (and needs an associated cyrus_done call) */
 extern int cyrus_init(const char *alt_config, const char *ident,
-		 unsigned flags);
+		 unsigned flags, int config_need_data);
 extern void global_sasl_init(int client, int server,
 			 const sasl_callback_t *callbacks);
 
 /* Shutdown a cyrus process */
-extern void cyrus_done();
+extern void cyrus_done(void);
 
 /* sasl configuration */
 extern int mysasl_config(void *context,
@@ -83,7 +86,8 @@
 typedef int (mysasl_cb_ft)(void);
 
 /* user canonification */
-extern char *canonify_userid(char *user, char *loginid, int *domain_from_ip);
+extern const char *canonify_userid(char *user, const char *loginid,
+				 int *domain_from_ip);
 
 extern int is_userid_anonymous(const char *user);
 
@@ -118,57 +122,41 @@
 int *userisproxyadmin;
 };
 
-/* imap parsing functions (imapparse.c) */
-int getword(struct protstream *in, struct buf *buf);
-
-/* IMAP_BIN_ASTRING is an IMAP_ASTRING that does not perform the
- * does-not-contain-a-NULL check (in the case of a literal) */
-enum string_types { IMAP_ASTRING,
-		 IMAP_BIN_ASTRING,
-		 IMAP_NSTRING,
-		 IMAP_QSTRING,
-		 IMAP_STRING };
-
-int getxstring(struct protstream *pin, struct protstream *pout,
-	 struct buf *buf, int type);
-#define getastring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_ASTRING)
-#define getbastring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_BIN_ASTRING)
-#define getnstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_NSTRING)
-#define getqstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_QSTRING)
-#define getstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_STRING)
-int getint32(struct protstream *pin, int *num);
-int getuint32(struct protstream *pin, unsigned int *num);
-
-void eatline(struct protstream *pin, int c);
-
 /* Misc utils */
-extern void cyrus_ctime(time_t date, char *datebuf);
 extern int shutdown_file(char *buf, int size);
 extern char *find_free_partition(unsigned long *tavail);
+extern char *find_msgid(char *, char **);
+#define UNIX_SOCKET "unix socket"
+extern const char *get_clienthost(int s,
+				 const char **localip, const char **remoteip);
 
 /* Misc globals */
 extern int in_shutdown;
 extern int config_fulldirhash;
 extern int config_implicitrights;
 extern unsigned long config_metapartition_files;
-extern struct cyrusdb_backend *config_mboxlist_db;
-extern struct cyrusdb_backend *config_quota_db;
-extern struct cyrusdb_backend *config_subscription_db;
-extern struct cyrusdb_backend *config_annotation_db;
-extern struct cyrusdb_backend *config_seenstate_db;
-extern struct cyrusdb_backend *config_mboxkey_db;
-extern struct cyrusdb_backend *config_duplicate_db;
-extern struct cyrusdb_backend *config_tlscache_db;
-extern struct cyrusdb_backend *config_ptscache_db;
-extern struct cyrusdb_backend *config_statuscache_db;
-extern struct cyrusdb_backend *config_userdeny_db;
+extern const char *config_mboxlist_db;
+extern const char *config_quota_db;
+extern const char *config_subscription_db;
+extern const char *config_annotation_db;
+extern const char *config_seenstate_db;
+extern const char *config_mboxkey_db;
+extern const char *config_duplicate_db;
+extern const char *config_tlscache_db;
+extern const char *config_ptscache_db;
+extern const char *config_statuscache_db;
+extern const char *config_userdeny_db;
+extern const char *config_conversations_db;
+extern int charset_flags;
 
 /* Session ID */
-extern void session_new_id();
-extern const char *session_id();
+extern void session_new_id(void);
+extern const char *session_id(void);
 extern void parse_sessionid(const char *str, char *sessionid);
 
 /* Capability suppression */
 extern int capa_is_disabled(const char *str);
 
+extern int cmd_cancelled();
+
 #endif /* INCLUDED_GLOBAL_H */

cyrus-imapd-2.5.tar.gz/imap/hammer_cyrusdb.c Added

@@ -0,0 +1,203 @@
+/* hammer_cyrusdb.c - tool to harass a cyrusdb file
+ * 
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any other legal
+ * details, please contact 
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * $Id: hammer_cyrusdb.c,v 1.4 2007/09/28 02:27:46 murch Exp $
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <syslog.h>
+
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#include "acl.h"
+#include "assert.h"
+#include "auth.h"
+#include "cyrusdb.h"
+#include "exitcodes.h"
+#include "glob.h"
+#include "imap_err.h"
+#include "global.h"
+#include "mailbox.h"
+#include "util.h"
+#include "xmalloc.h"
+
+const int config_need_data = 0;
+struct cyrusdb_backend *OLDDB = NULL;
+
+void hammer(struct db *db)
+{
+ int c;
+ for (c = 0;c < 10000; c++) { /* should be enough! */
+ struct txn *tid = NULL;
+ struct txn **tp;
+ char key100;
+ char value100;
+ int klen, vlen, i, r = 0;
+ int rop;
+
+ /* protect against silly things */
+
+ tp = (rand() % 2) ? &tid : NULL;
+ klen = 1 + (rand() % 6);
+ for (i = 0; i < klen; i++) {
+ keyi = 'A' + (rand() % 26);
+ }
+ keyklen = '\0';
+ vlen = rand() % 20;
+ for (i = 0; i < vlen; i++) {
+ valuei = 'a' + (rand() % 26);
+ }
+ valuevlen = '\0';
+ rop = rand() % 1000;
+ if (rop >= 999) {
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ /* forget to commit */
+ }
+ else if (rop >= 800) {
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ if (!r) r = cyrusdb_delete(db, key, klen, tp, 0);
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ if (!r && tp) cyrusdb_commit(db, *tp);
+ }
+ else if (rop >= 700) {
+ if (!r) r = cyrusdb_delete(db, key, klen, tp, 0);
+ if (!r && tp) cyrusdb_commit(db, *tp);
+ }
+ else if (rop >= 600) { /* will fail */
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ }
+ else if (rop > 200) {
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'a';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'b';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'd';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'c';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ if (!r && tp) cyrusdb_commit(db, *tp);
+ }
+ else {
+ if (!r) r = cyrusdb_store(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'a';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'b';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'd';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ keyklen-1 = 'c';
+ if (!r) r = cyrusdb_create(db, key, klen, value, vlen, tp);
+ if (!r && tp) cyrusdb_abort(db, *tp);
+ }
+
+ }
+
+
+}
+
+int main(int argc, char *argv)
+{
+ struct db *db;
+ const char *dbfile;
+ const char *dbtype = "twoskip";
+ int opt, r;
+ char *alt_config = NULL;
+ int db_flags = 0;
+
+ while ((opt = getopt(argc, argv, "C:n")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+	case 'n': /* create new */
+	 db_flags |= CYRUSDB_CREATE;
+	 break;
+	}
+ }
+	
+ if((argc - optind) < 1) {
+	fprintf(stderr, "Usage: %s -C altconfig <dbfile> <dbtype>\n", argv0);
+
+	exit(-1);
+ }
+
+ dbfile = argvoptind;
+
+ if((argc - optind) > 1)
+	dbtype = argvoptind+1;
+
+ if (dbfile0 != '/') {
+	printf("\nSorry, you cannot use this tool with relative path names.\n"
+	 "This is because some database backends (mainly berkeley) do not\n"
+	 "always do what you would expect with them.\n"
+	 "\nPlease use absolute pathnames instead.\n\n");
+	exit(EC_OSERR);
+ }
+
+ cyrus_init(alt_config, "hammer_cyrusdb", 0, 0);
+
+ r = cyrusdb_open(dbtype, dbfile, db_flags, &db);
+ if (r) fatal("can't open database", EC_TEMPFAIL);
+
+ hammer(db);
+ 
+ cyrus_done();
+
+ return 0;
+}
+

cyrus-imapd-2.5.tar.gz/imap/http_caldav.c Added

@@ -0,0 +1,5245 @@
+/* http_caldav.c -- Routines for handling CalDAV collections in httpd
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * TODO:
+ *
+ * - Make proxying more robust. Currently depends on calendar collections
+ * residing on same server as user's INBOX. Doesn't handle global/shared
+ * calendars.
+ * - Support COPY/MOVE on collections
+ * - Add more required properties
+ * - GET/HEAD on collections (iCalendar stream of resources)
+ * - calendar-query REPORT (handle partial retrieval, prop-filter, timezone?)
+ * - free-busy-query REPORT (check ACL and transp on all calendars)
+ * - sync-collection REPORT - need to handle Depth infinity?
+ */
+
+#include <config.h>
+
+#include <syslog.h>
+
+#include <libical/ical.h>
+#include <libxml/tree.h>
+#include <libxml/uri.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "acl.h"
+#include "append.h"
+#include "caldav_db.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "hash.h"
+#include "httpd.h"
+#include "http_caldav_sched.h"
+#include "http_dav.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "imap_err.h"
+#include "index.h"
+#include "jcal.h"
+#include "xcal.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "message.h"
+#include "message_guid.h"
+#include "proxy.h"
+#include "times.h"
+#include "smtpclient.h"
+#include "spool.h"
+#include "strhash.h"
+#include "stristr.h"
+#include "tok.h"
+#include "util.h"
+#include "version.h"
+#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+
+#define NEW_STAG (1<<8) /* Make sure we skip over PREFER bits */
+
+struct busytime {
+ struct icalperiodtype *busy;
+ unsigned len;
+ unsigned alloc;
+};
+
+struct calquery_filter {
+ unsigned comp;
+ struct icaltimetype start;
+ struct icaltimetype end;
+ unsigned check_transp;
+ unsigned save_busytime;
+ struct busytime busytime; 	/* array of found busytime periods */
+};
+
+static struct caldav_db *auth_caldavdb = NULL;
+static time_t compile_time;
+
+static void my_caldav_init(struct buf *serverinfo);
+static void my_caldav_auth(const char *userid);
+static void my_caldav_reset(void);
+static void my_caldav_shutdown(void);
+
+static int caldav_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr);
+
+static int caldav_check_precond(struct transaction_t *txn, const void *data,
+				const char *etag, time_t lastmod);
+
+static int caldav_acl(struct transaction_t *txn, xmlNodePtr priv, int *rights);
+static int caldav_copy(struct transaction_t *txn,
+		 struct mailbox *src_mbox, struct index_record *src_rec,
+		 struct mailbox *dest_mbox, const char *dest_rsrc,
+		 unsigned overwrite, unsigned flags);
+static int caldav_delete_sched(struct transaction_t *txn,
+			 struct mailbox *mailbox,
+			 struct index_record *record, void *data);
+static int meth_get(struct transaction_t *txn, void *params);
+static int caldav_post(struct transaction_t *txn);
+static int caldav_put(struct transaction_t *txn,
+		 struct mime_type_t *mime,
+		 struct mailbox *mailbox, unsigned flags);
+
+static int propfind_getcontenttype(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx, xmlNodePtr resp,
+				 struct propstat propstat, void *rock);
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_caldata(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_calcompset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int proppatch_calcompset(xmlNodePtr prop, unsigned set,
+				struct proppatch_ctx *pctx,
+				struct propstat propstat, void *rock);
+static int propfind_suppcaldata(const xmlChar *name, xmlNsPtr ns,
+				struct propfind_ctx *fctx, xmlNodePtr resp,
+				struct propstat propstat, void *rock);
+static int propfind_schedtag(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_caltransp(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int proppatch_caltransp(xmlNodePtr prop, unsigned set,
+			 struct proppatch_ctx *pctx,
+			 struct propstat propstat, void *rock);
+static int proppatch_timezone(xmlNodePtr prop, unsigned set,
+			 struct proppatch_ctx *pctx,
+			 struct propstat propstat, void *rock);
+
+static int report_cal_query(struct transaction_t *txn, xmlNodePtr inroot,
+			 struct propfind_ctx *fctx);
+static int report_cal_multiget(struct transaction_t *txn, xmlNodePtr inroot,
+			 struct propfind_ctx *fctx);
+static int report_fb_query(struct transaction_t *txn, xmlNodePtr inroot,
+			 struct propfind_ctx *fctx);
+
+static int store_resource(struct transaction_t *txn, icalcomponent *ical,
+			 struct mailbox *mailbox, const char *resource,
+			 struct caldav_db *caldavdb, int overwrite,
+			 unsigned flags);
+
+static void sched_request(const char *organizer, struct sched_param *sparam,
+			 icalcomponent *oldical, icalcomponent *newical,
+			 const char *att_update);
+static void sched_reply(const char *userid,
+			icalcomponent *oldical, icalcomponent *newical);
+
+static const char *begin_icalendar(struct buf *buf);
+static void end_icalendar(struct buf *buf);
+
+static struct mime_type_t caldav_mime_types = {
+ /* First item MUST be the default type and storage format */
+ { "text/calendar; charset=utf-8", "2.0", "ics", "ifb",
+ (const char* (*)(void *)) &icalcomponent_as_ical_string,
+ (void * (*)(const char*)) &icalparser_parse_string,
+ &begin_icalendar, &end_icalendar
+ },
+ { "application/calendar+xml; charset=utf-8", NULL, "xcs", "xfb",
+ (const char* (*)(void *)) &icalcomponent_as_xcal_string,
+ (void * (*)(const char*)) &xcal_string_as_icalcomponent,
+ &begin_xcal, &end_xcal
+ },
+#ifdef WITH_JSON
+ { "application/calendar+json; charset=utf-8", NULL, "jcs", "jfb",
+ (const char* (*)(void *)) &icalcomponent_as_jcal_string,
+ (void * (*)(const char*)) &jcal_string_as_icalcomponent,
+ &begin_jcal, &end_jcal
+ },
+#endif
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+/* Array of known "live" properties */
+static const struct prop_entry caldav_props = {
+
+ /* WebDAV (RFC 4918) properties */
+ { "creationdate", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_creationdate, NULL, NULL },
+ { "displayname", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_fromdb, proppatch_todb, NULL },
+ { "getcontentlanguage", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_fromhdr, NULL, "Content-Language" },
+ { "getcontentlength", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getlength, NULL, NULL },
+ { "getcontenttype", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getcontenttype, NULL, "Content-Type" },
+ { "getetag", NS_DAV, PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getetag, NULL, NULL },
+ { "getlastmodified", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getlastmod, NULL, NULL },
+ { "lockdiscovery", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_lockdisc, NULL, NULL },
+ { "resourcetype", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_restype, proppatch_restype, "calendar" },
+ { "supportedlock", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_suplock, NULL, NULL },
+
+ /* WebDAV Versioning (RFC 3253) properties */
+ { "supported-report-set", NS_DAV, PROP_COLLECTION,
+ propfind_reportset, NULL, NULL },
+
+ /* WebDAV ACL (RFC 3744) properties */
+ { "owner", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_owner, NULL, NULL },
+ { "group", NS_DAV, 0, NULL, NULL, NULL },
+ { "supported-privilege-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_supprivset, NULL, NULL },
+ { "current-user-privilege-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_curprivset, NULL, NULL },
+ { "acl", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_acl, NULL, NULL },
+ { "acl-restrictions", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_aclrestrict, NULL, NULL },
+ { "inherited-acl-set", NS_DAV, 0, NULL, NULL, NULL },
+ { "principal-collection-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_princolset, NULL, NULL },
+
+ /* WebDAV Quota (RFC 4331) properties */
+ { "quota-available-bytes", NS_DAV, PROP_COLLECTION,
+ propfind_quota, NULL, NULL },
+ { "quota-used-bytes", NS_DAV, PROP_COLLECTION,
+ propfind_quota, NULL, NULL },
+
+ /* WebDAV Current Principal (RFC 5397) properties */
+ { "current-user-principal", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_curprin, NULL, NULL },
+
+ /* WebDAV POST (RFC 5995) properties */
+ { "add-member", NS_DAV, PROP_COLLECTION,
+ propfind_addmember, NULL, NULL },
+
+ /* WebDAV Sync (RFC 6578) properties */
+ { "sync-token", NS_DAV, PROP_COLLECTION,
+ propfind_sync_token, NULL, NULL },
+
+ /* CalDAV (RFC 4791) properties */
+ { "calendar-data", NS_CALDAV,
+ PROP_RESOURCE | PROP_PRESCREEN | PROP_NEEDPROP,
+ propfind_caldata, NULL, NULL },
+ { "calendar-description", NS_CALDAV, PROP_COLLECTION,
+ propfind_fromdb, proppatch_todb, NULL },
+ { "calendar-timezone", NS_CALDAV, PROP_COLLECTION,
+ propfind_fromdb, proppatch_timezone, NULL },
+ { "supported-calendar-component-set", NS_CALDAV, PROP_COLLECTION,
+ propfind_calcompset, proppatch_calcompset, NULL },
+ { "supported-calendar-data", NS_CALDAV, PROP_COLLECTION,
+ propfind_suppcaldata, NULL, NULL },
+ { "max-resource-size", NS_CALDAV, 0, NULL, NULL, NULL },
+ { "min-date-time", NS_CALDAV, 0, NULL, NULL, NULL },
+ { "max-date-time", NS_CALDAV, 0, NULL, NULL, NULL },
+ { "max-instances", NS_CALDAV, 0, NULL, NULL, NULL },
+ { "max-attendees-per-instance", NS_CALDAV, 0, NULL, NULL, NULL },
+
+ /* CalDAV Scheduling (RFC 6638) properties */
+ { "schedule-tag", NS_CALDAV, PROP_RESOURCE,
+ propfind_schedtag, NULL, NULL },
+ { "schedule-default-calendar-URL", NS_CALDAV, PROP_COLLECTION,
+ propfind_calurl, NULL, SCHED_DEFAULT },
+ { "schedule-calendar-transp", NS_CALDAV, PROP_COLLECTION,
+ propfind_caltransp, proppatch_caltransp, NULL },
+
+ /* Apple Calendar Server properties */
+ { "getctag", NS_CS, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_sync_token, NULL, NULL },
+
+ { NULL, 0, 0, NULL, NULL, NULL }
+};
+
+
+static struct meth_params caldav_params = {
+ caldav_mime_types,
+ &caldav_parse_path,
+ &caldav_check_precond,
+ { (void **) &auth_caldavdb,
+ (db_lookup_proc_t) &caldav_lookup_resource,
+ (db_foreach_proc_t) &caldav_foreach,
+ (db_write_proc_t) &caldav_write,
+ (db_delete_proc_t) &caldav_delete,
+ (db_delmbox_proc_t) &caldav_delmbox },
+ &caldav_acl,
+ &caldav_copy,
+ &caldav_delete_sched,
+ { MBTYPE_CALENDAR, "mkcalendar", "mkcalendar-response", NS_CALDAV },
+ &caldav_post,
+ { CALDAV_SUPP_DATA, &caldav_put },
+ caldav_props,
+ { { "calendar-query", &report_cal_query, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS },
+ { "calendar-multiget", &report_cal_multiget, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS },
+ { "free-busy-query", &report_fb_query, DACL_READFB,
+	REPORT_NEED_MBOX },
+ { "sync-collection", &report_sync_col, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS | REPORT_NEED_PROPS },
+ { NULL, NULL, 0, 0 } }
+};
+
+
+/* Namespace for CalDAV collections */
+struct namespace_t namespace_calendar = {
+ URL_NS_CALENDAR, 0, "/dav/calendars", "/.well-known/caldav", 1 /* auth */,
+ (ALLOW_READ | ALLOW_POST | ALLOW_WRITE | ALLOW_DELETE |
+ ALLOW_DAV | ALLOW_WRITECOL | ALLOW_CAL ),
+ &my_caldav_init, &my_caldav_auth, my_caldav_reset, &my_caldav_shutdown,
+ { 
+	{ &meth_acl,		&caldav_params },	/* ACL		*/
+	{ &meth_copy,		&caldav_params },	/* COPY		*/
+	{ &meth_delete,		&caldav_params },	/* DELETE	*/
+	{ &meth_get,		&caldav_params },	/* GET		*/
+	{ &meth_get,		&caldav_params },	/* HEAD		*/
+	{ &meth_lock,		&caldav_params },	/* LOCK		*/
+	{ &meth_mkcol,		&caldav_params },	/* MKCALENDAR	*/
+	{ &meth_mkcol,		&caldav_params },	/* MKCOL	*/
+	{ &meth_copy,		&caldav_params },	/* MOVE		*/
+	{ &meth_options,	&caldav_parse_path },	/* OPTIONS	*/
+	{ &meth_post,		&caldav_params },	/* POST		*/
+	{ &meth_propfind,	&caldav_params },	/* PROPFIND	*/
+	{ &meth_proppatch,	&caldav_params },	/* PROPPATCH	*/
+	{ &meth_put,		&caldav_params },	/* PUT		*/
+	{ &meth_report,		&caldav_params },	/* REPORT	*/
+	{ &meth_trace,		&caldav_parse_path },	/* TRACE	*/
+	{ &meth_unlock,		&caldav_params } 	/* UNLOCK	*/
+ }
+};
+
+
+static void my_caldav_init(struct buf *serverinfo)
+{
+ namespace_calendar.enabled =
+	config_httpmodules & IMAP_ENUM_HTTPMODULES_CALDAV;
+
+ if (!namespace_calendar.enabled) return;
+
+ if (!config_getstring(IMAPOPT_CALENDARPREFIX)) {
+	fatal("Required 'calendarprefix' option is not set", EC_CONFIG);
+ }
+
+ caldav_init();
+
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	buf_printf(serverinfo, " libical/%s", ICAL_VERSION);
+#ifdef WITH_JSON
+	buf_printf(serverinfo, " Jansson/%s", JANSSON_VERSION);
+#endif
+ }
+
+ if (config_getswitch(IMAPOPT_CALDAV_ALLOWSCHEDULING)) {
+	namespace_calendar.allow |= ALLOW_CAL_SCHED;
+
+	/* Need to set this to parse CalDAV Scheduling parameters */
+	ical_set_unknown_token_handling_setting(ICAL_ASSUME_IANA_TOKEN);
+ }
+
+ compile_time = calc_compile_time(__TIME__, __DATE__);
+}
+
+
+static void my_caldav_auth(const char *userid)
+{
+ const char *mailboxname;
+ int r;
+
+ if (httpd_userisadmin ||
+	global_authisa(httpd_authstate, IMAPOPT_PROXYSERVERS)) {
+	/* admin or proxy from frontend - won't have DAV database */
+	return;
+ }
+ else if (config_mupdate_server && !config_getstring(IMAPOPT_PROXYSERVERS)) {
+	/* proxy-only server - won't have DAV database */
+ }
+ else {
+	/* Open CalDAV DB for 'userid' */
+	my_caldav_reset();
+	auth_caldavdb = caldav_open(userid, CALDAV_CREATE);
+	if (!auth_caldavdb) fatal("Unable to open CalDAV DB", EC_IOERR);
+ }
+
+ /* Auto-provision calendars for 'userid' */
+
+ /* calendar-home-set */
+ mailboxname = caldav_mboxname(userid, NULL);
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	if (config_mupdate_server) {
+	 /* Find location of INBOX */
+	 const char *inboxname = mboxname_user_mbox(userid, NULL);
+	 mbentry_t *mbentry = NULL;
+
+	 r = http_mlookup(inboxname, &mbentry, NULL);
+	 if (!r && mbentry->server) {
+		proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+		mboxlist_entry_free(&mbentry);
+		return;
+	 }
+	 mboxlist_entry_free(&mbentry);
+	}
+
+	/* will have been overwritten */
+	mailboxname = caldav_mboxname(userid, NULL);
+
+	/* Create locally */
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_CALENDAR,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+
+ /* Default calendar */
+ mailboxname = caldav_mboxname(userid, SCHED_DEFAULT);
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_CALENDAR,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+
+ /* Scheduling Inbox */
+ mailboxname = caldav_mboxname(userid, SCHED_INBOX);
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_CALENDAR,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+
+ /* Scheduling Outbox */
+ mailboxname = caldav_mboxname(userid, SCHED_OUTBOX);
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_CALENDAR,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+}
+
+
+static void my_caldav_reset(void)
+{
+ if (auth_caldavdb) caldav_close(auth_caldavdb);
+ auth_caldavdb = NULL;
+}
+
+
+static void my_caldav_shutdown(void)
+{
+ caldav_done();
+}
+
+
+/* Parse request-target path in CalDAV namespace */
+static int caldav_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr)
+{
+ char *p;
+ size_t len;
+ struct mboxname_parts parts;
+ struct buf boxbuf = BUF_INITIALIZER;
+
+ /* Make a working copy of target path */
+ strlcpy(tgt->path, path, sizeof(tgt->path));
+ tgt->tail = tgt->path + strlen(tgt->path);
+
+ p = tgt->path;
+
+ /* Sanity check namespace */
+ len = strlen(namespace_calendar.prefix);
+ if (strlen(p) < len ||
+	strncmp(namespace_calendar.prefix, p, len) ||
+	(pathlen && pathlen != '/')) {
+	*errstr = "Namespace mismatch request target path";
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Default to bare-bones Allow bits for toplevel collections */
+ tgt->allow &= ~(ALLOW_POST|ALLOW_WRITE|ALLOW_DELETE);
+
+ /* Skip namespace */
+ p += len;
+ if (!*p || !*++p) return 0;
+
+ /* Check if we're in user space */
+ len = strcspn(p, "/");
+ if (!strncmp(p, "user", len)) {
+	p += len;
+	if (!*p || !*++p) return 0;
+
+	/* Get user id */
+	len = strcspn(p, "/");
+	tgt->user = p;
+	tgt->userlen = len;
+
+	p += len;
+	if (!*p || !*++p) {
+	 /* Make sure calendar-home-set is terminated with '/' */
+	 if (p-1 != '/') *p++ = '/';
+	 goto done;
+	}
+
+	len = strcspn(p, "/");
+ }
+
+ /* Get collection */
+ tgt->collection = p;
+ tgt->collen = len;
+
+ p += len;
+ if (!*p || !*++p) {
+	/* Make sure collection is terminated with '/' */
+	if (p-1 != '/') *p++ = '/';
+	goto done;
+ }
+
+ /* Get resource */
+ len = strcspn(p, "/");
+ tgt->resource = p;
+ tgt->reslen = len;
+
+ p += len;
+
+ if (*p) {
+//	*errstr = "Too many segments in request target path";
+	return HTTP_NOT_FOUND;
+ }
+
+ done:
+ /* Set proper Allow bits and flags based on path components */
+ if (tgt->collection) {
+	if (tgt->resource) {
+	 tgt->allow &= ~ALLOW_WRITECOL;
+	 tgt->allow |= (ALLOW_WRITE|ALLOW_DELETE);
+	}
+	else if (!strcmp(tgt->collection, SCHED_INBOX))
+	 tgt->flags = TGT_SCHED_INBOX;
+	else if (!strcmp(tgt->collection, SCHED_OUTBOX)) {
+	 tgt->flags = TGT_SCHED_OUTBOX;
+	 tgt->allow |= ALLOW_POST;
+	}
+	else if (!strcmp(tgt->collection, SCHED_DEFAULT))
+	 tgt->allow |= ALLOW_POST;
+	else
+	 tgt->allow |= (ALLOW_POST|ALLOW_DELETE);
+ }
+ else if (tgt->user) tgt->allow |= ALLOW_DELETE;
+
+ /* Create mailbox name from the parsed path */
+
+ mboxname_init_parts(&parts);
+
+ if (tgt->user && tgt->userlen) {
+	/* holy "avoid copying" batman */
+	char *userid = xstrndup(tgt->user, tgt->userlen);
+	mboxname_userid_to_parts(userid, &parts);
+	free(userid);
+ }
+
+ buf_setcstr(&boxbuf, config_getstring(IMAPOPT_CALENDARPREFIX));
+ if (tgt->collen) {
+	buf_putc(&boxbuf, '.');
+	buf_appendmap(&boxbuf, tgt->collection, tgt->collen);
+ }
+ parts.box = buf_release(&boxbuf);
+
+ /* XXX - hack to allow @domain parts for non-domain-split users */
+ if (httpd_userid && !httpd_userisadmin) {
+	struct mboxname_parts userparts;
+	mboxname_init_parts(&userparts);
+	mboxname_userid_to_parts(httpd_userid, &userparts);
+	if (!parts.domain) {
+	 /* super XXX hack for FastMail magic */
+	 return HTTP_NOT_FOUND;
+	}
+	if (parts.domain && !userparts.domain) {
+	 //free(parts.domain); - XXX - fix when converting to real parts
+	 parts.domain = NULL;
+	}
+	mboxname_free_parts(&userparts);
+ }
+
+ mboxname_parts_to_internal(&parts, tgt->mboxname);
+
+ mboxname_free_parts(&parts);
+
+ return 0;
+}
+
+
+/* Check headers for any preconditions */
+static int caldav_check_precond(struct transaction_t *txn, const void *data,
+				const char *etag, time_t lastmod)
+{
+ const struct caldav_data *cdata = (const struct caldav_data *) data;
+ const char *stag = cdata ? cdata->sched_tag : NULL;
+ const char **hdr;
+ int precond;
+
+ /* Do normal WebDAV/HTTP checks (primarily for lock-token via If header) */
+ precond = check_precond(txn, data, etag, lastmod);
+ if (!(precond == HTTP_OK || precond == HTTP_PARTIAL)) return precond;
+
+ /* Per RFC 6638, check Schedule-Tag */
+ if ((hdr = spool_getheader(txn->req_hdrs, "If-Schedule-Tag-Match"))) {
+	if (etagcmp(hdr0, stag)) return HTTP_PRECOND_FAILED;
+ }
+
+ if (txn->meth == METH_GET || txn->meth == METH_HEAD) {
+	/* Fill in Schedule-Tag for successful GET/HEAD */
+	txn->resp_body.stag = stag;
+ }
+
+ return precond;
+}
+
+
+static int caldav_acl(struct transaction_t *txn, xmlNodePtr priv, int *rights)
+{
+ if (!xmlStrcmp(priv->ns->href, BAD_CAST XML_NS_CALDAV)) {
+	/* CalDAV privileges */
+	switch (txn->req_tgt.flags) {
+	case TGT_SCHED_INBOX:
+	 if (!xmlStrcmp(priv->name, BAD_CAST "schedule-deliver"))
+		*rights |= DACL_SCHED;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-deliver-invite"))
+		*rights |= DACL_INVITE;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-deliver-reply"))
+		*rights |= DACL_REPLY;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-query-freebusy"))
+		*rights |= DACL_SCHEDFB;
+	 else {
+		/* DAV:not-supported-privilege */
+		txn->error.precond = DAV_SUPP_PRIV;
+	 }
+	 break;
+	case TGT_SCHED_OUTBOX:
+	 if (!xmlStrcmp(priv->name, BAD_CAST "schedule-send"))
+		*rights |= DACL_SCHED;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-send-invite"))
+		*rights |= DACL_INVITE;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-send-reply"))
+		*rights |= DACL_REPLY;
+	 else if (!xmlStrcmp(priv->name, BAD_CAST "schedule-send-freebusy"))
+		*rights |= DACL_SCHEDFB;
+	 else {
+		/* DAV:not-supported-privilege */
+		txn->error.precond = DAV_SUPP_PRIV;
+	 }
+	 break;
+	default:
+	 if (xmlStrcmp(priv->name, BAD_CAST "read-free-busy"))
+		*rights |= DACL_READFB;
+	 else {
+		/* DAV:not-supported-privilege */
+		txn->error.precond = DAV_SUPP_PRIV;
+	 }
+	 break;
+	}
+
+	/* Done processing this priv */
+	return 1;
+ }
+ else if (!xmlStrcmp(priv->ns->href, BAD_CAST XML_NS_DAV)) {
+	/* WebDAV privileges */
+	if (!xmlStrcmp(priv->name, BAD_CAST "all")) {
+	 switch (txn->req_tgt.flags) {
+	 case TGT_SCHED_INBOX:
+		/* DAV:all aggregates CALDAV:schedule-deliver */
+		*rights |= DACL_SCHED;
+		break;
+	 case TGT_SCHED_OUTBOX:
+		/* DAV:all aggregates CALDAV:schedule-send */
+		*rights |= DACL_SCHED;
+		break;
+	 default:
+		/* DAV:all aggregates CALDAV:read-free-busy */
+		*rights |= DACL_READFB;
+		break;
+	 }
+	}
+	else if (!xmlStrcmp(priv->name, BAD_CAST "read")) {
+	 switch (txn->req_tgt.flags) {
+	 case TGT_SCHED_INBOX:
+	 case TGT_SCHED_OUTBOX:
+		break;
+	 default:
+		/* DAV:read aggregates CALDAV:read-free-busy */
+		*rights |= DACL_READFB;
+		break;
+	 }
+	}
+ }
+
+ /* Process this priv in meth_acl() */
+ return 0;
+}
+
+
+/* Perform a COPY/MOVE request
+ *
+ * preconditions:
+ * CALDAV:supported-calendar-data
+ * CALDAV:valid-calendar-data
+ * CALDAV:valid-calendar-object-resource
+ * CALDAV:supported-calendar-component
+ * CALDAV:no-uid-conflict (DAV:href)
+ * CALDAV:calendar-collection-location-ok
+ * CALDAV:max-resource-size
+ * CALDAV:min-date-time
+ * CALDAV:max-date-time
+ * CALDAV:max-instances
+ * CALDAV:max-attendees-per-instance
+ */
+static int caldav_copy(struct transaction_t *txn,
+		 struct mailbox *src_mbox, struct index_record *src_rec,
+		 struct mailbox *dest_mbox, const char *dest_rsrc,
+		 unsigned overwrite, unsigned flags)
+{
+ int r;
+
+ const char *organizer = NULL;
+ struct buf msg_buf = BUF_INITIALIZER;
+ icalcomponent *ical, *comp;
+ icalproperty *prop;
+
+ /* Load message containing the resource and parse iCal data */
+ r = mailbox_map_record(src_mbox, src_rec, &msg_buf);
+ if (r) return r;
+ ical = icalparser_parse_string(buf_base(&msg_buf) + src_rec->header_size);
+ buf_free(&msg_buf);
+
+ if (!ical) {
+	txn->error.precond = CALDAV_VALID_DATA;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Finished our initial read of source mailbox */
+ mailbox_unlock_index(src_mbox, NULL);
+
+ if (namespace_calendar.allow & ALLOW_CAL_SCHED) {
+	comp = icalcomponent_get_first_real_component(ical);
+	prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+	if (prop) organizer = icalproperty_get_organizer(prop);
+	if (organizer) flags |= NEW_STAG;
+ }
+
+ /* Store source resource at destination */
+ r = store_resource(txn, ical, dest_mbox, dest_rsrc, auth_caldavdb,
+		 overwrite, flags);
+
+ icalcomponent_free(ical);
+
+ return r;
+}
+
+
+/* Perform scheduling actions for a DELETE request */
+static int caldav_delete_sched(struct transaction_t *txn,
+			 struct mailbox *mailbox,
+			 struct index_record *record, void *data)
+{
+ struct caldav_data *cdata = (struct caldav_data *) data;
+ int r = 0;
+
+ if (!(namespace_calendar.allow & ALLOW_CAL_SCHED)) return 0;
+
+ if (!mailbox) {
+	/* XXX DELETE collection - check all resources for sched objects */
+ }
+ else if (cdata->sched_tag) {
+	/* Scheduling object resource */
+	const char *userid, *organizer, **hdr;
+	struct buf msg_buf = BUF_INITIALIZER;
+	icalcomponent *ical, *comp;
+	icalproperty *prop;
+	struct sched_param sparam;
+
+	/* Load message containing the resource and parse iCal data */
+	r = mailbox_map_record(mailbox, record, &msg_buf);
+	if (r) return r;
+	ical = icalparser_parse_string(buf_base(&msg_buf) + record->header_size);
+	buf_free(&msg_buf);
+
+	if (!ical) {
+	 syslog(LOG_ERR,
+		 "meth_delete: failed to parse iCalendar object %s:%u",
+		 txn->req_tgt.mboxname, record->uid);
+	 return HTTP_SERVER_ERROR;
+	}
+
+	/* Construct userid corresponding to mailbox */
+	userid = mboxname_to_userid(txn->req_tgt.mboxname);
+
+	/* Grab the organizer */
+	comp = icalcomponent_get_first_real_component(ical);
+	prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+	organizer = icalproperty_get_organizer(prop);
+
+	if (caladdress_lookup(organizer, &sparam)) {
+	 syslog(LOG_ERR,
+		 "meth_delete: failed to process scheduling message in %s"
+		 " (org=%s, att=%s)",
+		 txn->req_tgt.mboxname, organizer, userid);
+	 txn->error.desc = "Failed to lookup organizer address\r\n";
+	 r = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	if (!strcmp(sparam.userid, userid)) {
+	 /* Organizer scheduling object resource */
+	 sched_request(organizer, &sparam, ical, NULL, 0);
+	}
+	else if (!(hdr = spool_getheader(txn->req_hdrs, "Schedule-Reply")) ||
+		 strcmp(hdr0, "F")) {
+	 /* Attendee scheduling object resource */
+	 sched_reply(userid, ical, NULL);
+	}
+
+ done:
+	icalcomponent_free(ical);
+ }
+
+ return r;
+}
+
+static const char *begin_icalendar(struct buf *buf)
+{
+ /* Begin iCalendar stream */
+ buf_setcstr(buf, "BEGIN:VCALENDAR\r\n");
+ buf_printf(buf, "PRODID:-//CyrusIMAP.org/Cyrus %s//EN\r\n",
+	 cyrus_version());
+ buf_appendcstr(buf, "VERSION:2.0\r\n");
+
+ return "";
+}
+
+static void end_icalendar(struct buf *buf)
+{
+ /* End iCalendar stream */
+ buf_setcstr(buf, "END:VCALENDAR\r\n");
+}
+
+static int dump_calendar(struct transaction_t *txn, struct meth_params *gparams)
+{
+ int ret = 0, r, precond;
+ struct resp_body_t *resp_body = &txn->resp_body;
+ struct buf *buf = &resp_body->payload;
+ struct mailbox *mailbox = NULL;
+ static char etag33;
+ uint32_t recno;
+ struct index_record record;
+ struct hash_table tzid_table;
+ static const char *displayname_annot =
+	ANNOT_NS "<" XML_NS_DAV ">displayname";
+ struct buf attrib = BUF_INITIALIZER;
+ const char **hdr, *sep;
+ struct mime_type_t *mime = NULL;
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Check any preconditions */
+ sprintf(etag, "%u-%u-%u",
+	 mailbox->i.uidvalidity, mailbox->i.last_uid, mailbox->i.exists);
+ precond = gparams->check_precond(txn, NULL, etag, mailbox->index_mtime);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, Expires, and Cache-Control */
+	txn->resp_body.etag = etag;
+	txn->resp_body.lastmod = mailbox->index_mtime;
+	txn->resp_body.maxage = 3600; /* 1 hr */
+	txn->flags.cc |= CC_MAXAGE | CC_REVALIDATE; /* don't use stale data */
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ /* Check requested MIME type */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Accept"))) {
+	struct accept *e, *enc = parse_accept(hdr);
+
+	for (e = enc; e && e->token; e++) {
+	 struct mime_type_t *m;
+
+	 for (m = caldav_mime_types; !mime && m->content_type; m++) {
+		if (is_mediatype(e->token, m->content_type)) mime = m;
+	 }
+
+	 free(e->token);
+	}
+	if (enc) free(enc);
+ }
+ if (!mime) mime = caldav_mime_types; /* 1st in array MUST default type */
+
+ /* Setup for chunked response */
+ txn->flags.te |= TE_CHUNKED;
+ txn->flags.vary |= VARY_ACCEPT;
+ txn->resp_body.type = mime->content_type;
+
+ /* Set filename of resource */
+ r = annotatemore_lookup(mailbox->name, displayname_annot, /* shared */ NULL, &attrib);
+ if (r || !attrib.len) buf_setcstr(&attrib, strrchr(mailbox->name, '.') + 1);
+
+ buf_reset(&txn->buf);
+ buf_printf(&txn->buf, "%s.%s", buf_cstring(&attrib), mime->file_ext);
+ txn->resp_body.fname = buf_cstring(&txn->buf);
+
+ /* Short-circuit for HEAD request */
+ if (txn->meth == METH_HEAD) {
+	response_header(HTTP_OK, txn);
+	return 0;
+ }
+
+ /* iCalendar data in response should not be transformed */
+ txn->flags.cc |= CC_NOTRANSFORM;
+
+ /* Create hash table for TZIDs */
+ construct_hash_table(&tzid_table, 10, 1);
+
+ /* Begin (converted) iCalendar stream */
+ sep = mime->begin_stream(buf);
+ write_body(HTTP_OK, txn, buf_cstring(buf), buf_len(buf));
+
+ for (r = 0, recno = 1; recno <= mailbox->i.num_records; recno++) {
+	struct buf msg_buf = BUF_INITIALIZER;
+	icalcomponent *ical;
+
+	if (mailbox_read_index_record(mailbox, recno, &record)) continue;
+
+	if (record.system_flags & (FLAG_EXPUNGED | FLAG_DELETED)) continue;
+
+	/* Map and parse existing iCalendar resource */
+	if (mailbox_map_record(mailbox, &record, &msg_buf)) continue;
+	ical = icalparser_parse_string(buf_base(&msg_buf) + record.header_size);
+	buf_free(&msg_buf);
+
+	if (ical) {
+	 icalcomponent *comp;
+
+	 for (comp = icalcomponent_get_first_component(ical,
+							 ICAL_ANY_COMPONENT);
+		 comp;
+		 comp = icalcomponent_get_next_component(ical,
+							 ICAL_ANY_COMPONENT)) {
+		const char *cal_str;
+		icalcomponent_kind kind = icalcomponent_isa(comp);
+
+		/* Don't duplicate any TZIDs in our iCalendar */
+		if (kind == ICAL_VTIMEZONE_COMPONENT) {
+		 icalproperty *prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_TZID_PROPERTY);
+		 const char *tzid = icalproperty_get_tzid(prop);
+
+		 if (hash_lookup(tzid, &tzid_table)) continue;
+		 else hash_insert(tzid, (void *)0xDEADBEEF, &tzid_table);
+		}
+
+		/* Include this component in our iCalendar */
+		if (r++ && *sep) {
+		 /* Add separator, if necessary */
+		 buf_reset(buf);
+		 buf_printf_markup(buf, 0, sep);
+		 write_body(0, txn, buf_cstring(buf), buf_len(buf));
+		}
+		cal_str = mime->to_string(comp);
+		write_body(0, txn, cal_str, strlen(cal_str));
+	 }
+
+	 icalcomponent_free(ical);
+	}
+ }
+
+ free_hash_table(&tzid_table, NULL);
+
+ /* End (converted) iCalendar stream */
+ mime->end_stream(buf);
+ write_body(0, txn, buf_cstring(buf), buf_len(buf));
+
+ /* End of output */
+ write_body(0, txn, NULL, 0);
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+ buf_free(&attrib);
+
+ return ret;
+}
+
+
+/*
+ * mboxlist_findall() callback function to list calendars
+ */
+static int list_cb(char *name,
+		 int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock)
+{
+ struct transaction_t *txn = (struct transaction_t *) rock;
+ struct buf *body = &txn->resp_body.payload;
+ struct buf *url = &txn->buf;
+ static size_t inboxlen = 0;
+ static size_t outboxlen = 0;
+ char *shortname;
+ mbentry_t *mbentry = NULL;
+ size_t len;
+ int r;
+ static const char *displayname_annot =
+	ANNOT_NS "<" XML_NS_DAV ">displayname";
+ struct buf displayname = BUF_INITIALIZER;
+
+ if (!inboxlen) inboxlen = strlen(SCHED_INBOX) - 1;
+ if (!outboxlen) outboxlen = strlen(SCHED_OUTBOX) - 1;
+
+ shortname = strrchr(name, '.') + 1;
+ len = strlen(shortname);
+
+ /* Don't list scheduling Inbox/Outbox */
+ if ((len == inboxlen && !strncmp(shortname, SCHED_INBOX, inboxlen)) ||
+	(len == outboxlen && !strncmp(shortname, SCHED_OUTBOX, outboxlen)))
+	goto done;
+
+ /* Don't list deleted mailboxes */
+ if (mboxname_isdeletedmailbox(name, 0)) goto done;
+
+ /* Lookup the mailbox and make sure its readable */
+ r = http_mlookup(name, &mbentry, NULL);
+ if (r || !mbentry->acl || !(cyrus_acl_myrights(httpd_authstate, mbentry->acl) & ACL_READ))
+	goto done;
+
+ /* Send a body chunk once in a while */
+ if (buf_len(body) > PROT_BUFSIZE) {
+	write_body(0, txn, buf_cstring(body), buf_len(body));
+	buf_reset(body);
+ }
+
+ /* Lookup DAV:displayname */
+ r = annotatemore_lookup(name, displayname_annot,
+			 /* shared */ NULL, &displayname);
+ if (r || !displayname.len) buf_setcstr(&displayname, shortname);
+
+ /* Add available calendar with link */
+ len = buf_len(url);
+ buf_printf_markup(body, 3, "<li><a href=\"%s%s\">%s</a></li>",
+		 buf_cstring(url), shortname, buf_cstring(&displayname));
+
+done:
+ buf_free(&displayname);
+ mboxlist_entry_free(&mbentry);
+
+ return 0;
+}
+
+
+/* Create a HTML document listing all calendars available to the user */
+static int list_calendars(struct transaction_t *txn,
+			 struct meth_params *gparams)
+{
+ int ret = 0, precond;
+ time_t lastmod = compile_time;
+ char mboxlistMAX_MAILBOX_PATH+1;
+ struct stat sbuf;
+ static char etag63;
+ unsigned level = 0;
+ struct buf *body = &txn->resp_body.payload;
+ const char *host = NULL;
+
+ /* stat() mailboxes.db for Last-Modified and ETag */
+ snprintf(mboxlist, MAX_MAILBOX_PATH, "%s%s", config_dir, FNAME_MBOXLIST);
+ stat(mboxlist, &sbuf);
+ lastmod = MAX(compile_time, sbuf.st_mtime);
+ sprintf(etag, "%ld-%ld-%ld", compile_time, sbuf.st_mtime, sbuf.st_size);
+
+ /* Check any preconditions */
+ precond = gparams->check_precond(txn, NULL, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, and Expires */
+	txn->resp_body.etag = etag;
+	txn->resp_body.lastmod = lastmod;
+	txn->resp_body.maxage = 86400; /* 24 hrs */
+	txn->flags.cc |= CC_MAXAGE;
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ /* Setup for chunked response */
+ txn->flags.te |= TE_CHUNKED;
+ txn->resp_body.type = "text/html; charset=utf-8";
+
+ /* Short-circuit for HEAD request */
+ if (txn->meth == METH_HEAD) {
+	response_header(HTTP_OK, txn);
+	goto done;
+ }
+
+ /* Send HTML header */
+ buf_reset(body);
+ buf_printf_markup(body, level, HTML_DOCTYPE);
+ buf_printf_markup(body, level++, "<html>");
+ buf_printf_markup(body, level++, "<head>");
+ buf_printf_markup(body, level, "<title>%s</title>", "Available Calendars");
+ buf_printf_markup(body, --level, "</head>");
+ buf_printf_markup(body, level++, "<body>");
+ buf_printf_markup(body, level, "<h2>%s</h2>", "Available Calendars");
+ buf_printf_markup(body, level++, "<ul>");
+ write_body(HTTP_OK, txn, buf_cstring(body), buf_len(body));
+ buf_reset(body);
+
+ /* Create base URL for calendars */
+ http_proto_host(txn->req_hdrs, NULL, &host);
+ assert(!buf_len(&txn->buf));
+ buf_printf(&txn->buf, "webcal://%s%s", host, txn->req_tgt.path);
+
+ /* Generate list of calendars */
+ strlcat(txn->req_tgt.mboxname, ".%", sizeof(txn->req_tgt.mboxname));
+
+ mboxlist_findall(NULL, txn->req_tgt.mboxname, 1, httpd_userid,
+		 httpd_authstate, list_cb, txn);
+
+ if (buf_len(body)) write_body(0, txn, buf_cstring(body), buf_len(body));
+
+ /* Finish HTML */
+ buf_reset(body);
+ buf_printf_markup(body, --level, "</ul>");
+ buf_printf_markup(body, --level, "</body>");
+ buf_printf_markup(body, --level, "</html>");
+ write_body(0, txn, buf_cstring(body), buf_len(body));
+
+ /* End of output */
+ write_body(0, txn, NULL, 0);
+
+ done:
+ return ret;
+}
+
+
+/* Perform a GET/HEAD request on a CalDAV resource */
+static int meth_get(struct transaction_t *txn, void *params)
+{
+ struct meth_params *gparams = (struct meth_params *) params;
+ int r, rights;
+ mbentry_t *mbentry = NULL;
+
+ /* Parse the path */
+ if ((r = gparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* GET an individual resource */
+ if (txn->req_tgt.resource) return meth_get_dav(txn, gparams);
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if ((rights & DACL_READ) != DACL_READ) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights = DACL_READ;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ /* Get an entire calendar collection */ 
+ if (txn->req_tgt.collection) return dump_calendar(txn, gparams);
+
+ /* GET a list of calendars under calendar-home-set */
+ else return list_calendars(txn, gparams);
+}
+
+
+/* Perform a busy time request, if necessary */
+static int caldav_post(struct transaction_t *txn)
+{
+ int ret = 0, r, rights;
+ char orgidMAX_MAILBOX_NAME+1 = "";
+ mbentry_t *mbentry = NULL;
+ const char **hdr;
+ struct mime_type_t *mime = NULL;
+ icalcomponent *ical = NULL, *comp;
+ icalcomponent_kind kind = 0;
+ icalproperty_method meth = 0;
+ icalproperty *prop = NULL;
+ const char *uid = NULL, *organizer = NULL;
+ struct sched_param sparam;
+
+ if (!(namespace_calendar.allow & ALLOW_CAL_SCHED) || !txn->req_tgt.flags) {
+	/* POST to regular calendar collection */
+	return HTTP_CONTINUE;
+ }
+ else if (txn->req_tgt.flags == TGT_SCHED_INBOX) {
+	/* Don't allow POST to schedule-inbox */
+	return HTTP_NOT_ALLOWED;
+ }
+
+ /* POST to schedule-outbox */
+
+ /* Check Content-Type */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Content-Type"))) {
+	for (mime = caldav_mime_types; mime->content_type; mime++) {
+	 if (is_mediatype(hdr0, mime->content_type)) break;
+	}
+ }
+ if (!mime || !mime->content_type) {
+	txn->error.precond = CALDAV_SUPP_DATA;
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Get rights for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ mboxlist_entry_free(&mbentry);
+
+ /* Read body */
+ txn->req_body.flags |= BODY_DECODE;
+ r = read_body(httpd_in, txn->req_hdrs, &txn->req_body, &txn->error.desc);
+ if (r) {
+	txn->flags.conn = CONN_CLOSE;
+	return r;
+ }
+
+ /* Make sure we have a body */
+ if (!buf_len(&txn->req_body.payload)) {
+	txn->error.desc = "Missing request body\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Parse the iCal data for important properties */
+ ical = mime->from_string(buf_cstring(&txn->req_body.payload));
+ if (!ical || !icalrestriction_check(ical)) {
+	txn->error.precond = CALDAV_VALID_DATA;
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ meth = icalcomponent_get_method(ical);
+ comp = icalcomponent_get_first_real_component(ical);
+ if (comp) {
+	uid = icalcomponent_get_uid(comp);
+	kind = icalcomponent_isa(comp);
+	prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ }
+
+ /* Check method preconditions */
+ if (!meth || !uid || !prop) {
+	txn->error.precond = CALDAV_VALID_SCHED;
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ /* Organizer MUST be local to use CalDAV Scheduling */
+ organizer = icalproperty_get_organizer(prop);
+ if (organizer) {
+	if (!caladdress_lookup(organizer, &sparam) &&
+	 !(sparam.flags & SCHEDTYPE_REMOTE)) {
+	 strlcpy(orgid, sparam.userid, sizeof(orgid));
+	 mboxname_hiersep_toexternal(&httpd_namespace, orgid, 0);
+	}
+ }
+
+ if (strncmp(orgid, txn->req_tgt.user, txn->req_tgt.userlen)) {
+	txn->error.precond = CALDAV_VALID_ORGANIZER;
+	ret = HTTP_FORBIDDEN;
+	goto done;
+ }
+
+ switch (kind) {
+ case ICAL_VFREEBUSY_COMPONENT:
+	if (meth == ICAL_METHOD_REQUEST)
+	 if (!(rights & DACL_SCHEDFB)) {
+		/* DAV:need-privileges */
+		txn->error.precond = DAV_NEED_PRIVS;
+		txn->error.resource = txn->req_tgt.path;
+		txn->error.rights = DACL_SCHEDFB;
+		ret = HTTP_FORBIDDEN;
+	 }
+	 else ret = sched_busytime_query(txn, mime, ical);
+	else {
+	 txn->error.precond = CALDAV_VALID_SCHED;
+	 ret = HTTP_BAD_REQUEST;
+	}
+	break;
+
+ default:
+	txn->error.precond = CALDAV_VALID_SCHED;
+	ret = HTTP_BAD_REQUEST;
+ }
+
+ done:
+ if (ical) icalcomponent_free(ical);
+
+ return ret;
+}
+
+
+static const char *get_icalrestriction_errstr(icalcomponent *ical)
+{
+ icalcomponent *comp;
+
+ for (comp = icalcomponent_get_first_component(ical, ICAL_ANY_COMPONENT);
+	 comp;
+	 comp = icalcomponent_get_next_component(ical, ICAL_ANY_COMPONENT)) {
+	icalproperty *prop =
+	 icalcomponent_get_first_property(comp, ICAL_XLICERROR_PROPERTY);
+	if (prop) return icalproperty_get_xlicerror(prop);
+ }
+
+ return NULL;
+}
+
+
+/* Perform a PUT request
+ *
+ * preconditions:
+ * CALDAV:valid-calendar-data
+ * CALDAV:valid-calendar-object-resource
+ * CALDAV:supported-calendar-component
+ * CALDAV:no-uid-conflict (DAV:href)
+ * CALDAV:max-resource-size
+ * CALDAV:min-date-time
+ * CALDAV:max-date-time
+ * CALDAV:max-instances
+ * CALDAV:max-attendees-per-instance
+ */
+static int caldav_put(struct transaction_t *txn,
+		 struct mime_type_t *mime,
+		 struct mailbox *mailbox, unsigned flags)
+{
+ int ret;
+ icalcomponent *ical = NULL, *comp, *nextcomp;
+ icalcomponent_kind kind;
+ icalproperty *prop;
+ const char *uid, *organizer = NULL;
+
+ /* Parse and validate the iCal data */
+ ical = mime->from_string(buf_cstring(&txn->req_body.payload));
+ if (!ical || (icalcomponent_isa(ical) != ICAL_VCALENDAR_COMPONENT)) {
+	txn->error.precond = CALDAV_VALID_DATA;
+	ret = HTTP_FORBIDDEN;
+	goto done;
+ }
+ else if (!icalrestriction_check(ical)) {
+	txn->error.precond = CALDAV_VALID_OBJECT;
+	if ((txn->error.desc = get_icalrestriction_errstr(ical))) {
+	 assert(!buf_len(&txn->buf));
+	 buf_setcstr(&txn->buf, txn->error.desc);
+	 txn->error.desc = buf_cstring(&txn->buf);
+	}
+	ret = HTTP_FORBIDDEN;
+	goto done;
+ }
+
+ /* Make sure iCal UIDs and ORGANIZERs in all components are the same */
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+ uid = icalcomponent_get_uid(comp);
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ if (prop) organizer = icalproperty_get_organizer(prop);
+ while ((nextcomp =
+	 icalcomponent_get_next_component(ical, kind))) {
+	const char *nextuid = icalcomponent_get_uid(nextcomp);
+
+	if (!nextuid || strcmp(uid, nextuid)) {
+	 txn->error.precond = CALDAV_VALID_OBJECT;
+	 ret = HTTP_FORBIDDEN;
+	 goto done;
+	}
+
+	if (organizer) {
+	 const char *nextorg = NULL;
+
+	 prop = icalcomponent_get_first_property(nextcomp,
+						 ICAL_ORGANIZER_PROPERTY);
+	 if (prop) nextorg = icalproperty_get_organizer(prop);
+	 if (!nextorg || strcmp(organizer, nextorg)) {
+		txn->error.precond = CALDAV_SAME_ORGANIZER;
+		ret = HTTP_FORBIDDEN;
+		goto done;
+	 }
+	}
+ }
+
+ if ((namespace_calendar.allow & ALLOW_CAL_SCHED) && organizer) {
+	/* Scheduling object resource */
+	const char *userid;
+	struct caldav_data *cdata;
+	struct sched_param sparam;
+	icalcomponent *oldical = NULL;
+
+	/* Construct userid corresponding to mailbox */
+	userid = mboxname_to_userid(txn->req_tgt.mboxname);
+
+	/* Make sure iCal UID is unique for this user */
+	caldav_lookup_uid(auth_caldavdb, uid, 0, &cdata);
+	/* XXX Check errors */
+
+	if (cdata->dav.mailbox &&
+	 (strcmp(cdata->dav.mailbox, txn->req_tgt.mboxname) ||
+	 strcmp(cdata->dav.resource, txn->req_tgt.resource))) {
+	 /* CALDAV:unique-scheduling-object-resource */
+	 char ext_useridMAX_MAILBOX_NAME+1;
+
+	 strlcpy(ext_userid, userid, sizeof(ext_userid));
+	 mboxname_hiersep_toexternal(&httpd_namespace, ext_userid, 0);
+
+	 txn->error.precond = CALDAV_UNIQUE_OBJECT;
+	 assert(!buf_len(&txn->buf));
+	 buf_printf(&txn->buf, "%s/user/%s/%s/%s",
+		 namespace_calendar.prefix,
+		 ext_userid, strrchr(cdata->dav.mailbox, '.')+1,
+		 cdata->dav.resource);
+	 txn->error.resource = buf_cstring(&txn->buf);
+	 ret = HTTP_FORBIDDEN;
+	 goto done;
+	}
+
+	/* Lookup the organizer */
+	if (caladdress_lookup(organizer, &sparam)) {
+	 syslog(LOG_ERR,
+		 "meth_delete: failed to process scheduling message in %s"
+		 " (org=%s, att=%s)",
+		 txn->req_tgt.mboxname, organizer, userid);
+	 txn->error.desc = "Failed to lookup organizer address\r\n";
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	if (cdata->dav.imap_uid) {
+	 /* Update existing object */
+	 struct index_record record;
+	 struct buf msg_buf = BUF_INITIALIZER;
+	 int r;
+
+	 /* Load message containing the resource and parse iCal data */
+	 r = mailbox_find_index_record(mailbox, cdata->dav.imap_uid, &record, NULL);
+	 if (!r) r = mailbox_map_record(mailbox, &record, &msg_buf);
+	 if (r) {
+		txn->error.desc = "Failed to read record \r\n";
+		ret = HTTP_SERVER_ERROR;
+		goto done;
+	 }
+	 oldical = icalparser_parse_string(buf_base(&msg_buf) + record.header_size);
+	 buf_free(&msg_buf);
+	}
+
+	if (!strcmp(sparam.userid, userid)) {
+	 /* Organizer scheduling object resource */
+	 sched_request(organizer, &sparam, oldical, ical, 0);
+	}
+	else {
+	 /* Attendee scheduling object resource */
+	 sched_reply(userid, oldical, ical);
+	}
+
+	if (oldical) icalcomponent_free(oldical);
+
+	flags |= NEW_STAG;
+ }
+
+ /* Store resource at target */
+ ret = store_resource(txn, ical, mailbox, txn->req_tgt.resource,
+			 auth_caldavdb, OVERWRITE_CHECK, flags);
+
+ if (flags & PREFER_REP) {
+	struct resp_body_t *resp_body = &txn->resp_body;
+	const char *data;
+
+	switch (ret) {
+	case HTTP_NO_CONTENT:
+	 ret = HTTP_OK;
+
+	case HTTP_CREATED:
+	 /* Convert into requested MIME type */
+	 data = mime->to_string(ical);
+
+	 /* Fill in Content-Type, Content-Length */
+	 resp_body->type = mime->content_type;
+	 resp_body->len = strlen(data);
+
+	 /* Fill in Content-Location */
+	 resp_body->loc = txn->req_tgt.path;
+
+	 /* Fill in Expires and Cache-Control */
+	 resp_body->maxage = 3600;	/* 1 hr */
+	 txn->flags.cc = CC_MAXAGE
+		| CC_REVALIDATE		/* don't use stale data */
+		| CC_NOTRANSFORM;	/* don't alter iCal data */
+
+	 /* Output current representation */
+	 write_body(ret, txn, data, resp_body->len);
+	 ret = 0;
+	 break;
+
+	default:
+	 /* failure - do nothing */
+	 break;
+	}
+ }
+
+ done:
+ if (ical) icalcomponent_free(ical);
+
+ return ret;
+}
+
+
+/* Append a new busytime period to the busytime array */
+static void add_busytime(icalcomponent *comp, struct icaltime_span *span,
+			 void *rock)
+{
+ struct busytime *busytime = (struct busytime *) rock;
+ int is_date = icaltime_is_date(icalcomponent_get_dtstart(comp));
+ icaltimezone *utc = icaltimezone_get_utc_timezone();
+ struct icalperiodtype *newp;
+
+ /* Grow the array, if necessary */
+ if (busytime->len == busytime->alloc) {
+	busytime->alloc += 100; /* XXX arbitrary */
+	busytime->busy = xrealloc(busytime->busy,
+				 busytime->alloc *
+				 sizeof(struct icalperiodtype));
+ }
+
+ /* Add new busytime */
+ newp = &busytime->busybusytime->len++;
+ newp->start = icaltime_from_timet_with_zone(span->start, is_date, utc);
+ newp->end = icaltime_from_timet_with_zone(span->end, is_date, utc);
+ newp->duration = icaldurationtype_null_duration();
+}
+
+
+/* See if the current resource matches the specified filter
+ * (comp-type and/or time-range). Returns 1 if match, 0 otherwise.
+ */
+static int apply_calfilter(struct propfind_ctx *fctx, void *data)
+{
+ struct calquery_filter *calfilter =
+	(struct calquery_filter *) fctx->filter_crit;
+ struct caldav_data *cdata = (struct caldav_data *) data;
+ int match = 1;
+
+ if (calfilter->comp) {
+	/* Perform CALDAV:comp-filter filtering */
+	if (!(cdata->comp_type & calfilter->comp)) return 0;
+ }
+
+ if (!icaltime_is_null_time(calfilter->start)) {
+	/* Perform CALDAV:time-range filtering */
+	struct icaltimetype dtstart = icaltime_from_string(cdata->dtstart);
+	struct icaltimetype dtend = icaltime_from_string(cdata->dtend);
+
+	if (icaltime_compare(dtend, calfilter->start) <= 0) {
+	 /* Component is earlier than range */
+	 return 0;
+	}
+	else if (icaltime_compare(dtstart, calfilter->end) >= 0) {
+	 /* Component is later than range */
+	 return 0;
+	}
+	else if (!cdata->recurring && !calfilter->save_busytime) {
+	 /* Component is within range, non-recurring,
+	 and we don't need to save busytime */
+	 return 1;
+	}
+	else {
+	 /* Component is within range and recurring.
+	 * Need to mmap() and parse iCalendar object
+	 * to perform complete check of each recurrence.
+	 */
+	 struct busytime *busytime = &calfilter->busytime;
+	 icalcomponent *ical, *comp;
+	 icalcomponent_kind kind;
+	 icaltimezone *utc = icaltimezone_get_utc_timezone();
+	 icaltime_span rangespan;
+	 unsigned firstr, lastr;
+
+	 /* XXX - error */
+	 if (mailbox_map_record(fctx->mailbox, fctx->record, &fctx->msg_buf))
+		return 0;
+
+	 ical = icalparser_parse_string(buf_base(&fctx->msg_buf) +
+					 fctx->record->header_size);
+
+	 comp = icalcomponent_get_first_real_component(ical);
+	 kind = icalcomponent_isa(comp);
+
+	 /* XXX This code assumes that the first VEVENT will contain
+	 * the recurrence rule and the subsequent VEVENTs will
+	 * be the overrides. Technically this doesn't have to be
+	 * the case, but it appears to be true in practice.
+	 */
+
+	 /* Create a span for the given time-range */
+	 rangespan.start =
+		icaltime_as_timet_with_zone(calfilter->start, utc);
+	 rangespan.end =
+		icaltime_as_timet_with_zone(calfilter->end, utc);
+
+	 /* Mark start of where recurrences will be added */
+	 firstr = busytime->len;
+
+	 /* Add all recurring busytime in specified time-range */
+	 icalcomponent_foreach_recurrence(comp,
+					 calfilter->start, calfilter->end,
+					 add_busytime, busytime);
+
+	 /* Mark end of where recurrences were added */
+	 lastr = busytime->len;
+
+	 /* XXX Should we sort busytime array, so we can use bsearch()? */
+
+	 /* Handle overridden recurrences */
+	 while ((comp = icalcomponent_get_next_component(ical, kind))) {
+		icalproperty *prop;
+		struct icaltimetype recurid;
+		icalparameter *param;
+		icaltime_span recurspan;
+		unsigned n;
+
+		/* The *_get_recurrenceid() functions don't appear
+		 to deal with timezones properly, so we do it ourselves */
+		prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+		recurid = icalproperty_get_recurrenceid(prop);
+		param =
+		 icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
+
+		if (param) {
+		 const char *tzid = icalparameter_get_tzid(param);
+		 icaltimezone *tz = NULL;
+
+		 tz = icalcomponent_get_timezone(ical, tzid);
+		 if (!tz) {
+			tz = icaltimezone_get_builtin_timezone_from_tzid(tzid);
+		 }
+		 if (tz) icaltime_set_timezone(&recurid, tz);
+		}
+
+		recurid =
+		 icaltime_convert_to_zone(recurid,
+					 icaltimezone_get_utc_timezone());
+
+		/* Check if this overridden instance is in our array */
+		/* XXX Should we replace this linear search with bsearch() */
+		for (n = firstr; n < lastr; n++) {
+		 if (!icaltime_compare(recurid,
+					 busytime->busyn.start)) {
+			/* Remove the instance
+			 by sliding all future instances into its place */
+			/* XXX Doesn't handle the RANGE=THISANDFUTURE param */
+			busytime->len--;
+			memmove(&busytime->busyn, &busytime->busyn+1,
+				sizeof(struct icalperiodtype) *
+				(busytime->len - n));
+			lastr--;
+
+			break;
+		 }
+		}
+
+		/* Check if the new instance is in our time-range */
+		recurspan = icaltime_span_new(icalcomponent_get_dtstart(comp),
+					 icalcomponent_get_dtend(comp), 1);
+
+		if (icaltime_span_overlaps(&recurspan, &rangespan)) {
+		 /* Add this instance to the array */
+		 add_busytime(comp, &recurspan, busytime);
+		}
+	 }
+
+	 if (lastr == firstr) match = 0;
+
+	 if (!calfilter->save_busytime) busytime->len = 0;
+
+	 icalcomponent_free(ical);
+	}
+ }
+
+ return match;
+}
+
+
+static int is_valid_timerange(const struct icaltimetype start,
+			 const struct icaltimetype end)
+{
+ return (icaltime_is_valid_time(start) && icaltime_is_valid_time(end) &&
+	 !icaltime_is_date(start) && !icaltime_is_date(end) &&
+	 (icaltime_is_utc(start) || start.zone) &&
+	 (icaltime_is_utc(end) || end.zone));
+}
+
+
+static int parse_comp_filter(xmlNodePtr root, struct calquery_filter *filter,
+			 struct error_t *error)
+{
+ int ret = 0;
+ xmlNodePtr node;
+
+ /* Parse elements of filter */
+ for (node = root; node; node = node->next) {
+	if (node->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(node->name, BAD_CAST "comp-filter")) {
+		xmlChar *name = xmlGetProp(node, BAD_CAST "name");
+
+		if (!filter->comp) {
+		 if (!xmlStrcmp(name, BAD_CAST "VCALENDAR"))
+			filter->comp = CAL_COMP_VCALENDAR;
+		 else {
+			error->precond = CALDAV_VALID_FILTER;
+			ret = HTTP_FORBIDDEN;
+		 }
+		}
+		else if (filter->comp == CAL_COMP_VCALENDAR) {
+		 if (!xmlStrcmp(name, BAD_CAST "VCALENDAR") ||
+			!xmlStrcmp(name, BAD_CAST "VALARM")) {
+			error->precond = CALDAV_VALID_FILTER;
+			ret = HTTP_FORBIDDEN;
+		 }
+		 else if (!xmlStrcmp(name, BAD_CAST "VEVENT"))
+			filter->comp |= CAL_COMP_VEVENT;
+		 else if (!xmlStrcmp(name, BAD_CAST "VTODO"))
+			filter->comp |= CAL_COMP_VTODO;
+		 else if (!xmlStrcmp(name, BAD_CAST "VJOURNAL"))
+			filter->comp |= CAL_COMP_VJOURNAL;
+		 else if (!xmlStrcmp(name, BAD_CAST "VFREEBUSY"))
+			filter->comp |= CAL_COMP_VFREEBUSY;
+		 else if (!xmlStrcmp(name, BAD_CAST "VTIMEZONE"))
+			filter->comp |= CAL_COMP_VTIMEZONE;
+		 else {
+			error->precond = CALDAV_SUPP_FILTER;
+			ret = HTTP_FORBIDDEN;
+		 }
+		}
+		else if (filter->comp & (CAL_COMP_VEVENT | CAL_COMP_VTODO)) {
+		 if (!xmlStrcmp(name, BAD_CAST "VALARM"))
+			filter->comp |= CAL_COMP_VALARM;
+		 else {
+			error->precond = CALDAV_VALID_FILTER;
+			ret = HTTP_FORBIDDEN;
+		 }
+		}
+		else {
+		 error->precond = CALDAV_SUPP_FILTER;
+		 ret = HTTP_FORBIDDEN;
+		}
+
+		xmlFree(name);
+
+		if (!ret)
+		 ret = parse_comp_filter(node->children, filter, error);
+		if (ret) return ret;
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "time-range")) {
+		icaltimezone *utc = icaltimezone_get_utc_timezone();
+		xmlChar *start, *end;
+
+		if (!(filter->comp & (CAL_COMP_VEVENT | CAL_COMP_VTODO))) {
+		 error->precond = CALDAV_VALID_FILTER;
+		 return HTTP_FORBIDDEN;
+		}
+
+		start = xmlGetProp(node, BAD_CAST "start");
+		if (start) {
+		 filter->start = icaltime_from_string((char *) start);
+		 xmlFree(start);
+		}
+		else {
+		 filter->start =
+			icaltime_from_timet_with_zone(INT_MIN, 0, utc);
+		}
+
+		end = xmlGetProp(node, BAD_CAST "end");
+		if (end) {
+		 filter->end = icaltime_from_string((char *) end);
+		 xmlFree(end);
+		}
+		else {
+		 filter->end =
+			icaltime_from_timet_with_zone(INT_MAX, 0, utc);
+		}
+
+		if (!is_valid_timerange(filter->start, filter->end)) {
+		 error->precond = CALDAV_VALID_FILTER;
+		 return HTTP_FORBIDDEN;
+		}
+	 }
+	 else {
+		error->precond = CALDAV_SUPP_FILTER;
+		return HTTP_FORBIDDEN;
+	 }
+	}
+ }
+
+ return ret;
+}
+
+
+/* Callback to fetch DAV:getcontenttype */
+static int propfind_getcontenttype(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx,
+				 xmlNodePtr resp __attribute__((unused)),
+				 struct propstat propstat,
+				 void *rock __attribute__((unused)))
+{
+ buf_setcstr(&fctx->buf, "text/calendar; charset=utf-8");
+
+ if (fctx->data) {
+	struct caldav_data *cdata = (struct caldav_data *) fctx->data;
+	const char *comp = NULL;
+
+	switch (cdata->comp_type) {
+	case CAL_COMP_VEVENT: comp = "VEVENT"; break;
+	case CAL_COMP_VTODO: comp = "VTODO"; break;
+	case CAL_COMP_VJOURNAL: comp = "VJOURNAL"; break;
+	case CAL_COMP_VFREEBUSY: comp = "VFREEBUSY"; break;
+	}
+
+	if (comp) buf_printf(&fctx->buf, "; component=%s", comp);
+ }
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:resourcetype */
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (!fctx->record) {
+	xmlNewChild(node, NULL, BAD_CAST "collection", NULL);
+
+	if (fctx->req_tgt->collection) {
+	 ensure_ns(fctx->ns, NS_CALDAV, resp->parent, XML_NS_CALDAV, "C");
+	 if (!strcmp(fctx->req_tgt->collection, SCHED_INBOX)) {
+		xmlNewChild(node, fctx->nsNS_CALDAV,
+			 BAD_CAST "schedule-inbox", NULL);
+	 }
+	 else if (!strcmp(fctx->req_tgt->collection, SCHED_OUTBOX)) {
+		xmlNewChild(node, fctx->nsNS_CALDAV,
+			 BAD_CAST "schedule-outbox", NULL);
+	 }
+	 else {
+		xmlNewChild(node, fctx->nsNS_CALDAV,
+			 BAD_CAST "calendar", NULL);
+	 }
+	}
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:supported-report-set */
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr s, r, top;
+
+ top = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ if (fctx->req_tgt->collection && !fctx->req_tgt->resource) {
+	s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+	r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+	xmlNewChild(r, fctx->nsNS_DAV, BAD_CAST "sync-collection", NULL);
+ }
+
+ ensure_ns(fctx->ns, NS_CALDAV, resp->parent, XML_NS_CALDAV, "C");
+
+ s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+ r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+ xmlNewChild(r, fctx->nsNS_CALDAV, BAD_CAST "calendar-query", NULL);
+
+ s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+ r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+ xmlNewChild(r, fctx->nsNS_CALDAV, BAD_CAST "calendar-multiget", NULL);
+
+ s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+ r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+ xmlNewChild(r, fctx->nsNS_CALDAV, BAD_CAST "free-busy-query", NULL);
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:calendar-data */
+static int propfind_caldata(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock)
+{
+ xmlNodePtr prop = (xmlNodePtr) rock;
+ xmlChar *attr;
+ const char *data;
+ unsigned long datalen;
+ xmlNodePtr node;
+
+ if (!resp || !propstat) {
+	/* Prescreen calendar-data "property" request */
+	unsigned allowed = 1;
+
+	if ((attr = xmlGetProp(prop, BAD_CAST "content-type"))) {
+	 struct mime_type_t *mime;
+
+	 /* Check requested MIME type */
+	 for (mime = caldav_mime_types; mime->content_type; mime++) {
+		if (is_mediatype((const char *) attr, mime->content_type)) {
+		 xmlFree(attr);
+
+		 if ((attr = xmlGetProp(prop, BAD_CAST "version")) &&
+			(!mime->version ||
+			 xmlStrcmp(attr, BAD_CAST mime->version))) {
+			allowed = 0;
+		 }
+		 break;
+		}
+	 }
+	 if (!mime->content_type) allowed = 0;
+
+	 if (attr) xmlFree(attr);
+	}
+
+	if (!allowed) {
+	 fctx->err->precond = CALDAV_SUPP_DATA;
+	 *fctx->ret = HTTP_FORBIDDEN;
+	}
+
+	return allowed;
+ }
+
+
+ if (!fctx->record) return HTTP_NOT_FOUND;
+
+ if (!buf_base(&fctx->msg_buf)) {
+	if (mailbox_map_record(fctx->mailbox, fctx->record, &fctx->msg_buf))
+	 return HTTP_SERVER_ERROR;
+ }
+
+ data = buf_base(&fctx->msg_buf) + fctx->record->header_size;
+ datalen = fctx->record->size - fctx->record->header_size;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ if ((attr = xmlGetProp(prop, BAD_CAST "content-type"))) {
+	struct mime_type_t *mime = caldav_mime_types;
+
+	/* Find requested MIME type */
+	while (!is_mediatype((const char *) attr, mime->content_type)) mime++;
+
+	if (mime != caldav_mime_types) {
+	 /* Not the storage format - convert into requested MIME type */
+	 icalcomponent *ical = icalparser_parse_string(data);
+
+	 data = mime->to_string(ical);
+	 datalen = strlen(data);
+	 icalcomponent_free(ical);
+	}
+
+	xmlSetProp(node, BAD_CAST "content-type", attr);
+	xmlFree(attr);
+
+	if ((attr = xmlGetProp(prop, BAD_CAST "version"))) {
+	 xmlSetProp(node, BAD_CAST "version", attr);
+	 xmlFree(attr);
+	}
+ }
+
+ xmlAddChild(node,
+		xmlNewCDataBlock(fctx->root->doc, BAD_CAST data, datalen));
+
+ fctx->fetcheddata = 1;
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:calendar-home-set,
+ * CALDAV:schedule-inbox-URL, CALDAV:schedule-outbox-URL,
+ * and CALDAV:schedule-default-calendar-URL
+ */
+int propfind_calurl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock)
+{
+ xmlNodePtr node;
+ const char *cal = (const char *) rock;
+
+ if (!fctx->userid) return HTTP_NOT_FOUND;
+
+ /* sched-def-cal-URL only defined on sched-inbox-URL */
+ if (!xmlStrcmp(name, BAD_CAST "schedule-default-calendar-URL") &&
+	(!fctx->req_tgt->collection ||
+	 strcmp(fctx->req_tgt->collection, SCHED_INBOX)))
+	return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ buf_reset(&fctx->buf);
+ if (strchr(fctx->userid, '@')) {
+ buf_printf(&fctx->buf, "%s/user/%s/%s",
+	 namespace_calendar.prefix, fctx->userid, cal ? cal : "");
+ }
+ else {
+ buf_printf(&fctx->buf, "%s/user/%s@internal/%s",
+	 namespace_calendar.prefix, fctx->userid, cal ? cal : "");
+ }
+
+ xml_add_href(node, fctx->nsNS_DAV, buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:supported-calendar-component-set */
+static const struct cal_comp_t {
+ const char *name;
+ unsigned long type;
+} cal_comps = {
+ { "VEVENT", CAL_COMP_VEVENT },
+ { "VTODO", CAL_COMP_VTODO },
+ { "VJOURNAL", CAL_COMP_VJOURNAL },
+ { "VFREEBUSY", CAL_COMP_VFREEBUSY },
+// { "VTIMEZONE", CAL_COMP_VTIMEZONE },
+// { "VALARM",	 CAL_COMP_VALARM },
+ { NULL, 0 }
+};
+
+static int propfind_calcompset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ const char *prop_annot = ANNOT_NS "CALDAV:supported-calendar-component-set";
+ struct buf attrib = BUF_INITIALIZER;
+ unsigned long types = 0;
+ xmlNodePtr set, node;
+ const struct cal_comp_t *comp;
+ int r = 0;
+
+ if (!fctx->req_tgt->collection) return HTTP_NOT_FOUND;
+
+ r = annotatemore_lookup(fctx->mailbox->name, prop_annot,
+			 /* shared */ NULL, &attrib);
+ if (r) return HTTP_SERVER_ERROR;
+
+ if (attrib.len)
+	types = strtoul(buf_cstring(&attrib), NULL, 10);
+ else
+	types = -1; /* ALL components types */
+
+ buf_free(&attrib);
+
+ if (!types) return HTTP_NOT_FOUND;
+
+ set = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+ /* Create "comp" elements from the stored bitmask */
+ for (comp = cal_comps; comp->name; comp++) {
+	if (types & comp->type) {
+	 node = xmlNewChild(set, fctx->nsNS_CALDAV,
+			 BAD_CAST "comp", NULL);
+	 xmlNewProp(node, BAD_CAST "name", BAD_CAST comp->name);
+	}
+ }
+
+ return 0;
+}
+
+
+/* Callback to write supported-calendar-component-set property */
+static int proppatch_calcompset(xmlNodePtr prop, unsigned set,
+				struct proppatch_ctx *pctx,
+				struct propstat propstat,
+				void *rock __attribute__((unused)))
+{
+ int r = 0;
+ unsigned precond = 0;
+
+ if (set && (pctx->meth == METH_MKCOL || pctx->meth == METH_MKCALENDAR)) {
+	/* "Writeable" for MKCOL/MKCALENDAR only */
+	xmlNodePtr cur;
+	unsigned long types = 0;
+
+	/* Work through the given list of components */
+	for (cur = prop->children; cur; cur = cur->next) {
+	 xmlChar *name;
+	 const struct cal_comp_t *comp;
+
+	 /* Make sure its a "comp" element with a "name" */
+	 if (cur->type != XML_ELEMENT_NODE) continue;
+	 if (xmlStrcmp(cur->name, BAD_CAST "comp") ||
+		!(name = xmlGetProp(cur, BAD_CAST "name"))) break;
+
+	 /* Make sure we have a valid component type */
+	 for (comp = cal_comps;
+		 comp->name && xmlStrcmp(name, BAD_CAST comp->name); comp++);
+	 xmlFree(name);
+
+	 if (comp->name) types |= comp->type; /* found match in our list */
+	 else break;	 	 		 /* no match - invalid type */
+	}
+
+	if (!cur) {
+	 /* All component types are valid */
+	 const char *prop_annot =
+		ANNOT_NS "CALDAV:supported-calendar-component-set";
+	 annotate_state_t *astate = NULL;
+
+	 buf_reset(&pctx->buf);
+	 buf_printf(&pctx->buf, "%lu", types);
+
+	 r = mailbox_get_annotate_state(pctx->mailbox, 0, &astate);
+	 if (!r) r = annotate_state_write(astate, prop_annot, /*userid*/NULL, &pctx->buf);
+
+	 if (!r) {
+		xml_add_prop(HTTP_OK, pctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			 prop->name, prop->ns, NULL, 0);
+	 }
+	 else {
+		xml_add_prop(HTTP_SERVER_ERROR, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_ERROR,
+			 prop->name, prop->ns, NULL, 0);
+	 }
+
+	 return 0;
+	}
+
+	/* Invalid component type */
+	precond = CALDAV_SUPP_COMP;
+ }
+ else {
+	/* Protected property */
+	precond = DAV_PROT_PROP;
+ }
+
+ xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV, &propstatPROPSTAT_FORBID,
+		 prop->name, prop->ns, NULL, precond);
+
+ *pctx->ret = HTTP_FORBIDDEN;
+
+ return 0;
+}
+
+/* Callback to fetch CALDAV:supported-calendar-data */
+static int propfind_suppcaldata(const xmlChar *name, xmlNsPtr ns,
+				struct propfind_ctx *fctx,
+				xmlNodePtr resp __attribute__((unused)),
+				struct propstat propstat,
+				void *rock __attribute__((unused)))
+{
+ xmlNodePtr node;
+ struct mime_type_t *mime;
+
+ if (!fctx->req_tgt->collection) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ assert(!buf_len(&fctx->buf));
+
+ for (mime = caldav_mime_types; mime->content_type; mime++) {
+	xmlNodePtr type = xmlNewChild(node, fctx->nsNS_CALDAV,
+				 BAD_CAST "calendar-data", NULL);
+
+	/* Trim any charset from content-type */
+	buf_reset(&fctx->buf);
+	buf_printf(&fctx->buf, "%.*s",
+		 (int) strcspn(mime->content_type, ";"), mime->content_type);
+
+	xmlNewProp(type, BAD_CAST "content-type",
+		 BAD_CAST buf_cstring(&fctx->buf));
+
+	if (mime->version)
+	 xmlNewProp(type, BAD_CAST "version", BAD_CAST mime->version);
+ }
+
+ buf_reset(&fctx->buf);
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:schedule-tag */
+static int propfind_schedtag(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ struct caldav_data *cdata = (struct caldav_data *) fctx->data;
+
+ if (!cdata->sched_tag) return HTTP_NOT_FOUND;
+
+ /* add DQUOTEs */
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "\"%s\"", cdata->sched_tag);
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:calendar-user-address-set */
+int propfind_caluseraddr(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node;
+
+ if (!fctx->userid) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ /* XXX This needs to be done via an LDAP/DB lookup */
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "mailto:%s@%s", fctx->userid, config_servername);
+
+ xmlNewChild(node, fctx->nsNS_DAV, BAD_CAST "href",
+		BAD_CAST buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch CALDAV:schedule-calendar-transp */
+static int propfind_caltransp(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ const char *prop_annot = ANNOT_NS "CALDAV:schedule-calendar-transp";
+ struct buf attrib = BUF_INITIALIZER;
+ xmlNodePtr node;
+ int r = 0;
+
+ if (!fctx->req_tgt->collection) return HTTP_NOT_FOUND;
+
+ r = annotatemore_lookup(fctx->mailbox->name, prop_annot,
+			 /* shared */ NULL, &attrib);
+
+ if (r) return HTTP_SERVER_ERROR;
+ if (!attrib.len) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+ xmlNewChild(node, fctx->nsNS_CALDAV, BAD_CAST buf_cstring(&attrib), NULL);
+
+ buf_free(&attrib);
+
+ return 0;
+}
+
+
+/* Callback to write schedule-calendar-transp property */
+static int proppatch_caltransp(xmlNodePtr prop, unsigned set,
+			 struct proppatch_ctx *pctx,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ int r;
+
+ if (pctx->req_tgt->collection && !pctx->req_tgt->resource) {
+	const char *prop_annot =
+	 ANNOT_NS "CALDAV:schedule-calendar-transp";
+	annotate_state_t *astate = NULL;
+
+	buf_reset(&pctx->buf);
+
+	if (set) {
+	 xmlNodePtr cur;
+
+	 /* Find the value */
+	 for (cur = prop->children; cur; cur = cur->next) {
+
+		/* Make sure its a value we understand */
+		if (cur->type != XML_ELEMENT_NODE) continue;
+		if (!xmlStrcmp(cur->name, BAD_CAST "opaque") ||
+		 !xmlStrcmp(cur->name, BAD_CAST "transparent")) {
+		 buf_setcstr(&pctx->buf, (const char *)cur->name);
+		 break;
+		}
+		else {
+		 /* Unknown value */
+		 xml_add_prop(HTTP_CONFLICT, pctx->nsNS_DAV,
+				 &propstatPROPSTAT_CONFLICT,
+				 prop->name, prop->ns, NULL, 0);
+
+		 *pctx->ret = HTTP_FORBIDDEN;
+
+		 return 0;
+		}
+	 }
+	}
+
+	r = mailbox_get_annotate_state(pctx->mailbox, 0, &astate);
+	if (!r) r = annotate_state_write(astate, prop_annot, /*userid*/NULL, &pctx->buf);
+	if (!r) {
+	 xml_add_prop(HTTP_OK, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_OK, prop->name, prop->ns, NULL, 0);
+	}
+	else {
+	 xml_add_prop(HTTP_SERVER_ERROR, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_ERROR,
+			 prop->name, prop->ns, NULL, 0);
+	}
+ }
+ else {
+	xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV,
+		 &propstatPROPSTAT_FORBID,
+		 prop->name, prop->ns, NULL, 0);
+
+	*pctx->ret = HTTP_FORBIDDEN;
+ }
+
+ return 0;
+}
+
+
+/* Callback to write calendar-timezone property */
+static int proppatch_timezone(xmlNodePtr prop, unsigned set,
+			 struct proppatch_ctx *pctx,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ int r;
+
+ if (pctx->req_tgt->collection && !pctx->req_tgt->resource) {
+	xmlChar *freeme = NULL;
+	struct buf buf = BUF_INITIALIZER;
+	unsigned valid = 1;
+
+	if (set) {
+	 icalcomponent *ical = NULL;
+
+	 freeme = xmlNodeGetContent(prop);
+	 buf_setcstr(&buf, (const char*)freeme);
+
+	 /* Parse and validate the iCal data */
+	 ical = icalparser_parse_string(buf_cstring(&buf));
+	 if (!ical || (icalcomponent_isa(ical) != ICAL_VCALENDAR_COMPONENT)) {
+		xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_FORBID,
+			 prop->name, prop->ns, NULL,
+			 CALDAV_VALID_DATA);
+		*pctx->ret = HTTP_FORBIDDEN;
+		valid = 0;
+	 }
+	 else if (!icalcomponent_get_first_component(ical,
+							ICAL_VTIMEZONE_COMPONENT)
+		 || icalcomponent_get_first_real_component(ical)) {
+		xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_FORBID,
+			 prop->name, prop->ns, NULL,
+			 CALDAV_VALID_OBJECT);
+		*pctx->ret = HTTP_FORBIDDEN;
+		valid = 0;
+	 }
+	}
+
+	if (valid) {
+	 annotate_state_t *astate = NULL;
+
+	 buf_reset(&pctx->buf);
+	 buf_printf(&pctx->buf, ANNOT_NS "<%s>%s",
+		 (const char *) prop->ns->href, prop->name);
+
+	 r = mailbox_get_annotate_state(pctx->mailbox, 0, &astate);
+	 r = annotate_state_write(astate, buf_cstring(&pctx->buf), /*userid*/NULL, &buf);
+	 if (!r) {
+		xml_add_prop(HTTP_OK, pctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			 prop->name, prop->ns, NULL, 0);
+	 }
+	 else {
+		xml_add_prop(HTTP_SERVER_ERROR, pctx->nsNS_DAV,
+			 &propstatPROPSTAT_ERROR,
+			 prop->name, prop->ns, NULL, 0);
+	 }
+	}
+
+	if (freeme) xmlFree(freeme);
+ }
+ else {
+	xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV,
+		 &propstatPROPSTAT_FORBID, prop->name, prop->ns, NULL, 0);
+
+	*pctx->ret = HTTP_FORBIDDEN;
+ }
+
+ return 0;
+}
+
+
+static int report_cal_query(struct transaction_t *txn,
+			 xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int ret = 0;
+ xmlNodePtr node;
+ struct calquery_filter calfilter;
+
+ fctx->davdb = auth_caldavdb;
+ fctx->lookup_resource = (db_lookup_proc_t) &caldav_lookup_resource;
+ fctx->foreach_resource = (db_foreach_proc_t) &caldav_foreach;
+ fctx->proc_by_resource = &propfind_by_resource;
+
+ /* Parse children element of report */
+ for (node = inroot->children; node; node = node->next) {
+	if (node->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(node->name, BAD_CAST "filter")) {
+		memset(&calfilter, 0, sizeof(struct calquery_filter));
+		ret = parse_comp_filter(node->children, &calfilter, &txn->error);
+		if (ret) return ret;
+		else {
+		 fctx->filter = apply_calfilter;
+		 fctx->filter_crit = &calfilter;
+		}
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "timezone")) {
+		xmlChar *tz = NULL;
+		icalcomponent *ical = NULL;
+
+		syslog(LOG_WARNING, "REPORT calendar-query w/timezone");
+		tz = xmlNodeGetContent(node);
+		ical = icalparser_parse_string((const char *) tz);
+		if (!ical ||
+		 (icalcomponent_isa(ical) != ICAL_VCALENDAR_COMPONENT) ||
+		 !icalcomponent_get_first_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT)
+		 || icalcomponent_get_first_real_component(ical)) {
+		 txn->error.precond = CALDAV_VALID_DATA;
+		 ret = HTTP_FORBIDDEN;
+		}
+
+		if (tz) xmlFree(tz);
+		if (ical) icalcomponent_free(ical);
+		if (ret) return ret;
+	 }
+	}
+ }
+
+ if (fctx->depth > 0) {
+	/* Calendar collection(s) */
+	if (txn->req_tgt.collection) {
+	 /* Add response for target calendar collection */
+	 propfind_by_collection(txn->req_tgt.mboxname, 0, 0, fctx);
+	}
+	else {
+	 /* Add responses for all contained calendar collections */
+	 strlcat(txn->req_tgt.mboxname, ".%", sizeof(txn->req_tgt.mboxname));
+	 mboxlist_findall(NULL, /* internal namespace */
+			 txn->req_tgt.mboxname, 1, httpd_userid, 
+			 httpd_authstate, propfind_by_collection, fctx);
+	}
+
+	ret = *fctx->ret;
+ }
+
+ return ret;
+}
+
+
+static int report_cal_multiget(struct transaction_t *txn,
+			 xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int r, ret = 0;
+ struct request_target_t tgt;
+ struct mailbox *mailbox = NULL;
+ xmlNodePtr node;
+ struct buf uri = BUF_INITIALIZER;
+
+ memset(&tgt, 0, sizeof(struct request_target_t));
+ tgt.namespace = URL_NS_CALENDAR;
+
+ /* Get props for each href */
+ for (node = inroot->children; node; node = node->next) {
+	if ((node->type == XML_ELEMENT_NODE) &&
+	 !xmlStrcmp(node->name, BAD_CAST "href")) {
+	 xmlChar *href = xmlNodeListGetString(inroot->doc, node->children, 1);
+	 int len = xmlStrlen(href);
+	 struct caldav_data *cdata;
+
+	 buf_ensure(&uri, len);
+	 xmlURIUnescapeString((const char *) href, len, uri.s);
+	 xmlFree(href);
+
+	 /* Parse the path */
+	 if ((r = caldav_parse_path(uri.s, &tgt, &fctx->err->desc))) {
+		ret = r;
+		goto done;
+	 }
+
+	 fctx->req_tgt = &tgt;
+
+	 /* Check if we already have this mailbox open */
+	 if (!mailbox || strcmp(mailbox->name, tgt.mboxname)) {
+		if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+		/* Open mailbox for reading */
+		if ((r = http_mailbox_open(tgt.mboxname, &mailbox, LOCK_SHARED))) {
+		 syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+			 tgt.mboxname, error_message(r));
+		 txn->error.desc = error_message(r);
+		 ret = HTTP_SERVER_ERROR;
+		 goto done;
+		}
+
+		fctx->mailbox = mailbox;
+	 }
+
+	 /* Find message UID for the resource */
+	 r = caldav_lookup_resource(auth_caldavdb,
+				 tgt.mboxname, tgt.resource, 0, &cdata);
+	 if (r) {
+		ret = HTTP_NOT_FOUND;
+		goto done;
+	 }
+	 cdata->dav.resource = tgt.resource;
+	 /* XXX Check errors */
+
+	 propfind_by_resource(fctx, cdata);
+	}
+ }
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+ buf_free(&uri);
+
+ return ret;
+}
+
+
+
+/* caldav_foreach() callback to find busytime of a resource */
+static int busytime_by_resource(void *rock, void *data)
+{
+ struct propfind_ctx *fctx = (struct propfind_ctx *) rock;
+ struct dav_data *ddata = (struct dav_data *) data;
+ struct index_record record;
+ int r;
+
+ if (!ddata->imap_uid) return 0;
+
+ /* Fetch index record for the resource */
+ r = mailbox_find_index_record(fctx->mailbox, ddata->imap_uid, &record, NULL);
+ if (r) return 0;
+
+ fctx->record = &record;
+ (void) apply_calfilter(fctx, data);
+
+ buf_free(&fctx->msg_buf);
+ fctx->record = NULL;
+
+ return 0;
+}
+
+
+/* mboxlist_findall() callback to find busytime of a collection */
+static int busytime_by_collection(char *mboxname, int matchlen,
+				 int maycreate, void *rock)
+{
+ struct propfind_ctx *fctx = (struct propfind_ctx *) rock;
+ struct calquery_filter *calfilter =
+	(struct calquery_filter *) fctx->filter_crit;
+
+ if (calfilter && calfilter->check_transp) {
+	/* Check if the collection is marked as transparent */
+	struct buf attrib = BUF_INITIALIZER;
+	const char *prop_annot =
+	 ANNOT_NS "CALDAV:schedule-calendar-transp";
+
+	if (!annotatemore_lookup(mboxname, prop_annot, /* shared */ NULL, &attrib)) {
+	 if (!strcmp(buf_cstring(&attrib), "transparent")) {
+		buf_free(&attrib);
+		return 0;
+	 }
+	 buf_free(&attrib);
+	}
+ }
+
+ return propfind_by_collection(mboxname, matchlen, maycreate, rock);
+}
+
+
+/* Compare start times of busytime period -- used for sorting */
+static int compare_busytime(const void *b1, const void *b2)
+{
+ struct icalperiodtype *a = (struct icalperiodtype *) b1;
+ struct icalperiodtype *b = (struct icalperiodtype *) b2;
+
+ return icaltime_compare(a->start, b->start);
+}
+
+
+/* Create an iCalendar object containing busytime of all specified resources */
+static icalcomponent *busytime_query_local(struct transaction_t *txn,
+					 struct propfind_ctx *fctx,
+					 char mailboxname,
+					 icalproperty_method method,
+					 const char *uid,
+					 const char *organizer,
+					 const char *attendee)
+{
+ struct calquery_filter *calfilter =
+	(struct calquery_filter *) fctx->filter_crit;
+ struct busytime *busytime = &calfilter->busytime;
+ icalcomponent *cal = NULL;
+
+ fctx->lookup_resource = (db_lookup_proc_t) &caldav_lookup_resource;
+ fctx->foreach_resource = (db_foreach_proc_t) &caldav_foreach;
+ fctx->proc_by_resource = &busytime_by_resource;
+
+ /* Gather up all of the busytime */
+ if (fctx->depth > 0) {
+	/* Calendar collection(s) */
+
+	/* XXX Check DACL_READFB on all calendars */
+
+	if (txn->req_tgt.collection) {
+	 /* Get busytime for target calendar collection */
+	 busytime_by_collection(mailboxname, 0, 0, fctx);
+	}
+	else {
+	 /* Get busytime for all contained calendar collections */
+	 strlcat(mailboxname, ".%", sizeof(mailboxname));
+	 mboxlist_findall(NULL, /* internal namespace */
+			 mailboxname, 1, httpd_userid, 
+			 httpd_authstate, busytime_by_collection, fctx);
+	}
+ }
+
+ if (!*fctx->ret) {
+	struct buf prodid = BUF_INITIALIZER;
+	icalcomponent *fb;
+	icalproperty *prop;
+	time_t now = time(0);
+	unsigned n;
+
+	/* Construct iCalendar object with VFREEBUSY component */
+	buf_printf(&prodid, "-//CyrusIMAP.org/Cyrus %s//EN", cyrus_version());
+	cal = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
+				 icalproperty_new_version("2.0"),
+				 icalproperty_new_prodid(buf_cstring(&prodid)),
+				 0);
+	buf_free(&prodid);
+
+	if (method) icalcomponent_set_method(cal, method);
+
+	fb = icalcomponent_vanew(ICAL_VFREEBUSY_COMPONENT,
+				 icalproperty_new_dtstamp(
+				 icaltime_from_timet_with_zone(
+					 now,
+					 0,
+					 icaltimezone_get_utc_timezone())),
+				 icalproperty_new_dtstart(calfilter->start),
+				 icalproperty_new_dtend(calfilter->end),
+				 0);
+
+	if (uid) icalcomponent_set_uid(fb, uid);
+	if (organizer) {
+	 prop = icalproperty_new_organizer(organizer);
+	 icalcomponent_add_property(fb, prop);
+	}
+	if (attendee) {
+	 prop = icalproperty_new_attendee(attendee);
+	 icalcomponent_add_property(fb, prop);
+	}
+
+	icalcomponent_add_component(cal, fb);
+
+	/* Sort busytime periods by start time */
+	qsort(busytime->busy, busytime->len, sizeof(struct icalperiodtype),
+	 compare_busytime);
+
+	/* Add busytime periods to VFREEBUSY component, coalescing as needed */
+	for (n = 0; n < busytime->len; n++) {
+	 if ((n+1 < busytime->len) &&
+		icaltime_compare(busytime->busyn.end,
+				 busytime->busyn+1.start) >= 0) {
+		/* Periods overlap -- coalesce into next busytime */
+		memcpy(&busytime->busyn+1.start, &busytime->busyn.start,
+		 sizeof(struct icaltimetype));
+		if (icaltime_compare(busytime->busyn.end,
+				 busytime->busyn+1.end) > 0) {
+		 memcpy(&busytime->busyn+1.end, &busytime->busyn.end,
+			 sizeof(struct icaltimetype));
+		}
+	 }
+	 else {
+		icalproperty *busy =
+		 icalproperty_new_freebusy(busytime->busyn);
+
+		icalcomponent_add_property(fb, busy);
+	 }
+	}
+ }
+
+ return cal;
+}
+
+
+static int report_fb_query(struct transaction_t *txn,
+			 xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int ret = 0;
+ struct calquery_filter calfilter;
+ xmlNodePtr node;
+ icalcomponent *cal;
+
+ /* Can not be run against a resource */
+ if (txn->req_tgt.resource) return HTTP_FORBIDDEN;
+
+ memset(&calfilter, 0, sizeof(struct calquery_filter));
+ calfilter.comp = CAL_COMP_VEVENT | CAL_COMP_VFREEBUSY;
+ calfilter.start = icaltime_from_timet_with_zone(INT_MIN, 0, NULL);
+ calfilter.end = icaltime_from_timet_with_zone(INT_MAX, 0, NULL);
+ calfilter.save_busytime = 1;
+ fctx->filter = apply_calfilter;
+ fctx->filter_crit = &calfilter;
+ fctx->davdb = auth_caldavdb;
+
+ /* Parse children element of report */
+ for (node = inroot->children; node; node = node->next) {
+	if (node->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(node->name, BAD_CAST "time-range")) {
+		xmlChar *start, *end;
+
+		start = xmlGetProp(node, BAD_CAST "start");
+		if (start) {
+		 calfilter.start = icaltime_from_string((char *) start);
+		 xmlFree(start);
+		}
+
+		end = xmlGetProp(node, BAD_CAST "end");
+		if (end) {
+		 calfilter.end = icaltime_from_string((char *) end);
+		 xmlFree(end);
+		}
+
+		if (!is_valid_timerange(calfilter.start, calfilter.end)) {
+		 return HTTP_BAD_REQUEST;
+		}
+	 }
+	}
+ }
+
+ cal = busytime_query_local(txn, fctx, txn->req_tgt.mboxname,
+			 0, NULL, NULL, NULL);
+
+ if (calfilter.busytime.busy) free(calfilter.busytime.busy);
+
+ if (cal) {
+	struct mime_type_t *mime = NULL;
+	const char **hdr, *cal_str;
+
+	/* Check requested MIME type */
+	if ((hdr = spool_getheader(txn->req_hdrs, "Accept"))) {
+	 struct accept *e, *enc = parse_accept(hdr);
+
+	 for (e = enc; e && e->token; e++) {
+		struct mime_type_t *m;
+
+		for (m = caldav_mime_types; !mime && m->content_type; m++) {
+		 if (is_mediatype(e->token, m->content_type)) mime = m;
+		}
+
+		free(e->token);
+	 }
+	 if (enc) free(enc);
+	}
+	if (!mime) mime = caldav_mime_types; /* 1st in array is default type */
+
+	/* Output the iCalendar object as text/calendar */
+	cal_str = mime->to_string(cal);
+	icalcomponent_free(cal);
+
+	txn->resp_body.type = mime->content_type;
+
+	/* iCalendar data in response should not be transformed */
+	txn->flags.cc |= CC_NOTRANSFORM;
+
+	write_body(HTTP_OK, txn, cal_str, strlen(cal_str));
+ }
+ else ret = HTTP_NOT_FOUND;
+
+ return ret;
+}
+
+
+/* Store the iCal data in the specified calendar/resource */
+static int store_resource(struct transaction_t *txn, icalcomponent *ical,
+			 struct mailbox *mailbox, const char *resource,
+			 struct caldav_db *caldavdb, int overwrite,
+			 unsigned flags)
+{
+ int ret = HTTP_CREATED, r;
+ icalcomponent *comp;
+ icalcomponent_kind kind;
+ icalproperty_method meth;
+ icalproperty *prop;
+ unsigned mykind = 0;
+ char *header;
+ const char *organizer = NULL;
+ const char *prop_annot = ANNOT_NS "CALDAV:supported-calendar-component-set";
+ struct buf attrib = BUF_INITIALIZER;
+ struct buf headbuf = BUF_INITIALIZER;
+ struct index_record oldrecord;
+ struct caldav_data *cdata;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_DONTCARE_INITIALIZER;
+ FILE *f = NULL;
+ struct stagemsg *stage;
+ const char *uid, *ics;
+ uint32_t expunge_uid = 0;
+ time_t now = time(NULL);
+ char datestr80;
+ struct appendstate as;
+ static char sched_tag64;
+ static unsigned store_count = 0;
+
+ /* Check for supported component type */
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+ switch (kind) {
+ case ICAL_VEVENT_COMPONENT: mykind = CAL_COMP_VEVENT; break;
+ case ICAL_VTODO_COMPONENT: mykind = CAL_COMP_VTODO; break;
+ case ICAL_VJOURNAL_COMPONENT: mykind = CAL_COMP_VJOURNAL; break;
+ case ICAL_VFREEBUSY_COMPONENT: mykind = CAL_COMP_VFREEBUSY; break;
+ default:
+	txn->error.precond = CALDAV_SUPP_COMP;
+	return HTTP_FORBIDDEN;
+ }
+
+ if (!annotatemore_lookup(mailbox->name, prop_annot,
+			 /* shared */ NULL, &attrib)
+	&& attrib.len) {
+	unsigned long supp_comp = strtoul(buf_cstring(&attrib), NULL, 10);
+
+	buf_free(&attrib);
+
+	if (!(mykind & supp_comp)) {
+	 txn->error.precond = CALDAV_SUPP_COMP;
+	 return HTTP_FORBIDDEN;
+	}
+ }
+
+ /* Find iCalendar UID for the current resource, if exists */
+ uid = icalcomponent_get_uid(comp);
+ caldav_lookup_resource(caldavdb,
+			 mailbox->name, resource, 0, &cdata);
+ if (cdata->ical_uid && strcmp(cdata->ical_uid, uid)) {
+	/* CALDAV:no-uid-conflict */
+	txn->error.precond = CALDAV_UID_CONFLICT;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* XXX - theoretical race, but the mailbox is locked, so nothing
+ * else can ACTUALLY change it */
+ if (cdata->dav.imap_uid) {
+	/* Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, cdata->dav.imap_uid,
+				 &oldrecord, NULL);
+	if (r) return HTTP_SERVER_ERROR;
+
+	if (overwrite == OVERWRITE_CHECK) {
+	 /* Check any preconditions */
+	 const char *etag = message_guid_encode(&oldrecord.guid);
+	 time_t lastmod = oldrecord.internaldate;
+	 int precond = caldav_check_precond(txn, cdata,
+					 etag, lastmod);
+
+	 if (precond != HTTP_OK)
+		return HTTP_PRECOND_FAILED;
+	}
+
+	expunge_uid = cdata->dav.imap_uid;
+ }
+
+ /* Check for existing iCalendar UID */
+ caldav_lookup_uid(caldavdb, uid, 0, &cdata);
+ if (!(flags & NO_DUP_CHECK) &&
+	cdata->dav.mailbox && !strcmp(cdata->dav.mailbox, mailbox->name) &&
+	strcmp(cdata->dav.resource, resource)) {
+	/* CALDAV:no-uid-conflict */
+	const char *owner = mboxname_to_userid(cdata->dav.mailbox);
+
+	txn->error.precond = CALDAV_UID_CONFLICT;
+	assert(!buf_len(&txn->buf));
+	buf_printf(&txn->buf, "%s/user/%s/%s/%s",
+		 namespace_calendar.prefix, owner,
+		 strrchr(cdata->dav.mailbox, '.')+1, cdata->dav.resource);
+	txn->error.resource = buf_cstring(&txn->buf);
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Prepare to stage the message */
+ if (!(f = append_newstage(mailbox->name, now, 0, &stage))) {
+	syslog(LOG_ERR, "append_newstage(%s) failed", mailbox->name);
+	txn->error.desc = "append_newstage() failed\r\n";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Remove all X-LIC-ERROR properties*/
+ icalcomponent_strip_errors(ical);
+
+ ics = icalcomponent_as_ical_string(ical);
+
+ /* Create iMIP header for resource */
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ if (prop) {
+	organizer = icalproperty_get_organizer(prop)+7;
+	header = charset_encode_mimeheader(organizer, 0);
+	fprintf(f, "From: %s\r\n", header);
+	free(header);
+ }
+ else if (strchr(proxy_userid, '@')) {
+	/* XXX This needs to be done via an LDAP/DB lookup */
+	header = charset_encode_mimeheader(proxy_userid, 0);
+	fprintf(f, "From: %s\r\n", header);
+	free(header);
+ }
+ else {
+	buf_printf(&headbuf, "%s@%s", proxy_userid, config_servername);
+	header = charset_encode_mimeheader(buf_base(&headbuf), buf_len(&headbuf));
+	fprintf(f, "From: %s\r\n", header);
+	free(header);
+	buf_reset(&headbuf);
+ }
+
+ header = charset_encode_mimeheader(icalcomponent_get_summary(comp), 0);
+ fprintf(f, "Subject: %s\r\n", header);
+ free(header);
+
+ time_to_rfc822(icaltime_as_timet_with_zone(icalcomponent_get_dtstamp(comp),
+					 icaltimezone_get_utc_timezone()),
+		 datestr, sizeof(datestr));
+ fprintf(f, "Date: %s\r\n", datestr);
+
+ /* XXX - validate uid for mime safety? */
+ if (strchr(uid, '@')) {
+	fprintf(f, "Message-ID: <%s>\r\n", uid);
+ }
+ else {
+	fprintf(f, "Message-ID: <%s@%s>\r\n", uid, config_servername);
+ }
+
+ fprintf(f, "Content-Type: text/calendar; charset=utf-8");
+ if ((meth = icalcomponent_get_method(ical)) != ICAL_METHOD_NONE) {
+	fprintf(f, "; method=%s", icalproperty_method_to_string(meth));
+ }
+ fprintf(f, "; component=%s\r\n", icalcomponent_kind_to_string(kind));
+
+ fprintf(f, "Content-Length: %u\r\n", (unsigned) strlen(ics));
+ fprintf(f, "Content-Disposition: inline; filename=\"%s\"", resource);
+ if (organizer) {
+	const char *stag;
+	if (flags & NEW_STAG) {
+	 sprintf(sched_tag, "%d-%ld-%u", getpid(), now, store_count++);
+	 stag = sched_tag;
+	}
+	else stag = cdata->sched_tag;
+	if (stag) fprintf(f, ";\r\n\tschedule-tag=%s", stag);
+ }
+ fprintf(f, "\r\n");
+
+ /* XXX Check domain of data and use appropriate CTE */
+
+ fprintf(f, "MIME-Version: 1.0\r\n");
+ fprintf(f, "\r\n");
+
+ /* Write the iCal data to the file */
+ fprintf(f, "%s", ics);
+ qdiffsQUOTA_STORAGE = ftell(f);
+
+ fclose(f);
+
+ qdiffsQUOTA_MESSAGE = 1;
+
+ /* Prepare to append the iMIP message to calendar mailbox */
+ if ((r = append_setup_mbox(&as, mailbox, NULL, NULL, 0, qdiffs, 0, 0, EVENT_MESSAGE_NEW|EVENT_CALENDAR))) {
+	syslog(LOG_ERR, "append_setup(%s) failed: %s",
+	 mailbox->name, error_message(r));
+	ret = HTTP_SERVER_ERROR;
+	txn->error.desc = "append_setup() failed\r\n";
+ }
+ else {
+	struct body *body = NULL;
+
+	/* Append the iMIP file to the calendar mailbox */
+	if ((r = append_fromstage(&as, &body, stage, now, NULL, 0, 0))) {
+	 syslog(LOG_ERR, "append_fromstage() failed");
+	 ret = HTTP_SERVER_ERROR;
+	 txn->error.desc = "append_fromstage() failed\r\n";
+	}
+	if (body) {
+	 message_free_body(body);
+	 free(body);
+	}
+
+	if (r) append_abort(&as);
+	else {
+	 /* Commit the append to the calendar mailbox */
+	 if ((r = append_commit(&as))) {
+		syslog(LOG_ERR, "append_commit() failed");
+		ret = HTTP_SERVER_ERROR;
+		txn->error.desc = "append_commit() failed\r\n";
+	 }
+	 else {
+		/* append_commit() returns a write-locked index */
+		struct index_record newrecord;
+
+		/* Read index record for new message (always the last one) */
+		mailbox_read_index_record(mailbox, mailbox->i.num_records,
+					 &newrecord);
+
+		if (expunge_uid) {
+		 /* Now that we have the replacement message in place
+		 and the mailbox locked, re-read the old record
+		 and see if we should overwrite it. Either way,
+		 one of our records will have to be expunged.
+		 */
+		 int userflag;
+
+		 ret = HTTP_NO_CONTENT;
+
+		 /* Perform the actual expunge */
+		 r = mailbox_user_flag(mailbox, DFLAG_UNBIND, &userflag, 1);
+		 if (!r) {
+			oldrecord.user_flagsuserflag/32 |= 1<<(userflag&31);
+			oldrecord.system_flags |= FLAG_EXPUNGED;
+			r = mailbox_rewrite_index_record(mailbox, &oldrecord);
+		 }
+		 if (r) {
+			syslog(LOG_ERR, "expunging record (%s) failed: %s",
+			 mailbox->name, error_message(r));
+			txn->error.desc = error_message(r);
+			ret = HTTP_SERVER_ERROR;
+		 }
+		}
+
+		if (!r) {
+		 struct resp_body_t *resp_body = &txn->resp_body;
+
+		 if (cdata->organizer && (flags & NEW_STAG)) {
+			resp_body->stag = sched_tag;
+		 }
+
+		 if ((flags & PREFER_REP) || !(flags & NEW_STAG)) {
+			/* Tell client about the new resource */
+			resp_body->lastmod = newrecord.internaldate;
+			resp_body->etag = message_guid_encode(&newrecord.guid);
+		 }
+		}
+	 }
+	}
+ }
+
+ append_removestage(stage);
+
+ buf_free(&headbuf);
+
+ return ret;
+}
+
+
+int caladdress_lookup(const char *addr, struct sched_param *param)
+{
+ char *p;
+ int islocal = 1, found = 1;
+ static char useridMAX_MAILBOX_BUFFER;
+
+ memset(param, 0, sizeof(struct sched_param));
+
+ if (!addr) return HTTP_NOT_FOUND;
+
+ p = (char *) addr;
+ if (!strncmp(addr, "mailto:", 7)) p += 7;
+
+ /* XXX Do LDAP/DB/socket lookup to see if user is local */
+ /* XXX Hack until real lookup stuff is written */
+ strlcpy(userid, p, sizeof(userid));
+ if ((p = strchr(userid, '@'))) *p++ = '\0';
+
+ if (islocal) {
+	/* User is in a local domain */
+	int r;
+	char mailboxnameMAX_MAILBOX_NAME;
+	mbentry_t *mbentry = NULL;
+	struct mboxname_parts parts;
+
+	if (!found) return HTTP_NOT_FOUND;
+	else param->userid = userid;
+
+	/* Lookup user's cal-home-set to see if its on this server */
+
+	mboxname_userid_to_parts(userid, &parts);
+	parts.box = xstrdupnull(config_getstring(IMAPOPT_CALENDARPREFIX));
+	mboxname_parts_to_internal(&parts, mailboxname);
+
+	r = http_mlookup(mailboxname, &mbentry, NULL);
+	if (r) {
+	 syslog(LOG_ERR, "mlookup(%s) failed: %s",
+		 mailboxname, error_message(r));
+	 mboxname_free_parts(&parts);
+
+	 switch (r) {
+	 case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	 case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	 default: return HTTP_SERVER_ERROR;
+	 }
+	}
+	mboxname_free_parts(&parts);
+	param->server = xstrdupnull(mbentry->server); /* XXX - memory leak */
+	mboxlist_entry_free(&mbentry);
+
+	if (param->server) param->flags |= SCHEDTYPE_ISCHEDULE;
+ }
+ else {
+	/* User is outside of our domain(s) -
+	 Do remote scheduling (default = iMIP) */
+	param->flags |= SCHEDTYPE_REMOTE;
+
+#ifdef WITH_DKIM
+	/* Do iSchedule DNS SRV lookup */
+
+	/* XXX If success, set server, port,
+	 and flags |= SCHEDTYPE_ISCHEDULE | SCHEDTYPE_SSL */
+#endif
+ }
+
+ return 0;
+}
+
+
+/* Send an iMIP request for attendees in 'ical' */
+static int imip_send(icalcomponent *ical)
+{
+ icalcomponent *comp;
+ icalproperty *prop;
+ icalproperty_method meth;
+ icalcomponent_kind kind;
+ const char *argv8, *organizer, *subject;
+ FILE *sm;
+ pid_t pid;
+ int r;
+ time_t t = time(NULL);
+ char datestr80;
+ static unsigned send_count = 0;
+
+ meth = icalcomponent_get_method(ical);
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ organizer = icalproperty_get_organizer(prop) + 7;
+
+ argv0 = "sendmail";
+ argv1 = "-f";
+ argv2 = organizer;
+ argv3 = "-i";
+ argv4 = "-N";
+ argv5 = "failure,delay";
+ argv6 = "-t";
+ argv7 = NULL;
+ pid = open_sendmail(argv, &sm);
+
+ if (sm == NULL) return HTTP_UNAVAILABLE;
+
+ /* Create iMIP message */
+ fprintf(sm, "From: %s\r\n", organizer);
+
+ for (prop = icalcomponent_get_first_property(comp, ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = icalcomponent_get_next_property(comp, ICAL_ATTENDEE_PROPERTY)) {
+	fprintf(sm, "To: %s\r\n", icalproperty_get_attendee(prop) + 7);
+ }
+
+ subject = icalcomponent_get_summary(comp);
+ if (!subject) {
+	fprintf(sm, "Subject: %s %s\r\n", icalcomponent_kind_to_string(kind),
+		icalproperty_method_to_string(meth));
+ }
+ else fprintf(sm, "Subject: %s\r\n", subject);
+
+ time_to_rfc822(t, datestr, sizeof(datestr));
+ fprintf(sm, "Date: %s\r\n", datestr);
+
+ fprintf(sm, "Message-ID: <cmu-httpd-%u-%ld-%u@%s>\r\n",
+	 getpid(), t, send_count++, config_servername);
+
+ fprintf(sm, "Content-Type: text/calendar; charset=utf-8");
+ fprintf(sm, "; method=%s; component=%s \r\n",
+	 icalproperty_method_to_string(meth),
+	 icalcomponent_kind_to_string(kind));
+
+ fputs("Content-Disposition: inline\r\n", sm);
+
+ fputs("MIME-Version: 1.0\r\n", sm);
+ fputs("\r\n", sm);
+
+ fputs(icalcomponent_as_ical_string(ical), sm);
+
+ fclose(sm);
+
+ while (waitpid(pid, &r, 0) < 0);
+
+ return r;
+}
+
+
+/* Add a <response> XML element for 'recipient' to 'root' */
+xmlNodePtr xml_add_schedresponse(xmlNodePtr root, xmlNsPtr dav_ns,
+				 xmlChar *recipient, xmlChar *status)
+{
+ xmlNodePtr resp, recip;
+
+ resp = xmlNewChild(root, NULL, BAD_CAST "response", NULL);
+ recip = xmlNewChild(resp, NULL, BAD_CAST "recipient", NULL);
+
+ if (dav_ns) xmlNewChild(recip, dav_ns, BAD_CAST "href", recipient);
+ else xmlNodeAddContent(recip, recipient);
+
+ if (status)
+	xmlNewChild(resp, NULL, BAD_CAST "request-status", status);
+
+ return resp;
+}
+
+
+struct remote_rock {
+ struct transaction_t *txn;
+ icalcomponent *ical;
+ xmlNodePtr root;
+ xmlNsPtr *ns;
+};
+
+/* Send an iTIP busytime request to remote attendees via iMIP or iSchedule */
+static void busytime_query_remote(const char *server __attribute__((unused)),
+				 void *data, void *rock)
+{
+ struct sched_param *remote = (struct sched_param *) data;
+ struct remote_rock *rrock = (struct remote_rock *) rock;
+ icalcomponent *comp;
+ struct proplist *list;
+ xmlNodePtr resp;
+ const char *status = NULL;
+ int r;
+
+ comp = icalcomponent_get_first_real_component(rrock->ical);
+
+ /* Add the attendees to the iTIP request */
+ for (list = remote->props; list; list = list->next) {
+	icalcomponent_add_property(comp, list->prop);
+ }
+
+ if (remote->flags == SCHEDTYPE_REMOTE) {
+	/* Use iMIP */
+
+	r = imip_send(rrock->ical);
+
+	if (!r) status = REQSTAT_SENT;
+	else status = REQSTAT_TEMPFAIL;
+ }
+ else {
+	/* Use iSchedule */
+	xmlNodePtr xml;
+
+	r = isched_send(remote, NULL, rrock->ical, &xml);
+	if (r) status = REQSTAT_TEMPFAIL;
+	else if (xmlStrcmp(xml->name, BAD_CAST "schedule-response")) {
+	 if (r) status = REQSTAT_TEMPFAIL;
+	}
+	else {
+	 xmlNodePtr cur;
+
+	 /* Process each response element */
+	 for (cur = xml->children; cur; cur = cur->next) {
+		xmlNodePtr node;
+		xmlChar *recip = NULL, *status = NULL, *content = NULL;
+
+		if (cur->type != XML_ELEMENT_NODE) continue;
+
+		for (node = cur->children; node; node = node->next) {
+		 if (node->type != XML_ELEMENT_NODE) continue;
+
+		 if (!xmlStrcmp(node->name, BAD_CAST "recipient"))
+			recip = xmlNodeGetContent(node);
+		 else if (!xmlStrcmp(node->name, BAD_CAST "request-status"))
+			status = xmlNodeGetContent(node);
+		 else if (!xmlStrcmp(node->name, BAD_CAST "calendar-data"))
+			content = xmlNodeGetContent(node);
+		}
+
+		resp =
+		 xml_add_schedresponse(rrock->root,
+					 !(rrock->txn->req_tgt.allow & ALLOW_ISCHEDULE) ?
+					 rrock->nsNS_DAV : NULL,
+					 recip, status);
+
+		xmlFree(status);
+		xmlFree(recip);
+
+		if (content) {
+		 xmlNodePtr cdata =
+			xmlNewTextChild(resp, NULL,
+					BAD_CAST "calendar-data", NULL);
+		 xmlAddChild(cdata,
+				xmlNewCDataBlock(rrock->root->doc,
+						 content,
+						 xmlStrlen(content)));
+		 xmlFree(content);
+
+		 /* iCal data in resp SHOULD NOT be transformed */
+		 rrock->txn->flags.cc |= CC_NOTRANSFORM;
+		}
+	 }
+
+	 xmlFreeDoc(xml->doc);
+	}
+ }
+
+ /* Report request-status (if necesary)
+ * Remove the attendees from the iTIP request and hash bucket
+ */
+ for (list = remote->props; list; list = list->next) {
+	if (status) {
+	 const char *attendee = icalproperty_get_attendee(list->prop);
+	 xml_add_schedresponse(rrock->root,
+				 !(rrock->txn->req_tgt.allow & ALLOW_ISCHEDULE) ?
+				 rrock->nsNS_DAV : NULL,
+				 BAD_CAST attendee,
+				 BAD_CAST status);
+	}
+
+	icalcomponent_remove_property(comp, list->prop);
+	icalproperty_free(list->prop);
+ }
+
+ if (remote->server) free(remote->server);
+}
+
+
+static void free_sched_param(void *data)
+{
+ struct sched_param *sched_param = (struct sched_param *) data;
+
+ if (sched_param) {
+	struct proplist *prop, *next;
+
+	for (prop = sched_param->props; prop; prop = next) {
+	 next = prop->next;
+	 free(prop);
+	}
+	free(sched_param);
+ }
+}
+
+
+/* Perform a Busy Time query based on given VFREEBUSY component */
+/* NOTE: This function is destructive of 'ical' */
+int sched_busytime_query(struct transaction_t *txn,
+			 struct mime_type_t *mime, icalcomponent *ical)
+{
+ int ret = 0;
+ static const char *calendarprefix = NULL;
+ icalcomponent *comp;
+ char mailboxnameMAX_MAILBOX_BUFFER;
+ icalproperty *prop = NULL, *next;
+ const char *uid = NULL, *organizer = NULL;
+ struct sched_param sparam;
+ struct auth_state *org_authstate = NULL;
+ xmlNodePtr root = NULL;
+ xmlNsPtr nsNUM_NAMESPACE;
+ struct propfind_ctx fctx;
+ struct calquery_filter calfilter;
+ struct hash_table remote_table;
+ struct sched_param *remote = NULL;
+
+ if (!calendarprefix) {
+	calendarprefix = config_getstring(IMAPOPT_CALENDARPREFIX);
+ }
+
+ comp = icalcomponent_get_first_real_component(ical);
+ uid = icalcomponent_get_uid(comp);
+
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ organizer = icalproperty_get_organizer(prop);
+
+ /* XXX Do we need to do more checks here? */
+ if (caladdress_lookup(organizer, &sparam) ||
+	(sparam.flags & SCHEDTYPE_REMOTE))
+	org_authstate = auth_newstate("anonymous");
+ else
+	org_authstate = auth_newstate(sparam.userid);
+
+ /* Start construction of our schedule-response */
+ if (!(root =
+	 init_xml_response("schedule-response",
+			 (txn->req_tgt.allow & ALLOW_ISCHEDULE) ? NS_ISCHED :
+			 NS_CALDAV, NULL, ns))) {
+	ret = HTTP_SERVER_ERROR;
+	txn->error.desc = "Unable to create XML response\r\n";
+	goto done;
+ }
+
+ /* Populate our filter and propfind context for local attendees */
+ memset(&calfilter, 0, sizeof(struct calquery_filter));
+ calfilter.comp = CAL_COMP_VEVENT | CAL_COMP_VFREEBUSY;
+ calfilter.start = icalcomponent_get_dtstart(comp);
+ calfilter.end = icalcomponent_get_dtend(comp);
+ calfilter.check_transp = 1;
+ calfilter.save_busytime = 1;
+
+ memset(&fctx, 0, sizeof(struct propfind_ctx));
+ fctx.req_tgt = &txn->req_tgt;
+ fctx.depth = 2;
+ fctx.userid = proxy_userid;
+ fctx.int_userid = httpd_userid;
+ fctx.userisadmin = httpd_userisadmin;
+ fctx.authstate = org_authstate;
+ fctx.reqd_privs = 0; /* handled by CALDAV:schedule-deliver on Inbox */
+ fctx.filter = apply_calfilter;
+ fctx.filter_crit = &calfilter;
+ fctx.err = &txn->error;
+ fctx.ret = &ret;
+ fctx.fetcheddata = 0;
+
+ /* Create hash table for any remote attendee servers */
+ construct_hash_table(&remote_table, 10, 1);
+
+ assert(!buf_len(&txn->buf));
+
+ /* Process each attendee */
+ for (prop = icalcomponent_get_first_property(comp, ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = next) {
+	const char *attendee;
+	int r;
+
+	next = icalcomponent_get_next_property(comp, ICAL_ATTENDEE_PROPERTY);
+
+	/* Remove each attendee so we can add in only those
+	 that reside on a given remote server later */
+	icalcomponent_remove_property(comp, prop);
+
+	/* Is attendee remote or local? */
+	attendee = icalproperty_get_attendee(prop);
+	r = caladdress_lookup(attendee, &sparam);
+
+	/* Don't allow scheduling of remote users via an iSchedule request */
+	if ((sparam.flags & SCHEDTYPE_REMOTE) &&
+	 (txn->req_tgt.allow & ALLOW_ISCHEDULE)) {
+	 r = HTTP_FORBIDDEN;
+	}
+
+	if (r) {
+	 xml_add_schedresponse(root,
+				 !(txn->req_tgt.allow & ALLOW_ISCHEDULE) ?
+				 nsNS_DAV : NULL,
+				 BAD_CAST attendee, BAD_CAST REQSTAT_NOUSER);
+
+	 icalproperty_free(prop);
+	}
+	else if (sparam.flags) {
+	 /* Remote attendee */
+	 struct proplist *newprop;
+	 const char *key;
+
+	 if (sparam.flags == SCHEDTYPE_REMOTE) {
+		/* iMIP - collect attendees under empty key (no server) */
+		key = "";
+	 }
+	 else {
+		/* iSchedule - collect attendees by server */
+		key = sparam.server;
+	 }
+
+	 remote = hash_lookup(key, &remote_table);
+	 if (!remote) {
+		/* New remote - add it to the hash table */
+		remote = xzmalloc(sizeof(struct sched_param));
+		if (sparam.server) remote->server = xstrdup(sparam.server);
+		remote->port = sparam.port;
+		remote->flags = sparam.flags;
+		hash_insert(key, remote, &remote_table);
+	 }
+	 newprop = xmalloc(sizeof(struct proplist));
+	 newprop->prop = prop;
+	 newprop->next = remote->props;
+	 remote->props = newprop;
+	}
+	else {
+	 /* Local attendee on this server */
+	 xmlNodePtr resp;
+	 const char *userid = sparam.userid;
+	 mbentry_t *mbentry = NULL;
+	 icalcomponent *busy = NULL;
+	 int rights = 0;
+
+	 resp =
+		xml_add_schedresponse(root,
+				 !(txn->req_tgt.allow & ALLOW_ISCHEDULE) ?
+				 nsNS_DAV : NULL,
+				 BAD_CAST attendee, NULL);
+
+	 /* Check ACL of ORGANIZER on attendee's Scheduling Inbox */
+	 snprintf(mailboxname, sizeof(mailboxname),
+		 "user.%s.%s.Inbox", userid, calendarprefix);
+
+	 r = mboxlist_lookup(mailboxname, &mbentry, NULL);
+	 if (r) {
+		syslog(LOG_INFO, "mboxlist_lookup(%s) failed: %s",
+		 mailboxname, error_message(r));
+		xmlNewChild(resp, NULL, BAD_CAST "request-status",
+			 BAD_CAST REQSTAT_REJECTED);
+	 }
+	 else {
+		rights = cyrus_acl_myrights(org_authstate, mbentry->acl);
+		mboxlist_entry_free(&mbentry);
+		if (!(rights & DACL_SCHEDFB)) {
+		 xmlNewChild(resp, NULL, BAD_CAST "request-status",
+				BAD_CAST REQSTAT_NOPRIVS);
+		}
+		else {
+		 /* Start query at attendee's calendar-home-set */
+		 snprintf(mailboxname, sizeof(mailboxname),
+			 "user.%s.%s", userid, calendarprefix);
+
+		 fctx.davdb = caldav_open(userid, CALDAV_CREATE);
+		 fctx.req_tgt->collection = NULL;
+		 calfilter.busytime.len = 0;
+		 busy = busytime_query_local(txn, &fctx, mailboxname,
+						ICAL_METHOD_REPLY, uid,
+						organizer, attendee);
+
+		 caldav_close(fctx.davdb);
+		}
+	 }
+
+	 if (busy) {
+		xmlNodePtr cdata;
+		const char *fb_str = mime->to_string(busy);
+		icalcomponent_free(busy);
+
+		xmlNewChild(resp, NULL, BAD_CAST "request-status",
+			 BAD_CAST REQSTAT_SUCCESS);
+
+		cdata = xmlNewTextChild(resp, NULL,
+					BAD_CAST "calendar-data", NULL);
+
+		/* Trim any charset from content-type */
+		buf_reset(&txn->buf);
+		buf_printf(&txn->buf, "%.*s",
+			 (int) strcspn(mime->content_type, ";"),
+			 mime->content_type);
+
+		xmlNewProp(cdata, BAD_CAST "content-type",
+			 BAD_CAST buf_cstring(&txn->buf));
+
+		if (mime->version)
+		 xmlNewProp(cdata, BAD_CAST "version",
+			 BAD_CAST mime->version);
+
+		xmlAddChild(cdata,
+			 xmlNewCDataBlock(root->doc, BAD_CAST fb_str,
+					 strlen(fb_str)));
+
+		/* iCalendar data in response should not be transformed */
+		txn->flags.cc |= CC_NOTRANSFORM;
+	 }
+	 else {
+		xmlNewChild(resp, NULL, BAD_CAST "request-status",
+			 BAD_CAST REQSTAT_NOUSER);
+	 }
+
+	 icalproperty_free(prop);
+	}
+ }
+
+ buf_reset(&txn->buf);
+
+ if (remote) {
+	struct remote_rock rrock = { txn, ical, root, ns };
+	hash_enumerate(&remote_table, busytime_query_remote, &rrock);
+ }
+ free_hash_table(&remote_table, free_sched_param);
+
+ /* Output the XML response */
+ if (!ret) xml_response(HTTP_OK, txn, root->doc);
+
+ done:
+ if (org_authstate) auth_freestate(org_authstate);
+ if (calfilter.busytime.busy) free(calfilter.busytime.busy);
+ if (root) xmlFreeDoc(root->doc);
+
+ return ret;
+}
+
+
+static void free_sched_data(void *data)
+{
+ struct sched_data *sched_data = (struct sched_data *) data;
+
+ if (sched_data) {
+	if (sched_data->itip) icalcomponent_free(sched_data->itip);
+	if (sched_data->force_send) free(sched_data->force_send);
+	free(sched_data);
+ }
+}
+
+
+#define SCHEDSTAT_PENDING	"1.0"
+#define SCHEDSTAT_SENT		"1.1"
+#define SCHEDSTAT_DELIVERED	"1.2"
+#define SCHEDSTAT_SUCCESS	"2.0"
+#define SCHEDSTAT_PARAM		"2.3"
+#define SCHEDSTAT_NOUSER	"3.7"
+#define SCHEDSTAT_NOPRIVS	"3.8"
+#define SCHEDSTAT_TEMPFAIL	"5.1"
+#define SCHEDSTAT_PERMFAIL	"5.2"
+#define SCHEDSTAT_REJECTED	"5.3"
+
+/* Deliver scheduling object to a remote recipient */
+static void sched_deliver_remote(const char *recipient,
+				 struct sched_param *sparam,
+				 struct sched_data *sched_data)
+{
+ int r;
+
+ if (sparam->flags == SCHEDTYPE_REMOTE) {
+	/* Use iMIP */
+	r = imip_send(sched_data->itip);
+	if (!r) {
+	 sched_data->status =
+		sched_data->ischedule ? REQSTAT_SENT : SCHEDSTAT_SENT;
+	}
+	else {
+	 sched_data->status = sched_data->ischedule ?
+		REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	}
+ }
+ else {
+	/* Use iSchedule */
+	xmlNodePtr xml;
+
+	r = isched_send(sparam, recipient, sched_data->itip, &xml);
+	if (r) {
+	 sched_data->status = sched_data->ischedule ?
+		REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	}
+	else if (xmlStrcmp(xml->name, BAD_CAST "schedule-response")) {
+	 sched_data->status = sched_data->ischedule ?
+		REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	}
+	else {
+	 xmlNodePtr cur;
+
+	 /* Process each response element */
+	 for (cur = xml->children; cur; cur = cur->next) {
+		xmlNodePtr node;
+		xmlChar *recip = NULL, *status = NULL;
+		static char statbuf1024;
+
+		if (cur->type != XML_ELEMENT_NODE) continue;
+
+		for (node = cur->children; node; node = node->next) {
+		 if (node->type != XML_ELEMENT_NODE) continue;
+
+		 if (!xmlStrcmp(node->name, BAD_CAST "recipient"))
+			recip = xmlNodeGetContent(node);
+		 else if (!xmlStrcmp(node->name,
+					BAD_CAST "request-status"))
+			status = xmlNodeGetContent(node);
+		}
+
+		if (!strncmp((const char *) status, "2.0", 3)) {
+		 sched_data->status = sched_data->ischedule ?
+			REQSTAT_DELIVERED : SCHEDSTAT_DELIVERED;
+		}
+		else {
+		 if (sched_data->ischedule)
+			strlcpy(statbuf, (const char *) status, sizeof(statbuf));
+		 else
+			strlcpy(statbuf, (const char *) status, 4);
+		 
+		 sched_data->status = statbuf;
+		}
+
+		xmlFree(status);
+		xmlFree(recip);
+	 }
+	}
+ }
+}
+
+/* Deliver scheduling object to local recipient */
+static void sched_deliver_local(const char *recipient,
+				struct sched_param *sparam,
+				struct sched_data *sched_data,
+				struct auth_state *authstate)
+{
+ int r = 0, rights, reqd_privs, deliver_inbox = 0;
+ const char *userid = sparam->userid, *attendee = NULL;
+ static struct buf resource = BUF_INITIALIZER;
+ static unsigned sched_count = 0;
+ const char *mailboxname = NULL;
+ mbentry_t *mbentry = NULL;
+ struct mailbox *mailbox = NULL, *inbox = NULL;
+ struct caldav_db *caldavdb = NULL;
+ struct caldav_data *cdata;
+ icalcomponent *ical = NULL;
+ icalproperty *prop;
+ struct transaction_t txn;
+
+ /* Check ACL of sender on recipient's Scheduling Inbox */
+ mailboxname = caldav_mboxname(userid, SCHED_INBOX);
+ r = mboxlist_lookup(mailboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_INFO, "mboxlist_lookup(%s) failed: %s",
+	 mailboxname, error_message(r));
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_REJECTED : SCHEDSTAT_REJECTED;
+	goto done;
+ }
+
+ rights = cyrus_acl_myrights(authstate, mbentry->acl);
+ mboxlist_entry_free(&mbentry);
+
+ reqd_privs = sched_data->is_reply ? DACL_REPLY : DACL_INVITE;
+ if (!(rights & reqd_privs)) {
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_NOPRIVS : SCHEDSTAT_NOPRIVS;
+	goto done;
+ }
+
+ /* Open recipient's Inbox for reading */
+ if ((r = mailbox_open_irl(mailboxname, &inbox))) {
+	syslog(LOG_ERR, "mailbox_open_irl(%s) failed: %s",
+	 mailboxname, error_message(r));
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	goto done;
+ }
+
+ /* Search for iCal UID in recipient's calendars */
+ caldavdb = caldav_open(userid, CALDAV_CREATE);
+ if (!caldavdb) {
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	goto done;
+ }
+
+ caldav_lookup_uid(caldavdb,
+		 icalcomponent_get_uid(sched_data->itip), 0, &cdata);
+
+ if (cdata->dav.mailbox) {
+	mailboxname = cdata->dav.mailbox;
+	buf_setcstr(&resource, cdata->dav.resource);
+ }
+ else if (sched_data->is_reply) {
+	/* Can't find object belonging to organizer - ignore reply */
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_PERMFAIL : SCHEDSTAT_PERMFAIL;
+	goto done;
+ }
+ else {
+	/* Can't find object belonging to attendee - use default calendar */
+	mailboxname = caldav_mboxname(userid, SCHED_DEFAULT);
+	buf_reset(&resource);
+	buf_printf(&resource, "%s.ics",
+		 icalcomponent_get_uid(sched_data->itip));
+ }
+
+ /* Open recipient's calendar for reading */
+ r = mailbox_open_irl(mailboxname, &mailbox);
+ if (r) {
+	syslog(LOG_ERR, "mailbox_open_irl(%s) failed: %s",
+	 mailboxname, error_message(r));
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	goto done;
+ }
+
+ if (!cdata->dav.imap_uid) {
+	/* Create new object (copy of request w/o METHOD) */
+	ical = icalcomponent_new_clone(sched_data->itip);
+
+	prop = icalcomponent_get_first_property(ical, ICAL_METHOD_PROPERTY);
+	icalcomponent_remove_property(ical, prop);
+	icalproperty_free(prop);
+
+	deliver_inbox = 1;
+ }
+ else {
+	/* Update existing object */
+	struct index_record record;
+	struct buf msg_buf = BUF_INITIALIZER;
+	icalcomponent *comp;
+	icalcomponent_kind kind;
+	icalproperty_method method;
+
+	/* Load message containing the resource and parse iCal data */
+	r = mailbox_find_index_record(mailbox, cdata->dav.imap_uid, &record, NULL);
+	if (!r) r = mailbox_map_record(mailbox, &record, &msg_buf);
+	if (r) {
+	 syslog(LOG_ERR, "mailbox_map_record(%s, %u) failed: %s",
+		 mailbox->name, record.uid, error_message(r));
+	 goto done;
+	}
+	ical = icalparser_parse_string(buf_base(&msg_buf) + record.header_size);
+	buf_free(&msg_buf);
+
+	/* Get component type */
+	comp = icalcomponent_get_first_real_component(ical);
+	kind = icalcomponent_isa(comp);
+
+	/* Get METHOD of the iTIP message */
+	method = icalcomponent_get_method(sched_data->itip);
+
+	switch (method) {
+	case ICAL_METHOD_CANCEL:
+	 /* Set STATUS:CANCELLED on all components */
+	 do {
+		icalcomponent_set_status(comp, ICAL_STATUS_CANCELLED);
+		icalcomponent_set_sequence(comp,
+					 icalcomponent_get_sequence(comp)+1);
+	 } while ((comp = icalcomponent_get_next_component(ical, kind)));
+
+	 deliver_inbox = 1;
+
+	 break;
+
+	case ICAL_METHOD_REPLY: {
+	 struct hash_table comp_table;
+	 icalcomponent *itip;
+	 icalproperty *att;
+	 icalparameter *param;
+	 icalparameter_partstat partstat;
+	 icalparameter_rsvp rsvp = ICAL_RSVP_NONE;
+	 const char *recurid, *req_stat = SCHEDSTAT_SUCCESS;
+
+	 /* Add each component of old object to hash table for comparison */
+	 construct_hash_table(&comp_table, 10, 1);
+	 comp = icalcomponent_get_first_real_component(ical);
+	 do {
+		prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+		if (prop) recurid = icalproperty_get_value_as_string(prop);
+		else recurid = "";
+
+		hash_insert(recurid, comp, &comp_table);
+
+	 } while ((comp = icalcomponent_get_next_component(ical, kind)));
+
+	 /* Process each component in the iTIP reply */
+	 itip = icalcomponent_get_first_component(sched_data->itip, kind);
+	 do {
+		/* Lookup this comp in the hash table */
+		prop =
+		 icalcomponent_get_first_property(itip,
+						 ICAL_RECURRENCEID_PROPERTY);
+		if (prop) recurid = icalproperty_get_value_as_string(prop);
+		else recurid = "";
+
+		comp = hash_lookup(recurid, &comp_table);
+		if (!comp) {
+		 /* New recurrence overridden by attendee.
+		 Create a new recurrence from master component. */
+		 comp =
+			icalcomponent_new_clone(hash_lookup("", &comp_table));
+
+		 /* Add RECURRENCE-ID */
+		 icalcomponent_add_property(comp,
+					 icalproperty_new_clone(prop));
+
+		 /* Remove RRULE */
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_RRULE_PROPERTY);
+		 if (prop) {
+			icalcomponent_remove_property(comp, prop);
+			icalproperty_free(prop);
+		 }
+
+		 /* Replace DTSTART, DTEND, SEQUENCE */
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_DTSTART_PROPERTY);
+		 if (prop) {
+			icalcomponent_remove_property(comp, prop);
+			icalproperty_free(prop);
+		 }
+		 prop =
+			icalcomponent_get_first_property(itip,
+							 ICAL_DTSTART_PROPERTY);
+		 if (prop)
+			icalcomponent_add_property(comp,
+						 icalproperty_new_clone(prop));
+
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_DTEND_PROPERTY);
+		 if (prop) {
+			icalcomponent_remove_property(comp, prop);
+			icalproperty_free(prop);
+		 }
+		 prop =
+			icalcomponent_get_first_property(itip,
+							 ICAL_DTEND_PROPERTY);
+		 if (prop)
+			icalcomponent_add_property(comp,
+						 icalproperty_new_clone(prop));
+
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_SEQUENCE_PROPERTY);
+		 if (prop) {
+			icalcomponent_remove_property(comp, prop);
+			icalproperty_free(prop);
+		 }
+		 prop =
+			icalcomponent_get_first_property(itip,
+							 ICAL_SEQUENCE_PROPERTY);
+		 if (prop)
+			icalcomponent_add_property(comp,
+						 icalproperty_new_clone(prop));
+
+		 icalcomponent_add_component(ical, comp);
+		}
+
+		/* Get the sending attendee */
+		att = icalcomponent_get_first_property(itip,
+						 ICAL_ATTENDEE_PROPERTY);
+		attendee = icalproperty_get_attendee(att);
+		param =
+		 icalproperty_get_first_parameter(att,
+						 ICAL_PARTSTAT_PARAMETER);
+		partstat = icalparameter_get_partstat(param);
+		param =
+		 icalproperty_get_first_parameter(att,
+						 ICAL_RSVP_PARAMETER);
+		if (param) rsvp = icalparameter_get_rsvp(param);
+
+		prop =
+		 icalcomponent_get_first_property(itip,
+						 ICAL_REQUESTSTATUS_PROPERTY);
+		if (prop) {
+		 struct icalreqstattype rq =
+			icalproperty_get_requeststatus(prop);
+		 req_stat =
+			icalenum_reqstat_code(rq.code);
+		}
+
+		/* Find matching attendee in existing object */
+		for (prop =
+			 icalcomponent_get_first_property(comp,
+							 ICAL_ATTENDEE_PROPERTY);
+		 prop && strcmp(attendee, icalproperty_get_attendee(prop));
+		 prop =
+			 icalcomponent_get_next_property(comp,
+							 ICAL_ATTENDEE_PROPERTY));
+		if (!prop) {
+		 /* Attendee added themselves to this recurrence */
+		 prop = icalproperty_new_clone(att);
+		 icalcomponent_add_property(comp, prop);
+		}
+
+		/* Find and set PARTSTAT */
+		param =
+		 icalproperty_get_first_parameter(prop,
+						 ICAL_PARTSTAT_PARAMETER);
+		if (!param) {
+		 param = icalparameter_new(ICAL_PARTSTAT_PARAMETER);
+		 icalproperty_add_parameter(prop, param);
+		}
+		icalparameter_set_partstat(param, partstat);
+
+		/* Find and set RSVP */
+		param =
+		 icalproperty_get_first_parameter(prop,
+						 ICAL_RSVP_PARAMETER);
+		if (param) icalproperty_remove_parameter_by_ref(prop, param);
+		if (rsvp != ICAL_RSVP_NONE) {
+		 param = icalparameter_new(ICAL_RSVP_PARAMETER);
+		 icalproperty_add_parameter(prop, param);
+		 icalparameter_set_rsvp(param, rsvp);
+		}
+
+		/* Find and set SCHEDULE-STATUS */
+		for (param =
+			 icalproperty_get_first_parameter(prop,
+							 ICAL_IANA_PARAMETER);
+		 param && strcmp(icalparameter_get_iana_name(param),
+				 "SCHEDULE-STATUS");
+		 param =
+			 icalproperty_get_next_parameter(prop,
+							 ICAL_IANA_PARAMETER));
+		if (!param) {
+		 param = icalparameter_new(ICAL_IANA_PARAMETER);
+		 icalproperty_add_parameter(prop, param);
+		 icalparameter_set_iana_name(param, "SCHEDULE-STATUS");
+		}
+		icalparameter_set_iana_value(param, req_stat);
+
+	 } while ((itip = icalcomponent_get_next_component(sched_data->itip,
+							 kind)));
+
+	 free_hash_table(&comp_table, NULL);
+
+	 deliver_inbox = 1;
+
+	 break;
+	}
+
+	case ICAL_METHOD_REQUEST: {
+	 struct hash_table comp_table;
+	 icalcomponent *itip;
+	 const char *tzid, *recurid;
+
+	 /* Add each VTIMEZONE of old object to hash table for comparison */
+	 construct_hash_table(&comp_table, 10, 1);
+	 for (comp = icalcomponent_get_first_component(ical,
+							 ICAL_VTIMEZONE_COMPONENT);
+		 comp;
+		 comp =
+		 icalcomponent_get_next_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT)) {
+		prop =
+		 icalcomponent_get_first_property(comp, ICAL_TZID_PROPERTY);
+		tzid = icalproperty_get_tzid(prop);
+
+		hash_insert(tzid, comp, &comp_table);
+	 }
+
+	 /* Process each VTIMEZONE in the iTIP request */
+	 for (itip =
+		 icalcomponent_get_first_component(sched_data->itip,
+						 ICAL_VTIMEZONE_COMPONENT);
+		 itip;
+		 itip =
+		 icalcomponent_get_next_component(sched_data->itip,
+						 ICAL_VTIMEZONE_COMPONENT)) {
+		/* Lookup this TZID in the hash table */
+		prop =
+		 icalcomponent_get_first_property(itip,
+						 ICAL_TZID_PROPERTY);
+		tzid = icalproperty_get_tzid(prop);
+
+		comp = hash_lookup(tzid, &comp_table);
+		if (comp) {
+		 /* Remove component from old object */
+		 icalcomponent_remove_component(ical, comp);
+		 icalcomponent_free(comp);
+		}
+
+		/* Add new/modified component from iTIP request*/
+		icalcomponent_add_component(ical,
+					 icalcomponent_new_clone(itip));
+	 }
+
+	 free_hash_table(&comp_table, NULL);
+
+	 /* Add each component of old object to hash table for comparison */
+	 construct_hash_table(&comp_table, 10, 1);
+	 comp = icalcomponent_get_first_real_component(ical);
+	 do {
+		prop =
+		 icalcomponent_get_first_property(comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+		if (prop) recurid = icalproperty_get_value_as_string(prop);
+		else recurid = "";
+
+		hash_insert(recurid, comp, &comp_table);
+
+	 } while ((comp = icalcomponent_get_next_component(ical, kind)));
+
+	 /* Process each component in the iTIP request */
+	 itip = icalcomponent_get_first_component(sched_data->itip, kind);
+	 do {
+		icalcomponent *new_comp = icalcomponent_new_clone(itip);
+
+		/* Lookup this comp in the hash table */
+		prop =
+		 icalcomponent_get_first_property(itip,
+						 ICAL_RECURRENCEID_PROPERTY);
+		if (prop) recurid = icalproperty_get_value_as_string(prop);
+		else recurid = "";
+
+		comp = hash_lookup(recurid, &comp_table);
+		if (comp) {
+		 int old_seq, new_seq;
+		 icalparameter *param;
+
+		 /* Check if this is something more than an update */
+		 /* XXX Probably need to check PARTSTAT=NEEDS-ACTION
+		 and RSVP=TRUE as well */
+		 old_seq = icalcomponent_get_sequence(comp);
+		 new_seq = icalcomponent_get_sequence(itip);
+		 if (new_seq > old_seq) deliver_inbox = 1;
+
+		 /* Copy over any COMPLETED, PERCENT-COMPLETE,
+		 or TRANSP properties */
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_COMPLETED_PROPERTY);
+		 if (prop) {
+			icalcomponent_add_property(new_comp,
+						 icalproperty_new_clone(prop));
+		 }
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_PERCENTCOMPLETE_PROPERTY);
+		 if (prop) {
+			icalcomponent_add_property(new_comp,
+						 icalproperty_new_clone(prop));
+		 }
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_TRANSP_PROPERTY);
+		 if (prop) {
+			icalcomponent_add_property(new_comp,
+						 icalproperty_new_clone(prop));
+		 }
+
+		 /* Copy over any ORGANIZER;SCHEDULE-STATUS */
+		 /* XXX Do we only do this iff PARTSTAT!=NEEDS-ACTION */
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_ORGANIZER_PROPERTY);
+		 for (param =
+			 icalproperty_get_first_parameter(prop,
+							 ICAL_IANA_PARAMETER);
+			 param;
+			 param =
+			 icalproperty_get_next_parameter(prop,
+							 ICAL_IANA_PARAMETER)) {
+			if (!strcmp(icalparameter_get_iana_name(param),
+				 "SCHEDULE-STATUS")) {
+			 const char *sched_stat =
+				icalparameter_get_iana_value(param);
+
+			 prop =
+				icalcomponent_get_first_property(new_comp,
+								 ICAL_ORGANIZER_PROPERTY);
+			 param = icalparameter_new(ICAL_IANA_PARAMETER);
+			 icalproperty_add_parameter(prop, param);
+			 icalparameter_set_iana_name(param,
+							"SCHEDULE-STATUS");
+			 icalparameter_set_iana_value(param, sched_stat);
+			}
+		 }
+
+		 /* Remove component from old object */
+		 icalcomponent_remove_component(ical, comp);
+		 icalcomponent_free(comp);
+		}
+		else deliver_inbox = 1;
+
+		/* Add new/modified component from iTIP request*/
+		icalcomponent_add_component(ical, new_comp);
+
+	 } while ((itip = icalcomponent_get_next_component(sched_data->itip,
+							 kind)));
+
+	 free_hash_table(&comp_table, NULL);
+
+	 break;
+	}
+
+	default:
+	 /* Unknown METHOD -- ignore it */
+	 syslog(LOG_ERR, "Unknown iTIP method: %s",
+		 icalenum_method_to_string(method));
+	 goto inbox;
+	}
+ }
+
+ /* Store the (updated) object in the recipients's calendar */
+ mailbox_unlock_index(mailbox, NULL);
+
+ r = store_resource(&txn, ical, mailbox, buf_cstring(&resource),
+		 caldavdb, OVERWRITE_YES, NEW_STAG);
+
+ if (r == HTTP_CREATED || r == HTTP_NO_CONTENT) {
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_SUCCESS : SCHEDSTAT_DELIVERED;
+ }
+ else {
+	syslog(LOG_ERR, "store_resource(%s) failed: %s (%s)",
+	 mailbox->name, error_message(r), txn.error.resource);
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_TEMPFAIL : SCHEDSTAT_TEMPFAIL;
+	goto done;
+ }
+
+ inbox:
+ if (deliver_inbox) {
+	/* Create a name for the new iTIP message resource */
+	buf_reset(&resource);
+	buf_printf(&resource, "%x-%d-%ld-%u.ics",
+		 strhash(icalcomponent_get_uid(sched_data->itip)), getpid(),
+		 time(0), sched_count++);
+
+	/* Store the message in the recipient's Inbox */
+	mailbox_unlock_index(inbox, NULL);
+
+	r = store_resource(&txn, sched_data->itip, inbox,
+			 buf_cstring(&resource), caldavdb, OVERWRITE_NO, 0);
+	/* XXX What do we do if storing to Inbox fails? */
+ }
+
+ /* XXX Should this be a config option? - it might have perf implications */
+ if (sched_data->is_reply) {
+	/* Send updates to attendees */
+	sched_request(recipient, sparam, NULL, ical, attendee);
+ }
+
+ done:
+ if (ical) icalcomponent_free(ical);
+ if (inbox) {
+	mailbox_unlock_index(inbox, NULL);
+	mailbox_close(&inbox);
+ }
+ if (mailbox) mailbox_close(&mailbox);
+ if (caldavdb) caldav_close(caldavdb);
+}
+
+
+/* Deliver scheduling object to recipient's Inbox */
+void sched_deliver(const char *recipient, void *data, void *rock)
+{
+ struct sched_data *sched_data = (struct sched_data *) data;
+ struct auth_state *authstate = (struct auth_state *) rock;
+ struct sched_param sparam;
+
+ /* Check SCHEDULE-FORCE-SEND value */
+ if (sched_data->force_send) {
+	const char *force = sched_data->is_reply ? "REPLY" : "REQUEST";
+
+	if (strcmp(sched_data->force_send, force)) {
+	 sched_data->status = SCHEDSTAT_PARAM;
+	 return;
+	}
+ }
+
+ if (caladdress_lookup(recipient, &sparam)) {
+	sched_data->status =
+	 sched_data->ischedule ? REQSTAT_NOUSER : SCHEDSTAT_NOUSER;
+	/* Unknown user */
+	return;
+ }
+
+ if (sparam.flags) {
+	/* Remote recipient */
+	sched_deliver_remote(recipient, &sparam, sched_data);
+ }
+ else {
+	/* Local recipient */
+	sched_deliver_local(recipient, &sparam, sched_data, authstate);
+ }
+}
+
+
+struct comp_data {
+ icalcomponent *comp;
+ icalparameter_partstat partstat;
+ int sequence;
+};
+
+static void free_comp_data(void *data) {
+ struct comp_data *comp_data = (struct comp_data *) data;
+
+ if (comp_data) {
+	if (comp_data->comp) icalcomponent_free(comp_data->comp);
+	free(comp_data);
+ }
+}
+
+
+/*
+ * sched_request/reply() helper function
+ *
+ * Update DTSTAMP, remove VALARMs,
+ * optionally remove scheduling params from ORGANIZER
+ */
+static void clean_component(icalcomponent *comp, int clean_org)
+{
+ icalcomponent *alarm, *next;
+ icalproperty *prop;
+ icaltimezone *utc = icaltimezone_get_utc_timezone();
+ time_t now = time(NULL);
+
+ /* Replace DTSTAMP on component */
+ prop = icalcomponent_get_first_property(comp,
+					 ICAL_DTSTAMP_PROPERTY);
+ icalcomponent_remove_property(comp, prop);
+ icalproperty_free(prop);
+ prop =
+	icalproperty_new_dtstamp(icaltime_from_timet_with_zone(now, 0, utc));
+ icalcomponent_add_property(comp, prop);
+
+ /* Remove any VALARM components */
+ for (alarm = icalcomponent_get_first_component(comp, ICAL_VALARM_COMPONENT);
+	 alarm; alarm = next) {
+	next = icalcomponent_get_next_component(comp, ICAL_VALARM_COMPONENT);
+	icalcomponent_remove_component(comp, alarm);
+	icalcomponent_free(alarm);
+ }
+
+ if (clean_org) {
+	icalparameter *param, *next;
+
+	/* Grab the organizer */
+	prop = icalcomponent_get_first_property(comp,
+						ICAL_ORGANIZER_PROPERTY);
+
+	/* Remove CalDAV Scheduling parameters from organizer */
+	for (param =
+		 icalproperty_get_first_parameter(prop, ICAL_IANA_PARAMETER);
+	 param; param = next) {
+	 next = icalproperty_get_next_parameter(prop, ICAL_IANA_PARAMETER);
+
+	 if (!strcmp(icalparameter_get_iana_name(param),
+			"SCHEDULE-AGENT")) {
+		icalproperty_remove_parameter_by_ref(prop, param);
+	 }
+	 else if (!strcmp(icalparameter_get_iana_name(param),
+			 "SCHEDULE-FORCE-SEND")) {
+		icalproperty_remove_parameter_by_ref(prop, param);
+	 }
+	}
+ }
+}
+
+
+/*
+ * sched_request() helper function
+ *
+ * Add EXDATE to master component if attendee is excluded from recurrence
+ */
+struct exclude_rock {
+ unsigned ncomp;
+ icalcomponent *comp;
+};
+
+static void sched_exclude(const char *attendee __attribute__((unused)),
+			 void *data, void *rock)
+{
+ struct sched_data *sched_data = (struct sched_data *) data;
+ struct exclude_rock *erock = (struct exclude_rock *) rock;
+
+ if (!(sched_data->comp_mask & (1<<erock->ncomp))) {
+	icalproperty *recurid, *exdate;
+	struct icaltimetype exdt;
+	icalparameter *param;
+
+	/* Fetch the RECURRENCE-ID and use it to create a new EXDATE */
+	recurid = icalcomponent_get_first_property(erock->comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+	exdt = icalproperty_get_recurrenceid(recurid);
+
+	exdate = icalproperty_new_exdate(exdt);
+
+	/* Copy any parameters from RECURRENCE-ID to EXDATE */
+	param = icalproperty_get_first_parameter(recurid, ICAL_TZID_PARAMETER);
+	if (param) {
+	 icalproperty_add_parameter(exdate, icalparameter_new_clone(param));
+	}
+	param = icalproperty_get_first_parameter(recurid, ICAL_VALUE_PARAMETER);
+	if (param) {
+	 icalproperty_add_parameter(exdate, icalparameter_new_clone(param));
+	}
+	/* XXX Need to handle RANGE parameter */
+
+	/* Add the EXDATE to the master component for this attendee */
+	icalcomponent_add_property(sched_data->master, exdate);
+ }
+}
+
+
+/*
+ * sched_request() helper function
+ *
+ * Process all attendees in the given component and add a 
+ * properly modified component to the attendee's iTIP request if necessary
+ */
+static void process_attendees(icalcomponent *comp, unsigned ncomp,
+			 const char *organizer, const char *att_update,
+			 struct hash_table *att_table,
+			 icalcomponent *itip, unsigned needs_action)
+{
+ icalcomponent *copy;
+ icalproperty *prop;
+ icalparameter *param, *next;
+
+ /* Strip SCHEDULE-STATUS from each attendee
+ and optionally set PROPSTAT=NEEDS-ACTION */
+ for (prop = icalcomponent_get_first_property(comp, ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = icalcomponent_get_next_property(comp, ICAL_ATTENDEE_PROPERTY)) {
+	const char *attendee = icalproperty_get_attendee(prop);
+
+	/* Don't modify attendee == organizer */
+	if (!strcmp(attendee, organizer)) continue;
+
+	for (param =
+		 icalproperty_get_first_parameter(prop, ICAL_IANA_PARAMETER);
+	 param; param = next) {
+	 next = icalproperty_get_next_parameter(prop, ICAL_IANA_PARAMETER);
+
+	 if (!strcmp(icalparameter_get_iana_name(param),
+			 "SCHEDULE-STATUS")) {
+		icalproperty_remove_parameter_by_ref(prop, param);
+	 }
+	}
+
+	if (needs_action) {
+	 param =
+		icalproperty_get_first_parameter(prop, ICAL_PARTSTAT_PARAMETER);
+	 if (!param) {
+		param = icalparameter_new(ICAL_PARTSTAT_PARAMETER);
+		icalproperty_add_parameter(prop, param);
+	 }
+	 icalparameter_set_partstat(param, ICAL_PARTSTAT_NEEDSACTION);
+	}
+ }
+
+ /* Clone a working copy of the component */
+ copy = icalcomponent_new_clone(comp);
+
+ clean_component(copy, 0);
+
+ /* Process each attendee */
+ for (prop = icalcomponent_get_first_property(copy, ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = icalcomponent_get_next_property(copy, ICAL_ATTENDEE_PROPERTY)) {
+	const char *attendee = icalproperty_get_attendee(prop);
+	unsigned do_sched = 1;
+	icalparameter *force_send = NULL;
+
+	/* Don't schedule attendee == organizer */
+	if (!strcmp(attendee, organizer)) continue;
+
+	/* Don't send an update to the attendee that just sent a reply */
+	if (att_update && !strcmp(attendee, att_update)) continue;
+
+	/* Check CalDAV Scheduling parameters */
+	for (param =
+		 icalproperty_get_first_parameter(prop, ICAL_IANA_PARAMETER);
+	 param; param = next) {
+	 next = icalproperty_get_next_parameter(prop, ICAL_IANA_PARAMETER);
+
+	 if (!strcmp(icalparameter_get_iana_name(param),
+			"SCHEDULE-AGENT")) {
+		do_sched =
+		 !strcmp(icalparameter_get_iana_value(param), "SERVER");
+		icalproperty_remove_parameter_by_ref(prop, param);
+	 }
+	 else if (!strcmp(icalparameter_get_iana_name(param),
+			 "SCHEDULE-FORCE-SEND")) {
+		force_send = param;
+	 }
+	}
+
+	/* Create/update iTIP request for this attendee */
+	if (do_sched) {
+	 struct sched_data *sched_data;
+	 icalcomponent *new_comp;
+
+	 sched_data = hash_lookup(attendee, att_table);
+	 if (!sched_data) {
+		/* New attendee - add it to the hash table */
+		sched_data = xzmalloc(sizeof(struct sched_data));
+		sched_data->itip = icalcomponent_new_clone(itip);
+		if (force_send) {
+		 sched_data->force_send =
+			xstrdup(icalparameter_get_iana_value(force_send));
+		}
+		hash_insert(attendee, sched_data, att_table);
+	 }
+	 new_comp = icalcomponent_new_clone(copy);
+	 icalcomponent_add_component(sched_data->itip, new_comp);
+	 sched_data->comp_mask |= (1 << ncomp);
+
+	 /* XXX We assume that the master component is always first */
+	 if (!ncomp) sched_data->master = new_comp;
+	}
+
+	if (force_send) icalproperty_remove_parameter_by_ref(prop, force_send);
+ }
+
+ /* XXX We assume that the master component is always first */
+ if (ncomp) {
+	/* Handle attendees that are excluded from this recurrence */
+	struct exclude_rock erock = { ncomp, copy };
+
+	hash_enumerate(att_table, sched_exclude, &erock);
+ }
+
+ icalcomponent_free(copy);
+}
+
+
+/*
+ * sched_request() helper function
+ *
+ * Organizer removed this component, mark it as cancelled for all attendees
+ */
+struct cancel_rock {
+ const char *organizer;
+ struct hash_table *att_table;
+ icalcomponent *itip;
+};
+
+static void sched_cancel(const char *recurid __attribute__((unused)),
+			 void *data, void *rock)
+{
+ struct comp_data *old_data = (struct comp_data *) data;
+ struct cancel_rock *crock = (struct cancel_rock *) rock;
+
+ /* Deleting the object -- set STATUS to CANCELLED for component */
+ icalcomponent_set_status(old_data->comp, ICAL_STATUS_CANCELLED);
+// icalcomponent_set_sequence(old_data->comp, old_data->sequence+1);
+
+ process_attendees(old_data->comp, 0, crock->organizer, NULL,
+		 crock->att_table, crock->itip, 0);
+}
+
+
+static unsigned propcmp(icalcomponent *oldical, icalcomponent *newical,
+			icalproperty_kind kind)
+{
+ icalproperty *oldprop, *newprop;
+
+ oldprop = icalcomponent_get_first_property(oldical, kind);
+ newprop = icalcomponent_get_first_property(newical, kind);
+
+ if (!oldprop) {
+	if (newprop) return 1;
+ }
+ else if (!newprop) return 1;
+ else {
+	/* XXX Do something smarter based on property type */
+	const char *oldstr = icalproperty_get_value_as_string(oldprop);
+	const char *newstr = icalproperty_get_value_as_string(newprop);
+
+	if (strcmp(oldstr, newstr)) return 1;
+ }
+
+ return 0;
+}
+
+
+/* Create and deliver an organizer scheduling request */
+static void sched_request(const char *organizer, struct sched_param *sparam,
+			 icalcomponent *oldical, icalcomponent *newical,
+			 const char *att_update)
+{
+ int r;
+ icalproperty_method method;
+ static struct buf prodid = BUF_INITIALIZER;
+ struct auth_state *authstate;
+ icalcomponent *ical, *req, *comp;
+ icalproperty *prop;
+ icalcomponent_kind kind;
+ struct hash_table att_table, comp_table;
+ const char *sched_stat = NULL, *recurid;
+ struct comp_data *old_data;
+
+ /* Check what kind of action we are dealing with */
+ if (!newical) {
+	/* Remove */
+	ical = oldical;
+	method = ICAL_METHOD_CANCEL;
+ }
+ else {
+	/* Create / Modify */
+	ical = newical;
+	method = ICAL_METHOD_REQUEST;
+ }
+
+ if (!att_update) {
+	int rights = 0;
+	mbentry_t *mbentry = NULL;
+	/* Check ACL of auth'd user on userid's Scheduling Outbox */
+	const char *outboxname = caldav_mboxname(sparam->userid, SCHED_OUTBOX);
+
+	r = mboxlist_lookup(outboxname, &mbentry, NULL);
+	if (r) {
+	 syslog(LOG_INFO, "mboxlist_lookup(%s) failed: %s",
+		 outboxname, error_message(r));
+	}
+	else {
+	 rights = cyrus_acl_myrights(httpd_authstate, mbentry->acl);
+	 mboxlist_entry_free(&mbentry);
+	}
+
+	if (!(rights & DACL_INVITE)) {
+	 /* DAV:need-privileges */
+	 sched_stat = SCHEDSTAT_NOPRIVS;
+
+	 goto done;
+	}
+ }
+
+ /* Create a shell for our iTIP request objects */
+ if (!buf_len(&prodid)) {
+	buf_printf(&prodid, "-//CyrusIMAP.org/Cyrus %s//EN", cyrus_version());
+ }
+
+ req = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
+			 icalproperty_new_version("2.0"),
+			 icalproperty_new_prodid(buf_cstring(&prodid)),
+			 icalproperty_new_method(method),
+			 0);
+
+ /* XXX Make sure SEQUENCE is incremented */
+
+ /* Copy over any CALSCALE property */
+ prop = icalcomponent_get_first_property(ical, ICAL_CALSCALE_PROPERTY);
+ if (prop) {
+	icalcomponent_add_property(req,
+				 icalproperty_new_clone(prop));
+ }
+
+ /* Copy over any VTIMEZONE components */
+ for (comp = icalcomponent_get_first_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT);
+	 comp;
+	 comp = icalcomponent_get_next_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT)) {
+	 icalcomponent_add_component(req,
+				 icalcomponent_new_clone(comp));
+ }
+
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+
+ /* Add each component of old object to hash table for comparison */
+ construct_hash_table(&comp_table, 10, 1);
+
+ if (oldical) {
+	comp = icalcomponent_get_first_real_component(oldical);
+	do {
+	 old_data = xzmalloc(sizeof(struct comp_data));
+	 old_data->comp = comp;
+	 old_data->sequence = icalcomponent_get_sequence(comp);
+
+	 prop = icalcomponent_get_first_property(comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+	 if (prop) recurid = icalproperty_get_value_as_string(prop);
+	 else recurid = "";
+
+	 hash_insert(recurid, old_data, &comp_table);
+
+	} while ((comp = icalcomponent_get_next_component(oldical, kind)));
+ }
+
+ /* Create hash table of attendees */
+ construct_hash_table(&att_table, 10, 1);
+
+ /* Process each component of new object */
+ if (newical) {
+	unsigned ncomp = 0;
+
+	comp = icalcomponent_get_first_real_component(newical);
+	do {
+	 unsigned changed = 1, needs_action = 0;
+
+	 prop = icalcomponent_get_first_property(comp,
+						 ICAL_RECURRENCEID_PROPERTY);
+	 if (prop) recurid = icalproperty_get_value_as_string(prop);
+	 else recurid = "";
+
+	 old_data = hash_del(recurid, &comp_table);
+
+	 if (old_data) {
+		/* Per RFC 6638, Section 3.2.8: We need to compare
+		 DTSTART, DTEND, DURATION, DUE, RRULE, RDATE, EXDATE */
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_DTSTART_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_DTEND_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_DURATION_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_DUE_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_RRULE_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_RDATE_PROPERTY);
+		needs_action += propcmp(old_data->comp, comp,
+					ICAL_EXDATE_PROPERTY);
+
+		if (old_data->sequence >= icalcomponent_get_sequence(comp)) {
+		 /* Make sure SEQUENCE is set properly */
+		 if (!needs_action) changed = 0;
+
+		 icalcomponent_set_sequence(comp,
+					 old_data->sequence + changed);
+		}
+
+		free(old_data);
+	 }
+
+	 if (changed) {
+		/* Process all attendees in created/modified components */
+		process_attendees(comp, ncomp++, organizer, att_update,
+				 &att_table, req, needs_action);
+	 }
+
+	} while ((comp = icalcomponent_get_next_component(newical, kind)));
+ }
+
+ if (oldical) {
+	/* Cancel any components that have been left behind in the old obj */
+	struct cancel_rock crock = { organizer, &att_table, req };
+
+	hash_enumerate(&comp_table, sched_cancel, &crock);
+ }
+ free_hash_table(&comp_table, free);
+
+ icalcomponent_free(req);
+
+ /* Attempt to deliver requests to attendees */
+ /* XXX Do we need to do more checks here? */
+ if (sparam->flags & SCHEDTYPE_REMOTE)
+	authstate = auth_newstate("anonymous");
+ else
+	authstate = auth_newstate(sparam->userid);
+
+ hash_enumerate(&att_table, sched_deliver, authstate);
+ auth_freestate(authstate);
+
+ done:
+ if (newical) {
+	unsigned ncomp = 0;
+
+	/* Set SCHEDULE-STATUS for each attendee in organizer object */
+	comp = icalcomponent_get_first_real_component(newical);
+	kind = icalcomponent_isa(comp);
+
+	do {
+	 for (prop =
+		 icalcomponent_get_first_property(comp, ICAL_ATTENDEE_PROPERTY);
+		 prop;
+		 prop =
+		 icalcomponent_get_next_property(comp, ICAL_ATTENDEE_PROPERTY)) {
+		const char *attendee = icalproperty_get_attendee(prop);
+		const char *stat = NULL;
+
+		/* Don't set status if attendee == organizer */
+		if (!strcmp(attendee, organizer)) continue;
+
+		if (sched_stat) stat = sched_stat;
+		else {
+		 struct sched_data *sched_data;
+
+		 sched_data = hash_lookup(attendee, &att_table);
+		 if (sched_data && (sched_data->comp_mask & (1 << ncomp)))
+			stat = sched_data->status;
+		}
+
+		if (stat) {
+		 icalparameter *param;
+		 for (param =
+			 icalproperty_get_first_parameter(prop,
+							 ICAL_IANA_PARAMETER);
+			 param && strcmp(icalparameter_get_iana_name(param),
+					 "SCHEDULE-STATUS");
+			 param =
+			 icalproperty_get_next_parameter(prop,
+							 ICAL_IANA_PARAMETER));
+		 if (!param) {
+			param = icalparameter_new(ICAL_IANA_PARAMETER);
+			icalproperty_add_parameter(prop, param);
+			icalparameter_set_iana_name(param, "SCHEDULE-STATUS");
+		 }
+		 icalparameter_set_iana_value(param, stat);
+		}
+	 }
+
+	 ncomp++;
+	} while ((comp = icalcomponent_get_next_component(newical, kind)));
+ }
+
+ /* Cleanup */
+ if (!sched_stat) free_hash_table(&att_table, free_sched_data);
+}
+
+
+/*
+ * sched_reply() helper function
+ *
+ * Remove all attendees from 'comp' other than the one corresponding to 'userid'
+ *
+ * Returns the new trimmed component (must be freed by caller)
+ * Optionally returns the 'attendee' property, his/her 'propstat',
+ * and the 'recurid' of the component
+ */
+static icalcomponent *trim_attendees(icalcomponent *comp, const char *userid,
+				 icalproperty **attendee,
+				 icalparameter_partstat *partstat,
+				 const char **recurid)
+{
+ icalcomponent *copy;
+ icalproperty *prop, *nextprop, *myattendee = NULL;
+
+ if (partstat) *partstat = ICAL_PARTSTAT_NONE;
+
+ /* Clone a working copy of the component */
+ copy = icalcomponent_new_clone(comp);
+
+ /* Locate userid in the attendee list (stripping others) */
+ for (prop = icalcomponent_get_first_property(copy,
+						 ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = nextprop) {
+	const char *att = icalproperty_get_attendee(prop);
+	struct sched_param sparam;
+
+	nextprop = icalcomponent_get_next_property(copy,
+						 ICAL_ATTENDEE_PROPERTY);
+
+	if (!myattendee &&
+	 !caladdress_lookup(att, &sparam) &&
+	 !(sparam.flags & SCHEDTYPE_REMOTE) &&
+	 !strcmp(sparam.userid, userid)) {
+	 /* Found it */
+	 myattendee = prop;
+
+	 if (partstat) {
+		/* Get the PARTSTAT */
+		icalparameter *param = 
+		 icalproperty_get_first_parameter(myattendee,
+						 ICAL_PARTSTAT_PARAMETER);
+		if (param) *partstat = icalparameter_get_partstat(param);
+	 }
+	}
+	else {
+	 /* Some other attendee, remove it */
+	 icalcomponent_remove_property(copy, prop);
+	 icalproperty_free(prop);
+	}
+ }
+
+ if (attendee) *attendee = myattendee;
+
+ if (recurid) {
+	prop = icalcomponent_get_first_property(copy,
+						ICAL_RECURRENCEID_PROPERTY);
+	if (prop) *recurid = icalproperty_get_value_as_string(prop);
+	else *recurid = "";
+ }
+
+ return copy;
+}
+
+
+/*
+ * sched_reply() helper function
+ *
+ * Attendee removed this component, mark it as declined for the organizer.
+ */
+static void sched_decline(const char *recurid __attribute__((unused)),
+			 void *data, void *rock)
+{
+ struct comp_data *old_data = (struct comp_data *) data;
+ icalcomponent *itip = (icalcomponent *) rock;
+ icalproperty *myattendee;
+ icalparameter *param;
+
+ /* Don't send a decline for cancelled components */
+ if (icalcomponent_get_status(old_data->comp) == ICAL_STATUS_CANCELLED)
+	return;
+
+ myattendee = icalcomponent_get_first_property(old_data->comp,
+						 ICAL_ATTENDEE_PROPERTY);
+
+ param =
+	icalproperty_get_first_parameter(myattendee,
+					 ICAL_PARTSTAT_PARAMETER);
+ if (!param) {
+	param = icalparameter_new(ICAL_PARTSTAT_PARAMETER);
+	icalproperty_add_parameter(myattendee, param);
+ }
+ icalparameter_set_partstat(param, ICAL_PARTSTAT_DECLINED);
+
+ clean_component(old_data->comp, 1);
+
+ icalcomponent_add_component(itip, old_data->comp);
+}
+
+
+/* Create and deliver an attendee scheduling reply */
+static void sched_reply(const char *userid,
+			icalcomponent *oldical, icalcomponent *newical)
+{
+ int r, rights = 0;
+ mbentry_t *mbentry = NULL;
+ const char *outboxname;
+ icalcomponent *ical;
+ static struct buf prodid = BUF_INITIALIZER;
+ struct sched_data *sched_data;
+ struct auth_state *authstate;
+ icalcomponent *comp;
+ icalproperty *prop;
+ icalparameter *param, *force_send = NULL;
+ icalcomponent_kind kind;
+ const char *organizer, *recurid;
+ struct hash_table comp_table;
+ struct comp_data *old_data;
+
+ /* Check what kind of action we are dealing with */
+ if (!newical) {
+	/* Remove */
+	ical = oldical;
+ }
+ else {
+	/* Create / Modify */
+	ical = newical;
+ }
+
+ /* Check CalDAV Scheduling parameters on the organizer */
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ organizer = icalproperty_get_organizer(prop);
+
+ for (param = icalproperty_get_first_parameter(prop,
+						 ICAL_IANA_PARAMETER);
+	 param;
+	 param = icalproperty_get_next_parameter(prop,
+						 ICAL_IANA_PARAMETER)) {
+	if (!strcmp(icalparameter_get_iana_name(param),
+		 "SCHEDULE-AGENT")) {
+	 if (strcmp(icalparameter_get_iana_value(param), "SERVER")) {
+		/* We are not supposed to send replies to the organizer */
+		return;
+	 }
+	}
+	else if (!strcmp(icalparameter_get_iana_name(param),
+			 "SCHEDULE-FORCE-SEND")) {
+	 force_send = param;
+	}
+ }
+
+ sched_data = xzmalloc(sizeof(struct sched_data));
+ sched_data->is_reply = 1;
+ if (force_send) {
+	sched_data->force_send =
+	 xstrdup(icalparameter_get_iana_value(force_send));
+ }
+
+ /* Check ACL of auth'd user on userid's Scheduling Outbox */
+ outboxname = caldav_mboxname(userid, SCHED_OUTBOX);
+
+ r = mboxlist_lookup(outboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_INFO, "mboxlist_lookup(%s) failed: %s",
+	 outboxname, error_message(r));
+ }
+ else {
+	rights = cyrus_acl_myrights(httpd_authstate, mbentry->acl);
+	mboxlist_entry_free(&mbentry);
+ }
+
+ if (!(rights & DACL_REPLY)) {
+	/* DAV:need-privileges */
+	if (newical) sched_data->status = SCHEDSTAT_NOPRIVS;
+
+	goto done;
+ }
+
+ /* Create our reply iCal object */
+ if (!buf_len(&prodid)) {
+	buf_printf(&prodid, "-//CyrusIMAP.org/Cyrus %s//EN", cyrus_version());
+ }
+
+ sched_data->itip =
+	icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
+			 icalproperty_new_version("2.0"),
+			 icalproperty_new_prodid(buf_cstring(&prodid)),
+			 icalproperty_new_method(ICAL_METHOD_REPLY),
+			 0);
+
+ /* XXX Make sure SEQUENCE is incremented */
+
+ /* Copy over any CALSCALE property */
+ prop = icalcomponent_get_first_property(ical, ICAL_CALSCALE_PROPERTY);
+ if (prop) {
+	icalcomponent_add_property(sched_data->itip,
+				 icalproperty_new_clone(prop));
+ }
+
+ /* Copy over any VTIMEZONE components */
+ for (comp = icalcomponent_get_first_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT);
+	 comp;
+	 comp = icalcomponent_get_next_component(ical,
+						 ICAL_VTIMEZONE_COMPONENT)) {
+	 icalcomponent_add_component(sched_data->itip,
+				 icalcomponent_new_clone(comp));
+ }
+
+ /* Add each component of old object to hash table for comparison */
+ construct_hash_table(&comp_table, 10, 1);
+
+ if (oldical) {
+	comp = icalcomponent_get_first_real_component(oldical);
+	do {
+	 old_data = xzmalloc(sizeof(struct comp_data));
+
+	 old_data->comp = trim_attendees(comp, userid, NULL,
+					 &old_data->partstat, &recurid);
+
+	 hash_insert(recurid, old_data, &comp_table);
+
+	} while ((comp = icalcomponent_get_next_component(oldical, kind)));
+ }
+
+ /* Process each component of new object */
+ if (newical) {
+	unsigned ncomp = 0;
+
+	comp = icalcomponent_get_first_real_component(newical);
+	do {
+	 icalcomponent *copy;
+	 icalproperty *myattendee;
+	 icalparameter_partstat partstat;
+	 int changed = 1;
+
+	 copy = trim_attendees(comp, userid,
+				 &myattendee, &partstat, &recurid);
+	 if (myattendee) {
+		/* Found our userid */
+		old_data = hash_del(recurid, &comp_table);
+
+		if (old_data) {
+		 /* XXX Need to check EXDATE */
+
+		 /* Compare PARTSTAT in the two components */
+		 if (old_data->partstat == partstat) {
+			changed = 0;
+		 }
+
+		 free_comp_data(old_data);
+		}
+	 }
+	 else {
+		/* Our user isn't in this component */
+		/* XXX Can this actually happen? */
+		changed = 0;
+	 }
+
+	 if (changed) {
+		clean_component(copy, 1);
+
+		icalcomponent_add_component(sched_data->itip, copy);
+		sched_data->comp_mask |= (1 << ncomp);
+	 }
+	 else icalcomponent_free(copy);
+
+	 ncomp++;
+	} while ((comp = icalcomponent_get_next_component(newical, kind)));
+ }
+
+ /* Decline any components that have been left behind in the old obj */
+ hash_enumerate(&comp_table, sched_decline, sched_data->itip);
+ free_hash_table(&comp_table, free_comp_data);
+
+ done:
+ if (sched_data->itip &&
+	icalcomponent_get_first_real_component(sched_data->itip)) {
+	/* We built a reply object */
+
+	if (!sched_data->status) {
+	 /* Attempt to deliver reply to organizer */
+	 authstate = auth_newstate(userid);
+	 sched_deliver(organizer, sched_data, authstate);
+	 auth_freestate(authstate);
+	}
+
+	if (newical) {
+	 unsigned ncomp = 0;
+
+	 /* Set SCHEDULE-STATUS for organizer in attendee object */
+	 comp = icalcomponent_get_first_real_component(newical);
+	 do {
+		if (sched_data->comp_mask & (1 << ncomp)) {
+		 prop =
+			icalcomponent_get_first_property(comp,
+							 ICAL_ORGANIZER_PROPERTY);
+		 param = icalparameter_new(ICAL_IANA_PARAMETER);
+		 icalparameter_set_iana_name(param, "SCHEDULE-STATUS");
+		 icalparameter_set_iana_value(param, sched_data->status);
+		 icalproperty_add_parameter(prop, param);
+		}
+
+		ncomp++;
+	 } while ((comp = icalcomponent_get_next_component(newical, kind)));
+	}
+ }
+
+ /* Cleanup */
+ free_sched_data(sched_data);
+}

cyrus-imapd-2.5.tar.gz/imap/http_caldav_sched.h Added

@@ -0,0 +1,110 @@
+/* http_caldav_sched.h -- Routines for dealing with CALDAV scheduling in httpd
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef HTTP_CALDAV_SCHED_H
+#define HTTP_CALDAV_SCHED_H
+
+#include <libical/ical.h>
+
+#ifdef WITH_DKIM
+#include <dkim.h>
+
+#ifndef DKIM_CANON_ISCHEDULE
+#undef WITH_DKIM
+#endif
+
+#endif /* WITH_DKIM */
+
+#include "http_dav.h"
+
+
+#define REQSTAT_PENDING		"1.0;Pending"
+#define REQSTAT_SENT		"1.1;Sent"
+#define REQSTAT_DELIVERED	"1.2;Delivered"
+#define REQSTAT_SUCCESS		"2.0;Success"
+#define REQSTAT_NOUSER		"3.7;Invalid calendar user"
+#define REQSTAT_NOPRIVS		"3.8;Noauthority"
+#define REQSTAT_TEMPFAIL	"5.1;Service unavailable"
+#define REQSTAT_PERMFAIL	"5.2;Invalid calendar service"
+#define REQSTAT_REJECTED	"5.3;No scheduling support for user"
+
+struct sched_data {
+ unsigned ischedule;
+ unsigned is_reply;
+ icalcomponent *itip;
+ icalcomponent *master;
+ unsigned comp_mask;
+ char *force_send;
+ const char *status;
+};
+
+/* Scheduling protocol flags */
+#define SCHEDTYPE_REMOTE	(1<<0)
+#define SCHEDTYPE_ISCHEDULE	(1<<1)
+#define SCHEDTYPE_SSL		(1<<2)
+
+struct proplist {
+ icalproperty *prop;
+ struct proplist *next;
+};
+
+/* Each calendar user address has the following scheduling protocol params */
+struct sched_param {
+ char *userid;	/* Userid corresponding to calendar address */ 
+ char *server;	/* Remote server user lives on */
+ unsigned port;	/* Remote server port, default = 80 */
+ unsigned flags;	/* Flags dictating protocol to use for scheduling */
+ struct proplist *props; /* List of attendee iCal properties */
+};
+
+extern int isched_send(struct sched_param *sparam, const char *recipient,
+		 icalcomponent *ical, xmlNodePtr *xml);
+
+extern int sched_busytime_query(struct transaction_t *txn,
+				struct mime_type_t *mime, icalcomponent *comp);
+extern void sched_deliver(const char *recipient, void *data, void *rock);
+extern xmlNodePtr xml_add_schedresponse(xmlNodePtr root, xmlNsPtr dav_ns,
+					xmlChar *recipient, xmlChar *status);
+extern int caladdress_lookup(const char *addr, struct sched_param *param);
+
+#endif /* HTTP_CALDAV_SCHED_H */

cyrus-imapd-2.5.tar.gz/imap/http_carddav.c Added

@@ -0,0 +1,1180 @@
+/* http_carddav.c -- Routines for handling CardDAV collections in httpd
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * TODO:
+ * Support <filter> for addressbook-query Report
+ *
+ */
+
+#include <config.h>
+
+#include <syslog.h>
+
+#include <libical/vcc.h>
+#include <libxml/tree.h>
+#include <libxml/uri.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "acl.h"
+#include "append.h"
+#include "carddav_db.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "hash.h"
+#include "httpd.h"
+#include "http_dav.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "imap_err.h"
+#include "index.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "message.h"
+#include "message_guid.h"
+#include "proxy.h"
+#include "smtpclient.h"
+#include "spool.h"
+#include "stristr.h"
+#include "times.h"
+#include "util.h"
+#include "version.h"
+#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+
+static struct carddav_db *auth_carddavdb = NULL;
+
+static void my_carddav_init(struct buf *serverinfo);
+static void my_carddav_auth(const char *userid);
+static void my_carddav_reset(void);
+static void my_carddav_shutdown(void);
+
+static int carddav_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr);
+
+static int carddav_copy(struct transaction_t *txn,
+			struct mailbox *src_mbox, struct index_record *src_rec,
+			struct mailbox *dest_mbox, const char *dest_rsrc,
+			unsigned overwrite, unsigned flags);
+static int carddav_put(struct transaction_t *txn, 
+		 struct mime_type_t *mime,
+		 struct mailbox *mailbox, unsigned flags);
+static VObject *vcard_string_as_vobject(const char *str)
+{
+ return Parse_MIME(str, strlen(str));
+}
+
+static int propfind_getcontenttype(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx, xmlNodePtr resp,
+				 struct propstat propstat, void *rock);
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_addrdata(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_suppaddrdata(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx, xmlNodePtr resp,
+				 struct propstat propstat, void *rock);
+
+static int report_card_query(struct transaction_t *txn, xmlNodePtr inroot,
+			 struct propfind_ctx *fctx);
+static int report_card_multiget(struct transaction_t *txn, xmlNodePtr inroot,
+				struct propfind_ctx *fctx);
+
+static int store_resource(struct transaction_t *txn, VObject *vcard,
+			 struct mailbox *mailbox, const char *resource,
+			 struct carddav_db *carddavdb, int overwrite,
+			 unsigned flags);
+
+static struct mime_type_t carddav_mime_types = {
+ /* First item MUST be the default type and storage format */
+ { "text/vcard; charset=utf-8", "3.0", NULL, "vcf", NULL,
+ (void * (*)(const char*)) &vcard_string_as_vobject,
+ NULL, NULL
+ },
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+/* Array of known "live" properties */
+static const struct prop_entry carddav_props = {
+
+ /* WebDAV (RFC 4918) properties */
+ { "creationdate", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_creationdate, NULL, NULL },
+ { "displayname", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_fromdb, proppatch_todb, NULL },
+ { "getcontentlanguage", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_fromhdr, NULL, "Content-Language" },
+ { "getcontentlength", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getlength, NULL, NULL },
+ { "getcontenttype", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getcontenttype, NULL, "Content-Type" },
+ { "getetag", NS_DAV, PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getetag, NULL, NULL },
+ { "getlastmodified", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_getlastmod, NULL, NULL },
+ { "lockdiscovery", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_lockdisc, NULL, NULL },
+ { "resourcetype", NS_DAV,
+ PROP_ALLPROP | PROP_COLLECTION | PROP_RESOURCE,
+ propfind_restype, proppatch_restype, "addressbook" },
+ { "supportedlock", NS_DAV, PROP_ALLPROP | PROP_RESOURCE,
+ propfind_suplock, NULL, NULL },
+
+ /* WebDAV Versioning (RFC 3253) properties */
+ { "supported-report-set", NS_DAV, PROP_COLLECTION,
+ propfind_reportset, NULL, NULL },
+
+ /* WebDAV ACL (RFC 3744) properties */
+ { "owner", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_owner, NULL, NULL },
+ { "group", NS_DAV, 0, NULL, NULL, NULL },
+ { "supported-privilege-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_supprivset, NULL, NULL },
+ { "current-user-privilege-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_curprivset, NULL, NULL },
+ { "acl", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_acl, NULL, NULL },
+ { "acl-restrictions", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_aclrestrict, NULL, NULL },
+ { "inherited-acl-set", NS_DAV, 0, NULL, NULL, NULL },
+ { "principal-collection-set", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_princolset, NULL, NULL },
+
+ /* WebDAV Quota (RFC 4331) properties */
+ { "quota-available-bytes", NS_DAV, PROP_COLLECTION,
+ propfind_quota, NULL, NULL },
+ { "quota-used-bytes", NS_DAV, PROP_COLLECTION,
+ propfind_quota, NULL, NULL },
+
+ /* WebDAV Current Principal (RFC 5397) properties */
+ { "current-user-principal", NS_DAV, PROP_COLLECTION | PROP_RESOURCE,
+ propfind_curprin, NULL, NULL },
+
+ /* WebDAV POST (RFC 5995) properties */
+ { "add-member", NS_DAV, PROP_COLLECTION,
+ NULL, /* Until Apple Contacts is fixed */ NULL, NULL },
+
+ /* WebDAV Sync (RFC 6578) properties */
+ { "sync-token", NS_DAV, PROP_COLLECTION,
+ propfind_sync_token, NULL, NULL },
+
+ /* CardDAV (RFC 6352) properties */
+ { "address-data", NS_CARDDAV,
+ PROP_RESOURCE | PROP_PRESCREEN | PROP_NEEDPROP,
+ propfind_addrdata, NULL, NULL },
+ { "addressbook-description", NS_CARDDAV, PROP_COLLECTION,
+ propfind_fromdb, proppatch_todb, NULL },
+ { "supported-address-data", NS_CARDDAV, PROP_COLLECTION,
+ propfind_suppaddrdata, NULL, NULL },
+ { "max-resource-size", NS_CARDDAV, 0, NULL, NULL, NULL },
+
+ /* Apple Calendar Server properties */
+ { "getctag", NS_CS, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_sync_token, NULL, NULL },
+
+ { NULL, 0, 0, NULL, NULL, NULL }
+};
+
+static struct meth_params carddav_params = {
+ carddav_mime_types,
+ &carddav_parse_path,
+ &check_precond,
+ { (void **) &auth_carddavdb,
+ (db_lookup_proc_t) &carddav_lookup_resource,
+ (db_foreach_proc_t) &carddav_foreach,
+ (db_write_proc_t) &carddav_write,
+ (db_delete_proc_t) &carddav_delete,
+ (db_delmbox_proc_t) &carddav_delmbox },
+ NULL,					/* No ACL extensions */
+ &carddav_copy,
+ NULL,		 	 		/* No special DELETE handling */
+ { MBTYPE_ADDRESSBOOK, NULL, NULL, 0 },	/* No special MK* method */
+ NULL,		 	 		/* No special POST handling */
+ { CARDDAV_SUPP_DATA, &carddav_put },
+ carddav_props,
+ { { "addressbook-query", &report_card_query, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS },
+ { "addressbook-multiget", &report_card_multiget, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS },
+ { "sync-collection", &report_sync_col, DACL_READ,
+	REPORT_NEED_MBOX | REPORT_MULTISTATUS | REPORT_NEED_PROPS },
+ { NULL, NULL, 0, 0 } }
+};
+
+
+/* Namespace for Carddav collections */
+struct namespace_t namespace_addressbook = {
+ URL_NS_ADDRESSBOOK, 0, "/dav/addressbooks", "/.well-known/carddav",
+ 1 /* auth */,
+#if 0 /* Until Apple Contacts fixes their add-member implementation */
+ (ALLOW_READ | ALLOW_POST | ALLOW_WRITE | ALLOW_DELETE |
+ ALLOW_DAV | ALLOW_WRITECOL | ALLOW_CARD),
+#else
+ (ALLOW_READ | ALLOW_WRITE | ALLOW_DELETE |
+ ALLOW_DAV | ALLOW_WRITECOL | ALLOW_CARD),
+#endif
+ &my_carddav_init, &my_carddav_auth, my_carddav_reset, &my_carddav_shutdown,
+ { 
+	{ &meth_acl,		&carddav_params },	/* ACL		*/
+	{ &meth_copy,		&carddav_params },	/* COPY		*/
+	{ &meth_delete,		&carddav_params },	/* DELETE	*/
+	{ &meth_get_dav,	&carddav_params },	/* GET		*/
+	{ &meth_get_dav,	&carddav_params },	/* HEAD		*/
+	{ &meth_lock,		&carddav_params },	/* LOCK		*/
+	{ NULL,			NULL },			/* MKCALENDAR	*/
+	{ &meth_mkcol,		&carddav_params },	/* MKCOL	*/
+	{ &meth_copy,		&carddav_params },	/* MOVE		*/
+	{ &meth_options,	&carddav_parse_path },	/* OPTIONS	*/
+#if 0 /* Until Apple Contacts fixes their add-member implementation */
+	{ &meth_post,		&carddav_params },	/* POST		*/
+#else
+	{ NULL,			NULL },			/* POST		*/
+#endif
+	{ &meth_propfind,	&carddav_params },	/* PROPFIND	*/
+	{ &meth_proppatch,	&carddav_params },	/* PROPPATCH	*/
+	{ &meth_put,		&carddav_params },	/* PUT		*/
+	{ &meth_report,		&carddav_params },	/* REPORT	*/
+	{ &meth_trace,		&carddav_parse_path },	/* TRACE	*/
+	{ &meth_unlock,		&carddav_params } 	/* UNLOCK	*/
+ }
+};
+
+
+static struct namespace carddav_namespace;
+
+static void my_carddav_init(struct buf *serverinfo)
+{
+ int r;
+
+ namespace_addressbook.enabled =
+	config_httpmodules & IMAP_ENUM_HTTPMODULES_CARDDAV;
+
+ if (!namespace_addressbook.enabled) return;
+
+ if (!config_getstring(IMAPOPT_ADDRESSBOOKPREFIX)) {
+	fatal("Required 'addressbookprefix' option is not set", EC_CONFIG);
+ }
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&carddav_namespace, 1))) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ carddav_init();
+
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON &&
+	!strstr(buf_cstring(serverinfo), " libical/")) {
+	buf_printf(serverinfo, " libicalvcal/%s", ICAL_VERSION);
+ }
+}
+
+
+#define DEFAULT_ADDRBOOK "Default"
+
+static void my_carddav_auth(const char *userid)
+{
+ int r;
+ struct buf boxbuf = BUF_INITIALIZER;
+ const char *mailboxname;
+
+ if (httpd_userisadmin ||
+	global_authisa(httpd_authstate, IMAPOPT_PROXYSERVERS)) {
+	/* admin or proxy from frontend - won't have DAV database */
+	return;
+ }
+ else if (config_mupdate_server && !config_getstring(IMAPOPT_PROXYSERVERS)) {
+	/* proxy-only server - won't have DAV databases */
+ }
+ else {
+	/* Open CardDAV DB for 'userid' */
+	my_carddav_reset();
+	auth_carddavdb = carddav_open(userid, CARDDAV_CREATE);
+	if (!auth_carddavdb) fatal("Unable to open CardDAV DB", EC_IOERR);
+ }
+
+ buf_setcstr(&boxbuf, config_getstring(IMAPOPT_ADDRESSBOOKPREFIX));
+
+ mailboxname = mboxname_user_mbox(userid, buf_cstring(&boxbuf));
+
+ /* Auto-provision an addressbook for 'userid' */
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	if (config_mupdate_server) {
+	 /* Find location of INBOX */
+	 const char *inboxname = mboxname_user_mbox(userid, NULL);
+	 mbentry_t *mbentry = NULL;
+
+	 r = http_mlookup(inboxname, &mbentry, NULL);
+	 if (!r && mbentry->server) {
+		proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+		mboxlist_entry_free(&mbentry);
+		return;
+	 }
+	 mboxlist_entry_free(&mbentry);
+	}
+
+	mailboxname = mboxname_user_mbox(userid, buf_cstring(&boxbuf));
+
+	/* XXX - set rights */
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_ADDRESSBOOK,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+ if (r) return;
+
+ /* Default addressbook */
+ buf_setcstr(&boxbuf, config_getstring(IMAPOPT_ADDRESSBOOKPREFIX));
+ buf_printf(&boxbuf, ".%s", DEFAULT_ADDRBOOK);
+ mailboxname = mboxname_user_mbox(userid, buf_cstring(&boxbuf));
+ r = mboxlist_lookup(mailboxname, NULL, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* XXX - set rights */
+	r = mboxlist_createmailbox(mailboxname, MBTYPE_ADDRESSBOOK,
+				 NULL, 0,
+				 userid, httpd_authstate,
+				 0, 0, 0, 0, NULL);
+ }
+}
+
+
+static void my_carddav_reset(void)
+{
+ if (auth_carddavdb) carddav_close(auth_carddavdb);
+ auth_carddavdb = NULL;
+}
+
+
+static void my_carddav_shutdown(void)
+{
+ carddav_done();
+}
+
+
+/* Parse request-target path in CardDAV namespace */
+static int carddav_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr)
+{
+ char *p;
+ size_t len;
+ struct mboxname_parts parts;
+ struct buf boxbuf = BUF_INITIALIZER;
+
+ /* Make a working copy of target path */
+ strlcpy(tgt->path, path, sizeof(tgt->path));
+ tgt->tail = tgt->path + strlen(tgt->path);
+
+ p = tgt->path;
+
+ /* Sanity check namespace */
+ len = strlen(namespace_addressbook.prefix);
+ if (strlen(p) < len ||
+	strncmp(namespace_addressbook.prefix, p, len) ||
+	(pathlen && pathlen != '/')) {
+	*errstr = "Namespace mismatch request target path";
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Default to bare-bones Allow bits for toplevel collections */
+ tgt->allow &= ~(ALLOW_POST|ALLOW_WRITE|ALLOW_DELETE);
+
+ /* Skip namespace */
+ p += len;
+ if (!*p || !*++p) return 0;
+
+ /* Check if we're in user space */
+ len = strcspn(p, "/");
+ if (!strncmp(p, "user", len)) {
+	p += len;
+	if (!*p || !*++p) return 0;
+
+	/* Get user id */
+	len = strcspn(p, "/");
+	tgt->user = p;
+	tgt->userlen = len;
+
+	p += len;
+	if (!*p || !*++p) goto done;
+
+	len = strcspn(p, "/");
+ }
+
+ /* Get collection */
+ tgt->collection = p;
+ tgt->collen = len;
+
+ p += len;
+ if (!*p || !*++p) {
+	/* Make sure collection is terminated with '/' */
+	if (p-1 != '/') *p++ = '/';
+	goto done;
+ }
+
+ /* Get resource */
+ len = strcspn(p, "/");
+ tgt->resource = p;
+ tgt->reslen = len;
+
+ p += len;
+
+ if (*p) {
+//	*errstr = "Too many segments in request target path";
+	return HTTP_NOT_FOUND;
+ }
+
+ done:
+ /* Set proper Allow bits based on path components */
+ if (tgt->collection) {
+	if (tgt->resource) {
+	 tgt->allow &= ~ALLOW_WRITECOL;
+	 tgt->allow |= (ALLOW_WRITE|ALLOW_DELETE);
+	}
+#if 0 /* Until Apple Contacts fixes their add-member implementation */
+	else tgt->allow |= (ALLOW_POST|ALLOW_DELETE);
+#else
+	else tgt->allow |= ALLOW_DELETE;
+#endif
+ }
+ else if (tgt->user) tgt->allow |= ALLOW_DELETE;
+
+
+ /* Create mailbox name from the parsed path */
+
+ mboxname_init_parts(&parts);
+
+ if (tgt->user && tgt->userlen) {
+ /* holy "avoid copying" batman */
+ char *userid = xstrndup(tgt->user, tgt->userlen);
+ mboxname_userid_to_parts(userid, &parts);
+ free(userid);
+ }
+
+ buf_setcstr(&boxbuf, config_getstring(IMAPOPT_ADDRESSBOOKPREFIX));
+ if (tgt->collen) {
+ buf_putc(&boxbuf, '.');
+ buf_appendmap(&boxbuf, tgt->collection, tgt->collen);
+ }
+ parts.box = buf_release(&boxbuf);
+
+ /* XXX - hack to allow @domain parts for non-domain-split users */
+ if (httpd_userid && !httpd_userisadmin) {
+	struct mboxname_parts userparts;
+	mboxname_init_parts(&userparts);
+	mboxname_userid_to_parts(httpd_userid, &userparts);
+	if (parts.domain && !userparts.domain) {
+	 //free(parts.domain); - XXX fix when converting to real parts
+	 parts.domain = NULL;
+	}
+	mboxname_free_parts(&userparts);
+ }
+
+ mboxname_parts_to_internal(&parts, tgt->mboxname);
+
+ mboxname_free_parts(&parts);
+
+ return 0;
+}
+
+
+/* Perform a COPY/MOVE request
+ *
+ * preconditions:
+ * CARDDAV:supported-address-data
+ * CARDDAV:valid-address-data
+ * CARDDAV:no-uid-conflict (DAV:href)
+ * CARDDAV:addressbook-collection-location-ok
+ * CARDDAV:max-resource-size
+ */
+static int carddav_copy(struct transaction_t *txn,
+			struct mailbox *src_mbox, struct index_record *src_rec,
+			struct mailbox *dest_mbox, const char *dest_rsrc,
+			unsigned overwrite, unsigned flags)
+{
+ int r;
+ struct buf msg_buf = BUF_INITIALIZER;
+ VObject *vcard;
+
+ /* Load message containing the resource and parse vCard data */
+ r = mailbox_map_record(src_mbox, src_rec, &msg_buf);
+ if (r) return r;
+ vcard = Parse_MIME(buf_base(&msg_buf) + src_rec->header_size,
+		 src_rec->size - src_rec->header_size);
+ buf_free(&msg_buf);
+
+ if (!vcard) {
+	txn->error.precond = CARDDAV_VALID_DATA;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Finished our initial read of source mailbox */
+ mailbox_unlock_index(src_mbox, NULL);
+
+ /* Store source resource at destination */
+ r = store_resource(txn, vcard, dest_mbox, dest_rsrc, auth_carddavdb,
+		 overwrite, flags);
+
+ cleanVObject(vcard);
+ cleanStrTbl();
+
+ return r;
+}
+
+
+/* Perform a PUT request
+ *
+ * preconditions:
+ * CARDDAV:valid-address-data
+ * CARDDAV:no-uid-conflict (DAV:href)
+ * CARDDAV:max-resource-size
+ */
+static int carddav_put(struct transaction_t *txn, 
+		 struct mime_type_t *mime,
+		 struct mailbox *mailbox, unsigned flags)
+{
+ int ret;
+ VObject *vcard = NULL;
+
+ /* Parse and validate the vCard data */
+ vcard = mime->from_string(buf_cstring(&txn->req_body.payload));
+ if (!vcard || strcmp(vObjectName(vcard), "VCARD")) {
+	txn->error.precond = CARDDAV_VALID_DATA;
+	ret = HTTP_FORBIDDEN;
+	goto done;
+ }
+
+ /* Store resource at target */
+ ret = store_resource(txn, vcard, mailbox, txn->req_tgt.resource,
+			 auth_carddavdb, OVERWRITE_CHECK, flags);
+
+ if (flags & PREFER_REP) {
+	struct resp_body_t *resp_body = &txn->resp_body;
+	const char *data;
+
+	switch (ret) {
+	case HTTP_NO_CONTENT:
+	 ret = HTTP_OK;
+
+	case HTTP_CREATED:
+	 /* Use the request data */
+	 data = buf_cstring(&txn->req_body.payload);
+
+	 /* Fill in Content-Type, Content-Length */
+	 resp_body->type = mime->content_type;
+	 resp_body->len = strlen(data);
+
+	 /* Fill in Content-Location */
+	 resp_body->loc = txn->req_tgt.path;
+
+	 /* Fill in Expires and Cache-Control */
+	 resp_body->maxage = 3600;	/* 1 hr */
+	 txn->flags.cc = CC_MAXAGE
+		| CC_REVALIDATE		/* don't use stale data */
+		| CC_NOTRANSFORM;	/* don't alter vCard data */
+
+	 /* Output current representation */
+	 write_body(ret, txn, data, resp_body->len);
+	 ret = 0;
+	 break;
+
+	default:
+	 /* failure - do nothing */
+	 break;
+	}
+ }
+
+ done:
+ if (vcard) {
+	cleanVObject(vcard);
+	cleanStrTbl();
+ }
+
+ return ret;
+}
+
+
+/* Callback to fetch DAV:getcontenttype */
+static int propfind_getcontenttype(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx,
+				 xmlNodePtr resp __attribute__((unused)),
+				 struct propstat propstat,
+				 void *rock __attribute__((unused)))
+{
+ buf_setcstr(&fctx->buf, "text/vcard; charset=utf-8");
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:resourcetype */
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (!fctx->record) {
+	xmlNewChild(node, NULL, BAD_CAST "collection", NULL);
+
+	if (fctx->req_tgt->collection) {
+	 ensure_ns(fctx->ns, NS_CARDDAV, resp->parent,
+		 XML_NS_CARDDAV, "C");
+	 xmlNewChild(node, fctx->nsNS_CARDDAV,
+			BAD_CAST "addressbook", NULL);
+	}
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:supported-report-set */
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr s, r, top;
+
+ top = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ if (fctx->req_tgt->collection && !fctx->req_tgt->resource) {
+	s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+	r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+	xmlNewChild(r, fctx->nsNS_DAV, BAD_CAST "sync-collection", NULL);
+ }
+
+ ensure_ns(fctx->ns, NS_CARDDAV, resp->parent, XML_NS_CARDDAV, "C");
+
+ s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+ r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+ xmlNewChild(r, fctx->nsNS_CARDDAV, BAD_CAST "addressbook-query", NULL);
+
+ s = xmlNewChild(top, NULL, BAD_CAST "supported-report", NULL);
+ r = xmlNewChild(s, NULL, BAD_CAST "report", NULL);
+ xmlNewChild(r, fctx->nsNS_CARDDAV, BAD_CAST "addressbook-multiget", NULL);
+
+ return 0;
+}
+
+
+/* Callback to fetch CARDDAV:address-data */
+static int propfind_addrdata(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp,
+			 struct propstat propstat,
+			 void *rock)
+{
+ xmlNodePtr prop = (xmlNodePtr) rock;
+ xmlChar *attr;
+ const char *data;
+ unsigned long datalen;
+ xmlNodePtr node;
+
+ if (!resp || !propstat) {
+	/* Prescreen address-data "property" request */
+	unsigned allowed = 1;
+
+	if ((attr = xmlGetProp(prop, BAD_CAST "content-type"))) {
+	 struct mime_type_t *mime;
+
+	 /* Check requested MIME type */
+	 for (mime = carddav_mime_types; mime->content_type; mime++) {
+		if (is_mediatype((const char *) attr, mime->content_type)) {
+		 xmlFree(attr);
+
+		 if ((attr = xmlGetProp(prop, BAD_CAST "version")) &&
+			(!mime->version ||
+			 xmlStrcmp(attr, BAD_CAST mime->version))) {
+			allowed = 0;
+		 }
+		 break;
+		}
+	 }
+	 if (!mime->content_type) allowed = 0;
+
+	 if (attr) xmlFree(attr);
+	}
+
+	if (!allowed) {
+	 fctx->err->precond = CARDDAV_SUPP_DATA;
+	 *fctx->ret = HTTP_FORBIDDEN;
+	}
+
+	return allowed;
+ }
+
+
+ if (!fctx->record) return HTTP_NOT_FOUND;
+
+ if (!buf_base(&fctx->msg_buf))
+	mailbox_map_record(fctx->mailbox, fctx->record, &fctx->msg_buf);
+
+ data = buf_base(&fctx->msg_buf) + fctx->record->header_size;
+ datalen = fctx->record->size - fctx->record->header_size;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ if ((attr = xmlGetProp(prop, BAD_CAST "content-type"))) {
+	struct mime_type_t *mime = carddav_mime_types;
+
+	/* Find requested MIME type */
+	while (!is_mediatype((const char *) attr, mime->content_type)) mime++;
+
+	if (mime != carddav_mime_types) {
+	 /* Not the storage format - convert into requested MIME type */
+	 /* XXX TODO */
+	}
+
+	xmlSetProp(node, BAD_CAST "content-type", attr);
+	xmlFree(attr);
+
+	if ((attr = xmlGetProp(prop, BAD_CAST "version"))) {
+	 xmlSetProp(node, BAD_CAST "version", attr);
+	 xmlFree(attr);
+	}
+ }
+
+ xmlAddChild(node,
+		xmlNewCDataBlock(fctx->root->doc, BAD_CAST data, datalen));
+
+ fctx->fetcheddata = 1;
+
+ return 0;
+}
+
+
+/* Callback to fetch CARDDAV:addressbook-home-set */
+int propfind_abookurl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock)
+{
+ xmlNodePtr node;
+ const char *abook = (const char *) rock;
+
+ if (!fctx->userid) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "%s/user/%s/%s", namespace_addressbook.prefix,
+	 fctx->userid, abook ? abook : "");
+
+ xml_add_href(node, fctx->nsNS_DAV, buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch CARDDAV:supported-address-data */
+static int propfind_suppaddrdata(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx,
+				 xmlNodePtr resp __attribute__((unused)),
+				 struct propstat propstat,
+				 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node;
+ struct mime_type_t *mime;
+
+ if (!fctx->req_tgt->collection) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ for (mime = carddav_mime_types; mime->content_type; mime++) {
+	xmlNodePtr type = xmlNewChild(node, fctx->nsNS_CARDDAV,
+				 BAD_CAST "address-data-type", NULL);
+
+	/* Trim any charset from content-type */
+	buf_reset(&fctx->buf);
+	buf_printf(&fctx->buf, "%.*s",
+		 (int) strcspn(mime->content_type, ";"), mime->content_type);
+
+	xmlNewProp(type, BAD_CAST "content-type",
+		 BAD_CAST buf_cstring(&fctx->buf));
+
+	if (mime->version)
+	 xmlNewProp(type, BAD_CAST "version", BAD_CAST mime->version);
+ }
+
+ buf_reset(&fctx->buf);
+
+ return 0;
+}
+
+
+static int report_card_query(struct transaction_t *txn,
+			 xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int ret = 0;
+ xmlNodePtr node;
+
+ fctx->davdb = auth_carddavdb;
+ fctx->lookup_resource = (db_lookup_proc_t) &carddav_lookup_resource;
+ fctx->foreach_resource = (db_foreach_proc_t) &carddav_foreach;
+ fctx->proc_by_resource = &propfind_by_resource;
+
+ /* Parse children element of report */
+ for (node = inroot->children; node; node = node->next) {
+	if (node->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(node->name, BAD_CAST "filter")) {
+		txn->error.precond = CARDDAV_SUPP_FILTER;
+		return HTTP_FORBIDDEN;
+	 }
+	}
+ }
+
+ if (fctx->depth > 0) {
+	/* Calendar collection(s) */
+	if (txn->req_tgt.collection) {
+	 /* Add response for target calendar collection */
+	 propfind_by_collection(txn->req_tgt.mboxname, 0, 0, fctx);
+	}
+	else {
+	 /* Add responses for all contained calendar collections */
+	 strlcat(txn->req_tgt.mboxname, ".%", sizeof(txn->req_tgt.mboxname));
+	 mboxlist_findall(NULL, /* internal namespace */
+			 txn->req_tgt.mboxname, 1, httpd_userid, 
+			 httpd_authstate, propfind_by_collection, fctx);
+	}
+
+	ret = *fctx->ret;
+ }
+
+ return ret;
+}
+
+
+static int report_card_multiget(struct transaction_t *txn,
+				xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int r, ret = 0;
+ struct request_target_t tgt;
+ struct mailbox *mailbox = NULL;
+ xmlNodePtr node;
+ struct buf uri = BUF_INITIALIZER;
+
+ memset(&tgt, 0, sizeof(struct request_target_t));
+ tgt.namespace = URL_NS_CALENDAR;
+
+ /* Get props for each href */
+ for (node = inroot->children; node; node = node->next) {
+	if ((node->type == XML_ELEMENT_NODE) &&
+	 !xmlStrcmp(node->name, BAD_CAST "href")) {
+	 xmlChar *href = xmlNodeListGetString(inroot->doc, node->children, 1);
+	 int len = xmlStrlen(href);
+	 struct carddav_data *cdata;
+
+	 buf_ensure(&uri, len);
+	 xmlURIUnescapeString((const char *) href, len, uri.s);
+	 xmlFree(href);
+
+	 /* Parse the path */
+	 if ((r = carddav_parse_path(uri.s, &tgt, &fctx->err->desc))) {
+		ret = r;
+		goto done;
+	 }
+
+	 fctx->req_tgt = &tgt;
+
+	 /* Check if we already have this mailbox open */
+	 if (!mailbox || strcmp(mailbox->name, tgt.mboxname)) {
+		if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+		/* Open mailbox for reading */
+		if ((r = http_mailbox_open(tgt.mboxname, &mailbox, LOCK_SHARED))) {
+		 syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+			 tgt.mboxname, error_message(r));
+		 txn->error.desc = error_message(r);
+		 ret = HTTP_SERVER_ERROR;
+		 goto done;
+		}
+
+		fctx->mailbox = mailbox;
+	 }
+
+	 /* Find message UID for the resource */
+	 carddav_lookup_resource(auth_carddavdb,
+				 tgt.mboxname, tgt.resource, 0, &cdata);
+	 cdata->dav.resource = tgt.resource;
+	 /* XXX Check errors */
+
+	 propfind_by_resource(fctx, cdata);
+	}
+ }
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+ buf_free(&uri);
+
+ return ret;
+}
+
+
+
+/* Store the vCard data in the specified addressbook/resource */
+static int store_resource(struct transaction_t *txn, VObject *vcard,
+			 struct mailbox *mailbox, const char *resource,
+			 struct carddav_db *carddavdb, int overwrite,
+			 unsigned flags)
+{
+ int ret = HTTP_CREATED, r;
+ VObjectIterator i;
+ struct carddav_data *cdata;
+ FILE *f = NULL;
+ struct index_record oldrecord;
+ struct stagemsg *stage;
+ char *header;
+ const char *version = NULL, *uid = NULL, *fullname = NULL;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_DONTCARE_INITIALIZER;
+ uint32_t expunge_uid = 0;
+ time_t now = time(NULL);
+ char datestr80;
+ struct appendstate as;
+
+ /* Fetch some important properties */
+ initPropIterator(&i, vcard);
+ while (moreIteration(&i)) {
+	VObject *prop = nextVObject(&i);
+	const char *name = vObjectName(prop);
+
+	if (!strcmp(name, "VERSION")) {
+	 version = fakeCString(vObjectUStringZValue(prop));
+	 if (strcmp(version, "3.0")) {
+		txn->error.precond = CARDDAV_SUPP_DATA;
+		return HTTP_FORBIDDEN;
+	 }
+	}
+	else if (!strcmp(name, "UID")) {
+	 uid = fakeCString(vObjectUStringZValue(prop));
+	}
+	else if (!strcmp(name, "FN")) {
+	 fullname = fakeCString(vObjectUStringZValue(prop));
+	}
+ }
+
+ /* Sanity check data */
+ if (!version || !uid || !fullname) {
+	txn->error.precond = CARDDAV_VALID_DATA;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Check for existing vCard UID */
+ carddav_lookup_uid(carddavdb, uid, 0, &cdata);
+ if (!(flags & NO_DUP_CHECK) &&
+	cdata->dav.mailbox && !strcmp(cdata->dav.mailbox, mailbox->name) &&
+	strcmp(cdata->dav.resource, resource)) {
+	/* CARDDAV:no-uid-conflict */
+	const char *owner = mboxname_to_userid(cdata->dav.mailbox);
+
+	txn->error.precond = CARDDAV_UID_CONFLICT;
+	assert(!buf_len(&txn->buf));
+	buf_printf(&txn->buf, "%s/user/%s/%s/%s",
+		 namespace_addressbook.prefix, owner,
+		 strrchr(cdata->dav.mailbox, '.')+1, cdata->dav.resource);
+	txn->error.resource = buf_cstring(&txn->buf);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (cdata->dav.imap_uid) {
+	/* Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, cdata->dav.imap_uid,
+				 &oldrecord, NULL);
+
+	if (overwrite == OVERWRITE_CHECK) {
+	 /* Check any preconditions */
+	 const char *etag = message_guid_encode(&oldrecord.guid);
+	 time_t lastmod = oldrecord.internaldate;
+	 int precond = check_precond(txn, cdata, etag, lastmod);
+
+	 if (precond != HTTP_OK)
+		return HTTP_PRECOND_FAILED;
+	}
+
+	expunge_uid = oldrecord.uid;
+ }
+
+ /* Prepare to stage the message */
+ if (!(f = append_newstage(mailbox->name, now, 0, &stage))) {
+	syslog(LOG_ERR, "append_newstage(%s) failed", mailbox->name);
+	txn->error.desc = "append_newstage() failed\r\n";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Create iMIP header for resource */
+
+ /* XXX This needs to be done via an LDAP/DB lookup */
+ header = charset_encode_mimeheader(proxy_userid, 0);
+ fprintf(f, "From: %s <>\r\n", header);
+ free(header);
+
+ header = charset_encode_mimeheader(fullname, 0);
+ fprintf(f, "Subject: %s\r\n", header);
+ free(header);
+
+ time_to_rfc822(now, datestr, sizeof(datestr));
+
+ fprintf(f, "Date: %s\r\n", datestr);
+
+ fprintf(f, "Message-ID: <%s@%s>\r\n", uid, config_servername);
+
+ fprintf(f, "Content-Type: text/vcard; charset=utf-8\r\n");
+
+ fprintf(f, "Content-Length: %u\r\n", (unsigned)buf_len(&txn->req_body.payload));
+ fprintf(f, "Content-Disposition: inline; filename=\"%s\"\r\n", resource);
+
+ /* XXX Check domain of data and use appropriate CTE */
+
+ fprintf(f, "MIME-Version: 1.0\r\n");
+ fprintf(f, "\r\n");
+
+ /* Write the vCard data to the file */
+ fprintf(f, "%s", buf_cstring(&txn->req_body.payload));
+
+ qdiffsQUOTA_STORAGE = ftell(f);
+ qdiffsQUOTA_MESSAGE = 1;
+
+ fclose(f);
+
+ /* Prepare to append the iMIP message to calendar mailbox */
+ if ((r = append_setup_mbox(&as, mailbox, NULL, NULL, 0, qdiffs, 0, 0, EVENT_MESSAGE_NEW|EVENT_CALENDAR))) {
+	syslog(LOG_ERR, "append_setup(%s) failed: %s",
+	 mailbox->name, error_message(r));
+	ret = HTTP_SERVER_ERROR;
+	txn->error.desc = "append_setup() failed\r\n";
+ }
+ else {
+	struct body *body = NULL;
+
+	/* Append the iMIP file to the calendar mailbox */
+	if ((r = append_fromstage(&as, &body, stage, now, NULL, 0, 0))) {
+	 syslog(LOG_ERR, "append_fromstage() failed");
+	 ret = HTTP_SERVER_ERROR;
+	 txn->error.desc = "append_fromstage() failed\r\n";
+	}
+	if (body) {
+	 message_free_body(body);
+	 free(body);
+	}
+
+	if (r) append_abort(&as);
+	else {
+	 /* Commit the append to the calendar mailbox */
+	 r = append_commit(&as);
+	 if (r) {
+		syslog(LOG_ERR, "append_commit() failed");
+		ret = HTTP_SERVER_ERROR;
+		txn->error.desc = "append_commit() failed\r\n";
+	 }
+	 else {
+		/* append_commit() returns a write-locked index */
+		struct index_record newrecord;
+
+		/* Read index record for new message (always the last one) */
+		mailbox_read_index_record(mailbox, mailbox->i.num_records,
+					 &newrecord);
+
+		if (expunge_uid) {
+		 /* Now that we have the replacement message in place
+		 and the mailbox locked, re-read the old record
+		 and see if we should overwrite it. Either way,
+		 one of our records will have to be expunged.
+		 */
+		 int userflag;
+
+		 ret = HTTP_NO_CONTENT;
+
+		 /* Perform the actual expunge */
+		 r = mailbox_user_flag(mailbox, DFLAG_UNBIND, &userflag, 1);
+		 if (!r) {
+			oldrecord.user_flagsuserflag/32 |= 1<<(userflag&31);
+			oldrecord.system_flags |= FLAG_EXPUNGED;
+			r = mailbox_rewrite_index_record(mailbox, &oldrecord);
+		 }
+		 if (r) {
+			syslog(LOG_ERR, "expunging record (%s) failed: %s",
+			 mailbox->name, error_message(r));
+			txn->error.desc = error_message(r);
+			ret = HTTP_SERVER_ERROR;
+		 }
+		}
+
+		if (!r) {
+		 struct resp_body_t *resp_body = &txn->resp_body;
+
+		 /* Tell client about the new resource */
+		 resp_body->lastmod = newrecord.internaldate;
+		 resp_body->etag = message_guid_encode(&newrecord.guid);
+		}
+	 }
+	}
+ }
+
+ append_removestage(stage);
+
+ return ret;
+}

cyrus-imapd-2.5.tar.gz/imap/http_dav.c Added

@@ -0,0 +1,4881 @@
+/* http_dav.c -- Routines for dealing with DAV properties in httpd
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * TODO:
+ *
+ * - CALDAV:supported-calendar-component-set should be a bitmask in
+ * cyrus.index header Mailbox Options field
+ *
+ * - CALDAV:schedule-calendar-transp should be a flag in
+ * cyrus.index header (Mailbox Options)
+ *
+ * - DAV:creationdate sould be added to cyrus.header since it only
+ * gets set at creation time
+ *
+ * - Should add a last_metadata_update field to cyrus.index header
+ * for use in PROPFIND, PROPPATCH, and possibly REPORT.
+ * This would get updated any time a mailbox annotation, mailbox
+ * acl, or quota root limit is changed
+ *
+ * - Should we use cyrus.index header Format field to indicate
+ * CalDAV mailbox?
+ *
+ */
+
+
+#include "http_dav.h"
+#include "annotate.h"
+#include "acl.h"
+#include "append.h"
+#include "caldav_db.h"
+#include "global.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "imap_err.h"
+#include "index.h"
+#include "proxy.h"
+#include "times.h"
+#include "syslog.h"
+#include "strhash.h"
+#include "tok.h"
+#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+
+#include <libxml/uri.h>
+
+
+static const struct dav_namespace_t {
+ const char *href;
+ const char *prefix;
+} known_namespaces = {
+ { XML_NS_DAV, "D" },
+ { XML_NS_CALDAV, "C" },
+ { XML_NS_CARDDAV, "C" },
+ { XML_NS_ISCHED, NULL },
+ { XML_NS_CS, "CS" },
+ { XML_NS_CYRUS, "CY" },
+};
+
+/* PROPFIND modes */
+enum {
+ PROPFIND_NONE = 0,			/* only used with REPORT */
+ PROPFIND_ALL,
+ PROPFIND_NAME,
+ PROPFIND_PROP
+};
+
+static void my_dav_init(struct buf *serverinfo);
+
+static int prin_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr);
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+static int propfind_principalurl(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx, xmlNodePtr resp,
+				 struct propstat propstat, void *rock);
+
+static int allprop_cb(const char *mailbox __attribute__((unused)),
+		 uint32_t uid __attribute__((unused)),
+		 const char *entry,
+		 const char *userid, const struct buf *attrib,
+		 void *rock);
+
+/* Array of known "live" properties */
+static const struct prop_entry dav_props = {
+
+ /* WebDAV (RFC 4918) properties */
+ { "creationdate", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "displayname", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "getcontentlanguage", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "getcontentlength", NS_DAV, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_getlength, NULL, NULL },
+ { "getcontenttype", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "getetag", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "getlastmodified", NS_DAV, PROP_ALLPROP, NULL, NULL, NULL },
+ { "lockdiscovery", NS_DAV, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_lockdisc, NULL, NULL },
+ { "resourcetype", NS_DAV, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_restype, NULL, NULL },
+ { "supportedlock", NS_DAV, PROP_ALLPROP | PROP_COLLECTION,
+ propfind_suplock, NULL, NULL },
+
+ /* WebDAV Versioning (RFC 3253) properties */
+ { "supported-report-set", NS_DAV, PROP_COLLECTION,
+ propfind_reportset, NULL, NULL },
+
+ /* WebDAV ACL (RFC 3744) properties */
+ { "alternate-URI-set", NS_DAV, 0, NULL, NULL, NULL },
+ { "principal-URL", NS_DAV, PROP_COLLECTION,
+ propfind_principalurl, NULL, NULL },
+ { "group-member-set", NS_DAV, 0, NULL, NULL, NULL },
+ { "group-membership", NS_DAV, 0, NULL, NULL, NULL },
+ { "principal-collection-set", NS_DAV, PROP_COLLECTION,
+ propfind_princolset, NULL, NULL },
+
+ /* WebDAV Current Principal (RFC 5397) properties */
+ { "current-user-principal", NS_DAV, PROP_COLLECTION,
+ propfind_curprin, NULL, NULL },
+
+ /* CalDAV (RFC 4791) properties */
+ { "calendar-home-set", NS_CALDAV, PROP_COLLECTION,
+ propfind_calurl, NULL, NULL },
+
+ /* CalDAV Scheduling (RFC 6638) properties */
+ { "schedule-inbox-URL", NS_CALDAV, PROP_COLLECTION,
+ propfind_calurl, NULL, SCHED_INBOX },
+ { "schedule-outbox-URL", NS_CALDAV, PROP_COLLECTION,
+ propfind_calurl, NULL, SCHED_OUTBOX },
+ { "calendar-user-address-set", NS_CALDAV, PROP_COLLECTION,
+ propfind_caluseraddr, NULL, NULL },
+ { "calendar-user-type", NS_CALDAV, 0, NULL, NULL, NULL },
+
+ /* CardDAV (RFC 6352) properties */
+ { "addressbook-home-set", NS_CARDDAV, PROP_COLLECTION,
+ propfind_abookurl, NULL, NULL },
+
+ /* Apple Calendar Server properties */
+ { "getctag", NS_CS, PROP_ALLPROP, NULL, NULL, NULL },
+
+ { NULL, 0, 0, NULL, NULL, NULL }
+};
+
+
+static struct meth_params princ_params = {
+ .parse_path = &prin_parse_path,
+ .lprops = dav_props
+};
+
+/* Namespace for WebDAV principals */
+struct namespace_t namespace_principal = {
+ URL_NS_PRINCIPAL, 0, "/dav/principals", NULL, 1 /* auth */,
+ ALLOW_READ | ALLOW_DAV,
+ &my_dav_init, NULL, NULL, NULL,
+ {
+	{ NULL,			NULL },			/* ACL		*/
+	{ NULL,			NULL },			/* COPY		*/
+	{ NULL,			NULL },			/* DELETE	*/
+	{ &meth_get_dav,	&princ_params },	/* GET		*/
+	{ &meth_get_dav,	&princ_params },	/* HEAD		*/
+	{ NULL,			NULL },			/* LOCK		*/
+	{ NULL,			NULL },			/* MKCALENDAR	*/
+	{ NULL,			NULL },			/* MKCOL	*/
+	{ NULL,			NULL },			/* MOVE		*/
+	{ &meth_options,	NULL },			/* OPTIONS	*/
+	{ NULL,			NULL },			/* POST		*/
+	{ &meth_propfind,	&princ_params },	/* PROPFIND	*/
+	{ NULL,			NULL },			/* PROPPATCH	*/
+	{ NULL,			NULL },			/* PUT		*/
+	{ &meth_report,		NULL },			/* REPORT	*/
+	{ &meth_trace,		NULL },			/* TRACE	*/
+	{ NULL,			NULL }			/* UNLOCK	*/
+ }
+};
+
+
+static void my_dav_init(struct buf *serverinfo)
+{
+ if (config_httpmodules & IMAP_ENUM_HTTPMODULES_CALDAV) {
+	namespace_principal.enabled = 1;
+	namespace_principal.allow |= ALLOW_CAL;
+	if (config_getswitch(IMAPOPT_CALDAV_ALLOWSCHEDULING))
+	 namespace_principal.allow |= ALLOW_CAL_SCHED;
+ }
+ if (config_httpmodules & IMAP_ENUM_HTTPMODULES_CARDDAV) {
+	namespace_principal.enabled = 1;
+	namespace_principal.allow |= ALLOW_CARD;
+ }
+
+ if (!namespace_principal.enabled) return;
+
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	buf_printf(serverinfo, " SQLite/%s", sqlite3_libversion());
+ }
+}
+
+
+/* Linked-list of properties for fetching */
+struct propfind_entry_list {
+ const xmlChar *name;		/* Property name */
+ xmlNsPtr ns;			/* Property namespace */
+ unsigned char flags;		/* Flags for how/where prop apply */
+ int (*get)(const xmlChar *name,	/* Callback to fetch property */
+	 xmlNsPtr ns, struct propfind_ctx *fctx, xmlNodePtr resp,
+	 struct propstat propstat, void *rock);
+ void *rock;				/* Add'l data to pass to callback */
+ struct propfind_entry_list *next;
+};
+
+
+/* Bitmask of privilege flags */
+enum {
+ PRIV_IMPLICIT =		(1<<0),
+ PRIV_INBOX =		(1<<1),
+ PRIV_OUTBOX =		(1<<2)
+};
+
+
+/* Array of precondition/postcondition errors */
+static const struct precond_t {
+ const char *name;			/* Property name */
+ unsigned ns;			/* Index into known namespace array */
+} preconds = {
+ /* Placeholder for zero (no) precondition code */
+ { NULL, 0 },
+
+ /* WebDAV (RFC 4918) preconditons */
+ { "cannot-modify-protected-property", NS_DAV },
+ { "lock-token-matches-request-uri", NS_DAV },
+ { "lock-token-submitted", NS_DAV },
+ { "no-conflicting-lock", NS_DAV },
+
+ /* WebDAV Versioning (RFC 3253) preconditions */
+ { "supported-report", NS_DAV },
+ { "resource-must-be-null", NS_DAV },
+
+ /* WebDAV ACL (RFC 3744) preconditions */
+ { "need-privileges", NS_DAV },
+ { "no-invert", NS_DAV },
+ { "no-abstract", NS_DAV },
+ { "not-supported-privilege", NS_DAV },
+ { "recognized-principal", NS_DAV },
+
+ /* WebDAV Quota (RFC 4331) preconditions */
+ { "quota-not-exceeded", NS_DAV },
+ { "sufficient-disk-space", NS_DAV },
+
+ /* WebDAV Extended MKCOL (RFC 5689) preconditions */
+ { "valid-resourcetype", NS_DAV },
+
+ /* WebDAV Sync (RFC 6578) preconditions */
+ { "valid-sync-token", NS_DAV },
+ { "number-of-matches-within-limits", NS_DAV },
+
+ /* CalDAV (RFC 4791) preconditions */
+ { "supported-calendar-data", NS_CALDAV },
+ { "valid-calendar-data", NS_CALDAV },
+ { "valid-calendar-object-resource", NS_CALDAV },
+ { "supported-calendar-component", NS_CALDAV },
+ { "calendar-collection-location-ok", NS_CALDAV },
+ { "no-uid-conflict", NS_CALDAV },
+ { "supported-filter", NS_CALDAV },
+ { "valid-filter", NS_CALDAV },
+
+ /* CalDAV Scheduling (RFC 6638) preconditions */
+ { "valid-scheduling-message", NS_CALDAV },
+ { "valid-organizer", NS_CALDAV },
+ { "unique-scheduling-object-resource", NS_CALDAV },
+ { "same-organizer-in-all-components", NS_CALDAV },
+ { "allowed-organizer-scheduling-object-change", NS_CALDAV },
+ { "allowed-attendee-scheduling-object-change", NS_CALDAV },
+
+ /* iSchedule (draft-desruisseaux-ischedule) preconditions */
+ { "version-not-supported", NS_ISCHED },
+ { "invalid-calendar-data-type", NS_ISCHED },
+ { "invalid-calendar-data", NS_ISCHED },
+ { "invalid-scheduling-message", NS_ISCHED },
+ { "originator-missing", NS_ISCHED },
+ { "too-many-originators", NS_ISCHED },
+ { "originator-invalid", NS_ISCHED },
+ { "originator-denied", NS_ISCHED },
+ { "recipient-missing", NS_ISCHED },
+ { "recipient-mismatch", NS_ISCHED },
+ { "verification-failed", NS_ISCHED },
+
+ /* CardDAV (RFC 6352) preconditions */
+ { "supported-address-data", NS_CARDDAV },
+ { "valid-address-data", NS_CARDDAV },
+ { "no-uid-conflict", NS_CARDDAV },
+ { "addressbook-collection-location-ok", NS_CARDDAV },
+ { "supported-filter", NS_CARDDAV }
+};
+
+
+/* Parse request-target path in DAV principals namespace */
+static int prin_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr)
+{
+ char *p;
+ size_t len;
+
+ /* Make a working copy of target path */
+ strlcpy(tgt->path, path, sizeof(tgt->path));
+ tgt->tail = tgt->path + strlen(tgt->path);
+
+ p = tgt->path;
+
+ /* Sanity check namespace */
+ len = strlen(namespace_principal.prefix);
+ if (strlen(p) < len ||
+	strncmp(namespace_principal.prefix, p, len) ||
+	(pathlen && pathlen != '/')) {
+	*errstr = "Namespace mismatch request target path";
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Skip namespace */
+ p += len;
+ if (!*p || !*++p) return 0;
+
+ /* Check if we're in user space */
+ len = strcspn(p, "/");
+ if (!strncmp(p, "user", len)) {
+	p += len;
+	if (!*p || !*++p) return 0;
+
+	/* Get user id */
+	len = strcspn(p, "/");
+	tgt->user = p;
+	tgt->userlen = len;
+
+	p += len;
+	if (!*p || !*++p) return 0;
+ }
+ else return HTTP_NOT_FOUND; /* need to specify a userid */
+
+ if (*p) {
+//	*errstr = "Too many segments in request target path";
+	return HTTP_NOT_FOUND;
+ }
+
+ return 0;
+}
+
+
+unsigned get_preferences(struct transaction_t *txn)
+{
+ unsigned mask = 0, prefs = 0;
+ const char **hdr;
+
+ /* Create a mask for preferences honored by method */
+ switch (txn->meth) {
+ case METH_COPY:
+ case METH_MOVE:
+ case METH_POST:
+ case METH_PUT:
+	mask = PREFER_REP;
+	break;
+
+ case METH_MKCALENDAR:
+ case METH_MKCOL:
+ case METH_PROPPATCH:
+	mask = PREFER_MIN;
+	break;
+
+ case METH_PROPFIND:
+ case METH_REPORT:
+	mask = (PREFER_MIN | PREFER_NOROOT);
+	break;
+ }
+
+ if (!mask) return 0;
+ else {
+	txn->flags.vary |= VARY_PREFER;
+	if (mask & PREFER_MIN) txn->flags.vary |= VARY_BRIEF;
+ }
+
+ /* Check for Prefer header(s) */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Prefer"))) {
+	int i;
+	for (i = 0; hdri; i++) {
+	 tok_t tok;
+	 char *token;
+
+	 tok_init(&tok, hdri, ",\r\n", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	 while ((token = tok_next(&tok))) {
+		if ((mask & PREFER_MIN) &&
+		 !strcmp(token, "return=minimal"))
+		 prefs |= PREFER_MIN;
+		else if ((mask & PREFER_REP) &&
+			 !strcmp(token, "return=representation"))
+		 prefs |= PREFER_REP;
+		else if ((mask & PREFER_NOROOT) &&
+			 !strcmp(token, "depth-noroot"))
+		 prefs |= PREFER_NOROOT;
+	 }
+	 tok_fini(&tok);
+	}
+
+	txn->resp_body.prefs = prefs;
+ }
+
+ /* Check for Brief header */
+ if ((mask & PREFER_MIN) &&
+	(hdr = spool_getheader(txn->req_hdrs, "Brief")) &&
+	!strcasecmp(hdr0, "t")) {
+	prefs |= PREFER_MIN;
+ }
+
+ return prefs;
+}
+
+
+static int add_privs(int rights, unsigned flags,
+		 xmlNodePtr parent, xmlNodePtr root, xmlNsPtr *ns);
+
+
+/* Ensure that we have a given namespace. If it doesn't exist in what we
+ * parsed in the request, create it and attach to 'node'.
+ */
+int ensure_ns(xmlNsPtr *respNs, int ns, xmlNodePtr node,
+	 const char *url, const char *prefix)
+{
+ if (!respNsns)
+	respNsns = xmlNewNs(node, BAD_CAST url, BAD_CAST prefix);
+
+ /* XXX check for errors */
+ return 0;
+}
+
+
+/* Add namespaces declared in the request to our root node and Ns array */
+static int xml_add_ns(xmlNodePtr req, xmlNsPtr *respNs, xmlNodePtr root)
+{
+ for (; req; req = req->next) {
+	if (req->type == XML_ELEMENT_NODE) {
+	 xmlNsPtr nsDef;
+
+	 for (nsDef = req->nsDef; nsDef; nsDef = nsDef->next) {
+		if (!xmlStrcmp(nsDef->href, BAD_CAST XML_NS_DAV))
+		 ensure_ns(respNs, NS_DAV, root,
+			 (const char *) nsDef->href,
+			 (const char *) nsDef->prefix);
+		else if (!xmlStrcmp(nsDef->href, BAD_CAST XML_NS_CALDAV))
+		 ensure_ns(respNs, NS_CALDAV, root,
+			 (const char *) nsDef->href,
+			 (const char *) nsDef->prefix);
+		else if (!xmlStrcmp(nsDef->href, BAD_CAST XML_NS_CARDDAV))
+		 ensure_ns(respNs, NS_CARDDAV, root,
+			 (const char *) nsDef->href,
+			 (const char *) nsDef->prefix);
+		else if (!xmlStrcmp(nsDef->href, BAD_CAST XML_NS_CS))
+		 ensure_ns(respNs, NS_CS, root,
+			 (const char *) nsDef->href,
+			 (const char *) nsDef->prefix);
+		else if (!xmlStrcmp(nsDef->href, BAD_CAST XML_NS_CYRUS))
+		 ensure_ns(respNs, NS_CYRUS, root,
+			 (const char *) nsDef->href,
+			 (const char *) nsDef->prefix);
+		else
+		 xmlNewNs(root, nsDef->href, nsDef->prefix);
+	 }
+	}
+
+	xml_add_ns(req->children, respNs, root);
+ }
+
+ /* XXX check for errors */
+ return 0;
+}
+
+
+/* Initialize an XML tree for a property response */
+xmlNodePtr init_xml_response(const char *resp, int ns,
+			 xmlNodePtr req, xmlNsPtr *respNs)
+{
+ /* Start construction of our XML response tree */
+ xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");
+ xmlNodePtr root = NULL;
+
+ if (!doc) return NULL;
+ if (!(root = xmlNewNode(NULL, BAD_CAST resp))) return NULL;
+
+ xmlDocSetRootElement(doc, root);
+
+ /* Add namespaces from request to our response,
+ * creating array of known namespaces that we can reference later.
+ */
+ memset(respNs, 0, NUM_NAMESPACE * sizeof(xmlNsPtr));
+ xml_add_ns(req, respNs, root);
+
+ /* Set namespace of root node */
+ ensure_ns(respNs, ns, root,
+	 known_namespacesns.href, known_namespacesns.prefix);
+ xmlSetNs(root, respNsns);
+
+ return root;
+}
+
+xmlNodePtr xml_add_href(xmlNodePtr parent, xmlNsPtr ns, const char *href)
+{
+ xmlChar *uri = xmlURIEscapeStr(BAD_CAST href, BAD_CAST ":/");
+ xmlNodePtr node = xmlNewChild(parent, ns, BAD_CAST "href", uri);
+
+ free(uri);
+ return node;
+}
+
+xmlNodePtr xml_add_error(xmlNodePtr root, struct error_t *err,
+			 xmlNsPtr *avail_ns)
+{
+ xmlNsPtr nsNUM_NAMESPACE;
+ xmlNodePtr error, node;
+ const struct precond_t *precond = &precondserr->precond;
+ unsigned err_ns = NS_DAV;
+ const char *resp_desc = "responsedescription";
+
+ if (precond->ns == NS_ISCHED) {
+	err_ns = NS_ISCHED;
+	resp_desc = "response-description";
+ }
+
+ if (!root) {
+	error = root = init_xml_response("error", err_ns, NULL, ns);
+	avail_ns = ns;
+ }
+ else error = xmlNewChild(root, NULL, BAD_CAST "error", NULL);
+
+ ensure_ns(avail_ns, precond->ns, root, known_namespacesprecond->ns.href,
+	 known_namespacesprecond->ns.prefix);
+ node = xmlNewChild(error, avail_nsprecond->ns,
+		 BAD_CAST precond->name, NULL);
+
+ switch (err->precond) {
+ case DAV_NEED_PRIVS:
+	if (err->resource && err->rights) {
+	 unsigned flags = 0;
+	 size_t rlen = strlen(err->resource);
+	 const char *p = err->resource + rlen;
+
+	 node = xmlNewChild(node, NULL, BAD_CAST "resource", NULL);
+	 xml_add_href(node, NULL, err->resource);
+
+	 if (rlen > 6 && !strcmp(p-6, SCHED_INBOX))
+		flags = PRIV_INBOX;
+	 else if (rlen > 7 && !strcmp(p-7, SCHED_OUTBOX))
+		flags = PRIV_OUTBOX;
+
+	 add_privs(err->rights, flags, node, root, avail_ns);
+	}
+	break;
+
+ default:
+	if (err->resource) xml_add_href(node, avail_nsNS_DAV, err->resource);
+	break;
+ }
+
+ if (err->desc) {
+	xmlNewTextChild(error, NULL, BAD_CAST resp_desc, BAD_CAST err->desc);
+ }
+
+ return root;
+}
+
+
+void xml_add_lockdisc(xmlNodePtr node, const char *root, struct dav_data *data)
+{
+ time_t now = time(NULL);
+
+ if (data->lock_expire > now) {
+	xmlNodePtr active, node1;
+	char tbuf30; /* "Second-" + long int + NUL */
+
+	active = xmlNewChild(node, NULL, BAD_CAST "activelock", NULL);
+	node1 = xmlNewChild(active, NULL, BAD_CAST "lockscope", NULL);
+	xmlNewChild(node1, NULL, BAD_CAST "exclusive", NULL);
+
+	node1 = xmlNewChild(active, NULL, BAD_CAST "locktype", NULL);
+	xmlNewChild(node1, NULL, BAD_CAST "write", NULL);
+
+	xmlNewChild(active, NULL, BAD_CAST "depth", BAD_CAST "0");
+
+	if (data->lock_owner) {
+	 /* Last char of token signals href (1) or text (0) */
+	 if (data->lock_tokenstrlen(data->lock_token)-1 == '1') {
+		node1 = xmlNewChild(active, NULL, BAD_CAST "owner", NULL);
+		xml_add_href(node1, NULL, data->lock_owner);
+	 }
+	 else {
+		xmlNewTextChild(active, NULL, BAD_CAST "owner",
+				BAD_CAST data->lock_owner);
+	 }
+	}
+
+	snprintf(tbuf, sizeof(tbuf), "Second-%lu", data->lock_expire - now);
+	xmlNewChild(active, NULL, BAD_CAST "timeout", BAD_CAST tbuf);
+
+	node1 = xmlNewChild(active, NULL, BAD_CAST "locktoken", NULL);
+	xml_add_href(node1, NULL, data->lock_token);
+
+	node1 = xmlNewChild(active, NULL, BAD_CAST "lockroot", NULL);
+	xml_add_href(node1, NULL, root);
+ }
+}
+		 
+
+/* Add a property 'name', of namespace 'ns', with content 'content',
+ * and status code/string 'status' to propstat element 'stat'.
+ * 'stat' will be created as necessary.
+ */
+xmlNodePtr xml_add_prop(long status, xmlNsPtr davns,
+			struct propstat *propstat,
+			const xmlChar *name, xmlNsPtr ns,
+			xmlChar *content,
+			unsigned precond)
+{
+ xmlNodePtr newprop = NULL;
+
+ if (!propstat->root) {
+	propstat->root = xmlNewNode(davns, BAD_CAST "propstat");
+	xmlNewChild(propstat->root, NULL, BAD_CAST "prop", NULL);
+ }
+
+ if (name) newprop = xmlNewTextChild(propstat->root->children,
+					ns, name, content);
+ propstat->status = status;
+ propstat->precond = precond;
+
+ return newprop;
+}
+
+
+struct allprop_rock {
+ struct propfind_ctx *fctx;
+ struct propstat *propstat;
+};
+
+/* Add a response tree to 'root' for the specified href and 
+ either error code or property list */
+static int xml_add_response(struct propfind_ctx *fctx, long code)
+{
+ xmlNodePtr resp;
+
+ resp = xmlNewChild(fctx->root, NULL, BAD_CAST "response", NULL);
+ if (!resp) {
+	fctx->err->desc = "Unable to add response XML element";
+	*fctx->ret = HTTP_SERVER_ERROR;
+	return HTTP_SERVER_ERROR;
+ }
+ xml_add_href(resp, NULL, fctx->req_tgt->path);
+
+ if (code) {
+	xmlNewChild(resp, NULL, BAD_CAST "status",
+		 BAD_CAST http_statusline(code));
+ }
+ else {
+	struct propstat propstatNUM_PROPSTAT, *stat;
+	struct propfind_entry_list *e;
+	int i;
+
+	memset(propstat, 0, NUM_PROPSTAT * sizeof(struct propstat));
+
+	/* Process each property in the linked list */
+	for (e = fctx->elist; e; e = e->next) {
+	 int r = HTTP_NOT_FOUND;
+
+	 if (e->get) {
+		r = 0;
+
+		/* Pre-screen request based on prop flags */
+		if (fctx->req_tgt->resource) {
+		 if (!(e->flags & PROP_RESOURCE)) r = HTTP_NOT_FOUND;
+		}
+		else if (!(e->flags & PROP_COLLECTION)) r = HTTP_NOT_FOUND;
+
+		if (!r) {
+		 if (fctx->mode == PROPFIND_NAME) {
+			xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK,
+				 e->name, e->ns, NULL, 0);
+		 }
+		 else {
+			r = e->get(e->name, e->ns,
+				 fctx, resp, propstat, e->rock);
+		 }
+		}
+	 }
+
+	 switch (r) {
+	 case 0:
+	 case HTTP_OK:
+		/* Nothing to do - property handled in callback */
+		break;
+
+	 case HTTP_UNAUTHORIZED:
+		xml_add_prop(HTTP_UNAUTHORIZED, fctx->nsNS_DAV,
+			 &propstatPROPSTAT_UNAUTH,
+			 e->name, e->ns, NULL, 0);
+		break;
+
+	 case HTTP_FORBIDDEN:
+		xml_add_prop(HTTP_FORBIDDEN, fctx->nsNS_DAV,
+			 &propstatPROPSTAT_FORBID,
+			 e->name, e->ns, NULL, 0);
+		break;
+
+	 case HTTP_NOT_FOUND:
+		if (!(fctx->prefer & PREFER_MIN)) {
+		 xml_add_prop(HTTP_NOT_FOUND, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_NOTFOUND,
+				 e->name, e->ns, NULL, 0);
+		}
+		break;
+
+	 default:
+		xml_add_prop(r, fctx->nsNS_DAV, &propstatPROPSTAT_ERROR,
+			 e->name, e->ns, NULL, 0);
+		break;
+
+	 }
+	}
+
+	/* Process dead properties for allprop/propname */
+	if (fctx->mailbox && !fctx->req_tgt->resource &&
+	 (fctx->mode == PROPFIND_ALL || fctx->mode == PROPFIND_NAME)) {
+	 struct allprop_rock arock = { fctx, propstat };
+
+	 annotatemore_findall(fctx->mailbox->name, 0, "*", allprop_cb, &arock);
+	}
+
+	/* Check if we have any propstat elements */
+	for (i = 0; i < NUM_PROPSTAT && !propstati.root; i++);
+	if (i == NUM_PROPSTAT) {
+	 /* Add an empty propstat 200 */
+	 xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+			 &propstatPROPSTAT_OK, NULL, NULL, NULL, 0);
+	}
+
+	/* Add status and optional error to the propstat elements
+	 and then add them to response element */
+	for (i = 0; i < NUM_PROPSTAT; i++) {
+	 stat = &propstati;
+
+	 if (stat->root) {
+		xmlNewChild(stat->root, NULL, BAD_CAST "status",
+			 BAD_CAST http_statusline(stat->status));
+		if (stat->precond) {
+		 struct error_t error = { NULL, stat->precond, NULL, 0 };
+		 xml_add_error(stat->root, &error, fctx->ns);
+		}
+
+		xmlAddChild(resp, stat->root);
+	 }
+	}
+ }
+
+ fctx->record = NULL;
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:creationdate */
+int propfind_creationdate(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ time_t t = 0;
+ struct tm *tm;
+
+ if (fctx->data) {
+	struct dav_data *ddata = (struct dav_data *) fctx->data;
+
+	t = ddata->creationdate;
+ }
+ else if (fctx->mailbox) {
+	struct stat sbuf;
+
+	fstat(fctx->mailbox->header_fd, &sbuf);
+
+	t = sbuf.st_ctime;
+ }
+
+ if (!t) return HTTP_NOT_FOUND;
+
+ tm = gmtime(&t);
+
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "%4d-%02d-%02dT%02d:%02d:%02dZ",
+	 tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+	 tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:getcontentlength */
+int propfind_getlength(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ buf_reset(&fctx->buf);
+
+ if (fctx->record) {
+	buf_printf(&fctx->buf, "%u",
+		 fctx->record->size - fctx->record->header_size);
+ }
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:getetag */
+int propfind_getetag(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ if (fctx->req_tgt->resource && !fctx->record) return HTTP_NOT_FOUND;
+ if (!fctx->mailbox) return HTTP_NOT_FOUND;
+
+ buf_reset(&fctx->buf);
+
+ if (fctx->record) {
+	/* add DQUOTEs */
+	buf_printf(&fctx->buf, "\"%s\"",
+		 message_guid_encode(&fctx->record->guid));
+ }
+ else {
+	buf_printf(&fctx->buf, "\"%u-%u-%u\"", fctx->mailbox->i.uidvalidity,
+		 fctx->mailbox->i.last_uid, fctx->mailbox->i.exists);
+ }
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:getlastmodified */
+int propfind_getlastmod(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx,
+			xmlNodePtr resp __attribute__((unused)),
+			struct propstat propstat,
+			void *rock __attribute__((unused)))
+{
+ if (!fctx->mailbox ||
+	(fctx->req_tgt->resource && !fctx->record)) return HTTP_NOT_FOUND;
+
+ buf_ensure(&fctx->buf, 30);
+ httpdate_gen(fctx->buf.s, fctx->buf.alloc,
+		 fctx->record ? fctx->record->internaldate :
+		 fctx->mailbox->index_mtime);
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST fctx->buf.s, 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:lockdiscovery */
+int propfind_lockdisc(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (fctx->mailbox && fctx->record) {
+	struct dav_data *ddata = (struct dav_data *) fctx->data;
+
+	xml_add_lockdisc(node, fctx->req_tgt->path, ddata);
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:resourcetype */
+static int propfind_restype(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ xmlNewChild(node, NULL, BAD_CAST "collection", NULL);
+
+ return 0;
+}
+
+
+/* Callback to "write" resourcetype property */
+int proppatch_restype(xmlNodePtr prop, unsigned set,
+		 struct proppatch_ctx *pctx,
+		 struct propstat propstat,
+		 void *rock)
+{
+ const char *coltype = (const char *) rock;
+ unsigned precond = 0;
+
+ if (set && (pctx->meth == METH_MKCOL || pctx->meth == METH_MKCALENDAR)) {
+	/* "Writeable" for MKCOL/MKCALENDAR only */
+	xmlNodePtr cur;
+
+	for (cur = prop->children; cur; cur = cur->next) {
+	 if (cur->type != XML_ELEMENT_NODE) continue;
+	 /* Make sure we have valid resourcetypes for the collection */
+	 if (xmlStrcmp(cur->name, BAD_CAST "collection") &&
+		xmlStrcmp(cur->name, BAD_CAST coltype)) break;
+	}
+
+	if (!cur) {
+	 /* All resourcetypes are valid */
+	 xml_add_prop(HTTP_OK, pctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			 prop->name, prop->ns, NULL, 0);
+
+	 return 0;
+	}
+
+	/* Invalid resourcetype */
+	precond = DAV_VALID_RESTYPE;
+ }
+ else {
+	/* Protected property */
+	precond = DAV_PROT_PROP;
+ }
+
+ xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV, &propstatPROPSTAT_FORBID,
+		 prop->name, prop->ns, NULL, precond);
+	 
+ *pctx->ret = HTTP_FORBIDDEN;
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:supportedlock */
+int propfind_suplock(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (fctx->mailbox && fctx->record) {
+	xmlNodePtr entry = xmlNewChild(node, NULL, BAD_CAST "lockentry", NULL);
+	xmlNodePtr scope = xmlNewChild(entry, NULL, BAD_CAST "lockscope", NULL);
+	xmlNodePtr type = xmlNewChild(entry, NULL, BAD_CAST "locktype", NULL);
+
+	xmlNewChild(scope, NULL, BAD_CAST "exclusive", NULL);
+	xmlNewChild(type, NULL, BAD_CAST "write", NULL);
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:supported-report-set */
+static int propfind_reportset(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:principalurl */
+static int propfind_principalurl(const xmlChar *name, xmlNsPtr ns,
+				 struct propfind_ctx *fctx,
+				 xmlNodePtr resp __attribute__((unused)),
+				 struct propstat propstat,
+				 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ buf_reset(&fctx->buf);
+ if (fctx->req_tgt->user) {
+	buf_printf(&fctx->buf, "%s/user/%.*s/",
+		 namespace_principal.prefix,
+		 (int) fctx->req_tgt->userlen, fctx->req_tgt->user);
+ }
+
+ xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:owner */
+int propfind_owner(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (fctx->req_tgt->user) {
+	buf_reset(&fctx->buf);
+	buf_printf(&fctx->buf, "%s/user/%.*s/",
+		 namespace_principal.prefix,
+		 (int) fctx->req_tgt->userlen, fctx->req_tgt->user);
+
+	xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+ }
+
+ return 0;
+}
+
+
+/* Add possibly 'abstract' supported-privilege 'priv_name', of namespace 'ns',
+ * with description 'desc_str' to node 'root'. For now, we alssume all
+ * descriptions are English.
+ */
+static xmlNodePtr add_suppriv(xmlNodePtr root, const char *priv_name,
+			 xmlNsPtr ns, int abstract, const char *desc_str)
+{
+ xmlNodePtr supp, priv, desc;
+
+ supp = xmlNewChild(root, NULL, BAD_CAST "supported-privilege", NULL);
+ priv = xmlNewChild(supp, NULL, BAD_CAST "privilege", NULL);
+ xmlNewChild(priv, ns, BAD_CAST priv_name, NULL);
+ if (abstract) xmlNewChild(supp, NULL, BAD_CAST "abstract", NULL);
+ desc = xmlNewChild(supp, NULL, BAD_CAST "description", BAD_CAST desc_str);
+ xmlNodeSetLang(desc, BAD_CAST "en");
+
+ return supp;
+}
+
+
+/* Callback to fetch DAV:supported-privilege-set */
+int propfind_supprivset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx,
+			xmlNodePtr resp,
+			struct propstat propstat,
+			void *rock __attribute__((unused)))
+{
+ xmlNodePtr set, all, agg, write;
+ unsigned tgt_flags = 0;
+
+ set = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ all = add_suppriv(set, "all", NULL, 0, "Any operation");
+
+ agg = add_suppriv(all, "read", NULL, 0, "Read any object");
+ add_suppriv(agg, "read-current-user-privilege-set", NULL, 1,
+		"Read current user privilege set");
+
+ if (fctx->req_tgt->namespace == URL_NS_CALENDAR) {
+	if (fctx->req_tgt->collection) {
+	 ensure_ns(fctx->ns, NS_CALDAV, resp->parent, XML_NS_CALDAV, "C");
+
+	 if (!strcmp(fctx->req_tgt->collection, SCHED_INBOX))
+		tgt_flags = TGT_SCHED_INBOX;
+	 else if (!strcmp(fctx->req_tgt->collection, SCHED_OUTBOX))
+		tgt_flags = TGT_SCHED_OUTBOX;
+	 else {
+		add_suppriv(agg, "read-free-busy", fctx->nsNS_CALDAV, 0,
+			 "Read free/busy time");
+	 }
+	}
+ }
+
+ write = add_suppriv(all, "write", NULL, 0, "Write any object");
+ add_suppriv(write, "write-content", NULL, 0, "Write resource content");
+ add_suppriv(write, "write-properties", NULL, 0, "Write properties");
+
+ agg = add_suppriv(write, "bind", NULL, 0, "Add new member to collection");
+ ensure_ns(fctx->ns, NS_CYRUS, resp->parent, XML_NS_CYRUS, "CY");
+ add_suppriv(agg, "make-collection", fctx->nsNS_CYRUS, 0,
+		"Make new collection");
+ add_suppriv(agg, "add-resource", fctx->nsNS_CYRUS, 0,
+		"Add new resource");
+
+ agg = add_suppriv(write, "unbind", NULL, 0,
+			 "Remove member from collection");
+ add_suppriv(agg, "remove-collection", fctx->nsNS_CYRUS, 0,
+		"Remove collection");
+ add_suppriv(agg, "remove-resource", fctx->nsNS_CYRUS, 0,
+		"Remove resource");
+
+ agg = add_suppriv(all, "admin", fctx->nsNS_CYRUS, 0,
+			"Perform administrative operations");
+ add_suppriv(agg, "read-acl", NULL, 1, "Read ACL");
+ add_suppriv(agg, "write-acl", NULL, 1, "Write ACL");
+ add_suppriv(agg, "unlock", NULL, 1, "Unlock resource");
+
+ if (tgt_flags == TGT_SCHED_INBOX) {
+	agg = add_suppriv(all, "schedule-deliver", fctx->nsNS_CALDAV, 0,
+			 "Deliver scheduling messages");
+	add_suppriv(agg, "schedule-deliver-invite", fctx->nsNS_CALDAV, 0,
+		 "Deliver scheduling messages from Organizers");
+	add_suppriv(agg, "schedule-deliver-reply", fctx->nsNS_CALDAV, 0,
+		 "Deliver scheduling messages from Attendees");
+	add_suppriv(agg, "schedule-query-freebusy", fctx->nsNS_CALDAV, 0,
+		 "Accept free/busy requests");
+ }
+ else if (tgt_flags == TGT_SCHED_OUTBOX) {
+	agg = add_suppriv(all, "schedule-send", fctx->nsNS_CALDAV, 0,
+			 "Send scheduling messages");
+	add_suppriv(agg, "schedule-send-invite", fctx->nsNS_CALDAV, 0,
+		 "Send scheduling messages by Organizers");
+	add_suppriv(agg, "schedule-send-reply", fctx->nsNS_CALDAV, 0,
+		 "Send scheduling messages by Attendees");
+	add_suppriv(agg, "schedule-send-freebusy", fctx->nsNS_CALDAV, 0,
+		 "Submit free/busy requests");
+ }
+
+ return 0;
+}
+
+
+static int add_privs(int rights, unsigned flags,
+		 xmlNodePtr parent, xmlNodePtr root, xmlNsPtr *ns)
+{
+ xmlNodePtr priv;
+
+ if ((rights & DACL_ALL) == DACL_ALL &&
+	/* DAV:all on CALDAV:schedule-in/outbox MUST include CALDAV:schedule */
+	(!(flags & (PRIV_INBOX|PRIV_OUTBOX)) ||
+	 (rights & DACL_SCHED) == DACL_SCHED)) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "all", NULL);
+ }
+ if ((rights & DACL_READ) == DACL_READ) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "read", NULL);
+	if (flags & PRIV_IMPLICIT) rights |= DACL_READFB;
+ }
+ if ((rights & DACL_READFB) &&
+	/* CALDAV:read-free-busy does not apply to CALDAV:schedule-in/outbox */
+	!(flags & (PRIV_INBOX|PRIV_OUTBOX))) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	ensure_ns(ns, NS_CALDAV, root, XML_NS_CALDAV, "C");
+	xmlNewChild(priv, nsNS_CALDAV, BAD_CAST "read-free-busy", NULL);
+ }
+ if ((rights & DACL_WRITE) == DACL_WRITE) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "write", NULL);
+ }
+ if (rights & DACL_WRITECONT) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "write-content", NULL);
+ }
+ if (rights & DACL_WRITEPROPS) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "write-properties", NULL);
+ }
+
+ if (rights & (DACL_BIND|DACL_UNBIND|DACL_ADMIN)) {
+	ensure_ns(ns, NS_CYRUS, root, XML_NS_CYRUS, "CY");
+ }
+
+ if ((rights & DACL_BIND) == DACL_BIND) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "bind", NULL);
+ }
+ if (rights & DACL_MKCOL) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, nsNS_CYRUS, BAD_CAST "make-collection", NULL);
+ }
+ if (rights & DACL_ADDRSRC) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, nsNS_CYRUS, BAD_CAST "add-resource", NULL);
+ }
+ if ((rights & DACL_UNBIND) == DACL_UNBIND) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, NULL, BAD_CAST "unbind", NULL);
+ }
+ if (rights & DACL_RMCOL) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, nsNS_CYRUS, BAD_CAST "remove-collection", NULL);
+ }
+ if (rights & DACL_RMRSRC) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, nsNS_CYRUS, BAD_CAST "remove-resource", NULL);
+ }
+ if (rights & DACL_ADMIN) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	xmlNewChild(priv, nsNS_CYRUS, BAD_CAST "admin", NULL);
+ }
+
+ if (rights & DACL_SCHED) {
+	ensure_ns(ns, NS_CALDAV, root, XML_NS_CALDAV, "C");
+ }
+ if ((rights & DACL_SCHED) == DACL_SCHED) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	if (flags & PRIV_INBOX)
+	 xmlNewChild(priv, nsNS_CALDAV, BAD_CAST "schedule-deliver", NULL);
+	else if (flags & PRIV_OUTBOX)
+	 xmlNewChild(priv, nsNS_CALDAV, BAD_CAST "schedule-send", NULL);
+ }
+ if (rights & DACL_INVITE) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	if (flags & PRIV_INBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-deliver-invite", NULL);
+	else if (flags & PRIV_OUTBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-send-invite", NULL);
+ }
+ if (rights & DACL_REPLY) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	if (flags & PRIV_INBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-deliver-reply", NULL);
+	else if (flags & PRIV_OUTBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-send-reply", NULL);
+ }
+ if (rights & DACL_SCHEDFB) {
+	priv = xmlNewChild(parent, NULL, BAD_CAST "privilege", NULL);
+	if (flags & PRIV_INBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-query-freebusy", NULL);
+	else if (flags & PRIV_OUTBOX)
+	 xmlNewChild(priv, nsNS_CALDAV,
+			BAD_CAST "schedule-send-freebusy", NULL);
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:current-user-privilege-set */
+int propfind_curprivset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx,
+			xmlNodePtr resp,
+			struct propstat propstat,
+			void *rock __attribute__((unused)))
+{
+ int rights;
+ unsigned flags = 0;
+ xmlNodePtr set;
+
+ if (!fctx->mailbox) return HTTP_NOT_FOUND;
+ if (((rights = cyrus_acl_myrights(fctx->authstate, fctx->mailbox->acl))
+	 & DACL_READ) != DACL_READ) {
+	return HTTP_UNAUTHORIZED;
+ }
+
+ /* Add in implicit rights */
+ if (fctx->userisadmin) {
+	rights |= DACL_ADMIN;
+ }
+ else if (mboxname_userownsmailbox(fctx->int_userid, fctx->mailbox->name)) {
+	rights |= config_implicitrights;
+ }
+
+ /* Build the rest of the XML response */
+ set = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ if (fctx->req_tgt->collection) {
+	if (fctx->req_tgt->namespace == URL_NS_CALENDAR) {
+	 flags = PRIV_IMPLICIT;
+
+	 if (!strcmp(fctx->req_tgt->collection, SCHED_INBOX))
+		flags = PRIV_INBOX;
+	 else if (!strcmp(fctx->req_tgt->collection, SCHED_OUTBOX))
+		flags = PRIV_OUTBOX;
+	}
+
+	add_privs(rights, flags, set, resp->parent, fctx->ns);
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:acl */
+int propfind_acl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp,
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ int rights;
+ xmlNodePtr acl;
+ char *aclstr, *userid;
+ unsigned flags = 0;
+
+ if (!fctx->mailbox) return HTTP_NOT_FOUND;
+ if (!((rights = cyrus_acl_myrights(fctx->authstate, fctx->mailbox->acl))
+	 & DACL_ADMIN)) {
+	return HTTP_UNAUTHORIZED;
+ }
+
+ if (fctx->req_tgt->namespace == URL_NS_CALENDAR) {
+	flags = PRIV_IMPLICIT;
+
+	if (fctx->req_tgt->collection) {
+	 if (!strcmp(fctx->req_tgt->collection, SCHED_INBOX))
+		flags = PRIV_INBOX;
+	 else if (!strcmp(fctx->req_tgt->collection, SCHED_OUTBOX))
+		flags = PRIV_OUTBOX;
+	}
+ }
+
+ /* Start the acl XML response */
+ acl = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, NULL, 0);
+
+ /* Parse the ACL string (userid/rights pairs) */
+ userid = aclstr = xstrdup(fctx->mailbox->acl);
+
+ while (userid) {
+	char *rightstr, *nextid;
+	xmlNodePtr ace, node;
+	int deny = 0;
+
+	rightstr = strchr(userid, '\t');
+	if (!rightstr) break;
+	*rightstr++ = '\0';
+	
+	nextid = strchr(rightstr, '\t');
+	if (!nextid) break;
+	*nextid++ = '\0';
+
+	/* Check for negative rights */
+	/* XXX Does this correspond to DAV:deny? */
+	if (*userid == '-') {
+	 deny = 1;
+	 userid++;
+	}
+
+	rights = cyrus_acl_strtomask(rightstr);
+
+	/* Add ace XML element for this userid/right pair */
+	ace = xmlNewChild(acl, NULL, BAD_CAST "ace", NULL);
+
+	/* XXX Need to check for groups.
+	 * Is there any IMAP equivalent to "unauthenticated"?
+	 * Is there any DAV equivalent to "anonymous"?
+	 */
+
+	node = xmlNewChild(ace, NULL, BAD_CAST "principal", NULL);
+	if (!strcmp(userid, fctx->userid))
+	 xmlNewChild(node, NULL, BAD_CAST "self", NULL);
+	else if ((strlen(userid) == fctx->req_tgt->userlen) &&
+		 !strncmp(userid, fctx->req_tgt->user, fctx->req_tgt->userlen))
+	 xmlNewChild(node, NULL, BAD_CAST "owner", NULL);
+	else if (!strcmp(userid, "anyone"))
+	 xmlNewChild(node, NULL, BAD_CAST "authenticated", NULL);
+	else {
+	 buf_reset(&fctx->buf);
+	 buf_printf(&fctx->buf, "%s/user/%s/",
+		 namespace_principal.prefix, userid);
+	 xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+	}
+
+	node = xmlNewChild(ace, NULL,
+			 BAD_CAST (deny ? "deny" : "grant"), NULL);
+	add_privs(rights, flags, node, resp->parent, fctx->ns);
+
+	if (fctx->req_tgt->resource) {
+	 node = xmlNewChild(ace, NULL, BAD_CAST "inherited", NULL);
+	 buf_reset(&fctx->buf);
+	 buf_printf(&fctx->buf, "%.*s",
+		 (int)(fctx->req_tgt->resource - fctx->req_tgt->path),
+		 fctx->req_tgt->path);
+	 xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+	}
+
+	userid = nextid;
+ }
+
+ if (aclstr) free(aclstr);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:acl-restrictions */
+int propfind_aclrestrict(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx,
+			 xmlNodePtr resp __attribute__((unused)),
+			 struct propstat propstat,
+			 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ xmlNewChild(node, NULL, BAD_CAST "no-invert", NULL);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:principal-collection-set */
+EXPORTED int propfind_princolset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx,
+			xmlNodePtr resp __attribute__((unused)),
+			struct propstat propstat,
+			void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "%s/", namespace_principal.prefix);
+ xmlNewChild(node, NULL, BAD_CAST "href", BAD_CAST buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:quota-available-bytes and DAV:quota-used-bytes */
+EXPORTED int propfind_quota(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ static char prevrootMAX_MAILBOX_BUFFER;
+ char foundrootMAX_MAILBOX_BUFFER, *qr = NULL;
+
+ if (fctx->mailbox) {
+	/* Use the quotaroot as specified in mailbox header */
+	qr = fctx->mailbox->quotaroot;
+ }
+ else {
+	/* Find the quotaroot governing this hierarchy */
+	if (quota_findroot(foundroot, sizeof(foundroot), fctx->req_tgt->mboxname)) {
+	 qr = foundroot;
+	}
+ }
+
+ if (!qr) return HTTP_NOT_FOUND;
+
+ if (!fctx->quota.root ||
+	strcmp(fctx->quota.root, qr)) {
+	/* Different quotaroot - read it */
+
+	syslog(LOG_DEBUG, "reading quota for '%s'", qr);
+
+	fctx->quota.root = strcpy(prevroot, qr);
+
+	quota_read(&fctx->quota, NULL, 0);
+ }
+
+ buf_reset(&fctx->buf);
+ if (!xmlStrcmp(name, BAD_CAST "quota-available-bytes")) {
+	/* Calculate limit in bytes and subtract usage */
+	quota_t limit = fctx->quota.limitsQUOTA_STORAGE * quota_unitsQUOTA_STORAGE;
+	buf_printf(&fctx->buf, QUOTA_T_FMT, limit - fctx->quota.usedsQUOTA_STORAGE);
+ }
+ else if (fctx->record) {
+	/* Bytes used by resource */
+	buf_printf(&fctx->buf, "%u", fctx->record->size);
+ }
+ else if (fctx->mailbox) {
+	/* Bytes used by calendar collection */
+	buf_printf(&fctx->buf, QUOTA_T_FMT,
+		 fctx->mailbox->i.quota_mailbox_used);
+ }
+ else {
+	/* Bytes used by entire hierarchy */
+	buf_printf(&fctx->buf, QUOTA_T_FMT, fctx->quota.usedsQUOTA_STORAGE);
+ }
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:current-user-principal */
+EXPORTED int propfind_curprin(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV,
+				 &propstatPROPSTAT_OK, name, ns, NULL, 0);
+
+ if (fctx->userid) {
+	buf_reset(&fctx->buf);
+	buf_printf(&fctx->buf, "%s/user/%s/",
+		 namespace_principal.prefix, fctx->userid);
+	xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+ }
+ else {
+	xmlNewChild(node, NULL, BAD_CAST "unauthenticated", NULL);
+ }
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:add-member */
+int propfind_addmember(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlNodePtr node;
+ int len;
+
+ if (!fctx->req_tgt->collection) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+
+ len = fctx->req_tgt->resource ?
+	(size_t) (fctx->req_tgt->resource - fctx->req_tgt->path) :
+	strlen(fctx->req_tgt->path);
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, "%.*s", len, fctx->req_tgt->path);
+
+ xml_add_href(node, NULL, buf_cstring(&fctx->buf));
+
+ return 0;
+}
+
+
+/* Callback to fetch DAV:sync-token and CS:getctag */
+int propfind_sync_token(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx,
+			xmlNodePtr resp __attribute__((unused)),
+			struct propstat propstat,
+			void *rock __attribute__((unused)))
+{
+ if (!fctx->mailbox || fctx->record) return HTTP_NOT_FOUND;
+
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, XML_NS_CYRUS "sync/%u-" MODSEQ_FMT,
+	 fctx->mailbox->i.uidvalidity,
+	 fctx->mailbox->i.highestmodseq);
+
+ xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 name, ns, BAD_CAST buf_cstring(&fctx->buf), 0);
+
+ return 0;
+}
+
+
+/* Callback to fetch properties from resource header */
+int propfind_fromhdr(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock)
+{
+ const char *hdrname = (const char *) rock;
+ int r = HTTP_NOT_FOUND;
+
+ if (fctx->record &&
+	(mailbox_cached_header(hdrname) != BIT32_MAX) &&
+	!mailbox_cacherecord(fctx->mailbox, fctx->record)) {
+	unsigned size;
+	struct protstream *stream;
+	hdrcache_t hdrs = NULL; 
+	const char **hdr;
+
+	size = cacheitem_size(fctx->record, CACHE_HEADERS);
+	stream = prot_readmap(cacheitem_base(fctx->record,
+					 CACHE_HEADERS), size);
+	hdrs = spool_new_hdrcache();
+	spool_fill_hdrcache(stream, NULL, hdrs, NULL);
+	prot_free(stream);
+
+	if ((hdr = spool_getheader(hdrs, (const char *) hdrname))) {
+	 xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			 name, ns, BAD_CAST hdr0, 0);
+	 r = 0;
+	}
+
+	spool_free_hdrcache(hdrs);
+ }
+
+ return r;
+}
+
+
+/* Callback to read a property from annotation DB */
+int propfind_fromdb(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx,
+		 xmlNodePtr resp __attribute__((unused)),
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ struct buf attrib = BUF_INITIALIZER;
+ xmlNodePtr node;
+ int r = 0;
+
+ buf_reset(&fctx->buf);
+ buf_printf(&fctx->buf, ANNOT_NS "<%s>%s",
+	 (const char *) ns->href, name);
+
+ if (fctx->mailbox && !fctx->record &&
+	!(r = annotatemore_lookup(fctx->mailbox->name, buf_cstring(&fctx->buf),
+				 /* shared */ NULL, &attrib))) {
+	if (!buf_len(&attrib) &&
+	 !xmlStrcmp(name, BAD_CAST "displayname")) {
+	 /* Special case empty displayname -- use last segment of path */
+	 buf_setcstr(&attrib, strrchr(fctx->mailbox->name, '.') + 1);
+	}
+ }
+
+ if (r) return HTTP_SERVER_ERROR;
+ if (!buf_len(&attrib)) return HTTP_NOT_FOUND;
+
+ node = xml_add_prop(HTTP_OK, fctx->nsNS_DAV, &propstatPROPSTAT_OK,
+			name, ns, NULL, 0);
+ xmlAddChild(node, xmlNewCDataBlock(fctx->root->doc,
+				 BAD_CAST buf_cstring(&attrib), buf_len(&attrib)));
+
+ return 0;
+}
+
+
+/* Callback to write a property to annotation DB */
+int proppatch_todb(xmlNodePtr prop, unsigned set,
+		 struct proppatch_ctx *pctx,
+		 struct propstat propstat,
+		 void *rock __attribute__((unused)))
+{
+ xmlChar *freeme = NULL;
+ annotate_state_t *astate = NULL;
+ struct buf value = BUF_INITIALIZER;
+ int r;
+
+ buf_reset(&pctx->buf);
+ buf_printf(&pctx->buf, ANNOT_NS "<%s>%s",
+	 (const char *) prop->ns->href, prop->name);
+
+ if (set) {
+	freeme = xmlNodeGetContent(prop);
+	buf_init_ro_cstr(&value, (const char *)freeme);
+ }
+
+ r = mailbox_get_annotate_state(pctx->mailbox, 0, &astate);
+ if (!r) r = annotate_state_write(astate, buf_cstring(&pctx->buf), /*userid*/NULL, &value);
+
+ if (!r) {
+	xml_add_prop(HTTP_OK, pctx->nsNS_DAV, &propstatPROPSTAT_OK,
+		 prop->name, prop->ns, NULL, 0);
+ }
+ else {
+	xml_add_prop(HTTP_SERVER_ERROR, pctx->nsNS_DAV,
+		 &propstatPROPSTAT_ERROR, prop->name, prop->ns, NULL, 0);
+ }
+
+ if (freeme) xmlFree(freeme);
+
+ return 0;
+}
+
+
+/* annotemore_findall callback for adding dead properties (allprop/propname) */
+static int allprop_cb(const char *mailbox __attribute__((unused)),
+		 uint32_t uid __attribute__((unused)),
+		 const char *entry,
+		 const char *userid, const struct buf *attrib,
+		 void *rock)
+{
+ struct allprop_rock *arock = (struct allprop_rock *) rock;
+ const struct prop_entry *pentry;
+ char *href, *name;
+ xmlNsPtr ns;
+ xmlNodePtr node;
+
+ /* Make sure its a shared entry or the user's private one */
+ if (*userid && strcmp(userid, arock->fctx->userid)) return 0;
+
+ /* Split entry into namespace href and name ( <href>name ) */
+ buf_setcstr(&arock->fctx->buf, entry + strlen(ANNOT_NS) + 1);
+ href = (char *) buf_cstring(&arock->fctx->buf);
+ if ((name = strchr(href, '>'))) *name++ = '\0';
+ else if ((name = strchr(href, ':'))) *name++ = '\0';
+
+ /* Look for a match against live properties */
+ for (pentry = arock->fctx->lprops;
+	 pentry->name &&
+	 (strcmp(name, pentry->name) ||
+	 strcmp(href, known_namespacespentry->ns.href));
+	 pentry++);
+
+ if (pentry->name &&
+	(arock->fctx->mode == PROPFIND_ALL /* Skip all live properties */
+	 || (pentry->flags & PROP_ALLPROP))) /* Skip those already included */
+	return 0;
+
+ /* Look for an instance of this namespace in our response */
+ ns = hash_lookup(href, arock->fctx->ns_table);
+ if (!ns) {
+	char prefix5;
+	snprintf(prefix, sizeof(prefix), "X%u", arock->fctx->prefix_count++);
+	ns = xmlNewNs(arock->fctx->root, BAD_CAST href, BAD_CAST prefix);
+	hash_insert(href, ns, arock->fctx->ns_table);
+ }
+
+ /* Add the dead property to the response */
+ node = xml_add_prop(HTTP_OK, arock->fctx->nsNS_DAV,
+			&arock->propstatPROPSTAT_OK,
+			BAD_CAST name, ns, NULL, 0);
+
+ if (arock->fctx->mode == PROPFIND_ALL) {
+	xmlAddChild(node, xmlNewCDataBlock(arock->fctx->root->doc,
+					 BAD_CAST attrib->s, attrib->len));
+ }
+
+ return 0;
+}
+
+
+static int prescreen_prop(const struct prop_entry *entry,
+			 xmlNodePtr prop,
+			 struct propfind_ctx *fctx)
+{
+ unsigned allowed = 1;
+
+ if (fctx->req_tgt->resource && !(entry->flags & PROP_RESOURCE)) allowed = 0;
+ else if (entry->flags & PROP_PRESCREEN) {
+	void *rock = (entry->flags & PROP_NEEDPROP) ? prop : entry->rock;
+
+	allowed = entry->get(prop->name, NULL, fctx, NULL, NULL, rock);
+ }
+
+ return allowed;
+}
+
+
+/* Parse the requested properties and create a linked list of fetch callbacks.
+ * The list gets reused for each href if Depth > 0
+ */
+static int preload_proplist(xmlNodePtr proplist, struct propfind_ctx *fctx)
+{
+ int ret = 0;
+ xmlNodePtr prop;
+ const struct prop_entry *entry;
+
+ if (fctx->mode == PROPFIND_ALL || fctx->mode == PROPFIND_NAME) {
+	xmlNsPtr nsDef;
+
+	/* Add live properties for allprop/propname */
+	for (entry = fctx->lprops; entry->name; entry++) {
+	 if (entry->flags & PROP_ALLPROP) {
+		/* Pre-screen request based on prop flags */
+		int allowed = prescreen_prop(entry, NULL, fctx);
+
+		if (allowed || fctx->mode == PROP_ALLPROP) {
+		 struct propfind_entry_list *nentry =
+			xzmalloc(sizeof(struct propfind_entry_list));
+
+		 ensure_ns(fctx->ns, entry->ns, fctx->root,
+			 known_namespacesentry->ns.href,
+			 known_namespacesentry->ns.prefix);
+
+		 nentry->name = BAD_CAST entry->name;
+		 nentry->ns = fctx->nsentry->ns;
+		 if (allowed) {
+			nentry->flags = entry->flags;
+			nentry->get = entry->get;
+			nentry->rock = entry->rock;
+		 }
+		 nentry->next = fctx->elist;
+		 fctx->elist = nentry;
+		}
+	 }
+	}
+
+	/* Add all namespaces attached to the response to our hash table */
+	construct_hash_table(fctx->ns_table, 10, 1);
+
+	for (nsDef = fctx->root->nsDef; nsDef; nsDef = nsDef->next) {
+	 hash_insert((const char *) nsDef->href, nsDef, fctx->ns_table);
+	}
+ }
+
+ /* Iterate through requested properties */
+ for (prop = proplist; !*fctx->ret && prop; prop = prop->next) {
+	if (prop->type == XML_ELEMENT_NODE) {
+	 struct propfind_entry_list *nentry;
+
+	 /* Look for a match against our known properties */
+	 for (entry = fctx->lprops;
+		 entry->name && 
+		 (strcmp((const char *) prop->name, entry->name) ||
+		 strcmp((const char *) prop->ns->href,
+			 known_namespacesentry->ns.href));
+		 entry++);
+
+	 /* Skip properties already included by allprop */
+	 if (fctx->mode == PROPFIND_ALL && (entry->flags & PROP_ALLPROP))
+		continue;		
+
+	 nentry = xzmalloc(sizeof(struct propfind_entry_list));
+	 nentry->name = prop->name;
+	 nentry->ns = prop->ns;
+	 if (entry->name) {
+		/* Found a match - Pre-screen request based on prop flags */
+		if (prescreen_prop(entry, prop, fctx)) {
+		 nentry->flags = entry->flags;
+		 nentry->get = entry->get;
+		 if (entry->flags & PROP_NEEDPROP)
+			nentry->rock = prop;
+		 else
+			nentry->rock = entry->rock;
+		}
+		ret = *fctx->ret;
+	 }
+	 else {
+		/* No match, treat as a dead property */
+		nentry->flags = PROP_COLLECTION;
+		nentry->get = propfind_fromdb;
+		nentry->rock = NULL;
+	 }
+	 nentry->next = fctx->elist;
+	 fctx->elist = nentry;
+	}
+ }
+
+ return ret;
+}
+
+
+/* Execute the given property patch instructions */
+static int do_proppatch(struct proppatch_ctx *pctx, xmlNodePtr instr)
+{
+ struct propstat propstatNUM_PROPSTAT;
+ int i;
+
+ memset(propstat, 0, NUM_PROPSTAT * sizeof(struct propstat));
+
+ /* Iterate through propertyupdate children */
+ for (; instr; instr = instr->next) {
+	if (instr->type == XML_ELEMENT_NODE) {
+	 xmlNodePtr prop;
+	 unsigned set = 0;
+
+	 if (!xmlStrcmp(instr->name, BAD_CAST "set")) set = 1;
+	 else if ((pctx->meth == METH_PROPPATCH) &&
+		 !xmlStrcmp(instr->name, BAD_CAST "remove")) set = 0;
+	 else {
+		syslog(LOG_INFO, "Unknown PROPPATCH instruction");
+		pctx->err->desc = "Unknown PROPPATCH instruction";
+		return HTTP_BAD_REQUEST;
+	 }
+
+	 /* Find child element */
+	 for (prop = instr->children;
+		 prop && prop->type != XML_ELEMENT_NODE; prop = prop->next);
+	 if (!prop || xmlStrcmp(prop->name, BAD_CAST "prop")) {
+		pctx->err->desc = "Missing prop element";
+		return HTTP_BAD_REQUEST;
+	 }
+
+	 /* Iterate through requested properties */
+	 for (prop = prop->children; prop; prop = prop->next) {
+		if (prop->type == XML_ELEMENT_NODE) {
+		 const struct prop_entry *entry;
+
+		 /* Look for a match against our known properties */
+		 for (entry = pctx->lprops;
+			 entry->name &&
+			 (strcmp((const char *) prop->name, entry->name) ||
+			 strcmp((const char *) prop->ns->href,
+				 known_namespacesentry->ns.href));
+			 entry++);
+
+		 if (entry->name) {
+			if (!entry->put) {
+			 /* Protected property */
+			 xml_add_prop(HTTP_FORBIDDEN, pctx->nsNS_DAV,
+					 &propstatPROPSTAT_FORBID,
+					 prop->name, prop->ns, NULL,
+					 DAV_PROT_PROP);
+			 *pctx->ret = HTTP_FORBIDDEN;
+			}
+			else {
+			 /* Write "live" property */
+			 entry->put(prop, set, pctx, propstat, entry->rock);
+			}
+		 }
+		 else {
+			/* Write "dead" property */
+			proppatch_todb(prop, set, pctx, propstat, NULL);
+		 }
+		}
+	 }
+	}
+ }
+
+ /* One or more of the properties failed */
+ if (*pctx->ret && propstatPROPSTAT_OK.root) {
+	/* 200 status must become 424 */
+	propstatPROPSTAT_FAILEDDEP.root = propstatPROPSTAT_OK.root;
+	propstatPROPSTAT_FAILEDDEP.status = HTTP_FAILED_DEP;
+	propstatPROPSTAT_OK.root = NULL;
+ }
+
+ /* Add status and optional error to the propstat elements
+ and then add them to the response element */
+ for (i = 0; i < NUM_PROPSTAT; i++) {
+	struct propstat *stat = &propstati;
+
+	if (stat->root) {
+	 xmlNewChild(stat->root, NULL, BAD_CAST "status",
+			BAD_CAST http_statusline(stat->status));
+	 if (stat->precond) {
+		struct error_t error = { NULL, stat->precond, NULL, 0 };
+		xml_add_error(stat->root, &error, pctx->ns);
+	 }
+
+	 xmlAddChild(pctx->root, stat->root);
+	}
+ }
+
+ return 0;
+}
+
+
+/* Parse an XML body into a tree */
+int parse_xml_body(struct transaction_t *txn, xmlNodePtr *root)
+{
+ const char **hdr;
+ xmlParserCtxtPtr ctxt;
+ xmlDocPtr doc = NULL;
+ int r = 0;
+
+ *root = NULL;
+
+ /* Read body */
+ txn->req_body.flags |= BODY_DECODE;
+ r = read_body(httpd_in, txn->req_hdrs, &txn->req_body, &txn->error.desc);
+ if (r) {
+	txn->flags.conn = CONN_CLOSE;
+	return r;
+ }
+
+ if (!buf_len(&txn->req_body.payload)) return 0;
+
+ /* Check Content-Type */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "Content-Type")) ||
+	(!is_mediatype(hdr0, "text/xml") &&
+	 !is_mediatype(hdr0, "application/xml"))) {
+	txn->error.desc = "This method requires an XML body\r\n";
+	return HTTP_BAD_MEDIATYPE;
+ }
+
+ /* Parse the XML request */
+ ctxt = xmlNewParserCtxt();
+ if (ctxt) {
+	doc = xmlCtxtReadMemory(ctxt, buf_cstring(&txn->req_body.payload),
+				buf_len(&txn->req_body.payload), NULL, NULL,
+				XML_PARSE_NOWARNING);
+	xmlFreeParserCtxt(ctxt);
+ }
+ if (!doc) {
+	txn->error.desc = "Unable to parse XML body\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Get the root element of the XML request */
+ if (!(*root = xmlDocGetRootElement(doc))) {
+	txn->error.desc = "Missing root element in request\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ return 0;
+}
+
+
+/* Perform an ACL request
+ *
+ * preconditions:
+ * DAV:no-ace-conflict
+ * DAV:no-protected-ace-conflict
+ * DAV:no-inherited-ace-conflict
+ * DAV:limited-number-of-aces
+ * DAV:deny-before-grant
+ * DAV:grant-only
+ * DAV:no-invert
+ * DAV:no-abstract
+ * DAV:not-supported-privilege
+ * DAV:missing-required-principal
+ * DAV:recognized-principal
+ * DAV:allowed-principal
+ */
+int meth_acl(struct transaction_t *txn, void *params)
+{
+ struct meth_params *aparams = (struct meth_params *) params;
+ int ret = 0, r, rights;
+ xmlDocPtr indoc = NULL;
+ xmlNodePtr root, ace;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct buf acl = BUF_INITIALIZER;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = aparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (only allowed on collections) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITECOL)) {
+	txn->error.desc = "ACLs can only be set on collections\r\n";
+	syslog(LOG_DEBUG, "Tried to set ACL on non-collection");
+	return HTTP_NOT_ALLOWED;
+ }
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_ADMIN)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights = DACL_ADMIN;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ /* Open mailbox for writing */
+ r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_EXCLUSIVE);
+ if (r) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Parse the ACL body */
+ ret = parse_xml_body(txn, &root);
+ if (!ret && !root) {
+	txn->error.desc = "Missing request body\r\n";
+	ret = HTTP_BAD_REQUEST;
+ }
+ if (ret) goto done;
+
+ indoc = root->doc;
+
+ /* Make sure its an DAV:acl element */
+ if (xmlStrcmp(root->name, BAD_CAST "acl")) {
+	txn->error.desc = "Missing acl element in ACL request\r\n";
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ /* Parse the DAV:ace elements */
+ for (ace = root->children; ace; ace = ace->next) {
+	if (ace->type == XML_ELEMENT_NODE) {
+	 xmlNodePtr child = NULL, prin = NULL, privs = NULL;
+	 const char *userid = NULL;
+	 int deny = 0, rights = 0;
+	 char rightstr100;
+	 struct request_target_t tgt;
+
+	 for (child = ace->children; child; child = child->next) {
+		if (child->type == XML_ELEMENT_NODE) {
+		 if (!xmlStrcmp(child->name, BAD_CAST "principal")) {
+			if (prin) {
+			 txn->error.desc = "Multiple principals in ACE\r\n";
+			 ret = HTTP_BAD_REQUEST;
+			 goto done;
+			}
+
+			for (prin = child->children;
+			 prin->type != XML_ELEMENT_NODE; prin = prin->next);
+		 }
+		 else if (!xmlStrcmp(child->name, BAD_CAST "grant")) {
+			if (privs) {
+			 txn->error.desc = "Multiple grant|deny in ACE\r\n";
+			 ret = HTTP_BAD_REQUEST;
+			 goto done;
+			}
+
+			for (privs = child->children;
+			 privs->type != XML_ELEMENT_NODE; privs = privs->next);
+		 }
+		 else if (!xmlStrcmp(child->name, BAD_CAST "deny")) {
+			if (privs) {
+			 txn->error.desc = "Multiple grant|deny in ACE\r\n";
+			 ret = HTTP_BAD_REQUEST;
+			 goto done;
+			}
+
+			for (privs = child->children;
+			 privs->type != XML_ELEMENT_NODE; privs = privs->next);
+			deny = 1;
+		 }
+		 else if (!xmlStrcmp(child->name, BAD_CAST "invert")) {
+			/* DAV:no-invert */
+			txn->error.precond = DAV_NO_INVERT;
+			ret = HTTP_FORBIDDEN;
+			goto done;
+		 }
+		 else {
+			txn->error.desc = "Unknown element in ACE\r\n";
+			ret = HTTP_BAD_REQUEST;
+			goto done;
+		 }
+		}
+	 }
+
+	 if (!xmlStrcmp(prin->name, BAD_CAST "self")) {
+		userid = proxy_userid;
+	 }
+#if 0 /* XXX Do we need to support this? */
+	 else if (!xmlStrcmp(prin->name, BAD_CAST "owner")) {
+		/* XXX construct userid from mailbox name */
+	 }
+#endif
+	 else if (!xmlStrcmp(prin->name, BAD_CAST "authenticated")) {
+		userid = "anyone";
+	 }
+	 else if (!xmlStrcmp(prin->name, BAD_CAST "href")) {
+		xmlChar *href = xmlNodeGetContent(prin);
+		xmlURIPtr uri;
+		const char *errstr = NULL;
+		size_t plen = strlen(namespace_principal.prefix);
+
+		uri = parse_uri(METH_UNKNOWN, (const char *) href, 1, &errstr);
+		if (uri &&
+		 !strncmp(namespace_principal.prefix, uri->path, plen) &&
+		 uri->pathplen == '/') {
+		 memset(&tgt, 0, sizeof(struct request_target_t));
+		 tgt.namespace = URL_NS_PRINCIPAL;
+		 r = prin_parse_path(uri->path, &tgt, &errstr);
+		 if (!r && tgt.user) userid = tgt.user;
+		}
+		if (uri) xmlFreeURI(uri);
+		xmlFree(href);
+	 }
+
+	 if (!userid) {
+		/* DAV:recognized-principal */
+		txn->error.precond = DAV_RECOG_PRINC;
+		ret = HTTP_FORBIDDEN;
+		goto done;
+	 }
+
+	 for (; privs; privs = privs->next) {
+		if (privs->type == XML_ELEMENT_NODE) {
+		 xmlNodePtr priv = privs->children;
+		 for (; priv->type != XML_ELEMENT_NODE; priv = priv->next);
+
+		 if (aparams->acl_ext &&
+			aparams->acl_ext(txn, priv, &rights)) {
+			/* Extension (CalDAV) privileges */
+			if (txn->error.precond) {
+			 ret = HTTP_FORBIDDEN;
+			 goto done;
+			}
+		 }
+		 else if (!xmlStrcmp(priv->ns->href,
+					BAD_CAST XML_NS_DAV)) {
+			/* WebDAV privileges */
+			if (!xmlStrcmp(priv->name,
+				 BAD_CAST "all"))
+			 rights |= DACL_ALL;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "read"))
+			 rights |= DACL_READ;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "write"))
+			 rights |= DACL_WRITE;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "write-content"))
+			 rights |= DACL_WRITECONT;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "write-properties"))
+			 rights |= DACL_WRITEPROPS;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "bind"))
+			 rights |= DACL_BIND;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "unbind"))
+			 rights |= DACL_UNBIND;
+			else if (!xmlStrcmp(priv->name,
+					 BAD_CAST "read-current-user-privilege-set")
+				 || !xmlStrcmp(priv->name,
+					 BAD_CAST "read-acl")
+				 || !xmlStrcmp(priv->name,
+					 BAD_CAST "write-acl")
+				 || !xmlStrcmp(priv->name,
+					 BAD_CAST "unlock")) {
+			 /* DAV:no-abstract */
+			 txn->error.precond = DAV_NO_ABSTRACT;
+			 ret = HTTP_FORBIDDEN;
+			 goto done;
+			}
+			else {
+			 /* DAV:not-supported-privilege */
+			 txn->error.precond = DAV_SUPP_PRIV;
+			 ret = HTTP_FORBIDDEN;
+			 goto done;
+			}
+		 }
+		 else if (!xmlStrcmp(priv->ns->href,
+				 BAD_CAST XML_NS_CYRUS)) {
+			/* Cyrus-specific privileges */
+			if (!xmlStrcmp(priv->name,
+				 BAD_CAST "make-collection"))
+			 rights |= DACL_MKCOL;
+			else if (!xmlStrcmp(priv->name,
+				 BAD_CAST "remove-collection"))
+			 rights |= DACL_RMCOL;
+			else if (!xmlStrcmp(priv->name,
+				 BAD_CAST "add-resource"))
+			 rights |= DACL_ADDRSRC;
+			else if (!xmlStrcmp(priv->name,
+				 BAD_CAST "remove-resource"))
+			 rights |= DACL_RMRSRC;
+			else if (!xmlStrcmp(priv->name,
+				 BAD_CAST "admin"))
+			 rights |= DACL_ADMIN;
+			else {
+			 /* DAV:not-supported-privilege */
+			 txn->error.precond = DAV_SUPP_PRIV;
+			 ret = HTTP_FORBIDDEN;
+			 goto done;
+			}
+		 }
+		 else {
+			/* DAV:not-supported-privilege */
+			txn->error.precond = DAV_SUPP_PRIV;
+			ret = HTTP_FORBIDDEN;
+			goto done;
+		 }
+		}
+	 }
+
+	 cyrus_acl_masktostr(rights, rightstr);
+	 buf_printf(&acl, "%s%s\t%s\t",
+		 deny ? "-" : "", userid, rightstr);
+	}
+ }
+
+ if ((r = mboxlist_sync_setacls(txn->req_tgt.mboxname, buf_cstring(&acl)))) {
+	syslog(LOG_ERR, "mboxlist_sync_setacls(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+ mailbox_set_acl(mailbox, buf_cstring(&acl), 0);
+
+ response_header(HTTP_OK, txn);
+
+ done:
+ buf_free(&acl);
+ if (indoc) xmlFreeDoc(indoc);
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}
+
+
+/* Perform a COPY/MOVE request
+ *
+ * preconditions:
+ * *DAV:need-privileges
+ */
+int meth_copy(struct transaction_t *txn, void *params)
+{
+ struct meth_params *cparams = (struct meth_params *) params;
+ int ret = HTTP_CREATED, r, precond, rights, overwrite = OVERWRITE_YES;
+ const char **hdr;
+ xmlURIPtr dest_uri;
+ struct request_target_t dest_tgt; /* Parsed destination URL */
+ struct backend *src_be = NULL, *dest_be = NULL;
+ struct mailbox *src_mbox = NULL, *dest_mbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record src_rec;
+ const char *etag = NULL;
+ time_t lastmod = 0;
+ unsigned flags = 0;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the source path */
+ if ((r = cparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (not allowed on collections yet) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITE)) return HTTP_NOT_ALLOWED;
+
+ /* Check for mandatory Destination header */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "Destination"))) {
+	txn->error.desc = "Missing Destination header\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Parse destination URI */
+ if (!(dest_uri = parse_uri(METH_UNKNOWN, hdr0, 1, &txn->error.desc))) {
+	txn->error.desc = "Illegal Destination target URI";
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Make sure source and dest resources are NOT the same */
+ if (!strcmp(txn->req_uri->path, dest_uri->path)) {
+	txn->error.desc = "Source and destination resources are the same\r\n";
+	r = HTTP_FORBIDDEN;
+ }
+
+ /* Parse the destination path */
+ if (!r) {
+	r = cparams->parse_path(dest_uri->path, &dest_tgt, &txn->error.desc);
+ }
+ xmlFreeURI(dest_uri);
+
+ if (r) return HTTP_FORBIDDEN;
+
+ /* We don't yet handle COPY/MOVE on collections */
+ if (!dest_tgt.resource) return HTTP_NOT_ALLOWED;
+
+ /* Locate the source mailbox */
+ if ((r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL))) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user on source mailbox */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (((rights & DACL_READ) != DACL_READ) ||
+	((txn->meth == METH_MOVE) && !(rights & DACL_RMRSRC))) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights =
+	 (rights & DACL_READ) != DACL_READ ? DACL_READ : DACL_RMRSRC;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote source mailbox */
+	src_be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!src_be) return HTTP_UNAVAILABLE;
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Locate the destination mailbox */
+ r = http_mlookup(dest_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 dest_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user on destination */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_ADDRSRC) || !(rights & DACL_WRITECONT)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = dest_tgt.path;
+	txn->error.rights =
+	 !(rights & DACL_ADDRSRC) ? DACL_ADDRSRC : DACL_WRITECONT;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote destination mailbox */
+	dest_be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!dest_be) return HTTP_UNAVAILABLE;
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ if (src_be) {
+	/* Remote source mailbox */
+	/* XXX Currently only supports standard Murder */
+
+	if (!dest_be) return HTTP_NOT_ALLOWED;
+
+	/* Replace cached Destination header with just the absolute path */
+	hdr = spool_getheader(txn->req_hdrs, "Destination");
+	strcpy((char *) hdr0, dest_tgt.path);
+
+	if (src_be == dest_be) {
+	 /* Simply send the COPY to the backend */
+	 return http_pipe_req_resp(src_be, txn);
+	}
+
+	/* This is the harder case: GET from source and PUT on destination */
+	return http_proxy_copy(src_be, dest_be, txn);
+ }
+
+ /* Local Mailbox */
+
+ if (!*cparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Open dest mailbox for reading */
+ if ((r = mailbox_open_irl(dest_tgt.mboxname, &dest_mbox))) {
+	syslog(LOG_ERR, "mailbox_open_irl(%s) failed: %s",
+	 dest_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the dest resource, if exists */
+ cparams->davdb.lookup_resource(*cparams->davdb.db, dest_tgt.mboxname,
+				 dest_tgt.resource, 0, (void **) &ddata);
+ /* XXX Check errors */
+
+ /* Finished our initial read of dest mailbox */
+ mailbox_unlock_index(dest_mbox, NULL);
+
+ /* Check any preconditions on destination */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Overwrite")) &&
+	!strcmp(hdr0, "F")) {
+
+	if (ddata->rowid) {
+	 /* Don't overwrite the destination resource */
+	 ret = HTTP_PRECOND_FAILED;
+	 goto done;
+	}
+	overwrite = OVERWRITE_NO;
+ }
+
+ /* Open source mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &src_mbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the source resource */
+ cparams->davdb.lookup_resource(*cparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 0, (void **) &ddata);
+ if (!ddata->rowid) {
+	ret = HTTP_NOT_FOUND;
+	goto done;
+ }
+
+ if (ddata->imap_uid) {
+	/* Mapped URL - Fetch index record for the resource */
+	r = mailbox_find_index_record(src_mbox, ddata->imap_uid, &src_rec, NULL);
+	if (r) {
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	etag = message_guid_encode(&src_rec.guid);
+	lastmod = src_rec.internaldate;
+ }
+ else {
+	/* Unmapped URL (empty resource) */
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+
+ /* Check any preconditions on source */
+ precond = check_precond(txn, (void **) ddata, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+	break;
+
+ case HTTP_LOCKED:
+	txn->error.precond = DAV_NEED_LOCK_TOKEN;
+	txn->error.resource = txn->req_tgt.path;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ if (get_preferences(txn) & PREFER_REP) flags |= PREFER_REP;
+ if ((txn->meth == METH_MOVE) && (dest_mbox == src_mbox))
+	flags |= NO_DUP_CHECK;
+
+ r = mailbox_lock_index(dest_mbox, LOCK_EXCLUSIVE);
+ if (r) {
+	syslog(LOG_ERR, "relock index(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Parse, validate, and store the resource */
+ ret = cparams->copy(txn, src_mbox, &src_rec, dest_mbox, dest_tgt.resource,
+			overwrite, flags);
+
+ /* we're done, no need to keep this */
+ mailbox_unlock_index(dest_mbox, NULL);
+
+ /* For MOVE, we need to delete the source resource */
+ if ((txn->meth == METH_MOVE) &&
+	(ret == HTTP_CREATED || ret == HTTP_NO_CONTENT)) {
+	/* Lock source mailbox */
+	mailbox_lock_index(src_mbox, LOCK_EXCLUSIVE);
+
+	/* Find message UID for the source resource */
+	cparams->davdb.lookup_resource(*cparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 0, (void **) &ddata);
+	/* XXX Check errors */
+
+	/* Fetch index record for the source resource */
+	if (ddata->imap_uid &&
+	 !mailbox_find_index_record(src_mbox, ddata->imap_uid, &src_rec, NULL)) {
+
+	 /* Expunge the source message */
+	 src_rec.system_flags |= FLAG_EXPUNGED;
+	 if ((r = mailbox_rewrite_index_record(src_mbox, &src_rec))) {
+		syslog(LOG_ERR, "expunging src record (%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+		txn->error.desc = error_message(r);
+		ret = HTTP_SERVER_ERROR;
+		goto done;
+	 }
+	}
+ }
+
+ done:
+ if (ret == HTTP_CREATED) {
+	/* Tell client where to find the new resource */
+	txn->location = dest_tgt.path;
+ }
+ else {
+	/* Don't confuse client by providing ETag of Destination resource */
+	txn->resp_body.etag = NULL;
+ }
+
+ if (dest_mbox) mailbox_close(&dest_mbox);
+ if (src_mbox) mailbox_unlock_index(src_mbox, NULL);
+
+ return ret;
+}
+
+
+/* Perform a DELETE request */
+int meth_delete(struct transaction_t *txn, void *params)
+{
+ struct meth_params *dparams = (struct meth_params *) params;
+ int ret = HTTP_NO_CONTENT, r, precond, rights;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record record;
+ const char *etag = NULL;
+ time_t lastmod = 0;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = dparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed */
+ if (!(txn->req_tgt.allow & ALLOW_DELETE)) return HTTP_NOT_ALLOWED; 
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if ((txn->req_tgt.resource && !(rights & DACL_RMRSRC)) ||
+	!(rights & DACL_RMCOL)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights = txn->req_tgt.resource ? DACL_RMRSRC : DACL_RMCOL;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ if (!*dparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ if (!txn->req_tgt.resource) {
+	/* DELETE collection */
+
+	/* Do any special processing */
+	if (dparams->delete) dparams->delete(txn, NULL, NULL, NULL);
+
+	r = mboxlist_deletemailbox(txn->req_tgt.mboxname,
+				 httpd_userisadmin || httpd_userisproxyadmin,
+				 httpd_userid, httpd_authstate,
+				 /*mboxevent*/NULL,
+				 /*checkack*/1, /*localonly*/0, /*force*/0);
+
+	if (!r) dparams->davdb.delete_mbox(*dparams->davdb.db, txn->req_tgt.mboxname, 0);
+	else if (r == IMAP_PERMISSION_DENIED) ret = HTTP_FORBIDDEN;
+	else if (r == IMAP_MAILBOX_NONEXISTENT) ret = HTTP_NOT_FOUND;
+	else if (r) ret = HTTP_SERVER_ERROR;
+
+	return ret;
+ }
+
+
+ /* DELETE resource */
+
+ /* Open mailbox for writing */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_EXCLUSIVE))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the resource, if exists */
+ dparams->davdb.lookup_resource(*dparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 0, (void **) &ddata);
+ if (!ddata->rowid) {
+	ret = HTTP_NOT_FOUND;
+	goto done;
+ }
+
+ memset(&record, 0, sizeof(struct index_record));
+ if (ddata->imap_uid) {
+	/* Mapped URL - Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, ddata->imap_uid, &record, NULL);
+	if (r) {
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	etag = message_guid_encode(&record.guid);
+	lastmod = record.internaldate;
+ }
+ else {
+	/* Unmapped URL (empty resource) */
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+
+ /* Check any preconditions */
+ precond = dparams->check_precond(txn, (void *) ddata, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+	break;
+
+ case HTTP_LOCKED:
+	txn->error.precond = DAV_NEED_LOCK_TOKEN;
+	txn->error.resource = txn->req_tgt.path;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ if (record.uid) {
+	/* Expunge the resource */
+	record.system_flags |= FLAG_EXPUNGED;
+
+	if ((r = mailbox_rewrite_index_record(mailbox, &record))) {
+	 syslog(LOG_ERR, "expunging record (%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+ }
+
+ /* Do any special processing */
+ if (dparams->delete) dparams->delete(txn, mailbox, &record, ddata);
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}
+
+
+/* Perform a GET/HEAD request on a DAV resource */
+int meth_get_dav(struct transaction_t *txn, void *params)
+{
+ struct meth_params *gparams = (struct meth_params *) params;
+ const char **hdr;
+ struct mime_type_t *mime = NULL;
+ int ret = 0, r, precond, rights;
+ const char *data = NULL;
+ unsigned long datalen, offset;
+ struct buf msg_buf = BUF_INITIALIZER;
+ struct resp_body_t *resp_body = &txn->resp_body;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record record;
+ const char *etag = NULL;
+ time_t lastmod = 0;
+
+ /* Parse the path */
+ ret = gparams->parse_path(txn->req_uri->path,
+			 &txn->req_tgt, &txn->error.desc);
+ if (ret) return ret;
+
+ /* We don't handle GET on a collection (yet) */
+ if (!txn->req_tgt.resource) return HTTP_NO_CONTENT;
+
+ /* Check requested MIME type */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Accept"))) {
+	struct accept *e, *enc = parse_accept(hdr);
+
+	for (e = enc; e && e->token; e++) {
+	 struct mime_type_t *m;
+
+	 for (m = gparams->mime_types; !mime && m->content_type; m++) {
+		if (is_mediatype(e->token, m->content_type)) mime = m;
+	 }
+
+	 free(e->token);
+	}
+	if (enc) free(enc);
+ }
+ if (!mime) mime = gparams->mime_types; /* 1st in array MUST default type */
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_READ)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights = DACL_READ;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ if (!*gparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Open mailbox for reading */
+ r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED);
+ if (r) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	goto done;
+ }
+
+ /* Find message UID for the resource */
+ gparams->davdb.lookup_resource(*gparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 0, (void **) &ddata);
+ if (!ddata->rowid) {
+	ret = HTTP_NOT_FOUND;
+	goto done;
+ }
+
+ memset(&record, 0, sizeof(struct index_record));
+ if (ddata->imap_uid) {
+	/* Mapped URL - Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, ddata->imap_uid, &record, NULL);
+	if (r) {
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	/* Resource length doesn't include RFC 5322 header */
+	offset = record.header_size;
+	datalen = record.size - offset;
+
+	txn->flags.ranges = 1;
+	etag = message_guid_encode(&record.guid);
+	lastmod = record.internaldate;
+ }
+ else {
+	/* Unmapped URL (empty resource) */
+	offset = datalen = 0;
+	txn->flags.ranges = 0;
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+
+ /* Check any preconditions, including range request */
+ precond = gparams->check_precond(txn, (void *) ddata, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_PARTIAL:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, Expires, and Cache-Control */
+	resp_body->etag = etag;
+	resp_body->lastmod = lastmod;
+	resp_body->maxage = 3600;	/* 1 hr */
+	txn->flags.cc |= CC_MAXAGE | CC_REVALIDATE; /* don't use stale data */
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ if (record.uid) {
+	txn->flags.vary |= VARY_ACCEPT;
+	resp_body->type = mime->content_type;
+
+	if (txn->meth == METH_GET) {
+	 /* Load message containing the resource */
+	 r = mailbox_map_record(mailbox, &record, &msg_buf);
+	 if (r) goto done;
+
+	 /* iCalendar data in response should not be transformed */
+	 txn->flags.cc |= CC_NOTRANSFORM;
+
+	 data = buf_base(&msg_buf) + offset;
+
+	 if (mime != gparams->mime_types) {
+		/* Not the storage format - convert into requested MIME type */
+		icalcomponent *ical = icalparser_parse_string(data);
+
+		data = mime->to_string(ical);
+		datalen = strlen(data);
+		icalcomponent_free(ical);
+	 }
+	}
+ }
+
+ write_body(precond, txn, data, datalen);
+
+ buf_free(&msg_buf);
+
+ done:
+ if (r) {
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+ }
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}
+
+
+/* Perform a LOCK request
+ *
+ * preconditions:
+ * DAV:need-privileges
+ * DAV:no-conflicting-lock
+ * DAV:lock-token-submitted
+ */
+int meth_lock(struct transaction_t *txn, void *params)
+{
+ struct meth_params *lparams = (struct meth_params *) params;
+ int ret = HTTP_OK, r, precond, rights;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record oldrecord;
+ const char *etag;
+ time_t lastmod;
+ xmlDocPtr indoc = NULL, outdoc = NULL;
+ xmlNodePtr root = NULL;
+ xmlNsPtr nsNUM_NAMESPACE;
+ xmlChar *owner = NULL;
+ time_t now = time(NULL);
+
+ /* XXX We ignore Depth and Timeout header fields */
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = lparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (only allowed on resources) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITE)) return HTTP_NOT_ALLOWED; 
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_WRITECONT) || !(rights & DACL_ADDRSRC)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights =
+	 !(rights & DACL_WRITECONT) ? DACL_WRITECONT : DACL_ADDRSRC;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ if (!*lparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the resource, if exists */
+ lparams->davdb.lookup_resource(*lparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 1, (void *) &ddata);
+
+ if (ddata->imap_uid) {
+	/* Locking existing resource */
+
+	/* Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, ddata->imap_uid, &oldrecord, NULL);
+	if (r) {
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	etag = message_guid_encode(&oldrecord.guid);
+	lastmod = oldrecord.internaldate;
+ }
+ else if (ddata->rowid) {
+	/* Unmapped URL (empty resource) */
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+ else {
+	/* New resource */
+	etag = NULL;
+	lastmod = 0;
+
+	ddata->creationdate = now;
+	ddata->mailbox = mailbox->name;
+	ddata->resource = txn->req_tgt.resource;
+ }
+
+ /* Check any preconditions */
+ precond = lparams->check_precond(txn, ddata, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+	break;
+
+ case HTTP_LOCKED:
+	if (strcmp(ddata->lock_ownerid, httpd_userid))
+	 txn->error.precond = DAV_LOCKED;
+	else
+	 txn->error.precond = DAV_NEED_LOCK_TOKEN;
+	txn->error.resource = txn->req_tgt.path;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ if (ddata->lock_expire <= now) {
+	/* Create new lock */
+	xmlNodePtr node, sub;
+	unsigned owner_is_href = 0;
+
+	/* Parse the required body */
+	ret = parse_xml_body(txn, &root);
+	if (!ret && !root) {
+	 txn->error.desc = "Missing request body";
+	 ret = HTTP_BAD_REQUEST;
+	}
+	if (ret) goto done;
+
+	/* Check for correct root element */
+	indoc = root->doc;
+	if (xmlStrcmp(root->name, BAD_CAST "lockinfo")) {
+	 txn->error.desc = "Incorrect root element in XML request\r\n";
+	 ret = HTTP_BAD_MEDIATYPE;
+	 goto done;
+	}
+
+	/* Parse elements of lockinfo */
+	for (node = root->children; node; node = node->next) {
+	 if (node->type != XML_ELEMENT_NODE) continue;
+
+	 if (!xmlStrcmp(node->name, BAD_CAST "lockscope")) {
+		/* Find child element of lockscope */
+		for (sub = node->children;
+		 sub && sub->type != XML_ELEMENT_NODE; sub = sub->next);
+		/* Make sure its an exclusive element */
+		if (!sub || xmlStrcmp(sub->name, BAD_CAST "exclusive")) {
+		 txn->error.desc = "Only exclusive locks are supported";
+		 ret = HTTP_BAD_REQUEST;
+		 goto done;
+		}
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "locktype")) {
+		/* Find child element of locktype */
+		for (sub = node->children;
+		 sub && sub->type != XML_ELEMENT_NODE; sub = sub->next);
+		/* Make sure its a write element */
+		if (!sub || xmlStrcmp(sub->name, BAD_CAST "write")) {
+		 txn->error.desc = "Only write locks are supported";
+		 ret = HTTP_BAD_REQUEST;
+		 goto done;
+		}
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "owner")) {
+		/* Find child element of owner */
+		for (sub = node->children;
+		 sub && sub->type != XML_ELEMENT_NODE; sub = sub->next);
+		if (!sub) {
+		 owner = xmlNodeGetContent(node);
+		}
+		/* Make sure its a href element */
+		else if (xmlStrcmp(sub->name, BAD_CAST "href")) {
+		 ret = HTTP_BAD_REQUEST;
+		 goto done;
+		}
+		else {
+		 owner_is_href = 1;
+		 owner = xmlNodeGetContent(sub);
+		}
+	 }
+	}
+
+	ddata->lock_ownerid = httpd_userid;
+	if (owner) ddata->lock_owner = (const char *) owner;
+
+	/* Construct lock-token */
+	assert(!buf_len(&txn->buf));
+	buf_printf(&txn->buf, XML_NS_CYRUS "lock/%s-%x-%u",
+		 mailbox->uniqueid, strhash(txn->req_tgt.resource),
+		 owner_is_href);
+
+	ddata->lock_token = buf_cstring(&txn->buf);
+ }
+
+ /* Update lock expiration */
+ ddata->lock_expire = now + 300; /* 5 min */
+
+ /* Start construction of our prop response */
+ if (!(root = init_xml_response("prop", NS_DAV, root, ns))) {
+	ret = HTTP_SERVER_ERROR;
+	txn->error.desc = "Unable to create XML response\r\n";
+	goto done;
+ }
+
+ outdoc = root->doc;
+ root = xmlNewChild(root, NULL, BAD_CAST "lockdiscovery", NULL);
+ xml_add_lockdisc(root, txn->req_tgt.path, (struct dav_data *) ddata);
+
+ lparams->davdb.write_resource(*lparams->davdb.db, ddata, 1);
+
+ txn->resp_body.lock = ddata->lock_token;
+
+ if (!ddata->rowid) {
+	ret = HTTP_CREATED;
+
+	/* Tell client about the new resource */
+	txn->resp_body.etag = NULL_ETAG;
+
+	/* Tell client where to find the new resource */
+	txn->location = txn->req_tgt.path;
+ }
+
+ xml_response(ret, txn, outdoc);
+ ret = 0;
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+ if (outdoc) xmlFreeDoc(outdoc);
+ if (indoc) xmlFreeDoc(indoc);
+ if (owner) xmlFree(owner);
+
+ return ret;
+}
+
+
+/* Perform a MKCOL/MKCALENDAR request */
+/*
+ * preconditions:
+ * DAV:resource-must-be-null
+ * DAV:need-privileges
+ * DAV:valid-resourcetype
+ * CALDAV:calendar-collection-location-ok
+ * CALDAV:valid-calendar-data (CALDAV:calendar-timezone)
+ */
+int meth_mkcol(struct transaction_t *txn, void *params)
+{
+ struct meth_params *mparams = (struct meth_params *) params;
+ int ret = 0, r = 0;
+ xmlDocPtr indoc = NULL, outdoc = NULL;
+ xmlNodePtr root = NULL, instr = NULL;
+ xmlNsPtr nsNUM_NAMESPACE;
+ char *partition = NULL;
+ struct proppatch_ctx pctx;
+ struct mailbox *mailbox = NULL;
+
+ memset(&pctx, 0, sizeof(struct proppatch_ctx));
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = mparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) {
+	txn->error.precond = CALDAV_LOCATION_OK;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Make sure method is allowed (only allowed on home-set) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITECOL)) {
+	txn->error.precond = CALDAV_LOCATION_OK;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Check if we are allowed to create the mailbox */
+ r = mboxlist_createmailboxcheck(txn->req_tgt.mboxname, 0, NULL,
+				 httpd_userisadmin || httpd_userisproxyadmin,
+				 httpd_userid, httpd_authstate,
+				 NULL, &partition, 0);
+
+ if (r == IMAP_PERMISSION_DENIED) return HTTP_FORBIDDEN;
+ else if (r == IMAP_MAILBOX_EXISTS) {
+	txn->error.precond = DAV_RSRC_EXISTS;
+	return HTTP_FORBIDDEN;
+ }
+ else if (r) return HTTP_SERVER_ERROR;
+
+ if (!config_partitiondir(partition)) {
+	/* Invalid partition, assume its a server (remote mailbox) */
+	char *server = partition, *p;
+	struct backend *be;
+
+	/* Trim remote partition */
+	p = strchr(server, '!');
+	if (p) *p++ = '\0';
+
+	be = proxy_findserver(server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ /* Local Mailbox */
+
+ /* Parse the MKCOL/MKCALENDAR body, if exists */
+ ret = parse_xml_body(txn, &root);
+ if (ret) goto done;
+
+ if (root) {
+	/* Check for correct root element */
+	indoc = root->doc;
+
+	if (txn->meth == METH_MKCOL)
+	 r = xmlStrcmp(root->name, BAD_CAST "mkcol");
+	else
+	 r = xmlStrcmp(root->name, BAD_CAST mparams->mkcol.xml_req);
+	if (r) {
+	 txn->error.desc = "Incorrect root element in XML request\r\n";
+	 return HTTP_BAD_MEDIATYPE;
+	}
+
+	instr = root->children;
+ }
+
+ /* Create the mailbox */
+ r = mboxlist_createmailbox(txn->req_tgt.mboxname, mparams->mkcol.mbtype,
+			 partition,
+			 httpd_userisadmin || httpd_userisproxyadmin,
+			 httpd_userid, httpd_authstate,
+			 /*localonly*/0, /*forceuser*/0,
+			 /*dbonly*/0, /*notify*/0,
+			 &mailbox);
+
+ if (instr && !r) {
+	/* Start construction of our mkcol/mkcalendar response */
+	if (txn->meth == METH_MKCOL)
+	 root = init_xml_response("mkcol-response", NS_DAV, root, ns);
+	else
+	 root = init_xml_response(mparams->mkcol.xml_resp,
+				 mparams->mkcol.xml_ns, root, ns);
+	if (!root) {
+	 ret = HTTP_SERVER_ERROR;
+	 txn->error.desc = "Unable to create XML response\r\n";
+	 goto done;
+	}
+
+	outdoc = root->doc;
+
+	/* Populate our proppatch context */
+	pctx.req_tgt = &txn->req_tgt;
+	pctx.meth = txn->meth;
+	pctx.mailbox = mailbox;
+	pctx.lprops = mparams->lprops;
+	pctx.root = root;
+	pctx.ns = ns;
+	pctx.tid = NULL;
+	pctx.err = &txn->error;
+	pctx.ret = &r;
+
+	/* Execute the property patch instructions */
+	if (!r) ret = do_proppatch(&pctx, instr);
+
+	if (ret || r) {
+	 /* Something failed. Abort the txn and change the OK status */
+
+	 if (!ret) {
+		/* Output the XML response */
+		xml_response(HTTP_FORBIDDEN, txn, outdoc);
+		ret = 0;
+	 }
+
+	 goto done;
+	}
+ }
+
+ if (!r) ret = HTTP_CREATED;
+ else if (r == IMAP_PERMISSION_DENIED) ret = HTTP_FORBIDDEN;
+ else if (r == IMAP_MAILBOX_EXISTS) {
+	txn->error.precond = DAV_RSRC_EXISTS;
+	ret = HTTP_FORBIDDEN;
+ }
+ else if (r) {
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+ }
+
+ done:
+ buf_free(&pctx.buf);
+ mailbox_close(&mailbox);
+
+ if (outdoc) xmlFreeDoc(outdoc);
+ if (indoc) xmlFreeDoc(indoc);
+
+ return ret;
+}
+
+
+/* dav_foreach() callback to find props on a resource */
+int propfind_by_resource(void *rock, void *data)
+{
+ struct propfind_ctx *fctx = (struct propfind_ctx *) rock;
+ struct dav_data *ddata = (struct dav_data *) data;
+ struct index_record record;
+ char *p;
+ size_t len;
+ int r, ret = 0;
+
+ /* Append resource name to URL path */
+ if (!fctx->req_tgt->resource) {
+	len = strlen(fctx->req_tgt->path);
+	p = fctx->req_tgt->path + len;
+ }
+ else {
+	p = fctx->req_tgt->resource;
+	len = p - fctx->req_tgt->path;
+ }
+
+ if (p-1 != '/') {
+	*p++ = '/';
+	len++;
+ }
+ strlcpy(p, ddata->resource, MAX_MAILBOX_PATH - len);
+ fctx->req_tgt->resource = p;
+ fctx->req_tgt->reslen = strlen(p);
+
+ fctx->data = data;
+ if (ddata->imap_uid && !fctx->record) {
+	/* Fetch index record for the resource */
+	r = mailbox_find_index_record(fctx->mailbox, ddata->imap_uid,
+				 &record, NULL);
+	/* XXX Check errors */
+
+	fctx->record = r ? NULL : &record;
+ }
+
+ if (!ddata->imap_uid || !fctx->record) {
+	/* Add response for missing target */
+	ret = xml_add_response(fctx, HTTP_NOT_FOUND);
+ }
+ else {
+	int add_it = 1;
+
+	if (fctx->filter) add_it = fctx->filter(fctx, data);
+
+	if (add_it) {
+	 /* Add response for target */
+	 ret = xml_add_response(fctx, 0);
+	}
+ }
+
+ buf_free(&fctx->msg_buf);
+ fctx->record = NULL;
+ fctx->data = NULL;
+
+ return ret;
+}
+
+
+/* mboxlist_findall() callback to find props on a collection */
+int propfind_by_collection(char *mboxname, int matchlen,
+			 int maycreate __attribute__((unused)),
+			 void *rock)
+{
+ struct propfind_ctx *fctx = (struct propfind_ctx *) rock;
+ mbentry_t *mbentry = NULL;
+ struct mailbox *mailbox = NULL;
+ char *p;
+ size_t len;
+ int r = 0, rights, root;
+
+ /* If this function is called outside of mboxlist_findall()
+ with matchlen == 0, this is the root resource of the PROPFIND */
+ root = !matchlen;
+
+ /* Check ACL on mailbox for current user */
+ if ((r = mboxlist_lookup(mboxname, &mbentry, NULL))) {
+	syslog(LOG_INFO, "mboxlist_lookup(%s) failed: %s",
+	 mboxname, error_message(r));
+	fctx->err->desc = error_message(r);
+	*fctx->ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if ((rights & fctx->reqd_privs) != fctx->reqd_privs) goto done;
+
+ /* Open mailbox for reading */
+ if ((r = mailbox_open_irl(mboxname, &mailbox))) {
+	syslog(LOG_INFO, "mailbox_open_irl(%s) failed: %s",
+	 mboxname, error_message(r));
+	fctx->err->desc = error_message(r);
+	*fctx->ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ fctx->mailbox = mailbox;
+ fctx->record = NULL;
+
+ if (!fctx->req_tgt->resource) {
+	/* Append collection name to URL path */
+	if (!fctx->req_tgt->collection) {
+	 len = strlen(fctx->req_tgt->path);
+	 p = fctx->req_tgt->path + len;
+	}
+	else {
+	 p = fctx->req_tgt->collection;
+	 len = p - fctx->req_tgt->path;
+	}
+
+	if (p-1 != '/') {
+	 *p++ = '/';
+	 len++;
+	}
+	strlcpy(p, strrchr(mboxname, '.') + 1, MAX_MAILBOX_PATH - len);
+	strlcat(p, "/", MAX_MAILBOX_PATH - len - 1);
+	fctx->req_tgt->collection = p;
+	fctx->req_tgt->collen = strlen(p);
+
+	/* If not filtering by calendar resource, and not excluding root,
+	 add response for collection */
+	if (!fctx->filter &&
+	 (!root || (fctx->depth == 1) || !(fctx->prefer & PREFER_NOROOT)) &&
+	 (r = xml_add_response(fctx, 0))) goto done;
+ }
+
+ if (fctx->depth > 1) {
+	/* Resource(s) */
+
+	if (fctx->req_tgt->resource) {
+	 /* Add response for target resource */
+	 void *data;
+
+	 /* Find message UID for the resource */
+	 fctx->lookup_resource(fctx->davdb,
+				 mboxname, fctx->req_tgt->resource, 0, &data);
+	 /* XXX Check errors */
+
+	 r = fctx->proc_by_resource(rock, data);
+	}
+	else {
+	 /* Add responses for all contained resources */
+	 fctx->foreach_resource(fctx->davdb, mboxname,
+				 fctx->proc_by_resource, rock);
+
+	 /* Started with NULL resource, end with NULL resource */
+	 fctx->req_tgt->resource = NULL;
+	 fctx->req_tgt->reslen = 0;
+	}
+ }
+
+ done:
+ mboxlist_entry_free(&mbentry);
+ if (mailbox) mailbox_close(&mailbox);
+
+ return r;
+}
+
+
+/* Perform a PROPFIND request */
+EXPORTED int meth_propfind(struct transaction_t *txn, void *params)
+{
+ struct meth_params *fparams = (struct meth_params *) params;
+ int ret = 0, r;
+ const char **hdr;
+ unsigned depth;
+ xmlDocPtr indoc = NULL, outdoc = NULL;
+ xmlNodePtr root, cur = NULL, props = NULL;
+ xmlNsPtr nsNUM_NAMESPACE;
+ struct hash_table ns_table = { 0, NULL, NULL };
+ struct propfind_ctx fctx;
+ struct propfind_entry_list *elist = NULL;
+
+ memset(&fctx, 0, sizeof(struct propfind_ctx));
+
+ /* Parse the path */
+ if (fparams->parse_path &&
+	(r = fparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed */
+ if (!(txn->req_tgt.allow & ALLOW_DAV)) return HTTP_NOT_ALLOWED;
+
+ /* Check Depth */
+ hdr = spool_getheader(txn->req_hdrs, "Depth");
+ if (!hdr || !strcmp(hdr0, "infinity")) {
+	depth = 2;
+ }
+ else if (hdr && ((sscanf(hdr0, "%u", &depth) != 1) || (depth > 1))) {
+	txn->error.desc = "Illegal Depth value\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ if ((txn->req_tgt.namespace != URL_NS_PRINCIPAL) && txn->req_tgt.user) {
+	mbentry_t *mbentry = NULL;
+	int rights;
+
+	/* Locate the mailbox */
+	r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+	if (r) {
+	 syslog(LOG_ERR, "mlookup(%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+	 txn->error.desc = error_message(r);
+
+	 switch (r) {
+	 case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	 case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	 default: return HTTP_SERVER_ERROR;
+	 }
+	}
+
+	/* Check ACL for current user */
+	rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+	if ((rights & DACL_READ) != DACL_READ) {
+	 /* DAV:need-privileges */
+	 txn->error.precond = DAV_NEED_PRIVS;
+	 txn->error.resource = txn->req_tgt.path;
+	 txn->error.rights = DACL_READ;
+	 ret = HTTP_FORBIDDEN;
+	 mboxlist_entry_free(&mbentry);
+	 goto done;
+	}
+
+	if (mbentry->server) {
+	 /* Remote mailbox */
+	 struct backend *be;
+
+	 be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+	 mboxlist_entry_free(&mbentry);
+	 if (!be) return HTTP_UNAVAILABLE;
+
+	 return http_pipe_req_resp(be, txn);
+	}
+
+	mboxlist_entry_free(&mbentry);
+
+	/* Local Mailbox */
+	if (!*fparams->davdb.db) {
+	 syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+		 "Check 'configdirectory' permissions or "
+		 "'proxyservers' option on backend server.", proxy_userid);
+	 txn->error.desc = "DAV database is not opened";
+	 return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Principal or Local Mailbox */
+
+ /* Normalize depth so that:
+ * 0 = home-set collection, 1+ = calendar collection, 2+ = calendar resource
+ */
+ if (txn->req_tgt.collection) depth++;
+ if (txn->req_tgt.resource) depth++;
+
+ /* Parse the PROPFIND body, if exists */
+ ret = parse_xml_body(txn, &root);
+ if (ret) goto done;
+
+ if (!root) {
+	/* Empty request */
+	fctx.mode = PROPFIND_ALL;
+ }
+ else {
+	indoc = root->doc;
+
+	/* Make sure its a propfind element */
+	if (xmlStrcmp(root->name, BAD_CAST "propfind")) {
+	 txn->error.desc = "Missing propfind element in PROFIND request\r\n";
+	 ret = HTTP_BAD_REQUEST;
+	 goto done;
+	}
+
+	/* Find child element of propfind */
+	for (cur = root->children;
+	 cur && cur->type != XML_ELEMENT_NODE; cur = cur->next);
+
+	/* Add propfind type to our header cache */
+	spool_cache_header(xstrdup(":type"), xstrdup((const char *) cur->name),
+			 txn->req_hdrs);
+
+	/* Make sure its a known element */
+	if (!cur) {
+	 ret = HTTP_BAD_REQUEST;
+	 goto done;
+	}
+	else if (!xmlStrcmp(cur->name, BAD_CAST "allprop")) {
+	 fctx.mode = PROPFIND_ALL;
+	}
+	else if (!xmlStrcmp(cur->name, BAD_CAST "propname")) {
+	 fctx.mode = PROPFIND_NAME;
+	 fctx.prefer = PREFER_MIN; /* Don't want 404 (Not Found) */
+	}
+	else if (!xmlStrcmp(cur->name, BAD_CAST "prop")) {
+	 fctx.mode = PROPFIND_PROP;
+	 props = cur->children;
+	}
+	else {
+	 ret = HTTP_BAD_REQUEST;
+	 goto done;
+	}
+
+	/* Check for extra elements */
+	for (cur = cur->next; cur; cur = cur->next) {
+	 if (cur->type == XML_ELEMENT_NODE) {
+		if ((fctx.mode == PROPFIND_ALL) && !props &&
+		 /* Check for 'include' element */
+		 !xmlStrcmp(cur->name, BAD_CAST "include")) {
+		 props = cur->children;
+		}
+		else {
+		 ret = HTTP_BAD_REQUEST;
+		 goto done;
+		}
+	 }
+	}
+ }
+
+ /* Start construction of our multistatus response */
+ if (!(root = init_xml_response("multistatus", NS_DAV, root, ns))) {
+	ret = HTTP_SERVER_ERROR;
+	txn->error.desc = "Unable to create XML response\r\n";
+	goto done;
+ }
+
+ outdoc = root->doc;
+
+ /* Populate our propfind context */
+ fctx.req_tgt = &txn->req_tgt;
+ fctx.depth = depth;
+ fctx.prefer |= get_preferences(txn);
+ fctx.userid = proxy_userid;
+ fctx.int_userid = httpd_userid;
+ fctx.userisadmin = httpd_userisadmin;
+ fctx.authstate = httpd_authstate;
+ fctx.mailbox = NULL;
+ fctx.record = NULL;
+ fctx.reqd_privs = DACL_READ;
+ fctx.filter = NULL;
+ fctx.filter_crit = NULL;
+ if (fparams->davdb.db) {
+	fctx.davdb = *fparams->davdb.db;
+	fctx.lookup_resource = fparams->davdb.lookup_resource;
+	fctx.foreach_resource = fparams->davdb.foreach_resource;
+ }
+ fctx.proc_by_resource = &propfind_by_resource;
+ fctx.elist = NULL;
+ fctx.lprops = fparams->lprops;
+ fctx.root = root;
+ fctx.ns = ns;
+ fctx.ns_table = &ns_table;
+ fctx.err = &txn->error;
+ fctx.ret = &ret;
+ fctx.fetcheddata = 0;
+
+ /* Parse the list of properties and build a list of callbacks */
+ preload_proplist(props, &fctx);
+
+ if (!txn->req_tgt.collection &&
+	(!depth || !(fctx.prefer & PREFER_NOROOT))) {
+	/* Add response for principal or home-set collection */
+	struct mailbox *mailbox = NULL;
+
+	if (*txn->req_tgt.mboxname) {
+	 /* Open mailbox for reading */
+	 if ((r = mailbox_open_irl(txn->req_tgt.mboxname, &mailbox))) {
+		syslog(LOG_INFO, "mailbox_open_irl(%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+		txn->error.desc = error_message(r);
+		ret = HTTP_SERVER_ERROR;
+		goto done;
+	 }
+	 fctx.mailbox = mailbox;
+	}
+
+	xml_add_response(&fctx, 0);
+
+	mailbox_close(&mailbox);
+ }
+
+ if (depth > 0) {
+	/* Calendar collection(s) */
+
+	if (txn->req_tgt.collection) {
+	 /* Add response for target calendar collection */
+	 propfind_by_collection(txn->req_tgt.mboxname, 0, 0, &fctx);
+	}
+	else {
+	 /* Add responses for all contained calendar collections */
+	 strlcat(txn->req_tgt.mboxname, ".%", sizeof(txn->req_tgt.mboxname));
+	 r = mboxlist_findall(NULL, /* internal namespace */
+				 txn->req_tgt.mboxname, 1, httpd_userid, 
+				 httpd_authstate, propfind_by_collection, &fctx);
+	}
+
+	ret = *fctx.ret;
+ }
+
+ /* Output the XML response */
+ if (!ret) {
+	/* iCalendar data in response should not be transformed */
+	if (fctx.fetcheddata) txn->flags.cc |= CC_NOTRANSFORM;
+
+	xml_response(HTTP_MULTI_STATUS, txn, outdoc);
+ }
+
+ done:
+ /* Free the entry list */
+ elist = fctx.elist;
+ while (elist) {
+	struct propfind_entry_list *freeme = elist;
+	elist = elist->next;
+	free(freeme);
+ }
+
+ buf_free(&fctx.buf);
+
+ free_hash_table(&ns_table, NULL);
+
+ if (outdoc) xmlFreeDoc(outdoc);
+ if (indoc) xmlFreeDoc(indoc);
+
+ return ret;
+}
+
+
+/* Perform a PROPPATCH request
+ *
+ * preconditions:
+ * DAV:cannot-modify-protected-property
+ * CALDAV:valid-calendar-data (CALDAV:calendar-timezone)
+ */
+int meth_proppatch(struct transaction_t *txn, void *params)
+{
+ struct meth_params *pparams = (struct meth_params *) params;
+ int ret = 0, r = 0, rights;
+ xmlDocPtr indoc = NULL, outdoc = NULL;
+ xmlNodePtr root, instr, resp;
+ xmlNsPtr nsNUM_NAMESPACE;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct proppatch_ctx pctx;
+
+ memset(&pctx, 0, sizeof(struct proppatch_ctx));
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = pparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (only allowed on collections) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITECOL)) {
+	txn->error.desc =
+	 "Properties can only be updated on collections\r\n";
+	return HTTP_NOT_ALLOWED;
+ }
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_WRITEPROPS)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights = DACL_WRITEPROPS;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ r = mailbox_open_iwl(txn->req_tgt.mboxname, &mailbox);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to open mailbox %s for proppatch", txn->req_tgt.mboxname);
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Parse the PROPPATCH body */
+ ret = parse_xml_body(txn, &root);
+ if (!ret && !root) {
+	txn->error.desc = "Missing request body\r\n";
+	ret = HTTP_BAD_REQUEST;
+ }
+ if (ret) goto done;
+
+ indoc = root->doc;
+
+ /* Make sure its a propertyupdate element */
+ if (xmlStrcmp(root->name, BAD_CAST "propertyupdate")) {
+	txn->error.desc =
+	 "Missing propertyupdate element in PROPPATCH request\r\n";
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+ instr = root->children;
+
+ /* Start construction of our multistatus response */
+ if (!(root = init_xml_response("multistatus", NS_DAV, root, ns))) {
+	txn->error.desc = "Unable to create XML response\r\n";
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ outdoc = root->doc;
+
+ /* Add a response tree to 'root' for the specified href */
+ resp = xmlNewChild(root, NULL, BAD_CAST "response", NULL);
+ if (!resp) syslog(LOG_ERR, "new child response failed");
+ xmlNewChild(resp, NULL, BAD_CAST "href", BAD_CAST txn->req_tgt.path);
+
+ /* Populate our proppatch context */
+ pctx.req_tgt = &txn->req_tgt;
+ pctx.meth = txn->meth;
+ pctx.mailbox = mailbox;
+ pctx.lprops = pparams->lprops;
+ pctx.root = resp;
+ pctx.ns = ns;
+ pctx.tid = NULL;
+ pctx.err = &txn->error;
+ pctx.ret = &r;
+
+ /* Execute the property patch instructions */
+ ret = do_proppatch(&pctx, instr);
+
+ /* Output the XML response */
+ if (!ret) {
+	if (get_preferences(txn) & PREFER_MIN) ret = HTTP_OK;
+	else xml_response(HTTP_MULTI_STATUS, txn, outdoc);
+ }
+
+ done:
+ mailbox_close(&mailbox);
+ buf_free(&pctx.buf);
+
+ if (outdoc) xmlFreeDoc(outdoc);
+ if (indoc) xmlFreeDoc(indoc);
+
+ return ret;
+}
+
+
+/* Perform a POST request */
+int meth_post(struct transaction_t *txn, void *params)
+{
+ struct meth_params *pparams = (struct meth_params *) params;
+ static unsigned post_count = 0;
+ int r, ret;
+ size_t len;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = pparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (only allowed on certain collections) */
+ if (!(txn->req_tgt.allow & ALLOW_POST)) return HTTP_NOT_ALLOWED; 
+
+ /* Do any special processing */
+ if (pparams->post) {
+	ret = pparams->post(txn);
+	if (ret != HTTP_CONTINUE) return ret;
+ }
+
+ /* POST to regular collection */
+
+ /* Append a unique resource name to URL path and perform a PUT */
+ len = strlen(txn->req_tgt.path);
+ txn->req_tgt.resource = txn->req_tgt.path + len;
+ txn->req_tgt.reslen =
+	snprintf(txn->req_tgt.resource, MAX_MAILBOX_PATH - len,
+		 "%x-%d-%ld-%u.ics",
+		 strhash(txn->req_tgt.path), getpid(), time(0), post_count++);
+
+ /* Tell client where to find the new resource */
+ txn->location = txn->req_tgt.path;
+
+ ret = meth_put(txn, params);
+
+ if (ret != HTTP_CREATED) txn->location = NULL;
+
+ return ret;
+}
+
+
+/* Perform a PUT request
+ *
+ * preconditions:
+ * *DAV:supported-address-data
+ */
+int meth_put(struct transaction_t *txn, void *params)
+{
+ struct meth_params *pparams = (struct meth_params *) params;
+ int ret, r, precond, rights;
+ const char **hdr, *etag;
+ struct mime_type_t *mime = NULL;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record oldrecord;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
+ time_t lastmod;
+ unsigned flags = 0;
+
+ if (txn->meth == METH_PUT) {
+	/* Response should not be cached */
+	txn->flags.cc |= CC_NOCACHE;
+
+	/* Parse the path */
+	if ((r = pparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) {
+	 return HTTP_FORBIDDEN;
+	}
+
+	/* Make sure method is allowed (only allowed on resources) */
+	if (!(txn->req_tgt.allow & ALLOW_WRITE)) return HTTP_NOT_ALLOWED;
+ }
+
+ /* Make sure Content-Range isn't specified */
+ if (spool_getheader(txn->req_hdrs, "Content-Range"))
+	return HTTP_BAD_REQUEST;
+
+ /* Check Content-Type */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Content-Type"))) {
+	for (mime = pparams->mime_types; mime->content_type; mime++) {
+	 if (is_mediatype(hdr0, mime->content_type)) break;
+	}
+ }
+ if (!mime || !mime->content_type) {
+	txn->error.precond = pparams->put.supp_data_precond;
+	return HTTP_FORBIDDEN;
+ }
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Check ACL for current user */
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+ if (!(rights & DACL_WRITECONT) || !(rights & DACL_ADDRSRC)) {
+	/* DAV:need-privileges */
+	txn->error.precond = DAV_NEED_PRIVS;
+	txn->error.resource = txn->req_tgt.path;
+	txn->error.rights =
+	 !(rights & DACL_WRITECONT) ? DACL_WRITECONT : DACL_ADDRSRC;
+	mboxlist_entry_free(&mbentry);
+	return HTTP_FORBIDDEN;
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ if (!*pparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the resource, if exists */
+ pparams->davdb.lookup_resource(*pparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 0, (void *) &ddata);
+ /* XXX Check errors */
+
+ if (ddata->imap_uid) {
+	/* Overwriting existing resource */
+
+	/* Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, ddata->imap_uid, &oldrecord, NULL);
+	if (r) {
+	 syslog(LOG_ERR, "mailbox_find_index_record(%s, %u) failed: %s",
+		 txn->req_tgt.mboxname, ddata->imap_uid, error_message(r));
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	etag = message_guid_encode(&oldrecord.guid);
+	lastmod = oldrecord.internaldate;
+ }
+ else if (ddata->rowid) {
+	/* Unmapped URL (empty resource) */
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+ else {
+	/* New resource */
+	etag = NULL;
+	lastmod = 0;
+ }
+
+ /* Finished our initial read */
+ mailbox_unlock_index(mailbox, NULL);
+
+ /* Check any preconditions */
+ precond = pparams->check_precond(txn, ddata, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+	break;
+
+ case HTTP_LOCKED:
+	txn->error.precond = DAV_NEED_LOCK_TOKEN;
+	txn->error.resource = txn->req_tgt.path;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ /* Read body */
+ txn->req_body.flags |= BODY_DECODE;
+ ret = read_body(httpd_in, txn->req_hdrs, &txn->req_body, &txn->error.desc);
+ if (ret) {
+	txn->flags.conn = CONN_CLOSE;
+	goto done;
+ }
+
+ /* Make sure we have a body */
+ qdiffsQUOTA_STORAGE = buf_len(&txn->req_body.payload);
+ if (!qdiffsQUOTA_STORAGE) {
+	txn->error.desc = "Missing request body\r\n";
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ /* Check if we can append a new message to mailbox */
+ if ((r = append_check(txn->req_tgt.mboxname,
+			 httpd_authstate, ACL_INSERT, qdiffs))) {
+	syslog(LOG_ERR, "append_check(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ if (get_preferences(txn) & PREFER_REP) flags |= PREFER_REP;
+
+ r = mailbox_lock_index(mailbox, LOCK_EXCLUSIVE);
+ if (r) {
+	syslog(LOG_ERR, "relock index(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Parse, validate, and store the resource */
+ ret = pparams->put.proc(txn, mime, mailbox, flags);
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}
+
+
+/* Compare modseq in index maps -- used for sorting */
+static int map_modseq_cmp(const struct index_map *m1,
+			 const struct index_map *m2)
+{
+ if (m1->modseq < m2->modseq) return -1;
+ if (m1->modseq > m2->modseq) return 1;
+ return 0;
+}
+
+
+int report_sync_col(struct transaction_t *txn,
+		 xmlNodePtr inroot, struct propfind_ctx *fctx)
+{
+ int ret = 0, r, userflag, i;
+ struct mailbox *mailbox = NULL;
+ uint32_t uidvalidity = 0;
+ modseq_t syncmodseq = 0, highestmodseq;
+ uint32_t limit = -1;
+ uint32_t recno;
+ uint32_t msgno;
+ uint32_t nresp = 0;
+ xmlNodePtr node;
+ struct index_state istate;
+ struct index_record record;
+ char tokenuriMAX_MAILBOX_PATH+1;
+
+ /* XXX Handle Depth (cal-home-set at toplevel) */
+
+ istate.map = NULL;
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ fctx->mailbox = mailbox;
+
+ highestmodseq = mailbox->i.highestmodseq;
+ if (mailbox_user_flag(mailbox, DFLAG_UNBIND, &userflag, 0)) userflag = -1;
+
+ /* Parse children element of report */
+ for (node = inroot->children; node; node = node->next) {
+	xmlNodePtr node2;
+	xmlChar *str = NULL;
+	if (node->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(node->name, BAD_CAST "sync-token") &&
+		(str = xmlNodeListGetString(inroot->doc, node->children, 1))) {
+		if (xmlStrncmp(str, BAD_CAST XML_NS_CYRUS "sync/",
+			 strlen(XML_NS_CYRUS "sync/")) ||
+		 (sscanf(strrchr((char *) str, '/') + 1,
+			 "%u-" MODSEQ_FMT,
+			 &uidvalidity, &syncmodseq) != 2) ||
+		 !syncmodseq ||
+		 (uidvalidity != mailbox->i.uidvalidity) ||
+		 (syncmodseq < mailbox->i.deletedmodseq) ||
+		 (syncmodseq > highestmodseq)) {
+		 /* DAV:valid-sync-token */
+		 txn->error.precond = DAV_SYNC_TOKEN;
+		 ret = HTTP_FORBIDDEN;
+		}
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "sync-level") &&
+		(str = xmlNodeListGetString(inroot->doc, node->children, 1))) {
+		if (!strcmp((char *) str, "infinity")) {
+		 fctx->err->desc =
+			"This server DOES NOT support infinite depth requests";
+		 ret = HTTP_SERVER_ERROR;
+		}
+		else if ((sscanf((char *) str, "%u", &fctx->depth) != 1) ||
+			 (fctx->depth != 1)) {
+		 fctx->err->desc = "Illegal sync-level";
+		 ret = HTTP_BAD_REQUEST;
+		}
+	 }
+	 else if (!xmlStrcmp(node->name, BAD_CAST "limit")) {
+		for (node2 = node->children; node2; node2 = node2->next) {
+		 if ((node2->type == XML_ELEMENT_NODE) &&
+			!xmlStrcmp(node2->name, BAD_CAST "nresults") &&
+			(!(str = xmlNodeListGetString(inroot->doc,
+						 node2->children, 1)) ||
+			 (sscanf((char *) str, "%u", &limit) != 1))) {
+			txn->error.precond = DAV_OVER_LIMIT;
+			ret = HTTP_FORBIDDEN;
+		 }
+		}
+	 }
+
+	 if (str) xmlFree(str);
+	 if (ret) goto done;
+	}
+ }
+
+ /* Check Depth */
+ if (!fctx->depth) {
+	fctx->err->desc = "Illegal sync-level";
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+
+ /* Construct array of records for sorting and/or fetching cached header */
+ istate.mailbox = mailbox;
+ istate.map = xzmalloc(mailbox->i.num_records *
+			 sizeof(struct index_map));
+
+ /* Find which resources we need to report */
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	/* XXX Corrupted record? Should we bail? */
+	if (mailbox_read_index_record(mailbox, recno, &record))
+	 continue;
+
+	/* Resource not added/removed since last sync */
+	if (record.modseq <= syncmodseq)
+	 continue;
+
+	/* Resource replaced by a PUT, COPY, or MOVE - ignore it */
+	if ((userflag >= 0) &&
+	 record.user_flagsuserflag / 32 & (1 << (userflag & 31)))
+	 continue;
+
+	/* Initial sync - ignore unmapped resources */
+	if (!syncmodseq && (record.system_flags & FLAG_EXPUNGED))
+	 continue;
+
+	/* copy data into map (just like index.c - XXX helper fn? */
+	istate.mapnresp.recno = recno;
+	istate.mapnresp.uid = record.uid;
+	istate.mapnresp.modseq = record.modseq;
+	istate.mapnresp.system_flags = record.system_flags;
+	for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	 istate.mapnresp.user_flagsi = record.user_flagsi;
+	istate.mapnresp.cache_offset = record.cache_offset;
+
+	nresp++;
+ }
+
+ if (limit < nresp) {
+	/* Need to truncate the responses */
+	struct index_map *map = istate.map;
+
+	/* Sort the response records by modseq */
+	qsort(map, nresp, sizeof(struct index_map),
+	 (int (*)(const void *, const void *)) &map_modseq_cmp);
+
+	/* Our last response MUST be the last record with its modseq */
+	for (nresp = limit;
+	 nresp && mapnresp-1.modseq == mapnresp.modseq;
+	 nresp--);
+
+	if (!nresp) {
+	 /* DAV:number-of-matches-within-limits */
+	 fctx->err->desc = "Unable to truncate results";
+	 ret = HTTP_FORBIDDEN; /* HTTP_NO_STORAGE ? */
+	 goto done;
+	}
+
+	/* highestmodseq will be modseq of last record we return */
+	highestmodseq = mapnresp-1.modseq;
+
+	/* Tell client we truncated the responses */
+	xml_add_response(fctx, HTTP_NO_STORAGE);
+ }
+
+ /* Report the resources within the client requested limit (if any) */
+ for (msgno = 1; msgno <= nresp; msgno++) {
+	char *p, *resource = NULL;
+	struct dav_data ddata;
+
+	if (mailbox_read_index_record(mailbox, istate.mapmsgno-1.recno, &record))
+	 continue;
+
+	/* Get resource filename from Content-Disposition header */
+	if ((p = index_getheader(&istate, msgno, "Content-Disposition"))) {
+	 resource = strstr(p, "filename=") + 9;
+	}
+	if (!resource) continue; /* No filename */
+
+	if (*resource == '\"') {
+	 resource++;
+	 if ((p = strchr(resource, '\"'))) *p = '\0';
+	}
+	else if ((p = strchr(resource, ';'))) *p = '\0';
+
+	memset(&ddata, 0, sizeof(struct dav_data));
+	ddata.resource = resource;
+
+	if (record.system_flags & FLAG_EXPUNGED) {
+	 /* report as NOT FOUND
+	 IMAP UID of 0 will cause index record to be ignored
+	 propfind_by_resource() will append our resource name */
+	 propfind_by_resource(fctx, &ddata);
+	}
+	else {
+	 fctx->record = &record;
+	 ddata.imap_uid = record.uid;
+	 propfind_by_resource(fctx, &ddata);
+	}
+ }
+
+ /* Add sync-token element */
+ snprintf(tokenuri, MAX_MAILBOX_PATH,
+	 XML_NS_CYRUS "sync/%u-" MODSEQ_FMT,
+	 mailbox->i.uidvalidity, highestmodseq);
+ xmlNewChild(fctx->root, NULL, BAD_CAST "sync-token", BAD_CAST tokenuri);
+
+ done:
+ if (istate.map) free(istate.map);
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}
+
+
+/* Perform a REPORT request */
+int meth_report(struct transaction_t *txn, void *params)
+{
+ struct meth_params *rparams = (struct meth_params *) params;
+ int ret = 0, r;
+ const char **hdr;
+ unsigned depth = 0;
+ xmlNodePtr inroot = NULL, outroot = NULL, cur, prop = NULL, props = NULL;
+ const struct report_type_t *report = NULL;
+ xmlNsPtr nsNUM_NAMESPACE;
+ struct hash_table ns_table = { 0, NULL, NULL };
+ struct propfind_ctx fctx;
+ struct propfind_entry_list *elist = NULL;
+
+ memset(&fctx, 0, sizeof(struct propfind_ctx));
+
+ /* Parse the path */
+ if ((r = rparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed */
+ if (!(txn->req_tgt.allow & ALLOW_DAV)) return HTTP_NOT_ALLOWED; 
+
+ /* Check Depth */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Depth"))) {
+	if (!strcmp(hdr0, "infinity")) {
+	 depth = 2;
+	}
+	else if ((sscanf(hdr0, "%u", &depth) != 1) || (depth > 1)) {
+	 txn->error.desc = "Illegal Depth value\r\n";
+	 return HTTP_BAD_REQUEST;
+	}
+ }
+
+ /* Normalize depth so that:
+ * 0 = home-set collection, 1+ = calendar collection, 2+ = calendar resource
+ */
+ if (txn->req_tgt.collection) depth++;
+ if (txn->req_tgt.resource) depth++;
+
+ /* Parse the REPORT body */
+ ret = parse_xml_body(txn, &inroot);
+ if (!ret && !inroot) {
+	txn->error.desc = "Missing request body\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+ if (ret) goto done;
+
+ /* Add report type to our header cache */
+ spool_cache_header(xstrdup(":type"), xstrdup((const char *) inroot->name),
+		 txn->req_hdrs);
+
+ /* Check the report type against our supported list */
+ for (report = rparams->reports; report && report->name; report++) {
+	if (!xmlStrcmp(inroot->name, BAD_CAST report->name)) break;
+ }
+ if (!report || !report->name) {
+	syslog(LOG_WARNING, "REPORT %s", inroot->name);
+	/* DAV:supported-report */
+	txn->error.precond = DAV_SUPP_REPORT;
+	ret = HTTP_FORBIDDEN;
+	goto done;
+ }
+
+ if (report->flags & REPORT_NEED_MBOX) {
+	mbentry_t *mbentry = NULL;
+	int rights;
+
+	/* Locate the mailbox */
+	if ((r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL))) {
+	 syslog(LOG_ERR, "mlookup(%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+	 txn->error.desc = error_message(r);
+
+	 switch (r) {
+	 case IMAP_PERMISSION_DENIED: ret = HTTP_FORBIDDEN;
+	 case IMAP_MAILBOX_NONEXISTENT: ret = HTTP_NOT_FOUND;
+	 default: ret = HTTP_SERVER_ERROR;
+	 }
+	 goto done;
+	}
+
+	/* Check ACL for current user */
+	rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+	if ((rights & report->reqd_privs) != report->reqd_privs) {
+	 if (report->reqd_privs == DACL_READFB) ret = HTTP_NOT_FOUND;
+	 else {
+		/* DAV:need-privileges */
+		txn->error.precond = DAV_NEED_PRIVS;
+		txn->error.resource = txn->req_tgt.path;
+		txn->error.rights = report->reqd_privs;
+		ret = HTTP_FORBIDDEN;
+	 }
+	 mboxlist_entry_free(&mbentry);
+	 goto done;
+	}
+
+	if (mbentry->server) {
+	 /* Remote mailbox */
+	 struct backend *be;
+
+	 be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+	 mboxlist_entry_free(&mbentry);
+	 if (!be) ret = HTTP_UNAVAILABLE;
+	 else ret = http_pipe_req_resp(be, txn);
+	 goto done;
+	}
+
+	mboxlist_entry_free(&mbentry);
+
+	/* Local Mailbox */
+	if (!*rparams->davdb.db) {
+	 syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+		 "Check 'configdirectory' permissions or "
+		 "'proxyservers' option on backend server.", proxy_userid);
+	 txn->error.desc = "DAV database is not opened";
+	 return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Principal or Local Mailbox */
+
+ /* Parse children element of report */
+ for (cur = inroot->children; cur; cur = cur->next) {
+	if (cur->type == XML_ELEMENT_NODE) {
+	 if (!xmlStrcmp(cur->name, BAD_CAST "allprop")) {
+		fctx.mode = PROPFIND_ALL;
+		prop = cur;
+		break;
+	 }
+	 else if (!xmlStrcmp(cur->name, BAD_CAST "propname")) {
+		fctx.mode = PROPFIND_NAME;
+		fctx.prefer = PREFER_MIN; /* Don't want 404 (Not Found) */
+		prop = cur;
+		break;
+	 }
+	 else if (!xmlStrcmp(cur->name, BAD_CAST "prop")) {
+		fctx.mode = PROPFIND_PROP;
+		prop = cur;
+		props = cur->children;
+		break;
+	 }
+	}
+ }
+
+ if (!prop && (report->flags & REPORT_NEED_PROPS)) {
+	txn->error.desc = "Missing <prop> element in REPORT\r\n";
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ /* Start construction of our multistatus response */
+ if ((report->flags & REPORT_MULTISTATUS) &&
+	!(outroot = init_xml_response("multistatus", NS_DAV, inroot, ns))) {
+	txn->error.desc = "Unable to create XML response\r\n";
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Populate our propfind context */
+ fctx.req_tgt = &txn->req_tgt;
+ fctx.depth = depth;
+ fctx.prefer |= get_preferences(txn);
+ fctx.userid = proxy_userid;
+ fctx.int_userid = httpd_userid;
+ fctx.userisadmin = httpd_userisadmin;
+ fctx.authstate = httpd_authstate;
+ fctx.mailbox = NULL;
+ fctx.record = NULL;
+ fctx.reqd_privs = report->reqd_privs;
+ fctx.elist = NULL;
+ fctx.lprops = rparams->lprops;
+ fctx.root = outroot;
+ fctx.ns = ns;
+ fctx.ns_table = &ns_table;
+ fctx.err = &txn->error;
+ fctx.ret = &ret;
+ fctx.fetcheddata = 0;
+
+ /* Parse the list of properties and build a list of callbacks */
+ if (fctx.mode) ret = preload_proplist(props, &fctx);
+
+ /* Process the requested report */
+ if (!ret) ret = (*report->proc)(txn, inroot, &fctx);
+
+ /* Output the XML response */
+ if (!ret && outroot) {
+	/* iCalendar data in response should not be transformed */
+	if (fctx.fetcheddata) txn->flags.cc |= CC_NOTRANSFORM;
+
+	xml_response(HTTP_MULTI_STATUS, txn, outroot->doc);
+ }
+
+ done:
+ /* Free the entry list */
+ elist = fctx.elist;
+ while (elist) {
+	struct propfind_entry_list *freeme = elist;
+	elist = elist->next;
+	free(freeme);
+ }
+
+ buf_free(&fctx.buf);
+
+ free_hash_table(&ns_table, NULL);
+
+ if (inroot) xmlFreeDoc(inroot->doc);
+ if (outroot) xmlFreeDoc(outroot->doc);
+
+ return ret;
+}
+
+
+/* Perform a UNLOCK request
+ *
+ * preconditions:
+ * DAV:need-privileges
+ * DAV:lock-token-matches-request-uri
+ */
+int meth_unlock(struct transaction_t *txn, void *params)
+{
+ struct meth_params *lparams = (struct meth_params *) params;
+ int ret = HTTP_NO_CONTENT, r, precond, rights;
+ const char **hdr, *token;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+ struct dav_data *ddata;
+ struct index_record record;
+ const char *etag;
+ time_t lastmod;
+ size_t len;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Parse the path */
+ if ((r = lparams->parse_path(txn->req_uri->path,
+				 &txn->req_tgt, &txn->error.desc))) return r;
+
+ /* Make sure method is allowed (only allowed on resources) */
+ if (!(txn->req_tgt.allow & ALLOW_WRITE)) return HTTP_NOT_ALLOWED; 
+
+ /* Check for mandatory Lock-Token header */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "Lock-Token"))) {
+	txn->error.desc = "Missing Lock-Token header";
+	return HTTP_BAD_REQUEST;
+ }
+ token = hdr0;
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ rights = mbentry->acl ? cyrus_acl_myrights(httpd_authstate, mbentry->acl) : 0;
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ if (!*lparams->davdb.db) {
+	syslog(LOG_ERR, "DAV database for user '%s' is not opened. "
+	 "Check 'configdirectory' permissions or "
+	 "'proxyservers' option on backend server.", proxy_userid);
+	txn->error.desc = "DAV database is not opened";
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+	ret = HTTP_SERVER_ERROR;
+	goto done;
+ }
+
+ /* Find message UID for the resource, if exists */
+ lparams->davdb.lookup_resource(*lparams->davdb.db, txn->req_tgt.mboxname,
+				 txn->req_tgt.resource, 1, (void **) &ddata);
+ if (!ddata->rowid) {
+	ret = HTTP_NOT_FOUND;
+	goto done;
+ }
+
+ /* Check if resource is locked */
+ if (ddata->lock_expire <= time(NULL)) {
+	/* DAV:lock-token-matches-request-uri */
+	txn->error.precond = DAV_BAD_LOCK_TOKEN;
+	ret = HTTP_CONFLICT;
+	goto done;
+ }
+
+ /* Check if current user owns the lock */
+ if (strcmp(ddata->lock_ownerid, httpd_userid)) {
+	/* Check ACL for current user */
+	if (!(rights & DACL_ADMIN)) {
+	 /* DAV:need-privileges */
+	 txn->error.precond = DAV_NEED_PRIVS;
+	 txn->error.resource = txn->req_tgt.path;
+	 txn->error.rights = DACL_ADMIN;
+	 ret = HTTP_FORBIDDEN;
+	 goto done;
+	}
+ }
+
+ /* Check if lock token matches */
+ len = strlen(ddata->lock_token);
+ if (token0 != '<' || strlen(token) != len+2 || tokenlen+1 != '>' ||
+	strncmp(token+1, ddata->lock_token, len)) {
+	/* DAV:lock-token-matches-request-uri */
+	txn->error.precond = DAV_BAD_LOCK_TOKEN;
+	ret = HTTP_CONFLICT;
+	goto done;
+ }
+
+ if (ddata->imap_uid) {
+	/* Mapped URL - Fetch index record for the resource */
+	r = mailbox_find_index_record(mailbox, ddata->imap_uid, &record, NULL);
+	if (r) {
+	 txn->error.desc = error_message(r);
+	 ret = HTTP_SERVER_ERROR;
+	 goto done;
+	}
+
+	etag = message_guid_encode(&record.guid);
+	lastmod = record.internaldate;
+ }
+ else {
+	/* Unmapped URL (empty resource) */
+	etag = NULL_ETAG;
+	lastmod = ddata->creationdate;
+ }
+
+ /* Check any preconditions */
+ precond = lparams->check_precond(txn, ddata, etag, lastmod);
+
+ if (precond != HTTP_OK) {
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ if (ddata->imap_uid) {
+	/* Mapped URL - Remove the lock */
+	ddata->lock_token = NULL;
+	ddata->lock_owner = NULL;
+	ddata->lock_ownerid = NULL;
+	ddata->lock_expire = 0;
+
+	lparams->davdb.write_resource(*lparams->davdb.db, ddata, 1);
+ }
+ else {
+	/* Unmapped URL - Treat as lock-null and delete mapping entry */
+	lparams->davdb.delete_resource(lparams->davdb.db, ddata->rowid, 1);
+ }
+
+ done:
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+}

cyrus-imapd-2.5.tar.gz/imap/http_dav.h Added

@@ -0,0 +1,593 @@
+/* http_dav.h -- Routines for dealing with DAV properties in httpd
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef HTTP_DAV_H
+#define HTTP_DAV_H
+
+#include <stdint.h>
+#include <libical/ical.h>
+#include <libxml/tree.h>
+
+#include "annotate.h"
+#include "caldav_db.h"
+#include "httpd.h"
+#include "spool.h"
+#include "quota.h"
+
+#define NULL_ETAG	"da39a3ee5e6b4b0d3255bfef95601890afd80709"
+			/* SHA1("") */
+
+#define DFLAG_UNBIND	"DAV:unbind"
+
+#define ANNOT_NS	"/vendor/cmu/cyrus-httpd/"
+
+#define SCHED_INBOX	"Inbox/"
+#define SCHED_OUTBOX	"Outbox/"
+#define SCHED_DEFAULT	"Default/"
+
+/* XML namespace URIs */
+#define XML_NS_DAV	"DAV:"
+#define XML_NS_CALDAV	"urn:ietf:params:xml:ns:caldav"
+#define XML_NS_CARDDAV	"urn:ietf:params:xml:ns:carddav"
+#define XML_NS_ISCHED	"urn:ietf:params:xml:ns:ischedule"
+#define XML_NS_CS	"http://calendarserver.org/ns/"
+#define XML_NS_CYRUS	"http://cyrusimap.org/ns/"
+
+/* Index into known namespace array */
+enum {
+ NS_DAV,
+ NS_CALDAV,
+ NS_CARDDAV,
+ NS_ISCHED,
+ NS_CS,
+ NS_CYRUS,
+};
+#define NUM_NAMESPACE 6
+
+/* Cyrus-specific privileges */
+#define DACL_MKCOL	ACL_CREATE	/* CY:make-collection */
+#define DACL_ADDRSRC	ACL_POST	/* CY:add-resource */
+#define DACL_RMCOL	ACL_DELETEMBOX	/* CY:remove-collection */
+#define DACL_RMRSRC	ACL_DELETEMSG	/* CY:remove-resource */
+#define DACL_ADMIN	ACL_ADMIN	/* CY:admin (aggregates
+					 DAV:read-acl, write-acl, unlock) */
+
+/* WebDAV (RFC 3744) privileges */
+#define DACL_READ	(ACL_READ\
+			 |ACL_LOOKUP)	/* DAV:read (aggregates
+					 DAV:read-current-user-privilege-set
+					 and CALDAV:read-free-busy) */
+#define DACL_WRITECONT	ACL_INSERT	/* DAV:write-content */
+#define DACL_WRITEPROPS	ACL_WRITE	/* DAV:write-properties */
+#define DACL_BIND	(DACL_MKCOL\
+			 |DACL_ADDRSRC)	/* DAV:bind */
+#define DACL_UNBIND	(DACL_RMCOL\
+			 |DACL_RMRSRC)	/* DAV:unbind */
+#define DACL_WRITE	(DACL_WRITECONT\
+			 |DACL_WRITEPROPS\
+			 |DACL_BIND\
+			 |DACL_UNBIND)	/* DAV:write */
+#define DACL_ALL	(DACL_READ\
+			 |DACL_WRITE\
+			 |DACL_ADMIN)	/* DAV:all */
+
+/* CalDAV (RFC 4791) privileges */
+#define DACL_READFB	ACL_USER9	/* CALDAV:read-free-busy
+					 (implicit if user has DAV:read) */
+
+/* CalDAV Scheduling (RFC 6638) privileges
+
+ We use the same ACLs for both schedule-deliver* and schedule-send* because
+ functionality of Scheduling Inbox and Outbox are mutually exclusive.
+ We use ACL_USER9 for both read-free-busy and schedule-*-freebusy because
+ Scheduling Inbox and Outbox don't contribute to free-busy.
+*/
+#define DACL_SCHEDFB	ACL_USER9	/* For Scheduling Inbox:
+					 CALDAV:schedule-query-freebusy
+
+					 For Scheduling Outbox:
+					 CALDAV:schedule-send-freebusy */
+#define DACL_INVITE	ACL_USER8	/* For Scheduling Inbox:
+					 CALDAV:schedule-deliver-invite
+
+					 For Scheduling Outbox:
+					 CALDAV:schedule-send-invite */
+#define DACL_REPLY	ACL_USER7	/* For Scheduling Inbox:
+					 CALDAV:schedule-deliver-reply
+
+					 For Scheduling Outbox:
+					 CALDAV:schedule-send-reply */
+#define DACL_SCHED	(DACL_SCHEDFB\
+			 |DACL_INVITE\
+			 |DACL_REPLY)	/* For Scheduling Inbox:
+					 CALDAV:schedule-deliver (aggregates
+					 CALDAV:schedule-deliver-invite,
+					 schedule-deliver-reply,
+					 schedule-query-freebusy);
+
+					 For Scheduling Outbox:
+					 CALDAV:schedule-send (aggregates
+					 CALDAV:schedule-send-invite,
+					 schedule-send-reply,
+					 schedule-send-freebusy) */
+
+/* Bitmask of calendar components */
+enum {
+ CAL_COMP_VCALENDAR =	0xf000,
+ CAL_COMP_VEVENT =		(1<<0),
+ CAL_COMP_VTODO =		(1<<1),
+ CAL_COMP_VJOURNAL =		(1<<2),
+ CAL_COMP_VFREEBUSY =	(1<<3),
+ CAL_COMP_VTIMEZONE =	(1<<4),
+ CAL_COMP_VALARM =		(1<<5)
+};
+
+/* Index into preconditions array */
+enum {
+ /* WebDAV (RFC 4918) preconditons */
+ DAV_PROT_PROP = 1,
+ DAV_BAD_LOCK_TOKEN,
+ DAV_NEED_LOCK_TOKEN,
+ DAV_LOCKED,
+
+ /* WebDAV Versioning (RFC 3253) preconditions */
+ DAV_SUPP_REPORT,
+ DAV_RSRC_EXISTS,
+
+ /* WebDAV ACL (RFC 3744) preconditions */
+ DAV_NEED_PRIVS,
+ DAV_NO_INVERT,
+ DAV_NO_ABSTRACT,
+ DAV_SUPP_PRIV,
+ DAV_RECOG_PRINC,
+
+ /* WebDAV Quota (RFC 4331) preconditions */
+ DAV_OVER_QUOTA,
+ DAV_NO_DISK_SPACE,
+
+ /* WebDAV Extended MKCOL (RFC 5689) preconditions */
+ DAV_VALID_RESTYPE,
+
+ /* WebDAV Sync (RFC 6578) preconditions */
+ DAV_SYNC_TOKEN,
+ DAV_OVER_LIMIT,
+
+ /* CalDAV (RFC 4791) preconditions */
+ CALDAV_SUPP_DATA,
+ CALDAV_VALID_DATA,
+ CALDAV_VALID_OBJECT,
+ CALDAV_SUPP_COMP,
+ CALDAV_LOCATION_OK,
+ CALDAV_UID_CONFLICT,
+ CALDAV_SUPP_FILTER,
+ CALDAV_VALID_FILTER,
+
+ /* CalDAV Scheduling (RFC 6638) preconditions */
+ CALDAV_VALID_SCHED,
+ CALDAV_VALID_ORGANIZER,
+ CALDAV_UNIQUE_OBJECT,
+ CALDAV_SAME_ORGANIZER,
+ CALDAV_ALLOWED_ORG_CHANGE,
+ CALDAV_ALLOWED_ATT_CHANGE,
+
+ /* iSchedule (draft-desruisseaux-ischedule) preconditions */
+ ISCHED_UNSUPP_VERSION,
+ ISCHED_UNSUPP_DATA,
+ ISCHED_INVALID_DATA,
+ ISCHED_INVALID_SCHED,
+ ISCHED_ORIG_MISSING,
+ ISCHED_MULTIPLE_ORIG,
+ ISCHED_ORIG_INVALID,
+ ISCHED_ORIG_DENIED,
+ ISCHED_RECIP_MISSING,
+ ISCHED_RECIP_MISMATCH,
+ ISCHED_VERIFICATION_FAILED,
+
+ /* CardDAV (RFC 6352) preconditions */
+ CARDDAV_SUPP_DATA,
+ CARDDAV_VALID_DATA,
+ CARDDAV_UID_CONFLICT,
+ CARDDAV_LOCATION_OK,
+ CARDDAV_SUPP_FILTER
+};
+
+/* Preference bits */
+enum {
+ PREFER_MIN = (1<<0),
+ PREFER_REP = (1<<1),
+ PREFER_NOROOT = (1<<2)
+};
+
+#define NO_DUP_CHECK (1<<7)
+
+
+/* Function to lookup DAV 'resource' in 'mailbox', with optional 'lock',
+ * placing the record in 'data'
+ */
+typedef int (*db_lookup_proc_t)(void *davdb, const char *mailbox,
+				const char *resource, int lock, void **data);
+
+/* Function to process each DAV resource in 'mailbox' with 'cb' */
+typedef int (*db_foreach_proc_t)(void *davdb, const char *mailbox,
+				 int (*cb)(void *rock, void *data), void *rock);
+
+/* Context for fetching properties */
+struct propfind_entry_list;
+struct prop_entry;
+struct error_t;
+
+struct propfind_ctx {
+ struct request_target_t *req_tgt;	/* parsed request target URL */
+ unsigned mode;	 		/* none, allprop, propname, prop */
+ unsigned depth;	 		/* 0 = root, 1 = calendar, 2 = resrc */
+ unsigned prefer;			/* bitmask of client preferences */
+ const char *userid;			/* userid client has logged in as */
+ const char *int_userid;		/* internal userid */
+ int userisadmin;			/* is userid an admin */
+ struct auth_state *authstate;	/* authorization state for userid */
+ void *davdb;			/* DAV DB corresponding to userid */
+ struct mailbox *mailbox;		/* mailbox correspondng to collection */
+ struct quota quota;			/* quota info for collection */
+ struct index_record *record;	/* cyrus.index record for resource */
+ void *data;				/* DAV record for resource */
+ struct buf msg_buf;			/* mmap()'d resource file */
+ unsigned long reqd_privs;		/* privileges req'd on collections */
+ int (*filter)(struct propfind_ctx *,
+		 void *data);		/* callback to filter resources */
+ void *filter_crit;			/* criteria to filter resources */
+ db_lookup_proc_t lookup_resource;
+ db_foreach_proc_t foreach_resource;
+ int (*proc_by_resource)(void *rock,	/* Callback to process a resource */
+			 void *data);
+ struct propfind_entry_list *elist;	/* List of props to fetch w/callbacks */
+ const struct prop_entry *lprops;	/* Array of known "live" properties */
+ xmlNodePtr root;			/* root node to add to XML tree */
+ xmlNsPtr *ns;			/* Array of our known namespaces */
+ struct hash_table *ns_table;	/* Table of all ns attached to resp */
+ unsigned prefix_count;		/* Count of new ns added to resp */
+ struct error_t *err;		/* Error info to pass up to caller */
+ int *ret; 				/* Return code to pass up to caller */
+ int fetcheddata;			/* Did we fetch iCalendar/vCard data? */
+ struct buf buf;			/* Working buffer */
+};
+
+
+/* Context for patching (writing) properties */
+struct proppatch_ctx {
+ struct request_target_t *req_tgt;	/* parsed request target URL */
+ unsigned meth;	 		/* requested Method */
+ struct mailbox *mailbox;		/* mailbox related to the collection */
+ const struct prop_entry *lprops;	/* Array of known "live" properties */
+ xmlNodePtr root;			/* root node to add to XML tree */
+ xmlNsPtr *ns;			/* Array of our supported namespaces */
+ struct txn *tid;			/* Transaction ID for annot writes */
+ struct error_t *err;		/* Error info to pass up to caller */
+ int *ret; 				/* Return code to pass up to caller */
+ struct buf buf;			/* Working buffer */
+};
+
+
+/* Structure for property status */
+struct propstat {
+ xmlNodePtr root;
+ long status;
+ unsigned precond;
+};
+
+/* Index into propstat array */
+enum {
+ PROPSTAT_OK = 0,
+ PROPSTAT_UNAUTH,
+ PROPSTAT_FORBID,
+ PROPSTAT_NOTFOUND,
+ PROPSTAT_CONFLICT,
+ PROPSTAT_FAILEDDEP,
+ PROPSTAT_ERROR,
+ PROPSTAT_OVERQUOTA
+};
+#define NUM_PROPSTAT 8
+
+
+/* Context for "live" properties */
+struct prop_entry {
+ const char *name;			/* Property name */
+ unsigned ns;			/* Property namespace */
+ unsigned char flags;		/* Flags for how/where props apply */
+ int (*get)(const xmlChar *name,	/* Callback to fetch property */
+	 xmlNsPtr ns, struct propfind_ctx *fctx, xmlNodePtr resp,
+	 struct propstat *propstat, void *rock);
+ int (*put)(xmlNodePtr prop,		/* Callback to write property */
+	 unsigned set, struct proppatch_ctx *pctx,
+	 struct propstat *propstat, void *rock);
+ void *rock;				/* Add'l data to pass to callback */
+};
+
+/* Bitmask of property flags */
+enum {
+ PROP_ALLPROP =	(1<<0),		/* Returned in <allprop> request */
+ PROP_COLLECTION = 	(1<<1),		/* Returned for collection */
+ PROP_RESOURCE =	(1<<2),		/* Returned for resource */
+ PROP_PRESCREEN =	(1<<3),		/* Prescreen property using callback */
+ PROP_NEEDPROP =	(1<<4),		/* Pass property node into callback */
+};
+
+
+/* Function to check headers for preconditions */
+typedef int (*check_precond_t)(struct transaction_t *txn, const void *data,
+			 const char *etag, time_t lastmod);
+
+/* Function to insert/update DAV resource in 'data', optionally commiting txn */
+typedef int (*db_write_proc_t)(void *davdb, void *data, int commit);
+
+/* Function to delete resource in 'rowid', optionally commiting txn */
+typedef int (*db_delete_proc_t)(void *davdb, unsigned rowid, int commit);
+
+/* Function to delete all entries in 'mailbox', optionally commiting txn */
+typedef int (*db_delmbox_proc_t)(void *davdb, const char *mailbox, int commit);
+
+struct davdb_params {
+ void **db;				/* DAV DB to use for resources */
+ db_lookup_proc_t lookup_resource;	/* lookup a specific resource */
+ db_foreach_proc_t foreach_resource;	/* process all resources in a mailbox */
+ db_write_proc_t write_resource;	/* write a specific resource */
+ db_delete_proc_t delete_resource;	/* delete a specific resource */
+ db_delmbox_proc_t delete_mbox;	/* delete all resources in mailbox */
+};
+
+/*
+ * Process 'priv', augmenting 'rights' as necessary.
+ * Returns 1 if processing is complete.
+ * Returns 0 if processing should continue in meth_acl()
+ */
+typedef int (*acl_proc_t)(struct transaction_t *txn, xmlNodePtr priv,
+			 int *rights);
+
+/* Function to process and COPY a resource */
+typedef int (*copy_proc_t)(struct transaction_t *txn,
+			 struct mailbox *src_mbox, struct index_record *src_rec,
+			 struct mailbox *dest_mbox, const char *dest_rsrc,
+			 unsigned overwrite, unsigned flags);
+
+/* Function to do special processing for DELETE method (optional) */
+typedef int (*delete_proc_t)(struct transaction_t *txn, struct mailbox *mailbox,
+			 struct index_record *record, void *data);
+
+/* Function to convert to/from MIME type */
+struct mime_type_t {
+ const char *content_type;
+ const char *version;
+ const char *file_ext;
+ const char *file_ext2;
+ const char* (*to_string)(void *);
+ void* (*from_string)(const char *);
+ const char* (*begin_stream)(struct buf *);
+ void (*end_stream)(struct buf *);
+};
+
+/* meth_mkcol() parameters */
+struct mkcol_params {
+ unsigned mbtype;			/* mbtype to use for created mailbox */
+ const char *xml_req;		/* toplevel XML request element */
+ const char *xml_resp;		/* toplevel XML response element */
+ unsigned xml_ns;			/* namespace of response element */
+};
+
+/*
+ * Function to do special processing for POST method (optional).
+ * Returns HTTP_CONTINUE if processing should continue in meth_post(),
+ * otherwise processing is complete.
+ */
+typedef int (*post_proc_t)(struct transaction_t *txn);
+
+/* meth_put() parameters */
+typedef int (*put_proc_t)(struct transaction_t *txn,
+			 struct mime_type_t *mime,
+			 struct mailbox *mailbox, unsigned flags);
+
+struct put_params {
+ unsigned supp_data_precond;		/* precond code for unsupported data */
+ put_proc_t proc;			/* function to process & PUT a rsrc */
+};
+
+/* meth_report() parameters */
+typedef int (*report_proc_t)(struct transaction_t *txn, xmlNodePtr inroot,
+			 struct propfind_ctx *fctx);
+
+struct report_type_t {
+ const char *name;			/* report name */
+ report_proc_t proc;			/* function to generate the report */
+ unsigned long reqd_privs;		/* privileges required to run report */
+ unsigned flags;			/* report-specific flags */
+};
+
+/* Report flags */
+enum {
+ REPORT_NEED_MBOX	= (1<<0),
+ REPORT_NEED_PROPS 	= (1<<1),
+ REPORT_MULTISTATUS	= (1<<2)
+};
+
+/* Overwrite flags */
+enum {
+ OVERWRITE_CHECK = -1,
+ OVERWRITE_NO,
+ OVERWRITE_YES
+};
+
+struct meth_params {
+ struct mime_type_t *mime_types;	/* array of MIME types and conv funcs */
+ parse_path_t parse_path;		/* parse URI path & generate mboxname */
+ check_precond_t check_precond;	/* check headers for preconditions */
+ struct davdb_params davdb;		/* DAV DB access functions */
+ acl_proc_t acl_ext;			/* special ACL handling (extensions) */
+ copy_proc_t copy;			/* function to process & COPY a rsrc */
+ delete_proc_t delete;		/* special DELETE handling (optional) */
+ struct mkcol_params mkcol;		/* params for creating collection */
+ post_proc_t post;			/* special POST handling (optional) */
+ struct put_params put;		/* params for putting a resource */
+ const struct prop_entry *lprops;	/* array of "live" properties */
+ struct report_type_t reports;	/* array of reports & proc functions */
+};
+
+int report_sync_col(struct transaction_t *txn, xmlNodePtr inroot,
+		 struct propfind_ctx *fctx);
+
+
+int parse_path(struct request_target_t *tgt, const char **errstr);
+int target_to_mboxname(struct request_target_t *req_tgt, char *mboxname);
+unsigned get_preferences(struct transaction_t *txn);
+
+int parse_xml_body(struct transaction_t *txn, xmlNodePtr *root);
+
+/* Initialize an XML tree */
+xmlNodePtr init_xml_response(const char *resp, int ns,
+			 xmlNodePtr req, xmlNsPtr *respNs);
+
+xmlNodePtr xml_add_href(xmlNodePtr parent, xmlNsPtr ns, const char *href);
+xmlNodePtr xml_add_error(xmlNodePtr root, struct error_t *err,
+			 xmlNsPtr *avail_ns);
+xmlNodePtr xml_add_prop(long status, xmlNsPtr davns,
+			struct propstat *propstat,
+			const xmlChar *name, xmlNsPtr ns,
+			xmlChar *content, unsigned precond);
+void xml_add_lockdisc(xmlNodePtr node, const char *path, struct dav_data *data);
+int ensure_ns(xmlNsPtr *respNs, int ns, xmlNodePtr node,
+	 const char *url, const char *prefix);
+
+int propfind_by_resource(void *rock, void *data);
+int propfind_by_collection(char *mboxname, int matchlen,
+			 int maycreate, void *rock);
+
+/* DAV method processing functions */
+int meth_acl(struct transaction_t *txn, void *params);
+int meth_copy(struct transaction_t *txn, void *params);
+int meth_delete(struct transaction_t *txn, void *params);
+int meth_get_dav(struct transaction_t *txn, void *params);
+int meth_lock(struct transaction_t *txn, void *params);
+int meth_mkcol(struct transaction_t *txn, void *params);
+int meth_propfind(struct transaction_t *txn, void *params);
+int meth_proppatch(struct transaction_t *txn, void *params);
+int meth_post(struct transaction_t *txn, void *params);
+int meth_put(struct transaction_t *txn, void *params);
+int meth_report(struct transaction_t *txn, void *params);
+int meth_unlock(struct transaction_t *txn, void *params);
+
+
+/* PROPFIND callbacks */
+int propfind_fromdb(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_fromhdr(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_creationdate(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+int propfind_getlength(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_getetag(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_getlastmod(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx, xmlNodePtr resp,
+			struct propstat propstat, void *rock);
+int propfind_lockdisc(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_suplock(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+
+int propfind_owner(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_supprivset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx, xmlNodePtr resp,
+			struct propstat propstat, void *rock);
+int propfind_curprivset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx, xmlNodePtr resp,
+			struct propstat propstat, void *rock);
+int propfind_acl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_aclrestrict(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+int propfind_princolset(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx, xmlNodePtr resp,
+			struct propstat propstat, void *rock);
+
+int propfind_quota(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+
+int propfind_curprin(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+
+int propfind_addmember(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+
+int propfind_sync_token(const xmlChar *name, xmlNsPtr ns,
+			struct propfind_ctx *fctx, xmlNodePtr resp,
+			struct propstat propstat, void *rock);
+
+int propfind_calurl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+int propfind_caluseraddr(const xmlChar *name, xmlNsPtr ns,
+			 struct propfind_ctx *fctx, xmlNodePtr resp,
+			 struct propstat propstat, void *rock);
+int propfind_abookurl(const xmlChar *name, xmlNsPtr ns,
+		 struct propfind_ctx *fctx, xmlNodePtr resp,
+		 struct propstat propstat, void *rock);
+
+/* PROPPATCH callbacks */
+int proppatch_todb(xmlNodePtr prop, unsigned set, struct proppatch_ctx *pctx,
+		 struct propstat propstat, void *rock);
+int proppatch_restype(xmlNodePtr prop, unsigned set, struct proppatch_ctx *pctx,
+		 struct propstat propstat, void *rock);
+
+#endif /* HTTP_DAV_H */

cyrus-imapd-2.5.tar.gz/imap/http_dblookup.c Added

@@ -0,0 +1,156 @@
+/* http_dblookup.c -- Routines for dealing with HTTP based db lookups
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+
+#include "carddav_db.h"
+#include "http_err.h"
+#include "http_dav.h"
+#include <jansson.h>
+#include "util.h"
+
+static int meth_get_db(struct transaction_t *txn, void *params);
+
+/* Namespace for DB lookups */
+struct namespace_t namespace_dblookup = {
+ URL_NS_DBLOOKUP, /*enabled*/1, "/dblookup", NULL, 0 /* auth */,
+ ALLOW_READ,
+ NULL, NULL, NULL, NULL,
+ {
+	{ NULL,			NULL },			/* ACL		*/
+	{ NULL,			NULL },			/* COPY		*/
+	{ NULL,			NULL },			/* DELETE	*/
+	{ &meth_get_db,		NULL },			/* GET		*/
+	{ NULL,			NULL },			/* HEAD		*/
+	{ NULL,			NULL },			/* LOCK		*/
+	{ NULL,			NULL },			/* MKCALENDAR	*/
+	{ NULL,			NULL },			/* MKCOL	*/
+	{ NULL,			NULL },			/* MOVE		*/
+	{ NULL,			NULL },			/* OPTIONS	*/
+	{ NULL,			NULL },			/* POST		*/
+	{ NULL,			NULL },			/* PROPFIND	*/
+	{ NULL,			NULL },			/* PROPPATCH	*/
+	{ NULL,			NULL },			/* PUT		*/
+	{ NULL,			NULL },			/* REPORT	*/
+	{ NULL,			NULL },			/* TRACE	*/
+	{ NULL,			NULL }			/* UNLOCK	*/
+ }
+};
+
+static int get_email(struct transaction_t *txn __attribute__((unused)),
+		 const char *user, const char *key)
+{
+ struct carddav_db *db = NULL;
+ int ret = HTTP_NOT_FOUND;
+
+ /* XXX init just incase carddav not enabled? */
+ db = carddav_open(user, /*flags*/0);
+ if (!db) goto done;
+
+ if (carddav_getemail(db, key))
+	ret = HTTP_NO_CONTENT;
+
+done:
+ if (db) carddav_close(db);
+ return ret;
+}
+
+static int get_group(struct transaction_t *txn, const char *user, const char *key)
+{
+ struct carddav_db *db = NULL;
+ strarray_t *array = NULL;
+ char *result = NULL;
+ json_t *json;
+ int ret = HTTP_NOT_FOUND;
+ int i;
+
+ /* XXX init just incase carddav not enabled? */
+ db = carddav_open(user, /*flags*/0);
+ if (!db) goto done;
+
+ array = carddav_getgroup(db, key);
+ if (!array) goto done;
+
+ json = json_array();
+ for (i = 0; i < strarray_size(array); i++) {
+	json_array_append_new(json, json_string(strarray_nth(array, i)));
+ }
+
+ result = json_dumps(json, JSON_PRESERVE_ORDER|JSON_COMPACT);
+ json_decref(json);
+
+ txn->resp_body.type = "application/json";
+ txn->resp_body.len = strlen(result);
+
+ write_body(HTTP_OK, txn, result, txn->resp_body.len);
+ ret = 0;
+
+done:
+ free(result);
+ if (array) strarray_free(array);
+ if (db) carddav_close(db);
+ return ret;
+}
+
+static int meth_get_db(struct transaction_t *txn,
+		 void *params __attribute__((unused)))
+{
+ const char **userhdrs;
+ const char **keyhdrs;
+
+ userhdrs = spool_getheader(txn->req_hdrs, "User");
+ keyhdrs = spool_getheader(txn->req_hdrs, "Key");
+
+ if (!userhdrs) return HTTP_BAD_REQUEST;
+ if (!keyhdrs) return HTTP_BAD_REQUEST;
+
+ if (userhdrs1) return HTTP_NOT_ALLOWED;
+ if (keyhdrs1) return HTTP_NOT_ALLOWED;
+
+ if (!strcmp(txn->req_uri->path, "/dblookup/email"))
+	return get_email(txn, userhdrs0, keyhdrs0);
+
+ if (!strcmp(txn->req_uri->path, "/dblookup/group"))
+	return get_group(txn, userhdrs0, keyhdrs0);
+
+ return HTTP_NOT_FOUND;
+}

cyrus-imapd-2.5.tar.gz/imap/http_err.et Added

@@ -0,0 +1,186 @@
+# http_err.et -- Error codes for the Cyrus HTTP server
+#
+# Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+error_table http
+
+# HTTP/1.1 Status Codes (draft-ietf-httpbis-*)
+#
+# 1xx: Informational - Request received, continuing process
+# 2xx: Successful    - Request successfully received, understood, and accepted
+# 3xx: Redirection   - Further action must be taken to complete the request
+# 4xx: Client Error  - The request contains bad syntax or cannot be fulfilled
+# 5xx: Server Error  - The server is incapable of performing the request
+
+ec HTTP_CONTINUE,
+   "100 Continue"
+
+ec HTTP_SWITCH_PROT,
+   "101 Switching Protocols"
+
+ec HTTP_OK,
+   "200 OK"
+
+ec HTTP_CREATED,
+   "201 Created"
+
+ec HTTP_NO_CONTENT,
+   "204 No Content"
+
+ec HTTP_PARTIAL,
+   "206 Partial Content"
+
+ec HTTP_MOVED,
+   "301 Moved Permanently"
+
+ec HTTP_NOT_MODIFIED,
+   "304 Not Modified"
+
+ec HTTP_TEMP_REDIRECT,
+   "307 Temporary Redirect"
+
+ec HTTP_BAD_REQUEST,
+   "400 Bad Request"
+
+ec HTTP_UNAUTHORIZED,
+   "401 Unauthorized"
+
+ec HTTP_FORBIDDEN,
+   "403 Forbidden"
+
+ec HTTP_NOT_FOUND,
+   "404 Not Found"
+
+ec HTTP_NOT_ALLOWED,
+   "405 Method Not Allowed"
+
+ec HTTP_NOT_ACCEPTABLE,
+   "406 Not Acceptable"
+
+ec HTTP_TIMEOUT,
+   "408 Request Timeout"
+
+ec HTTP_CONFLICT,
+   "409 Conflict"
+
+ec HTTP_GONE,
+   "410 Gone"
+
+ec HTTP_LENGTH_REQUIRED,
+   "411 Length Required"
+
+ec HTTP_PRECOND_FAILED,
+   "412 Precondition Failed"
+
+ec HTTP_TOO_LARGE,
+   "413 Payload Too Large"
+
+ec HTTP_TOO_LONG,
+   "414 URI Too Long"
+
+ec HTTP_BAD_MEDIATYPE,
+   "415 Unsupported Media Type"
+
+ec HTTP_UNSAT_RANGE,
+   "416 Range Not Satisfiable"
+
+ec HTTP_EXPECT_FAILED,
+   "417 Expectation Failed"
+
+ec HTTP_UPGRADE,
+   "426 Upgrade Required"
+
+ec HTTP_SERVER_ERROR,
+   "500 Internal Server Error"
+
+ec HTTP_NOT_IMPLEMENTED,
+   "501 Not Implemented"
+
+ec HTTP_BAD_GATEWAY,
+   "502 Bad Gateway"
+
+ec HTTP_UNAVAILABLE,
+   "503 Service Unavailable"
+
+ec HTTP_GATEWAY_TIMEOUT,
+   "504 Gateway Timeout"
+
+ec HTTP_BAD_VERSION,
+   "505 HTTP Version Not Supported"
+
+
+
+# WebDAV (RFC 2518/4918)
+
+ec HTTP_PROCESSING,
+   "102 Processing"
+
+ec HTTP_MULTI_STATUS,
+   "207 Multi-Status"
+
+ec HTTP_UNPROCESSABLE,
+   "422 Unprocessable Entity"
+
+ec HTTP_LOCKED,
+   "423 Locked"
+
+ec HTTP_FAILED_DEP,
+   "424 Failed Dependency"
+
+ec HTTP_NO_STORAGE,
+   "507 Insufficient Storage"
+
+
+
+# draft-reschke-http-status-308
+
+ec HTTP_PERM_REDIRECT,
+   "308 Permanent Redirect"
+
+
+
+# Additional HTTP Status Codes (RFC 6585)
+
+ec HTTP_PRECOND_REQUIRED,
+   "428 Precondition Required"
+
+
+end

cyrus-imapd-2.5.tar.gz/imap/http_ischedule.c Added

@@ -0,0 +1,942 @@
+/* http_ischedule.c -- Routines for handling iSchedule in httpd
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <syslog.h>
+
+#include <libical/ical.h>
+
+#include "global.h"
+#include "httpd.h"
+#include "http_caldav_sched.h"
+#include "http_dav.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "jcal.h"
+#include "map.h"
+#include "proxy.h"
+#include "tok.h"
+#include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include <sasl/saslutil.h>
+
+#define ISCHED_WELLKNOWN_URI "/.well-known/ischedule"
+
+#ifdef WITH_DKIM
+#include <dkim.h>
+
+//#define TEST
+
+#define BASE64_LEN(inlen) ((((inlen) + 2) / 3) * 4)
+
+static DKIM_LIB *dkim_lib = NULL;
+static struct buf privkey = BUF_INITIALIZER;
+static struct buf tmpbuf = BUF_INITIALIZER;
+static struct buf b64req = BUF_INITIALIZER;
+#endif /* WITH_DKIM */
+
+static void isched_init(struct buf *serverinfo);
+static void isched_shutdown(void);
+
+static int meth_get_isched(struct transaction_t *txn, void *params);
+static int meth_post_isched(struct transaction_t *txn, void *params);
+static int dkim_auth(struct transaction_t *txn);
+static int meth_get_domainkey(struct transaction_t *txn, void *params);
+static time_t compile_time;
+
+static struct mime_type_t isched_mime_types = {
+ /* First item MUST be the default type and storage format */
+ { "text/calendar; charset=utf-8", "2.0", "ics", "ifb",
+ (const char* (*)(void *)) &icalcomponent_as_ical_string,
+ (void * (*)(const char*)) &icalparser_parse_string,
+ NULL, NULL
+ },
+#ifdef WITH_JSON
+ { "application/calendar+json; charset=utf-8", NULL, "jcs", "jfb",
+ (const char* (*)(void *)) &icalcomponent_as_jcal_string,
+ (void * (*)(const char*)) &jcal_string_as_icalcomponent,
+ NULL, NULL,
+ },
+#endif
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+struct namespace_t namespace_ischedule = {
+ URL_NS_ISCHEDULE, 0, "/ischedule", ISCHED_WELLKNOWN_URI, 0 /* auth */,
+ (ALLOW_READ | ALLOW_POST | ALLOW_ISCHEDULE),
+ isched_init, NULL, NULL, isched_shutdown,
+ {
+	{ NULL,			NULL },	/* ACL		*/
+	{ NULL,			NULL },	/* COPY		*/
+	{ NULL,			NULL },	/* DELETE	*/
+	{ &meth_get_isched,	NULL },	/* GET		*/
+	{ &meth_get_isched,	NULL },	/* HEAD		*/
+	{ NULL,			NULL },	/* LOCK		*/
+	{ NULL,			NULL },	/* MKCALENDAR	*/
+	{ NULL,			NULL },	/* MKCOL	*/
+	{ NULL,			NULL },	/* MOVE		*/
+	{ &meth_options,	NULL },	/* OPTIONS	*/
+	{ &meth_post_isched,	NULL },	/* POST		*/
+	{ NULL,			NULL },	/* PROPFIND	*/
+	{ NULL,			NULL },	/* PROPPATCH	*/
+	{ NULL,			NULL },	/* PUT		*/
+	{ NULL,			NULL },	/* REPORT	*/
+	{ &meth_trace,		NULL },	/* TRACE	*/
+	{ NULL,			NULL }	/* UNLOCK	*/
+ }
+};
+
+struct namespace_t namespace_domainkey = {
+ URL_NS_DOMAINKEY, 0, "/domainkeys", "/.well-known/domainkey", 0 /* auth */,
+ ALLOW_READ, NULL, NULL, NULL, NULL,
+ {
+	{ NULL,			NULL },	/* ACL		*/
+	{ NULL,			NULL },	/* COPY		*/
+	{ NULL,			NULL },	/* DELETE	*/
+	{ &meth_get_domainkey,	NULL },	/* GET		*/
+	{ &meth_get_domainkey,	NULL },	/* HEAD		*/
+	{ NULL,			NULL },	/* LOCK		*/
+	{ NULL,			NULL },	/* MKCALENDAR	*/
+	{ NULL,			NULL },	/* MKCOL	*/
+	{ NULL,			NULL },	/* MOVE		*/
+	{ &meth_options,	NULL },	/* OPTIONS	*/
+	{ NULL,			NULL },	/* POST		*/
+	{ NULL,			NULL },	/* PROPFIND	*/
+	{ NULL,			NULL },	/* PROPPATCH	*/
+	{ NULL,			NULL },	/* PUT		*/
+	{ NULL,			NULL },	/* REPORT	*/
+	{ &meth_trace,		NULL },	/* TRACE	*/
+	{ NULL,			NULL }	/* UNLOCK	*/
+ }
+};
+
+
+/* iSchedule Receiver Capabilities */
+static int meth_get_isched(struct transaction_t *txn,
+			 void *params __attribute__((unused)))
+{
+ int precond;
+ struct message_guid guid;
+ const char *etag;
+ static time_t lastmod = 0;
+ static xmlChar *buf = NULL;
+ static int bufsiz = 0;
+
+ /* We don't handle GET on a anything other than ?action=capabilities */
+ if (!URI_QUERY(txn->req_uri) ||
+	strcmp(URI_QUERY(txn->req_uri), "action=capabilities")) {
+	return HTTP_NOT_FOUND;
+ }
+
+ /* Generate ETag based on compile date/time of this source file.
+ * Extend this to include config file size/mtime if we add run-time options.
+ */
+ assert(!buf_len(&txn->buf));
+ buf_printf(&txn->buf, "%ld", (long) compile_time);
+ message_guid_generate(&guid, buf_cstring(&txn->buf), buf_len(&txn->buf));
+ etag = message_guid_encode(&guid);
+
+ /* Check any preconditions, including range request */
+ txn->flags.ranges = 1;
+ precond = check_precond(txn, NULL, etag, compile_time);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_PARTIAL:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in Etag, Last-Modified, Expires, and iSchedule-Capabilities */
+	txn->resp_body.etag = etag;
+	txn->resp_body.lastmod = compile_time;
+	txn->resp_body.maxage = 86400; /* 24 hrs */
+	txn->flags.cc |= CC_MAXAGE;
+	txn->resp_body.iserial = compile_time;
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	return precond;
+ }
+
+ if (txn->resp_body.lastmod > lastmod) {
+	xmlNodePtr root, capa, node, comp, meth;
+	xmlNsPtr nsNUM_NAMESPACE;
+
+	/* Start construction of our query-result */
+	if (!(root = init_xml_response("query-result", NS_ISCHED, NULL, ns))) {
+	 txn->error.desc = "Unable to create XML response";
+	 return HTTP_SERVER_ERROR;
+	}
+
+	capa = xmlNewChild(root, NULL, BAD_CAST "capabilities", NULL);
+
+	node = xmlNewChild(capa, NULL, BAD_CAST "serial-number",
+			 BAD_CAST buf_cstring(&txn->buf));
+
+	node = xmlNewChild(capa, NULL, BAD_CAST "versions", NULL);
+	node = xmlNewChild(node, NULL, BAD_CAST "version", BAD_CAST "1.0");
+
+	node = xmlNewChild(capa, NULL,
+			 BAD_CAST "scheduling-messages", NULL);
+	comp = xmlNewChild(node, NULL, BAD_CAST "component", NULL);
+	xmlNewProp(comp, BAD_CAST "name", BAD_CAST "VEVENT");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "REQUEST");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "REPLY");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "CANCEL");
+	comp = xmlNewChild(node, NULL, BAD_CAST "component", NULL);
+	xmlNewProp(comp, BAD_CAST "name", BAD_CAST "VTODO");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "REQUEST");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "REPLY");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "CANCEL");
+	comp = xmlNewChild(node, NULL, BAD_CAST "component", NULL);
+	xmlNewProp(comp, BAD_CAST "name", BAD_CAST "VFREEBUSY");
+	meth = xmlNewChild(comp, NULL, BAD_CAST "method", NULL);
+	xmlNewProp(meth, BAD_CAST "name", BAD_CAST "REQUEST");
+
+	node = xmlNewChild(capa, NULL,
+			 BAD_CAST "calendar-data-types", NULL);
+	node = xmlNewChild(node, NULL, BAD_CAST "calendar-data-type", NULL);
+	xmlNewProp(node, BAD_CAST "content-type", BAD_CAST "text/calendar");
+	xmlNewProp(node, BAD_CAST "version", BAD_CAST "2.0");
+
+	node = xmlNewChild(capa, NULL, BAD_CAST "attachments", NULL);
+	node = xmlNewChild(node, NULL, BAD_CAST "inline", NULL);
+
+	/* Dump XML response tree into a text buffer */
+	xmlDocDumpFormatMemoryEnc(root->doc, &buf, &bufsiz, "utf-8", 1);
+	xmlFree(root->doc);
+
+	if (!buf) {
+	 txn->error.desc = "Error dumping XML tree";
+	 return HTTP_SERVER_ERROR;
+	}
+
+	lastmod = txn->resp_body.lastmod;
+ }
+
+ /* Output the XML response */
+ txn->resp_body.type = "application/xml; charset=utf-8";
+ write_body(precond, txn, (char *) buf, bufsiz);
+
+ xmlFree(buf);
+
+ return 0;
+}
+
+
+/* iSchedule Receiver */
+static int meth_post_isched(struct transaction_t *txn,
+			 void *params __attribute__((unused)))
+{
+ int ret = 0, r, authd = 0;
+ const char **hdr;
+ struct mime_type_t *mime = NULL;
+ icalcomponent *ical = NULL, *comp;
+ icalcomponent_kind kind = 0;
+ icalproperty_method meth = 0;
+ icalproperty *prop = NULL;
+ const char *uid = NULL;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Check iSchedule-Version */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "iSchedule-Version")) ||
+	strcmp(hdr0, "1.0")) {
+	txn->error.precond = ISCHED_UNSUPP_VERSION;
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Check Content-Type */
+ if ((hdr = spool_getheader(txn->req_hdrs, "Content-Type"))) {
+	for (mime = isched_mime_types; mime->content_type; mime++) {
+	 if (is_mediatype(hdr0, mime->content_type)) break;
+	}
+ }
+ if (!mime || !mime->content_type) {
+	txn->error.precond = ISCHED_UNSUPP_DATA;
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Check Originator */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "Originator"))) {
+	txn->error.precond = ISCHED_ORIG_MISSING;
+	return HTTP_BAD_REQUEST;
+ }
+ else if (hdr1) {
+	/* Multiple Originators */
+	txn->error.precond = ISCHED_MULTIPLE_ORIG;
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Check Recipient */
+ if (!(hdr = spool_getheader(txn->req_hdrs, "Recipient"))) {
+	txn->error.precond = ISCHED_RECIP_MISSING;
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Read body */
+ txn->req_body.flags |= BODY_DECODE;
+ r = read_body(httpd_in, txn->req_hdrs, &txn->req_body, &txn->error.desc);
+ if (r) {
+	txn->flags.conn = CONN_CLOSE;
+	return r;
+ }
+
+ /* Make sure we have a body */
+ if (!buf_len(&txn->req_body.payload)) {
+	txn->error.desc = "Missing request body\r\n";
+	return HTTP_BAD_REQUEST;
+ }
+
+ /* Check authorization */
+ if (httpd_userid) {
+	/* Allow admins or proxyservers to auth and use iSchedule */
+	authd = httpd_userisadmin ||
+	 global_authisa(httpd_authstate, IMAPOPT_PROXYSERVERS);
+ }
+ else if (!spool_getheader(txn->req_hdrs, "DKIM-Signature")) {
+	txn->error.desc = "No signature";
+ }
+ else {
+	authd = dkim_auth(txn);
+ }
+
+ if (!authd) {
+	ret = HTTP_FORBIDDEN;
+	txn->error.precond = ISCHED_VERIFICATION_FAILED;
+	goto done;
+ }
+
+ /* Parse the iCal data for important properties */
+ ical = mime->from_string(buf_cstring(&txn->req_body.payload));
+ if (!ical || !icalrestriction_check(ical)) {
+	txn->error.precond = ISCHED_INVALID_DATA;
+	return HTTP_BAD_REQUEST;
+ }
+
+ meth = icalcomponent_get_method(ical);
+ comp = icalcomponent_get_first_real_component(ical);
+ if (comp) {
+	uid = icalcomponent_get_uid(comp);
+	kind = icalcomponent_isa(comp);
+	prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ }
+
+ /* Check method preconditions */
+ if (!meth || !uid || !prop) {
+	txn->error.precond = ISCHED_INVALID_SCHED;
+	ret = HTTP_BAD_REQUEST;
+	goto done;
+ }
+
+ switch (kind) {
+ case ICAL_VFREEBUSY_COMPONENT:
+	if (meth == ICAL_METHOD_REQUEST)
+	 ret = sched_busytime_query(txn, mime, ical);
+	else {
+	 txn->error.precond = ISCHED_INVALID_SCHED;
+	 ret = HTTP_BAD_REQUEST;
+	}
+	break;
+
+ case ICAL_VEVENT_COMPONENT:
+ case ICAL_VTODO_COMPONENT:
+	switch (meth) {
+	case ICAL_METHOD_REQUEST:
+	case ICAL_METHOD_REPLY:
+	case ICAL_METHOD_CANCEL: {
+	 struct sched_data sched_data =
+		{ 1, meth == ICAL_METHOD_REPLY, ical, NULL, 0, NULL, NULL };
+	 xmlNodePtr root = NULL;
+	 xmlNsPtr nsNUM_NAMESPACE;
+	 struct auth_state *authstate;
+	 icalcomponent *comp;
+	 icalproperty *prop;
+
+	 /* Start construction of our schedule-response */
+	 if (!(root = init_xml_response("schedule-response",
+					 NS_ISCHED, NULL, ns))) {
+		ret = HTTP_SERVER_ERROR;
+		txn->error.desc = "Unable to create XML response\r\n";
+		goto done;
+	 }
+
+	 authstate = auth_newstate("anonymous");
+	 comp = icalcomponent_get_first_real_component(ical);
+
+	 /* Process each attendee */
+	 for (prop = icalcomponent_get_first_property(comp,
+							 ICAL_ATTENDEE_PROPERTY);
+		 prop;
+		 prop =
+		 icalcomponent_get_next_property(comp,
+						 ICAL_ATTENDEE_PROPERTY)) {
+		const char *attendee;
+		struct sched_param sparam;
+		int r;
+
+		/* Is attendee remote or local? */
+		attendee = icalproperty_get_attendee(prop);
+		r = caladdress_lookup(attendee, &sparam);
+
+		/* Don't allow scheduling of remote users via an iSchedule request */
+		if (sparam.flags & SCHEDTYPE_REMOTE) r = HTTP_FORBIDDEN;
+
+		if (r) sched_data.status = REQSTAT_NOUSER;
+		else sched_deliver((char *) attendee, &sched_data, authstate);
+
+		xml_add_schedresponse(root, NULL, BAD_CAST attendee,
+				 BAD_CAST sched_data.status);
+	 }
+
+	 /* Fill in iSchedule-Capabilities */
+	 txn->resp_body.iserial = compile_time;
+
+	 xml_response(HTTP_OK, txn, root->doc);
+
+	 auth_freestate(authstate);
+	}
+	 break;
+
+	default:
+	 txn->error.precond = ISCHED_INVALID_SCHED;
+	 ret = HTTP_BAD_REQUEST;
+	}
+	break;
+
+ default:
+	txn->error.precond = ISCHED_INVALID_SCHED;
+	ret = HTTP_BAD_REQUEST;
+ }
+
+ done:
+ if (ical) icalcomponent_free(ical);
+
+ return ret;
+}
+
+
+int isched_send(struct sched_param *sparam, const char *recipient,
+		icalcomponent *ical, xmlNodePtr *xml)
+{
+ int r = 0;
+ struct backend *be;
+ static unsigned send_count = 0;
+ static struct buf hdrs = BUF_INITIALIZER;
+ const char *body, *uri;
+ size_t bodylen;
+ icalcomponent *comp;
+ icalcomponent_kind kind;
+ icalproperty *prop;
+ unsigned code;
+ struct transaction_t txn;
+
+ *xml = NULL;
+ memset(&txn, 0, sizeof(struct transaction_t));
+
+ if (sparam->flags & SCHEDTYPE_REMOTE) uri = ISCHED_WELLKNOWN_URI;
+ else uri = namespace_ischedule.prefix;
+
+ /* Open connection to iSchedule receiver.
+ Use header buffer to construct remote server:port/tls */
+ buf_setcstr(&hdrs, sparam->server);
+ if (sparam->port) buf_printf(&hdrs, ":%u", sparam->port);
+ if (sparam->flags & SCHEDTYPE_SSL) buf_appendcstr(&hdrs, "/tls");
+ if (sparam->flags & SCHEDTYPE_REMOTE) buf_appendcstr(&hdrs, "/noauth");
+ be = proxy_findserver(buf_cstring(&hdrs), &http_protocol, NULL,
+			 &backend_cached, NULL, NULL, httpd_in);
+ if (!be) return HTTP_UNAVAILABLE;
+
+ /* Create iSchedule request body */
+ body = icalcomponent_as_ical_string(ical);
+ bodylen = strlen(body);
+
+ /* Create iSchedule request header.
+ * XXX Make sure that we don't use multiple headers of the same name
+ * or add WSP around commas in signed headers
+ * to obey ischedule-relaxed canonicalization.
+ */
+ buf_reset(&hdrs);
+ buf_printf(&hdrs, "Host: %s", sparam->server);
+ if (sparam->port) buf_printf(&hdrs, ":%u", sparam->port);
+ buf_printf(&hdrs, "\r\n");
+ buf_printf(&hdrs, "Cache-Control: no-cache, no-transform\r\n");
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	buf_printf(&hdrs, "User-Agent: %s\r\n", buf_cstring(&serverinfo));
+ }
+ buf_printf(&hdrs, "iSchedule-Version: 1.0\r\n");
+ buf_printf(&hdrs, "iSchedule-Message-ID: <cmu-ischedule-%u-%ld-%u@%s>\r\n",
+	 getpid(), time(NULL), send_count++, config_servername);
+ buf_printf(&hdrs, "Content-Type: text/calendar; charset=utf-8");
+
+ comp = icalcomponent_get_first_real_component(ical);
+ kind = icalcomponent_isa(comp);
+ buf_printf(&hdrs, "; method=REQUEST; component=%s\r\n",
+	 icalcomponent_kind_to_string(kind));
+
+ buf_printf(&hdrs, "Content-Length: %u\r\n", (unsigned) bodylen);
+
+ prop = icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
+ buf_printf(&hdrs, "Originator: %s\r\n", icalproperty_get_organizer(prop));
+
+ if (recipient) {
+	/* Single recipient */
+	buf_printf(&hdrs, "Recipient: %s\r\n", recipient);
+ }
+ else {
+	/* VFREEBUSY REQUEST - use ATTENDEES as Recipients */
+	char sep = ' ';
+
+	buf_printf(&hdrs, "Recipient:");
+	for (prop = icalcomponent_get_first_property(comp,
+						 ICAL_ATTENDEE_PROPERTY);
+	 prop;
+	 prop = icalcomponent_get_next_property(comp,
+						 ICAL_ATTENDEE_PROPERTY)) {
+	 buf_printf(&hdrs, "%c%s", sep, icalproperty_get_attendee(prop));
+	 sep = ',';
+	}
+	buf_printf(&hdrs, "\r\n");
+ }
+
+ buf_printf(&hdrs, "\r\n");
+
+ redirect:
+ /* Send request line */
+ prot_printf(be->out, "POST %s %s\r\n", uri, HTTP_VERSION);
+
+ if (sparam->flags & SCHEDTYPE_REMOTE) {
+#ifdef WITH_DKIM
+	DKIM *dkim = NULL;
+	DKIM_STAT stat;
+	unsigned char *sig = NULL;
+	size_t siglen;
+
+	/* Create iSchedule/DKIM signature */
+	if (dkim_lib &&
+	 (dkim = dkim_sign(dkim_lib, NULL /* id */, NULL,
+			 (dkim_sigkey_t) buf_cstring(&privkey),
+			 (const u_char *) config_getstring(IMAPOPT_DKIM_SELECTOR),
+			 (const u_char *) config_getstring(IMAPOPT_DKIM_DOMAIN),
+			 /* Requires modified version of OpenDKIM
+				 until we get OpenDOSETA */
+			 DKIM_CANON_ISCHEDULE, DKIM_CANON_SIMPLE,
+			 DKIM_SIGN_RSASHA256, -1 /* entire body */,
+			 &stat))) {
+
+	 /* Suppress folding of DKIM header */
+//	 stat = dkim_set_margin(dkim, 0);
+
+	 /* Add our query method list */
+	 stat = dkim_add_querymethod(dkim, "private-exchange", NULL);
+	 stat = dkim_add_querymethod(dkim, "http", "well-known");
+//	 stat = dkim_add_querymethod(dkim, "dns", "txt");
+
+	 /* Process the headers and body */
+	 stat = dkim_chunk(dkim,
+			 (u_char *) buf_cstring(&hdrs), buf_len(&hdrs));
+	 stat = dkim_chunk(dkim, (u_char *) body, bodylen);
+	 stat = dkim_chunk(dkim, NULL, 0);
+	 stat = dkim_eom(dkim, NULL);
+
+	 /* Generate the signature */
+	 stat = dkim_getsighdr_d(dkim, strlen(DKIM_SIGNHEADER) + 2,
+				 &sig, &siglen);
+
+	 /* Prepend a DKIM-Signature header */
+	 prot_printf(be->out, "%s: %s\r\n", DKIM_SIGNHEADER, sig);
+
+	 dkim_free(dkim);
+	}
+#else
+	syslog(LOG_WARNING, "DKIM-Signature required, but DKIM isn't supported");
+#endif /* WITH_DKIM */
+ }
+
+ /* Send request headers and body */
+ prot_putbuf(be->out, &hdrs);
+ prot_write(be->out, body, bodylen);
+
+ /* Read response (req_hdr and req_body are actually the response) */
+ txn.req_body.flags = BODY_DECODE;
+ r = http_read_response(be, METH_POST, &code, NULL,
+			 &txn.req_hdrs, &txn.req_body, &txn.error.desc);
+ if (!r) {
+	switch (code) {
+	case 200: /* Successful */
+	 r = parse_xml_body(&txn, xml);
+	 break;
+
+	case 301:
+	case 302:
+	case 307:
+	case 308: /* Redirection */
+	 uri = spool_getheader(txn.req_hdrs, "Location")0;
+	 goto redirect;
+
+	default:
+	 r = HTTP_UNAVAILABLE;
+	}
+ }
+
+ if (txn.req_hdrs) spool_free_hdrcache(txn.req_hdrs);
+ buf_free(&txn.req_body.payload);
+
+ return r;
+}
+
+
+#ifdef WITH_DKIM
+static DKIM_CBSTAT isched_get_key(DKIM *dkim, DKIM_SIGINFO *sig,
+				 u_char *buf, size_t buflen)
+{
+ DKIM_CBSTAT stat = DKIM_CBSTAT_NOTFOUND;
+ const char *domain, *selector, *query;
+ tok_t tok;
+ char *type, *opts;
+
+ assert(dkim != NULL);
+ assert(sig != NULL);
+
+ domain = (const char *) dkim_sig_getdomain(sig);
+ selector = (const char *) dkim_sig_getselector(sig);
+ if (!domain || !selector) return DKIM_CBSTAT_ERROR;
+
+ query = (const char *) dkim_sig_gettagvalue(sig, 0, (u_char *) "q");
+ if (!query) query = "dns/txt"; /* implicit default */
+
+ /* Parse the q= tag */
+ tok_init(&tok, query, ":", 0);
+ while ((type = tok_next(&tok))) {
+	/* Split type/options */
+	if ((opts = strchr(type, '/'))) *opts++ = '\0';
+
+	if (!strcmp(type, "private-exchange")) {
+	 const char *prefix = config_getstring(IMAPOPT_HTTPDOCROOT);
+	 struct buf path = BUF_INITIALIZER;
+	 FILE *f;
+
+	 if (!prefix) continue;
+
+	 buf_setcstr(&path, prefix);
+	 buf_printf(&path, "%s/%s/%s",
+		 namespace_domainkey.prefix, domain, selector);
+
+	 if (!(f = fopen(buf_cstring(&path), "r"))) {
+		syslog(LOG_NOTICE, "%s: fopen(): %s",
+		 buf_cstring(&path), strerror(errno));
+	 }
+	 buf_free(&path);
+	 if (!f) continue;
+
+	 memset(buf, '\0', buflen);
+	 fgets((char *) buf, buflen, f);
+	 fclose(f);
+
+	 if (buf0 != '\0') {
+		stat = DKIM_CBSTAT_CONTINUE;
+		break;
+	 }
+	}
+	else if (!strcmp(type, "http") && !strcmp(opts, "well-known")) {
+	}
+	else if (!strcmp(type, "dns") && !strcmp(opts, "txt")) {
+	 stat = DKIM_CBSTAT_DEFAULT;
+	 break;
+	}
+ }
+
+ tok_fini(&tok);
+
+ return stat;
+}
+
+
+static void dkim_cachehdr(const char *name, const char *contents, void *rock)
+{
+ struct buf *hdrfield = &tmpbuf;
+ static const char *lastname = NULL;
+ int dup_hdr = name && lastname && !strcmp(name, lastname);
+
+ /* Ignore private headers in our cache */
+ if (name && name0 == ':') return;
+
+ /* Combine header fields of the same name.
+ * Our hash table will always feed us duplicate headers consecutively.
+ */
+ if (lastname && !dup_hdr) {
+	dkim_header((DKIM *) rock,
+		 (u_char *) buf_cstring(hdrfield), buf_len(hdrfield));
+ }
+
+ lastname = name;
+
+ if (name) {
+	tok_t tok;
+	char *token, sep = ':';
+
+	if (!dup_hdr) buf_setcstr(hdrfield, name);
+	else sep = ',';
+
+	/* Trim leading/trailing WSP around comma-separated values */
+	tok_init(&tok, contents, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT|TOK_EMPTY);
+	while ((token = tok_next(&tok))) {
+	 buf_printf(hdrfield, "%c%s", sep, token);
+	 sep = ',';
+	}
+	tok_fini(&tok);
+ }
+}
+
+static int dkim_auth(struct transaction_t *txn)
+{
+ int authd = 0;
+ DKIM *dkim = NULL;
+ DKIM_STAT stat;
+
+ if (!dkim_lib) return 0;
+
+ dkim = dkim_verify(dkim_lib, NULL /* id */, NULL, &stat);
+ if (!dkim) return 0;
+
+#ifdef TEST
+ {
+	/* XXX Hack for local testing */
+	dkim_query_t qtype = DKIM_QUERY_FILE;
+	struct buf keyfile = BUF_INITIALIZER;
+
+	stat = dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYMETHOD,
+			 &qtype, sizeof(qtype));
+
+	buf_printf(&keyfile, "%s/dkim.public", config_dir);
+	stat = dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_QUERYINFO,
+			 (void *) buf_cstring(&keyfile),
+			 buf_len(&keyfile));
+ }
+#endif
+
+ /* Process the cached headers and body */
+ spool_enum_hdrcache(txn->req_hdrs, &dkim_cachehdr, dkim);
+ dkim_cachehdr(NULL, NULL, dkim); /* Force canon of last header */
+ stat = dkim_eoh(dkim);
+ if (stat == DKIM_STAT_OK) {
+	stat = dkim_body(dkim, (u_char *) buf_cstring(&txn->req_body.payload),
+			 buf_len(&txn->req_body.payload));
+	stat = dkim_eom(dkim, NULL);
+ }
+
+ if (stat == DKIM_STAT_OK) authd = 1;
+ else if (stat == DKIM_STAT_CBREJECT) {
+	txn->error.desc =
+	 "Unable to verify: HTTP request-line mismatch";
+ }
+ else {
+	DKIM_SIGINFO *sig = dkim_getsignature(dkim);
+
+	if (sig) {
+	 const char *sigerr;
+
+	 if (dkim_sig_getbh(sig) == DKIM_SIGBH_MISMATCH)
+		sigerr = "body hash mismatch";
+	 else {
+		DKIM_SIGERROR err = dkim_sig_geterror(sig);
+
+		sigerr = dkim_sig_geterrorstr(err);
+	 }
+
+	 assert(!buf_len(&txn->buf));
+	 buf_printf(&txn->buf, "%s: %s",
+		 dkim_getresultstr(stat), sigerr);
+	 txn->error.desc = buf_cstring(&txn->buf);
+	}
+	else txn->error.desc = dkim_getresultstr(stat);
+ }
+
+ dkim_free(dkim);
+
+ return authd;
+}
+#else
+static int dkim_auth(struct transaction_t *txn __attribute__((unused)))
+{
+ syslog(LOG_WARNING, "DKIM-Signature provided, but DKIM isn't supported");
+
+ return 0;
+}
+#endif /* WITH_DKIM */
+
+
+/* Perform a GET/HEAD request for a domainkey */
+static int meth_get_domainkey(struct transaction_t *txn,
+			 void *params __attribute__((unused)))
+{
+ txn->flags.cc |= CC_REVALIDATE;
+ txn->resp_body.type = "text/plain";
+
+ return meth_get_doc(txn, NULL);
+}
+
+
+static void isched_init(struct buf *serverinfo)
+{
+ if (!(config_httpmodules & IMAP_ENUM_HTTPMODULES_CALDAV) ||
+	!config_getswitch(IMAPOPT_CALDAV_ALLOWSCHEDULING)) {
+	/* Need CALDAV and CALDAV_SCHED in order to have ISCHEDULE */
+	return;
+ }
+
+ compile_time = calc_compile_time(__TIME__, __DATE__);
+
+ if (config_mupdate_server && config_getstring(IMAPOPT_PROXYSERVERS)) {
+	/* If backend server, we require ISCHEDULE (w/o DKIM) */
+	namespace_ischedule.enabled = -1;
+	buf_len(serverinfo); // squash compiler warning when #undef WITH_DKIM
+ }
+#ifdef WITH_DKIM
+ else {
+	namespace_ischedule.enabled =
+	 config_httpmodules & IMAP_ENUM_HTTPMODULES_ISCHEDULE;
+ }
+
+ if (namespace_ischedule.enabled) {
+	int fd;
+	struct buf keypath = BUF_INITIALIZER;
+	unsigned flags = ( DKIM_LIBFLAGS_BADSIGHANDLES | DKIM_LIBFLAGS_CACHE |
+//			 DKIM_LIBFLAGS_KEEPFILES | DKIM_LIBFLAGS_TMPFILES |
+			 DKIM_LIBFLAGS_VERIFYONE );
+	uint64_t ttl = 3600; /* 1 hour */
+	const char *requiredhdrs = { "Content-Type", "iSchedule-Version",
+				 "Originator", "Recipient", NULL };
+	const char *signhdrs = { "iSchedule-Message-ID", "User-Agent", NULL };
+	const char *skiphdrs = { "Cache-Control", "Connection",
+				 "Content-Length", "Host", "Keep-Alive",
+				 "Proxy-Authenticate", "Proxy-Authorization",
+				 "TE", "Trailer", "Transfer-Encoding",
+				 "Upgrade", "Via", NULL };
+	const char *senderhdrs = { "Originator", NULL };
+	uint32_t ver = dkim_libversion();
+	unsigned need_dkim =
+	 namespace_ischedule.enabled == IMAP_ENUM_HTTPMODULES_ISCHEDULE;
+
+	/* Add OpenDKIM version to serverinfo string */
+	buf_printf(serverinfo, " OpenDKIM/%u.%u.%u",
+		 (ver >> 24) & 0xff, (ver >> 16) & 0xff, (ver >> 8) & 0xff);
+	if (ver & 0xff) buf_printf(serverinfo, ".%u", ver & 0xff);
+
+	/* Initialize DKIM library */
+	if (!(dkim_lib = dkim_init(NULL, NULL))) {
+	 syslog(LOG_ERR, "unable to initialize libopendkim");
+	 namespace_ischedule.enabled = !need_dkim;	 
+	 return;
+	}
+
+	/* Install our callback for doing key lookups */
+	dkim_set_key_lookup(dkim_lib, isched_get_key);
+
+	/* Setup iSchedule DKIM options */
+#ifdef TEST
+	flags |= ( DKIM_LIBFLAGS_SIGNLEN | DKIM_LIBFLAGS_ZTAGS );
+#endif
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_FLAGS,
+		 &flags, sizeof(flags));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_SIGNATURETTL,
+		 &ttl, sizeof(ttl));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_REQUIREDHDRS,
+		 requiredhdrs, sizeof(const char **));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_MUSTBESIGNED,
+		 requiredhdrs, sizeof(const char **));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_SIGNHDRS,
+		 signhdrs, sizeof(const char **));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_SKIPHDRS,
+		 skiphdrs, sizeof(const char **));
+	dkim_options(dkim_lib, DKIM_OP_SETOPT, DKIM_OPTS_SENDERHDRS,
+		 senderhdrs, sizeof(const char **));
+
+	/* Fetch DKIM private key for signing */
+	buf_printf(&keypath, "%s/dkim.private", config_dir);
+	if ((fd = open(buf_cstring(&keypath), O_RDONLY)) != -1) {
+	 const char *base = NULL;
+	 unsigned long len = 0;
+
+	 map_refresh(fd, 1, &base, &len,
+			MAP_UNKNOWN_LEN, buf_cstring(&keypath), NULL);
+	 buf_setmap(&privkey, base, len);
+	 map_free(&base, &len);
+	 close(fd);
+	}
+	else {
+	 syslog(LOG_ERR, "unable to open private key file %s",
+		 buf_cstring(&keypath));
+	 namespace_ischedule.enabled = !need_dkim;	 
+	}
+	buf_free(&keypath);
+
+	namespace_domainkey.enabled =
+	 config_httpmodules & IMAP_ENUM_HTTPMODULES_DOMAINKEY;
+ }
+#endif /* WITH_DKIM */
+}
+
+
+static void isched_shutdown(void)
+{
+#ifdef WITH_DKIM
+ buf_free(&privkey);
+ buf_free(&tmpbuf);
+ buf_free(&b64req);
+ if (dkim_lib) dkim_close(dkim_lib);
+#endif
+}

cyrus-imapd-2.5.tar.gz/imap/http_proxy.c Added

@@ -0,0 +1,1114 @@
+/* http_proxy.c - HTTP proxy support functions
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <ctype.h>
+#include <syslog.h>
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
+
+#include "httpd.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "imap_err.h"
+#include "iptostring.h"
+#include "mupdate-client.h"
+#include "prot.h"
+#include "proxy.h"
+#include "spool.h"
+#include "tls.h"
+#include "tok.h"
+#include "version.h"
+#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
+
+#include <libxml/uri.h>
+
+static int login(struct backend *s, const char *userid,
+		 sasl_callback_t *cb, const char **status,
+		 int noauth);
+static int ping(struct backend *s, const char *userid);
+static int logout(struct backend *s __attribute__((unused)));
+
+
+HIDDEN struct protocol_t http_protocol =
+{ "http", "HTTP", TYPE_SPEC,
+ { .spec = { &login, &ping, &logout } }
+};
+
+
+EXPORTED const char *digest_recv_success(hdrcache_t hdrs)
+{
+ const char **hdr = spool_getheader(hdrs, "Authentication-Info");
+
+ return (hdr ? hdr0: NULL);
+}
+
+
+static const char *callback_getdata(sasl_conn_t *conn,
+				 sasl_callback_t *callbacks,
+				 unsigned long callbackid)
+{
+ sasl_callback_t *cb;
+ const char *result = NULL;
+
+ for (cb = callbacks; cb->id != SASL_CB_LIST_END; cb++) {
+	if (cb->id == callbackid) {
+	 switch (cb->id) {
+	 case SASL_CB_USER:
+	 case SASL_CB_AUTHNAME: {
+		sasl_getsimple_t *simple_cb = (sasl_getsimple_t *) cb->proc;
+		simple_cb(cb->context, cb->id, &result, NULL);
+		break;
+	 }
+
+	 case SASL_CB_PASS: {
+		sasl_secret_t *pass;
+		sasl_getsecret_t *pass_cb = (sasl_getsecret_t *) cb->proc;
+		pass_cb(conn, cb->context, cb->id, &pass);
+		result = (const char *) pass->data;
+		break;
+	 }
+	 }
+	}
+ }
+
+ return result;
+}
+
+
+#define BASE64_BUF_SIZE	21848	/* per RFC 2222bis: ((16K / 3) + 1) * 4 */
+
+static int login(struct backend *s, const char *userid,
+		 sasl_callback_t *cb, const char **status,
+		 int noauth __attribute__((unused)))
+{
+ int r = 0;
+ socklen_t addrsize;
+ struct sockaddr_storage saddr_l, saddr_r;
+ char remoteip60, localip60;
+ static struct buf buf = BUF_INITIALIZER;
+ sasl_security_properties_t secprops =
+	{ 0, 0xFF, PROT_BUFSIZE, 0, NULL, NULL }; /* default secprops */
+ const char *mech_conf, *pass, *clientout = NULL;
+ struct auth_scheme_t *scheme = NULL;
+ unsigned need_tls = 0, tls_done = 0, clientoutlen;
+ hdrcache_t hdrs = NULL;
+
+ if (status) *status = NULL;
+
+ /* set the IP addresses */
+ addrsize = sizeof(struct sockaddr_storage);
+ if (getpeername(s->sock, (struct sockaddr *) &saddr_r, &addrsize) ||
+	iptostring((struct sockaddr *) &saddr_r, addrsize, remoteip, 60)) {
+	if (status) *status = "Failed to get remote IP address";
+	return SASL_FAIL;
+ }
+ 
+ addrsize = sizeof(struct sockaddr_storage);
+ if (getsockname(s->sock, (struct sockaddr *) &saddr_l, &addrsize) ||
+	iptostring((struct sockaddr *) &saddr_l, addrsize, localip, 60)) {
+	if (status) *status = "Failed to get local IP address";
+	return SASL_FAIL;
+ }
+
+ /* Create callbacks, if necessary */
+ if (!cb) {
+	buf_setmap(&buf, s->hostname, strcspn(s->hostname, "."));
+	buf_appendcstr(&buf, "_password");
+	pass = config_getoverflowstring(buf_cstring(&buf), NULL);
+	if (!pass) pass = config_getstring(IMAPOPT_PROXY_PASSWORD);
+	cb = mysasl_callbacks(NULL, /* userid */
+			 config_getstring(IMAPOPT_PROXY_AUTHNAME),
+			 config_getstring(IMAPOPT_PROXY_REALM),
+			 pass);
+	s->sasl_cb = cb;
+ }
+
+ /* Create SASL context */
+ r = sasl_client_new(s->prot->sasl_service, s->hostname,
+			localip, remoteip, cb, SASL_USAGE_FLAGS, &s->saslconn);
+ if (r != SASL_OK) goto done;
+
+ r = sasl_setprop(s->saslconn, SASL_SEC_PROPS, &secprops);
+ if (r != SASL_OK) goto done;
+
+ /* Get SASL mechanism list. We can force a particular
+ mechanism using a <shorthost>_mechs option */
+ buf_setmap(&buf, s->hostname, strcspn(s->hostname, "."));
+ buf_appendcstr(&buf, "_mechs");
+ if (!(mech_conf = config_getoverflowstring(buf_cstring(&buf), NULL))) {
+	mech_conf = config_getstring(IMAPOPT_FORCE_SASL_CLIENT_MECH);
+ }
+
+ do {
+	unsigned code;
+	const char **hdr, *errstr, *serverin;
+	char base64BASE64_BUF_SIZE+1;
+	unsigned int serverinlen;
+	struct body_t resp_body;
+#ifdef SASL_HTTP_REQUEST
+	sasl_http_request_t httpreq = { "OPTIONS",	/* Method */
+					"*",		/* URI */
+					(u_char *) "",	/* Empty body */
+					0,		/* Zero-length body */
+					0 };		/* Persistent cxn? */
+#endif
+
+	/* Base64 encode any client response, if necessary */
+	if (clientout && scheme && (scheme->flags & AUTH_BASE64)) {
+	 r = sasl_encode64(clientout, clientoutlen,
+			 base64, BASE64_BUF_SIZE, &clientoutlen);
+	 if (r != SASL_OK) break;
+
+	 clientout = base64;
+	}
+
+	/* Send Authorization and/or Upgrade request to server */
+	prot_puts(s->out, "OPTIONS * HTTP/1.1\r\n");
+	prot_printf(s->out, "Host: %s\r\n", s->hostname);
+	prot_printf(s->out, "User-Agent: %s\r\n", buf_cstring(&serverinfo));
+	if (scheme) {
+	 prot_printf(s->out, "Authorization: %s %s\r\n", 
+			scheme->name, clientout ? clientout : "");
+	 if (userid) prot_printf(s->out, "Authorize-As: %s\r\n", userid);
+	}
+	else {
+	 prot_printf(s->out, "Upgrade: %s\r\n", TLS_VERSION);
+	 if (need_tls) {
+		prot_puts(s->out, "Connection: Upgrade\r\n");
+		need_tls = 0;
+	 }
+	 prot_puts(s->out, "Authorization: \r\n");
+	}
+	prot_puts(s->out, "\r\n");
+	prot_flush(s->out);
+
+	serverin = clientout = NULL;
+	serverinlen = clientoutlen = 0;
+
+	/* Read response(s) from backend until final response or error */
+	do {
+	 resp_body.flags = BODY_DISCARD;
+	 r = http_read_response(s, METH_OPTIONS, &code, NULL,
+				 &hdrs, &resp_body, &errstr);
+	 if (r) {
+		if (status) *status = errstr;
+		break;
+	 }
+
+	 if (code == 101) { /* Switching Protocols */
+		if (tls_done) {
+		 r = HTTP_BAD_GATEWAY;
+		 if (status) *status = "TLS already active";
+		 break;
+		}
+		else if (backend_starttls(s, NULL)) {
+		 r = HTTP_SERVER_ERROR;
+		 if (status) *status = "Unable to start TLS";
+		 break;
+		}
+		else tls_done = 1;
+	 }
+	} while (code < 200);
+
+	switch (code) {
+	default: /* Failure */
+	 if (!r) {
+		r = HTTP_BAD_GATEWAY;
+		if (status) {
+		 buf_reset(&buf);
+		 buf_printf(&buf,
+			 "Unexpected status code from backend: %u", code);
+		 *status = buf_cstring(&buf);
+		}
+	 }
+	 break;
+
+	case 426: /* Upgrade Required */
+	 if (tls_done) {
+		r = HTTP_BAD_GATEWAY;
+		if (status) *status = "TLS already active";
+	 }
+	 else need_tls = 1;
+	 break;
+
+	case 200: /* OK */
+	 if (scheme->recv_success &&
+		(serverin = scheme->recv_success(hdrs))) {
+		serverinlen = strlen(serverin);
+	 }
+	 /* Fall through and process any success data */
+
+	case 401: /* Unauthorized */
+	 if (!serverin) {
+		int i = 0;
+		
+		hdr = spool_getheader(hdrs, "WWW-Authenticate");
+
+		if (!scheme) {
+		 unsigned avail_auth_schemes = 0;
+		 const char *mech = NULL;
+		 size_t len;
+
+		 /* Compare authentication schemes offered in
+		 * WWW-Authenticate header(s) to what we support */
+		 buf_reset(&buf);
+		 for (i = 0; hdr && hdri; i++) {
+			len = strcspn(hdri, " ");
+
+			for (scheme = auth_schemes; scheme->name; scheme++) {
+			 if (!strncmp(scheme->name, hdri, len) &&
+				!((scheme->flags & AUTH_NEED_PERSIST) &&
+				 (resp_body.flags & BODY_CLOSE))) {
+				/* Tag the scheme as available */
+				avail_auth_schemes |= (1 << scheme->idx);
+
+				/* Add SASL-based schemes to SASL mech list */
+				if (scheme->saslmech) {
+				 if (buf_len(&buf)) buf_putc(&buf, ' ');
+				 buf_appendcstr(&buf, scheme->saslmech);
+				}
+				break;
+			 }
+			}
+		 }
+
+		 /* If we have a mech_conf, use it */
+		 if (mech_conf && buf_len(&buf)) {
+			char *conf = xstrdup(mech_conf);
+			char *newmechlist =
+			 intersect_mechlists(conf,
+						(char *) buf_cstring(&buf));
+
+			if (newmechlist) {
+			 buf_setcstr(&buf, newmechlist);
+			 free(newmechlist);
+			}
+			else {
+			 syslog(LOG_DEBUG, "%s did not offer %s",
+				 s->hostname, mech_conf);
+			 buf_reset(&buf);
+			}
+			free(conf);
+		 }
+
+#ifdef SASL_HTTP_REQUEST
+		 /* Set HTTP request as specified above (REQUIRED) */
+		 httpreq.non_persist = (resp_body.flags & BODY_CLOSE);
+		 sasl_setprop(s->saslconn, SASL_HTTP_REQUEST, &httpreq);
+#endif
+
+		 /* Try to start SASL exchange using available mechs */
+		 r = sasl_client_start(s->saslconn, buf_cstring(&buf),
+					 NULL,		/* no prompts */
+					 NULL, NULL, 	/* no initial resp */
+					 &mech);
+
+		 if (mech) {
+			/* Find auth scheme associated with chosen SASL mech */
+			for (scheme = auth_schemes; scheme->name; scheme++) {
+			 if (scheme->saslmech &&
+				!strcmp(scheme->saslmech, mech)) break;
+			}
+		 }
+		 else {
+			/* No matching SASL mechs - try Basic */
+			scheme = &auth_schemesAUTH_BASIC;
+			if (!(avail_auth_schemes & (1 << scheme->idx))) {
+			 need_tls = !tls_done;
+			 break; /* case 401 */
+			}
+		 }
+
+		 /* Find the associated WWW-Authenticate header */
+		 for (i = 0; hdr && hdri; i++) {
+			len = strcspn(hdri, " ");
+			if (!strncmp(scheme->name, hdri, len)) break;
+		 }
+		}
+
+		/* Get server challenge, if any */
+		if (hdr) {
+		 const char *p = strchr(hdri, ' ');
+		 serverin = p ? ++p : "";
+		 serverinlen = strlen(serverin);
+		}
+	 }
+
+	 if (serverin) {
+		/* Perform the next step in the auth exchange */
+
+		if (scheme->idx == AUTH_BASIC) {
+		 /* Don't care about "realm" in server challenge */
+		 const char *authid =
+			callback_getdata(s->saslconn, cb, SASL_CB_AUTHNAME);
+		 pass = callback_getdata(s->saslconn, cb, SASL_CB_PASS);
+
+		 buf_reset(&buf);
+		 buf_printf(&buf, "%s:%s", authid, pass);
+		 clientout = buf_cstring(&buf);
+		 clientoutlen = buf_len(&buf);
+		}
+		else {
+		 /* Base64 decode any server challenge, if necessary */
+		 if (serverin && (scheme->flags & AUTH_BASE64)) {
+			r = sasl_decode64(serverin, serverinlen,
+					 base64, BASE64_BUF_SIZE, &serverinlen);
+			if (r != SASL_OK) break; /* case 401 */
+
+			serverin = base64;
+		 }
+
+		 /* SASL mech (Digest, Negotiate, NTLM) */
+		 r = sasl_client_step(s->saslconn, serverin, serverinlen,
+					 NULL,		/* no prompts */
+					 &clientout, &clientoutlen);
+		}
+	 }
+	 break; /* case 401 */
+	}
+
+ } while (need_tls || clientout);
+
+ done:
+ if (hdrs) spool_free_hdrcache(hdrs);
+
+ if (r && status && !*status) *status = sasl_errstring(r, NULL, NULL);
+
+ return r;
+}
+
+
+static int ping(struct backend *s, const char *userid)
+{
+ unsigned code = 0;
+ const char *errstr;
+ hdrcache_t resp_hdrs = NULL;
+ struct body_t resp_body;
+
+ /* Send Authorization request to server */
+ prot_puts(s->out, "OPTIONS * HTTP/1.1\r\n");
+ prot_printf(s->out, "Host: %s\r\n", s->hostname);
+ prot_printf(s->out, "User-Agent: %s\r\n", buf_cstring(&serverinfo));
+ if (userid) prot_printf(s->out, "Authorize-As: %s\r\n", userid);
+ prot_puts(s->out, "\r\n");
+ prot_flush(s->out);
+
+ /* Read response(s) from backend until final response or error */
+ do {
+	resp_body.flags = BODY_DISCARD;
+	if (http_read_response(s, METH_OPTIONS, &code, NULL,
+			 &resp_hdrs, &resp_body, &errstr)) {
+	 break;
+	}
+ } while (code < 200);
+
+ if (resp_hdrs) spool_free_hdrcache(resp_hdrs);
+
+ return (code != 200);
+}
+
+
+static int logout(struct backend *s __attribute__((unused)))
+{
+ /* Nothing to send, client just closes connection */
+ return 0;
+}
+
+
+/* proxy mboxlist_lookup; on misses, it asks the listener for this
+ * machine to make a roundtrip to the master mailbox server to make
+ * sure it's up to date
+ */
+EXPORTED int http_mlookup(const char *name, mbentry_t **mbentryp, void *tid)
+{
+ mbentry_t *mbentry = NULL;
+ int r;
+
+ r = mboxlist_lookup(name, &mbentry, tid);
+ if (r == IMAP_MAILBOX_NONEXISTENT && config_mupdate_server) {
+	kick_mupdate();
+	r = mboxlist_lookup(name, &mbentry, tid);
+ }
+ if (r) return r;
+ if (mbentry->mbtype & MBTYPE_RESERVE) {
+	r = IMAP_MAILBOX_RESERVED;
+	goto done;
+ }
+ if (mbentry->mbtype & MBTYPE_MOVING) {
+	r = IMAP_MAILBOX_MOVED;
+	goto done;
+ }
+ if (mbentry->mbtype & MBTYPE_DELETED) {
+	r = IMAP_MAILBOX_NONEXISTENT;
+	goto done;
+ }
+
+done:
+ if (!r && mbentryp) *mbentryp = mbentry;
+ else mboxlist_entry_free(&mbentry);
+ return r;
+}
+
+
+/* Fetch protocol and host used for request from headers */
+EXPORTED void http_proto_host(hdrcache_t req_hdrs, const char **proto, const char **host)
+{
+ const char **fwd;
+
+ if (config_mupdate_server && config_getstring(IMAPOPT_PROXYSERVERS) &&
+	(fwd = spool_getheader(req_hdrs, "Forwarded"))) {
+	/* Proxied request - parse last Forwarded header for proto and host */
+	/* XXX This is destructive of the header but we don't care
+	 * and more importantly, we need the tokens available after tok_fini()
+	 */
+	tok_t tok;
+	char *token;
+
+	while (fwd1) ++fwd; /* Skip to last Forwarded header */
+
+	tok_initm(&tok, (char *) fwd0, ";", 0);
+	while ((token = tok_next(&tok))) {
+	 if (proto && !strncmp(token, "proto=", 6)) *proto = token+6;
+	 else if (host && !strncmp(token, "host=", 5)) *host = token+5;
+	}
+	tok_fini(&tok);
+ }
+ else {
+	/* Use our protocol and host */
+	if (proto) *proto = https ? "https" : "http";
+	if (host) *host = *spool_getheader(req_hdrs, "Host");
+ }
+}
+
+/* Construct and write Via header to protstream. */
+static void write_forwarding_hdrs(struct protstream *pout, hdrcache_t hdrs,
+				 const char *version, const char *proto)
+{
+ const char **via = spool_getheader(hdrs, "Via");
+ const char **fwd = spool_getheader(hdrs, "Forwarded");
+
+ /* Add any existing Via headers */
+ for (; via && *via; via++) prot_printf(pout, "Via: %s\r\n", *via);
+
+ /* Create our own Via header */
+ prot_printf(pout, "Via: %s %s", version+5, config_servername);
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	prot_printf(pout, " (Cyrus/%s)", cyrus_version());
+ }
+ prot_puts(pout, "\r\n");
+
+ /* Add any existing Forwarded headers */
+ for (; fwd && *fwd; fwd++) prot_printf(pout, "Forwarded: %s\r\n", *fwd);
+
+ /* Create our own Forwarded header */
+ if (proto) {
+	char localip60, remoteip60, *p;
+	socklen_t salen = sizeof(httpd_remoteaddr);
+	const char **host = spool_getheader(hdrs, "Host");
+
+	prot_printf(pout, "Forwarded: proto=%s", proto);
+	if (host) prot_printf(pout, ";host=%s", *host);
+	if (!iptostring((struct sockaddr *)&httpd_remoteaddr, salen,
+			remoteip, 60)) {
+	 if ((p = strrchr(remoteip, ';'))) *p = '\0';
+	 prot_printf(pout, ";for=%s", remoteip);
+	}
+	if (!iptostring((struct sockaddr *)&httpd_localaddr, salen,
+			localip, 60)) {
+	 if ((p = strrchr(localip, ';'))) *p = '\0';
+	 prot_printf(pout, ";by=%s", localip);
+	}
+	prot_puts(pout, "\r\n"); 
+ }
+}
+
+
+/* Write end-to-end header (ignoring hop-by-hop) from cache to protstream. */
+static void write_cachehdr(const char *name, const char *contents, void *rock)
+{
+ struct protstream *pout = (struct protstream *) rock;
+ const char **hdr, *hop_by_hop =
+	{ "authorization", "connection", "content-length", "expect",
+	 "forwarded", "host", "keep-alive", "strict-transport-security",
+	 "te", "trailer", "transfer-encoding", "upgrade", "via", NULL };
+
+ /* Ignore private headers in our cache */
+ if (name0 == ':') return;
+
+ for (hdr = hop_by_hop; *hdr && strcmp(name, *hdr); hdr++);
+
+ if (!*hdr) {
+	if (!strcmp(name, "max-forwards")) {
+	 /* Decrement Max-Forwards before forwarding */
+	 unsigned long max = strtoul(contents, NULL, 10);
+
+	 prot_printf(pout, "Max-Forwards: %lu\r\n", max-1);
+	}
+	else {
+	 prot_printf(pout, "%c%s: %s\r\n", toupper(*name), name+1, contents);
+	}
+ }
+}
+
+
+/* Read a response from backend */
+EXPORTED int http_read_response(struct backend *be, unsigned meth, unsigned *code,
+		 const char **statline, hdrcache_t *hdrs,
+		 struct body_t *body, const char **errstr)
+{
+ static char statbuf2048;
+ const char **conn;
+ int c = EOF;
+
+ if (statline) *statline = statbuf;
+ *errstr = NULL;
+ *code = HTTP_BAD_GATEWAY;
+
+ if (*hdrs) spool_free_hdrcache(*hdrs);
+ if (!(*hdrs = spool_new_hdrcache())) {
+	*errstr = "Unable to create header cache for backend response";
+	return HTTP_SERVER_ERROR;
+ }
+ if (!prot_fgets(statbuf, sizeof(statbuf), be->in) ||
+	(sscanf(statbuf, HTTP_VERSION " %u ", code) != 1) ||
+	spool_fill_hdrcache(be->in, NULL, *hdrs, NULL)) {
+	*errstr = "Unable to read status-line/headers from backend";
+	return HTTP_BAD_GATEWAY;
+ }
+ eatline(be->in, c); /* CRLF separating headers & body */
+
+ /* 1xx (provisional) response - nothing else to do */
+ if (*code < 200) return 0;
+
+ /* Final response */
+ if (!(body->flags & BODY_DISCARD)) buf_reset(&body->payload);
+
+ /* Check connection persistence */
+ if (!strncmp(statbuf, "HTTP/1.0 ", 9)) body->flags |= BODY_CLOSE;
+ for (conn = spool_getheader(*hdrs, "Connection"); conn && *conn; conn++) {
+	tok_t tok =
+	 TOK_INITIALIZER(*conn, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	char *token;
+
+	while ((token = tok_next(&tok))) {
+	 if (!strcasecmp(token, "keep-alive")) body->flags &= ~BODY_CLOSE;
+	 else if (!strcasecmp(token, "close")) body->flags |= BODY_CLOSE;
+	}
+	tok_fini(&tok);
+ }
+
+ /* Not expecting a body for 204/304 response or any HEAD response */
+ switch (*code){
+ case 204: /* No Content */
+ case 304: /* Not Modified */
+	break;
+
+ default:
+	if (meth == METH_HEAD) break;
+
+	else {
+	 body->flags |= BODY_RESPONSE;
+	 body->framing = FRAMING_UNKNOWN;
+
+	 if (read_body(be->in, *hdrs, body, errstr)) {
+		return HTTP_BAD_GATEWAY;
+	 }
+	}
+ }
+
+ return 0;
+}
+
+
+/* Send a cached response to the client */
+static void send_response(const char *statline, hdrcache_t hdrs,
+			 struct buf *body, struct txn_flags_t *flags)
+{
+ unsigned long len;
+
+ /* Stop method processing alarm */
+ alarm(0);
+
+ /*
+ * - Use cached Status Line
+ * - Add/append-to Via: header
+ * - Add our own hop-by-hop headers
+ * - Use all cached end-to-end headers
+ */
+ prot_puts(httpd_out, statline);
+ write_forwarding_hdrs(httpd_out, hdrs, HTTP_VERSION, NULL);
+ if (flags->conn) {
+	/* Construct Connection header */
+	const char *conn_tokens =
+	 { "close", "Upgrade", "Keep-Alive", NULL };
+
+	if (flags->conn & CONN_KEEPALIVE) {
+	 prot_printf(httpd_out, "Keep-Alive: timeout=%d\r\n", httpd_timeout);
+	}
+
+	comma_list_hdr("Connection", conn_tokens, flags->conn);
+ }
+ if (httpd_tls_done) {
+	prot_puts(httpd_out, "Strict-Transport-Security: max-age=600\r\n");
+ }
+
+ spool_enum_hdrcache(hdrs, &write_cachehdr, httpd_out);
+
+ if (!body || !(len = buf_len(body))) {
+	/* Empty body -- use payload headers from response, if any */
+	const char **hdr;
+
+	if (!flags->ver1_0 &&
+	 (hdr = spool_getheader(hdrs, "Transfer-Encoding"))) {
+	 prot_printf(httpd_out, "Transfer-Encoding: %s\r\n", hdr0);
+	 if ((hdr = spool_getheader(hdrs, "Trailer"))) {
+		prot_printf(httpd_out, "Trailer: %s\r\n", hdr0);
+	 }
+	}
+	else if ((hdr = spool_getheader(hdrs, "Content-Length"))) {
+	 prot_printf(httpd_out, "Content-Length: %s\r\n", hdr0);
+	}
+
+	prot_puts(httpd_out, "\r\n");
+ }
+ else {
+	/* Body is buffered, so send using "identity" TE */
+	prot_printf(httpd_out, "Content-Length: %lu\r\n\r\n", len);
+	prot_putbuf(httpd_out, body);
+ }
+}
+
+
+/* Proxy (pipe) a chunk of body data to a client/server. */
+static unsigned pipe_chunk(struct protstream *pin, struct protstream *pout,
+			 unsigned len)
+{
+ char bufPROT_BUFSIZE;
+ unsigned n = 0;
+
+ /* Read 'len' octets */
+ for (; len; len -= n) {
+	n = prot_read(pin, buf, MIN(len, PROT_BUFSIZE));
+	if (!n) break;
+
+	prot_write(pout, buf, n);
+ }
+
+ return n;
+}
+
+
+/* Proxy (pipe) a response body to a client/server. */
+static int pipe_resp_body(struct protstream *pin, struct protstream *pout,
+			 hdrcache_t resp_hdrs, struct body_t *resp_body,
+			 int ver1_0, const char **errstr)
+{
+ char bufPROT_BUFSIZE;
+
+ if (resp_body->framing == FRAMING_UNKNOWN) {
+	/* Get message framing */
+	int r = parse_framing(resp_hdrs, resp_body, errstr);
+	if (r) return r;
+ }
+ 
+ /* Read and pipe the body */
+ switch (resp_body->framing) {
+ case FRAMING_LENGTH:
+	/* Read 'len' octets */
+	if (!pipe_chunk(pin, pout, resp_body->len)) {
+	 syslog(LOG_ERR, "prot_read() error");
+	 *errstr = "Unable to read body data";
+	 return HTTP_BAD_GATEWAY;
+	}
+	break;
+
+ case FRAMING_CHUNKED: {
+	unsigned chunk;
+	char *c;
+
+	/* Read chunks until last-chunk (zero chunk-size) */
+	do {
+	 /* Read chunk-size */
+	 prot_NONBLOCK(pin);
+	 c = prot_fgets(buf, PROT_BUFSIZE, pin);
+	 prot_BLOCK(pin);
+	 if (!c) {
+		prot_flush(pout);
+		c = prot_fgets(buf, PROT_BUFSIZE, pin);
+	 }
+	 if (!c || sscanf(buf, "%x", &chunk) != 1) {
+		*errstr = "Unable to read chunk size";
+		return HTTP_BAD_GATEWAY;
+
+		/* XXX Do we need to parse chunk-ext? */
+	 }
+	 else if (chunk > resp_body->max - resp_body->len)
+		return HTTP_TOO_LARGE;
+	 else if (!ver1_0) prot_puts(pout, buf);
+
+	 if (chunk) {
+		/* Read 'chunk' octets */
+		if (!pipe_chunk(pin, pout, chunk)) {
+		 syslog(LOG_ERR, "prot_read() error");
+		 *errstr = "Unable to read chunk data";
+		 return HTTP_BAD_GATEWAY;
+		}
+	 }
+	 else {
+		/* Read any trailing headers */
+		for (*c = prot_ungetc(prot_getc(pin), pin);
+		 *c != '\r' && *c != '\n';
+		 *c = prot_ungetc(prot_getc(pin), pin)) {
+		 if (!prot_fgets(buf, sizeof(buf), pin)) {
+			*errstr = "Error reading trailer";
+			return HTTP_BAD_GATEWAY;
+		 }
+		 else if (!ver1_0) prot_puts(pout, buf);
+		}
+	 }
+	 
+
+	 /* Read CRLF terminating the chunk/trailer */
+	 if (!prot_fgets(buf, sizeof(buf), pin)) {
+		*errstr = "Missing CRLF following chunk/trailer";
+		return HTTP_BAD_GATEWAY;
+	 }
+	 else if (!ver1_0) prot_puts(pout, buf);
+
+	} while (chunk);
+
+	break;
+ }
+
+ case FRAMING_CLOSE:
+	/* Read until EOF */
+	if (pipe_chunk(pin, pout, UINT_MAX) || !pin->eof)
+	 return HTTP_BAD_GATEWAY;
+
+	break;
+
+ default:
+	/* XXX Should never get here */
+	*errstr = "Unknown length of body data";
+	return HTTP_BAD_GATEWAY;
+ }
+
+ return 0;
+}
+
+
+
+/* Proxy (pipe) a client-request/server-response to/from a backend. */
+EXPORTED int http_pipe_req_resp(struct backend *be, struct transaction_t *txn)
+{
+ int r = 0, sent_body = 0;
+ xmlChar *uri;
+ unsigned code;
+ const char *statline;
+ hdrcache_t resp_hdrs = NULL;
+ struct body_t resp_body;
+
+ /*
+ * Send client request to backend:
+ *
+ * - Piece the Request Line back together
+ * - Add/append-to Via: header
+ * - Add Expect:100-continue header (for synchonicity)
+ * - Use all cached end-to-end headers from client
+ * - Body will be sent using "chunked" TE, since we might not have it yet
+ */
+ uri = xmlURIEscapeStr(BAD_CAST txn->req_uri->path, BAD_CAST "/");
+ prot_printf(be->out, "%s %s", txn->req_line.meth, uri);
+ free(uri);
+ if (URI_QUERY(txn->req_uri)) {
+	prot_printf(be->out, "?%s", URI_QUERY(txn->req_uri));
+ }
+ prot_printf(be->out, " %s\r\n", HTTP_VERSION);
+ prot_printf(be->out, "Host: %s\r\n", be->hostname);
+ write_forwarding_hdrs(be->out, txn->req_hdrs, txn->req_line.ver,
+			 https ? "https" : "http");
+ spool_enum_hdrcache(txn->req_hdrs, &write_cachehdr, be->out);
+ if (http_methodstxn->meth.flags & METH_NOBODY)
+	prot_puts(be->out, "Content-Length: 0\r\n");
+ else if (spool_getheader(txn->req_hdrs, "Transfer-Encoding") ||
+	spool_getheader(txn->req_hdrs, "Content-Length")) {
+	prot_puts(be->out, "Expect: 100-continue\r\n");
+	prot_puts(be->out, "Transfer-Encoding: chunked\r\n");
+ }
+ prot_puts(be->out, "\r\n");
+ prot_flush(be->out);
+
+ /* Read response(s) from backend until final response or error */
+ memset(&resp_body, 0, sizeof(struct body_t));
+ resp_body.flags = BODY_DONE; /* Don't read body, we want to pipe it */
+
+ do {
+	r = http_read_response(be, txn->meth, &code, &statline,
+			 &resp_hdrs, &resp_body, &txn->error.desc);
+	if (r) break;
+
+	if (code == 100) { /* Continue */
+	 if (!sent_body++) {
+		unsigned len;
+
+		/* Read body from client */
+		r = read_body(httpd_in, txn->req_hdrs, &txn->req_body,
+			 &txn->error.desc);
+		if (r) {
+		 /* Couldn't get the body and can't finish request */
+		 txn->flags.conn = CONN_CLOSE;
+		 break;
+		}
+
+		/* Send single-chunk body to backend to complete the request */
+		if ((len = buf_len(&txn->req_body.payload))) {
+		 prot_printf(be->out, "%x\r\n", len);
+		 prot_putbuf(be->out, &txn->req_body.payload);
+		 prot_puts(be->out, "\r\n");
+		}
+		prot_puts(be->out, "0\r\n\r\n");
+		prot_flush(be->out);
+	 }
+	 else {
+		prot_puts(httpd_out, statline);
+		spool_enum_hdrcache(resp_hdrs, &write_cachehdr, httpd_out);
+		prot_puts(httpd_out, "\r\n");
+		prot_flush(httpd_out);
+	 }
+	}
+ } while (code < 200);
+
+ if (!r) {
+	/* Send response to client */
+	send_response(statline, resp_hdrs, NULL, &txn->flags);
+ 
+	/* Not expecting a body for 204/304 response or any HEAD response */
+	switch (code) {
+	case 204: /* No Content */
+	case 304: /* Not Modified */
+	 break;
+
+	default:
+	 if (txn->meth == METH_HEAD) break;
+
+	 r = pipe_resp_body(be->in, httpd_out, resp_hdrs, &resp_body,
+			 txn->flags.ver1_0, &txn->error.desc);
+	}
+ }
+
+ if (r || (resp_body.flags & BODY_CLOSE)) proxy_downserver(be);
+
+ if (resp_hdrs) spool_free_hdrcache(resp_hdrs);
+
+ return r;
+}
+
+
+/*
+ * Proxy a COPY/MOVE client-request when the source and destination are
+ * on different backends. This is handled as a GET from the source and
+ * PUT on the destination, while obeying any Overwrite header.
+ *
+ * XXX This function currently buffers the response headers and body.
+ * Should work on sending them to the client on-the-fly.
+ */
+EXPORTED int http_proxy_copy(struct backend *src_be, struct backend *dest_be,
+		 struct transaction_t *txn)
+{
+ int r = 0;
+ unsigned code;
+ char *etag = NULL, *lastmod = NULL;;
+ const char **hdr, *statline;
+ hdrcache_t resp_hdrs = NULL;
+ struct body_t resp_body;
+
+ /*
+ * Send a GET request to source backend to fetch body:
+ *
+ * - Use any relevant conditional headers specified by client
+ */
+ prot_printf(src_be->out, "GET %s %s\r\n", txn->req_tgt.path, HTTP_VERSION);
+ prot_printf(src_be->out, "Host: %s\r\n", src_be->hostname);
+ prot_printf(src_be->out, "User-Agent: %s\r\n", buf_cstring(&serverinfo));
+ if ((hdr = spool_getheader(txn->req_hdrs, "If")))
+	prot_printf(src_be->out, "If: %s\r\n", hdr0);
+ if ((hdr = spool_getheader(txn->req_hdrs, "If-Match"))) {
+	for (; *hdr; hdr++) prot_printf(src_be->out, "If-Match: %s\r\n", *hdr);
+ }
+ if ((hdr = spool_getheader(txn->req_hdrs, "If-Unmodified-Since")))
+	prot_printf(src_be->out, "If-Unmodified-Since: %s\r\n", hdr0);
+ prot_puts(src_be->out, "\r\n");
+ prot_flush(src_be->out);
+
+ /* Read response(s) from source backend until final response or error */
+ resp_body.flags = 0;
+ resp_body.payload = txn->resp_body.payload;
+
+ do {
+	r = http_read_response(src_be, METH_GET, &code, &statline,
+			 &resp_hdrs, &resp_body, &txn->error.desc);
+	if (r || (resp_body.flags & BODY_CLOSE)) {
+	 proxy_downserver(src_be);
+	 break;
+	}
+ } while (code < 200);
+
+ if (!r && (code == 200)) { /* OK */
+	int sent_body = 0;
+
+	/* For MOVE, make a copy of the ETag or Last-Modified for later use */
+	if (txn->meth == METH_MOVE) {
+	 if ((hdr = spool_getheader(resp_hdrs, "ETag")))
+		etag = xstrdup(hdr0);
+	 else if ((hdr = spool_getheader(resp_hdrs, "Last-Modified")))
+		lastmod = xstrdup(hdr0);
+	}
+
+	/*
+	 * Send a synchonizing PUT request to dest backend:
+	 *
+	 * - Add Expect:100-continue header (for synchonicity)
+	 * - Use any Prefer headers specified by client
+	 * - Obey Overwrite:F by adding If-None-Match:* header
+	 * - Use Content-Type, -Encoding, -Language and -Length from GET resp
+	 * - Body is buffered, so send using "identity" TE
+	 */
+	hdr = spool_getheader(txn->req_hdrs, "Destination");
+	prot_printf(dest_be->out, "PUT %s %s\r\n", hdr0, HTTP_VERSION);
+	prot_printf(dest_be->out, "Host: %s\r\n", dest_be->hostname);
+	prot_printf(dest_be->out, "User-Agent: %s\r\n",
+		 buf_cstring(&serverinfo));
+	prot_puts(dest_be->out, "Expect: 100-continue\r\n");
+	if ((hdr = spool_getheader(txn->req_hdrs, "Prefer"))) {
+	 for (; *hdr; hdr++)
+		prot_printf(dest_be->out, "Prefer: %s\r\n", *hdr);
+	}
+	if ((hdr = spool_getheader(txn->req_hdrs, "Overwrite")) &&
+	 !strcmp(hdr0, "F")) {
+	 prot_printf(dest_be->out, "If-None-Match: *\r\n");
+	}
+	hdr = spool_getheader(resp_hdrs, "Content-Type");
+	prot_printf(dest_be->out, "Content-Type: %s\r\n", hdr0);
+	if ((hdr = spool_getheader(resp_hdrs, "Content-Encoding")))
+	 prot_printf(dest_be->out, "Content-Encoding: %s\r\n", hdr0);
+	if ((hdr = spool_getheader(resp_hdrs, "Content-Language")))
+	 prot_printf(dest_be->out, "Content-Language: %s\r\n", hdr0);
+	prot_printf(dest_be->out, "Content-Length: %u\r\n",
+		 (unsigned)buf_len(&resp_body.payload));
+	prot_puts(dest_be->out, "\r\n");
+	prot_flush(dest_be->out);
+
+	/* Read response(s) from dest backend until final response or error */
+	resp_body.flags = 0;
+
+	do {
+	 r = http_read_response(dest_be, METH_PUT, &code, &statline,
+				 &resp_hdrs, &resp_body, &txn->error.desc);
+	 if (r || (resp_body.flags & BODY_CLOSE)) {
+		proxy_downserver(dest_be);
+		break;
+	 }
+
+	 if ((code == 100) /* Continue */ && !sent_body++) {
+		/* Send body to dest backend to complete the PUT */
+		prot_putbuf(dest_be->out, &resp_body.payload);
+		prot_flush(dest_be->out);
+	 }
+	} while (code < 200);
+ }
+
+ txn->resp_body.payload = resp_body.payload;
+
+ if (!r) {
+	/* Send response to client */
+	send_response(statline, resp_hdrs, &resp_body.payload, &txn->flags);
+
+	if ((txn->meth == METH_MOVE) && (code < 300)) {
+	 /*
+	 * Send a DELETE request to source backend:
+	 *
+	 * - Add If-Match header with ETag from GET
+	 * - Add If-Unmodified-Since header with Last-Modified from GET
+	 *
+	 * XXX This clearly isn't an atomic MOVE.
+	 * Either try to fix this (LOCK?), or don't allow MOVE
+	 */
+	 prot_printf(src_be->out, "DELETE %s %s\r\n",
+			txn->req_tgt.path, HTTP_VERSION);
+	 prot_printf(src_be->out, "Host: %s\r\n", src_be->hostname);
+	 prot_printf(src_be->out, "User-Agent: %s\r\n",
+			buf_cstring(&serverinfo));
+	 if (etag) prot_printf(src_be->out, "If-Match: %s\r\n", etag);
+	 else if (lastmod) prot_printf(src_be->out,
+					 "If-Unmodified-Since: %s\r\n",
+					 lastmod);
+	 prot_puts(src_be->out, "\r\n");
+	 prot_flush(src_be->out);
+
+	 /* Read response(s) from source backend until final resp or error */
+	 resp_body.flags = BODY_DISCARD;
+
+	 do {
+		if (http_read_response(src_be, METH_DELETE, &code, NULL,
+				 &resp_hdrs, &resp_body, &txn->error.desc)
+		 || (resp_body.flags & BODY_CLOSE)) {
+		 proxy_downserver(src_be);
+		 break;
+		}
+	 } while (code < 200);
+	}
+ }
+
+ if (resp_hdrs) spool_free_hdrcache(resp_hdrs);
+ if (etag) free(etag);
+ if (lastmod) free(lastmod);
+
+ return r;
+}

cyrus-imapd-2.5.tar.gz/imap/http_proxy.h Added

@@ -0,0 +1,62 @@
+/* http_proxy.h - HTTP proxy support functions
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef _HTTP_PROXY_H
+#define _HTTP_PROXY_H
+
+#include "backend.h"
+
+
+extern struct protocol_t http_protocol;
+
+extern int http_mlookup(const char *name, mbentry_t **mbentryp, void *tid);
+extern void http_proto_host(hdrcache_t req_hdrs,
+			    const char **proto, const char **host);
+extern int http_pipe_req_resp(struct backend *be, struct transaction_t *txn);
+extern int http_proxy_copy(struct backend *src_be, struct backend *dest_be,
+			   struct transaction_t *txn);
+extern int http_read_response(struct backend *be, unsigned meth, unsigned *code,
+			      const char **statline, hdrcache_t *hdrs,
+			      struct body_t *body, const char **errstr);
+
+#endif /* _HTTP_PROXY_H */

cyrus-imapd-2.5.tar.gz/imap/http_rss.c Added

@@ -0,0 +1,1325 @@
+/* http_rss.c -- Routines for handling RSS feeds of mailboxes in httpd
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <ctype.h>
+#include <string.h>
+#include <syslog.h>
+#include <assert.h>
+
+#include "acl.h"
+#include "annotate.h"
+#include "charset.h"
+#include "global.h"
+#include "httpd.h"
+#include "http_err.h"
+#include "http_proxy.h"
+#include "imap_err.h"
+#include "mailbox.h"
+#include "map.h"
+#include "mboxlist.h"
+#include "message.h"
+#include "parseaddr.h"
+#include "proxy.h"
+#include "times.h"
+#include "seen.h"
+#include "tok.h"
+#include "util.h"
+#include "version.h"
+#include "wildmat.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+
+#define XML_NS_ATOM	"http://www.w3.org/2005/Atom"
+#define XML_NS_CYRUS	"http://cyrusimap.org/ns/"
+#define MAX_SECTION_LEN	128
+#define FEEDLIST_VAR	"%RSS_FEEDLIST%"
+
+static const char def_template =
+ HTML_DOCTYPE
+ "<html>\n<head>\n<title>Cyrus RSS Feeds</title>\n</head>\n"
+ "<body>\n<h2>Cyrus RSS Feeds</h2>\n"
+ FEEDLIST_VAR
+ "</body>\n</html>\n";
+
+static time_t compile_time;
+static void rss_init(struct buf *serverinfo);
+static int meth_get(struct transaction_t *txn, void *params);
+static int rss_parse_path(const char *path,
+			 struct request_target_t *tgt, const char **errstr);
+static int is_feed(const char *mbox);
+static int list_feeds(struct transaction_t *txn);
+static int fetch_message(struct transaction_t *txn, struct mailbox *mailbox,
+			 unsigned recno, uint32_t uid,
+			 struct index_record *record, struct body **body,
+			 struct buf *msg_buf);
+static int list_messages(struct transaction_t *txn, struct mailbox *mailbox);
+static void display_message(struct transaction_t *txn,
+			 const char *mboxname, const struct index_record *record,
+			 struct body *body, const struct buf *msg_buf);
+static void fetch_part(struct transaction_t *txn, struct body *body,
+		 const char *findsection, const char *cursection,
+		 struct buf *msg_buf);
+
+
+/* Namespace for RSS feeds of mailboxes */
+struct namespace_t namespace_rss = {
+ URL_NS_RSS, 0, "/rss", NULL, 1 /* auth */, ALLOW_READ,
+ rss_init, NULL, NULL, NULL,
+ {
+	{ NULL,			NULL },			/* ACL		*/
+	{ NULL,			NULL },			/* COPY		*/
+	{ NULL,			NULL },			/* DELETE	*/
+	{ &meth_get,		NULL },			/* GET		*/
+	{ &meth_get,		NULL },			/* HEAD		*/
+	{ NULL,			NULL },			/* LOCK		*/
+	{ NULL,			NULL },			/* MKCALENDAR	*/
+	{ NULL,			NULL },			/* MKCOL	*/
+	{ NULL,			NULL },			/* MOVE		*/
+	{ &meth_options,	&rss_parse_path },	/* OPTIONS	*/
+	{ NULL,			NULL },			/* POST		*/
+	{ NULL,			NULL },			/* PROPFIND	*/
+	{ NULL,			NULL },			/* PROPPATCH	*/
+	{ NULL,			NULL },			/* PUT		*/
+	{ NULL,			NULL },			/* REPORT	*/
+	{ &meth_trace,		&rss_parse_path },	/* TRACE	*/
+	{ NULL,			NULL }			/* UNLOCK	*/
+ }
+};
+
+
+static void rss_init(struct buf *serverinfo __attribute__((unused)))
+{
+ namespace_rss.enabled = config_httpmodules & IMAP_ENUM_HTTPMODULES_RSS;
+
+ if (!namespace_rss.enabled) return;
+
+ compile_time = calc_compile_time(__TIME__, __DATE__);
+}
+
+/* Perform a GET/HEAD request */
+static int meth_get(struct transaction_t *txn,
+		 void *params __attribute__((unused)))
+{
+ int ret = 0, r;
+ char sectionMAX_SECTION_LEN+1 = "";
+ uint32_t uid = 0;
+ struct mailbox *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
+
+ /* Construct mailbox name corresponding to request target URI */
+ if ((r = rss_parse_path(txn->req_uri->path,
+			 &txn->req_tgt, &txn->error.desc))) {
+	txn->error.desc = error_message(r);
+	return HTTP_NOT_FOUND;
+ }
+
+ /* If no mailboxname, list all available feeds */
+ if (!*txn->req_tgt.mboxname) return list_feeds(txn);
+
+ /* Make sure its a mailbox that we are treating as an RSS feed */
+ if (!is_feed(txn->req_tgt.mboxname)) return HTTP_NOT_FOUND;
+
+ /* Locate the mailbox */
+ r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+ if (r) {
+	syslog(LOG_ERR, "mlookup(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ if (mbentry->server) {
+	/* Remote mailbox */
+	struct backend *be;
+
+	be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+			 &backend_cached, NULL, NULL, httpd_in);
+	mboxlist_entry_free(&mbentry);
+	if (!be) return HTTP_UNAVAILABLE;
+
+	return http_pipe_req_resp(be, txn);
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ /* Local Mailbox */
+
+ /* Open mailbox for reading */
+ if ((r = http_mailbox_open(txn->req_tgt.mboxname, &mailbox, LOCK_SHARED))) {
+	syslog(LOG_ERR, "http_mailbox_open(%s) failed: %s",
+	 txn->req_tgt.mboxname, error_message(r));
+	txn->error.desc = error_message(r);
+
+	switch (r) {
+	case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+	case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+	default: return HTTP_SERVER_ERROR;
+	}
+ }
+
+ /* Parse query params, if any */
+ if (URI_QUERY(txn->req_uri) &&
+	!strncasecmp(URI_QUERY(txn->req_uri), "uid=", 4)) {
+	/* UID */
+	char *end;
+
+	uid = strtoul(URI_QUERY(txn->req_uri)+4, &end, 10);
+	if (!uid) uid = -1;
+
+	if (!strncasecmp(end, ";section=", 9)) {
+	 /* SECTION */
+	 strlcpy(section, end+9, MAX_SECTION_LEN);
+	}
+ }
+
+ /* If no UID specified, list messages as an RSS feed */
+ if (!uid) ret = list_messages(txn, mailbox);
+ else if (uid > mailbox->i.last_uid) {
+	txn->error.desc = "Message does not exist\r\n";
+	ret = HTTP_NOT_FOUND;
+ }
+ else {
+	struct index_record record;
+	struct buf msg_buf = BUF_INITIALIZER;
+	struct body *body = NULL;
+
+	/* Fetch the message */
+	if (!(ret = fetch_message(txn, mailbox, 0, uid,
+				 &record, &body, &msg_buf))) {
+	 int precond;
+	 const char *etag = NULL;
+	 time_t lastmod = 0;
+	 struct resp_body_t *resp_body = &txn->resp_body;
+
+	 /* Check any preconditions */
+	 if (!strcmp(section, "0")) {
+		/* Entire raw message */
+		txn->flags.ranges = 1;
+	 }
+
+	 etag = message_guid_encode(&record.guid);
+	 lastmod = record.internaldate;
+	 precond = check_precond(txn, NULL, etag, lastmod);
+
+	 switch (precond) {
+	 case HTTP_OK:
+	 case HTTP_PARTIAL:
+	 case HTTP_NOT_MODIFIED:
+		/* Fill in ETag, Last-Modified, and Expires */
+		resp_body->etag = etag;
+		resp_body->lastmod = lastmod;
+		resp_body->maxage = 31536000; /* 1 year */
+		txn->flags.cc |= CC_MAXAGE;
+
+		if (precond != HTTP_NOT_MODIFIED) break;
+
+	 default:
+		/* We failed a precondition - don't perform the request */
+		ret = precond;
+		goto done;
+	 }
+
+	 if (!*section) {
+		/* Return entire message formatted as text/html */
+		display_message(txn, mailbox->name, &record, body, &msg_buf);
+	 }
+	 else if (!strcmp(section, "0")) {
+		/* Return entire message as text/plain */
+		resp_body->type = "text/plain";
+		write_body(precond, txn, buf_base(&msg_buf), buf_len(&msg_buf));
+	 }
+	 else {
+		/* Fetch, decode, and return the specified MIME message part */
+		fetch_part(txn, body, section, "1", &msg_buf);
+	 }
+
+	 done:
+	 buf_free(&msg_buf);
+
+	 if (body) {
+		message_free_body(body);
+		free(body);
+	 }
+	}
+ }
+
+ if (mailbox) mailbox_unlock_index(mailbox, NULL);
+
+ return ret;
+
+}
+
+
+/* Create a mailbox name from the request URL */ 
+static int rss_parse_path(const char *path,
+			 struct request_target_t *tgt,
+			 const char **errstr __attribute__((unused)))
+{
+ const char *start, *end;
+ size_t len;
+
+ /* Clip off RSS prefix */
+ start = path + strlen("/rss");
+ if (*start == '/') start++;
+ end = start + strlen(start);
+
+ if ((end > start) && (end-1 == '/')) end--;
+
+ len = end - start;
+ if (len > MAX_MAILBOX_BUFFER) return IMAP_MAILBOX_BADNAME;
+
+ strncpy(tgt->mboxname, start, len);
+ tgt->mboxnamelen = '\0';
+
+ mboxname_hiersep_tointernal(&httpd_namespace, tgt->mboxname, len);
+
+ return 0;
+}
+
+
+/*
+ * Checks to make sure that the given mailbox is actually something
+ * that we're treating as an RSS feed. Returns 1 if yes, 0 if no.
+ */
+static int is_feed(const char *mbox)
+{
+ static struct wildmat *feeds = NULL;
+ struct wildmat *wild;
+
+ if (!feeds) {
+	feeds = split_wildmats((char *) config_getstring(IMAPOPT_RSS_FEEDS),
+			 NULL);
+ }
+
+ /* check mailbox against the 'rss_feeds' wildmat */
+ wild = feeds;
+ while (wild->pat && wildmat(mbox, wild->pat) != 1) wild++;
+
+ /* if we don't have a match, or its a negative match, don't use it */
+ if (!wild->pat || wild->not) return 0;
+
+ /* otherwise, its usable */
+ return 1;
+}
+ 
+
+/*
+ * mboxlist_findall() callback function to list RSS feeds as a tree
+ */
+struct node {
+ char nameMAX_MAILBOX_BUFFER;
+ size_t len;
+ struct node *parent;
+ struct node *child;
+};
+
+struct list_rock {
+ struct transaction_t *txn;
+ struct node *last;
+};
+
+static int list_cb(char *name, int matchlen, int maycreate, void *rock)
+{
+ struct list_rock *lrock = (struct list_rock *) rock;
+ struct node *last = lrock->last;
+ struct buf *buf = &lrock->txn->resp_body.payload;
+
+ if (name) {
+	mbentry_t *mbentry = NULL;
+	int r;
+
+	/* Don't list mailboxes that we don't treat as RSS feeds */
+	if (!is_feed(name)) return 0;
+
+	/* Don't list deleted mailboxes */
+	if (mboxname_isdeletedmailbox(name, NULL)) return 0;
+
+	/* Lookup the mailbox and make sure its readable */
+	r = http_mlookup(name, &mbentry, NULL);
+	if (r || !mbentry->acl || !(cyrus_acl_myrights(httpd_authstate, mbentry->acl) & ACL_READ)) {
+	 mboxlist_entry_free(&mbentry);
+	 return 0;
+	}
+	mboxlist_entry_free(&mbentry);
+ }
+
+ if (name &&
+	!strncmp(name, last->name, last->len) &&
+	(!last->len || (namelast->len == '.'))) {
+	/* Found closest ancestor of 'name' */
+	struct node *node;
+	size_t len = matchlen;
+	char shortnameMAX_MAILBOX_NAME+1, pathMAX_MAILBOX_PATH+1;
+	char *cp, *href = NULL;
+
+	/* Send a body chunk once in a while */
+	if (buf_len(buf) > PROT_BUFSIZE) {
+	 write_body(0, lrock->txn, buf_cstring(buf), buf_len(buf));
+	 buf_reset(buf);
+	}
+
+	if (last->child) {
+	 /* Reuse our sibling */
+	 buf_printf(buf, "</li>\n");
+	 node = last->child;
+	}
+	else {
+	 /* Create first child */
+	 buf_printf(buf, "\n<ul%s>\n",
+		 last->parent ? "" : " id='feed'"); /* needed by CSS */
+	 node = xmalloc(sizeof(struct node));
+	}
+
+	/* See if we have a missing ancestor in the tree */
+	if ((cp = strchr(&namelast->len+1, '.'))) len = cp - name;
+	else href = path;
+
+	/* Populate new/updated node */
+	strncpy(node->name, name, len);
+	node->namelen = '\0';
+	node->len = len;
+	node->parent = last;
+	node->child = NULL;
+	lrock->last = last->child = node;
+
+	/* Get last segment of mailbox name */
+	if ((cp = strrchr(node->name, '.'))) cp++;
+	else cp = node->name;
+
+	/* Translate short mailbox name to external form */
+	strlcpy(shortname, cp, sizeof(shortname));
+	mboxname_hiersep_toexternal(&httpd_namespace, shortname, 0);
+
+	if (href) {
+	 /* Add selectable feed with link */
+	 snprintf(path, sizeof(path), ".rss.%s", node->name);
+	 mboxname_hiersep_toexternal(&httpd_namespace, href, 0);
+	 buf_printf(buf, "<li><a href=\"%s\">%s</a>",
+		 href, shortname);
+	}
+	else {
+	 /* Add missing ancestor and recurse down the tree */
+	 buf_printf(buf, "<li>%s", shortname);
+
+	 list_cb(name, matchlen, maycreate, rock);
+	}
+ }
+ else {
+	/* Remove child */
+	if (last->child) {
+	 buf_printf(buf, "</li>\n</ul>\n");
+	 free(last->child);
+	 last->child = NULL;
+	}
+
+	if (last->parent) {
+	 /* Recurse back up the tree */
+	 lrock->last = last->parent;
+	 list_cb(name, matchlen, maycreate, rock);
+	}
+ }
+
+ return 0;
+}
+
+
+/* Create a HTML document listing all RSS feeds available to the user */
+static int list_feeds(struct transaction_t *txn)
+{
+ const char *template_file = config_getstring(IMAPOPT_RSS_FEEDLIST_TEMPLATE);
+ const char *var = NULL, *template = NULL, *prefix, *suffix;
+ unsigned long template_len = 0, prefix_len, suffix_len;
+ size_t varlen = strlen(FEEDLIST_VAR);
+ int fd = -1;
+ struct message_guid guid;
+ time_t lastmod;
+ char mboxlistMAX_MAILBOX_PATH+1;
+ struct stat sbuf;
+ int ret = 0, precond;
+ struct buf *body = &txn->resp_body.payload;
+ struct list_rock lrock;
+ struct node root = { "", 0, NULL, NULL };
+
+ if (template_file) {
+	/* See if template exists and contains feedlist variable */
+	if (!stat(template_file, &sbuf) && S_ISREG(sbuf.st_mode) &&
+	 (size_t) sbuf.st_size >= varlen &&
+	 (fd = open(template_file, O_RDONLY)) != -1) {
+	 const char *p;
+	 unsigned long len;
+
+	 map_refresh(fd, 1, &template, &template_len, sbuf.st_size,
+			template_file, NULL);
+
+	 for (p = template, len = template_len;
+		 len >= varlen && strncmp(p, FEEDLIST_VAR, varlen); p++, len--);
+	 if (len >= varlen) {
+		var = p;
+		lastmod = sbuf.st_mtime;
+	 }
+	 else {
+		map_free(&template, &template_len);
+		close(fd);
+		fd = -1;
+	 }
+	}
+ }
+
+ if (!var) {
+	/* No usable template specified, use our default */
+	template = def_template;
+	template_len = strlen(def_template);
+	var = strstr(template, FEEDLIST_VAR);
+	lastmod = compile_time;
+ }
+
+ prefix = template;
+ prefix_len = var - template;
+ suffix = template + prefix_len + varlen;
+ suffix_len = template_len - (prefix_len + varlen);
+
+ /* Begin to generate ETag */
+ message_guid_generate(&guid, template, template_len);
+ buf_setcstr(&txn->buf, message_guid_encode(&guid));
+
+ /* stat() mailboxes.db for Last-Modified and ETag */
+ snprintf(mboxlist, MAX_MAILBOX_PATH, "%s%s", config_dir, FNAME_MBOXLIST);
+ stat(mboxlist, &sbuf);
+ lastmod = MAX(lastmod, sbuf.st_mtime);
+ buf_printf(&txn->buf, "-%ld-%ld", sbuf.st_mtime, sbuf.st_size);
+
+ /* stat() imapd.conf for Last-Modified and ETag */
+ stat(config_filename, &sbuf);
+ lastmod = MAX(lastmod, sbuf.st_mtime);
+ buf_printf(&txn->buf, "-%ld-%ld", sbuf.st_mtime, sbuf.st_size);
+
+ /* Check any preconditions */
+ precond = check_precond(txn, NULL, buf_cstring(&txn->buf), lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, and Expires */
+	txn->resp_body.etag = buf_cstring(&txn->buf);
+	txn->resp_body.lastmod = lastmod;
+	txn->resp_body.maxage = 86400; /* 24 hrs */
+	txn->flags.cc |= CC_MAXAGE;
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	ret = precond;
+	goto done;
+ }
+
+ /* Setup for chunked response */
+ txn->flags.te |= TE_CHUNKED;
+ txn->resp_body.type = "text/html; charset=utf-8";
+
+ /* Short-circuit for HEAD request */
+ if (txn->meth == METH_HEAD) {
+	response_header(HTTP_OK, txn);
+	goto done;
+ }
+
+ /* Send beginning of template */
+ write_body(HTTP_OK, txn, prefix, prefix_len);
+
+ /* Generate tree view of feeds */
+ buf_reset(body);
+ lrock.txn = txn;
+ lrock.last = &root;
+ mboxlist_findall(NULL, "*", httpd_userisadmin, NULL, httpd_authstate,
+		 list_cb, &lrock);
+
+ /* Close out the tree */
+ list_cb(NULL, 0, 0, &lrock);
+ if (buf_len(body)) write_body(0, txn, buf_cstring(body), buf_len(body));
+
+ /* Send rest of template */
+ if (suffix_len) write_body(0, txn, suffix, suffix_len);
+
+ /* End of output */
+ write_body(0, txn, NULL, 0);
+
+ done:
+ if (fd != -1) {
+	map_free(&template, &template_len);
+	close(fd);
+ }
+
+ return ret;
+}
+
+
+/* Fetch the index record & bodystructure, and mmap the message */
+static int fetch_message(struct transaction_t *txn, struct mailbox *mailbox,
+			 unsigned recno, uint32_t uid,
+			 struct index_record *record, struct body **body,
+			 struct buf *msg_buf)
+{
+ int r;
+
+ buf_reset(msg_buf);
+
+ /* Fetch index record for the message */
+ if (uid) r = mailbox_find_index_record(mailbox, uid, record, NULL);
+ else r = mailbox_read_index_record(mailbox, recno, record);
+ if ((r == CYRUSDB_NOTFOUND) ||
+	(record->system_flags & (FLAG_DELETED|FLAG_EXPUNGED))) {
+	txn->error.desc = "Message has been removed\r\n";
+
+	/* Fill in Expires */
+	txn->resp_body.maxage = 31536000; /* 1 year */
+	txn->flags.cc |= CC_MAXAGE;
+	return HTTP_GONE;
+ }
+ else if (r) {
+	syslog(LOG_ERR, "find index record failed");
+	txn->error.desc = error_message(r);
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Fetch cache record for the message */
+ if ((r = mailbox_cacherecord(mailbox, record))) {
+	syslog(LOG_ERR, "read cache failed");
+	txn->error.desc = error_message(r);
+	return HTTP_SERVER_ERROR;
+ }
+
+ /* Read message bodystructure */
+ message_read_bodystructure(record, body);
+
+ /* Map the message into memory */
+ mailbox_map_record(mailbox, record, msg_buf);
+
+ return 0;
+}
+
+
+static void buf_escapestr(struct buf *buf, const char *str, unsigned max,
+			 unsigned replace, unsigned level)
+{
+ const char *c;
+ unsigned buflen = buf_len(buf), len = 0;
+
+ if (!replace && config_httpprettytelemetry)
+	buf_printf(buf, "%*s", level * MARKUP_INDENT, "");
+
+ for (c = str; c && *c && (!max || len < max); c++, len++) {
+	/* Translate CR to HTML tag */
+	if (*c == '\r') buf_appendcstr(buf, " ");
+	else if (*c == '\n' && !config_httpprettytelemetry) continue;
+
+	/* Translate XML/HTML specials */
+	else if (*c == '"') buf_appendcstr(buf, "&quot;");
+//	else if (*c == '\'') buf_appendcstr(buf, "&apos;");
+	else if (*c == '&') buf_appendcstr(buf, "&amp;");
+	else if (*c == '<') buf_appendcstr(buf, "&lt;");
+	else if (*c == '>') buf_appendcstr(buf, "&gt;");
+
+	/* Handle multi-byte UTF-8 sequences */
+	else if ((*c & 0xc0) == 0xc0) {
+	 /* Code points larger than 127 are represented by
+	 * multi-byte sequences, composed of a leading byte and
+	 * one or more continuation bytes. The leading byte has
+	 * two or more high-order 1s followed by a 0, while
+	 * continuation bytes all have '10' in the high-order
+	 * position. The number of high-order 1s in the leading
+	 * byte of a multi-byte sequence indicates the number of
+	 * bytes in the sequence.
+	 */
+	 unsigned char lead = *c;
+
+	 do buf_putc(buf, *c);
+	 while (((lead <<= 1) & 0x80) && c++);
+	}
+
+	/* Check for non-printable chars */
+	else if (!(isspace(*c) || isprint(*c))) {
+	 if (replace) {
+		/* Replace entire string with a warning */
+		buf_truncate(buf, buflen);
+		buf_printf_markup(buf, level++, "<blockquote>");
+		buf_printf_markup(buf, level, "NOTE: "
+				 "This message contains characters "
+				 "that can not be displayed in RSS");
+		buf_printf_markup(buf, --level, "</blockquote>");
+		return;
+	 }
+	 else {
+		/* Translate non-printable chars to X */
+		buf_putc(buf, 'X');
+	 }
+	}
+
+	else buf_putc(buf, *c);
+ }
+
+ if (!replace && config_httpprettytelemetry) buf_appendcstr(buf, "\n");
+}
+
+/* List messages as an RSS feed */
+static int list_messages(struct transaction_t *txn, struct mailbox *mailbox)
+{
+ const char *proto = NULL, *host = NULL;
+ uint32_t url_len, recno, recentuid = 0;
+ int max_age, max_items, max_len, nitems, precond;
+ time_t age_mark = 0, lastmod;
+ char datestr80;
+ static char etag33;
+ struct buf *url = &txn->buf;
+ struct buf *buf = &txn->resp_body.payload;
+ unsigned level = 0;
+ char mboxnameMAX_MAILBOX_NAME+1;
+ struct buf attrib = BUF_INITIALIZER;
+
+ /* Check any preconditions */
+ lastmod = mailbox->i.last_appenddate;
+ sprintf(etag, "%u-%u-%u",
+	 mailbox->i.uidvalidity, mailbox->i.last_uid, mailbox->i.exists);
+ precond = check_precond(txn, NULL, etag, lastmod);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, and Expires */
+	txn->resp_body.etag = etag;
+	txn->resp_body.lastmod = lastmod;
+	txn->resp_body.maxage = 3600; /* 1 hr */
+	txn->flags.cc |= CC_MAXAGE;
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	return precond;
+ }
+
+ /* Setup for chunked response */
+ txn->flags.te |= TE_CHUNKED;
+ txn->resp_body.type = "application/atom+xml; charset=utf-8";
+
+ /* Short-circuit for HEAD request */
+ if (txn->meth == METH_HEAD) {
+	response_header(HTTP_OK, txn);
+	return 0;
+ }
+
+ /* Get maximum age of items to display */
+ max_age = config_getint(IMAPOPT_RSS_MAXAGE);
+ if (max_age > 0) age_mark = time(0) - (max_age * 60 * 60 * 24);
+
+ /* Get number of items to display */
+ max_items = config_getint(IMAPOPT_RSS_MAXITEMS);
+ if (max_items < 0) max_items = 0;
+
+ /* Get length of description to display */
+ max_len = config_getint(IMAPOPT_RSS_MAXSYNOPSIS);
+ if (max_len < 0) max_len = 0;
+
+#if 0
+ /* Obtain recentuid */
+ if (mailbox_internal_seen(mailbox, httpd_userid)) {
+	recentuid = mailbox->i.recentuid;
+ }
+ else if (httpd_userid) {
+	struct seen *seendb = NULL;
+	struct seendata sd;
+
+	r = seen_open(httpd_userid, SEEN_CREATE, &seendb);
+	if (!r) r = seen_read(seendb, mailbox->uniqueid, &sd);
+	seen_close(&seendb);
+
+	/* handle no seen DB gracefully */
+	if (r) {
+	 recentuid = mailbox->i.last_uid;
+	 syslog(LOG_ERR, "Could not open seen state for %s (%s)",
+		 httpd_userid, error_message(r));
+	}
+	else {
+	 recentuid = sd.lastuid;
+	 free(sd.seenuids);
+	}
+ }
+ else {
+	recentuid = mailbox->i.last_uid; /* nothing is recent! */
+ }
+#endif
+
+ /* Translate mailbox name to external form */
+ strlcpy(mboxname, mailbox->name, sizeof(mboxname));
+ mboxname_hiersep_toexternal(&httpd_namespace, mboxname, 0);
+
+ /* Construct base URL */
+ http_proto_host(txn->req_hdrs, &proto, &host);
+ assert(!buf_len(url));
+ buf_printf(url, "%s://%s%s", proto, host, txn->req_uri->path);
+ url_len = buf_len(url);
+
+ /* Start XML */
+ buf_reset(buf);
+ buf_printf_markup(buf, level, "<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+
+ /* Set up the Atom <feed> response for the mailbox */
+ buf_printf_markup(buf, level++,
+		 "<feed xmlns=\"" XML_NS_ATOM "\">");
+
+ /* <title> - required */
+ buf_printf_markup(buf, level, "<title>%s</title>", mboxname);
+
+ /* <id> - required */
+ buf_printf_markup(buf, level, "<id>%sguid/%s</id>",
+		 XML_NS_CYRUS, mailbox->uniqueid);
+
+ /* <updated> - required */
+ time_to_rfc3339(lastmod, datestr, sizeof(datestr));
+ buf_printf_markup(buf, level, "<updated>%s</updated>", datestr);
+
+ /* <author> - required (use 'Anonymous' as default <name>) */
+ buf_printf_markup(buf, level++, "<author>");
+ buf_printf_markup(buf, level, "<name>Anonymous</name>");
+ buf_printf_markup(buf, --level, "</author>");
+
+ /* <subtitle> - optional */
+ annotatemore_lookup(mailbox->name, "/comment", NULL, &attrib);
+ if (age_mark) {
+	time_to_rfc822(age_mark, datestr, sizeof(datestr));
+	buf_printf_markup(buf, level,
+			"<subtitle>%s posts since %s</subtitle>",
+			 buf_cstring(&attrib), datestr);
+ }
+ else {
+	buf_printf_markup(buf, level,
+			 "<subtitle>%s %u most recent posts</subtitle>",
+			 buf_cstring(&attrib),
+			 max_items ? (unsigned) max_items : mailbox->i.exists);
+ }
+
+ /* <link> - optional */
+ buf_printf_markup(buf, level,
+		 "<link rel=\"self\" type=\"application/atom+xml\""
+		 " href=\"%s\"/>", buf_cstring(url));
+
+ /* <generator> - optional */
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	buf_printf_markup(buf, level, "<generator>Cyrus HTTP %s</generator>",
+			 cyrus_version());
+ }
+
+ write_body(HTTP_OK, txn, buf_cstring(buf), buf_len(buf));
+ buf_reset(buf);
+
+ /* Add an <entry> for each message */
+ for (recno = mailbox->i.num_records, nitems = 0;
+	 recno >= 1 && (!max_items || nitems < max_items); recno--) {
+	struct index_record record;
+	struct buf msg_buf = BUF_INITIALIZER;
+	struct body *body = NULL;
+	char *subj;
+	struct address *addr = NULL;
+	const char *content_types = { "text", NULL };
+	struct message_content content;
+	struct bodypart **parts;
+
+	/* Send a body chunk once in a while */
+	if (buf_len(buf) > PROT_BUFSIZE) {
+	 write_body(0, txn, buf_cstring(buf), buf_len(buf));
+	 buf_reset(buf);
+	}
+
+	/* Fetch the message */
+	if (fetch_message(txn, mailbox, recno, 0,
+			 &record, &body, &msg_buf)) {
+	 continue;
+	}
+
+	/* XXX Are we going to do anything with \Recent? */
+	if (record.uid <= recentuid) {
+	 syslog(LOG_DEBUG, "recno %u not recent (%u/%u)",
+		 recno, record.uid, recentuid);
+	 continue;
+	}
+
+	/* Make sure the message is new enough */
+	if (record.gmtime < age_mark) continue;
+
+	/* Feeding this message, increment counter */
+	nitems++;
+
+	buf_printf_markup(buf, level++, "<entry>");
+
+	/* <title> - required */
+	subj = charset_parse_mimeheader(body->subject);
+	buf_printf_markup(buf, level++, "<title type=\"html\">");
+	buf_escapestr(buf, subj && *subj ? subj : "Untitled", 0, 0, level);
+	buf_printf_markup(buf, --level, "</title>");
+	free(subj);
+
+	/* <id> - required */
+	buf_printf_markup(buf, level, "<id>%sguid/%s</id>",
+			 XML_NS_CYRUS, message_guid_encode(&record.guid));
+
+	/* <updated> - required */
+	time_to_rfc3339(record.gmtime, datestr, sizeof(datestr));
+	buf_printf_markup(buf, level, "<updated>%s</updated>", datestr);
+
+	/* <published> - optional */
+	buf_printf_markup(buf, level, "<published>%s</published>", datestr);
+
+	/* <link> - optional */
+	buf_truncate(url, url_len);
+	buf_printf(url, "?uid=%u", record.uid);
+	buf_printf_markup(buf, level, "<link rel=\"alternate\""
+			 " type=\"text/html\" href=\"%s\"/>",
+			 buf_cstring(url));
+
+	/* <author> - optional */
+	addr = body->from;
+	if (!addr) addr = body->sender;
+	if (addr && *addr->mailbox) {
+	 buf_printf_markup(buf, level++, "<author>");
+
+	 /* <name> - required */
+	 if (addr->name) {
+		char *name = charset_parse_mimeheader(addr->name);
+		buf_printf_markup(buf, level++, "<name>");
+		buf_escapestr(buf, name, 0, 0, level);
+		buf_printf_markup(buf, --level, "</name>");
+		free(name);
+	 }
+	 else {
+		buf_printf_markup(buf, level, "<name>%s@%s</name>",
+				 addr->mailbox, addr->domain);
+	 }
+
+	 /* <email> - optional */
+	 buf_printf_markup(buf, level, "<email>%s@%s</email>",
+			 addr->mailbox, addr->domain);
+
+	 buf_printf_markup(buf, --level, "</author>");
+	}
+
+	/* <summary> - optional (find and use the first text/ part) */
+	content.base = buf_base(&msg_buf);
+	content.len = buf_len(&msg_buf);
+	content.body = body;
+	message_fetch_part(&content, content_types, &parts);
+
+	if (parts && *parts) {
+	 buf_printf_markup(buf, level++, "<summary type=\"html\">");
+	 buf_printf_markup(buf, level++, "<!CDATA");
+	 buf_escapestr(buf, parts0->decoded_body, max_len, 1, level);
+	 buf_printf_markup(buf, --level, ">");
+	 buf_printf_markup(buf, --level, "</summary>");
+	}
+
+	buf_printf_markup(buf, --level, "</entry>");
+
+	/* free the results */
+	if (parts) {
+	 struct bodypart **p;
+
+	 for (p = parts; *p; p++) free(*p);
+	 free(parts);
+	}
+
+	if (body) {
+	 message_free_body(body);
+	 free(body);
+	}
+
+	buf_free(&msg_buf);
+ }
+
+ /* End of Atom <feed> */
+ buf_printf_markup(buf, --level, "</feed>");
+ write_body(0, txn, buf_cstring(buf), buf_len(buf));
+
+ /* End of output */
+ write_body(0, txn, NULL, 0);
+
+ return 0;
+}
+
+
+static void display_address(struct buf *buf, struct address *addr,
+			 const char *sep, unsigned level)
+{
+ if (config_httpprettytelemetry)
+	buf_printf(buf, "%*s", level * MARKUP_INDENT, "");
+
+ buf_printf(buf, "%s", sep);
+ if (addr->name) buf_printf(buf, "\"%s\" ", addr->name);
+ buf_printf(buf, "<a href=\"mailto:%s@%s\">&lt;%s@%s&gt;</a>",
+	 addr->mailbox, addr->domain, addr->mailbox, addr->domain);
+
+ if (config_httpprettytelemetry) buf_appendcstr(buf, "\n");
+}
+
+
+static void display_part(struct transaction_t *txn,
+			 struct body *body, const struct index_record *record,
+			 const char *cursection, const struct buf *msg_buf,
+			 unsigned level)
+{
+ struct buf *buf = &txn->resp_body.payload;
+ char nextsectionMAX_SECTION_LEN+1;
+
+ if (!strcmp(body->type, "MULTIPART")) {
+	int i;
+
+	if (!strcmp(body->subtype, "ALTERNATIVE") &&
+	 !strcmp(body->subpart0.type, "TEXT")) {
+	 /* Display a multpart/ or text/html subpart,
+	 otherwise display first subpart */
+	 for (i = body->numparts; --i;) {
+		if (!strcmp(body->subparti.type, "MULTIPART") ||
+		 !strcmp(body->subparti.subtype, "HTML")) break;
+	 }
+	 snprintf(nextsection, sizeof(nextsection), "%s%s%d",
+		 cursection, *cursection ? "." : "", i+1);
+	 display_part(txn, &body->subparti,
+			 record, nextsection, msg_buf, level);
+	}
+	else {
+	 /* Display all subparts */
+	 for (i = 0; i < body->numparts; i++) {
+		snprintf(nextsection, sizeof(nextsection), "%s%s%d",
+			 cursection, *cursection ? "." : "", i+1);
+		display_part(txn, &body->subparti,
+			 record, nextsection, msg_buf, level);
+	 }
+	}
+ }
+ else if (!strcmp(body->type, "MESSAGE") &&
+	 !strcmp(body->subtype, "RFC822")) {
+	struct body *subpart = body->subpart;
+	struct address *addr;
+	char *sep;
+
+	/* Display enclosed message header as a shaded table */
+	buf_printf_markup(buf, level++,
+			 "<table width=\"100%%\" bgcolor=\"#CCCCCC\">");
+	/* Subject header field */
+	if (subpart->subject) {
+	 char *subj;
+
+	 subj = charset_parse_mimeheader(subpart->subject);
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right valign=top>Subject: </td>");
+	 buf_printf_markup(buf, level, "<td>%s</td>", subj);
+	 buf_printf_markup(buf, --level, "</tr>");
+	 free(subj);
+	}
+	/* From header field */
+	if (subpart->from && *subpart->from->mailbox) {
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right>From: </td>");
+	 buf_printf_markup(buf, level++, "<td>");
+	 display_address(buf, subpart->from, "", level);
+	 buf_printf_markup(buf, --level, "</td>");
+	 buf_printf_markup(buf, --level, "</tr>");
+	}
+	/* Sender header field (if different than From */
+	if (subpart->sender && *subpart->sender->mailbox &&
+	 (!subpart->from ||
+	 strcmp(subpart->sender->mailbox, subpart->from->mailbox) ||
+	 strcmp(subpart->sender->domain, subpart->from->domain))) {
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right>Sender: </td>");
+	 buf_printf_markup(buf, level++, "<td>");
+	 display_address(buf, subpart->sender, "", level);
+	 buf_printf_markup(buf, --level, "</td>");
+	 buf_printf_markup(buf, --level, "</tr>");
+	}
+	/* Reply-To header field (if different than From */
+	if (subpart->reply_to && *subpart->reply_to->mailbox &&
+	 (!subpart->from ||
+	 strcmp(subpart->reply_to->mailbox, subpart->from->mailbox) ||
+	 strcmp(subpart->reply_to->domain, subpart->from->domain))) {
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right>Reply-To: </td>");
+	 buf_printf_markup(buf, level++, "<td>");
+	 display_address(buf, subpart->reply_to, "", level);
+	 buf_printf_markup(buf, --level, "</td>");
+	 buf_printf_markup(buf, --level, "</tr>");
+	}
+	/* Date header field */
+	buf_printf_markup(buf, level++, "<tr>");
+	buf_printf_markup(buf, level,
+			 "<td align=right>Date: </td>");
+	buf_printf_markup(buf, level,
+			 "<td width=\"100%%\">%s</td>", subpart->date);
+	buf_printf_markup(buf, --level, "</tr>");
+	/* To header field (possibly multiple addresses) */
+	if (subpart->to) {
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right valign=top>To: </td>");
+	 buf_printf_markup(buf, level++, "<td>");
+	 for (sep = "", addr = subpart->to; addr; addr = addr->next) {
+		display_address(buf, addr, sep, level);
+		sep = ", ";
+	 }
+	 buf_printf_markup(buf, --level, "</td>");
+	 buf_printf_markup(buf, --level, "</tr>");
+	}
+	/* Cc header field (possibly multiple addresses) */
+	if (subpart->cc) {
+	 buf_printf_markup(buf, level++, "<tr>");
+	 buf_printf_markup(buf, level,
+			 "<td align=right valign=top>Cc: </td>");
+	 buf_printf_markup(buf, level++, "<td>");
+	 for (sep = "", addr = subpart->cc; addr; addr = addr->next) {
+		display_address(buf, addr, sep, level);
+		sep = ", ";
+	 }
+	 buf_printf_markup(buf, --level, "</td>");
+	 buf_printf_markup(buf, --level, "</tr>");
+	}
+	buf_printf_markup(buf, --level, "</table>");
+//	buf_printf_markup(buf, level, " ");
+
+	/* Display subpart */
+	snprintf(nextsection, sizeof(nextsection), "%s%s%d",
+		 cursection, *cursection ? "." : "", 1);
+	display_part(txn, subpart, record, nextsection, msg_buf, level);
+ }
+ else {
+	/* Leaf part - display something */
+
+	if (!strcmp(body->type, "TEXT")) {
+	 /* Display text part */
+	 int ishtml = !strcmp(body->subtype, "HTML");
+	 int charset = body->charset_cte >> 16;
+	 int encoding = body->charset_cte & 0xff;
+
+	 if (charset < 0) charset = 0; /* unknown, try ASCII */
+	 body->decoded_body =
+		charset_to_utf8(buf_base(msg_buf) + body->content_offset,
+				body->content_size, charset, encoding);
+	 if (!ishtml) buf_printf_markup(buf, level, "<pre>");
+	 write_body(0, txn, buf_cstring(buf), buf_len(buf));
+	 buf_reset(buf);
+
+	 write_body(0, txn, body->decoded_body, strlen(body->decoded_body));
+	 if (!ishtml) buf_printf_markup(buf, level, "</pre>");
+	}
+	else {
+	 int is_image = !strcmp(body->type, "IMAGE");
+	 struct param *param = body->params;
+	 const char *file_attr = "NAME";
+
+	 /* Anything else is shown as an attachment.
+	 * Show images inline, using name/description as alternative text.
+	 */
+	 /* Look for a filename in parameters */
+	 if (body->disposition) {
+		if (!strcmp(body->disposition, "ATTACHMENT")) is_image = 0;
+		param = body->disposition_params;
+		file_attr = "FILENAME";
+	 }
+	 for (; param && strcmp(param->attribute, file_attr);
+		 param = param->next);
+
+	 buf_printf_markup(buf, level++, "<div align=center>");
+
+	 /* Create link */
+	 buf_printf_markup(buf, level++,
+			 "<a href=\"%s?uid=%u;section=%s\" type=\"%s/%s\">",
+			 txn->req_tgt.path, record->uid, cursection,
+			 body->type, body->subtype);
+
+	 if (config_httpprettytelemetry)
+		buf_printf(buf, "%*s", level * MARKUP_INDENT, "");
+
+	 /* Add image */
+	 if (is_image) {
+		buf_printf(buf, "<img src=\"%s?uid=%u;section=%s\" alt=\"",
+			 txn->req_tgt.path, record->uid, cursection);
+	 }
+
+	 /* Create text for link or alternative text for image */
+	 if (param) buf_printf(buf, "%s", param->value);
+	 else {
+		buf_printf(buf, "%s/%s %lu bytes",
+			 body->type, body->subtype, body->content_size);
+	 }
+
+	 if (is_image) buf_printf(buf, "\">");
+
+	 if (config_httpprettytelemetry) buf_appendcstr(buf, "\n");
+
+	 buf_printf_markup(buf, --level, "</a>");
+	 buf_printf_markup(buf, --level, "</div>");
+	}
+
+	buf_printf_markup(buf, level, "<hr>");
+ }
+}
+
+
+/* Return entire message formatted as text/html */
+static void display_message(struct transaction_t *txn,
+			 const char *mboxname, const struct index_record *record,
+			 struct body *body, const struct buf *msg_buf)
+{
+ struct body toplevel;
+ struct buf *buf = &txn->resp_body.payload;
+ unsigned level = 0;
+
+ /* Setup for chunked response */
+ txn->flags.te |= TE_CHUNKED;
+ txn->resp_body.type = "text/html; charset=utf-8";
+
+ /* Short-circuit for HEAD request */
+ if (txn->meth == METH_HEAD) {
+	response_header(HTTP_OK, txn);
+	return;
+ }
+
+ /* Start HTML */
+ buf_reset(buf);
+ buf_printf_markup(buf, level, HTML_DOCTYPE);
+ buf_printf_markup(buf, level++, "<html>");
+ buf_printf_markup(buf, level++, "<head>");
+ buf_printf_markup(buf, level, "<title>%s:%u</title>",
+		 mboxname, record->uid);
+ buf_printf_markup(buf, --level, "</head>");
+ buf_printf_markup(buf, level++, "<body>");
+
+ /* Create link to message source */
+ buf_printf_markup(buf, level++, "<div align=center>");
+ buf_printf_markup(buf, level,
+		 "<a href=\"%s?uid=%u;section=0\" type=\"plain/text\">"
+		 "View message source</a>",
+		 txn->req_tgt.path, record->uid);
+ buf_printf_markup(buf, --level, "</div>");
+ buf_printf_markup(buf, level, "<hr>");
+
+ write_body(HTTP_OK, txn, buf_cstring(buf), buf_len(buf));
+ buf_reset(buf);
+
+ /* Encapsulate our body in a message/rfc822 to display toplevel hdrs */
+ memset(&toplevel, 0, sizeof(struct body));
+ toplevel.type = "MESSAGE";
+ toplevel.subtype = "RFC822";
+ toplevel.subpart = body;
+
+ display_part(txn, &toplevel, record, "", msg_buf, level);
+
+ /* End of HTML */
+ buf_printf_markup(buf, --level, "</body>");
+ buf_printf_markup(buf, --level, "</html>");
+
+ write_body(0, txn, buf_cstring(buf), buf_len(buf));
+
+ /* End of output */
+ write_body(0, txn, NULL, 0);
+}
+
+
+/* Fetch, decode, and return the specified MIME message part */
+static void fetch_part(struct transaction_t *txn, struct body *body,
+		 const char *findsection, const char *cursection,
+		 struct buf *msg_buf)
+{
+ char nextsectionMAX_SECTION_LEN+1;
+
+ if (!strcmp(body->type, "MULTIPART")) {
+	int i;
+
+	/* Recurse through all subparts */
+	for (i = 0; i < body->numparts; i++) {
+	 snprintf(nextsection, sizeof(nextsection), "%s%s%d",
+		 cursection, *cursection ? "." : "", i+1);
+	 fetch_part(txn, &body->subparti,
+		 findsection, nextsection, msg_buf);
+	}
+ }
+ else if (!strcmp(body->type, "MESSAGE") &&
+	 !strcmp(body->subtype, "RFC822")) {
+	/* Recurse into supbart */
+	snprintf(nextsection, sizeof(nextsection), "%s%s%d",
+		 cursection, *cursection ? "." : "", 1);
+	fetch_part(txn, body->subpart, findsection, nextsection, msg_buf);
+ }
+ else if (!strcmp(findsection, cursection)) {
+	int encoding = body->charset_cte & 0xff;
+	const char *outbuf;
+	size_t outsize;
+
+	outbuf = charset_decode_mimebody(buf_base(msg_buf) + body->content_offset,
+					 body->content_size, encoding,
+					 &body->decoded_body, &outsize);
+
+	if (!outbuf) {
+	 txn->error.desc = "Unknown MIME encoding\r\n";
+	 error_response(HTTP_SERVER_ERROR, txn);
+	 return;
+
+	}
+
+	assert(!buf_len(&txn->buf));
+	buf_printf(&txn->buf, "%s/%s", body->type, body->subtype);
+	txn->resp_body.type = buf_cstring(&txn->buf);
+
+	write_body(HTTP_OK, txn, outbuf, outsize);
+ }
+}

cyrus-imapd-2.5.tar.gz/imap/httpd.c Added

@@ -0,0 +1,3915 @@
+/* httpd.c -- HTTP/WebDAV/CalDAV server protocol parsing
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <syslog.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+#include "prot.h"
+
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
+
+#include "httpd.h"
+#include "http_proxy.h"
+
+#include "assert.h"
+#include "util.h"
+#include "iptostring.h"
+#include "global.h"
+#include "tls.h"
+#include "map.h"
+
+#include "exitcodes.h"
+#include "imapd.h"
+#include "imap_err.h"
+#include "http_err.h"
+#include "proc.h"
+#include "version.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "sync_log.h"
+#include "telemetry.h"
+#include "backend.h"
+#include "proxy.h"
+#include "userdeny.h"
+#include "message.h"
+#include "idle.h"
+#include "times.h"
+#include "tok.h"
+#include "wildmat.h"
+#include "md5.h"
+
+#ifdef WITH_DAV
+#include "http_dav.h"
+#endif
+
+#include <libxml/tree.h>
+#include <libxml/HTMLtree.h>
+#include <libxml/uri.h>
+
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif /* HAVE_ZLIB */
+
+
+static const char tls_message =
+ HTML_DOCTYPE
+ "<html>\n<head>\n<title>TLS Required</title>\n</head>\n" \
+ "<body>\n<h2>TLS is required to use Basic authentication</h2>\n" \
+ "Use <a href=\"%s\">%s</a> instead.\n" \
+ "</body>\n</html>\n";
+
+extern int optind;
+extern char *optarg;
+extern int opterr;
+
+
+#ifdef HAVE_SSL
+static SSL *tls_conn;
+#endif /* HAVE_SSL */
+
+sasl_conn_t *httpd_saslconn; /* the sasl connection context */
+
+static struct mailbox *httpd_mailbox = NULL;
+static struct wildmat *allow_cors = NULL;
+int httpd_timeout, httpd_keepalive;
+char *httpd_userid = NULL, *proxy_userid = NULL;
+struct auth_state *httpd_authstate = 0;
+int httpd_userisadmin = 0;
+int httpd_userisproxyadmin = 0;
+struct sockaddr_storage httpd_localaddr, httpd_remoteaddr;
+int httpd_haveaddr = 0;
+char httpd_clienthostNI_MAXHOST*2+1 = "local";
+struct protstream *httpd_out = NULL;
+struct protstream *httpd_in = NULL;
+struct protgroup *protin = NULL;
+static int httpd_logfd = -1;
+
+static sasl_ssf_t extprops_ssf = 0;
+int https = 0;
+int httpd_tls_done = 0;
+int httpd_tls_required = 0;
+unsigned avail_auth_schemes = 0; /* bitmask of available auth schemes */
+unsigned long config_httpmodules;
+int config_httpprettytelemetry;
+
+struct buf serverinfo = BUF_INITIALIZER;
+
+static void digest_send_success(const char *name __attribute__((unused)),
+				const char *data)
+{
+ prot_printf(httpd_out, "Authentication-Info: %s\r\n", data);
+}
+
+/* List of HTTP auth schemes that we support */
+struct auth_scheme_t auth_schemes = {
+ { AUTH_BASIC, "Basic", NULL, AUTH_SERVER_FIRST | AUTH_BASE64, NULL, NULL },
+ { AUTH_DIGEST, "Digest", HTTP_DIGEST_MECH, AUTH_NEED_REQUEST|AUTH_SERVER_FIRST,
+ &digest_send_success, digest_recv_success },
+ { AUTH_SPNEGO, "Negotiate", "GSS-SPNEGO", AUTH_BASE64, NULL, NULL },
+ { AUTH_NTLM, "NTLM", "NTLM", AUTH_NEED_PERSIST | AUTH_BASE64, NULL, NULL },
+ { -1, NULL, NULL, 0, NULL, NULL }
+};
+
+
+/* the sasl proxy policy context */
+static struct proxy_context httpd_proxyctx = {
+ 0, 1, &httpd_authstate, &httpd_userisadmin, &httpd_userisproxyadmin
+};
+
+/* signal to config.c */
+const int config_need_data = CONFIG_NEED_PARTITION_DATA;
+
+/* current namespace */
+HIDDEN struct namespace httpd_namespace;
+
+/* PROXY STUFF */
+/* we want a list of our outgoing connections here and which one we're
+ currently piping */
+
+/* the current server most commands go to */
+struct backend *backend_current = NULL;
+
+/* our cached connections */
+struct backend **backend_cached = NULL;
+
+/* end PROXY stuff */
+
+static void starttls(int https);
+void usage(void);
+void shut_down(int code) __attribute__ ((noreturn));
+
+/* Enable the resetting of a sasl_conn_t */
+static int reset_saslconn(sasl_conn_t **conn);
+
+static void cmdloop(void);
+static int parse_expect(struct transaction_t *txn);
+static void parse_connection(struct transaction_t *txn);
+static int parse_ranges(const char *hdr, unsigned long len,
+			struct range **ranges);
+static int proxy_authz(const char **authzid, struct transaction_t *txn);
+static void auth_success(struct transaction_t *txn);
+static int http_auth(const char *creds, struct transaction_t *txn);
+static void keep_alive(int sig);
+
+static int meth_propfind_root(struct transaction_t *txn, void *params);
+
+
+static struct {
+ char *ipremoteport;
+ char *iplocalport;
+ sasl_ssf_t ssf;
+ char *authid;
+} saslprops = {NULL,NULL,0,NULL};
+
+static struct sasl_callback mysasl_cb = {
+ { SASL_CB_GETOPT, (mysasl_cb_ft *) &mysasl_config, NULL },
+ { SASL_CB_PROXY_POLICY, (mysasl_cb_ft *) &mysasl_proxy_policy, (void*) &httpd_proxyctx },
+ { SASL_CB_CANON_USER, (mysasl_cb_ft *) &mysasl_canon_user, NULL },
+ { SASL_CB_LIST_END, NULL, NULL }
+};
+
+/* Array of HTTP methods known by our server. */
+const struct known_meth_t http_methods = {
+ { "ACL",		0 },
+ { "COPY",	 	METH_NOBODY },
+ { "DELETE",	 	METH_NOBODY },
+ { "GET",	 	METH_NOBODY },
+ { "HEAD",	 	METH_NOBODY },
+ { "LOCK",		0 },
+ { "MKCALENDAR",	0 },
+ { "MKCOL",		0 },
+ { "MOVE",		METH_NOBODY },
+ { "OPTIONS",	METH_NOBODY },
+ { "POST",		0 },
+ { "PROPFIND",	0 },
+ { "PROPPATCH",	0 },
+ { "PUT",		0 },
+ { "REPORT",		0 },
+ { "TRACE",	 	METH_NOBODY },
+ { "UNLOCK",	 	METH_NOBODY },
+ { NULL,		0 }
+};
+
+/* Namespace to fetch static content from filesystem */
+struct namespace_t namespace_default = {
+ URL_NS_DEFAULT, 1, "", NULL, 0 /* no auth */, ALLOW_READ,
+ NULL, NULL, NULL, NULL,
+ {
+	{ NULL,			NULL },			/* ACL		*/
+	{ NULL,			NULL },			/* COPY		*/
+	{ NULL,			NULL },			/* DELETE	*/
+	{ &meth_get_doc,	NULL },			/* GET		*/
+	{ &meth_get_doc,	NULL },			/* HEAD		*/
+	{ NULL,			NULL },			/* LOCK		*/
+	{ NULL,			NULL },			/* MKCALENDAR	*/
+	{ NULL,			NULL },			/* MKCOL	*/
+	{ NULL,			NULL },			/* MOVE		*/
+	{ &meth_options,	NULL },			/* OPTIONS	*/
+	{ NULL,			NULL },			/* POST		*/
+	{ &meth_propfind_root,	NULL },			/* PROPFIND	*/
+	{ NULL,			NULL },			/* PROPPATCH	*/
+	{ NULL,			NULL },			/* PUT		*/
+	{ NULL,			NULL },			/* REPORT	*/
+	{ &meth_trace,		NULL },			/* TRACE	*/
+	{ NULL,			NULL },			/* UNLOCK	*/
+ }
+};
+
+/* Array of different namespaces and features supported by the server */
+struct namespace_t *namespaces = {
+#ifdef WITH_DAV
+ &namespace_principal,
+ &namespace_calendar,
+ &namespace_ischedule,
+ &namespace_domainkey,
+ &namespace_addressbook,
+#endif
+#ifdef WITH_RSS
+ &namespace_rss,
+#endif
+ &namespace_dblookup,
+ &namespace_default,		/* MUST be present and be last!! */
+ NULL,
+};
+
+
+static void httpd_reset(void)
+{
+ int i;
+ int bytes_in = 0;
+ int bytes_out = 0;
+
+ /* Do any namespace specific cleanup */
+ for (i = 0; namespacesi; i++) {
+	if (namespacesi->enabled && namespacesi->reset)
+	 namespacesi->reset();
+ }
+
+ proc_cleanup();
+
+ /* close backend connections */
+ i = 0;
+ while (backend_cached && backend_cachedi) {
+	proxy_downserver(backend_cachedi);
+	free(backend_cachedi->context);
+	free(backend_cachedi);
+	i++;
+ }
+ if (backend_cached) free(backend_cached);
+ backend_cached = NULL;
+ backend_current = NULL;
+
+ if (httpd_mailbox) mailbox_close(&httpd_mailbox);
+ httpd_mailbox = NULL;
+
+ if (httpd_in) {
+	prot_NONBLOCK(httpd_in);
+	prot_fill(httpd_in);
+	bytes_in = prot_bytes_in(httpd_in);
+	prot_free(httpd_in);
+ }
+
+ if (httpd_out) {
+	prot_flush(httpd_out);
+	bytes_out = prot_bytes_out(httpd_out);
+	prot_free(httpd_out);
+ }
+
+ if (config_auditlog) {
+	syslog(LOG_NOTICE,
+	 "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>", 
+	 session_id(), bytes_in, bytes_out);
+ }
+ 
+ httpd_in = httpd_out = NULL;
+
+ if (protin) protgroup_reset(protin);
+
+#ifdef HAVE_SSL
+ if (tls_conn) {
+	tls_reset_servertls(&tls_conn);
+	tls_conn = NULL;
+ }
+#endif
+
+ cyrus_reset_stdio();
+
+ strcpy(httpd_clienthost, "local");
+ if (httpd_logfd != -1) {
+	close(httpd_logfd);
+	httpd_logfd = -1;
+ }
+ if (httpd_userid != NULL) {
+	free(httpd_userid);
+	httpd_userid = NULL;
+ }
+ if (proxy_userid != NULL) {
+	free(proxy_userid);
+	proxy_userid = NULL;
+ }
+ if (httpd_authstate) {
+	auth_freestate(httpd_authstate);
+	httpd_authstate = NULL;
+ }
+ if (httpd_saslconn) {
+	sasl_dispose(&httpd_saslconn);
+	httpd_saslconn = NULL;
+ }
+ httpd_tls_done = 0;
+
+ if(saslprops.iplocalport) {
+ free(saslprops.iplocalport);
+ saslprops.iplocalport = NULL;
+ }
+ if(saslprops.ipremoteport) {
+ free(saslprops.ipremoteport);
+ saslprops.ipremoteport = NULL;
+ }
+ if(saslprops.authid) {
+ free(saslprops.authid);
+ saslprops.authid = NULL;
+ }
+ saslprops.ssf = 0;
+}
+
+/*
+ * run once when process is forked;
+ * MUST NOT exit directly; must return with non-zero error code
+ */
+int service_init(int argc __attribute__((unused)),
+		 char **argv __attribute__((unused)),
+		 char **envp __attribute__((unused)))
+{
+ int r, opt, i, allow_trace = config_getswitch(IMAPOPT_HTTPALLOWTRACE);
+
+ LIBXML_TEST_VERSION
+
+ initialize_http_error_table();
+
+ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+ setproctitle_init(argc, argv, envp);
+
+ /* set signal handlers */
+ signals_set_shutdown(&shut_down);
+ signal(SIGPIPE, SIG_IGN);
+
+ /* load the SASL plugins */
+ global_sasl_init(1, 1, mysasl_cb);
+
+ /* open the mboxlist, we'll need it for real work */
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ /* open the quota db, we'll need it for expunge */
+ quotadb_init(0);
+ quotadb_open(NULL);
+
+ /* open the user deny db */
+ denydb_init(0);
+ denydb_open(/*create*/0);
+
+ /* open annotations.db, we'll need it for collection properties */
+ annotatemore_open();
+
+ /* setup for sending IMAP IDLE notifications */
+ idle_enabled();
+
+ /* Set namespace */
+ if ((r = mboxname_init_namespace(&httpd_namespace, 1)) != 0) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+ /* External names are in URIs (UNIX sep) */
+ httpd_namespace.hier_sep = '/';
+
+ /* open the mboxevent system */
+ mboxevent_init();
+
+ mboxevent_setnamespace(&httpd_namespace);
+
+ while ((opt = getopt(argc, argv, "sp:")) != EOF) {
+	switch(opt) {
+	case 's': /* https (do TLS right away) */
+	 https = 1;
+	 if (!tls_enabled()) {
+		syslog(LOG_ERR, "https: required OpenSSL options not present");
+		fatal("https: required OpenSSL options not present",
+		 EC_CONFIG);
+	 }
+	 break;
+
+	case 'p': /* external protection */
+	 extprops_ssf = atoi(optarg);
+	 break;
+
+	default:
+	 usage();
+	}
+ }
+
+ /* Create a protgroup for input from the client and selected backend */
+ protin = protgroup_new(2);
+
+ config_httpprettytelemetry = config_getswitch(IMAPOPT_HTTPPRETTYTELEMETRY);
+
+ if (config_getstring(IMAPOPT_HTTPALLOWCORS)) {
+	allow_cors =
+	 split_wildmats((char *) config_getstring(IMAPOPT_HTTPALLOWCORS),
+			 NULL);
+ }
+
+ /* Construct serverinfo string */
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	buf_printf(&serverinfo, "Cyrus/%s%s Cyrus-SASL/%u.%u.%u",
+		 cyrus_version(), config_mupdate_server ? " (Murder)" : "",
+		 SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP);
+#ifdef HAVE_SSL
+	buf_printf(&serverinfo, " OpenSSL/%s", SHLIB_VERSION_NUMBER);
+#endif
+#ifdef HAVE_ZLIB
+	buf_printf(&serverinfo, " zlib/%s", ZLIB_VERSION);
+#endif
+	buf_printf(&serverinfo, " libxml/%s", LIBXML_DOTTED_VERSION);
+ }
+
+ /* Do any namespace specific initialization */
+ config_httpmodules = config_getbitfield(IMAPOPT_HTTPMODULES);
+ for (i = 0; namespacesi; i++) {
+	if (allow_trace) namespacesi->allow |= ALLOW_TRACE;
+	if (namespacesi->init) namespacesi->init(&serverinfo);
+ }
+
+ return 0;
+}
+
+
+/*
+ * run for each accepted connection
+ */
+int service_main(int argc __attribute__((unused)),
+		 char **argv __attribute__((unused)),
+		 char **envp __attribute__((unused)))
+{
+ socklen_t salen;
+ char hbufNI_MAXHOST;
+ char localip60, remoteip60;
+ int niflags;
+ sasl_security_properties_t *secprops=NULL;
+ const char *mechlist, *mech;
+ int mechcount = 0;
+ size_t mechlen;
+ struct auth_scheme_t *scheme;
+
+ session_new_id();
+
+ signals_poll();
+
+ sync_log_init();
+
+ httpd_in = prot_new(0, 0);
+ httpd_out = prot_new(1, 1);
+ protgroup_insert(protin, httpd_in);
+
+ /* Find out name of client host */
+ salen = sizeof(httpd_remoteaddr);
+ if (getpeername(0, (struct sockaddr *)&httpd_remoteaddr, &salen) == 0 &&
+	(httpd_remoteaddr.ss_family == AF_INET ||
+	 httpd_remoteaddr.ss_family == AF_INET6)) {
+	if (getnameinfo((struct sockaddr *)&httpd_remoteaddr, salen,
+			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
+ 	 strncpy(httpd_clienthost, hbuf, sizeof(hbuf));
+	 strlcat(httpd_clienthost, " ", sizeof(httpd_clienthost));
+	} else {
+	 httpd_clienthost0 = '\0';
+	}
+	niflags = NI_NUMERICHOST;
+#ifdef NI_WITHSCOPEID
+	if (((struct sockaddr *)&httpd_remoteaddr)->sa_family == AF_INET6)
+	 niflags |= NI_WITHSCOPEID;
+#endif
+	if (getnameinfo((struct sockaddr *)&httpd_remoteaddr, salen, hbuf,
+			sizeof(hbuf), NULL, 0, niflags) != 0)
+	 strlcpy(hbuf, "unknown", sizeof(hbuf));
+	strlcat(httpd_clienthost, "", sizeof(httpd_clienthost));
+	strlcat(httpd_clienthost, hbuf, sizeof(httpd_clienthost));
+	strlcat(httpd_clienthost, "", sizeof(httpd_clienthost));
+	salen = sizeof(httpd_localaddr);
+	if (getsockname(0, (struct sockaddr *)&httpd_localaddr, &salen) == 0) {
+	 httpd_haveaddr = 1;
+	}
+
+	/* Create pre-authentication telemetry log based on client IP */
+	httpd_logfd = telemetry_log(hbuf, httpd_in, httpd_out, 0);
+ }
+
+ /* other params should be filled in */
+ if (sasl_server_new("HTTP", config_servername, NULL, NULL, NULL, NULL,
+			SASL_USAGE_FLAGS, &httpd_saslconn) != SASL_OK)
+	fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); 
+
+ /* will always return something valid */
+ secprops = mysasl_secprops(0);
+
+ /* no HTTP clients seem to use "auth-int" */
+ secprops->max_ssf = 0;				/* "auth" only */
+ secprops->maxbufsize = 0; 			 	/* don't need maxbuf */
+ if (sasl_setprop(httpd_saslconn, SASL_SEC_PROPS, secprops) != SASL_OK)
+	fatal("Failed to set SASL property", EC_TEMPFAIL);
+ if (sasl_setprop(httpd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf) != SASL_OK)
+	fatal("Failed to set SASL property", EC_TEMPFAIL);
+ 
+ if(iptostring((struct sockaddr *)&httpd_localaddr,
+		 salen, localip, 60) == 0) {
+	sasl_setprop(httpd_saslconn, SASL_IPLOCALPORT, localip);
+	saslprops.iplocalport = xstrdup(localip);
+ }
+ 
+ if(iptostring((struct sockaddr *)&httpd_remoteaddr,
+		 salen, remoteip, 60) == 0) {
+	sasl_setprop(httpd_saslconn, SASL_IPREMOTEPORT, remoteip); 
+	saslprops.ipremoteport = xstrdup(remoteip);
+ }
+
+ /* See which auth schemes are available to us */
+ if ((extprops_ssf >= 2) || config_getswitch(IMAPOPT_ALLOWPLAINTEXT)) {
+	avail_auth_schemes |= (1 << AUTH_BASIC);
+ }
+ sasl_listmech(httpd_saslconn, NULL, NULL, " ", NULL,
+		 &mechlist, NULL, &mechcount);
+ for (mech = mechlist; mechcount--; mech += ++mechlen) {
+	mechlen = strcspn(mech, " \0");
+	for (scheme = auth_schemes; scheme->name; scheme++) {
+	 if (scheme->saslmech && !strncmp(mech, scheme->saslmech, mechlen)) {
+		avail_auth_schemes |= (1 << scheme->idx);
+		break;
+	 }
+	}
+ }
+ httpd_tls_required = !avail_auth_schemes;
+
+ proc_register("httpd", httpd_clienthost, NULL, NULL, NULL);
+
+ /* Set inactivity timer */
+ httpd_timeout = config_getint(IMAPOPT_HTTPTIMEOUT);
+ if (httpd_timeout < 0) httpd_timeout = 0;
+ httpd_timeout *= 60;
+ prot_settimeout(httpd_in, httpd_timeout);
+ prot_setflushonread(httpd_in, httpd_out);
+
+ /* we were connected on https port so we should do 
+ TLS negotiation immediatly */
+ if (https == 1) starttls(1);
+
+ /* Setup the signal handler for keepalive heartbeat */
+ httpd_keepalive = config_getint(IMAPOPT_HTTPKEEPALIVE);
+ if (httpd_keepalive < 0) httpd_keepalive = 0;
+ if (httpd_keepalive) {
+	struct sigaction action;
+
+	sigemptyset(&action.sa_mask);
+	action.sa_flags = 0;
+#ifdef SA_RESTART
+	action.sa_flags |= SA_RESTART;
+#endif
+	action.sa_handler = keep_alive;
+	if (sigaction(SIGALRM, &action, NULL) < 0) {
+	 syslog(LOG_ERR, "unable to install signal handler for %d: %m", SIGALRM);
+	 httpd_keepalive = 0;
+	}
+ }
+
+ cmdloop();
+
+ /* Closing connection */
+
+ /* cleanup */
+ signal(SIGALRM, SIG_IGN);
+ httpd_reset();
+
+ return 0;
+}
+
+
+/* Called by service API to shut down the service */
+void service_abort(int error)
+{
+ shut_down(error);
+}
+
+
+void usage(void)
+{
+ prot_printf(httpd_out, "%s: usage: httpd -C <alt_config> -s\r\n",
+		error_message(HTTP_SERVER_ERROR));
+ prot_flush(httpd_out);
+ exit(EC_USAGE);
+}
+
+
+/*
+ * Cleanly shut down and exit
+ */
+void shut_down(int code)
+{
+ int i;
+ int bytes_in = 0;
+ int bytes_out = 0;
+
+ in_shutdown = 1;
+
+ if (allow_cors) free_wildmats(allow_cors);
+
+ /* Do any namespace specific cleanup */
+ for (i = 0; namespacesi; i++) {
+	if (namespacesi->enabled && namespacesi->shutdown)
+	 namespacesi->shutdown();
+ }
+
+ xmlCleanupParser();
+
+ proc_cleanup();
+
+ /* close backend connections */
+ i = 0;
+ while (backend_cached && backend_cachedi) {
+	proxy_downserver(backend_cachedi);
+	free(backend_cachedi->context);
+	free(backend_cachedi);
+	i++;
+ }
+ if (backend_cached) free(backend_cached);
+
+ if (httpd_mailbox) mailbox_close(&httpd_mailbox);
+
+ sync_log_done();
+
+ mboxlist_close();
+ mboxlist_done();
+
+ quotadb_close();
+ quotadb_done();
+
+ denydb_close();
+ denydb_done();
+
+ annotatemore_close();
+
+ if (httpd_in) {
+	prot_NONBLOCK(httpd_in);
+	prot_fill(httpd_in);
+	bytes_in = prot_bytes_in(httpd_in);
+	prot_free(httpd_in);
+ }
+
+ if (httpd_out) {
+	prot_flush(httpd_out);
+	bytes_out = prot_bytes_out(httpd_out);
+	prot_free(httpd_out);
+ }
+
+ if (protin) protgroup_free(protin);
+
+ if (config_auditlog)
+	syslog(LOG_NOTICE,
+	 "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>", 
+	 session_id(), bytes_in, bytes_out);
+
+#ifdef HAVE_SSL
+ tls_shutdown_serverengine();
+#endif
+
+ cyrus_done();
+
+ exit(code);
+}
+
+
+void fatal(const char* s, int code)
+{
+ static int recurse_code = 0;
+
+ if (recurse_code) {
+	/* We were called recursively. Just give up */
+	proc_cleanup();
+	exit(recurse_code);
+ }
+ recurse_code = code;
+ if (httpd_out) {
+	prot_printf(httpd_out,
+		 "HTTP/1.1 %s\r\n"
+		 "Content-Type: text/plain\r\n"
+		 "Connection: close\r\n\r\n"
+		 "Fatal error: %s\r\n",
+		 error_message(HTTP_SERVER_ERROR), s);
+	prot_flush(httpd_out);
+ }
+ syslog(LOG_ERR, "Fatal error: %s", s);
+ shut_down(code);
+}
+
+
+
+
+#ifdef HAVE_SSL
+static void starttls(int https)
+{
+ int result;
+ int *layerp;
+ sasl_ssf_t ssf;
+ char *auth_id;
+
+ /* SASL and openssl have different ideas about whether ssf is signed */
+ layerp = (int *) &ssf;
+
+ result=tls_init_serverengine("http",
+				 5, /* depth to verify */
+				 !https, /* can client auth? */
+				 !https); /* TLS only? */
+
+ if (result == -1) {
+	syslog(LOG_ERR, "httpd error initializing TLS");
+	fatal("tls_init() failed",EC_TEMPFAIL);
+ }
+
+ if (!https) {
+	/* tell client to start TLS upgrade (RFC 2817) */
+	response_header(HTTP_SWITCH_PROT, NULL);
+ }
+ 
+ result=tls_start_servertls(0, /* read */
+			 1, /* write */
+			 https ? 180 : httpd_timeout,
+			 layerp,
+			 &auth_id,
+			 &tls_conn);
+
+ /* if error */
+ if (result == -1) {
+	syslog(LOG_NOTICE, "https failed: %s", httpd_clienthost);
+	fatal("tls_start_servertls() failed", EC_TEMPFAIL);
+ }
+
+ /* tell SASL about the negotiated layer */
+ result = sasl_setprop(httpd_saslconn, SASL_SSF_EXTERNAL, &ssf);
+ if (result != SASL_OK) {
+	fatal("sasl_setprop() failed: starttls()", EC_TEMPFAIL);
+ }
+ saslprops.ssf = ssf;
+
+ result = sasl_setprop(httpd_saslconn, SASL_AUTH_EXTERNAL, auth_id);
+ if (result != SASL_OK) {
+ fatal("sasl_setprop() failed: starttls()", EC_TEMPFAIL);
+ }
+ if (saslprops.authid) {
+	free(saslprops.authid);
+	saslprops.authid = NULL;
+ }
+ if (auth_id) saslprops.authid = xstrdup(auth_id);
+
+ /* tell the prot layer about our new layers */
+ prot_settls(httpd_in, tls_conn);
+ prot_settls(httpd_out, tls_conn);
+
+ httpd_tls_done = 1;
+ httpd_tls_required = 0;
+
+ avail_auth_schemes |= (1 << AUTH_BASIC);
+}
+#else
+static void starttls(int https __attribute__((unused)))
+{
+ fatal("starttls() called, but no OpenSSL", EC_SOFTWARE);
+}
+#endif /* HAVE_SSL */
+
+
+/* Reset the given sasl_conn_t to a sane state */
+static int reset_saslconn(sasl_conn_t **conn) 
+{
+ int ret;
+ sasl_security_properties_t *secprops = NULL;
+
+ sasl_dispose(conn);
+ /* do initialization typical of service_main */
+ ret = sasl_server_new("HTTP", config_servername, NULL, NULL, NULL, NULL,
+			 SASL_USAGE_FLAGS, conn);
+ if(ret != SASL_OK) return ret;
+
+ if(saslprops.ipremoteport)
+ ret = sasl_setprop(*conn, SASL_IPREMOTEPORT,
+ saslprops.ipremoteport);
+ if(ret != SASL_OK) return ret;
+ 
+ if(saslprops.iplocalport)
+ ret = sasl_setprop(*conn, SASL_IPLOCALPORT,
+ saslprops.iplocalport);
+ if(ret != SASL_OK) return ret;
+ secprops = mysasl_secprops(0);
+
+ /* no HTTP clients seem to use "auth-int" */
+ secprops->max_ssf = 0;				/* "auth" only */
+ secprops->maxbufsize = 0; 			 	/* don't need maxbuf */
+ ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops);
+ if(ret != SASL_OK) return ret;
+ /* end of service_main initialization excepting SSF */
+
+ /* If we have TLS/SSL info, set it */
+ if(saslprops.ssf) {
+	ret = sasl_setprop(*conn, SASL_SSF_EXTERNAL, &saslprops.ssf);
+ } else {
+	ret = sasl_setprop(*conn, SASL_SSF_EXTERNAL, &extprops_ssf);
+ }
+
+ if(ret != SASL_OK) return ret;
+
+ if(saslprops.authid) {
+ ret = sasl_setprop(*conn, SASL_AUTH_EXTERNAL, saslprops.authid);
+ if(ret != SASL_OK) return ret;
+ }
+ /* End TLS/SSL Info */
+
+ return SASL_OK;
+}
+
+
+/*
+ * Top-level command loop parsing
+ */
+static void cmdloop(void)
+{
+ int gzip_enabled = 0;
+ struct transaction_t txn;
+
+ /* Start with an empty (clean) transaction */
+ memset(&txn, 0, sizeof(struct transaction_t));
+
+ /* Pre-allocate our working buffer */
+ buf_ensure(&txn.buf, 1024);
+
+#ifdef HAVE_ZLIB
+ /* Always use gzip format because IE incorrectly uses raw deflate */
+ if (config_getswitch(IMAPOPT_HTTPALLOWCOMPRESS) &&
+	deflateInit2(&txn.zstrm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
+		 16+MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY) == Z_OK) {
+	gzip_enabled = 1;
+ }
+#endif
+
+ for (;;) {
+	int ret, empty, r, i, c;
+	char *p;
+	tok_t tok;
+	const char **hdr;
+	const struct namespace_t *namespace;
+	const struct method_t *meth_t;
+	struct request_line_t *req_line = &txn.req_line;
+
+	/* Reset txn state */
+	txn.meth = METH_UNKNOWN;
+	memset(&txn.flags, 0, sizeof(struct txn_flags_t));
+	txn.flags.conn = 0;
+	txn.flags.vary = VARY_AE;
+	memset(req_line, 0, sizeof(struct request_line_t));
+	memset(&txn.req_tgt, 0, sizeof(struct request_target_t));
+	txn.req_uri = NULL;
+	txn.auth_chal.param = NULL;
+	txn.req_hdrs = NULL;
+	txn.req_body.flags = 0;
+	txn.location = NULL;
+	memset(&txn.error, 0, sizeof(struct error_t));
+	memset(&txn.resp_body, 0, /* Don't zero the response payload buffer */
+	 sizeof(struct resp_body_t) - sizeof(struct buf));
+	buf_reset(&txn.buf);
+	ret = empty = 0;
+
+	/* Create header cache */
+	if (!(txn.req_hdrs = spool_new_hdrcache())) {
+	 txn.error.desc = "Unable to create header cache";
+	 ret = HTTP_SERVER_ERROR;
+	}
+
+ req_line:
+	do {
+	 /* Flush any buffered output */
+	 prot_flush(httpd_out);
+	 if (backend_current) prot_flush(backend_current->out);
+
+	 /* Check for shutdown file */
+	 if (shutdown_file(txn.buf.s, txn.buf.alloc) ||
+		(httpd_userid &&
+		 userdeny(httpd_userid, config_ident, txn.buf.s, txn.buf.alloc))) {
+		txn.error.desc = txn.buf.s;
+		ret = HTTP_UNAVAILABLE;
+		break;
+	 }
+
+	 signals_poll();
+
+	} while (!proxy_check_input(protin, httpd_in, httpd_out,
+				 backend_current ? backend_current->in : NULL,
+				 NULL, 0));
+	if (ret) {
+	 txn.flags.conn = CONN_CLOSE;
+	 error_response(ret, &txn);
+	 protgroup_free(protin);
+	 shut_down(0);
+	}
+
+
+	/* Read request-line */
+	syslog(LOG_DEBUG, "read & parse request-line");
+	if (!prot_fgets(req_line->buf, MAX_REQ_LINE+1, httpd_in)) {
+	 txn.error.desc = prot_error(httpd_in);
+	 if (txn.error.desc && strcmp(txn.error.desc, PROT_EOF_STRING)) {
+		/* client timed out */
+		syslog(LOG_WARNING, "%s, closing connection", txn.error.desc);
+		ret = HTTP_TIMEOUT;
+	 }
+	 else {
+		/* client closed connection */
+	 }
+
+	 txn.flags.conn = CONN_CLOSE;
+	 goto done;
+	}
+
+	/* Trim CRLF from request-line */
+	p = req_line->buf + strlen(req_line->buf);
+	if (p-1 == '\n') *--p = '\0';
+	if (p-1 == '\r') *--p = '\0';
+
+	/* Ignore 1 empty line before request-line per HTTPbis Part 1 Sec 3.5 */
+	if (!empty++ && !*req_line->buf) goto req_line;
+
+	/* Parse request-line = method SP request-target SP HTTP-version CRLF */
+	tok_initm(&tok, req_line->buf, " ", 0);
+	if (!(req_line->meth = tok_next(&tok))) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = "Missing method in request-line";
+	}
+	else if (!(req_line->uri = tok_next(&tok))) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = "Missing request-target in request-line";
+	}
+	else if ((size_t) (p - req_line->buf) > MAX_REQ_LINE - 2) {
+	 /* request-line overran the size of our buffer */
+	 ret = HTTP_TOO_LONG;
+	 buf_printf(&txn.buf,
+		 "Length of request-line MUST be less than %u octets",
+		 MAX_REQ_LINE);
+	 txn.error.desc = buf_cstring(&txn.buf);
+	}
+	else if (!(req_line->ver = tok_next(&tok))) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = "Missing HTTP-version in request-line";
+	}
+	else if (tok_next(&tok)) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = "Unexpected extra argument(s) in request-line";
+	}
+
+	/* Check HTTP-Version - MUST be HTTP/1.x */
+	else if (strlen(req_line->ver) != HTTP_VERSION_LEN
+		 || strncmp(req_line->ver, HTTP_VERSION, HTTP_VERSION_LEN-1)
+		 || !isdigit(req_line->verHTTP_VERSION_LEN-1)) {
+	 ret = HTTP_BAD_VERSION;
+	 buf_printf(&txn.buf,
+		 "This server only speaks %.*sx",
+		 HTTP_VERSION_LEN-1, HTTP_VERSION);
+	 txn.error.desc = buf_cstring(&txn.buf);
+	}
+	else if (req_line->verHTTP_VERSION_LEN-1 == '0') {
+	 /* HTTP/1.0 connection */
+	 txn.flags.ver1_0 = 1;
+	}
+	tok_fini(&tok);
+
+	if (ret) {
+	 txn.flags.conn = CONN_CLOSE;
+	 goto done;
+	}
+
+	/* Read and parse headers */
+	syslog(LOG_DEBUG, "read & parse headers");
+	if ((r = spool_fill_hdrcache(httpd_in, NULL, txn.req_hdrs, NULL))) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = error_message(r);
+	}
+	else if ((txn.error.desc = prot_error(httpd_in)) &&
+		 strcmp(txn.error.desc, PROT_EOF_STRING)) {
+	 /* client timed out */
+	 syslog(LOG_WARNING, "%s, closing connection", txn.error.desc);
+	 ret = HTTP_TIMEOUT;
+	}
+
+	/* Read CRLF separating headers and body */
+	else if ((c = prot_getc(httpd_in)) != '\r' ||
+		 (c = prot_getc(httpd_in)) != '\n') {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = error_message(IMAP_MESSAGE_NOBLANKLINE);
+	}
+
+	if (ret) {
+	 txn.flags.conn = CONN_CLOSE;
+	 goto done;
+	}
+
+	/* Check for Connection options */
+	parse_connection(&txn);
+	if (txn.flags.conn & CONN_UPGRADE) {
+	 starttls(0);
+	 txn.flags.conn &= ~CONN_UPGRADE;
+	}
+
+	/* Check Method against our list of known methods */
+	for (txn.meth = 0; (txn.meth < METH_UNKNOWN) &&
+		 strcmp(http_methodstxn.meth.name, req_line->meth);
+	 txn.meth++);
+
+	if (txn.meth == METH_UNKNOWN) ret = HTTP_NOT_IMPLEMENTED;
+
+	/* Parse request-target URI */
+	else if (!(txn.req_uri = parse_uri(txn.meth, req_line->uri, 1,
+					 &txn.error.desc))) {
+	 ret = HTTP_BAD_REQUEST;
+	}
+
+	/* Check message framing */
+	else if ((r = parse_framing(txn.req_hdrs, &txn.req_body,
+				 &txn.error.desc))) {
+	 ret = r;
+	}
+
+	/* Check for Expectations */
+	else if ((r = parse_expect(&txn))) {
+	 ret = r;
+	}
+
+	/* Check for mandatory Host header (HTTP/1.1+ only) */
+	else if ((hdr = spool_getheader(txn.req_hdrs, "Host")) && hdr1) {
+	 ret = HTTP_BAD_REQUEST;
+	 txn.error.desc = "Too many Host headers";
+	}
+	else if (!hdr) {
+	 if (txn.flags.ver1_0) {
+		/* HTTP/1.0 - create a Host header from URI */
+		if (txn.req_uri->server) {
+		 buf_setcstr(&txn.buf, txn.req_uri->server);
+		 if (txn.req_uri->port)
+			buf_printf(&txn.buf, ":%d", txn.req_uri->port);
+		}
+		else buf_setcstr(&txn.buf, config_servername);
+
+		spool_cache_header(xstrdup("Host"),
+				 xstrdup(buf_cstring(&txn.buf)),
+				 txn.req_hdrs);
+		buf_reset(&txn.buf);
+	 }
+	 else {
+		ret = HTTP_BAD_REQUEST;
+		txn.error.desc = "Missing Host header";
+	 }
+	}
+
+	if (ret) goto done;
+
+	/* Find the namespace of the requested resource */
+	for (i = 0; namespacesi; i++) {
+	 const char *path = txn.req_uri->path;
+	 const char *query = URI_QUERY(txn.req_uri);
+	 size_t len;
+
+	 /* Skip disabled namespaces */
+	 if (!namespacesi->enabled) continue;
+
+	 /* Handle any /.well-known/ bootstrapping */
+	 if (namespacesi->well_known) {
+		len = strlen(namespacesi->well_known);
+		if (!strncmp(path, namespacesi->well_known, len) &&
+		 (!pathlen || pathlen == '/')) {
+			
+		 buf_setcstr(&txn.buf, namespacesi->prefix);
+		 buf_appendcstr(&txn.buf, path + len);
+		 if (query) buf_printf(&txn.buf, "?%s", query);
+		 txn.location = buf_cstring(&txn.buf);
+
+		 ret = HTTP_MOVED;
+		 goto done;
+		}
+	 }
+
+	 /* See if the prefix matches - terminated with NUL or '/' */
+	 len = strlen(namespacesi->prefix);
+	 if (!strncmp(path, namespacesi->prefix, len) &&
+		(!pathlen || (pathlen == '/') || !strcmp(path, "*"))) {
+		break;
+	 }
+	}
+	if ((namespace = namespacesi)) {
+	 txn.req_tgt.namespace = namespace->id;
+	 txn.req_tgt.allow = namespace->allow;
+
+	 /* Check if method is supported in this namespace */
+	 meth_t = &namespace->methodstxn.meth;
+	 if (!meth_t->proc) ret = HTTP_NOT_ALLOWED;
+
+	 /* Check if method expects a body */
+	 else if ((http_methodstxn.meth.flags & METH_NOBODY) &&
+		 (txn.req_body.framing != FRAMING_LENGTH ||
+		 /* XXX Will break if client sends just a last-chunk */
+		 txn.req_body.len)) {
+		ret = HTTP_BAD_MEDIATYPE;
+	 }
+	} else {
+	 /* XXX Should never get here */
+	 ret = HTTP_SERVER_ERROR;
+	}
+
+	if (ret) goto done;
+
+	/* Perform authentication, if necessary */
+	if ((hdr = spool_getheader(txn.req_hdrs, "Authorization"))) {
+	 if (httpd_userid) {
+		/* Reauth - reinitialize */
+		syslog(LOG_DEBUG, "reauth - reinit");
+		reset_saslconn(&httpd_saslconn);
+		txn.auth_chal.scheme = NULL;
+	 }
+
+	 /* Check the auth credentials */
+	 r = http_auth(hdr0, &txn);
+	 if ((r < 0) || !txn.auth_chal.scheme) {
+		/* Auth failed - reinitialize */
+		syslog(LOG_DEBUG, "auth failed - reinit");
+		reset_saslconn(&httpd_saslconn);
+		txn.auth_chal.scheme = NULL;
+		r = SASL_FAIL;
+	 }
+	}
+	else if (!httpd_userid && txn.auth_chal.scheme) {
+	 /* Started auth exchange, but client didn't engage - reinit */
+	 syslog(LOG_DEBUG, "client didn't complete auth - reinit");
+	 reset_saslconn(&httpd_saslconn);
+	 txn.auth_chal.scheme = NULL;
+	}
+
+	/* Perform proxy authorization, if necessary */
+	else if (saslprops.authid &&
+		 (hdr = spool_getheader(txn.req_hdrs, "Authorize-As")) &&
+		 *hdr0) {
+	 const char *authzid = hdr0;
+
+	 r = proxy_authz(&authzid, &txn);
+	 if (r) {
+		/* Proxy authz failed - reinitialize */
+		syslog(LOG_DEBUG, "proxy authz failed - reinit");
+		reset_saslconn(&httpd_saslconn);
+		txn.auth_chal.scheme = NULL;
+	 }
+	 else {
+		httpd_userid = xstrdup(authzid);
+		auth_success(&txn);
+	 }
+	}
+
+	/* Request authentication, if necessary */
+	if (!httpd_userid &&
+	 (r || (namespace->need_auth && txn.meth != METH_OPTIONS))) {
+	 need_auth:
+	 /* User must authenticate */
+
+	 if (httpd_tls_required) {
+		/* We only support TLS+Basic, so tell client to use TLS */
+
+		/* Check which response is required */
+		if ((hdr = spool_getheader(txn.req_hdrs, "Upgrade")) &&
+		 !strncmp(hdr0, TLS_VERSION, strcspn(hdr0, " ,"))) {
+		 /* Client (Murder proxy) supports RFC 2817 (TLS upgrade) */
+
+		 response_header(HTTP_UPGRADE, &txn);
+		}
+		else {
+		 /* All other clients use RFC 2818 (HTTPS) */
+		 const char *path = txn.req_uri->path;
+		 const char *query = URI_QUERY(txn.req_uri);
+		 struct buf *html = &txn.resp_body.payload;
+
+		 /* Create https URL */
+		 hdr = spool_getheader(txn.req_hdrs, "Host");
+		 buf_printf(&txn.buf, "https://%s", hdr0);
+		 if (strcmp(path, "*")) {
+			buf_appendcstr(&txn.buf, path);
+			if (query) buf_printf(&txn.buf, "?%s", query);
+		 }
+
+		 txn.location = buf_cstring(&txn.buf);
+
+		 /* Create HTML body */
+		 buf_reset(html);
+		 buf_printf(html, tls_message,
+			 buf_cstring(&txn.buf), buf_cstring(&txn.buf));
+
+		 /* Output our HTML response */
+		 txn.resp_body.type = "text/html; charset=utf-8";
+		 write_body(HTTP_MOVED, &txn,
+			 buf_cstring(html), buf_len(html));
+		}
+	 }
+	 else {
+		/* Tell client to authenticate */
+		ret = HTTP_UNAUTHORIZED;
+		if (r == SASL_CONTINUE)
+		 txn.error.desc = "Continue authentication exchange";
+		else if (r) txn.error.desc = "Authentication failed";
+		else txn.error.desc =
+			 "Must authenticate to access the specified target";
+	 }
+
+	 goto done;
+	}
+
+	/* Check if this is a Cross-Origin Resource Sharing request */
+	if (allow_cors && (hdr = spool_getheader(txn.req_hdrs, "Origin"))) {
+	 const char *err = NULL;
+	 xmlURIPtr uri = parse_uri(METH_UNKNOWN, hdr0, 0, &err);
+
+	 if (uri && uri->scheme && uri->server) {
+		int o_https = !strcasecmp(uri->scheme, "https");
+
+		if ((https == o_https) &&
+		 !strcasecmp(uri->server,
+				*spool_getheader(txn.req_hdrs, "Host"))) {
+		 txn.flags.cors = CORS_SIMPLE;
+		}
+		else {
+		 struct wildmat *wild;
+
+		 /* Create URI w/o path or default port */
+		 assert(!buf_len(&txn.buf));
+		 buf_printf(&txn.buf, "%s://%s",
+			 lcase(uri->scheme), lcase(uri->server));
+		 if (uri->port &&
+			((o_https && uri->port != 443) ||
+			 (!o_https && uri->port != 80))) {
+			buf_printf(&txn.buf, ":%d", uri->port);
+		 }
+
+		 /* Check Origin against the 'httpallowcors' wildmat */
+		 for (wild = allow_cors; wild->pat; wild++) {
+			if (wildmat(buf_cstring(&txn.buf), wild->pat)) {
+			 /* If we have a non-negative match, allow request */
+			 if (!wild->not) txn.flags.cors = CORS_SIMPLE;
+			 break;
+			}
+		 }
+		 buf_reset(&txn.buf);
+		}
+	 }
+	 xmlFreeURI(uri);
+	}
+
+	/* Check if we should compress response body */
+	if (gzip_enabled) {
+	 /* XXX Do we want to support deflate even though M$
+	 doesn't implement it correctly (raw deflate vs. zlib)? */
+
+	 if (!txn.flags.ver1_0 &&
+		(hdr = spool_getheader(txn.req_hdrs, "TE"))) {
+		struct accept *e, *enc = parse_accept(hdr);
+
+		for (e = enc; e && e->token; e++) {
+		 if (!strcasecmp(e->token, "gzip") ||
+			!strcasecmp(e->token, "x-gzip")) {
+			txn.flags.te = TE_GZIP;
+		 }
+		 free(e->token);
+		}
+		if (enc) free(enc);
+	 }
+	 else if ((hdr = spool_getheader(txn.req_hdrs, "Accept-Encoding"))) {
+		struct accept *e, *enc = parse_accept(hdr);
+
+		for (e = enc; e && e->token; e++) {
+		 if (!strcasecmp(e->token, "gzip") ||
+			!strcasecmp(e->token, "x-gzip")) {
+			txn.resp_body.enc = CE_GZIP;
+		 }
+		 free(e->token);
+		}
+		if (enc) free(enc);
+	 }
+	}
+
+	/* Start method processing alarm (HTTP/1.1+ only) */
+	if (!txn.flags.ver1_0) alarm(httpd_keepalive);
+
+	/* Process the requested method */
+	ret = (*meth_t->proc)(&txn, meth_t->params);
+	if (ret == HTTP_UNAUTHORIZED) goto need_auth;
+
+ done:
+	/* Handle errors (success responses handled by method functions) */
+	if (ret) error_response(ret, &txn);
+
+	/* Read and discard any unread request body */
+	if (!(txn.flags.conn & CONN_CLOSE)) {
+	 txn.req_body.flags |= BODY_DISCARD;
+	 if (read_body(httpd_in, txn.req_hdrs, &txn.req_body,
+			 &txn.error.desc)) {
+		txn.flags.conn = CONN_CLOSE;
+	 }
+	}
+
+	/* Memory cleanup */
+	if (txn.req_uri) xmlFreeURI(txn.req_uri);
+	if (txn.req_hdrs) spool_free_hdrcache(txn.req_hdrs);
+
+	if (txn.flags.conn & CONN_CLOSE) {
+	 buf_free(&txn.buf);
+	 buf_free(&txn.req_body.payload);
+	 buf_free(&txn.resp_body.payload);
+#ifdef HAVE_ZLIB
+	 deflateEnd(&txn.zstrm);
+	 buf_free(&txn.zbuf);
+#endif
+	 return;
+	}
+
+	continue;
+ }
+}
+
+/**************************** Parsing Routines ******************************/
+
+/* Parse URI, returning the path */
+EXPORTED xmlURIPtr parse_uri(unsigned meth, const char *uri, unsigned path_reqd,
+		 const char **errstr)
+{
+ xmlURIPtr p_uri; /* parsed URI */
+
+ /* Parse entire URI */
+ if ((p_uri = xmlParseURI(uri)) == NULL) {
+	*errstr = "Illegal request target URI";
+	goto bad_request;
+ }
+
+ if (p_uri->scheme) {
+	/* Check sanity of scheme */
+
+	if (strcasecmp(p_uri->scheme, "http") &&
+	 strcasecmp(p_uri->scheme, "https")) {
+	 *errstr = "Unsupported URI scheme";
+	 goto bad_request;
+	}
+ }
+
+ /* Check sanity of path */
+ if (path_reqd && (!p_uri->path || !*p_uri->path)) {
+	*errstr = "Empty path in target URI";
+	goto bad_request;
+ }
+ else if (p_uri->path) {
+	if ((p_uri->path0 != '/') &&
+	 (strcmp(p_uri->path, "*") || (meth != METH_OPTIONS))) {
+	 /* No special URLs except for "OPTIONS * HTTP/1.1" */
+	 *errstr = "Illegal request target URI";
+	 goto bad_request;
+	}
+	else if (strstr(p_uri->path, "/..")) {
+	 /* Don't allow access up directory tree */
+	 *errstr = "Illegal request target URI";
+	 goto bad_request;
+	}
+	else if (strlen(p_uri->path) > MAX_MAILBOX_PATH) {
+	 *errstr = "Request target URI too long";
+	 goto bad_request;
+	}
+ }
+
+ return p_uri;
+
+ bad_request:
+ if (p_uri) xmlFreeURI(p_uri);
+ return NULL;
+}
+
+
+/* Compare Content-Types */
+EXPORTED int is_mediatype(const char *hdr, const char *type)
+{
+ size_t tlen = strcspn(type, "; \r\n\0");
+ size_t hlen = strcspn(hdr, "; \r\n\0");
+
+ return ((tlen == hlen) && !strncasecmp(hdr, type, tlen));
+}
+
+
+/* Calculate compile time of a file for use as Last-Modified and/or ETag */
+EXPORTED time_t calc_compile_time(const char *time, const char *date)
+{
+ struct tm tm;
+ char month4;
+ const char *monthname = {
+	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+
+ memset(&tm, 0, sizeof(struct tm));
+ tm.tm_isdst = -1;
+ sscanf(time, "%02d:%02d:%02d", &tm.tm_hour, &tm.tm_min, &tm.tm_sec);
+ sscanf(date, "%s %2d %4d", month, &tm.tm_mday, &tm.tm_year);
+ tm.tm_year -= 1900;
+ for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
+	if (!strcmp(month, monthnametm.tm_mon)) break;
+ }
+
+ return mktime(&tm);
+}
+
+
+/*
+ * Parse the framing of a request or response message.
+ * Handles chunked, gzip, deflate TE only.
+ * Handles close-delimited response bodies (no Content-Length specified) 
+ */
+EXPORTED int parse_framing(hdrcache_t hdrs, struct body_t *body, const char **errstr)
+{
+ static unsigned max_msgsize = 0;
+ const char **hdr;
+
+ if (!max_msgsize) {
+	max_msgsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+
+	/* If max_msgsize is 0, allow any size */
+	if (!max_msgsize) max_msgsize = INT_MAX;
+ }
+
+ body->framing = FRAMING_LENGTH;
+ body->te = TE_NONE;
+ body->len = 0;
+ body->max = max_msgsize;
+
+ /* Check for Transfer-Encoding */
+ if ((hdr = spool_getheader(hdrs, "Transfer-Encoding"))) {
+	for (; *hdr; hdr++) {
+	 tok_t tok = TOK_INITIALIZER(*hdr, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	 char *token;
+
+	 while ((token = tok_next(&tok))) {
+		if (body->te & TE_CHUNKED) {
+		 /* "chunked" MUST only appear once and MUST be last */
+		 break;
+		}
+		else if (!strcasecmp(token, "chunked")) {
+		 body->te |= TE_CHUNKED;
+		 body->framing = FRAMING_CHUNKED;
+		}
+		else if (body->te & ~TE_CHUNKED) {
+		 /* can't combine compression codings */
+		 break;
+		}
+#ifdef HAVE_ZLIB
+		else if (!strcasecmp(token, "deflate"))
+		 body->te = TE_DEFLATE;
+		else if (!strcasecmp(token, "gzip") ||
+			 !strcasecmp(token, "x-gzip"))
+		 body->te = TE_GZIP;
+#endif
+		else if (!(body->flags & BODY_DISCARD)) {
+		 /* unknown/unsupported TE */
+		 break;
+		}
+	 }
+	 tok_fini(&tok);
+	 if (token) break; /* error */
+	}
+
+	if (*hdr) {
+	 *errstr = "Specified Transfer-Encoding not implemented";
+	 return HTTP_NOT_IMPLEMENTED;
+	}
+
+	/* Check if this is a non-chunked response */
+	else if (!(body->te & TE_CHUNKED)) {
+	 if ((body->flags & BODY_RESPONSE) && (body->flags & BODY_CLOSE)) {
+		body->framing = FRAMING_CLOSE;
+	 }
+	 else {
+		*errstr = "Final Transfer-Encoding MUST be \"chunked\"";
+		return HTTP_NOT_IMPLEMENTED;
+	 }
+	}
+ }
+
+ /* Check for Content-Length */
+ else if ((hdr = spool_getheader(hdrs, "Content-Length"))) {
+	if (hdr1) {
+	 *errstr = "Multiple Content-Length header fields";
+	 return HTTP_BAD_REQUEST;
+	}
+
+	body->len = strtoul(hdr0, NULL, 10);
+	if (body->len > max_msgsize) return HTTP_TOO_LARGE;
+
+	body->framing = FRAMING_LENGTH;
+ }
+	
+ /* Check if this is a close-delimited response */
+ else if (body->flags & BODY_RESPONSE) {
+	if (body->flags & BODY_CLOSE) body->framing = FRAMING_CLOSE;
+	else return HTTP_LENGTH_REQUIRED;
+ }
+
+ return 0;
+}
+
+
+/*
+ * Read the body of a request or response.
+ * Handles chunked, gzip, deflate TE only.
+ * Handles close-delimited response bodies (no Content-Length specified) 
+ * Handles gzip and deflate CE only.
+ */
+EXPORTED int read_body(struct protstream *pin, hdrcache_t hdrs, struct body_t *body,
+	 const char **errstr)
+{
+ char bufPROT_BUFSIZE;
+ unsigned n;
+ int r = 0;
+
+ syslog(LOG_DEBUG, "read_body(%#x)", body->flags);
+
+ if (body->flags & BODY_DONE) return 0;
+ body->flags |= BODY_DONE;
+
+ if (!(body->flags & BODY_DISCARD)) buf_reset(&body->payload);
+ else if (body->flags & BODY_CONTINUE) {
+	/* Don't care about the body and client hasn't sent it, we're done */
+	return 0;
+ }
+
+ if (body->framing == FRAMING_UNKNOWN) {
+	/* Get message framing */
+	r = parse_framing(hdrs, body, errstr);
+	if (r) return r;
+ }
+
+ if (body->flags & BODY_CONTINUE) {
+	/* Tell client to send the body */
+	response_header(HTTP_CONTINUE, NULL);
+ }
+
+ /* Read and buffer the body */
+ switch (body->framing) {
+ case FRAMING_LENGTH:
+	/* Read 'len' octets */
+	for (; body->len; body->len -= n) {
+	 if (body->flags & BODY_DISCARD)
+		n = prot_read(pin, buf, MIN(body->len, PROT_BUFSIZE));
+	 else
+		n = prot_readbuf(pin, &body->payload, body->len);
+
+	 if (!n) {
+		syslog(LOG_ERR, "prot_read() error");
+		*errstr = "Unable to read body data";
+		goto read_failure;
+	 }
+	}
+
+	break;
+
+ case FRAMING_CHUNKED:
+ {
+	unsigned last = 0;
+
+	/* Read chunks until last-chunk (zero chunk-size) */
+	do {
+	 unsigned chunk;
+
+	 /* Read chunk-size */
+	 if (!prot_fgets(buf, PROT_BUFSIZE, pin) ||
+		sscanf(buf, "%x", &chunk) != 1) {
+		*errstr = "Unable to read chunk size";
+		goto read_failure;
+
+		/* XXX Do we need to parse chunk-ext? */
+	 }
+	 else if (chunk > body->max - body->len) return HTTP_TOO_LARGE;
+
+	 if (!chunk) {
+		/* last-chunk */
+		last = 1;
+
+		/* Read/parse any trailing headers */
+		spool_fill_hdrcache(pin, NULL, hdrs, NULL);
+	 }
+	 
+	 /* Read 'chunk' octets */ 
+	 for (; chunk; chunk -= n) {
+		if (body->flags & BODY_DISCARD)
+		 n = prot_read(pin, buf, MIN(chunk, PROT_BUFSIZE));
+		else
+		 n = prot_readbuf(pin, &body->payload, chunk);
+		
+		if (!n) {
+		 syslog(LOG_ERR, "prot_read() error");
+		 *errstr = "Unable to read chunk data";
+		 goto read_failure;
+		}
+		body->len += n;
+	 }
+
+	 /* Read CRLF terminating the chunk/trailer */
+	 if (!prot_fgets(buf, sizeof(buf), pin)) {
+		*errstr = "Missing CRLF following chunk/trailer";
+		goto read_failure;
+	 }
+
+	} while (!last);
+
+	body->te &= ~TE_CHUNKED;
+
+	break;
+ }
+
+ case FRAMING_CLOSE:
+	/* Read until EOF */
+	do {
+	 if (body->flags & BODY_DISCARD)
+		n = prot_read(pin, buf, PROT_BUFSIZE);
+	 else
+		n = prot_readbuf(pin, &body->payload, PROT_BUFSIZE);
+
+	 if (n > body->max - body->len) return HTTP_TOO_LARGE;
+	 body->len += n;
+
+	} while (n);
+
+	if (!pin->eof) goto read_failure;
+
+	break;
+
+ default:
+	/* XXX Should never get here */
+	*errstr = "Unknown length of read body data";
+	goto read_failure;
+ }
+
+
+ if (!(body->flags & BODY_DISCARD) && buf_len(&body->payload)) {
+#ifdef HAVE_ZLIB
+	/* Decode the payload, if necessary */
+	if (body->te == TE_DEFLATE)
+	 r = buf_inflate(&body->payload, DEFLATE_ZLIB);
+	else if (body->te == TE_GZIP)
+	 r = buf_inflate(&body->payload, DEFLATE_GZIP);
+
+	if (r) {
+	 *errstr = "Error decoding payload";
+	 return HTTP_BAD_REQUEST;
+	}
+#endif
+
+	/* Decode the representation, if necessary */
+	if (body->flags & BODY_DECODE) {
+	 const char **hdr;
+
+	 if (!(hdr = spool_getheader(hdrs, "Content-Encoding"))) {
+		/* nothing to see here */
+	 }
+
+#ifdef HAVE_ZLIB
+	 else if (!strcasecmp(hdr0, "deflate")) {
+		const char **ua = spool_getheader(hdrs, "User-Agent");
+
+		/* Try to detect Microsoft's broken deflate */
+		if (ua && strstr(ua0, "; MSIE "))
+		 r = buf_inflate(&body->payload, DEFLATE_RAW);
+		else
+		 r = buf_inflate(&body->payload, DEFLATE_ZLIB);
+	 }
+	 else if (!strcasecmp(hdr0, "gzip") ||
+		 !strcasecmp(hdr0, "x-gzip"))
+		r = buf_inflate(&body->payload, DEFLATE_GZIP);
+#endif
+	 else {
+		*errstr = "Specified Content-Encoding not accepted";
+		return HTTP_BAD_MEDIATYPE;
+	 }
+
+	 if (r) {
+		*errstr = "Error decoding content";
+		return HTTP_BAD_REQUEST;
+	 }
+	}
+ }
+
+ return 0;
+
+ read_failure:
+ if (strcmpsafe(prot_error(httpd_in), PROT_EOF_STRING)) {
+	/* client timed out */
+	*errstr = prot_error(httpd_in);
+	syslog(LOG_WARNING, "%s, closing connection", *errstr);
+	return HTTP_TIMEOUT;
+ }
+ else return HTTP_BAD_REQUEST;
+}
+
+
+/* Parse Expect header(s) for interesting expectations */
+static int parse_expect(struct transaction_t *txn)
+{
+ const char **exp = spool_getheader(txn->req_hdrs, "Expect");
+ int i, ret = 0;
+
+ /* Expect not supported by HTTP/1.0 clients */
+ if (exp && txn->flags.ver1_0) return HTTP_EXPECT_FAILED;
+
+ /* Look for interesting expectations. Unknown == error */
+ for (i = 0; !ret && exp && expi; i++) {
+	tok_t tok = TOK_INITIALIZER(expi, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	char *token;
+
+	while (!ret && (token = tok_next(&tok))) {
+	 /* Check if this is a non-persistent connection */
+	 if (!strcasecmp(token, "100-continue")) {
+		syslog(LOG_DEBUG, "Expect: 100-continue");
+		txn->req_body.flags |= BODY_CONTINUE;
+	 }
+	 else {
+		txn->error.desc = "Unsupported Expectation";
+		ret = HTTP_EXPECT_FAILED;
+	 }
+	}
+
+	tok_fini(&tok);
+ }
+
+ return ret;
+}
+
+
+/* Parse Connection header(s) for interesting options */
+static void parse_connection(struct transaction_t *txn)
+{
+ const char **conn = spool_getheader(txn->req_hdrs, "Connection");
+ int i;
+
+ /* Look for interesting connection tokens */
+ for (i = 0; conn && conni; i++) {
+	tok_t tok = TOK_INITIALIZER(conni, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	char *token;
+
+	while ((token = tok_next(&tok))) {
+	 if (httpd_timeout) {
+		/* Check if this is a non-persistent connection */
+		if (!strcasecmp(token, "close")) {
+		 txn->flags.conn |= CONN_CLOSE;
+		 continue;
+		}
+
+		/* Check if this is a persistent connection */
+		else if (!strcasecmp(token, "keep-alive")) {
+		 txn->flags.conn |= CONN_KEEPALIVE;
+		 continue;
+		}
+	 }
+
+	 /* Check if we need to upgrade to TLS */
+	 if (!httpd_tls_done && tls_enabled() &&
+		 !strcasecmp(token, "Upgrade")) {
+		const char **upgrd;
+
+		if ((upgrd = spool_getheader(txn->req_hdrs, "Upgrade")) &&
+		 !strncmp(upgrd0, TLS_VERSION, strcspn(upgrd0, " ,"))) {
+		 syslog(LOG_DEBUG, "client requested TLS");
+		 txn->flags.conn |= CONN_UPGRADE;
+		}
+	 }
+	}
+
+	tok_fini(&tok);
+ }
+
+ if (!httpd_timeout) txn->flags.conn |= CONN_CLOSE;
+ else if (txn->flags.conn & CONN_CLOSE) {
+	/* close overrides keep-alive */
+	txn->flags.conn &= ~CONN_KEEPALIVE;
+ }
+ else if (txn->flags.ver1_0 && !(txn->flags.conn & CONN_KEEPALIVE)) {
+	/* HTTP/1.0 - non-persistent connection unless keep-alive */
+	txn->flags.conn |= CONN_CLOSE;
+ }
+}
+
+
+/* Compare accept quality values so that they sort in descending order */
+static int compare_accept(const struct accept *a1, const struct accept *a2)
+{
+ if (a2->qual < a1->qual) return -1;
+ if (a2->qual > a1->qual) return 1;
+ return 0;
+}
+
+struct accept *parse_accept(const char **hdr)
+{
+ int i, n = 0, alloc = 0;
+ struct accept *ret = NULL;
+#define GROW_ACCEPT 10;
+
+ for (i = 0; hdr && hdri; i++) {
+	tok_t tok = TOK_INITIALIZER(hdri, ";,", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	char *token;
+
+	while ((token = tok_next(&tok))) {
+	 if (!strncmp(token, "q=", 2)) {
+		if (!ret) break;
+		retn-1.qual = strtof(token+2, NULL);
+	 }
+	 else {
+		if (n + 1 >= alloc) {
+		 alloc += GROW_ACCEPT;
+		 ret = xrealloc(ret, alloc * sizeof(struct accept));
+		}
+		retn.token = xstrdup(token);
+		retn.qual = 1.0;
+		ret++n.token = NULL;
+	 }
+	}
+	tok_fini(&tok);
+ }
+
+ qsort(ret, n, sizeof(struct accept),
+	 (int (*)(const void *, const void *)) &compare_accept);
+
+ return ret;
+}
+
+
+/**************************** Response Routines *****************************/
+
+
+/* Create HTTP-date ('buf' must be at least 30 characters) */
+EXPORTED void httpdate_gen(char *buf, size_t len, time_t t)
+{
+ struct tm *tm;
+ static char *month = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+			 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+ static char *wday = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+
+ tm = gmtime(&t);
+
+ snprintf(buf, len, "%3s, %02d %3s %4d %02d:%02d:%02d GMT",
+	 wdaytm->tm_wday, 
+	 tm->tm_mday, monthtm->tm_mon, tm->tm_year + 1900,
+	 tm->tm_hour, tm->tm_min, tm->tm_sec);
+}
+
+
+/* Create an HTTP Status-Line given response code */
+EXPORTED const char *http_statusline(long code)
+{
+ static struct buf statline = BUF_INITIALIZER;
+ static unsigned tail = 0;
+
+ if (!tail) {
+	buf_setcstr(&statline, HTTP_VERSION);
+	buf_putc(&statline, ' ');
+	tail = buf_len(&statline);
+ }
+
+ buf_truncate(&statline, tail);
+ buf_appendcstr(&statline, error_message(code));
+ return buf_cstring(&statline);
+}
+
+
+/* Output an HTTP response header.
+ * 'code' specifies the HTTP Status-Code and Reason-Phrase.
+ * 'txn' contains the transaction context
+ */
+
+#define WWW_Authenticate(name, param)				\
+ prot_printf(httpd_out, "WWW-Authenticate: %s", name);	\
+ if (param) prot_printf(httpd_out, " %s", param);		\
+ prot_puts(httpd_out, "\r\n")
+
+#define Access_Control_Expose(hdr)				\
+ prot_puts(httpd_out, "Access-Control-Expose-Headers: " hdr "\r\n")
+
+EXPORTED void comma_list_hdr(const char *hdr, const char *vals, unsigned flags, ...)
+{
+ const char *sep = " ";
+ va_list args;
+ int i;
+
+ va_start(args, flags);
+ prot_printf(httpd_out, "%s:", hdr);
+ for (i = 0; valsi; i++) {
+	if (flags & (1 << i)) {
+	 prot_puts(httpd_out, sep);
+	 prot_vprintf(httpd_out, valsi, args);
+	 sep = ", ";
+	}
+	else {
+	 /* discard any unused args */
+	 vsnprintf(NULL, 0, valsi, args);
+	}
+ }
+ prot_puts(httpd_out, "\r\n");
+ va_end(args);
+}
+
+EXPORTED void allow_hdr(const char *hdr, unsigned allow)
+{
+ const char *meths = {
+	"OPTIONS, GET, HEAD", "POST", "PUT", "DELETE", "TRACE", NULL
+ };
+
+ comma_list_hdr(hdr, meths, allow);
+
+ if (allow & ALLOW_DAV) {
+	prot_printf(httpd_out, "%s: PROPFIND, REPORT", hdr);
+	if (allow & ALLOW_WRITE) {
+	 prot_puts(httpd_out, ", COPY, MOVE, LOCK, UNLOCK");
+	}
+	if (allow & ALLOW_WRITECOL) {
+	 prot_puts(httpd_out, ", PROPPATCH, MKCOL, ACL");
+	 if (allow & ALLOW_CAL) {
+		prot_printf(httpd_out, "\r\n%s: MKCALENDAR", hdr);
+	 }
+	}
+	prot_puts(httpd_out, "\r\n");
+ }
+}
+
+#define MD5_BASE64_LEN 25 /* ((MD5_DIGEST_LENGTH / 3) + 1) * 4 */
+
+EXPORTED void Content_MD5(const unsigned char *md5)
+{
+ char base64MD5_BASE64_LEN+1;
+
+ sasl_encode64((char *) md5, MD5_DIGEST_LENGTH,
+		 base64, MD5_BASE64_LEN, NULL);
+ prot_printf(httpd_out, "Content-MD5: %s\r\n", base64);
+}
+
+
+EXPORTED void response_header(long code, struct transaction_t *txn)
+{
+ time_t now;
+ char datestr30;
+ unsigned keepalive;
+ const char **hdr;
+ struct auth_challenge_t *auth_chal;
+ struct resp_body_t *resp_body;
+ static struct buf log = BUF_INITIALIZER;
+
+ /* Stop method processing alarm */
+ keepalive = alarm(0);
+
+
+ /* Status-Line */
+ prot_printf(httpd_out, "%s\r\n", http_statusline(code));
+
+
+ /* Connection Management */
+ switch (code) {
+ case HTTP_SWITCH_PROT:
+	keepalive = 0; /* No alarm during TLS negotiation */
+
+	prot_printf(httpd_out, "Upgrade: %s\r\n", TLS_VERSION);
+	prot_puts(httpd_out, "Connection: Upgrade\r\n");
+
+	/* Fall through as provisional response */
+
+ case HTTP_CONTINUE:
+ case HTTP_PROCESSING:
+	/* Provisional response - nothing else needed */
+
+	/* CRLF terminating the header block */
+	prot_puts(httpd_out, "\r\n");
+
+	/* Force the response to the client immediately */
+	prot_flush(httpd_out);
+
+	/* Reset method processing alarm */
+	alarm(keepalive);
+
+	return;
+
+ case HTTP_UPGRADE:
+	txn->flags.conn |= CONN_UPGRADE;
+	prot_printf(httpd_out, "Upgrade: %s\r\n", TLS_VERSION);
+
+	/* Fall through as final response */
+
+ default:
+	/* Final response */
+	if (txn->flags.conn) {
+	 /* Construct Connection header */
+	 const char *conn_tokens =
+		{ "close", "Upgrade", "Keep-Alive", NULL };
+
+	 if (txn->flags.conn & CONN_KEEPALIVE) {
+		prot_printf(httpd_out, "Keep-Alive: timeout=%d\r\n",
+			 httpd_timeout);
+	 }
+
+	 comma_list_hdr("Connection", conn_tokens, txn->flags.conn);
+	}
+
+	auth_chal = &txn->auth_chal;
+	resp_body = &txn->resp_body;
+ }
+
+
+ /* Control Data */
+ now = time(0);
+ httpdate_gen(datestr, sizeof(datestr), now);
+ prot_printf(httpd_out, "Date: %s\r\n", datestr);
+
+ if (httpd_tls_done) {
+	prot_puts(httpd_out, "Strict-Transport-Security: max-age=600\r\n");
+ }
+ if (txn->location) {
+	prot_printf(httpd_out, "Location: %s\r\n", txn->location);
+ }
+ if (txn->flags.cc) {
+	/* Construct Cache-Control header */
+	const char *cc_dirs =
+	 { "must-revalidate", "no-cache", "no-store", "no-transform",
+	 "public", "private", "max-age=%d", NULL };
+
+	comma_list_hdr("Cache-Control", cc_dirs, txn->flags.cc,
+		 resp_body->maxage);
+
+	if (txn->flags.cc & CC_MAXAGE) {
+	 httpdate_gen(datestr, sizeof(datestr), now + resp_body->maxage);
+	 prot_printf(httpd_out, "Expires: %s\r\n", datestr);
+	}
+ }
+ if (txn->flags.cors) {
+	/* Construct Cross-Origin Resource Sharing headers */
+	prot_printf(httpd_out, "Access-Control-Allow-Origin: %s\r\n",
+		 *spool_getheader(txn->req_hdrs, "Origin"));
+	prot_puts(httpd_out, "Access-Control-Allow-Credentials: true\r\n");
+
+	if (txn->flags.cors == CORS_PREFLIGHT) {
+	 allow_hdr("Access-Control-Allow-Methods", txn->req_tgt.allow);
+
+	 for (hdr = spool_getheader(txn->req_hdrs,
+				 "Access-Control-Request-Headers");
+		 hdr && *hdr; hdr++) {
+		prot_printf(httpd_out,
+			 "Access-Control-Allow-Headers: %s\r\n", *hdr);
+	 }
+	 prot_puts(httpd_out, "Access-Control-Max-Age: 3600\r\n");
+	}
+ }
+ if (txn->flags.vary) {
+	/* Construct Vary header */
+	const char *vary_hdrs =
+	 { "Accept", "Accept-Encoding", "Brief", "Prefer", NULL };
+
+	comma_list_hdr("Vary", vary_hdrs, txn->flags.vary);
+ }
+
+
+ /* Response Context */
+ if (config_serverinfo == IMAP_ENUM_SERVERINFO_ON) {
+	prot_printf(httpd_out, "Server: %s\r\n", buf_cstring(&serverinfo));
+ }
+ if (txn->req_tgt.allow & ALLOW_ISCHEDULE) {
+	prot_puts(httpd_out, "iSchedule-Version: 1.0\r\n");
+	if (resp_body->iserial) {
+	 prot_printf(httpd_out, "iSchedule-Capabilities: %ld\r\n",
+			resp_body->iserial);
+	}
+ }
+ if (resp_body->prefs) {
+	/* Construct Preference-Applied header */
+	const char *prefs =
+	 { "return=minimal", "return=representation", "depth-noroot", NULL };
+
+	comma_list_hdr("Preference-Applied", prefs, resp_body->prefs);
+	if (txn->flags.cors) Access_Control_Expose("Preference-Applied");
+ }
+
+ switch (code) {
+ case HTTP_OK:
+	switch (txn->meth) {
+	case METH_GET:
+	case METH_HEAD:
+	 /* Construct Accept-Ranges header for GET and HEAD responses */
+	 prot_printf(httpd_out, "Accept-Ranges: %s\r\n",
+			txn->flags.ranges ? "bytes" : "none");
+	 break;
+
+	case METH_OPTIONS:
+	 if (txn->req_tgt.allow & ALLOW_DAV) {
+		/* Construct DAV header(s) based on namespace of request URL */
+		prot_printf(httpd_out, "DAV: 1,%s 3, access-control%s\r\n",
+			 (txn->req_tgt.allow & ALLOW_WRITE) ? " 2," : "",
+			 (txn->req_tgt.allow & ALLOW_WRITECOL) ?
+			 ", extended-mkcol" : "");
+		if (txn->req_tgt.allow & ALLOW_CAL) {
+		 prot_printf(httpd_out, "DAV: calendar-access%s\r\n",
+				(txn->req_tgt.allow & ALLOW_CAL_SCHED) ?
+				", calendar-auto-schedule" : "");
+		}
+		if (txn->req_tgt.allow & ALLOW_CARD) {
+		 prot_puts(httpd_out, "DAV: addressbook\r\n");
+		}
+	 }
+
+	 if (txn->flags.cors == CORS_PREFLIGHT) {
+		/* Access-Control-Allow-Methods supersedes Allow */
+		break;
+	 }
+	 else goto allow;
+	}
+	goto authorized;
+
+ case HTTP_NOT_ALLOWED:
+ allow:
+	/* Construct Allow header(s) for OPTIONS and 405 response */
+	allow_hdr("Allow", txn->req_tgt.allow);
+	goto authorized;
+
+ case HTTP_UNAUTHORIZED:
+	/* Authentication Challenges */
+	if (!auth_chal->scheme) {
+	 /* Require authentication by advertising all possible schemes */
+	 struct auth_scheme_t *scheme;
+
+	 for (scheme = auth_schemes; scheme->name; scheme++) {
+		/* Only advertise what is available and
+		 can work with the type of connection */
+		if ((avail_auth_schemes & (1 << scheme->idx)) &&
+		 !((txn->flags.conn & CONN_CLOSE) &&
+		 (scheme->flags & AUTH_NEED_PERSIST))) {
+		 auth_chal->param = NULL;
+
+		 if (scheme->flags & AUTH_SERVER_FIRST) {
+			/* Generate the initial challenge */
+			http_auth(scheme->name, txn);
+
+			if (!auth_chal->param) continue; /* If fail, skip it */
+		 }
+		 WWW_Authenticate(scheme->name, auth_chal->param);
+		}
+	 }
+	}
+	else {
+	 /* Continue with current authentication exchange */ 
+	 WWW_Authenticate(auth_chal->scheme->name, auth_chal->param);
+	}
+	break;
+
+ default:
+ authorized:
+	/* Authentication completed/unnecessary */
+	if (auth_chal->param) {
+	 /* Authentication completed with success data */
+	 if (auth_chal->scheme->send_success) {
+		/* Special handling of success data for this scheme */
+		auth_chal->scheme->send_success(auth_chal->scheme->name,
+						auth_chal->param);
+	 }
+	 else {
+		/* Default handling of success data */
+		WWW_Authenticate(auth_chal->scheme->name, auth_chal->param);
+	 }
+	}
+ }
+
+
+ /* Validators */
+ if (resp_body->lock) {
+	prot_printf(httpd_out, "Lock-Token: <%s>\r\n", resp_body->lock);
+	if (txn->flags.cors) Access_Control_Expose("Lock-Token");
+ }
+ if (resp_body->stag) {
+	prot_printf(httpd_out, "Schedule-Tag: \"%s\"\r\n", resp_body->stag);
+	if (txn->flags.cors) Access_Control_Expose("Schedule-Tag");
+ }
+ if (resp_body->etag) {
+	prot_printf(httpd_out, "ETag: %s\"%s\"\r\n",
+		 resp_body->enc ? "W/" : "", resp_body->etag);
+	if (txn->flags.cors) Access_Control_Expose("ETag");
+ }
+ if (resp_body->lastmod) {
+	/* Last-Modified MUST NOT be in the future */
+	resp_body->lastmod = MIN(resp_body->lastmod, now);
+	httpdate_gen(datestr, sizeof(datestr), resp_body->lastmod);
+	prot_printf(httpd_out, "Last-Modified: %s\r\n", datestr);
+ }
+
+
+ /* Representation Metadata */
+ if (resp_body->type) {
+	prot_printf(httpd_out, "Content-Type: %s\r\n", resp_body->type);
+
+	if (resp_body->fname) {
+	 prot_printf(httpd_out,
+			"Content-Disposition: inline; filename=\"%s\"\r\n",
+			resp_body->fname);
+	}
+	if (txn->resp_body.enc) {
+	 /* Construct Content-Encoding header */
+	 const char *ce =
+		{ "deflate", "gzip", NULL };
+
+	 comma_list_hdr("Content-Encoding", ce, txn->resp_body.enc);
+	}
+	if (resp_body->lang) {
+	 prot_printf(httpd_out, "Content-Language: %s\r\n", resp_body->lang);
+	}
+	if (resp_body->loc) {
+	 prot_printf(httpd_out, "Content-Location: %s\r\n", resp_body->loc);
+	 if (txn->flags.cors) Access_Control_Expose("Content-Location");
+	}
+	if (resp_body->md5) {
+	 Content_MD5(resp_body->md5);
+	}
+ }
+
+
+ /* Payload */
+ switch (code) {
+ case HTTP_NO_CONTENT:
+ case HTTP_NOT_MODIFIED:
+	/* MUST NOT include a body */
+	break;
+
+ case HTTP_UNSAT_RANGE:
+	prot_printf(httpd_out, "Content-Range: bytes */%lu\r\n",
+		 resp_body->len);
+	resp_body->len = 0; /* No content */
+
+	/* Fall through and specify framing */
+
+ case HTTP_PARTIAL:
+	if (resp_body->range) {
+	 prot_printf(httpd_out, "Content-Range: bytes %lu-%lu/%lu\r\n",
+			resp_body->range->first, resp_body->range->last,
+			resp_body->len);
+
+	 /* Set actual content length of range */
+	 resp_body->len = resp_body->range->last -
+		resp_body->range->first + 1;
+
+	 free(resp_body->range);
+	}
+
+	/* Fall through and specify framing */
+
+ default:
+	if (txn->flags.te) {
+	 /* HTTP/1.1+ only - we use close-delimiting for HTTP/1.0 */
+	 if (!txn->flags.ver1_0) {
+		/* Construct Transfer-Encoding header */
+		const char *te =
+		 { "deflate", "gzip", "chunked", NULL };
+
+		comma_list_hdr("Transfer-Encoding", te, txn->flags.te);
+
+		if (txn->flags.trailer) {
+		 /* Construct Trailer header */
+		 const char *trailer_hdrs =
+			{ "Content-MD5", NULL };
+
+		 comma_list_hdr("Trailer", trailer_hdrs, txn->flags.trailer);
+		}
+	 }
+	}
+	else prot_printf(httpd_out, "Content-Length: %lu\r\n", resp_body->len);
+ }
+
+
+ /* CRLF terminating the header block */
+ prot_puts(httpd_out, "\r\n");
+
+
+ /* Log the client request and our response */
+ buf_reset(&log);
+ /* Add client data */
+ buf_printf(&log, "%s", httpd_clienthost);
+ if (proxy_userid) buf_printf(&log, " as \"%s\"", proxy_userid);
+ if (txn->req_hdrs &&
+	(hdr = spool_getheader(txn->req_hdrs, "User-Agent"))) {
+	buf_printf(&log, " with \"%s\"", hdr0);
+	if ((hdr = spool_getheader(txn->req_hdrs, "X-Client")))
+	 buf_printf(&log, " by \"%s\"", hdr0);
+	else if ((hdr = spool_getheader(txn->req_hdrs, "X-Requested-With")))
+	 buf_printf(&log, " by \"%s\"", hdr0);
+ }
+ /* Add request-line */
+ buf_appendcstr(&log, "; \"");
+ if (txn->req_line.meth) {
+	buf_printf(&log, "%s", txn->req_line.meth);
+	if (txn->req_line.uri) {
+	 buf_printf(&log, " %s", txn->req_line.uri);
+	 if (txn->req_line.ver) {
+		buf_printf(&log, " %s", txn->req_line.ver);
+		if (code != HTTP_TOO_LONG) {
+		 char *p = txn->req_line.ver + strlen(txn->req_line.ver) + 1;
+		 if (*p) buf_printf(&log, " %s", p);
+		}
+	 }
+	}
+ }
+ buf_appendcstr(&log, "\"");
+ if (txn->req_hdrs) {
+	/* Add any request modifying headers */
+	const char *sep = " (";
+
+	if ((hdr = spool_getheader(txn->req_hdrs, "Origin"))) {
+	 buf_printf(&log, "%sorigin=%s", sep, hdr0);
+	 sep = "; ";
+	}
+	if ((hdr = spool_getheader(txn->req_hdrs, "Referer"))) {
+	 buf_printf(&log, "%sreferer=%s", sep, hdr0);
+	 sep = "; ";
+	}
+	if ((hdr = spool_getheader(txn->req_hdrs, "Destination"))) {
+	 buf_printf(&log, "%sdestination=%s", sep, hdr0);
+	 sep = "; ";
+	}
+	if ((hdr = spool_getheader(txn->req_hdrs, ":type"))) {
+	 buf_printf(&log, "%stype=%s", sep, hdr0);
+	 sep = "; ";
+	}
+	if ((hdr = spool_getheader(txn->req_hdrs, "Depth"))) {
+	 buf_printf(&log, "%sdepth=%s", sep, hdr0);
+	 sep = "; ";
+	}
+	if (*sep == ';') buf_appendcstr(&log, ")");
+ }
+ buf_printf(&log, " => \"%s\"", error_message(code));
+ /* Add any auxiliary response data */
+ if (txn->location) {
+	buf_printf(&log, " (location=%s)", txn->location);
+ }
+ else if (txn->flags.cors) {
+	buf_appendcstr(&log, " (allow-origin)");
+ }
+ else if (txn->error.desc) {
+	buf_printf(&log, " (error=%s)", txn->error.desc);
+ }
+ syslog(LOG_INFO, "%s", buf_cstring(&log));
+}
+
+
+static void keep_alive(int sig)
+{
+ if (sig == SIGALRM) {
+	response_header(HTTP_CONTINUE, NULL);
+	alarm(httpd_keepalive);
+ }
+}
+
+
+/*
+ * Output an HTTP response with multipart body data.
+ *
+ * An initial call with 'code' != 0 will output a response header
+ * and the preamble.
+ * All subsequent calls should have 'code' = 0 to output just a body part.
+ * A final call with 'len' = 0 ends the multipart body.
+ */
+EXPORTED void write_multipart_body(long code, struct transaction_t *txn,
+			 const char *buf, unsigned len)
+{
+ static char boundary100;
+ struct buf *body = &txn->resp_body.payload;
+
+ if (code) {
+	const char *preamble =
+	 "This is a message with multiple parts in MIME format.\r\n";
+
+	/* Create multipart boundary */
+	snprintf(boundary, sizeof(boundary), "%s-%ld-%ld-%ld",
+		 *spool_getheader(txn->req_hdrs, "Host"),
+		 (long) getpid(), (long) time(0), (long) rand());
+
+	/* Create Content-Type w/ boundary */
+	assert(!buf_len(&txn->buf));
+	buf_printf(&txn->buf, "%s; boundary=\"%s\"",
+		 txn->resp_body.type, boundary);
+	txn->resp_body.type = buf_cstring(&txn->buf);
+
+	/* Setup for chunked response and begin multipart */
+	txn->flags.te |= TE_CHUNKED;
+	if (!buf) {
+	 buf = preamble;
+	 len = strlen(preamble);
+	}
+	write_body(code, txn, buf, len);
+ }
+ else if (len) {
+	/* Output delimiter and MIME part-headers */
+	buf_reset(body);
+	buf_printf(body, "\r\n--%s\r\n", boundary);
+	buf_printf(body, "Content-Type: %s\r\n", txn->resp_body.type);
+	if (txn->resp_body.range) {
+	 buf_printf(body, "Content-Range: bytes %lu-%lu/%lu\r\n",
+		 txn->resp_body.range->first,
+		 txn->resp_body.range->last,
+		 txn->resp_body.len);
+	}
+	buf_printf(body, "Content-Length: %d\r\n\r\n", len);
+	write_body(0, txn, buf_cstring(body), buf_len(body));
+
+	/* Output body-part data */
+	write_body(0, txn, buf, len);
+ }
+ else {
+	const char *epilogue = "\r\nEnd of MIME multipart body.\r\n";
+
+	/* Output close-delimiter and epilogue */
+	buf_reset(body);
+	buf_printf(body, "\r\n--%s--\r\n%s", boundary, epilogue);
+	write_body(0, txn, buf_cstring(body), buf_len(body));
+
+	/* End of output */
+	write_body(0, txn, NULL, 0);
+ }
+}
+
+
+/* Output multipart/byteranges */
+static void multipart_byteranges(struct transaction_t *txn,
+				 const char *msg_base)
+{
+ /* Save Content-Range and Content-Type pointers */
+ struct range *range = txn->resp_body.range;
+ const char *type = txn->resp_body.type;
+
+ /* Start multipart response */
+ txn->resp_body.range = NULL;
+ txn->resp_body.type = "multipart/byteranges";
+ write_multipart_body(HTTP_PARTIAL, txn, NULL, 0);
+
+ txn->resp_body.type = type;
+ while (range) {
+	unsigned long offset = range->first;
+	unsigned long datalen = range->last - range->first + 1;
+	struct range *next = range->next;
+
+	/* Output range as body part */
+	txn->resp_body.range = range;
+	write_multipart_body(0, txn, msg_base + offset, datalen);
+
+	/* Cleanup */
+	free(range);
+	range = next;
+ }
+
+ /* End of multipart body */
+ write_multipart_body(0, txn, NULL, 0);
+}
+
+
+/*
+ * Output an HTTP response with body data, compressed as necessary.
+ *
+ * For chunked body data, an initial call with 'code' != 0 will output
+ * a response header and the first body chunk.
+ * All subsequent calls should have 'code' = 0 to output just the body chunk.
+ * A final call with 'len' = 0 ends the chunked body.
+ *
+ * NOTE: HTTP/1.0 clients can't handle chunked encoding,
+ * so we use bare chunks and close the connection when done.
+ */
+EXPORTED void write_body(long code, struct transaction_t *txn,
+		const char *buf, unsigned len)
+{
+ unsigned is_dynamic = code ? (txn->flags.te & TE_CHUNKED) : 1;
+ unsigned outlen = len, offset = 0;
+ int do_md5 = config_getswitch(IMAPOPT_HTTPCONTENTMD5);
+ static MD5_CTX ctx;
+ static unsigned char md5MD5_DIGEST_LENGTH;
+
+ if (!is_dynamic && len < GZIP_MIN_LEN) {
+	/* Don't compress small static content */
+	txn->resp_body.enc = CE_IDENTITY;
+	txn->flags.te = TE_NONE;
+ }
+
+ /* Compress data */
+ if (txn->resp_body.enc || txn->flags.te & ~TE_CHUNKED) {
+#ifdef HAVE_ZLIB
+	/* Only flush for static content or on last (zero-length) chunk */
+	unsigned flush = (is_dynamic && len) ? Z_NO_FLUSH : Z_FINISH;
+
+	if (code) deflateReset(&txn->zstrm);
+
+	txn->zstrm.next_in = (Bytef *) buf;
+	txn->zstrm.avail_in = len;
+	buf_reset(&txn->zbuf);
+
+	do {
+	 buf_ensure(&txn->zbuf,
+		 deflateBound(&txn->zstrm, txn->zstrm.avail_in));
+
+	 txn->zstrm.next_out = (Bytef *) txn->zbuf.s + txn->zbuf.len;
+	 txn->zstrm.avail_out = txn->zbuf.alloc - txn->zbuf.len;
+
+	 deflate(&txn->zstrm, flush);
+	 txn->zbuf.len = txn->zbuf.alloc - txn->zstrm.avail_out;
+
+	} while (!txn->zstrm.avail_out);
+
+	buf = txn->zbuf.s;
+	outlen = txn->zbuf.len;
+#else
+	/* XXX should never get here */
+	fatal("Compression requested, but no zlib", EC_SOFTWARE);
+#endif /* HAVE_ZLIB */
+ }
+
+ if (code) {
+	/* Initial call - prepare response header based on CE, TE and version */
+	if (do_md5) MD5_Init(&ctx);
+
+	if (txn->flags.te & ~TE_CHUNKED) {
+	 /* Transfer-Encoded content MUST be chunked */
+	 txn->flags.te |= TE_CHUNKED;
+
+	 if (!is_dynamic) {
+		/* Handle static content as last chunk */
+		len = 0;
+	 }
+	}
+
+	if (!(txn->flags.te & TE_CHUNKED)) {
+	 /* Full/partial body (no encoding).
+	 *
+	 * In all cases, 'resp_body.len' is used to specify complete-length
+	 * In the case of a 206 or 416 response, Content-Length will be
+	 * set accordingly in response_header().
+	 */
+	 txn->resp_body.len = outlen;
+
+	 if (code == HTTP_PARTIAL) {
+		/* check_precond() tells us that this is a range request */
+		code = parse_ranges(*spool_getheader(txn->req_hdrs, "Range"),
+				 outlen, &txn->resp_body.range);
+
+		switch (code) {
+		case HTTP_OK:
+		 /* Full body (unknown range-unit) */
+		 break;
+
+		case HTTP_PARTIAL:
+		 /* One or more range request(s) */
+		 txn->resp_body.len = outlen;
+
+		 if (txn->resp_body.range->next) {
+			/* Multiple ranges */
+			multipart_byteranges(txn, buf);
+			return;
+		 }
+		 else {
+			/* Single range - set data parameters accordingly */
+			offset += txn->resp_body.range->first;
+			outlen = txn->resp_body.range->last -
+			 txn->resp_body.range->first + 1;
+		 }
+		 break;
+
+		case HTTP_UNSAT_RANGE:
+		 /* No valid ranges */
+		 outlen = 0;
+		 break;
+		}
+	 }
+
+	 if (outlen && do_md5) {
+		MD5_Update(&ctx, buf+offset, outlen);
+		MD5_Final(md5, &ctx);
+		txn->resp_body.md5 = md5;
+	 }
+	}
+	else if (txn->flags.ver1_0) {
+	 /* HTTP/1.0 doesn't support chunked - close-delimit the body */
+	 txn->flags.conn = CONN_CLOSE;
+	}
+	else if (do_md5) txn->flags.trailer = TRAILER_CMD5;
+
+	response_header(code, txn);
+
+	/* MUST NOT send a body for 1xx/204/304 response or any HEAD response */
+	switch (code) {
+	case HTTP_CONTINUE:
+	case HTTP_SWITCH_PROT:
+	case HTTP_PROCESSING:
+	case HTTP_NO_CONTENT:
+	case HTTP_NOT_MODIFIED:
+	 return;
+
+	default:
+	 if (txn->meth == METH_HEAD) return;
+	}
+ }
+
+ /* Output data */
+ if ((txn->flags.te & TE_CHUNKED) && !txn->flags.ver1_0) {
+	/* HTTP/1.1 chunk */
+	if (outlen) {
+	 prot_printf(httpd_out, "%x\r\n", outlen);
+	 prot_write(httpd_out, buf, outlen);
+	 prot_puts(httpd_out, "\r\n");
+
+	 if (do_md5) MD5_Update(&ctx, buf, outlen);	 
+	}
+	if (!len) {
+	 /* Terminate the HTTP/1.1 body with a zero-length chunk */
+	 prot_puts(httpd_out, "0\r\n");
+
+	 /* Trailer */
+	 if (do_md5) {
+		MD5_Final(md5, &ctx);
+		Content_MD5(md5);
+	 }
+
+	 prot_puts(httpd_out, "\r\n");
+	}
+ }
+ else {
+	/* Full body or HTTP/1.0 close-delimited body */
+	prot_write(httpd_out, buf + offset, outlen);
+ }
+}
+
+
+/* Output an HTTP response with application/xml body */
+EXPORTED void xml_response(long code, struct transaction_t *txn, xmlDocPtr xml)
+{
+ xmlChar *buf;
+ int bufsiz;
+
+ switch (code) {
+ case HTTP_OK:
+ case HTTP_CREATED:
+ case HTTP_NO_CONTENT:
+ case HTTP_MULTI_STATUS:
+	break;
+
+ default:
+	/* Neither Brief nor Prefer affect error response bodies */
+	txn->flags.vary &= ~(VARY_BRIEF | VARY_PREFER);
+	txn->resp_body.prefs = 0;
+ }
+
+ /* Dump XML response tree into a text buffer */
+ xmlDocDumpFormatMemoryEnc(xml, &buf, &bufsiz, "utf-8",
+			 config_httpprettytelemetry);
+
+ if (buf) {
+	/* Output the XML response */
+	txn->resp_body.type = "application/xml; charset=utf-8";
+
+	write_body(code, txn, (char *) buf, bufsiz);
+
+	/* Cleanup */
+	xmlFree(buf);
+ }
+ else {
+	txn->error.precond = 0;
+	txn->error.desc = "Error dumping XML tree\r\n";
+	error_response(HTTP_SERVER_ERROR, txn);
+ }
+}
+
+EXPORTED void buf_printf_markup(struct buf *buf, unsigned level, const char *fmt, ...)
+{
+ va_list args;
+ const char *eol = "\n";
+
+ if (!config_httpprettytelemetry) {
+	level = 0;
+	eol = "";
+ }
+
+ va_start(args, fmt);
+
+ buf_printf(buf, "%*s", level * MARKUP_INDENT, "");
+ buf_vprintf(buf, fmt, args);
+ buf_appendcstr(buf, eol);
+
+ va_end(args);
+}
+
+
+/* Output an HTTP error response with optional XML or HTML body */
+EXPORTED void error_response(long code, struct transaction_t *txn)
+{
+ struct buf *html = &txn->resp_body.payload;
+
+ /* Neither Brief nor Prefer affect error response bodies */
+ txn->flags.vary &= ~(VARY_BRIEF | VARY_PREFER);
+ txn->resp_body.prefs = 0;
+
+#ifdef WITH_DAV
+ if (txn->error.precond) {
+	xmlNodePtr root = xml_add_error(NULL, &txn->error, NULL);
+
+	if (root) {
+	 xml_response(code, txn, root->doc);
+	 xmlFreeDoc(root->doc);
+	 return;
+	}
+ }
+#endif
+
+ if (!txn->error.desc) {
+	switch (code) {
+	 /* 4xx codes */
+	case HTTP_BAD_REQUEST:
+	 txn->error.desc =
+		"The request was not understood by this server.";
+	 break;
+
+	case HTTP_NOT_FOUND:
+	 txn->error.desc =
+		"The requested URL was not found on this server.";
+	 break;
+
+	case HTTP_NOT_ALLOWED:
+	 txn->error.desc =
+		"The requested method is not allowed for the URL.";
+	 break;
+
+	case HTTP_GONE:
+	 txn->error.desc =
+		"The requested URL has been removed from this server.";
+	 break;
+
+	 /* 5xx codes */
+	case HTTP_SERVER_ERROR:
+	 txn->error.desc =
+		"The server encountered an internal error.";
+	 break;
+
+	case HTTP_NOT_IMPLEMENTED:
+	 txn->error.desc =
+		"The requested method is not implemented by this server.";
+	 break;
+
+	case HTTP_UNAVAILABLE:
+	 txn->error.desc =
+		"The server is unable to process the request at this time.";
+	 break;
+	}
+ }
+
+ buf_reset(html);
+ if (txn->error.desc) {
+	const char **hdr, *host = "";
+	char *port = NULL;
+	unsigned level = 0;
+
+	if (txn->req_hdrs &&
+	 (hdr = spool_getheader(txn->req_hdrs, "Host")) &&
+	 hdr0 && *hdr0) {
+	 host = (char *) hdr0;
+	 if ((port = strchr(host, ':'))) *port++ = '\0';
+	}
+	else if (config_serverinfo != IMAP_ENUM_SERVERINFO_OFF) {
+	 host = config_servername;
+	}
+	if (!port) port = strchr(saslprops.iplocalport, ';')+1;
+
+	buf_printf_markup(html, level, HTML_DOCTYPE);
+	buf_printf_markup(html, level++, "<html>");
+	buf_printf_markup(html, level++, "<head>");
+	buf_printf_markup(html, level, "<title>%s</title>",
+			 error_message(code));
+	buf_printf_markup(html, --level, "</head>");
+	buf_printf_markup(html, level++, "<body>");
+	buf_printf_markup(html, level, "<h1>%s</h1>", error_message(code)+4);
+	buf_printf_markup(html, level, "%s", txn->error.desc);
+	buf_printf_markup(html, level, "<hr>");
+	buf_printf_markup(html, level,
+			 "<address>%s Server at %s Port %s</address>",
+			 buf_cstring(&serverinfo), host, port);
+	buf_printf_markup(html, --level, "</body>");
+	buf_printf_markup(html, --level, "</html>");
+
+	txn->resp_body.type = "text/html; charset=utf-8";
+ }
+
+ write_body(code, txn, buf_cstring(html), buf_len(html));
+}
+
+
+static int proxy_authz(const char **authzid, struct transaction_t *txn)
+{
+ static char authzbufMAX_MAILBOX_BUFFER;
+ unsigned authzlen;
+ int status;
+
+ syslog(LOG_DEBUG, "proxy_auth: authzid='%s'", *authzid);
+
+ /* Free userid & authstate previously allocated for auth'd user */
+ if (httpd_userid) {
+	free(httpd_userid);
+	httpd_userid = NULL;
+ }
+ if (httpd_authstate) {
+	auth_freestate(httpd_authstate);
+	httpd_authstate = NULL;
+ }
+
+ if (!(config_mupdate_server && config_getstring(IMAPOPT_PROXYSERVERS))) {
+	/* Not a backend in a Murder - proxy authz is not allowed */
+	syslog(LOG_NOTICE, "badlogin: %s %s %s %s",
+	 httpd_clienthost, txn->auth_chal.scheme->name, saslprops.authid,
+	 "proxy authz attempted on non-Murder backend");
+	return SASL_NOAUTHZ;
+ }
+
+ /* Canonify the authzid */
+ status = mysasl_canon_user(httpd_saslconn, NULL,
+			 *authzid, strlen(*authzid),
+			 SASL_CU_AUTHZID, NULL,
+			 authzbuf, sizeof(authzbuf), &authzlen);
+ if (status) {
+	syslog(LOG_NOTICE, "badlogin: %s %s %s invalid user",
+	 httpd_clienthost, txn->auth_chal.scheme->name,
+	 beautify_string(*authzid));
+	return status;
+ }
+
+ /* See if auth'd user is allowed to proxy */
+ status = mysasl_proxy_policy(httpd_saslconn, &httpd_proxyctx,
+				 authzbuf, authzlen,
+				 saslprops.authid, strlen(saslprops.authid),
+				 NULL, 0, NULL);
+
+ if (status) {
+	syslog(LOG_NOTICE, "badlogin: %s %s %s %s",
+	 httpd_clienthost, txn->auth_chal.scheme->name, saslprops.authid,
+	 sasl_errdetail(httpd_saslconn));
+	return status;
+ }
+
+ *authzid = authzbuf;
+
+ return status;
+}
+
+
+/* Write cached header (redacting authorization credentials) to buffer. */
+static void log_cachehdr(const char *name, const char *contents, void *rock)
+{
+ struct buf *buf = (struct buf *) rock;
+
+ /* Ignore private headers in our cache */
+ if (name0 == ':') return;
+
+ buf_printf(buf, "%c%s: ", toupper(name0), name+1);
+ if (!strcmp(name, "authorization")) {
+	/* Replace authorization credentials with an ellipsis */
+	const char *creds = strchr(contents, ' ') + 1;
+	buf_printf(buf, "%.*s%-*s\r\n", (int) (creds - contents), contents,
+		 (int) strlen(creds), "...");
+ }
+ else buf_printf(buf, "%s\r\n", contents);
+}
+
+
+static void auth_success(struct transaction_t *txn)
+{
+ struct auth_scheme_t *scheme = txn->auth_chal.scheme;
+ int i;
+
+ proc_register("httpd", httpd_clienthost, httpd_userid, NULL, NULL);
+
+ syslog(LOG_NOTICE, "login: %s %s %s%s %s",
+	 httpd_clienthost, httpd_userid, scheme->name,
+	 httpd_tls_done ? "+TLS" : "", "User logged in");
+
+
+ /* Recreate telemetry log entry for request (w/ credentials redacted) */
+ assert(!buf_len(&txn->buf));
+ buf_printf(&txn->buf, "<%ld<", time(NULL));		/* timestamp */
+ buf_printf(&txn->buf, "%s %s %s\r\n",		/* request-line*/
+	 txn->req_line.meth, txn->req_line.uri, txn->req_line.ver);
+ spool_enum_hdrcache(txn->req_hdrs,			/* header fields */
+			&log_cachehdr, &txn->buf);
+ buf_appendcstr(&txn->buf, "\r\n");			/* CRLF */
+ buf_append(&txn->buf, &txn->req_body.payload);	/* message body */
+ buf_appendmap(&txn->buf,				/* buffered input */
+		 (const char *) httpd_in->ptr, httpd_in->cnt);
+
+ if (httpd_logfd != -1) {
+	/* Rewind log to current request and truncate it */
+	off_t end = lseek(httpd_logfd, 0, SEEK_END);
+
+	ftruncate(httpd_logfd, end - buf_len(&txn->buf));
+ }
+
+ if (!proxy_userid || strcmp(proxy_userid, httpd_userid)) {
+	/* Close existing telemetry log */
+	close(httpd_logfd);
+
+	prot_setlog(httpd_in, PROT_NO_FD);
+	prot_setlog(httpd_out, PROT_NO_FD);
+
+	/* Create telemetry log based on new userid */
+	httpd_logfd = telemetry_log(httpd_userid, httpd_in, httpd_out, 0);
+ }
+
+ if (httpd_logfd != -1) {
+	/* Log credential-redacted request */
+	write(httpd_logfd, buf_cstring(&txn->buf), buf_len(&txn->buf));
+ }
+
+ buf_reset(&txn->buf);
+
+ /* Make a copy of the external userid for use in proxying */
+ if (proxy_userid) free(proxy_userid);
+ proxy_userid = xstrdup(httpd_userid);
+
+ /* Translate any separators in userid */
+ mboxname_hiersep_tointernal(&httpd_namespace, httpd_userid,
+				config_virtdomains ?
+				strcspn(httpd_userid, "@") : 0);
+
+ /* Do any namespace specific post-auth processing */
+ for (i = 0; namespacesi; i++) {
+	if (namespacesi->enabled && namespacesi->auth)
+	 namespacesi->auth(httpd_userid);
+ }
+}
+
+
+/* Perform HTTP Authentication based on the given credentials ('creds').
+ * Returns the selected auth scheme and any server challenge in 'chal'.
+ * May be called multiple times if auth scheme requires multiple steps.
+ * SASL status between steps is maintained in 'status'.
+ */
+#define BASE64_BUF_SIZE 21848	/* per RFC 4422: ((16K / 3) + 1) * 4 */
+
+static int http_auth(const char *creds, struct transaction_t *txn)
+{
+ struct auth_challenge_t *chal = &txn->auth_chal;
+ static int status = SASL_OK;
+ int slen;
+ const char *clientin = NULL, *realm = NULL, *user, **authzid;
+ unsigned int clientinlen = 0;
+ struct auth_scheme_t *scheme;
+ static char base64BASE64_BUF_SIZE+1;
+ const void *canon_user;
+
+ /* Split credentials into auth scheme and response */
+ slen = strcspn(creds, " \0");
+ if ((clientin = strchr(creds, ' '))) clientinlen = strlen(++clientin);
+
+ syslog(LOG_DEBUG,
+	 "http_auth: status=%d scheme='%s' creds='%.*s%s'",
+	 status, chal->scheme ? chal->scheme->name : "",
+	 slen, creds, clientin ? " <response>" : "");
+
+ /* Free userid & authstate previously allocated for auth'd user */
+ if (httpd_userid) {
+	free(httpd_userid);
+	httpd_userid = NULL;
+ }
+ if (httpd_authstate) {
+	auth_freestate(httpd_authstate);
+	httpd_authstate = NULL;
+ }
+ chal->param = NULL;
+
+ if (chal->scheme) {
+	/* Use current scheme, if possible */
+	scheme = chal->scheme;
+
+	if (strncasecmp(scheme->name, creds, slen)) {
+	 /* Changing auth scheme -> reset state */
+	 syslog(LOG_DEBUG, "http_auth: changing scheme");
+	 reset_saslconn(&httpd_saslconn);
+	 chal->scheme = NULL;
+	 status = SASL_OK;
+	}
+ }
+
+ if (!chal->scheme) {
+	/* Find the client-specified auth scheme */
+	syslog(LOG_DEBUG, "http_auth: find client scheme");
+	for (scheme = auth_schemes; scheme->name; scheme++) {
+	 if (slen && !strncasecmp(scheme->name, creds, slen)) {
+		/* Found a supported scheme, see if its available */
+		if (!(avail_auth_schemes & (1 << scheme->idx))) scheme = NULL;
+		break;
+	 }
+	}
+	if (!scheme || !scheme->name) {
+	 /* Didn't find a matching scheme that is available */
+	 syslog(LOG_DEBUG, "Unknown auth scheme '%.*s'", slen, creds);
+	 return SASL_NOMECH;
+	}
+	/* We found it! */
+	syslog(LOG_DEBUG, "http_auth: found matching scheme: %s", scheme->name);
+	chal->scheme = scheme;
+	status = SASL_OK;
+ }
+
+ /* Base64 decode any client response, if necesary */
+ if (clientin && (scheme->flags & AUTH_BASE64)) {
+	int r = sasl_decode64(clientin, clientinlen,
+			 base64, BASE64_BUF_SIZE, &clientinlen);
+	if (r != SASL_OK) {
+	 syslog(LOG_ERR, "Base64 decode failed: %s",
+		 sasl_errstring(r, NULL, NULL));
+	 return r;
+	}
+	clientin = base64;
+ }
+
+ /* Get realm - based on namespace of URL */
+ switch (txn->req_tgt.namespace) {
+ case URL_NS_DEFAULT:
+ case URL_NS_PRINCIPAL:
+	realm = config_getstring(IMAPOPT_DAV_REALM);
+	break;
+
+ case URL_NS_CALENDAR:
+	realm = config_getstring(IMAPOPT_CALDAV_REALM);
+	break;
+
+ case URL_NS_ADDRESSBOOK:
+	realm = config_getstring(IMAPOPT_CARDDAV_REALM);
+	break;
+
+ case URL_NS_RSS:
+	realm = config_getstring(IMAPOPT_RSS_REALM);
+	break;
+ }
+ if (!realm) realm = config_servername;
+
+#ifdef SASL_HTTP_REQUEST
+ /* Setup SASL HTTP request, if necessary */
+ if (scheme->flags & AUTH_NEED_REQUEST) {
+	sasl_http_request_t sasl_http_req;
+
+	sasl_http_req.method = txn->req_line.meth;
+	sasl_http_req.uri = txn->req_line.uri;
+	sasl_http_req.entity = NULL;
+	sasl_http_req.elen = 0;
+	sasl_http_req.non_persist = txn->flags.conn & CONN_CLOSE;
+	sasl_setprop(httpd_saslconn, SASL_HTTP_REQUEST, &sasl_http_req);
+ }
+#endif /* SASL_HTTP_REQUEST */
+
+ if (scheme->idx == AUTH_BASIC) {
+	/* Basic (plaintext) authentication */
+	char *pass;
+
+	if (!clientin) {
+	 /* Create initial challenge (base64 buffer is static) */
+	 snprintf(base64, BASE64_BUF_SIZE, "realm=\"%s\"", realm);
+	 chal->param = base64;
+	 chal->scheme = NULL; /* make sure we don't reset the SASL ctx */
+	 return status;
+	}
+
+	/* Split credentials into <user> ':' <pass>.
+	 * We are working with base64 buffer, so we can modify it.
+	 */
+	user = base64;
+	pass = strchr(base64, ':');
+	if (!pass) {
+	 syslog(LOG_ERR, "Basic auth: Missing password");
+	 return SASL_BADPARAM;
+	}
+	*pass++ = '\0';
+	
+	/* Verify the password */
+	status = sasl_checkpass(httpd_saslconn, user, strlen(user),
+				pass, strlen(pass));
+	memset(pass, 0, strlen(pass));		/* erase plaintext password */
+
+	if (status) {
+	 syslog(LOG_NOTICE, "badlogin: %s Basic %s %s",
+		 httpd_clienthost, user, sasl_errdetail(httpd_saslconn));
+
+	 /* Don't allow user probing */
+	 if (status == SASL_NOUSER) status = SASL_BADAUTH;
+	 return status;
+	}
+
+	/* Successful authentication - fall through */
+ }
+ else {
+	/* SASL-based authentication (Digest, Negotiate, NTLM) */
+	const char *serverout = NULL;
+	unsigned int serveroutlen = 0;
+
+	if (status == SASL_CONTINUE) {
+	 /* Continue current authentication exchange */
+	 syslog(LOG_DEBUG, "http_auth: continue %s", scheme->saslmech);
+	 status = sasl_server_step(httpd_saslconn, clientin, clientinlen,
+				 &serverout, &serveroutlen);
+	}
+	else {
+	 /* Start new authentication exchange */
+	 syslog(LOG_DEBUG, "http_auth: start %s", scheme->saslmech);
+	 status = sasl_server_start(httpd_saslconn, scheme->saslmech,
+				 clientin, clientinlen,
+				 &serverout, &serveroutlen);
+	}
+
+	/* Failure - probably bad client response */
+	if ((status != SASL_OK) && (status != SASL_CONTINUE)) {
+	 syslog(LOG_ERR, "SASL failed: %s",
+		 sasl_errstring(status, NULL, NULL));
+	 return status;
+	}
+
+	/* Base64 encode any server challenge, if necesary */
+	if (serverout && (scheme->flags & AUTH_BASE64)) {
+	 int r = sasl_encode64(serverout, serveroutlen,
+				 base64, BASE64_BUF_SIZE, NULL);
+	 if (r != SASL_OK) {
+		syslog(LOG_ERR, "Base64 encode failed: %s",
+		 sasl_errstring(r, NULL, NULL));
+		return r;
+	 }
+	 serverout = base64;
+	}
+
+	chal->param = serverout;
+
+	if (status == SASL_CONTINUE) {
+	 /* Need another step to complete authentication */
+	 return status;
+	}
+
+	/* Successful authentication
+	 *
+	 * HTTP doesn't support security layers,
+	 * so don't attach SASL context to prot layer.
+	 */
+ }
+
+ /* Get the userid from SASL - already canonicalized */
+ status = sasl_getprop(httpd_saslconn, SASL_USERNAME, &canon_user);
+ if (status != SASL_OK) {
+	syslog(LOG_ERR, "weird SASL error %d getting SASL_USERNAME", status);
+	return status;
+ }
+ user = (const char *) canon_user;
+
+ if (saslprops.authid) free(saslprops.authid);
+ saslprops.authid = xstrdup(user);
+
+ authzid = spool_getheader(txn->req_hdrs, "Authorize-As");
+ if (authzid && *authzid0) {
+	/* Trying to proxy as another user */
+	user = authzid0;
+
+	status = proxy_authz(&user, txn);
+	if (status) return status;
+ }
+
+ httpd_userid = xstrdup(user);
+
+ auth_success(txn);
+
+ return status;
+}
+
+
+/************************* Method Execution Routines ************************/
+
+
+/* "Open" the requested mailbox. Either return the existing open
+ * mailbox if it matches, or close the existing and open the requested.
+ */
+EXPORTED int http_mailbox_open(const char *name, struct mailbox **mailbox, int locktype)
+{
+ int r;
+
+ if (httpd_mailbox && !strcmp(httpd_mailbox->name, name)) {
+	r = mailbox_lock_index(httpd_mailbox, locktype);
+ }
+ else {
+	if (httpd_mailbox) {
+	 mailbox_close(&httpd_mailbox);
+	 httpd_mailbox = NULL;
+	}
+	if (locktype == LOCK_EXCLUSIVE)
+	 r = mailbox_open_iwl(name, &httpd_mailbox);
+	else
+	 r = mailbox_open_irl(name, &httpd_mailbox);
+ }
+
+ *mailbox = httpd_mailbox;
+ return r;
+}
+
+
+/* Compare an etag in a header to a resource etag.
+ * Returns 0 if a match, non-zero otherwise.
+ */
+EXPORTED int etagcmp(const char *hdr, const char *etag)
+{
+ size_t len;
+
+ if (!etag) return -1;		/* no representation	 */
+ if (!strcmp(hdr, "*")) return 0;	/* any representation	 */
+
+ len = strlen(etag);
+ if (!strncmp(hdr, "W/", 2)) hdr+=2;	/* skip weak prefix	 */
+ if (*hdr++ != '\"') return 1; 	/* match/skip open DQUOTE */
+ if (strlen(hdr) != len+1) return 1;	/* make sure lengths match */
+ if (hdrlen != '\"') return 1; 	/* match close DQUOTE	 */
+
+ return strncmp(hdr, etag, len);
+}
+
+
+/* Compare a resource etag to a comma-separated list and/or multiple headers
+ * looking for a match. Returns 1 if a match is found, 0 otherwise.
+ */
+static unsigned etag_match(const char *hdr, const char *etag)
+{
+ unsigned i, match = 0;
+ tok_t tok;
+ char *token;
+
+ for (i = 0; !match && hdri; i++) {
+	tok_init(&tok, hdri, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	while (!match && (token = tok_next(&tok))) {
+	 if (!etagcmp(token, etag)) match = 1;
+	}
+	tok_fini(&tok);
+ }
+
+ return match;
+}
+
+
+/* Evaluate If header. Note that we can't short-circuit any of the tests
+ because we need to check for a lock-token anywhere in the header */
+static int eval_if(const char *hdr, const char *etag, const char *lock_token,
+		 unsigned *locked)
+{
+ unsigned ret = 0;
+ tok_t tok_l;
+ char *list;
+
+ /* Process each list, ORing the results */
+ tok_init(&tok_l, hdr, ")", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+ while ((list = tok_next(&tok_l))) {
+	unsigned ret_l = 1;
+	tok_t tok_c;
+	char *cond;
+
+	/* XXX Need to handle Resource-Tag for Tagged-list (COPY/MOVE dest) */
+
+	/* Process each condition, ANDing the results */
+	tok_initm(&tok_c, list+1, ">", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	while ((cond = tok_next(&tok_c))) {
+	 unsigned r, not = 0;
+
+	 if (!strncmp(cond, "Not", 3)) {
+		not = 1;
+		cond += 3;
+		while (*cond == ' ') cond++;
+	 }
+	 if (*cond == '') {
+		/* ETag */
+		r = !etagcmp(cond+1, etag);
+	 }
+	 else {
+		/* State Token */
+		if (!lock_token) r = 0;
+		else {
+		 r = !strcmp(cond+1, lock_token);
+		 if (r) {
+			/* Correct lock-token has been provided */
+			*locked = 0;
+		 }
+		}
+	 }
+
+	 ret_l &= (not ? !r : r);
+	}
+
+	tok_fini(&tok_c);
+
+	ret |= ret_l;
+ }
+
+ tok_fini(&tok_l);
+
+ return (ret || locked);
+}
+
+
+static int parse_ranges(const char *hdr, unsigned long len,
+			struct range **ranges)
+{
+ int ret = HTTP_UNSAT_RANGE;
+ struct range *new, *tail = *ranges = NULL;
+ tok_t tok;
+ char *token;
+
+ if (!len) return HTTP_OK; /* need to know length of representation */
+
+ /* we only handle byte-unit */
+ if (!hdr || strncmp(hdr, "bytes=", 6)) return HTTP_OK;
+
+ tok_init(&tok, hdr+6, ",", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+ while ((token = tok_next(&tok))) {
+	/* default to entire representation */
+	unsigned long first = 0;
+	unsigned long last = len - 1;
+	char *p, *endp;
+
+	if (!(p = strchr(token, '-'))) continue; /* bad byte-range-set */
+
+	if (p == token) {
+	 /* suffix-byte-range-spec */
+	 unsigned long suffix = strtoul(++p, &endp, 10);
+
+	 if (endp == p || *endp) continue; /* bad suffix-length */
+	 if (!suffix) continue;	/* unsatisfiable suffix-length */
+		
+	 /* don't start before byte zero */
+	 if (suffix < len) first = len - suffix;
+	}
+	else {
+	 /* byte-range-spec */
+	 first = strtoul(token, &endp, 10);
+	 if (endp != p) continue; /* bad first-byte-pos */
+	 if (first >= len) continue; /* unsatisfiable first-byte-pos */
+
+	 if (*++p) {
+		/* last-byte-pos */
+		last = strtoul(p, &endp, 10);
+		if (*endp || last < first) continue; /* bad last-byte-pos */
+
+		/* don't go past end of representation */
+		if (last >= len) last = len - 1;
+	 }
+	}
+
+	ret = HTTP_PARTIAL;
+
+	/* Coalesce overlapping ranges, or those with a gap < 80 bytes */
+	if (tail &&
+	 first >= tail->first && (long) (first - tail->last) < 80) {
+	 tail->last = MAX(last, tail->last);
+	 continue;
+	}
+
+	/* Create a new range and append it to linked list */
+	new = xzmalloc(sizeof(struct range));
+	new->first = first;
+	new->last = last;
+
+	if (tail) tail->next = new;
+	else *ranges = new;
+	tail = new;
+ }
+
+ tok_fini(&tok);
+
+ return ret;
+}
+
+
+/* Check headers for any preconditions.
+ *
+ * Interaction is complex and is documented in RFC 4918 and
+ * Section 5 of HTTPbis, Part 4.
+ */
+EXPORTED int check_precond(struct transaction_t *txn, const void *data,
+		 const char *etag, time_t lastmod)
+{
+ const char *lock_token = NULL;
+ unsigned locked = 0;
+ hdrcache_t hdrcache = txn->req_hdrs;
+ const char **hdr;
+ time_t since;
+
+#ifdef WITH_DAV
+ struct dav_data *ddata = (struct dav_data *) data;
+
+ /* Check for a write-lock on the source */
+ if (ddata && ddata->lock_expire > time(NULL)) {
+	lock_token = ddata->lock_token;
+
+	switch (txn->meth) {
+	case METH_DELETE:
+	case METH_LOCK:
+	case METH_MOVE:
+	case METH_POST:
+	case METH_PUT:
+	 /* State-changing method: Only the lock owner can execute
+	 and MUST provide the correct lock-token in an If header */
+	 if (strcmp(ddata->lock_ownerid, httpd_userid)) return HTTP_LOCKED;
+
+	 locked = 1;
+	 break;
+
+	case METH_UNLOCK:
+	 /* State-changing method: Authorized in meth_unlock() */
+	 break;
+
+	case METH_ACL:
+	case METH_MKCALENDAR:
+	case METH_MKCOL:
+	case METH_PROPPATCH:
+	 /* State-changing method: Locks on collections unsupported */
+	 break;
+
+	default:
+	 /* Non-state-changing method: Always allowed */
+	 break;
+	}
+ }
+#else
+ assert(!data);
+#endif /* WITH_DAV */
+
+ /* Per RFC 4918, If is similar to If-Match, but with lock-token submission.
+ Per Section 5 of HTTPbis, Part 4, LOCK errors supercede preconditions */
+ if ((hdr = spool_getheader(hdrcache, "If"))) {
+	/* State tokens (sync-token, lock-token) and Etags */
+	if (!eval_if(hdr0, etag, lock_token, &locked))
+	 return HTTP_PRECOND_FAILED;
+ }
+
+ if (locked) {
+	/* Correct lock-token was not provided in If header */
+	return HTTP_LOCKED;
+ }
+
+ /* Evaluate other precondition headers per Section 5 of HTTPbis, Part 4 */
+
+ /* Step 1 */
+ if ((hdr = spool_getheader(hdrcache, "If-Match"))) {
+	if (!etag_match(hdr, etag)) return HTTP_PRECOND_FAILED;
+
+	/* Continue to step 3 */
+ }
+
+ /* Step 2 */
+ else if ((hdr = spool_getheader(hdrcache, "If-Unmodified-Since"))) {
+	if (time_from_rfc822(hdr0, &since))
+	 return HTTP_BAD_REQUEST;
+
+	if (since && (lastmod > since)) return HTTP_PRECOND_FAILED;
+
+	/* Continue to step 3 */
+ }
+
+ /* Step 3 */
+ if ((hdr = spool_getheader(hdrcache, "If-None-Match"))) {
+	if (etag_match(hdr, etag)) {
+	 if (txn->meth == METH_GET || txn->meth == METH_HEAD)
+		return HTTP_NOT_MODIFIED;
+	 else
+		return HTTP_PRECOND_FAILED;
+	}
+
+	/* Continue to step 5 */
+ }
+
+ /* Step 4 */
+ else if ((txn->meth == METH_GET || txn->meth == METH_HEAD) &&
+	 (hdr = spool_getheader(hdrcache, "If-Modified-Since"))) {
+	if (time_from_rfc822(hdr0, &since))
+	 return HTTP_BAD_REQUEST;
+
+	if (lastmod <= since) return HTTP_NOT_MODIFIED;
+
+	/* Continue to step 5 */
+ }
+
+ /* Step 5 */
+ if (txn->flags.ranges && /* Only if we support Range requests */
+	txn->meth == METH_GET && (hdr = spool_getheader(hdrcache, "Range"))) {
+
+	if ((hdr = spool_getheader(hdrcache, "If-Range"))) {
+	 time_from_rfc822(hdr0, &since); /* error OK here, could be an etag */
+	}
+
+	/* Only process Range if If-Range isn't present or validator matches */
+	if (!hdr || (since && (lastmod <= since)) || !etagcmp(hdr0, etag))
+	 return HTTP_PARTIAL;
+ }
+
+ /* Step 6 */
+ return HTTP_OK;
+}
+
+
+const struct mimetype {
+ const char *ext;
+ const char *type;
+ unsigned int compressible;
+} mimetypes = {
+ { ".css", "text/css", 1 },
+ { ".htm", "text/html", 1 },
+ { ".html", "text/html", 1 },
+ { ".text", "text/plain", 1 },
+ { ".txt", "text/plain", 1 },
+
+ { ".gif", "image/gif", 0 },
+ { ".jpg", "image/jpeg", 0 },
+ { ".jpeg", "image/jpeg", 0 },
+ { ".png", "image/png", 0 },
+
+ { ".svg", "image/svg+xml", 1 },
+ { ".tif", "image/tiff", 1 },
+ { ".tiff", "image/tiff", 1 },
+
+ { ".bz", "application/x-bzip", 0 },
+ { ".bz2", "application/x-bzip2", 0 },
+ { ".gz", "application/gzip", 0 },
+ { ".gzip", "application/gzip", 0 },
+ { ".tgz", "application/gzip", 0 },
+ { ".zip", "application/zip", 0 },
+
+ { ".doc", "application/msword", 1 },
+ { ".js", "application/javascript", 1 },
+ { ".pdf", "application/pdf", 1 },
+ { ".ppt", "application/vnd.ms-powerpoint", 1 },
+ { ".sh", "application/x-sh", 1 },
+ { ".tar", "application/x-tar", 1 },
+ { ".xls", "application/vnd.ms-excel", 1 },
+ { ".xml", "application/xml", 1 },
+
+ { NULL, NULL, 0 }
+};
+
+
+/* Perform a GET/HEAD request */
+int meth_get_doc(struct transaction_t *txn,
+		 void *params __attribute__((unused)))
+{
+ int ret = 0, r, fd = -1, precond;
+ const char *prefix, *urls, *path, *ext;
+ static struct buf pathbuf = BUF_INITIALIZER;
+ struct stat sbuf;
+ const char *msg_base = NULL;
+ unsigned long msg_size = 0;
+ struct resp_body_t *resp_body = &txn->resp_body;
+
+ /* Serve up static pages */
+ prefix = config_getstring(IMAPOPT_HTTPDOCROOT);
+ if (!prefix) return HTTP_NOT_FOUND;
+
+ if ((urls = config_getstring(IMAPOPT_HTTPALLOWEDURLS))) {
+	tok_t tok = TOK_INITIALIZER(urls, " \t", TOK_TRIMLEFT|TOK_TRIMRIGHT);
+	char *token;
+
+	while ((token = tok_next(&tok)) && strcmp(token, txn->req_uri->path))
+	tok_fini(&tok);
+
+	if (!token) return HTTP_NOT_FOUND;
+ }
+
+ buf_setcstr(&pathbuf, prefix);
+ buf_appendcstr(&pathbuf, txn->req_uri->path);
+ path = buf_cstring(&pathbuf);
+
+ /* See if path is a directory and look for index.html */
+ if (!(r = stat(path, &sbuf)) && S_ISDIR(sbuf.st_mode)) {
+	buf_appendcstr(&pathbuf, "/index.html");
+	path = buf_cstring(&pathbuf);
+	r = stat(path, &sbuf);
+ }
+
+ /* See if file exists and get Content-Length & Last-Modified time */
+ if (r || !S_ISREG(sbuf.st_mode)) return HTTP_NOT_FOUND;
+
+ if (!resp_body->type) {
+	/* Caller hasn't specified the Content-Type */
+	resp_body->type = "application/octet-stream";
+	
+	if ((ext = strrchr(path, '.'))) {
+	 /* Try to use filename extension to identity Content-Type */
+	 const struct mimetype *mtype;
+
+	 for (mtype = mimetypes; mtype->ext; mtype++) {
+		if (!strcasecmp(ext, mtype->ext)) {
+		 resp_body->type = mtype->type;
+		 if (!mtype->compressible) {
+			/* Never compress non-compressible resources */
+			txn->resp_body.enc = CE_IDENTITY;
+			txn->flags.te = TE_NONE;
+			txn->flags.vary &= ~VARY_AE;
+		 }
+		 break;
+		}
+	 }
+	}
+ }
+
+ /* Generate Etag */
+ assert(!buf_len(&txn->buf));
+ buf_printf(&txn->buf, "%ld-%ld", (long) sbuf.st_mtime, (long) sbuf.st_size);
+
+ /* Check any preconditions, including range request */
+ txn->flags.ranges = 1;
+ precond = check_precond(txn, NULL, buf_cstring(&txn->buf), sbuf.st_mtime);
+
+ switch (precond) {
+ case HTTP_OK:
+ case HTTP_PARTIAL:
+ case HTTP_NOT_MODIFIED:
+	/* Fill in ETag, Last-Modified, and Expires */
+	resp_body->etag = buf_cstring(&txn->buf);
+	resp_body->lastmod = sbuf.st_mtime;
+	resp_body->maxage = 86400; /* 24 hrs */
+	txn->flags.cc |= CC_MAXAGE;
+	if (httpd_userid) txn->flags.cc |= CC_PUBLIC;
+
+	if (precond != HTTP_NOT_MODIFIED) break;
+
+ default:
+	/* We failed a precondition - don't perform the request */
+	resp_body->type = NULL;
+	return precond;
+ }
+
+ if (txn->meth == METH_GET) {
+	/* Open and mmap the file */
+	if ((fd = open(path, O_RDONLY)) == -1) return HTTP_SERVER_ERROR;
+	map_refresh(fd, 1, &msg_base, &msg_size, sbuf.st_size, path, NULL);
+ }
+
+ write_body(precond, txn, msg_base, sbuf.st_size);
+
+ if (fd != -1) {
+	map_free(&msg_base, &msg_size);
+	close(fd);
+ }
+
+ return ret;
+}
+
+
+/* Perform an OPTIONS request */
+EXPORTED int meth_options(struct transaction_t *txn, void *params)
+{
+ parse_path_t parse_path = (parse_path_t) params;
+ int r, i;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Response doesn't have a body, so no Vary */
+ txn->flags.vary = 0;
+
+ /* Special case "*" - show all features/methods available on server */
+ if (!strcmp(txn->req_uri->path, "*")) {
+	for (i = 0; namespacesi; i++) {
+	 if (namespacesi->enabled)
+		txn->req_tgt.allow |= namespacesi->allow;
+	}
+ }
+ else {
+	if (parse_path) {
+	 /* Parse the path */
+	 r = parse_path(txn->req_uri->path, &txn->req_tgt, &txn->error.desc);
+	 if (r) return r;
+	}
+
+	if (txn->flags.cors) {
+	 const char **hdr =
+		spool_getheader(txn->req_hdrs, "Access-Control-Request-Method");
+
+	 if (hdr) {
+		/* CORS preflight request */
+		unsigned meth;
+
+		txn->flags.cors = CORS_PREFLIGHT;
+
+		/* Check Method against our list of known methods */
+		for (meth = 0; (meth < METH_UNKNOWN) &&
+			 strcmp(http_methodsmeth.name, hdr0); meth++);
+
+		if (meth == METH_UNKNOWN) txn->flags.cors = 0;
+		else {
+		 /* Check Method against those supported by the resource */
+		 for (i = 0; namespacesi &&
+			 namespacesi->id != txn->req_tgt.namespace; i++);
+
+		 if (!namespacesi->methodsmeth.proc) txn->flags.cors = 0;
+		}
+	 }
+	}
+ }
+
+ response_header(HTTP_OK, txn);
+ return 0;
+}
+
+
+/* Perform an PROPFIND request on "/" iff we support CalDAV */
+int meth_propfind_root(struct transaction_t *txn,
+		 void *params __attribute__((unused)))
+{
+ assert(txn);
+
+#ifdef WITH_DAV
+ /* Apple iCal and Evolution both check "/" */
+ if (!strcmp(txn->req_uri->path, "/") ||
+	!strcmp(txn->req_uri->path, "/dav/")) {
+	/* Array of known "live" properties */
+	const struct prop_entry root_props = {
+
+	 /* WebDAV ACL (RFC 3744) properties */
+	 { "principal-collection-set", NS_DAV, PROP_COLLECTION,
+	 propfind_princolset, NULL, NULL },
+
+	 /* WebDAV Current Principal (RFC 5397) properties */
+	 { "current-user-principal", NS_DAV, PROP_COLLECTION,
+	 propfind_curprin, NULL, NULL },
+
+	 { NULL, 0, 0, NULL, NULL, NULL }
+	};
+
+	struct meth_params root_params = {
+	 .lprops = root_props
+	};
+
+	if (!httpd_userid) return HTTP_UNAUTHORIZED;
+
+	/* Make a working copy of target path */
+	strlcpy(txn->req_tgt.path, txn->req_uri->path,
+		sizeof(txn->req_tgt.path));
+	txn->req_tgt.tail = txn->req_tgt.path + strlen(txn->req_tgt.path);
+
+	txn->req_tgt.allow |= ALLOW_DAV;
+	return meth_propfind(txn, &root_params);
+ }
+#endif
+
+ return HTTP_NOT_ALLOWED;
+}
+
+
+/* Write cached header to buf, excluding any that might have sensitive data. */
+static void trace_cachehdr(const char *name, const char *contents, void *rock)
+{
+ struct buf *buf = (struct buf *) rock;
+ const char **hdr, *sensitive =
+	{ "authorization", "cookie", "proxy-authorization", NULL };
+
+ /* Ignore private headers in our cache */
+ if (name0 == ':') return;
+
+ for (hdr = sensitive; *hdr && strcmp(name, *hdr); hdr++);
+
+ if (!*hdr) buf_printf(buf, "%c%s: %s\r\n",
+			 toupper(name0), name+1, contents);
+}
+
+/* Perform an TRACE request */
+EXPORTED int meth_trace(struct transaction_t *txn, void *params)
+{
+ parse_path_t parse_path = (parse_path_t) params;
+ const char **hdr;
+ unsigned long max_fwd = -1;
+ struct buf *msg = &txn->resp_body.payload;
+
+ /* Response should not be cached */
+ txn->flags.cc |= CC_NOCACHE;
+
+ /* Make sure method is allowed */
+ if (!(txn->req_tgt.allow & ALLOW_TRACE)) return HTTP_NOT_ALLOWED;
+
+ if ((hdr = spool_getheader(txn->req_hdrs, "Max-Forwards"))) {
+	max_fwd = strtoul(hdr0, NULL, 10);
+ }
+
+ if (max_fwd && parse_path) {
+	/* Parse the path */
+	int r;
+
+	if ((r = parse_path(txn->req_uri->path,
+			 &txn->req_tgt, &txn->error.desc))) return r;
+
+	if (*txn->req_tgt.mboxname) {
+	 /* Locate the mailbox */
+	 mbentry_t *mbentry = NULL;
+
+	 r = http_mlookup(txn->req_tgt.mboxname, &mbentry, NULL);
+	 if (r) {
+		syslog(LOG_ERR, "mlookup(%s) failed: %s",
+		 txn->req_tgt.mboxname, error_message(r));
+		txn->error.desc = error_message(r);
+
+		switch (r) {
+		case IMAP_PERMISSION_DENIED: return HTTP_FORBIDDEN;
+		case IMAP_MAILBOX_NONEXISTENT: return HTTP_NOT_FOUND;
+		default: return HTTP_SERVER_ERROR;
+		}
+	 }
+
+	 if (mbentry->server) {
+		/* Remote mailbox */
+		struct backend *be;
+
+		be = proxy_findserver(mbentry->server, &http_protocol, proxy_userid,
+				 &backend_cached, NULL, NULL, httpd_in);
+		mboxlist_entry_free(&mbentry);
+		if (!be) return HTTP_UNAVAILABLE;
+
+		return http_pipe_req_resp(be, txn);
+	 }
+
+	 mboxlist_entry_free(&mbentry);
+
+	 /* Local mailbox */
+	}
+ }
+
+ /* Echo the request back to the client as a message/http:
+ *
+ * - Piece the Request-line back together
+ * - Use all non-sensitive cached headers from client
+ */
+ buf_reset(msg);
+ buf_printf(msg, "TRACE %s %s\r\n", txn->req_line.uri, txn->req_line.ver);
+ spool_enum_hdrcache(txn->req_hdrs, &trace_cachehdr, msg);
+ buf_appendcstr(msg, "\r\n");
+
+ txn->resp_body.type = "message/http";
+ txn->resp_body.len = buf_len(msg);
+
+ write_body(HTTP_OK, txn, buf_cstring(msg), buf_len(msg));
+
+ return 0;
+}

cyrus-imapd-2.5.tar.gz/imap/httpd.h Added

@@ -0,0 +1,483 @@
+/* httpd.h -- Common state for HTTP/RSS/WebDAV/CalDAV/iSchedule daemon
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef HTTPD_H
+#define HTTPD_H
+
+#include <sasl/sasl.h>
+#include <libxml/tree.h>
+#include <libxml/uri.h>
+
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif /* HAVE_ZLIB */
+
+#include "mailbox.h"
+#include "spool.h"
+
+#define MAX_REQ_LINE	8000 /* minimum size per HTTPbis */
+#define MARKUP_INDENT	2 /* # spaces to indent each line of markup */
+#define GZIP_MIN_LEN	300 /* minimum length of data to gzip */
+
+/* Supported HTTP version */
+#define HTTP_VERSION	 "HTTP/1.1"
+#define HTTP_VERSION_LEN 8
+
+/* Supported TLS version for Upgrade */
+#define TLS_VERSION	 "TLS/1.0"
+
+/* Supported HTML DOCTYPE */
+#define HTML_DOCTYPE \
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" " \
+ "\"http://www.w3.org/TR/html4/loose.dtd\">"
+
+/* Macro to access query part of URI */
+#if LIBXML_VERSION >= 20700
+#define URI_QUERY(uri) uri->query_raw
+#else
+#define URI_QUERY(uri) uri->query
+#endif
+
+/* SASL usage based on availability */
+#if defined(SASL_NEED_HTTP) && defined(SASL_HTTP_REQUEST)
+ #define HTTP_DIGEST_MECH "DIGEST-MD5"
+ #define SASL_USAGE_FLAGS (SASL_NEED_HTTP | SASL_SUCCESS_DATA)
+#else
+ #define HTTP_DIGEST_MECH NULL /* not supported by our SASL version */
+ #define SASL_USAGE_FLAGS SASL_SUCCESS_DATA
+#endif /* SASL_NEED_HTTP */
+
+
+/* Array of HTTP methods known by our server. */
+struct known_meth_t {
+ const char *name;
+ unsigned flags;
+};
+extern const struct known_meth_t http_methods;
+
+/* Flags for known methods*/
+enum {
+ METH_NOBODY =	(1<<0),	/* Method does not expect a body */
+};
+
+/* Index into known HTTP methods - needs to stay in sync with array */
+enum {
+ METH_ACL = 0,
+ METH_COPY,
+ METH_DELETE,
+ METH_GET,
+ METH_HEAD,
+ METH_LOCK,
+ METH_MKCALENDAR,
+ METH_MKCOL,
+ METH_MOVE,
+ METH_OPTIONS,
+ METH_POST,
+ METH_PROPFIND,
+ METH_PROPPATCH,
+ METH_PUT,
+ METH_REPORT,
+ METH_TRACE,
+ METH_UNLOCK,
+
+ METH_UNKNOWN, /* MUST be last */
+};
+
+
+/* Path namespaces */
+enum {
+ URL_NS_DEFAULT = 0,
+ URL_NS_PRINCIPAL,
+ URL_NS_CALENDAR,
+ URL_NS_ADDRESSBOOK,
+ URL_NS_RSS,
+ URL_NS_ISCHEDULE,
+ URL_NS_DOMAINKEY,
+ URL_NS_DBLOOKUP
+};
+
+/* Bitmask of features/methods to allow, based on URL */
+enum {
+ ALLOW_READ =	(1<<0),	/* Read resources/properties */
+ ALLOW_POST =	(1<<1),	/* Post to a URL */
+ ALLOW_WRITE =	(1<<2),	/* Create/modify/lock resources */
+ ALLOW_DELETE =	(1<<3),	/* Delete resources/collections */
+ ALLOW_TRACE =	(1<<4),	/* TRACE a request */
+ ALLOW_DAV =		(1<<5),	/* WebDAV specific methods/features */
+ ALLOW_WRITECOL =	(1<<6),	/* Create/modify collections */
+ ALLOW_CAL =		(1<<7),	/* CalDAV specific methods/features */
+ ALLOW_CAL_SCHED =	(1<<8),	/* CalDAV Scheduling specific features */
+ ALLOW_CARD =	(1<<9),	/* CardDAV specific methods/features */
+ ALLOW_ISCHEDULE =	(1<<10)	/* iSchedule specific methods/features */
+};
+
+struct auth_scheme_t {
+ unsigned idx;		/* Index value of the scheme */
+ const char *name;		/* HTTP auth scheme name */
+ const char *saslmech;	/* Corresponding SASL mech name */
+ unsigned flags;		/* Bitmask of requirements/features */
+ 	 			/* Optional function to send success data */
+ void (*send_success)(const char *name, const char *data);
+ 	 			/* Optional function to recv success data */
+ const char *(*recv_success)(hdrcache_t hdrs);
+};
+
+/* Index into available schemes */
+enum {
+ AUTH_BASIC = 0,
+ AUTH_DIGEST,
+ AUTH_SPNEGO,
+ AUTH_NTLM
+};
+
+/* Auth scheme flags */
+enum {
+ AUTH_NEED_PERSIST =	(1<<0),	/* Persistent connection required */
+ AUTH_NEED_REQUEST =	(1<<1),	/* Request-line required */
+ AUTH_SERVER_FIRST =	(1<<2),	/* SASL mech is server-first */
+ AUTH_BASE64 =	(1<<3)	/* Base64 encode/decode auth data */
+};
+
+/* List of HTTP auth schemes that we support */
+extern struct auth_scheme_t auth_schemes;
+
+extern const char *digest_recv_success(hdrcache_t hdrs);
+
+
+/* Request-line context */
+struct request_line_t {
+ char bufMAX_REQ_LINE+1;	/* working copy of request-line */
+ char *meth;			/* method */
+ char *uri;			/* request-target */
+ char *ver;			/* HTTP-version */
+};
+
+
+/* Request target context */
+struct request_target_t {
+ char pathMAX_MAILBOX_PATH+1; /* working copy of URL path */
+ char *tail;			/* tail of original request path */
+ unsigned namespace;		/* namespace of path */
+ char *user;			/* ptr to owner of collection (NULL = shared) */
+ size_t userlen;
+ char *collection;		/* ptr to collection name */
+ size_t collen;
+ char *resource;		/* ptr to resource name */
+ size_t reslen;
+ unsigned flags;		/* target-specific flags/meta-data */
+ unsigned long allow;	/* bitmask of allowed features/methods */
+ char mboxnameMAX_MAILBOX_BUFFER+1;
+};
+
+/* Request target flags */
+enum {
+ TGT_SCHED_INBOX = 1,
+ TGT_SCHED_OUTBOX
+};
+
+/* Function to parse URI path and generate a mailbox name */
+typedef int (*parse_path_t)(const char *path,
+			 struct request_target_t *tgt, const char **errstr);
+
+/* Auth challenge context */
+struct auth_challenge_t {
+ struct auth_scheme_t *scheme;	/* Selected AUTH scheme */
+ const char *param;	 		/* Server challenge */
+};
+
+/* Meta-data for error response */
+struct error_t {
+ const char *desc;			/* Error description */
+ unsigned precond;			/* CalDAV precondition */
+ const char *resource;		/* Resource which lacks privileges */
+ int rights; 			/* Privileges needed by resource */
+};
+
+struct range {
+ unsigned long first;
+ unsigned long last;
+ struct range *next;
+};
+
+/* Context for reading request/response body */
+struct body_t {
+ unsigned char flags;		/* Disposition flags */
+ unsigned char framing;		/* Message framing */
+ unsigned char te;			/* Transfer-Encoding */
+ unsigned max;			/* Max allowed len */
+ ulong len; 				/* Content-Length */
+ struct buf payload;			/* Payload	 */
+};
+
+/* Message Framing flags */
+enum {
+ FRAMING_UNKNOWN = 0,
+ FRAMING_LENGTH,
+ FRAMING_CHUNKED,
+ FRAMING_CLOSE
+};
+
+
+/* Meta-data for response body (payload & representation headers) */
+struct resp_body_t {
+ ulong len; 		/* Content-Length */
+ struct range *range;/* Content-Range */
+ const char *fname;	/* Content-Dispo */
+ unsigned char enc;	/* Content-Encoding */
+ const char *lang;	/* Content-Language */
+ const char *loc;	/* Content-Location */
+ const u_char *md5;	/* Content-MD5 */
+ const char *type;	/* Content-Type */
+ unsigned prefs;	/* Prefer	 */
+ const char *lock;	/* Lock-Token */
+ const char *etag;	/* ETag */
+ time_t lastmod;	/* Last-Modified */
+ time_t maxage;	/* Expires	 */
+ const char *stag;	/* Schedule-Tag */
+ time_t iserial;	/* iSched serial# */
+ struct buf payload;	/* Payload	 */
+};
+
+/* Transaction flags */
+struct txn_flags_t {
+ unsigned char ver1_0;		/* Request from HTTP/1.0 client */
+ unsigned char conn;			/* Connection opts on req/resp */
+ unsigned char cors;			/* Cross-Origin Resource Sharing */
+ unsigned char te;			/* Transfer-Encoding for resp */
+ unsigned char cc;			/* Cache-Control directives for resp */
+ unsigned char ranges;		/* Accept range requests for resource */
+ unsigned char vary;			/* Headers on which response varied */
+ unsigned char trailer;		/* Headers which will be in trailer */
+};
+
+/* Transaction context */
+struct transaction_t {
+ unsigned meth;			/* Index of Method to be performed */
+ struct txn_flags_t flags;		/* Flags for this txn */
+ struct request_line_t req_line;	/* Parsed request-line */
+ xmlURIPtr req_uri;	 		/* Parsed request-target URI */
+ struct request_target_t req_tgt;	/* Parsed request-target path */
+ hdrcache_t req_hdrs; 		/* Cached HTTP headers */
+ struct body_t req_body;		/* Buffered request body */
+ struct auth_challenge_t auth_chal;	/* Authentication challenge */
+ const char *location; 		/* Location of resource */
+ struct error_t error;		/* Error response meta-data */
+ struct resp_body_t resp_body;	/* Response body meta-data */
+#ifdef HAVE_ZLIB
+ z_stream zstrm;			/* Compression context */
+ struct buf zbuf;			/* Compression buffer */
+#endif
+ struct buf buf;	 		/* Working buffer - currently used for:
+					 httpd:
+					 - telemetry of auth'd request
+					 - error desc string
+					 - Location hdr on redirects
+					 - Etag for static docs
+					 http_rss:
+					 - Content-Type for MIME parts
+					 - URL for feed & items
+					 http_caldav:
+					 - precond error resource URL
+					 http_ischedule:
+					 - error desc string
+					*/
+};
+
+/* Connection token flags */
+enum {
+ CONN_CLOSE =	(1<<0),
+ CONN_UPGRADE = 	(1<<1),
+ CONN_KEEPALIVE =	(1<<2)
+};
+
+/* Cross-Origin Resource Sharing flags */
+enum {
+ CORS_NONE =		0,
+ CORS_SIMPLE =	1,
+ CORS_PREFLIGHT =	2
+};
+
+/* read_body() flags */
+enum {
+ BODY_RESPONSE =	(1<<0),	/* Response body, otherwise request */
+ BODY_CONTINUE =	(1<<1),	/* Expect:100-continue request */
+ BODY_CLOSE =	(1<<1),	/* Close-delimited response body */
+ BODY_DECODE = 	(1<<2),	/* Decode any Content-Encoding */
+ BODY_DISCARD =	(1<<3),	/* Discard body (don't buffer or decode) */
+ BODY_DONE =		(1<<4)	/* Body has been read */
+};
+
+/* Transfer-Encoding flags (coding of response payload) */
+enum {
+ TE_NONE =		0,
+ TE_DEFLATE =	(1<<0),	/* Implies TE_CHUNKED as final coding */
+ TE_GZIP =		(1<<1),	/* Implies TE_CHUNKED as final coding */
+ TE_CHUNKED =	(1<<2) /* MUST be last */
+};
+
+/* Content-Encoding flags (coding of representation) */
+enum {
+ CE_IDENTITY =	0,
+ CE_DEFLATE =	(1<<0),
+ CE_GZIP =		(1<<1)
+};
+
+/* Cache-Control directive flags */
+enum {
+ CC_REVALIDATE =	(1<<0),
+ CC_NOCACHE =	(1<<1),
+ CC_NOSTORE =	(1<<2),
+ CC_NOTRANSFORM =	(1<<3),
+ CC_PUBLIC =	 	(1<<4),
+ CC_PRIVATE =	(1<<5),
+ CC_MAXAGE =	 	(1<<6)
+};
+
+/* Vary header flags (headers used in selecting/producing representation) */
+enum {
+ VARY_ACCEPT =	(1<<0),
+ VARY_AE =		(1<<1),	/* Accept-Encoding */
+ VARY_BRIEF =	(1<<2),
+ VARY_PREFER =	(1<<3)
+};
+
+/* Trailer header flags */
+enum {
+ TRAILER_CMD5 =	(1<<0) /* Content-MD5 */
+};
+
+typedef int (*method_proc_t)(struct transaction_t *txn, void *params);
+typedef int (*filter_proc_t)(struct transaction_t *txn,
+			 const char *base, unsigned long len);
+
+struct method_t {
+ method_proc_t proc;		/* Function to perform the method */
+ void *params;		/* Parameters to pass to the method */
+};
+
+struct namespace_t {
+ unsigned id;		/* Namespace identifier */
+ unsigned enabled;		/* Is this namespace enabled? */
+ const char *prefix;		/* Prefix of URL path denoting namespace */
+ const char *well_known;	/* Any /.well-known/ URI */
+ unsigned need_auth;		/* Do we need to auth for this namespace? */
+ unsigned long allow;	/* Bitmask of allowed features/methods */
+ void (*init)(struct buf *serverinfo);
+ void (*auth)(const char *userid);
+ void (*reset)(void);
+ void (*shutdown)(void);
+ struct method_t methods;	/* Array of functions to perform HTTP methods.
+				 * MUST be an entry for EACH method listed,
+				 * and in the SAME ORDER in which they appear,
+				 * in the http_methods array.
+				 * If the method is not supported,
+				 * the function pointer MUST be NULL.
+				 */
+};
+
+struct accept {
+ char *token;
+ float qual;
+ struct accept *next;
+};
+
+extern struct namespace_t namespace_principal;
+extern struct namespace_t namespace_calendar;
+extern struct namespace_t namespace_addressbook;
+extern struct namespace_t namespace_ischedule;
+extern struct namespace_t namespace_domainkey;
+extern struct namespace_t namespace_rss;
+extern struct namespace_t namespace_dblookup;
+extern struct namespace_t namespace_default;
+
+
+/* XXX These should be included in struct transaction_t */
+extern struct buf serverinfo;
+extern struct backend **backend_cached;
+extern struct protstream *httpd_in;
+extern struct protstream *httpd_out;
+extern int https;
+extern int httpd_tls_done;
+extern int httpd_timeout;
+extern int httpd_userisadmin;
+extern int httpd_userisproxyadmin;
+extern char *httpd_userid, *proxy_userid;
+extern struct auth_state *httpd_authstate;
+extern struct namespace httpd_namespace;
+extern struct sockaddr_storage httpd_localaddr, httpd_remoteaddr;
+extern unsigned long config_httpmodules;
+extern int config_httpprettytelemetry;
+
+extern xmlURIPtr parse_uri(unsigned meth, const char *uri, unsigned path_reqd,
+			 const char **errstr);
+extern struct accept *parse_accept(const char **hdr);
+extern int is_mediatype(const char *hdr, const char *type);
+extern time_t calc_compile_time(const char *time, const char *date);
+extern int http_mailbox_open(const char *name, struct mailbox **mailbox,
+			 int locktype);
+extern const char *http_statusline(long code);
+extern void httpdate_gen(char *buf, size_t len, time_t t);
+extern void comma_list_hdr(const char *hdr, const char *vals,
+			 unsigned flags, ...);
+extern void response_header(long code, struct transaction_t *txn);
+extern void buf_printf_markup(struct buf *buf, unsigned level,
+			 const char *fmt, ...);
+extern void error_response(long code, struct transaction_t *txn);
+extern void html_response(long code, struct transaction_t *txn, xmlDocPtr html);
+extern void xml_response(long code, struct transaction_t *txn, xmlDocPtr xml);
+extern void write_body(long code, struct transaction_t *txn,
+		 const char *buf, unsigned len);
+extern void write_multipart_body(long code, struct transaction_t *txn,
+				 const char *buf, unsigned len);
+extern int meth_get_doc(struct transaction_t *txn, void *params);
+extern int meth_options(struct transaction_t *txn, void *params);
+extern int meth_trace(struct transaction_t *txn, void *params);
+extern int etagcmp(const char *hdr, const char *etag);
+extern int check_precond(struct transaction_t *txn, const void *data,
+			 const char *etag, time_t lastmod);
+extern int parse_framing(hdrcache_t hdrs, struct body_t *body,
+			 const char **errstr);
+extern int read_body(struct protstream *pin, hdrcache_t hdrs,
+		 struct body_t *body, const char **errstr);
+
+#endif /* HTTPD_H */

cyrus-imapd-2.4.17.tar.gz/imap/idle.c -> cyrus-imapd-2.5.tar.gz/imap/idle.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: idle.c,v 1.7 2010/01/06 17:01:32 murch Exp $
 */
 
 #include <config.h>
@@ -49,211 +47,223 @@
 #include <syslog.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <syslog.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <signal.h>
 #include <string.h>
+#include <errno.h>
 
+#include "assert.h"
 #include "idle.h"
-#include "idled.h"
+#include "idlemsg.h"
 #include "global.h"
+#include "util.h"
 
-const char *idle_method_desc = "no";
-
-/* function to report mailbox updates to the client */
-static idle_updateproc_t *idle_update = NULL;
+HIDDEN const char *idle_method_desc = "no";
 
-/* how often to poll the mailbox */
-static time_t idle_period = -1;
-static int idle_started = 0;
-
-/* UNIX socket variables */
-static int notify_sock = -1;
+/* link to idled */
 static struct sockaddr_un idle_remote;
-static int idle_remote_len = 0;
 
+/* true if we've successfully told the idled
+ * that we want to be notified of changes */
+static int idle_started;
 
-/*
- * Send a message to idled
- */
-static int idle_send_msg(int msg, const char *mboxname)
+/* Send the message 'which' about the mailbox 'mboxname' to the idled.
+ * Returns 0 on success or an IMAP error code on failure */
+static int idle_send_msg(int which, const char *mboxname)
 {
- idle_data_t idledata;
+ idle_message_t msg;
+
+ /* maybe the idled came along, so we always send anyway, because
+ * polled idle is too awful to contemplate */
 
 /* fill the structure */
- idledata.msg = msg;
- idledata.pid = getpid();
- strncpy(idledata.mboxname, mboxname ? mboxname : ".", sizeof(idledata.mboxname));
+ msg.which = which;
+ xstrncpy(msg.mboxname, mboxname ? mboxname : ".", sizeof(msg.mboxname));
 
 /* send */
- if (sendto(notify_sock, (void *) &idledata,
-	 IDLEDATA_BASE_SIZE+strlen(idledata.mboxname)+1, /* 1 for NULL */
-	 0, (struct sockaddr *) &idle_remote, idle_remote_len) == -1) {
- syslog(LOG_ERR, "error sending to idled: %x", msg);
- return 0;
- }
-
- return 1;
+ return idle_send(&idle_remote, &msg);
 }
 
 /*
 * Notify idled of a mailbox change
 */
-void idle_notify(const char *mboxname)
+static void idle_notify(const char *mboxname)
 {
+ int r;
+
 /* We should try to determine if we need to send this
 * (ie, is an imapd is IDLE on 'mailbox'?).
 */
- idle_send_msg(IDLE_NOTIFY, mboxname);
+ r = idle_send_msg(IDLE_MSG_NOTIFY, mboxname);
+ if (r && (r != ENOENT)) {
+	/* ENOENT can happen as result of a race between delivering
+	 * messages and restarting idled. It indicates that the
+	 * idled's socket was unlinked, which means that idled went
+	 * through it's graceful shutdown path, so don't syslog. */
+	syslog(LOG_ERR, "IDLE: error sending message "
+			"NOTIFY to idled for mailbox %s: %s.",
+			mboxname, error_message(r));
+ }
 }
 
 /*
 * Create connection to idled for sending notifications
 */
-int idle_enabled(void)
+EXPORTED void idle_init(void)
 {
- if (idle_period == -1) {
-	int s;
-	int fdflags;
-	struct stat sbuf;
-	const char *idle_sock;
+ struct sockaddr_un local;
+ int fdflags;
+ int s;
 
-	/* get polling period in case we can't connect to idled
-	 * NOTE: if used, a period of zero disables IDLE
-	 */
-	idle_period = config_getint(IMAPOPT_IMAPIDLEPOLL);
-	if (idle_period < 0) idle_period = 0;
+ if (!idle_enabled()) return;
 
-	if (!idle_period) return 0;
+ assert(idle_make_client_address(&local));
+ assert(idle_make_server_address(&idle_remote));
 
-	idle_method_desc = "poll";
+ idle_method_desc = "poll";
 
-	if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-	 return idle_period;
-	}
+ /* set the mailbox update notifier */
+ mailbox_set_updatenotifier(idle_notify);
 
-	idle_remote.sun_family = AF_UNIX;
-	idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
-	if (idle_sock) {	
-	 strcpy(idle_remote.sun_path, idle_sock);
-	}
-	else {
-	 strcpy(idle_remote.sun_path, config_dir);
-	 strcat(idle_remote.sun_path, FNAME_IDLE_SOCK);
-	}
-	idle_remote_len = sizeof(idle_remote.sun_family) +
-	 strlen(idle_remote.sun_path) + 1;
-
-	/* check that the socket exists */
-	if (stat(idle_remote.sun_path, &sbuf) < 0) {
-	 close(s);
-	 return idle_period;
-	}
-
-	/* put us in non-blocking mode */
-	fdflags = fcntl(s, F_GETFD, 0);
-	if (fdflags != -1) fdflags = fcntl(s, F_SETFL, O_NONBLOCK | fdflags);
-	if (fdflags == -1) { close(s); return idle_period; }
+ if (!idle_init_sock(&local))
+	return;
 
-	notify_sock = s;
+ s = idle_get_sock();
 
-	if (!idle_send_msg(IDLE_NOOP, NULL)) {
-	 close(s);
-	 notify_sock = -1;
-	 return idle_period;
-	}
+ /* put us in non-blocking mode */
+ fdflags = fcntl(s, F_GETFD, 0);
+ if (fdflags != -1)
+	fdflags = fcntl(s, F_SETFL, O_NONBLOCK | fdflags);
+ if (fdflags == -1) {
+	idle_done_sock();
+	return;
+ }
 
-	/* set the mailbox update notifier */
-	mailbox_set_updatenotifier(idle_notify);
+ idle_method_desc = "idled";
+}
 
-	idle_method_desc = "idled";
+EXPORTED int idle_enabled(void)
+{
+ int idle_period = config_getint(IMAPOPT_IMAPIDLEPOLL);
 
-	return 1;
- }
- else if (notify_sock != -1) {
-	/* if the idle socket is already open, we're enabled */
-	return 1;
- }
- else {
-	return idle_period;
- }
+ /* only enabled if a positive period */
+ return (idle_period > 0);
 }
 
-static void idle_handler(int sig)
+EXPORTED void idle_start(const char *mboxname)
 {
- /* ignore the signals, unless the server has started idling */
- if (!idle_started) return;
-
- switch (sig) {
- case SIGUSR1:
-	idle_update(IDLE_MAILBOX);
-	break;
- case SIGUSR2:
-	idle_update(IDLE_ALERT);
-	break;
- case SIGALRM:
-	idle_update(IDLE_MAILBOX|IDLE_ALERT);
-	alarm(idle_period);
-	break;
+ int r;
+
+ if (!idle_enabled()) return;
+
+ /* Tell idled that we're idling. It doesn't
+ * matter if it fails, we'll still poll */
+ r = idle_send_msg(IDLE_MSG_INIT, mboxname);
+ if (r) {
+	int idle_timeout = config_getint(IMAPOPT_IMAPIDLEPOLL);
+	syslog(LOG_ERR, "IDLE: error sending message "
+			"INIT to idled for mailbox %s: %s. "
+			"Falling back to polling every %d seconds.",
+			mboxname, error_message(r), idle_timeout);
+	return;
 }
+
+ idle_started = 1;
 }
 
-int idle_init(idle_updateproc_t *proc)
+EXPORTED int idle_wait(int otherfd)
 {
- struct sigaction action;
+ fd_set rfds;
+ int maxfd = -1;
+ int s = -1;
+ struct timeval timeout;
+ int r;
+ int flags = 0;
+ int idle_timeout = config_getint(IMAPOPT_IMAPIDLEPOLL);
+
+ if (!idle_enabled()) return 0;
+
+ /* If idled was not contacted, we still listen on the socket,
+ * because we might get ALERTs, but we won't get mailbox
+ * notifications. The poll timeout controls how quickly
+ * we will notice new mail arriving. */
+
+ FD_ZERO(&rfds);
+ s = idle_get_sock();
+ if (s >= 0) {
+	FD_SET(s, &rfds);
+	maxfd = MAX(maxfd, s);
+ }
+ if (otherfd >= 0) {
+	FD_SET(otherfd, &rfds);
+	maxfd = MAX(maxfd, otherfd);
+ }
 
- idle_update = proc;
+ /* Note: it's technically valid for there to be no fds to listen
+ * to, in the case where @otherfd is passed as -1 and we failed
+ * to talk to idled. It shouldn't happen though as we're always
+ * called with a valid otherfd. */
 
- /* We don't want recursive calls to idle_update() */
- sigemptyset(&action.sa_mask);
- sigaddset(&action.sa_mask, SIGUSR1);
- sigaddset(&action.sa_mask, SIGUSR2);
- action.sa_flags = 0;
-#ifdef SA_RESTART
- action.sa_flags |= SA_RESTART;
-#endif
- action.sa_handler = idle_handler;
+ /* maximum possible timeout before we double-check anyway */
+ timeout.tv_sec = idle_timeout;
+ timeout.tv_usec = 0;
 
- /* Setup the signal handlers */
- if ((sigaction(SIGUSR1, &action, NULL) < 0) ||
-	(sigaction(SIGUSR2, &action, NULL) < 0) ||
-	(sigaction(SIGALRM, &action, NULL) < 0)) {
-	syslog(LOG_ERR, "sigaction: %m");
+ do {
+	r = signals_select(maxfd+1, &rfds, NULL, NULL, &timeout);
 
-	/* Cancel receiving signals */
-	idle_done(NULL);
-	return 0;
- }
+	if (r < 0) {
+	 if (errno == EAGAIN || errno == EINTR) continue;
+	 syslog(LOG_ERR, "IDLE: select failed: %m");
+	 return 0;
+	}
+	if (r == 0) {
+	 /* timeout */
+	 flags |= IDLE_MAILBOX|IDLE_ALERT;
+	}
+	if (r > 0 && s >= 0 && FD_ISSET(s, &rfds)) {
+	 struct sockaddr_un from;
+	 idle_message_t msg;
+
+	 if (idle_recv(&from, &msg)) {
+		switch (msg.which) {
+		case IDLE_MSG_NOTIFY:
+		 flags |= IDLE_MAILBOX;
+		 break;
+		case IDLE_MSG_ALERT:
+		 flags |= IDLE_ALERT;
+		 break;
+		}
+	 }
+	}
+	if (r > 0 && otherfd >= 0 && FD_ISSET(otherfd, &rfds))
+	 flags |= IDLE_INPUT;
+ } while (!flags);
 
- return 1;
+ return flags;
 }
 
-void idle_start(const char *mboxname)
+EXPORTED void idle_stop(const char *mboxname)
 {
- idle_started = 1;
+ int r;
 
- /* Tell idled that we're idling */
- if (notify_sock == -1 || !idle_send_msg(IDLE_INIT, mboxname)) {
-	/* otherwise, we'll poll with SIGALRM */
-	alarm(idle_period);
- }
-}
+ if (!idle_started) return;
 
-void idle_done(const char *mboxname)
-{
 /* Tell idled that we're done idling */
- if (notify_sock != -1) idle_send_msg(IDLE_DONE, mboxname);
-
- /* Cancel alarm */
- alarm(0);
-
- /* Remove the signal handlers */
- signal(SIGUSR1, SIG_IGN);
- signal(SIGUSR2, SIG_IGN);
- signal(SIGALRM, SIG_IGN);
+ r = idle_send_msg(IDLE_MSG_DONE, mboxname);
+ if (r && (r != ENOENT)) {
+	/* See comment in idle_notify() about ENOENT */
+	syslog(LOG_ERR, "IDLE: error sending message "
+			"DONE to idled for mailbox %s: %s.",
+			mboxname, error_message(r));
+ }
 
- idle_update = NULL;
 idle_started = 0;
 }
+
+EXPORTED void idle_done(void)
+{
+ /* close the local socket */
+ idle_done_sock();
+}

cyrus-imapd-2.4.17.tar.gz/imap/idle.h -> cyrus-imapd-2.5.tar.gz/imap/idle.h Changed

@@ -37,8 +37,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: idle.h,v 1.11 2010/01/06 17:01:32 murch Exp $
  */
 
 #ifndef IDLE_H
@@ -49,26 +47,42 @@
 extern const char *idle_method_desc;
 
 typedef enum {
+    /* something noteworthy may have happened to the mailbox,
+     * e.g. a delivery, so it needs to be checked */
     IDLE_MAILBOX =	0x1,
-    IDLE_ALERT =	0x2
+    /* the shutdownfile may have been written, needing an ALERT reponse
+     * to be sent to any IMAP clients */
+    IDLE_ALERT =	0x2,
+    /* input was detected on the @otherfd, probably because the IMAP
+     * client cancelled the IDLE */
+    IDLE_INPUT =	0x4
 } idle_flags_t;
 
 typedef void idle_updateproc_t(idle_flags_t flags);
 
+/* set up the link to the idled for notifications */
+void idle_init(void);
 
-/* Is IDLE enabled?  Can also do initial setup, if necessary */
+/* Is IDLE enabled? */
 int idle_enabled(void);
 
-/* Setup for IDLE.
- * 'proc' is a pointer to a function which reports mailbox updates and/or
- * ALERTs to the client.
- */
-int idle_init(idle_updateproc_t *proc);
-
 /* Start IDLEing on 'mailbox'. */
 void idle_start(const char *mboxname);
 
-/* Cleanup when IDLE is completed. */
-void idle_done(const char *mboxname);
+/* Wait for something to happen while IDLEing.  @otherfd is a file
+ * descriptor on which to wait for input; presumably this will be the
+ * fd of the main protstream from the IMAP client.  Returns a mask of
+ * flags indicating what if anything happened, see idle_flags_t, or 0
+ * on error.  If idled is disabled or was not contacted, we fall back
+ * to polling mode and return the flags IDLE_MAILBOX and IDLE_INPUT
+ * periodically.
+ */
+int idle_wait(int otherfd);
+
+/* Stop IDLEing on 'mailbox'. */
+void idle_stop(const char *mboxname);
+
+/* Clean up when IDLE is completed. */
+void idle_done(void);
 
 #endif

cyrus-imapd-2.4.17.tar.gz/imap/idled.c -> cyrus-imapd-2.5.tar.gz/imap/idled.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: idled.c,v 1.28 2010/01/06 17:01:32 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -47,8 +45,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <stdlib.h>
@@ -59,52 +55,43 @@
 #include <signal.h>
 #include <fcntl.h>
 
-#include "idled.h"
+#include "idlemsg.h"
 #include "global.h"
 #include "mboxlist.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "hash.h"
 #include "exitcodes.h"
 
-/* global state */
-const int config_need_data = 0;
-
 extern int optind;
 extern char *optarg;
 
 static int verbose = 0;
 static int debugmode = 0;
 static time_t idle_timeout;
-static int sigquit = 0;
 
 struct ientry {
- pid_t pid;
+ struct sockaddr_un remote;
 time_t itime;
 struct ientry *next;
 };
 static struct hash_table itable;
-static struct ientry *ifreelist;
-static int itable_inc = 100;
-void idle_done(char *mboxname, pid_t pid);
 
-void fatal(const char *msg, int err)
+EXPORTED void fatal(const char *msg, int err)
 {
 if (debugmode) fprintf(stderr, "dying with %s %d\n",msg,err);
 syslog(LOG_CRIT, "%s", msg);
 syslog(LOG_NOTICE, "exiting");
 
 cyrus_done();
- 
+
 exit(err);
 }
 
 static int mbox_count_cb(void *rockp,
 			 const char *key __attribute__((unused)),
-			 int keylen __attribute__((unused)),
+			 size_t keylen __attribute__((unused)),
 			 const char *data __attribute__((unused)),
-			 int datalen __attribute__((unused)))
+			 size_t datalen __attribute__((unused)))
 {
 int *ip = (int *) rockp;
 (*ip)++;
@@ -112,44 +99,20 @@
 return 0;
 }
 
-/* return a new 'ientry', either from the freelist or by malloc'ing it */
-static struct ientry *get_ientry(void)
-{
- struct ientry *t;
-
- if (!ifreelist) {
-	/* create child_table_inc more and add them to the freelist */
-	struct ientry *n;
-	int i;
-
-	n = xmalloc(itable_inc * sizeof(struct ientry));
-	ifreelist = n;
-	for (i = 0; i < itable_inc - 1; i++) {
-	 ni.next = n + (i + 1);
-	}
-	/* i == child_table_inc - 1, last item in block */
-	ni.next = NULL;
- }
-
- t = ifreelist;
- ifreelist = ifreelist->next;
-
- return t;
-}
-
-/* remove pid from list of those idling on mboxname */
-void idle_done(char *mboxname, pid_t pid)
+/* remove an ientry from list of those idling on mboxname */
+static void remove_ientry(const char *mboxname,
+			 const struct sockaddr_un *remote)
 {
 struct ientry *t, *p = NULL;
 
 t = (struct ientry *) hash_lookup(mboxname, &itable);
- while (t && t->pid != pid) {
+ while (t && memcmp(&t->remote, remote, sizeof(*remote))) {
 	p = t;
 	t = t->next;
 }
 if (t) {
 	if (!p) {
-	 /* first pid in the linked list */
+	 /* first ientry in the linked list */
 
 	 p = t->next; /* remove node */
 
@@ -158,122 +121,157 @@
 	 hash_insert(mboxname, p, &itable);
 	}
 	else {
-	 /* not the first pid in the linked list */
+	 /* not the first ientry in the linked list */
 
 	 p->next = t->next; /* remove node */
 	}
-	t->next = ifreelist; /* add to freelist */
-	ifreelist = t;
+	free(t);
 }
 }
 
-void process_msg(idle_data_t *idledata)
+
+
+static void process_message(struct sockaddr_un *remote, idle_message_t *msg)
 {
 struct ientry *t, *n;
+ int r;
 
- switch (idledata->msg) {
- case IDLE_INIT:
+ switch (msg->which) {
+ case IDLE_MSG_INIT:
 	if (verbose || debugmode)
-	 syslog(LOG_DEBUG, "imapd%ld: IDLE_INIT '%s'\n",
-		 idledata->pid, idledata->mboxname);
+	 syslog(LOG_DEBUG, "imapd%s: IDLE_MSG_INIT '%s'\n",
+		 idle_id_from_addr(remote), msg->mboxname);
 
-	/* add pid to list of those idling on mboxname */
-	t = (struct ientry *) hash_lookup(idledata->mboxname, &itable);
-	n = get_ientry();
-	n->pid = idledata->pid;
+	/* add an ientry to list of those idling on mboxname */
+	t = (struct ientry *) hash_lookup(msg->mboxname, &itable);
+	n = (struct ientry *) xzmalloc(sizeof(struct ientry));
+	n->remote = *remote;
 	n->itime = time(NULL);
 	n->next = t;
-	hash_insert(idledata->mboxname, n, &itable);
+	hash_insert(msg->mboxname, n, &itable);
 	break;
-	
- case IDLE_NOTIFY:
+
+ case IDLE_MSG_NOTIFY:
 	if (verbose || debugmode)
-	 syslog(LOG_DEBUG, "IDLE_NOTIFY '%s'\n", idledata->mboxname);
+	 syslog(LOG_DEBUG, "IDLE_MSG_NOTIFY '%s'\n", msg->mboxname);
 
-	/* send a message to all pids idling on mboxname */
-	t = (struct ientry *) hash_lookup(idledata->mboxname, &itable);
-	while (t) {
+	/* send a message to all clients idling on mboxname */
+	t = (struct ientry *) hash_lookup(msg->mboxname, &itable);
+	for ( ; t ; t = n) {
+	 n = t->next;
 	 if ((t->itime + idle_timeout) < time(NULL)) {
 		/* This process has been idling for longer than the timeout
 		 * period, so it probably died. Remove it from the list.
 		 */
 		if (verbose || debugmode)
-		 syslog(LOG_DEBUG, " TIMEOUT %d\n", t->pid);
+		 syslog(LOG_DEBUG, " TIMEOUT %s\n", idle_id_from_addr(&t->remote));
 
-		n = t;
-		t = t->next;
-		idle_done(idledata->mboxname, n->pid);
+		remove_ientry(msg->mboxname, &t->remote);
 	 }
 	 else { /* signal process to update */
 		if (verbose || debugmode)
-		 syslog(LOG_DEBUG, " SIGUSR1 %d\n", t->pid);
-
-		kill(t->pid, SIGUSR1);
-		t = t->next;
+		 syslog(LOG_DEBUG, " fwd NOTIFY %s\n", idle_id_from_addr(&t->remote));
+
+		/* forward the received msg onto our clients */
+		r = idle_send(&t->remote, msg);
+		if (r) {
+		 /* ENOENT can happen as result of a race between delivering
+		 * messages and shutting down imapd. It indicates that the
+		 * imapd's socket was unlinked, which means that imapd went
+		 * through it's graceful shutdown path, so don't syslog. */
+		 if (r != ENOENT)
+			syslog(LOG_ERR, "IDLE: error sending message "
+					"NOTIFY to imapd %s for mailbox %s: %s, "
+					"forgetting.",
+					idle_id_from_addr(&t->remote),
+					msg->mboxname, error_message(r));
+		 if (verbose || debugmode)
+			syslog(LOG_DEBUG, " forgetting %s\n", idle_id_from_addr(&t->remote));
+		 remove_ientry(msg->mboxname, &t->remote);
+		}
 	 }
 	}
 	break;
-	
- case IDLE_DONE:
+
+ case IDLE_MSG_DONE:
 	if (verbose || debugmode)
-	 syslog(LOG_DEBUG, "imapd%ld: IDLE_DONE '%s'\n",
-		 idledata->pid, idledata->mboxname);
+	 syslog(LOG_DEBUG, "imapd%s: IDLE_MSG_DONE '%s'\n",
+		 idle_id_from_addr(remote), msg->mboxname);
 
-	/* remove pid from list of those idling on mboxname */
-	idle_done(idledata->mboxname, idledata->pid);
+	/* remove client from list of those idling on mboxname */
+	remove_ientry(msg->mboxname, remote);
 	break;
 
- case IDLE_NOOP:
+ case IDLE_MSG_NOOP:
 	break;
-	
+
 default:
-	syslog(LOG_ERR, "unrecognized message: %lx", idledata->msg);
+	syslog(LOG_ERR, "unrecognized message: %lx", msg->which);
 	break;
 }
 }
 
-void idle_alert(char *key __attribute__((unused)),
-		void *data,
-		void *rock __attribute__((unused)))
+
+static void send_alert(const char *key,
+		 void *data,
+		 void *rock __attribute__((unused)))
 {
 struct ientry *t = (struct ientry *) data;
+ struct ientry *n;
+ idle_message_t msg;
+ int r;
+
+ msg.which = IDLE_MSG_ALERT;
+ strncpy(msg.mboxname, ".", sizeof(msg.mboxname));
+
+
+ for ( ; t ; t = n) {
+	n = t->next;
 
- while (t) {
 	/* signal process to check ALERTs */
 	if (verbose || debugmode)
-	 syslog(LOG_DEBUG, " SIGUSR2 %d\n", t->pid);
-	kill(t->pid, SIGUSR2);
-
-	t = t->next;
+	 syslog(LOG_DEBUG, " ALERT %s\n", idle_id_from_addr(&t->remote));
+
+	r = idle_send(&t->remote, &msg);
+	if (r) {
+	 /* ENOENT can happen as result of a race between shutting
+	 * down idled and shutting down imapd. It indicates that the
+	 * imapd's socket was unlinked, which means that imapd went
+	 * through it's graceful shutdown path, so don't syslog. */
+	 if (r != ENOENT)
+		syslog(LOG_ERR, "IDLE: error sending message "
+				"ALERT to imapd %s for mailbox %s: %s, "
+				"forgetting.",
+				idle_id_from_addr(&t->remote),
+				msg.mboxname, error_message(r));
+	 if (verbose || debugmode)
+		syslog(LOG_DEBUG, " forgetting %s\n", idle_id_from_addr(&t->remote));
+	 remove_ientry(key, &t->remote);
+	}
 }
 }
 
-static void sighandler (int sig __attribute__((unused))) 
+static void shut_down(int ec) __attribute__((noreturn));
+static void shut_down(int ec)
 {
- sigquit = 1;
- return;
+ hash_enumerate(&itable, send_alert, NULL);
+ idle_done_sock();
+ cyrus_done();
+ exit(ec);
 }
 
 int main(int argc, char **argv)
 {
- char shutdownfilename1024;
 char *p = NULL;
 int opt;
 int nmbox = 0;
- int s, len;
+ int s;
 struct sockaddr_un local;
- idle_data_t idledata;
- struct sockaddr_un from;
- socklen_t fromlen;
- mode_t oldumask;
 fd_set read_set, rset;
 int nfds;
 struct timeval timeout;
 pid_t pid;
- int fd;
 char *alt_config = NULL;
- const char *idle_sock;
- struct sigaction action;
 
 p = getenv("CYRUS_VERBOSE");
 if (p) verbose = atoi(p) + 1;
@@ -293,27 +291,7 @@
 	}
 }
 
- /* fork unless we were given the -d option */
- if (debugmode == 0) {
-	
-	pid = fork();
-	
-	if (pid == -1) {
-	 perror("fork");
-	 exit(1);
-	}
-	
-	if (pid != 0) { /* parent */
-	 exit(0);
-	}
- }
- /* child */
-
- cyrus_init(alt_config, "idled", 0);
-
- /* get name of shutdown file */
- snprintf(shutdownfilename, sizeof(shutdownfilename), "%s/msg/shutdown",
-	 config_dir);
+ cyrus_init(alt_config, "idled", 0, 0);
 
 /* Set inactivity timer (convert from minutes to seconds) */
 idle_timeout = config_getint(IMAPOPT_TIMEOUT);
@@ -323,52 +301,40 @@
 /* count the number of mailboxes */
 mboxlist_init(0);
 mboxlist_open(NULL);
- config_mboxlist_db->foreach(mbdb, "", 0, NULL, &mbox_count_cb,
+ cyrusdb_foreach(mbdb, "", 0, NULL, &mbox_count_cb,
 				&nmbox, NULL);
 mboxlist_close();
 mboxlist_done();
 
- sigemptyset(&action.sa_mask);
- 
- action.sa_flags = 0;
- action.sa_handler = sighandler;
- if (sigaction(SIGQUIT, &action, NULL) < 0) {
- fatal("unable to install signal handler for %d: %m", SIGQUIT);
- }
+ signals_set_shutdown(shut_down);
+ signals_add_handlers(0);
 
 /* create idle table -- +1 to avoid a zero value */
 construct_hash_table(&itable, nmbox + 1, 1);
- ifreelist = NULL;
 
- /* create socket we are going to use for listening */
- if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-	perror("socket");
+ if (!idle_make_server_address(&local) ||
+	!idle_init_sock(&local)) {
 	cyrus_done();
 	exit(1);
 }
+ s = idle_get_sock();
 
- /* bind it to a local file */
- local.sun_family = AF_UNIX;
- idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
- if (idle_sock) {	
-	strlcpy(local.sun_path, idle_sock, sizeof(local.sun_path));
- }
- else {
-	strlcpy(local.sun_path, config_dir, sizeof(local.sun_path));
-	strlcat(local.sun_path, FNAME_IDLE_SOCK, sizeof(local.sun_path));
- }
- unlink(local.sun_path);
- len = sizeof(local.sun_family) + strlen(local.sun_path) + 1;
+ /* fork unless we were given the -d option or we're running as a daemon */
+ if (debugmode == 0 && !getenv("CYRUS_ISDAEMON")) {
 
- oldumask = umask((mode_t) 0); /* for Linux */
+	pid = fork();
 
- if (bind(s, (struct sockaddr *)&local, len) == -1) {
-	perror("bind");
-	cyrus_done();
-	exit(1);
+	if (pid == -1) {
+	 perror("fork");
+	 exit(1);
+	}
+
+	if (pid != 0) { /* parent */
+	 exit(0);
+	}
 }
- umask(oldumask); /* for Linux */
- chmod(local.sun_path, 0777); /* for DUX */
+ /* child */
+
 
 /* get ready for select() */
 FD_ZERO(&read_set);
@@ -379,17 +345,11 @@
 	int n;
 
 	/* check for shutdown file */
-	if ((fd = open(shutdownfilename, O_RDONLY, 0)) != -1) {
+	if (shutdown_file(NULL, 0)) {
 	 /* signal all processes to shutdown */
 	 if (verbose || debugmode)
-		syslog(LOG_DEBUG, "IDLE_ALERT\n");
-
-	 hash_enumerate(&itable, idle_alert, NULL);
-	 break;
-	}
-	if (sigquit) {
-	 hash_enumerate(&itable, idle_alert, NULL);
-	 break;
+		syslog(LOG_DEBUG, "Detected shutdown file\n");
+	 shut_down(1);
 	}
 
 	/* timeout for select is 1 second */
@@ -398,7 +358,7 @@
 
 	/* check for the next input */
 	rset = read_set;
-	n = select(nfds, &rset, NULL, NULL, &timeout);
+	n = signals_select(nfds, &rset, NULL, NULL, &timeout);
 	if (n < 0 && errno == EAGAIN) continue;
 	if (n < 0 && errno == EINTR) continue;
 	if (n == -1) {
@@ -408,34 +368,18 @@
 	 fatal("select error",-1);
 	}
 
-	/* read on unix socket */
+	/* read and process a message */
 	if (FD_ISSET(s, &rset)) {
-	 fromlen = sizeof(from);
-	 n = recvfrom(s, (void*) &idledata, sizeof(idle_data_t), 0,
-			 (struct sockaddr *) &from, &fromlen);
-
-	 if (n > 0) {
-		if (n <= IDLEDATA_BASE_SIZE ||
-		 idledata.mboxnamen - 1 - IDLEDATA_BASE_SIZE != '\0')
-		 syslog(LOG_ERR, "Invalid message received, size=%d\n", n);
-		else 
-		 process_msg(&idledata);
-	 }
-	} else {
-	 /* log some sort of error */	 
+	 struct sockaddr_un from;
+	 idle_message_t msg;
+
+	 if (idle_recv(&from, &msg))
+		process_message(&from, &msg);
 	}
 
 }
 
- cyrus_done();
-
- exit(1);
-}
-
-void printstring(const char *s __attribute__((unused)))
-{ 
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for POP3!",
- EC_SOFTWARE);
+ /* NOTREACHED */
+ shut_down(1);
 }

cyrus-imapd-2.5.tar.gz/imap/idlemsg.c Added

@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <signal.h>
+#include <string.h>
+
+#include "imap/imap_err.h"
+#include "assert.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "idlemsg.h"
+#include "global.h"
+
+/* UNIX socket variables */
+static int idle_sock = -1;
+static struct sockaddr_un idle_local;
+
+EXPORTED int idle_make_server_address(struct sockaddr_un *mysun)
+{
+ const char *idle_sock;
+
+ memset(mysun, 0, sizeof(*mysun));
+ mysun->sun_family = AF_UNIX;
+ idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
+ if (idle_sock) {
+	strlcpy(mysun->sun_path, idle_sock, sizeof(mysun->sun_path));
+ }
+ else {
+	/* TODO: detect overflow and fail */
+	strlcpy(mysun->sun_path, config_dir, sizeof(mysun->sun_path));
+	strlcat(mysun->sun_path, FNAME_IDLE_SOCK, sizeof(mysun->sun_path));
+ }
+ return 1;
+}
+
+HIDDEN int idle_make_client_address(struct sockaddr_un *mysun)
+{
+ memset(mysun, 0, sizeof(*mysun));
+ mysun->sun_family = AF_UNIX;
+ /* TODO: detect overflow and fail */
+ snprintf(mysun->sun_path, sizeof(mysun->sun_path), "%s%s/idle.%d",
+	 config_dir, FNAME_IDLE_SOCK_DIR, (int)getpid());
+ return 1;
+}
+
+/* Extract an identifying string from the remote AF_UNIX address,
+ * suitable for logging debug messages. Returns a string into an
+ * internal buffer */
+EXPORTED const char *idle_id_from_addr(const struct sockaddr_un *mysun)
+{
+ const char *tail = strrchr(mysun->sun_path, '/');
+ const char *p;
+ /* Has to be an absolute path, so there must be at least 1 / */
+ assert(tail);
+ tail++;
+ p = strchr(tail, '.');
+ return (p ? p+1 : tail);
+}
+
+EXPORTED int idle_init_sock(const struct sockaddr_un *local)
+{
+ int len;
+ int s;
+ mode_t oldumask;
+
+ assert(idle_sock == -1);
+
+ /* create socket we are going to use for listening */
+ if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
+	perror("socket");
+	return 0;
+ }
+
+ /* bind it to a local file */
+ unlink(local->sun_path);
+ len = sizeof(local->sun_family) + strlen(local->sun_path) + 1;
+
+ oldumask = umask((mode_t) 0); /* for Linux */
+
+ if (bind(s, (struct sockaddr *)local, len) == -1) {
+	perror("bind");
+	close(s);
+	return 0;
+ }
+ umask(oldumask); /* for Linux */
+ chmod(local->sun_path, 0777); /* for DUX */
+
+ idle_sock = s;
+ idle_local = *local;
+
+ return 1;
+}
+
+EXPORTED void idle_done_sock(void)
+{
+ if (idle_sock >= 0) {
+	close(idle_sock);
+	unlink(idle_local.sun_path);
+	memset(&idle_local, 0, sizeof(struct sockaddr_un)); 
+ }
+
+ idle_sock = -1;
+}
+
+EXPORTED int idle_get_sock(void)
+{
+ return idle_sock;
+}
+
+/*
+ * Send a message to a peer (idled or imapd).
+ * Returns 0 on success or an IMAP error code on failure.
+ */
+EXPORTED int idle_send(const struct sockaddr_un *remote,
+		 const idle_message_t *msg)
+{
+ int flags = 0;
+
+#ifdef MSG_DONTWAIT
+ flags |= MSG_DONTWAIT;
+#endif
+
+ if (idle_sock < 0)
+	return IMAP_SERVER_UNAVAILABLE;
+
+ if (sendto(idle_sock, (void *) msg,
+	 IDLE_MESSAGE_BASE_SIZE+strlen(msg->mboxname)+1, /* 1 for NULL */
+	 flags, (struct sockaddr *) remote, sizeof(*remote)) == -1) {
+	return errno;
+ }
+
+ return 0;
+}
+
+EXPORTED int idle_recv(struct sockaddr_un *remote, idle_message_t *msg)
+{
+ socklen_t remote_len = sizeof(*remote);
+ int n;
+
+ if (idle_sock < 0)
+	return 0;
+
+ memset(remote, 0, remote_len);
+ memset(msg, 0, sizeof(idle_message_t));
+
+ n = recvfrom(idle_sock, (void *) msg, sizeof(idle_message_t), 0,
+		 (struct sockaddr *) remote, &remote_len);
+
+ if (n < 0) {
+	syslog(LOG_ERR, "IDLE: recvfrom failed: %m");
+	return 0;
+ }
+
+ if (n <= IDLE_MESSAGE_BASE_SIZE ||
+	msg->mboxnamen - 1 - IDLE_MESSAGE_BASE_SIZE != '\0') {
+	syslog(LOG_ERR, "IDLE: invalid message received: size=%d", n);
+	return 0;
+ }
+
+ return 1;
+}
+

cyrus-imapd-2.5.tar.gz/imap/idlemsg.h Added

@@ -0,0 +1,85 @@
+/* idled.h - daemon for handling IMAP IDLE notifications
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IDLEMSG_H
+#define IDLEMSG_H
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include "mailbox.h"
+
+/* socket to communicate with the idled */
+#define FNAME_IDLE_SOCK_DIR "/socket"
+#define FNAME_IDLE_SOCK FNAME_IDLE_SOCK_DIR"/idle"
+
+typedef struct idle_message_s idle_message_t;
+
+struct idle_message_s
+{
+ unsigned long which;
+
+ /* 1 for null. leave at end of structure for alignment */
+ char mboxnameMAX_MAILBOX_BUFFER;
+};
+
+#define IDLE_MESSAGE_BASE_SIZE	(1 * (int) sizeof(unsigned long))
+
+enum {
+ IDLE_MSG_INIT,
+ IDLE_MSG_DONE,
+ IDLE_MSG_NOTIFY,
+ IDLE_MSG_NOOP,
+ IDLE_MSG_ALERT
+};
+
+int idle_make_server_address(struct sockaddr_un *);
+int idle_make_client_address(struct sockaddr_un *);
+const char *idle_id_from_addr(const struct sockaddr_un *);
+int idle_init_sock(const struct sockaddr_un *);
+void idle_done_sock(void);
+int idle_get_sock(void);
+int idle_send(const struct sockaddr_un *remote,
+	 const idle_message_t *msg);
+int idle_recv(struct sockaddr_un *remote, idle_message_t *msg);
+
+
+#endif

cyrus-imapd-2.4.17.tar.gz/imap/imap_err.et -> cyrus-imapd-2.5.tar.gz/imap/imap_err.et Changed

@@ -38,8 +38,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: imap_err.et,v 1.56 2010/01/06 17:01:32 murch Exp $
 
 error_table imap
 
@@ -49,6 +47,9 @@
 ec IMAP_IOERROR,
    "System I/O error"
 
+ec IMAP_NOTFOUND,
+   "Item does not exist"
+
 ec IMAP_SYS_ERROR,
    "Operating System Error"
 
@@ -73,7 +74,10 @@
 ec IMAP_MAILBOX_BADFORMAT,
    "Mailbox has an invalid format"
 
-ec IMAP_MAILBOX_CRC,
+ec IMAP_SYNC_CHECKSUM,
+   "Replication inconsistency detected"
+
+ec IMAP_MAILBOX_CHECKSUM,
    "Mailbox format corruption detected"
 
 ec IMAP_MAILBOX_NOTSUPPORTED,
@@ -88,6 +92,9 @@
 ec IMAP_MAILBOX_BADNAME,
    "Invalid mailbox name"
 
+ec IMAP_MAILBOX_BADTYPE,
+   "Invalid mailbox type"
+
 ec IMAP_MAILBOX_MOVED,
    "Mailbox has been moved to another server"
 
@@ -192,10 +199,10 @@
 # Following used for internationalization of untagged OK/NO responses
 
 ec IMAP_NO_OVERQUOTA,
-   "Mailbox is over quota"
+   "Mailbox is over %s quota"
 
 ec IMAP_NO_CLOSEQUOTA,
-   "Mailbox is at %d%% of quota"
+   "Mailbox is at %d%% of %s quota"
 
 ec IMAP_NO_MSGGONE,
    "Message %d no longer exists"
@@ -215,6 +222,22 @@
 ec IMAP_NO_UNKNOWN_CTE,
    "UNKNOWN-CTE Can not process the binary data"
 
+# For conversations
+
+ec IMAP_CONVERSATIONS_ALREADY_OPEN,
+   "Conversation DB is already opened"
+
+ec IMAP_CONVERSATIONS_NOT_OPEN,
+   "Conversation DB is not opened"
+
+ec IMAP_ANCHOR_NOT_FOUND,
+   "Anchor not found"
+
+ec IMAP_CANCELLED,
+   "Command cancelled by user"
+
+# Used for search engine integration
+
 # Following used for internationalization of untagged BYE response
 
 ec IMAP_BYE_LOGOUT,

cyrus-imapd-2.4.17.tar.gz/imap/imap_proxy.c -> cyrus-imapd-2.5.tar.gz/imap/imap_proxy.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imap_proxy.c,v 1.19 2010/01/06 17:01:32 murch Exp $
 */
 
 #include <config.h>
@@ -56,7 +54,7 @@
 #include "backend.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "imap_proxy.h"
 #include "proxy.h"
 #include "mboxname.h"
@@ -64,7 +62,6 @@
 #include "prot.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "xstrlcat.h"
 
 extern unsigned int proxy_cmdcnt;
 extern struct protstream *imapd_in, *imapd_out;
@@ -72,56 +69,35 @@
 extern char *imapd_userid, *proxy_userid;
 extern struct namespace imapd_namespace;
 
-extern int mlookup(const char *tag, const char *ext_name,
-		 const char *name, int *flags,
-		 char **partp, char **aclp, struct txn **tid) ;
-
-static char *imap_parsemechlist(const char *str, struct protocol_t *prot)
+static void imap_postcapability(struct backend *s)
 {
- char *ret = xzmalloc(strlen(str)+1);
- char *tmp;
- int num = 0;
- 
- if (strstr(str, " SASL-IR")) {
+ if (CAPA(s, CAPA_SASL_IR)) {
 	/* server supports initial response in AUTHENTICATE command */
-	prot->sasl_cmd.maxlen = USHRT_MAX;
+	s->prot->u.std.sasl_cmd.maxlen = USHRT_MAX;
 }
- 
- while ((tmp = strstr(str, " AUTH="))) {
-	char *end = (tmp += 6);
-	
-	while((*end != ' ') && (*end != '\0')) end++;
-	
-	/* add entry to list */
-	if (num++ > 0) strcat(ret, " ");
-	strlcat(ret, tmp, strlen(ret) + (end - tmp) + 1);
-	
-	/* reset the string */
-	str = end;
- }
- 
- return ret;
 }
 
 struct protocol_t imap_protocol =
-{ "imap", "imap",
- { 1, NULL },
- { "C01 CAPABILITY", NULL, "C01 ", &imap_parsemechlist,
- { { " AUTH=", CAPA_AUTH },
- { " STARTTLS", CAPA_STARTTLS },
- { " COMPRESS=DEFLATE", CAPA_COMPRESS },
- { " IDLE", CAPA_IDLE },
- { " MUPDATE", CAPA_MUPDATE },
- { " MULTIAPPEND", CAPA_MULTIAPPEND },
- { " RIGHTS=kxte", CAPA_ACLRIGHTS },
- { " LIST-EXTENDED", CAPA_LISTEXTENDED },
- { NULL, 0 } } },
- { "S01 STARTTLS", "S01 OK", "S01 NO", 0 },
- { "A01 AUTHENTICATE", 0, 0, "A01 OK", "A01 NO", "+ ", "*",
- NULL, AUTO_CAPA_AUTH_OK },
- { "Z01 COMPRESS DEFLATE", "* ", "Z01 OK" },
- { "N01 NOOP", "* ", "N01 OK" },
- { "Q01 LOGOUT", "* ", "Q01 " }
+{ "imap", "imap", TYPE_STD,
+ { { { 1, NULL },
+ { "C01 CAPABILITY", NULL, "C01 ", imap_postcapability,
+	CAPAF_MANY_PER_LINE,
+	{ { "AUTH", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { "COMPRESS=DEFLATE", CAPA_COMPRESS },
+	 { "IDLE", CAPA_IDLE },
+	 { "MUPDATE", CAPA_MUPDATE },
+	 { "MULTIAPPEND", CAPA_MULTIAPPEND },
+	 { "RIGHTS=kxte", CAPA_ACLRIGHTS },
+	 { "LIST-EXTENDED", CAPA_LISTEXTENDED },
+	 { "SASL-IR", CAPA_SASL_IR },
+	 { NULL, 0 } } },
+ { "S01 STARTTLS", "S01 OK", "S01 NO", 0 },
+ { "A01 AUTHENTICATE", 0, 0, "A01 OK", "A01 NO", "+ ", "*",
+	NULL, AUTO_CAPA_AUTH_OK },
+ { "Z01 COMPRESS DEFLATE", "* ", "Z01 OK" },
+ { "N01 NOOP", "* ", "N01 OK" },
+ { "Q01 LOGOUT", "* ", "Q01 " } } }
 };
 
 void proxy_gentag(char *tag, size_t len)
@@ -132,22 +108,25 @@
 struct backend *proxy_findinboxserver(const char *userid)
 {
 char inboxMAX_MAILBOX_BUFFER;
- int r, mbtype;
- char *server = NULL;
+ mbentry_t *mbentry = NULL;
 struct backend *s = NULL;
+ int r;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, "INBOX",
 					 userid, inbox);
+ if (r) return NULL;
 
- if(!r) {
-	r = mlookup(NULL, NULL, inbox, &mbtype, &server, NULL, NULL);
-	if (!r && (mbtype & MBTYPE_REMOTE)) {
-	 s = proxy_findserver(server, &imap_protocol,
-				 proxy_userid, &backend_cached,
-				 &backend_current, &backend_inbox, imapd_in);
-	}
+ r = mboxlist_lookup(inbox, &mbentry, NULL);
+ if (r) return NULL;
+
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	s = proxy_findserver(mbentry->server, &imap_protocol,
+			 proxy_userid, &backend_cached,
+			 &backend_current, &backend_inbox, imapd_in);
 }
 
+ mboxlist_entry_free(&mbentry);
+
 return s;
 }
 
@@ -181,7 +160,7 @@
 	}
 }
 
- s->last_result.len = 0;
+ buf_reset(&s->last_result);
 
 /* the only complication here are literals */
 do {
@@ -229,16 +208,8 @@
 	
 	 if (last && !include_last) {
 		/* Store the tagged line */
-		if (sl > s->last_result.alloc - s->last_result.len) {
-		 s->last_result.alloc =
-			(s->last_result.alloc == 0) ? (int) sizeof(buf) :
-			s->last_result.alloc * 2;
-		 s->last_result.s = xrealloc(s->last_result.s,
-						s->last_result.alloc+1);
-		}
-
-		strcpy(s->last_result.s + s->last_result.len, buf + taglen + 1);
-		s->last_result.len += sl - taglen - 1;
+		buf_appendcstr(&s->last_result, buf+taglen+1);
+		buf_cstring(&s->last_result);
 	 }
 	}
 
@@ -472,8 +443,7 @@
 int exist_r;
 char mailboxnameMAX_MAILBOX_BUFFER;
 static struct buf tagb, cmd, sep, name;
- int cur_flags_size = 64;
- char *flags = xmalloc(cur_flags_size);
+ struct buf flags = BUF_INITIALIZER;
 
 const char *end_strip_flags = { " \\NonExistent)", "\\NonExistent)",
 				 " \\Noselect)", "\\Noselect)",
@@ -495,8 +465,8 @@
 	 if(s == backend_current && !force_notfatal)
 		fatal("Lost connection to selected backend", EC_UNAVAILABLE);
 	 proxy_downserver(s);
-	 free(flags);
-	 return PROXY_NOCONNECTION;
+	 r = PROXY_NOCONNECTION;
+	 goto out;
 	}
 
 	if(!strncmp(tag, tagb.s, taglen)) {
@@ -506,16 +476,12 @@
 		 fatal("Lost connection to selected backend",
 			 EC_UNAVAILABLE);
 		proxy_downserver(s);
-		free(flags);
-		return PROXY_NOCONNECTION;
+		r = PROXY_NOCONNECTION;
+		goto out;
 	 }	
 	 /* Got the end of the response */
-	 if (s->last_result.alloc == 0) {
-		s->last_result.alloc = sizeof(buf);
-		s->last_result.s = xmalloc(s->last_result.alloc+1);
-	 }
-	 strcpy(s->last_result.s, buf);
-	 s->last_result.len = strlen(buf);
+	 buf_appendcstr(&s->last_result, buf);
+	 buf_cstring(&s->last_result);
 
 	 switch (buf0) {
 	 case 'O': case 'o':
@@ -544,42 +510,31 @@
 	 if(s == backend_current && !force_notfatal)
 		fatal("Lost connection to selected backend", EC_UNAVAILABLE);
 	 proxy_downserver(s);
-	 free(flags);
-	 return PROXY_NOCONNECTION;
+	 r = PROXY_NOCONNECTION;
+	 goto out;
 	}
 
 	if(strncasecmp("LSUB", cmd.s, 4) && strncasecmp("LIST", cmd.s, 4)) {
 	 prot_printf(imapd_out, "%s %s ", tagb.s, cmd.s);
 	 r = pipe_to_end_of_response(s, force_notfatal);
-	 if(r != PROXY_OK) {
-		free(flags);
-		return r;
-	 }
+	 if (r != PROXY_OK)
+		goto out;
 	} else {
 	 /* build up the response bit by bit */
-	 int i = 0;
-	 char *p;
+	 int i;
 
+	 buf_reset(&flags);
 	 c = prot_getc(s->in);
 	 while(c != ')' && c != EOF) {
-		flagsi++ = c;
-		if(i == cur_flags_size) {
-		 /* expand our buffer */
-		 cur_flags_size *= 2;
-		 flags = xrealloc(flags, cur_flags_size);
-		}
+		buf_putc(&flags, c);
 		c = prot_getc(s->in);
 	 }
 
 	 if(c != EOF) {
 		/* terminate string */
-		flagsi++ = ')';
-		if(i == cur_flags_size) {
-		 /* expand our buffer */
-		 cur_flags_size *= 2;
-		 flags = xrealloc(flags, cur_flags_size);
-		}
-		flagsi = '\0';
+		buf_putc(&flags, ')');
+		buf_cstring(&flags);
+
 		/* get the next character */
 		c = prot_getc(s->in);
 	 }
@@ -589,28 +544,17 @@
 		 fatal("Bad LSUB response from selected backend",
 			 EC_UNAVAILABLE);
 		proxy_downserver(s);
-		free(flags);
-		return PROXY_NOCONNECTION;
+		r = PROXY_NOCONNECTION;
+		goto out;
 	 }
 
 	 /* Check for flags that we should remove
 	 * (e.g. Noselect, NonExistent) */
-	 for(i=0; end_strip_flagsi; i++) {
-		p = strstr(flags, end_strip_flagsi);
-		if(p) {
-		 *p = ')';
-		 *(p+1) = '\0';
-		}
-	 }
+	 for(i=0; end_strip_flagsi; i++)
+		buf_replace_all(&flags, end_strip_flagsi, ")");
 
-	 for(i=0; mid_strip_flagsi; i++) {
-		int mid_strip_len = strlen(mid_strip_flagsi);
-		p = strstr(flags, mid_strip_flagsi);
-		while(p) {
-		 strcpy(p, p + mid_strip_len);
-		 p = strstr(flags, mid_strip_flagsi);
-		}
-	 }
+	 for (i=0; mid_strip_flagsi; i++)
+		buf_replace_all(&flags, mid_strip_flagsi, NULL);
 
 	 /* Get separator */
 	 c = getastring(s->in, s->out, &sep);
@@ -620,8 +564,8 @@
 		 fatal("Bad LSUB response from selected backend",
 			 EC_UNAVAILABLE);
 		proxy_downserver(s);
-		free(flags);
-		return PROXY_NOCONNECTION;
+		r = PROXY_NOCONNECTION;
+		goto out;
 	 }
 
 	 /* Get name */
@@ -633,8 +577,8 @@
 		 fatal("Bad LSUB response from selected backend",
 			 EC_UNAVAILABLE);
 		proxy_downserver(s);
-		free(flags);
-		return PROXY_NOCONNECTION;
+		r = PROXY_NOCONNECTION;
+		goto out;
 	 }
 
 	 /* lookup name */
@@ -644,10 +588,11 @@
 							userid,
 							mailboxname);
 	 if (!r) {
-		struct mboxlist_entry mbentry;
+		mbentry_t *mbentry = NULL;
 		exist_r = mboxlist_lookup(mailboxname, &mbentry, NULL);
-		if(!exist_r && (mbentry.mbtype & MBTYPE_RESERVE))
+		if(!exist_r && (mbentry->mbtype & MBTYPE_RESERVE))
 		 exist_r = IMAP_MAILBOX_RESERVED;
+		mboxlist_entry_free(&mbentry);
 	 } else {
 		/* skip this one */
 		syslog(LOG_ERR, "could not convert %s to internal form",
@@ -657,10 +602,10 @@
 
 	 /* send our response */
 	 /* we need to set \Noselect if it's not in our mailboxes.db */
-	 if(resp0 == 'L') {
+	 if (resp0 == 'L') {
 		if(!exist_r) {
 		 prot_printf(imapd_out, "* %s %s \"%s\" ",
-				resp, flags, sep.s);
+				resp, flags.s, sep.s);
 		} else {
 		 prot_printf(imapd_out, "* %s (\\Noselect) \"%s\" ",
 				resp, sep.s);
@@ -678,13 +623,14 @@
 	}
 } /* while(1) */
 
- free(flags);
+out:
+ buf_free(&flags);
 return r;
 }
 
 /* xxx start of separate proxy-only code
 (remove when we move to a unified environment) */
-static int chomp(struct protstream *p, char *s)
+static int chomp(struct protstream *p, const char *s)
 {
 int c = prot_getc(p);
 
@@ -1293,11 +1239,11 @@
 
 /* Proxy GETANNOTATION commands to backend */
 int annotate_fetch_proxy(const char *server, const char *mbox_pat,
-			 struct strlist *entry_pat,
-			 struct strlist *attribute_pat) 
+			 const strarray_t *entry_pat,
+			 const strarray_t *attribute_pat)
 {
 struct backend *be;
- struct strlist *l;
+ int i;
 char mytag128;
 
 assert(server && mbox_pat && entry_pat && attribute_pat);
@@ -1310,12 +1256,12 @@
 /* Send command to remote */
 proxy_gentag(mytag, sizeof(mytag));
 prot_printf(be->out, "%s GETANNOTATION \"%s\" (", mytag, mbox_pat);
- for (l = entry_pat; l; l = l->next) {
-	prot_printf(be->out, "\"%s\"%s", l->s, l->next ? " " : "");
+ for (i = 0 ; i < entry_pat->count ; i++) {
+	prot_printf(be->out, "%s\"%s\"", i ? " " : "", entry_pat->datai);
 }
 prot_printf(be->out, ") (");
- for (l = attribute_pat; l; l = l->next) {
-	prot_printf(be->out, "\"%s\"%s", l->s, l->next ? " " : "");
+ for (i = 0 ; i < attribute_pat->count ; i++) {
+	prot_printf(be->out, "%s\"%s\"", i ? " " : "", attribute_pat->datai);
 }
 prot_printf(be->out, ")\r\n");
 prot_flush(be->out);
@@ -1350,8 +1296,9 @@
 	prot_printf(be->out, "\"%s\" (", e->entry);
 
 	for (av = e->attvalues; av; av = av->next) {
-	 prot_printf(be->out, "\"%s\" \"%s\"%s", av->attrib, av->value,
-			av->next ? " " : "");
+	 prot_printf(be->out, "\"%s\" ", av->attrib);
+	 prot_printmap(be->out, av->value.s, av->value.len);
+	 prot_printf(be->out, "%s", av->next ? " " : "");
 	}
 	prot_printf(be->out, ")");
 	if (e->next) prot_printf(be->out, " ");
@@ -1367,7 +1314,7 @@
 }
 
 
-char *find_free_server()
+char *find_free_server(void)
 {
 const char *servers = config_getstring(IMAPOPT_SERVERLIST);
 unsigned long max_avail = 0;

cyrus-imapd-2.4.17.tar.gz/imap/imap_proxy.h -> cyrus-imapd-2.5.tar.gz/imap/imap_proxy.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imap_proxy.h,v 1.7 2010/01/06 17:01:32 murch Exp $
 */
 
 #ifndef _IMAP_PROXY_H
@@ -48,6 +46,7 @@
 #include "annotate.h"
 #include "backend.h"
 #include "imapurl.h"
+#include "strarray.h"
 
 enum {
 PROXY_NOCONNECTION = -1,
@@ -62,7 +61,8 @@
 CAPA_MUPDATE	= (1 << 4),
 CAPA_MULTIAPPEND	= (1 << 5),
 CAPA_ACLRIGHTS	= (1 << 6),
- CAPA_LISTEXTENDED	= (1 << 7)
+ CAPA_LISTEXTENDED	= (1 << 7),
+ CAPA_SASL_IR	= (1 << 8)
 };
 
 extern struct protocol_t imap_protocol;
@@ -84,9 +84,9 @@
 		 unsigned long *size, const char **parseerr);
 
 int annotate_fetch_proxy(const char *server, const char *mbox_pat,
-			 struct strlist *entry_pat,
-			 struct strlist *attribute_pat);
+			 const strarray_t *entry_pat,
+			 const strarray_t *attribute_pat);
 int annotate_store_proxy(const char *server, const char *mbox_pat,
 			 struct entryattlist *entryatts);
-char *find_free_server();
+char *find_free_server(void);
 #endif /* _IMAP_PROXY_H */

cyrus-imapd-2.4.17.tar.gz/imap/imapd.c -> cyrus-imapd-2.5.tar.gz/imap/imapd.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imapd.c,v 1.583 2010/06/28 12:06:42 brong Exp $
 */
 
 #include <config.h>
@@ -49,7 +47,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -73,28 +70,30 @@
 #include "annotate.h"
 #include "append.h"
 #include "auth.h"
+#include "autocreate.h"
+#include "assert.h"
 #include "backend.h"
 #include "bsearch.h"
 #include "charset.h"
+#include "dlist.h"
 #include "exitcodes.h"
 #include "idle.h"
 #include "global.h"
-#include "hash.h"
-#include "imap_err.h"
+#include "times.h"
+#include "imap/imap_err.h"
 #include "proxy.h"
 #include "imap_proxy.h"
 #include "imapd.h"
 #include "imapurl.h"
 #include "imparse.h"
 #include "index.h"
-#include "iptostring.h"
 #include "mailbox.h"
 #include "message.h"
+#include "mboxevent.h"
 #include "mboxkey.h"
 #include "mboxlist.h"
 #include "mboxname.h"
 #include "mbdump.h"
-#include "mkgmtime.h"
 #include "mupdate-client.h"
 #include "proc.h"
 #include "quota.h"
@@ -110,8 +109,12 @@
 #include "xmalloc.h"
 #include "xstrlcat.h"
 #include "xstrlcpy.h"
+#include "ptrarray.h"
+#include "xstats.h"
+
+#include "imap/pushstats.h"		/* SNMP interface */
 
-#include "pushstats.h"		/* SNMP interface */
+#include "iostat.h"
 
 extern int optind;
 extern char *optarg;
@@ -119,7 +122,6 @@
 /* global state */
 const int config_need_data = CONFIG_NEED_PARTITION_DATA;
 
-static char shutdownfilenameMAX_MAILBOX_PATH+1;
 static int imaps = 0;
 static sasl_ssf_t extprops_ssf = 0;
 static int nosaslpasswdcheck = 0;
@@ -135,6 +137,10 @@
 				 referrals that are likely to change the
 				 mailbox list */
 
+/* global conversations database holder to avoid re-opening during
+ * status command or list responses */
+struct conversations_state *global_conversations = NULL;
+
 /* all subscription commands go to the backend server containing the
 user's inbox */
 struct backend *backend_inbox = NULL;
@@ -154,11 +160,11 @@
 /* end PROXY STUFF */
 
 /* per-user/session state */
-int imapd_timeout;
+static int imapd_timeout;
 struct protstream *imapd_out = NULL;
 struct protstream *imapd_in = NULL;
-struct protgroup *protin = NULL;
-static char imapd_clienthostNI_MAXHOST*2+1 = "local";
+static struct protgroup *protin = NULL;
+static const char *imapd_clienthost = "local";
 static int imapd_logfd = -1;
 char *imapd_userid = NULL, *proxy_userid = NULL;
 static char *imapd_magicplus = NULL;
@@ -170,7 +176,14 @@
 static int imapd_starttls_done = 0; /* have we done a successful starttls? */
 static void *imapd_tls_comp = NULL; /* TLS compression method, if any */
 static int imapd_compress_done = 0; /* have we done a successful compress? */
-const char *plaintextloginalert = NULL;
+static const char *plaintextloginalert = NULL;
+
+#define QUIRK_SEARCHFUZZY (1<<0)
+static struct id_data {
+ struct attvaluelist *params;
+ int did_id;
+ int quirks;
+} imapd_id;
 
 #ifdef HAVE_SSL
 /* our tls connection, if any */
@@ -181,12 +194,12 @@
 struct appendstage {
 struct stagemsg *stage;
 FILE *f;
- char **flag;
- int nflags, flagalloc;
+ strarray_t flags;
 time_t internaldate;
 int binary;
-} **stage = NULL;
-unsigned long numstage = 0;
+ struct entryattlist *annotations;
+};
+static ptrarray_t stages = PTRARRAY_INITIALIZER;
 
 /* the sasl proxy policy context */
 static struct proxy_context imapd_proxyctx = {
@@ -194,27 +207,17 @@
 };
 
 /* current sub-user state */
-struct index_state *imapd_index;
+static struct index_state *imapd_index;
 
 /* current namespace */
 struct namespace imapd_namespace;
 
-static const char *monthname = {
- "jan", "feb", "mar", "apr", "may", "jun",
- "jul", "aug", "sep", "oct", "nov", "dec"
-};
-
-static const int max_monthdays = {
- 31, 29, 31, 30, 31, 30,
- 31, 31, 30, 31, 30, 31
-};
-
 /* track if we're idling */
 static int idling = 0;
 
-static struct mbox_name_attribute {
+static const struct mbox_name_attribute {
 int flag;
- char *id;
+ const char *id;
 } mbox_name_attributes = {
 /* from RFC 3501 */
 { MBOX_ATTRIBUTE_NOINFERIORS, "\\Noinferiors" },
@@ -251,7 +254,7 @@
 
 /* Information about one mailbox name that LIST returns */
 struct list_entry {
- char *name;
+ const char *name;
 int attributes; /* bitmap of MBOX_ATTRIBUTE_* */
 };
 
@@ -276,7 +279,7 @@
 int mask;
 };
 
-struct capa_struct base_capabilities = {
+static struct capa_struct base_capabilities = {
 /* pre-auth capabilities */
 { "IMAP4rev1", 3 },
 { "LITERAL+", 3 },
@@ -284,7 +287,7 @@
 { "ENABLE", 3 },
 /* post-auth capabilities */
 { "ACL", 2 },
- { "RIGHTS=kxte", 2 },
+ { "RIGHTS=kxten", 2 },
 { "QUOTA", 2 },
 { "MAILBOX-REFERRALS", 2 },
 { "NAMESPACE", 2 }, 
@@ -297,17 +300,28 @@
 { "CATENATE", 2 },
 { "CONDSTORE", 2 },
 { "ESEARCH", 2 },
+ { "SEARCH=FUZZY",	 2 }, /* RFC 6203 */
 { "SORT", 2 },
 { "SORT=MODSEQ", 2 },
 { "SORT=DISPLAY", 2 },
+ { "SORT=UID", 2 }, /* not standard */
 { "THREAD=ORDEREDSUBJECT", 2 },
 { "THREAD=REFERENCES", 2 },
 { "ANNOTATEMORE", 2 },
+ { "ANNOTATE-EXPERIMENT-1", 2 },
+ { "METADATA", 2 },
 { "LIST-EXTENDED", 2 },
+ { "LIST-STATUS", 2 },
+ { "LIST-MYRIGHTS", 2 }, /* not standard */
 { "WITHIN", 2 },
 { "QRESYNC", 2 },
 { "SCAN", 2 },
 { "XLIST", 2 },
+ { "XMOVE", 2 },
+ { "MOVE", 2 }, /* draft */
+ { "SPECIAL-USE", 2 },
+ { "CREATE-SPECIAL-USE", 2 },
+ { "DIGEST=SHA1", 2 },
 
 #ifdef HAVE_SSL
 { "URLAUTH", 2 },
@@ -321,119 +335,137 @@
 { 0, 0 }
 };
 
-enum {
- GETSEARCH_CHARSET = 0x01,
- GETSEARCH_RETURN = 0x02,
-};
-
 
-void motd_file(int fd);
+static void motd_file(void);
 void shut_down(int code);
 void fatal(const char *s, int code);
 
-void cmdloop(void);
-void cmd_login(char *tag, char *user);
-void cmd_authenticate(char *tag, char *authtype, char *resp);
-void cmd_noop(char *tag, char *cmd);
-void capa_response(int flags);
-void cmd_capability(char *tag);
-void cmd_append(char *tag, char *name, const char *cur_name);
-void cmd_select(char *tag, char *cmd, char *name);
-void cmd_close(char *tag, char *cmd);
-void cmd_fetch(char *tag, char *sequence, int usinguid);
-void cmd_store(char *tag, char *sequence, int usinguid);
-void cmd_search(char *tag, int usinguid);
-void cmd_sort(char *tag, int usinguid);
-void cmd_thread(char *tag, int usinguid);
-void cmd_copy(char *tag, char *sequence, char *name, int usinguid);
-void cmd_expunge(char *tag, char *sequence);
-void cmd_create(char *tag, char *name, char *partition, int localonly);
-void cmd_delete(char *tag, char *name, int localonly, int force);
-void cmd_dump(char *tag, char *name, int uid_start);
-void cmd_undump(char *tag, char *name);
-void cmd_xfer(char *tag, char *name, char *toserver, char *topart);
-void cmd_rename(char *tag, char *oldname, char *newname, char *partition);
-void cmd_reconstruct(const char *tag, const char *name, int recursive);
-void getlistargs(char *tag, struct listargs *listargs);
-void cmd_list(char *tag, struct listargs *listargs);
-void cmd_changesub(char *tag, char *namespace, char *name, int add);
-void cmd_getacl(const char *tag, const char *name);
-void cmd_listrights(char *tag, char *name, char *identifier);
-void cmd_myrights(const char *tag, const char *name);
-void cmd_setacl(char *tag, const char *name,
+static void cmdloop(void);
+static void cmd_login(char *tag, char *user);
+static void cmd_authenticate(char *tag, char *authtype, char *resp);
+static void cmd_noop(char *tag, char *cmd);
+static void capa_response(int flags);
+static void cmd_capability(char *tag);
+static void cmd_append(char *tag, char *name, const char *cur_name);
+static void cmd_select(char *tag, char *cmd, char *name);
+static void cmd_close(char *tag, char *cmd);
+static int parse_fetch_args(const char *tag, const char *cmd,
+			 int allow_vanished,
+			 struct fetchargs *fa);
+static void cmd_fetch(char *tag, char *sequence, int usinguid);
+static void cmd_store(char *tag, char *sequence, int usinguid);
+static void cmd_search(char *tag, int usinguid);
+static void cmd_sort(char *tag, int usinguid);
+static void cmd_thread(char *tag, int usinguid);
+static void cmd_copy(char *tag, char *sequence, char *name, int usinguid, int ismove);
+static void cmd_expunge(char *tag, char *sequence);
+static void cmd_create(char *tag, char *name, struct dlist *extargs, int localonly);
+static void cmd_delete(char *tag, char *name, int localonly, int force);
+static void cmd_dump(char *tag, char *name, int uid_start);
+static void cmd_undump(char *tag, char *name);
+static void cmd_xfer(const char *tag, const char *name,
+		 const char *toserver, const char *topart);
+static void cmd_rename(char *tag, char *oldname, char *newname, char *partition);
+static void cmd_reconstruct(const char *tag, const char *name, int recursive);
+static void getlistargs(char *tag, struct listargs *listargs);
+static void cmd_list(char *tag, struct listargs *listargs);
+static void cmd_changesub(char *tag, char *namespace, char *name, int add);
+static void cmd_getacl(const char *tag, const char *name);
+static void cmd_listrights(char *tag, char *name, char *identifier);
+static void cmd_myrights(const char *tag, const char *name);
+static void cmd_setacl(char *tag, const char *name,
 		const char *identifier, const char *rights);
-void cmd_getquota(const char *tag, const char *name);
-void cmd_getquotaroot(const char *tag, const char *name);
-void cmd_setquota(const char *tag, const char *quotaroot);
-void cmd_status(char *tag, char *name);
-void cmd_namespace(char* tag);
-void cmd_mupdatepush(char *tag, char *name);
-void cmd_id(char* tag);
-extern void id_getcmdline(int argc, char **argv);
-extern void id_response(struct protstream *pout);
-
-void cmd_idle(char* tag);
-void idle_update(idle_flags_t flags);
-
-void cmd_starttls(char *tag, int imaps);
+static void cmd_getquota(const char *tag, const char *name);
+static void cmd_getquotaroot(const char *tag, const char *name);
+static void cmd_setquota(const char *tag, const char *quotaroot);
+static void cmd_status(char *tag, char *name);
+static void cmd_namespace(char* tag);
+static void cmd_mupdatepush(char *tag, char *name);
+static void cmd_id(char* tag);
+
+static void cmd_idle(char* tag);
+
+static void cmd_starttls(char *tag, int imaps);
+
+static void cmd_xconvsort(char *tag, int updates);
+static void cmd_xconvmultisort(char *tag);
+static void cmd_xconvmeta(const char *tag);
+static void cmd_xconvfetch(const char *tag);
+static int do_xconvfetch(struct dlist *cidlist,
+			 modseq_t ifchangedsince,
+			 struct fetchargs *fetchargs);
+static void cmd_xsnippets(char *tag);
+static void cmd_xstats(char *tag, int c);
 
 #ifdef HAVE_SSL
-void cmd_urlfetch(char *tag);
-void cmd_genurlauth(char *tag);
-void cmd_resetkey(char *tag, char *mailbox, char *mechanism);
+static void cmd_urlfetch(char *tag);
+static void cmd_genurlauth(char *tag);
+static void cmd_resetkey(char *tag, char *mailbox, char *mechanism);
 #endif
 
 #ifdef HAVE_ZLIB
-void cmd_compress(char *tag, char *alg);
+static void cmd_compress(char *tag, char *alg);
 #endif
 
 #ifdef ENABLE_X_NETSCAPE_HACK
 void cmd_netscrape(char* tag);
 #endif
 
-void cmd_getannotation(char* tag, char *mboxpat);
-void cmd_setannotation(char* tag, char *mboxpat);
+static void cmd_getannotation(const char* tag, char *mboxpat);
+static void cmd_getmetadata(const char* tag);
+static void cmd_setannotation(const char* tag, char *mboxpat);
+static void cmd_setmetadata(const char* tag, char *mboxpat);
+static void cmd_xrunannotator(const char *tag, const char *sequence,
+			 int usinguid);
+static void cmd_xwarmup(const char *tag);
+
+static void cmd_enable(char* tag);
+
+static void cmd_xkillmy(const char *tag, const char *cmdname);
+static void cmd_xforever(const char *tag);
+static void cmd_xmeid(const char *tag, const char *id);
+
+static int parsecreateargs(struct dlist **extargs);
+
+static int parse_annotate_fetch_data(const char *tag,
+				 int permessage_flag,
+				 strarray_t *entries,
+				 strarray_t *attribs);
+static int parse_metadata_string_or_list(const char *tag,
+					 strarray_t *sa,
+					 int *was_singlep);
+static int parse_annotate_store_data(const char *tag,
+				 int permessage_flag,
+				 struct entryattlist **entryatts);
+static int parse_metadata_store_data(const char *tag,
+				 struct entryattlist **entryatts);
+
+static int getlistselopts(char *tag, struct listargs *args);
+static int getlistretopts(char *tag, struct listargs *args);
+
+static int get_snippetargs(struct snippetargs **sap);
+static void free_snippetargs(struct snippetargs **sap);
+static int getsortcriteria(char *tag, struct sortcrit **sortcrit);
+static int getdatetime(time_t *date);
+static int parse_windowargs(const char *tag, struct windowargs **, int);
+static void free_windowargs(struct windowargs *wa);
 
-void cmd_enable(char* tag);
-
-int getannotatefetchdata(char *tag,
-			 struct strlist **entries, struct strlist **attribs);
-int getannotatestoredata(char *tag, struct entryattlist **entryatts);
-
-void annotate_response(struct entryattlist *l);
-
-int getlistselopts(char *tag, unsigned *opts);
-int getlistretopts(char *tag, unsigned *opts);
-
-int getsearchreturnopts(char *tag, struct searchargs *searchargs);
-int getsearchprogram(char *tag, struct searchargs *searchargs,
-			int *charsetp, int is_search_cmd);
-int getsearchcriteria(char *tag, struct searchargs *searchargs,
-			 int *charsetp, int *searchstatep);
-int getsearchdate(time_t *start, time_t *end);
-int getsortcriteria(char *tag, struct sortcrit **sortcrit);
-int getdatetime(time_t *date);
-
-void appendfieldlist(struct fieldlist **l, char *section,
-		 struct strlist *fields, char *trail,
+static void appendfieldlist(struct fieldlist **l, char *section,
+		 strarray_t *fields, char *trail,
 		 void *d, size_t size);
-void freefieldlist(struct fieldlist *l);
+static void freefieldlist(struct fieldlist *l);
 void freestrlist(struct strlist *l);
-void appendsearchargs(struct searchargs *s, struct searchargs *s1,
-			 struct searchargs *s2);
-void freesearchargs(struct searchargs *s);
-static void freesortcrit(struct sortcrit *s);
 
 static int set_haschildren(char *name, int matchlen, int maycreate,
 			 int *attributes);
-static void list_response(char *name, int attributes,
+static void list_response(const char *name, int attributes,
 			 struct listargs *listargs);
 static int set_subscribed(char *name, int matchlen, int maycreate,
 			 void *rock);
 static char *canonical_list_pattern(const char *reference,
 				 const char *pattern);
 static void canonical_list_patterns(const char *reference,
-				 struct strlist *patterns);
+				 strarray_t *patterns);
 static int list_cb(char *name, int matchlen, int maycreate,
 		 struct list_rock *rock);
 static int subscribed_cb(const char *name, int matchlen, int maycreate,
@@ -441,6 +473,8 @@
 static void list_data(struct listargs *listargs);
 static int list_data_remote(char *tag, struct listargs *listargs);
 
+static void clear_id();
+
 extern int saslserver(sasl_conn_t *conn, const char *mech,
 		 const char *init_resp, const char *resp_prefix,
 		 const char *continuation, const char *empty_resp,
@@ -557,10 +591,35 @@
 			 auth_identity, alen, def_realm, urlen, propctx);
 }
 
+static int imapd_sasl_log(void *context __attribute__((unused)),
+			 int level, const char *message)
+{
+ int syslog_level = LOG_INFO;
+
+ switch (level) {
+ case SASL_LOG_ERR:
+ case SASL_LOG_FAIL:
+	syslog_level = LOG_ERR;
+	break;
+ case SASL_LOG_WARN:
+	syslog_level = LOG_WARNING;
+	break;
+ case SASL_LOG_DEBUG:
+ case SASL_LOG_TRACE:
+ case SASL_LOG_PASS:
+	syslog_level = LOG_DEBUG;
+	break;
+ }
+
+ syslog(syslog_level, "SASL %s", message);
+ return SASL_OK;
+}
+
 static const struct sasl_callback mysasl_cb = {
 { SASL_CB_GETOPT, (mysasl_cb_ft *) &mysasl_config, NULL },
 { SASL_CB_PROXY_POLICY, (mysasl_cb_ft *) &imapd_proxy_policy, (void*) &imapd_proxyctx },
 { SASL_CB_CANON_USER, (mysasl_cb_ft *) &imapd_canon_user, (void*) &disable_referrals },
+ { SASL_CB_LOG, (mysasl_cb_ft *) &imapd_sasl_log, NULL },
 { SASL_CB_LIST_END, NULL, NULL }
 };
 
@@ -589,57 +648,50 @@
 * returns IMAP_MAILBOX_MOVED if we referred the client */
 /* ext_name is the external name of the mailbox */
 /* you can avoid referring the client by setting tag or ext_name to NULL. */
-int mlookup(const char *tag, const char *ext_name,
-	 const char *name, int *flags,
-	 char **partp, char **aclp, struct txn **tid) 
+static int mlookup(const char *tag, const char *ext_name,
+	 const char *name, mbentry_t **mbentryptr)
 {
 int r;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 
- r = mboxlist_lookup(name, &mbentry, tid);
- if ((r == IMAP_MAILBOX_NONEXISTENT || (mbentry.mbtype & MBTYPE_RESERVE)) &&
+ r = mboxlist_lookup(name, &mbentry, NULL);
+ if ((r == IMAP_MAILBOX_NONEXISTENT || (!r && (mbentry->mbtype & MBTYPE_RESERVE))) &&
 	config_mupdate_server) {
 	/* It is not currently active, make sure we have the most recent
 	 * copy of the database */
 	kick_mupdate();
-	r = mboxlist_lookup(name, &mbentry, tid);
+	mboxlist_entry_free(&mbentry);
+	r = mboxlist_lookup(name, &mbentry, NULL);
 }
 
- if(partp) *partp = mbentry.partition;
- if(aclp) *aclp = mbentry.acl;
- if(flags) *flags = mbentry.mbtype;
- if(r) return r;
+ if (r) goto done;
 
- if(mbentry.mbtype & MBTYPE_RESERVE) return IMAP_MAILBOX_RESERVED;
- if(mbentry.mbtype & MBTYPE_DELETED) return IMAP_MAILBOX_NONEXISTENT;
- 
- if(mbentry.mbtype & MBTYPE_MOVING) {
+ if (mbentry->mbtype & MBTYPE_RESERVE) {
+	r = IMAP_MAILBOX_RESERVED;
+ }
+ else if (mbentry->mbtype & MBTYPE_DELETED) {
+	r = IMAP_MAILBOX_NONEXISTENT;
+ }
+ else if (mbentry->mbtype & MBTYPE_MOVING) {
 	/* do we have rights on the mailbox? */
-	if(!imapd_userisadmin &&
-	 (!mbentry.acl || !(cyrus_acl_myrights(imapd_authstate,mbentry.acl) & ACL_LOOKUP))) {
+	if (!imapd_userisadmin &&
+	 (!mbentry->acl || !(cyrus_acl_myrights(imapd_authstate, mbentry->acl) & ACL_LOOKUP))) {
 	 r = IMAP_MAILBOX_NONEXISTENT;
-	} else if(tag && ext_name && mbentry.partition && *mbentry.partition) {
-	 char *c = NULL;
-	 
-	 c = strchr(mbentry.partition, '!');
-	 if(c) *c = '\0';
-	 imapd_refer(tag, mbentry.partition, ext_name);
+	} else if (tag && ext_name && mbentry->server) {
+	 imapd_refer(tag, mbentry->server, ext_name);
 	 r = IMAP_MAILBOX_MOVED;
-	} else if(config_mupdate_server) {
+	} else if (config_mupdate_server) {
 	 r = IMAP_SERVER_UNAVAILABLE;
 	} else {
 	 r = IMAP_MAILBOX_NOTSUPPORTED;
 	}
 }
- else if (mbentry.mbtype & MBTYPE_REMOTE) {
-	/* xxx hide the fact that we are storing partitions */
-	if(mbentry.partition && *mbentry.partition) {
-	 char *c;
-	 c = strchr(mbentry.partition, '!');
-	 if(c) *c = '\0';
-	}
- }
- 
+
+done:
+ if (r) mboxlist_entry_free(&mbentry);
+ else if (mbentryptr) *mbentryptr = mbentry;
+ else mboxlist_entry_free(&mbentry); /* we don't actually want it! */
+
 return r;
 }
 
@@ -704,7 +756,7 @@
 
 cyrus_reset_stdio();
 
- strcpy(imapd_clienthost, "local");
+ imapd_clienthost = "local";
 if (imapd_logfd != -1) {
 	close(imapd_logfd);
 	imapd_logfd = -1;
@@ -751,6 +803,8 @@
 	saslprops.authid = NULL;
 }
 saslprops.ssf = 0;
+
+ clear_id();
 }
 
 /*
@@ -759,9 +813,8 @@
 */
 int service_init(int argc, char **argv, char **envp)
 {
- int ret;
 int opt;
- 
+
 if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
 setproctitle_init(argc, argv, envp);
 
@@ -772,14 +825,6 @@
 /* load the SASL plugins */
 global_sasl_init(1, 1, mysasl_cb);
 
- ret = snprintf(shutdownfilename, sizeof(shutdownfilename),
-		 "%s/msg/shutdown", config_dir);
- 
- if(ret < 0 || ret >= (int) sizeof(shutdownfilename)) {
- fatal("shutdownfilename buffer too small (configdirectory too long)",
-	 EC_CONFIG);
- }
-
 /* open the mboxlist, we'll need it for real work */
 mboxlist_init(0);
 mboxlist_open(NULL);
@@ -790,10 +835,15 @@
 
 /* open the user deny db */
 denydb_init(0);
- denydb_open(NULL);
+ denydb_open(0);
 
 /* setup for sending IMAP IDLE notifications */
- idle_enabled();
+ idle_init();
+
+ /* setup for mailbox event notifications */
+ mboxevent_init();
+
+ search_attr_init();
 
 /* create connection to the SNMP listener, if available. */
 snmp_connect(); /* ignore return code */
@@ -823,13 +873,13 @@
 
 /* Initialize the annotatemore extention */
 if (config_mupdate_server)
-	annotatemore_init(0, annotate_fetch_proxy, annotate_store_proxy);
+	annotate_init(annotate_fetch_proxy, annotate_store_proxy);
 else
-	annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+	annotate_init(NULL, NULL);
+ annotatemore_open();
 
 if (config_getswitch(IMAPOPT_STATUSCACHE)) {
-	statuscache_open(NULL);
+	statuscache_open();
 }
 
 /* Create a protgroup for input from the client and selected backend */
@@ -849,13 +899,17 @@
 		 char **envp __attribute__((unused)))
 #endif
 {
- socklen_t salen;
 sasl_security_properties_t *secprops = NULL;
- struct sockaddr_storage imapd_localaddr, imapd_remoteaddr;
- char localip60, remoteip60;
- char hbufNI_MAXHOST;
- int niflags;
- int imapd_haveaddr = 0;
+ const char *localip, *remoteip;
+ struct mboxevent *mboxevent = NULL;
+ struct io_count *io_count_start = NULL;
+ struct io_count *io_count_stop = NULL;
+
+ if (config_iolog) {
+	io_count_start = xmalloc (sizeof (struct io_count));
+	io_count_stop = xmalloc (sizeof (struct io_count));
+	read_io_count(io_count_start);
+ }
 
 session_new_id();
 
@@ -873,43 +927,11 @@
 protgroup_insert(protin, imapd_in);
 
 /* Find out name of client host */
- salen = sizeof(imapd_remoteaddr);
- if (getpeername(0, (struct sockaddr *)&imapd_remoteaddr, &salen) == 0 &&
-	(imapd_remoteaddr.ss_family == AF_INET ||
-	 imapd_remoteaddr.ss_family == AF_INET6)) {
-	if (getnameinfo((struct sockaddr *)&imapd_remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-	 strncpy(imapd_clienthost, hbuf, sizeof(hbuf));
-	 strlcat(imapd_clienthost, " ", sizeof(imapd_clienthost));
-	 imapd_clienthostsizeof(imapd_clienthost)-30 = '\0';
-	} else {
-	 imapd_clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&imapd_remoteaddr, salen, hbuf,
-			sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(imapd_clienthost, "", sizeof(imapd_clienthost));
-	strlcat(imapd_clienthost, hbuf, sizeof(imapd_clienthost));
-	strlcat(imapd_clienthost, "", sizeof(imapd_clienthost));
-	salen = sizeof(imapd_localaddr);
-	if (getsockname(0, (struct sockaddr *)&imapd_localaddr, &salen) == 0) {
-	 if(iptostring((struct sockaddr *)&imapd_remoteaddr, salen,
-			 remoteip, sizeof(remoteip)) == 0
-	 && iptostring((struct sockaddr *)&imapd_localaddr, salen,
-			 localip, sizeof(localip)) == 0) {
-		imapd_haveaddr = 1;
-	 }
-	}
- }
+ imapd_clienthost = get_clienthost(0, &localip, &remoteip);
 
 /* create the SASL connection */
- if (sasl_server_new("imap", config_servername, 
-			NULL, NULL, NULL, NULL, 0, 
+ if (sasl_server_new("imap", config_servername,
+			NULL, NULL, NULL, NULL, 0,
 			&imapd_saslconn) != SASL_OK) {
 	fatal("SASL failed initializing: sasl_server_new()", EC_TEMPFAIL);
 }
@@ -920,14 +942,14 @@
 if (sasl_setprop(imapd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf) != SASL_OK)
 	fatal("Failed to set SASL property", EC_TEMPFAIL);
 
- if (imapd_haveaddr) {
+ if (localip && remoteip) {
 	sasl_setprop(imapd_saslconn, SASL_IPREMOTEPORT, remoteip);
 	saslprops.ipremoteport = xstrdup(remoteip);
 	sasl_setprop(imapd_saslconn, SASL_IPLOCALPORT, localip);
 	saslprops.iplocalport = xstrdup(localip);
 }
 
- proc_register("imapd", imapd_clienthost, NULL, NULL);
+ proc_register(config_ident, imapd_clienthost, NULL, NULL, NULL);
 
 /* Set inactivity timer */
 imapd_timeout = config_getint(IMAPOPT_TIMEOUT);
@@ -949,9 +971,28 @@
 prot_flush(imapd_out);
 snmp_increment(ACTIVE_CONNECTIONS, -1);
 
+ /* send a Logout event notification */
+ if ((mboxevent = mboxevent_new(EVENT_LOGOUT))) {
+	mboxevent_set_access(mboxevent, saslprops.iplocalport,
+			 saslprops.ipremoteport, imapd_userid, NULL);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
 /* cleanup */
 imapd_reset();
 
+ if (config_iolog) {
+	read_io_count(io_count_stop);
+	syslog(LOG_INFO,
+	 "IMAP session stats : I/O read : %d bytes : I/O write : %d bytes",
+		io_count_stop->io_read_count - io_count_start->io_read_count,
+		io_count_stop->io_write_count - io_count_start->io_write_count);
+	free (io_count_start);
+	free (io_count_stop);
+ }
+
 return 0;
 }
 
@@ -962,23 +1003,36 @@
 }
 
 /*
- * found a motd file; spit out message and return
+ * Try to find a motd file; if found spit out message as an ALERT
 */
-void motd_file(fd)
-int fd;
+static void motd_file(void)
 {
- struct protstream *motd_in;
+ char *filename = NULL;
+ int fd = -1;
+ struct protstream *motd_in = NULL;
 char bufMAX_MAILBOX_PATH+1;
 char *p;
 
+ filename = strconcat(config_dir, "/msg/motd", (char *)NULL);
+ fd = open(filename, O_RDONLY, 0);
+ if (fd < 0)
+	goto out;
+
 motd_in = prot_new(fd, 0);
 
 prot_fgets(buf, sizeof(buf), motd_in);
 if ((p = strchr(buf, '\r'))!=NULL) *p = 0;
 if ((p = strchr(buf, '\n'))!=NULL) *p = 0;
 
- for(p = buf; *p == ''; p++); /* can't have be first char, sigh */
+ for (p = buf; *p == ''; p++); /* can't have be first char, sigh */
 prot_printf(imapd_out, "* OK ALERT %s\r\n", p);
+
+out:
+ if (motd_in)
+	prot_free(motd_in);
+ if (fd >= 0)
+	close(fd);
+ free(filename);
 }
 
 /*
@@ -1007,7 +1061,7 @@
 if (backend_cached) free(backend_cached);
 
 if (idling)
-	idle_done(imapd_index ? imapd_index->mailbox->name : NULL);
+	idle_stop(index_mboxname(imapd_index));
 
 if (imapd_index) index_close(&imapd_index);
 
@@ -1024,7 +1078,9 @@
 denydb_done();
 
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
+
+ idle_done();
 
 if (config_getswitch(IMAPOPT_STATUSCACHE)) {
 	statuscache_close();
@@ -1064,7 +1120,7 @@
 exit(code);
 }
 
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 static int recurse_code = 0;
 
@@ -1079,23 +1135,21 @@
 	prot_printf(imapd_out, "* BYE Fatal error: %s\r\n", s);
 	prot_flush(imapd_out);
 }
- if (stage) {
+ if (stages.count) {
 	/* Cleanup the stage(s) */
-	while (numstage) {
-	 struct appendstage *curstage = stage--numstage;
-
+	struct appendstage *curstage;
+	while ((curstage = ptrarray_pop(&stages))) {
 	 if (curstage->f != NULL) fclose(curstage->f);
 	 append_removestage(curstage->stage);
-	 while (curstage->nflags--) {
-		free(curstage->flagcurstage->nflags);
-	 }
-	 if (curstage->flag) free((char *) curstage->flag);
+	 strarray_fini(&curstage->flags);
+	 freeentryatts(curstage->annotations);
 	 free(curstage);
 	}
-	free(stage);
+	ptrarray_fini(&stages);
 }
 
 syslog(LOG_ERR, "Fatal error: %s", s);
+ abort();
 shut_down(code);
 }
 
@@ -1115,7 +1169,7 @@
 	prot_printf(backend_current->out, "%s Noop\r\n", mytag);
 	pipe_until_tag(backend_current, mytag, 0);
 }
- else if (imapd_index) {
+ else {
 	/* local mailbox */
 	index_check(imapd_index, usinguid, 0);
 }
@@ -1124,12 +1178,9 @@
 /*
 * Top-level command loop parsing
 */
-void cmdloop()
+static void cmdloop(void)
 {
- int fd;
- char motdfilenameMAX_MAILBOX_PATH+1;
 int c;
- int ret;
 int usinguid, havepartition, havenamespace, recursive;
 static struct buf tag, cmd, arg1, arg2, arg3;
 char *p, shutMAX_MAILBOX_PATH+1, cmdname100;
@@ -1147,18 +1198,10 @@
 }
 prot_printf(imapd_out, " server ready\r\n");
 
- ret = snprintf(motdfilename, sizeof(motdfilename), "%s/msg/motd",
-		 config_dir);
- 
- if(ret < 0 || ret >= (int) sizeof(motdfilename)) {
- fatal("motdfilename buffer too small (configdirectory too long)",
-	 EC_CONFIG);
- }
- 
- if ((fd = open(motdfilename, O_RDONLY, 0)) != -1) {
-	motd_file(fd);
-	close(fd);
- }
+ /* clear cancelled flag if present before the next command */
+ cmd_cancelled();
+
+ motd_file();
 
 /* Get command timer logging paramater. This string
 * is a time in seconds. Any command that takes >=
@@ -1170,17 +1213,23 @@
 }
 
 for (;;) {
+	/* Release any held index */
+	index_release(imapd_index);
+
 	/* Flush any buffered output */
 	prot_flush(imapd_out);
 	if (backend_current) prot_flush(backend_current->out);
 
+	/* command no longer running */
+	proc_register(config_ident, imapd_clienthost, imapd_userid, index_mboxname(imapd_index), NULL);
+
 	/* Check for shutdown file */
 	if ( !imapd_userisadmin && imapd_userid &&
 	 (shutdown_file(shut, sizeof(shut)) ||
 	 userdeny(imapd_userid, config_ident, shut, sizeof(shut)))) {
 	 for (p = shut; *p == ''; p++); /* can't have be first char */
 	 prot_printf(imapd_out, "* BYE ALERT %s\r\n", p);
- telemetry_rusage( imapd_userid );
+	 telemetry_rusage(imapd_userid);
 	 shut_down(0);
 	}
 
@@ -1217,15 +1266,20 @@
 	 continue;
 	}
 	lcase(cmd.s);
-	strncpy(cmdname, cmd.s, 99);
+	xstrncpy(cmdname, cmd.s, 99);
 	cmd.s0 = toupper((unsigned char) cmd.s0);
 
+	if (config_getswitch(IMAPOPT_CHATTY))
+	 syslog(LOG_NOTICE, "command: %s %s", tag.s, cmd.s);
+
+	proc_register(config_ident, imapd_clienthost, imapd_userid, index_mboxname(imapd_index), cmd.s);
+
 	/* if we need to force a kick, do so */
 	if (referral_kick) {
 	 kick_mupdate();
 	 referral_kick = 0;
 	}
-	
+
 	if (plaintextloginalert) {
 	 prot_printf(imapd_out, "* OK ALERT %s\r\n",
 			plaintextloginalert);
@@ -1327,23 +1381,24 @@
 		if (c == '\r') c = prot_getc(imapd_in);
 		if (c != '\n') goto extraargs;
 
-		cmd_copy(tag.s, arg1.s, arg2.s, usinguid);
+		cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/0);
 
 		snmp_increment(COPY_COUNT, 1);
 	 }
 	 else if (!strcmp(cmd.s, "Create")) {
-		havepartition = 0;
+		struct dlist *extargs = NULL;
+
 		if (c != ' ') goto missingargs;
 		c = getastring(imapd_in, imapd_out, &arg1);
 		if (c == EOF) goto missingargs;
 		if (c == ' ') {
-		 havepartition = 1;
-		 c = getword(imapd_in, &arg2);
-		 if (!imparse_isatom(arg2.s)) goto badpartition;
+		 c = parsecreateargs(&extargs);
+		 if (c == EOF) goto badpartition;
 		}
 		if (c == '\r') c = prot_getc(imapd_in);
 		if (c != '\n') goto extraargs;
-		cmd_create(tag.s, arg1.s, havepartition ? arg2.s : 0, 0);
+		cmd_create(tag.s, arg1.s, extargs, 0);
+		dlist_free(&extargs);
 
 		snmp_increment(CREATE_COUNT, 1);
 	 }
@@ -1468,6 +1523,13 @@
 
 		snmp_increment(GETANNOTATION_COUNT, 1);
 	 }
+	 else if (!strcmp(cmd.s, "Getmetadata")) {
+		if (c != ' ') goto missingargs;
+
+		cmd_getmetadata(tag.s);
+
+		snmp_increment(GETANNOTATION_COUNT, 1);
+	 }
 	 else if (!strcmp(cmd.s, "Getquota")) {
 		if (c != ' ') goto missingargs;
 		c = getastring(imapd_in, imapd_out, &arg1);
@@ -1552,7 +1614,7 @@
 		memset(&listargs, 0, sizeof(struct listargs));
 		listargs.ret = LIST_RET_CHILDREN;
 		getlistargs(tag.s, &listargs);
-		if (listargs.pat) cmd_list(tag.s, &listargs);
+		if (listargs.pat.count) cmd_list(tag.s, &listargs);
 
 		snmp_increment(LIST_COUNT, 1);
 	 }
@@ -1569,7 +1631,7 @@
 		listargs.cmd = LIST_CMD_LSUB;
 		listargs.sel = LIST_SEL_SUBSCRIBED;
 		listargs.ref = arg1.s;
-		appendstrlist(&listargs.pat, arg2.s);
+		strarray_append(&listargs.pat, arg2.s);
 
 		cmd_list(tag.s, &listargs);
 
@@ -1599,18 +1661,19 @@
 	 }
 	 else if (!strcmp(cmd.s, "Localcreate")) {
 		/* create a local-only mailbox */
-		havepartition = 0;
+		struct dlist *extargs = NULL;
+
 		if (c != ' ') goto missingargs;
 		c = getastring(imapd_in, imapd_out, &arg1);
 		if (c == EOF) goto missingargs;
 		if (c == ' ') {
-		 havepartition = 1;
-		 c = getword(imapd_in, &arg2);
-		 if (!imparse_isatom(arg2.s)) goto badpartition;
+		 c = parsecreateargs(&extargs);
+		 if (c == EOF) goto badpartition;
 		}
 		if (c == '\r') c = prot_getc(imapd_in);
 		if (c != '\n') goto extraargs;
-		cmd_create(tag.s, arg1.s, havepartition ? arg2.s : NULL, 1);
+		cmd_create(tag.s, arg1.s, extargs, 1);
+		dlist_free(&extargs);
 
 		/* xxxx snmp_increment(CREATE_COUNT, 1); */
 	 }
@@ -1648,6 +1711,23 @@
 		cmd_mupdatepush(tag.s, arg1.s);
 		
 		/* xxxx snmp_increment(MUPDATEPUSH_COUNT, 1); */
+	 }
+	 else if (!strcmp(cmd.s, "Move")) {
+		if (!imapd_index && !backend_current) goto nomailbox;
+		usinguid = 0;
+		if (c != ' ') goto missingargs;
+	 move:
+		c = getword(imapd_in, &arg1);
+		if (c == '\r') goto missingargs;
+		if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
+		c = getastring(imapd_in, imapd_out, &arg2);
+		if (c == EOF) goto missingargs;
+		if (c == '\r') c = prot_getc(imapd_in);
+		if (c != '\n') goto extraargs;
+
+		cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/1);
+
+		snmp_increment(COPY_COUNT, 1);
 	 } else goto badcmd;
 	 break;
 
@@ -1729,7 +1809,7 @@
 		listargs.sel = LIST_SEL_REMOTE;
 		listargs.ret = LIST_RET_CHILDREN;
 		listargs.ref = arg1.s;
-		appendstrlist(&listargs.pat, arg2.s);
+		strarray_append(&listargs.pat, arg2.s);
 
 		cmd_list(tag.s, &listargs);
 
@@ -1748,7 +1828,7 @@
 		listargs.cmd = LIST_CMD_LSUB;
 		listargs.sel = LIST_SEL_REMOTE | LIST_SEL_SUBSCRIBED;
 		listargs.ref = arg1.s;
-		appendstrlist(&listargs.pat, arg2.s);
+		strarray_append(&listargs.pat, arg2.s);
 
 		cmd_list(tag.s, &listargs);
 
@@ -1893,6 +1973,15 @@
 
 		snmp_increment(SETANNOTATION_COUNT, 1);
 	 }
+	 else if (!strcmp(cmd.s, "Setmetadata")) {
+		if (c != ' ') goto missingargs;
+		c = getastring(imapd_in, imapd_out, &arg1);
+		if (c != ' ') goto missingargs;
+
+		cmd_setmetadata(tag.s, arg1.s);
+
+		snmp_increment(SETANNOTATION_COUNT, 1);
+	 }
 	 else if (!strcmp(cmd.s, "Setquota")) {
 		if (c != ' ') goto missingargs;
 		c = getastring(imapd_in, imapd_out, &arg1);
@@ -1931,7 +2020,7 @@
 
 		memset(&listargs, 0, sizeof(struct listargs));
 		listargs.ref = arg1.s;
-		appendstrlist(&listargs.pat, arg2.s);
+		strarray_append(&listargs.pat, arg2.s);
 		listargs.scan = arg3.s;
 
 		cmd_list(tag.s, &listargs);
@@ -1962,7 +2051,7 @@
 		c = getword(imapd_in, &arg1);
 		if (c != ' ') goto missingargs;
 		lcase(arg1.s);
-		strncpy(cmdname, arg1.s, 99);
+		xstrncpy(cmdname, arg1.s, 99);
 		if (!strcmp(arg1.s, "fetch")) {
 		 goto fetch;
 		}
@@ -1981,6 +2070,12 @@
 		else if (!strcmp(arg1.s, "copy")) {
 		 goto copy;
 		}
+		else if (!strcmp(arg1.s, "move")) {
+		 goto move;
+		}
+		else if (!strcmp(arg1.s, "xmove")) {
+		 goto move;
+		}
 		else if (!strcmp(arg1.s, "expunge")) {
 		 c = getword(imapd_in, &arg1);
 		 if (!imparse_issequence(arg1.s)) goto badsequence;
@@ -1990,6 +2085,9 @@
 
 		 snmp_increment(EXPUNGE_COUNT, 1);
 		}
+		else if (!strcmp(arg1.s, "xrunannotator")) {
+		 goto xrunannotator;
+		}
 		else {
 		 prot_printf(imapd_out, "%s BAD Unrecognized UID subcommand\r\n", tag.s);
 		 eatline(imapd_in, c);
@@ -2046,7 +2144,33 @@
 	 break;
 
 	case 'X':
-	 if (!strcmp(cmd.s, "Xfer")) {
+	 if (!strcmp(cmd.s, "Xconvfetch")) {
+		cmd_xconvfetch(tag.s);
+
+// 		snmp_increment(XCONVFETCH_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xconvmultisort")) {
+		if (c != ' ') goto missingargs;
+		if (!imapd_index && !backend_current) goto nomailbox;
+		cmd_xconvmultisort(tag.s);
+
+// 		snmp_increment(XCONVMULTISORT_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xconvsort")) {
+		if (c != ' ') goto missingargs;
+		if (!imapd_index && !backend_current) goto nomailbox;
+		cmd_xconvsort(tag.s, 0);
+
+// 		snmp_increment(XCONVSORT_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xconvupdates")) {
+		if (c != ' ') goto missingargs;
+		if (!imapd_index && !backend_current) goto nomailbox;
+		cmd_xconvsort(tag.s, 1);
+
+// 		snmp_increment(XCONVUPDATES_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xfer")) {
 		int havepartition = 0;
 		
 		/* Mailbox */
@@ -2071,6 +2195,9 @@
 			 (havepartition ? arg3.s : NULL));
 	 /*	snmp_increment(XFER_COUNT, 1);*/
 	 }
+	 else if (!strcmp(cmd.s, "Xconvmeta")) {
+		cmd_xconvmeta(tag.s);
+	 }
 	 else if (!strcmp(cmd.s, "Xlist")) {
 		struct listargs listargs;
 
@@ -2078,12 +2205,66 @@
 
 		memset(&listargs, 0, sizeof(struct listargs));
 		listargs.cmd = LIST_CMD_XLIST;
-		listargs.ret = LIST_RET_CHILDREN;
+		listargs.ret = LIST_RET_CHILDREN | LIST_RET_SPECIALUSE;
 		getlistargs(tag.s, &listargs);
-		if (listargs.pat) cmd_list(tag.s, &listargs);
+		if (listargs.pat.count) cmd_list(tag.s, &listargs);
 
 		snmp_increment(LIST_COUNT, 1);
 	 }
+	 else if (!strcmp(cmd.s, "Xmove")) {
+		if (!imapd_index && !backend_current) goto nomailbox;
+		usinguid = 0;
+		if (c != ' ') goto missingargs;
+		goto move;
+	 }
+	 else if (!strcmp(cmd.s, "Xrunannotator")) {
+		if (!imapd_index && !backend_current) goto nomailbox;
+		usinguid = 0;
+		if (c != ' ') goto missingargs;
+	 xrunannotator:
+		c = getword(imapd_in, &arg1);
+		if (!arg1.len || !imparse_issequence(arg1.s)) goto badsequence;
+		cmd_xrunannotator(tag.s, arg1.s, usinguid);
+// 		snmp_increment(XRUNANNOTATOR_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xsnippets")) {
+		if (c != ' ') goto missingargs;
+		if (!imapd_index && !backend_current) goto nomailbox;
+		cmd_xsnippets(tag.s);
+
+// 		snmp_increment(XSNIPPETS_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xstats")) {
+		cmd_xstats(tag.s, c);
+	 }
+	 else if (!strcmp(cmd.s, "Xwarmup")) {
+		/* XWARMUP doesn't need a mailbox to be selected */
+		if (c != ' ') goto missingargs;
+		cmd_xwarmup(tag.s);
+// 		snmp_increment(XWARMUP_COUNT, 1);
+	 }
+	 else if (!strcmp(cmd.s, "Xkillmy")) {
+		if (c != ' ') goto missingargs;
+		c = getastring(imapd_in, imapd_out, &arg1);
+		if (c == EOF) goto missingargs;
+		if (c == '\r') c = prot_getc(imapd_in);
+		if (c != '\n') goto extraargs;
+		cmd_xkillmy(tag.s, arg1.s);
+	 }
+	 else if (!strcmp(cmd.s, "Xforever")) {
+		if (c == '\r') c = prot_getc(imapd_in);
+		if (c != '\n') goto extraargs;
+		cmd_xforever(tag.s);
+	 }
+	 else if (!strcmp(cmd.s, "Xmeid")) {
+		if (c != ' ') goto missingargs;
+		c = getastring(imapd_in, imapd_out, &arg1);
+		if (c == EOF) goto missingargs;
+		if (c == '\r') c = prot_getc(imapd_in);
+		if (c != '\n') goto extraargs;
+		cmd_xmeid(tag.s, arg1.s);
+	 }
+
 	 else goto badcmd;
 	 break;
 
@@ -2096,11 +2277,12 @@
 	/* End command timer - don't log "idle" commands */
 	if (commandmintimer && strcmp("idle", cmdname)) {
 	 double cmdtime, nettime;
+	 const char *mboxname = index_mboxname(imapd_index);
+	 if (!mboxname) mboxname = "<none>";
 	 cmdtime_endtimer(&cmdtime, &nettime);
 	 if (cmdtime >= commandmintimerd) {
 		syslog(LOG_NOTICE, "cmdtimer: '%s' '%s' '%s' '%f' '%f' '%f'",
-		 imapd_userid ? imapd_userid : "<none>", 
-		 cmdname, imapd_index ? imapd_index->mailbox->name : "<none>",
+		 imapd_userid ? imapd_userid : "<none>", cmdname, mboxname,
 		 cmdtime, nettime, cmdtime + nettime);
 	 }
 	}
@@ -2139,13 +2321,28 @@
 }
 }
 
+/*
+ * Autocreate Inbox and subfolders upon login
+ */
+static void autocreate_inbox(void)
+{
+ if (imapd_userisadmin) return;
+ if (imapd_userisproxyadmin) return;
+
+ if (config_getint(IMAPOPT_AUTOCREATEQUOTA)) {
+	char *inboxname = mboxname_user_mbox(imapd_userid, NULL);
+	int r = mboxlist_lookup(inboxname, NULL, NULL);
+	free(inboxname);
+	if (r != IMAP_MAILBOX_NONEXISTENT) return;
+	autocreate_user(&imapd_namespace, imapd_userid);
+ }
+}
+
 static void authentication_success(void)
 {
 int r;
+ struct mboxevent *mboxevent;
 
- /* register the user */
- proc_register("imapd", imapd_clienthost, imapd_userid, NULL);
- 
 /* authstate already created by mysasl_proxy_policy() */
 imapd_userisadmin = global_authisa(imapd_authstate, IMAPOPT_ADMINS);
 
@@ -2155,6 +2352,9 @@
 /* Set namespace */
 r = mboxname_init_namespace(&imapd_namespace,
 				imapd_userisadmin || imapd_userisproxyadmin);
+
+ mboxevent_setnamespace(&imapd_namespace);
+
 if (r) {
 	syslog(LOG_ERR, "%s", error_message(r));
 	fatal(error_message(r), EC_CONFIG);
@@ -2167,12 +2367,53 @@
 mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid,
 				config_virtdomains ?
 				strcspn(imapd_userid, "@") : 0);
+
+ /* send a Login event notification */
+ if ((mboxevent = mboxevent_new(EVENT_LOGIN))) {
+	mboxevent_set_access(mboxevent, saslprops.iplocalport,
+			 saslprops.ipremoteport, imapd_userid, NULL);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
+ autocreate_inbox();
+}
+
+static int checklimits(const char *tag)
+{
+ struct proc_limits limits;
+
+ limits.procname = "imapd";
+ limits.clienthost = imapd_clienthost;
+ limits.userid = imapd_userid;
+
+ if (proc_checklimits(&limits)) {
+	const char *sep = "";
+	prot_printf(imapd_out, "%s NO Too many open connections (", tag);
+	if (limits.maxhost) {
+	 prot_printf(imapd_out, "%s%d of %d from %s", sep,
+		 limits.host, limits.maxhost, imapd_clienthost);
+	 sep = ", ";
+	}
+	if (limits.maxuser) {
+	 prot_printf(imapd_out, "%s%d of %d for %s", sep,
+		 limits.user, limits.maxuser, imapd_userid);
+	}
+	prot_printf(imapd_out, ")\r\n");
+	free(imapd_userid);
+	imapd_userid = NULL;
+	auth_freestate(imapd_authstate);
+	imapd_authstate = NULL;
+	return 1;
+ }
+ return 0;
 }
 
 /*
 * Perform a LOGIN command
 */
-void cmd_login(char *tag, char *user)
+static void cmd_login(char *tag, char *user)
 {
 char userbufMAX_MAILBOX_BUFFER;
 char replybufMAX_MAILBOX_BUFFER;
@@ -2256,8 +2497,7 @@
 	imapd_authstate = auth_newstate(canon_user);
 	syslog(LOG_NOTICE, "login: %s %s%s nopassword%s %s", imapd_clienthost,
 	 imapd_userid, imapd_magicplus ? imapd_magicplus : "",
-	 imapd_starttls_done ? "+TLS" : "",
-	 reply ? reply : "");
+	 imapd_starttls_done ? "+TLS" : "", reply);
 }
 else if ((r = sasl_checkpass(imapd_saslconn,
 				 canon_user,
@@ -2331,6 +2571,8 @@
 
 buf_free(&passwdbuf);
 
+ if (checklimits(tag)) return;
+
 prot_printf(imapd_out, "%s OK CAPABILITY ", tag);
 capa_response(CAPA_PREAUTH|CAPA_POSTAUTH);
 prot_printf(imapd_out, " %s\r\n", reply);
@@ -2341,12 +2583,12 @@
 /*
 * Perform an AUTHENTICATE command
 */
-void cmd_authenticate(char *tag, char *authtype, char *resp)
+static void cmd_authenticate(char *tag, char *authtype, char *resp)
 {
 int sasl_result;
 
 const void *val;
- char *ssfmsg=NULL;
+ const char *ssfmsg = NULL;
 char replybufMAX_MAILBOX_BUFFER;
 const char *reply = NULL;
 
@@ -2444,8 +2686,7 @@
 reply = replybuf;
 syslog(LOG_NOTICE, "login: %s %s%s %s%s %s", imapd_clienthost,
 	 imapd_userid, imapd_magicplus ? imapd_magicplus : "",
-	 authtype, imapd_starttls_done ? "+TLS" : "",
-	 reply ? reply : "");
+	 authtype, imapd_starttls_done ? "+TLS" : "", reply);
 
 sasl_getprop(imapd_saslconn, SASL_SSF, &val);
 saslprops.ssf = *((sasl_ssf_t *) val);
@@ -2470,6 +2711,11 @@
 			VARIABLE_AUTH, 0, /* hash_simple(authtype) */
 			VARIABLE_LISTEND);
 
+ if (checklimits(tag)) {
+	reset_saslconn(&imapd_saslconn);
+	return;
+ }
+
 if (!saslprops.ssf) {
 	prot_printf(imapd_out, "%s OK CAPABILITY ", tag);
 	capa_response(CAPA_PREAUTH|CAPA_POSTAUTH);
@@ -2489,7 +2735,7 @@
 /*
 * Perform a NOOP command
 */
-void cmd_noop(char *tag, char *cmd)
+static void cmd_noop(char *tag, char *cmd)
 {
 if (backend_current) {
 	/* remote mailbox */
@@ -2499,13 +2745,19 @@
 	return;
 }
 
- if (imapd_index) 
-	index_check(imapd_index, 1, 0);
+ index_check(imapd_index, 1, 0);
 
 prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
 }
 
+static void clear_id() {
+ if (imapd_id.params) {
+	freeattvalues(imapd_id.params);
+ }
+ memset(&imapd_id, 0, sizeof(struct id_data));
+}
+
 /*
 * Parse and perform an ID command.
 *
@@ -2515,18 +2767,14 @@
 * we only allow MAXIDFAILED consecutive failed IDs from a given client.
 * we only record MAXIDLOG ID responses from a given client.
 */
-void cmd_id(char *tag)
+static void cmd_id(char *tag)
 {
- static int did_id = 0;
- static int failed_id = 0;
- static int logged_id = 0;
- int error = 0;
 int c = EOF, npair = 0;
+ int is_ios = 0;
 static struct buf arg, field;
- struct attvaluelist *params = 0;
 
 /* check if we've already had an ID in non-authenticated state */
- if (!imapd_userid && did_id) {
+ if (!imapd_userid && imapd_id.did_id) {
 	prot_printf(imapd_out,
 		 "%s NO Only one Id allowed in non-authenticated state\r\n",
 		 tag);
@@ -2534,13 +2782,7 @@
 	return;
 }
 
- /* check if we've had too many failed IDs in a row */
- if (failed_id >= MAXIDFAILED) {
-	prot_printf(imapd_out, "%s NO Too many (%u) invalid Id commands\r\n",
-		 tag, failed_id);
-	eatline(imapd_in, c);
-	return;
- }
+ clear_id();
 
 /* ok, accept parameter list */
 c = getword(imapd_in, &arg);
@@ -2548,7 +2790,6 @@
 if (strcasecmp(arg.s, "NIL") && c != '(') {
 	prot_printf(imapd_out, "%s BAD Invalid parameter list in Id\r\n", tag);
 	eatline(imapd_in, c);
-	failed_id++;
 	return;
 }
 
@@ -2566,8 +2807,8 @@
 		prot_printf(imapd_out,
 			 "%s BAD Invalid/missing field name in Id\r\n",
 			 tag);
-		error = 1;
-		break;
+		eatline(imapd_in, c);
+		return;
 	 }
 
 	 /* get field value */
@@ -2576,42 +2817,48 @@
 		prot_printf(imapd_out,
 			 "%s BAD Invalid/missing value in Id\r\n",
 			 tag);
-		error = 1;
-		break;
+		eatline(imapd_in, c);
+		return;
 	 }
 
 	 /* ok, we're anal, but we'll still process the ID command */
 	 if (strlen(field.s) > MAXIDFIELDLEN) {
-		prot_printf(imapd_out, 
+		prot_printf(imapd_out,
 			 "%s BAD field longer than %u octets in Id\r\n",
 			 tag, MAXIDFIELDLEN);
-		error = 1;
-		break;
+		eatline(imapd_in, c);
+		return;
 	 }
-	 if (strlen(arg.s) > MAXIDVALUELEN) {
+	 if (arg.len > MAXIDVALUELEN) {
 		prot_printf(imapd_out,
 			 "%s BAD value longer than %u octets in Id\r\n",
 			 tag, MAXIDVALUELEN);
-		error = 1;
-		break;
+		eatline(imapd_in, c);
+		return;
 	 }
 	 if (++npair > MAXIDPAIRS) {
 		prot_printf(imapd_out,
 			 "%s BAD too many (%u) field-value pairs in ID\r\n",
 			 tag, MAXIDPAIRS);
-		error = 1;
-		break;
+		eatline(imapd_in, c);
+		return;
 	 }
-	 
+
+	 if (!strcmp(field.s, "os") && !strcmp(arg.s, "iOS")) {
+		is_ios = 1;
+	 }
+	 if (is_ios && !strcmp(field.s, "os-version") && arg.s0 == '7') {
+		imapd_id.quirks |= QUIRK_SEARCHFUZZY;
+	 }
+
 	 /* ok, we're happy enough */
-	 appendattvalue(&params, field.s, arg.s);
+	 appendattvalue(&imapd_id.params, field.s, &arg);
 	}
 
-	if (error || c != ')') {
+	if (c != ')') {
 	 /* erp! */
+	 prot_printf(imapd_out, "%s BAD trailing junk\r\n", tag);
 	 eatline(imapd_in, c);
-	 freeattvalues(params);
-	 failed_id++;
 	 return;
 	}
 	c = prot_getc(imapd_in);
@@ -2620,39 +2867,32 @@
 /* check for CRLF */
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
-	prot_printf(imapd_out,
-		 "%s BAD Unexpected extra arguments to Id\r\n", tag);
+	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to Id\r\n", tag);
 	eatline(imapd_in, c);
-	freeattvalues(params);
-	failed_id++;
 	return;
 }
 
 /* log the client's ID string.
 eventually this should be a callback or something. */
- if (npair && logged_id < MAXIDLOG) {
-	char logbufMAXIDLOGLEN + 1 = "";
+ if (npair) {
+	struct buf logbuf = BUF_INITIALIZER;
 	struct attvaluelist *pptr;
 
-	for (pptr = params; pptr; pptr = pptr->next) {
+	for (pptr = imapd_id.params; pptr; pptr = pptr->next) {
+	 const char *val = buf_cstring(&pptr->value);
+
 	 /* should we check for and format literals here ??? */
-	 snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
-		 " \"%s\" ", pptr->attrib);
-	 if (!strcmp(pptr->value, "NIL"))
-		snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
-			 "NIL");
+	 buf_printf(&logbuf, " \"%s\" ", pptr->attrib);
+	 if (!val || !strcmp(val, "NIL"))
+		buf_printf(&logbuf, "NIL");
 	 else
-		snprintf(logbuf + strlen(logbuf), MAXIDLOGLEN - strlen(logbuf),
-			"\"%s\"", pptr->value);
+		buf_printf(&logbuf, "\"%s\"", val);
 	}
 
-	syslog(LOG_INFO, "client id:%s", logbuf);
-
-	logged_id++;
+	syslog(LOG_INFO, "client id:%s", buf_cstring(&logbuf));
+	buf_free(&logbuf);
 }
 
- freeattvalues(params);
-
 /* spit out our ID string.
 eventually this might be configurable. */
 if (config_getswitch(IMAPOPT_IMAPIDRESPONSE) &&
@@ -2668,44 +2908,64 @@
 prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
 
- failed_id = 0;
- did_id = 1;
+ imapd_id.did_id = 1;
 }
 
 /*
 * Perform an IDLE command
 */
-void cmd_idle(char *tag)
+static void cmd_idle(char *tag)
 {
 int c = EOF;
+ int flags;
 static struct buf arg;
 static int idle_period = -1;
 
 if (!backend_current) { /* Local mailbox */
-	/* Setup for doing mailbox updates */
-	if (!idle_init(idle_update)) {
-	 prot_printf(imapd_out, 
-			"%s NO cannot start idling\r\n", tag);
-	 return;
-	}
 
 	/* Tell client we are idling and waiting for end of command */
 	prot_printf(imapd_out, "+ idling\r\n");
 	prot_flush(imapd_out);
 
 	/* Start doing mailbox updates */
-	if (imapd_index) index_check(imapd_index, 1, 0);
-	idle_start(imapd_index ? imapd_index->mailbox->name : NULL);
+	index_check(imapd_index, 1, 0);
+	idle_start(index_mboxname(imapd_index));
 	/* use this flag so if getc causes a shutdown due to
 	 * connection abort we tell idled about it */
 	idling = 1;
 
-	/* Get continuation data */
-	c = getword(imapd_in, &arg);
+	index_release(imapd_index);
+	while ((flags = idle_wait(imapd_in->fd))) {
+	 if (flags & IDLE_INPUT) {
+		/* Get continuation data */
+		c = getword(imapd_in, &arg);
+		break;
+	 }
+
+	 /* Send unsolicited untagged responses to the client */
+	 if (flags & IDLE_MAILBOX)
+		index_check(imapd_index, 1, 0);
+
+	 if (flags & IDLE_ALERT) {
+		char shutMAX_MAILBOX_PATH+1;
+		if (! imapd_userisadmin &&
+		 (shutdown_file(shut, sizeof(shut)) ||
+		 (imapd_userid && 
+		 userdeny(imapd_userid, config_ident, shut, sizeof(shut))))) {
+		 char *p;
+		 for (p = shut; *p == ''; p++); /* can't have be first char */
+		 prot_printf(imapd_out, "* BYE ALERT %s\r\n", p);
+		 shut_down(0);
+		}
+	 }
+
+	 index_release(imapd_index);
+	 prot_flush(imapd_out);
+	}
 
 	/* Stop updates and do any necessary cleanup */
 	idling = 0;
-	idle_done(imapd_index ? imapd_index->mailbox->name : NULL);
+	idle_stop(index_mboxname(imapd_index));
 }
 else { /* Remote mailbox */
 	int done = 0, shutdown = 0;
@@ -2797,29 +3057,8 @@
 }
 }
 
-/* Send unsolicited untagged responses to the client */
-void idle_update(idle_flags_t flags)
-{
- if ((flags & IDLE_MAILBOX) && imapd_index)
-	index_check(imapd_index, 1, 0);
 
- if (flags & IDLE_ALERT) {
-	char shutMAX_MAILBOX_PATH+1;
-	if (! imapd_userisadmin &&
-	 (shutdown_file(shut, sizeof(shut)) ||
-	 (imapd_userid && 
-	 userdeny(imapd_userid, config_ident, shut, sizeof(shut))))) {
-	 char *p;
-	 for (p = shut; *p == ''; p++); /* can't have be first char */
-	 prot_printf(imapd_out, "* BYE ALERT %s\r\n", p);
-	 shut_down(0);
-	}
- }
-
- prot_flush(imapd_out);
-}
-
-void capa_response(int flags)
+static void capa_response(int flags)
 {
 const char *sasllist; /* the list of SASL mechanisms */
 int mechcount;
@@ -2869,12 +3108,18 @@
 
 if (!(flags & CAPA_POSTAUTH)) return;
 
+ if (config_getswitch(IMAPOPT_CONVERSATIONS))
+	prot_printf(imapd_out, " XCONVERSATIONS");
+
 #ifdef HAVE_ZLIB
 if (!imapd_compress_done && !imapd_tls_comp) {
 	prot_printf(imapd_out, " COMPRESS=DEFLATE");
 }
 #endif
 
+ for (i = 0 ; i < QUOTA_NUMRESOURCES ; i++)
+	prot_printf(imapd_out, " X-QUOTA=%s", quota_namesi);
+
 if (idle_enabled()) {
 	prot_printf(imapd_out, " IDLE");
 }
@@ -2883,7 +3128,7 @@
 /*
 * Perform a CAPABILITY command
 */
-void cmd_capability(char *tag)
+static void cmd_capability(char *tag)
 {
 imapd_check(NULL, 0);
 
@@ -3050,18 +3295,16 @@
 						 url.mailbox,
 						 imapd_userid, mailboxname);
 	if (!r) {
-	 int mbtype;
-	 char *newserver;
+	 mbentry_t *mbentry = NULL;
 
 	 /* lookup the location of the mailbox */
-	 r = mlookup(NULL, NULL, mailboxname, &mbtype,
-			&newserver, NULL, NULL);
+	 r = mlookup(NULL, NULL, mailboxname, &mbentry);
 
-	 if (!r && (mbtype & MBTYPE_REMOTE)) {
+	 if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 		/* remote mailbox */
 		struct backend *be;
 
-		be = proxy_findserver(newserver, &imap_protocol,
+		be = proxy_findserver(mbentry->server, &imap_protocol,
 				 proxy_userid, &backend_cached,
 				 &backend_current, &backend_inbox, imapd_in);
 		if (be) {
@@ -3075,10 +3318,13 @@
 		 r = IMAP_SERVER_UNAVAILABLE;
 
 		free(url.freeme);
+		mboxlist_entry_free(&mbentry);
 
 		return r;
 	 }
 
+	 mboxlist_entry_free(&mbentry);
+
 	 /* local mailbox */
 	 if (!r) {
 		struct index_init init;
@@ -3088,6 +3334,7 @@
 		init.authstate = imapd_authstate;
 		init.out = imapd_out;
 		r = index_open(mailboxname, &init, &state);
+		if (init.vanishedlist) seqset_free(init.vanishedlist);
 	 }
 	 if (!r) doclose = 1;
 
@@ -3157,7 +3404,7 @@
 	}
 
 	if (!strcasecmp(arg.s, "TEXT")) {
-	 int r1 = catenate_text(!r ? f : NULL, totalsize, binary, parseerr);
+	 int r1 = catenate_text(f, totalsize, binary, parseerr);
 	 if (r1) return r1;
 
 	 /* if we see a SP, we're trying to catenate more than one part */
@@ -3205,63 +3452,61 @@
 * 'cur_name' is the name of the currently selected mailbox (if any) 
 * in case we have to resolve relative URLs
 */
-#define FLAGGROW 10
-void cmd_append(char *tag, char *name, const char *cur_name)
+static void cmd_append(char *tag, char *name, const char *cur_name)
 {
 int c;
 static struct buf arg;
 time_t now = time(NULL);
- uquota_t totalsize = 0;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
 unsigned size;
 int sync_seen = 0;
 int r;
- unsigned i;
+ int i;
 char mailboxnameMAX_MAILBOX_BUFFER;
 struct appendstate appendstate; 
- unsigned long uidvalidity;
- unsigned long firstuid, num;
+ unsigned long uidvalidity = 0;
 long doappenduid = 0;
 const char *parseerr = NULL, *url = NULL;
- int mbtype;
- char *newserver;
- unsigned numalloc = 5;
 struct appendstage *curstage;
+ mbentry_t *mbentry = NULL;
 
 /* See if we can append */
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &newserver, NULL, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
 	struct backend *s = NULL;
 
 	if (supports_referrals) { 
-	 imapd_refer(tag, newserver, name);
+	 imapd_refer(tag, mbentry->server, name);
 	 /* Eat the argument */
 	 eatline(imapd_in, prot_getc(imapd_in));
+	 mboxlist_entry_free(&mbentry);
 	 return;
 	}
 
-	s = proxy_findserver(newserver, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
 
+	mboxlist_entry_free(&mbentry);
+
 	imapd_check(s, 0);
 
 	if (!r) {
 	 int is_active = 1;
 	 s->context = (void*) &is_active;
 	 if (imapd_index) {
+		const char *mboxname = index_mboxname(imapd_index);
 		prot_printf(s->out, "%s Localappend {" SIZE_T_FMT "+}\r\n%s"
 			 " {" SIZE_T_FMT "+}\r\n%s ",
 			 tag, strlen(name), name,
-			 strlen(imapd_index->mailbox->name),
-			 imapd_index->mailbox->name);
+			 strlen(mboxname), mboxname);
 	 } else {
 		prot_printf(s->out, "%s Localappend {" SIZE_T_FMT "+}\r\n%s"
 			 " \"\" ", tag, strlen(name), name);
@@ -3283,9 +3528,12 @@
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 if (!r) {
-	r = append_check(mailboxname, imapd_authstate, ACL_INSERT, totalsize);
+	qdiffsQUOTA_MESSAGE = 1;
+	r = append_check(mailboxname, imapd_authstate, ACL_INSERT, qdiffs);
 }
 if (r) {
 	eatline(imapd_in, ' ');
@@ -3300,41 +3548,27 @@
 	return;
 }
 
- stage = xmalloc(numalloc * sizeof(struct appendstage *));
-
 c = ' '; /* just parsed a space */
 /* we loop, to support MULTIAPPEND */
 while (!r && c == ' ') {
-	/* Grow the stage array, if necessary */
-	if (numstage == numalloc) {
-	 /* Avoid integer wrap as arg to xrealloc */
-	 if (numalloc > INT_MAX/(2*sizeof(struct appendstage *)))
-		goto done;
-	 numalloc *= 2;
-	 stage = xrealloc(stage, numalloc * sizeof(struct appendstage *));
-	}
-	curstage = stagenumstage = xzmalloc(sizeof(struct appendstage));
-	numstage++;
+	curstage = xzmalloc(sizeof(*curstage));
+	ptrarray_push(&stages, curstage);
+
+	/* now parsing "append-opts" in the ABNF */
+
 	/* Parse flags */
 	c = getword(imapd_in, &arg);
 	if (c == '(' && !arg.s0) {
-	 curstage->nflags = 0;
+	 strarray_init(&curstage->flags);
 	 do {
 		c = getword(imapd_in, &arg);
-		if (!curstage->nflags && !arg.s0 && c == ')') break; /* empty list */
+		if (!curstage->flags.count && !arg.s0 && c == ')') break; /* empty list */
 		if (!isokflag(arg.s, &sync_seen)) {
 		 parseerr = "Invalid flag in Append command";
 		 r = IMAP_PROTOCOL_ERROR;
 		 goto done;
 		}
-		if (curstage->nflags == curstage->flagalloc) {
-		 curstage->flagalloc += FLAGGROW;
-		 curstage->flag =
-			(char **) xrealloc((char *) curstage->flag, 
-					 curstage->flagalloc * sizeof(char *));
-		}
-		curstage->flagcurstage->nflags = xstrdup(arg.s);
-		curstage->nflags++;
+		strarray_append(&curstage->flags, arg.s);
 	 } while (c == ' ');
 	 if (c != ')') {
 		parseerr = 
@@ -3363,13 +3597,38 @@
 	 c = getword(imapd_in, &arg);
 	}
 
+	/* try to parse a sequence of "append-ext" */
+	for (;;) {
+	 if (!strcasecmp(arg.s, "ANNOTATION")) {
+		/* RFC5257 */
+		if (c != ' ') {
+		 parseerr = "Missing annotation data in Append command";
+		 r = IMAP_PROTOCOL_ERROR;
+		 goto done;
+		}
+		c = parse_annotate_store_data(tag,
+					 /*permessage_flag*/1,
+					 &curstage->annotations);
+		if (c == EOF) {
+		 eatline(imapd_in, c);
+		 goto cleanup;
+		}
+		qdiffsQUOTA_ANNOTSTORAGE += sizeentryatts(curstage->annotations);
+		c = getword(imapd_in, &arg);
+	 }
+	 else
+		break;	/* not a known extension keyword */
+	}
+
 	/* Stage the message */
-	curstage->f = append_newstage(mailboxname, now, numstage, &(curstage->stage));
+	curstage->f = append_newstage(mailboxname, now, stages.count, &(curstage->stage));
 	if (!curstage->f) {
 	 r = IMAP_IOERROR;
 	 goto done;
 	}
 
+	/* now parsing "append-data" in the ABNF */
+
 	if (!strcasecmp(arg.s, "CATENATE")) {
 	 if (c != ' ' || (c = prot_getc(imapd_in) != '(')) {
 		parseerr = "Missing message part(s) in Append command";
@@ -3392,7 +3651,7 @@
 	 /* Copy message to stage */
 	 r = message_copy_strict(imapd_in, curstage->f, size, curstage->binary);
 	}
-	totalsize += size;
+	qdiffsQUOTA_STORAGE += size;
 	/* If this is a non-BINARY message, close the stage file.
 	 * Otherwise, leave it open so we can encode the binary parts.
 	 *
@@ -3425,52 +3684,49 @@
 
 /* Append from the stage(s) */
 if (!r) {
+	qdiffsQUOTA_MESSAGE = stages.count;
 	r = append_setup(&appendstate, mailboxname, 
-			 imapd_userid, imapd_authstate, ACL_INSERT, totalsize);
+			 imapd_userid, imapd_authstate, ACL_INSERT,
+			 qdiffs, &imapd_namespace,
+			 (imapd_userisadmin || imapd_userisproxyadmin),
+			 EVENT_MESSAGE_APPEND);
 }
 if (!r) {
 	struct body *body;
 
 	doappenduid = (appendstate.myrights & ACL_READ);
+	uidvalidity = append_uidvalidity(&appendstate);
 
-	for (i = 0; !r && i < numstage; i++) {
+	for (i = 0; !r && i < stages.count ; i++) {
+	 curstage = stages.datai;
 	 body = NULL;
-	 if (stagei->binary) {
-		r = message_parse_binary_file(stagei->f, &body);
-		fclose(stagei->f);
-		stagei->f = NULL;
+	 if (curstage->binary) {
+		r = message_parse_binary_file(curstage->f, &body);
+		fclose(curstage->f);
+		curstage->f = NULL;
 	 }
 	 if (!r) {
-		r = append_fromstage(&appendstate, &body, stagei->stage,
-				 stagei->internaldate, 
-				 (const char **) stagei->flag,
-				 stagei->nflags, 0);
+		r = append_fromstage(&appendstate, &body, curstage->stage,
+				 curstage->internaldate,
+				 &curstage->flags, 0,
+				 curstage->annotations);
+	 }
+	 if (body) {
+		/* Note: either the calls to message_parse_binary_file()
+		 * or append_fromstage() above, may create a body. */
+		message_free_body(body);
+		free(body);
+		body = NULL;
 	 }
-	 if (body) message_free_body(body);
 	}
 
 	if (!r) {
-	 r = append_commit(&appendstate, totalsize, &uidvalidity, &firstuid, &num, NULL);
+	 r = append_commit(&appendstate);
 	} else {
 	 append_abort(&appendstate);
 	}
 }
 
- /* Cleanup the stage(s) */
- while (numstage) {
-	curstage = stage--numstage;
-
-	if (curstage->f != NULL) fclose(curstage->f);
-	append_removestage(curstage->stage);
-	while (curstage->nflags--) {
-	 free(curstage->flagcurstage->nflags);
-	}
-	if (curstage->flag) free((char *) curstage->flag);
-	free(curstage);
- }
- if (stage) free(stage);
- stage = NULL;
-
 imapd_check(NULL, 1);
 
 if (r == IMAP_PROTOCOL_ERROR && parseerr) {
@@ -3490,34 +3746,115 @@
 		 ? "TOOBIG" : "", error_message(r));
 } else if (doappenduid) {
 	/* is this a space seperated list or sequence list? */
-	prot_printf(imapd_out, "%s OK APPENDUID %lu", tag, uidvalidity);
-	if (num == 1) {
-	 prot_printf(imapd_out, " %lu", firstuid);
+	prot_printf(imapd_out, "%s OK APPENDUID %lu ", tag, uidvalidity);
+	if (appendstate.nummsg == 1) {
+	 prot_printf(imapd_out, "%u", appendstate.baseuid);
 	} else {
-	 prot_printf(imapd_out, " %lu:%lu", firstuid, firstuid + num - 1);
+	 prot_printf(imapd_out, "%u:%u", appendstate.baseuid,
+			appendstate.baseuid + appendstate.nummsg - 1);
 	}
 	prot_printf(imapd_out, " %s\r\n", error_message(IMAP_OK_COMPLETED));
 } else {
 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		 error_message(IMAP_OK_COMPLETED));
 }
+
+cleanup:
+ /* Cleanup the stage(s) */
+ while ((curstage = ptrarray_pop(&stages))) {
+	if (curstage->f != NULL) fclose(curstage->f);
+	append_removestage(curstage->stage);
+	strarray_fini(&curstage->flags);
+	freeentryatts(curstage->annotations);
+	free(curstage);
+ }
+ ptrarray_fini(&stages);
+}
+
+/*
+ * Warn if mailbox is close to or over any quota resource.
+ *
+ * Warn if the following possibilities occur:
+ * - quotawarnkb not set + quotawarn hit
+ * - quotawarnkb set larger than mailbox + quotawarn hit
+ * - quotawarnkb set + hit + quotawarn hit
+ * - quotawarnmsg not set + quotawarn hit
+ * - quotawarnmsg set larger than mailbox + quotawarn hit
+ * - quotawarnmsg set + hit + quotawarn hit
+ */
+static void warn_about_quota(const char *quotaroot)
+{
+ time_t now = time(NULL);
+ struct quota q;
+ int res;
+ int r;
+ int thresholdsQUOTA_NUMRESOURCES;
+ int pc_threshold = config_getint(IMAPOPT_QUOTAWARN);
+ int pc_usage;
+ struct buf msg = BUF_INITIALIZER;
+ static char lastqrMAX_MAILBOX_PATH+1 = "";
+ static time_t nextalert = 0;
+
+ if (!quotaroot || !*quotaroot)
+	return;	 /* no quota, nothing to do */
+
+ /* rate limit checks and warnings to every 10 min */
+ if (!strcmp(quotaroot, lastqr) && now < nextalert)
+	return;
+ strlcpy(lastqr, quotaroot, sizeof(lastqr));
+ nextalert = now + 600;
+
+ quota_init(&q, quotaroot);
+ r = quota_read(&q, NULL, 0);
+ if (r)
+	goto out;	 /* failed to read */
+
+ memset(thresholds, 0, sizeof(thresholds));
+ thresholdsQUOTA_STORAGE = config_getint(IMAPOPT_QUOTAWARNKB);
+ thresholdsQUOTA_MESSAGE = config_getint(IMAPOPT_QUOTAWARNMSG);
+ thresholdsQUOTA_ANNOTSTORAGE = config_getint(IMAPOPT_QUOTAWARNKB);
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (q.limitsres < 0)
+	 continue;	 /* this resource is unlimited */
+	buf_reset(&msg);
+
+	if (thresholdsres <= 0 ||
+	 thresholdsres >= q.limitsres ||
+	 q.usedsres > ((quota_t) (q.limitsres - thresholdsres)) * quota_unitsres) {
+
+	 pc_usage = (int)(((double) q.usedsres * 100.0) /
+		 (double) ((quota_t) q.limitsres * quota_unitsres));
+
+	 if (q.usedsres > (quota_t) q.limitsres * quota_unitsres)
+		buf_printf(&msg, error_message(IMAP_NO_OVERQUOTA),
+			 quota_namesres);
+	 else if (pc_usage > pc_threshold)
+		buf_printf(&msg, error_message(IMAP_NO_CLOSEQUOTA),
+			 pc_usage, quota_namesres);
+	}
+
+	if (msg.len)
+	 prot_printf(imapd_out, "* NO ALERT %s\r\n", buf_cstring(&msg));
+ }
+
+ buf_reset(&msg);
+out:
+ quota_free(&q);
 }
 
+
 /*
 * Perform a SELECT/EXAMINE/BBOARD command
 */
-void cmd_select(char *tag, char *cmd, char *name)
+static void cmd_select(char *tag, char *cmd, char *name)
 {
 int c;
 char mailboxnameMAX_MAILBOX_BUFFER;
 int r = 0;
- double usage;
 int doclose = 0;
- int mbtype;
- char *newserver;
+ mbentry_t *mbentry = NULL;
 struct backend *backend_next = NULL;
- static char lastqrMAX_MAILBOX_PATH+1 = "";
- static time_t nextalert = 0;
 struct index_init init;
 int wasopen = 0;
 struct vanished_params *v = &init.vanished;
@@ -3549,9 +3886,8 @@
 		v->uidvalidity = strtoul(arg.s, &p, 10);
 		if (*p || !v->uidvalidity || v->uidvalidity == ULONG_MAX) goto badqresync;
 		if (c != ' ') goto badqresync;
-		c = getastring(imapd_in, imapd_out, &arg);
-		v->modseq = strtoul(arg.s, &p, 10);
-		if (*p || !v->modseq || v->modseq == ULONG_MAX) goto badqresync;
+		c = getmodseq(imapd_in, &v->modseq);
+		if (c == EOF) goto badqresync;
 		if (c == ' ') {
 		 c = prot_getc(imapd_in);
 		 if (c != '(') {
@@ -3580,14 +3916,23 @@
 		}
 		if (c != ')') goto badqresync;
 		c = prot_getc(imapd_in);
- 	 }
+	 }
+	 else if (!strcmp(arg.s, "ANNOTATE")) {
+		/*
+		 * RFC5257 requires us to parse this keyword, which
+		 * indicates that the client wants unsolicited
+		 * ANNOTATION responses in this session, but we don't
+		 * actually have to do anything with it, so we won't.
+		 */
+		;
+	 }
 	 else {
 		prot_printf(imapd_out, "%s BAD Invalid %s modifier %s\r\n",
 			 tag, cmd, arg.s);
 		eatline(imapd_in, c);
 		return;
 	 }
-	 
+
 	 if (c == ' ') c = getword(imapd_in, &arg);
 	 else break;
 	}
@@ -3620,31 +3965,24 @@
 	wasopen = 1;
 }
 
- if (wasopen) {
-	/* un-register currently selected mailbox, it may get
-	 * overwritten later, but easier here than handling
-	 * all possible error paths */
-	proc_register("imapd", imapd_clienthost, imapd_userid, NULL);
- }
-
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &newserver, NULL, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	char mytag128;
 
 	if (supports_referrals) {
-	 imapd_refer(tag, newserver, name);
+	 imapd_refer(tag, mbentry->server, name);
+	 mboxlist_entry_free(&mbentry);
 	 return;
 	}
 
-	backend_next = proxy_findserver(newserver, &imap_protocol,
+	backend_next = proxy_findserver(mbentry->server, &imap_protocol,
 					proxy_userid, &backend_cached,
 					&backend_current, &backend_inbox,
 					imapd_in);
@@ -3662,6 +4000,7 @@
 
 	if (r) {
 	 prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+	 mboxlist_entry_free(&mbentry);
 	 return;
 	}
 
@@ -3696,9 +4035,8 @@
 
 	switch (pipe_including_tag(backend_current, tag, 0)) {
 	case PROXY_OK:
-	 proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
 	 syslog(LOG_DEBUG, "open: user %s opened %s on %s",
-		 imapd_userid, name, newserver);
+		 imapd_userid, name, mbentry->server);
 
 	 /* add backend_current to the protgroup */
 	 protgroup_insert(protin, backend_current->in);
@@ -3711,9 +4049,13 @@
 	 break;
 	}
 
+	mboxlist_entry_free(&mbentry);
+
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 if (backend_current) {
 char mytag128;
@@ -3739,57 +4081,31 @@
 r = index_open(mailboxname, &init, &imapd_index);
 if (!r) doclose = 1;
 
- if (!r && !(imapd_index->myrights & ACL_READ)) {
-	r = (imapd_userisadmin || (imapd_index->myrights & ACL_LOOKUP)) ?
+ if (!r && !index_hasrights(imapd_index, ACL_READ)) {
+	r = (imapd_userisadmin || index_hasrights(imapd_index, ACL_LOOKUP)) ?
 	 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
 }
 
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+	if (init.vanishedlist) seqset_free(init.vanishedlist);
+	init.vanishedlist = NULL;
 	if (doclose) index_close(&imapd_index);
 	return;
 }
 
- if (imapd_index->myrights & ACL_EXPUNGE) {
-	time_t now = time(NULL);
-	struct quota q;
-
-	/* Warn if mailbox is close to or over quota */
-	q.root = imapd_index->mailbox->quotaroot;
-	r = quota_read(&q, NULL, 0);
-	if (!r && q.limit >= 0 && (strcmp(q.root, lastqr) || now > nextalert)) {
- 	 /* Warn if the following possibilities occur:
- 	 * - quotawarnkb not set + quotawarn hit
-	 * - quotawarnkb set larger than mailbox + quotawarn hit
- 	 * - quotawarnkb set + hit + quotawarn hit
- 	 */
- 	 int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
- 	 if (warnsize <= 0 || warnsize >= q.limit ||
- 	 ((uquota_t) (q.limit - warnsize)) * QUOTA_UNITS < q.used) {
-		usage = ((double) q.used * 100.0) /
-			(double) ((uquota_t) q.limit * QUOTA_UNITS);
-		if (usage >= 100.0) {
-		 prot_printf(imapd_out, "* NO ALERT %s\r\n",
-				error_message(IMAP_NO_OVERQUOTA));
-		}
-		else if (usage > config_getint(IMAPOPT_QUOTAWARN)) {
-		 int usageint = (int) usage;
-		 prot_printf(imapd_out, "* NO ALERT ");
-		 prot_printf(imapd_out, error_message(IMAP_NO_CLOSEQUOTA),
-				usageint);
-		 prot_printf(imapd_out, "\r\n");
-		}
-	 }
-	 strlcpy(lastqr, q.root, sizeof(lastqr));
-	 nextalert = now + 600; /* ALERT every 10 min regardless */
-	}
- }
+ if (index_hasrights(imapd_index, ACL_EXPUNGE))
+	warn_about_quota(imapd_index->mailbox->quotaroot);
+
+ index_select(imapd_index, &init);
+
+ if (init.vanishedlist) seqset_free(init.vanishedlist);
+ init.vanishedlist = NULL;
 
 prot_printf(imapd_out, "%s OK READ-%s %s\r\n", tag,
-		(imapd_index->myrights & ACL_READ_WRITE) ?
+		index_hasrights(imapd_index, ACL_READ_WRITE) ?
 		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
 
- proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
 syslog(LOG_DEBUG, "open: user %s opened %s", imapd_userid, name);
 return;
 
@@ -3808,11 +4124,8 @@
 /*
 * Perform a CLOSE/UNSELECT command
 */
-void cmd_close(char *tag, char *cmd)
+static void cmd_close(char *tag, char *cmd)
 {
- /* unregister the selected mailbox */
- proc_register("imapd", imapd_clienthost, imapd_userid, NULL);
-
 if (backend_current) {
 	/* remote mailbox */
 	prot_printf(backend_current->out, "%s %s\r\n", tag, cmd);
@@ -3828,8 +4141,9 @@
 }
 
 /* local mailbox */
- if ((cmd0 == 'C') && (imapd_index->myrights & ACL_EXPUNGE)) {
-	index_expunge(imapd_index, NULL);
+ if ((cmd0 == 'C') && index_hasrights(imapd_index, ACL_EXPUNGE)) {
+	index_expunge(imapd_index, NULL, 1);
+	/* don't tell changes here */
 }
 
 index_close(&imapd_index);
@@ -3841,6 +4155,36 @@
 		tag, error_message(IMAP_OK_COMPLETED));
 }
 
+
+/*
+ * Append to the section list.
+ */
+static void section_list_append(struct section **l,
+				const char *name,
+				const struct octetinfo *oi)
+{
+ struct section **tail = l;
+
+ while (*tail) tail = &(*tail)->next;
+
+ *tail = xzmalloc(sizeof(struct section));
+ (*tail)->name = xstrdup(name);
+ (*tail)->octetinfo = *oi;
+ (*tail)->next = NULL;
+}
+
+static void section_list_free(struct section *l)
+{
+ struct section *n;
+
+ while (l) {
+	n = l->next;
+	free(l->name);
+	free(l);
+	l = n;
+ }
+}
+
 /*
 * Parse the syntax for a partial fetch:
 * "<" number "." nz-number ">"
@@ -3876,37 +4220,16 @@
 	p++;								\
 }
 
-/*
- * Parse and perform a FETCH/UID FETCH command
- * The command has been parsed up to and including
- * the sequence
- */
-void cmd_fetch(char *tag, char *sequence, int usinguid)
+static int parse_fetch_args(const char *tag, const char *cmd,
+			 int allow_vanished,
+			 struct fetchargs *fa)
 {
- const char *cmd = usinguid ? "UID Fetch" : "Fetch";
 static struct buf fetchatt, fieldname;
 int c;
 int inlist = 0;
- int fetchitems = 0;
- struct fetchargs fetchargs;
- struct octetinfo oi;
- struct strlist *newfields = 0;
 char *p, *section;
- int fetchedsomething, r;
- clock_t start = clock();
- char mytime100;
-
- if (backend_current) {
-	/* remote mailbox */
-	prot_printf(backend_current->out, "%s %s %s ", tag, cmd, sequence);
-	if (!pipe_command(backend_current, 65536)) {
-	 pipe_including_tag(backend_current, tag, 0);
-	}
-	return;
- }
-
- /* local mailbox */
- memset(&fetchargs, 0, sizeof(struct fetchargs));
+ struct octetinfo oi;
+ strarray_t *newfields = strarray_new();
 
 c = getword(imapd_in, &fetchatt);
 if (c == '(' && !fetchatt.s0) {
@@ -3918,7 +4241,30 @@
 	switch (fetchatt.s0) {
 	case 'A':
 	 if (!inlist && !strcmp(fetchatt.s, "ALL")) {
-		fetchitems |= FETCH_ALL;
+		fa->fetchitems |= FETCH_ALL;
+	 }
+	 else if (!strcmp(fetchatt.s, "ANNOTATION")) {
+		fa->fetchitems |= FETCH_ANNOTATION;
+		if (c != ' ')
+		 goto badannotation;
+		c = prot_getc(imapd_in);
+		if (c != '(')
+		 goto badannotation;
+		c = parse_annotate_fetch_data(tag,
+					 /*permessage_flag*/1,
+					 &fa->entries,
+					 &fa->attribs);
+		if (c == EOF) {
+		 eatline(imapd_in, c);
+		 goto freeargs;
+		}
+		if (c != ')') {
+badannotation:
+		 prot_printf(imapd_out, "%s BAD invalid Annotation\r\n", tag);
+		 eatline(imapd_in, c);
+		 goto freeargs;
+		}
+		c = prot_getc(imapd_in);
 	 }
 	 else goto badatt;
 	 break;
@@ -3938,7 +4284,7 @@
 		 binsize = 1;
 		}
 		else {
-		 fetchitems |= FETCH_SETSEEN;
+		 fa->fetchitems |= FETCH_SETSEEN;
 		}
 		while (Uisdigit(*p) || *p == '.') {
 		 if (*p == '.' && !Uisdigit(p-1)) break;
@@ -3962,15 +4308,15 @@
 		 goto freeargs;
 		}
 		if (binsize)
-		 appendstrlist_withdata(&fetchargs.sizesections, section, &oi, sizeof(oi));
+		 section_list_append(&fa->sizesections, section, &oi);
 		else
-		 appendstrlist_withdata(&fetchargs.binsections, section, &oi, sizeof(oi));
+		 section_list_append(&fa->binsections, section, &oi);
 	 }
 	 else if (!strcmp(fetchatt.s, "BODY")) {
-		fetchitems |= FETCH_BODY;
+		fa->fetchitems |= FETCH_BODY;
 	 }
 	 else if (!strcmp(fetchatt.s, "BODYSTRUCTURE")) {
-		fetchitems |= FETCH_BODYSTRUCTURE;
+		fa->fetchitems |= FETCH_BODYSTRUCTURE;
 	 }
 	 else if (!strncmp(fetchatt.s, "BODY", 5) ||
 		 !strncmp(fetchatt.s, "BODY.PEEK", 10)) {
@@ -3979,7 +4325,7 @@
 		 p = section += 5;
 		}
 		else {
-		 fetchitems |= FETCH_SETSEEN;
+		 fa->fetchitems |= FETCH_SETSEEN;
 		}
 		while (Uisdigit(*p) || *p == '.') {
 		 if (*p == '.' && !Uisdigit(p-1)) break;
@@ -3997,7 +4343,7 @@
 		 * the headers out of the cache.
 		 */
 		 if (p != section || p13 != '\0') {
-			fetchargs.cache_atleast = BIT32_MAX;
+			fa->cache_atleast = BIT32_MAX;
 		 }
 
 		 if (c != ' ') {
@@ -4025,12 +4371,12 @@
 			 eatline(imapd_in, c);
 			 goto freeargs;
 			}
-			appendstrlist(&newfields, fieldname.s);
-			if (fetchargs.cache_atleast < BIT32_MAX) {
+			strarray_append(newfields, fieldname.s);
+			if (fa->cache_atleast < BIT32_MAX) {
 			 bit32 this_ver =
 				mailbox_cached_header(fieldname.s);
-			 if(this_ver > fetchargs.cache_atleast)
-				fetchargs.cache_atleast = this_ver;
+			 if(this_ver > fa->cache_atleast)
+				fa->cache_atleast = this_ver;
 			}
 		 } while (c == ' ');
 		 if (c != ')') {
@@ -4057,10 +4403,11 @@
 			eatline(imapd_in, c);
 			goto freeargs;
 		 }
-		 appendfieldlist(&fetchargs.fsections,
+		 appendfieldlist(&fa->fsections,
 				 section, newfields, fieldname.s,
 				 &oi, sizeof(oi));
-		 newfields = 0;
+		 /* old 'newfields' is managed by the fieldlist now */
+		 newfields = strarray_new();
 		 break;
 		}
 
@@ -4094,63 +4441,87 @@
 		 eatline(imapd_in, c);
 		 goto freeargs;
 		}
-		appendstrlist_withdata(&fetchargs.bodysections, section,
-				 &oi, sizeof(oi));
+		section_list_append(&fa->bodysections, section, &oi);
+	 }
+	 else goto badatt;
+	 break;
+
+	case 'C':
+	 if (!strcmp(fetchatt.s, "CID") &&
+	 config_getswitch(IMAPOPT_CONVERSATIONS)) {
+		fa->fetchitems |= FETCH_CID;
+	 }
+	 else goto badatt;
+	 break;
+
+	case 'D':
+	 if (!strcmp(fetchatt.s, "DIGEST.SHA1")) {
+		fa->fetchitems |= FETCH_GUID;
 	 }
 	 else goto badatt;
 	 break;
 
 	case 'E':
 	 if (!strcmp(fetchatt.s, "ENVELOPE")) {
-		fetchitems |= FETCH_ENVELOPE;
+		fa->fetchitems |= FETCH_ENVELOPE;
 	 }
 	 else goto badatt;
 	 break;
 
 	case 'F':
 	 if (!inlist && !strcmp(fetchatt.s, "FAST")) {
-		fetchitems |= FETCH_FAST;
+		fa->fetchitems |= FETCH_FAST;
 	 }
 	 else if (!inlist && !strcmp(fetchatt.s, "FULL")) {
-		fetchitems |= FETCH_FULL;
+		fa->fetchitems |= FETCH_FULL;
 	 }
 	 else if (!strcmp(fetchatt.s, "FLAGS")) {
-		fetchitems |= FETCH_FLAGS;
+		fa->fetchitems |= FETCH_FLAGS;
+	 }
+	 else if (!strcmp(fetchatt.s, "FOLDER")) {
+		fa->fetchitems |= FETCH_FOLDER;
 	 }
 	 else goto badatt;
 	 break;
 
 	case 'I':
 	 if (!strcmp(fetchatt.s, "INTERNALDATE")) {
-		fetchitems |= FETCH_INTERNALDATE;
+		fa->fetchitems |= FETCH_INTERNALDATE;
 	 }
 	 else goto badatt;
 	 break;
 
 	case 'M':
 	 if (!strcmp(fetchatt.s, "MODSEQ")) {
-		fetchitems |= FETCH_MODSEQ;
+		fa->fetchitems |= FETCH_MODSEQ;
 	 }
 	 else goto badatt;
 	 break;
+
 	case 'R':
 	 if (!strcmp(fetchatt.s, "RFC822")) {
-		fetchitems |= FETCH_RFC822|FETCH_SETSEEN;
+		fa->fetchitems |= FETCH_RFC822|FETCH_SETSEEN;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.HEADER")) {
-		fetchitems |= FETCH_HEADER;
+		fa->fetchitems |= FETCH_HEADER;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.PEEK")) {
-		fetchitems |= FETCH_RFC822;
+		fa->fetchitems |= FETCH_RFC822;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.SIZE")) {
-		fetchitems |= FETCH_SIZE;
+		fa->fetchitems |= FETCH_SIZE;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.TEXT")) {
-		fetchitems |= FETCH_TEXT|FETCH_SETSEEN;
+		fa->fetchitems |= FETCH_TEXT|FETCH_SETSEEN;
+	 }
+	 else if (!strcmp(fetchatt.s, "RFC822.SHA1")) {
+		fa->fetchitems |= FETCH_SHA1;
+	 }
+	 else if (!strcmp(fetchatt.s, "RFC822.FILESIZE")) {
+		fa->fetchitems |= FETCH_FILESIZE;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.TEXT.PEEK")) {
-		fetchitems |= FETCH_TEXT;
+		fa->fetchitems |= FETCH_TEXT;
 	 }
 	 else if (!strcmp(fetchatt.s, "RFC822.HEADER.LINES") ||
 		 !strcmp(fetchatt.s, "RFC822.HEADER.LINES.NOT")) {
@@ -4181,17 +4552,17 @@
 		 lcase(fieldname.s);;
 		 /* 19 is magic number -- length of 
 		 * "RFC822.HEADERS.NOT" */
-		 appendstrlist(strlen(fetchatt.s) == 19 ?
-				 &fetchargs.headers : &fetchargs.headers_not,
+		 strarray_append(strlen(fetchatt.s) == 19 ?
+				 &fa->headers : &fa->headers_not,
 				 fieldname.s);
 		 if (strlen(fetchatt.s) != 19) {
-			fetchargs.cache_atleast = BIT32_MAX;
+			fa->cache_atleast = BIT32_MAX;
 		 }
-		 if (fetchargs.cache_atleast < BIT32_MAX) {
+		 if (fa->cache_atleast < BIT32_MAX) {
 			bit32 this_ver =
 			 mailbox_cached_header(fieldname.s);
-			if(this_ver > fetchargs.cache_atleast)
-			 fetchargs.cache_atleast = this_ver;
+			if(this_ver > fa->cache_atleast)
+			 fa->cache_atleast = this_ver;
 		 }
 		} while (c == ' ');
 		if (c != ')') {
@@ -4207,7 +4578,10 @@
 
 	case 'U':
 	 if (!strcmp(fetchatt.s, "UID")) {
-		fetchitems |= FETCH_UID;
+		fa->fetchitems |= FETCH_UID;
+	 }
+	 else if (!strcmp(fetchatt.s, "UIDVALIDITY")) {
+		fa->fetchitems |= FETCH_UIDVALIDITY;
 	 }
 	 else goto badatt;
 	 break;
@@ -4255,20 +4629,19 @@
 		 eatline(imapd_in, c);
 		 goto freeargs;
 		}
-		c = getastring(imapd_in, imapd_out, &fieldname);
-		fetchargs.changedsince = strtoul(fieldname.s, &p, 10);
-		if (*p || fetchargs.changedsince == ULONG_MAX) {
+		c = getmodseq(imapd_in, &fa->changedsince);
+		if (c == EOF) {
 		 prot_printf(imapd_out,
 				"%s BAD Invalid argument to %s %s\r\n",
 				tag, cmd, fetchatt.s);
 		 eatline(imapd_in, c);
 		 goto freeargs;
 		}
-		fetchitems |= FETCH_MODSEQ;
+		fa->fetchitems |= FETCH_MODSEQ;
 	 }
-	 else if (usinguid && (imapd_client_capa & CAPA_QRESYNC) &&
+	 else if (allow_vanished &&
 		 !strcmp(fetchatt.s, "VANISHED")) {
-		fetchargs.vanished = 1;
+		fa->vanished = 1;
 	 }
 	 else {
 		prot_printf(imapd_out, "%s BAD Invalid %s modifier %s\r\n",
@@ -4293,30 +4666,92 @@
 	goto freeargs;
 }
 
- if (!fetchitems && !fetchargs.bodysections && !fetchargs.fsections &&
-	!fetchargs.binsections && !fetchargs.sizesections &&
-	!fetchargs.headers && !fetchargs.headers_not) {
+ if (!fa->fetchitems && !fa->bodysections && !fa->fsections &&
+	!fa->binsections && !fa->sizesections &&
+	!fa->headers.count && !fa->headers_not.count) {
 	prot_printf(imapd_out, "%s BAD Missing required argument to %s\r\n", tag, cmd);
 	goto freeargs;
 }
 
- if (fetchargs.vanished && !fetchargs.changedsince) {
+ if (fa->vanished && !fa->changedsince) {
 	prot_printf(imapd_out, "%s BAD Missing required argument to %s\r\n", tag, cmd);
 	goto freeargs;
 }
 
- if (fetchitems & FETCH_MODSEQ) {
+ if (fa->fetchitems & FETCH_MODSEQ) {
 	if (!(imapd_client_capa & CAPA_CONDSTORE)) {
 	 imapd_client_capa |= CAPA_CONDSTORE;
-	 prot_printf(imapd_out, "* OK HIGHESTMODSEQ " MODSEQ_FMT " \r\n",
+	 if (imapd_index)
+		prot_printf(imapd_out, "* OK HIGHESTMODSEQ " MODSEQ_FMT " \r\n",
 			index_highestmodseq(imapd_index));
 	}
 }
 
+ if (fa->fetchitems & (FETCH_ANNOTATION|FETCH_FOLDER)) {
+	fa->namespace = &imapd_namespace;
+	fa->userid = imapd_userid;
+ }
+ if (fa->fetchitems & FETCH_ANNOTATION) {
+	fa->isadmin = imapd_userisadmin || imapd_userisproxyadmin;
+	fa->authstate = imapd_authstate;
+ }
+
+ strarray_free(newfields);
+ return 0;
+
+freeargs:
+ strarray_free(newfields);
+ return IMAP_PROTOCOL_BAD_PARAMETERS;
+}
+
+static void fetchargs_fini (struct fetchargs *fa)
+{
+ section_list_free(fa->binsections);
+ section_list_free(fa->sizesections);
+ section_list_free(fa->bodysections);
+ freefieldlist(fa->fsections);
+ strarray_fini(&fa->headers);
+ strarray_fini(&fa->headers_not);
+ strarray_fini(&fa->entries);
+ strarray_fini(&fa->attribs);
+
+ memset(fa, 0, sizeof(struct fetchargs));
+}
+
+/*
+ * Parse and perform a FETCH/UID FETCH command
+ * The command has been parsed up to and including
+ * the sequence
+ */
+static void cmd_fetch(char *tag, char *sequence, int usinguid)
+{
+ const char *cmd = usinguid ? "UID Fetch" : "Fetch";
+ struct fetchargs fetchargs;
+ int fetchedsomething, r;
+ clock_t start = clock();
+ char mytime100;
+
+ if (backend_current) {
+	/* remote mailbox */
+	prot_printf(backend_current->out, "%s %s %s ", tag, cmd, sequence);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+
+ /* local mailbox */
+ memset(&fetchargs, 0, sizeof(struct fetchargs));
+
+ r = parse_fetch_args(tag, cmd,
+			 (usinguid && (imapd_client_capa & CAPA_QRESYNC)),
+			 &fetchargs);
+ if (r)
+	goto freeargs;
+
 if (usinguid)
-	fetchitems |= FETCH_UID;
+	fetchargs.fetchitems |= FETCH_UID;
 
- fetchargs.fetchitems = fetchitems;
 r = index_fetch(imapd_index, sequence, usinguid, &fetchargs,
 		&fetchedsomething);
 
@@ -4336,11 +4771,397 @@
 }
 
 freeargs:
- freestrlist(newfields);
- freestrlist(fetchargs.bodysections);
- freefieldlist(fetchargs.fsections);
- freestrlist(fetchargs.headers);
- freestrlist(fetchargs.headers_not);
+ fetchargs_fini(&fetchargs);
+}
+
+static void do_one_xconvmeta(struct conversations_state *state,
+			 conversation_id_t cid,
+			 conversation_t *conv,
+			 struct dlist *itemlist)
+{
+ struct dlist *item = dlist_newpklist(NULL, "");
+ struct dlist *fl;
+
+ assert(conv);
+ assert(itemlist);
+
+ for (fl = itemlist->head; fl; fl = fl->next) {
+	const char *key = dlist_cstring(fl);
+
+	/* xxx - parse to a fetchitems? */
+	if (!strcasecmp(key, "MODSEQ"))
+	 dlist_setnum64(item, "MODSEQ", conv->modseq);
+	else if (!strcasecmp(key, "EXISTS"))
+	 dlist_setnum32(item, "EXISTS", conv->exists);
+	else if (!strcasecmp(key, "UNSEEN"))
+	 dlist_setnum32(item, "UNSEEN", conv->unseen);
+	else if (!strcasecmp(key, "SIZE"))
+	 dlist_setnum32(item, "SIZE", conv->size);
+	else if (!strcasecmp(key, "COUNT")) {
+	 struct dlist *flist = dlist_newlist(item, "COUNT");
+	 fl = fl->next;
+	 if (dlist_isatomlist(fl)) {
+		struct dlist *tmp;
+		for (tmp = fl->head; tmp; tmp = tmp->next) {
+		 const char *lookup = dlist_cstring(tmp);
+		 int i = strarray_find_case(state->counted_flags, lookup, 0);
+		 if (i >= 0) {
+			dlist_setflag(flist, "FLAG", lookup);
+			dlist_setnum32(flist, "COUNT", conv->countsi);
+		 }
+		}
+	 }
+	}
+	else if (!strcasecmp(key, "SENDERS")) {
+	 conv_sender_t *sender;
+	 struct dlist *slist = dlist_newlist(item, "SENDERS");
+	 for (sender = conv->senders; sender; sender = sender->next) {
+		struct dlist *sli = dlist_newlist(slist, "");
+		dlist_setatom(sli, "NAME", sender->name);
+		dlist_setatom(sli, "ROUTE", sender->route);
+		dlist_setatom(sli, "MAILBOX", sender->mailbox);
+		dlist_setatom(sli, "DOMAIN", sender->domain);
+	 }
+	}
+	/* XXX - maybe rename FOLDERCOUNTS or something? */
+	else if (!strcasecmp(key, "FOLDEREXISTS")) {
+	 struct dlist *flist = dlist_newlist(item, "FOLDEREXISTS");
+	 conv_folder_t *folder;
+	 fl = fl->next;
+	 if (dlist_isatomlist(fl)) {
+		struct dlist *tmp;
+		for (tmp = fl->head; tmp; tmp = tmp->next) {
+		 const char *fname = dlist_cstring(tmp);
+		 char intnameMAX_MAILBOX_NAME;
+		 /* ugly city */
+		 if ((*imapd_namespace.mboxname_tointernal)(&imapd_namespace, fname,
+							 imapd_userid, intname))
+			continue;
+		 folder = conversation_find_folder(state, conv, intname);
+		 dlist_setatom(flist, "MBOXNAME", fname);
+		 /* ok if it's not there */
+		 dlist_setnum32(flist, "EXISTS", folder ? folder->exists : 0);
+		}
+	 }
+	}
+	else if (!strcasecmp(key, "FOLDERUNSEEN")) {
+	 struct dlist *flist = dlist_newlist(item, "FOLDERUNSEEN");
+	 conv_folder_t *folder;
+	 fl = fl->next;
+	 if (dlist_isatomlist(fl)) {
+		struct dlist *tmp;
+		for (tmp = fl->head; tmp; tmp = tmp->next) {
+		 const char *fname = dlist_cstring(tmp);
+		 char intnameMAX_MAILBOX_NAME;
+		 /* ugly city */
+		 if ((*imapd_namespace.mboxname_tointernal)(&imapd_namespace, fname,
+							 imapd_userid, intname))
+			continue;
+		 folder = conversation_find_folder(state, conv, intname);
+		 dlist_setatom(flist, "MBOXNAME", fname);
+		 /* ok if it's not there */
+		 dlist_setnum32(flist, "UNSEEN", folder ? folder->unseen : 0);
+		}
+	 }
+	}
+	else {
+	 dlist_setatom(item, key, NULL); /* add a NIL response */
+	}
+ }
+
+ prot_printf(imapd_out, "* XCONVMETA %s ", conversation_id_encode(cid));
+ dlist_print(item, 0, imapd_out);
+ prot_printf(imapd_out, "\r\n");
+
+ dlist_free(&item);
+}
+
+static void do_xconvmeta(const char *tag,
+			 struct conversations_state *state,
+			 struct dlist *cidlist,
+			 struct dlist *itemlist)
+{
+ conversation_id_t cid;
+ struct dlist *dl;
+ int r;
+
+ for (dl = cidlist->head; dl; dl = dl->next) {
+	const char *cidstr = dlist_cstring(dl);
+	conversation_t *conv = NULL;
+
+	if (!conversation_id_decode(&cid, cidstr) || !cid) {
+	 prot_printf(imapd_out, "%s BAD Invalid CID %s\r\n", tag, cidstr);
+	 return;
+	}
+
+	r = conversation_load(state, cid, &conv);
+	if (r) {
+	 prot_printf(imapd_out, "%s BAD Failed to read %s\r\n", tag, cidstr);
+	 conversation_free(conv);
+	 return;
+	}
+
+	if (conv && conv->exists)
+	 do_one_xconvmeta(state, cid, conv, itemlist);
+
+	conversation_free(conv);
+ }
+
+ prot_printf(imapd_out, "%s OK Completed\r\n", tag);
+}
+
+/*
+ * Parse and perform a XCONVMETA command.
+ */
+void cmd_xconvmeta(const char *tag)
+{
+ int r;
+ char c = ' ';
+ struct conversations_state *state = NULL;
+ struct dlist *cidlist = NULL;
+ struct dlist *itemlist = NULL;
+
+ if (backend_current) {
+	/* remote mailbox */
+	prot_printf(backend_current->out, "%s XCONVMETA ", tag);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+	eatline(imapd_in, c);
+	goto done;
+ }
+
+ c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+ if (c != ' ') {
+	prot_printf(imapd_out, "%s BAD Failed to parse CID list\r\n", tag);
+	eatline(imapd_in, c);
+	goto done;
+ }
+
+ c = dlist_parse_asatomlist(&itemlist, 0, imapd_in);
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out, "%s BAD Failed to parse item list\r\n", tag);
+	eatline(imapd_in, c);
+	goto done;
+ }
+
+ r = conversations_open_user(imapd_userid, &state);
+ if (r) {
+	prot_printf(imapd_out, "%s BAD failed to open db: %s\r\n",
+		 tag, error_message(r));
+	goto done;
+ }
+
+ do_xconvmeta(tag, state, cidlist, itemlist);
+
+ done:
+
+ dlist_free(&itemlist);
+ dlist_free(&cidlist);
+ conversations_commit(&state);
+}
+
+/*
+ * Parse and perform a XCONVFETCH command.
+ */
+void cmd_xconvfetch(const char *tag)
+{
+ int c = ' ';
+ struct fetchargs fetchargs;
+ int r;
+ clock_t start = clock();
+ modseq_t ifchangedsince = 0;
+ char mytime100;
+ struct dlist *cidlist = NULL;
+ struct dlist *item;
+
+ if (backend_current) {
+	/* remote mailbox */
+	prot_printf(backend_current->out, "%s XCONVFETCH ", tag);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+	eatline(imapd_in, c);
+	return;
+ }
+
+ /* local mailbox */
+ memset(&fetchargs, 0, sizeof(struct fetchargs));
+
+ c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+ if (c != ' ')
+	goto syntax_error;
+
+ /* check CIDs */
+ for (item = cidlist->head; item; item = item->next) {
+	if (!dlist_ishex64(item)) {
+	 prot_printf(imapd_out, "%s BAD Invalid CID\r\n", tag);
+	 eatline(imapd_in, c);
+	 goto freeargs;
+	}
+ }
+
+ c = getmodseq(imapd_in, &ifchangedsince);
+ if (c != ' ')
+	goto syntax_error;
+
+ r = parse_fetch_args(tag, "Xconvfetch", 0, &fetchargs);
+ if (r)
+	goto freeargs;
+ fetchargs.fetchitems |= (FETCH_UIDVALIDITY|FETCH_FOLDER);
+ fetchargs.namespace = &imapd_namespace;
+ fetchargs.userid = imapd_userid;
+
+ r = do_xconvfetch(cidlist, ifchangedsince, &fetchargs);
+
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
+
+ if (r) {
+	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+		 error_message(r), mytime);
+ } else {
+	prot_printf(imapd_out, "%s OK Completed (%s sec)\r\n",
+		 tag, mytime);
+ }
+
+freeargs:
+ dlist_free(&cidlist);
+ fetchargs_fini(&fetchargs);
+ return;
+
+syntax_error:
+ prot_printf(imapd_out, "%s BAD Syntax error\r\n", tag);
+ eatline(imapd_in, c);
+ dlist_free(&cidlist);
+ fetchargs_fini(&fetchargs);
+}
+
+static int xconvfetch_lookup(struct conversations_state *statep,
+			 conversation_id_t cid,
+			 modseq_t ifchangedsince,
+			 hash_table *wanted_cids,
+			 strarray_t *folder_list)
+{
+ const char *key = conversation_id_encode(cid);
+ conversation_t *conv = NULL;
+ conv_folder_t *folder;
+ int r;
+
+ r = conversation_load(statep, cid, &conv);
+ if (r) return r;
+
+ if (!conv)
+	goto out;
+
+ if (!conv->exists)
+	goto out;
+
+ /* output the metadata for this conversation */
+ {
+	struct dlist *dl = dlist_newlist(NULL, "");
+	dlist_setatom(dl, "", "MODSEQ");
+	do_one_xconvmeta(statep, cid, conv, dl);
+	dlist_free(&dl);
+ }
+
+ if (ifchangedsince >= conv->modseq)
+	goto out;
+
+ hash_insert(key, (void *)1, wanted_cids);
+
+ for (folder = conv->folders; folder; folder = folder->next) {
+	/* no contents */
+	if (!folder->exists)
+	 continue;
+
+	/* finally, something worth looking at */
+	strarray_add(folder_list, strarray_nth(statep->folder_names, folder->number));
+ }
+
+out:
+ conversation_free(conv);
+ return 0;
+}
+
+static int do_xconvfetch(struct dlist *cidlist,
+			 modseq_t ifchangedsince,
+			 struct fetchargs *fetchargs)
+{
+ struct conversations_state *state = NULL;
+ int r = 0;
+ struct index_state *index_state = NULL;
+ struct dlist *dl;
+ hash_table wanted_cids = HASH_TABLE_INITIALIZER;
+ strarray_t folder_list = STRARRAY_INITIALIZER;
+ struct index_init init;
+ int i;
+
+ r = conversations_open_user(imapd_userid, &state);
+ if (r) goto out;
+
+ construct_hash_table(&wanted_cids, 1024, 0);
+
+ for (dl = cidlist->head; dl; dl = dl->next) {
+	r = xconvfetch_lookup(state, dlist_num(dl), ifchangedsince,
+			 &wanted_cids, &folder_list);
+	if (r) goto out;
+ }
+
+ /* unchanged, woot */
+ if (!folder_list.count)
+	goto out;
+
+ fetchargs->cidhash = &wanted_cids;
+
+ memset(&init, 0, sizeof(struct index_init));
+ init.userid = imapd_userid;
+ init.authstate = imapd_authstate;
+ init.out = imapd_out;
+
+ for (i = 0; i < folder_list.count; i++) {
+	const char *mboxname = folder_list.datai;
+
+	r = index_open(mboxname, &init, &index_state);
+	if (r == IMAP_MAILBOX_NONEXISTENT)
+	 continue;
+	if (r)
+	 goto out;
+
+	index_checkflags(index_state, 0, 0);
+
+	/* make sure \Deleted messages are expunged. Will also lock the
+	 * mailbox state and read any new information */
+	r = index_expunge(index_state, NULL, 1);
+
+	if (!r)
+	 index_fetchresponses(index_state, NULL, /*usinguid*/1,
+				 fetchargs, NULL);
+
+	index_close(&index_state);
+
+	if (r) goto out;
+ }
+
+ r = 0;
+
+out:
+ index_close(&index_state);
+ conversations_commit(&state);
+ free_hash_table(&wanted_cids, NULL);
+ strarray_fini(&folder_list);
+ return r;
 }
 
 #undef PARSE_PARTIAL /* cleanup */
@@ -4350,15 +5171,14 @@
 * The command has been parsed up to and including
 * the sequence
 */
-void cmd_store(char *tag, char *sequence, int usinguid)
+static void cmd_store(char *tag, char *sequence, int usinguid)
 {
 const char *cmd = usinguid ? "UID Store" : "Store";
 struct storeargs storeargs;
 static struct buf operation, flagname;
 int len, c;
- char **flag = 0;
- int nflags = 0, flagalloc = 0;
 int flagsparsed = 0, inlist = 0;
+ char *modified = NULL;
 int r;
 
 if (backend_current) {
@@ -4373,13 +5193,14 @@
 
 /* local mailbox */
 memset(&storeargs, 0, sizeof storeargs);
- storeargs.unchangedsince = ULONG_MAX;
+ storeargs.unchangedsince = ~0ULL;
+ storeargs.usinguid = usinguid;
+ strarray_init(&storeargs.flags);
 
 c = prot_getc(imapd_in);
 if (c == '(') {
 	/* Grab/parse the modifier(s) */
-	static struct buf storemod, modvalue;
-	char *p;
+	static struct buf storemod;
 
 	do {
 	 c = getword(imapd_in, &storemod);
@@ -4392,12 +5213,11 @@
 		 eatline(imapd_in, c);
 		 return;
 		}
-		c = getastring(imapd_in, imapd_out, &modvalue);
-		storeargs.unchangedsince = strtoul(modvalue.s, &p, 10);
-		if (*p || storeargs.unchangedsince == ULONG_MAX) {
+		c = getmodseq(imapd_in, &storeargs.unchangedsince);
+		if (c == EOF) {
 		 prot_printf(imapd_out,
-				"%s BAD Invalid argument to %s %s\r\n",
-				tag, cmd, storemod.s);
+				"%s BAD Invalid argument to %s UNCHANGEDSINCE\r\n",
+				tag, cmd);
 		 eatline(imapd_in, c);
 		 return;
 		}
@@ -4444,13 +5264,30 @@
 }
 
 if (!strcmp(operation.s, "+flags")) {
-	storeargs.operation = STORE_ADD;
+	storeargs.operation = STORE_ADD_FLAGS;
 }
 else if (!strcmp(operation.s, "-flags")) {
-	storeargs.operation = STORE_REMOVE;
+	storeargs.operation = STORE_REMOVE_FLAGS;
 }
 else if (!strcmp(operation.s, "flags")) {
-	storeargs.operation = STORE_REPLACE;
+	storeargs.operation = STORE_REPLACE_FLAGS;
+ }
+ else if (!strcmp(operation.s, "annotation")) {
+	storeargs.operation = STORE_ANNOTATION;
+	/* ANNOTATION has implicit .SILENT behaviour */
+	storeargs.silent = 1;
+
+	c = parse_annotate_store_data(tag, /*permessage_flag*/1,
+				 &storeargs.entryatts);
+	if (c == EOF) {
+	 eatline(imapd_in, c);
+	 goto freeflags;
+	}
+	storeargs.namespace = &imapd_namespace;
+	storeargs.isadmin = imapd_userisadmin;
+	storeargs.userid = imapd_userid;
+	storeargs.authstate = imapd_authstate;
+	goto notflagsdammit;
 }
 else {
 	prot_printf(imapd_out, "%s BAD Invalid %s attribute\r\n", tag, cmd);
@@ -4497,15 +5334,8 @@
 	 eatline(imapd_in, c);
 	 goto freeflags;
 	}
-	else {
-	 if (nflags == flagalloc) {
-		flagalloc += FLAGGROW;
-		flag = (char **)xrealloc((char *)flag,
-					 flagalloc*sizeof(char *));
-	 }
-	 flagnflags = xstrdup(flagname.s);
-	 nflags++;
-	}
+	else
+	 strarray_append(&storeargs.flags, flagname.s);
 
 	flagsparsed++;
 	if (c != ' ') break;
@@ -4525,6 +5355,7 @@
 	eatline(imapd_in, c);
 	goto freeflags;
 }
+notflagsdammit:
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
 	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to %s\r\n", tag, cmd);
@@ -4539,28 +5370,38 @@
 		 index_highestmodseq(imapd_index));
 }
 
- r = index_store(imapd_index, sequence, usinguid, &storeargs,
-		 flag, nflags);
+ r = index_store(imapd_index, sequence, &storeargs);
+
+ /* format the MODIFIED response code */
+ if (storeargs.modified) {
+	char *seqstr = seqset_cstring(storeargs.modified);
+	assert(seqstr);
+	modified = strconcat("MODIFIED ", seqstr, " ", (char *)NULL);
+	free(seqstr);
+ }
+ else {
+	modified = xstrdup("");
+ }
 
 if (r) {
-	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+	prot_printf(imapd_out, "%s NO %s%s\r\n",
+		 tag, modified, error_message(r));
 }
 else {
-	prot_printf(imapd_out, "%s OK %s\r\n", tag,
-		 error_message(IMAP_OK_COMPLETED));
+	prot_printf(imapd_out, "%s OK %s%s\r\n",
+		 tag, modified, error_message(IMAP_OK_COMPLETED));
 }
 
 freeflags:
- while (nflags--) {
-	free(flagnflags);
- }
- if (flag) free((char *)flag);
+ strarray_fini(&storeargs.flags);
+ freeentryatts(storeargs.entryatts);
+ seqset_free(storeargs.modified);
+ free(modified);
 }
 
-void cmd_search(char *tag, int usinguid)
+static void cmd_search(char *tag, int usinguid)
 {
 int c;
- int charset = 0;
 struct searchargs *searchargs;
 clock_t start = clock();
 char mytime100;
@@ -4578,14 +5419,22 @@
 }
 
 /* local mailbox */
- searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
- searchargs->tag = tag;
- c = getsearchprogram(tag, searchargs, &charset, 1);
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_KEYWORD|GETSEARCH_RETURN,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ if (imapd_id.quirks & QUIRK_SEARCHFUZZY)
+	searchargs->fuzzy_depth++;
+ c = get_search_program(imapd_in, imapd_out, searchargs);
 if (c == EOF) {
 	eatline(imapd_in, ' ');
 	freesearchargs(searchargs);
 	return;
 }
+ if (imapd_id.quirks & QUIRK_SEARCHFUZZY) {
+	char *expr = search_expr_serialise(searchargs->root);
+	syslog(LOG_NOTICE, "fuzzy search %s", expr);
+	free(expr);
+ }
 
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
@@ -4595,7 +5444,7 @@
 	return;
 }
 
- if (charset == -1) {
+ if (searchargs->charset == -1) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag,
 	 error_message(IMAP_UNRECOGNIZED_CHARSET));
 }
@@ -4613,20 +5462,18 @@
 /*
 * Perform a SORT/UID SORT command
 */ 
-void cmd_sort(char *tag, int usinguid)
+static void cmd_sort(char *tag, int usinguid)
 {
 int c;
 struct sortcrit *sortcrit = NULL;
- static struct buf arg;
- int charset = 0;
- struct searchargs *searchargs;
+ struct searchargs *searchargs = NULL;
 clock_t start = clock();
 char mytime100;
 int n;
 
 if (backend_current) {
 	/* remote mailbox */
-	char *cmd = usinguid ? "UID Sort" : "Sort";
+	const char *cmd = usinguid ? "UID Sort" : "Sort";
 
 	prot_printf(backend_current->out, "%s %s ", tag, cmd);
 	if (!pipe_command(backend_current, 65536)) {
@@ -4637,79 +5484,400 @@
 
 /* local mailbox */
 c = getsortcriteria(tag, &sortcrit);
- if (c == EOF) {
-	eatline(imapd_in, ' ');
-	freesortcrit(sortcrit);
+ if (c == EOF) goto error;
+
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ if (imapd_id.quirks & QUIRK_SEARCHFUZZY)
+	searchargs->fuzzy_depth++;
+ c = get_search_program(imapd_in, imapd_out, searchargs);
+ if (c == EOF) goto error;
+
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out, 
+		 "%s BAD Unexpected extra arguments to Sort\r\n", tag);
+	goto error;
+ }
+
+ n = index_sort(imapd_index, sortcrit, searchargs, usinguid);
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
+ if (CONFIG_TIMING_VERBOSE) {
+	char *s = sortcrit_as_string(sortcrit);
+	syslog(LOG_DEBUG, "SORT (%s) processing time: %d msg in %s sec",
+	 s, n, mytime);
+	free(s);
+ }
+ prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
+		error_message(IMAP_OK_COMPLETED), n, mytime);
+
+ freesortcrit(sortcrit);
+ freesearchargs(searchargs);
+ return;
+
+error:
+ eatline(imapd_in, (c == EOF ? ' ' : c));
+ freesortcrit(sortcrit);
+ freesearchargs(searchargs);
+}
+
+/*
+ * Perform a XCONVSORT or XCONVUPDATES command
+ */
+void cmd_xconvsort(char *tag, int updates)
+{
+ int c;
+ struct sortcrit *sortcrit = NULL;
+ struct searchargs *searchargs = NULL;
+ struct windowargs *windowargs = NULL;
+ struct index_init init;
+ struct index_state *oldstate = NULL;
+ struct conversations_state *cstate = NULL;
+ clock_t start = clock();
+ char mytime100;
+ int r;
+
+ if (backend_current) {
+	/* remote mailbox */
+	const char *cmd = "Xconvsort";
+
+	prot_printf(backend_current->out, "%s %s ", tag, cmd);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
 	return;
 }
+ assert(imapd_index);
 
- /* get charset */
- if (c != ' ') {
-	prot_printf(imapd_out, "%s BAD Missing charset in Sort\r\n",
-		 tag);
-	eatline(imapd_in, c);
-	freesortcrit(sortcrit);
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+	eatline(imapd_in, ' ');
 	return;
 }
 
- c = getword(imapd_in, &arg);
+ c = getsortcriteria(tag, &sortcrit);
+ if (c == EOF) goto error;
+
 if (c != ' ') {
-	prot_printf(imapd_out, "%s BAD Missing search criteria in Sort\r\n",
+	prot_printf(imapd_out, "%s BAD Missing window args in XConvSort\r\n",
 		 tag);
-	eatline(imapd_in, c);
-	freesortcrit(sortcrit);
-	return;
+	goto error;
 }
- lcase(arg.s);
- charset = charset_lookupname(arg.s);
 
- if (charset == -1) {
+ c = parse_windowargs(tag, &windowargs, updates);
+ if (c != ' ')
+	goto error;
+
+ /* open the conversations state first - we don't care if it fails,
+ * because that probably just means it's already open */
+ conversations_open_mbox(index_mboxname(imapd_index), &cstate);
+
+ if (updates) {
+	/* in XCONVUPDATES, need to force a re-read from scratch into
+	 * a new index, because we ask for deleted messages */
+
+	oldstate = imapd_index;
+	imapd_index = NULL;
+
+	memset(&init, 0, sizeof(struct index_init));
+	init.userid = imapd_userid;
+	init.authstate = imapd_authstate;
+	init.out = imapd_out;
+	init.want_expunged = 1;
+
+	r = index_open(index_mboxname(oldstate), &init, &imapd_index);
+	if (r) {
+	 prot_printf(imapd_out, "%s NO %s\r\n", tag,
+			error_message(r));
+	 goto error;
+	}
+
+	index_checkflags(imapd_index, 0, 0);
+ }
+
+ /* need index loaded to even parse searchargs! */
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ c = get_search_program(imapd_in, imapd_out, searchargs);
+ if (c == EOF) goto error;
+
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out, 
+		 "%s BAD Unexpected extra arguments to Xconvsort\r\n", tag);
+	goto error;
+ }
+
+ if (updates)
+	r = index_convupdates(imapd_index, sortcrit, searchargs, windowargs);
+ else
+	r = index_convsort(imapd_index, sortcrit, searchargs, windowargs);
+
+ if (oldstate) {
+	index_close(&imapd_index);
+	imapd_index = oldstate;
+ }
+
+ if (r < 0) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag,
-	 error_message(IMAP_UNRECOGNIZED_CHARSET));
-	eatline(imapd_in, c);
-	freesortcrit(sortcrit);
-	return;
+		 error_message(r));
+	goto error;
+ }
+
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
+ if (CONFIG_TIMING_VERBOSE) {
+	char *s = sortcrit_as_string(sortcrit);
+	syslog(LOG_DEBUG, "XCONVSORT (%s) processing time %s sec",
+	 s, mytime);
+	free(s);
 }
+ prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+		error_message(IMAP_OK_COMPLETED), mytime);
 
- searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
+out:
+ if (cstate) conversations_commit(&cstate);
+ freesortcrit(sortcrit);
+ freesearchargs(searchargs);
+ free_windowargs(windowargs);
+ return;
 
- c = getsearchprogram(tag, searchargs, &charset, 0);
- if (c == EOF) {
+error:
+ if (cstate) conversations_commit(&cstate);
+ if (oldstate) {
+	if (imapd_index) index_close(&imapd_index);
+	imapd_index = oldstate;
+ }
+ eatline(imapd_in, (c == EOF ? ' ' : c));
+ goto out;
+}
+
+/*
+ * Perform a XCONVMULTISORT command. This is like XCONVSORT but returns
+ * search results from multiple folders. It still requires a selected
+ * mailbox, for two reasons:
+ *
+ * a) it's a useful shorthand for choosing what the current
+ * conversations scope is, and
+ *
+ * b) the code to parse a search program currently relies on a selected
+ * mailbox.
+ *
+ * Unlike ESEARCH it doesn't take folder names for scope, instead the
+ * search scope is implicitly the current conversation scope. This is
+ * implemented more or less by accident because both the Sphinx index
+ * and the conversations database are hardcoded to be per-user.
+ */
+static void cmd_xconvmultisort(char *tag)
+{
+ int c;
+ struct sortcrit *sortcrit = NULL;
+ struct searchargs *searchargs = NULL;
+ struct windowargs *windowargs = NULL;
+ struct conversations_state *cstate = NULL;
+ clock_t start = clock();
+ char mytime100;
+ int r;
+
+ if (backend_current) {
+	/* remote mailbox */
+	const char *cmd = "Xconvmultisort";
+
+	prot_printf(backend_current->out, "%s %s ", tag, cmd);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+ assert(imapd_index);
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
 	eatline(imapd_in, ' ');
-	freesearchargs(searchargs);
-	freesortcrit(sortcrit);
 	return;
 }
 
+ c = getsortcriteria(tag, &sortcrit);
+ if (c == EOF) goto error;
+
+ if (c != ' ') {
+	prot_printf(imapd_out, "%s BAD Missing window args in XConvMultiSort\r\n",
+		 tag);
+	goto error;
+ }
+
+ c = parse_windowargs(tag, &windowargs, /*updates*/0);
+ if (c != ' ')
+	goto error;
+
+ /* open the conversations state first - we don't care if it fails,
+ * because that probably just means it's already open */
+ conversations_open_mbox(index_mboxname(imapd_index), &cstate);
+
+ /* need index loaded to even parse searchargs! */
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ c = get_search_program(imapd_in, imapd_out, searchargs);
+ if (c == EOF) goto error;
+
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
 	prot_printf(imapd_out, 
-		 "%s BAD Unexpected extra arguments to Sort\r\n", tag);
-	eatline(imapd_in, c);
-	freesearchargs(searchargs);
-	freesortcrit(sortcrit);
-	return;
+		 "%s BAD Unexpected extra arguments to XconvMultiSort\r\n", tag);
+	goto error;
+ }
+
+ r = index_convmultisort(imapd_index, sortcrit, searchargs, windowargs);
+
+ if (r < 0) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag,
+		 error_message(r));
+	goto error;
 }
 
- n = index_sort(imapd_index, sortcrit, searchargs, usinguid);
 snprintf(mytime, sizeof(mytime), "%2.3f",
 	 (clock() - start) / (double) CLOCKS_PER_SEC);
- prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
-		error_message(IMAP_OK_COMPLETED), n, mytime);
+ if (CONFIG_TIMING_VERBOSE) {
+	char *s = sortcrit_as_string(sortcrit);
+	syslog(LOG_DEBUG, "XCONVMULTISORT (%s) processing time %s sec",
+	 s, mytime);
+	free(s);
+ }
+ prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+		error_message(IMAP_OK_COMPLETED), mytime);
 
+out:
+ if (cstate) conversations_commit(&cstate);
 freesortcrit(sortcrit);
 freesearchargs(searchargs);
+ free_windowargs(windowargs);
+ return;
+
+error:
+ if (cstate) conversations_commit(&cstate);
+ eatline(imapd_in, (c == EOF ? ' ' : c));
+ goto out;
+}
+
+static void cmd_xsnippets(char *tag)
+{
+ int c;
+ struct searchargs *searchargs = NULL;
+ struct snippetargs *snippetargs = NULL;
+ clock_t start = clock();
+ char mytime100;
+ int r;
+
+ if (backend_current) {
+	/* remote mailbox */
+	const char *cmd = "Xsnippets";
+
+	prot_printf(backend_current->out, "%s %s ", tag, cmd);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+ assert(imapd_index);
+
+ c = get_snippetargs(&snippetargs);
+ if (c == EOF) {
+	prot_printf(imapd_out, "%s BAD Syntax error in snippet arguments\r\n", tag);
+	goto error;
+ }
+ if (c != ' ') {
+	prot_printf(imapd_out,
+		 "%s BAD Unexpected arguments in Xsnippets\r\n", tag);
+	goto error;
+ }
+
+ /* need index loaded to even parse searchargs! */
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ c = get_search_program(imapd_in, imapd_out, searchargs);
+ if (c == EOF) goto error;
+
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out,
+		 "%s BAD Unexpected extra arguments to Xsnippets\r\n", tag);
+	goto error;
+ }
+
+ r = index_snippets(imapd_index, snippetargs, searchargs);
+
+ if (r < 0) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag,
+		 error_message(r));
+	goto error;
+ }
+
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
+ prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+		error_message(IMAP_OK_COMPLETED), mytime);
+
+out:
+ freesearchargs(searchargs);
+ free_snippetargs(&snippetargs);
 return;
+
+error:
+ eatline(imapd_in, (c == EOF ? ' ' : c));
+ goto out;
+}
+
+static void cmd_xstats(char *tag, int c)
+{
+ int metric;
+
+ if (backend_current) {
+	/* remote mailbox */
+	const char *cmd = "Xstats";
+
+	prot_printf(backend_current->out, "%s %s ", tag, cmd);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
+
+ if (c == EOF) {
+	prot_printf(imapd_out, "%s BAD Syntax error in Xstats arguments\r\n", tag);
+	goto error;
+ }
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out,
+		 "%s BAD Unexpected extra arguments to Xstats\r\n", tag);
+	goto error;
+ }
+
+ prot_printf(imapd_out, "* XSTATS");
+ for (metric = 0 ; metric < XSTATS_NUM_METRICS ; metric++)
+	prot_printf(imapd_out, " %s %u", xstats_namesmetric, xstatsmetric);
+ prot_printf(imapd_out, "\r\n");
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		error_message(IMAP_OK_COMPLETED));
+ return;
+
+error:
+ eatline(imapd_in, (c == EOF ? ' ' : c));
 }
 
 /*
 * Perform a THREAD/UID THREAD command
 */ 
-void cmd_thread(char *tag, int usinguid)
+static void cmd_thread(char *tag, int usinguid)
 {
 static struct buf arg;
 int c;
- int charset = 0;
 int alg;
 struct searchargs *searchargs;
 clock_t start = clock();
@@ -4743,27 +5911,10 @@
 	return;
 }
 
- /* get charset */
- c = getastring(imapd_in, imapd_out, &arg);
- if (c != ' ') {
-	prot_printf(imapd_out, "%s BAD Missing charset in Thread\r\n",
-		 tag);
-	eatline(imapd_in, c);
-	return;
- }
- lcase(arg.s);
- charset = charset_lookupname(arg.s);
-
- if (charset == -1) {
-	prot_printf(imapd_out, "%s NO %s\r\n", tag,
-	 error_message(IMAP_UNRECOGNIZED_CHARSET));
-	eatline(imapd_in, c);
-	return;
- }
-
- searchargs = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
-
- c = getsearchprogram(tag, searchargs, &charset, 0);
+ searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+				&imapd_namespace, imapd_userid, imapd_authstate,
+				imapd_userisadmin || imapd_userisproxyadmin);
+ c = get_search_program(imapd_in, imapd_out, searchargs);
 if (c == EOF) {
 	eatline(imapd_in, ' ');
 	freesearchargs(searchargs);
@@ -4792,23 +5943,21 @@
 /*
 * Perform a COPY/UID COPY command
 */ 
-void cmd_copy(char *tag, char *sequence, char *name, int usinguid)
+static void cmd_copy(char *tag, char *sequence, char *name, int usinguid, int ismove)
 {
 int r, myrights;
 char mailboxnameMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server, *acl;
 char *copyuid = NULL;
+ mbentry_t *mbentry = NULL;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(NULL, NULL, mailboxname, &mbtype,
-		 &server, &acl, NULL);
+	r = mlookup(NULL, NULL, mailboxname, &mbentry);
 }
 
- if (!r) myrights = cyrus_acl_myrights(imapd_authstate, acl);
+ if (!r) myrights = cyrus_acl_myrights(imapd_authstate, mbentry->acl);
 
 if (!r && backend_current) {
 	/* remote mailbox -> local or remote mailbox */
@@ -4817,20 +5966,23 @@
 	 (remove when we move to a unified environment) */
 	struct backend *s = NULL;
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
+	mboxlist_entry_free(&mbentry);
 	if (!s) {
 	 r = IMAP_SERVER_UNAVAILABLE;
 	 goto done;
 	}
 
+	assert(!ismove); /* XXX - support proxying moves */
+
 	if (s != backend_current) {
 	 /* this is the hard case; we have to fetch the messages and append
 	 them to the other mailbox */
 
 	 proxy_copy(tag, sequence, name, myrights, usinguid, s);
-	 return;
+	 goto cleanup;
 	}
 	/* xxx end of separate proxy-only code */
 
@@ -4840,9 +5992,9 @@
 		 sequence, strlen(name), name);
 	pipe_including_tag(backend_current, tag, 0);
 
-	return;
+	goto cleanup;
 }
- else if (!r && (mbtype & MBTYPE_REMOTE)) {
+ else if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* local mailbox -> remote mailbox
 	 *
 	 * fetch the messages and APPEND them to the backend
@@ -4852,9 +6004,10 @@
 	struct backend *s = NULL;
 	int res;
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
+	mboxlist_entry_free(&mbentry);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
 	else if (!CAPA(s, CAPA_MULTIAPPEND)) {
 	 /* we need MULTIAPPEND for atomicity */
@@ -4863,6 +6016,8 @@
 
 	if (r) goto done;
 
+	assert(!ismove); /* XXX - support proxying moves */
+
 	/* start the append */
 	prot_printf(s->out, "%s Append {" SIZE_T_FMT "+}\r\n%s",
 		 tag, strlen(name), name);
@@ -4903,23 +6058,30 @@
 	 /* abort the append */
 	 prot_printf(s->out, " {0}\r\n");
 	 pipe_until_tag(s, tag, 0);
-	 
+
 	 /* report failure */
 	 prot_printf(imapd_out, "%s NO inter-server COPY failed\r\n", tag);
 	}
 
-	return;
+	goto cleanup;
 }
 
+ /* need permission to delete from source if it's a move */
+ if (ismove && !(imapd_index->myrights & ACL_EXPUNGE))
+	r = IMAP_PERMISSION_DENIED;
+
 /* local mailbox -> local mailbox */
 if (!r) {
 	r = index_copy(imapd_index, sequence, usinguid, mailboxname,
-		 &copyuid, !config_getswitch(IMAPOPT_SINGLEINSTANCESTORE));
+		 &copyuid, !config_getswitch(IMAPOPT_SINGLEINSTANCESTORE),
+		 &imapd_namespace,
+		 (imapd_userisadmin || imapd_userisproxyadmin), ismove);
 }
 
- imapd_check(NULL, usinguid);
+ imapd_check(NULL, ismove || usinguid);
 
 done:
+
 if (r && !(usinguid && r == IMAP_NO_NOSUCHMSG)) {
 	prot_printf(imapd_out, "%s NO %s%s\r\n", tag,
 		 (r == IMAP_MAILBOX_NONEXISTENT &&
@@ -4938,13 +6100,16 @@
 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		 error_message(IMAP_OK_COMPLETED));
 }
-} 
+
+cleanup:
+ mboxlist_entry_free(&mbentry);
+}
 
 /*
 * Perform an EXPUNGE command
 * sequence == NULL if this isn't a UID EXPUNGE
 */
-void cmd_expunge(char *tag, char *sequence)
+static void cmd_expunge(char *tag, char *sequence)
 {
 modseq_t old;
 modseq_t new;
@@ -4963,15 +6128,14 @@
 }
 
 /* local mailbox */
- if (!(imapd_index->myrights & ACL_EXPUNGE)) {
+ if (!index_hasrights(imapd_index, ACL_EXPUNGE))
 	r = IMAP_PERMISSION_DENIED;
- }
 
 old = index_highestmodseq(imapd_index);
 
- if (!r) r = index_expunge(imapd_index, sequence);
+ if (!r) r = index_expunge(imapd_index, sequence, 1);
 /* tell expunges */
- if (!r) index_tellchanges(imapd_index, 1, sequence ? 1 : 0);
+ if (!r) index_tellchanges(imapd_index, 1, sequence ? 1 : 0, 0);
 
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
@@ -4989,13 +6153,52 @@
 /*
 * Perform a CREATE command
 */
-void cmd_create(char *tag, char *name, char *partition, int localonly)
+static void cmd_create(char *tag, char *name, struct dlist *extargs, int localonly)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
- int autocreatequota;
+ int autocreatequotastorage;
+ int mbtype = 0;
+ const char *partition = NULL;
+ const char *server = NULL;
+ struct buf specialuse = BUF_INITIALIZER;
+ struct dlist *use;
+
+ dlist_getatom(extargs, "PARTITION", &partition);
+ dlist_getatom(extargs, "SERVER", &server);
+
+ const char *type = NULL;
+
+ dlist_getatom(extargs, "PARTITION", &partition);
+ dlist_getatom(extargs, "SERVER", &server);
+ if (dlist_getatom(extargs, "TYPE", &type)) {
+	if (!strcasecmp(type, "CALENDAR")) mbtype |= MBTYPE_CALENDAR;
+	else if (!strcasecmp(type, "ADDRESSBOOK")) mbtype |= MBTYPE_ADDRESSBOOK;
+	else r = IMAP_MAILBOX_BADTYPE;
+ }
+ use = dlist_getchild(extargs, "USE");
+ if (use) {
+	struct dlist *item;
+	char *raw;
+	/* I would much prefer to create the specialuse annotation FIRST
+	 * and do the sanity check on the values, so we can return the
+	 * correct error. Sadly, that's a pain - so we compromise by
+	 * "normalising" first */
+	strarray_t *su = strarray_new();
+	for (item = use->head; item; item = item->next) {
+	 strarray_append(su, dlist_cstring(item));
+	}
+	raw = strarray_join(su, " ");
+	strarray_free(su);
+	r = specialuse_validate(raw, &specialuse);
+	free(raw);
+	if (r) {
+	 prot_printf(imapd_out, "%s NO USEATTR %s\r\n", tag, error_message(r));
+	 goto done;
+	}
+ }
 
- if (partition && !imapd_userisadmin) {
+ if (!r && partition && !imapd_userisadmin) {
 	r = IMAP_PERMISSION_DENIED;
 }
 
@@ -5009,16 +6212,27 @@
 						 imapd_userid, mailboxname);
 }
 
+ /* check for INBOX.INBOX creation by broken Apple clients */
+ if (!r) {
+	char *copy = xstrdup(mailboxname);
+	lcase(copy);
+	if (strstr(copy, "inbox.inbox"))
+	 r = IMAP_MAILBOX_BADNAME;
+	free(copy);
+ }
+
 if (!r && !localonly && config_mupdate_server) {
 	int guessedpart = 0;
 
 	/* determine if we're creating locally or remotely */
-	if (!partition) {
+	if (!partition && !server) {
+	 char *foundpart = NULL;
 	 guessedpart = 1;
 	 r = mboxlist_createmailboxcheck(mailboxname, 0, 0,
 					 imapd_userisadmin || imapd_userisproxyadmin,
 					 imapd_userid, imapd_authstate,
-					 NULL, &partition, 0);
+					 NULL, &foundpart, 0);
+	 partition = foundpart;
 
 	 if (!r && !partition &&
 		(config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_STANDARD) &&
@@ -5027,7 +6241,7 @@
 		guessedpart = 0;
 
 		/* use defaultserver if specified */
-		partition = (char *)config_getstring(IMAPOPT_DEFAULTSERVER);
+		partition = config_getstring(IMAPOPT_DEFAULTSERVER);
 
 		/* otherwise, find server with most available space */
 		if (!partition) partition = find_free_server();
@@ -5038,15 +6252,15 @@
 
 	if (!r && !config_partitiondir(partition)) {
 	 /* invalid partition, assume its a server (remote mailbox) */
-	 char *server;
 	 struct backend *s = NULL;
+	 char *p;
 	 int res;
 
 	 /* check for a remote partition */
 	 server = partition;
-	 partition = strchr(server, '!');
-	 if (partition) *partition++ = '\0';
-	 if (guessedpart) partition = NULL;
+	 p = strchr(server, '!');
+	 if (p) *p++ = '\0';
+	 partition = guessedpart ? NULL : p;
 
 	 s = proxy_findserver(server, &imap_protocol,
 				 proxy_userid, &backend_cached,
@@ -5068,24 +6282,33 @@
 
 	 if (!r) {
 		/* ok, send the create to that server */
-		if (partition) {
-		 /* Send partition as an atom, since its all we accept */
-		 prot_printf(s->out,
-				"%s CREATE {" SIZE_T_FMT "+}\r\n%s %s\r\n", 
-				tag, strlen(name), name, partition);
+		prot_printf(s->out, "%s CREATE ", tag);
+		prot_printastring(s->out, name);
+		/* special use needs extended support, so pass through extargs */
+		if (specialuse.len) {
+		 prot_printf(s->out, "(USE (%s)", buf_cstring(&specialuse));
+		 if (partition) {
+			prot_printf(s->out, " PARTITION ");
+			prot_printastring(s->out, partition);
+		 }
+		 prot_putc(')', s->out);
 		}
-		else
-		 prot_printf(s->out, "%s CREATE {" SIZE_T_FMT "+}\r\n%s\r\n", 
-				tag, strlen(name), name);
+		/* Send partition as an atom, since its supported by older servers */
+		else if (partition) {
+		 prot_putc(' ', s->out);
+		 prot_printastring(s->out, partition);
+		}
+		prot_printf(s->out, "\r\n");
+
 		res = pipe_until_tag(s, tag, 0);
-	
+
 		if (!CAPA(s, CAPA_MUPDATE)) {
 		 /* do MUPDATE create operations */
 		}
 		/* make sure we've seen the update */
 		if (ultraparanoid && res == PROXY_OK) kick_mupdate();
 	 }
- 
+
 	 imapd_check(s, 0);
 
 	 if (r) {
@@ -5096,7 +6319,7 @@
 		prot_printf(imapd_out, "%s %s", tag, s->last_result.s);
 	 }
 
-	 return;
+	 goto done;
 	}
 #if 0
 	else if (!r &&
@@ -5116,23 +6339,44 @@
 
 /* local mailbox */
 if (!r) {
+
 	/* xxx we do forced user creates on LOCALCREATE to facilitate
 	 * mailbox moves */
-	r = mboxlist_createmailbox(mailboxname, 0, partition,
-				 imapd_userisadmin || imapd_userisproxyadmin, 
+	r = mboxlist_createmailbox(mailboxname, mbtype, partition,
+				 imapd_userisadmin || imapd_userisproxyadmin,
 				 imapd_userid, imapd_authstate,
-				 localonly, localonly, 0);
+				 localonly, localonly, 0, 1, NULL);
 
 	if (r == IMAP_PERMISSION_DENIED && !strcasecmp(name, "INBOX") &&
-	 (autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) {
+	 (autocreatequotastorage = config_getint(IMAPOPT_AUTOCREATEQUOTA))) {
 
-	 /* Auto create */
-	 r = mboxlist_createmailbox(mailboxname, 0, partition, 
+	 /* Auto create INBOX is always type zero */
+	 r = mboxlist_createmailbox(mailboxname, /*mbtype*/0, partition,
 				 1, imapd_userid, imapd_authstate,
-				 0, 0, 0);
-	 
-	 if (!r && autocreatequota > 0) {
-		(void) mboxlist_setquota(mailboxname, autocreatequota, 0);
+				 0, 0, 0, 1, NULL);
+
+	 int autocreatequotamessage = config_getint(IMAPOPT_AUTOCREATEQUOTAMSG);
+	 if (!r && ((autocreatequotastorage > 0) || (autocreatequotamessage > 0))) {
+		int res;
+		int newquotasQUOTA_NUMRESOURCES;
+
+		for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+		 newquotasres = QUOTA_UNLIMITED;
+		newquotasQUOTA_STORAGE = autocreatequotastorage;
+		newquotasQUOTA_MESSAGE = autocreatequotamessage;
+
+		(void) mboxlist_setquotas(mailboxname, newquotas, 0);
+	 }
+	}
+
+	if (!r && specialuse.len) {
+	 const char *userid = mboxname_to_userid(mailboxname);
+	 if (!userid) userid = imapd_userid;
+	 r = annotatemore_write(mailboxname, "/specialuse", userid, &specialuse);
+	 if (r) {
+		/* XXX - failure here SHOULD cause a cleanup of the created mailbox */
+		syslog(LOG_ERR, "IOERROR: failed to write specialuse for %s on %s (%s)",
+		 imapd_userid, mailboxname, buf_cstring(&specialuse));
 	 }
 	}
 }
@@ -5149,6 +6393,9 @@
 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		 error_message(IMAP_OK_COMPLETED));
 }
+
+done:
+ buf_free(&specialuse);
 }
 
 /* Callback for use by cmd_delete */
@@ -5162,19 +6409,19 @@
 if (!mboxlist_delayed_delete_isenabled()) {
 r = mboxlist_deletemailbox(name,
 				 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate,
+ imapd_userid, imapd_authstate, NULL,
 0, 0, 0);
 } else if ((imapd_userisadmin || imapd_userisproxyadmin) && 
-	 mboxname_isdeletedmailbox(name)) {
+	 mboxname_isdeletedmailbox(name, NULL)) {
 r = mboxlist_deletemailbox(name,
 				 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate,
+ imapd_userid, imapd_authstate, NULL,
 0, 0, 0);
 } else {
 r = mboxlist_delayed_deletemailbox(name,
 					 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate,
- 0, 0, 0);
+ imapd_userid, imapd_authstate, NULL,
+ 0, 0);
 }
 
 if(r) {
@@ -5188,36 +6435,37 @@
 /*
 * Perform a DELETE command
 */
-void cmd_delete(char *tag, char *name, int localonly, int force)
+static void cmd_delete(char *tag, char *name, int localonly, int force)
 {
 int r;
 char mailboxnameMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server;
+ mbentry_t *mbentry = NULL;
+ struct mboxevent *mboxevent = NULL;
 char *p;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(NULL, NULL, mailboxname, &mbtype,
-		 &server, NULL, NULL);
+	r = mlookup(NULL, NULL, mailboxname, &mbentry);
 }
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
 	struct backend *s = NULL;
 	int res;
 
 	if (supports_referrals) { 
-	 imapd_refer(tag, server, name);
+	 imapd_refer(tag, mbentry->server, name);
 	 referral_kick = 1;
+	 mboxlist_entry_free(&mbentry);
 	 return;
 	}
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
+	mboxlist_entry_free(&mbentry);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
 
 	if (!r) {
@@ -5245,33 +6493,41 @@
 
 	return;
 }
+ mboxlist_entry_free(&mbentry);
+
+ mboxevent = mboxevent_new(EVENT_MAILBOX_DELETE);
 
 /* local mailbox */
 if (!r) {
 if (localonly || !mboxlist_delayed_delete_isenabled()) {
 r = mboxlist_deletemailbox(mailboxname,
 				 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate, 
+ imapd_userid, imapd_authstate, mboxevent,
 1-force, localonly, 0);
 } else if ((imapd_userisadmin || imapd_userisproxyadmin) &&
- mboxname_isdeletedmailbox(mailboxname)) {
+ mboxname_isdeletedmailbox(mailboxname, NULL)) {
 r = mboxlist_deletemailbox(mailboxname,
 				 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate,
+ imapd_userid, imapd_authstate, mboxevent,
 0 /* checkacl */, localonly, 0);
 } else {
 r = mboxlist_delayed_deletemailbox(mailboxname,
 					 imapd_userisadmin || imapd_userisproxyadmin,
- imapd_userid, imapd_authstate,
- 1-force, localonly, 0);
+ imapd_userid, imapd_authstate, mboxevent,
+ 1-force, 0);
 }
 }
 
+ /* send a MailboxDelete event notification */
+ if (!r)
+	mboxevent_notify(mboxevent);
+ mboxevent_free(&mboxevent);
+
 /* was it a top-level user mailbox? */
 /* localonly deletes are only per-mailbox */
 if (!r && !localonly && mboxname_isusermailbox(mailboxname, 1)) {
 	size_t mailboxname_len = strlen(mailboxname);
-	char *user = mboxname_to_userid(mailboxname);
+	const char *userid = mboxname_to_userid(mailboxname);
 
 	/* If we aren't too close to MAX_MAILBOX_BUFFER, append .* */
 	p = mailboxname + mailboxname_len; /* end of mailboxname */
@@ -5285,7 +6541,7 @@
 			 imapd_userid,
 			 imapd_authstate, delmbox, NULL);
 
-	user_deletedata(user, imapd_userid, imapd_authstate, 1);
+	user_deletedata(userid, 1);
 }
 
 imapd_check(NULL, 0);
@@ -5304,6 +6560,7 @@
 
 struct renrock 
 {
+ struct namespace *namespace;
 int ol;
 int nl;
 int rename_user;
@@ -5346,16 +6603,26 @@
 char oldextnameMAX_MAILBOX_BUFFER;
 char newextnameMAX_MAILBOX_BUFFER;
 struct renrock *text = (struct renrock *)rock;
- int r;
+ struct mboxlist_entry *mbentry = NULL;
+ int r = 0;
+
+ r = mboxlist_lookup(name, &mbentry, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* skip these mailboxes */
+	r = 0;
+	goto done;
+ }
+ if (r) goto done;
 
 if((text->nl + strlen(name + text->ol)) >= MAX_MAILBOX_BUFFER)
-	return 0;
+	goto done;
 
 strcpy(text->newmailboxname + text->nl, name + text->ol);
 
+ /* don't notify implied rename in mailbox hierarchy */
 r = mboxlist_renamemailbox(name, text->newmailboxname,
-			 text->partition,
-			 1, imapd_userid, imapd_authstate, 0,
+			 text->partition, 0 /* uidvalidity */,
+			 1, imapd_userid, imapd_authstate, NULL, 0,
 text->rename_user);
 
 (*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
@@ -5368,43 +6635,33 @@
 if(r) {
 	prot_printf(imapd_out, "* NO rename %s %s: %s\r\n",
 		 oldextname, newextname, error_message(r));
-	if (RENAME_STOP_ON_ERROR) return r;
+	if (!RENAME_STOP_ON_ERROR) r = 0;
 } else {
 	/* If we're renaming a user, change quotaroot and ACL */
 	if (text->rename_user) {
 	 user_copyquotaroot(name, text->newmailboxname);
-	 user_renameacl(text->newmailboxname,
+	 user_renameacl(text->namespace, text->newmailboxname,
 			 text->acl_olduser, text->acl_newuser);
 	}
 
-	/* Rename mailbox annotations */
-	annotatemore_rename(name, text->newmailboxname,
-			 text->rename_user ? text->olduser : NULL,
-			 text->newuser);
-	
+
 	prot_printf(imapd_out, "* OK rename %s %s\r\n",
 		 oldextname, newextname);
 
 	sync_log_mailbox_double(name, text->newmailboxname);
-
-	if (text->rename_user) {
-	 /* allow the replica to get the correct new quotaroot 
-	 * and acls copied across */
-	 sync_log_user(text->newuser);
-	 /* allow the replica to clean up the old meta files */
-	 sync_log_user(text->olduser);
-	}
 }
 
+done:
+ mboxlist_entry_free(&mbentry);
 prot_flush(imapd_out);
 
- return 0;
+ return r;
 }
 
 /*
 * Perform a RENAME command
 */
-void cmd_rename(char *tag, char *oldname, char *newname, char *partition)
+static void cmd_rename(char *tag, char *oldname, char *newname, char *partition)
 {
 int r = 0;
 char oldmailboxnameMAX_MAILBOX_BUFFER;
@@ -5419,8 +6676,7 @@
 int rename_user = 0;
 char olduser128, newuser128;
 char acl_olduser128, acl_newuser128;
- int mbtype;
- char *server;
+ mbentry_t *mbentry = NULL;
 
 if (partition && !imapd_userisadmin) {
 	r = IMAP_PERMISSION_DENIED;
@@ -5436,19 +6692,19 @@
 strcpy(oldmailboxname2, oldmailboxname);
 strcpy(newmailboxname2, newmailboxname);
 
- if (!r) r = mlookup(NULL, NULL, oldmailboxname, &mbtype,
-			&server, NULL, NULL);
+ if (!r) r = mlookup(NULL, NULL, oldmailboxname, &mbentry);
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
 	struct backend *s = NULL;
 	int res;
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
 
+
 	/* xxx start of separate proxy-only code
 	 (remove when we move to a unified environment) */
 
@@ -5460,31 +6716,31 @@
 		prot_printf(imapd_out,
 			 "%s NO Cross-server or cross-partition move w/rename not supported\r\n",
 			 tag);
-		return;
+		goto done;
 	 }
 
 	 /* dest partition? */
 
 	 destpart = strchr(partition,'!');
 	 if (destpart) {
-		char newserverMAX_MAILBOX_BUFFER;	 
+		char newserverMAX_MAILBOX_BUFFER;
 		if (strlen(partition) >= sizeof(newserver)) {
 		 prot_printf(imapd_out,
 				"%s NO Partition name too long\r\n", tag);
-		 return;
+		 goto done;
 		}
-		strcpy(newserver,partition);
-		newserverdestpart-partition='\0';
+		strcpy(newserver, partition);
+		newserverdestpart-partition = '\0';
 		destpart++;
 
-		if (!strcmp(server, newserver)) {
+		if (!strcmp(mbentry->server, newserver)) {
 		 /* Same Server, different partition */
 		 /* xxx this would require administrative access to the
 		 * backend, which we won't get */
 		 prot_printf(imapd_out,
 				"%s NO Can't move across partitions via a proxy\r\n",
 				tag);
-		 return;
+		 goto done;
 		} else {
 		 /* Cross Server */
 		 /* <tag> XFER <name> <dest server> <dest partition> */
@@ -5510,7 +6766,7 @@
 	 /* make sure we've seen the update */
 	 if (ultraparanoid && res == PROXY_OK) kick_mupdate();
 
-	 return;
+	 goto done;
 	}
 	/* xxx end of separate proxy-only code */
 
@@ -5544,9 +6800,11 @@
 	 prot_printf(imapd_out, "%s %s", tag, s->last_result.s);
 	}
 
-	return;
+	goto done;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 
 if (!r && partition && !config_partitiondir(partition)) {
@@ -5557,7 +6815,7 @@
 	 prot_printf(imapd_out,
 			"%s NO Cross-server or cross-partition move w/rename not supported\r\n",
 			tag);
-	 return;
+	 goto done;
 	}
 
 	/* dest partition? */
@@ -5567,7 +6825,7 @@
 
 	cmd_xfer(tag, oldname, server, partition);
 
-	return;
+	goto done;
 }
 
 /* local rename: it's OK if the mailbox doesn't exist, we'll check
@@ -5577,7 +6835,7 @@
 
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
-	return;
+	goto done;
 }
 
 /* local destination */
@@ -5632,6 +6890,7 @@
 	strcat(nmbn, ".");
 
 	/* setup the rock */
+	rock.namespace = &imapd_namespace;
 	rock.found = 0;
 	rock.newmailboxname = nmbn;
 	rock.ol = ol;
@@ -5652,14 +6911,30 @@
 
 /* attempt to rename the base mailbox */
 if (!r) {
+	struct mboxevent *mboxevent = NULL;
+
+	/* don't send rename notification if we only change the partition */
+	if (strcmp(oldmailboxname, newmailboxname))
+	 mboxevent = mboxevent_new(EVENT_MAILBOX_RENAME);
+
 	r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
-				 imapd_userisadmin, 
-				 imapd_userid, imapd_authstate, 0, rename_user);
+				 0 /* uidvalidity */, imapd_userisadmin,
+				 imapd_userid, imapd_authstate, mboxevent,
+				 0, rename_user);
 	/* it's OK to not exist if there are subfolders */
 	if (r == IMAP_MAILBOX_NONEXISTENT && subcount && !rename_user &&
 	 mboxname_userownsmailbox(imapd_userid, oldmailboxname) &&
-	 mboxname_userownsmailbox(imapd_userid, newmailboxname))
+	 mboxname_userownsmailbox(imapd_userid, newmailboxname)) {
+
+	 mboxevent_free(&mboxevent);
+
 	 goto submboxes;
+	}
+
+	/* send a MailboxRename event notification if enabled */
+	if (!r)
+	 mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
 }
 
 /* If we're renaming a user, take care of changing quotaroot, ACL,
@@ -5694,19 +6969,12 @@
 				 strcspn(acl_newuser, "@") : 0);
 
 	user_copyquotaroot(oldmailboxname, newmailboxname);
-	user_renameacl(newmailboxname, acl_olduser, acl_newuser);
+	user_renameacl(&imapd_namespace, newmailboxname, acl_olduser, acl_newuser);
 	user_renamedata(olduser, newuser, imapd_userid, imapd_authstate);
 
 	/* XXX report status/progress of meta-data */
 }
 
- if (!r) {
-	/* Rename mailbox annotations */
-	annotatemore_rename(oldmailboxname, newmailboxname,
-			 rename_user ? olduser : NULL,
-			 newuser);
- }
-
 /* rename all mailboxes matching this */
 if (!r && recursive_rename) {
 	struct renrock rock;
@@ -5720,6 +6988,7 @@
 	strcat(newmailboxname, ".");
 
 	/* setup the rock */
+	rock.namespace = &imapd_namespace;
 	rock.newmailboxname = newmailboxname;
 	rock.ol = omlen + 1;
 	rock.nl = nmlen + 1;
@@ -5737,8 +7006,14 @@
 }
 
 /* take care of deleting old ACLs, subscriptions, seen state and quotas */
- if (!r && rename_user)
-	user_deletedata(olduser, imapd_userid, imapd_authstate, 1);
+ if (!r && rename_user) {
+	user_deletedata(olduser, 1);
+	/* allow the replica to get the correct new quotaroot
+	 * and acls copied across */
+	sync_log_user(newuser);
+	/* allow the replica to clean up the old meta files */
+	sync_log_unuser(olduser);
+ }
 
 imapd_check(NULL, 0);
 
@@ -5751,19 +7026,22 @@
 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		 error_message(IMAP_OK_COMPLETED));
 sync_log_mailbox_double(oldmailboxname2, newmailboxname2);
+	if (rename_user) sync_log_user(newuser);
 }
+
+done:
+ mboxlist_entry_free(&mbentry);
 }
 
 /*
 * Perform a RECONSTRUCT command
 */
-void cmd_reconstruct(const char *tag, const char *name, int recursive)
+static void cmd_reconstruct(const char *tag, const char *name, int recursive)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
 char quotarootMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server;
+ mbentry_t *mbentry = NULL;
 struct mailbox *mailbox = NULL;
 
 /* administrators only please */
@@ -5774,31 +7052,33 @@
 	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 						 imapd_userid, mailboxname);
 
- if (!r && imapd_index && !strcmp(mailboxname, imapd_index->mailbox->name))
+ if (!r && !strcmpsafe(mailboxname, index_mboxname(imapd_index)))
 	r = IMAP_MAILBOX_LOCKED;
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &server, NULL, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
-	imapd_refer(tag, server, name);
+	imapd_refer(tag, mbentry->server, name);
+	mboxlist_entry_free(&mbentry);
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 if (!r) {
 	int pid;
-	 
+
 	/* Reconstruct it */
 
 	pid = fork();
-	if(pid == -1) {
+	if (pid == -1) {
 	 r = IMAP_SYS_ERROR;
-	} else if(pid == 0) {
+	} else if (pid == 0) {
 	 char buf4096;
 	 int ret;
 	 
@@ -5811,7 +7091,7 @@
 	 fclose(stdout);
 	 fclose(stderr);
 
-	 ret = snprintf(buf, sizeof(buf), "%s/reconstruct", SERVICE_PATH);
+	 ret = snprintf(buf, sizeof(buf), "%s/reconstruct", SERVICE_DIR);
 	 if(ret < 0 || ret >= (int) sizeof(buf)) {
 		/* in child, so fatailing won't disconnect our user */ 
 	 fatal("reconstruct buffer not sufficiently big", EC_CONFIG);
@@ -5872,7 +7152,7 @@
 	 fclose(stdout);
 	 fclose(stderr);
 
-	 ret = snprintf(buf, sizeof(buf), "%s/quota", SERVICE_PATH);
+	 ret = snprintf(buf, sizeof(buf), "%s/quota", SERVICE_DIR);
 	 if(ret < 0 || ret >= (int) sizeof(buf)) {
 		/* in child, so fatailing won't disconnect our user */ 
 	 fatal("quota buffer not sufficiently big", EC_CONFIG);
@@ -5907,7 +7187,7 @@
 /*
 * Parse LIST command arguments.
 */
-void getlistargs(char *tag, struct listargs *listargs)
+static void getlistargs(char *tag, struct listargs *listargs)
 {
 static struct buf reference, buf;
 int c;
@@ -5917,7 +7197,7 @@
 if (c == '(') {
 	listargs->cmd = LIST_CMD_EXTENDED;
 	listargs->ret = 0;
-	c = getlistselopts(tag, &listargs->sel);
+	c = getlistselopts(tag, listargs);
 	if (c == EOF) {
 	 eatline(imapd_in, c);
 	 return;
@@ -5954,7 +7234,7 @@
 	for (;;) {
 	 c = getastring(imapd_in, imapd_out, &buf);
 	 if (*buf.s)
-		appendstrlist(&listargs->pat, buf.s);
+		strarray_append(&listargs->pat, buf.s);
 	 if (c != ' ') break;
 	}
 	if (c != ')') {
@@ -5967,7 +7247,7 @@
 }
 else {
 	prot_ungetc(c, imapd_in);
- 	c = getastring(imapd_in, imapd_out, &buf);
+	c = getastring(imapd_in, imapd_out, &buf);
 	if (c == EOF) {
 	 prot_printf(imapd_out,
 			"%s BAD Missing required argument to List: mailbox pattern\r\n",
@@ -5975,27 +7255,20 @@
 	 eatline(imapd_in, c);
 	 goto freeargs;
 	}
-	appendstrlist(&listargs->pat, buf.s);
+	strarray_append(&listargs->pat, buf.s);
 }
 
 /* Check for and parse LIST-EXTENDED return options */
 if (c == ' ') {
 	listargs->cmd = LIST_CMD_EXTENDED;
 	listargs->ret = 0;
-	c = getlistretopts(tag, &listargs->ret);
+	c = getlistretopts(tag, listargs);
 	if (c == EOF) {
 	 eatline(imapd_in, c);
 	 goto freeargs;
 	}
 }
 
- /* Per RFC 5258:
- * "Note that the SUBSCRIBED selection option implies the SUBSCRIBED
- * return option."
- */
- if (listargs->sel & LIST_SEL_SUBSCRIBED)
-	listargs->ret |= LIST_RET_SUBSCRIBED;
-
 /* check for CRLF */
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
@@ -6005,18 +7278,19 @@
 	goto freeargs;
 }
 
+ autocreate_inbox();
+
 return;
 
 freeargs:
- freestrlist(listargs->pat);
- listargs->pat = NULL;
+ strarray_fini(&listargs->pat);
 return;
 }
 
 /*
 * Perform a LIST, LSUB, RLIST or RLSUB command
 */
-void cmd_list(char *tag, struct listargs *listargs)
+static void cmd_list(char *tag, struct listargs *listargs)
 {
 clock_t start = clock();
 char mytime100;
@@ -6029,7 +7303,7 @@
 
 list_callback_calls = 0;
 
- if (!listargs->pat->s0 && !(listargs->cmd & LIST_CMD_LSUB)) {
+ if (listargs->pat.count && !*(listargs->pat.data0) && !(listargs->cmd & LIST_CMD_LSUB)) {
 	/* special case: query top-level hierarchy separator */
 	prot_printf(imapd_out, "* LIST (\\Noselect) \"%c\" \"\"\r\n",
 		 imapd_namespace.hier_sep);
@@ -6049,7 +7323,7 @@
 	list_data(listargs);
 }
 
- freestrlist(listargs->pat);
+ strarray_fini(&listargs->pat);
 
 imapd_check((listargs->sel & LIST_SEL_SUBSCRIBED) ? NULL : backend_inbox, 0);
 
@@ -6060,13 +7334,18 @@
 if (list_callback_calls)
 	prot_printf(imapd_out, " %u calls", list_callback_calls);
 prot_printf(imapd_out, ")\r\n");
+
+ if (global_conversations) {
+	conversations_abort(&global_conversations);
+	global_conversations = NULL;
+ }
 }
 
 /*
 * Perform a SUBSCRIBE (add is nonzero) or
 * UNSUBSCRIBE (add is zero) command
 */
-void cmd_changesub(char *tag, char *namespace, char *name, int add)
+static void cmd_changesub(char *tag, char *namespace, char *name, int add)
 {
 const char *cmd = add ? "Subscribe" : "Unsubscribe";
 int r = 0;
@@ -6079,8 +7358,7 @@
 	 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace,
 						 name, imapd_userid,
 						 mailboxname);
-	 if (!r) r = mlookup(NULL, NULL, mailboxname,
-				NULL, NULL, NULL, NULL);
+	 if (!r) r = mlookup(NULL, NULL, mailboxname, NULL);
 
 	 /* Doesn't exist on murder */
 	}
@@ -6125,7 +7403,7 @@
 						 imapd_userid, mailboxname);
 	 if (!r) {
 		r = mboxlist_changesub(mailboxname, imapd_userid, 
-				 imapd_authstate, add, force);
+				 imapd_authstate, add, force, 1);
 	 }
 	}
 }
@@ -6151,23 +7429,25 @@
 /*
 * Perform a GETACL command
 */
-void cmd_getacl(const char *tag, const char *name)
+static void cmd_getacl(const char *tag, const char *name)
 {
 char mailboxnameMAX_MAILBOX_BUFFER;
 int r, access;
 char *acl;
 char *rights, *nextid;
+ char *freeme = NULL;
+ mbentry_t *mbentry = NULL;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, NULL, NULL, &acl, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
 if (!r) {
-	access = cyrus_acl_myrights(imapd_authstate, acl);
+	access = cyrus_acl_myrights(imapd_authstate, mbentry->acl);
 
 	if (!(access & ACL_ADMIN) &&
 	 !imapd_userisadmin &&
@@ -6181,12 +7461,15 @@
 
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+	mboxlist_entry_free(&mbentry);
 	return;
 }
 
 prot_printf(imapd_out, "* ACL ");
 prot_printastring(imapd_out, name);
- 
+
+ freeme = acl = xstrdupnull(mbentry->acl);
+
 while (acl) {
 	rights = strchr(acl, '\t');
 	if (!rights) break;
@@ -6205,31 +7488,33 @@
 prot_printf(imapd_out, "\r\n");
 prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
+ free(freeme);
+ mboxlist_entry_free(&mbentry);
 }
 
 /*
 * Perform a LISTRIGHTS command
 */
-void
-cmd_listrights(tag, name, identifier)
-char *tag;
-char *name;
-char *identifier;
+static void cmd_listrights(char *tag, char *name, char *identifier)
 {
 char mailboxnameMAX_MAILBOX_BUFFER;
 int r, rights;
- char *acl;
+ mbentry_t *mbentry = NULL;
+ struct auth_state *authstate;
+ const char *canon_identifier;
+ int implicit;
+ char rightsdesc100, optional33;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, NULL, NULL, &acl, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
 if (!r) {
-	rights = cyrus_acl_myrights(imapd_authstate, acl);
+	rights = cyrus_acl_myrights(imapd_authstate, mbentry->acl);
 
 	if (!rights && !imapd_userisadmin &&
 	 !mboxname_userownsmailbox(imapd_userid, mailboxname)) {
@@ -6237,105 +7522,116 @@
 	}
 }
 
+ mboxlist_entry_free(&mbentry);
+
 imapd_check(NULL, 0);
 
- if (!r) {
-	struct auth_state *authstate = auth_newstate(identifier);
-	char *canon_identifier;
-	int implicit;
-	char rightsdesc100, optional33;
+ if (r) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+	return;
+ }
 
-	if (global_authisa(authstate, IMAPOPT_ADMINS))
-	 canon_identifier = identifier; /* don't canonify global admins */
-	else
-	 canon_identifier = canonify_userid(identifier, imapd_userid, NULL);
-	auth_freestate(authstate);
+ authstate = auth_newstate(identifier);
+ if (global_authisa(authstate, IMAPOPT_ADMINS))
+	canon_identifier = identifier; /* don't canonify global admins */
+ else
+	canon_identifier = canonify_userid(identifier, imapd_userid, NULL);
+ auth_freestate(authstate);
 
-	if (!canon_identifier) {
-	 implicit = 0;
-	}
-	else if (mboxname_userownsmailbox(canon_identifier, mailboxname)) {
-	 /* identifier's personal mailbox */
-	 implicit = config_implicitrights;
-	}
-	else if (mboxname_isusermailbox(mailboxname, 1)) {
-	 /* anyone can post to an INBOX */
-	 implicit = ACL_POST;
-	}
-	else {
-	 implicit = 0;
-	}
+ if (!canon_identifier) {
+	implicit = 0;
+ }
+ else if (mboxname_userownsmailbox(canon_identifier, mailboxname)) {
+	/* identifier's personal mailbox */
+	implicit = config_implicitrights;
+ }
+ else if (mboxname_isusermailbox(mailboxname, 1)) {
+	/* anyone can post to an INBOX */
+	implicit = ACL_POST;
+ }
+ else {
+	implicit = 0;
+ }
 
-	/* calculate optional rights */
-	cyrus_acl_masktostr(implicit ^ (canon_identifier ? ACL_FULL : 0),
-			 optional);
+ /* calculate optional rights */
+ cyrus_acl_masktostr(implicit ^ (canon_identifier ? ACL_FULL : 0),
+			optional);
 
-	/* build the rights string */
-	if (implicit) {
-	 cyrus_acl_masktostr(implicit, rightsdesc);
-	}
-	else {
-	 strcpy(rightsdesc, "\"\"");
-	}
+ /* build the rights string */
+ if (implicit) {
+	cyrus_acl_masktostr(implicit, rightsdesc);
+ }
+ else {
+	strcpy(rightsdesc, "\"\"");
+ }
 
-	if (*optional) {
-	 int i, n = strlen(optional);
-	 char *p = rightsdesc + strlen(rightsdesc);
+ if (*optional) {
+	int i, n = strlen(optional);
+	char *p = rightsdesc + strlen(rightsdesc);
 
-	 for (i = 0; i < n; i++) {
-		*p++ = ' ';
-		*p++ = optionali;
-	 }
-	 *p = '\0';
+	for (i = 0; i < n; i++) {
+	 *p++ = ' ';
+	 *p++ = optionali;
 	}
+	*p = '\0';
+ }
 
-	prot_printf(imapd_out, "* LISTRIGHTS ");
-	prot_printastring(imapd_out, name);
-	(void)prot_putc(' ', imapd_out);
-	prot_printastring(imapd_out, identifier);
-	prot_printf(imapd_out, " %s", rightsdesc);
+ prot_printf(imapd_out, "* LISTRIGHTS ");
+ prot_printastring(imapd_out, name);
+ (void)prot_putc(' ', imapd_out);
+ prot_printastring(imapd_out, identifier);
+ prot_printf(imapd_out, " %s", rightsdesc);
 
-	prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
-		 error_message(IMAP_OK_COMPLETED));
-	return;
+ prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
+		error_message(IMAP_OK_COMPLETED));
+}
+
+static int printmyrights(const char *extname, mbentry_t *mbentry)
+{
+ int rights = 0;
+ char strACL_MAXSTR;
+
+ rights = cyrus_acl_myrights(imapd_authstate, mbentry->acl);
+
+ /* Add in implicit rights */
+ if (imapd_userisadmin) {
+	rights |= ACL_LOOKUP|ACL_ADMIN;
+ }
+ else if (mboxname_userownsmailbox(imapd_userid, mbentry->name)) {
+	rights |= config_implicitrights;
+ }
+
+ if (!(rights & (ACL_LOOKUP|ACL_READ|ACL_INSERT|ACL_CREATE|ACL_DELETEMBOX|ACL_ADMIN))) {
+	return IMAP_MAILBOX_NONEXISTENT;
 }
 
- prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+ prot_printf(imapd_out, "* MYRIGHTS ");
+ prot_printastring(imapd_out, extname);
+ prot_printf(imapd_out, " ");
+ prot_printastring(imapd_out, cyrus_acl_masktostr(rights, str));
+ prot_printf(imapd_out, "\r\n");
+
+ return 0;
 }
 
 /*
 * Perform a MYRIGHTS command
 */
-void cmd_myrights(const char *tag, const char *name)
+static void cmd_myrights(const char *tag, const char *name)
 {
 char mailboxnameMAX_MAILBOX_BUFFER;
- int r, rights = 0;
- char *acl;
- char strACL_MAXSTR;
+ mbentry_t *mbentry = NULL;
+ int r;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
- if (!r) {
-	r = mlookup(tag, name, mailboxname, NULL, NULL, &acl, NULL);
- }
+ if (!r) r = mlookup(tag, name, mailboxname, &mbentry);
 if (r == IMAP_MAILBOX_MOVED) return;
 
- if (!r) {
-	rights = cyrus_acl_myrights(imapd_authstate, acl);
+ if (!r) r = printmyrights(name, mbentry);
 
-	/* Add in implicit rights */
-	if (imapd_userisadmin) {
-	 rights |= ACL_LOOKUP|ACL_ADMIN;
-	}
-	else if (mboxname_userownsmailbox(imapd_userid, mailboxname)) {
-	 rights |= config_implicitrights;
-	}
-
-	if (!(rights & (ACL_LOOKUP|ACL_READ|ACL_INSERT|ACL_CREATE|ACL_DELETEMBOX|ACL_ADMIN))) {
-	 r = IMAP_MAILBOX_NONEXISTENT;
-	}
- }
+ mboxlist_entry_free(&mbentry);
 
 imapd_check(NULL, 0);
 
@@ -6343,52 +7639,51 @@
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
 	return;
 }
- 
- prot_printf(imapd_out, "* MYRIGHTS ");
- prot_printastring(imapd_out, name);
- prot_printf(imapd_out, " ");
- prot_printastring(imapd_out, cyrus_acl_masktostr(rights, str));
- prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
 }
 
 /*
 * Perform a SETACL command
 */
-void cmd_setacl(char *tag, const char *name,
+static void cmd_setacl(char *tag, const char *name,
 		const char *identifier, const char *rights)
 {
 int r;
 char mailboxnameMAX_MAILBOX_BUFFER;
- char *server;
- int mbtype;
+ mbentry_t *mbentry = NULL;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 /* is it remote? */
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &server, NULL, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
 	struct backend *s = NULL;
 	int res;
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
 
 	if (!r && imapd_userisadmin && supports_referrals) {
 	 /* They aren't an admin remotely, so let's refer them */
-	 imapd_refer(tag, server, name);
+	 imapd_refer(tag, mbentry->server, name);
 	 referral_kick = 1;
+	 mboxlist_entry_free(&mbentry);
 	 return;
-	} else if (!r) {
+	}
+
+	mboxlist_entry_free(&mbentry);
+
+	if (!r) {
 	 if (rights) {
 		prot_printf(s->out, 
 			 "%s Setacl {" SIZE_T_FMT "+}\r\n%s"
@@ -6425,11 +7720,13 @@
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 if (!r) {
-	r = mboxlist_setacl(mailboxname, identifier, rights,
+	r = mboxlist_setacl(&imapd_namespace, mailboxname, identifier, rights,
 			 imapd_userisadmin || imapd_userisproxyadmin,
-			 imapd_userid, imapd_authstate);
+			 proxy_userid, imapd_authstate);
 }
 
 imapd_check(NULL, 0);
@@ -6445,6 +7742,41 @@
 }
 }
 
+static void print_quota_used(struct protstream *o, const struct quota *q)
+{
+ int res;
+ const char *sep = "";
+
+ prot_putc('(', o);
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (q->limitsres >= 0) {
+	 prot_printf(o, "%s%s " QUOTA_T_FMT " %d",
+			sep, quota_namesres,
+			q->usedsres/quota_unitsres,
+			q->limitsres);
+	 sep = " ";
+	}
+ }
+ prot_putc(')', o);
+}
+
+static void print_quota_limits(struct protstream *o, const struct quota *q)
+{
+ int res;
+ const char *sep = "";
+
+ prot_putc('(', o);
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (q->limitsres >= 0) {
+	 prot_printf(o, "%s%s %d",
+			sep, quota_namesres,
+			q->limitsres);
+	 sep = " ";
+	}
+ }
+ prot_putc(')', o);
+}
+
 /*
 * Callback for (get|set)quota, to ensure that all of the
 * submailboxes are on the same server.
@@ -6452,31 +7784,35 @@
 static int quota_cb(char *name, int matchlen __attribute__((unused)),
 		 int maycreate __attribute__((unused)), void *rock) 
 {
- int r;
- char *this_server;
 const char *servername = (const char *)rock;
+ mbentry_t *mbentry = NULL;
+ int r;
 
- r = mlookup(NULL, NULL, name, NULL, &this_server, NULL, NULL);
- if(r) return r;
+ r = mlookup(NULL, NULL, name, &mbentry);
+ if (r) return r;
 
- if(strcmp(servername, this_server)) {
+ if (strcmp(servername, mbentry->server)) {
 	/* Not on same server as the root */
-	return IMAP_NOT_SINGULAR_ROOT;
+	r = IMAP_NOT_SINGULAR_ROOT;
 } else {
-	return PROXY_OK;
+	r = PROXY_OK;
 }
+
+ mboxlist_entry_free(&mbentry);
+
+ return r;
 }
 
+
 /*
 * Perform a GETQUOTA command
 */
-void cmd_getquota(const char *tag, const char *name)
+static void cmd_getquota(const char *tag, const char *name)
 {
 int r;
 char quotarootbufMAX_MAILBOX_BUFFER;
 char internalnameMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server_rock = NULL, *server_rock_tmp = NULL;
+ mbentry_t *mbentry = NULL;
 struct quota q;
 
 imapd_check(NULL, 0);
@@ -6489,24 +7825,22 @@
 }
 
 if (!r) {
-	r = mlookup(NULL, NULL, internalname, &mbtype,
-		 &server_rock_tmp, NULL, NULL);
+	r = mlookup(NULL, NULL, internalname, &mbentry);
 }
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
-	server_rock = xstrdup(server_rock_tmp);
 
 	snprintf(quotarootbuf, sizeof(quotarootbuf), "%s.*", internalname);
 
 	r = mboxlist_findall(&imapd_namespace, quotarootbuf,
 			 imapd_userisadmin, imapd_userid,
-			 imapd_authstate, quota_cb, server_rock);
+			 imapd_authstate, quota_cb, (void *)mbentry->server);
 
 	if (!r) {
 	 struct backend *s;
 
-	 s = proxy_findserver(server_rock, &imap_protocol,
+	 s = proxy_findserver(mbentry->server, &imap_protocol,
 				 proxy_userid, &backend_cached,
 				 &backend_current, &backend_inbox, imapd_in);
 	 if (!s) r = IMAP_SERVER_UNAVAILABLE;
@@ -6520,42 +7854,44 @@
 	 }
 	}
 
-	if (server_rock) free(server_rock);
 	if (r) prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
 
+	mboxlist_entry_free(&mbentry);
+
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 
- q.root = internalname;
+ quota_init(&q, internalname);
 r = quota_read(&q, NULL, 0);
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
-	return;
+	goto done;
 }
 
 prot_printf(imapd_out, "* QUOTA ");
 prot_printastring(imapd_out, name);
- prot_printf(imapd_out, " (");
- if (q.limit >= 0) {
-	prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
-		 q.used/QUOTA_UNITS, q.limit);
- }
- prot_printf(imapd_out, ")\r\n");
+ prot_printf(imapd_out, " ");
+ print_quota_used(imapd_out, &q);
+ prot_printf(imapd_out, "\r\n");
 
 prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
+
+ done:
+ quota_free(&q);
 }
 
 /*
 * Perform a GETQUOTAROOT command
 */
-void cmd_getquotaroot(const char *tag, const char *name)
+static void cmd_getquotaroot(const char *tag, const char *name)
 {
 char mailboxnameMAX_MAILBOX_BUFFER;
- char *server;
- int mbtype;
+ mbentry_t *mbentry = NULL;
 struct mailbox *mailbox = NULL;
 int myrights;
 int r, doclose = 0;
@@ -6564,17 +7900,15 @@
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &server, NULL, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
-
 	struct backend *s;
 
-	s = proxy_findserver(server, &imap_protocol,
+	s = proxy_findserver(mbentry->server, &imap_protocol,
 			 proxy_userid, &backend_cached,
 			 &backend_current, &backend_inbox, imapd_in);
 	if (!s) r = IMAP_SERVER_UNAVAILABLE;
@@ -6589,9 +7923,13 @@
 	 prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
 	}
 
+	mboxlist_entry_free(&mbentry);
+
 	return;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* local mailbox */
 if (!r) {
 	r = mailbox_open_irl(mailboxname, &mailbox);
@@ -6618,19 +7956,15 @@
 						 imapd_userid, mailboxname);
 	 prot_printf(imapd_out, " ");
 	 prot_printastring(imapd_out, mailboxname);
-	 q.root = mailbox->quotaroot;
+	 quota_init(&q, mailbox->quotaroot);
 	 r = quota_read(&q, NULL, 0);
 	 if (!r) {
 		prot_printf(imapd_out, "\r\n* QUOTA ");
 		prot_printastring(imapd_out, mailboxname);
-		prot_printf(imapd_out, " (");
-		if (q.limit >= 0) {
-		 prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
-				q.used/QUOTA_UNITS,
-				q.limit);
-		}
-		(void)prot_putc(')', imapd_out);
+		prot_putc(' ', imapd_out);
+		print_quota_used(imapd_out, &q);
 	 }
+	 quota_free(&q);
 	}
 	prot_printf(imapd_out, "\r\n");
 }
@@ -6654,119 +7988,116 @@
 */
 void cmd_setquota(const char *tag, const char *quotaroot)
 {
- int newquota = -1;
- int badresource = 0;
+ int newquotasQUOTA_NUMRESOURCES;
+ int res;
 int c;
 int force = 0;
 static struct buf arg;
- char *p;
 int r;
 char mailboxnameMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server_rock_tmp = NULL;
-
- c = prot_getc(imapd_in);
- if (c != '(') goto badlist;
-
- c = getword(imapd_in, &arg);
- if (c != ')' || arg.s0 != '\0') {
-	for (;;) {
-	 if (c != ' ') goto badlist;
-	 if (strcasecmp(arg.s, "storage") != 0) badresource = 1;
-	 c = getword(imapd_in, &arg);
-	 if (c != ' ' && c != ')') goto badlist;
-	 if (arg.s0 == '\0') goto badlist;
-	 /* accept "(storage -1)" as "()" to make move from unpatched cyrus possible */
-	 if (strcmp(arg.s, "-1") != 0) {
-		newquota = 0;
-		for (p = arg.s; *p; p++) {
-		 if (!Uisdigit(*p)) goto badlist;
-		 newquota = newquota * 10 + *p - '0';
- if (newquota < 0) goto badlist; /* overflow */
-		}
-	 }
-	 if (c == ')') break;
-	}
- }
- c = prot_getc(imapd_in);
- if (c == '\r') c = prot_getc(imapd_in);
- if (c != '\n') {
-	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to SETQUOTA\r\n", tag);
-	eatline(imapd_in, c);
-	return;
- }
+ mbentry_t *mbentry = NULL;
 
- if (badresource) r = IMAP_UNSUPPORTED_QUOTA;
- else if (!imapd_userisadmin && !imapd_userisproxyadmin) {
+ if (!imapd_userisadmin && !imapd_userisproxyadmin) {
 	/* need to allow proxies so that mailbox moves can set initial quota
 	 * roots */
 	r = IMAP_PERMISSION_DENIED;
- } else {
-	/* are we forcing the creation of a quotaroot by having a leading +? */
-	if (quotaroot0 == '+') {
-	 force = 1;
-	 quotaroot++;
-	}
-	
-	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, quotaroot,
-						 imapd_userid, mailboxname);
+	goto out;
 }
 
- if (!r) {
-	r = mlookup(NULL, NULL, mailboxname, &mbtype,
-		 &server_rock_tmp, NULL, NULL);
+ /* are we forcing the creation of a quotaroot by having a leading +? */
+ if (quotaroot0 == '+') {
+	force = 1;
+	quotaroot++;
 }
+ 
+ r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, quotaroot,
+					 imapd_userid, mailboxname);
+ if (r)
+	goto out;
+
+ r = mlookup(NULL, NULL, mailboxname, &mbentry);
+ if (r == IMAP_MAILBOX_NONEXISTENT)
+	r = 0;	 /* will create a quotaroot anyway */
+ if (r)
+	goto out;
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (mbentry && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
+	struct backend *s;
 	char quotarootbufMAX_MAILBOX_BUFFER;
-	char *server_rock = xstrdup(server_rock_tmp);
 
 	snprintf(quotarootbuf, sizeof(quotarootbuf), "%s.*", mailboxname);
 
 	r = mboxlist_findall(&imapd_namespace, quotarootbuf,
 			 imapd_userisadmin, imapd_userid,
-			 imapd_authstate, quota_cb, server_rock);
+			 imapd_authstate, quota_cb, (void *)mbentry->server);
+	if (r)
+	 goto out;
 
 	imapd_check(NULL, 0);
 
-	if (!r) {
-	 struct backend *s;
+	s = proxy_findserver(mbentry->server, &imap_protocol,
+			 proxy_userid, &backend_cached,
+			 &backend_current, &backend_inbox, imapd_in);
+	if (!s) {
+	 r = IMAP_SERVER_UNAVAILABLE;
+	 goto out;
+	}
 
-	 s = proxy_findserver(server_rock, &imap_protocol,
-				 proxy_userid, &backend_cached,
-				 &backend_current, &backend_inbox, imapd_in);
-	 if (!s) r = IMAP_SERVER_UNAVAILABLE;
+	imapd_check(s, 0);
 
-	 imapd_check(s, 0);
+	prot_printf(s->out, "%s Setquota ", tag);
+	prot_printliteral(s->out, quotaroot, strlen(quotaroot));
+	prot_putc(' ', s->out);
+	pipe_including_tag(s, tag, 0);
 
-	 if (!r) {
-		if (newquota == -1) {
-		 prot_printf(s->out, "%s Setquota {" SIZE_T_FMT "+}\r\n%s"
-				" ()\r\n",
-				tag, strlen(quotaroot), quotaroot);
-		}
-		else {
-		 prot_printf(s->out, "%s Setquota {" SIZE_T_FMT "+}\r\n%s"
-				" (Storage %d)\r\n",
-				tag, strlen(quotaroot), quotaroot, newquota);
-		}
-		pipe_including_tag(s, tag, 0);
-	 }
-	}
+	goto out;
+ }
+ mboxlist_entry_free(&mbentry);
 
-	if (server_rock) free(server_rock);
-	if (r) prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+ /* local mailbox */
+
+ /* Now parse the arguments as a setquota_list */
+ c = prot_getc(imapd_in);
+ if (c != '(') goto badlist;
 
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+	newquotasres = QUOTA_UNLIMITED;
+
+ for (;;) {
+	/* XXX - limit is actually stored in an int value */
+	int32_t limit = 0;
+
+	c = getword(imapd_in, &arg);
+	if ((c == ')') && !arg.s0) break;
+	if (c != ' ') goto badlist;
+	res = quota_name_to_resource(arg.s);
+	if (res < 0) {
+	 r = IMAP_UNSUPPORTED_QUOTA;
+	 goto out;
+	}
+
+	c = getsint32(imapd_in, &limit);
+	/* note: we accept >= 0 according to rfc2087,
+	 * and also -1 to fix Bug #3559 */
+	if (limit < -1) goto badlist;
+	newquotasres = limit;
+	if (c == ')') break;
+	else if (c != ' ') goto badlist;
+ }
+ c = prot_getc(imapd_in);
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to SETQUOTA\r\n", tag);
+	eatline(imapd_in, c);
 	return;
 }
 
- /* local mailbox */
- if (!r || (r == IMAP_MAILBOX_NONEXISTENT)) {
-	r = mboxlist_setquota(mailboxname, newquota, force);
- }
+ r = mboxlist_setquotas(mailboxname, newquotas, force);
 
 imapd_check(NULL, 0);
+out:
+ mboxlist_entry_free(&mbentry);
 
 if (r) {
 	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
@@ -6791,7 +8122,7 @@
 * be fixed.
 */
 /* imaps - whether this is an imaps transaction or not */
-void cmd_starttls(char *tag, int imaps)
+static void cmd_starttls(char *tag, int imaps)
 {
 int result;
 int *layerp;
@@ -6892,28 +8223,181 @@
 }
 #endif /* HAVE_SSL */
 
+static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+{
+ static struct buf arg;
+ unsigned statusitems = 0;
+ int c;
+ int hasconv = config_getswitch(IMAPOPT_CONVERSATIONS);
+
+ c = prot_getc(imapd_in);
+ if (c != '(') return EOF;
+
+ c = getword(imapd_in, &arg);
+ if (arg.s0 == '\0') return EOF;
+ for (;;) {
+	lcase(arg.s);
+	if (!strcmp(arg.s, "messages")) {
+	 statusitems |= STATUS_MESSAGES;
+	}
+	else if (!strcmp(arg.s, "recent")) {
+	 statusitems |= STATUS_RECENT;
+	}
+	else if (!strcmp(arg.s, "uidnext")) {
+	 statusitems |= STATUS_UIDNEXT;
+	}
+	else if (!strcmp(arg.s, "uidvalidity")) {
+	 statusitems |= STATUS_UIDVALIDITY;
+	}
+	else if (!strcmp(arg.s, "unseen")) {
+	 statusitems |= STATUS_UNSEEN;
+	}
+	else if (!strcmp(arg.s, "highestmodseq")) {
+	 statusitems |= STATUS_HIGHESTMODSEQ;
+	}
+	else if (hasconv && !strcmp(arg.s, "xconvexists")) {
+	 statusitems |= STATUS_XCONVEXISTS;
+	}
+	else if (hasconv && !strcmp(arg.s, "xconvunseen")) {
+	 statusitems |= STATUS_XCONVUNSEEN;
+	}
+	else if (hasconv && !strcmp(arg.s, "xconvmodseq")) {
+	 statusitems |= STATUS_XCONVMODSEQ;
+	}
+	else {
+	 static char buf200;
+	 snprintf(buf, 200, "Invalid Status attributes %s", arg.s);
+	 *errstr = buf;
+	 return EOF;
+	}
+
+	if (c == ' ') c = getword(imapd_in, &arg);
+	else break;
+ }
+
+ if (c != ')') {
+	*errstr = "Missing close parenthesis in Status";
+	return EOF;
+ }
+ c = prot_getc(imapd_in);
+
+ /* success */
+ *statusitemsp = statusitems;
+ return c;
+}
+
+static int print_statusline(const char *extname, unsigned statusitems,
+			 struct statusdata *sd)
+{
+ int sepchar;
+ 
+ prot_printf(imapd_out, "* STATUS ");
+ prot_printastring(imapd_out, extname);
+ prot_printf(imapd_out, " ");
+ sepchar = '(';
+
+ if (statusitems & STATUS_MESSAGES) {
+	prot_printf(imapd_out, "%cMESSAGES %u", sepchar, sd->messages);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_RECENT) {
+	prot_printf(imapd_out, "%cRECENT %u", sepchar, sd->recent);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_UIDNEXT) {
+	prot_printf(imapd_out, "%cUIDNEXT %u", sepchar, sd->uidnext);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_UIDVALIDITY) {
+	prot_printf(imapd_out, "%cUIDVALIDITY %u", sepchar, sd->uidvalidity);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_UNSEEN) {
+	prot_printf(imapd_out, "%cUNSEEN %u", sepchar, sd->unseen);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_HIGHESTMODSEQ) {
+	prot_printf(imapd_out, "%cHIGHESTMODSEQ " MODSEQ_FMT,
+		 sepchar, sd->highestmodseq);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_XCONVEXISTS) {
+	prot_printf(imapd_out, "%cXCONVEXISTS %u", sepchar, sd->xconv.exists);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_XCONVUNSEEN) {
+	prot_printf(imapd_out, "%cXCONVUNSEEN %u", sepchar, sd->xconv.unseen);
+	sepchar = ' ';
+ }
+ if (statusitems & STATUS_XCONVMODSEQ) {
+	prot_printf(imapd_out, "%cXCONVMODSEQ " MODSEQ_FMT, sepchar, sd->xconv.modseq);
+	sepchar = ' ';
+ }
+
+ prot_printf(imapd_out, ")\r\n");
+
+ return 0;
+}
+
+static int imapd_statusdata(const char *mailboxname, unsigned statusitems,
+			 struct statusdata *sd)
+{
+ int r;
+ struct conversations_state *state = NULL;
+
+ if (!(statusitems & STATUS_CONVITEMS)) goto nonconv;
+ statusitems &= ~STATUS_CONVITEMS; /* strip them for the regular lookup */
+
+ /* use the existing state if possible */
+ state = conversations_get_mbox(mailboxname);
+
+ /* otherwise fetch a new one! */
+ if (!state) {
+	if (global_conversations) {
+	 conversations_abort(&global_conversations);
+	 global_conversations = NULL;
+	}
+	r = conversations_open_mbox(mailboxname, &state);
+	if (r) {
+	 /* maybe the mailbox doesn't even have conversations - just ignore */
+	 goto nonconv;
+	}
+	global_conversations = state;
+ }
+
+ r = conversation_getstatus(state, mailboxname, &sd->xconv);
+ if (r) return r;
+
+nonconv:
+ /* use the index status if we can so we get the 'alive' Recent count */
+ if (!strcmpsafe(mailboxname, index_mboxname(imapd_index)))
+	r = index_status(imapd_index, sd);
+ /* fall back to generic lookup */
+ else
+	r = status_lookup(mailboxname, imapd_userid, statusitems, sd);
+
+ return r;
+}
+
 /*
 * Parse and perform a STATUS command
 * The command has been parsed up to the attribute list
 */
-void cmd_status(char *tag, char *name)
+static void cmd_status(char *tag, char *name)
 {
 int c;
 unsigned statusitems = 0;
- static struct buf arg;
 char mailboxnameMAX_MAILBOX_BUFFER;
- int mbtype;
- char *server, *acl;
+ const char *errstr = "Bad status string";
+ mbentry_t *mbentry = NULL;
+ struct statusdata sdata = STATUSDATA_INIT;
 int r = 0;
- int sepchar;
- struct statusdata sdata;
 
 r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
 					 imapd_userid, mailboxname);
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, &mbtype,
-		 &server, &acl, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) {
 	/* Eat the argument */
@@ -6921,19 +8405,19 @@
 	return;
 }
 
- if (!r && (mbtype & MBTYPE_REMOTE)) {
+ if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	/* remote mailbox */
 
 	if (supports_referrals
 	 && config_getswitch(IMAPOPT_PROXYD_ALLOW_STATUS_REFERRAL)) { 
-	 imapd_refer(tag, server, name);
+	 imapd_refer(tag, mbentry->server, name);
 	 /* Eat the argument */
 	 eatline(imapd_in, prot_getc(imapd_in));
 	}
 	else {
 	 struct backend *s;
 
-	 s = proxy_findserver(server, &imap_protocol,
+	 s = proxy_findserver(mbentry->server, &imap_protocol,
 				 proxy_userid, &backend_cached,
 				 &backend_current, &backend_inbox, imapd_in);
 	 if (!s) r = IMAP_SERVER_UNAVAILABLE;
@@ -6952,67 +8436,30 @@
 	 }
 	}
 
-	return;
+	goto done;
 }
 
 /* local mailbox */
 
 imapd_check(NULL, 0);
 
- c = prot_getc(imapd_in);
- if (c != '(') goto badlist;
-
- c = getword(imapd_in, &arg);
- if (arg.s0 == '\0') goto badlist;
- for (;;) {
-	lcase(arg.s);
-	if (!strcmp(arg.s, "messages")) {
-	 statusitems |= STATUS_MESSAGES;
-	}
-	else if (!strcmp(arg.s, "recent")) {
-	 statusitems |= STATUS_RECENT;
-	}
-	else if (!strcmp(arg.s, "uidnext")) {
-	 statusitems |= STATUS_UIDNEXT;
-	}
-	else if (!strcmp(arg.s, "uidvalidity")) {
-	 statusitems |= STATUS_UIDVALIDITY;
-	}
-	else if (!strcmp(arg.s, "unseen")) {
-	 statusitems |= STATUS_UNSEEN;
-	}
-	else if (!strcmp(arg.s, "highestmodseq")) {
-	 statusitems |= STATUS_HIGHESTMODSEQ;
-	}
-	else {
-	 prot_printf(imapd_out, "%s BAD Invalid Status attribute %s\r\n",
-			tag, arg.s);
-	 eatline(imapd_in, c);
-	 return;
-	}
-	 
-	if (c == ' ') c = getword(imapd_in, &arg);
-	else break;
- }
-
- if (c != ')') {
-	prot_printf(imapd_out,
-		 "%s BAD Missing close parenthesis in Status\r\n", tag);
-	eatline(imapd_in, c);
-	return;
+ c = parse_statusitems(&statusitems, &errstr);
+ if (c == EOF) {
+	prot_printf(imapd_out, "%s BAD %s\r\n", tag, errstr);
+	goto done;
 }
 
- c = prot_getc(imapd_in);
 if (c == '\r') c = prot_getc(imapd_in);
 if (c != '\n') {
 	prot_printf(imapd_out,
 		 "%s BAD Unexpected extra arguments to Status\r\n", tag);
 	eatline(imapd_in, c);
-	return;
+	goto done;
 }
 
+ /* check permissions */
 if (!r) {
-	int myrights = cyrus_acl_myrights(imapd_authstate, acl);
+	int myrights = cyrus_acl_myrights(imapd_authstate, mbentry->acl);
 
 	if (!(myrights & ACL_READ)) {
 	 r = (imapd_userisadmin || (myrights & ACL_LOOKUP)) ?
@@ -7020,58 +8467,25 @@
 	}
 }
 
- if (!r) {
-	/* use the index status if we can so we get the 'alive' Recent count */
-	if (imapd_index && !strcmp(imapd_index->mailbox->name, mailboxname))
-	 r = index_status(imapd_index, &sdata);
-	else
-	 r = status_lookup(mailboxname, imapd_userid, statusitems, &sdata);
- }
+ if (!r) r = imapd_statusdata(mailboxname, statusitems, &sdata);
 
 if (r) {
-	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
-	return;
- }
-
- prot_printf(imapd_out, "* STATUS ");
- prot_printastring(imapd_out, name);
- prot_printf(imapd_out, " ");
- sepchar = '(';
-
- if (statusitems & STATUS_MESSAGES) {
-	prot_printf(imapd_out, "%cMESSAGES %u", sepchar, sdata.messages);
-	sepchar = ' ';
- }
- if (statusitems & STATUS_RECENT) {
-	prot_printf(imapd_out, "%cRECENT %u", sepchar, sdata.recent);
-	sepchar = ' ';
- }
- if (statusitems & STATUS_UIDNEXT) {
-	prot_printf(imapd_out, "%cUIDNEXT %u", sepchar, sdata.uidnext);
-	sepchar = ' ';
- }
- if (statusitems & STATUS_UIDVALIDITY) {
-	prot_printf(imapd_out, "%cUIDVALIDITY %u", sepchar, sdata.uidvalidity);
-	sepchar = ' ';
+	prot_printf(imapd_out, "%s NO %s\r\n", tag,
+		 error_message(r));
 }
- if (statusitems & STATUS_UNSEEN) {
-	prot_printf(imapd_out, "%cUNSEEN %u", sepchar, sdata.unseen);
-	sepchar = ' ';
+ else {
+	print_statusline(name, statusitems, &sdata);
+	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		 error_message(IMAP_OK_COMPLETED));
 }
- if (statusitems & STATUS_HIGHESTMODSEQ) {
-	prot_printf(imapd_out, "%cHIGHESTMODSEQ " MODSEQ_FMT,
-		 sepchar, sdata.highestmodseq);
-	sepchar = ' ';
+
+ done:
+ if (global_conversations) {
+	conversations_abort(&global_conversations);
+	global_conversations = NULL;
 }
- prot_printf(imapd_out, ")\r\n");
- 
- prot_printf(imapd_out, "%s OK %s\r\n", tag,
-		error_message(IMAP_OK_COMPLETED));
+ mboxlist_entry_free(&mbentry);
 return;
-
- badlist:
- prot_printf(imapd_out, "%s BAD Invalid status list in Status\r\n", tag);
- eatline(imapd_in, c);
 }
 
 #ifdef ENABLE_X_NETSCAPE_HACK
@@ -7130,8 +8544,7 @@
 * Print out a response to the NAMESPACE command defined by
 * RFC 2342.
 */
-void cmd_namespace(tag)
- char* tag;
+static void cmd_namespace(char* tag)
 {
 int sawone3 = {0, 0, 0};
 char* pattern;
@@ -7189,6 +8602,68 @@
 		error_message(IMAP_OK_COMPLETED));
 }
 
+static int parsecreateargs(struct dlist **extargs)
+{
+ int c;
+ static struct buf arg, val;
+ struct dlist *res;
+ struct dlist *sub;
+ char *p;
+ const char *name;
+
+ res = dlist_newkvlist(NULL, "CREATE");
+
+ c = prot_getc(imapd_in);
+ if (c == '(') {
+	/* new style RFC4466 arguments */
+	do {
+	 c = getword(imapd_in, &arg);
+	 name = ucase(arg.s);
+	 if (c != ' ') goto fail;
+	 c = prot_getc(imapd_in);
+	 if (c == '(') {
+		/* fun - more lists! */
+		sub = dlist_newlist(res, name);
+		do {
+		 c = getword(imapd_in, &val);
+		 dlist_setatom(sub, name, val.s);
+		} while (c == ' ');
+		if (c != ')') goto fail;
+		c = prot_getc(imapd_in);
+	 }
+	 else {
+		prot_ungetc(c, imapd_in);
+		c = getword(imapd_in, &val);
+		dlist_setatom(res, name, val.s);
+	 }
+	} while (c == ' ');
+	if (c != ')') goto fail;
+	c = prot_getc(imapd_in);
+ }
+ else {
+	prot_ungetc(c, imapd_in);
+	c = getword(imapd_in, &arg);
+	if (c == EOF) goto fail;
+	p = strchr(arg.s, '!');
+	if (p) {
+	 /* with a server */
+	 *p = '\0';
+	 dlist_setatom(res, "SERVER", arg.s);
+	 dlist_setatom(res, "PARTITION", p+1);
+	}
+	else {
+	 dlist_setatom(res, "PARTITION", arg.s);
+	}
+ }
+
+ *extargs = res;
+ return c;
+
+ fail:
+ dlist_free(&res);
+ return EOF;
+}
+
 /*
 * Parse annotate fetch data.
 *
@@ -7197,14 +8672,14 @@
 * GETANNOTATION, FETCH.
 */
 
-int getannotatefetchdata(char *tag,
-			 struct strlist **entries, struct strlist **attribs)
+static int parse_annotate_fetch_data(const char *tag,
+				 int permessage_flag,
+				 strarray_t *entries,
+				 strarray_t *attribs)
 {
 int c;
 static struct buf arg;
 
- *entries = *attribs = NULL;
-
 c = prot_getc(imapd_in);
 if (c == EOF) {
 	prot_printf(imapd_out,
@@ -7214,7 +8689,10 @@
 else if (c == '(') {
 	/* entry list */
 	do {
-	 c = getqstring(imapd_in, imapd_out, &arg);
+	 if (permessage_flag)
+		c = getastring(imapd_in, imapd_out, &arg);
+	 else
+		c = getqstring(imapd_in, imapd_out, &arg);
 	 if (c == EOF) {
 		prot_printf(imapd_out,
 			 "%s BAD Missing annotation entry\r\n", tag);
@@ -7222,7 +8700,7 @@
 	 }
 
 	 /* add the entry to the list */
-	 appendstrlist(entries, arg.s);
+	 strarray_append(entries, arg.s);
 
 	} while (c == ' ');
 
@@ -7238,14 +8716,17 @@
 else {
 	/* single entry -- add it to the list */
 	prot_ungetc(c, imapd_in);
-	c = getqstring(imapd_in, imapd_out, &arg);
+	if (permessage_flag)
+	 c = getastring(imapd_in, imapd_out, &arg);
+	else
+	 c = getqstring(imapd_in, imapd_out, &arg);
 	if (c == EOF) {
 	 prot_printf(imapd_out,
 			"%s BAD Missing annotation entry\r\n", tag);
 	 goto baddata;
 	}
 
-	appendstrlist(entries, arg.s);
+	strarray_append(entries, arg.s);
 }
 
 if (c != ' ' || (c = prot_getc(imapd_in)) == EOF) {
@@ -7257,7 +8738,10 @@
 if (c == '(') {
 	/* attrib list */
 	do {
-	 c = getnstring(imapd_in, imapd_out, &arg);
+	 if (permessage_flag)
+		c = getastring(imapd_in, imapd_out, &arg);
+	 else
+		c = getqstring(imapd_in, imapd_out, &arg);
 	 if (c == EOF) {
 		prot_printf(imapd_out,
 			 "%s BAD Missing annotation attribute(s)\r\n", tag);
@@ -7265,7 +8749,7 @@
 	 }
 
 	 /* add the attrib to the list */
-	 appendstrlist(attribs, arg.s);
+	 strarray_append(attribs, arg.s);
 
 	} while (c == ' ');
 
@@ -7281,17 +8765,87 @@
 else {
 	/* single attrib */
 	prot_ungetc(c, imapd_in);
-	c = getqstring(imapd_in, imapd_out, &arg);
+	if (permessage_flag)
+	 c = getastring(imapd_in, imapd_out, &arg);
+	else
+	 c = getqstring(imapd_in, imapd_out, &arg);
+	if (c == EOF) {
+	 prot_printf(imapd_out,
+			"%s BAD Missing annotation attribute\r\n", tag);
+	 goto baddata;
+	}
+
+	strarray_append(attribs, arg.s);
+ }
+
+ return c;
+
+ baddata:
+ if (c != EOF) prot_ungetc(c, imapd_in);
+ return EOF;
+}
+
+/*
+ * Parse either a single string or a (bracketed) list of strings.
+ * This is used up to three times in the GETMETADATA command.
+ */
+static int parse_metadata_string_or_list(const char *tag,
+					 strarray_t *entries,
+					 int *was_singlep)
+{
+ int c;
+ static struct buf arg;
+
+ *was_singlep = 0;
+
+ c = prot_getc(imapd_in);
+ if (c == EOF) {
+	prot_printf(imapd_out,
+		 "%s BAD Missing metadata entry\r\n", tag);
+	goto baddata;
+ }
+ else if (c == '\r') {
+	return c;
+ }
+ else if (c == '(') {
+	/* entry list */
+	do {
+	 c = getastring(imapd_in, imapd_out, &arg);
 	 if (c == EOF) {
 		prot_printf(imapd_out,
-			 "%s BAD Missing annotation attribute\r\n", tag);
+			 "%s BAD Missing metadata entry\r\n", tag);
 		goto baddata;
 	 }
 
-	appendstrlist(attribs, arg.s);
- }
+	 /* add the entry to the list */
+	 strarray_append(entries, arg.s);
 
- return c;
+	} while (c == ' ');
+
+	if (c != ')') {
+	 prot_printf(imapd_out,
+			"%s BAD Missing close paren in metadata entry list \r\n",
+			tag);
+	 goto baddata;
+	}
+
+	c = prot_getc(imapd_in);
+ }
+ else {
+	/* single entry -- add it to the list */
+	prot_ungetc(c, imapd_in);
+	c = getastring(imapd_in, imapd_out, &arg);
+	if (c == EOF) {
+	 prot_printf(imapd_out,
+			"%s BAD Missing metadata entry\r\n", tag);
+	 goto baddata;
+	}
+
+	strarray_append(entries, arg.s);
+	*was_singlep = 1;
+ }
+
+ if (c == ' ' || c == '\r') return c;
 
 baddata:
 if (c != EOF) prot_ungetc(c, imapd_in);
@@ -7304,9 +8858,16 @@
 * This is a generic routine which parses just the annotation data.
 * Any surrounding command text must be parsed elsewhere, ie,
 * SETANNOTATION, STORE, APPEND.
+ *
+ * Also parse RFC5257 per-message annotation store data, which
+ * is almost identical but differs in that entry names and attrib
+ * names are astrings rather than strings, and that the whole set
+ * of data *must* be enclosed in parentheses.
 */
 
-int getannotatestoredata(char *tag, struct entryattlist **entryatts)
+static int parse_annotate_store_data(const char *tag,
+				 int permessage_flag,
+				 struct entryattlist **entryatts)
 {
 int c, islist = 0;
 static struct buf entry, attrib, value;
@@ -7324,6 +8885,11 @@
 	/* entry list */
 	islist = 1;
 }
+ else if (permessage_flag) {
+	prot_printf(imapd_out,
+		 "%s BAD Missing paren for annotation entry\r\n", tag);
+	goto baddata;
+ }
 else {
 	/* single entry -- put the char back */
 	prot_ungetc(c, imapd_in);
@@ -7331,7 +8897,10 @@
 
 do {
 	/* get entry */
-	c = getqstring(imapd_in, imapd_out, &entry);
+	if (permessage_flag)
+	 c = getastring(imapd_in, imapd_out, &entry);
+	else
+	 c = getqstring(imapd_in, imapd_out, &entry);
 	if (c == EOF) {
 	 prot_printf(imapd_out,
 			"%s BAD Missing annotation entry\r\n", tag);
@@ -7348,7 +8917,10 @@
 
 	do {
 	 /* get attrib */
-	 c = getqstring(imapd_in, imapd_out, &attrib);
+	 if (permessage_flag)
+		c = getastring(imapd_in, imapd_out, &attrib);
+	 else
+		c = getqstring(imapd_in, imapd_out, &attrib);
 	 if (c == EOF) {
 		prot_printf(imapd_out,
 			 "%s BAD Missing annotation attribute\r\n", tag);
@@ -7356,15 +8928,20 @@
 	 }
 
 	 /* get value */
-	 if (c != ' ' ||
-		(c = getnstring(imapd_in, imapd_out, &value)) == EOF) {
+	 if (c != ' ') {
+		prot_printf(imapd_out,
+			 "%s BAD Missing annotation value\r\n", tag);
+		goto baddata;
+	 }
+	 c = getbnstring(imapd_in, imapd_out, &value);
+	 if (c == EOF) {
 		prot_printf(imapd_out,
 			 "%s BAD Missing annotation value\r\n", tag);
 		goto baddata;
 	 }
 
 	 /* add the attrib-value pair to the list */
-	 appendattvalue(&attvalues, attrib.s, value.s);
+	 appendattvalue(&attvalues, attrib.s, &value);
 
 	} while (c == ' ');
 
@@ -7403,65 +8980,303 @@
 }
 
 /*
- * Output an entry/attribute-value list response.
+ * Parse metadata store data.
 *
- * This is a generic routine which outputs just the annotation data.
- * Any surrounding response text must be output elsewhere, ie,
- * GETANNOTATION, FETCH. 
+ * This is a generic routine which parses just the annotation data.
+ * Any surrounding command text must be parsed elsewhere, ie,
+ * SETANNOTATION, STORE, APPEND.
 */
-void annotate_response(struct entryattlist *l)
+static int parse_metadata_store_data(const char *tag,
+				 struct entryattlist **entryatts)
 {
- int islist; /* do we have more than one entry? */
+ int c;
+ const char *name;
+ const char *att;
+ static struct buf entry, value;
+ struct attvaluelist *attvalues = NULL;
+ struct entryattlist *entryp;
+ int need_add;
 
- if (!l) return;
+ *entryatts = NULL;
 
- islist = (l->next != NULL);
+ c = prot_getc(imapd_in);
+ if (c != '(') {
+	prot_printf(imapd_out,
+		 "%s BAD Missing metadata entry list\r\n", tag);
+	goto baddata;
+ }
 
- if (islist) prot_printf(imapd_out, "(");
+ do {
+	/* get entry */
+	c = getastring(imapd_in, imapd_out, &entry);
+	if (c != ' ') {
+	 prot_printf(imapd_out,
+			"%s BAD Missing metadata entry\r\n", tag);
+	 goto baddata;
+	}
+	lcase(entry.s);
 
- while (l) {
-	prot_printf(imapd_out, "\"%s\"", l->entry);
+	/* get value */
+	c = getbnstring(imapd_in, imapd_out, &value);
+	if (c == EOF) {
+	 prot_printf(imapd_out,
+			"%s BAD Missing metadata value\r\n", tag);
+	 goto baddata;
+	}
 
-	/* do we have attributes? solicited vs. unsolicited */
-	if (l->attvalues) {
-	 struct attvaluelist *av = l->attvalues;
-
-	 prot_printf(imapd_out, " (");
-	 while (av) {
-		prot_printf(imapd_out, "\"%s\" ", av->attrib);
-		if (!strcasecmp(av->value, "NIL"))
-		 prot_printf(imapd_out, "NIL");
-		else
-		 prot_printf(imapd_out, "\"%s\"", av->value);
+	if (!strncmp(entry.s, "/private", 8) &&
+	 (entry.s8 == '\0' || entry.s8 == '/')) {
+	 att = "value.priv";
+	 name = entry.s + 8;
+	}
+	else if (!strncmp(entry.s, "/shared", 7) &&
+	 (entry.s7 == '\0' || entry.s7 == '/')) {
+	 att = "value.shared";
+	 name = entry.s + 7;
+	}
+	else {
+	 prot_printf(imapd_out,
+			"%s BAD entry must begin with /shared or /private\r\n",
+			tag);
+	 goto baddata;
+	}
 
-		if ((av = av->next) == NULL)
-		 prot_printf(imapd_out, ")");
-		else
-		 prot_printf(imapd_out, " ");
-	 }
+	need_add = 1;
+	for (entryp = *entryatts; entryp; entryp = entryp->next) {
+	 if (strcmp(entryp->entry, name)) continue;
+	 /* it's a match, have to append! */
+	 appendattvalue(&entryp->attvalues, att, &value);
+	 need_add = 0;
+	 break;
+	}
+	if (need_add) {
+	 appendattvalue(&attvalues, att, &value);
+	 appendentryatt(entryatts, name, attvalues);
+	 attvalues = NULL;
 	}
+ } while (c == ' ');
 
-	if ((l = l->next) != NULL)
-	 prot_printf(imapd_out, " ");
+ if (c != ')') {
+	prot_printf(imapd_out,
+		 "%s BAD Missing close paren in annotation entry list \r\n",
+		 tag);
+	goto baddata;
+ }
+
+ c = prot_getc(imapd_in);
+
+ return c;
+
+ baddata:
+ if (attvalues) freeattvalues(attvalues);
+ if (c != EOF) prot_ungetc(c, imapd_in);
+ return EOF;
+}
+
+static void getannotation_response(const char *mboxname,
+			 uint32_t uid
+					__attribute__((unused)),
+				 const char *entry,
+				 struct attvaluelist *attvalues,
+				 void *rock __attribute__((unused)))
+{
+ int sep = '(';
+ struct attvaluelist *l;
+ char ext_mboxnameMAX_MAILBOX_BUFFER;
+
+ imapd_namespace.mboxname_toexternal(&imapd_namespace, mboxname,
+					imapd_userid, ext_mboxname);
+
+ prot_printf(imapd_out, "* ANNOTATION ");
+ prot_printastring(imapd_out, ext_mboxname);
+ prot_putc(' ', imapd_out);
+ prot_printstring(imapd_out, entry);
+ prot_putc(' ', imapd_out);
+ for (l = attvalues ; l ; l = l->next) {
+	prot_putc(sep, imapd_out);
+	sep = ' ';
+	prot_printstring(imapd_out, l->attrib);
+	prot_putc(' ', imapd_out);
+	prot_printmap(imapd_out, l->value.s, l->value.len);
+ }
+ prot_printf(imapd_out, ")\r\n");
+}
+
+struct annot_fetch_rock
+{
+ strarray_t *entries;
+ strarray_t *attribs;
+ annotate_fetch_cb_t callback;
+ int *sizeptr;
+};
+
+static int annot_fetch_cb(annotate_state_t *astate, void *rock)
+{
+ struct annot_fetch_rock *arock = rock;
+ return annotate_state_fetch(astate, arock->entries, arock->attribs,
+			 arock->callback, NULL, arock->sizeptr);
+}
+
+struct annot_store_rock
+{
+ struct entryattlist *entryatts;
+};
+
+static int annot_store_cb(annotate_state_t *astate, void *rock)
+{
+ struct annot_store_rock *arock = rock;
+ return annotate_state_store(astate, arock->entryatts);
+}
+
+/*
+ * Common code used to apply a function to every mailbox which matches
+ * a mailbox pattern, with an annotate_state_t* set up to point to the
+ * mailbox.
+ */
+
+struct apply_rock {
+ annotate_state_t *state;
+ int (*proc)(annotate_state_t *, void *data);
+ void *data;
+ char lastnameMAX_MAILBOX_PATH+1;
+ int sawuser;
+ unsigned int nseen;
+};
+
+static int apply_cb(char *name, int matchlen,
+		 int maycreate __attribute__((unused)), void* rock)
+{
+ struct apply_rock *arock = (struct apply_rock *)rock;
+ annotate_state_t *state = arock->state;
+ mbentry_t *mbentry = NULL;
+ char int_mboxnameMAX_MAILBOX_BUFFER;
+ int r;
+
+ /* Suppress any output of a partial match */
+ if (namematchlen && strncmp(arock->lastname, name, matchlen) == 0)
+	return 0;
+
+ /*
+ * We can get a partial match for "user" multiple times with
+ * other matches inbetween. Handle it as a special case
+ */
+ if (matchlen == 4 && strncasecmp(name, "user", 4) == 0) {
+	if (arock->sawuser)
+	 return 0;
+	arock->sawuser = 1;
+ }
+
+ strlcpy(arock->lastname, name, sizeof(arock->lastname));
+ arock->lastnamematchlen = '\0';
+
+ if (!strncasecmp(arock->lastname, "INBOX", 5)) {
+	imapd_namespace.mboxname_tointernal(&imapd_namespace, "INBOX",
+					 imapd_userid, int_mboxname);
+	strlcat(int_mboxname, arock->lastname+5, sizeof(int_mboxname));
+ }
+ else
+	strlcpy(int_mboxname, arock->lastname, sizeof(int_mboxname));
+
+ r = 0;
+ if (mboxlist_lookup(int_mboxname, &mbentry, NULL))
+	goto out;
+
+ r = annotate_state_set_mailbox_mbe(state, mbentry);
+ if (r)
+	goto out;
+
+ r = arock->proc(state, arock->data);
+ arock->nseen++;
+
+out:
+ mboxlist_entry_free(&mbentry);
+ return r;
+}
+
+static int apply_mailbox_pattern(annotate_state_t *state,
+				 const char *pattern,
+				 int (*proc)(annotate_state_t *, void *),
+				 void *data)
+{
+ struct apply_rock arock;
+ char mboxpatMAX_MAILBOX_BUFFER;
+ int r = 0;
+
+ memset(&arock, 0, sizeof(arock));
+ arock.state = state;
+ arock.proc = proc;
+ arock.data = data;
+
+ /* copy the pattern so we can change hiersep */
+ strlcpy(mboxpat, pattern, sizeof(mboxpat));
+ mboxname_hiersep_tointernal(&imapd_namespace, mboxpat,
+				config_virtdomains ?
+				strcspn(mboxpat, "@") : 0);
+
+ r = imapd_namespace.mboxlist_findall(&imapd_namespace,
+					 mboxpat,
+					 imapd_userisadmin || imapd_userisproxyadmin,
+					 imapd_userid,
+					 imapd_authstate,
+					 apply_cb, &arock);
+
+ if (!r && !arock.nseen)
+	r = IMAP_MAILBOX_NONEXISTENT;
+
+ return r;
+}
+
+static int apply_mailbox_array(annotate_state_t *state,
+			 const strarray_t *mboxes,
+			 int (*proc)(annotate_state_t *, void *),
+			 void *rock)
+{
+ int i;
+ mbentry_t *mbentry = NULL;
+ char int_mboxnameMAX_MAILBOX_BUFFER;
+ int r = 0;
+
+ for (i = 0 ; i < mboxes->count ; i++) {
+	imapd_namespace.mboxname_tointernal(&imapd_namespace,
+					 mboxes->datai,
+					 imapd_userid,
+					 int_mboxname);
+	r = mboxlist_lookup(int_mboxname, &mbentry, NULL);
+	if (r)
+	 break;
+
+	r = annotate_state_set_mailbox_mbe(state, mbentry);
+	if (r)
+	 break;
+
+	r = proc(state, rock);
+	if (r)
+	 break;
+
+	mboxlist_entry_free(&mbentry);
 }
 
- if (islist) prot_printf(imapd_out, ")");
+ mboxlist_entry_free(&mbentry);
+ return r;
 }
 
+
 /*
 * Perform a GETANNOTATION command
 *
 * The command has been parsed up to the entries
- */ 
-void cmd_getannotation(char *tag, char *mboxpat)
+ */
+static void cmd_getannotation(const char *tag, char *mboxpat)
 {
 int c, r = 0;
- struct strlist *entries = NULL, *attribs = NULL;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ annotate_state_t *astate = NULL;
 
- c = getannotatefetchdata(tag, &entries, &attribs);
+ c = parse_annotate_fetch_data(tag, /*permessage_flag*/0, &entries, &attribs);
 if (c == EOF) {
 	eatline(imapd_in, c);
-	return;
+	goto freeargs;
 }
 
 /* check for CRLF */
@@ -7474,9 +9289,26 @@
 	goto freeargs;
 }
 
- r = annotatemore_fetch(mboxpat, entries, attribs, &imapd_namespace,
-			 imapd_userisadmin || imapd_userisproxyadmin,
-			 imapd_userid, imapd_authstate, imapd_out);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate,
+			 imapd_userisadmin || imapd_userisproxyadmin,
+			 imapd_userid, imapd_authstate);
+ if (!*mboxpat) {
+	r = annotate_state_set_server(astate);
+	if (!r)
+	 r = annotate_state_fetch(astate, &entries, &attribs,
+				 getannotation_response, NULL, 0);
+ }
+ else {
+	struct annot_fetch_rock arock;
+	arock.entries = &entries;
+	arock.attribs = &attribs;
+	arock.callback = getannotation_response;
+	arock.sizeptr = NULL;
+	r = apply_mailbox_pattern(astate, mboxpat, annot_fetch_cb, &arock);
+ }
+ /* we didn't write anything */
+ annotate_state_abort(&astate);
 
 imapd_check(NULL, 0);
 
@@ -7487,27 +9319,327 @@
 		 tag, error_message(IMAP_OK_COMPLETED));
 }
 
- freeargs:
- if (entries) freestrlist(entries);
- if (attribs) freestrlist(attribs);
+ freeargs:
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+}
+
+static void getmetadata_response(const char *mboxname,
+			 uint32_t uid
+				 __attribute__((unused)),
+				 const char *entry,
+				 struct attvaluelist *attvalues,
+				 void *rock __attribute__((unused)))
+{
+ int sep = '(';
+ struct attvaluelist *l;
+ struct buf mentry = BUF_INITIALIZER;
+ char ext_mboxnameMAX_MAILBOX_BUFFER;
+
+ imapd_namespace.mboxname_toexternal(&imapd_namespace, mboxname,
+					imapd_userid, ext_mboxname);
+
+ prot_printf(imapd_out, "* METADATA ");
+ prot_printastring(imapd_out, ext_mboxname);
+ prot_putc(' ', imapd_out);
+ for (l = attvalues ; l ; l = l->next) {
+	/* check if it's a value we print... */
+	buf_reset(&mentry);
+	if (!strcmp(l->attrib, "value.shared"))
+	 buf_appendcstr(&mentry, "/shared");
+	else if (!strcmp(l->attrib, "value.priv"))
+	 buf_appendcstr(&mentry, "/private");
+	else
+	 continue;
+	buf_appendcstr(&mentry, entry);
+	buf_cstring(&mentry);
+
+	prot_putc(sep, imapd_out);
+	sep = ' ';
+	prot_printastring(imapd_out, mentry.s);
+	prot_putc(' ', imapd_out);
+	prot_printmap(imapd_out, l->value.s, l->value.len);
+ }
+ prot_printf(imapd_out, ")\r\n");
+ buf_free(&mentry);
+}
+
+struct getmetadata_options
+{
+ int maxsize;
+ int depth;
+};
+
+static int parse_getmetadata_options(const strarray_t *sa,
+				 struct getmetadata_options *opts)
+{
+ int i;
+ int n = 0;
+ struct getmetadata_options dummy;
+
+ if (!opts) opts = &dummy;
+
+ for (i = 0 ; i < sa->count ; i+=2) {
+	const char *option = sa->datai;
+	const char *value = sa->datai+1;
+	if (!value)
+	 return -1;
+	if (!strcasecmp(option, "MAXSIZE")) {
+	 char *end = NULL;
+	 opts->maxsize = strtoul(value, &end, 10);
+	 if (!end || *end || end == value)
+		return -1;
+	 n++;
+	}
+	else if (!strcasecmp(option, "DEPTH")) {
+	 if (!strcmp(value, "0"))
+		opts->depth = 0;
+	 else if (!strcmp(value, "1"))
+		opts->depth = 1;
+	 else if (!strcasecmp(value, "infinity"))
+		opts->depth = -1;
+	 else
+		return -1;
+	 n++;
+	}
+	else {
+	 return 0;
+	}
+ }
+
+ return n;
+}
+
+/*
+ * Perform a GETMETADATA command
+ *
+ * The command has been parsed up to the mailbox
+ */
+static void cmd_getmetadata(const char *tag)
+{
+ int c, r = 0;
+ strarray_t lists3 = { STRARRAY_INITIALIZER,
+			 STRARRAY_INITIALIZER,
+			 STRARRAY_INITIALIZER };
+ int was_single3 = { 0, 0, 0 };
+ int nlists = 0;
+ strarray_t *options = NULL;
+ strarray_t *mboxes = NULL;
+ strarray_t *entries = NULL;
+ strarray_t newe = STRARRAY_INITIALIZER;
+ strarray_t newa = STRARRAY_INITIALIZER;
+ struct buf arg1 = BUF_INITIALIZER;
+ int mbox_is_pattern = 0;
+ struct getmetadata_options opts;
+ int basesize = 0;
+ int *sizeptr = NULL;
+ int have_shared = 0;
+ int have_private = 0;
+ int i;
+ annotate_state_t *astate = NULL;
+
+ opts.maxsize = -1;
+ opts.depth = 0;
+
+ while (nlists < 3)
+ {
+	c = parse_metadata_string_or_list(tag, &listsnlists, &was_singlenlists);
+	if (c == EOF)
+	 goto missingargs;
+	nlists++;
+	if (c == '\r')
+	 break;
+ }
+
+ /* check for CRLF */
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out,
+		 "%s BAD Unexpected extra arguments to Getannotation\r\n",
+		 tag);
+	eatline(imapd_in, c);
+	goto freeargs;
+ }
+
+ /*
+ * We have three strings or lists of strings. Now to figure out
+ * what's what. We have two complicating factors. First, due to
+ * a erratum in RFC5464 and our earlier misreading of the document,
+ * we historically supported specifying the options *after* the
+ * mailbox name. Second, we have for a few months now supported
+ * a non-standard extension where a list of mailbox names could
+ * be supplied instead of just a single one. So we have to apply
+ * some rules. We support the following syntaxes:
+ *
+ * --- no options
+ * mailbox entry
+ * mailbox (entries)
+ * (mailboxes) entry
+ * (mailboxes) (entries)
+ *
+ * --- options in the correct place (per the ABNF in RFC5464)
+ * (options) mailbox entry
+ * (options) mailbox (entries)
+ * (options) (mailboxes) entry
+ * (options) (mailboxes) (entries)
+ *
+ * --- options in the wrong place (per the examples in RFC5464)
+ * mailbox (options) entry
+ * mailbox (options) (entries)
+ * (mailboxes) (options) entry
+ * (mailboxes) (options) (entries)
+ */
+ if (nlists < 2)
+	goto missingargs;
+ entries = &listsnlists-1;	 /* entries always last */
+ if (nlists == 2) {
+	/* no options */
+	mboxes = &lists0;
+	mbox_is_pattern = was_single0;
+ }
+ if (nlists == 3) {
+	/* options, either before or after */
+	int r0 = (parse_getmetadata_options(&lists0, NULL) > 0);
+	int r1 = (parse_getmetadata_options(&lists1, NULL) > 0);
+	switch ((r1<<1)|r0) {
+	case 0:
+	 /* neither are valid options */
+	 goto missingargs;
+	case 1:
+	 /* (options) (mailboxes) */
+	 options = &lists0;
+	 mboxes = &lists1;
+	 mbox_is_pattern = was_single1;
+	 break;
+	case 2:
+	 /* (mailboxes) (options) */
+	 mboxes = &lists0;
+	 mbox_is_pattern = was_single0;
+	 options = &lists1;
+	 break;
+	case 3:
+	 /* both appear like valid options */
+	 prot_printf(imapd_out,
+			"%s BAD Too many option lists for Getmetadata\r\n",
+			tag);
+	 eatline(imapd_in, c);
+	 goto freeargs;
+	}
+ }
 
+ if (options) {
+	parse_getmetadata_options(options, &opts);
+	if (opts.maxsize >= 0)
+	 sizeptr = &opts.maxsize;
+ }
+
+ /* we need to rewrite the entries and attribs to match the way that
+ * the old annotation system works. */
+ for (i = 0 ; i < entries->count ; i++) {
+	char *ent = entries->datai;
+	char entryMAX_MAILBOX_NAME;
+
+	lcase(ent);
+	/* there's no way to perfect this - unfortunately - the old style
+	 * syntax doesn't support everything. XXX - will be nice to get
+	 * rid of this... */
+	if (!strncmp(ent, "/private", 8) &&
+	 (ent8 == '\0' || ent8 == '/')) {
+	 xstrncpy(entry, ent + 8, MAX_MAILBOX_NAME);
+	 have_private = 1;
+	}
+	else if (!strncmp(ent, "/shared", 7) &&
+	 (ent7 == '\0' || ent7 == '/')) {
+	 xstrncpy(entry, ent + 7, MAX_MAILBOX_NAME);
+	 have_shared = 1;
+	}
+	else {
+	 prot_printf(imapd_out,
+			"%s BAD entry must begin with /shared or /private\r\n",
+			tag);
+	 goto freeargs;
+	}
+	strarray_append(&newe, entry);
+	if (opts.depth == 1) {
+	 strncat(entry, "/%", MAX_MAILBOX_NAME);
+	 strarray_append(&newe, entry);
+	}
+	else if (opts.depth == -1) {
+	 strncat(entry, "/*", MAX_MAILBOX_NAME);
+	 strarray_append(&newe, entry);
+	}
+ }
+
+ if (have_private) strarray_append(&newa, "value.priv");
+ if (have_shared) strarray_append(&newa, "value.shared");
+
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate,
+			 imapd_userisadmin || imapd_userisproxyadmin,
+			 imapd_userid, imapd_authstate);
+ basesize = opts.maxsize;
+ if (!mboxes->count || !strcmpsafe(mboxes->data0, NULL)) {
+	r = annotate_state_set_server(astate);
+	if (!r)
+	 r = annotate_state_fetch(astate, &newe, &newa,
+				 getmetadata_response, NULL, sizeptr);
+ }
+ else {
+	struct annot_fetch_rock arock;
+	arock.entries = &newe;
+	arock.attribs = &newa;
+	arock.callback = getmetadata_response;
+	arock.sizeptr = sizeptr;
+	if (mbox_is_pattern)
+	 r = apply_mailbox_pattern(astate, mboxes->data0, annot_fetch_cb, &arock);
+	else
+	 r = apply_mailbox_array(astate, mboxes, annot_fetch_cb, &arock);
+ }
+ /* we didn't write anything */
+ annotate_state_abort(&astate);
+
+ imapd_check(NULL, 0);
+
+ if (r) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+ } else if (sizeptr && *sizeptr > basesize) {
+	prot_printf(imapd_out, "%s OK METADATA LONGENTRIES %d %s\r\n",
+		 tag, *sizeptr, error_message(IMAP_OK_COMPLETED));
+ } else {
+	prot_printf(imapd_out, "%s OK %s\r\n",
+		 tag, error_message(IMAP_OK_COMPLETED));
+ }
+
+ freeargs:
+ strarray_fini(&lists0);
+ strarray_fini(&lists1);
+ strarray_fini(&lists2);
+ strarray_fini(&newe);
+ strarray_fini(&newa);
+ buf_free(&arg1);
 return;
+
+missingargs:
+ prot_printf(imapd_out, "%s BAD Missing arguments to Getmetadata\r\n", tag);
+ eatline(imapd_in, c);
+ goto freeargs;
 }
 
 /*
 * Perform a SETANNOTATION command
 *
 * The command has been parsed up to the entry-att list
- */ 
-void cmd_setannotation(char *tag, char *mboxpat)
+ */
+static void cmd_setannotation(const char *tag, char *mboxpat)
 {
 int c, r = 0;
 struct entryattlist *entryatts = NULL;
+ annotate_state_t *astate = NULL;
 
- c = getannotatestoredata(tag, &entryatts);
+ c = parse_annotate_store_data(tag, 0, &entryatts);
 if (c == EOF) {
 	eatline(imapd_in, c);
-	return;
+	goto freeargs;
 }
 
 /* check for CRLF */
@@ -7520,9 +9652,25 @@
 	goto freeargs;
 }
 
- r = annotatemore_store(mboxpat,
-			 entryatts, &imapd_namespace, imapd_userisadmin,
-			 imapd_userid, imapd_authstate);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, imapd_userisadmin,
+			 imapd_userid, imapd_authstate);
+ if (!r) {
+	if (!*mboxpat) {
+	 r = annotate_state_set_server(astate);
+	 if (!r)
+		r = annotate_state_store(astate, entryatts);
+	}
+	else {
+	 struct annot_store_rock arock;
+	 arock.entryatts = entryatts;
+	 r = apply_mailbox_pattern(astate, mboxpat, annot_store_cb, &arock);
+	}
+ }
+ if (!r)
+	annotate_state_commit(&astate);
+ else
+	annotate_state_abort(&astate);
 
 imapd_check(NULL, 0);
 
@@ -7535,560 +9683,323 @@
 
 freeargs:
 if (entryatts) freeentryatts(entryatts);
- return;
 }
 
 /*
- * Parse search return options
+ * Perform a SETMETADATA command
+ *
+ * The command has been parsed up to the entry-att list
 */
-int getsearchreturnopts(char *tag, struct searchargs *searchargs)
+static void cmd_setmetadata(const char *tag, char *mboxpat)
 {
- int c;
- static struct buf opt;
+ int c, r = 0;
+ struct entryattlist *entryatts = NULL;
+ annotate_state_t *astate = NULL;
 
- c = prot_getc(imapd_in);
- if (c != '(') {
- prot_printf(imapd_out,
- "%s BAD Missing return options in Search\r\n", tag);
- return EOF;
+ c = parse_metadata_store_data(tag, &entryatts);
+ if (c == EOF) {
+	eatline(imapd_in, c);
+	goto freeargs;
 }
 
- do {
- c = getword(imapd_in, &opt);
- if (!opt.s0) break;
+ /* check for CRLF */
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out,
+		 "%s BAD Unexpected extra arguments to Setmetadata\r\n",
+		 tag);
+	eatline(imapd_in, c);
+	goto freeargs;
+ }
 
- lcase(opt.s);
- if (!strcmp(opt.s, "min")) {
- searchargs->returnopts |= SEARCH_RETURN_MIN;
- }
- else if (!strcmp(opt.s, "max")) {
- searchargs->returnopts |= SEARCH_RETURN_MAX;
- }
- else if (!strcmp(opt.s, "all")) {
- searchargs->returnopts |= SEARCH_RETURN_ALL;
- }
- else if (!strcmp(opt.s, "count")) {
- searchargs->returnopts |= SEARCH_RETURN_COUNT;
- }
- else {
- prot_printf(imapd_out,
-			"%s BAD Invalid Search return option %s\r\n",
- tag, opt.s);
- return EOF;
- }
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate, imapd_userisadmin,
+			 imapd_userid, imapd_authstate);
+ if (!r) {
+	if (!*mboxpat) {
+	 r = annotate_state_set_server(astate);
+	 if (!r)
+		r = annotate_state_store(astate, entryatts);
+	}
+	else {
+	 struct annot_store_rock arock;
+	 arock.entryatts = entryatts;
+	 r = apply_mailbox_pattern(astate, mboxpat, annot_store_cb, &arock);
+	}
+ }
+ if (!r)
+	r = annotate_state_commit(&astate);
+ else
+	annotate_state_abort(&astate);
 
- } while (c == ' ');
+ imapd_check(NULL, 0);
 
- if (c != ')') {
- prot_printf(imapd_out,
- "%s BAD Missing close parenthesis in Search\r\n", tag);
- return EOF;
+ if (r) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+ } else {
+	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		 error_message(IMAP_OK_COMPLETED));
 }
 
- c = prot_getc(imapd_in);
-
- return c;
+ freeargs:
+ if (entryatts) freeentryatts(entryatts);
+ return;
 }
 
-/*
- * Parse a search program
- */
-int getsearchprogram(char *tag, struct searchargs *searchargs,
-		 int *charsetp, int is_search_cmd)
+
+static void cmd_xrunannotator(const char *tag, const char *sequence,
+			 int usinguid)
 {
- int c;
- int searchstate = 0;
+ const char *cmd = usinguid ? "UID Xrunannotator" : "Xrunannotator";
+ clock_t start = clock();
+ char mytime100;
+ int c, r = 0;
 
- if (is_search_cmd)
-	searchstate |= GETSEARCH_CHARSET|GETSEARCH_RETURN;
+ if (backend_current) {
+	/* remote mailbox */
+	prot_printf(backend_current->out, "%s %s %s ", tag, cmd, sequence);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
+	}
+	return;
+ }
 
- do {
-	c = getsearchcriteria(tag, searchargs, charsetp, &searchstate);
- } while (c == ' ');
- return c;
-}
+ /* local mailbox */
 
-/*
- * Parse a search criteria
- */
-int getsearchcriteria(char *tag, struct searchargs *searchargs,
-		 int *charsetp, int *searchstatep)
-{
- static struct buf criteria, arg;
- struct searchargs *sub1, *sub2;
- char *p, *str;
- int c, flag;
- unsigned size;
- time_t start, end, now = time(0);
- int keep_charset = 0;
+ /* we're expecting no more arguments */
+ c = prot_getc(imapd_in);
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') {
+	prot_printf(imapd_out, "%s BAD Unexpected extra arguments to %s\r\n", tag, cmd);
+	eatline(imapd_in, c);
+	return;
+ }
 
- c = getword(imapd_in, &criteria);
- lcase(criteria.s);
- switch (criteria.s0) {
- case '\0':
-	if (c != '(') goto badcri;
-	c = getsearchprogram(tag, searchargs, charsetp, 0);
-	if (c == EOF) return EOF;
-	if (c != ')') {
-	 prot_printf(imapd_out, "%s BAD Missing required close paren in Search command\r\n",
-		 tag);
-	 if (c != EOF) prot_ungetc(c, imapd_in);
-	 return EOF;
-	}
-	c = prot_getc(imapd_in);
-	break;
+ r = index_run_annotator(imapd_index, sequence, usinguid,
+			 &imapd_namespace, imapd_userisadmin);
 
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- case '*':
-	if (imparse_issequence(criteria.s)) {
-	 appendsequencelist(imapd_index, &searchargs->sequence, criteria.s, 0);
-	}
-	else goto badcri;
-	break;
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
 
- case 'a':
-	if (!strcmp(criteria.s, "answered")) {
-	 searchargs->system_flags_set |= FLAG_ANSWERED;
-	}
-	else if (!strcmp(criteria.s, "all")) {
-	 break;
-	}
-	else goto badcri;
-	break;
+ if (r)
+	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+		 error_message(r), mytime);
+ else
+	prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
+		 error_message(IMAP_OK_COMPLETED), mytime);
+}
 
- case 'b':
-	if (!strcmp(criteria.s, "before")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->before || searchargs->before > start) {
-		searchargs->before = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "bcc")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->bcc, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else if (!strcmp(criteria.s, "body")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->body, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else goto badcri;
-	break;
 
- case 'c':
-	if (!strcmp(criteria.s, "cc")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->cc, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else if ((*searchstatep & GETSEARCH_CHARSET)
-	 && !strcmp(criteria.s, "charset")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c != ' ') goto missingarg;
-	 lcase(arg.s);
-	 *charsetp = charset_lookupname(arg.s);
-	}
-	else goto badcri;
-	break;
+static void cmd_xwarmup(const char *tag)
+{
+ const char *cmd = "Xwarmup";
+ clock_t start = clock();
+ char mytime100;
+ struct buf arg = BUF_INITIALIZER;
+ int warmup_flags = 0;
+ struct seqset *uids = NULL;
+ /* We deal with the mboxlist API instead of the index_state API or
+ * mailbox API to avoid the overhead of index_open(), which will
+ * block while reading all the cyrus.index...we want to be
+ * non-blocking */
+ struct mboxlist_entry *mbentry = NULL;
+ int myrights;
+ int c, r = 0;
+ char mboxnameMAX_MAILBOX_BUFFER;
 
- case 'd':
-	if (!strcmp(criteria.s, "deleted")) {
-	 searchargs->system_flags_set |= FLAG_DELETED;
-	}
-	else if (!strcmp(criteria.s, "draft")) {
-	 searchargs->system_flags_set |= FLAG_DRAFT;
-	}
-	else goto badcri;
-	break;
+ /* parse arguments: expect <mboxname> '('<warmup-items>')' */
 
- case 'f':
-	if (!strcmp(criteria.s, "flagged")) {
-	 searchargs->system_flags_set |= FLAG_FLAGGED;
-	}
-	else if (!strcmp(criteria.s, "from")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->from, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else goto badcri;
-	break;
+ c = getastring(imapd_in, imapd_out, &arg);
+ if (c != ' ') {
+syntax_error:
+	prot_printf(imapd_out, "%s BAD syntax error in %s\r\n", tag, cmd);
+	eatline(imapd_in, c);
+	goto out_noprint;
+ }
 
- case 'h':
-	if (!strcmp(criteria.s, "header")) {
-	 struct strlist **patlist;
+ r = imapd_namespace.mboxname_tointernal(&imapd_namespace, arg.s,
+					 imapd_userid, mboxname);
+ if (r) {
+	prot_printf(imapd_out, "%s BAD Invalid mboxname in %s\r\n", tag, cmd);
+	eatline(imapd_in, c);
+	goto out_noprint;
+ }
 
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c != ' ') goto missingarg;
-	 lcase(arg.s);
+ r = mboxlist_lookup(mboxname, &mbentry, NULL);
+ if (r) goto out;
 
-	 /* some headers can be reduced to search terms */
- if (!strcmp(arg.s, "bcc")) {
- patlist = &searchargs->bcc;
- }
- else if (!strcmp(arg.s, "cc")) {
-		patlist = &searchargs->cc;
- }
-	 else if (!strcmp(arg.s, "to")) {
-		patlist = &searchargs->to;
- }
-	 else if (!strcmp(arg.s, "from")) {
-		patlist = &searchargs->from;
- }
-	 else if (!strcmp(arg.s, "subject")) {
-		patlist = &searchargs->subject;
- }
-
-	 /* we look message-id up in the envelope */
-	 else if (!strcmp(arg.s, "message-id")) {
-		patlist = &searchargs->messageid;
-	 }
+ /* Do a permissions check to avoid server DoS opportunity. But we
+ * only need read permission to warmup a mailbox. Also, be careful
+ * to avoid telling the client about the existance of mailboxes to
+ * which he doesn't have LOOKUP rights. */
+ r = IMAP_PERMISSION_DENIED;
+ myrights = (mbentry->acl ? cyrus_acl_myrights(imapd_authstate, mbentry->acl) : 0);
+ if (imapd_userisadmin)
+	r = 0;
+ else if (!(myrights & ACL_LOOKUP))
+	r = IMAP_MAILBOX_NONEXISTENT;
+ else if (myrights & ACL_READ)
+	r = 0;
+ if (r) goto out;
 
-	 /* all other headers we handle normally */
-	 else {
-		if (searchargs->cache_atleast < BIT32_MAX) {
-		 bit32 this_ver =
-			mailbox_cached_header(arg.s);
-		 if(this_ver > searchargs->cache_atleast)
-			searchargs->cache_atleast = this_ver;
-		}
-		appendstrlist(&searchargs->header_name, arg.s);
-		patlist = &searchargs->header;
-	 }
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	/* remote mailbox */
+	struct backend *be;
 
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(patlist, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
+	be = proxy_findserver(mbentry->server, &imap_protocol,
+			 proxy_userid, &backend_cached,
+			 &backend_current, &backend_inbox, imapd_in);
+	if (!be) {
+	 r = IMAP_SERVER_UNAVAILABLE;
+	 goto out;
 	}
-	else goto badcri;
-	break;
 
- case 'k':
-	if (!strcmp(criteria.s, "keyword")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 if (!imparse_isatom(arg.s)) goto badflag;
-	 lcase(arg.s);
-	 for (flag=0; flag < MAX_USER_FLAGS; flag++) {
-		if (imapd_index->mailbox->flagnameflag &&
-		 !strcasecmp(imapd_index->mailbox->flagnameflag, arg.s)) break;
-	 }
-	 if (flag == MAX_USER_FLAGS) {
-		/* Force failure */
-		searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-		break;
-	 }
-	 searchargs->user_flags_setflag/32 |= 1<<(flag&31);
+	prot_printf(be->out, "%s %s %s ", tag, cmd, arg.s);
+	if (!pipe_command(backend_current, 65536)) {
+	 pipe_including_tag(backend_current, tag, 0);
 	}
-	else goto badcri;
-	break;
+	goto out;
+ }
+ /* local mailbox */
 
- case 'l':
-	if (!strcmp(criteria.s, "larger")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 size = 0;
-	 for (p = arg.s; *p && Uisdigit(*p); p++) {
-		size = size * 10 + *p - '0';
- /* if (size < 0) goto badnumber; */
-	 }
-	 if (!arg.s || *p) goto badnumber;
-	 if (size > searchargs->larger) searchargs->larger = size;
-	}
-	else goto badcri;
-	break;
+ /* parse the arguments after the mailbox */
 
- case 'm':
-	if (!strcmp(criteria.s, "modseq")) {
-	 if (c != ' ') goto missingarg;
-	 /* Check for optional search-modseq-ext */
-	 c = getqstring(imapd_in, imapd_out, &arg);
-	 if (c != EOF) {
-		if (c != ' ') goto missingarg;
+ c = prot_getc(imapd_in);
+ if (c != '(') goto syntax_error;
+
+ for (;;) {
+	c = getword(imapd_in, &arg);
+	if (arg.len) {
+	 if (!strcasecmp(arg.s, "index"))
+		warmup_flags |= WARMUP_INDEX;
+	 else if (!strcasecmp(arg.s, "conversations"))
+		warmup_flags |= WARMUP_CONVERSATIONS;
+	 else if (!strcasecmp(arg.s, "annotations"))
+		warmup_flags |= WARMUP_ANNOTATIONS;
+	 else if (!strcasecmp(arg.s, "folderstatus"))
+		warmup_flags |= WARMUP_FOLDERSTATUS;
+	 else if (!strcasecmp(arg.s, "search"))
+		warmup_flags |= WARMUP_SEARCH;
+	 else if (!strcasecmp(arg.s, "uids")) {
+		if (c != ' ') goto syntax_error;
 		c = getword(imapd_in, &arg);
-		if (c != ' ') goto missingarg;
+		if (c == EOF) goto syntax_error;
+		if (!imparse_issequence(arg.s)) goto syntax_error;
+		uids = seqset_parse(arg.s, NULL, /*maxval*/0);
+		if (!uids) goto syntax_error;
 	 }
-	 c = getword(imapd_in, &arg);
-	 for (p = arg.s; *p && Uisdigit(*p); p++) {
-		searchargs->modseq = searchargs->modseq * 10 + *p - '0';
-	 }
-	 if (!arg.s || *p) goto badnumber;
+	 else if (!strcasecmp(arg.s, "all"))
+		warmup_flags |= WARMUP_ALL;
+	 else
+		goto syntax_error;
 	}
-	else goto badcri;
-	break;
+	if (c == ')')
+	 break;
+	if (c != ' ') goto syntax_error;
+ }
 
- case 'n':
-	if (!strcmp(criteria.s, "not")) {
-	 if (c != ' ') goto missingarg;		
-	 sub1 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
-	 c = getsearchcriteria(tag, sub1, charsetp, searchstatep);
-	 if (c == EOF) {
-		freesearchargs(sub1);
-		return EOF;
-	 }
+ /* we're expecting no more arguments */
+ c = prot_getc(imapd_in);
+ if (c == '\r') c = prot_getc(imapd_in);
+ if (c != '\n') goto syntax_error;
 
-	 appendsearchargs(searchargs, sub1, (struct searchargs *)0);
-	}
-	else if (!strcmp(criteria.s, "new")) {
-	 searchargs->flags |= (SEARCH_SEEN_UNSET|SEARCH_RECENT_SET);
-	}
-	else goto badcri;
-	break;
+ r = index_warmup(mbentry, warmup_flags, uids);
 
- case 'o':
-	if (!strcmp(criteria.s, "or")) {
-	 if (c != ' ') goto missingarg;		
-	 sub1 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
-	 c = getsearchcriteria(tag, sub1, charsetp, searchstatep);
-	 if (c == EOF) {
-		freesearchargs(sub1);
-		return EOF;
-	 }
-	 if (c != ' ') goto missingarg;		
-	 sub2 = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
-	 c = getsearchcriteria(tag, sub2, charsetp, searchstatep);
-	 if (c == EOF) {
-		freesearchargs(sub1);
-		freesearchargs(sub2);
-		return EOF;
-	 }
-	 appendsearchargs(searchargs, sub1, sub2);
-	}
-	else if (!strcmp(criteria.s, "old")) {
-	 searchargs->flags |= SEARCH_RECENT_UNSET;
-	}
-	else if (!strcmp(criteria.s, "older")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 if (c == EOF || !imparse_isnumber(arg.s)) goto badinterval;
-	 start = now - atoi(arg.s);
-	 if (!searchargs->before || searchargs->before > start) {
-		searchargs->before = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "on")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->before || searchargs->before > end) {
-		searchargs->before = end;
-	 }
-	 if (!searchargs->after || searchargs->after < start) {
-		searchargs->after = start;
-	 }
-	}
-	else goto badcri;
-	break;
+out:
+ snprintf(mytime, sizeof(mytime), "%2.3f",
+	 (clock() - start) / (double) CLOCKS_PER_SEC);
 
- case 'r':
-	if (!strcmp(criteria.s, "recent")) {
-	 searchargs->flags |= SEARCH_RECENT_SET;
-	}
-	else if ((*searchstatep & GETSEARCH_RETURN) && 
-		 !strcmp(criteria.s, "return")) {
-	 c = getsearchreturnopts(tag, searchargs);
-	 if (c == EOF) return EOF;
-	 keep_charset = 1;
-	}
-	else goto badcri;
-	break;
+ if (r)
+	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+		 error_message(r), mytime);
+ else
+	prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
+		 error_message(IMAP_OK_COMPLETED), mytime);
 
- case 's':
-	if (!strcmp(criteria.s, "seen")) {
-	 searchargs->flags |= SEARCH_SEEN_SET;
-	}
-	else if (!strcmp(criteria.s, "sentbefore")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->sentbefore || searchargs->sentbefore > start) {
-		searchargs->sentbefore = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "senton")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->sentbefore || searchargs->sentbefore > end) {
-		searchargs->sentbefore = end;
-	 }
-	 if (!searchargs->sentafter || searchargs->sentafter < start) {
-		searchargs->sentafter = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "sentsince")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->sentafter || searchargs->sentafter < start) {
-		searchargs->sentafter = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "since")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getsearchdate(&start, &end);
-	 if (c == EOF) goto baddate;
-	 if (!searchargs->after || searchargs->after < start) {
-		searchargs->after = start;
-	 }
-	}
-	else if (!strcmp(criteria.s, "smaller")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 size = 0;
-	 for (p = arg.s; *p && Uisdigit(*p); p++) {
-		size = size * 10 + *p - '0';
- /* if (size < 0) goto badnumber; */
-	 }
-	 if (!arg.s || *p) goto badnumber;
-	 if (size == 0) size = 1;
-	 if (!searchargs->smaller || size < searchargs->smaller)
-	 searchargs->smaller = size;
-	}
-	else if (!strcmp(criteria.s, "subject")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->subject, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else goto badcri;
-	break;
+out_noprint:
+ mboxlist_entry_free(&mbentry);
+ buf_free(&arg);
+ if (uids) seqset_free(uids);
+}
 
- case 't':
-	if (!strcmp(criteria.s, "to")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->to, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else if (!strcmp(criteria.s, "text")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getastring(imapd_in, imapd_out, &arg);
-	 if (c == EOF) goto missingarg;
-	 str = charset_convert(arg.s, *charsetp, NULL, 0);
-	 if (str) appendstrlistpat(&searchargs->text, str);
-	 else searchargs->flags = (SEARCH_RECENT_SET|SEARCH_RECENT_UNSET);
-	}
-	else goto badcri;
-	break;
+static void free_snippetargs(struct snippetargs **sap)
+{
+ while (*sap) {
+	struct snippetargs *sa = *sap;
+	*sap = sa->next;
+	free(sa->mboxname);
+	free(sa->uids.data);
+	free(sa);
+ }
+}
 
- case 'u':
-	if (!strcmp(criteria.s, "uid")) {
-	 if (c != ' ') goto missingarg;
-	 c = getword(imapd_in, &arg);
-	 if (!imparse_issequence(arg.s)) goto badcri;
-	 appendsequencelist(imapd_index, &searchargs->uidsequence, arg.s, 1);
-	}
-	else if (!strcmp(criteria.s, "unseen")) {
-	 searchargs->flags |= SEARCH_SEEN_UNSET;
-	}
-	else if (!strcmp(criteria.s, "unanswered")) {
-	 searchargs->system_flags_unset |= FLAG_ANSWERED;
-	}
-	else if (!strcmp(criteria.s, "undeleted")) {
-	 searchargs->system_flags_unset |= FLAG_DELETED;
-	}
-	else if (!strcmp(criteria.s, "undraft")) {
-	 searchargs->system_flags_unset |= FLAG_DRAFT;
-	}
-	else if (!strcmp(criteria.s, "unflagged")) {
-	 searchargs->system_flags_unset |= FLAG_FLAGGED;
-	}
-	else if (!strcmp(criteria.s, "unkeyword")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 if (!imparse_isatom(arg.s)) goto badflag;
-	 lcase(arg.s);
-	 for (flag=0; flag < MAX_USER_FLAGS; flag++) {
-		if (imapd_index->mailbox->flagnameflag &&
-		 !strcasecmp(imapd_index->mailbox->flagnameflag, arg.s)) break;
-	 }
-	 if (flag != MAX_USER_FLAGS) {
-		searchargs->user_flags_unsetflag/32 |= 1<<(flag&31);
-	 }
-	}
-	else goto badcri;
-	break;
+static int get_snippetargs(struct snippetargs **sap)
+{
+ int r;
+ int c;
+ struct snippetargs **prevp = sap;
+ struct snippetargs *sa = NULL;
+ struct buf arg = BUF_INITIALIZER;
+ uint32_t uid;
+ char mboxnameMAX_MAILBOX_NAME;
 
- case 'y':
-	if (!strcmp(criteria.s, "younger")) {
-	 if (c != ' ') goto missingarg;		
-	 c = getword(imapd_in, &arg);
-	 if (c == EOF || !imparse_isnumber(arg.s)) goto badinterval;
-	 start = now - atoi(arg.s);
-	 if (!searchargs->after || searchargs->after < start) {
-		searchargs->after = start;
-	 }
-	}
-	else goto badcri;
-	break;
+ c = prot_getc(imapd_in);
+ if (c != '(') goto syntax_error;
 
+ for (;;) {
+	c = prot_getc(imapd_in);
+	if (c == ')') break;
+	if (c != '(') goto syntax_error;
 
- default:
- badcri:
-	prot_printf(imapd_out, "%s BAD Invalid Search criteria\r\n", tag);
-	if (c != EOF) prot_ungetc(c, imapd_in);
-	return EOF;
- }
+	c = getastring(imapd_in, imapd_out, &arg);
+	if (c != ' ') goto syntax_error;
 
- if (!keep_charset)
-	*searchstatep &= ~GETSEARCH_CHARSET;
- *searchstatep &= ~GETSEARCH_RETURN;
+	r = imapd_namespace.mboxname_tointernal(&imapd_namespace, buf_cstring(&arg),
+						imapd_userid, mboxname);
+	if (r) goto out;
+
+	/* allocate a new snippetargs */
+	sa = xzmalloc(sizeof(struct snippetargs));
+	sa->mboxname = xstrdup(mboxname);
+	/* append to the list */
+	*prevp = sa;
+	prevp = &sa->next;
 
- return c;
+	c = getuint32(imapd_in, &sa->uidvalidity);
+	if (c != ' ') goto syntax_error;
 
- missingarg:
- prot_printf(imapd_out, "%s BAD Missing required argument to Search %s\r\n",
-	 tag, criteria.s);
- if (c != EOF) prot_ungetc(c, imapd_in);
- return EOF;
+	c = prot_getc(imapd_in);
+	if (c != '(') break;
+	for (;;) {
+	 c = getuint32(imapd_in, &uid);
+	 if (c != ' ' && c != ')') goto syntax_error;
+	 if (sa->uids.count + 1 > sa->uids.alloc) {
+		sa->uids.alloc += 64;
+		sa->uids.data = xrealloc(sa->uids.data,
+					 sizeof(uint32_t) * sa->uids.alloc);
+	 }
+	 sa->uids.datasa->uids.count++ = uid;
+	 if (c == ')') break;
+	}
 
- badflag:
- prot_printf(imapd_out, "%s BAD Invalid flag name %s in Search command\r\n",
-	 tag, arg.s);
- if (c != EOF) prot_ungetc(c, imapd_in);
- return EOF;
+	c = prot_getc(imapd_in);
+	if (c != ')') goto syntax_error;
+ }
 
- baddate:
- prot_printf(imapd_out, "%s BAD Invalid date in Search command\r\n", tag);
- if (c != EOF) prot_ungetc(c, imapd_in);
- return EOF;
+ c = prot_getc(imapd_in);
+ if (c != ' ') goto syntax_error;
 
- badnumber:
- prot_printf(imapd_out, "%s BAD Invalid number in Search command\r\n", tag);
- if (c != EOF) prot_ungetc(c, imapd_in);
- return EOF;
+out:
+ buf_free(&arg);
+ return c;
 
- badinterval:
- prot_printf(imapd_out, "%s BAD Invalid interval in Search command\r\n", tag);
- if (c != EOF) prot_ungetc(c, imapd_in);
- return EOF;
+syntax_error:
+ free_snippetargs(sap);
+ c = EOF;
+ goto out;
 }
 
-void cmd_dump(char *tag, char *name, int uid_start) 
+static void cmd_dump(char *tag, char *name, int uid_start)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
@@ -8116,11 +10027,10 @@
 if (mailbox) mailbox_close(&mailbox);
 }
 
-void cmd_undump(char *tag, char *name) 
+static void cmd_undump(char *tag, char *name)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
- char *acl;
 
 /* administrators only please */
 if (!imapd_userisadmin) {
@@ -8133,8 +10043,7 @@
 }
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, NULL,
-		 NULL, &acl, NULL);
+	r = mlookup(tag, name, mailboxname, NULL);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
@@ -8158,7 +10067,7 @@
 }
 }
 
-static int getresult(struct protstream *p, char *tag) 
+static int getresult(struct protstream *p, const char *tag)
 {
 char buf4096;
 char *str = (char *) buf;
@@ -8301,7 +10210,7 @@
 }
 
 static int dumpacl(struct protstream *pin, struct protstream *pout,
-		 char *mailbox, char *acl_in) 
+		 const char *mboxname, const char *acl_in) 
 {
 int r = 0;
 int c;		/* getword() returns an int */
@@ -8328,7 +10237,7 @@
 	prot_printf(pout, "%s SETACL {" SIZE_T_FMT "+}\r\n%s"
 		 " {" SIZE_T_FMT "+}\r\n%s {" SIZE_T_FMT "+}\r\n%s\r\n",
 		 tag,
-		 strlen(mailbox), mailbox,
+		 strlen(mboxname), mboxname,
 		 strlen(acl), acl,
 		 strlen(rights), rights);
 
@@ -8379,10 +10288,7 @@
 };
 
 struct xfer_item {
- char *name;
- char *part;
- char *acl;
- int mbtype;
+ mbentry_t *mbentry;
 char extnameMAX_MAILBOX_NAME;
 struct mailbox *mailbox;
 int state;
@@ -8442,9 +10348,7 @@
 item = xfer->items;
 while (item) {
 	next = item->next;
-	free(item->name);
-	free(item->part);
-	free(item->acl);
+	mboxlist_entry_free(&item->mbentry);
 	free(item);
 	item = next;
 }
@@ -8467,8 +10371,8 @@
 const char *minor;
 
 /* master branch? */
- if (strstr(be->banner, "git2.5.")) {
-	return 12;
+ if (strstr(be->banner, "git2.5")) {
+	return 13;
 }
 
 /* check for current version */
@@ -8517,7 +10421,7 @@
 
 /* Get a connection to the remote backend */
 xfer->be = backend_connect(NULL, toserver, &imap_protocol,
-			 "", NULL, NULL);
+			 "", NULL, NULL, -1);
 if (!xfer->be) {
 	r = IMAP_SERVER_UNAVAILABLE;
 	goto fail;
@@ -8545,16 +10449,12 @@
 }
 
 static void xfer_addmbox(struct xfer_header *xfer,
-			const char *mboxname, struct mboxlist_entry *entry)
+			 mbentry_t *mbentry)
 {
 struct xfer_item *item = xzmalloc(sizeof(struct xfer_item));
 
- /* make a local copy of all the interesting fields */
- item->name = xstrdup(mboxname);
- item->part = xstrdup(entry->partition);
- item->acl = xstrdup(entry->acl);
- item->mbtype = entry->mbtype;
- (*imapd_namespace.mboxname_toexternal)(&imapd_namespace, item->name,
+ item->mbentry = mbentry;
+ (*imapd_namespace.mboxname_toexternal)(&imapd_namespace, mbentry->name,
 					 imapd_userid, item->extname);
 item->mailbox = NULL;
 item->state = 0;
@@ -8581,7 +10481,7 @@
 	r = getresult(xfer->be->in, "LC1");
 	if (r) {
 	 syslog(LOG_ERR, "Could not move mailbox: %s, LOCALCREATE failed",
-		 item->name);
+		 item->mbentry->name);
 	 return r;
 	}
 
@@ -8623,6 +10523,7 @@
 r = seen_write(seendb, mailbox->uniqueid, &sd);
 
 seen_freedata(&sd);
+ seqset_free(outlist);
 
 return r;
 }
@@ -8634,12 +10535,12 @@
 
 /* Step 3: mupdate.DEACTIVATE(mailbox, newserver) */
 for (item = xfer->items; item; item = item->next) {
-	r = xfer_mupdate(xfer, 0, item->name, item->part,
-			 config_servername, item->acl);
+	r = xfer_mupdate(xfer, 0, item->mbentry->name, item->mbentry->partition,
+			 config_servername, item->mbentry->acl);
 	if (r) {
 	 syslog(LOG_ERR,
 		 "Could not move mailbox: %s, MUPDATE DEACTIVATE failed",
-		 item->name);
+		 item->mbentry->name);
 	 return r;
 	}
 
@@ -8653,26 +10554,33 @@
 {
 struct xfer_item *item;
 int r;
+ mbentry_t *newentry;
 struct mailbox *mailbox = NULL;
- char bufMAX_PARTITION_LEN+HOSTNAME_SIZE+2;
 
 for (item = xfer->items; item; item = item->next) {
-	r = mailbox_open_irl(item->name, &mailbox);
+	r = mailbox_open_irl(item->mbentry->name, &mailbox);
 	if (r) {
 	 syslog(LOG_ERR,
 		 "Failed to open mailbox %s for dump_mailbox() %s",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 return r;
 	}
 
 	/* Step 3.5: Set mailbox as MOVING on local server */
-	snprintf(buf, sizeof(buf), "%s!%s", xfer->toserver, xfer->topart);
-	r = mboxlist_update(item->name, item->mbtype|MBTYPE_MOVING,
-			 buf, item->acl, 1);
+	/* XXX - this code is awful... need a sane way to manage mbentries */
+	newentry = mboxlist_entry_create();
+	newentry->name = xstrdupnull(item->mbentry->name);
+	newentry->acl = xstrdupnull(item->mbentry->acl);
+	newentry->server = xstrdupnull(xfer->toserver);
+	newentry->partition = xstrdupnull(xfer->topart);
+	newentry->mbtype = item->mbentry->mbtype|MBTYPE_MOVING;
+	r = mboxlist_update(newentry, 1);
+	mboxlist_entry_free(&newentry);
+
 	if (r) {
 	 syslog(LOG_ERR,
 		 "Could not move mailbox: %s, mboxlist_update() failed %s",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	}
 
 	if (!r && xfer->seendb) {
@@ -8694,7 +10602,7 @@
 	 if (r) {
 		syslog(LOG_ERR,
 		 "Could not move mailbox: %s, dump_mailbox() failed %s",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 }
 	}
 
@@ -8705,7 +10613,7 @@
 	r = getresult(xfer->be->in, "D01");
 	if (r) {
 	 syslog(LOG_ERR, "Could not move mailbox: %s, UNDUMP failed %s",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 return r;
 	}
 
@@ -8714,15 +10622,15 @@
 		 item->extname);
 	if (r) {
 	 syslog(LOG_ERR, "Could not clear remote acl on %s",
-		 item->name);
+		 item->mbentry->name);
 	 return r;
 	}
 
 	r = dumpacl(xfer->be->in, xfer->be->out,
-		 item->extname, item->acl);
+		 item->extname, item->mbentry->acl);
 	if (r) {
 	 syslog(LOG_ERR, "Could not set remote acl on %s",
-		 item->name);
+		 item->mbentry->name);
 	 return r;
 	}
 
@@ -8746,7 +10654,7 @@
 	r = getresult(xfer->be->in, "MP1");
 	if (r) {
 	 syslog(LOG_ERR, "MUPDATE: can't activate mailbox entry '%s'",
-		 item->name);
+		 item->mbentry->name);
 	 return r;
 	}
 }
@@ -8756,6 +10664,7 @@
 
 static int xfer_delete(struct xfer_header *xfer)
 {
+ mbentry_t *newentry = NULL;
 struct xfer_item *item;
 int r;
 
@@ -8765,30 +10674,35 @@
 	/* Set mailbox as DELETED on local server
 	 (need to also reset to local partition,
 	 otherwise mailbox can not be opened for deletion) */
-	r = mboxlist_update(item->name, item->mbtype|MBTYPE_DELETED,
-			 item->part, item->acl, 1);
+	/* XXX - this code is awful... need a sane way to manage mbentries */
+	newentry = mboxlist_entry_create();
+	newentry->name = xstrdupnull(item->mbentry->name);
+	newentry->acl = xstrdupnull(item->mbentry->acl);
+	newentry->server = xstrdupnull(item->mbentry->server);
+	newentry->partition = xstrdupnull(item->mbentry->partition);
+	newentry->mbtype = item->mbentry->mbtype|MBTYPE_DELETED;
+	r = mboxlist_update(newentry, 1);
+	mboxlist_entry_free(&newentry);
+
 	if (r) {
 	 syslog(LOG_ERR,
 		 "Could not move mailbox: %s, mboxlist_update failed (%s)",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	}
 
 	/* Note that we do not check the ACL, and we don't update MUPDATE */
 	/* note also that we need to remember to let proxyadmins do this */
 	/* On a unified system, the subsequent MUPDATE PUSH on the remote
 	 should repopulate the local mboxlist entry */
-	r = mboxlist_deletemailbox(item->name,
+	r = mboxlist_deletemailbox(item->mbentry->name,
 				 imapd_userisadmin || imapd_userisproxyadmin,
-				 imapd_userid, imapd_authstate, 0, 1, 0);
+				 imapd_userid, imapd_authstate, NULL, 0, 1, 0);
 	if (r) {
 	 syslog(LOG_ERR,
 		 "Could not delete local mailbox during move of %s",
-		 item->name);
+		 item->mbentry->name);
 	 /* can't abort now! */
 	}
-
-	/* Delete mailbox annotations */
-	annotatemore_delete(item->name);
 }
 
 return 0;
@@ -8796,6 +10710,7 @@
 
 static void xfer_recover(struct xfer_header *xfer)
 {
+ mbentry_t *newentry = NULL;
 struct xfer_item *item;
 int r;
 
@@ -8805,12 +10720,20 @@
 	case XFER_UNDUMPED:
 	case XFER_LOCAL_MOVING:
 	 /* Unset mailbox as MOVING on local server */
-	 r = mboxlist_update(item->name, item->mbtype,
-				 item->part, item->acl, 1);
+	 /* XXX - this code is awful... need a sane way to manage mbentries */
+	 newentry = mboxlist_entry_create();
+	 newentry->name = xstrdupnull(item->mbentry->name);
+	 newentry->acl = xstrdupnull(item->mbentry->acl);
+	 newentry->server = xstrdupnull(item->mbentry->server);
+	 newentry->partition = xstrdupnull(item->mbentry->partition);
+	 newentry->mbtype = item->mbentry->mbtype;
+	 r = mboxlist_update(newentry, 1);
+	 mboxlist_entry_free(&newentry);
+
 	 if (r) {
 		syslog(LOG_ERR,
 		 "Could not back out MOVING flag during move of %s (%s)",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 }
 
 	case XFER_REMOTE_CREATED:
@@ -8822,17 +10745,17 @@
 	 if (r) {
 		syslog(LOG_ERR,
 		 "Could not back out remote mailbox during move of %s (%s)",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 }
 
 	case XFER_DEACTIVATED:
 	 /* Tell murder it's back here and active */
-	 r = xfer_mupdate(xfer, 1, item->name, item->part,
-			 config_servername, item->acl);
+	 r = xfer_mupdate(xfer, 1, item->mbentry->name, item->mbentry->partition,
+			 config_servername, item->mbentry->acl);
 	 if (r) {
 		syslog(LOG_ERR,
 		 "Could not back out mupdate during move of %s (%s)",
-		 item->name, error_message(r));
+		 item->mbentry->name, error_message(r));
 	 }
 	}
 }
@@ -8844,7 +10767,7 @@
 			void *rock) 
 {
 struct xfer_header *xfer = (struct xfer_header *)rock;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 
 /* NOTE: NOT mlookup() because we don't want to issue a referral */
@@ -8852,9 +10775,10 @@
 if (r) return r;
 
 /* Skip remote mailbox */
- if (mbentry.mbtype & MBTYPE_REMOTE) return 0;
-
- xfer_addmbox(xfer, name, &mbentry);
+ if (mbentry->mbtype & MBTYPE_REMOTE)
+	mboxlist_entry_free(&mbentry);
+ else
+	xfer_addmbox(xfer, mbentry);
 
 return 0;
 }
@@ -8884,30 +10808,26 @@
 
 static int xfer_setquotaroot(struct xfer_header *xfer, const char *mboxname)
 {
- struct quota quota;
+ struct quota q;
 int r;
 char extnameMAX_MAILBOX_NAME;
 
 (*imapd_namespace.mboxname_toexternal)(&imapd_namespace, mboxname,
 					 imapd_userid, extname);
 
- quota.root = mboxname;
- r = quota_read(&quota, NULL, 0);
+ quota_init(&q, mboxname);
+ r = quota_read(&q, NULL, 0);
 if (r == IMAP_QUOTAROOT_NONEXISTENT) return 0;
 if (r) return r;
 
 /* note use of + to force the setting of a nonexistant
 * quotaroot */
- if (quota.limit == -1) {
-	prot_printf(xfer->be->out, "Q01 SETQUOTA {" SIZE_T_FMT "+}\r\n" \
-		 "+%s ()\r\n",
-		 strlen(extname)+1, extname);
- }
- else {
-	prot_printf(xfer->be->out, "Q01 SETQUOTA {" SIZE_T_FMT "+}\r\n" \
-		 "+%s (STORAGE %d)\r\n",
-		 strlen(extname)+1, extname, quota.limit);
- }
+ prot_printf(xfer->be->out, "Q01 SETQUOTA {" SIZE_T_FMT "+}\r\n+%s ",
+		strlen(extname)+1, extname);
+ print_quota_limits(xfer->be->out, &q);
+ prot_printf(xfer->be->out, "\r\n");
+ quota_free(&q);
+
 r = getresult(xfer->be->in, "Q01");
 if (r) syslog(LOG_ERR,
 		 "Could not move mailbox: %s, " \
@@ -8940,13 +10860,14 @@
 }
 
 
-void cmd_xfer(char *tag, char *name, char *toserver, char *topart)
+static void cmd_xfer(const char *tag, const char *name,
+	 const char *toserver, const char *topart)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
 int moving_user = 0;
 char *p, *mbox = mailboxname;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 struct xfer_header *xfer = NULL;
 
 /* administrators only please */
@@ -8996,27 +10917,28 @@
 r = mboxlist_lookup(mailboxname, &mbentry, NULL);
 if (r) goto done;
 
- if (!topart) topart = mbentry.partition;
+ if (!topart) topart = mbentry->partition;
 r = xfer_init(toserver, topart, &xfer);
 if (r) goto done;
 
 /* we're always moving this mailbox */
- xfer_addmbox(xfer, mailboxname, &mbentry);
+ xfer_addmbox(xfer, mbentry);
+ mbentry = NULL;
 
 /* if we are not moving a user, just move the one mailbox */
 if (!moving_user) {
 	/* is the selected mailbox the one we're moving? */
-	if (imapd_index && !strcmp(mailboxname, imapd_index->mailbox->name)) {
+	if (!strcmpsafe(mailboxname, index_mboxname(imapd_index))) {
 	 r = IMAP_MAILBOX_LOCKED;
 	 goto done;
 	}
 	r = do_xfer(xfer);
 } else {
-	char *userid = mboxname_to_userid(mailboxname);
+	const char *userid = mboxname_to_userid(mailboxname);
 
 	/* is the selected mailbox in the namespace we're moving? */
-	if (imapd_index && !strncmp(mailboxname, imapd_index->mailbox->name,
-				 strlen(mailboxname))) {
+	if (!strncmpsafe(mailboxname, index_mboxname(imapd_index),
+			 strlen(mailboxname))) {
 	 r = IMAP_MAILBOX_LOCKED;
 	 goto done;
 	}
@@ -9042,7 +10964,7 @@
 
 	/* this was a successful user delete, and we need to delete
 	 certain user meta-data (but not seen state!) */
-	user_deletedata(userid, imapd_userid, imapd_authstate, 0);
+	user_deletedata(userid, 0);
 }
 
 done:
@@ -9061,106 +10983,17 @@
 return;
 }
 
-/*
- * Parse a "date", for SEARCH criteria
- * The time_t's pointed to by 'start' and 'end' are set to the
- * times of the start and end of the parsed date.
- */
-int getsearchdate(start, end)
-time_t *start, *end;
-{
- int c;
- struct tm tm;
- int quoted = 0;
- char month4;
-
- memset(&tm, 0, sizeof tm);
-
- c = prot_getc(imapd_in);
- if (c == '\"') {
-	quoted++;
-	c = prot_getc(imapd_in);
- }
-
- /* Day of month */
- if (!isdigit(c)) goto baddate;
- tm.tm_mday = c - '0';
- c = prot_getc(imapd_in);
- if (isdigit(c)) {
-	tm.tm_mday = tm.tm_mday * 10 + c - '0';
-	c = prot_getc(imapd_in);
- }
- 
- if (c != '-') goto baddate;
- c = prot_getc(imapd_in);
-
- /* Month name */
- if (!isalpha(c)) goto baddate;
- month0 = c;
- c = prot_getc(imapd_in);
- if (!isalpha(c)) goto baddate;
- month1 = c;
- c = prot_getc(imapd_in);
- if (!isalpha(c)) goto baddate;
- month2 = c;
- c = prot_getc(imapd_in);
- month3 = '\0';
- lcase(month);
-
- for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
-	if (!strcmp(month, monthnametm.tm_mon)) break;
- }
- if (tm.tm_mon == 12) goto baddate;
-
- if (c != '-') goto baddate;
- c = prot_getc(imapd_in);
-
- /* Year */
- if (!isdigit(c)) goto baddate;
- tm.tm_year = c - '0';
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_year = tm.tm_year * 10 + c - '0';
- c = prot_getc(imapd_in);
- if (isdigit(c)) {
-	if (tm.tm_year < 19) goto baddate;
-	tm.tm_year -= 19;
-	tm.tm_year = tm.tm_year * 10 + c - '0';
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	tm.tm_year = tm.tm_year * 10 + c - '0';
-	c = prot_getc(imapd_in);
- }
-
- if (quoted) {
-	if (c != '\"') goto baddate;
-	c = prot_getc(imapd_in);
- }
-
- tm.tm_isdst = -1;
- *start = mktime(&tm);
-
- tm.tm_hour = 24;
- tm.tm_isdst = -1;
- *end = mktime(&tm);
-
- return c;
-
- baddate:
- prot_ungetc(c, imapd_in);
- return EOF;
-}
-
 #define SORTGROWSIZE	10
 
 /*
 * Parse sort criteria
 */
-int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
 {
 int c;
 static struct buf criteria;
 int nsort, n;
+ int hasconv = config_getswitch(IMAPOPT_CONVERSATIONS);
 
 *sortcrit = NULL;
 
@@ -9206,20 +11039,52 @@
 	 (*sortcrit)n.key = SORT_SUBJECT;
 	else if (!strcmp(criteria.s, "to"))
 	 (*sortcrit)n.key = SORT_TO;
-#if 0
 	else if (!strcmp(criteria.s, "annotation")) {
+	 const char *userid = NULL;
+
 	 (*sortcrit)n.key = SORT_ANNOTATION;
 	 if (c != ' ') goto missingarg;
-	 c = getstring(imapd_in, &arg);
+	 c = getastring(imapd_in, imapd_out, &criteria);
 	 if (c != ' ') goto missingarg;
-	 (*sortcrit)n.args.annot.entry = xstrdup(arg.s);
-	 c = getstring(imapd_in, &arg);
+	 (*sortcrit)n.args.annot.entry = xstrdup(criteria.s);
+	 c = getastring(imapd_in, imapd_out, &criteria);
 	 if (c == EOF) goto missingarg;
-	 (*sortcrit)n.args.annot.attrib = xstrdup(arg.s);
+	 if (!strcmp(criteria.s, "value.shared"))
+		userid = "";
+	 else if (!strcmp(criteria.s, "value.priv"))
+		userid = imapd_userid;
+	 else
+		goto missingarg;
+	 (*sortcrit)n.args.annot.userid = xstrdup(userid);
 	}
-#endif
 	else if (!strcmp(criteria.s, "modseq"))
 	 (*sortcrit)n.key = SORT_MODSEQ;
+	else if (!strcmp(criteria.s, "uid"))
+	 (*sortcrit)n.key = SORT_UID;
+	else if (!strcmp(criteria.s, "hasflag")) {
+	 (*sortcrit)n.key = SORT_HASFLAG;
+	 if (c != ' ') goto missingarg;
+	 c = getastring(imapd_in, imapd_out, &criteria);
+	 if (c == EOF) goto missingarg;
+	 (*sortcrit)n.args.flag.name = xstrdup(criteria.s);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convmodseq"))
+	 (*sortcrit)n.key = SORT_CONVMODSEQ;
+	else if (hasconv && !strcmp(criteria.s, "convexists"))
+	 (*sortcrit)n.key = SORT_CONVEXISTS;
+	else if (hasconv && !strcmp(criteria.s, "convsize"))
+	 (*sortcrit)n.key = SORT_CONVSIZE;
+	else if (hasconv && !strcmp(criteria.s, "hasconvflag")) {
+	 (*sortcrit)n.key = SORT_HASCONVFLAG;
+	 if (c != ' ') goto missingarg;
+	 c = getastring(imapd_in, imapd_out, &criteria);
+	 if (c == EOF) goto missingarg;
+	 (*sortcrit)n.args.flag.name = xstrdup(criteria.s);
+	}
+	else if (!strcmp(criteria.s, "folder"))
+	 (*sortcrit)n.key = SORT_FOLDER;
+	else if (!strcmp(criteria.s, "relevancy"))
+	 (*sortcrit)n.key = SORT_RELEVANCY;
 	else {
 	 prot_printf(imapd_out, "%s BAD Invalid Sort criterion %s\r\n",
 			tag, criteria.s);
@@ -9259,20 +11124,201 @@
 prot_printf(imapd_out, "%s BAD Missing Sort criteria\r\n", tag);
 if (c != EOF) prot_ungetc(c, imapd_in);
 return EOF;
-#if 0 /* For annotations stuff above */
 missingarg:
 prot_printf(imapd_out, "%s BAD Missing argument to Sort criterion %s\r\n",
 		tag, criteria.s);
 if (c != EOF) prot_ungetc(c, imapd_in);
 return EOF;
-#endif
+}
+
+static int parse_windowargs(const char *tag,
+			 struct windowargs **wa,
+			 int updates)
+{
+ struct windowargs windowargs;
+ struct buf arg = BUF_INITIALIZER;
+ struct buf ext_folder = BUF_INITIALIZER;
+ int c;
+
+ memset(&windowargs, 0, sizeof(windowargs));
+
+ c = prot_getc(imapd_in);
+ if (c == EOF)
+	goto out;
+ if (c != '(') {
+	/* no window args at all */
+	prot_ungetc(c, imapd_in);
+	goto out;
+ }
+
+ for (;;)
+ {
+	c = prot_getc(imapd_in);
+	if (c == EOF)
+	 goto out;
+	if (c == ')')
+	 break; /* end of window args */
+
+	prot_ungetc(c, imapd_in);
+	c = getword(imapd_in, &arg);
+	if (!arg.len)
+	 goto syntax_error;
+
+	if (!strcasecmp(arg.s, "CONVERSATIONS"))
+	 windowargs.conversations = 1;
+	else if (!strcasecmp(arg.s, "POSITION")) {
+	 if (updates)
+		goto syntax_error;
+	 if (c != ' ')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (c != '(')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.position);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.limit);
+	 if (c != ')')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (windowargs.position == 0)
+		goto syntax_error;
+	}
+	else if (!strcasecmp(arg.s, "ANCHOR")) {
+	 if (updates)
+		goto syntax_error;
+	 if (c != ' ')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (c != '(')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.anchor);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.offset);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.limit);
+	 if (c != ')')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (windowargs.anchor == 0)
+		goto syntax_error;
+	}
+	else if (!strcasecmp(arg.s, "MULTIANCHOR")) {
+	 if (updates)
+		goto syntax_error;
+	 if (c != ' ')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (c != '(')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.anchor);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getastring(imapd_in, imapd_out, &ext_folder);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.offset);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.limit);
+	 if (c != ')')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (windowargs.anchor == 0)
+		goto syntax_error;
+	}
+	else if (!strcasecmp(arg.s, "CHANGEDSINCE")) {
+	 if (!updates)
+		goto syntax_error;
+	 windowargs.changedsince = 1;
+	 if (c != ' ')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (c != '(')
+		goto syntax_error;
+	 c = getmodseq(imapd_in, &windowargs.modseq);
+	 if (c != ' ')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.uidnext);
+	 if (c != ')')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	} else if (!strcasecmp(arg.s, "UPTO")) {
+	 if (!updates)
+		goto syntax_error;
+	 if (c != ' ')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+	 if (c != '(')
+		goto syntax_error;
+	 c = getuint32(imapd_in, &windowargs.upto);
+	 if (c != ')')
+		goto syntax_error;
+	 c = prot_getc(imapd_in);
+
+	 if (windowargs.upto == 0)
+		goto syntax_error;
+	}
+	else
+	 goto syntax_error;
+
+	if (c == ')')
+	 break;
+	if (c != ' ')
+	 goto syntax_error;
+ }
+
+ c = prot_getc(imapd_in);
+ if (c != ' ')
+	goto syntax_error;
+
+out:
+ /* these two are mutually exclusive */
+ if (windowargs.anchor && windowargs.position)
+	goto syntax_error;
+ /* changedsince is mandatory for XCONVUPDATES
+ * and illegal for XCONVSORT */
+ if (!!updates != windowargs.changedsince)
+	goto syntax_error;
+
+ if (ext_folder.len) {
+	int r;
+	char int_mboxnameMAX_MAILBOX_PATH+1;
+
+	r = imapd_namespace.mboxname_tointernal(&imapd_namespace,
+						buf_cstring(&ext_folder),
+						imapd_userid, int_mboxname);
+	if (!r)
+	 windowargs.anchorfolder = xstrdup(int_mboxname);
+ }
+
+ *wa = xmemdup(&windowargs, sizeof(windowargs));
+ buf_free(&ext_folder);
+ buf_free(&arg);
+ return c;
+
+syntax_error:
+ free(windowargs.anchorfolder);
+ buf_free(&ext_folder);
+ prot_printf(imapd_out, "%s BAD Syntax error in window arguments\r\n", tag);
+ return EOF;
+}
+
+static void free_windowargs(struct windowargs *wa)
+{
+ if (!wa)
+	return;
+ free(wa->anchorfolder);
+ free(wa);
 }
 
 /*
 * Parse LIST selection options.
 * The command has been parsed up to and including the opening '('.
 */
-int getlistselopts(char *tag, unsigned *opts)
+static int getlistselopts(char *tag, struct listargs *args)
 {
 int c;
 static struct buf buf;
@@ -9295,11 +11341,13 @@
 	lcase(buf.s);
 
 	if (!strcmp(buf.s, "subscribed")) {
-	 *opts |= LIST_SEL_SUBSCRIBED;
+	 args->sel |= LIST_SEL_SUBSCRIBED | LIST_RET_SUBSCRIBED;
 	} else if (!strcmp(buf.s, "remote")) {
-	 *opts |= LIST_SEL_REMOTE;
+	 args->sel |= LIST_SEL_REMOTE;
 	} else if (!strcmp(buf.s, "recursivematch")) {
-	 *opts |= LIST_SEL_RECURSIVEMATCH;
+	 args->sel |= LIST_SEL_RECURSIVEMATCH;
+	} else if (!strcmp(buf.s, "special-use")) {
+	 args->sel |= LIST_SEL_SPECIALUSE;
 	} else {
 	 prot_printf(imapd_out,
 			"%s BAD Invalid List selection option \"%s\"\r\n",
@@ -9316,8 +11364,8 @@
 	return EOF;
 }
 
- if (*opts & list_select_mod_opts
-	 && ! (*opts & list_select_base_opts)) {
+ if (args->sel & list_select_mod_opts
+	 && ! (args->sel & list_select_base_opts)) {
 	prot_printf(imapd_out,
 		 "%s BAD Invalid combination of selection options\r\n",
 		 tag);
@@ -9331,7 +11379,8 @@
 * Parse LIST return options.
 * The command has been parsed up to and including the ' ' before RETURN.
 */
-int getlistretopts(char *tag, unsigned *opts) {
+static int getlistretopts(char *tag, struct listargs *args)
+{
 static struct buf buf;
 int c;
 
@@ -9372,9 +11421,22 @@
 	lcase(buf.s);
 
 	if (!strcmp(buf.s, "subscribed"))
-	 *opts |= LIST_RET_SUBSCRIBED;
+	 args->ret |= LIST_RET_SUBSCRIBED;
 	else if (!strcmp(buf.s, "children"))
-	 *opts |= LIST_RET_CHILDREN;
+	 args->ret |= LIST_RET_CHILDREN;
+	else if (!strcmp(buf.s, "myrights"))
+	 args->ret |= LIST_RET_MYRIGHTS;
+	else if (!strcmp(buf.s, "special-use"))
+	 args->ret |= LIST_RET_SPECIALUSE;
+	else if (!strcmp(buf.s, "status")) {
+	 const char *errstr = "Bad status string";
+	 args->ret |= LIST_RET_STATUS;
+	 c = parse_statusitems(&args->statusitems, &errstr);
+	 if (c == EOF) {
+		prot_printf(imapd_out, "%s BAD %s", tag, errstr);
+		return EOF;
+	 }
+	}
 	else {
 	 prot_printf(imapd_out,
 			"%s BAD Invalid List return option \"%s\"\r\n",
@@ -9397,267 +11459,33 @@
 /*
 * Parse a string in IMAP date-time format (and some more
 * obscure legacy formats too) to a time_t. Parses both
- * date and time parts.
- *
- * Specific formats accepted are listed below. Note that
- * the " quotes are part of the format. Also note that only
- * the first two are compliant with RFC3501, the remainder
- * are legacy formats.
- *
- * "dd-mmm-yyyy HH:MM:SS zzzzz"
- * " d-mmm-yyyy HH:MM:SS zzzzz"
- * "dd-mmm-yy HH:MM:SS-z"
- * " d-mmm-yy HH:MM:SS-z"
- * "dd-mmm-yy HH:MM:SS-zz"
- * " d-mmm-yy HH:MM:SS-zz"
- * "dd-mmm-yy HH:MM:SS-zzz"
- * " d-mmm-yy HH:MM:SS-zzz"
- *
- * where:
- * dd	is the day-of-month between 1 and 31 inclusive.
- * mmm	is the three-letter abbreviation for the English
- * month name (case insensitive).
- * yy	is the 2 digit year, between 00 (the year 1900)
- *	and 99 (the year 1999) inclusive.
- * yyyy is the 4 digit year, between 1900 and disaster
- * (31b time_t wrapping in 2038 is not handled, sorry).
- * HH	is the hour, zero padded, between 00 and 23 inclusive.
- * MM 	is the minute, zero padded, between 00 and 59 inclusive.
- * MM 	is the second, zero padded, between 00 and 60 inclusive
- * (to account for leap seconds).
- * z	is a US military style single character time zone.
- *	 A (Alpha) is +0100 ... M (Mike) is +1200
- *	 N (November) is -0100 ... Y (Yankee) is -1200
- *	 Z (Zulu) is UTC
- * zz	is the case-insensitive string "UT", denoting UTC time.
- * zzz	is a three-character case insensitive North American
- *	time zone name, one of the following (listed with the
- *	UTC offsets and comments):
- *	 AST	-0400	Atlantic Standard Time
- *	 ADT	-0500	Atlantic Daylight Time
- *			WRONG -> -0300
- *	 EST	-0500	Eastern Standard Time
- *	 EDT	-0600	Eastern Daylight Time
- *			WRONG -> -0400
- *	 CST	-0600	Central Standard Time
- *	 CDT	-0700	Central Daylight Time
- *			WRONG -> -0500
- *	 MST	-0700	Mountain Standard Time
- *	 MDT	-0800	Mountain Daylight Time
- *			WRONG -> -0600
- *	 PST	-0800	Pacific Standard Time
- *	 PDT	-0900	Pacific Daylight Time
- *			WRONG -> -0700
- *	 YST	-0900	Yukon Standard Time
- *			(Obsolete, now AKST = Alaska S.T.)
- *	 YDT	-1000	Yukon Daylight Time
- *			(Obsolete, now AKDT = Alaska D.T.)
- *			WRONG -> -0800
- *	 HST	-1000	Hawaiian Standard Time
- *			(Obsolete, now HAST = Hawaiian/Aleutian S.T.)
- *	 HDT	-1100	Hawaiian Daylight Time
- *			(Obsolete, now HADT = Hawaiian/Aleutian D.T.)
- *			WRONG -> -0900
- *	 BST	-1100	Used in American Samoa & Midway Island
- *			(Obsolete, now SST = Samoa S.T.)
- *	 BDT	-1200	Nonsensical, standard time is used
- *			all year around in the SST territories.
- * zzzzz is an numeric time zone offset in the form +HHMM
- *	or -HMMM.
- *
- * Note that the longest accepted format is 28 chars long
- * including the surrounding " quotes.
+ * date and time parts. See cyrus_parsetime() for formats.
 *
 * Returns: the next character read from imapd_in, or
 *	 or EOF on error.
 */
-int getdatetime(date)
-time_t *date;
+static int getdatetime(time_t *date)
 {
 int c;
- struct tm tm;
- int old_format = 0;
- char month4, zone4, *p;
- time_t tmp_gmtime;
- int zone_off;
-
- memset(&tm, 0, sizeof tm);
+ int r;
+ int i = 0;
+ char bufRFC3501_DATETIME_MAX+1;
 
 c = prot_getc(imapd_in);
- if (c != '\"') goto baddate;
- 
- /* Day of month */
- c = prot_getc(imapd_in);
- if (c == ' ') c = '0';
- if (!isdigit(c)) goto baddate;
- tm.tm_mday = c - '0';
- c = prot_getc(imapd_in);
- if (isdigit(c)) {
-	tm.tm_mday = tm.tm_mday * 10 + c - '0';
-	c = prot_getc(imapd_in);
-	if(tm.tm_mday <= 0 || tm.tm_mday > 31)
+ if (c != '\"')
+	goto baddate;
+ while ((c = prot_getc(imapd_in)) != '\"') {
+	if (i >= RFC3501_DATETIME_MAX)
 	 goto baddate;
+	bufi++ = c;
 }
- 
- if (c != '-') goto baddate;
- c = prot_getc(imapd_in);
-
- /* Month name */
- if (!isalpha(c)) goto baddate;
- month0 = c;
- c = prot_getc(imapd_in);
- if (!isalpha(c)) goto baddate;
- month1 = c;
- c = prot_getc(imapd_in);
- if (!isalpha(c)) goto baddate;
- month2 = c;
- c = prot_getc(imapd_in);
- month3 = '\0';
- lcase(month);
-
- for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
-	if (!strcmp(month, monthnametm.tm_mon)) break;
- }
- if (tm.tm_mon == 12) goto baddate;
- /* xxx this doesn't quite work in leap years */
- if (tm.tm_mday > max_monthdaystm.tm_mon) goto baddate;
-
- if (c != '-') goto baddate;
- c = prot_getc(imapd_in);
-
- /* Year */
- if (!isdigit(c)) goto baddate;
- tm.tm_year = c - '0';
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_year = tm.tm_year * 10 + c - '0';
- c = prot_getc(imapd_in);
- if (isdigit(c)) {
-	if (tm.tm_year < 19) goto baddate;
-	tm.tm_year -= 19;
-	tm.tm_year = tm.tm_year * 10 + c - '0';
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	tm.tm_year = tm.tm_year * 10 + c - '0';
-	c = prot_getc(imapd_in);
- }
- else old_format++;
-
- /* Hour */
- if (c != ' ') goto baddate;
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_hour = c - '0';
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_hour = tm.tm_hour * 10 + c - '0';
- c = prot_getc(imapd_in);
- if (tm.tm_hour > 23) goto baddate;
-
- /* Minute */
- if (c != ':') goto baddate;
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_min = c - '0';
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_min = tm.tm_min * 10 + c - '0';
- c = prot_getc(imapd_in);
- if (tm.tm_min > 59) goto baddate;
-
- /* Second */
- if (c != ':') goto baddate;
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_sec = c - '0';
- c = prot_getc(imapd_in);
- if (!isdigit(c)) goto baddate;
- tm.tm_sec = tm.tm_sec * 10 + c - '0';
- c = prot_getc(imapd_in);
- if (tm.tm_min > 60) goto baddate;
-
- /* Time zone */
- if (old_format) {
-	if (c != '-') goto baddate;
-	c = prot_getc(imapd_in);
-
-	if (!isalpha(c)) goto baddate;
-	zone0 = c;
-	c = prot_getc(imapd_in);
-
-	if (c == '\"') {
-	 /* Military (single-char) zones */
-	 zone1 = '\0';
-	 lcase(zone);
-	 if (zone0 <= 'm') {
-		zone_off = (zone0 - 'a' + 1)*60;
-	 }
-	 else if (zone0 < 'z') {
-		zone_off = ('m' - zone0)*60;
-	 }
-	 else zone_off = 0;
-	}
-	else {
-	 /* UT (universal time) */
-	 zone1 = c;
-	 c = prot_getc(imapd_in);
-	 if (c == '\"') {
-		zone2 = '\0';
-		lcase(zone);
-		if (!strcmp(zone, "ut")) goto baddate;
-		zone_off = 0;
-	 }
-	 else {
-		/* 3-char time zone */
-		zone2 = c;
-		c = prot_getc(imapd_in);
-		if (c != '\"') goto baddate;
-		zone3 = '\0';
-		lcase(zone);
-		p = strchr("aecmpyhb", zone0);
-		if (c != '\"' || zone2 != 't' || !p) goto baddate;
-		zone_off = (strlen(p) - 12)*60;
-		if (zone1 == 'd') zone_off -= 60;
-		else if (zone1 != 's') goto baddate;
-	 }
-	}
- }
- else {
-	if (c != ' ') goto baddate;
-	c = prot_getc(imapd_in);
+ bufi = '\0';
 
-	if (c != '+' && c != '-') goto baddate;
-	zone0 = c;
-
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	zone_off = c - '0';
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	zone_off = zone_off * 10 + c - '0';
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	zone_off = zone_off * 6 + c - '0';
-	c = prot_getc(imapd_in);
-	if (!isdigit(c)) goto baddate;
-	zone_off = zone_off * 10 + c - '0';
-
-	if (zone0 == '-') zone_off = -zone_off;
-
-	c = prot_getc(imapd_in);
-	if (c != '\"') goto baddate;
-
- }
+ r = time_from_rfc3501(buf, date);
+ if (r < 0)
+	goto baddate;
 
 c = prot_getc(imapd_in);
-
- tm.tm_isdst = -1;
-
- tmp_gmtime = mkgmtime(&tm);
- if(tmp_gmtime == -1) goto baddate;
-
- *date = tmp_gmtime - zone_off*60;
-
 return c;
 
 baddate:
@@ -9668,10 +11496,9 @@
 /*
 * Append 'section', 'fields', 'trail' to the fieldlist 'l'.
 */
-void
-appendfieldlist(struct fieldlist **l, char *section,
-		struct strlist *fields, char *trail,
-		void *d, size_t size)
+static void appendfieldlist(struct fieldlist **l, char *section,
+		 strarray_t *fields, char *trail,
+		 void *d, size_t size)
 {
 struct fieldlist **tail = l;
 
@@ -9694,14 +11521,14 @@
 /*
 * Free the fieldlist 'l'
 */
-void freefieldlist(struct fieldlist *l)
+static void freefieldlist(struct fieldlist *l)
 {
 struct fieldlist *n;
 
 while (l) {
 	n = l->next;
 	free(l->section);
-	freestrlist(l->fields);
+	strarray_free(l->fields);
 	free(l->trail);
 	if (l->rock) free(l->rock);
 	free((char *)l);
@@ -9709,76 +11536,6 @@
 }
 }
 
-/*
- * Append the searchargs 's1' and 's2' to the sublist of 's'
- */
-void
-appendsearchargs(s, s1, s2)
-struct searchargs *s, *s1, *s2;
-{
- struct searchsub **tail = &s->sublist;
-
- while (*tail) tail = &(*tail)->next;
-
- *tail = (struct searchsub *)xmalloc(sizeof(struct searchsub));
- (*tail)->sub1 = s1;
- (*tail)->sub2 = s2;
- (*tail)->next = 0;
-}
-
-
-/*
- * Free the searchargs 's'
- */
-void
-freesearchargs(s)
-struct searchargs *s;
-{
- struct searchsub *sub, *n;
-
- if (!s) return;
-
- freesequencelist(s->sequence);
- freesequencelist(s->uidsequence);
- freestrlist(s->from);
- freestrlist(s->to);
- freestrlist(s->cc);
- freestrlist(s->bcc);
- freestrlist(s->subject);
- freestrlist(s->body);
- freestrlist(s->text);
- freestrlist(s->header_name);
- freestrlist(s->header);
-
- for (sub = s->sublist; sub; sub = n) {
-	n = sub->next;
-	freesearchargs(sub->sub1);
-	freesearchargs(sub->sub2);
-	free(sub);
- }
- free(s);
-}
-
-/*
- * Free an array of sortcrit
- */
-static void freesortcrit(struct sortcrit *s)
-{
- int i = 0;
-
- if (!s) return;
- do {
-	switch (si.key) {
-	case SORT_ANNOTATION:
-	 free(si.args.annot.entry);
-	 free(si.args.annot.attrib);
-	 break;
-	}
-	i++;
- } while (si.key != SORT_SEQUENCE);
- free(s);
-}
-
 static int set_haschildren(char *name, int matchlen,
 			 int maycreate __attribute__((unused)),
 			 int *attributes)
@@ -9791,71 +11548,52 @@
 return 0;
 }
 
-
-struct xlist_rock {
- const char *mboxname;
- const char *sep;
-};
-
-static void xlist_check(const char *key, const char *val, void *rock)
-{
- struct xlist_rock *r = (struct xlist_rock *)rock;
- char *flag;
-
- if (strncmp(key, "xlist-", 6))
-	return;
-
- if (strcmp(val, r->mboxname))
-	return;
-
- flag = xstrdup(key + 6);
- lcase(flag);
- flag0 = toupper((unsigned char)flag0);
- prot_printf(imapd_out, "%s\\%s", r->sep, flag);
- free(flag);
-
- r->sep = " ";
-}
-
-static void xlist_flags(const char *mboxname, char *sep)
+static void specialuse_flags(mbentry_t *mbentry, const char *sep,
+			 int isxlist)
 {
 char inboxnameMAX_MAILBOX_PATH+1;
 int inboxlen;
 
+ if (!mbentry) return;
+
 (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, "INBOX",
 					 imapd_userid, inboxname);
 inboxlen = strlen(inboxname);
 
 /* doesn't match inbox, not xlistable */
- if (strncmp(mboxname, inboxname, inboxlen))
+ if (strncmp(mbentry->name, inboxname, inboxlen))
 	return;
 
- /* inbox */
- if (mboxnameinboxlen == '\0') {
-	prot_printf(imapd_out, "%s\\Inbox", sep);
+ /* inbox - only print if command is XLIST */
+ if (mbentry->nameinboxlen == '\0') {
+	if (isxlist) prot_printf(imapd_out, "%s\\Inbox", sep);
 }
 /* subdir */
- else if (mboxnameinboxlen == '.') {
-	struct xlist_rock rock;
-	rock.sep = sep;
-	rock.mboxname = mboxname + inboxlen + 1;
-	config_foreachoverflowstring(xlist_check, &rock);
+ else if (mbentry->nameinboxlen == '.') {
+	struct buf attrib = BUF_INITIALIZER;
+	/* check if there's a special use flag set */
+	if (!annotatemore_lookup(mbentry->name, "/specialuse", imapd_userid, &attrib)) {
+	 if (attrib.len)
+		prot_printf(imapd_out, "%s%s", sep, buf_cstring(&attrib));
+	}
+	buf_free(&attrib);
 }
 /* otherwise it's actually another user who matches for
 * the substr. Ok to just print nothing */
 }
 
 /* Print LIST or LSUB untagged response */
-static void list_response(char *name, int attributes,
+static void list_response(const char *name, int attributes,
 			 struct listargs *listargs)
 {
- struct mbox_name_attribute *attr;
+ const struct mbox_name_attribute *attr;
 char internal_nameMAX_MAILBOX_PATH+1;
 int r;
 char mboxnameMAX_MAILBOX_PATH+1;
- char *server, *sep;
+ const char *sep;
 const char *cmd;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
+ struct statusdata sdata = STATUSDATA_INIT;
 
 if (!name) return;
 
@@ -9873,10 +11611,6 @@
 r = mboxlist_lookup(internal_name, &mbentry, NULL);
 
 if (r == IMAP_MAILBOX_NONEXISTENT) {
-	/* if mupdate isn't configured we can drop out now, otherwise
-	 * we might be a backend and need to report folders that don't
-	 * exist on this backend - this is awful and complex and brittle
-	 * and should be changed, but we're stuck with it for now */
 	attributes |= (listargs->cmd & LIST_CMD_EXTENDED) ?
 		 MBOX_ATTRIBUTE_NONEXISTENT : MBOX_ATTRIBUTE_NOSELECT;
 }
@@ -9885,14 +11619,13 @@
 else if (listargs->scan) {
 	/* SCAN mailbox for content */
 
-	if ((mbentry.mbtype & MBTYPE_REMOTE) &&
-	 !hash_lookup(mbentry.partition, &listargs->server_table)) {
+	if ((mbentry->mbtype & MBTYPE_REMOTE) &&
+	 !hash_lookup(mbentry->partition, &listargs->server_table)) {
 	 /* remote mailbox that we haven't proxied to yet */
 	 struct backend *s;
-	 server = mbentry.partition;
 
-	 hash_insert(server, (void *)0xDEADBEEF, &listargs->server_table);
-	 s = proxy_findserver(server, &imap_protocol,
+	 hash_insert(mbentry->server, (void *)0xDEADBEEF, &listargs->server_table);
+	 s = proxy_findserver(mbentry->server, &imap_protocol,
 				 proxy_userid, &backend_cached,
 				 &backend_current, &backend_inbox, imapd_in);
 	 if (!s) r = IMAP_SERVER_UNAVAILABLE;
@@ -9905,18 +11638,18 @@
 			 "%s Scan {%tu+}\r\n%s {%tu+}\r\n%s {%tu+}\r\n%s\r\n",
 			 mytag,
 			 strlen(listargs->ref), listargs->ref,
-			 strlen(listargs->pat->s), listargs->pat->s,
+			 strlen(listargs->pat.data0), listargs->pat.data0,
 			 strlen(listargs->scan), listargs->scan);
 
 		r = pipe_until_tag(s, mytag, 0);
 	 }
 
-	 return;
+	 goto done;
 	}
-	else if (imapd_index && !strcmp(internal_name, imapd_index->mailbox->name)) {
+	else if (!strcmpsafe(internal_name, index_mboxname(imapd_index))) {
 	 /* currently selected mailbox */
 	 if (!index_scan(imapd_index, listargs->scan))
-		return; /* no matching messages */
+		goto done; /* no matching messages */
 	}
 	else {
 	 /* other local mailbox */
@@ -9934,8 +11667,8 @@
 	 if (!r)
 		doclose = 1;
 
-	 if (!r && !(state->myrights & ACL_READ)) {
-		r = (imapd_userisadmin || (state->myrights & ACL_LOOKUP)) ?
+	 if (!r && index_hasrights(state, ACL_READ)) {
+		r = (imapd_userisadmin || index_hasrights(state, ACL_LOOKUP)) ?
 		 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
 	 }
 
@@ -9947,7 +11680,7 @@
 
 	 if (doclose) index_close(&state);
 
-	 if (r) return;
+	 if (r) goto done;
 	}
 }
 
@@ -9966,9 +11699,12 @@
 
 if (attributes & (MBOX_ATTRIBUTE_NONEXISTENT | MBOX_ATTRIBUTE_NOSELECT)) {
 	int keep = 0;
+	/* extended get told everything */
+	if (listargs->cmd & LIST_CMD_EXTENDED) {
+	 keep = 1;
+	}
 	/* we have to mention this, it has children */
-	if (listargs->ret & LIST_RET_SUBSCRIBED ||
-	 listargs->sel & LIST_SEL_SUBSCRIBED) {
+	if (listargs->cmd & LIST_CMD_LSUB) {
 	 /* subscribed children need a mention */
 	 if (attributes & MBOX_ATTRIBUTE_CHILDINFO_SUBSCRIBED)
 		keep = 1;
@@ -9982,7 +11718,7 @@
 	else if (attributes & MBOX_ATTRIBUTE_HASCHILDREN)
 	 keep = 1;
 
-	if (!keep) return;
+	if (!keep) goto done;
 }
 
 if (listargs->cmd & LIST_CMD_LSUB) {
@@ -10008,6 +11744,30 @@
 	 attributes &= ~MBOX_ATTRIBUTE_NOSELECT;
 }
 
+ if (listargs->sel & LIST_SEL_SPECIALUSE) {
+	struct buf attrib = BUF_INITIALIZER;
+	if (!mbentry) goto done;
+	/* check that this IS a specialuse folder */
+	if (annotatemore_lookup(mbentry->name, "/specialuse", imapd_userid, &attrib))
+	 goto done;
+	if (!attrib.len) {
+	 buf_free(&attrib);
+	 goto done;
+	}
+	buf_free(&attrib);
+ }
+
+ /* can we read the status data ? */
+ if ((listargs->ret & LIST_RET_STATUS) &&
+	!(attributes & MBOX_ATTRIBUTE_NOSELECT)) {
+	r = imapd_statusdata(internal_name, listargs->statusitems, &sdata);
+	if (r) {
+	 /* RFC 5819: the STATUS response MUST NOT be returned and the
+	 * LIST response MUST include the \NoSelect attribute. */
+	 attributes |= MBOX_ATTRIBUTE_NOSELECT;
+	}
+ }
+
 switch (listargs->cmd) {
 case LIST_CMD_LSUB:
 	cmd = "LSUB";
@@ -10031,8 +11791,11 @@
 imapd_userid, mboxname);
 
 if (config_getswitch(IMAPOPT_SPECIALUSEALWAYS) ||
-	 listargs->cmd == LIST_CMD_XLIST)
-	xlist_flags(internal_name, sep);
+	listargs->cmd == LIST_CMD_XLIST || 
+	listargs->ret & LIST_RET_SPECIALUSE ||
+	listargs->sel & LIST_SEL_SPECIALUSE) {
+	specialuse_flags(mbentry, sep, listargs->cmd == LIST_CMD_XLIST);
+ }
 
 prot_printf(imapd_out, ") ");
 
@@ -10049,6 +11812,20 @@
 }
 
 prot_printf(imapd_out, "\r\n");
+
+ if ((listargs->ret & LIST_RET_STATUS) &&
+	!(attributes & MBOX_ATTRIBUTE_NOSELECT)) {
+	/* output the status line now, per rfc 5819 */
+	print_statusline(mboxname, listargs->statusitems, &sdata);
+ }
+
+ if ((listargs->ret & LIST_RET_MYRIGHTS) &&
+	!(attributes & MBOX_ATTRIBUTE_NOSELECT)) {
+	/*ignore result*/printmyrights(mboxname, mbentry);
+ }
+
+done:
+ mboxlist_entry_free(&mbentry);
 }
 
 static int set_subscribed(char *name, int matchlen,
@@ -10106,7 +11883,7 @@
 perform_output(name, matchlen, rock);
 if (!maycreate)
 	rock->last_attributes |= MBOX_ATTRIBUTE_NOINFERIORS;
- else if (namematchlen)
+ else if (namematchlen == '.')
 	rock->last_attributes |= MBOX_ATTRIBUTE_HASCHILDREN;
 
 /* XXX: is there a cheaper way to figure out \Subscribed? */
@@ -10142,7 +11919,8 @@
 	if (!maycreate)
 	 rock->last_attributes |= MBOX_ATTRIBUTE_NOINFERIORS;
 }
- else if (rock->listargs->cmd & LIST_CMD_LSUB) {
+ else if (namematchlen == '.' &&
+	 rock->listargs->cmd & LIST_CMD_LSUB) {
 	/* special case: for LSUB,
 	 * mailbox names that match the pattern but aren't subscribed
 	 * must also be returned if they have a child mailbox that is
@@ -10184,26 +11962,27 @@
 * translates any hierarchy separators.
 */
 static void canonical_list_patterns(const char *reference,
-				 struct strlist *patterns)
+				 strarray_t *patterns)
 {
 static int ignorereference = 0;
- char *old;
+ int i;
 
 /* Ignore the reference argument?
 (the behavior in 1.5.10 & older) */
 if (ignorereference == 0)
 	ignorereference = config_getswitch(IMAPOPT_IGNOREREFERENCE);
 
- for (; patterns; patterns = patterns->next) {
-	if (!ignorereference || patterns->s0 == imapd_namespace.hier_sep) {
-	 old = patterns->s;
-	 patterns->s = canonical_list_pattern(reference, old);
-	 free(old);
+ for (i = 0 ; i < patterns->count ; i++) {
+	char *p = patterns->datai;
+	if (!ignorereference || p0 == imapd_namespace.hier_sep) {
+	 strarray_setm(patterns, i,
+			 canonical_list_pattern(reference, p));
+	 p = patterns->datai;
 	}
 	/* Translate any separators in pattern */
-	mboxname_hiersep_tointernal(&imapd_namespace, patterns->s,
+	mboxname_hiersep_tointernal(&imapd_namespace, p,
 				 config_virtdomains ?
-				 strcspn(patterns->s, "@") : 0);
+				 strcspn(p, "@") : 0);
 }
 }
 
@@ -10214,7 +11993,8 @@
 list_callback_calls++;
 
 if (namematchlen) {
-	if (namematchlen == '.') {
+	char c = namematchlen;
+	if (c == '.' || c == imapd_namespace.hier_sep) {
 	 int *parent_info;
 	 namematchlen = '\0';
 	 parent_info = hash_lookup(name, &rock->table);
@@ -10225,7 +12005,7 @@
 		rock->count++;
 	 }
 	 *parent_info |= MBOX_ATTRIBUTE_CHILDINFO_SUBSCRIBED;
-	 namematchlen = '.';
+	 namematchlen = c;
 	}
 } else {
 	int *list_info = hash_lookup(name, &rock->table);
@@ -10242,7 +12022,8 @@
 }
 
 /* callback for hash_enumerate */
-void copy_to_array(char *key, void *data, void *void_rock) {
+static void copy_to_array(const char *key, void *data, void *void_rock)
+{
 int *attributes = (int *)data;
 struct list_rock_recursivematch *rock =
 	(struct list_rock_recursivematch *)void_rock;
@@ -10252,11 +12033,11 @@
 }
 
 /* Comparator for reverse-sorting an array of struct list_entry by mboxname. */
-int list_entry_comparator(const void *p1, const void *p2) {
+static int list_entry_comparator(const void *p1, const void *p2) {
 const struct list_entry *e1 = (struct list_entry *)p1;
 const struct list_entry *e2 = (struct list_entry *)p2;
 
- return bsearch_compare(e2->name, e1->name);
+ return bsearch_compare_mbox(e2->name, e1->name);
 }
 
 static void list_data_recursivematch(struct listargs *listargs,
@@ -10264,7 +12045,7 @@
 					 const char *, int, const char *,
 					 struct auth_state *, int (*)(),
 					 void *, int)) {
- struct strlist *pattern;
+ char **pattern;
 struct list_rock_recursivematch rock;
 
 rock.count = 0;
@@ -10272,9 +12053,10 @@
 construct_hash_table(&rock.table, 100, 1);
 
 /* find */
- for (pattern = listargs->pat; pattern; pattern = pattern->next)
-	findsub(&imapd_namespace, pattern->s, imapd_userisadmin, imapd_userid,
+ for (pattern = listargs->pat.data ; *pattern ; pattern++) {
+	findsub(&imapd_namespace, *pattern, imapd_userisadmin, imapd_userid,
 		imapd_authstate, recursivematch_cb, &rock, 1);
+ }
 
 if (rock.count) {
 	/* sort */
@@ -10309,14 +12091,13 @@
 		 struct auth_state *auth_state, int (*proc)(),
 		 void *rock, int force);
 
- canonical_list_patterns(listargs->ref, listargs->pat);
+ canonical_list_patterns(listargs->ref, &listargs->pat);
 
 /* Check to see if we should only list the personal namespace */
 if (!(listargs->cmd & LIST_CMD_EXTENDED)
-	 && !strcmp(listargs->pat->s, "*")
+	 && !strcmp(listargs->pat.data0, "*")
 	 && config_getswitch(IMAPOPT_FOOLSTUPIDCLIENTS)) {
-	free(listargs->pat->s);
-	listargs->pat->s = xstrdup("INBOX*");
+	strarray_set(&listargs->pat, 0, "INBOX*");
 	findsub = mboxlist_findsub;
 	findall = mboxlist_findall;
 } else {
@@ -10327,14 +12108,14 @@
 if (listargs->sel & LIST_SEL_RECURSIVEMATCH) {
 	list_data_recursivematch(listargs, findsub);
 } else {
-	struct strlist *pattern;
+	char **pattern;
 	struct list_rock rock;
 	memset(&rock, 0, sizeof(struct list_rock));
 	rock.listargs = listargs;
 
 	if (listargs->sel & LIST_SEL_SUBSCRIBED) {
-	 for (pattern = listargs->pat; pattern; pattern = pattern->next) {
-		findsub(&imapd_namespace, pattern->s, imapd_userisadmin,
+	 for (pattern = listargs->pat.data ; pattern && *pattern ; pattern++) {
+		findsub(&imapd_namespace, *pattern, imapd_userisadmin,
 			imapd_userid, imapd_authstate, subscribed_cb, &rock, 1);
 		perform_output(NULL, 0, &rock);
 	 }
@@ -10343,8 +12124,8 @@
 		construct_hash_table(&listargs->server_table, 10, 1);
 	 }
 
-	 for (pattern = listargs->pat; pattern; pattern = pattern->next) {
-		findall(&imapd_namespace, pattern->s, imapd_userisadmin,
+	 for (pattern = listargs->pat.data ; pattern && *pattern ; pattern++) {
+		findall(&imapd_namespace, *pattern, imapd_userisadmin,
 			imapd_userid, imapd_authstate, list_cb, &rock);
 		perform_output(NULL, 0, &rock);
 	 }
@@ -10390,19 +12171,19 @@
 		"{%tu+}\r\n%s ", strlen(listargs->ref), listargs->ref);
 
 /* print mailbox pattern(s) */
- if (listargs->pat->next) {
-	struct strlist *pattern;
+ if (listargs->pat.count > 1) {
+	char **p;
 	char c = '(';
 
-	for (pattern = listargs->pat; pattern; pattern = pattern->next) {
-	 prot_printf(backend_inbox->out, 
-			"%c{%tu+}\r\n%s", c, strlen(pattern->s), pattern->s);
+	for (p = listargs->pat.data ; *p ; p++) {
+	 prot_printf(backend_inbox->out,
+			"%c{%tu+}\r\n%s", c, strlen(*p), *p);
 	 c = ' ';
 	}
 	(void)prot_putc(')', backend_inbox->out);
 } else {
 	prot_printf(backend_inbox->out, 
-		 "{%tu+}\r\n%s", strlen(listargs->pat->s), listargs->pat->s);
+		 "{%tu+}\r\n%s", strlen(listargs->pat.data0), listargs->pat.data0);
 }
 
 /* print list return options */
@@ -10473,11 +12254,11 @@
 return SASL_OK;
 }
 
-void cmd_mupdatepush(char *tag, char *name)
+static void cmd_mupdatepush(char *tag, char *name)
 {
 int r = 0;
 char mailboxnameMAX_MAILBOX_BUFFER;
- char *part, *acl;
+ mbentry_t *mbentry = NULL;
 mupdate_handle *mupdate_h = NULL;
 char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
 
@@ -10494,8 +12275,7 @@
 }
 
 if (!r) {
-	r = mlookup(tag, name, mailboxname, NULL,
-		 &part, &acl, NULL);
+	r = mlookup(tag, name, mailboxname, &mbentry);
 }
 if (r == IMAP_MAILBOX_MOVED) return;
 
@@ -10505,12 +12285,14 @@
 }
 
 if (!r) {
-	snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
-
-	r = mupdate_activate(mupdate_h, mailboxname, buf, acl);
+	snprintf(buf, sizeof(buf), "%s!%s",
+		 config_servername, mbentry->partition);
+	r = mupdate_activate(mupdate_h, mailboxname, buf, mbentry->acl);
 }
 
- if(mupdate_h) {
+ mboxlist_entry_free(&mbentry);
+
+ if (mupdate_h) {
 	mupdate_disconnect(&mupdate_h);
 }
 
@@ -10524,31 +12306,11 @@
 }
 
 #ifdef HAVE_SSL
-/* Convert the ASCII hex into binary data
- *
- * 'bin' MUST be able to accomodate at least strlen(hex)/2 bytes
- */
-void hex2bin(const char *hex, unsigned char *bin, unsigned int *binlen)
-{
- int i;
- const char *c;
- unsigned char msn, lsn;
-
- for (c = hex, i = 0; *c && Uisxdigit(*c); c++) {
-	msn = (*c > '9') ? tolower((int) *c) - 'a' + 10 : *c - '0';
-	c++;
-	lsn = (*c > '9') ? tolower((int) *c) - 'a' + 10 : *c - '0';
-	
-	bini++ = (unsigned char) (msn << 4) | lsn;
- }
- *binlen = i;
-}
-
 enum {
 URLAUTH_ALG_HMAC_SHA1 =	0 /* HMAC-SHA1 */
 };
 
-void cmd_urlfetch(char *tag)
+static void cmd_urlfetch(char *tag)
 {
 struct mboxkey *mboxkey_db;
 int c, r, doclose;
@@ -10557,9 +12319,7 @@
 char mailboxnameMAX_MAILBOX_BUFFER;
 struct index_state *state;
 uint32_t msgno;
- unsigned int token_len;
- int mbtype;
- char *newserver;
+ mbentry_t *mbentry = NULL;
 time_t now = time(NULL);
 unsigned extended, params;
 
@@ -10648,15 +12408,14 @@
 						 url.user, mailboxname);
 	}
 	if (!r) {
-	 r = mlookup(NULL, NULL, mailboxname, &mbtype,
-			&newserver, NULL, NULL);
+	 r = mlookup(NULL, NULL, mailboxname, &mbentry);
 	}
 
-	if (!r && (mbtype & MBTYPE_REMOTE)) {
+	if (!r && (mbentry->mbtype & MBTYPE_REMOTE)) {
 	 /* remote mailbox */
 	 struct backend *be;
 
-	 be = proxy_findserver(newserver, &imap_protocol,
+	 be = proxy_findserver(mbentry->server, &imap_protocol,
 				 proxy_userid, &backend_cached,
 				 &backend_current, &backend_inbox, imapd_in);
 	 if (!be) {
@@ -10664,18 +12423,28 @@
 	 } else {
 		/* XXX proxy command to backend */
 	 }
-	 
+
 	 free(url.freeme);
 
+	 mboxlist_entry_free(&mbentry);
+
 	 continue;
 	}
 
+	mboxlist_entry_free(&mbentry);
+
 	/* local mailbox */
 	if (!r) {
 	 if (url.urlauth.token) {
 		/* validate the URLAUTH token */
-		hex2bin(url.urlauth.token,
-			(unsigned char *) url.urlauth.token, &token_len);
+
+		/* yes, this is evil, in-place conversion from hex
+		 * to binary */
+		if (hex_to_bin(url.urlauth.token, 0,
+		 (unsigned char *) url.urlauth.token) < 1) {
+		 r = IMAP_BADURL;
+		 break;
+		}
 
 		/* first byte is the algorithm used to create token */
 		switch (url.urlauth.token0) {
@@ -10708,7 +12477,7 @@
 	 }
 
 	 if (!r) {
-		if (imapd_index && !strcmp(imapd_index->mailbox->name, mailboxname)) {
+		if (!strcmp(index_mboxname(imapd_index), mailboxname)) {
 		 state = imapd_index;
 		}
 		else {
@@ -10772,27 +12541,9 @@
 eatline(imapd_in, c);
 }
 
-/* Convert the binary data into ASCII hex
- *
- * 'hex' MUST be able to accomodate at least 2*binlen+1 bytes
- */
-void bin2hex(unsigned char *bin, int binlen, char *hex)
-{
- int i;
- unsigned char c;
- 
- for (i = 0; i < binlen; i++) {
-	c = (bini >> 4) & 0xf;
-	hexi*2 = (c > 9) ? ('a' + c - 10) : ('0' + c);
-	c = bini & 0xf;
-	hexi*2+1 = (c > 9) ? ('a' + c - 10) : ('0' + c);
- }
- hexi*2 = '\0';
-}
-
 #define MBOX_KEY_LEN 16		 /* 128 bits */
 
-void cmd_genurlauth(char *tag)
+static void cmd_genurlauth(char *tag)
 {
 struct mboxkey *mboxkey_db;
 int first = 1;
@@ -10806,8 +12557,7 @@
 size_t keylen;
 unsigned char tokenEVP_MAX_MD_SIZE+1; /* +1 for algorithm */
 unsigned int token_len;
- int mbtype;
- char *newserver;
+ mbentry_t *mbentry = NULL;
 time_t now = time(NULL);
 
 r = mboxkey_open(imapd_userid, MBOXKEY_CREATE, &mboxkey_db);
@@ -10860,9 +12610,9 @@
 						 imapd_userid, mailboxname);
 	}
 	if (!r) {
-	 r = mlookup(NULL, NULL, mailboxname, &mbtype,
-			&newserver, NULL, NULL);
+	 r = mlookup(NULL, NULL, mailboxname, &mbentry);
 	}
+
 	if (r) {
 	 prot_printf(imapd_out,
 			"%s BAD Poorly specified URL to Genurlauth %s\r\n",
@@ -10871,11 +12621,14 @@
 	 return;
 	}
 
-	if (mbtype & MBTYPE_REMOTE) {
+	if (mbentry->mbtype & MBTYPE_REMOTE) {
 	 /* XXX proxy to backend */
+	 mboxlist_entry_free(&mbentry);
 	 continue;
 	}
 
+	mboxlist_entry_free(&mbentry);
+
 	/* lookup key */
 	r = mboxkey_read(mboxkey_db, mailboxname, &key, &keylen);
 	if (r) {
@@ -10912,7 +12665,7 @@
 			 2 * (EVP_MAX_MD_SIZE+1) + 1);
 	strcpy(urlauth, arg1.s);
 	strcat(urlauth, ":internal:");
-	bin2hex(token, token_len, urlauth+strlen(urlauth));
+	bin_to_hex(token, token_len, urlauth+strlen(urlauth), BH_LOWER);
 
 	if (first) {
 	 prot_printf(imapd_out, "* GENURLAUTH");
@@ -10940,7 +12693,7 @@
 mboxkey_close(mboxkey_db);
 }
 
-void cmd_resetkey(char *tag, char *mailbox,
+static void cmd_resetkey(char *tag, char *mailbox,
 		 char *mechanism __attribute__((unused)))
 /* XXX we don't support any external mechanisms, so we ignore it */
 {
@@ -10948,16 +12701,15 @@
 
 if (mailbox) {
 	/* delete key for specified mailbox */
-	char mailboxnameMAX_MAILBOX_BUFFER, *newserver;
-	int mbtype;
+	char mailboxnameMAX_MAILBOX_BUFFER;
 	struct mboxkey *mboxkey_db;
+	mbentry_t *mbentry = NULL;
 
 	r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace,
 						 mailbox,
 						 imapd_userid, mailboxname);
 	if (!r) {
-	 r = mlookup(NULL, NULL, mailboxname, &mbtype,
-			&newserver, NULL, NULL);
+	 r = mlookup(NULL, NULL, mailboxname, &mbentry);
 	}
 	if (r) {
 	 prot_printf(imapd_out, "%s NO Error removing key: %s\r\n",
@@ -10965,11 +12717,14 @@
 	 return;
 	}
 
-	if (mbtype & MBTYPE_REMOTE) {
+	if (mbentry->mbtype & MBTYPE_REMOTE) {
 	 /* XXX proxy to backend */
+	 mboxlist_entry_free(&mbentry);
 	 return;
 	}
 
+	mboxlist_entry_free(&mbentry);
+
 	r = mboxkey_open(imapd_userid, MBOXKEY_CREATE, &mboxkey_db);
 	if (!r) {
 	 r = mboxkey_write(mboxkey_db, mailboxname, NULL, 0);
@@ -10999,7 +12754,7 @@
 #endif /* HAVE_SSL */
 
 #ifdef HAVE_ZLIB
-void cmd_compress(char *tag, char *alg)
+static void cmd_compress(char *tag, char *alg)
 {
 if (imapd_compress_done) {
 	prot_printf(imapd_out,
@@ -11035,7 +12790,7 @@
 }
 #endif /* HAVE_ZLIB */
 
-void cmd_enable(char *tag)
+static void cmd_enable(char *tag)
 {
 static struct buf arg;
 int c;
@@ -11084,4 +12839,47 @@
 
 prot_printf(imapd_out, "%s OK %s\r\n", tag,
 		error_message(IMAP_OK_COMPLETED));
+}
+
+static void cmd_xkillmy(const char *tag, const char *cmdname)
+{
+ char *cmd = xstrdup(cmdname);
+ char *p;
+
+ /* normalise to imapd conventions */
+ if (Uislower(cmd0))
+	cmd0 = toupper((unsigned char) cmd0);
+ for (p = cmd+1; *p; p++) {
+	if (Uisupper(*p)) *p = tolower((unsigned char) *p);
+ }
+
+ proc_killusercmd(imapd_userid, cmd, SIGUSR2);
+
+ free(cmd);
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		error_message(IMAP_OK_COMPLETED));
+}
+
+static void cmd_xforever(const char *tag)
+{
+ unsigned n = 1;
+ int r = 0;
+
+ while (!r) {
+	sleep(1);
+	prot_printf(imapd_out, "* FOREVER %u\r\n", n++);
+	prot_flush(imapd_out);
+	r = cmd_cancelled();
+ }
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag, error_message(r));
+}
+
+static void cmd_xmeid(const char *tag, const char *id)
+{
+ mboxevent_set_client_id(id);
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		error_message(IMAP_OK_COMPLETED));
 }

cyrus-imapd-2.4.17.tar.gz/imap/imapd.h -> cyrus-imapd-2.5.tar.gz/imap/imapd.h Changed

@@ -38,18 +38,19 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imapd.h,v 1.72 2010/01/06 17:01:34 murch Exp $
 */
 
 #ifndef INCLUDED_IMAPD_H
 #define INCLUDED_IMAPD_H
 
 #include "annotate.h"
-#include "charset.h"
 #include "hash.h"
 #include "mailbox.h"
+#include "message.h"
 #include "prot.h"
+#include "strarray.h"
+#include "search_expr.h"
+#include "conversations.h"
 
 /* Userid client has logged in as */
 extern char *imapd_userid;
@@ -60,10 +61,22 @@
 /* Client capabilities (via ENABLE) */
 extern unsigned imapd_client_capa;
 
+struct octetinfo
+{
+ int start_octet;
+ int octet_count;
+};
+
+struct section {
+ char *name;
+ struct octetinfo octetinfo;
+ struct section *next;
+};
+
 /* List of HEADER.FIELDS.NOT fetch specifications */
 struct fieldlist {
 char *section;		/* First part of BODYx value */
- struct strlist *fields;	/* List of field-names */
+ strarray_t *fields;		/* Array of field-names */
 char *trail;		/* Last part of BODYx value */
 void *rock;
 struct fieldlist *next;
@@ -72,12 +85,12 @@
 /* Items that may be fetched */
 struct fetchargs {
 int fetchitems;		 /* Bitmask */
- struct strlist *binsections; /* BINARYx<x> values */
- struct strlist *sizesections; /* BINARY.SIZEx values */
- struct strlist *bodysections; /* BODYx<x> values */
+ struct section *binsections; /* BINARYx<x> values */
+ struct section *sizesections; /* BINARY.SIZEx values */
+ struct section *bodysections; /* BODYx<x> values */
 struct fieldlist *fsections; /* BODYxHEADER.FIELDSx<x> values */
- struct strlist *headers;	 /* RFC822.HEADER.LINES */
- struct strlist *headers_not; /* RFC822.HEADER.LINES.NOT */
+ strarray_t headers;		 /* RFC822.HEADER.LINES */
+ strarray_t headers_not;	 /* RFC822.HEADER.LINES.NOT */
 int start_octet; /* start_octet for partial fetch */
 int octet_count; /* octet_count for partial fetch, or 0 */
 modseq_t changedsince; /* changed since modseq, or 0 */
@@ -87,12 +100,13 @@
 
 bit32 cache_atleast; /* to do headers we need atleast this
 				 * cache version */
-};
-
-struct octetinfo 
-{
- int start_octet;
- int octet_count;
+ struct namespace *namespace; 
+ const char *userid;
+ strarray_t entries;		 /* for FETCH_ANNOTATION */
+ strarray_t attribs;
+ int isadmin;
+ struct auth_state *authstate;
+ hash_table *cidhash; /* for XCONVFETCH */
 };
 
 /* Bitmasks for fetchitems */
@@ -110,7 +124,14 @@
 FETCH_SETSEEN = (1<<10),
 /* FETCH_UNCACHEDHEADER = (1<<11) -- obsolete */
 FETCH_IS_PARTIAL = (1<<12), /* this is the PARTIAL command */
- FETCH_MODSEQ =		(1<<13)
+ FETCH_MODSEQ =		(1<<13),
+ FETCH_ANNOTATION =		(1<<14),
+ FETCH_GUID =		(1<<15),
+ FETCH_SHA1 =		(1<<16),
+ FETCH_FILESIZE =		(1<<17),
+ FETCH_CID =			(1<<18),
+ FETCH_FOLDER =		(1<<19),
+ FETCH_UIDVALIDITY =		(1<<20)
 };
 
 enum {
@@ -122,82 +143,82 @@
 /* Arguments to Store functions */
 struct storeargs {
 int operation;
+ int usinguid;
 modseq_t unchangedsince; /* unchanged since modseq, or ULLONG_MAX */
 int silent;
 int seen;
- bit32 system_flags;
+ /* for STORE_*_FLAGS */
+ uint32_t system_flags;
+ /* Note that we must pass the user flags as names because the
+ * lookup of user flag names must proceed under the index lock */
+ strarray_t flags;
+ /* for STORE_ANNOTATION */
+ struct entryattlist *entryatts;
+ struct namespace *namespace;
+ int isadmin;
+ const char *userid;
+ struct auth_state *authstate;
 /* private to index.c */
 bit32 user_flagsMAX_USER_FLAGS/32;
 time_t update_time;
- int usinguid;
 /* private to index_storeflag() */
 unsigned last_msgno;
 unsigned last_found;
+ /* returned to caller */
+ struct seqset *modified;
 };
 
 /* values for operation */
 enum {
- STORE_ADD = 1,
- STORE_REMOVE = 2,
- STORE_REPLACE = 3
+ STORE_ADD_FLAGS = 1,
+ STORE_REMOVE_FLAGS,
+ STORE_REPLACE_FLAGS,
+ STORE_ANNOTATION
 };
 
-struct searchsub {
- struct searchsub *next;
- struct searchargs *sub1;
- /*
- * If sub2 is null, then sub1 is NOT'ed.
- * Otherwise sub1 and sub2 are OR'ed.
- */
- struct searchargs *sub2;
+struct searchannot {
+ struct searchannot *next;	 /* gnb:TODO remove */
+ char *entry;
+ char *attrib;
+ struct namespace *namespace; /* gnb:TODO get this from searchargs */
+ int isadmin;		 /* gnb:TODO get this from searchargs */
+ const char *userid;		 /* gnb:TODO get this from searchargs */
+ struct auth_state *auth_state; /* gnb:TODO get this from searchargs */
+ struct buf value;
 };
 
-/* Bitmasks for search flags */
+/* Flags for searchargs.state */
 enum {
- SEARCH_RECENT_SET = (1<<0),
- SEARCH_RECENT_UNSET	= (1<<1),
- SEARCH_SEEN_SET = (1<<2),
- SEARCH_SEEN_UNSET =	 (1<<3)
-/* SEARCH_UNCACHEDHEADER =	(1<<4) -- obsolete */
+ GETSEARCH_CHARSET_KEYWORD = 0x01,
+ GETSEARCH_RETURN = 0x02,
+ GETSEARCH_CHARSET_FIRST = 0x04,
 };
 
+
 /* Bitmasks for search return options */
 enum {
 SEARCH_RETURN_MIN =		(1<<0),
 SEARCH_RETURN_MAX =		(1<<1),
 SEARCH_RETURN_ALL =		(1<<2),
- SEARCH_RETURN_COUNT =	(1<<3)
+ SEARCH_RETURN_COUNT =	(1<<3),
+ SEARCH_RETURN_RELEVANCY =	(1<<4)
 };
 
 /* Things that may be searched for */
 struct searchargs {
- int flags;
- unsigned smaller, larger;
- time_t before, after;
- time_t sentbefore, sentafter;
- bit32 system_flags_set;
- bit32 system_flags_unset;
- bit32 user_flags_setMAX_USER_FLAGS/32;
- bit32 user_flags_unsetMAX_USER_FLAGS/32;
- struct seqset *sequence;
- struct seqset *uidsequence;
- struct strlist *from;
- struct strlist *to;
- struct strlist *cc;
- struct strlist *bcc;
- struct strlist *subject;
- struct strlist *messageid;
- struct strlist *body;
- struct strlist *text;
- struct strlist *header_name, *header;
- struct searchsub *sublist;
- modseq_t modseq;
-
- bit32 cache_atleast;
+ struct search_expr *root;
+ int charset;
+ int state;
+ /* used only during parsing */
+ int fuzzy_depth;
 
- /* For ESEARCH */
+ /* For ESEARCH & XCONVMULTISORT */
 const char *tag;
 int returnopts;
+ struct namespace *namespace;
+ const char *userid;
+ struct auth_state *authstate;
+ int isadmin;
 };
 
 /* Sort criterion */
@@ -207,50 +228,111 @@
 union {			/* argument(s) to the sort key */
 	struct {
 	 char *entry;
-	 char *attrib;
+	 char *userid;
 	} annot;
+	struct {
+	 char *name;
+	} flag;
 } args;
 };
 
 /* Values for sort keys */
 enum {
 SORT_SEQUENCE = 0,
- SORT_ARRIVAL,
- SORT_CC,
- SORT_DATE,
- SORT_DISPLAYFROM,
- SORT_DISPLAYTO,
- SORT_FROM,
- SORT_SIZE,
- SORT_SUBJECT,
- SORT_TO,
- SORT_ANNOTATION,
- SORT_MODSEQ
+ SORT_ARRIVAL,	/* RFC 5256 */
+ SORT_CC,		/* RFC 5256 */
+ SORT_DATE,		/* RFC 5256 */
+ SORT_DISPLAYFROM,	/* RFC 5957 */
+ SORT_DISPLAYTO,	/* RFC 5957 */
+ SORT_FROM,		/* RFC 5256 */
+ SORT_SIZE,		/* RFC 5256 */
+ SORT_SUBJECT,	/* RFC 5256 */
+ SORT_TO,		/* RFC 5256 */
+ SORT_ANNOTATION,	/* RFC 5257 */
+ SORT_MODSEQ,	/* nonstandard */
+ SORT_UID,		/* nonstandard */
+ SORT_HASFLAG,	/* nonstandard */
+ SORT_CONVMODSEQ,	/* nonstandard */
+ SORT_CONVEXISTS,	/* nonstandard */
+ SORT_CONVSIZE,	/* nonstandard */
+ SORT_HASCONVFLAG,	/* nonstandard */
+ SORT_FOLDER,	/* nonstandard */
+ SORT_RELEVANCY	/* RFC 6203 */
 /* values > 255 are reserved for internal use */
 };
 
 /* Sort key modifier flag bits */
-#define SORT_REVERSE		(1<<0)
+#define SORT_REVERSE		(1<<0)	 /* RFC 5256 */
+
+/* Windowing arguments for the XCONVSORT command */
+struct windowargs {
+ int conversations;		/* whether to limit the results by
+				 conversation id */
+ uint32_t limit;		/* limit on how many messages to return,
+				 * 0 means unlimited. */
+ uint32_t position;		/* 1-based index into results of first
+				 * message to return. 0 means not
+				 * specified which is the same as 1.
+				 * Mutually exclusive with @anchor */
+ uint32_t anchor;		/* UID of a message used to locate the
+				 * start of the window; 0 means not
+				 * specified. If the anchor is found,
+				 * the first message reported will be
+				 * the largest of 1 and the anchor minus
+				 * @offset. If specified but not found,
+				 * an error will be returned. Mutually
+				 * exclusive with @position.*/
+ char *anchorfolder;		/* internal mboxname of a folder to
+				 * which the anchor applies; only used
+				 * for XCONVMULTISORT. */
+ uint32_t offset;
+ int changedsince;		/* if 1, show messages a) added since @uidnext,
+				 * b) removed since @modseq, or c) modified
+				 * since @modseq */
+ modseq_t modseq;
+ uint32_t uidnext;
+ uint32_t upto;		/* UID of a message used to terminate an
+				 * XCONVUPDATES early, 0 means not
+				 * specified. */
+};
+
+struct snippetargs
+{
+ struct snippetargs *next;
+ char *mboxname;		/* internal */
+ uint32_t uidvalidity;
+ struct {
+	uint32_t *data;
+	int count;
+	int alloc;
+ } uids;
+};
 
 /* Bitmask for status queries */
 enum {
- STATUS_MESSAGES =	 (1<<0),
+ STATUS_MESSAGES =		(1<<0),
 STATUS_RECENT =		(1<<1),
 STATUS_UIDNEXT =		(1<<2),
 STATUS_UIDVALIDITY =	(1<<3),
 STATUS_UNSEEN =		(1<<4),
- STATUS_HIGHESTMODSEQ =	(1<<5)
+ STATUS_HIGHESTMODSEQ =	(1<<5),
+ STATUS_XCONVEXISTS =	(1<<6),
+ STATUS_XCONVUNSEEN =	(1<<7),
+ STATUS_XCONVMODSEQ =	(1<<8)
 };
 
+#define STATUS_CONVITEMS (STATUS_XCONVEXISTS|STATUS_XCONVUNSEEN|STATUS_XCONVMODSEQ)
+
 /* Arguments to List functions */
 struct listargs {
 unsigned cmd;		/* Command variant */
 unsigned sel;		/* Selection options */
 unsigned ret;		/* Return options */
 const char *ref;		/* Reference name */
- struct strlist *pat;	/* Mailbox pattern(s) */
+ strarray_t pat;		/* Mailbox pattern(s) */
 const char *scan;		/* SCAN content */
 hash_table server_table;	/* for proxying SCAN */
+ unsigned statusitems;	/* for RETURN STATUS */
 };
 
 /* Value for List command variant */
@@ -265,13 +347,17 @@
 enum {
 LIST_SEL_SUBSCRIBED =	(1<<0),
 LIST_SEL_REMOTE =		(1<<1),
- LIST_SEL_RECURSIVEMATCH =	(1<<2)
+ LIST_SEL_RECURSIVEMATCH =	(1<<2),
+ LIST_SEL_SPECIALUSE =	(1<<3)
 };
 
 /* Bitmask for List return options */
 enum {
 LIST_RET_SUBSCRIBED =	(1<<0),
- LIST_RET_CHILDREN =		(1<<1)
+ LIST_RET_CHILDREN =		(1<<1),
+ LIST_RET_SPECIALUSE =	(1<<2),
+ LIST_RET_STATUS =		(1<<3),
+ LIST_RET_MYRIGHTS =		(1<<4)
 };
 
 /* Bitmask for List name attributes */
@@ -294,7 +380,7 @@
 /* Bitmask for client capabilities */
 enum {
 CAPA_CONDSTORE =	(1<<0),
- CAPA_QRESYNC = 	(1<<1)
+ CAPA_QRESYNC =	(1<<1)
 };
 
 /* Bitmask for urlfetch params */

cyrus-imapd-2.4.17.tar.gz/imap/imapparse.c -> cyrus-imapd-2.5.tar.gz/imap/imapparse.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imapparse.c,v 1.20 2010/01/06 17:01:34 murch Exp $
 */
 
 #include <config.h>
@@ -49,6 +47,10 @@
 
 #include "exitcodes.h"
 #include "global.h"
+#include "imparse.h"
+#include "imap_err.h"
+#include "search_expr.h"
+#include "imapd.h"	/* for struct searchargs */
 #include "prot.h"
 #include "util.h"
 #include "xmalloc.h"
@@ -57,8 +59,7 @@
 * Parse a word
 * (token not containing whitespace, parens, or double quotes)
 */
-#define BUFGROWSIZE 100
-int getword(struct protstream *in, struct buf *buf)
+EXPORTED int getword(struct protstream *in, struct buf *buf)
 {
 int c;
 
@@ -80,8 +81,8 @@
 * Parse an xstring
 * (astring, nstring or string based on type)
 */
-int getxstring(struct protstream *pin, struct protstream *pout,
-	 struct buf *buf, int type)
+EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+	 struct buf *buf, enum getxstring_flags flags)
 {
 int c;
 int i;
@@ -99,12 +100,14 @@
 case '\r':
 case '\n':
 	/* Invalid starting character */
-	buf_reset(buf);
-	buf_cstring(buf);
-	if (c != EOF) prot_ungetc(c, pin);
-	return EOF;
+	goto fail;
 
 case '\"':
+	if (!(flags & GXS_QUOTED)) {
+	 /* Invalid starting character */
+	 goto fail;
+	}
+
 	/*
 	 * Quoted-string. Server is liberal in accepting qspecials
 	 * other than double-quote, CR, and LF.
@@ -130,11 +133,9 @@
 	}
 
 case '{':
-	if (type == IMAP_QSTRING) {
+	if (!(flags & GXS_LITERAL)) {
 	 /* Invalid starting character */
-	 buf_cstring(buf);
-	 if (c != EOF) prot_ungetc(c, pin);
-	 return EOF;
+	 goto fail;
 	}
 
 	/* Literal */
@@ -176,57 +177,58 @@
 	 buf_putc(buf, c);
 	}
 	buf_cstring(buf);
-	if (type != IMAP_BIN_ASTRING && strlen(buf_cstring(buf)) != (unsigned)buf_len(buf))
-	 return EOF; /* Disallow imbedded NUL for non IMAP_BIN_ASTRING */
+	if (!(flags & GXS_BINARY) && strlen(buf_cstring(buf)) != (unsigned)buf_len(buf))
+	 return EOF; /* Disallow imbedded NUL */
 	return prot_getc(pin);
 
 default:
-	switch (type) {
-	case IMAP_BIN_ASTRING: /* binary-allowed ASTRING */
-	case IMAP_ASTRING:	 /* atom, quoted-string or literal */
+	if ((flags & GXS_ATOM)) {
 	 /*
 	 * Atom -- server is liberal in accepting specials other
 	 * than whitespace, parens, or double quotes
 	 */
 	 for (;;) {
-		if (c == EOF || isspace(c) || c == '(' || 
-		 c == ')' || c == '\"') {
-		 buf_cstring(buf);
+		if (c == EOF || isspace(c) || c == '(' ||
+			 c == ')' || c == '\"') {
+		 /* gotta handle NIL here too */
+		 if ((flags & GXS_NIL) && buf->len == 3 && !memcmp(buf->s, "NIL", 3))
+			buf_free(buf);
+		 else
+			buf_cstring(buf);
 		 return c;
 		}
 		buf_putc(buf, c);
 		c = prot_getc(pin);
 	 }
 	 /* never gets here */
-	 break;
-
-	case IMAP_NSTRING:	 /* "NIL", quoted-string or literal */
+	}
+	else if ((flags & GXS_NIL)) {
 	 /*
 	 * Look for "NIL"
 	 */
 	 if (c == 'N') {
 		prot_ungetc(c, pin);
 		c = getword(pin, buf);
-		if (!strcmp(buf_cstring(buf), "NIL"))
+		if (buf->len == 3 && !memcmp(buf->s, "NIL", 3)) {
+		 /* indicated NIL with a NULL buf.s pointer */
+		 buf_free(buf);
 		 return c;
+		}
+		return EOF;
 	 }
-	 if (c != EOF) prot_ungetc(c, pin);
-	 return EOF;
-	 break;
-
-	case IMAP_QSTRING:	 /* quoted-string */
-	case IMAP_STRING:	 /* quoted-string or literal */
-	 /* atoms aren't acceptable */
-	 if (c != EOF) prot_ungetc(c, pin);
-	 return EOF;
-	 break;
 	}
+	goto fail;
 }
 
 return EOF;
+
+fail:
+ buf_cstring(buf);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
 }
 
-int getint32(struct protstream *pin, int32_t *num)
+EXPORTED int getint32(struct protstream *pin, int32_t *num)
 {
 int32_t result = 0;
 char c;
@@ -248,8 +250,36 @@
 return c;
 }
 
+/* Like getint32() but explicitly signed, i.e. negative numbers
+ * are accepted */
+EXPORTED int getsint32(struct protstream *pin, int32_t *num)
+{
+ int c;
+ int sgn = 1;
+
+ c = prot_getc(pin);
+ if (c == EOF)
+	return EOF;
+
+ if (c == '-')
+	sgn = -1;
+ else if (c == '+')
+	sgn = 1;
+ else
+	prot_ungetc(c, pin);
+
+ c = getint32(pin, num);
+ if (c == EOF)
+	return EOF;
+ /* this is slightly buggy: the number INT_MIN = -2147483648
+ * is a valid signed 32b int but is not accepted */
+ if (sgn < 0)
+	*num = - (*num);
+ return c;
+}
+
 /* can't flag with -1 if there is no number here, so return EOF */
-int getuint32(struct protstream *pin, uint32_t *num)
+EXPORTED int getuint32(struct protstream *pin, uint32_t *num)
 {
 uint32_t result = 0;
 char c;
@@ -271,11 +301,36 @@
 return c;
 }
 
+/* This would be called getuint64() if
+ * all were right with the world */
+EXPORTED int getmodseq(struct protstream *pin, modseq_t *num)
+{
+ int c;
+ unsigned int i = 0;
+ char buf32;
+ int gotchar = 0;
+
+ while (i < sizeof(buf) &&
+	 (c = prot_getc(pin)) != EOF &&
+	 cyrus_isdigit(c)) {
+	bufi++ = c;
+	gotchar = 1;
+ }
+
+ if (!gotchar || i == sizeof(buf))
+	return EOF;
+
+ bufi = '\0';
+ *num = strtoull(buf, NULL, 10);
+
+ return c;
+}
+
 /*
 * Eat characters up to and including the next newline
 * Also look for and eat non-synchronizing literals.
 */
-void eatline(struct protstream *pin, int c)
+EXPORTED void eatline(struct protstream *pin, int c)
 {
 int state = 0;
 char *statediagram = " {+}\r";
@@ -306,3 +361,818 @@
 	if (c == EOF) return;
 }
 }
+
+/*
+ * Parse a "date", for SEARCH criteria
+ * The time_t's pointed to by 'start' and 'end' are set to the
+ * times of the start and end of the parsed date.
+ */
+static int get_search_date(struct protstream *pin, time_t *start, time_t *end)
+{
+ int c;
+ struct tm tm;
+ int quoted = 0;
+ char month4;
+ static const char *monthname = {
+	"jan", "feb", "mar", "apr", "may", "jun",
+	"jul", "aug", "sep", "oct", "nov", "dec"
+ };
+
+ memset(&tm, 0, sizeof tm);
+
+ c = prot_getc(pin);
+ if (c == '\"') {
+	quoted++;
+	c = prot_getc(pin);
+ }
+
+ /* Day of month */
+ if (!isdigit(c)) goto baddate;
+ tm.tm_mday = c - '0';
+ c = prot_getc(pin);
+ if (isdigit(c)) {
+	tm.tm_mday = tm.tm_mday * 10 + c - '0';
+	c = prot_getc(pin);
+ }
+
+ if (c != '-') goto baddate;
+ c = prot_getc(pin);
+
+ /* Month name */
+ if (!isalpha(c)) goto baddate;
+ month0 = c;
+ c = prot_getc(pin);
+ if (!isalpha(c)) goto baddate;
+ month1 = c;
+ c = prot_getc(pin);
+ if (!isalpha(c)) goto baddate;
+ month2 = c;
+ c = prot_getc(pin);
+ month3 = '\0';
+ lcase(month);
+
+ for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
+	if (!strcmp(month, monthnametm.tm_mon)) break;
+ }
+ if (tm.tm_mon == 12) goto baddate;
+
+ if (c != '-') goto baddate;
+ c = prot_getc(pin);
+
+ /* Year */
+ if (!isdigit(c)) goto baddate;
+ tm.tm_year = c - '0';
+ c = prot_getc(pin);
+ if (!isdigit(c)) goto baddate;
+ tm.tm_year = tm.tm_year * 10 + c - '0';
+ c = prot_getc(pin);
+ if (isdigit(c)) {
+	if (tm.tm_year < 19) goto baddate;
+	tm.tm_year -= 19;
+	tm.tm_year = tm.tm_year * 10 + c - '0';
+	c = prot_getc(pin);
+	if (!isdigit(c)) goto baddate;
+	tm.tm_year = tm.tm_year * 10 + c - '0';
+	c = prot_getc(pin);
+ }
+
+ if (quoted) {
+	if (c != '\"') goto baddate;
+	c = prot_getc(pin);
+ }
+
+ tm.tm_isdst = -1;
+ *start = mktime(&tm);
+
+ tm.tm_hour = 24;
+ tm.tm_isdst = -1;
+ *end = mktime(&tm);
+
+ return c;
+
+ baddate:
+ prot_ungetc(c, pin);
+ return EOF;
+}
+
+/*
+ * Parse search return options
+ */
+static int get_search_return_opts(struct protstream *pin,
+				 struct protstream *pout,
+				 struct searchargs *searchargs)
+{
+ int c;
+ static struct buf opt;
+
+ c = prot_getc(pin);
+ if (c != '(') {
+	prot_printf(pout,
+		 "%s BAD Missing return options in Search\r\n", searchargs->tag);
+	return EOF;
+ }
+
+ do {
+	c = getword(pin, &opt);
+	if (!opt.s0) break;
+
+	lcase(opt.s);
+	if (!strcmp(opt.s, "min")) {
+	 searchargs->returnopts |= SEARCH_RETURN_MIN;
+	}
+	else if (!strcmp(opt.s, "max")) {
+	 searchargs->returnopts |= SEARCH_RETURN_MAX;
+	}
+	else if (!strcmp(opt.s, "all")) {
+	 searchargs->returnopts |= SEARCH_RETURN_ALL;
+	}
+	else if (!strcmp(opt.s, "count")) {
+	 searchargs->returnopts |= SEARCH_RETURN_COUNT;
+	}
+	else if (!strcmp(opt.s, "relevancy")) {	/* RFC 6203 */
+	 searchargs->returnopts |= SEARCH_RETURN_RELEVANCY;
+	}
+	else {
+	 prot_printf(pout,
+			"%s BAD Invalid Search return option %s\r\n",
+			searchargs->tag, opt.s);
+	 return EOF;
+	}
+
+ } while (c == ' ');
+
+ if (c != ')') {
+	prot_printf(pout,
+		 "%s BAD Missing close parenthesis in Search\r\n",
+		 searchargs->tag);
+	return EOF;
+ }
+
+ c = prot_getc(pin);
+
+ return c;
+}
+
+/*
+ * Parse a ANNOTATION item for SEARCH (RFC5257) into a struct
+ * searchannot and append it to the chain of such structures at *lp.
+ * Returns the next character.
+ */
+static int get_search_annotation(struct protstream *pin,
+				 struct protstream *pout,
+				 struct searchargs *base,
+				 int c, struct searchannot **lp)
+{
+ struct searchannot *sa;
+ struct buf entry = BUF_INITIALIZER;
+ struct buf attrib = BUF_INITIALIZER;
+ struct buf value = BUF_INITIALIZER;
+
+ if (c != ' ')
+	return EOF;
+
+ /* parse the entry */
+ c = getastring(pin, pout, &entry);
+ if (!entry.len || c != ' ') {
+	c = EOF;
+	goto out;
+ }
+
+ /* parse the attrib */
+ c = getastring(pin, pout, &attrib);
+ if (!attrib.len || c != ' ') {
+	c = EOF;
+	goto out;
+ }
+ if (strcmp(attrib.s, "value") &&
+	strcmp(attrib.s, "value.shared") &&
+	strcmp(attrib.s, "value.priv")) {
+	c = EOF;
+	goto out;
+ }
+
+ /* parse the value */
+ c = getbnstring(pin, pout, &value);
+ if (c == EOF)
+	goto out;
+
+ sa = xzmalloc(sizeof(*sa));
+ sa->entry = buf_release(&entry);
+ sa->attrib = buf_release(&attrib);
+ sa->namespace = base->namespace;
+ sa->isadmin = base->isadmin;
+ sa->userid = base->userid;
+ sa->auth_state = base->authstate;
+ buf_move(&sa->value, &value);
+
+ *lp = sa;
+
+out:
+ buf_free(&entry);
+ buf_free(&attrib);
+ buf_free(&value);
+ return c;
+}
+
+
+static void string_match(search_expr_t *parent, const char *val,
+			 const char *aname, struct searchargs *base)
+{
+ search_expr_t *e;
+ const search_attr_t *attr = search_attr_find(aname);
+ enum search_op op = SEOP_MATCH;
+
+ if (base->fuzzy_depth > 0 &&
+	search_attr_is_fuzzable(attr))
+	op = SEOP_FUZZYMATCH;
+
+ e = search_expr_new(parent, op);
+ e->attr = attr;
+ e->value.s = charset_convert(val, base->charset, charset_flags);
+ if (!e->value.s) {
+	e->op = SEOP_FALSE;
+	e->attr = NULL;
+ }
+}
+
+static void systemflag_match(search_expr_t *parent, unsigned int flag, int not)
+{
+ search_expr_t *e;
+
+ if (not)
+	parent = search_expr_new(parent, SEOP_NOT);
+ e = search_expr_new(parent, SEOP_MATCH);
+ e->attr = search_attr_find("systemflags");
+ e->value.u = flag;
+}
+
+static void indexflag_match(search_expr_t *parent, unsigned int flag, int not)
+{
+ search_expr_t *e;
+
+ if (not)
+	parent = search_expr_new(parent, SEOP_NOT);
+ e = search_expr_new(parent, SEOP_MATCH);
+ e->attr = search_attr_find("indexflags");
+ e->value.u = flag;
+}
+
+static void convflag_match(search_expr_t *parent, const char *flagname, int not)
+{
+ search_expr_t *e;
+
+ if (not)
+	parent = search_expr_new(parent, SEOP_NOT);
+ e = search_expr_new(parent, SEOP_MATCH);
+ e->attr = search_attr_find("convflags");
+ e->value.s = xstrdup(flagname);
+}
+
+static void date_range(search_expr_t *parent, const char *aname,
+		 time_t start, time_t end)
+{
+ search_expr_t *e;
+ const search_attr_t *attr = search_attr_find(aname);
+
+ parent = search_expr_new(parent, SEOP_AND);
+
+ e = search_expr_new(parent, SEOP_LT);
+ e->attr = attr;
+ e->value.u = end;
+
+ e = search_expr_new(parent, SEOP_GE);
+ e->attr = attr;
+ e->value.u = start;
+}
+
+/*
+ * Parse a single search criterion
+ */
+static int get_search_criterion(struct protstream *pin,
+				struct protstream *pout,
+				search_expr_t *parent,
+				struct searchargs *base)
+{
+ static struct buf criteria, arg, arg2;
+ search_expr_t *e;
+ int c;
+ int keep_charset = 0;
+ time_t start, end, now = time(0);
+ uint32_t u;
+ int hasconv = config_getswitch(IMAPOPT_CONVERSATIONS);
+ char mboxnameMAX_MAILBOX_NAME;
+
+ if (base->state & GETSEARCH_CHARSET_FIRST) {
+	c = getcharset(pin, pout, &arg);
+	if (c != ' ') goto missingcharset;
+	lcase(arg.s);
+	base->charset = charset_lookupname(arg.s);
+	if (base->charset == -1) goto badcharset;
+	base->state &= ~GETSEARCH_CHARSET_FIRST;
+ }
+
+ c = getword(pin, &criteria);
+ lcase(criteria.s);
+ switch (criteria.s0) {
+ case '\0':
+	if (c != '(') goto badcri;
+	e = search_expr_new(parent, SEOP_AND);
+	do {
+	 c = get_search_criterion(pin, pout, e, base);
+	} while (c == ' ');
+	if (c == EOF) return EOF;
+	if (c != ')') {
+	 prot_printf(pout, "%s BAD Missing required close paren in Search command\r\n",
+		 base->tag);
+	 if (c != EOF) prot_ungetc(c, pin);
+	 return EOF;
+	}
+	c = prot_getc(pin);
+	break;
+
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ case '*':						/* RFC 3501 */
+	if (imparse_issequence(criteria.s)) {
+	 struct seqset *seq;
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find("msgno");
+	 seq = seqset_parse(criteria.s, NULL, /*maxval*/0);
+	 if (!seq) goto badcri;
+	 seqset_free(seq);
+	 e->value.s = xstrdup(criteria.s);
+	}
+	else goto badcri;
+	break;
+
+ case 'a':
+	if (!strcmp(criteria.s, "answered")) {		/* RFC 3501 */
+	 systemflag_match(parent, FLAG_ANSWERED, /*not*/0);
+	}
+	else if (!strcmp(criteria.s, "all")) {		/* RFC 3501 */
+	 search_expr_new(parent, SEOP_TRUE);
+	 break;
+	}
+	else if (!strcmp(criteria.s, "annotation")) {	/* RFC 5259 */
+	 struct searchannot *annot = NULL;
+	 c = get_search_annotation(pin, pout, base, c, &annot);
+	 if (c == EOF)
+		goto badcri;
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find("annotation");
+	 e->value.annot = annot;
+	}
+	else goto badcri;
+	break;
+
+ case 'b':
+	if (!strcmp(criteria.s, "before")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 e = search_expr_new(parent, SEOP_LT);
+	 e->attr = search_attr_find("internaldate");
+	 e->value.u = start;
+	}
+	else if (!strcmp(criteria.s, "bcc")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else if (!strcmp(criteria.s, "body")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else goto badcri;
+	break;
+
+ case 'c':
+	if (!strcmp(criteria.s, "cc")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convflag")) {	/* nonstandard */
+	 if (c != ' ') goto missingarg;
+	 c = getword(pin, &arg);
+	 lcase(arg.s);
+	 convflag_match(parent, arg.s, /*not*/0);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convread")) {	/* nonstandard */
+	 convflag_match(parent, "\\Seen", /*not*/0);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convunread")) { /* nonstandard */
+	 convflag_match(parent, "\\Seen", /*not*/1);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convseen")) {	/* nonstandard */
+	 convflag_match(parent, "\\Seen", /*not*/0);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convunseen")) { /* nonstandard */
+	 convflag_match(parent, "\\Seen", /*not*/1);
+	}
+	else if (hasconv && !strcmp(criteria.s, "convmodseq")) { /* nonstandard */
+	 modseq_t ms;
+	 if (c != ' ') goto missingarg;
+	 c = getmodseq(pin, &ms);
+	 if (c == EOF) goto badnumber;
+	 e = search_expr_new(parent, SEOP_GE);
+	 e->attr = search_attr_find("convmodseq");
+	 e->value.u = ms;
+	}
+	else if ((base->state & GETSEARCH_CHARSET_KEYWORD)
+	 && !strcmp(criteria.s, "charset")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingcharset;
+	 c = getcharset(pin, pout, &arg);
+	 if (c != ' ') goto missingcharset;
+	 lcase(arg.s);
+	 base->charset = charset_lookupname(arg.s);
+	 if (base->charset == -1) goto badcharset;
+	}
+	else if (!strcmp(criteria.s, "cid")) {		/* nonstandard */
+	 conversation_id_t cid;
+	 if (c != ' ') goto missingarg;
+	 c = getword(pin, &arg);
+	 if (c == EOF) goto badnumber;
+	 if (!conversation_id_decode(&cid, arg.s)) goto badnumber;
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find("cid");
+	 e->value.u = cid;
+	}
+	else goto badcri;
+	break;
+
+ case 'd':
+	if (!strcmp(criteria.s, "deleted")) {		/* RFC 3501 */
+	 systemflag_match(parent, FLAG_DELETED, /*not*/0);
+	}
+	else if (!strcmp(criteria.s, "draft")) {	/* RFC 3501 */
+	 systemflag_match(parent, FLAG_DRAFT, /*not*/0);
+	}
+	else goto badcri;
+	break;
+
+ case 'f':
+	if (!strcmp(criteria.s, "flagged")) {		/* RFC 3501 */
+	 systemflag_match(parent, FLAG_FLAGGED, /*not*/0);
+	}
+	else if (!strcmp(criteria.s, "folder")) {	/* nonstandard */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 base->namespace->mboxname_tointernal(base->namespace, arg.s,
+						 base->userid, mboxname);
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find("folder");
+	 e->value.s = xstrdup(mboxname);
+	}
+	else if (!strcmp(criteria.s, "from")) {		/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else if (!strcmp(criteria.s, "fuzzy")) {	/* RFC 6203 */
+	 if (c != ' ') goto missingarg;
+	 base->fuzzy_depth++;
+	 c = get_search_criterion(pin, pout, parent, base);
+	 base->fuzzy_depth--;
+	 if (c == EOF) return EOF;
+	 break;
+	}
+	else goto badcri;
+	break;
+
+ case 'h':
+	if (!strcmp(criteria.s, "header")) {		/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg2);
+	 if (c == EOF) goto missingarg;
+
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find_field(arg.s);
+	 e->value.s = charset_convert(arg2.s, base->charset, charset_flags);
+	 if (!e->value.s) {
+		e->op = SEOP_FALSE;
+		e->attr = NULL;
+	 }
+	}
+	else goto badcri;
+	break;
+
+ case 'k':
+	if (!strcmp(criteria.s, "keyword")) {		/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getword(pin, &arg);
+	 if (!imparse_isatom(arg.s)) goto badflag;
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find("keyword");
+	 e->value.s = xstrdup(arg.s);
+	}
+	else goto badcri;
+	break;
+
+ case 'l':
+	if (!strcmp(criteria.s, "larger")) {		/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getint32(pin, (int32_t *)&u);
+	 if (c == EOF) goto badnumber;
+	 e = search_expr_new(parent, SEOP_GT);
+	 e->attr = search_attr_find("size");
+	 e->value.u = u;
+	}
+	else goto badcri;
+	break;
+
+ case 'm':
+	if (!strcmp(criteria.s, "modseq")) {		/* RFC 4551 */
+	 modseq_t modseq;
+	 if (c != ' ') goto missingarg;
+	 /* Check for optional search-modseq-ext */
+	 c = getqstring(pin, pout, &arg);
+	 if (c != EOF) {
+		if (c != ' ') goto missingarg;
+		c = getword(pin, &arg);
+		if (c != ' ') goto missingarg;
+	 }
+	 c = getmodseq(pin, &modseq);
+	 if (c == EOF) goto badnumber;
+	 e = search_expr_new(parent, SEOP_GE);
+	 e->attr = search_attr_find("modseq");
+	 e->value.u = modseq;
+	}
+	else goto badcri;
+	break;
+
+ case 'n':
+	if (!strcmp(criteria.s, "not")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 e = search_expr_new(parent, SEOP_NOT);
+	 c = get_search_criterion(pin, pout, e, base);
+	 if (c == EOF) return EOF;
+	}
+	else if (!strcmp(criteria.s, "new")) {	/* RFC 3501 */
+	 e = search_expr_new(parent, SEOP_AND);
+	 indexflag_match(e, MESSAGE_SEEN, /*not*/1);
+	 indexflag_match(e, MESSAGE_RECENT, /*not*/0);
+	}
+	else goto badcri;
+	break;
+
+ case 'o':
+	if (!strcmp(criteria.s, "or")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 e = search_expr_new(parent, SEOP_OR);
+	 c = get_search_criterion(pin, pout, e, base);
+	 if (c == EOF) return EOF;
+	 if (c != ' ') goto missingarg;
+	 c = get_search_criterion(pin, pout, e, base);
+	 if (c == EOF) return EOF;
+	}
+	else if (!strcmp(criteria.s, "old")) {	/* RFC 3501 */
+	 indexflag_match(parent, MESSAGE_RECENT, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "older")) { /* RFC 5032 */
+	 if (c != ' ') goto missingarg;
+	 c = getint32(pin, (int32_t *)&u);
+	 if (c == EOF) goto badinterval;
+	 e = search_expr_new(parent, SEOP_LE);
+	 e->attr = search_attr_find("internaldate");
+	 e->value.u = now - u;
+	}
+	else if (!strcmp(criteria.s, "on")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 date_range(parent, "internaldate", start, end);
+	}
+	else goto badcri;
+	break;
+
+ case 'r':
+	if (!strcmp(criteria.s, "recent")) {	/* RFC 3501 */
+	 indexflag_match(parent, MESSAGE_RECENT, /*not*/0);
+	}
+	else if ((base->state & GETSEARCH_RETURN) &&
+		 !strcmp(criteria.s, "return")) { /* RFC 4731 */
+	 c = get_search_return_opts(pin, pout, base);
+	 if (c == EOF) return EOF;
+	 keep_charset = 1;
+	}
+	else goto badcri;
+	break;
+
+ case 's':
+	if (!strcmp(criteria.s, "seen")) {		/* RFC 3501 */
+	 indexflag_match(parent, MESSAGE_SEEN, /*not*/0);
+	}
+	else if (!strcmp(criteria.s, "sentbefore")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 e = search_expr_new(parent, SEOP_LT);
+	 e->attr = search_attr_find("sentdate");
+	 e->value.u = start;
+	}
+	else if (!strcmp(criteria.s, "senton")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 date_range(parent, "sentdate", start, end);
+	}
+	else if (!strcmp(criteria.s, "sentsince")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 e = search_expr_new(parent, SEOP_GE);
+	 e->attr = search_attr_find("sentdate");
+	 e->value.u = start;
+	}
+	else if (!strcmp(criteria.s, "since")) { /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = get_search_date(pin, &start, &end);
+	 if (c == EOF) goto baddate;
+	 e = search_expr_new(parent, SEOP_GE);
+	 e->attr = search_attr_find("internaldate");
+	 e->value.u = start;
+	}
+	else if (!strcmp(criteria.s, "smaller")) { /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getint32(pin, (int32_t *)&u);
+	 if (c == EOF) goto badnumber;
+	 e = search_expr_new(parent, SEOP_LT);
+	 e->attr = search_attr_find("size");
+	 e->value.u = u;
+	}
+	else if (!strcmp(criteria.s, "subject")) { /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else goto badcri;
+	break;
+
+ case 't':
+	if (!strcmp(criteria.s, "to")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else if (!strcmp(criteria.s, "text")) {	 /* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, criteria.s, base);
+	}
+	else goto badcri;
+	break;
+
+ case 'u':
+	if (!strcmp(criteria.s, "uid")) {	 /* RFC 3501 */
+	 struct seqset *seq;
+	 if (c != ' ') goto missingarg;
+	 c = getword(pin, &arg);
+	 if (!imparse_issequence(arg.s)) goto badcri;
+	 e = search_expr_new(parent, SEOP_MATCH);
+	 e->attr = search_attr_find(criteria.s);
+	 seq = seqset_parse(arg.s, NULL, /*maxval*/0);
+	 if (!seq) goto badcri;
+	 seqset_free(seq);
+	 e->value.s = xstrdup(arg.s);
+	}
+	else if (!strcmp(criteria.s, "unseen")) {	/* RFC 3501 */
+	 indexflag_match(parent, MESSAGE_SEEN, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "unanswered")) {	/* RFC 3501 */
+	 systemflag_match(parent, FLAG_ANSWERED, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "undeleted")) {	/* RFC 3501 */
+	 systemflag_match(parent, FLAG_DELETED, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "undraft")) {	/* RFC 3501 */
+	 systemflag_match(parent, FLAG_DRAFT, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "unflagged")) {	/* RFC 3501 */
+	 systemflag_match(parent, FLAG_FLAGGED, /*not*/1);
+	}
+	else if (!strcmp(criteria.s, "unkeyword")) {	/* RFC 3501 */
+	 if (c != ' ') goto missingarg;
+	 c = getword(pin, &arg);
+	 if (!imparse_isatom(arg.s)) goto badflag;
+	 e = search_expr_new(parent, SEOP_NOT);
+	 e = search_expr_new(e, SEOP_MATCH);
+	 e->attr = search_attr_find("keyword");
+	 e->value.s = xstrdup(arg.s);
+	}
+	else goto badcri;
+	break;
+
+ case 'x':
+	if (!strcmp(criteria.s, "xlistid")) {		/* nonstandard */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, "listid", base);
+	}
+	else if (!strcmp(criteria.s, "xcontenttype")) {	/* nonstandard */
+	 if (c != ' ') goto missingarg;
+	 c = getastring(pin, pout, &arg);
+	 if (c == EOF) goto missingarg;
+	 string_match(parent, arg.s, "contenttype", base);
+	}
+	else goto badcri;
+	break;
+
+ case 'y':
+	if (!strcmp(criteria.s, "younger")) {		/* RFC 5032 */
+	 if (c != ' ') goto missingarg;
+	 c = getint32(pin, (int32_t *)&u);
+	 if (c == EOF) goto badinterval;
+	 e = search_expr_new(parent, SEOP_GE);
+	 e->attr = search_attr_find("internaldate");
+	 e->value.u = now - u;
+	}
+	else goto badcri;
+	break;
+
+ default:
+ badcri:
+	prot_printf(pout, "%s BAD Invalid Search criteria\r\n", base->tag);
+	if (c != EOF) prot_ungetc(c, pin);
+	return EOF;
+ }
+
+ if (!keep_charset)
+	base->state &= ~GETSEARCH_CHARSET_KEYWORD;
+ base->state &= ~GETSEARCH_RETURN;
+
+ return c;
+
+ missingarg:
+ prot_printf(pout, "%s BAD Missing required argument to Search %s\r\n",
+		base->tag, criteria.s);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ badflag:
+ prot_printf(pout, "%s BAD Invalid flag name %s in Search command\r\n",
+		base->tag, arg.s);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ baddate:
+ prot_printf(pout, "%s BAD Invalid date in Search command\r\n",
+		base->tag);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ badnumber:
+ prot_printf(pout, "%s BAD Invalid number in Search command\r\n",
+		base->tag);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ badinterval:
+ prot_printf(pout, "%s BAD Invalid interval in Search command\r\n",
+		base->tag);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ missingcharset:
+ prot_printf(pout, "%s BAD Missing charset\r\n",
+		base->tag);
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+
+ badcharset:
+ prot_printf(pout, "%s BAD %s\r\n", base->tag,
+	 error_message(IMAP_UNRECOGNIZED_CHARSET));
+ if (c != EOF) prot_ungetc(c, pin);
+ return EOF;
+}
+
+/*
+ * Parse a search program
+ */
+EXPORTED int get_search_program(struct protstream *pin,
+				struct protstream *pout,
+				struct searchargs *searchargs)
+{
+ int c;
+
+ searchargs->root = search_expr_new(NULL, SEOP_AND);
+
+ do {
+	c = get_search_criterion(pin, pout, searchargs->root, searchargs);
+ } while (c == ' ');
+
+ return c;
+}
+

cyrus-imapd-2.5.tar.gz/imap/imapparse.h Added

@@ -0,0 +1,94 @@
+/* imapparse.h -- Header for IMAP parsing functions
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_IMAP_PARSE_H__
+#define __CYRUS_IMAP_PARSE_H__
+
+#include "libconfig.h"
+#include "prot.h"
+#include "index.h"
+
+/* imap parsing functions (imapparse.c) */
+int getword(struct protstream *in, struct buf *buf);
+
+/* Flags for getxstring() */
+/* IMAP_BIN_ASTRING is an IMAP_ASTRING that does not perform the
+ * does-not-contain-a-NULL check (in the case of a literal) */
+enum getxstring_flags {
+ GXS_ATOM	= (1<<0), /* result may be a bare atom */
+ GXS_QUOTED	= (1<<1), /* result may be "quoted" */
+ GXS_LITERAL	= (1<<2), /* result may be {N}literal */
+ GXS_NIL	= (1<<3), /* result may be the special atom NIL */
+ GXS_BINARY	= (1<<4), /* result may contain embedded NULs */
+
+ IMAP_ASTRING = GXS_ATOM|GXS_QUOTED|GXS_LITERAL,
+ IMAP_BIN_ASTRING = IMAP_ASTRING|GXS_BINARY,
+ IMAP_NSTRING = GXS_NIL|GXS_QUOTED|GXS_LITERAL,
+ IMAP_BIN_NSTRING = IMAP_NSTRING|GXS_BINARY,
+ IMAP_QSTRING = GXS_QUOTED,
+ IMAP_STRING = GXS_QUOTED|GXS_LITERAL,
+
+ /* note: there's some consistency issues here... the special
+ * value "NIL" must be quoted to get returned as a string */
+ IMAP_NASTRING = GXS_NIL|GXS_ATOM|GXS_QUOTED|GXS_LITERAL,
+};
+
+int getxstring(struct protstream *pin, struct protstream *pout,
+	 struct buf *buf, enum getxstring_flags);
+#define getastring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_ASTRING)
+#define getbastring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_BIN_ASTRING)
+#define getnstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_NSTRING)
+#define getbnstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_BIN_NSTRING)
+#define getqstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_QSTRING)
+#define getstring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_STRING)
+#define getnastring(pin, pout, buf) getxstring((pin), (pout), (buf), IMAP_NASTRING)
+#define getcharset(pin, pout, buf) getxstring((pin), (pout), (buf), GXS_ATOM|GXS_QUOTED)
+int getint32(struct protstream *pin, int *num);
+int getsint32(struct protstream *pin, int *num);
+int getuint32(struct protstream *pin, unsigned int *num);
+int getmodseq(struct protstream *pin, modseq_t *num);
+
+void eatline(struct protstream *pin, int c);
+
+int get_search_program(struct protstream *pin, struct protstream *pout, struct searchargs *searchargs);
+
+#endif /* __CYRUS_IMAP_PARSE_H__ */

cyrus-imapd-2.4.17.tar.gz/imap/index.c -> cyrus-imapd-2.5.tar.gz/imap/index.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: index.c,v 1.259 2010/06/28 12:04:53 brong Exp $
 */
 
 #include <config.h>
@@ -48,10 +46,10 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <syslog.h>
-#include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -60,43 +58,58 @@
 #include "append.h"
 #include "assert.h"
 #include "charset.h"
+#include "conversations.h"
+#include "dlist.h"
 #include "exitcodes.h"
 #include "hash.h"
+#include "hashu64.h"
 #include "imap_err.h"
 #include "global.h"
+#include "times.h"
 #include "imapd.h"
-#include "cyr_lock.h"
 #include "lsort.h"
 #include "mailbox.h"
 #include "map.h"
 #include "message.h"
 #include "parseaddr.h"
 #include "search_engines.h"
+#include "search_query.h"
 #include "seen.h"
 #include "statuscache.h"
 #include "strhash.h"
-#include "stristr.h"
+#include "user.h"
 #include "util.h"
+#include "xstats.h"
+#include "ptrarray.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 #include "index.h"
 #include "sync_log.h"
 
 /* Forward declarations */
-static void index_refresh(struct index_state *state);
+static void index_refresh_locked(struct index_state *state);
 static void index_tellexists(struct index_state *state);
-int index_lock(struct index_state *state);
-void index_unlock(struct index_state *state);
+static int index_lock(struct index_state *state);
+static void index_unlock(struct index_state *state);
+// extern struct namespace imapd_namespace;
+
+struct index_modified_flags {
+ int added_flags;
+ bit32 added_system_flags;
+ bit32 added_user_flagsMAX_USER_FLAGS/32;
+ int removed_flags;
+ bit32 removed_system_flags;
+ bit32 removed_user_flagsMAX_USER_FLAGS/32;
+};
 
-int index_writeseen(struct index_state *state);
-void index_fetchmsg(struct index_state *state,
-		 const char *msg_base, unsigned long msg_size,
+static int index_writeseen(struct index_state *state);
+static void index_fetchmsg(struct index_state *state,
+		 const struct buf *msg,
 		 unsigned offset, unsigned size,
 		 unsigned start_octet, unsigned octet_count);
 static int index_fetchsection(struct index_state *state, const char *resp,
-			 const char *msg_base, unsigned long msg_size,
+			 const struct buf *msg,
 			 char *section,
 			 const char *cachestr, unsigned size,
 			 unsigned start_octet, unsigned octet_count);
@@ -107,72 +120,54 @@
 				unsigned start_octet, unsigned octet_count);
 static char *index_readheader(const char *msg_base, unsigned long msg_size,
 			 unsigned offset, unsigned size);
-static void index_pruneheader(char *buf, struct strlist *headers,
-			 struct strlist *headers_not);
 static void index_fetchheader(struct index_state *state,
 			 const char *msg_base, unsigned long msg_size,
 			 unsigned size,
-			 struct strlist *headers,
-			 struct strlist *headers_not);
+			 const strarray_t *headers,
+			 const strarray_t *headers_not);
 static void index_fetchcacheheader(struct index_state *state, struct index_record *record, 
-				 struct strlist *headers, unsigned start_octet, 
+				 const strarray_t *headers, unsigned start_octet, 
 				 unsigned octet_count);
 static void index_listflags(struct index_state *state);
 static void index_fetchflags(struct index_state *state, uint32_t msgno);
-static int index_search_evaluate(struct index_state *state,
-				 struct searchargs *searchargs,
-				 uint32_t msgno, struct mapfile *msgfile);
-static int index_searchmsg(char *substr, comp_pat *pat,
-			 struct mapfile *msgfile,
-			 int skipheader, const char *cachestr);
-static int index_searchheader(char *name, char *substr, comp_pat *pat,
-			 struct mapfile *msgfile,
-			 int size);
-static int index_searchcacheheader(struct index_state *state, uint32_t msgno, char *name, char *substr,
-				 comp_pat *pat);
-static int _index_search(unsigned **msgno_list, struct index_state *state,
-			 struct searchargs *searchargs,
-			 modseq_t *highestmodseq);
 
-static int index_copysetup(struct index_state *state, uint32_t msgno, struct copyargs *copyargs);
-static int index_storeflag(struct index_state *state, uint32_t msgno,
+static int index_copysetup(struct index_state *state, uint32_t msgno,
+			 struct copyargs *copyargs, int is_same_user);
+static int index_storeflag(struct index_state *state,
+			 struct index_modified_flags *modified_flags,
+			 uint32_t msgno, struct index_record *record,
+			 struct storeargs *storeargs);
+static int index_store_annotation(struct index_state *state, uint32_t msgno,
 			 struct storeargs *storeargs);
 static int index_fetchreply(struct index_state *state, uint32_t msgno,
-			 struct fetchargs *fetchargs);
-static void index_printflags(struct index_state *state, uint32_t msgno, int usinguid);
-static void index_checkflags(struct index_state *state, int dirty);
-static char *find_msgid(char *str, char **rem);
+			 const struct fetchargs *fetchargs);
+static void index_printflags(struct index_state *state, uint32_t msgno,
+			 int usinguid, int printmodseq);
 static char *get_localpart_addr(const char *header);
 static char *get_displayname(const char *header);
 static char *index_extract_subject(const char *subj, size_t len, int *is_refwd);
 static char *_index_extract_subject(char *s, int *is_refwd);
 static void index_get_ids(MsgData *msgdata,
 			 char *envtokens, const char *headers, unsigned size);
-static MsgData *index_msgdata_load(struct index_state *state, unsigned *msgno_list, int n,
-				 struct sortcrit *sortcrit);
 
-static void *index_sort_getnext(MsgData *node);
-static void index_sort_setnext(MsgData *node, MsgData *next);
 static int index_sort_compare(MsgData *md1, MsgData *md2,
-			 struct sortcrit *call_data);
-static void index_msgdata_free(MsgData *md);
+			 const struct sortcrit *call_data);
+static int index_sort_compare_qsort(const void *v1, const void *v2);
 
 static void *index_thread_getnext(Thread *thread);
 static void index_thread_setnext(Thread *thread, Thread *next);
 static int index_thread_compare(Thread *t1, Thread *t2,
-				struct sortcrit *call_data);
+				const struct sortcrit *call_data);
 static void index_thread_orderedsubj(struct index_state *state,
-				 unsigned *msgno_list, int nmsg,
+				 unsigned *msgno_list, unsigned int nmsg,
 				 int usinguid);
-static void index_thread_sort(Thread *root, struct sortcrit *sortcrit);
+static void index_thread_sort(Thread *root, const struct sortcrit *sortcrit);
 static void index_thread_print(struct index_state *state,
 			 Thread *threads, int usinguid);
 static void index_thread_ref(struct index_state *state,
-			 unsigned *msgno_list, int nmsg, int usinguid);
+			 unsigned *msgno_list, unsigned int nmsg,
+			 int usinguid);
 
-static void index_select(struct index_state *state);
-static struct seqset *_index_vanished(struct index_state *state,
-				 struct vanished_params *params);
 static struct seqset *_parse_sequence(struct index_state *state,
 				 const char *sequence, int usinguid);
 static void massage_header(char *hdr);
@@ -184,118 +179,184 @@
 { NULL, NULL }
 };
 
+static int index_reload_record(struct index_state *state,
+			 uint32_t msgno,
+			 struct index_record *recordp)
+{
+ struct index_map *im = &state->mapmsgno-1;
+ int r = 0;
+ int i;
+
+ if (!im->recno) {
+	/* doh, gotta just fill in what we know */
+	memset(recordp, 0, sizeof(struct index_record));
+	recordp->uid = im->uid;
+ }
+ else {
+	r = mailbox_read_index_record(state->mailbox, im->recno, recordp);
+ }
+ /* NOTE: we have released the cyrus.index lock at this point, but are
+ * still holding the mailbox name relock. This means nobody can rewrite
+ * the file under us - so the offsets are still guaranteed to be correct,
+ * and all the immutable fields are unchanged. That said, we can get a
+ * read of a partially updated record which contains an invalid checksum
+ * due to incomplete concurrent changes to mutable fields.
+ *
+ * That's OK in just this case, because we're about to overwrite all the
+ * parsed mutable fields with the clean values we cached back when we had
+ * a cyrus.index lock and got a complete read. */
+ if (r == IMAP_MAILBOX_CHECKSUM) r = 0;
+
+ /* but other errors are still bad */
+ if (r) return r;
+
+ /* better be! */
+ assert(recordp->uid == im->uid);
+
+ /* restore mutable fields */
+ recordp->modseq = im->modseq;
+ recordp->system_flags = im->system_flags;
+ recordp->cache_offset = im->cache_offset;
+ for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	recordp->user_flagsi = im->user_flagsi;
+
+ return 0;
+}
+
+static int index_rewrite_record(struct index_state *state,
+				uint32_t msgno,
+				struct index_record *recordp)
+{
+ struct index_map *im = &state->mapmsgno-1;
+ int i;
+ int r;
+
+ assert(recordp->uid == im->uid);
+
+ r = mailbox_rewrite_index_record(state->mailbox, recordp);
+ if (r) return r;
+
+ /* update tracking of mutable fields */
+ im->modseq = recordp->modseq;
+ im->system_flags = recordp->system_flags;
+ im->cache_offset = recordp->cache_offset;
+ for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	im->user_flagsi = recordp->user_flagsi;
+
+ return 0;
+}
+
+EXPORTED void index_release(struct index_state *state)
+{
+ if (!state) return;
+
+ if (state->mailbox) {
+	mailbox_close(&state->mailbox);
+	state->mailbox = NULL; /* should be done by close anyway */
+ }
+}
+static struct sortcrit *the_sortcrit;
 
 /*
 * A mailbox is about to be closed.
 */
-int index_close(struct index_state **stateptr)
+EXPORTED void index_close(struct index_state **stateptr)
 {
 unsigned i;
 struct index_state *state = *stateptr;
 
- free(state->userid);
+ if (!state) return;
+
+ index_release(state);
+
 free(state->map);
+ free(state->mboxname);
+ free(state->userid);
 for (i = 0; i < MAX_USER_FLAGS; i++)
 	free(state->flagnamei);
- mailbox_close(&state->mailbox);
 free(state);
 
 *stateptr = NULL;
-
- return 0;
 }
 
 /*
 * A new mailbox has been selected, map it into memory and do the
 * initial CHECK.
 */
-int index_open(const char *name, struct index_init *init,
+EXPORTED int index_open(const char *name, struct index_init *init,
 	 struct index_state **stateptr)
 {
 int r;
 struct index_state *state = xzmalloc(sizeof(struct index_state));
- struct seqset *vanishedlist = NULL;
-
- r = mailbox_open_iwl(name, &state->mailbox);
- if (r) goto fail;
 
 if (init) {
-	state->myrights = cyrus_acl_myrights(init->authstate, state->mailbox->acl);
-	if (init->examine_mode)
-	 state->myrights &= ~ACL_READ_WRITE;
-
 	state->authstate = init->authstate;
-	state->userid = init->userid ? xstrdup(init->userid) : NULL;
-
-	state->internalseen = mailbox_internal_seen(state->mailbox, state->userid);
-	state->keepingseen = (state->myrights & ACL_SEEN);
 	state->examining = init->examine_mode;
-
+	state->mboxname = xstrdup(name);
 	state->out = init->out;
 	state->qresync = init->qresync;
- }
+	state->userid = xstrdupnull(init->userid);
+	state->want_expunged = init->want_expunged;
 
- /* initialise the index_state */
- index_refresh(state);
+	if (state->examining) {
+	 r = mailbox_open_irl(state->mboxname, &state->mailbox);
+	 if (r) goto fail;
+	}
+	else {
+	 r = mailbox_open_iwl(state->mboxname, &state->mailbox);
+	 if (r) goto fail;
+	}
+	state->myrights = cyrus_acl_myrights(init->authstate,
+					 state->mailbox->acl);
+	if (state->examining)
+	 state->myrights &= ~ACL_READ_WRITE;
 
- /* have to get the vanished list while we're still locked */
- if (init && init->vanished.uidvalidity == state->mailbox->i.uidvalidity) {
-	vanishedlist = _index_vanished(state, &init->vanished);
+	state->internalseen = mailbox_internal_seen(state->mailbox,
+						 state->userid);
+	state->keepingseen = (state->myrights & ACL_SETSEEN);
+ }
+ else {
+	r = mailbox_open_iwl(name, &state->mailbox);
+	if (r) goto fail;
 }
 
- index_unlock(state);
-
- if (init && init->select && state->myrights & ACL_READ) {
-	index_select(state);
-
-	if (init->vanished.uidvalidity == state->mailbox->i.uidvalidity) {
-	 const char *sequence = init->vanished.sequence;
-	 struct index_map *im;
-	 uint32_t msgno;
-	 struct seqset *seq = _parse_sequence(state, sequence, 1);
-
-	 /* QRESYNC response:
-	 * UID FETCH seq FLAGS (CHANGEDSINCE modseq VANISHED)
-	 */
-
-	 if (vanishedlist && vanishedlist->len) {
-		char *vanished = seqset_cstring(vanishedlist);
-		prot_printf(state->out, "* VANISHED (EARLIER) %s\r\n", vanished);
-		free(vanished);
-	 }
+ if (state->mailbox->mbtype & MBTYPES_NONIMAP) {
+	r = IMAP_MAILBOX_BADTYPE;
+	goto fail;
+ }
 
-	 for (msgno = 1; msgno <= state->exists; msgno++) {
-		im = &state->mapmsgno-1;
-		if (sequence && !seqset_ismember(seq, im->record.uid))
-		 continue;
-		if (im->record.modseq <= init->vanished.modseq)
-		 continue;
-		index_printflags(state, msgno, 1);
-	 }
+ /* initialise the index_state */
+ index_refresh_locked(state);
 
-	 seqset_free(seq);
-	}
- }
+ /* have to get the vanished list while we're still locked */
+ if (init)
+	init->vanishedlist = index_vanished(state, &init->vanished);
 
- seqset_free(vanishedlist);
+ index_unlock(state);
 
 *stateptr = state;
 
 return 0;
 
 fail:
- free(state->mailbox);
+ mailbox_close(&state->mailbox);
+ free(state->mboxname);
+ free(state->userid);
 free(state);
 return r;
 }
 
-int index_expunge(struct index_state *state, char *sequence)
+EXPORTED int index_expunge(struct index_state *state, char *sequence,
+		 int need_deleted)
 {
 int r;
 uint32_t msgno;
 struct index_map *im;
 struct seqset *seq = NULL;
+ struct index_record record;
 int numexpunged = 0;
+ struct mboxevent *mboxevent = NULL;
+ modseq_t oldmodseq;
 
 r = index_lock(state);
 if (r) return r;
@@ -303,45 +364,77 @@
 /* XXX - earlier list if the sequence names UIDs that don't exist? */
 seq = _parse_sequence(state, sequence, 1);
 
+ /* don't notify for messages that don't need \Deleted flag because
+ * a notification should be already send (eg. MessageMove) */
+ if (need_deleted)
+	mboxevent = mboxevent_new(EVENT_MESSAGE_EXPUNGE);
+
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
 
-	if (im->record.system_flags & FLAG_EXPUNGED)
+	if (im->system_flags & FLAG_EXPUNGED)
 	 continue; /* already expunged */
 
-	if (!(im->record.system_flags & FLAG_DELETED))
+	if (need_deleted && !(im->system_flags & FLAG_DELETED))
 	 continue; /* no \Deleted flag */
 
 	/* if there is a sequence list, check it */
-	if (sequence && !seqset_ismember(seq, im->record.uid))
+	if (sequence && !seqset_ismember(seq, im->uid))
 	 continue; /* not in the list */
 
-	if (!im->isseen)
+	/* load first once we know we have to process this one */
+	if (index_reload_record(state, msgno, &record))
+	 continue;
+
+	oldmodseq = im->modseq;
+
+	if (!im->isseen) {
 	 state->numunseen--;
+	 im->isseen = 1;
+	}
 
-	if (im->isrecent)
+	if (im->isrecent) {
 	 state->numrecent--;
+	 im->isrecent = 0;
+	}
 
-	im->record.system_flags |= FLAG_EXPUNGED;
- numexpunged++;
+	/* set the flags */
+	record.system_flags |= FLAG_DELETED | FLAG_EXPUNGED;
+	numexpunged++;
+	state->num_expunged++;
 
-	r = mailbox_rewrite_index_record(state->mailbox, &im->record);
+	r = index_rewrite_record(state, msgno, &record);
 	if (r) break;
+
+	/* avoid telling again (equivalent to STORE FLAGS.SILENT) */
+	if (im->told_modseq == oldmodseq)
+	 im->told_modseq = im->modseq;
+
+	mboxevent_extract_record(mboxevent, state->mailbox, &record);
 }
 
 seqset_free(seq);
 
+ mboxevent_extract_mailbox(mboxevent, state->mailbox);
+ mboxevent_set_numunseen(mboxevent, state->mailbox, state->numunseen);
+
 /* unlock before responding */
 index_unlock(state);
 
 if (!r && (numexpunged > 0)) {
 	syslog(LOG_NOTICE, "Expunged %d messages from %s",
-	 numexpunged, state->mailbox->name);
+	 numexpunged, state->mboxname);
+	/* send the MessageExpunge event notification for "immediate", "default"
+	 * and "delayed" expunge */
+	mboxevent_notify(mboxevent);
 }
+
+ mboxevent_free(&mboxevent);
+
 return r;
 }
 
-char *index_buildseen(struct index_state *state, const char *oldseenuids)
+static char *index_buildseen(struct index_state *state, const char *oldseenuids)
 {
 struct seqset *outlist;
 uint32_t msgno;
@@ -352,7 +445,7 @@
 outlist = seqset_init(0, SEQ_MERGE); 
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
-	seqset_add(outlist, im->record.uid, im->isseen);
+	seqset_add(outlist, im->uid, im->isseen);
 }
 
 /* there may be future already seen UIDs that this process isn't
@@ -376,7 +469,7 @@
 return out;
 }
 
-int index_writeseen(struct index_state *state)
+static int index_writeseen(struct index_state *state)
 {
 int r;
 struct seen *seendb = NULL;
@@ -384,8 +477,6 @@
 struct seendata sd = SEENDATA_INITIALIZER;
 struct mailbox *mailbox = state->mailbox;
 
- assert(mailbox->index_locktype == LOCK_EXCLUSIVE);
-
 if (!state->seen_dirty)
 	return 0;
 
@@ -483,23 +574,36 @@
 return seenlist;
 }
 
-void index_refresh(struct index_state *state)
+static void index_refresh_locked(struct index_state *state)
 {
 struct mailbox *mailbox = state->mailbox;
- uint32_t recno;
+ struct index_record record;
+ uint32_t recno = 1;
 uint32_t msgno = 1;
 uint32_t firstnotseen = 0;
 uint32_t numrecent = 0;
 uint32_t numunseen = 0;
- uint32_t recentuid;
- struct index_map *im;
+ uint32_t num_expunged = 0;
+ uint32_t recentuid = 0;
 modseq_t delayed_modseq = 0;
+ struct index_map *im;
 uint32_t need_records;
 struct seqset *seenlist;
+ int i;
 
- if (state->num_records) {
-	need_records = mailbox->i.num_records -
-		 state->num_records + state->exists;
+ /* need to start by having enough space for the entire index state
+ * before telling of any expunges (which happens after this refresh
+ * if the command allows it). In the update case, where there's
+ * already a map, we have to theoretically fit the number that existed
+ * last time plus however many new records might be unEXPUNGEd on the
+ * end */
+
+ if (state->last_uid) {
+	need_records = state->exists + (mailbox->i.last_uid - state->last_uid);
+ }
+ else if (state->want_expunged) {
+	/* could need the lot! */
+	need_records = mailbox->i.num_records;
 }
 else {
 	/* init case */
@@ -515,79 +619,137 @@
 
 seenlist = _readseen(state, &recentuid);
 
- /* already known records - flag updates */
- for (msgno = 1; msgno <= state->exists; msgno++) {
-	im = &state->mapmsgno-1;
-	if (mailbox_read_index_record(mailbox, im->record.recno, &im->record))
+ /* walk through all records */
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	if (mailbox_read_index_record(mailbox, recno, &record))
 	 continue; /* bogus read... should probably be fatal */
 
-	/* ignore expunged messages */
-	if (im->record.system_flags & FLAG_EXPUNGED) {
+	/* skip over map records where the mailbox doesn't have any
+	 * data at all for the record any more (this can only happen
+	 * after a repack), otherwise there will still be a readable
+	 * record, which is handled below */
+	im = &state->mapmsgno-1;
+	while (msgno <= state->exists && im->uid < record.uid) {
+	 /* NOTE: this same logic is repeated below for messages
+	 * past the end of recno (repack removing the trailing
+	 * records). Make sure to keep them in sync */
+	 if (!(im->system_flags & FLAG_EXPUNGED)) {
+		/* we don't even know the modseq of when it was wiped,
+		 * but we can be sure it's since the last given highestmodseq,
+		 * so simulate the lowest possible value. This is fine for
+		 * our told_modseq logic, and doesn't have to be exact because
+		 * QRESYNC/CONDSTORE clients will see deletedmodseq and fall
+		 * back to the inefficient codepath anyway */
+		im->modseq = state->highestmodseq + 1;
+	 }
+	 if (!delayed_modseq || im->modseq < delayed_modseq)
+		delayed_modseq = im->modseq - 1;
+	 im->recno = 0;
+	 /* simulate expunged flag so we get an EXPUNGE response and
+	 * tell about unlinked so we don't get IO errors trying to
+	 * find the file */
+	 im->system_flags |= FLAG_EXPUNGED | FLAG_UNLINKED;
+	 im = &state->mapmsgno++;
+
+	 /* this one is expunged */
+	 num_expunged++;
+	}
+
+	/* expunged record not in map, can skip immediately. It's
+	 * never been told to this connection, so it doesn't need to
+	 * get its own msgno */
+	if (!state->want_expunged
+	 && (msgno > state->exists || record.uid < im->uid)
+	 && (record.system_flags & FLAG_EXPUNGED))
+	 continue;
+
+	/* make sure our UID map is consistent */
+	if (msgno <= state->exists) {
+	 assert(im->uid == record.uid);
+	}
+	else {
+	 im->uid = record.uid;
+	}
+
+	/* copy all mutable fields */
+	im->recno = recno;
+	im->modseq = record.modseq;
+	im->system_flags = record.system_flags;
+	im->cache_offset = record.cache_offset;
+	for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	 im->user_flagsi = record.user_flagsi;
+
+	/* for expunged records, just track the modseq */
+	if (!state->want_expunged && (im->system_flags & FLAG_EXPUNGED)) {
 	 /* http://www.rfc-editor.org/errata_search.php?rfc=5162
 	 * Errata ID: 1809 - if there are expunged records we
 	 * aren't telling about, need to make the highestmodseq
 	 * be one lower so the client can safely resync */
-	 if (!delayed_modseq || im->record.modseq < delayed_modseq)
-		delayed_modseq = im->record.modseq - 1;
-	 continue;
+	 if (!delayed_modseq || im->modseq < delayed_modseq)
+		delayed_modseq = im->modseq - 1;
 	}
+	else {
+	 /* re-calculate seen flags */
+	 if (state->internalseen)
+		im->isseen = (im->system_flags & FLAG_SEEN) ? 1 : 0;
+	 else
+		im->isseen = seqset_ismember(seenlist, im->uid) ? 1 : 0;
 
-	/* re-calculate seen flags */
-	if (state->internalseen)
-	 im->isseen = (im->record.system_flags & FLAG_SEEN) ? 1 : 0;
-	else
-	 im->isseen = seqset_ismember(seenlist, im->record.uid);
+	 if (msgno > state->exists) {
+		/* don't auto-tell new records */
+		im->told_modseq = im->modseq;
+		if (im->uid > recentuid) {
+		 /* mark recent if it's newly being added to the index and also
+		 * greater than the recentuid - ensures only one session gets
+		 * the \Recent flag for any one message */
+		 im->isrecent = 1;
+		 state->seen_dirty = 1;
+		}
+		else
+		 im->isrecent = 0;
+	 }
 
-	/* track select values */
-	if (!im->isseen) {
-	 numunseen++;
-	 if (!firstnotseen)
-		firstnotseen = msgno;
-	}
-	if (im->isrecent) {
-	 /* we don't need to dirty seen here, it's a refresh */
-	 numrecent++;
+	 /* track select values */
+	 if (!im->isseen) {
+		numunseen++;
+		if (!firstnotseen)
+		 firstnotseen = msgno;
+	 }
+	 if (im->isrecent) {
+		numrecent++;
+	 }
 	}
- }
 
- /* new records? */
- for (recno = state->num_records + 1; recno <= mailbox->i.num_records; recno++) {
-	im = &state->mapmsgno-1;
-	if (mailbox_read_index_record(mailbox, recno, &im->record))
-	 continue; /* bogus read... should probably be fatal */
-	if (im->record.system_flags & FLAG_EXPUNGED)
-	 continue;
+	if (im->system_flags & FLAG_EXPUNGED)
+	 num_expunged++;
+
+	msgno++;
 
 	/* make sure we don't overflow the memory we mapped */
-	if (msgno >= state->mapsize) {
+	if (msgno > state->mapsize) {
 	 char buf2048;
 	 sprintf(buf, "Exists wrong %u %u %u %u", msgno,
 		 state->mapsize, mailbox->i.exists, mailbox->i.num_records);
 	 fatal(buf, EC_IOERR);
 	}
+ }
 
-	/* calculate flags */
-	if (state->internalseen)
-	 im->isseen = (im->record.system_flags & FLAG_SEEN) ? 1 : 0;
-	else
-	 im->isseen = seqset_ismember(seenlist, im->record.uid);
-	im->isrecent = (im->record.uid > recentuid) ? 1 : 0;
-
-	/* track select values */
-	if (!im->isseen) {
-	 numunseen++;
-	 if (!firstnotseen)
-		firstnotseen = msgno;
-	}
-	if (im->isrecent) {
-	 numrecent++;
-	 state->seen_dirty = 1;
-	}
-
-	/* don't auto-tell */
-	im->told_modseq = im->record.modseq;
-
-	msgno++;
+ /* may be trailing records which need to be considered for
+ * delayed_modseq purposes, and to get the count right for
+ * later expunge processing */
+ im = &state->mapmsgno-1;
+ while (msgno <= state->exists) {
+	/* this is the same logic as the block above in the main loop,
+	 * see comments up there, and make sure the blocks are kept
+	 * in sync! */
+	if (!(im->system_flags & FLAG_EXPUNGED))
+	 im->modseq = state->highestmodseq + 1;
+	if (!delayed_modseq || im->modseq < delayed_modseq)
+	 delayed_modseq = im->modseq - 1;
+	im->recno = 0;
+	im->system_flags |= FLAG_EXPUNGED | FLAG_UNLINKED;
+	im = &state->mapmsgno++;
+	num_expunged++;
 }
 
 seqset_free(seenlist);
@@ -597,26 +759,29 @@
 state->exists = msgno - 1; /* we actually got this many */
 state->delayed_modseq = delayed_modseq;
 state->highestmodseq = mailbox->i.highestmodseq;
+ state->generation = mailbox->i.generation_no;
+ state->uidvalidity = mailbox->i.uidvalidity;
 state->last_uid = mailbox->i.last_uid;
 state->num_records = mailbox->i.num_records;
+ state->num_expunged = num_expunged;
 state->firstnotseen = firstnotseen;
 state->numunseen = numunseen;
 state->numrecent = numrecent;
 }
 
-modseq_t index_highestmodseq(struct index_state *state)
+EXPORTED modseq_t index_highestmodseq(struct index_state *state)
 {
 if (state->delayed_modseq)
 	return state->delayed_modseq;
 return state->highestmodseq;
 }
 
-static void index_select(struct index_state *state)
+EXPORTED void index_select(struct index_state *state, struct index_init *init)
 {
 index_tellexists(state);
 
 /* always print flags */
- index_checkflags(state, 1);
+ index_checkflags(state, 1, 1);
 
 if (state->firstnotseen)
 	prot_printf(state->out, "* OK UNSEEN %u Ok\r\n", 
@@ -628,26 +793,62 @@
 prot_printf(state->out, "* OK HIGHESTMODSEQ " MODSEQ_FMT " Ok\r\n",
 		state->highestmodseq);
 prot_printf(state->out, "* OK URLMECH INTERNAL Ok\r\n");
+
+ /*
+ * RFC5257. Note that we must report a maximum size for annotations
+ * but we don't enforce any such limit, so pick a "large" number.
+ */
+ prot_printf(state->out, "* OK ANNOTATIONS %u Ok\r\n", 64*1024);
+
+ if (init->vanishedlist) {
+	char *vanished;
+	const char *sequence = NULL;
+	struct seqset *seq = NULL;
+	struct index_map *im;
+	uint32_t msgno;
+
+	/* QRESYNC response:
+	 * UID FETCH seq FLAGS (CHANGEDSINCE modseq VANISHED)
+	 */
+
+	vanished = seqset_cstring(init->vanishedlist);
+	if (vanished) {
+	 prot_printf(state->out, "* VANISHED (EARLIER) %s\r\n", vanished);
+	 free(vanished);
+	}
+
+	sequence = init->vanished.sequence;
+	if (sequence) seq = _parse_sequence(state, sequence, 1);
+	for (msgno = 1; msgno <= state->exists; msgno++) {
+	 im = &state->mapmsgno-1;
+	 if (sequence && !seqset_ismember(seq, im->uid))
+		continue;
+	 if (im->modseq <= init->vanished.modseq)
+		continue;
+	 index_printflags(state, msgno, 1, 0);
+	}
+	seqset_free(seq);
+ }
 }
 
 /*
 * Check for and report updates
 */
-int index_check(struct index_state *state, int usinguid, int printuid)
+EXPORTED int index_check(struct index_state *state, int usinguid, int printuid)
 {
- struct mailbox *mailbox = state->mailbox;
 int r;
 
- r = mailbox_lock_index(mailbox, LOCK_EXCLUSIVE);
- if (r) return r;
+ if (!state) return 0;
+
+ r = index_lock(state);
 
 /* Check for deleted mailbox */
- if (mailbox->i.options & OPT_MAILBOX_DELETED) {
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
 	/* Mailbox has been (re)moved */
 	if (config_getswitch(IMAPOPT_DISCONNECT_ON_VANISHED_MAILBOX)) {
 	 syslog(LOG_WARNING,
 		 "Mailbox %s has been (re)moved out from under client",
-		 mailbox->name);
+		 state->mboxname);
 	 fatal("Mailbox has been (re)moved", EC_IOERR);
 	}
 
@@ -661,24 +862,23 @@
 		prot_printf(state->out, "* 1 EXPUNGE\r\n");
 	 }
 	}
-	mailbox_unlock_index(mailbox, NULL);
+
 	state->exists = 0;
 	return IMAP_MAILBOX_NONEXISTENT;
 }
 
- index_refresh(state);
+ if (r) return r;
 
- /* any updates? */
- index_tellchanges(state, usinguid, printuid);
+ index_tellchanges(state, usinguid, printuid, 0);
 
 #if TOIMSP
 if (state->firstnotseen) {
-	toimsp(mailbox->name, mailbox->i.uidvalidity, "SEENsnn", state->userid,
-	 0, mailbox->i.recenttime, 0);
+	toimsp(state->mboxname, state->mailbox->i.uidvalidity, "SEENsnn", state->userid,
+	 0, state->mailbox->i.recenttime, 0);
 }
 else {
-	toimsp(mailbox->name, mailbox->i.uidvalidity, "SEENsnn", state->userid,
-	 mailbox->last_uid, mailbox->i.recenttime, 0);
+	toimsp(state->mboxname, state->mailbox->i.uidvalidity, "SEENsnn", state->userid,
+	 state->mailbox->last_uid, state->mailbox->i.recenttime, 0);
 }
 #endif
 
@@ -690,8 +890,8 @@
 /*
 * Perform UID FETCH (VANISHED) on a sequence.
 */
-static struct seqset *_index_vanished(struct index_state *state,
-				 struct vanished_params *params)
+struct seqset *index_vanished(struct index_state *state,
+			 struct vanished_params *params)
 {
 struct mailbox *mailbox = state->mailbox;
 struct index_record record;
@@ -699,6 +899,14 @@
 struct seqset *seq;
 uint32_t recno;
 
+ /* check uidvalidity match */
+ if (params->uidvalidity_is_max) {
+	if (params->uidvalidity < mailbox->i.uidvalidity) return NULL;
+ }
+ else {
+	if (params->uidvalidity != mailbox->i.uidvalidity) return NULL;
+ }
+
 /* No recently expunged messages */
 if (params->modseq >= state->highestmodseq) return NULL;
 
@@ -743,12 +951,12 @@
 	 while ((msgno = seqset_getnext(msgnolist)) != 0) {
 		uid = seqset_getnext(uidlist);
 		/* first non-match, we'll start here */
-		if (state->mapmsgno-1.record.uid != uid)
+		if (state->mapmsgno-1.uid != uid)
 		 break;
 		/* ok, they matched - so we can start at the recno and UID
 		 * first past the match */
 		prevuid = uid;
-		recno = state->mapmsgno-1.record.recno + 1;
+		recno = state->mapmsgno-1.recno + 1;
 	 }
 	 seqset_free(msgnolist);
 	 seqset_free(uidlist);
@@ -787,9 +995,12 @@
 return outlist;
 }
 
-static int _fetch_setseen(struct index_state *state, uint32_t msgno)
+static int _fetch_setseen(struct index_state *state,
+			 struct mboxevent *mboxevent,
+			 uint32_t msgno)
 {
 struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
 int r;
 
 /* already seen */
@@ -797,15 +1008,10 @@
 	return 0;
 
 /* no rights to change it */
- if (!(state->myrights & ACL_SEEN))
+ if (!(state->myrights & ACL_SETSEEN))
 	return 0;
 
- /* store in the record if it's internal seen */
- if (state->internalseen)
-	im->record.system_flags |= FLAG_SEEN;
-
- /* need to bump modseq anyway, so always rewrite it */
- r = mailbox_rewrite_index_record(state->mailbox, &im->record);
+ r = index_reload_record(state, msgno, &record);
 if (r) return r;
 
 /* track changes internally */
@@ -813,6 +1019,16 @@
 state->seen_dirty = 1;
 im->isseen = 1;
 
+ /* also store in the record if it's internal seen */
+ if (state->internalseen)
+	record.system_flags |= FLAG_SEEN;
+
+ /* need to bump modseq anyway, so always rewrite it */
+ r = index_rewrite_record(state, msgno, &record);
+ if (r) return r;
+
+ mboxevent_extract_record(mboxevent, state->mailbox, &record);
+
 /* RFC2060 says:
 * The \Seen flag is implicitly set; if this causes
 * the flags to change they SHOULD be included as part
@@ -823,30 +1039,22 @@
 return 0;
 }
 
-/*
- * Perform a FETCH-related command on a sequence.
- * Fetchedsomething argument is 0 if nothing was fetched, 1 if something was
- * fetched. (A fetch command that fetches nothing is not a valid fetch
- * command.)
- */
-int index_fetch(struct index_state *state,
-		const char *sequence,
-		int usinguid,
-		struct fetchargs *fetchargs,
-		int *fetchedsomething)
+/* seq can be NULL - means "ALL" */
+EXPORTED void index_fetchresponses(struct index_state *state,
+			 struct seqset *seq,
+			 int usinguid,
+			 const struct fetchargs *fetchargs,
+			 int *fetchedsomething)
 {
- struct seqset *seq;
- struct seqset *vanishedlist = NULL;
 uint32_t msgno, start, end;
- unsigned checkval;
- int r;
 struct index_map *im;
 int fetched = 0;
+ annotate_db_t *annot_db = NULL;
 
- r = index_lock(state);
- if (r) return r;
-
- seq = _parse_sequence(state, sequence, usinguid);
+ /* Keep an open reference on the per-mailbox db to avoid
+ * doing too many slow database opens during the fetch */
+ if ((fetchargs->fetchitems & FETCH_ANNOTATION))
+	annotate_getdb(state->mboxname, &annot_db);
 
 start = 1;
 end = state->exists;
@@ -874,31 +1082,78 @@
 if (start < 1) start = 1;
 if (end > state->exists) end = state->exists;
 
+ for (msgno = start; msgno <= end; msgno++) {
+	im = &state->mapmsgno-1;
+	if (seq && !seqset_ismember(seq, usinguid ? im->uid : msgno))
+	 continue;
+	if (index_fetchreply(state, msgno, fetchargs))
+	 break;
+	fetched = 1;
+ }
+
+ if (fetchedsomething) *fetchedsomething = fetched;
+ annotate_putdb(&annot_db);
+}
+
+/*
+ * Perform a FETCH-related command on a sequence.
+ * Fetchedsomething argument is 0 if nothing was fetched, 1 if something was
+ * fetched. (A fetch command that fetches nothing is not a valid fetch
+ * command.)
+ */
+EXPORTED int index_fetch(struct index_state *state,
+		const char *sequence,
+		int usinguid,
+		const struct fetchargs *fetchargs,
+		int *fetchedsomething)
+{
+ struct seqset *seq;
+ struct seqset *vanishedlist = NULL;
+ struct index_map *im;
+ uint32_t msgno;
+ int r;
+ struct mboxevent *mboxevent = NULL;
+
+ r = index_lock(state);
+ if (r) return r;
+
+ seq = _parse_sequence(state, sequence, usinguid);
+
 /* set the \Seen flag if necessary - while we still have the lock */
 if (fetchargs->fetchitems & FETCH_SETSEEN && !state->examining) {
-	for (msgno = start; msgno <= end; msgno++) {
+	mboxevent = mboxevent_new(EVENT_MESSAGE_READ);
+
+	for (msgno = 1; msgno <= state->exists; msgno++) {
 	 im = &state->mapmsgno-1;
-	 checkval = usinguid ? im->record.uid : msgno;
-	 if (!seqset_ismember(seq, checkval))
+	 if (!seqset_ismember(seq, usinguid ? im->uid : msgno))
 		continue;
-	 r = _fetch_setseen(state, msgno); 
+	 r = _fetch_setseen(state, mboxevent, msgno);
 	 if (r) break;
 	}
+
+	mboxevent_extract_mailbox(mboxevent, state->mailbox);
+	mboxevent_set_numunseen(mboxevent, state->mailbox,
+				state->numunseen);
 }
 
 if (fetchargs->vanished) {
 	struct vanished_params v;
 	v.sequence = sequence;;
+	v.uidvalidity = state->mailbox->i.uidvalidity;
 	v.modseq = fetchargs->changedsince;
 	v.match_seq = fetchargs->match_seq;
 	v.match_uid = fetchargs->match_uid;
 	/* XXX - return error unless usinguid? */
-	vanishedlist = _index_vanished(state, &v);
+	vanishedlist = index_vanished(state, &v);
 }
 
 index_unlock(state);
 
- index_checkflags(state, 0);
+ /* send MessageRead event notification for successfully rewritten records */
+ mboxevent_notify(mboxevent);
+ mboxevent_free(&mboxevent);
+
+ index_checkflags(state, 1, 0);
 
 if (vanishedlist && vanishedlist->len) {
 	char *vanished = seqset_cstring(vanishedlist);
@@ -908,21 +1163,11 @@
 
 seqset_free(vanishedlist);
 
- for (msgno = start; msgno <= end; msgno++) {
-	im = &state->mapmsgno-1;
-	checkval = usinguid ? im->record.uid : msgno;
-	if (!seqset_ismember(seq, checkval))
-	 continue;
-	r = index_fetchreply(state, msgno, fetchargs);
-	if (r) break;
-	fetched = 1;
- }
+ index_fetchresponses(state, seq, usinguid, fetchargs, fetchedsomething);
 
 seqset_free(seq);
 
- index_tellchanges(state, usinguid, usinguid);
-
- if (fetchedsomething) *fetchedsomething = fetched;
+ index_tellchanges(state, usinguid, usinguid, 0);
 
 return r;
 }
@@ -930,22 +1175,26 @@
 /*
 * Perform a STORE command on a sequence
 */
-int index_store(struct index_state *state, char *sequence, int usinguid,
-		struct storeargs *storeargs, char **flag, int nflags)
+EXPORTED int index_store(struct index_state *state, char *sequence,
+			 struct storeargs *storeargs)
 {
- struct mailbox *mailbox = state->mailbox;
+ struct mailbox *mailbox;
 int i, r = 0;
 uint32_t msgno;
- unsigned checkval;
 int userflag;
 struct seqset *seq;
 struct index_map *im;
+ const strarray_t *flags = &storeargs->flags;
+ struct mboxevent *mboxevents = NULL;
+ struct mboxevent *flagsset = NULL, *flagsclear = NULL;
+ struct index_modified_flags modified_flags;
+ struct index_record record;
 
 /* First pass at checking permission */
- if ((storeargs->seen && !(state->myrights & ACL_SEEN)) ||
+ if ((storeargs->seen && !(state->myrights & ACL_SETSEEN)) ||
 	((storeargs->system_flags & FLAG_DELETED) &&
 	 !(state->myrights & ACL_DELETEMSG)) ||
-	(((storeargs->system_flags & ~FLAG_DELETED) || nflags) &&
+	(((storeargs->system_flags & ~FLAG_DELETED) || flags->count) &&
 	 !(state->myrights & ACL_WRITE))) {
 	return IMAP_PERMISSION_DENIED;
 }
@@ -953,34 +1202,336 @@
 r = index_lock(state);
 if (r) return r;
 
- seq = _parse_sequence(state, sequence, usinguid);
+ mailbox = state->mailbox;
 
- for (i = 0; i < nflags; i++) {
-	r = mailbox_user_flag(mailbox, flagi, &userflag);
-	if (r) goto fail;
+ seq = _parse_sequence(state, sequence, storeargs->usinguid);
+
+ for (i = 0; i < flags->count ; i++) {
+	r = mailbox_user_flag(mailbox, flags->datai, &userflag, 1);
+	if (r) goto out;
 	storeargs->user_flagsuserflag/32 |= 1<<(userflag&31);
 }
 
 storeargs->update_time = time((time_t *)0);
- storeargs->usinguid = usinguid;
 
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
-	checkval = usinguid ? im->record.uid : msgno;
-	if (!seqset_ismember(seq, checkval))
+	if (!seqset_ismember(seq, storeargs->usinguid ? im->uid : msgno))
 	 continue;
-	r = index_storeflag(state, msgno, storeargs);
-	if (r) goto fail;
+
+	/* if it's expunged already, skip it now */
+	if ((im->system_flags & FLAG_EXPUNGED))
+	 continue;
+
+	/* if it's changed already, skip it now */
+	if (im->modseq > storeargs->unchangedsince) {
+	 if (!storeargs->modified) {
+		uint32_t maxval = (storeargs->usinguid ?
+				 state->last_uid : state->exists);
+		storeargs->modified = seqset_init(maxval, SEQ_SPARSE);
+	 }
+	 seqset_add(storeargs->modified,
+		 (storeargs->usinguid ? im->uid : msgno),
+		 /*ismember*/1);
+	 continue;
+	}
+
+	r = index_reload_record(state, msgno, &record);
+	if (r) goto out;
+
+	switch (storeargs->operation) {
+	case STORE_ADD_FLAGS:
+	case STORE_REMOVE_FLAGS:
+	case STORE_REPLACE_FLAGS:
+	 r = index_storeflag(state, &modified_flags, msgno, &record, storeargs);
+	 if (r)
+		break;
+
+	 if (modified_flags.added_flags) {
+		if (flagsset == NULL)
+		 flagsset = mboxevent_enqueue(EVENT_FLAGS_SET, &mboxevents);
+
+		mboxevent_add_flags(flagsset, mailbox->flagname,
+		 modified_flags.added_system_flags,
+		 modified_flags.added_user_flags);
+		mboxevent_extract_record(flagsset, mailbox, &record);
+	 }
+	 if (modified_flags.removed_flags) {
+		if (flagsclear == NULL)
+		 flagsclear = mboxevent_enqueue(EVENT_FLAGS_CLEAR, &mboxevents);
+
+		mboxevent_add_flags(flagsclear, mailbox->flagname,
+		 modified_flags.removed_system_flags,
+		 modified_flags.removed_user_flags);
+		mboxevent_extract_record(flagsclear, mailbox, &record);
+	 }
+
+	 break;
+
+	case STORE_ANNOTATION:
+	 r = index_store_annotation(state, msgno, storeargs);
+	 break;
+
+	default:
+	 r = IMAP_INTERNAL;
+	 break;
+	}
+	if (r) goto out;
 }
 
-fail:
+ /* let mboxevent_notify split FlagsSet into MessageRead, MessageTrash
+ * and FlagsSet events */
+ mboxevent_extract_mailbox(flagsset, mailbox);
+ mboxevent_set_numunseen(flagsset, mailbox, state->numunseen);
+ mboxevent_extract_mailbox(flagsclear, mailbox);
+ mboxevent_set_numunseen(flagsclear, mailbox, state->numunseen);
+
+ mboxevent_notify(mboxevents);
+ mboxevent_freequeue(&mboxevents);
+out:
+ if (storeargs->operation == STORE_ANNOTATION && r)
+	annotate_state_abort(&mailbox->annot_state);
+ seqset_free(seq);
+ index_unlock(state);
+ index_tellchanges(state, storeargs->usinguid, storeargs->usinguid,
+		 (storeargs->unchangedsince != ~0ULL));
+
+ return r;
+}
+
+static void prefetch_messages(struct index_state *state,
+			 struct seqset *seq,
+			 int usinguid)
+{
+ struct mailbox *mailbox = state->mailbox;
+ struct index_map *im;
+ uint32_t msgno;
+ const char *fname;
+ struct index_record record;
+
+ syslog(LOG_ERR, "Prefetching initial parts of messages\n");
+
+ for (msgno = 1; msgno <= state->exists; msgno++) {
+	im = &state->mapmsgno-1;
+	if (!seqset_ismember(seq, usinguid ? im->uid : msgno))
+	 continue;
+
+	if (index_reload_record(state, msgno, &record))
+	 continue;
+
+	fname = mailbox_record_fname(mailbox, &record);
+	if (!fname)
+	 continue;
+
+	warmup_file(fname, 0, 16384);
+ }
+}
+
+
+/*
+ * Perform the XRUNANNOTATOR command which runs the
+ * annotator callout for each message in the given sequence.
+ */
+EXPORTED int index_run_annotator(struct index_state *state,
+			const char *sequence, int usinguid,
+			struct namespace *namespace, int isadmin)
+{
+ struct index_record record;
+ struct seqset *seq = NULL;
+ struct index_map *im;
+ uint32_t msgno;
+ struct appendstate as;
+ int r = 0;
+
+ /* We do the acl check here rather than in append_setup_mbox()
+ * to account for the EXAMINE command where state->myrights has
+ * fewer rights than the ACL actually grants */
+ if (!(state->myrights & (ACL_WRITE|ACL_ANNOTATEMSG)))
+	return IMAP_PERMISSION_DENIED;
+
+ if (!config_getstring(IMAPOPT_ANNOTATION_CALLOUT))
+	return 0;
+
+ r = index_lock(state);
+ if (r) return r;
+
+ r = append_setup_mbox(&as, state->mailbox,
+			 state->userid, state->authstate,
+			 0, NULL, namespace, isadmin, 0);
+ if (r) goto out;
+
+ seq = _parse_sequence(state, sequence, usinguid);
+ if (!seq) goto out;
+
+ prefetch_messages(state, seq, usinguid);
+
+ for (msgno = 1; msgno <= state->exists; msgno++) {
+	im = &state->mapmsgno-1;
+	if (!seqset_ismember(seq, usinguid ? im->uid : msgno))
+	 continue;
+
+	/* if it's expunged already, skip it now */
+	if ((im->system_flags & FLAG_EXPUNGED))
+	 continue;
+
+	r = index_reload_record(state, msgno, &record);
+	if (r) goto out;
+
+	r = append_run_annotator(&as, &record);
+	if (r) goto out;
+
+	r = index_rewrite_record(state, msgno, &record);
+	if (r) goto out;
+ }
+
+out:
 seqset_free(seq);
+
+ if (!r) {
+	r = append_commit(&as);
+ }
+ else {
+	append_abort(&as);
+ }
 index_unlock(state);
- index_tellchanges(state, usinguid, usinguid);
 
+ index_tellchanges(state, usinguid, usinguid, 1);
+
+ return r;
+}
+
+EXPORTED int index_warmup(struct mboxlist_entry *mbentry,
+			 unsigned int warmup_flags,
+			 struct seqset *uids)
+{
+ const char *fname = NULL;
+ char *tofree1 = NULL;
+ char *tofree2 = NULL;
+ unsigned int uid;
+ strarray_t files = STRARRAY_INITIALIZER;
+ int i;
+ int r = 0;
+
+ if (warmup_flags & WARMUP_INDEX) {
+	fname = mboxname_metapath(mbentry->partition, mbentry->name, META_INDEX, 0);
+	r = warmup_file(fname, 0, 0);
+	if (r) goto out;
+ }
+ if (warmup_flags & WARMUP_CONVERSATIONS) {
+	if (config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	 fname = tofree1 = conversations_getmboxpath(mbentry->name);
+	 r = warmup_file(fname, 0, 0);
+	 if (r) goto out;
+	}
+ }
+ if (warmup_flags & WARMUP_ANNOTATIONS) {
+	fname = mboxname_metapath(mbentry->partition, mbentry->name, META_ANNOTATIONS, 0);
+	r = warmup_file(fname, 0, 0);
+	if (r) goto out;
+ }
+ if (warmup_flags & WARMUP_FOLDERSTATUS) {
+	if (config_getswitch(IMAPOPT_STATUSCACHE)) {
+	 fname = tofree2 = statuscache_filename();
+	 r = warmup_file(fname, 0, 0);
+	 if (r) goto out;
+	}
+ }
+ if (warmup_flags & WARMUP_SEARCH) {
+	const char *userid = mboxname_to_userid(mbentry->name);
+	r = search_list_files(userid, &files);
+	if (r) goto out;
+	for (i = 0 ; i < files.count ; i++) {
+	 fname = strarray_nth(&files, i);
+	 r = warmup_file(fname, 0, 0);
+	 if (r) goto out;
+	}
+ }
+ while ((uid = seqset_getnext(uids))) {
+	fname = mboxname_datapath(mbentry->partition, mbentry->name, uid);
+	r = warmup_file(fname, 0, 0);
+	if (r) goto out;
+ }
+
+out:
+ if (r == ENOENT || r == ENOSYS)
+	r = 0;
+ if (r)
+	syslog(LOG_ERR, "IOERROR: unable to warmup file %s: %s",
+		fname, error_message(r));
+ free(tofree1);
+ free(tofree2);
+ strarray_fini(&files);
 return r;
 }
 
+static void build_query(search_builder_t *bx,
+			search_expr_t *e,
+			int remove,
+			int *nmatchesp)
+{
+ search_expr_t *child;
+ int bop = -1;
+
+ switch (e->op) {
+
+ case SEOP_NOT:
+	bop = SEARCH_OP_NOT;
+	break;
+
+ case SEOP_AND:
+	bop = SEARCH_OP_AND;
+	break;
+
+ case SEOP_OR:
+	bop = SEARCH_OP_OR;
+	break;
+
+ case SEOP_FUZZYMATCH:
+	if (e->attr && e->attr->part >= 0) {
+	 bx->match(bx, e->attr->part, e->value.s);
+	 (*nmatchesp)++;
+	 if (remove && e->attr->part != SEARCH_PART_HEADERS) {
+		/*
+		 * We're relying on the search engine to correctly
+		 * find matching messages, so we don't need to
+		 * keep this node in the expression tree anymore.
+		 * Rather than remove it we neuter it.
+		 */
+		search_expr_neutralise(e);
+	 }
+	}
+	return;
+
+ default:
+	return;
+ }
+
+ if (e->children) {
+	assert(bop != -1);
+	bx->begin_boolean(bx, bop);
+	for (child = e->children ; child ; child = child->next)
+	 build_query(bx, child, remove, nmatchesp);
+	bx->end_boolean(bx, bop);
+ }
+}
+
+static int index_prefilter_messages(unsigned* msg_list,
+				 struct index_state *state,
+				 struct searchargs *searchargs __attribute((unused)))
+{
+ unsigned int msgno;
+
+ xstats_inc(SEARCH_TRIVIAL);
+
+ /* Just put in all possible messages. This falls back to Cyrus' default
+ * search. */
+
+ for (msgno = 1; msgno <= state->exists; msgno++)
+	msg_listmsgno-1 = msgno;
+
+ return state->exists;
+}
+
 static int index_scan_work(const char *s, unsigned long len,
 			 const char *match, unsigned long min)
 {
@@ -997,19 +1548,16 @@
 *
 * Returns 1 if we get a hit, otherwise returns 0.
 */
-int index_scan(struct index_state *state, const char *contents)
+EXPORTED int index_scan(struct index_state *state, const char *contents)
 {
 unsigned *msgno_list;
 uint32_t msgno;
- struct mapfile msgfile;
 int n = 0;
 int listindex;
 int listcount;
 struct searchargs searchargs;
- struct strlist strlist;
 unsigned long length;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im;
 
 if (!(contents && contents0)) return(0);
 
@@ -1021,200 +1569,148 @@
 length = strlen(contents);
 
 memset(&searchargs, 0, sizeof(struct searchargs));
- searchargs.text = &strlist;
+ searchargs.root = search_expr_new(NULL, SEOP_MATCH);
+ searchargs.root->attr = search_attr_find("text");
 
 /* Use US-ASCII to emulate fgrep */
- strlist.s = charset_convert(contents, charset_lookupname("US-ASCII"),
-				NULL, 0); 
- strlist.p = charset_compilepat(strlist.s);
- strlist.next = NULL;
+ searchargs.root->value.s = charset_convert(contents, charset_lookupname("US-ASCII"),
+				charset_flags);
+
+ search_expr_internalise(state, searchargs.root);
 
 msgno_list = (unsigned *) xmalloc(state->exists * sizeof(unsigned));
 
- listcount = search_prefilter_messages(msgno_list, state, &searchargs);
+ listcount = index_prefilter_messages(msgno_list, state, &searchargs);
 
 for (listindex = 0; !n && listindex < listcount; listindex++) {
- msgno = msgno_listlistindex;
-	im = &state->mapmsgno-1;
-
-	msgfile.base = 0;
-	msgfile.size = 0;
+	struct buf msgfile = BUF_INITIALIZER;
+	struct index_record record;
+	msgno = msgno_listlistindex;
+	if (index_reload_record(state, msgno, &record))
+	 continue;
 
- if (mailbox_map_message(mailbox, im->record.uid,
- &msgfile.base, &msgfile.size))
- continue;
+	if (mailbox_map_record(mailbox, &record, &msgfile))
+	 continue;
 
- n += index_scan_work(msgfile.base, msgfile.size, contents, length);
+	n += index_scan_work(msgfile.s, msgfile.len, contents, length);
 
- mailbox_unmap_message(mailbox, im->record.uid,
- &msgfile.base, &msgfile.size);
+	buf_free(&msgfile);
 }
 
- free(strlist.s);
- free(strlist.p);
+ search_expr_free(searchargs.root);
 free(msgno_list);
 
 return n;
 }
 
-/*
- * Guts of the SEARCH command.
- * 
- * Returns message numbers in an array. This function is used by
- * SEARCH, SORT and THREAD.
- */
-static int _index_search(unsigned **msgno_list, struct index_state *state,
-			 struct searchargs *searchargs,
-			 modseq_t *highestmodseq)
+EXPORTED message_t *index_get_message(struct index_state *state, uint32_t msgno)
 {
- uint32_t msgno;
- struct mapfile msgfile;
- int n = 0;
- int listindex, min;
- int listcount;
- struct mailbox *mailbox = state->mailbox;
- struct index_map *im;
+ struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
+ uint32_t indexflags = 0;
+ if (im->isseen) indexflags |= MESSAGE_SEEN;
+ if (im->isrecent) indexflags |= MESSAGE_RECENT;
+ if (index_reload_record(state, msgno, &record))
+	return NULL;
+ return message_new_from_index(state->mailbox, &record,
+				 msgno, indexflags);
+}
 
- if (state->exists <= 0) return 0;
+EXPORTED uint32_t index_getuid(struct index_state *state, uint32_t msgno)
+{
+ assert(msgno <= state->exists);
+ return state->mapmsgno-1.uid;
+}
 
- *msgno_list = (unsigned *) xmalloc(state->exists * sizeof(unsigned));
+/* 'uid_list' is malloc'd string representing the hits from searchargs;
+ returns number of hits */
+EXPORTED int index_getuidsequence(struct index_state *state,
+			 struct searchargs *searchargs,
+			 unsigned **uid_list)
+{
+ search_query_t *query = NULL;
+ search_folder_t *folder = NULL;
+ int r;
+ int n = 0;
 
- /* OK, so I'm being a bit clever here. We fill the msgno list with
- a list of message IDs returned by the search engine. Then we
- scan through the list and store matching message IDs back into the
- list. This is OK because we only overwrite message IDs that we've
- already looked at. */
- listcount = search_prefilter_messages(*msgno_list, state, searchargs);
-
- if (searchargs->returnopts == SEARCH_RETURN_MAX) {
-	/* If we only want MAX, then skip forward search,
-	 and do complete reverse search */
-	listindex = listcount;
-	min = 0;
- } else {
-	/* Otherwise use forward search, potentially skipping reverse search */
-	listindex = 0;
-	min = listcount;
- }
+ query = search_query_new(state, searchargs);
+ r = search_query_run(query);
+ if (r) goto out;
+ folder = search_query_find_folder(query, index_mboxname(state));
+ if (!folder) goto out;
 
- /* Forward search. Used for everything other than MAX-only */
- for (; listindex < listcount; listindex++) {
-	msgno = (*msgno_list)listindex;
-	im = &state->mapmsgno-1;
-	msgfile.base = 0;
-	msgfile.size = 0;
+ n = search_folder_get_array(folder, uid_list);
 
-	/* expunged messages never match */
-	if (im->record.system_flags & FLAG_EXPUNGED)
-	 continue;
+out:
+ search_query_free(query);
+ return n;
+}
 
-	if (index_search_evaluate(state, searchargs, msgno, &msgfile)) {
-	 (*msgno_list)n++ = msgno;
-	 if (highestmodseq && im->record.modseq > *highestmodseq) {
-		*highestmodseq = im->record.modseq;
-	 }
+static int index_lock(struct index_state *state)
+{
+ int r;
 
-	 /* See if we should short-circuit
-	 (we want MIN, but NOT COUNT or ALL) */
-	 if ((searchargs->returnopts & SEARCH_RETURN_MIN) &&
-		!(searchargs->returnopts & SEARCH_RETURN_COUNT) &&
-		!(searchargs->returnopts & SEARCH_RETURN_ALL)) {
-
-		if (searchargs->returnopts & SEARCH_RETURN_MAX) {
-		 /* If we want MAX, setup for reverse search */
-		 min = listindex;
-		}
-		/* We're done */
-		listindex = listcount;
-		if (highestmodseq)
-		 *highestmodseq = im->record.modseq;
-	 }
+ if (state->mailbox) {
+	if (state->examining) {
+	 r = mailbox_lock_index(state->mailbox, LOCK_SHARED);
+	 if (r) return r;
 	}
-	if (msgfile.base) {
-	 mailbox_unmap_message(mailbox, im->record.uid,
-				 &msgfile.base, &msgfile.size);
+	else {
+	 r = mailbox_lock_index(state->mailbox, LOCK_EXCLUSIVE);
+	 if (r) return r;
 	}
 }
-
- /* Reverse search. Stops at previously found MIN (if any) */
- for (listindex = listcount; listindex > min; listindex--) {
-	msgno = (*msgno_list)listindex-1;
-	im = &state->mapmsgno-1;
-	msgfile.base = 0;
-	msgfile.size = 0;
-
-	/* expunged messages never match */
-	if (im->record.system_flags & FLAG_EXPUNGED)
-	 continue;
-
-	if (index_search_evaluate(state, searchargs, msgno, &msgfile)) {
-	 (*msgno_list)n++ = msgno;
-	 if (highestmodseq && im->record.modseq > *highestmodseq) {
-		*highestmodseq = im->record.modseq;
-	 }
-	 /* We only care about MAX, so we're done on first match */
-	 listindex = 0;
+ else {
+	if (state->examining) {
+	 r = mailbox_open_irl(state->mboxname, &state->mailbox);
+	 if (r) return r;
 	}
-	if (msgfile.base) {
-	 mailbox_unmap_message(mailbox, im->record.uid,
-				 &msgfile.base, &msgfile.size);
+	else {
+	 r = mailbox_open_iwl(state->mboxname, &state->mailbox);
+	 if (r) return r;
 	}
 }
 
- /* if we didn't find any matches, free msgno_list */
- if (!n && *msgno_list) {
-	free(*msgno_list);
-	*msgno_list = NULL;
+ /* if the UIDVALIDITY has changed, treat as a delete */
+ if (state->mailbox->i.uidvalidity != state->uidvalidity) {
+	mailbox_close(&state->mailbox);
+	return IMAP_MAILBOX_NONEXISTENT;
 }
 
- return n;
-}
+ /* if highestmodseq has changed or file is repacked, read updates */
+ if (state->highestmodseq != state->mailbox->i.highestmodseq
+	|| state->generation != state->mailbox->i.generation_no)
+	index_refresh_locked(state);
 
-unsigned index_getuid(struct index_state *state, uint32_t msgno) {
- return state->mapmsgno-1.record.uid;
+ return 0;
 }
 
-/* 'uid_list' is malloc'd string representing the hits from searchargs;
- returns number of hits */
-int index_getuidsequence(struct index_state *state,
-			 struct searchargs *searchargs,
-			 unsigned **uid_list)
+EXPORTED int index_status(struct index_state *state, struct statusdata *sdata)
 {
- unsigned *msgno_list;
- int i, n;
-
- n = _index_search(&msgno_list, state, searchargs, NULL);
- if (n == 0) {
-	*uid_list = NULL;
-	return 0;
- }
+ int items = STATUS_MESSAGES | STATUS_UIDNEXT | STATUS_UIDVALIDITY |
+		STATUS_HIGHESTMODSEQ | STATUS_RECENT | STATUS_UNSEEN;
+ int r;
 
- *uid_list = msgno_list;
+ r = index_refresh(state);
+ if (r) return r;
 
- /* filthy in-place replacement */
- for (i = 0; i < n; i++)
-	(*uid_list)i = index_getuid(state, msgno_listi);
+ statuscache_fill(sdata, state->userid, state->mailbox, items,
+		 state->numrecent, state->numunseen);
 
- return n;
+ return 0;
 }
 
-int index_lock(struct index_state *state)
+EXPORTED int index_refresh(struct index_state *state)
 {
- int r = mailbox_lock_index(state->mailbox, LOCK_EXCLUSIVE);
- if (!r) index_refresh(state);
- return r;
-}
+ int r;
 
-int index_status(struct index_state *state, struct statusdata *sdata)
-{
- int items = STATUS_MESSAGES | STATUS_UIDNEXT | STATUS_UIDVALIDITY |
-		STATUS_HIGHESTMODSEQ | STATUS_RECENT | STATUS_UNSEEN;
- statuscache_fill(sdata, state->userid, state->mailbox, items,
-		 state->numrecent, state->numunseen);
+ r = index_lock(state); /* calls index_refresh_locked */
+ if (r) return r;
+ index_unlock(state);
 return 0;
 }
 
-void index_unlock(struct index_state *state)
+static void index_unlock(struct index_state *state)
 {
 /* XXX - errors */
 
@@ -1223,216 +1719,1020 @@
 /* grab the latest modseq */
 state->highestmodseq = state->mailbox->i.highestmodseq;
 
- if (config_getswitch(IMAPOPT_STATUSCACHE)) {
-	struct statusdata sdata;
-	index_status(state, &sdata);
-	/* RECENT is zero for everyone else because we wrote a new
-	 * recentuid! */
-	sdata.recent = 0;
-	mailbox_unlock_index(state->mailbox, &sdata);
+ mailbox_unlock_index(state->mailbox, NULL);
+}
+
+/*
+ * RFC 4551 says:
+ * If client specifies a MODSEQ criterion in a SEARCH command
+ * and the server returns a non-empty SEARCH result, the server
+ * MUST also append (to the end of the untagged SEARCH response)
+ * the highest mod-sequence for all messages being returned.
+ */
+static int needs_modseq(const struct searchargs *searchargs,
+			const struct sortcrit *sortcrit)
+{
+ int i;
+
+ if (search_expr_uses_attr(searchargs->root, "modseq"))
+	return 1;
+
+ if (sortcrit) {
+	for (i = 0 ; sortcriti.key != SORT_SEQUENCE ; i++)
+	 if (sortcriti.key == SORT_MODSEQ)
+		return 1;
 }
- else
-	mailbox_unlock_index(state->mailbox, NULL);
+
+ return 0;
 }
 
 /*
 * Performs a SEARCH command.
- * This is a wrapper around _index_search() which simply prints the results.
+ * This is a wrapper around the search_query API which simply prints the results.
 */
-int index_search(struct index_state *state, struct searchargs *searchargs,
-		 int usinguid)
-{
- unsigned *list = NULL;
- int i, n;
+EXPORTED int index_search(struct index_state *state,
+			 struct searchargs *searchargs,
+			 int usinguid)
+{
+ search_query_t *query = NULL;
+ search_folder_t *folder;
+ int nmsg = 0;
+ int i;
 modseq_t highestmodseq = 0;
+ int r;
 
 /* update the index */
 if (index_check(state, 0, 0))
 	return 0;
 
- /* now do the search */
- n = _index_search(&list, state, searchargs, 
-		 searchargs->modseq ? &highestmodseq : NULL);
-
- /* replace the values now */
- if (usinguid)
-	for (i = 0; i < n; i++)
-	 listi = state->maplisti-1.record.uid;
+ highestmodseq = needs_modseq(searchargs, NULL);
+
+ query = search_query_new(state, searchargs);
+ r = search_query_run(query);
+ if (r) goto out;	 /* search failed */
+ folder = search_query_find_folder(query, index_mboxname(state));
+
+ if (folder) {
+	if (!usinguid)
+	 search_folder_use_msn(folder, state);
+	if (highestmodseq)
+	 highestmodseq = search_folder_get_highest_modseq(folder);
+	nmsg = search_folder_get_count(folder);
+ }
+ else
+	nmsg = 0;
 
 if (searchargs->returnopts) {
+	/*
+	 * Implement RFC 4731 return options.
+	 */
 	prot_printf(state->out, "* ESEARCH");
 	if (searchargs->tag) {
 	 prot_printf(state->out, " (TAG \"%s\")", searchargs->tag);
 	}
-	if (n) {
+	if (nmsg) {
 	 if (usinguid) prot_printf(state->out, " UID");
 	 if (searchargs->returnopts & SEARCH_RETURN_MIN)
-		prot_printf(state->out, " MIN %u", list0);
+		prot_printf(state->out, " MIN %u", search_folder_get_min(folder));
 	 if (searchargs->returnopts & SEARCH_RETURN_MAX)
-		prot_printf(state->out, " MAX %u", listn-1);
+		prot_printf(state->out, " MAX %u", search_folder_get_max(folder));
 	 if (highestmodseq)
 		prot_printf(state->out, " MODSEQ " MODSEQ_FMT, highestmodseq);
 	 if (searchargs->returnopts & SEARCH_RETURN_ALL) {
-		struct seqset *seq;
-		char *str;
-
-		/* Create a sequence-set */
-		seq = seqset_init(0, SEQ_SPARSE);
-		for (i = 0; i < n; i++)
-		 seqset_add(seq, listi, 1);
+		struct seqset *seq = search_folder_get_seqset(folder);
 
 		if (seq->len) {
-		 str = seqset_cstring(seq);
+		 char *str = seqset_cstring(seq);
 		 prot_printf(state->out, " ALL %s", str);
 		 free(str);
 		}
 
 		seqset_free(seq);
 	 }
+	 if (searchargs->returnopts & SEARCH_RETURN_RELEVANCY) {
+		prot_printf(state->out, " RELEVANCY (");
+		for (i = 0; i < nmsg; i++) {
+		 if (i) prot_putc(' ', state->out);
+		 /* for now all messages have relevancy=100 */
+		 prot_printf(state->out, "%u", 100);
+		}
+		prot_printf(state->out, ")");
+	 }
 	}
 	if (searchargs->returnopts & SEARCH_RETURN_COUNT) {
-	 prot_printf(state->out, " COUNT %u", n);
+	 prot_printf(state->out, " COUNT %u", nmsg);
 	}
 }
 else {
 	prot_printf(state->out, "* SEARCH");
 
-	for (i = 0; i < n; i++)
-	 prot_printf(state->out, " %u", listi);
+	if (nmsg) {
+	 search_folder_foreach(folder, i) {
+		prot_printf(state->out, " %u", i);
+	 }
+	}
 
 	if (highestmodseq)
 	 prot_printf(state->out, " (MODSEQ " MODSEQ_FMT ")", highestmodseq);
 }
 
- if (n) free(list);
-
 prot_printf(state->out, "\r\n");
 
- return n;
+out:
+ search_query_free(query);
+ return nmsg;
 }
 
 /*
 * Performs a SORT command
 */
-int index_sort(struct index_state *state, struct sortcrit *sortcrit,
+EXPORTED int index_sort(struct index_state *state,
+	 const struct sortcrit *sortcrit,
 	 struct searchargs *searchargs, int usinguid)
 {
- unsigned *msgno_list;
- MsgData *msgdata = NULL, *freeme = NULL;
- int nmsg;
- clock_t start;
+ int i;
+ int nmsg = 0;
 modseq_t highestmodseq = 0;
- int i, modseq = 0;
+ search_query_t *query = NULL;
+ search_folder_t *folder = NULL;
+ int r;
 
 /* update the index */
 if (index_check(state, 0, 0))
 	return 0;
 
- if(CONFIG_TIMING_VERBOSE)
-	start = clock();
+ highestmodseq = needs_modseq(searchargs, NULL);
 
- if (searchargs->modseq) modseq = 1;
- else {
-	for (i = 0; sortcriti.key != SORT_SEQUENCE; i++) {
-	 if (sortcriti.key == SORT_MODSEQ) {
-		modseq = 1;
+ /* Search for messages based on the given criteria */
+ query = search_query_new(state, searchargs);
+ query->sortcrit = sortcrit;
+ r = search_query_run(query);
+ if (r) goto out;	 /* search failed */
+ folder = search_query_find_folder(query, index_mboxname(state));
+
+ if (folder) {
+	if (highestmodseq)
+	 highestmodseq = search_folder_get_highest_modseq(folder);
+	nmsg = search_folder_get_count(folder);
+ }
+
+ prot_printf(state->out, "* SORT");
+
+ if (nmsg) {
+	/* Output the sorted messages */
+	for (i = 0 ; i < query->merged_msgdata.count ; i++) {
+	 MsgData *md = ptrarray_nth(&query->merged_msgdata, i);
+	 prot_printf(state->out, " %u",
+			(usinguid ? md->uid : md->msgno));
+	}
+ }
+
+ if (highestmodseq)
+	prot_printf(state->out, " (MODSEQ " MODSEQ_FMT ")", highestmodseq);
+
+ prot_printf(state->out, "\r\n");
+
+out:
+ search_query_free(query);
+ return nmsg;
+}
+
+static int is_mutable_sort(struct sortcrit *sortcrit)
+{
+ int i;
+
+ if (!sortcrit) return 0;
+
+ for (i = 0; sortcriti.key; i++) {
+	switch (sortcriti.key) {
+	 /* these are the mutable fields */
+	 case SORT_ANNOTATION:
+	 case SORT_MODSEQ:
+	 case SORT_HASFLAG:
+	 case SORT_CONVMODSEQ:
+	 case SORT_CONVEXISTS:
+	 case SORT_CONVSIZE:
+	 case SORT_HASCONVFLAG:
+		return 1;
+	 default:
 		break;
+	}
+ }
+
+ return 0;
+}
+
+/* This function will return a TRUE value if anything in the
+ * sort or search criteria returns a MUTABLE ordering, i.e.
+ * the user can take actions which will change the order in
+ * which the results are returned. For example, the base
+ * case of UID sort and all messages is NOT mutable */
+static int is_mutable_ordering(struct sortcrit *sortcrit,
+			 struct searchargs *searchargs)
+{
+ if (is_mutable_sort(sortcrit))
+	return 1;
+ if (search_expr_is_mutable(searchargs->root))
+	return 1;
+ return 0;
+}
+
+#define UNPREDICTABLE	 (-1)
+static int search_predict_total(struct index_state *state,
+				struct conversations_state *cstate,
+			 const struct searchargs *searchargs,
+				int conversations,
+				modseq_t *xconvmodseqp)
+{
+ conv_status_t convstatus = CONV_STATUS_INIT;
+ uint32_t exists;
+
+ if (conversations) {
+	conversation_getstatus(cstate, index_mboxname(state), &convstatus);
+	/* always grab xconvmodseq, so we report a growing
+	 * highestmodseq to all callers */
+	if (xconvmodseqp) *xconvmodseqp = convstatus.modseq;
+	exists = convstatus.exists;
+ }
+ else {
+	if (xconvmodseqp) *xconvmodseqp = state->highestmodseq;
+	/* we may be in xconvupdates, where expunged are present */
+	exists = state->exists - state->num_expunged;
+ }
+
+ switch (search_expr_get_countability(searchargs->root)) {
+ case SEC_EXISTS:
+	return exists;
+
+ case SEC_EXISTS|SEC_NOT:
+	return 0;
+
+ /* we don't try to optimise searches on \Recent */
+ case SEC_SEEN:
+	assert(state->exists >= state->numunseen);
+	return state->exists - state->numunseen;
+
+ case SEC_SEEN|SEC_NOT:
+	return state->numunseen;
+
+ case SEC_CONVSEEN:
+	assert(conversations);
+	assert(convstatus.exists >= convstatus.unseen);
+	return convstatus.exists - convstatus.unseen;
+
+ case SEC_CONVSEEN|SEC_NOT:
+	assert(conversations);
+	return convstatus.unseen;
+
+ default:
+	return UNPREDICTABLE;
+ }
+}
+
+/*
+ * Performs a XCONVSORT command
+ */
+EXPORTED int index_convsort(struct index_state *state,
+			 struct sortcrit *sortcrit,
+			 struct searchargs *searchargs,
+			 const struct windowargs *windowargs)
+{
+ MsgData **msgdata = NULL;
+ unsigned int mi;
+ modseq_t xconvmodseq = 0;
+ int i;
+ hashu64_table seen_cids = HASHU64_TABLE_INITIALIZER;
+ uint32_t pos = 0;
+ int found_anchor = 0;
+ uint32_t anchor_pos = 0;
+ uint32_t first_pos = 0;
+ unsigned int ninwindow = 0;
+ ptrarray_t results = PTRARRAY_INITIALIZER;
+ int total = 0;
+ int r = 0;
+ struct conversations_state *cstate = NULL;
+
+ assert(windowargs);
+ assert(!windowargs->changedsince);
+ assert(!windowargs->upto);
+
+ /* Check the client didn't specify MULTIANCHOR. */
+ if (windowargs->anchor && windowargs->anchorfolder)
+	return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ /* make sure \Deleted messages are expunged. Will also lock the
+ * mailbox state and read any new information */
+ r = index_expunge(state, NULL, 1);
+ if (r) return r;
+
+ if (windowargs->conversations) {
+	cstate = conversations_get_mbox(index_mboxname(state));
+	if (!cstate)
+	 return IMAP_INTERNAL;
+ }
+
+ search_expr_internalise(state, searchargs->root);
+
+ /* this works both with and without conversations */
+ total = search_predict_total(state, cstate, searchargs,
+				windowargs->conversations,
+				&xconvmodseq);
+ /* not going to match anything? bonus */
+ if (!total)
+	goto out;
+
+ construct_hashu64_table(&seen_cids, state->exists/4+4, 0);
+
+ /* Create/load the msgdata array.
+ * load data for ALL messages always. We sort before searching so
+ * we can take advantage of the window arguments to stop searching
+ * early */
+ msgdata = index_msgdata_load(state, NULL, state->exists, sortcrit,
+			 windowargs->anchor, &found_anchor);
+ if (windowargs->anchor && !found_anchor) {
+	r = IMAP_ANCHOR_NOT_FOUND;
+	goto out;
+ }
+
+ /* Sort the messages based on the given criteria */
+ index_msgdata_sort(msgdata, state->exists, sortcrit);
+
+ /* One pass through the message list */
+ for (mi = 0 ; mi < state->exists ; mi++) {
+	MsgData *msg = msgdatami;
+	struct index_map *im = &state->mapmsg->msgno-1;
+
+	/* can happen if we didn't "tellchanges" yet */
+	if (im->system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* run the search program against all messages */
+	if (!index_search_evaluate(state, searchargs->root, msg->msgno))
+	 continue;
+
+	/* figure out whether this message is an exemplar */
+	if (windowargs->conversations) {
+	 /* in conversations mode => only the first message seen
+	 * with each unique CID is an exemplar */
+	 if (hashu64_lookup(msg->cid, &seen_cids))
+		continue;
+	 hashu64_insert(msg->cid, (void *)1, &seen_cids);
+	}
+	/* else not in conversations mode => all messages are exemplars */
+
+	pos++;
+
+	if (!anchor_pos &&
+	 windowargs->anchor == msg->uid) {
+	 /* we've found the anchor's position, rejoice! */
+	 anchor_pos = pos;
+	}
+
+	if (windowargs->anchor) {
+	 if (!anchor_pos)
+		continue;
+	 if (pos < anchor_pos + windowargs->offset)
+		continue;
+	}
+	else if (windowargs->position) {
+	 if (pos < windowargs->position)
+		continue;
+	}
+	if (windowargs->limit &&
+	 ++ninwindow > windowargs->limit) {
+	 if (total == UNPREDICTABLE) {
+		/* the total was not predictable, so we need to keep
+		 * going over the whole list to count it */
+		continue;
 	 }
+	 break;
 	}
+
+	if (!first_pos)
+	 first_pos = pos;
+	ptrarray_append(&results, msg);
 }
 
- /* Search for messages based on the given criteria */
- nmsg = _index_search(&msgno_list, state, searchargs,
-			 modseq ? &highestmodseq : NULL);
+ if (total == UNPREDICTABLE) {
+	/* the total was not predictable prima facie */
+	total = pos;
+ }
 
- prot_printf(state->out, "* SORT");
+ if (windowargs->anchor && !anchor_pos) {
+	/* the anchor was present but not an exemplar */
+	assert(results.count == 0);
+	r = IMAP_ANCHOR_NOT_FOUND;
+	goto out;
+ }
 
- if (nmsg) {
-	/* Create/load the msgdata array */
-	freeme = msgdata = index_msgdata_load(state, msgno_list, nmsg, sortcrit);
-	free(msgno_list);
+ /* Print the resulting list */
+
+ /* Yes, we could use a seqset here, but apparently the most common
+ * sort order seen in the field is reverse date, which is basically
+ * the worst case for seqset. So we don't bother */
+ if (results.count) {
+	prot_printf(state->out, "* SORT"); /* uids */
+	for (i = 0 ; i < results.count ; i++) {
+	 MsgData *msg = results.datai;
+	 prot_printf(state->out, " %u", msg->uid);
+	}
+	prot_printf(state->out, "\r\n");
+ }
+
+out:
+ if (!r) {
+	if (first_pos)
+	 prot_printf(state->out, "* OK POSITION %u\r\n", first_pos);
+
+	prot_printf(state->out, "* OK HIGHESTMODSEQ " MODSEQ_FMT "\r\n",
+		 MAX(xconvmodseq, state->mailbox->i.highestmodseq));
+	prot_printf(state->out, "* OK UIDVALIDITY %u\r\n",
+		 state->mailbox->i.uidvalidity);
+	prot_printf(state->out, "* OK UIDNEXT %u\r\n",
+		 state->mailbox->i.last_uid + 1);
+	prot_printf(state->out, "* OK TOTAL %u\r\n",
+		 total);
+ }
+
+ /* free all our temporary data */
+ index_msgdata_free(msgdata, state->exists);
+ ptrarray_fini(&results);
+ free_hashu64_table(&seen_cids, NULL);
+
+ return r;
+}
+
+/*
+ * Performs a XCONVMULTISORT command
+ */
+EXPORTED int index_convmultisort(struct index_state *state,
+				 struct sortcrit *sortcrit,
+				 struct searchargs *searchargs,
+				 const struct windowargs *windowargs)
+{
+ int mi;
+ int fi;
+ int i;
+ hashu64_table seen_cids = HASHU64_TABLE_INITIALIZER;
+ uint32_t pos = 0;
+ uint32_t anchor_pos = 0;
+ uint32_t first_pos = 0;
+ unsigned int ninwindow = 0;
+ /* array of (arrays of msgdata* with the same CID) */
+ ptrarray_t results = PTRARRAY_INITIALIZER;
+ /* Used as a placeholder which provides a non-NULL entry in the
+ * seen_cids hashtable for conversations which are outside the
+ * specified window. */
+ ptrarray_t dummy_response;
+ int total = UNPREDICTABLE;
+ int r = 0;
+ char extnameMAX_MAILBOX_BUFFER;
+ modseq_t hms;
+ search_query_t *query = NULL;
+ search_folder_t *folder = NULL;
+ search_folder_t *anchor_folder = NULL;
+
+ assert(windowargs);
+ assert(!windowargs->changedsince);
+ assert(!windowargs->upto);
+
+ /* Client needs to have specified MULTIANCHOR which includes
+ * the folder name instead of just ANCHOR. Check that here
+ * 'cos it's easier than doing so during parsing */
+ if (windowargs->anchor && !windowargs->anchorfolder)
+	return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ /* make sure folder still exists and map in data */
+ r = index_refresh(state);
+ if (r) return r;
+
+ hms = mboxname_readmodseq(index_mboxname(state));
+ query = search_query_new(state, searchargs);
+ query->multiple = 1;
+ query->need_ids = 1;
+ query->need_expunge = 1;
+ query->sortcrit = sortcrit;
+ r = search_query_run(query);
+ if (r) return r;
+
+ if (windowargs->anchorfolder) {
+	anchor_folder = search_query_find_folder(query, windowargs->anchorfolder);
+	if (!anchor_folder) {
+	 r = IMAP_ANCHOR_NOT_FOUND;
+	 goto out;
+	}
+ }
+
+ /* going to need to do conversation-level breakdown */
+ if (windowargs->conversations)
+	construct_hashu64_table(&seen_cids, query->merged_msgdata.count/4+4, 0);
+ /* no need */
+ else
+	total = query->merged_msgdata.count;
+
+ /* Another pass through the merged message list */
+ for (mi = 0 ; mi < query->merged_msgdata.count ; mi++) {
+	MsgData *md = ptrarray_nth(&query->merged_msgdata, mi);
+	ptrarray_t *response = NULL;
+
+	/* figure out whether this message is an exemplar */
+	if (windowargs->conversations) {
+	 response = hashu64_lookup(md->cid, &seen_cids);
+	 /* in conversations mode => only the first message seen
+	 * with each unique CID is an exemplar */
+	 if (response) {
+		if (response != &dummy_response)
+		 ptrarray_append(response, md);
+		continue;
+	 }
+	 hashu64_insert(md->cid, &dummy_response, &seen_cids);
+	}
+	/* else not in conversations mode => all messages are exemplars */
+
+	pos++;
+
+	if (!anchor_pos &&
+	 windowargs->anchor == md->uid &&
+	 anchor_folder == md->folder) {
+	 /* we've found the anchor's position, rejoice! */
+	 anchor_pos = pos;
+	}
 
-	/* Sort the messages based on the given criteria */
-	msgdata = lsort(msgdata,
-			(void * (*)(void*)) index_sort_getnext,
-			(void (*)(void*,void*)) index_sort_setnext,
-			(int (*)(void*,void*,void*)) index_sort_compare,
-			sortcrit);
-
-	/* Output the sorted messages */ 
-	while (msgdata) {
-	 unsigned no = usinguid ? state->mapmsgdata->msgno-1.record.uid
-				 : msgdata->msgno;
-	 prot_printf(state->out, " %u", no);
+	if (windowargs->anchor) {
+	 if (!anchor_pos)
+		continue;
+	 if (pos < anchor_pos + windowargs->offset)
+		continue;
+	}
+	else if (windowargs->position) {
+	 if (pos < windowargs->position)
+		continue;
+	}
+	if (windowargs->limit &&
+	 ++ninwindow > windowargs->limit) {
+	 if (total == UNPREDICTABLE) {
+		/* the total was not predictable, so we need to keep
+		 * going over the whole list to count it */
+		continue;
+	 }
+	 break;
+	}
 
-	 /* free contents of the current node */
-	 index_msgdata_free(msgdata);
+	if (!first_pos)
+	 first_pos = pos;
 
-	 msgdata = msgdata->next;
+	/* the message is the exemplar of a conversation which is inside
+	 * the specified window, so record a non-dummy seen_cids entry
+	 * and a results entry */
+	response = ptrarray_new();
+	ptrarray_push(response, md);
+	ptrarray_push(&results, response);
+
+	if (windowargs->conversations) {
+	 hashu64_insert(md->cid, response, &seen_cids);
 	}
+ }
 
-	/* free the msgdata array */
-	free(freeme);
+ if (total == UNPREDICTABLE) {
+	/* the total was not predictable prima facie */
+	total = pos;
+ }
+
+ if (windowargs->anchor && !anchor_pos) {
+	/* the anchor was not found */
+	assert(results.count == 0);
+	r = IMAP_ANCHOR_NOT_FOUND;
+	goto out;
+ }
+
+ /* Print the resulting list */
+
+ xstats_add(SEARCH_RESULT, results.count);
+ if (results.count) {
+	/* The untagged reponse would be XCONVMULTISORT but
+	 * Mail::IMAPTalk has an undocumented hack whereby any untagged
+	 * response matching /sort/i is assumed to be a sequence of
+	 * numeric uids. Meh. */
+	prot_printf(state->out, "* XCONVMULTI (");
+	for (fi = 0 ; fi < query->folders_by_id.count ; fi++) {
+	 folder = ptrarray_nth(&query->folders_by_id, fi);
+
+	 searchargs->namespace->mboxname_toexternal(searchargs->namespace,
+						 folder->mboxname,
+						 searchargs->userid,
+						 extname);
+	 if (fi)
+		prot_printf(state->out, " ");
+	 prot_printf(state->out, "(");
+	 prot_printstring(state->out, extname);
+	 prot_printf(state->out, " %u)", folder->uidvalidity);
+	}
+	prot_printf(state->out, ") (");
+	for (i = 0 ; i < results.count ; i++) {
+	 ptrarray_t *response = ptrarray_nth(&results, i);
+	 int j;
+	 if (i)
+		prot_printf(state->out, " ");
+	 for (j = 0; j < response->count; j++) {
+		MsgData *md = ptrarray_nth(response, j);
+		if (!j)
+		 prot_printf(state->out, "(%s" , conversation_id_encode(md->cid));
+		prot_printf(state->out, " (%u %u)", md->folder->id, md->uid);
+	 }
+	 prot_printf(state->out, ")");
+	}
+	prot_printf(state->out, ")\r\n");
 }
 
- if (highestmodseq)
-	prot_printf(state->out, " (MODSEQ " MODSEQ_FMT ")", highestmodseq);
+out:
+ if (!r) {
+	if (first_pos)
+	 prot_printf(state->out, "* OK POSITION %u\r\n", first_pos);
 
- prot_printf(state->out, "\r\n");
+	prot_printf(state->out, "* OK HIGHESTMODSEQ " MODSEQ_FMT "\r\n",
+		 hms);
+#if 0
+	prot_printf(state->out, "* OK UIDNEXT %u\r\n",
+		 state->mailbox->i.last_uid + 1);
+#endif
+	prot_printf(state->out, "* OK TOTAL %u\r\n",
+		 total);
+ }
 
- /* debug */
- if (CONFIG_TIMING_VERBOSE) {
-	int len;
-	char *key_names = { "SEQUENCE", "ARRIVAL", "CC", "DATE", "FROM",
-			 "SIZE", "SUBJECT", "TO", "ANNOTATION", "MODSEQ",
-			 "DISPLAYFROM", "DISPLAYTO" };
-	char buf1024 = "";
-
-	while (sortcrit->key && sortcrit->key < VECTOR_SIZE(key_names)) {
-	 if (sortcrit->flags & SORT_REVERSE)
-		strlcat(buf, "REVERSE ", sizeof(buf));
+ /* free all our temporary data */
+ free_hashu64_table(&seen_cids, NULL);
+ for (i = 0 ; i < results.count ; i++) {
+	ptrarray_t *response = ptrarray_nth(&results, i);
+	ptrarray_free(response);
+ }
+ ptrarray_fini(&results);
+ search_query_free(query);
 
-	 strlcat(buf, key_namessortcrit->key, sizeof(buf));
+ return r;
+}
 
-	 switch (sortcrit->key) {
-	 case SORT_ANNOTATION:
-		len = strlen(buf);
-		snprintf(buf + len, sizeof(buf) - len,
-			 " \"%s\" \"%s\"",
-			 sortcrit->args.annot.entry, sortcrit->args.annot.attrib);
-		break;
+struct snippet_rock {
+ struct protstream *out;
+ struct namespace *namespace;
+ const char *userid;
+};
+
+static int emit_snippet(struct mailbox *mailbox, uint32_t uid,
+			int part, const char *snippet, void *rock)
+{
+ struct snippet_rock *sr = (struct snippet_rock *)rock;
+ const char *partname = search_part_as_string(part);
+ int r;
+ char extnameMAX_MAILBOX_BUFFER;
+
+ if (!partname) return 0;
+
+ r = sr->namespace->mboxname_toexternal(sr->namespace, mailbox->name,
+					 sr->userid, extname);
+ if (r) return r;
+
+ prot_printf(sr->out, "* SNIPPET ");
+ prot_printstring(sr->out, extname);
+ prot_printf(sr->out, " %u %u %s ", mailbox->i.uidvalidity, uid, partname);
+ prot_printstring(sr->out, snippet);
+ prot_printf(sr->out, "\r\n");
+ return 0;
+}
+
+EXPORTED int index_snippets(struct index_state *state,
+			 const struct snippetargs *snippetargs,
+			 struct searchargs *searchargs)
+{
+ void *intquery = NULL;
+ search_builder_t *bx = NULL;
+ search_text_receiver_t *rx = NULL;
+ struct mailbox *mailbox = NULL;
+ int i;
+ int r = 0;
+ int nmatches = 0;
+ struct snippet_rock srock;
+
+ /* reload index */
+ r = index_refresh(state);
+ if (r) return r;
+
+ bx = search_begin_search(state->mailbox, SEARCH_MULTIPLE);
+ if (!bx) {
+	r = IMAP_INTERNAL;
+	goto out;
+ }
+
+ build_query(bx, searchargs->root, 0, &nmatches);
+ if (!bx->get_internalised) goto out;
+ intquery = bx->get_internalised(bx);
+ search_end_search(bx);
+ if (!intquery) goto out;
+
+ srock.out = state->out;
+ srock.namespace = searchargs->namespace;
+ srock.userid = searchargs->userid;
+ rx = search_begin_snippets(intquery, 0/*verbose*/,
+			 emit_snippet, &srock);
+ if (!rx) goto out;
+
+ for ( ; snippetargs ; snippetargs = snippetargs->next) {
+
+	mailbox = NULL;
+	if (!strcmp(snippetargs->mboxname, index_mboxname(state))) {
+	 mailbox = state->mailbox;
+	}
+	else {
+	 r = mailbox_open_iwl(snippetargs->mboxname, &mailbox);
+	 if (r) goto out;
+	}
+
+	if (snippetargs->uidvalidity &&
+	 snippetargs->uidvalidity != mailbox->i.uidvalidity) {
+	 r = IMAP_NOTFOUND;
+	 goto out;
+	}
+
+	r = rx->begin_mailbox(rx, mailbox, /*incremental*/0);
+
+	for (i = 0 ; i < snippetargs->uids.count ; i++) {
+	 uint32_t uid = snippetargs->uids.datai;
+	 struct index_record record;
+	 message_t *msg;
+
+	 /* This UID didn't appear in the old index file */
+	 r = mailbox_find_index_record(mailbox, uid, &record, NULL);
+	 if (r) continue;
+
+	 msg = message_new_from_record(mailbox, &record);
+	 index_getsearchtext(msg, rx, /*snippet*/1);
+	 message_unref(&msg);
+	}
+
+	r = rx->end_mailbox(rx, mailbox);
+	if (r) goto out;
+	if (mailbox != state->mailbox)
+	 mailbox_close(&mailbox);
+ }
+
+out:
+ if (rx) search_end_snippets(rx);
+ if (intquery) search_free_internalised(intquery);
+ if (mailbox != state->mailbox)
+	mailbox_close(&mailbox);
+ return r;
+}
+
+static modseq_t get_modseq_of(MsgData *msg,
+			 struct conversations_state *cstate)
+{
+ modseq_t modseq = 0;
+
+ if (cstate) {
+	conversation_get_modseq(cstate, msg->cid, &modseq);
+	/* TODO: error handling dammit */
+ } else {
+	modseq = msg->modseq;
+ }
+ return modseq;
+}
+
+/*
+ * Performs a XCONVUPDATES command
+ */
+EXPORTED int index_convupdates(struct index_state *state,
+		 struct sortcrit *sortcrit,
+		 struct searchargs *searchargs,
+		 const struct windowargs *windowargs)
+{
+ MsgData **msgdata = NULL;
+ modseq_t xconvmodseq = 0;
+ unsigned int mi;
+ int i;
+ hashu64_table seen_cids = HASHU64_TABLE_INITIALIZER;
+ hashu64_table old_seen_cids = HASHU64_TABLE_INITIALIZER;
+ int32_t pos = 0;
+ uint32_t upto_pos = 0;
+ ptrarray_t added = PTRARRAY_INITIALIZER;
+ ptrarray_t removed = PTRARRAY_INITIALIZER;
+ ptrarray_t changed = PTRARRAY_INITIALIZER;
+ int total = 0;
+ struct conversations_state *cstate = NULL;
+ int search_is_mutable = is_mutable_ordering(sortcrit, searchargs);
+ int r = 0;
+
+ assert(windowargs);
+ assert(windowargs->changedsince);
+ assert(windowargs->offset == 0);
+ assert(!windowargs->position);
+
+ /* make sure \Deleted messages are expunged. Will also lock the
+ * mailbox state and read any new information */
+ r = index_expunge(state, NULL, 1);
+ if (r) return r;
+
+ if (windowargs->conversations) {
+	cstate = conversations_get_mbox(index_mboxname(state));
+	if (!cstate)
+	 return IMAP_INTERNAL;
+ }
+
+ search_expr_internalise(state, searchargs->root);
+
+ total = search_predict_total(state, cstate, searchargs,
+				windowargs->conversations,
+				&xconvmodseq);
+ /* If there are no current and no expunged messages, we won't
+ * have any results at all and can short circuit the main loop;
+ * note that is a righter criterion than for XCONVSORT. */
+ if (!total && !state->exists)
+	goto out;
+
+ construct_hashu64_table(&seen_cids, state->exists/4+4, 0);
+ construct_hashu64_table(&old_seen_cids, state->exists/4+4, 0);
+
+ /* Create/load the msgdata array
+ * initial list - load data for ALL messages always */
+ msgdata = index_msgdata_load(state, NULL, state->exists, sortcrit, 0, NULL);
+
+ /* Sort the messages based on the given criteria */
+ index_msgdata_sort(msgdata, state->exists, sortcrit);
+
+ /* Discover exemplars */
+ for (mi = 0 ; mi < state->exists ; mi++) {
+	MsgData *msg = msgdatami;
+	struct index_map *im = &state->mapmsg->msgno-1;
+	int was_old_exemplar = 0;
+	int is_new_exemplar = 0;
+	int is_deleted = 0;
+	int is_new = 0;
+	int was_deleted = 0;
+	int is_changed = 0;
+	int in_search = 0;
+
+	in_search = index_search_evaluate(state, searchargs->root, msg->msgno);
+	is_deleted = !!(im->system_flags & FLAG_EXPUNGED);
+	is_new = (im->uid >= windowargs->uidnext);
+	is_changed = (im->modseq > windowargs->modseq);
+	was_deleted = is_deleted && !is_changed;
+
+	/* is this message a current exemplar? */
+	if (!is_deleted &&
+	 in_search &&
+	 (!windowargs->conversations || !hashu64_lookup(msg->cid, &seen_cids))) {
+	 is_new_exemplar = 1;
+	 pos++;
+	 if (windowargs->conversations)
+		hashu64_insert(msg->cid, (void *)1, &seen_cids);
+	}
+
+	/* optimisation for when the total is
+	 * not known but we've hit 'upto' */
+	if (upto_pos)
+	 continue;
+
+	/* was this message an old exemplar, or in the case of mutable
+	 * searches, possible an old exemplar? */
+	if (!is_new &&
+	 !was_deleted &&
+	 (in_search || search_is_mutable) &&
+	 (!windowargs->conversations || !hashu64_lookup(msg->cid, &old_seen_cids))) {
+	 was_old_exemplar = 1;
+	 if (windowargs->conversations)
+		hashu64_insert(msg->cid, (void *)1, &old_seen_cids);
+	}
+
+	if (was_old_exemplar && !is_new_exemplar) {
+	 ptrarray_push(&removed, msg);
+	} else if (!was_old_exemplar && is_new_exemplar) {
+	 msg->msgno = pos; /* hacky: reuse ->msgno for pos */
+	 ptrarray_push(&added, msg);
+	} else if (was_old_exemplar && is_new_exemplar) {
+	 modseq_t modseq = get_modseq_of(msg, cstate);
+	 if (modseq > windowargs->modseq) {
+		ptrarray_push(&changed, msg);
+		if (search_is_mutable) {
+		 /* is the search is mutable, we're in a whole world of
+		 * uncertainty about the client's state, so we just
+		 * report the exemplar in all three lists and let the
+		 * client sort it out. */
+		 ptrarray_push(&removed, msg);
+		 msg->msgno = pos; /* hacky: reuse ->msgno for pos */
+		 ptrarray_push(&added, msg);
+		}
 	 }
-	 if ((++sortcrit)->key) strlcat(buf, " ", sizeof(buf));
 	}
 
-	syslog(LOG_DEBUG, "SORT (%s) processing time: %d msg in %f sec",
-	 buf, nmsg, (clock() - start) / (double) CLOCKS_PER_SEC);
+	/* if this is the last message the client cares about ('upto')
+	 * then we can break early...unless its a mutable search or
+	 * we need to keep going to calculate an accurate total */
+	if (!search_is_mutable &&
+	 !upto_pos &&
+	 msg->uid == windowargs->upto) {
+	 if (total != UNPREDICTABLE)
+		break;
+	 upto_pos = pos;
+	}
 }
 
- return nmsg;
+ /* unlike 'anchor', the case of not finding 'upto' is not an error */
+
+ if (total == UNPREDICTABLE) {
+	/* the total was not predictable prima facie */
+	total = pos;
+ }
+
+ /* Print the resulting lists */
+
+ if (added.count) {
+	prot_printf(state->out, "* ADDED"); /* (uid pos) tuples */
+	for (i = 0 ; i < added.count ; i++) {
+	 MsgData *msg = added.datai;
+	 prot_printf(state->out, " (%u %u)",
+			msg->uid, msg->msgno);
+	}
+	prot_printf(state->out, "\r\n");
+ }
+
+ if (removed.count) {
+	prot_printf(state->out, "* REMOVED");	/* uids */
+	for (i = 0 ; i < removed.count ; i++) {
+	 MsgData *msg = removed.datai;
+	 prot_printf(state->out, " %u", msg->uid);
+	}
+	prot_printf(state->out, "\r\n");
+ }
+
+ if (changed.count) {
+	prot_printf(state->out, "* CHANGED");	/* cids or uids */
+	for (i = 0 ; i < changed.count ; i++) {
+	 MsgData *msg = changed.datai;
+	 if (windowargs->conversations)
+		prot_printf(state->out, " %s",
+			conversation_id_encode(msg->cid));
+	 else
+		prot_printf(state->out, " %u", msg->uid);
+	}
+	prot_printf(state->out, "\r\n");
+ }
+
+out:
+ if (!r) {
+	prot_printf(state->out, "* OK HIGHESTMODSEQ " MODSEQ_FMT "\r\n",
+		 MAX(xconvmodseq, state->mailbox->i.highestmodseq));
+	prot_printf(state->out, "* OK UIDVALIDITY %u\r\n",
+		 state->mailbox->i.uidvalidity);
+	prot_printf(state->out, "* OK UIDNEXT %u\r\n",
+		 state->mailbox->i.last_uid + 1);
+	prot_printf(state->out, "* OK TOTAL %u\r\n",
+		 total);
+ }
+
+ /* free all our temporary data */
+ index_msgdata_free(msgdata, state->exists);
+ ptrarray_fini(&added);
+ ptrarray_fini(&removed);
+ ptrarray_fini(&changed);
+ free_hashu64_table(&seen_cids, NULL);
+ free_hashu64_table(&old_seen_cids, NULL);
+
+ return r;
 }
 
 /*
 * Performs a THREAD command
 */
-int index_thread(struct index_state *state, int algorithm,
+EXPORTED int index_thread(struct index_state *state, int algorithm,
 		 struct searchargs *searchargs, int usinguid)
 {
+ search_query_t *query = NULL;
+ search_folder_t *folder;
 unsigned *msgno_list;
- int nmsg;
+ int nmsg = 0;
 clock_t start;
 modseq_t highestmodseq = 0;
+ int r;
 
 /* update the index */
 if (index_check(state, 0, 0))
 	return 0;
- 
+
+ highestmodseq = needs_modseq(searchargs, NULL);
+
 if(CONFIG_TIMING_VERBOSE)
 	start = clock();
 
 /* Search for messages based on the given criteria */
- nmsg = _index_search(&msgno_list, state, searchargs,
-			 searchargs->modseq ? &highestmodseq : NULL);
+ query = search_query_new(state, searchargs);
+ r = search_query_run(query);
+ if (r) goto out;	 /* search failed */
+ folder = search_query_find_folder(query, index_mboxname(state));
+
+ if (folder) {
+	search_folder_use_msn(folder, state);
+	if (highestmodseq)
+	 highestmodseq = search_folder_get_highest_modseq(folder);
+	nmsg = search_folder_get_array(folder, &msgno_list);
+ }
 
 if (nmsg) {
 	/* Thread messages using given algorithm */
@@ -1457,74 +2757,107 @@
 	 (clock() - start) / (double) CLOCKS_PER_SEC);
 }
 
+out:
+ search_query_free(query);
 return nmsg;
 }
 
 /*
 * Performs a COPY command
 */
-int
+EXPORTED int
 index_copy(struct index_state *state,
 	 char *sequence, 
 	 int usinguid,
 	 char *name, 
 	 char **copyuidp,
-	 int nolink)
+	 int nolink,
+	 struct namespace *namespace,
+	 int isadmin,
+	 int ismove)
 {
- static struct copyargs copyargs;
+ struct copyargs copyargs;
 int i;
- uquota_t totalsize = 0;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
+ quota_t *qptr = NULL;
 int r;
 struct appendstate appendstate;
 uint32_t msgno, checkval;
- unsigned long uidvalidity;
- unsigned long startuid, num;
- unsigned baseuid;
 long docopyuid;
 struct seqset *seq;
- struct mailbox *mailbox = state->mailbox;
+ struct mailbox *srcmailbox = NULL;
 struct mailbox *destmailbox = NULL;
 struct index_map *im;
+ int is_same_user;
 
 *copyuidp = NULL;
 
- copyargs.nummsg = 0;
+ memset(&copyargs, 0, sizeof(struct copyargs));
+
+ /* let's just see how common this is... */
+ if (!strcmp(index_mboxname(state), name))
+	syslog(LOG_NOTICE, "same mailbox copy %s (%s)", name, sequence);
+
+ is_same_user = mboxname_same_userid(index_mboxname(state), name);
+ if (is_same_user < 0)
+	return is_same_user;
 
 r = index_check(state, usinguid, usinguid);
 if (r) return r;
 
+ srcmailbox = state->mailbox;
+
 seq = _parse_sequence(state, sequence, usinguid);
 
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
-	checkval = usinguid ? im->record.uid : msgno;
+	checkval = usinguid ? im->uid : msgno;
 	if (!seqset_ismember(seq, checkval))
 	 continue;
-	index_copysetup(state, msgno, &copyargs);
+	index_copysetup(state, msgno, &copyargs, is_same_user);
 }
 
 seqset_free(seq);
 
- if (copyargs.nummsg == 0) return IMAP_NO_NOSUCHMSG;
+ if (copyargs.nummsg == 0) {
+	r = IMAP_NO_NOSUCHMSG;
+	goto done;
+ }
 
- for (i = 0; i < copyargs.nummsg; i++)
-	totalsize += copyargs.copymsgi.size;
+ r = mailbox_open_iwl(name, &destmailbox);
+ if (r) goto done;
 
- r = append_setup(&appendstate, name, state->userid,
-		 state->authstate, ACL_INSERT, totalsize);
- if (r) return r;
+ /* not moving or different quota root - need to check quota */
+ if (!ismove || strcmpsafe(srcmailbox->quotaroot, destmailbox->quotaroot)) {
+	for (i = 0; i < copyargs.nummsg; i++)
+	 qdiffsQUOTA_STORAGE += copyargs.copymsgi.record.size;
+	qdiffsQUOTA_MESSAGE = copyargs.nummsg;
+	qptr = qdiffs;
+ }
+
+ r = append_setup_mbox(&appendstate, destmailbox, state->userid,
+			 state->authstate, ACL_INSERT,
+			 qptr, namespace, isadmin,
+			 ismove ? EVENT_MESSAGE_MOVE : EVENT_MESSAGE_COPY);
+ if (r) goto done;
 
 docopyuid = (appendstate.myrights & ACL_READ);
- baseuid = appendstate.mailbox->i.last_uid + 1;
 
- r = append_copy(mailbox, &appendstate, copyargs.nummsg,
+ r = append_copy(srcmailbox, &appendstate, copyargs.nummsg,
 		 copyargs.copymsg, nolink);
- if (!r) {
-	r = append_commit(&appendstate, totalsize,
-		 &uidvalidity, &startuid, &num, &destmailbox);
+ if (r) {
+	append_abort(&appendstate);
+	goto done;
 }
 
- if (!r && docopyuid) {
+ r = append_commit(&appendstate);
+ if (r) goto done;
+
+ /* unlock first so we don't hold the lock while expunging
+ * the source */
+ mailbox_unlock_index(destmailbox, NULL);
+
+ if (docopyuid || ismove) {
 	char *source;
 	struct seqset *seq;
 	unsigned uidvalidity = destmailbox->i.uidvalidity;
@@ -1532,26 +2865,40 @@
 	seq = seqset_init(0, SEQ_SPARSE);
 
 	for (i = 0; i < copyargs.nummsg; i++)
-	 seqset_add(seq, copyargs.copymsgi.uid, 1);
+	 seqset_add(seq, copyargs.copymsgi.olduid, 1);
 
 	source = seqset_cstring(seq);
-	*copyuidp = xmalloc(strlen(source) + 50);
 
-	if (appendstate.nummsg == 1)
-	 sprintf(*copyuidp, "%u %s %u", uidvalidity, source, baseuid);
-	else
-	 sprintf(*copyuidp, "%u %s %u:%u", uidvalidity, source,
-		 baseuid, baseuid + appendstate.nummsg - 1);
+	/* remove the source messages */
+	if (ismove)
+	 r = index_expunge(state, source, 0);
+
+	if (docopyuid) {
+	 *copyuidp = xmalloc(strlen(source) + 50);
+
+	 if (appendstate.nummsg == 1)
+		sprintf(*copyuidp, "%u %s %u", uidvalidity, source,
+			appendstate.baseuid);
+	 else
+		sprintf(*copyuidp, "%u %s %u:%u", uidvalidity, source,
+			appendstate.baseuid,
+			appendstate.baseuid + appendstate.nummsg - 1);
+	}
 
 	free(source);
 	seqset_free(seq);
 }
 
- if (!r) {
-	/* we log the first name to get GUID-copy magic */
-	mailbox_close(&destmailbox);
-	sync_log_mailbox_double(mailbox->name, name);
+ /* we log the first name to get GUID-copy magic */
+ if (!r)
+	sync_log_mailbox_double(index_mboxname(state), name);
+
+done:
+ for (i = 0; i < copyargs.nummsg; i++) {
+	strarray_fini(&copyargs.copymsgi.flags);
 }
+ free(copyargs.copymsg);
+ mailbox_close(&destmailbox);
 
 return r;
 }
@@ -1563,38 +2910,41 @@
 			 struct protstream *pout)
 {
 struct mailbox *mailbox = state->mailbox;
- const char *msg_base = 0;
- unsigned long msg_size = 0;
- unsigned flag, flagmask;
- char datebuf30;
+ struct buf msg = BUF_INITIALIZER;
+ unsigned flag, flagmask = 0;
+ char datebufRFC3501_DATETIME_MAX+1;
 char sepchar = '(';
- struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
+ int r;
+
+ r = index_reload_record(state, msgno, &record);
+ if (r) return r;
 
 /* Open the message file */
- if (mailbox_map_message(mailbox, im->record.uid, &msg_base, &msg_size)) 
+ if (mailbox_map_record(mailbox, &record, &msg))
 	return IMAP_NO_MSGGONE;
 
 /* start the individual append */
 prot_printf(pout, " ");
 
 /* add system flags */
- if (im->record.system_flags & FLAG_ANSWERED) {
+ if (record.system_flags & FLAG_ANSWERED) {
 	prot_printf(pout, "%c\\Answered", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_FLAGGED) {
+ if (record.system_flags & FLAG_FLAGGED) {
 	prot_printf(pout, "%c\\Flagged", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_DRAFT) {
+ if (record.system_flags & FLAG_DRAFT) {
 	prot_printf(pout, "%c\\Draft", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_DELETED) {
+ if (record.system_flags & FLAG_DELETED) {
 	prot_printf(pout, "%c\\Deleted", sepchar);
 	sepchar = ' ';
 }
- if (im->isseen) {
+ if (record.system_flags & FLAG_SEEN) {
 	prot_printf(pout, "%c\\Seen", sepchar);
 	sepchar = ' ';
 }
@@ -1602,7 +2952,7 @@
 /* add user flags */
 for (flag = 0; flag < MAX_USER_FLAGS; flag++) {
 	if ((flag & 31) == 0) {
-	 flagmask = im->record.user_flagsflag/32;
+	 flagmask = record.user_flagsflag/32;
 	}
 	if (state->flagnameflag && (flagmask & (1<<(flag & 31)))) {
 	 prot_printf(pout, "%c%s", sepchar, state->flagnameflag);
@@ -1611,15 +2961,14 @@
 }
 
 /* add internal date */
- cyrus_ctime(im->record.internaldate, datebuf);
+ time_to_rfc3501(record.internaldate, datebuf, sizeof(datebuf));
 prot_printf(pout, ") \"%s\" ", datebuf);
 
 /* message literal */
- index_fetchmsg(state, msg_base, msg_size, 0, im->record.size, 0, 0);
+ index_fetchmsg(state, &msg, 0, record.size, 0, 0);
 
 /* close the message file */
- if (msg_base) 
-	mailbox_unmap_message(mailbox, im->record.uid, &msg_base, &msg_size);
+ buf_free(&msg);
 
 return 0;
 }
@@ -1627,10 +2976,10 @@
 /*
 * Performs a COPY command from a local mailbox to a remote mailbox
 */
-int index_copy_remote(struct index_state *state, char *sequence, 
+EXPORTED int index_copy_remote(struct index_state *state, char *sequence,
 		 int usinguid, struct protstream *pout)
 {
- uint32_t msgno, checkval;
+ uint32_t msgno;
 struct seqset *seq;
 struct index_map *im;
 int r;
@@ -1642,8 +2991,7 @@
 
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
-	checkval = usinguid ? im->record.uid : msgno;
-	if (!seqset_ismember(seq, checkval))
+	if (!seqset_ismember(seq, usinguid ? im->uid : msgno))
 	 continue;
 	index_appendremote(state, msgno, pout);
 }
@@ -1658,7 +3006,7 @@
 * If no message with UID 'uid', returns the message with
 * the higest UID not greater than 'uid'.
 */
-unsigned index_finduid(struct index_state *state, unsigned uid)
+EXPORTED uint32_t index_finduid(struct index_state *state, uint32_t uid)
 {
 unsigned low = 1;
 unsigned high = state->exists;
@@ -1704,22 +3052,16 @@
 * further constrained by 'start_octet' and 'octet_count' as per the
 * IMAP command PARTIAL.
 */
-void
-index_fetchmsg(state, msg_base, msg_size, offset, size,
-	 start_octet, octet_count)
-struct index_state *state;
-const char *msg_base;
-unsigned long msg_size;
-unsigned offset;
-unsigned size; /* this is the correct size for a news message after
-		 having LF translated to CRLF */
-unsigned start_octet;
-unsigned octet_count;
+void index_fetchmsg(struct index_state *state, const struct buf *msg,
+		 unsigned offset,
+		 unsigned size, /* this is the correct size for a news message after
+					 having LF translated to CRLF */
+		 unsigned start_octet, unsigned octet_count)
 {
- unsigned n, domain;
+ unsigned n, domain;
 
 /* If no data, output NIL */
- if (!msg_base) {
+ if (!msg || !msg->s) {
 	prot_printf(state->out, "NIL");
 	return;
 }
@@ -1744,9 +3086,9 @@
 /* Seek over PARTIAL constraint */
 offset += start_octet;
 n = size;
- if (offset + size > msg_size) {
-	if (msg_size > offset) {
-	 n = msg_size - offset;
+ if (offset + size > msg->len) {
+	if (msg->len > offset) {
+	 n = msg->len - offset;
 	}
 	else {
 	 prot_printf(state->out, "\"\"");
@@ -1755,7 +3097,7 @@
 }
 
 /* Get domain of the data */
- domain = data_domain(msg_base + offset, n);
+ domain = data_domain(msg->s + offset, n);
 
 if (domain == DOMAIN_BINARY) {
 	/* Write size of literal8 */
@@ -1768,7 +3110,7 @@
 /* Non-text literal -- tell the protstream about it */
 if (domain != DOMAIN_7BIT) prot_data_boundary(state->out);
 
- prot_write(state->out, msg_base + offset, n);
+ prot_write(state->out, msg->s + offset, n);
 while (n++ < size) {
 	/* File too short, resynch client.
 	 *
@@ -1786,7 +3128,7 @@
 * Helper function to fetch a body section
 */
 static int index_fetchsection(struct index_state *state, const char *resp,
-			 const char *msg_base, unsigned long msg_size,
+			 const struct buf *inmsg,
 			 char *section, const char *cachestr, unsigned size,
 			 unsigned start_octet, unsigned octet_count)
 {
@@ -1795,6 +3137,9 @@
 int fetchmime = 0;
 unsigned offset = 0;
 char *decbuf = NULL;
+ struct buf msg = BUF_INITIALIZER;
+
+ buf_init_ro(&msg, inmsg->s, inmsg->len);
 
 p = section;
 
@@ -1804,7 +3149,7 @@
 	 prot_printf(state->out, "%s%u", resp, size);
 	} else {
 	 prot_printf(state->out, "%s", resp);
-	 index_fetchmsg(state, msg_base, msg_size, 0, size,
+	 index_fetchmsg(state, &msg, 0, size,
 			 start_octet, octet_count);
 	}
 	return 0;
@@ -1871,21 +3216,21 @@
 offset = CACHE_ITEM_BIT32(cachestr);
 size = CACHE_ITEM_BIT32(cachestr + CACHE_ITEM_SIZE_SKIP);
 
- if (msg_base && (p = strstr(resp, "BINARY"))) {
+ if (msg.s && (p = strstr(resp, "BINARY"))) {
 	/* BINARY or BINARY.SIZE */
 	int encoding = CACHE_ITEM_BIT32(cachestr + 2 * 4) & 0xff;
 	size_t newsize;
 
 	/* check that the offset isn't corrupt */
-	if (offset + size > msg_size) {
-	 syslog(LOG_ERR, "invalid part offset in %s", state->mailbox->name);
+	if (offset + size > msg.len) {
+	 syslog(LOG_ERR, "invalid part offset in %s", index_mboxname(state));
 	 return IMAP_IOERROR;
 	}
 
-	msg_base = charset_decode_mimebody(msg_base + offset, size, encoding,
-					 &decbuf, 0, &newsize);
+	msg.s = (char *)charset_decode_mimebody(msg.s + offset, size, encoding,
+						&decbuf, &newsize);
 
-	if (!msg_base) {
+	if (!msg.s) {
 	 /* failed to decode */
 	 if (decbuf) free(decbuf);
 	 return IMAP_NO_UNKNOWN_CTE;
@@ -1900,13 +3245,13 @@
 	 /* BINARY */
 	 offset = 0;
 	 size = newsize;
-	 msg_size = newsize;
+	 msg.len = newsize;
 	}
 }
 
 /* Output body part */
 prot_printf(state->out, "%s", resp);
- index_fetchmsg(state, msg_base, msg_size, offset, size,
+ index_fetchmsg(state, &msg, offset, size,
 		 start_octet, octet_count);
 
 if (decbuf) free(decbuf);
@@ -1981,10 +3326,10 @@
 			 CACHE_ITEM_BIT32(cachestr+CACHE_ITEM_SIZE_SKIP));
 
 if (fields_not) {
-	index_pruneheader(buf, 0, fsection->fields);
+	message_pruneheader(buf, 0, fsection->fields);
 }
 else {
-	index_pruneheader(buf, fsection->fields, 0);
+	message_pruneheader(buf, fsection->fields, 0);
 }
 size = strlen(buf);
 
@@ -2033,15 +3378,10 @@
 /*
 * Helper function to read a header section into a static buffer
 */
-static char *
-index_readheader(msg_base, msg_size, offset, size)
-const char *msg_base;
-unsigned long msg_size;
-unsigned offset;
-unsigned size;
+static char *index_readheader(const char *msg_base, unsigned long msg_size,
+			 unsigned offset, unsigned size)
 {
- static char *buf;
- static unsigned bufsize;
+ static struct buf buf = BUF_INITIALIZER;
 
 if (offset + size > msg_size) {
 	/* Message file is too short, truncate request */
@@ -2053,78 +3393,9 @@
 	}
 }
 
- if (bufsize < size+2) {
-	bufsize = size+100;
-	buf = xrealloc(buf, bufsize);
- }
-
- msg_base += offset;
-
- memcpy(buf, msg_base, size);
- bufsize = '\0';
-
- return buf;
-}
-
-/*
- * Prune the header section in buf to include only those headers
- * listed in headers or (if headers_not is non-empty) those headers
- * not in headers_not.
- */
-static void
-index_pruneheader(char *buf, struct strlist *headers,
-		 struct strlist *headers_not)
-{
- char *p, *colon, *nextheader;
- int goodheader;
- char *endlastgood = buf;
- struct strlist *l;
- 
- p = buf;
- while (*p && *p != '\r') {
-	colon = strchr(p, ':');
-	if (colon && headers_not) {
-	 goodheader = 1;
-	 for (l = headers_not; l; l = l->next) {
-		if ((size_t) (colon - p) == strlen(l->s) &&
-		 !strncasecmp(p, l->s, colon - p)) {
-		 goodheader = 0;
-		 break;
-		}
-	 }
-	} else {
-	 goodheader = 0;
-	}
-	if (colon) {
-	 for (l = headers; l; l = l->next) {
-		if ((size_t) (colon - p) == strlen(l->s) &&
-		 !strncasecmp(p, l->s, colon - p)) {
-		 goodheader = 1;
-		 break;
-		}
-	 }
-	}
-
-	nextheader = p;
-	do {
-	 nextheader = strchr(nextheader, '\n');
-	 if (nextheader) nextheader++;
-	 else nextheader = p + strlen(p);
-	} while (*nextheader == ' ' || *nextheader == '\t');
-
-	if (goodheader) {
-	 if (endlastgood != p) {
-		/* memmove and not strcpy since this is all within a
-		 * single buffer */
-		memmove(endlastgood, p, strlen(p) + 1);
-		nextheader -= p - endlastgood;
-	 }
-	 endlastgood = nextheader;
-	}
-	p = nextheader;
- }
-	 
- *endlastgood = '\0';
+ buf_reset(&buf);
+ buf_appendmap(&buf, msg_base+offset, size);
+ return (char *)buf_cstring(&buf);
 }
 
 /*
@@ -2135,8 +3406,8 @@
 			 const char *msg_base,
 			 unsigned long msg_size,
 			 unsigned size,
-			 struct strlist *headers,
-			 struct strlist *headers_not)
+			 const strarray_t *headers,
+			 const strarray_t *headers_not)
 {
 char *buf;
 
@@ -2148,7 +3419,7 @@
 
 buf = index_readheader(msg_base, msg_size, 0, size);
 
- index_pruneheader(buf, headers, headers_not);
+ message_pruneheader(buf, headers, headers_not);
 
 size = strlen(buf);
 prot_printf(state->out, "{%u}\r\n%s\r\n", size+2, buf);
@@ -2160,11 +3431,10 @@
 */
 static void
 index_fetchcacheheader(struct index_state *state, struct index_record *record,
-		 struct strlist *headers, unsigned start_octet,
+		 const strarray_t *headers, unsigned start_octet,
 		 unsigned octet_count)
 {
- static char *buf;
- static unsigned bufsize;
+ static struct buf buf = BUF_INITIALIZER;
 unsigned size;
 unsigned crlf_start = 0;
 unsigned crlf_size = 2;
@@ -2176,17 +3446,12 @@
 	return;
 }
 
- size = cacheitem_size(record, CACHE_HEADERS);
- if (bufsize < size+2) {
-	bufsize = size+100;
-	buf = xrealloc(buf, bufsize);
- }
-
- memcpy(buf, cacheitem_base(record, CACHE_HEADERS), size);
- bufsize = '\0';
+ buf_setmap(&buf, cacheitem_base(record, CACHE_HEADERS),
+		 cacheitem_size(record, CACHE_HEADERS));
+ buf_cstring(&buf);
 
- index_pruneheader(buf, headers, 0);
- size = strlen(buf);
+ message_pruneheader(buf.s, headers, 0);
+ size = strlen(buf.s); /* not buf.len, it has been pruned */
 
 /* partial fetch: adjust 'size' */
 if (octet_count) {
@@ -2218,7 +3483,7 @@
 }
 else {
 	prot_printf(state->out, "{%u}\r\n", size + crlf_size);
-	prot_write(state->out, buf + start_octet, size);
+	prot_write(state->out, buf.s + start_octet, size);
 	prot_write(state->out, "\r\n" + crlf_start, crlf_size);
 }
 }
@@ -2249,7 +3514,7 @@
 	 prot_printf(state->out, "%c\\Deleted", sepchar);
 	 sepchar = ' ';
 	}
-	if (state->myrights & ACL_SEEN) {
+	if (state->myrights & ACL_SETSEEN) {
 	 prot_printf(state->out, "%c\\Seen", sepchar);
 	 sepchar = ' ';
 	}
@@ -2268,7 +3533,7 @@
 prot_printf(state->out, ") Ok\r\n");
 }
 
-static void index_checkflags(struct index_state *state, int dirty)
+EXPORTED void index_checkflags(struct index_state *state, int print, int dirty)
 {
 struct mailbox *mailbox = state->mailbox;
 unsigned i;
@@ -2294,7 +3559,7 @@
 	dirty = 1;
 }
 
- if (dirty)
+ if (dirty && print)
 	index_listflags(state);
 }
 
@@ -2312,14 +3577,15 @@
 	im = &state->mapoldmsgno-1;
 
 	/* inform about expunges */
-	if (im->record.system_flags & FLAG_EXPUNGED) {
+	if (im->system_flags & FLAG_EXPUNGED) {
 	 state->exists--;
+	 state->num_expunged--;
 	 /* they never knew about this one, skip */
 	 if (msgno > state->oldexists)
 		continue;
 	 state->oldexists--;
 	 if (state->qresync)
-		seqset_add(vanishedlist, im->record.uid, 1);
+		seqset_add(vanishedlist, im->uid, 1);
 	 else
 		prot_printf(state->out, "* %u EXPUNGE\r\n", msgno);
 	 continue;
@@ -2351,8 +3617,8 @@
 state->oldexists = state->exists;
 }
 
-void index_tellchanges(struct index_state *state, int canexpunge,
-		 int printuid)
+EXPORTED void index_tellchanges(struct index_state *state, int canexpunge,
+		 int printuid, int printmodseq)
 {
 uint32_t msgno;
 struct index_map *im;
@@ -2361,21 +3627,82 @@
 
 if (state->oldexists != state->exists) index_tellexists(state);
 
- index_checkflags(state, 0);
+ index_checkflags(state, 1, 0);
 
 /* print any changed message flags */
 for (msgno = 1; msgno <= state->exists; msgno++) {
 	im = &state->mapmsgno-1;
 
-	/* we don't report flag updates if it's been expunged */
-	if (im->record.system_flags & FLAG_EXPUNGED)
-	 continue;
-
 	/* report if it's changed since last told */
-	if (im->record.modseq > im->told_modseq)
-	 index_printflags(state, msgno, printuid);
+	if (im->modseq > im->told_modseq)
+	 index_printflags(state, msgno, printuid, printmodseq);
+ }
+}
+
+struct fetch_annotation_rock {
+ struct protstream *pout;
+ const char *sep;
+};
+
+static void fetch_annotation_response(const char *mboxname
+					__attribute__((unused)),
+				 uint32_t uid
+					__attribute__((unused)),
+				 const char *entry,
+				 struct attvaluelist *attvalues,
+				 void *rock)
+{
+ char sep2 = '(';
+ struct attvaluelist *l;
+ struct fetch_annotation_rock *frock = rock;
+
+ prot_printf(frock->pout, "%s", frock->sep);
+ prot_printastring(frock->pout, entry);
+ prot_putc(' ', frock->pout);
+
+ for (l = attvalues ; l ; l = l->next) {
+	prot_putc(sep2, frock->pout);
+	sep2 = ' ';
+	prot_printastring(frock->pout, l->attrib);
+	prot_putc(' ', frock->pout);
+	prot_printmap(frock->pout, l->value.s, l->value.len);
 }
+ prot_putc(')', frock->pout);
+
+ frock->sep = " ";
+}
+
+/*
+ * Helper function to send FETCH data for the ANNOTATION
+ * fetch item.
+ */
+static int index_fetchannotations(struct index_state *state,
+				 uint32_t msgno,
+				 const struct fetchargs *fetchargs)
+{
+ annotate_state_t *astate = NULL;
+ struct fetch_annotation_rock rock;
+ int r = 0;
+
+ r = mailbox_get_annotate_state(state->mailbox,
+			 state->mapmsgno-1.uid,
+				 &astate);
+ if (r) return r;
+ annotate_state_set_auth(astate, fetchargs->isadmin,
+			 fetchargs->userid, fetchargs->authstate);
+
+ memset(&rock, 0, sizeof(rock));
+ rock.pout = state->out;
+ rock.sep = "";
+
+ r = annotate_state_fetch(astate,
+			 &fetchargs->entries, &fetchargs->attribs,
+			 fetch_annotation_response, &rock,
+			 0);
+
+ return r;
 }
+
 /*
 * Helper function to send * FETCH (FLAGS data.
 * Does not send the terminating close paren or CRLF.
@@ -2395,19 +3722,19 @@
 	prot_printf(state->out, "%c\\Recent", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_ANSWERED) {
+ if (im->system_flags & FLAG_ANSWERED) {
 	prot_printf(state->out, "%c\\Answered", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_FLAGGED) {
+ if (im->system_flags & FLAG_FLAGGED) {
 	prot_printf(state->out, "%c\\Flagged", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_DRAFT) {
+ if (im->system_flags & FLAG_DRAFT) {
 	prot_printf(state->out, "%c\\Draft", sepchar);
 	sepchar = ' ';
 }
- if (im->record.system_flags & FLAG_DELETED) {
+ if (im->system_flags & FLAG_DELETED) {
 	prot_printf(state->out, "%c\\Deleted", sepchar);
 	sepchar = ' ';
 }
@@ -2417,7 +3744,7 @@
 }
 for (flag = 0; flag < VECTOR_SIZE(state->flagname); flag++) {
 	if ((flag & 31) == 0) {
-	 flagmask = im->record.user_flagsflag/32;
+	 flagmask = im->user_flagsflag/32;
 	}
 	if (state->flagnameflag && (flagmask & (1<<(flag & 31)))) {
 	 prot_printf(state->out, "%c%s", sepchar, state->flagnameflag);
@@ -2426,11 +3753,12 @@
 }
 if (sepchar == '(') (void)prot_putc('(', state->out);
 (void)prot_putc(')', state->out);
- im->told_modseq = im->record.modseq;
+ im->told_modseq = im->modseq;
 }
 
 static void index_printflags(struct index_state *state,
-			 uint32_t msgno, int usinguid)
+			 uint32_t msgno, int usinguid,
+			 int printmodseq)
 {
 struct index_map *im = &state->mapmsgno-1;
 
@@ -2439,9 +3767,9 @@
 * Errata ID: 1807 - MUST send UID and MODSEQ to all
 * untagged FETCH unsolicited responses */
 if (usinguid || state->qresync)
-	prot_printf(state->out, " UID %u", im->record.uid);
- if (state->qresync)
-	prot_printf(state->out, " MODSEQ (" MODSEQ_FMT ")", im->record.modseq);
+	prot_printf(state->out, " UID %u", im->uid);
+ if (printmodseq || state->qresync)
+	prot_printf(state->out, " MODSEQ (" MODSEQ_FMT ")", im->modseq);
 prot_printf(state->out, ")\r\n");
 }
 
@@ -2449,33 +3777,50 @@
 * Helper function to send requested * FETCH data for a message
 */
 static int index_fetchreply(struct index_state *state, uint32_t msgno,
-			 struct fetchargs *fetchargs)
+			 const struct fetchargs *fetchargs)
 {
 struct mailbox *mailbox = state->mailbox;
 int fetchitems = fetchargs->fetchitems;
- const char *msg_base = NULL;
- unsigned long msg_size = 0;
+ struct buf msg = BUF_INITIALIZER;
 struct octetinfo *oi = NULL;
 int sepchar = '(';
 int started = 0;
- struct strlist *section, *field;
+ struct section *section;
 struct fieldlist *fsection;
 char respbuf100;
 int r = 0;
 struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
 
 /* Check the modseq against changedsince */
- if (fetchargs->changedsince &&
-	im->record.modseq <= fetchargs->changedsince) {
+ if (fetchargs->changedsince && im->modseq <= fetchargs->changedsince)
+	return 0;
+
+ /* skip missing records entirely */
+ if (!im->recno)
+	return 0;
+
+ r = index_reload_record(state, msgno, &record);
+ if (r) {
+	prot_printf(state->out, "* OK ");
+	prot_printf(state->out, error_message(IMAP_NO_MSGGONE), msgno);
+	prot_printf(state->out, "\r\n");
 	return 0;
 }
 
+ /* Check against the CID list filter */
+ if (fetchargs->cidhash) {
+	const char *key = conversation_id_encode(record.cid);
+	if (!hash_lookup(key, fetchargs->cidhash))
+	 return 0;
+ }
+
 /* Open the message file if we're going to need it */
- if ((fetchitems & (FETCH_HEADER|FETCH_TEXT|FETCH_RFC822)) ||
-	fetchargs->cache_atleast > im->record.cache_version || 
+ if ((fetchitems & (FETCH_HEADER|FETCH_TEXT|FETCH_SHA1|FETCH_RFC822)) ||
+	fetchargs->cache_atleast > record.cache_version || 
 	fetchargs->binsections || fetchargs->sizesections ||
 	fetchargs->bodysections) {
-	if (mailbox_map_message(mailbox, im->record.uid, &msg_base, &msg_size)) {
+	if (mailbox_map_record(mailbox, &record, &msg)) {
 	 prot_printf(state->out, "* OK ");
 	 prot_printf(state->out, error_message(IMAP_NO_MSGGONE), msgno);
 	 prot_printf(state->out, "\r\n");
@@ -2484,25 +3829,31 @@
 }
 
 /* display flags if asked _OR_ if they've changed */
- if (fetchitems & FETCH_FLAGS || im->told_modseq < im->record.modseq) {
+ if (fetchitems & FETCH_FLAGS || im->told_modseq < record.modseq) {
 	index_fetchflags(state, msgno);
 	sepchar = ' ';
 }
- else if ((fetchitems & ~FETCH_SETSEEN) || fetchargs->fsections ||
-	 fetchargs->headers || fetchargs->headers_not) {
+ else if ((fetchitems & ~FETCH_SETSEEN) || fetchargs->fsections ||
+	 fetchargs->headers.count || fetchargs->headers_not.count) {
 	/* these fetch items will always succeed, so start the response */
 	prot_printf(state->out, "* %u FETCH ", msgno);
 	started = 1;
 }
 if (fetchitems & FETCH_UID) {
-	prot_printf(state->out, "%cUID %u", sepchar, im->record.uid);
+	prot_printf(state->out, "%cUID %u", sepchar, record.uid);
 	sepchar = ' ';
 }
+ if (fetchitems & FETCH_GUID) {
+	prot_printf(state->out, "%cDIGEST.SHA1 %s", sepchar,
+		 message_guid_encode(&record.guid));
+	sepchar = ' ';
+ }
+
 if (fetchitems & FETCH_INTERNALDATE) {
-	time_t msgdate = im->record.internaldate;
-	char datebuf30;
+	time_t msgdate = record.internaldate;
+	char datebufRFC3501_DATETIME_MAX+1;
 
-	cyrus_ctime(msgdate, datebuf);
+	time_to_rfc3501(msgdate, datebuf, sizeof(datebuf));
 
 	prot_printf(state->out, "%cINTERNALDATE \"%s\"",
 		 sepchar, datebuf);
@@ -2510,63 +3861,119 @@
 }
 if (fetchitems & FETCH_MODSEQ) {
 	prot_printf(state->out, "%cMODSEQ (" MODSEQ_FMT ")",
-		 sepchar, im->record.modseq);
+		 sepchar, record.modseq);
 	sepchar = ' ';
 }
 if (fetchitems & FETCH_SIZE) {
 	prot_printf(state->out, "%cRFC822.SIZE %u", 
-		 sepchar, im->record.size);
+		 sepchar, record.size);
+	sepchar = ' ';
+ }
+ if ((fetchitems & FETCH_ANNOTATION)) {
+	prot_printf(state->out, "%cANNOTATION (", sepchar);
+	r = index_fetchannotations(state, msgno, fetchargs);
+	r = 0;
+	prot_printf(state->out, ")");
+	sepchar = ' ';
+ }
+ if (fetchitems & FETCH_FILESIZE) {
+	unsigned int msg_size = msg.len;
+	if (!msg.s) {
+	 const char *fname = mailbox_record_fname(mailbox, &record);
+	 struct stat sbuf;
+	 /* Find the size of the message file */
+	 if (stat(fname, &sbuf) == -1)
+		syslog(LOG_ERR, "IOERROR: stat on %s: %m", fname);
+	 else
+		msg_size = sbuf.st_size;
+	}
+	prot_printf(state->out, "%cRFC822.FILESIZE %lu", sepchar,
+		 (long unsigned)msg_size);
+	sepchar = ' ';
+ }
+ if (fetchitems & FETCH_SHA1) {
+	struct message_guid tmpguid;
+	message_guid_generate(&tmpguid, msg.s, msg.len);
+	prot_printf(state->out, "%cRFC822.SHA1 %s", sepchar, message_guid_encode(&tmpguid));
+	sepchar = ' ';
+ }
+ if ((fetchitems & FETCH_CID) &&
+	config_getswitch(IMAPOPT_CONVERSATIONS)) {
+	struct buf buf = BUF_INITIALIZER;
+	if (!record.cid)
+	 buf_appendcstr(&buf, "NIL");
+	else
+	 buf_printf(&buf, CONV_FMT, record.cid);
+	prot_printf(state->out, "%cCID %s", sepchar, buf_cstring(&buf));
+	buf_free(&buf);
+	sepchar = ' ';
+ }
+ if ((fetchitems & FETCH_FOLDER)) {
+	struct namespace *ns = fetchargs->namespace;
+	char mboxnameMAX_MAILBOX_PATH+1;
+	r = ns->mboxname_toexternal(ns, index_mboxname(state),
+				 fetchargs->userid, mboxname);
+	if (!r) {
+	 prot_printf(state->out, "%cFOLDER ", sepchar);
+	 prot_printastring(state->out, mboxname);
+	 sepchar = ' ';
+	}
+	r = 0;
+ }
+ if ((fetchitems & FETCH_UIDVALIDITY)) {
+	prot_printf(state->out, "%cUIDVALIDITY %u", sepchar,
+		 state->mailbox->i.uidvalidity);
 	sepchar = ' ';
 }
 if (fetchitems & FETCH_ENVELOPE) {
- if (!mailbox_cacherecord(mailbox, &im->record)) {
+ if (!mailbox_cacherecord(mailbox, &record)) {
 	 prot_printf(state->out, "%cENVELOPE ", sepchar);
 	 sepchar = ' ';
-	 prot_putbuf(state->out, cacheitem_buf(&im->record, CACHE_ENVELOPE));
+	 prot_putbuf(state->out, cacheitem_buf(&record, CACHE_ENVELOPE));
 	}
 }
 if (fetchitems & FETCH_BODYSTRUCTURE) {
- if (!mailbox_cacherecord(mailbox, &im->record)) {
+ if (!mailbox_cacherecord(mailbox, &record)) {
 	 prot_printf(state->out, "%cBODYSTRUCTURE ", sepchar);
 	 sepchar = ' ';
-	 prot_putbuf(state->out, cacheitem_buf(&im->record, CACHE_BODYSTRUCTURE));
+	 prot_putbuf(state->out, cacheitem_buf(&record, CACHE_BODYSTRUCTURE));
 	}
 }
 if (fetchitems & FETCH_BODY) {
- if (!mailbox_cacherecord(mailbox, &im->record)) {
+ if (!mailbox_cacherecord(mailbox, &record)) {
 	 prot_printf(state->out, "%cBODY ", sepchar);
 	 sepchar = ' ';
-	 prot_putbuf(state->out, cacheitem_buf(&im->record, CACHE_BODY));
+	 prot_putbuf(state->out, cacheitem_buf(&record, CACHE_BODY));
 	}
 }
 
 if (fetchitems & FETCH_HEADER) {
 	prot_printf(state->out, "%cRFC822.HEADER ", sepchar);
 	sepchar = ' ';
-	index_fetchmsg(state, msg_base, msg_size, 0,
-		 im->record.header_size,
+	index_fetchmsg(state, &msg, 0,
+		 record.header_size,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
 		 fetchargs->start_octet : 0,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
 		 fetchargs->octet_count : 0);
 }
- else if (fetchargs->headers || fetchargs->headers_not) {
+ else if (fetchargs->headers.count || fetchargs->headers_not.count) {
 	prot_printf(state->out, "%cRFC822.HEADER ", sepchar);
 	sepchar = ' ';
-	if (fetchargs->cache_atleast > im->record.cache_version) {
-	 index_fetchheader(state, msg_base, msg_size,
-			 im->record.header_size,
-			 fetchargs->headers, fetchargs->headers_not);
+	if (fetchargs->cache_atleast > record.cache_version) {
+	 index_fetchheader(state, msg.s, msg.len,
+			 record.header_size,
+			 &fetchargs->headers, &fetchargs->headers_not);
 	} else {
-	 index_fetchcacheheader(state, &im->record, fetchargs->headers, 0, 0);
+	 index_fetchcacheheader(state, &record, &fetchargs->headers, 0, 0);
 	}
 }
 
 if (fetchitems & FETCH_TEXT) {
 	prot_printf(state->out, "%cRFC822.TEXT ", sepchar);
 	sepchar = ' ';
-	index_fetchmsg(state, msg_base, msg_size,
-		 im->record.header_size, im->record.size - im->record.header_size,
+	index_fetchmsg(state, &msg,
+		 record.header_size, record.size - record.header_size,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
 		 fetchargs->start_octet : 0,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
@@ -2575,19 +3982,20 @@
 if (fetchitems & FETCH_RFC822) {
 	prot_printf(state->out, "%cRFC822 ", sepchar);
 	sepchar = ' ';
-	index_fetchmsg(state, msg_base, msg_size, 0, im->record.size,
+	index_fetchmsg(state, &msg, 0, record.size,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
 		 fetchargs->start_octet : 0,
 		 (fetchitems & FETCH_IS_PARTIAL) ?
 		 fetchargs->octet_count : 0);
 }
 for (fsection = fetchargs->fsections; fsection; fsection = fsection->next) {
+	int i;
 	prot_printf(state->out, "%cBODY%s ", sepchar, fsection->section);
 	sepchar = '(';
-	for (field = fsection->fields; field; field = field->next) {
+	for (i = 0 ; i < fsection->fields->count ; i++) {
 	 (void)prot_putc(sepchar, state->out);
 	 sepchar = ' ';
-	 prot_printastring(state->out, field->s);
+	 prot_printastring(state->out, fsection->fields->datai);
 	}
 	(void)prot_putc(')', state->out);
 	sepchar = ' ';
@@ -2596,11 +4004,11 @@
 
 	prot_printf(state->out, "%s ", fsection->trail);
 
-	if (fetchargs->cache_atleast > im->record.cache_version) {
-	 if (!mailbox_cacherecord(mailbox, &im->record))
-		index_fetchfsection(state, msg_base, msg_size,
+	if (fetchargs->cache_atleast > record.cache_version) {
+	 if (!mailbox_cacherecord(mailbox, &record))
+		index_fetchfsection(state, msg.s, msg.len,
 				 fsection,
-				 cacheitem_base(&im->record, CACHE_SECTION),
+				 cacheitem_base(&record, CACHE_SECTION),
 				 (fetchitems & FETCH_IS_PARTIAL) ?
 				 fetchargs->start_octet : oi->start_octet,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
@@ -2610,7 +4018,7 @@
 	 
 	}
 	else {
-	 index_fetchcacheheader(state, &im->record, fsection->fields,
+	 index_fetchcacheheader(state, &record, fsection->fields,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
 				 fetchargs->start_octet : oi->start_octet,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
@@ -2624,15 +4032,14 @@
 	 snprintf(respbuf, sizeof(respbuf), "* %u FETCH ", msgno);
 	}
 	snprintf(respbuf+strlen(respbuf), sizeof(respbuf)-strlen(respbuf),
-		 "%cBODY%s ", sepchar, section->s);
+		 "%cBODY%s ", sepchar, section->name);
 
-	oi = section->rock;
+	oi = &section->octetinfo;
 
-	if (!mailbox_cacherecord(mailbox, &im->record)) {
-	 r = index_fetchsection(state, respbuf,
-				 msg_base, msg_size,
-				 section->s, cacheitem_base(&im->record, CACHE_SECTION),
-				 im->record.size,
+	if (!mailbox_cacherecord(mailbox, &record)) {
+	 r = index_fetchsection(state, respbuf, &msg,
+				 section->name, cacheitem_base(&record, CACHE_SECTION),
+				 record.size,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
 				 fetchargs->start_octet : oi->start_octet,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
@@ -2647,14 +4054,13 @@
 	 snprintf(respbuf, sizeof(respbuf), "* %u FETCH ", msgno);
 	}
 	snprintf(respbuf+strlen(respbuf), sizeof(respbuf)-strlen(respbuf),
-		 "%cBINARY%s ", sepchar, section->s);
+		 "%cBINARY%s ", sepchar, section->name);
 
-	if (!mailbox_cacherecord(mailbox, &im->record)) {
-	 oi = section->rock;
-	 r = index_fetchsection(state, respbuf,
-				 msg_base, msg_size,
-				 section->s, cacheitem_base(&im->record, CACHE_SECTION),
-				 im->record.size,
+	if (!mailbox_cacherecord(mailbox, &record)) {
+	 oi = &section->octetinfo;
+	 r = index_fetchsection(state, respbuf, &msg,
+				 section->name, cacheitem_base(&record, CACHE_SECTION),
+				 record.size,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
 				 fetchargs->start_octet : oi->start_octet,
 				 (fetchitems & FETCH_IS_PARTIAL) ?
@@ -2669,13 +4075,12 @@
 	 snprintf(respbuf, sizeof(respbuf), "* %u FETCH ", msgno);
 	}
 	snprintf(respbuf+strlen(respbuf), sizeof(respbuf)-strlen(respbuf),
-		 "%cBINARY.SIZE%s ", sepchar, section->s);
+		 "%cBINARY.SIZE%s ", sepchar, section->name);
 
- if (!mailbox_cacherecord(mailbox, &im->record)) {
-	 r = index_fetchsection(state, respbuf,
-				 msg_base, msg_size,
-				 section->s, cacheitem_base(&im->record, CACHE_SECTION),
-				 im->record.size,
+ if (!mailbox_cacherecord(mailbox, &record)) {
+	 r = index_fetchsection(state, respbuf, &msg,
+				 section->name, cacheitem_base(&record, CACHE_SECTION),
+				 record.size,
 				 fetchargs->start_octet, fetchargs->octet_count);
 	 if (!r) sepchar = ' ';
 	}
@@ -2684,8 +4089,7 @@
 	/* finsh the response if we have one */
 	prot_printf(state->out, ")\r\n");
 }
- if (msg_base) 
-	mailbox_unmap_message(mailbox, im->record.uid, &msg_base, &msg_size);
+ buf_free(&msg);
 
 return r;
 }
@@ -2700,37 +4104,50 @@
 * This is an amalgamation of index_fetchreply(), index_fetchsection()
 * and index_fetchmsg().
 */
-int index_urlfetch(struct index_state *state, uint32_t msgno,
+EXPORTED int index_urlfetch(struct index_state *state, uint32_t msgno,
 		 unsigned params, const char *section,
 		 unsigned long start_octet, unsigned long octet_count,
 		 struct protstream *pout, unsigned long *outsize)
 {
- const char *data, *msg_base = 0;
- unsigned long msg_size = 0;
+ /* dumbass eM_Client sends this:
+ * A4 APPEND "INBOX.Junk Mail" () "14-Jul-2013 17:01:02 +0000"
+ * CATENATE (URL "/INBOX/;uid=83118/;section=TEXT.MIME"
+ * URL "/INBOX/;uid=83118/;section=TEXT")
+ *
+ * genius. I can sort of see how TEXT.MIME kinda == "HEADER",
+ * so there we go */
+ static char text_mime = "HEADER";
+ const char *data;
+ struct buf msg = BUF_INITIALIZER;
 const char *cacheitem;
 int fetchmime = 0, domain = DOMAIN_7BIT;
- unsigned size;
+ size_t size;
 int32_t skip = 0;
 int n, r = 0;
 char *decbuf = NULL;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
+
+ if (!strcasecmp(section, "TEXT.MIME"))
+	section = text_mime;
 
 if (outsize) *outsize = 0;
 
- r = mailbox_cacherecord(mailbox, &im->record);
+ r = index_reload_record(state, msgno, &record);
+
+ r = mailbox_cacherecord(mailbox, &record);
 if (r) return r;
 
 /* Open the message file */
- if (mailbox_map_message(mailbox, im->record.uid, &msg_base, &msg_size))
+ if (mailbox_map_record(mailbox, &record, &msg))
 	return IMAP_NO_MSGGONE;
 
- data = msg_base;
- size = im->record.size;
+ data = msg.s;
+ size = record.size;
 
- if (size > msg_size) size = msg_size;
+ if (size > msg.len) size = msg.len;
 
- cacheitem = cacheitem_base(&im->record, CACHE_SECTION);
+ cacheitem = cacheitem_base(&record, CACHE_SECTION);
 
 /* Special-case BODY */
 if (!section || !*section) {
@@ -2823,7 +4240,7 @@
 	prot_printf(pout, " (BINARY");
 
 	data = charset_decode_mimebody(data, size, encoding,
-				 &decbuf, 0, (size_t *) &size);
+				 &decbuf, &size);
 	if (!data) {
 	 /* failed to decode */
 	 prot_printf(pout, " NIL)");
@@ -2868,43 +4285,40 @@
 
 done:
 /* Close the message file */
- mailbox_unmap_message(mailbox, im->record.uid, &msg_base, &msg_size);
+ buf_free(&msg);
 
 if (decbuf) free(decbuf);
 return r;
 }
 
 /*
- * Helper function to perform a generalized STORE command
+ * Helper function to perform a STORE command for flags.
 */
-static int index_storeflag(struct index_state *state, uint32_t msgno,
+static int index_storeflag(struct index_state *state,
+			 struct index_modified_flags *modified_flags,
+			 uint32_t msgno, struct index_record *record,
 			 struct storeargs *storeargs)
 {
- bit32 old, new;
+ uint32_t old, new, keep;
 unsigned i;
 int dirty = 0;
 modseq_t oldmodseq;
- struct mailbox *mailbox = state->mailbox;
 struct index_map *im = &state->mapmsgno-1;
 int r;
 
- /* if it's changed already, skip out now */
- if (im->record.modseq > storeargs->unchangedsince) return 0;
+ memset(modified_flags, 0, sizeof(struct index_modified_flags));
 
- /* if it's expunged already, skip out now */
- if (im->record.system_flags & FLAG_EXPUNGED)
-	return 0;
+ oldmodseq = im->modseq;
 
- oldmodseq = im->record.modseq;
-
- /* Change \Seen flag */
- if (state->myrights & ACL_SEEN) {
+ /* Change \Seen flag. This gets done on the index first and will only be
+ copied into the record later if internalseen is set */
+ if (state->myrights & ACL_SETSEEN) {
 	old = im->isseen ? 1 : 0;
 	new = old;
-	if (storeargs->operation == STORE_REPLACE)
+	if (storeargs->operation == STORE_REPLACE_FLAGS)
 	 new = storeargs->seen ? 1 : 0;
 	else if (storeargs->seen)
-	 new = (storeargs->operation == STORE_ADD) ? 1 : 0;
+	 new = (storeargs->operation == STORE_ADD_FLAGS) ? 1 : 0;
 
 	if (new != old) {
 	 state->numunseen += (old - new);
@@ -2914,59 +4328,86 @@
 	}
 }
 
- old = im->record.system_flags;
- new = storeargs->system_flags;
+ keep = record->system_flags & FLAGS_INTERNAL;
+ old = record->system_flags & FLAGS_SYSTEM;
+ new = storeargs->system_flags & FLAGS_SYSTEM;
 
- if (storeargs->operation == STORE_REPLACE) {
+ /* all other updates happen directly to the record */
+ if (storeargs->operation == STORE_REPLACE_FLAGS) {
 	if (!(state->myrights & ACL_WRITE)) {
 	 /* ACL_DELETE handled in index_store() */
 	 if ((old & FLAG_DELETED) != (new & FLAG_DELETED)) {
 		dirty++;
-	 im->record.system_flags = (old & ~FLAG_DELETED) | (new & FLAG_DELETED);
+	 record->system_flags = (old & ~FLAG_DELETED) | (new & FLAG_DELETED);
 	 }
 	}
 	else {
 	 if (!(state->myrights & ACL_DELETEMSG)) {
 		if ((old & ~FLAG_DELETED) != (new & ~FLAG_DELETED)) {
 		 dirty++;
-		 im->record.system_flags = (old & FLAG_DELETED) | (new & ~FLAG_DELETED);
+		 record->system_flags = (old & FLAG_DELETED) | (new & ~FLAG_DELETED);
 		}
 	 }
 	 else {
 		if (old != new) {
 		 dirty++;
-		 im->record.system_flags = new;
+		 record->system_flags = new;
 		}
 	 }
 	 for (i = 0; i < (MAX_USER_FLAGS/32); i++) {
-		if (im->record.user_flagsi != storeargs->user_flagsi) {
+		if (record->user_flagsi != storeargs->user_flagsi) {
+		 uint32_t changed;
 		 dirty++;
-		 im->record.user_flagsi = storeargs->user_flagsi;
+
+		 changed = ~record->user_flagsi & storeargs->user_flagsi;
+		 if (changed) {
+			modified_flags->added_user_flagsi = changed;
+			modified_flags->added_flags++;
+		 }
+
+		 changed = record->user_flagsi & ~storeargs->user_flagsi;
+		 if (changed) {
+			modified_flags->removed_user_flagsi = changed;
+			modified_flags->removed_flags++;
+		 }
+		 record->user_flagsi = storeargs->user_flagsi;
 		}
 	 }
 	}
 }
- else if (storeargs->operation == STORE_ADD) {
+ else if (storeargs->operation == STORE_ADD_FLAGS) {
+	uint32_t added;
+
 	if (~old & new) {
 	 dirty++;
-	 im->record.system_flags = old | new;
+	 record->system_flags = old | new;
 	}
 	for (i = 0; i < (MAX_USER_FLAGS/32); i++) {
-	 if (~im->record.user_flagsi & storeargs->user_flagsi) {
+	 added = ~record->user_flagsi & storeargs->user_flagsi;
+	 if (added) {
 		dirty++;
-		im->record.user_flagsi |= storeargs->user_flagsi;
+		record->user_flagsi |= storeargs->user_flagsi;
+
+		modified_flags->added_user_flagsi = added;
+		modified_flags->added_flags++;
 	 }
 	}
 }
- else { /* STORE_REMOVE */
+ else { /* STORE_REMOVE_FLAGS */
+	uint32_t removed;
+
 	if (old & new) {
 	 dirty++;
-	 im->record.system_flags &= ~storeargs->system_flags;
+	 record->system_flags &= ~storeargs->system_flags;
 	}
 	for (i = 0; i < (MAX_USER_FLAGS/32); i++) {
-	 if (im->record.user_flagsi & storeargs->user_flagsi) {
+	 removed = record->user_flagsi & storeargs->user_flagsi;
+	 if (removed) {
 		dirty++;
-		im->record.user_flagsi &= ~storeargs->user_flagsi;
+		record->user_flagsi &= ~storeargs->user_flagsi;
+
+		modified_flags->removed_user_flagsi = removed;
+		modified_flags->removed_flags++;
 	 }
 	}
 }
@@ -2987,14 +4428,23 @@
 if (!dirty) return 0;
 
 if (state->internalseen) {
-	/* set the seen flag */
+	/* copy the seen flag from the index */
 	if (im->isseen)
-	 im->record.system_flags |= FLAG_SEEN;
+	 record->system_flags |= FLAG_SEEN;
 	else
-	 im->record.system_flags &= ~FLAG_SEEN;
+	 record->system_flags &= ~FLAG_SEEN;
 }
+ /* add back the internal tracking flags */
+ record->system_flags |= keep;
 
- r = mailbox_rewrite_index_record(mailbox, &im->record);
+ modified_flags->added_system_flags = ~old & record->system_flags & FLAGS_SYSTEM;
+ if (modified_flags->added_system_flags)
+	modified_flags->added_flags++;
+ modified_flags->removed_system_flags = old & ~record->system_flags & FLAGS_SYSTEM;
+ if (modified_flags->removed_system_flags)
+	modified_flags->removed_flags++;
+
+ r = index_rewrite_record(state, msgno, record);
 if (r) return r;
 
 /* if it's silent and unchanged, update the seen value, but
@@ -3003,445 +4453,227 @@
 * as well in this case, it's simpler and not much more
 * bandwidth */
 if (!state->qresync && storeargs->silent && im->told_modseq == oldmodseq)
-	im->told_modseq = im->record.modseq;
+	im->told_modseq = im->modseq;
 
 return 0;
 }
 
-int _search_searchbuf(char *s, comp_pat *p, struct buf *b)
-{
- if (!b->len)
-	return 0;
-
- return charset_searchstring(s, p, b->s, b->len);
-}
-
 /*
- * Evaluate a searchargs structure on a msgno
- *
- * Note: msgfile argument must be 0 if msg is not mapped in.
+ * Helper function to perform a STORE command for annotations
 */
-static int index_search_evaluate(struct index_state *state,
-				 struct searchargs *searchargs,
-				 uint32_t msgno,
-				 struct mapfile *msgfile)
+static int index_store_annotation(struct index_state *state,
+				 uint32_t msgno,
+				 struct storeargs *storeargs)
 {
- unsigned i;
- struct strlist *l, *h;
- struct searchsub *s;
- struct seqset *seq;
- struct mailbox *mailbox = state->mailbox;
+ modseq_t oldmodseq;
+ struct index_record record;
+ annotate_state_t *astate = NULL;
 struct index_map *im = &state->mapmsgno-1;
+ int r;
 
- if ((searchargs->flags & SEARCH_RECENT_SET) && !im->isrecent)
-	return 0;
- if ((searchargs->flags & SEARCH_RECENT_UNSET) && im->isrecent)
-	return 0;
- if ((searchargs->flags & SEARCH_SEEN_SET) && !im->isseen)
-	return 0;
- if ((searchargs->flags & SEARCH_SEEN_UNSET) && im->isseen)
-	return 0;
+ r = index_reload_record(state, msgno, &record);
+ if (r) goto out;
 
- if (searchargs->smaller && im->record.size >= searchargs->smaller)
-	return 0;
- if (searchargs->larger && im->record.size <= searchargs->larger)
-	return 0;
+ oldmodseq = record.modseq;
 
- if (searchargs->after && im->record.internaldate < searchargs->after)
-	return 0;
- if (searchargs->before && im->record.internaldate >= searchargs->before)
-	return 0;
- if (searchargs->sentafter && im->record.sentdate < searchargs->sentafter)
-	return 0;
- if (searchargs->sentbefore && im->record.sentdate >= searchargs->sentbefore)
-	return 0;
+ r = mailbox_get_annotate_state(state->mailbox, record.uid, &astate);
+ if (r) goto out;
+ annotate_state_set_auth(astate, storeargs->isadmin,
+			 storeargs->userid, storeargs->authstate);
+ r = annotate_state_store(astate, storeargs->entryatts);
+ if (r) goto out;
+
+ /* It would be nice if the annotate layer told us whether it
+ * actually made a change to the database, but it doesn't, so
+ * we have to assume the message is dirty */
 
- if (searchargs->modseq && im->record.modseq < searchargs->modseq)
-	return 0;
+ r = index_rewrite_record(state, msgno, &record);
+ if (r) goto out;
 
- if (~im->record.system_flags & searchargs->system_flags_set)
-	return 0;
- if (im->record.system_flags & searchargs->system_flags_unset)
-	return 0;
+ /* if it's silent and unchanged, update the seen value */
+ if (!state->qresync && storeargs->silent && im->told_modseq == oldmodseq)
+	im->told_modseq = im->modseq;
 
- for (i = 0; i < (MAX_USER_FLAGS/32); i++) {
-	if (~im->record.user_flagsi & searchargs->user_flags_seti)
-	 return 0;
-	if (im->record.user_flagsi & searchargs->user_flags_unseti)
-	 return 0;
- }
+out:
+ return r;
+}
 
- for (seq = searchargs->sequence; seq; seq = seq->nextseq) {
-	if (!seqset_ismember(seq, msgno)) return 0;
- }
- for (seq = searchargs->uidsequence; seq; seq = seq->nextseq) {
-	if (!seqset_ismember(seq, im->record.uid)) return 0;
- }
 
- if (searchargs->from || searchargs->to || searchargs->cc ||
-	searchargs->bcc || searchargs->subject || searchargs->messageid) {
+/*
+ * Evaluate a searchargs structure on a msgno
+ */
+int index_search_evaluate(struct index_state *state,
+			 const search_expr_t *e,
+			 uint32_t msgno)
+{
+ struct index_map *im = &state->mapmsgno-1;
+ int r;
+ message_t *m;
+ struct index_record record;
 
-	if (mailbox_cacherecord(mailbox, &im->record))
-	 return 0;
+ r = index_reload_record(state, msgno, &record);
+ if (r) return r;
 
-	if (searchargs->messageid) {
-	 char *tmpenv;
-	 char *envtokensNUMENVTOKENS;
-	 char *msgid;
-	 int msgidlen;
-
-	 /* must be long enough to actually HAVE some contents */
-	 if (cacheitem_size(&im->record, CACHE_ENVELOPE) <= 2)
-		return 0;
-
-	 /* get msgid out of the envelope */
-
-	 /* get a working copy; strip outer ()'s */
-	 /* +1 -> skip the leading paren */
-	 /* -2 -> don't include the size of the outer parens */
-	 tmpenv = xstrndup(cacheitem_base(&im->record, CACHE_ENVELOPE) + 1, 
-			 cacheitem_size(&im->record, CACHE_ENVELOPE) - 2);
-	 parse_cached_envelope(tmpenv, envtokens, VECTOR_SIZE(envtokens));
-
-	 if (!envtokensENV_MSGID) {
-		/* free stuff */
-		free(tmpenv);
-		return 0;
-	 }
-
-	 msgid = lcase(envtokensENV_MSGID);
-	 msgidlen = strlen(msgid);
-	 for (l = searchargs->messageid; l; l = l->next) {
-		if (!charset_searchstring(l->s, l->p, msgid, msgidlen))
-		 break;
-	 }
+ xstats_inc(SEARCH_EVALUATE);
 
-	 /* free stuff */
-	 free(tmpenv);
+ m = message_new_from_index(state->mailbox, &record, msgno,
+			 (im->isrecent ? MESSAGE_RECENT : 0) |
+			 (im->isseen ? MESSAGE_SEEN : 0));
+ r = search_expr_evaluate(m, e);
+ message_unref(&m);
 
-	 if (l) return 0;
-	}
+ return r;
+}
 
-	for (l = searchargs->from; l; l = l->next) {
-	 if (!_search_searchbuf(l->s, l->p, cacheitem_buf(&im->record, CACHE_FROM)))
-		return 0;
-	}
+struct getsearchtext_rock
+{
+ search_text_receiver_t *receiver;
+ int partcount;
+ int charset_flags;
+};
 
-	for (l = searchargs->to; l; l = l->next) {
-	 if (!_search_searchbuf(l->s, l->p, cacheitem_buf(&im->record, CACHE_TO)))
-		return 0;
-	}
+static void stuff_part(search_text_receiver_t *receiver,
+		 int part, const struct buf *buf)
+{
+ if (part == SEARCH_PART_HEADERS &&
+	!config_getswitch(IMAPOPT_SEARCH_INDEX_HEADERS))
+	return;
 
-	for (l = searchargs->cc; l; l = l->next) {
-	 if (!_search_searchbuf(l->s, l->p, cacheitem_buf(&im->record, CACHE_CC)))
-		return 0;
-	}
+ receiver->begin_part(receiver, part);
+ receiver->append_text(receiver, buf);
+ receiver->end_part(receiver, part);
+}
 
-	for (l = searchargs->bcc; l; l = l->next) {
-	 if (!_search_searchbuf(l->s, l->p, cacheitem_buf(&im->record, CACHE_BCC)))
-		return 0;
-	}
+static void extract_cb(const struct buf *text, void *rock)
+{
+ struct getsearchtext_rock *str = (struct getsearchtext_rock *)rock;
+ str->receiver->append_text(str->receiver, text);
+}
 
-	for (l = searchargs->subject; l; l = l->next) {
-	 if ((cacheitem_size(&im->record, CACHE_SUBJECT) == 3 && 
-		!strncmp(cacheitem_base(&im->record, CACHE_SUBJECT), "NIL", 3)) ||
-		!_search_searchbuf(l->s, l->p, cacheitem_buf(&im->record, CACHE_SUBJECT)))
-		return 0;
-	}
- }
+static int getsearchtext_cb(int partno, int charset, int encoding,
+			 const char *subtype, struct buf *data,
+			 void *rock)
+{
+ struct getsearchtext_rock *str = (struct getsearchtext_rock *)rock;
+ char *q;
+ struct buf text = BUF_INITIALIZER;
 
- for (s = searchargs->sublist; s; s = s->next) {
-	if (index_search_evaluate(state, s->sub1, msgno, msgfile)) {
-	 if (!s->sub2) return 0;
-	}
-	else {
-	 if (s->sub2 &&
-		!index_search_evaluate(state, s->sub2, msgno, msgfile))
-	 return 0;
+ if (!partno) {
+	/* header-like */
+	q = charset_decode_mimeheader(buf_cstring(data), str->charset_flags);
+	buf_init_ro_cstr(&text, q);
+	if (++str->partcount == 1) {
+	 stuff_part(str->receiver, SEARCH_PART_HEADERS, &text);
+	} else {
+	 stuff_part(str->receiver, SEARCH_PART_BODY, &text);
 	}
+	free(q);
+	buf_free(&text);
 }
-
- if (searchargs->body || searchargs->text ||
-	searchargs->cache_atleast > im->record.cache_version) {
-	if (!msgfile->size) { /* Map the message in if we haven't before */
-	 if (mailbox_map_message(mailbox, im->record.uid,
-				 &msgfile->base, &msgfile->size)) {
-		return 0;
-	 }
-	}
-
-	h = searchargs->header_name;
-	for (l = searchargs->header; l; (l = l->next), (h = h->next)) {
-	 if (!index_searchheader(h->s, l->s, l->p, msgfile,
-				 im->record.header_size)) return 0;
-	}
-
-	if (mailbox_cacherecord(mailbox, &im->record))
-	 return 0;
-
-	for (l = searchargs->body; l; l = l->next) {
-	 if (!index_searchmsg(l->s, l->p, msgfile, 1,
-				 cacheitem_base(&im->record, CACHE_SECTION))) return 0;
-	}
-	for (l = searchargs->text; l; l = l->next) {
-	 if (!index_searchmsg(l->s, l->p, msgfile, 0,
-				 cacheitem_base(&im->record, CACHE_SECTION))) return 0;
-	}
+ else if (buf_len(data) > 50 && !memcmp(data->s, "-----BEGIN PGP MESSAGE-----", 27)) {
+	/* PGP encrypted body part - we don't want to index this,
+	 * it's a ton of random base64 noise */
 }
- else if (searchargs->header_name) {
-	h = searchargs->header_name;
-	for (l = searchargs->header; l; (l = l->next), (h = h->next)) {
-	 if (!index_searchcacheheader(state, msgno, h->s, l->s, l->p))
-		return 0;
-	}
+ else {
+	/* body-like */
+	str->receiver->begin_part(str->receiver, SEARCH_PART_BODY);
+	charset_extract(extract_cb, str, data, charset, encoding, subtype,
+			str->charset_flags);
+	str->receiver->end_part(str->receiver, SEARCH_PART_BODY);
 }
 
- return 1;
+ return 0;
 }
 
-/*
- * Search part of a message for a substring.
- * Keep this in sync with index_getsearchtextmsg!
- */
-static int
-index_searchmsg(char *substr,
-		comp_pat *pat,
-		struct mapfile *msgfile,
-		int skipheader,
-		const char *cachestr)
+static void append_alnum(struct buf *buf, const char *ss)
 {
- int partsleft = 1;
- int subparts;
- unsigned long start;
- int len, charset, encoding;
- char *p, *q;
- 
- /* Won't find anything in a truncated file */
- if (msgfile->size == 0) return 0;
-
- while (partsleft--) {
-	subparts = CACHE_ITEM_BIT32(cachestr);
-	cachestr += 4;
-	if (subparts) {
-	 partsleft += subparts-1;
+ const unsigned char *s = (const unsigned char *)ss;
 
-	 if (skipheader) {
-		skipheader = 0; /* Only skip top-level message header */
-	 }
-	 else {
-		len = CACHE_ITEM_BIT32(cachestr + CACHE_ITEM_SIZE_SKIP);
-		if (len > 0) {
-		 p = index_readheader(msgfile->base, msgfile->size,
-					 CACHE_ITEM_BIT32(cachestr),
-					 len);
-		 q = charset_decode_mimeheader(p, NULL, 0);
-		 if (charset_searchstring(substr, pat, q, strlen(q))) {
-			free(q);
-			return 1;
-		 }
-		 free(q);
-		}
-	 }
-	 cachestr += 5*4;
-
-	 while (--subparts) {
-		start = CACHE_ITEM_BIT32(cachestr+2*4);
-		len = CACHE_ITEM_BIT32(cachestr+3*4);
-		charset = CACHE_ITEM_BIT32(cachestr+4*4) >> 16;
-		encoding = CACHE_ITEM_BIT32(cachestr+4*4) & 0xff;
-
-		if (start < msgfile->size && len > 0 &&
-		 charset >= 0 && charset < 0xffff) {
-		 if (charset_searchfile(substr, pat,
-					 msgfile->base + start,
-					 len, charset, encoding)) return 1;
-		}
-		cachestr += 5*4;
-	 }
-	}
+ for ( ; *s ; ++s) {
+	if (Uisalnum(*s))
+	 buf_putc(buf, *s);
 }
-
- return 0;
 }
- 
-/*
- * Search named header of a message for a substring
- */
-static int index_searchheader(char *name,
-			 char *substr,
-			 comp_pat *pat,
-			 struct mapfile *msgfile,
-			 int size)
+
+EXPORTED int index_getsearchtext(message_t *msg,
+			 search_text_receiver_t *receiver,
+			 int snippet)
 {
- char *p, *q;
+ struct getsearchtext_rock str;
+ struct buf buf = BUF_INITIALIZER;
+ uint32_t uid = 0;
+ int format = MESSAGE_SEARCH;
+ strarray_t types = STRARRAY_INITIALIZER;
+ int i;
 int r;
- static struct strlist header;
 
- header.s = name;
+ message_get_uid(msg, &uid);
+ receiver->begin_message(receiver, uid);
 
- p = index_readheader(msgfile->base, msgfile->size, 0, size);
- index_pruneheader(p, &header, 0);
- if (!*p) return 0;		/* Header not present, fail */
- if (!*substr) return 1;	/* Only checking existence, succeed */
- q = charset_decode_mimeheader(strchr(p, ':') + 1, NULL, 0);
- r = charset_searchstring(substr, pat, q, strlen(q));
- free(q);
- return r;
-}
+ str.receiver = receiver;
+ str.partcount = 0;
+ str.charset_flags = charset_flags;
 
-/*
- * Search named cached header of a message for a substring
- */
-static int index_searchcacheheader(struct index_state *state, uint32_t msgno,
-				 char *name, char *substr, comp_pat *pat)
-{
- char *q;
- static struct strlist header;
- static char *buf;
- static unsigned bufsize;
- unsigned size;
- int r;
- struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
+ if (snippet) {
+	str.charset_flags |= CHARSET_SNIPPET;
+	format = MESSAGE_SNIPPET;
+ }
 
- r = mailbox_cacherecord(mailbox, &im->record);
- if (r) return 0;
+ message_foreach_text_section(msg, getsearchtext_cb, &str);
 
- size = cacheitem_size(&im->record, CACHE_HEADERS);
- if (!size) return 0;	/* No cached headers, fail */
- 
- if (bufsize < size+2) {
-	bufsize = size+100;
-	buf = xrealloc(buf, bufsize);
- }
-
- /* Copy this item to the buffer */
- memcpy(buf, cacheitem_base(&im->record, CACHE_HEADERS), size);
- bufsize = '\0';
-
- header.s = name;
-
- index_pruneheader(buf, &header, 0);
- if (!*buf) return 0;	/* Header not present, fail */
- if (!*substr) return 1;	/* Only checking existence, succeed */
- /* XXX - we could do this in one pass maybe? charset_search_mimeheader */
- q = charset_decode_mimeheader(strchr(buf, ':') + 1, NULL, 0);
- r = charset_searchstring(substr, pat, q, strlen(q));
- free(q);
- return r;
-}
+ if (!message_get_field(msg, "From", format, &buf))
+	stuff_part(receiver, SEARCH_PART_FROM, &buf);
 
+ if (!message_get_field(msg, "To", format, &buf))
+	stuff_part(receiver, SEARCH_PART_TO, &buf);
 
-/* This code was cribbed from index_searchmsg. Instead of checking for matches,
- we call charset_extractfile to send the entire text out to 'receiver'.
- Keep this in sync with index_searchmsg! */
-static void index_getsearchtextmsg(struct index_state *state,
-				 int uid,
-				 index_search_text_receiver_t receiver,
-				 void *rock,
-				 char const *cachestr) {
- struct mapfile msgfile;
- int partsleft = 1;
- int subparts;
- unsigned long start;
- int len, charset, encoding;
- int partcount = 0;
- char *p, *q;
- struct mailbox *mailbox = state->mailbox;
- 
- if (mailbox_map_message(mailbox, uid, &msgfile.base, &msgfile.size)) {
- return;
- }
+ if (!message_get_field(msg, "Cc", format, &buf))
+	stuff_part(receiver, SEARCH_PART_CC, &buf);
 
- /* Won't find anything in a truncated file */
- if (msgfile.size > 0) {
- while (partsleft--) {
-	subparts = CACHE_ITEM_BIT32(cachestr);
-	cachestr += 4;
-	if (subparts) {
-	 partsleft += subparts-1;
-
- partcount++;
-
- len = CACHE_ITEM_BIT32(cachestr+4);
- if (len > 0) {
- p = index_readheader(msgfile.base, msgfile.size,
- CACHE_ITEM_BIT32(cachestr),
- len);
- q = charset_decode_mimeheader(p, NULL, 0);
- if (partcount == 1) {
- receiver(uid, SEARCHINDEX_PART_HEADERS,
- SEARCHINDEX_CMD_STUFFPART, q, strlen(q), rock);
- receiver(uid, SEARCHINDEX_PART_BODY,
- SEARCHINDEX_CMD_BEGINPART, NULL, 0, rock);
- } else {
- receiver(uid, SEARCHINDEX_PART_BODY,
- SEARCHINDEX_CMD_APPENDPART, q, strlen(q), rock);
- }
- free(q);
- }
-	 cachestr += 5*4;
-
-	 while (--subparts) {
-		start = CACHE_ITEM_BIT32(cachestr+2*4);
-		len = CACHE_ITEM_BIT32(cachestr+3*4);
-		charset = CACHE_ITEM_BIT32(cachestr+4*4) >> 16;
-		encoding = CACHE_ITEM_BIT32(cachestr+4*4) & 0xff;
-
-		if (start < msgfile.size && len > 0) {
-		 charset_extractfile(receiver, rock, uid,
-				 msgfile.base + start,
-				 len, charset, encoding);
-		}
-		cachestr += 5*4;
-	 }
-	}
- }
+ if (!message_get_field(msg, "Bcc", format, &buf))
+	stuff_part(receiver, SEARCH_PART_BCC, &buf);
 
- receiver(uid, SEARCHINDEX_PART_BODY,
- SEARCHINDEX_CMD_ENDPART, NULL, 0, rock);
- }
- 
- mailbox_unmap_message(mailbox, uid, &msgfile.base, &msgfile.size);
-}
+ if (!message_get_field(msg, "Subject", format, &buf))
+	stuff_part(receiver, SEARCH_PART_SUBJECT, &buf);
 
-void index_getsearchtext_single(struct index_state *state, uint32_t msgno,
-				index_search_text_receiver_t receiver,
-				void *rock) {
- struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
+ if (!message_get_field(msg, "List-Id", format, &buf))
+	stuff_part(receiver, SEARCH_PART_LISTID, &buf);
+ if (!message_get_field(msg, "Mailing-List", format, &buf))
+	stuff_part(receiver, SEARCH_PART_LISTID, &buf);
 
- if (mailbox_cacherecord(mailbox, &im->record))
-	return;
+ if (!message_get_leaf_types(msg, &types) && types.count) {
+	/* We add three search terms: the type, subtype, and a combined
+	 * type+subtype string. We carefully control punctuation to
+	 * ensure that each word in indexed as a single term. For
+	 * example if the original message has "application/x-pdf" then
+	 * we index "APPLICATION" "XPDF" "APPLICATION_XPDF". */
 
- index_getsearchtextmsg(state, im->record.uid, receiver, rock,
-	 cacheitem_base(&im->record, CACHE_SECTION));
- receiver(im->record.uid, SEARCHINDEX_PART_FROM, SEARCHINDEX_CMD_STUFFPART,
-	 cacheitem_base(&im->record, CACHE_FROM),
-	 cacheitem_size(&im->record, CACHE_FROM), rock);
- receiver(im->record.uid, SEARCHINDEX_PART_TO, SEARCHINDEX_CMD_STUFFPART,
-	 cacheitem_base(&im->record, CACHE_TO),
-	 cacheitem_size(&im->record, CACHE_TO), rock);
- receiver(im->record.uid, SEARCHINDEX_PART_CC, SEARCHINDEX_CMD_STUFFPART,
-	 cacheitem_base(&im->record, CACHE_CC),
-	 cacheitem_size(&im->record, CACHE_CC), rock);
- receiver(im->record.uid, SEARCHINDEX_PART_BCC, SEARCHINDEX_CMD_STUFFPART,
-	 cacheitem_base(&im->record, CACHE_BCC),
-	 cacheitem_size(&im->record, CACHE_BCC), rock);
- receiver(im->record.uid, SEARCHINDEX_PART_SUBJECT, SEARCHINDEX_CMD_STUFFPART,
-	 cacheitem_base(&im->record, CACHE_SUBJECT),
-	 cacheitem_size(&im->record, CACHE_SUBJECT), rock);
-}
-
-void index_getsearchtext(struct index_state *state,
-			 index_search_text_receiver_t receiver,
-			 void *rock)
-{
- uint32_t msgno;
+	receiver->begin_part(receiver, SEARCH_PART_TYPE);
+	for (i = 0 ; i < types.count ; i+= 2) {
+	 buf_reset(&buf);
 
- /* Send the converted text of every message out to the receiver. */
- for (msgno = 1; msgno <= state->exists; msgno++)
-	index_getsearchtext_single(state, msgno, receiver, rock);
+	 if (i) buf_putc(&buf, ' ');
+
+	 /* type */
+	 append_alnum(&buf, types.datai);
+	 buf_putc(&buf, ' ');
+	 /* subtype */
+	 append_alnum(&buf, types.datai+1);
+	 buf_putc(&buf, ' ');
+	 /* combined type_subtype */
+	 append_alnum(&buf, types.datai);
+	 buf_putc(&buf, '_');
+	 append_alnum(&buf, types.datai+1);
+
+	 receiver->append_text(receiver, &buf);
+	}
+	receiver->end_part(receiver, SEARCH_PART_TYPE);
+ }
+
+ r = receiver->end_message(receiver);
+ buf_free(&buf);
+ strarray_fini(&types);
+ return r;
 }
 
 /*
@@ -3449,16 +4681,20 @@
 */
 #define COPYARGSGROW 30
 static int index_copysetup(struct index_state *state, uint32_t msgno,
-			 struct copyargs *copyargs)
+			 struct copyargs *copyargs, int is_same_user)
 {
- int flag = 0;
 int userflag;
 bit32 flagmask = 0;
+ int i;
 int r;
 struct mailbox *mailbox = state->mailbox;
 struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
+
+ r = index_reload_record(state, msgno, &record);
+ if (r) return 0;
 
- r = mailbox_cacherecord(mailbox, &im->record);
+ r = mailbox_cacherecord(mailbox, &record);
 if (r) return r;
 
 if (copyargs->nummsg == copyargs->msgalloc) {
@@ -3468,80 +4704,96 @@
 		 copyargs->msgalloc * sizeof(struct copymsg));
 }
 
- copyargs->copymsgcopyargs->nummsg.uid = im->record.uid;
- copyargs->copymsgcopyargs->nummsg.internaldate = im->record.internaldate;
- copyargs->copymsgcopyargs->nummsg.sentdate = im->record.sentdate;
- copyargs->copymsgcopyargs->nummsg.gmtime = im->record.gmtime;
- copyargs->copymsgcopyargs->nummsg.size = im->record.size;
- copyargs->copymsgcopyargs->nummsg.header_size = im->record.header_size;
- copyargs->copymsgcopyargs->nummsg.content_lines = im->record.content_lines;
- copyargs->copymsgcopyargs->nummsg.cache_version = im->record.cache_version;
- copyargs->copymsgcopyargs->nummsg.cache_crc = im->record.cache_crc;
- copyargs->copymsgcopyargs->nummsg.crec = im->record.crec;
-
- message_guid_copy(&copyargs->copymsgcopyargs->nummsg.guid,
-		 &im->record.guid);
+ copyargs->copymsgcopyargs->nummsg.olduid = record.uid;
+ copyargs->copymsgcopyargs->nummsg.record = record;
 
- copyargs->copymsgcopyargs->nummsg.system_flags = im->record.system_flags;
+ /* copy the names of all user flags */
+ strarray_init(&copyargs->copymsgcopyargs->nummsg.flags);
 for (userflag = 0; userflag < MAX_USER_FLAGS; userflag++) {
 	if ((userflag & 31) == 0) {
-	 flagmask = im->record.user_flagsuserflag/32;
+	 flagmask = record.user_flagsuserflag/32;
 	}
 	if (mailbox->flagnameuserflag && (flagmask & (1<<(userflag&31)))) {
-	 copyargs->copymsgcopyargs->nummsg.flagflag++ =
-		mailbox->flagnameuserflag;
+	 strarray_append(&copyargs->copymsgcopyargs->nummsg.flags, mailbox->flagnameuserflag);
 	}
 }
- copyargs->copymsgcopyargs->nummsg.flagflag = 0;
 
 /* grab seen from our state - it's different for different users */
 copyargs->copymsgcopyargs->nummsg.seen = im->isseen;
 
+ /* zero out the seen flag in the system record, it may be different */
+ copyargs->copymsgcopyargs->nummsg.record.system_flags &= ~FLAG_SEEN;
+
+ /* zero out the user_flags - they might be different in the destination */
+ for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	copyargs->copymsgcopyargs->nummsg.record.user_flagsi = 0;
+
+ /* CIDs are per-user, so we can reuse the cid if we're copying
+ * between mailboxes owned by the same user. Otherwise we need
+ * to zap the cid and let append_copy() recalculate it. */
+ /* XXX: really??? surely it can't hurt if they happen to match up.
+ * Double-check this */
+ if (!is_same_user)
+	copyargs->copymsgcopyargs->nummsg.record.cid = NULLCONVERSATION;
+
 copyargs->nummsg++;
 
 return 0;
 }
 
 /*
- * Creates a list of msgdata.
+ * Creates a list, and optionally also an array of pointers to, of msgdata.
 *
 * We fill these structs with the processed info that will be needed
 * by the specified sort criteria.
 */
-#define ANNOTGROWSIZE 10
-
-static MsgData *index_msgdata_load(struct index_state *state,
-				 unsigned *msgno_list, int n,
-				 struct sortcrit *sortcrit)
+MsgData **index_msgdata_load(struct index_state *state,
+			 unsigned *msgno_list, int n,
+			 const struct sortcrit *sortcrit,
+			 unsigned int anchor, int *found_anchor)
 {
- MsgData *md, *cur;
+ MsgData **ptrs, *md, *cur;
 int i, j;
 char *tmpenv;
 char *envtokensNUMENVTOKENS;
 int did_cache, did_env, did_conv;
 int label;
- int annotsize;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im;
+ struct index_record record;
+ struct conversations_state *cstate = NULL;
+ conversation_t *conv = NULL;
 
 if (!n) return NULL;
 
- /* create an array of MsgData to use as nodes of linked list */
- md = (MsgData *) xmalloc(n * sizeof(MsgData));
- memset(md, 0, n * sizeof(MsgData));
+ /* create an array of MsgData */
+ ptrs = (MsgData **) xzmalloc(n * sizeof(MsgData *) + n * sizeof(MsgData));
+ md = (MsgData *)(ptrs + n);
+ xstats_add(MSGDATA_LOAD, n);
+
+ if (found_anchor)
+	*found_anchor = 0;
+
+ for (i = 0 ; i < n ; i++) {
+	cur = &mdi;
+	ptrsi = cur;
 
- for (i = 0, cur = md; i < n; i++, cur = cur->next) {
 	/* set msgno */
-	cur->msgno = msgno_listi;
-	im = &state->mapcur->msgno-1;
-	cur->uid = im->record.uid;
+	cur->msgno = (msgno_list ? msgno_listi : (unsigned)(i+1));
 
-	/* set pointer to next node */
-	cur->next = (i+1 < n ? cur+1 : NULL);
+	if (index_reload_record(state, cur->msgno, &record))
+	 continue;
+
+	cur->uid = record.uid;
+	cur->cid = record.cid;
+	if (found_anchor && record.uid == anchor)
+	 *found_anchor = 1;
+
+	/* useful for convupdates */
+	cur->modseq = record.modseq;
 
 	did_cache = did_env = did_conv = 0;
 	tmpenv = NULL;
-	annotsize = 0;
+	conv = NULL; /* XXX: use a hash to avoid re-reading? */
 
 	for (j = 0; sortcritj.key; j++) {
 	 label = sortcritj.key;
@@ -3553,7 +4805,7 @@
 		!did_cache) {
 
 		/* fetch cached info */
-		if (mailbox_cacherecord(mailbox, &im->record))
+		if (mailbox_cacherecord(mailbox, &record))
 		 continue; /* can't do this with a broken cache */
 
 		did_cache++;
@@ -3561,14 +4813,14 @@
 
 	 if ((label == LOAD_IDS) && !did_env) {
 		/* no point if we don't have enough data */
-		if (cacheitem_size(&im->record, CACHE_ENVELOPE) <= 2)
+		if (cacheitem_size(&record, CACHE_ENVELOPE) <= 2)
 		 continue;
 
 		/* make a working copy of envelope -- strip outer ()'s */
 		/* +1 -> skip the leading paren */
 		/* -2 -> don't include the size of the outer parens */
-		tmpenv = xstrndup(cacheitem_base(&im->record, CACHE_ENVELOPE) + 1, 
-				 cacheitem_size(&im->record, CACHE_ENVELOPE) - 2);
+		tmpenv = xstrndup(cacheitem_base(&record, CACHE_ENVELOPE) + 1, 
+				 cacheitem_size(&record, CACHE_ENVELOPE) - 2);
 
 		/* parse envelope into tokens */
 		parse_cached_envelope(tmpenv, envtokens,
@@ -3577,65 +4829,104 @@
 		did_env++;
 	 }
 
+	 if ((label == SORT_HASCONVFLAG || label == SORT_CONVMODSEQ ||
+		label == SORT_CONVEXISTS || label == SORT_CONVSIZE) && !did_conv) {
+		if (!cstate) cstate = conversations_get_mbox(index_mboxname(state));
+		assert(cstate);
+		if (conversation_load(cstate, record.cid, &conv))
+		 continue;
+		if (!conv) conv = conversation_new(cstate);
+		did_conv++;
+	 }
+
 	 switch (label) {
 	 case SORT_CC:
-		cur->cc = get_localpart_addr(cacheitem_base(&im->record, CACHE_CC));
+		cur->cc = get_localpart_addr(cacheitem_base(&record, CACHE_CC));
 		break;
 	 case SORT_DATE:
-		cur->date = im->record.gmtime;
+		cur->sentdate = record.gmtime;
 		/* fall through */
 	 case SORT_ARRIVAL:
-		cur->internaldate = im->record.internaldate;
+		cur->internaldate = record.internaldate;
 		break;
 	 case SORT_FROM:
-		cur->from = get_localpart_addr(cacheitem_base(&im->record, CACHE_FROM));
+		cur->from = get_localpart_addr(cacheitem_base(&record, CACHE_FROM));
 		break;
 	 case SORT_MODSEQ:
-		cur->modseq = im->record.modseq;
+		/* already copied above */
 		break;
 	 case SORT_SIZE:
-		cur->size = im->record.size;
+		cur->size = record.size;
 		break;
 	 case SORT_SUBJECT:
-		cur->xsubj = index_extract_subject(cacheitem_base(&im->record, CACHE_SUBJECT),
-						 cacheitem_size(&im->record, CACHE_SUBJECT),
+		cur->xsubj = index_extract_subject(cacheitem_base(&record, CACHE_SUBJECT),
+						 cacheitem_size(&record, CACHE_SUBJECT),
 						 &cur->is_refwd);
 		cur->xsubj_hash = strhash(cur->xsubj);
 		break;
 	 case SORT_TO:
-		cur->to = get_localpart_addr(cacheitem_base(&im->record, CACHE_TO));
+		cur->to = get_localpart_addr(cacheitem_base(&record, CACHE_TO));
 		break;
- 	 case SORT_ANNOTATION:
- 		/* reallocate space for the annotation values if necessary */
- 		if (cur->nannot == annotsize) {
- 		 annotsize += ANNOTGROWSIZE;
- 		 cur->annot = (char **)
- 			xrealloc(cur->annot, annotsize * sizeof(char *));
- 		}
-
- 		/* fetch attribute value - we fake it for now */
- 		cur->annotcur->nannot = xstrdup(sortcritj.args.annot.attrib);
- 		cur->nannot++;
+ 	 case SORT_ANNOTATION: {
+		struct buf value = BUF_INITIALIZER;
+
+		annotatemore_msg_lookup(state->mboxname,
+					record.uid,
+					sortcritj.args.annot.entry,
+					sortcritj.args.annot.userid,
+					&value);
+
+		/* buf_release() never returns NULL, so if the lookup
+		 * fails for any reason we just get an empty string here */
+		strarray_appendm(&cur->annot, buf_release(&value));
 		break;
+	 }
 	 case LOAD_IDS:
-		index_get_ids(cur, envtokens, cacheitem_base(&im->record, CACHE_HEADERS),
-					 cacheitem_size(&im->record, CACHE_HEADERS));
+		index_get_ids(cur, envtokens, cacheitem_base(&record, CACHE_HEADERS),
+					 cacheitem_size(&record, CACHE_HEADERS));
 		break;
 	 case SORT_DISPLAYFROM:
 		cur->displayfrom = get_displayname(
-				 cacheitem_base(&im->record, CACHE_FROM));
+				 cacheitem_base(&record, CACHE_FROM));
 		break;
 	 case SORT_DISPLAYTO:
 		cur->displayto = get_displayname(
-				 cacheitem_base(&im->record, CACHE_TO));
+				 cacheitem_base(&record, CACHE_TO));
+		break;
+	 case SORT_HASFLAG: {
+		const char *name = sortcritj.args.flag.name;
+		if (mailbox_record_hasflag(mailbox, &record, name))
+		 cur->hasflag |= (1<<j);
+		break;
+	 }
+	 case SORT_HASCONVFLAG: {
+		const char *name = sortcritj.args.flag.name;
+		int idx = strarray_find_case(cstate->counted_flags, name, 0);
+		/* flag exists in the conversation at all */
+		if (idx >= 0 && conv->countsidx > 0 && j < 31)
+		 cur->hasconvflag |= (1<<j);
+		break;
+	 }
+	 case SORT_CONVEXISTS:
+		cur->convexists = conv->exists;
+		break;
+	 case SORT_CONVSIZE:
+		cur->convsize = conv->size;
+		break;
+	 case SORT_CONVMODSEQ:
+		cur->convmodseq = conv->modseq;
+		break;
+	 case SORT_RELEVANCY:
+		/* for now all messages have relevancy=100 */
 		break;
 	 }
 	}
 
 	free(tmpenv);
+	conversation_free(conv);
 }
 
- return md;
+ return ptrs;
 }
 
 static char *get_localpart_addr(const char *header)
@@ -3661,24 +4952,26 @@
 {
 struct address *addr = NULL;
 char *ret = NULL;
+ char *p;
 
 parseaddr_list(header, &addr);
 if (!addr) return NULL;
 
 if (addr->name && addr->name0) {
-	char *p;
-	ret = xstrdup(addr->name);
-	for (p = ret; *p; p++)
-	 *p = toupper(*p);
+	/* pure RFC5255 compatible "searchform" conversion */
+	ret = charset_utf8_to_searchform(addr->name, /*flags*/0);
 }
 else if (addr->domain && addr->mailbox) {
-	/* mailbox@domain */
-	int len = strlen(addr->mailbox) + strlen(addr->domain) + 2;
-	ret = xmalloc(len);
-	snprintf(ret, len, "%s@%s", addr->mailbox, addr->domain);
+	ret = strconcat(addr->mailbox, "@", addr->domain, (char *)NULL);
+	/* gotta uppercase mailbox/domain */
+	for (p = ret; *p; p++)
+	 *p = toupper(*p);
 }
 else if (addr->mailbox) {
 	ret = xstrdup(addr->mailbox);
+	/* gotta uppercase mailbox/domain */
+	for (p = ret; *p; p++)
+	 *p = toupper(*p);
 }
 
 parseaddr_free(addr);
@@ -3694,18 +4987,21 @@
 */
 static char *index_extract_subject(const char *subj, size_t len, int *is_refwd)
 {
- char *buf, *s, *base;
+ char *rawbuf, *buf, *s, *base;
 
 /* parse the subj NSTRING and make a working copy */
 if (!strcmp(subj, "NIL")) {		 	/* NIL? */
 	return xstrdup("");			/* yes, return empty */
 } else if (*subj == '"') {			/* quoted? */
-	buf = xstrndup(subj + 1, len - 2);	/* yes, strip quotes */
+	rawbuf = xstrndup(subj + 1, len - 2);	/* yes, strip quotes */
 } else {
 	s = strchr(subj, '}') + 3;		/* literal, skip { }\r\n */
-	buf = xstrndup(s, len - (s - subj));
+	rawbuf = xstrndup(s, len - (s - subj));
 }
 
+ buf = charset_parse_mimeheader(rawbuf);
+ free(rawbuf);
+
 for (s = buf;;) {
 	base = _index_extract_subject(s, is_refwd);
 
@@ -3738,7 +5034,7 @@
 }
 
 /*
- * Guts if subject extraction.
+ * Guts of subject extraction.
 *
 * Takes a subject string and returns a pointer to the base.
 */
@@ -3862,182 +5158,55 @@
 return base;
 }
 
-/* Find a message-id looking thingy in a string. Returns a pointer to the
- * alloc'd id and the remaining string is returned in the **loc parameter.
- *
- * This is a poor-man's way of finding the message-id. We simply look for
- * any string having the format "< ... @ ... >" and assume that the mail
- * client created a properly formatted message-id.
- */
-#define MSGID_SPECIALS "<> @\\"
-
-static char *find_msgid(char *str, char **rem)
-{
- char *msgid, *src, *dst, *cp;
-
- if (!str) return NULL;
-
- msgid = NULL;
- src = str;
-
- /* find the start of a msgid (don't go past the end of the header) */
- while ((cp = src = strpbrk(src, "<\r")) != NULL) {
-
-	/* check for fold or end of header
-	 *
-	 * Per RFC 2822 section 2.2.3, a long header may be folded by
-	 * inserting CRLF before any WSP (SP and HTAB, per section 2.2.2).
-	 * Any other CRLF is the end of the header.
-	 */
-	if (*cp++ == '\r') {
-	 if (*cp++ == '\n' && !(*cp == ' ' || *cp == '\t')) {
-		/* end of header, we're done */
-		break;
-	 }
-
-	 /* skip fold (or junk) */
-	 src++;
-	 continue;
-	}
-
-	/* see if we have (and skip) a quoted localpart */
-	if (*cp == '\"') {
-	 /* find the endquote, making sure it isn't escaped */
-	 do {
-		++cp; cp = strchr(cp, '\"');
-	 } while (cp && *(cp-1) == '\\');
-
-	 /* no endquote, so bail */
-	 if (!cp) {
-		src++;
-		continue;
-	 }
-	}
-
-	/* find the end of the msgid */
-	if ((cp = strchr(cp, '>')) == NULL)
-	 return NULL;
-
-	/* alloc space for the msgid */
-	dst = msgid = (char*) xrealloc(msgid, cp - src + 2);
-
-	*dst++ = *src++;
-
-	/* quoted string */
-	if (*src == '\"') {
-	 src++;
-	 while (*src != '\"') {
-		if (*src == '\\') {
-		 src++;
-		}
-		*dst++ = *src++;
-	 }
-	 src++;
-	}
-	/* atom */
-	else {
-	 while (!strchr(MSGID_SPECIALS, *src))
-		*dst++ = *src++;
-	}
-
-	if (*src != '@' || *(dst-1) == '<') continue;
-	*dst++ = *src++;
-
-	/* domain atom */
-	while (!strchr(MSGID_SPECIALS, *src))
-	 *dst++ = *src++;
-
-	if (*src != '>' || *(dst-1) == '@') continue;
-	*dst++ = *src++;
-	*dst = '\0';
-
-	if (rem) *rem = src;
-	return msgid;
- }
-
- if (msgid) free(msgid);
- return NULL;
-}
-
 /* Get message-id, and references/in-reply-to */
-#define REFGROWSIZE 20
 
 void index_get_ids(MsgData *msgdata, char *envtokens, const char *headers,
 		 unsigned size)
 {
- static char *buf;
- static unsigned bufsize;
- static struct strlist refhdr;
+ static struct buf buf;
+ strarray_t refhdr = STRARRAY_INITIALIZER;
 char *refstr, *ref, *in_reply_to;
- int refsize = REFGROWSIZE;
 
- if (bufsize < size+2) {
-	bufsize = size+100;
-	buf = xrealloc(buf, bufsize);
- }
+ buf_reset(&buf);
 
 /* get msgid */
 msgdata->msgid = find_msgid(envtokensENV_MSGID, NULL);
 /* if we don't have one, create one */
 if (!msgdata->msgid) {
-	snprintf(buf, bufsize, "<Empty-ID: %u>", msgdata->msgno);
-	msgdata->msgid = xstrdup(buf);
+	buf_printf(&buf, "<Empty-ID: %u>", msgdata->msgno);
+	msgdata->msgid = xstrdup(buf.s);
+	buf_reset(&buf);
 }
 
 /* Copy headers to the buffer */
- memcpy(buf, headers, size);
- bufsize = '\0';
+ buf_appendmap(&buf, headers, size);
+ buf_cstring(&buf);
 
 /* grab the References header */
- refhdr.s = "references";
- index_pruneheader(buf, &refhdr, 0);
- if (*buf) {
+ strarray_append(&refhdr, "references");
+ message_pruneheader(buf.s, &refhdr, 0);
+ strarray_fini(&refhdr);
+
+ if (buf.s) {
 	/* allocate some space for refs */
-	msgdata->ref = (char **) xmalloc(refsize * sizeof(char *));
 	/* find references */
-	massage_header(buf);
-	refstr = buf;
-	while ((ref = find_msgid(refstr, &refstr)) != NULL) {
-	 /* reallocate space for this msgid if necessary */
-	 if (msgdata->nref == refsize) {
-		refsize += REFGROWSIZE;
-		msgdata->ref = (char **)
-		 xrealloc(msgdata->ref, refsize * sizeof(char *));
-	 }
-	 /* store this msgid in the array */
-	 msgdata->refmsgdata->nref++ = ref;
-	}
+	refstr = buf.s;
+	massage_header(refstr);
+	while ((ref = find_msgid(refstr, &refstr)) != NULL)
+	 strarray_appendm(&msgdata->ref, ref);
 }
 
 /* if we have no references, try in-reply-to */
- if (!msgdata->nref) {
+ if (!msgdata->ref.count) {
 	/* get in-reply-to id */
 	in_reply_to = find_msgid(envtokensENV_INREPLYTO, NULL);
 	/* if we have an in-reply-to id, make it the ref */
-	if (in_reply_to) {
-	 msgdata->ref = (char **) xmalloc(sizeof(char *));
-	 msgdata->refmsgdata->nref++ = in_reply_to;
-	}
+	if (in_reply_to)
+	 strarray_appendm(&msgdata->ref, in_reply_to);
 }
 }
 
 /*
- * Getnext function for sorting message lists.
- */
-static void *index_sort_getnext(MsgData *node)
-{
- return node->next;
-}
-
-/*
- * Setnext function for sorting message lists.
- */
-static void index_sort_setnext(MsgData *node, MsgData *next)
-{
- node->next = next;
-}
-
-/*
 * Function for comparing two integers.
 */
 static int numcmp(modseq_t n1, modseq_t n2)
@@ -4049,7 +5218,7 @@
 * Comparison function for sorting message lists.
 */
 static int index_sort_compare(MsgData *md1, MsgData *md2,
-			 struct sortcrit *sortcrit)
+			 const struct sortcrit *sortcrit)
 {
 int reverse, ret = 0, i = 0, ann = 0;
 
@@ -4068,8 +5237,8 @@
 	 ret = strcmpsafe(md1->cc, md2->cc);
 	 break;
 	case SORT_DATE: {
-	 time_t d1 = md1->date ? md1->date : md1->internaldate;
-	 time_t d2 = md2->date ? md2->date : md2->internaldate;
+	 time_t d1 = md1->sentdate ? md1->sentdate : md1->internaldate;
+	 time_t d2 = md2->sentdate ? md2->sentdate : md2->internaldate;
 	 ret = numcmp(d1, d2);
 	 break;
 	}
@@ -4086,7 +5255,7 @@
 	 ret = strcmpsafe(md1->to, md2->to);
 	 break;
 	case SORT_ANNOTATION:
-	 ret = strcmpsafe(md1->annotann, md2->annotann);
+	 ret = strcmpsafe(md1->annot.dataann, md2->annot.dataann);
 	 ann++;
 	 break;
 	case SORT_MODSEQ:
@@ -4098,35 +5267,80 @@
 	case SORT_DISPLAYTO:
 	 ret = strcmpsafe(md1->displayto, md2->displayto);
 	 break;
+	case SORT_UID:
+	 ret = numcmp(md1->uid, md2->uid);
+	 break;
+	case SORT_CONVMODSEQ:
+	 ret = numcmp(md1->convmodseq, md2->convmodseq);
+	 break;
+	case SORT_CONVEXISTS:
+	 ret = numcmp(md1->convexists, md2->convexists);
+	 break;
+	case SORT_CONVSIZE:
+	 ret = numcmp(md1->convsize, md2->convsize);
+	 break;
+	case SORT_HASFLAG:
+	 if (i < 31)
+		ret = numcmp(md1->hasflag & (1<<i),
+			 md2->hasflag & (1<<i));
+	 break;
+	case SORT_HASCONVFLAG:
+	 if (i < 31)
+		ret = numcmp(md1->hasconvflag & (1<<i),
+			 md2->hasconvflag & (1<<i));
+	 break;
+	case SORT_FOLDER:
+	 if (md1->folder && md2->folder)
+		ret = strcmpsafe(md1->folder->mboxname, md2->folder->mboxname);
+	 break;
+	case SORT_RELEVANCY:
+	 ret = 0;	 /* for now all messages have relevancy=100 */
+	 break;
 	}
 } while (!ret && sortcriti++.key != SORT_SEQUENCE);
 
 return (reverse ? -ret : ret);
 }
 
+static int index_sort_compare_qsort(const void *v1, const void *v2)
+{
+ MsgData *md1 = *(MsgData **)v1;
+ MsgData *md2 = *(MsgData **)v2;
+
+ return index_sort_compare(md1, md2, the_sortcrit);
+}
+
+void index_msgdata_sort(MsgData **msgdata, int n, const struct sortcrit *sortcrit)
+{
+ the_sortcrit = (struct sortcrit *)sortcrit;
+ qsort(msgdata, n, sizeof(MsgData *), index_sort_compare_qsort);
+}
+
 /*
- * Free a msgdata node.
+ * Free an array of MsgData* as built by index_msgdata_load()
 */
-static void index_msgdata_free(MsgData *md)
+void index_msgdata_free(MsgData **msgdata, unsigned int n)
 {
-#define FREE(x)	if (x) free(x)
- int i;
+ unsigned int i;
 
- if (!md)
+ if (!msgdata)
 	return;
- FREE(md->cc);
- FREE(md->from);
- FREE(md->to);
- FREE(md->displayfrom);
- FREE(md->displayto);
- FREE(md->xsubj);
- FREE(md->msgid);
- for (i = 0; i < md->nref; i++)
-	free(md->refi);
- FREE(md->ref);
- for (i = 0; i < md->nannot; i++)
-	free(md->annoti);
- FREE(md->annot);
+ for (i = 0 ; i < n ; i++) {
+	MsgData *md = msgdatai;
+
+	free(md->cc);
+	free(md->from);
+	free(md->to);
+	free(md->displayfrom);
+	free(md->displayto);
+	free(md->xsubj);
+	free(md->msgid);
+	free(md->listid);
+	free(md->contenttype);
+	strarray_fini(&md->ref);
+	strarray_fini(&md->annot);
+ }
+ free(msgdata);
 }
 
 /*
@@ -4149,7 +5363,7 @@
 * Comparison function for sorting threads.
 */
 static int index_thread_compare(Thread *t1, Thread *t2,
-				struct sortcrit *call_data)
+				const struct sortcrit *call_data)
 {
 MsgData *md1, *md2;
 
@@ -4162,7 +5376,8 @@
 /*
 * Sort a list of threads.
 */
-static void index_thread_sort(Thread *root, struct sortcrit *sortcrit)
+static void index_thread_sort(Thread *root,
+			 const struct sortcrit *sortcrit)
 {
 Thread *child;
 
@@ -4180,18 +5395,20 @@
 			(void * (*)(void*)) index_thread_getnext,
 			(void (*)(void*,void*)) index_thread_setnext,
 			(int (*)(void*,void*,void*)) index_thread_compare,
-			sortcrit);
+			(void *)sortcrit);
 }
 
 /*
 * Thread a list of messages using the ORDEREDSUBJECT algorithm.
 */
-static void index_thread_orderedsubj(struct index_state *state, 
-				 unsigned *msgno_list, int nmsg,
+static void index_thread_orderedsubj(struct index_state *state,
+				 unsigned *msgno_list, unsigned int nmsg,
 				 int usinguid)
 {
- MsgData *msgdata, *freeme;
- struct sortcrit sortcrit = {{ SORT_SUBJECT, 0, {{NULL, NULL}} },
+ MsgData **msgdata;
+ unsigned int mi;
+ static const struct sortcrit sortcrit =
+				 {{ SORT_SUBJECT, 0, {{NULL, NULL}} },
 				 { SORT_DATE, 0, {{NULL, NULL}} },
 				 { SORT_SEQUENCE, 0, {{NULL, NULL}} }};
 unsigned psubj_hash = 0;
@@ -4199,22 +5416,17 @@
 Thread *head, *newnode, *cur, *parent, *last;
 
 /* Create/load the msgdata array */
- freeme = msgdata = index_msgdata_load(state, msgno_list, nmsg, sortcrit);
+ msgdata = index_msgdata_load(state, msgno_list, nmsg, sortcrit, 0, NULL);
 
 /* Sort messages by subject and date */
- msgdata = lsort(msgdata,
-		 (void * (*)(void*)) index_sort_getnext,
-		 (void (*)(void*,void*)) index_sort_setnext,
-		 (int (*)(void*,void*,void*)) index_sort_compare,
-		 sortcrit);
+ index_msgdata_sort(msgdata, nmsg, sortcrit);
 
 /* create an array of Thread to use as nodes of thread tree
 *
 * we will be building threads under a dummy head,
 * so we need (nmsg + 1) nodes
 */
- head = (Thread *) xmalloc((nmsg + 1) * sizeof(Thread));
- memset(head, 0, (nmsg + 1) * sizeof(Thread));
+ head = (Thread *) xzmalloc((nmsg + 1) * sizeof(Thread));
 
 newnode = head + 1;	/* set next newnode to the second
 			 one in the array (skip the head) */
@@ -4223,15 +5435,16 @@
 cur = NULL;		/* no current thread */
 last = NULL;	/* no last child */
 
- while (msgdata) {
-	newnode->msgdata = msgdata;
+ for (mi = 0 ; mi < nmsg ; mi++) {
+	MsgData *msg = msgdatami;
+	newnode->msgdata = msg;
 
 	/* if no previous subj, or
 	 current subj = prev subj (subjs have same hash, and
 	 the strings are equal), then add message to current thread */
 	if (!psubj ||
-	 (msgdata->xsubj_hash == psubj_hash &&
-	 !strcmp(msgdata->xsubj, psubj))) {
+	 (msg->xsubj_hash == psubj_hash &&
+	 !strcmp(msg->xsubj, psubj))) {
 	 /* if no children, create first child */
 	 if (!parent->child) {
 		last = parent->child = newnode;
@@ -4250,9 +5463,8 @@
 	 parent = cur = cur->next;	/* now work with the new thread */
 	}
 
-	psubj_hash = msgdata->xsubj_hash;
-	psubj = msgdata->xsubj;
-	msgdata = msgdata->next;
+	psubj_hash = msg->xsubj_hash;
+	psubj = msg->xsubj;
 	newnode++;
 }
 
@@ -4266,7 +5478,7 @@
 free(head);
 
 /* free the msgdata array */
- free(freeme);
+ index_msgdata_free(msgdata, nmsg);
 }
 
 /*
@@ -4294,9 +5506,6 @@
 
 	 /* if we have a child, print the parent-child separator */
 	 if (thread->child) prot_printf(state->out, " ");
-
-	 /* free contents of the current node */
-	 index_msgdata_free(thread->msgdata);
 	}
 
 	/* for each child, grandchild, etc... */
@@ -4316,9 +5525,6 @@
 		/* if we have a child, print the parent-child separator */
 		if (child->child) prot_printf(state->out, " ");
 
-		/* free contents of the child node */
-		index_msgdata_free(child->msgdata);
-
 		child = child->child;
 	 }
 	}
@@ -4351,7 +5557,7 @@
 * Find threading algorithm for given arg.
 * Returns index into thread_algs, or -1 if not found.
 */
-int find_thread_algorithm(char *arg)
+EXPORTED int find_thread_algorithm(char *arg)
 {
 int alg;
 
@@ -4430,54 +5636,57 @@
 /*
 * Link messages together using message-id and references.
 */
-static void ref_link_messages(MsgData *msgdata, Thread **newnode,
-		 struct hash_table *id_table)
+static void ref_link_messages(MsgData **msgdata, unsigned int nmsg,
+			 Thread **newnode, struct hash_table *id_table)
 {
 Thread *cur, *parent, *ref;
+ unsigned int mi;
 int dup_count = 0;
 char buf100;
 int i;
 
 /* for each message... */
- while (msgdata) {
+ for (mi = 0 ; mi < nmsg ; mi++) {
+	MsgData *msg = msgdatami;
+
 	/* fill the containers with msgdata
 	 *
 	 * if we already have a container, use it
 	 */
-	if ((cur = (Thread *) hash_lookup(msgdata->msgid, id_table))) {
+	if ((cur = (Thread *) hash_lookup(msg->msgid, id_table))) {
 	 /* If this container is not empty, then we have a duplicate
 	 * Message-ID. Make this one unique so that we don't stomp
 	 * on the old one.
 	 */
 	 if (cur->msgdata) {
 		snprintf(buf, sizeof(buf), "-dup%d", dup_count++);
-		msgdata->msgid =
-		 (char *) xrealloc(msgdata->msgid,
-				 strlen(msgdata->msgid) + strlen(buf) + 1);
-		strcat(msgdata->msgid, buf);
+		msg->msgid =
+		 (char *) xrealloc(msg->msgid,
+				 strlen(msg->msgid) + strlen(buf) + 1);
+		strcat(msg->msgid, buf);
 		/* clear cur so that we create a new container */
 		cur = NULL;
 	 }
 	 else
-		cur->msgdata = msgdata;
+		cur->msgdata = msg;
 	}
 
 	/* otherwise, make and index a new container */
 	if (!cur) {
 	 cur = *newnode;
-	 cur->msgdata = msgdata;
-	 hash_insert(msgdata->msgid, cur, id_table);
+	 cur->msgdata = msg;
+	 hash_insert(msg->msgid, cur, id_table);
 	 (*newnode)++;
 	}
 
 	/* Step 1.A */
-	for (i = 0, parent = NULL; i < msgdata->nref; i++) {
+	for (i = 0, parent = NULL; i < msg->ref.count; i++) {
 	 /* if we don't already have a container for the reference,
 	 * make and index a new (empty) container
 	 */
-	 if (!(ref = (Thread *) hash_lookup(msgdata->refi, id_table))) {
+	 if (!(ref = (Thread *) hash_lookup(msg->ref.datai, id_table))) {
 		ref = *newnode;
-		hash_insert(msgdata->refi, ref, id_table);
+		hash_insert(msg->ref.datai, ref, id_table);
 		(*newnode)++;
 	 }
 
@@ -4506,18 +5715,18 @@
 	 */
 	if (parent && !thread_is_descendent(cur, parent))
 	 thread_adopt_child(parent, cur);
-
-	msgdata = msgdata->next;
 }
 }
 
 /*
 * Gather orphan messages under the root node.
 */
-static void ref_gather_orphans(char *key __attribute__((unused)),
-			 Thread *node,
-			 struct rootset *rootset)
+static void ref_gather_orphans(const char *key __attribute__((unused)),
+			 void *data, void *rock)
 {
+ Thread *node = (Thread *)data;
+ struct rootset *rootset = (struct rootset *)rock;
+
 /* we only care about nodes without parents */
 if (!node->parent) {
 	if (node->next) {
@@ -4545,6 +5754,7 @@
 	 cur;
 	 prev = cur, cur = next, next = (cur ? cur->next : NULL)) {
 
+retry:
 	/* if we have an empty container with no children, delete it */
 	if (!cur->msgdata && !cur->child) {
 	 if (!prev)	/* first child */
@@ -4599,8 +5809,14 @@
 	}
 
 	/* if we have a message with children, prune it's children */
-	else if (cur->child)
+	else if (cur->child) {
 	 ref_prune_tree(cur);
+	 if (!cur->msgdata && !cur->child) {
+		/* Did we end up with a completely empty node here?
+		 * Go back and prune it too. See Bug 3784. */
+		goto retry;
+	 }
+	}
 }
 }
 
@@ -4610,7 +5826,8 @@
 static void ref_sort_root(Thread *root)
 {
 Thread *cur;
- struct sortcrit sortcrit = {{ SORT_DATE, 0, {{NULL, NULL}} },
+ static const struct sortcrit sortcrit =
+				 {{ SORT_DATE, 0, {{NULL, NULL}} },
 				 { SORT_SEQUENCE, 0, {{NULL, NULL}} }};
 
 cur = root->child;
@@ -4621,7 +5838,7 @@
 			 (void * (*)(void*)) index_thread_getnext,
 			 (void (*)(void*,void*)) index_thread_setnext,
 			 (int (*)(void*,void*,void*)) index_thread_compare,
-			 sortcrit);
+			 (void *)sortcrit);
 	}
 	cur = cur->next;
 }
@@ -4631,7 +5848,7 @@
 			(void * (*)(void*)) index_thread_getnext,
 			(void (*)(void*,void*)) index_thread_setnext,
 			(int (*)(void*,void*,void*)) index_thread_compare,
-			sortcrit);
+			(void *)sortcrit);
 }
 
 /*
@@ -4789,24 +6006,6 @@
 }
 
 /*
- * Free an entire thread.
- */
-static void index_thread_free(Thread *thread)
-{
- Thread *child;
-
- /* free the head node */
- if (thread->msgdata) index_msgdata_free(thread->msgdata);
-
- /* free the children recursively */
- child = thread->child;
- while (child) {
-	index_thread_free(child);
-	child = child->next;
- }
-}
-
-/*
 * Guts of thread searching. Recurses over children when necessary.
 */
 static int _index_thread_search(struct index_state *state,
@@ -4849,9 +6048,6 @@
 	 else
 		prev->next = cur->next;
 
-	 /* free all nodes in the thread */
-	 index_thread_free(cur);
-
 	 /* we just removed cur from our list,
 	 * so we need to keep the same prev for the next pass
 	 */
@@ -4864,23 +6060,25 @@
 * Guts of the REFERENCES algorithms. Behavior is tweaked with loadcrit,
 * searchproc() and sortcrit.
 */
-static void _index_thread_ref(struct index_state *state, unsigned *msgno_list, int nmsg,
-			 struct sortcrit loadcrit,
+static void _index_thread_ref(struct index_state *state, unsigned *msgno_list,
+			 unsigned int nmsg,
+			 const struct sortcrit loadcrit,
 			 int (*searchproc) (MsgData *),
-			 struct sortcrit sortcrit, int usinguid)
+			 const struct sortcrit sortcrit, int usinguid)
 {
- MsgData *msgdata, *freeme, *md;
+ MsgData **msgdata;
+ unsigned int mi;
 int tref, nnode;
 Thread *newnode;
 struct hash_table id_table;
 struct rootset rootset;
 
 /* Create/load the msgdata array */
- freeme = msgdata = index_msgdata_load(state, msgno_list, nmsg, loadcrit);
+ msgdata = index_msgdata_load(state, msgno_list, nmsg, loadcrit, 0, NULL);
 
 /* calculate the sum of the number of references for all messages */
- for (md = msgdata, tref = 0; md; md = md->next)
-	tref += md->nref;
+ for (mi = 0, tref = 0 ; mi < nmsg ; mi++)
+	tref += msgdatami->ref.count;
 
 /* create an array of Thread to use as nodes of thread tree (including
 * empty containers)
@@ -4912,12 +6110,11 @@
 construct_hash_table(&id_table, nmsg + tref, 1);
 
 /* Step 1: link messages together */
- ref_link_messages(msgdata, &newnode, &id_table);
+ ref_link_messages(msgdata, nmsg, &newnode, &id_table);
 
 /* Step 2: find the root set (gather all of the orphan messages) */
 rootset.nroot = 0;
- hash_enumerate(&id_table, (void (*)(char*,void*,void*)) ref_gather_orphans,
-		 &rootset);
+ hash_enumerate(&id_table, ref_gather_orphans, &rootset);
 
 /* discard id_table */
 free_hash_table(&id_table, NULL);
@@ -4944,19 +6141,23 @@
 free(rootset.root);
 
 /* free the msgdata array */
- free(freeme);
+ index_msgdata_free(msgdata, nmsg);
 }
 
 /*
 * Thread a list of messages using the REFERENCES algorithm.
 */
-static void index_thread_ref(struct index_state *state, unsigned *msgno_list, int nmsg, int usinguid)
+static void index_thread_ref(struct index_state *state,
+			 unsigned *msgno_list, unsigned int nmsg,
+			 int usinguid)
 {
- struct sortcrit loadcrit = {{ LOAD_IDS, 0, {{NULL,NULL}} },
+ static const struct sortcrit loadcrit =
+				 {{ LOAD_IDS, 0, {{NULL,NULL}} },
 				 { SORT_SUBJECT, 0, {{NULL,NULL}} },
 				 { SORT_DATE, 0, {{NULL,NULL}} },
 				 { SORT_SEQUENCE, 0, {{NULL,NULL}} }};
- struct sortcrit sortcrit = {{ SORT_DATE, 0, {{NULL,NULL}} },
+ static const struct sortcrit sortcrit =
+				 {{ SORT_DATE, 0, {{NULL,NULL}} },
 				 { SORT_SEQUENCE, 0, {{NULL,NULL}} }};
 
 _index_thread_ref(state, msgno_list, nmsg, loadcrit, NULL, sortcrit, usinguid);
@@ -4965,37 +6166,16 @@
 /*
 * NNTP specific stuff.
 */
-char *index_get_msgid(struct index_state *state,
-		 uint32_t msgno)
+EXPORTED char *index_get_msgid(struct index_state *state,
+			 uint32_t msgno)
 {
- char *env;
- char *envtokensNUMENVTOKENS;
- char *msgid;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
-
- if (mailbox_cacherecord(mailbox, &im->record))
-	return NULL;
+ struct index_record record;
 
- if (cacheitem_size(&im->record, CACHE_ENVELOPE) <= 2)
+ if (index_reload_record(state, msgno, &record))
 	return NULL;
 
- /* get msgid out of the envelope
- *
- * get a working copy; strip outer ()'s
- * +1 -> skip the leading paren
- * -2 -> don't include the size of the outer parens
- */
- env = xstrndup(cacheitem_base(&im->record, CACHE_ENVELOPE) + 1,
-		 cacheitem_size(&im->record, CACHE_ENVELOPE) - 2);
- parse_cached_envelope(env, envtokens, VECTOR_SIZE(envtokens));
-
- msgid = envtokensENV_MSGID ? xstrdup(envtokensENV_MSGID) : NULL;
-
- /* free stuff */
- free(env);
-
- return msgid;
+ return mailbox_cache_get_msgid(mailbox, &record);
 }
 
 static void massage_header(char *hdr)
@@ -5028,41 +6208,8 @@
 hdrn = '\0';
 }
 
-static char *parse_nstring(char **str)
-{
- char *cp = *str, *val;
-
- if (*cp == '"') { /* quoted string */
-	val = ++cp; /* skip " */
-	do {
-	 cp = strchr(cp, '"');
-	 if (!cp) return NULL; /* whole thing is broken */
-	} while (*(cp-1) == '\\'); /* skip escaped " */
-	*cp++ = '\0';
- }
- else { /* NIL */
-	val = NULL;
-	cp += 3;
- }
-
- *str = cp;
- return val;
-}
-
-static void parse_env_address(char *str, struct address *addr)
-{
- str++; /* skip ( */
- addr->name = parse_nstring(&str);
- str++; /* skip SP */
- addr->route = parse_nstring(&str);
- str++; /* skip SP */
- addr->mailbox = parse_nstring(&str);
- str++; /* skip SP */
- addr->domain = parse_nstring(&str);
-}
-
-extern struct nntp_overview *index_overview(struct index_state *state,
-					 uint32_t msgno)
+EXPORTED extern struct nntp_overview *index_overview(struct index_state *state,
+						 uint32_t msgno)
 {
 static struct nntp_overview over;
 static char *env = NULL, *from = NULL, *hdr = NULL;
@@ -5070,40 +6217,43 @@
 int size;
 char *envtokensNUMENVTOKENS;
 struct address addr = { NULL, NULL, NULL, NULL, NULL, NULL };
- static struct strlist refhdr;
+ strarray_t refhdr = STRARRAY_INITIALIZER;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
 
 /* flush any previous data */
 memset(&over, 0, sizeof(struct nntp_overview));
 
- if (mailbox_cacherecord(mailbox, &im->record))
+ if (index_reload_record(state, msgno, &record))
+	return NULL;
+
+ if (mailbox_cacherecord(mailbox, &record))
 	return NULL; /* upper layers can cope! */
 
 /* make a working copy of envelope; strip outer ()'s */
 /* -2 -> don't include the size of the outer parens */
 /* +1 -> leave space for NUL */
- size = cacheitem_size(&im->record, CACHE_ENVELOPE) - 2 + 1;
+ size = cacheitem_size(&record, CACHE_ENVELOPE) - 2 + 1;
 if (envsize < size) {
 	envsize = size;
 	env = xrealloc(env, envsize);
 }
 /* +1 -> skip the leading paren */
- strlcpy(env, cacheitem_base(&im->record, CACHE_ENVELOPE) + 1, size);
+ strlcpy(env, cacheitem_base(&record, CACHE_ENVELOPE) + 1, size);
 
 /* make a working copy of headers */
- size = cacheitem_size(&im->record, CACHE_HEADERS);
+ size = cacheitem_size(&record, CACHE_HEADERS);
 if (hdrsize < size+2) {
 	hdrsize = size+100;
 	hdr = xrealloc(hdr, hdrsize);
 }
- memcpy(hdr, cacheitem_base(&im->record, CACHE_HEADERS), size);
+ memcpy(hdr, cacheitem_base(&record, CACHE_HEADERS), size);
 hdrsize = '\0';
 
 parse_cached_envelope(env, envtokens, VECTOR_SIZE(envtokens));
 
- over.uid = im->record.uid;
- over.bytes = im->record.size;
+ over.uid = record.uid;
+ over.bytes = record.size;
 over.lines = index_getlines(state, msgno);
 over.date = envtokensENV_DATE;
 over.msgid = envtokensENV_MSGID;
@@ -5114,7 +6264,7 @@
 
 /* build original From: header */
 if (envtokensENV_FROM) /* paranoia */
-	parse_env_address(envtokensENV_FROM, &addr);
+	message_parse_env_address(envtokensENV_FROM, &addr);
 
 if (addr.mailbox && addr.domain) { /* paranoia */
 	/* +3 -> add space for quotes and space */
@@ -5134,8 +6284,10 @@
 }
 
 /* massage references */
- refhdr.s = "references";
- index_pruneheader(hdr, &refhdr, 0);
+ strarray_append(&refhdr, "references");
+ message_pruneheader(hdr, &refhdr, 0);
+ strarray_fini(&refhdr);
+
 if (*hdr) {
 	over.ref = hdr + 11; /* skip over header name */
 	massage_header(over.ref);
@@ -5144,51 +6296,49 @@
 return &over;
 }
 
-extern char *index_getheader(struct index_state *state, uint32_t msgno,
-			 char *hdr)
+EXPORTED char *index_getheader(struct index_state *state, uint32_t msgno,
+			 char *hdr)
 {
- static const char *msg_base = 0;
- static unsigned long msg_size = 0;
- struct strlist headers = { NULL, NULL, NULL, NULL };
+ struct buf msg = BUF_INITIALIZER;
+ strarray_t headers = STRARRAY_INITIALIZER;
 static char *alloc = NULL;
 static unsigned allocsize = 0;
 unsigned size;
 char *buf;
 struct mailbox *mailbox = state->mailbox;
- struct index_map *im = &state->mapmsgno-1;
+ struct index_record record;
 
- headers.s = hdr;
+ if (index_reload_record(state, msgno, &record))
+	return NULL;
 
- if (msg_base) {
-	mailbox_unmap_message(NULL, 0, &msg_base, &msg_size);
-	msg_base = 0;
-	msg_size = 0;
- }
+ buf_free(&msg);
 
 /* see if the header is cached */
 if (mailbox_cached_header(hdr) != BIT32_MAX &&
- !mailbox_cacherecord(mailbox, &im->record)) {
+ !mailbox_cacherecord(mailbox, &record)) {
 
-	size = cacheitem_size(&im->record, CACHE_HEADERS);
+	size = cacheitem_size(&record, CACHE_HEADERS);
 	if (allocsize < size+2) {
 	 allocsize = size+100;
 	 alloc = xrealloc(alloc, allocsize);
 	}
 
-	memcpy(alloc, cacheitem_base(&im->record, CACHE_HEADERS), size);
+	memcpy(alloc, cacheitem_base(&record, CACHE_HEADERS), size);
 	allocsize = '\0';
 
 	buf = alloc;
 }
 else {
 	/* uncached header */
-	if (mailbox_map_message(mailbox, im->record.uid, &msg_base, &msg_size))
+	if (mailbox_map_record(mailbox, &record, &msg))
 	 return NULL;
 
-	buf = index_readheader(msg_base, msg_size, 0, im->record.header_size);
+	buf = index_readheader(msg.s, msg.len, 0, record.header_size);
 }
 
- index_pruneheader(buf, &headers, NULL);
+ strarray_append(&headers, hdr);
+ message_pruneheader(buf, &headers, NULL);
+ strarray_fini(&headers);
 
 if (*buf) {
 	buf += strlen(hdr) + 1; /* skip header: */
@@ -5198,17 +6348,37 @@
 return buf;
 }
 
-extern unsigned long index_getsize(struct index_state *state,
-				 uint32_t msgno)
+EXPORTED extern unsigned long index_getsize(struct index_state *state,
+					 uint32_t msgno)
 {
- struct index_map *im = &state->mapmsgno-1;
- return im->record.size;
+ struct index_record record;
+
+ if (index_reload_record(state, msgno, &record))
+	return 0;
+
+ return record.size;
 }
 
-extern unsigned long index_getlines(struct index_state *state, uint32_t msgno)
+EXPORTED extern unsigned long index_getlines(struct index_state *state,
+					 uint32_t msgno)
 {
- struct index_map *im = &state->mapmsgno-1;
- return im->record.content_lines;
+ struct index_record record;
+
+ if (index_reload_record(state, msgno, &record))
+	return 0;
+
+ return record.content_lines;
+}
+
+EXPORTED const char *index_mboxname(const struct index_state *state)
+{
+ if (!state) return NULL;
+ return state->mboxname;
+}
+
+EXPORTED int index_hasrights(const struct index_state *state, int rights)
+{
+ return state->myrights & rights;
 }
 
 /*
@@ -5221,15 +6391,97 @@
 return seqset_parse(sequence, NULL, maxval);
 }
 
-void appendsequencelist(struct index_state *state,
-			struct seqset **l,
-			char *sequence, int usinguid)
+EXPORTED void freesequencelist(struct seqset *l)
 {
- unsigned maxval = usinguid ? state->last_uid : state->exists;
- seqset_append(l, sequence, maxval);
+ seqset_free(l);
 }
 
-void freesequencelist(struct seqset *l)
+/*
+ * Create a new search program.
+ */
+EXPORTED struct searchargs *new_searchargs(const char *tag, int state,
+					 struct namespace *namespace,
+					 const char *userid,
+					 struct auth_state *authstate,
+					 int isadmin)
 {
- seqset_free(l);
+ struct searchargs *sa;
+
+ sa = (struct searchargs *)xzmalloc(sizeof(struct searchargs));
+ sa->tag = tag;
+ sa->state = state;
+ /* default charset is US-ASCII which is always 0 */
+
+ sa->namespace = namespace;
+ sa->userid = userid;
+ sa->authstate = authstate;
+ sa->isadmin = isadmin;
+
+ return sa;
+}
+
+/*
+ * Free the searchargs 's'
+ */
+EXPORTED void freesearchargs(struct searchargs *s)
+{
+ if (!s) return;
+
+ search_expr_free(s->root);
+ free(s);
+}
+
+EXPORTED char *sortcrit_as_string(const struct sortcrit *sortcrit)
+{
+ struct buf b = BUF_INITIALIZER;
+ static const char * const key_names = {
+	"SEQUENCE", "ARRIVAL", "CC", "DATE",
+	"DISPLAYFROM", "DISPLAYTO", "FROM",
+	"SIZE", "SUBJECT", "TO", "ANNOTATION",
+	"MODSEQ", "UID", "HASFLAG", "CONVMODSEQ",
+	"CONVEXISTS", "CONVSIZE", "HASCONVFLAG",
+	"FOLDER", "RELEVANCY"
+ };
+
+ for ( ; sortcrit->key ; sortcrit++) {
+	if (b.len)
+	 buf_putc(&b, ' ');
+	if (sortcrit->flags & SORT_REVERSE)
+	 buf_appendcstr(&b, "REVERSE ");
+
+	if (sortcrit->key < VECTOR_SIZE(key_names))
+	 buf_appendcstr(&b, key_namessortcrit->key);
+	else
+	 buf_printf(&b, "UNKNOWN%u", sortcrit->key);
+
+	switch (sortcrit->key) {
+	case SORT_ANNOTATION:
+	 buf_printf(&b, " \"%s\" \"%s\"",
+		 sortcrit->args.annot.entry,
+		 *sortcrit->args.annot.userid ?
+			 "value.priv" : "value.shared");
+	 break;
+	}
+ }
+ return buf_release(&b);
+}
+
+/*
+ * Free an array of sortcrit
+ */
+EXPORTED void freesortcrit(struct sortcrit *s)
+{
+ int i = 0;
+
+ if (!s) return;
+ do {
+	switch (si.key) {
+	case SORT_ANNOTATION:
+	 free(si.args.annot.entry);
+	 free(si.args.annot.userid);
+	 break;
+	}
+	i++;
+ } while (si.key != SORT_SEQUENCE);
+ free(s);
 }

cyrus-imapd-2.4.17.tar.gz/imap/index.h -> cyrus-imapd-2.5.tar.gz/imap/index.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: index.h,v 1.18 2010/01/06 17:01:35 murch Exp $
 */
 
 /* Header for internal usage of index.c + programs that make raw access
@@ -56,25 +54,27 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <syslog.h>
-#include <errno.h>
-#include <ctype.h>
 
 #include "annotate.h" /* for strlist functionality */
+#include "search_engines.h"
 #include "message_guid.h"
 #include "sequence.h"
+#include "strarray.h"
 
 /* Special "sort criteria" to load message-id and references/in-reply-to
 * into msgdata array for threaders that need them.
 */
 #define LOAD_IDS	256
 
+struct message;
+
 struct vanished_params {
 unsigned long uidvalidity;
 modseq_t modseq;
 const char *match_seq;
 const char *match_uid;
 const char *sequence;
+ int uidvalidity_is_max;
 };
 
 struct index_init {
@@ -84,14 +84,21 @@
 int examine_mode;
 int qresync;
 int select;
+ int want_expunged;
 struct vanished_params vanished;
+ struct seqset *vanishedlist;
 };
 
 struct index_map {
- struct index_record record;
+ modseq_t modseq;
 modseq_t told_modseq;
- int isseen:1;
- int isrecent:1;
+ uint32_t uid;
+ uint32_t recno;
+ uint32_t system_flags;
+ uint32_t cache_offset;
+ uint32_t user_flagsMAX_USER_FLAGS/32;
+ unsigned int isseen:1;
+ unsigned int isrecent:1;
 };
 
 struct index_state {
@@ -100,6 +107,8 @@
 unsigned oldexists;
 unsigned exists;
 unsigned long last_uid;
+ uint32_t generation; /* to notice repacks */
+ uint32_t uidvalidity; /* to notice delete/recreate */
 modseq_t highestmodseq;
 modseq_t delayed_modseq;
 struct index_map *map;
@@ -115,9 +124,12 @@
 unsigned firstnotseen;
 char *flagnameMAX_USER_FLAGS;
 char *userid;
+ char *mboxname;
 struct protstream *out;
 int qresync;
 struct auth_state *authstate;
+ int want_expunged;
+ unsigned num_expunged;
 };
 
 struct copyargs {
@@ -126,22 +138,31 @@
 int msgalloc;
 };
 
-struct mapfile {
- const char *base;
- unsigned long size;
-};
-
 typedef struct msgdata {
+ struct search_folder *folder; /* search folder (can be NULL) */
+
+ /* items from the index_record */
 bit32 uid; /* UID for output purposes */
 uint32_t msgno;		/* message number */
- char *msgid;		/* message ID */
- char **ref;			/* array of references */
- int nref;			/* number of references */
- time_t date;		/* sent date & time of message
+ conversation_id_t cid;	/* conversation id */
+ strarray_t ref;		/* array of references */
+ time_t sentdate;		/* sent date & time of message
 				 from Date: header (adjusted by time zone) */
 time_t internaldate; /* internaldate */
 size_t size; /* message size */
 modseq_t modseq; /* modseq of record*/
+ bit32 hasflag;		/* hasflag values (up to 32 of them) */
+
+ /* items from the conversations database */
+ modseq_t convmodseq;	/* modseq of conversation */
+ uint32_t convexists;	/* exists count of conversation */
+ uint32_t convsize;		/* total size of messages in conversation */
+ bit32 hasconvflag;		/* hasconvflag values (up to 32 of them) */
+
+ /* items from the cache record */
+ char *msgid;		/* message ID */
+ char *listid;		/* List-Id and Mailing-List fields */
+ char *contenttype;		/* all MIME Content-Types except multipart */
 char *cc;			/* local-part of first "cc" address */
 char *from;			/* local-part of first "from" address */
 char *to;			/* local-part of first "to" address */
@@ -150,10 +171,8 @@
 char *xsubj;		/* extracted subject text */
 unsigned xsubj_hash;	/* hash of extracted subject text */
 int is_refwd;		/* is message a reply or forward? */
- char **annot;		/* array of annotation attribute values
+ strarray_t annot;		/* array of annotation attribute values
 				 (stored in order of sortcrit) */
- int nannot;			/* number of annotation values */
- struct msgdata *next;
 } MsgData;
 
 typedef struct thread {
@@ -169,8 +188,9 @@
 };
 
 struct thread_algorithm {
- char *alg_name;
- void (*threader)(struct index_state *state, unsigned *msgno_list, int nmsg, int usinguid);
+ const char *alg_name;
+ void (*threader)(struct index_state *state, unsigned *msgno_list,
+		 unsigned int nmsg, int usinguid);
 };
 
 struct nntp_overview {
@@ -184,18 +204,50 @@
 unsigned long lines;
 };
 
+enum index_warmup_flags
+{
+ WARMUP_INDEX	 = (1<<0),
+ WARMUP_CONVERSATIONS = (1<<1),
+ WARMUP_ANNOTATIONS	 = (1<<2),
+ WARMUP_FOLDERSTATUS	 = (1<<3),
+ WARMUP_SEARCH	 = (1<<4),
+ WARMUP_ALL		 = (~WARMUP_SEARCH)
+};
+
+/* non-locking, non-updating - just do a fetch on the state
+ * we already have */
+void index_fetchresponses(struct index_state *state,
+				 struct seqset *seq,
+				 int usinguid,
+				 const struct fetchargs *fetchargs,
+				 int *fetchedsomething);
 extern int index_fetch(struct index_state *state,
 		 const char* sequence,
 		 int usinguid,
-		 struct fetchargs* fetchargs,
+		 const struct fetchargs* fetchargs,
 		 int* fetchedsomething);
 extern int index_store(struct index_state *state,
 		 char *sequence,
-		 int usinguid,
-		 struct storeargs *storeargs,
-		 char **flag, int nflags);
-extern int index_sort(struct index_state *state, struct sortcrit *sortcrit,
+		 struct storeargs *storeargs);
+extern int index_run_annotator(struct index_state *state,
+			 const char *sequence, int usinguid,
+			 struct namespace *namespace, int isadmin);
+extern int index_warmup(struct mboxlist_entry *, unsigned int warmup_flags,
+			struct seqset *uids);
+extern int index_sort(struct index_state *state, const struct sortcrit *sortcrit,
 		 struct searchargs *searchargs, int usinguid);
+extern int index_convsort(struct index_state *state, struct sortcrit *sortcrit,
+		 struct searchargs *searchargs,
+		 const struct windowargs * windowargs);
+extern int index_convmultisort(struct index_state *state, struct sortcrit *sortcrit,
+			 struct searchargs *searchargs,
+			 const struct windowargs * windowargs);
+extern int index_snippets(struct index_state *state,
+			 const struct snippetargs *snippetargs,
+			 struct searchargs *searchargs);
+extern int index_convupdates(struct index_state *state, struct sortcrit *sortcrit,
+		 struct searchargs *searchargs,
+		 const struct windowargs * windowargs);
 extern int index_thread(struct index_state *state, int algorithm,
 			struct searchargs *searchargs, int usinguid);
 extern int index_search(struct index_state *state,
@@ -208,24 +260,34 @@
 		 int usinguid,
 		 char *name, 
 		 char **copyuidp,
-		 int nolink);
+		 int nolink,
+		 struct namespace *namespace,
+		 int isadmin,
+		 int ismove);
 extern int find_thread_algorithm(char *arg);
 
 extern int index_open(const char *name, struct index_init *init,
 		 struct index_state **stateptr);
+extern int index_refresh(struct index_state *state);
+extern void index_checkflags(struct index_state *state, int print, int dirty);
+extern void index_select(struct index_state *state, struct index_init *init);
 extern int index_status(struct index_state *state, struct statusdata *sdata);
-extern int index_close(struct index_state **stateptr);
-extern unsigned index_finduid(struct index_state *state, unsigned uid);
+extern void index_release(struct index_state *state);
+extern void index_close(struct index_state **stateptr);
+extern uint32_t index_finduid(struct index_state *state, uint32_t uid);
+extern uint32_t index_getuid(struct index_state *state, uint32_t msgno);
 extern void index_tellchanges(struct index_state *state, int canexpunge,
-			 int printuid);
-extern unsigned index_getuid(struct index_state *state, uint32_t msgno);
+			 int printuid, int printmodseq);
 extern modseq_t index_highestmodseq(struct index_state *state);
 extern int index_check(struct index_state *state, int usinguid, int printuid);
+extern struct seqset *index_vanished(struct index_state *state,
+				 struct vanished_params *params);
 extern int index_urlfetch(struct index_state *state, uint32_t msgno,
 			 unsigned params, const char *section,
 			 unsigned long start_octet, unsigned long octet_count,
 			 struct protstream *pout, unsigned long *size);
 extern char *index_get_msgid(struct index_state *state, uint32_t msgno);
+extern struct message *index_get_message(struct index_state *state, uint32_t msgno);
 extern struct nntp_overview *index_overview(struct index_state *state,
 					 uint32_t msgno);
 extern char *index_getheader(struct index_state *state, uint32_t msgno,
@@ -235,22 +297,35 @@
 extern int index_copy_remote(struct index_state *state, char *sequence, 
 			 int usinguid, struct protstream *pout);
 
-void appendsequencelist(struct index_state *state, struct seqset **l,
-			char *sequence, int usinguid);
+struct searchargs *new_searchargs(const char *tag, int state,
+				 struct namespace *namespace,
+				 const char *userid,
+				 struct auth_state *authstate,
+				 int isadmin);
+
 void freesequencelist(struct seqset *l);
-extern int index_expunge(struct index_state *state, char *uidsequence);
+void freesearchargs(struct searchargs *s);
+char *sortcrit_as_string(const struct sortcrit *sortcrit);
+void freesortcrit(struct sortcrit *s);
+void index_msgdata_sort(MsgData **msgdata, int n, const struct sortcrit *sortcrit);
+void index_msgdata_free(MsgData **, unsigned int);
+MsgData **index_msgdata_load(struct index_state *state, unsigned *msgno_list, int n,
+			 const struct sortcrit *sortcrit,
+			 unsigned int anchor, int *found_anchor);
+int index_search_evaluate(struct index_state *state, const search_expr_t *e, uint32_t msgno);
 
-/* See lib/charset.h for the definition of receiver. */
-extern void index_getsearchtext_single(struct index_state *state, uint32_t msgno,
- index_search_text_receiver_t receiver,
- void* rock);
+extern int index_expunge(struct index_state *state, char *uidsequence,
+			 int need_deleted);
 
-extern void index_getsearchtext(struct index_state *state,
- index_search_text_receiver_t receiver,
- void* rock);
+extern int index_getsearchtext(struct message *,
+				struct search_text_receiver *receiver,
+				int snippet);
 
 extern int index_getuidsequence(struct index_state *state,
 				struct searchargs *searchargs,
 				unsigned **uid_list);
 
+extern const char *index_mboxname(const struct index_state *state);
+extern int index_hasrights(const struct index_state *state, int rights);
+
 #endif /* INDEX_H */

cyrus-imapd-2.4.17.tar.gz/imap/ipurge.c -> cyrus-imapd-2.5.tar.gz/imap/ipurge.c Changed

@@ -41,8 +41,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ipurge.c,v 1.35 2010/01/06 17:01:35 murch Exp $
 */
 
 #include <config.h>
@@ -58,18 +56,14 @@
 
 /* cyrus includes */
 #include "global.h"
-#include "sysexits.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "xmalloc.h"
 #include "mboxlist.h"
 #include "util.h"
 #include "sync_log.h"
 
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 /* globals for getopt routines */
 extern char *optarg;
 extern int optind;
@@ -77,14 +71,13 @@
 extern int optopt;
 
 /* globals for callback functions */
-int days = -1;
-int size = -1;
-int exact = -1;
-int pattern = -1;
-int skipflagged = 0;
-int onlydeleted = 0;
-int use_sentdate = 1;
-int invertmatch = 0;
+static int days = -1;
+static int size = -1;
+static int exact = -1;
+static int skipflagged = 0;
+static int onlydeleted = 0;
+static int use_sentdate = 1;
+static int invertmatch = 0;
 
 /* for statistical purposes */
 typedef struct mbox_stats_s {
@@ -99,15 +92,15 @@
 /* current namespace */
 static struct namespace purge_namespace;
 
-int verbose = 1;
-int forceall = 0;
+static int verbose = 1;
+static int forceall = 0;
 
-int purge_me(char *, int, int);
-unsigned purge_check(struct mailbox *mailbox,
+static int purge_me(char *, int, int, void *);
+static unsigned purge_check(struct mailbox *mailbox,
 		 struct index_record *record,
 		 void *rock);
-int usage(char *name);
-void print_stats(mbox_stats_t *stats);
+static int usage(const char *name);
+static void print_stats(mbox_stats_t *stats);
 
 int main (int argc, char *argv) {
 int option;		/* getopt() returns an int */
@@ -115,7 +108,7 @@
 char *alt_config = NULL;
 int r;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -175,7 +168,10 @@
 usage(argv0);
 }
 
- cyrus_init(alt_config, "ipurge", 0);
+ cyrus_init(alt_config, "ipurge", 0, CONFIG_NEED_PARTITION_DATA);
+
+ /* setup for mailbox event notifications */
+ mboxevent_init();
 
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(&purge_namespace, 1)) != 0) {
@@ -183,6 +179,8 @@
 fatal(error_message(r), EC_CONFIG);
 }
 
+ mboxevent_setnamespace(&purge_namespace);
+
 mboxlist_init(0);
 mboxlist_open(NULL);
 
@@ -217,12 +215,12 @@
 mboxlist_done();
 
 cyrus_done();
- 
+
 return 0;
 }
 
-int
-usage(char *name) {
+static int usage(const char *name)
+{
 printf("usage: %s -f -s -C <alt_config> -x -X -i -o {-d days | -b bytes|-k Kbytes|-m Mbytes}\n\tmboxpattern1 ... mboxpatternN\n", name);
 printf("\tthere are no defaults and at least one of -d, -b, -k, -m\n\tmust be specified\n");
 printf("\tif no mboxpattern is given %s works on all mailboxes\n", name);
@@ -236,8 +234,10 @@
 }
 
 /* we don't check what comes in on matchlen and maycreate, should we? */
-int purge_me(char *name, int matchlen __attribute__((unused)),
-	 int maycreate __attribute__((unused))) {
+static int purge_me(char *name, int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
+{
 struct mailbox *mailbox = NULL;
 int r;
 mbox_stats_t stats;
@@ -265,7 +265,7 @@
 return r;
 }
 
- mailbox_expunge(mailbox, purge_check, &stats, NULL);
+ mailbox_expunge(mailbox, purge_check, &stats, NULL, EVENT_MESSAGE_EXPUNGE);
 
 mailbox_close(&mailbox);
 
@@ -274,7 +274,7 @@
 return 0;
 }
 
-void deleteit(bit32 msgsize, mbox_stats_t *stats)
+static void deleteit(bit32 msgsize, mbox_stats_t *stats)
 {
 stats->deleted++;
 stats->deleted_bytes += msgsize;
@@ -282,7 +282,7 @@
 
 /* thumbs up routine, checks date & size and returns yes or no for deletion */
 /* 0 = no, 1 = yes */
-unsigned purge_check(struct mailbox *mailbox __attribute__((unused)),
+static unsigned purge_check(struct mailbox *mailbox __attribute__((unused)),
 		 struct index_record *record,
 		 void *deciderock)
 {
@@ -355,7 +355,7 @@
 }
 }
 
-void print_stats(mbox_stats_t *stats)
+static void print_stats(mbox_stats_t *stats)
 {
 printf("total messages \t\t %d\n",stats->total);
 printf("total bytes \t\t %d\n",stats->total_bytes);

cyrus-imapd-2.5.tar.gz/imap/jcal.c Added

@@ -0,0 +1,790 @@
+/* jcal.c -- Routines for converting iCalendar to/from jCal
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef WITH_JSON
+
+#include <stdio.h> /* for snprintf() */
+#include <stddef.h> /* for offsetof() macro */
+#include <syslog.h>
+
+#include "httpd.h"
+#include "jcal.h"
+#include "xcal.h"
+#include "util.h"
+#include "version.h"
+#include "xstrlcat.h"
+
+
+/*
+ * Construct a JSON string for an iCalendar Period.
+ */
+static char *icalperiodtype_as_json_string(struct icalperiodtype p)
+{
+ static char str42;
+ const char *start;
+ const char *end;
+
+ start = icaltime_as_iso_string(p.start);
+ snprintf(str, sizeof(str), "%s/", start);
+
+ if (!icaltime_is_null_time(p.end))
+	end = icaltime_as_iso_string(p.end);
+ else
+	end = icaldurationtype_as_ical_string(p.duration);
+
+ strlcat(str, end, sizeof(str));
+ 
+ return str;
+}
+
+
+/*
+ * Add an iCalendar recur-rule-part to a JSON recur object.
+ */
+static void icalrecur_add_int_to_json_object(void *jrecur, const char *rpart,
+					 int i)
+{
+ json_object_set_new((json_t *) jrecur, rpart, json_integer(i));
+}
+
+static void icalrecur_add_string_to_json_object(void *jrecur, const char *rpart,
+						const char *s)
+{
+ json_object_set_new((json_t *) jrecur, rpart, json_string(s));
+}
+
+
+/*
+ * Construct a JSON "structured value" for an iCalendar REQUEST-STATUS.
+ */
+static json_t *icalreqstattype_as_json_array(struct icalreqstattype stat)
+{
+ json_t *jstat;
+ char code22;
+
+ icalerror_check_arg_rz((stat.code != ICAL_UNKNOWN_STATUS),"Status");
+
+ if (!stat.desc) stat.desc = icalenum_reqstat_desc(stat.code);
+
+ jstat = json_array();
+ 
+ snprintf(code, sizeof(code), "%u.%u",
+	 icalenum_reqstat_major(stat.code),
+	 icalenum_reqstat_minor(stat.code));
+
+ json_array_append_new(jstat, json_string(code));
+ json_array_append_new(jstat, json_string(stat.desc));
+ if (stat.debug) json_array_append_new(jstat, json_string(stat.debug));
+
+ return jstat;
+}
+
+
+/*
+ * Construct the proper JSON object for an iCalendar value.
+ */
+static json_t *icalvalue_as_json_object(const icalvalue *value)
+{
+ const char *str = NULL;
+ json_t *obj;
+
+ switch (icalvalue_isa(value)) {
+ case ICAL_BOOLEAN_VALUE:
+	return (icalvalue_get_integer(value) ? json_true() : json_false());
+
+ case ICAL_DATE_VALUE:
+	str = icaltime_as_iso_string(icalvalue_get_date(value));
+	break;
+
+ case ICAL_DATETIME_VALUE:
+	str = icaltime_as_iso_string(icalvalue_get_datetime(value));
+	break;
+
+ case ICAL_DATETIMEPERIOD_VALUE: {
+	struct icaldatetimeperiodtype dtp =
+	 icalvalue_get_datetimeperiod(value);
+
+	if (!icaltime_is_null_time(dtp.time))
+	 str = icaltime_as_iso_string(dtp.time);
+	else
+	 str = icalperiodtype_as_json_string(dtp.period);
+	break;
+ }
+
+ case ICAL_FLOAT_VALUE:
+	return json_real(icalvalue_get_float(value));
+
+ case ICAL_GEO_VALUE: {
+	struct icalgeotype geo = icalvalue_get_geo(value);
+
+	obj = json_array();
+	json_array_append_new(obj, json_real(geo.lat));
+	json_array_append_new(obj, json_real(geo.lon));
+	return obj;
+ }
+
+ case ICAL_INTEGER_VALUE:
+	return json_integer(icalvalue_get_integer(value));
+
+ case ICAL_PERIOD_VALUE:
+	str = icalperiodtype_as_json_string(icalvalue_get_period(value));
+	break;
+
+ case ICAL_RECUR_VALUE: {
+	struct icalrecurrencetype recur = icalvalue_get_recur(value);
+
+	obj = json_object();
+	icalrecurrencetype_add_as_xxx(&recur, obj,
+				 &icalrecur_add_int_to_json_object,
+				 &icalrecur_add_string_to_json_object);
+	return obj;
+ }
+
+ case ICAL_REQUESTSTATUS_VALUE:
+	return
+	 icalreqstattype_as_json_array(icalvalue_get_requeststatus(value));
+
+ case ICAL_TRIGGER_VALUE: {
+	struct icaltriggertype trig = icalvalue_get_trigger(value);
+
+	if (!icaltime_is_null_time(trig.time))
+	 str = icaltime_as_iso_string(trig.time);
+	else
+	 str = icaldurationtype_as_ical_string(trig.duration);
+	break;
+ }
+
+ case ICAL_UTCOFFSET_VALUE:
+	str = icalvalue_utcoffset_as_iso_string(value);
+	break;
+
+ default:
+	str = icalvalue_as_ical_string(value);
+	break;
+ }
+
+ return (str ? json_string(str) : NULL);
+}
+
+
+/*
+ * Add an iCalendar parameter to an existing JSON object.
+ */
+static void icalparameter_as_json_object_member(icalparameter *param,
+						json_t *jparams)
+{
+ icalparameter_kind kind;
+ const char *kind_string, *value_string;
+
+ kind = icalparameter_isa(param);
+
+ switch (kind) {
+ case ICAL_X_PARAMETER:
+ kind_string = icalparameter_get_xname(param);
+	break;
+
+ case ICAL_IANA_PARAMETER:
+	kind_string = icalparameter_get_iana_name(param);
+	break;
+
+ default:
+	kind_string = icalparameter_kind_to_string(kind);
+	if (kind_string) break;
+
+ case ICAL_NO_PARAMETER:
+ case ICAL_ANY_PARAMETER:
+	 icalerror_set_errno(ICAL_BADARG_ERROR);
+	 return;
+ }
+
+ /* XXX Need to handle multi-valued parameters */
+ value_string = icalparameter_get_xvalue(param);
+ if (!value_string) {
+	icalparameter_value value = icalparameter_get_value(param);
+
+	if (value) value_string = icalparameter_enum_to_string(value);
+ }
+ if (!value_string) return;
+
+ json_object_set_new(jparams, lcase(icalmemory_tmp_copy(kind_string)),
+			json_string(value_string));
+}
+
+
+/*
+ * Construct a JSON array for an iCalendar property.
+ */
+static json_t *icalproperty_as_json_array(icalproperty *prop)
+{ 
+ icalproperty_kind prop_kind;
+ const char *x_name, *property_name = NULL; 
+ icalparameter *param;
+ const char *type = NULL;
+ const icalvalue *value;
+ json_t *jprop, *jparams;
+
+ if (!prop) return NULL;
+ 
+ prop_kind = icalproperty_isa(prop);
+ x_name = icalproperty_get_x_name(prop);
+
+ if (prop_kind == ICAL_X_PROPERTY && x_name)
+	property_name = x_name;
+ else
+	property_name = icalproperty_kind_to_string(prop_kind);
+
+ if (!property_name) {
+	icalerror_warn("Got a property of an unknown kind.");
+	return NULL;
+ }
+
+ /* Create property array */
+ jprop = json_array();
+
+
+ /* Add property name */
+ json_array_append_new(jprop,
+			 json_string(lcase(icalmemory_tmp_copy(property_name))));
+
+
+ /* Add parameters */
+ jparams = json_object();
+ for (param = icalproperty_get_first_parameter(prop, ICAL_ANY_PARAMETER);
+	 param != 0;
+	 param = icalproperty_get_next_parameter(prop, ICAL_ANY_PARAMETER)) {
+
+	if (icalparameter_isa(param) == ICAL_VALUE_PARAMETER) continue;
+
+	icalparameter_as_json_object_member(param, jparams);
+ }
+ json_array_append_new(jprop, jparams);
+
+
+ /* Add type */
+ type = icalproperty_value_kind_as_string(prop);
+ json_array_append_new(jprop, json_string(lcase(icalmemory_tmp_copy(type))));
+
+
+ /* Add value */
+ /* XXX Need to handle multi-valued properties */
+ value = icalproperty_get_value(prop);
+ if (value) json_array_append_new(jprop, icalvalue_as_json_object(value));
+
+ return jprop;
+}
+
+
+/*
+ * Construct a JSON array for an iCalendar component.
+ */
+static json_t *icalcomponent_as_json_array(icalcomponent *comp)
+{
+ icalcomponent *c;
+ icalproperty *p;
+ icalcomponent_kind kind;
+ const char* kind_string;
+ json_t *jcomp, *jprops, *jsubs;
+
+ if (!comp) return NULL;
+
+ kind = icalcomponent_isa(comp);
+ switch (kind) {
+ case ICAL_NO_COMPONENT:
+	return NULL;
+	break;
+
+ case ICAL_X_COMPONENT:
+	kind_string = ""; //comp->x_name;
+	break;
+
+ default:
+	kind_string = icalcomponent_kind_to_string(kind);
+ }
+
+
+ /* Create component array */
+ jcomp = json_array();
+
+
+ /* Add component name */
+ json_array_append_new(jcomp,
+	json_string(lcase(icalmemory_tmp_copy(kind_string))));
+
+
+ /* Add properties */
+ jprops = json_array();
+ for (p = icalcomponent_get_first_property(comp, ICAL_ANY_PROPERTY);
+	 p;
+	 p = icalcomponent_get_next_property(comp, ICAL_ANY_PROPERTY)) {
+
+	json_array_append_new(jprops, icalproperty_as_json_array(p));
+ }
+ json_array_append_new(jcomp, jprops);
+
+
+ /* Add sub-components */
+ jsubs = json_array();
+ for (c = icalcomponent_get_first_component(comp, ICAL_ANY_COMPONENT);
+	 c;
+	 c = icalcomponent_get_next_component(comp, ICAL_ANY_COMPONENT)) {
+
+	json_array_append_new(jsubs, icalcomponent_as_json_array(c));
+ }
+ json_array_append_new(jcomp, jsubs);
+
+ return jcomp;
+}
+
+
+/*
+ * Construct a jCal string for an iCalendar component.
+ */
+const char *icalcomponent_as_jcal_string(icalcomponent *ical)
+{
+ json_t *jcal;
+ size_t flags = JSON_PRESERVE_ORDER;
+ char *freeme;
+ const char *buf;
+
+ if (!ical) return NULL;
+
+ jcal = icalcomponent_as_json_array(ical);
+
+ flags |= (config_httpprettytelemetry ? JSON_INDENT(2) : JSON_COMPACT);
+ freeme = json_dumps(jcal, flags);
+ buf = icalmemory_tmp_copy(freeme);
+ free(freeme);
+
+ json_decref(jcal);
+
+ return buf;
+}
+
+
+struct icalrecur_parser {
+ const char* rule;
+ char* copy;
+ char* this_clause;
+ char* next_clause;
+
+ struct icalrecurrencetype rt;
+};
+
+extern icalrecurrencetype_frequency icalrecur_string_to_freq(const char* str);
+extern void icalrecur_add_byrules(struct icalrecur_parser *parser, short *array,
+				 int size, char* vals);
+extern void icalrecur_add_bydayrules(struct icalrecur_parser *parser,
+				 const char* vals);
+
+static const char *json_x_value(json_t *jvalue)
+{
+ static char buf21;
+
+ if (json_is_integer(jvalue)) {
+	snprintf(buf, sizeof(buf), "%" JSON_INTEGER_FORMAT,
+		 json_integer_value(jvalue));
+	return buf;
+ }
+ else return json_string_value(jvalue);
+}
+
+/*
+ * Construct an iCalendar property value from a JSON object.
+ */
+static icalvalue *json_object_to_icalvalue(json_t *jvalue,
+					 icalvalue_kind kind)
+{
+ icalvalue *value = NULL;
+ int len, i;
+
+ switch (kind) {
+ case ICAL_BOOLEAN_VALUE:
+	if (json_is_boolean(jvalue))
+	 value = icalvalue_new_integer(json_is_true(jvalue));
+	else
+	 syslog(LOG_WARNING, "jCal boolean object expected");
+	break;
+
+ case ICAL_FLOAT_VALUE:
+	if (json_is_real(jvalue))
+	 value = icalvalue_new_float((float) json_real_value(jvalue));
+	else
+	 syslog(LOG_WARNING, "jCal double object expected");
+	break;
+
+ case ICAL_GEO_VALUE:
+	/* MUST be an array of 2 doubles */
+	if (json_is_array(jvalue) && (len = json_array_size(jvalue)) != 2) {
+
+	 for (i = 0;
+		 i < len && json_is_real(json_array_get(jvalue, i));
+		 i++);
+	 if (i == len) {
+		struct icalgeotype geo;
+
+		geo.lat =
+		 json_real_value(json_array_get(jvalue, 0));
+		geo.lon =
+		 json_real_value(json_array_get(jvalue, 1));
+
+		value = icalvalue_new_geo(geo);
+	 }
+	}
+	if (!value)
+	 syslog(LOG_WARNING, "jCal array object of 2 doubles expected");
+	break;
+
+ case ICAL_INTEGER_VALUE:
+	if (json_is_integer(jvalue))
+	 value = icalvalue_new_integer((int) json_integer_value(jvalue));
+	else
+	 syslog(LOG_WARNING, "jCal integer object expected");
+	break;
+
+ case ICAL_RECUR_VALUE:
+	if (json_is_object(jvalue)) {
+	 struct icalrecurrencetype *rt = NULL;
+	 const char *key;
+	 json_t *val;
+
+	 json_object_foreach(jvalue, key, val) {
+		rt = icalrecur_add_rule(&rt, key, val,
+		 (int (*)(void *)) &json_integer_value,
+		 (const char * (*)(void *)) &json_x_value);
+		if (!rt) break;
+	 }
+
+ if (rt && rt->freq != ICAL_NO_RECURRENCE)
+		value = icalvalue_new_recur(*rt);
+	}
+	else
+	 syslog(LOG_WARNING, "jCal object object expected");
+	break;
+
+ case ICAL_REQUESTSTATUS_VALUE:
+	/* MUST be an array of 2-3 strings */
+	if (json_is_array(jvalue) &&
+	 ((len = json_array_size(jvalue)) == 2 || len == 3)) {
+
+	 for (i = 0;
+		 i < len && json_is_string(json_array_get(jvalue, i));
+		 i++);
+	 if (i == len) {
+		struct icalreqstattype rst =
+		 { ICAL_UNKNOWN_STATUS, NULL, NULL };
+		short maj, min;
+
+		if (sscanf(json_string_value(json_array_get(jvalue, 0)),
+			 "%hd.%hd", &maj, &min) == 2) {
+		 rst.code = icalenum_num_to_reqstat(maj, min);
+		}
+		if (rst.code == ICAL_UNKNOWN_STATUS) {
+		 syslog(LOG_WARNING, "Unknown request-status code");
+		 break;
+		}
+
+		rst.desc =
+		 json_string_value(json_array_get(jvalue, 1));
+		rst.debug = (len < 3) ? NULL :
+		 json_string_value(json_array_get(jvalue, 2));
+
+		value = icalvalue_new_requeststatus(rst);
+	 }
+	}
+	if (!value)
+	 syslog(LOG_WARNING, "jCal array object of 2-3 strings expected");
+	break;
+
+ case ICAL_UTCOFFSET_VALUE:
+	if (json_is_string(jvalue)) {
+	 int utcoffset, hours, minutes, seconds = 0;
+	 char sign;
+
+	 if (sscanf(json_string_value(jvalue), "%c%02d:%02d:%02d",
+		 &sign, &hours, &minutes, &seconds) < 3) {
+		syslog(LOG_WARNING, "Unexpected utc-offset format");
+		break;
+	 }
+
+	 utcoffset = hours*3600 + minutes*60 + seconds;
+
+	 if (sign == '-') utcoffset = -utcoffset;
+
+	 value = icalvalue_new_utcoffset(utcoffset);
+	}
+	else
+	 syslog(LOG_WARNING, "jCal string object expected");
+	break;
+
+ default:
+	if (json_is_string(jvalue))
+	 value = icalvalue_new_from_string(kind,
+					 json_string_value(jvalue));
+	else
+	 syslog(LOG_WARNING, "jCal string object expected");
+	break;
+ }
+
+ return value;
+}
+
+
+/*
+ * Construct an iCalendar property from a JSON array.
+ */
+static icalproperty *json_array_to_icalproperty(json_t *jprop)
+{
+ json_t *jtype, *jparams, *jvaltype, *jvalue;
+ const char *propname, *typestr, *key;
+ icalproperty_kind kind;
+ icalproperty *prop = NULL;
+ icalvalue_kind valkind;
+ icalvalue *value;
+
+ /* Sanity check the types of the jCal property object */
+ if (!json_is_array(jprop) || json_array_size(jprop) < 4) {
+	syslog(LOG_WARNING,
+	 "jCal component object is not an array of 4+ objects");
+	return NULL;
+ }
+
+ jtype = json_array_get(jprop, 0);
+ jparams = json_array_get(jprop, 1);
+ jvaltype = json_array_get(jprop, 2);
+
+ if (!json_is_string(jtype) ||
+	!json_is_object(jparams) || !json_is_string(jvaltype)) {
+	syslog(LOG_WARNING, "jCal property array contains incorrect objects");
+	return NULL;
+ }
+
+ /* Get the property type */
+ propname = ucase(icalmemory_tmp_copy(json_string_value(jtype)));
+ kind = icalenum_string_to_property_kind(propname);
+ if (kind == ICAL_NO_PROPERTY) {
+	syslog(LOG_WARNING, "Unknown jCal property type: %s", propname);
+	return NULL;
+ }
+
+ /* Get the value type */
+ typestr = json_string_value(jvaltype);
+ valkind = !strcmp(typestr, "unknown") ? ICAL_X_VALUE :
+	icalenum_string_to_value_kind(ucase(icalmemory_tmp_copy(typestr)));
+ if (valkind == ICAL_NO_VALUE) {
+	syslog(LOG_WARNING, "Unknown jCal value type for %s property: %s",
+	 propname, typestr);
+	return NULL;
+ }
+ else if (valkind == ICAL_TEXT_VALUE) {
+	/* "text" also includes enumerated types - grab type from property */
+	valkind = icalproperty_kind_to_value_kind(kind);
+ }
+
+ /* Create new property */
+ prop = icalproperty_new(kind);
+ if (!prop) {
+	syslog(LOG_ERR, "Creation of new %s property failed", propname);
+	return NULL;
+ }
+ if (kind == ICAL_X_PROPERTY) icalproperty_set_x_name(prop, propname);
+
+ /* Add parameters */
+ json_object_foreach(jparams, key, jvalue) {
+	/* XXX Need to handle multi-valued parameters */
+	icalproperty_set_parameter_from_string(prop,
+					 ucase(icalmemory_tmp_copy(key)),
+					 json_string_value(jvalue));
+ }
+
+ /* Add value */
+ /* XXX Need to handle multi-valued properties */
+ jvalue = json_array_get(jprop, 3);
+ value = json_object_to_icalvalue(jvalue, valkind);
+ if (!value) {
+ 	syslog(LOG_ERR, "Creation of new %s property value failed", propname);
+ 	goto error;
+ }
+
+ icalproperty_set_value(prop, value);
+
+ return prop;
+
+ error:
+ icalproperty_free(prop);
+ return NULL;
+}
+
+
+/*
+ * Construct an iCalendar component from a JSON object.
+ */
+static icalcomponent *json_object_to_icalcomponent(json_t *jobj)
+{
+ json_t *jtype, *jprops, *jsubs;
+ const char *type;
+ icalcomponent_kind kind;
+ icalcomponent *comp = NULL;
+ size_t i;
+
+ /* Sanity check the types of the jCal component object */
+ if (!json_is_array(jobj) || json_array_size(jobj) != 3) {
+	syslog(LOG_WARNING,
+	 "jCal component object is not an array of 3 objects");
+	return NULL;
+ }
+
+ jtype = json_array_get(jobj, 0);
+ jprops = json_array_get(jobj, 1);
+ jsubs = json_array_get(jobj, 2);
+
+ if (!json_is_string(jtype) ||
+	!json_is_array(jprops) || !json_is_array(jsubs)) {
+	syslog(LOG_WARNING, "jCal component array contains incorrect objects");
+	return NULL;
+ }
+
+ type = json_string_value(jtype);
+ kind = icalenum_string_to_component_kind(ucase(icalmemory_tmp_copy(type)));
+ if (kind == ICAL_NO_COMPONENT) {
+	syslog(LOG_WARNING, "Unknown jCal component type: %s", type);
+	return NULL;
+ }
+
+ /* Create new component */
+ comp = icalcomponent_new(kind);
+ if (!comp) {
+	syslog(LOG_ERR, "Creation of new %s component failed", type);
+	return NULL;
+ }
+
+ /* Add properties */
+ for (i = 0; i < json_array_size(jprops); i++) {
+	icalproperty *prop =
+	 json_array_to_icalproperty(json_array_get(jprops, i));
+
+	if (!prop) goto error;
+
+	icalcomponent_add_property(comp, prop);
+ }
+
+ /* Add sub-components */
+ for (i = 0; i < json_array_size(jsubs); i++) {
+	icalcomponent *sub =
+	 json_object_to_icalcomponent(json_array_get(jsubs, i));
+
+	if (!sub) goto error;
+
+	icalcomponent_add_component(comp, sub);
+ }
+
+ return comp;
+
+ error:
+ icalcomponent_free(comp);
+ return NULL;
+}
+
+
+/*
+ * Construct an iCalendar component from a jCal string.
+ */
+EXPORTED icalcomponent *jcal_string_as_icalcomponent(const char *str)
+{
+ json_t *jcal;
+ json_error_t jerr;
+ icalcomponent *ical;
+
+ if (!str) return NULL;
+
+ jcal = json_loads(str, 0, &jerr);
+ if (!jcal) {
+	syslog(LOG_WARNING, "json parse error: '%s'", jerr.text);
+	return NULL;
+ }
+
+ ical = json_object_to_icalcomponent(jcal);
+
+ json_decref(jcal);
+
+ return ical;
+}
+
+
+EXPORTED const char *begin_jcal(struct buf *buf)
+{
+ /* Begin jCal stream */
+ buf_reset(buf);
+ buf_printf_markup(buf, 0, "");
+ buf_printf_markup(buf, 1, "\"vcalendar\",");
+ buf_printf_markup(buf, 1, "");
+ buf_printf_markup(buf, 2, "");
+ buf_printf_markup(buf, 3, "\"prodid\",");
+ buf_printf_markup(buf, 3, "{");
+ buf_printf_markup(buf, 3, "},");
+ buf_printf_markup(buf, 3, "\"text\",");
+ buf_printf_markup(buf, 3, "\"-//CyrusIMAP.org/Cyrus %s//EN\"",
+		 cyrus_version());
+ buf_printf_markup(buf, 2, ",");
+ buf_printf_markup(buf, 2, "");
+ buf_printf_markup(buf, 3, "\"version\",");
+ buf_printf_markup(buf, 3, "{");
+ buf_printf_markup(buf, 3, "},");
+ buf_printf_markup(buf, 3, "\"text\",");
+ buf_printf_markup(buf, 3, "\"2.0\"");
+ buf_printf_markup(buf, 2, "");
+ buf_printf_markup(buf, 1, ",");
+ buf_printf_markup(buf, 0, "");
+
+ return ",";
+}
+
+
+EXPORTED void end_jcal(struct buf *buf)
+{
+ /* End jCal stream */
+ buf_setcstr(buf, "");
+}
+
+#endif /* WITH_JSON */

cyrus-imapd-2.5.tar.gz/imap/jcal.h Added

@@ -0,0 +1,58 @@
+/* jcal.h -- Routines for converting iCalendar to/from jCal
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#ifdef WITH_JSON
+
+#include <libical/ical.h>
+#include <jansson.h>
+
+#include "util.h"
+
+extern const char *icalcomponent_as_jcal_string(icalcomponent* comp);
+extern icalcomponent *jcal_string_as_icalcomponent(const char *str);
+extern const char *begin_jcal(struct buf *buf);
+extern void end_jcal(struct buf *buf);
+
+#endif /* WITH_JSON */

cyrus-imapd-2.4.17.tar.gz/imap/lmtp_sieve.c -> cyrus-imapd-2.5.tar.gz/imap/lmtp_sieve.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lmtp_sieve.c,v 1.20 2010/01/06 17:01:35 murch Exp $
 */
 
 #include <config.h>
@@ -58,25 +56,27 @@
 
 #include "annotate.h"
 #include "append.h"
+#include "assert.h"
 #include "auth.h"
 #include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "lmtpd.h"
 #include "lmtp_sieve.h"
 #include "lmtpengine.h"
-#include "lmtpstats.h"
+#include "imap/lmtpstats.h"
 #include "notify.h"
 #include "prot.h"
-#include "rfc822date.h"
-#include "sieve_interface.h"
+#include "times.h"
+#include "sieve/sieve_interface.h"
 #include "smtpclient.h"
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
+#include "me.h"
 
 static int sieve_usehomedir = 0;
 static const char *sieve_dir = NULL;
@@ -88,6 +88,9 @@
 struct auth_state *authstate;
 } script_data_t;
 
+static int autosieve_createfolder(const char *userid, struct auth_state *auth_state,
+				 const char *internalname);
+
 static char *make_sieve_db(const char *user)
 {
 static char bufMAX_MAILBOX_PATH+1;
@@ -223,7 +226,7 @@
 char buf8192, *namebuf;
 int i, sm_stat;
 time_t t;
- char datestr80;
+ char datestrRFC822_DATETIME_MAX+1;
 pid_t sm_pid, p;
 duplicate_key_t dkey = DUPLICATE_INITIALIZER;
 
@@ -246,11 +249,13 @@
 
 namebuf = make_sieve_db(mailreceip);
 
+ time_to_rfc822(t, datestr, sizeof(datestr));
+
 dkey.id = buf;
 dkey.to = namebuf;
- rfc822date_gen(datestr, sizeof(datestr), t);
 dkey.date = datestr;
 duplicate_mark(&dkey, t, 0);
+
 fprintf(sm, "Message-ID: %s\r\n", buf);
 fprintf(sm, "Date: %s\r\n", datestr);
 
@@ -284,7 +289,7 @@
 	 config_servername, cyrus_version(), SIEVE_VERSION);
 if (origreceip)
 	fprintf(sm, "Original-Recipient: rfc822; %s\r\n", origreceip);
- fprintf(sm, "Final-Recipient: rfc822; %s\r\n", mailreceip);
+ fprintf(sm, "Final-Recipient: rfc822; %s\r\n", me_create_sasl_enc(mailreceip));
 if (origid)
 	fprintf(sm, "Original-Message-ID: %s\r\n", origid);
 fprintf(sm, "Disposition: "
@@ -457,7 +462,7 @@
 	return SIEVE_OK;
 }
 
- body = msg_getheader(md, "original-recipient");
+ body = msg_getheader(md, "x-delivered-to");
 origreceip = body ? body0 : NULL;
 if ((res = send_rejection(md->id, md->return_path, 
 			 origreceip, sd->username,
@@ -498,12 +503,25 @@
 						 sd->username, namebuf);
 if (!ret) {
 	ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
-			 fc->imapflags->flag, fc->imapflags->nflags,
+			 fc->imapflags,
 			 (char *) sd->username, sd->authstate, md->id,
 			 sd->username, mdata->notifyheader,
 			 namebuf, md->date, quotaoverride, 0);
 }
 
+ if (ret == IMAP_MAILBOX_NONEXISTENT) {
+	/* if "plus" folder under INBOX, then try to create it */
+	ret = autosieve_createfolder(sd->username, sd->authstate, namebuf);
+
+	/* Try to deliver the mail again. */
+	if (!ret)
+	 ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
+				 fc->imapflags,
+				 (char *) sd->username, sd->authstate, md->id,
+				 sd->username, mdata->notifyheader,
+				 namebuf, md->date, quotaoverride, 0);
+ }
+
 if (!ret) {
 	snmp_increment(SIEVE_FILEINTO, 1);
 	return SIEVE_OK;
@@ -522,7 +540,7 @@
 deliver_data_t *mydata = (deliver_data_t *) mc;
 int ret;
 
- ret = deliver_local(mydata, kc->imapflags->flag, kc->imapflags->nflags,
+ ret = deliver_local(mydata, kc->imapflags,
 			(char *) sd->username, sd->mailboxname);
 
 if (!ret) {
@@ -605,7 +623,7 @@
 }
 
 if (ret == SIEVE_OK) {
-	duplicate_mark(&dkey, now + arc->days * (24 * 60 * 60), 0);
+	duplicate_mark(&dkey, now + arc->seconds, 0);
 }
 
 free(id);
@@ -622,7 +640,7 @@
 char outmsgid8192, *sievedb;
 int i, sl, sm_stat;
 time_t t;
- char datestr80;
+ char datestrRFC822_DATETIME_MAX+1;
 pid_t sm_pid, p;
 sieve_send_response_context_t *src = (sieve_send_response_context_t *) ac;
 message_data_t *md = ((deliver_data_t *) mc)->m;
@@ -649,7 +667,7 @@
 
 fprintf(sm, "Message-ID: %s\r\n", outmsgid);
 
- rfc822date_gen(datestr, sizeof(datestr), t);
+ time_to_rfc822(t, datestr, sizeof(datestr));
 fprintf(sm, "Date: %s\r\n", datestr);
 
 fprintf(sm, "X-Sieve: %s\r\n", SIEVE_VERSION);
@@ -703,17 +721,13 @@
 }
 
 /* vacation support */
-sieve_vacation_t vacation = {
- 1,				/* min response */
- 31,				/* max response */
+static sieve_vacation_t vacation = {
+ 1 * DAY2SEC,		/* min response */
+ 31 * DAY2SEC,		/* max response */
 &autorespond,		/* autorespond() */
 &send_response,		/* send_response() */
 };
 
-/* imapflags support */
-static char *markflags = { "\\flagged" };
-static sieve_imapflags_t mark = { markflags, 1 };
-
 static int sieve_parse_error_handler(int lineno, const char *msg, 
 				 void *ic __attribute__((unused)),
 				 void *sc)
@@ -743,6 +757,10 @@
 {
 sieve_interp_t *interp = NULL;
 int res;
+ static strarray_t mark = STRARRAY_INITIALIZER;
+
+ if (!mark.count)
+	strarray_append(&mark, "\\flagged");
 
 sieve_usehomedir = config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR);
 if (!sieve_usehomedir) {
@@ -751,75 +769,22 @@
 	sieve_dir = NULL;
 }
 
- res = sieve_interp_alloc(&interp, NULL);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_interp_alloc() returns %d\n", res);
-	fatal("sieve_interp_alloc()", EC_SOFTWARE);
- }
+ interp = sieve_interp_alloc(NULL);
+ assert(interp != NULL);
 
- res = sieve_register_redirect(interp, &sieve_redirect);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_redirect() returns %d\n", res);
-	fatal("sieve_register_redirect()", EC_SOFTWARE);
- }
- res = sieve_register_discard(interp, &sieve_discard);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_discard() returns %d\n", res);
-	fatal("sieve_register_discard()", EC_SOFTWARE);
- }
- res = sieve_register_reject(interp, &sieve_reject);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_reject() returns %d\n", res);
-	fatal("sieve_register_reject()", EC_SOFTWARE);
- }
- res = sieve_register_fileinto(interp, &sieve_fileinto);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_fileinto() returns %d\n", res);
-	fatal("sieve_register_fileinto()", EC_SOFTWARE);
- }
- res = sieve_register_keep(interp, &sieve_keep);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_keep() returns %d\n", res);
-	fatal("sieve_register_keep()", EC_SOFTWARE);
- }
- res = sieve_register_imapflags(interp, &mark);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_imapflags() returns %d\n", res);
-	fatal("sieve_register_imapflags()", EC_SOFTWARE);
- }
- res = sieve_register_notify(interp, &sieve_notify);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_notify() returns %d\n", res);
-	fatal("sieve_register_notify()", EC_SOFTWARE);
- }
- res = sieve_register_size(interp, &getsize);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_size() returns %d\n", res);
-	fatal("sieve_register_size()", EC_SOFTWARE);
- }
- res = sieve_register_header(interp, &getheader);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_header() returns %d\n", res);
-	fatal("sieve_register_header()", EC_SOFTWARE);
- }
+ sieve_register_redirect(interp, &sieve_redirect);
+ sieve_register_discard(interp, &sieve_discard);
+ sieve_register_reject(interp, &sieve_reject);
+ sieve_register_fileinto(interp, &sieve_fileinto);
+ sieve_register_keep(interp, &sieve_keep);
+ sieve_register_imapflags(interp, &mark);
+ sieve_register_notify(interp, &sieve_notify);
+ sieve_register_size(interp, &getsize);
+ sieve_register_header(interp, &getheader);
 
- res = sieve_register_envelope(interp, &getenvelope);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR,"sieve_register_envelope() returns %d\n", res);
-	fatal("sieve_register_envelope()", EC_SOFTWARE);
- }
- 
- res = sieve_register_body(interp, &getbody);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR,"sieve_register_body() returns %d\n", res);
-	fatal("sieve_register_body()", EC_SOFTWARE);
- }
- 
- res = sieve_register_include(interp, &getinclude);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR,"sieve_register_include() returns %d\n", res);
-	fatal("sieve_register_include()", EC_SOFTWARE);
- }
+ sieve_register_envelope(interp, &getenvelope);
+ sieve_register_body(interp, &getbody);
+ sieve_register_include(interp, &getinclude);
 
 res = sieve_register_vacation(interp, &vacation);
 if (res != SIEVE_OK) {
@@ -827,18 +792,8 @@
 	fatal("sieve_register_vacation()", EC_SOFTWARE);
 }
 
- res = sieve_register_parse_error(interp, &sieve_parse_error_handler);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_parse_error() returns %d\n", res);
-	fatal("sieve_register_parse_error()", EC_SOFTWARE);
- }
- 
- res = sieve_register_execute_error(interp, 
-				 &sieve_execute_error_handler);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_execute_error() returns %d\n", res);
-	fatal("sieve_register_execute_error()", EC_SOFTWARE);
- }
+ sieve_register_parse_error(interp, &sieve_parse_error_handler);
+ sieve_register_execute_error(interp, &sieve_execute_error_handler);
 
 return interp;
 }
@@ -894,7 +849,7 @@
 	 sieve_interp_t *interp, deliver_data_t *msgdata)
 {
 char namebufMAX_MAILBOX_BUFFER = "";
- struct annotation_data attrib;
+ struct buf attrib = BUF_INITIALIZER;
 const char *script = NULL;
 char fnameMAX_MAILBOX_PATH+1;
 sieve_execute_t *bc = NULL;
@@ -911,19 +866,22 @@
 
 	if (annotatemore_lookup(namebuf,
 				"/vendor/cmu/cyrus-imapd/sieve", "",
-				&attrib) != 0 || !attrib.value) {
+				&attrib) != 0 || !attrib.s) {
 	 /* no sieve script annotation */
 	 return 1; /* do normal delivery actions */
 	}
 
-	script = attrib.value;
+	script = buf_cstring(&attrib);
 }
 
 if (sieve_find_script(user, domain, script, fname, sizeof(fname)) != 0 ||
 	sieve_script_load(fname, &bc) != SIEVE_OK) {
+	buf_free(&attrib);
 	/* no sieve script */
 	return 1; /* do normal delivery actions */
 }
+ buf_free(&attrib);
+ script = NULL;
 
 if (user) strlcpy(userbuf, user, sizeof(userbuf));
 if (domain) {
@@ -973,3 +931,61 @@
 we'll do normal delivery */
 return r;
 }
+
+
+#define SEP "|"
+
+static int autosieve_createfolder(const char *userid, struct auth_state *auth_state,
+				 const char *internalname)
+{
+ const char *subf ;
+ int createsievefolder = 0;
+ int r = 0;
+ int n;
+
+ /* Check if internalname or userid are NULL */
+ if (userid == NULL || internalname == NULL)
+	return IMAP_MAILBOX_NONEXISTENT;
+
+ syslog(LOG_DEBUG, "autosievefolder: autosieve_createfolder() was called for user %s, folder %s", 
+	 userid, internalname);
+
+ if (config_getswitch(IMAPOPT_ANYSIEVEFOLDER)) {
+	createsievefolder = 1;
+ }
+ else if ((subf = config_getstring(IMAPOPT_AUTOSIEVEFOLDERS)) != NULL) {
+	strarray_t *create = strarray_split(subf, SEP, STRARRAY_TRIM);
+
+	for (n = 0; n < create->count; n++) {
+	 const char *name = strarray_nth(create, n);
+	 char *foldername = mboxname_user_mbox(userid, name);
+
+	 if (!strcmp(foldername, internalname))
+		createsievefolder = 1;
+
+	 free(foldername);
+	 if (createsievefolder) break;
+	}
+
+	strarray_free(create);
+ }
+
+ if (createsievefolder) {
+	/* Folder is already in internal namespace format */
+	r = mboxlist_createmailbox(internalname, 0, NULL,
+				 1, userid, auth_state, 0, 0, 0, 1, NULL);
+	if (!r) {
+	 mboxlist_changesub(internalname, userid, auth_state, 1, 1, 1);
+	 syslog(LOG_DEBUG, "autosievefolder: User %s, folder %s creation succeeded",
+		 userid, internalname);
+	 return 0;
+	} else {
+	 syslog(LOG_ERR, "autosievefolder: User %s, folder %s creation failed. %s",
+		 userid, internalname, error_message(r));
+	 return r;
+	}
+ }
+
+ return IMAP_MAILBOX_NONEXISTENT;
+}
+

cyrus-imapd-2.4.17.tar.gz/imap/lmtp_sieve.h -> cyrus-imapd-2.5.tar.gz/imap/lmtp_sieve.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/lmtpd.c -> cyrus-imapd-2.5.tar.gz/imap/lmtpd.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lmtpd.c,v 1.167 2010/05/25 20:59:19 wescraig Exp $
 */
 
 #include <config.h>
@@ -55,7 +53,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <syslog.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <netdb.h>
@@ -70,16 +67,16 @@
 #include "append.h"
 #include "assert.h"
 #include "auth.h"
+#include "autocreate.h"
 #include "backend.h"
 #include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
 #include "idle.h"
-#include "imap_err.h"
-#include "imparse.h"
-#include "cyr_lock.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "map.h"
+#include "mboxevent.h"
 #include "mboxlist.h"
 #include "mboxname.h"
 #include "message.h"
@@ -98,7 +95,7 @@
 
 #include "lmtpd.h"
 #include "lmtpengine.h"
-#include "lmtpstats.h"
+#include "imap/lmtpstats.h"
 #ifdef USE_SIEVE
 #include "lmtp_sieve.h"
 
@@ -107,11 +104,14 @@
 
 #include "sync_log.h"
 
+#include "iostat.h"
+
 /* forward declarations */
 static int deliver(message_data_t *msgdata, char *authuser,
 		 struct auth_state *authstate);
 static int verify_user(const char *user, const char *domain, char *mailbox,
-		 quota_t quotacheck, struct auth_state *authstate);
+		 quota_t quotastorage_check, quota_t quotamessage_check,
+		 struct auth_state *authstate);
 static char *generate_notify(message_data_t *m);
 
 void shut_down(int code);
@@ -119,14 +119,16 @@
 static FILE *spoolfile(message_data_t *msgdata);
 static void removespool(message_data_t *msgdata);
 
+static int autocreate_inbox(const char *user, const char *domain);
+
 /* current namespace */
 static struct namespace lmtpd_namespace;
 
-struct lmtp_func mylmtp = { &deliver, &verify_user, &shut_down,
+static struct lmtp_func mylmtp = { &deliver, &verify_user, &shut_down,
 			 &spoolfile, &removespool, &lmtpd_namespace,
 			 0, 1, 0 };
 
-static void usage();
+static void usage(void);
 
 /* global state */
 const int config_need_data = CONFIG_NEED_PARTITION_DATA;
@@ -137,30 +139,31 @@
 				 same message-id */
 static int singleinstance = 1;	/* attempt single instance store */
 
-struct stagemsg *stage = NULL;
+static struct stagemsg *stage = NULL;
 
 /* per-user/session state */
 static struct protstream *deliver_out, *deliver_in;
 int deliver_logfd = -1; /* used in lmtpengine.c */
 
 /* our cached connections */
-mupdate_handle *mhandle = NULL;
+static mupdate_handle *mhandle = NULL;
 struct backend **backend_cached = NULL;
 
 static struct protocol_t lmtp_protocol =
-{ "lmtp", "lmtp",
- { 0, "220 " },
- { "LHLO", "lmtpproxyd", "250 ", NULL,
- { { "AUTH ", CAPA_AUTH },
- { "STARTTLS", CAPA_STARTTLS },
- { "PIPELINING", CAPA_PIPELINING },
- { "IGNOREQUOTA", CAPA_IGNOREQUOTA },
- { NULL, 0 } } },
- { "STARTTLS", "220", "454", 0 },
- { "AUTH", 512, 0, "235", "5", "334 ", "*", NULL, 0 },
- { NULL, NULL, NULL },
- { "NOOP", NULL, "250" },
- { "QUIT", NULL, "221" }
+{ "lmtp", "lmtp", TYPE_STD,
+ { { { 0, "220 " },
+ { "LHLO", "lmtpproxyd", "250 ", NULL,
+	CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD|CAPAF_DASH_STUFFING,
+	{ { "AUTH", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { "PIPELINING", CAPA_PIPELINING },
+	 { "IGNOREQUOTA", CAPA_IGNOREQUOTA },
+	 { NULL, 0 } } },
+ { "STARTTLS", "220", "454", 0 },
+ { "AUTH", 512, 0, "235", "5", "334 ", "*", NULL, 0 },
+ { NULL, NULL, NULL },
+ { "NOOP", NULL, "250" },
+ { "QUIT", NULL, "221" } } }
 };
 
 static struct sasl_callback mysasl_cb = {
@@ -171,14 +174,14 @@
 };
 
 
-int service_init(int argc __attribute__((unused)), 
-		 char **argv __attribute__((unused)), 
+int service_init(int argc __attribute__((unused)),
+		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
 int r;
 
 if (geteuid() == 0) return 1;
- 
+
 signals_set_shutdown(&shut_down);
 signal(SIGPIPE, SIG_IGN);
 
@@ -212,7 +215,7 @@
 #endif
 	{
 	 /* initialize duplicate delivery database */
-	 if (duplicate_init(NULL, 0) != 0) {
+	 if (duplicate_init(NULL) != 0) {
 		fatal("lmtpd: unable to init duplicate delivery database",
 		 EC_SOFTWARE);
 	 }
@@ -227,14 +230,17 @@
 	quotadb_open(NULL);
 
 	/* Initialize the annotatemore db (for sieve on shared mailboxes) */
-	annotatemore_init(0, NULL, NULL);
-	annotatemore_open(NULL);
+	annotate_init(NULL, NULL);
+	annotatemore_open();
 
 	/* setup for statuscache invalidation */
-	statuscache_open(NULL);
+	statuscache_open();
 
 	/* setup for sending IMAP IDLE notifications */
-	idle_enabled();
+	idle_init();
+
+	/* setup for mailbox event notifications */
+	mboxevent_init();
 }
 
 /* Set namespace */
@@ -243,6 +249,8 @@
 	fatal(error_message(r), EC_CONFIG);
 }
 
+ mboxevent_setnamespace(&lmtpd_namespace);
+
 /* create connection to the SNMP listener, if available. */
 snmp_connect(); /* ignore return code */
 snmp_set_str(SERVER_NAME_VERSION, cyrus_version());
@@ -252,7 +260,7 @@
 
 static int mupdate_ignore_cb(struct mupdate_mailboxdata *mdata __attribute__((unused)),
 			 const char *cmd __attribute__((unused)),
-			 void *context __attribute__((unused))) 
+			 void *context __attribute__((unused)))
 {
 /* If we get called, we've recieved something other than an OK in
 * response to the NOOP, so we want to hang up this connection anyway */
@@ -262,11 +270,20 @@
 /*
 * run for each accepted connection
 */
-int service_main(int argc, char **argv, 
+int service_main(int argc, char **argv,
 		 char **envp __attribute__((unused)))
 {
 int opt, r;
 
+ struct io_count *io_count_start = NULL;
+ struct io_count *io_count_stop = NULL;
+
+ if (config_iolog) {
+	io_count_start = xmalloc (sizeof (struct io_count));
+	io_count_stop = xmalloc (sizeof (struct io_count));
+	read_io_count(io_count_start);
+ }
+
 sync_log_init();
 
 deliver_in = prot_new(0, 0);
@@ -327,6 +344,16 @@
 
 cyrus_reset_stdio();
 
+ if (config_iolog) {
+	read_io_count(io_count_stop);
+	syslog(LOG_INFO,
+	 "LMTP session stats : I/O read : %d bytes : I/O write : %d bytes",
+		io_count_stop->io_read_count - io_count_start->io_read_count,
+		io_count_stop->io_write_count - io_count_start->io_write_count);
+	free (io_count_start);
+	free (io_count_stop);
+ }
+
 return 0;
 }
 
@@ -336,8 +363,7 @@
 shut_down(error);
 }
 
-static void
-usage()
+static void usage(void)
 {
 fprintf(stderr, "421-4.3.0 usage: lmtpd -C <alt_config> -a\r\n");
 fprintf(stderr, "421 4.3.0 %s\n", cyrus_version());
@@ -423,12 +449,11 @@
 /* proxy mboxlist_lookup; on misses, it asks the listener for this
 machine to make a roundtrip to the master mailbox server to make
 sure it's up to date */
-static int mlookup(const char *name, char **server, char **aclp, void *tid)
+static int mlookup(const char *name, mbentry_t **mbentryptr)
 {
 int r;
 char *c;
-
- if (server) *server = NULL;
+ mbentry_t *mbentry = NULL;
 
 if (mhandle) {
 	/* proxy only, so check the mupdate master */
@@ -448,38 +473,42 @@
 
 	if (mailboxdata->t == RESERVE) return IMAP_MAILBOX_RESERVED;
 
-	if (aclp) *aclp = (char *) mailboxdata->acl;
-	if (server) *server = (char *) mailboxdata->server;
-	c = strchr(*server, '!');
-	if (c) *c = '\0';
+	mbentry = mboxlist_entry_create();
+	mbentry->acl = xstrdupnull(mailboxdata->acl);
+	mbentry->server = xstrdupnull(mailboxdata->server);
+
+	/* XXX hack for now - should pull this out into mupdate_find */
+	c = strchr(mbentry->server, '!');
+	if (c) {
+	 *c++ = '\0';
+	 mbentry->partition = xstrdupnull(c);
+	}
+
 }
 else {
-	struct mboxlist_entry mbentry;
 	/* do a local lookup and kick the slave if necessary */
-	r = mboxlist_lookup(name, &mbentry, tid);
+	r = mboxlist_lookup(name, &mbentry, NULL);
 	if (r == IMAP_MAILBOX_NONEXISTENT && config_mupdate_server) {
 	 kick_mupdate();
-	 r = mboxlist_lookup(name, &mbentry, tid);
+	 mboxlist_entry_free(&mbentry);
+	 r = mboxlist_lookup(name, &mbentry, NULL);
 	}
 	if (r) return r;
-	if (mbentry.mbtype & MBTYPE_MOVING) return IMAP_MAILBOX_MOVED;
-	if (mbentry.mbtype & MBTYPE_DELETED) return IMAP_MAILBOX_NONEXISTENT;
-
-	if (aclp) *aclp = mbentry.acl;
-	if (server) {
-	 if (mbentry.mbtype & MBTYPE_REMOTE) {
-		/* xxx hide the fact that we are storing partitions */
-		*server = mbentry.partition;
-		c = strchr(*server, '!');
-		if (c) *c = '\0';
-	 }
+	if (mbentry->mbtype & MBTYPE_MOVING) {
+	 r = IMAP_MAILBOX_MOVED;
+	}
+	else if (mbentry->mbtype & MBTYPE_DELETED) {
+	 r = IMAP_MAILBOX_NONEXISTENT;
 	}
 }
 
+ if (mbentryptr && !r) *mbentryptr = mbentry;
+ else mboxlist_entry_free(&mbentry);
+
 return r;
 }
 
-/* places msg in mailbox mailboxname. 
+/* places msg in mailbox mailboxname.
 * if you wish to use single instance store, pass stage as non-NULL
 * if you want to deliver message regardless of duplicates, pass id as NULL
 * if you want to notify, pass user
@@ -490,8 +519,7 @@
 		 struct message_content *content,
 		 struct stagemsg *stage,
 		 unsigned size,
-		 char **flag,
-		 int nflags,
+		 const strarray_t *flags,
 		 char *authuser,
 		 struct auth_state *authstate,
 		 char *id,
@@ -502,26 +530,51 @@
 		 int quotaoverride,
 		 int acloverride)
 {
- int r;
+ int r = 0;
 struct appendstate as;
- unsigned long uid;
 const char *notifier;
- duplicate_key_t dkey = {NULL, NULL, NULL};
-
- r = append_setup(&as, mailboxname,
-		 authuser, authstate, acloverride ? 0 : ACL_POST, 
-		 quotaoverride ? (long) -1 :
-		 config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
-		 (long) size : 0);
+ struct mailbox *mailbox = NULL;
+ char *uuid = NULL;
+ duplicate_key_t dkey = DUPLICATE_INITIALIZER;
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
+
+ /* open the mailbox separately so we can hold it open until
+ * after the duplicate elimination is done */
+ r = mailbox_open_iwl(mailboxname, &mailbox);
+ if (r) return r;
+
+ if (quotaoverride)
+	qdiffsQUOTA_STORAGE = -1;
+ else if (config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA))
+	qdiffsQUOTA_STORAGE = size;
+ if (quotaoverride)
+	qdiffsQUOTA_MESSAGE = -1;
+ else if (config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA))
+	qdiffsQUOTA_MESSAGE = 1;
+ if (quotaoverride)
+	qdiffsQUOTA_ANNOTSTORAGE = -1;
+ else if (config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA))
+	qdiffsQUOTA_ANNOTSTORAGE = 0;
+
+ r = append_setup_mbox(&as, mailbox,
+			 authuser, authstate, acloverride ? 0 : ACL_POST,
+			 qdiffs, NULL, 0, EVENT_MESSAGE_NEW);
+ if (r) {
+	mailbox_close(&mailbox);
+	return r;
+ }
 
 /* check for duplicate message */
+ uuid = xstrdup(as.mailbox->uniqueid);
 dkey.id = id;
- dkey.to = mailboxname;
+ dkey.to = uuid;
 dkey.date = date;
- if (!r && id && dupelim && !(as.mailbox->i.options & OPT_IMAP_DUPDELIVER) &&
+ if (id && dupelim && !(as.mailbox->i.options & OPT_IMAP_DUPDELIVER) &&
 	duplicate_check(&dkey)) {
 	duplicate_log(&dkey, "delivery");
 	append_abort(&as);
+	mailbox_close(&mailbox);
+	free(uuid);
 	return 0;
 }
 
@@ -533,26 +586,27 @@
 
 if (!r) {
 	r = append_fromstage(&as, &content->body, stage, 0,
-			 (const char **) flag, nflags, !singleinstance);
+			 flags, !singleinstance,
+			 /*annotations*/NULL);
 
 	if (r) {
 	 append_abort(&as);
 	} else {
-	 struct mailbox *mailbox = NULL;
-	 /* hold the mailbox open until the duplicate mark is done */
-	 r = append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid,
-			 NULL, &mailbox);
+	 r = append_commit(&as);
 	 if (!r) {
+		/* dupelim after commit, but while mailbox is still
+		 * locked to avoid race condition */
 		syslog(LOG_INFO, "Delivered: %s to mailbox: %s",
 		 id, mailboxname);
-		if (dupelim && id) {
-		 duplicate_mark(&dkey, time(NULL), uid);
-		}
-		mailbox_close(&mailbox);
+		if (dupelim && id)
+		 duplicate_mark(&dkey, time(NULL), as.baseuid);
 	 }
 	}
 }
 
+ /* safe to close the mailbox before sending responses */
+ mailbox_close(&mailbox);
+
 if (!r && user && (notifier = config_getstring(IMAPOPT_MAILNOTIFIER))) {
 	char inboxMAX_MAILBOX_BUFFER;
 	char namebufMAX_MAILBOX_BUFFER;
@@ -567,7 +621,7 @@
 	 if (strlen(mailboxname) >= inboxlen &&
 		!strncmp(mailboxname, inbox, inboxlen) &&
 		(!mailboxnameinboxlen || mailboxnameinboxlen == '.')) {
-		strlcpy(inbox, "INBOX", sizeof(inbox)); 
+		strlcpy(inbox, "INBOX", sizeof(inbox));
 		strlcat(inbox, mailboxname+inboxlen, sizeof(inbox));
 		notify_mailbox = inbox;
 	 }
@@ -588,6 +642,7 @@
 	}
 }
 
+ free(uuid);
 return r;
 }
 
@@ -599,7 +654,7 @@
 s_done,			/* sieve script successfully run */
 };
 
-void deliver_remote(message_data_t *msgdata,
+static void deliver_remote(message_data_t *msgdata,
 		 struct dest *dlist, enum rcpt_status *status)
 {
 struct dest *d;
@@ -611,12 +666,12 @@
 	struct rcpt *rc;
 	struct backend *remote;
 	int i = 0;
-	
+
 	lt->from = msgdata->return_path;
 	lt->auth = d->authas0 ? d->authas : NULL;
 	lt->isdotstuffed = 0;
 	lt->tempfail_unknown_mailbox = 1;
-	
+
 	prot_rewind(msgdata->data);
 	lt->data = msgdata->data;
 	lt->rcpt_num = d->rnum;
@@ -633,7 +688,7 @@
 				 &backend_cached, NULL, NULL, NULL);
 	if (remote) {
 	 int txn_timeout = config_getint(IMAPOPT_LMTPTXN_TIMEOUT);
-	 if (txn_timeout) 
+	 if (txn_timeout)
 		prot_settimeout(remote->in, txn_timeout);
 	 lmtp_runtxn(remote, lt);
 	} else {
@@ -650,7 +705,7 @@
 	 int j = rc->rcpt_num;
 	 switch (statusj) {
 	 case s_wait:
-		/* hmmm, if something fails we'll want to try an 
+		/* hmmm, if something fails we'll want to try an
 		 error delivery */
 		if (lt->rcpti.result != RCPT_GOOD) {
 		 statusj = s_err;
@@ -679,7 +734,7 @@
 }
 }
 
-int deliver_local(deliver_data_t *mydata, char **flag, int nflags,
+int deliver_local(deliver_data_t *mydata, const strarray_t *flags,
 		 const char *username, const char *mailboxname)
 {
 char namebufMAX_MAILBOX_BUFFER = "", *tail;
@@ -693,7 +748,7 @@
 	strlcat(namebuf, mailboxname, sizeof(namebuf));
 
 	return deliver_mailbox(md->f, mydata->content, mydata->stage,
-			 md->size, flag, nflags,
+			 md->size, flags,
 			 mydata->authuser, mydata->authstate, md->id,
 			 NULL, mydata->notifyheader,
 			 namebuf, md->date, quotaoverride, 0);
@@ -713,7 +768,7 @@
 	 strlcat(namebuf, mailboxname, sizeof(namebuf));
 
 	 ret2 = deliver_mailbox(md->f, mydata->content, mydata->stage,
-				 md->size, flag, nflags,
+				 md->size, flags,
 				 mydata->authuser, mydata->authstate, md->id,
 				 username, mydata->notifyheader,
 				 namebuf, md->date, quotaoverride, 0);
@@ -723,7 +778,7 @@
 	 fuzzy_match(namebuf)) {
 	 /* try delivery to a fuzzy matched mailbox */
 	 ret2 = deliver_mailbox(md->f, mydata->content, mydata->stage,
-				 md->size, flag, nflags,
+				 md->size, flags,
 				 mydata->authuser, mydata->authstate, md->id,
 				 username, mydata->notifyheader,
 				 namebuf, md->date, quotaoverride, 0);
@@ -735,7 +790,7 @@
 	 *tail = '\0';
 
 	 ret = deliver_mailbox(md->f, mydata->content, mydata->stage,
-				 md->size, flag, nflags,
+				 md->size, flags,
 				 (char *) username, authstate, md->id,
 				 username, mydata->notifyheader,
 				 namebuf, md->date, quotaoverride, 1);
@@ -756,7 +811,7 @@
 struct message_content content = { NULL, 0, NULL };
 char *notifyheader;
 deliver_data_t mydata;
- 
+
 assert(msgdata);
 nrcpts = msg_getnumrcpt(msgdata);
 assert(nrcpts);
@@ -774,12 +829,13 @@
 mydata.namespace = &lmtpd_namespace;
 mydata.authuser = authuser;
 mydata.authstate = authstate;
- 
+
 /* loop through each recipient, attempting delivery for each */
 for (n = 0; n < nrcpts; n++) {
-	char namebufMAX_MAILBOX_BUFFER = "", *server;
+	char namebufMAX_MAILBOX_BUFFER = "";
 	char userbufMAX_MAILBOX_BUFFER;
 	const char *rcpt, *user, *domain, *mailbox;
+	mbentry_t *mbentry = NULL;
 	int r = 0;
 
 	rcpt = msg_getrcptall(msgdata, n);
@@ -806,10 +862,10 @@
 	 strlcat(userbuf, domain, sizeof(userbuf));
 	}
 
-	r = mlookup(namebuf, &server, NULL, NULL);
-	if (!r && server) {
+	r = mlookup(namebuf, &mbentry);
+	if (!r && mbentry->server) {
 	 /* remote mailbox */
-	 proxy_adddest(&dlist, rcpt, n, server, authuser);
+	 proxy_adddest(&dlist, rcpt, n, mbentry->server, authuser);
 	 statusn = nosieve;
 	}
 	else if (!r) {
@@ -824,12 +880,14 @@
 #endif
 
 	 if (r) {
-		r = deliver_local(&mydata, NULL, 0, userbuf, mailbox);
+		r = deliver_local(&mydata, NULL, userbuf, mailbox);
 	 }
 	}
 
-	telemetry_rusage( user );
+	telemetry_rusage( userbuf );
 	msg_setrcpt_status(msgdata, n, r);
+
+	mboxlist_entry_free(&mbentry);
 }
 
 if (dlist) {
@@ -843,7 +901,7 @@
 	while (d) {
 	 struct dest *nextd = d->next;
 	 struct rcpt *rc = d->to;
- 
+
 	 while (rc) {
 		struct rcpt *nextrc = rc->next;
 		free(rc);
@@ -861,7 +919,7 @@
 	 case s_err:
 	 case s_done:
 		/* yikes, we haven't implemented sieve ! */
-		syslog(LOG_CRIT, 
+		syslog(LOG_CRIT,
 		 "sieve states reached, but we don't implement sieve");
 		abort();
 	 break;
@@ -885,7 +943,7 @@
 	 assert(statusn == done || statusn == s_done);
 	}
 }
- 
+
 /* cleanup */
 free(status);
 if (content.base) map_free(&content.base, &content.len);
@@ -900,10 +958,10 @@
 return 0;
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
- 
+
 if(recurse_code) {
 	/* We were called recursively. Just give up */
 	snmp_increment(ACTIVE_CONNECTIONS, -1);
@@ -918,6 +976,7 @@
 
 syslog(LOG_ERR, "FATAL: %s", s);
 
+ abort();
 /* shouldn't return */
 shut_down(code);
 
@@ -961,10 +1020,12 @@
 	quotadb_done();
 
 	annotatemore_close();
-	annotatemore_done();
+	annotate_done();
 
 	statuscache_close();
 	statuscache_done();
+
+	idle_done();
 }
 
 #ifdef HAVE_SSL
@@ -984,8 +1045,54 @@
 exit(code);
 }
 
+
+/*
+ * Autocreate Inbox and subfolders upon login
+ */
+int autocreate_inbox(const char *user, const char *domain)
+{
+ char *username;
+ int r = 0;
+
+ if (!user)
+	return IMAP_MAILBOX_NONEXISTENT;
+
+ if (domain) {
+	username = strconcat(user, "@", domain, (char *)NULL);
+ } else {
+	username = xstrdup(user);
+ }
+
+ /*
+ * Exclude anonymous
+ */
+ if (!strcmp(username, "anonymous")) {
+	free(username);
+	return IMAP_MAILBOX_NONEXISTENT;
+ }
+
+ /*
+ * Check for autocreatequota and createonpost
+ */
+ if (!config_getint(IMAPOPT_AUTOCREATEQUOTA)) {
+	free(username);
+	return IMAP_MAILBOX_NONEXISTENT;
+ }
+ if (!config_getswitch(IMAPOPT_CREATEONPOST)) {
+	free(username);
+	return IMAP_MAILBOX_NONEXISTENT;
+ }
+
+ r = autocreate_user(&lmtpd_namespace, username);
+
+ free(username);
+
+ return r;
+}
+
 static int verify_user(const char *user, const char *domain, char *mailbox,
-		 quota_t quotacheck, struct auth_state *authstate)
+		 quota_t quotastorage_check, quota_t quotamessage_check,
+		 struct auth_state *authstate)
 {
 char namebufMAX_MAILBOX_BUFFER = "";
 int r = 0;
@@ -1016,7 +1123,7 @@
 }
 
 if (!r) {
-	char *server, *acl;
+	mbentry_t *mbentry = NULL;
 	long aclcheck = !user ? ACL_POST : 0;
 	/*
 	 * check to see if mailbox exists and we can append to it:
@@ -1025,35 +1132,46 @@
 	 * - don't care about ACL on INBOX (always allow post)
 	 * - don't care about message size (1 msg over quota allowed)
 	 */
-	r = mlookup(namebuf, &server, &acl, NULL);
+	r = mlookup(namebuf, &mbentry);
+
+	/* If user mailbox does not exist, then invoke autocreate inbox function */
+	if (r == IMAP_MAILBOX_NONEXISTENT) {
+	 r = autocreate_inbox(user, domain);
+	 if (!r) r = mlookup(namebuf, &mbentry);
+	}
 
 	if (r == IMAP_MAILBOX_NONEXISTENT && !user &&
 	 config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) &&
 	 /* see if we have a mailbox whose name is close */
 	 fuzzy_match(namebuf)) {
-
 	 /* We are guaranteed that the mailbox returned by fuzzy_match()
 	 will be no longer than the original, so we can copy over
 	 the existing mailbox. The keeps us from having to do the
 	 fuzzy match multiple times. */
 	 strcpy(mailbox, domain ? namebuf+strlen(domain)+1 : namebuf);
 
-	 r = mlookup(namebuf, &server, &acl, NULL);
+	 r = mlookup(namebuf, &mbentry);
 	}
 
-	if (!r && server) {
-	 int access = cyrus_acl_myrights(authstate, acl);
+	if (!r && mbentry->server) {
+	 int access = cyrus_acl_myrights(authstate, mbentry->acl);
 
 	 if ((access & aclcheck) != aclcheck) {
 		r = (access & ACL_LOOKUP) ?
 		 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
 	 }
 	} else if (!r) {
-	 r = append_check(namebuf, authstate,
-			 aclcheck, (quotacheck < 0)
-			 || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
-			 quotacheck : 0);
+	 int strict = config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA);
+	 quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
+	 if (quotastorage_check < 0 || strict)
+		qdiffsQUOTA_STORAGE = quotastorage_check;
+	 if (quotamessage_check < 0 || strict)
+		qdiffsQUOTA_MESSAGE = quotamessage_check;
+
+	 r = append_check(namebuf, authstate, aclcheck, qdiffs);
 	}
+
+	mboxlist_entry_free(&mbentry);
 }
 
 if (r) syslog(LOG_DEBUG, "verify_user(%s) failed: %s", namebuf,
@@ -1062,7 +1180,7 @@
 return r;
 }
 
-const char *notifyheaders = { "From", "Subject", "To", 0 };
+static const char *notifyheaders = { "From", "Subject", "To", 0 };
 /* returns a malloc'd string that should be sent to users for successful
 delivery of 'm'. */
 char *generate_notify(message_data_t *m)
@@ -1086,7 +1204,7 @@
 		 ret = xrealloc(ret, len += 1024);
 		}
 		pos += sprintf(ret + pos, "%s: ", h);
-		
+
 		/* put the header body.
 		 xxx it would be nice to linewrap.*/
 		/* need: length + '\n' + '\0' */
@@ -1111,7 +1229,8 @@
 (don't bother if we're only a proxy) */
 n = mhandle ? 0 : msg_getnumrcpt(msgdata);
 for (i = 0; !f && (i < n); i++) {
-	char namebufMAX_MAILBOX_BUFFER = "", *server;
+	mbentry_t *mbentry = NULL;
+	char namebufMAX_MAILBOX_BUFFER = "";
 	const char *user, *domain, *mailbox;
 	int r;
 
@@ -1132,11 +1251,13 @@
 	 strlcat(namebuf, user, sizeof(namebuf));
 	}
 
-	r = mlookup(namebuf, &server, NULL, NULL);
-	if (!r && !server) {
+	r = mlookup(namebuf, &mbentry);
+	if (!r && !mbentry->server) {
 	 /* local mailbox -- setup stage for later use by deliver() */
 	 f = append_newstage(namebuf, now, 0, &stage);
 	}
+
+	mboxlist_entry_free(&mbentry);
 }
 
 if (!f) {

cyrus-imapd-2.4.17.tar.gz/imap/lmtpd.h -> cyrus-imapd-2.5.tar.gz/imap/lmtpd.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/lmtpengine.c -> cyrus-imapd-2.5.tar.gz/imap/lmtpengine.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lmtpengine.c,v 1.132 2010/01/06 17:01:35 murch Exp $
 */
 
 #include <config.h>
@@ -51,7 +49,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <syslog.h>
@@ -65,10 +62,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
@@ -76,19 +69,17 @@
 #include "util.h"
 #include "auth.h"
 #include "prot.h"
-#include "rfc822date.h"
+#include "times.h"
 #include "global.h"
-#include "iptostring.h"
 #include "exitcodes.h"
-#include "imap_err.h"
-#include "mupdate_err.h"
+#include "imap/imap_err.h"
+#include "imap/mupdate_err.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "version.h"
 
 #include "lmtpengine.h"
-#include "lmtpstats.h"
+#include "imap/lmtpstats.h"
 #include "tls.h"
 #include "telemetry.h"
 
@@ -110,7 +101,7 @@
 struct protstream *pout;
 int fd;
 
- char clienthostNI_MAXHOST*2+1;
+ const char *clienthost;
 char lhlo_param250;
 
 sasl_conn_t *conn;
@@ -275,7 +266,7 @@
 ----- access functions and the like, etc. */
 
 /* returns non-zero on failure */
-int msg_new(message_data_t **m)
+static int msg_new(message_data_t **m)
 {
 message_data_t *ret = (message_data_t *) xmalloc(sizeof(message_data_t));
 
@@ -299,7 +290,7 @@
 return 0;
 }
 
-void msg_free(message_data_t *m)
+static void msg_free(message_data_t *m)
 {
 int i;
 
@@ -468,8 +459,7 @@
 /* return malloc'd string containing the address */
 static char *parseaddr(char *s)
 {
- char *p, *ret;
- int len;
+ char *p;
 int lmtp_strict_rfc2821 = config_getswitch(IMAPOPT_LMTP_STRICT_RFC2821);
 
 p = s;
@@ -534,19 +524,15 @@
 	 while (Uisalnum(*p) || *p == '.' || *p == '-') p++;
 	}
 }
- 
+
 if (*p++ != '>') return 0;
 if (*p && *p != ' ') return 0;
- len = p - s;
 
- ret = xmalloc(len + 1);
- memcpy(ret, s, len);
- retlen = '\0';
- return ret;
+ return xstrndup(s, p - s);
 }
 
 /* clean off the <> from the return path */
-void clean_retpath(char *rpath)
+static void clean_retpath(char *rpath)
 {
 int sl;
 
@@ -567,9 +553,8 @@
 * from string pointed to by 'buf'. Does not handle continuation header
 * lines.
 */
-void
-clean822space(buf)
-char *buf;
+static void
+clean822space(char *buf)
 {
 char *from=buf, *to=buf;
 int c;
@@ -623,7 +608,7 @@
 int nrcpts = m->rcpt_num;
 time_t now = time(NULL);
 static unsigned msgid_count = 0;
- char datestr80, tls_info250 = "";
+ char datestrRFC822_DATETIME_MAX+1, tls_info250 = "";
 const char *skipheaders = {
 	"Return-Path", /* need to remove (we add our own) */
 	NULL
@@ -667,7 +652,7 @@
 }
 
 /* add a received header */
- rfc822date_gen(datestr, sizeof(datestr), now);
+ time_to_rfc822(now, datestr, sizeof(datestr));
 addlen = 8 + strlen(cd->lhlo_param) + strlen(cd->clienthost);
 if (m->authuser) addlen += 28 + strlen(m->authuser) + 5; /* +5 for ssf */
 addlen += 25 + strlen(config_servername) + strlen(cyrus_version());
@@ -730,8 +715,10 @@
 
 /* now, using our header cache, fill in the data that we want */
 
- /* first check resent-message-id */
- if ((body = msg_getheader(m, "resent-message-id")) && body00) {
+ /* first check x-me-message-id, then resent-message-id */
+ if ((body = msg_getheader(m, "x-me-message-id")) && body00) {
+	m->id = xstrdup(body0);
+ } else if ((body = msg_getheader(m, "resent-message-id")) && body00) {
 	m->id = xstrdup(body0);
 } else if ((body = msg_getheader(m, "message-id")) && body00) {
 	m->id = xstrdup(body0);
@@ -821,7 +808,7 @@
 static int process_recipient(char *addr, struct namespace *namespace,
 			 int ignorequota,
 			 int (*verify_user)(const char *, const char *,
-						char *, quota_t,
+						char *, quota_t, quota_t,
 						struct auth_state *),
 			 message_data_t *msg)
 {
@@ -910,13 +897,30 @@
 	ret->user = NULL;
 
 r = verify_user(ret->user, ret->domain, ret->mailbox,
-		 (quota_t) (ignorequota ? -1 : msg->size), msg->authstate);
+		 (quota_t) (ignorequota ? -1 : msg->size),
+		 ignorequota ? -1 : 1, msg->authstate);
 if (r) {
-	/* we lost */
-	free(ret->all);
-	free(ret->rcpt);
-	free(ret);
-	return r;
+	const char *catchall = NULL;
+	if (r == IMAP_MAILBOX_NONEXISTENT) {
+	 catchall = config_getstring(IMAPOPT_LMTP_CATCHALL_MAILBOX);
+	 if (catchall) {
+		if (!verify_user(catchall, NULL, NULL,
+				ignorequota ? -1 : msg->size,
+				ignorequota ? -1 : 1, msg->authstate)) {
+		 ret->user = xstrdup(catchall);
+		} else {
+		 catchall = NULL;
+		}
+	 }
+	}
+
+	if (catchall == NULL ) {
+	 /* we lost */
+	 free(ret->all);
+	 free(ret->rcpt);
+	 free(ret);
+	 return r;
+	}
 }
 ret->ignorequota = ignorequota;
 
@@ -1006,12 +1010,7 @@
 int r;
 struct clientdata cd;
 
- struct sockaddr_storage localaddr, remoteaddr;
- int havelocal = 0, haveremote = 0;
- char localip60, remoteip60;
- socklen_t salen;
- char hbufNI_MAXHOST;
- int niflags = 0;
+ const char *localip, *remoteip;
 
 sasl_ssf_t ssf;
 char *auth_id;
@@ -1022,7 +1021,7 @@
 cd.pin = pin;
 cd.pout = pout;
 cd.fd = fd;
- cd.clienthost0 = '\0';
+ cd.clienthost = "";
 cd.lhlo_param0 = '\0';
 cd.authenticated = NOAUTH;
 #ifdef HAVE_SSL
@@ -1048,58 +1047,16 @@
 }
 
 /* determine who we're talking to */
- salen = sizeof(remoteaddr);
- r = getpeername(fd, (struct sockaddr *)&remoteaddr, &salen);
- if (!r &&
-	(remoteaddr.ss_family == AF_INET ||
-	 remoteaddr.ss_family == AF_INET6)) {
-	/* connected to an internet socket */
-	if (getnameinfo((struct sockaddr *)&remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-	 strncpy(cd.clienthost, hbuf, sizeof(hbuf));
-	 strlcat(cd.clienthost, " ", sizeof(cd.clienthost));
-	 cd.clienthostsizeof(cd.clienthost)-30 = '\0';
-	} else {
-	 cd.clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(cd.clienthost, "", sizeof(cd.clienthost));
-	strlcat(cd.clienthost, hbuf, sizeof(cd.clienthost));
-	strlcat(cd.clienthost, "", sizeof(cd.clienthost));
-	salen = sizeof(localaddr);
-	if (!getsockname(fd, (struct sockaddr *)&localaddr, &salen)) {
-	 /* set the ip addresses here */
-	 if(iptostring((struct sockaddr *)&localaddr, salen,
-			 localip, sizeof(localip)) == 0) {
-		havelocal = 1;
- saslprops.iplocalport = xstrdup(localip);
- }
- if(iptostring((struct sockaddr *)&remoteaddr, salen,
-			 remoteip, sizeof(remoteip)) == 0) {
-		haveremote = 1;
- saslprops.ipremoteport = xstrdup(remoteip);
- }
-	} else {
-	 fatal("can't get local addr", EC_SOFTWARE);
-	}
-
-	syslog(LOG_DEBUG, "connection from %s%s", 
-	 cd.clienthost, 
-	 func->preauth ? " preauth'd as postman" : "");
- } else {
+ cd.clienthost = get_clienthost(fd, &localip, &remoteip);
+ if (!strcmp(cd.clienthost, UNIX_SOCKET)) {
 	/* we're not connected to a internet socket! */
 	func->preauth = 1;
-	strcpy(cd.clienthost, "unix socket");
-	syslog(LOG_DEBUG, "lmtp connection preauth'd as postman");
 }
 
+ syslog(LOG_DEBUG, "connection from %s%s", 
+	 cd.clienthost, 
+	 func->preauth ? " preauth'd as postman" : "");
+
 /* Setup SASL to go. We need to do this *after* we decide if
 * we are preauthed or not. */
 if (sasl_server_new("lmtp", config_servername, NULL, NULL,
@@ -1126,8 +1083,8 @@
 
 	deliver_logfd = telemetry_log(auth_id, pin, pout, 0);
 } else {
-	if(havelocal) sasl_setprop(cd.conn, SASL_IPLOCALPORT, &localip );
-	if(haveremote) sasl_setprop(cd.conn, SASL_IPREMOTEPORT, &remoteip); 
+	if(localip) sasl_setprop(cd.conn, SASL_IPLOCALPORT, &localip );
+	if(remoteip) sasl_setprop(cd.conn, SASL_IPREMOTEPORT, &remoteip); 
 }
 
 prot_printf(pout, "220 %s", config_servername);
@@ -1164,6 +1121,9 @@
 	 func->shutdown(0);
 }
 
+ if (config_getswitch(IMAPOPT_CHATTY))
+	syslog(LOG_NOTICE, "command: %s", buf);
+
 switch (buf0) {
 case 'a':
 case 'A':
@@ -1222,24 +1182,8 @@
 			 continue;
 		 }
 		 else {
-			 sleep(3);
-
-			 if (remoteaddr.ss_family == AF_INET ||
-			 remoteaddr.ss_family == AF_INET6) {
-			 niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-			 if (remoteaddr.ss_family == AF_INET6)
-				 niflags |= NI_WITHSCOPEID;
-#endif
-			 if (getnameinfo((struct sockaddr *)&remoteaddr,
-					 salen, hbuf, sizeof(hbuf),
-					 NULL, 0, niflags) != 0)
-				 strlcpy(hbuf, "unknown", sizeof(hbuf));
-			 }
-			 else
-			 strlcpy(hbuf, "unix socket", sizeof(hbuf));		 
 			 syslog(LOG_ERR, "badlogin: %s %s %s",
-				 hbuf, mech, sasl_errdetail(cd.conn));
+				 cd.clienthost, mech, sasl_errdetail(cd.conn));
 		 
 			 snmp_increment_args(AUTHENTICATION_NO, 1,
 					 VARIABLE_AUTH, hash_simple(mech),

cyrus-imapd-2.4.17.tar.gz/imap/lmtpengine.h -> cyrus-imapd-2.5.tar.gz/imap/lmtpengine.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lmtpengine.h,v 1.28 2010/01/06 17:01:36 murch Exp $
  */
 
 #ifndef LMTPENGINE_H
@@ -47,6 +45,7 @@
 
 /***************** server-side LMTP *******************/
 
+#include "xmalloc.h"
 #include "spool.h"
 #include "mboxname.h"
 #include "quota.h"
@@ -111,7 +110,9 @@
     int (*deliver)(message_data_t *m, 
 		   char *authuser, struct auth_state *authstate);
     int (*verify_user)(const char *user, const char *domain, char *mailbox,
-		       quota_t quotacheck, /* user must have this much quota left
+		       quota_t quotastorage_check, /* user must have this much storage quota left
+					   (-1 means don't care about quota) */
+		       quota_t quotamessage_check, /* user must have this much message quota left
 					   (-1 means don't care about quota) */
 		       struct auth_state *authstate);
     void (*shutdown)(int code);

cyrus-imapd-2.4.17.tar.gz/imap/lmtpstats.snmp -> cyrus-imapd-2.5.tar.gz/imap/lmtpstats.snmp Changed

cyrus-imapd-2.4.17.tar.gz/imap/mailbox.c -> cyrus-imapd-2.5.tar.gz/imap/mailbox.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mailbox.c,v 1.201 2010/06/28 12:04:20 brong Exp $
 */
 #include <config.h>
 
@@ -48,7 +46,12 @@
 #endif
 #include <ctype.h>
 #include <errno.h>
-#include <stdint.h>
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+#include <libical/vcc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -72,28 +75,41 @@
 # endif
 #endif
 
-#include "acl.h"
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#endif
+
+#include "annotate.h"
 #include "assert.h"
+#include "caldav_db.h"
+#include "carddav_db.h"
 #include "crc32.h"
+#include "md5.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "imparse.h"
 #include "cyr_lock.h"
 #include "mailbox.h"
+#include "mappedfile.h"
 #include "message.h"
 #include "map.h"
+#include "mboxevent.h"
 #include "mboxlist.h"
+#include "parseaddr.h"
+#include "proc.h"
 #include "retry.h"
 #include "seen.h"
 #include "upgrade_index.h"
 #include "util.h"
 #include "sequence.h"
 #include "statuscache.h"
+#include "strarray.h"
 #include "sync_log.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
+#include "xstats.h"
 
 struct mailboxlist {
 struct mailboxlist *next;
@@ -106,11 +122,12 @@
 
 #define zeromailbox(m) { memset(&m, 0, sizeof(struct mailbox)); \
 (m).index_fd = -1; \
- (m).cache_fd = -1; \
 (m).header_fd = -1; }
 
 static int mailbox_index_unlink(struct mailbox *mailbox);
 static int mailbox_index_repack(struct mailbox *mailbox);
+static int mailbox_lock_index_internal(struct mailbox *mailbox,
+				 int locktype);
 
 static struct mailboxlist *create_listitem(const char *name)
 {
@@ -122,6 +139,8 @@
 item->l = NULL;
 zeromailbox(item->m);
 item->m.name = xstrdup(name);
+ /* ensure we never print insane times */
+ gettimeofday(&item->m.starttime, 0);
 
 return item;
 }
@@ -129,13 +148,10 @@
 static struct mailboxlist *find_listitem(const char *name)
 {
 struct mailboxlist *item;
- struct mailboxlist *previtem = NULL;
 
- /* remove from the active list */
 for (item = open_mailboxes; item; item = item->next) {
 	if (!strcmp(name, item->m.name))
 	 return item;
-	previtem = item;
 }
 
 return NULL;
@@ -161,7 +177,7 @@
 fatal("didn't find item in list", EC_SOFTWARE);
 }
 
-char *mailbox_meta_fname(struct mailbox *mailbox, int metafile)
+EXPORTED const char *mailbox_meta_fname(struct mailbox *mailbox, int metafile)
 {
 static char fnamebufMAX_MAILBOX_PATH;
 const char *src;
@@ -169,11 +185,11 @@
 src = mboxname_metapath(mailbox->part, mailbox->name, metafile, 0);
 if (!src) return NULL;
 
- strncpy(fnamebuf, src, MAX_MAILBOX_PATH);
+ xstrncpy(fnamebuf, src, MAX_MAILBOX_PATH);
 return fnamebuf;
 }
 
-char *mailbox_meta_newfname(struct mailbox *mailbox, int metafile)
+EXPORTED const char *mailbox_meta_newfname(struct mailbox *mailbox, int metafile)
 {
 static char fnamebufMAX_MAILBOX_PATH;
 const char *src;
@@ -181,14 +197,14 @@
 src = mboxname_metapath(mailbox->part, mailbox->name, metafile, 1);
 if (!src) return NULL;
 
- strncpy(fnamebuf, src, MAX_MAILBOX_PATH);
+ xstrncpy(fnamebuf, src, MAX_MAILBOX_PATH);
 return fnamebuf;
 }
 
-int mailbox_meta_rename(struct mailbox *mailbox, int metafile)
+EXPORTED int mailbox_meta_rename(struct mailbox *mailbox, int metafile)
 {
- char *fname = mailbox_meta_fname(mailbox, metafile);
- char *newfname = mailbox_meta_newfname(mailbox, metafile);
+ const char *fname = mailbox_meta_fname(mailbox, metafile);
+ const char *newfname = mailbox_meta_newfname(mailbox, metafile);
 
 if (rename(newfname, fname))
 	return IMAP_IOERROR;
@@ -196,19 +212,26 @@
 return 0;
 }
 
-char *mailbox_message_fname(struct mailbox *mailbox, unsigned long uid)
+static const char *mailbox_spool_fname(struct mailbox *mailbox, uint32_t uid)
 {
- static char localbufMAX_MAILBOX_PATH;
- const char *src;
+ return mboxname_datapath(mailbox->part, mailbox->name, uid);
+}
 
- src = mboxname_datapath(mailbox->part, mailbox->name, uid);
- if (!src) return NULL;
+static const char *mailbox_archive_fname(struct mailbox *mailbox, uint32_t uid)
+{
+ return mboxname_archivepath(mailbox->part, mailbox->name, uid);
+}
 
- strncpy(localbuf, src, MAX_MAILBOX_PATH);
- return localbuf;
+EXPORTED const char *mailbox_record_fname(struct mailbox *mailbox,
+					 struct index_record *record)
+{
+ if (record->system_flags & FLAG_ARCHIVED)
+	return mailbox_archive_fname(mailbox, record->uid);
+ else
+	return mailbox_spool_fname(mailbox, record->uid);
 }
 
-char *mailbox_datapath(struct mailbox *mailbox)
+EXPORTED const char *mailbox_datapath(struct mailbox *mailbox)
 {
 static char localbufMAX_MAILBOX_PATH;
 const char *src;
@@ -216,7 +239,7 @@
 src = mboxname_datapath(mailbox->part, mailbox->name, 0);
 if (!src) return NULL;
 
- strncpy(localbuf, src, MAX_MAILBOX_PATH);
+ xstrncpy(localbuf, src, MAX_MAILBOX_PATH);
 return localbuf;
 }
 
@@ -253,16 +276,14 @@
 
 /* for efficient FastMail interface display */
 { "x-spam-score", 3 },
- { "x-spam-hits", 3 },
- { "x-spam-source", 3 },
 { "x-resolved-to", 3 },
 { "x-delivered-to", 3 },
 { "x-mail-from", 3 },
- { "x-truedomain", 3 },
- { "x-truedomain-dkim", 3 },
- { "x-truedomain-spf", 3 },
 { "x-truedomain-domain", 3 },
 
+ /* for conversations */
+ { "x-me-message-id", 4 },
+
 /* things to never cache */
 { "bcc", BIT32_MAX },
 { "cc", BIT32_MAX },
@@ -300,7 +321,7 @@
 * Assume cache entry version 1, unless other data is found
 * in the table.
 */
-static inline unsigned is_cached_header(const char *hdr) 
+static inline unsigned is_cached_header(const char *hdr)
 {
 int i;
 
@@ -322,7 +343,7 @@
 * Returns minimum version required for lookup to succeed
 * or BIT32_MAX if header not cached
 */
-unsigned mailbox_cached_header(const char *s) 
+EXPORTED unsigned mailbox_cached_header(const char *s)
 {
 char hdrMAX_CACHED_HEADER_SIZE;
 int i;
@@ -342,7 +363,7 @@
 /* Same as mailbox_cached_header, but for use on a header
 * as it appears in the message (i.e. :-terminated, not NUL-terminated)
 */
-unsigned mailbox_cached_header_inline(const char *text)
+HIDDEN unsigned mailbox_cached_header_inline(const char *text)
 {
 char bufMAX_CACHED_HEADER_SIZE;
 int i;
@@ -350,7 +371,7 @@
 /* Scan for header */
 for (i=0; i < (MAX_CACHED_HEADER_SIZE - 1); i++) {
 	if (!texti || texti == '\r' || texti == '\n') break;
-	
+
 	if (texti == ':') {
 	 bufi = '\0';
 	 return is_cached_header(buf);
@@ -364,11 +385,11 @@
 
 const char *cache_base(struct index_record *record)
 {
- const char *base = record->crec.base->s;
+ const char *base = record->crec.buf->s;
 return base + record->crec.offset;
 }
 
-unsigned cache_size(struct index_record *record)
+size_t cache_len(struct index_record *record)
 {
 return record->crec.len;
 }
@@ -377,53 +398,57 @@
 {
 static struct buf staticbuf;
 
- staticbuf.s = (char *)cache_base(record);
- staticbuf.len = cache_size(record);
+ buf_init_ro(&staticbuf,
+		cache_base(record),
+		cache_len(record));
 
 return &staticbuf;
 }
 
-const char *cacheitem_base(struct index_record *record, int field)
+EXPORTED const char *cacheitem_base(struct index_record *record, int field)
 {
- const char *base = record->crec.base->s;
+ const char *base = record->crec.buf->s;
 return base + record->crec.itemfield.offset;
 }
 
-unsigned cacheitem_size(struct index_record *record, int field)
+EXPORTED unsigned cacheitem_size(struct index_record *record, int field)
 {
 return record->crec.itemfield.len;
 }
 
-struct buf *cacheitem_buf(struct index_record *record, int field)
+EXPORTED struct buf *cacheitem_buf(struct index_record *record, int field)
 {
 static struct buf staticbuf;
 
- staticbuf.s = (char *)cacheitem_base(record, field);
- staticbuf.len = cacheitem_size(record, field);
+ buf_init_ro(&staticbuf,
+		cacheitem_base(record, field),
+		cacheitem_size(record, field));
 
 return &staticbuf;
 }
 
-
 /* parse a single cache record from the mapped file - creates buf
 * records which point into the map, so you can't free it while
 * you still have them around! */
-int cache_parserecord(struct buf *cachebase, unsigned cache_offset,
-		 struct cacherecord *crec)
+static int cache_parserecord(struct mappedfile *cachefile, size_t cache_offset,
+			 struct cacherecord *crec)
 {
- unsigned cache_ent;
- unsigned offset;
+ const struct buf *buf = mappedfile_buf(cachefile);
+ size_t buf_size = mappedfile_size(cachefile);
 const char *cacheitem, *next;
+ size_t offset;
+ int cache_ent;
 
 offset = cache_offset;
 
- if (offset >= cachebase->len) {
-	syslog(LOG_ERR, "IOERROR: offset greater than cache size");
+ if (offset >= buf_size) {
+	syslog(LOG_ERR, "IOERROR: offset greater than cache size %lu %lu",
+	 offset, buf_size);
 	return IMAP_IOERROR;
 }
 
 for (cache_ent = 0; cache_ent < NUM_CACHE_FIELDS; cache_ent++) {
-	cacheitem = cachebase->s + offset;
+	cacheitem = buf->s + offset;
 	/* copy locations */
 	crec->itemcache_ent.len = CACHE_ITEM_LEN(cacheitem);
 	crec->itemcache_ent.offset = offset + CACHE_ITEM_SIZE_SKIP;
@@ -435,248 +460,265 @@
 	 return IMAP_IOERROR;
 	}
 
-	offset = next - cachebase->s;
-	if (offset > cachebase->len) {
-	 syslog(LOG_ERR, "IOERROR: offset greater than cache size");
+	offset = next - buf->s;
+	if (offset > buf_size) {
+	 syslog(LOG_ERR, "IOERROR: offset greater than cache size "
+		 SIZE_T_FMT " " SIZE_T_FMT "(%d)",
+		 offset, buf_size, cache_ent);
 	 return IMAP_IOERROR;
 	}
 }
 
 /* all fit within the cache, it's gold as far as we can tell */
- crec->base = cachebase;
+ crec->buf = buf;
 crec->len = offset - cache_offset;
 crec->offset = cache_offset;
 
 return 0;
 }
 
-int mailbox_open_cache(struct mailbox *mailbox)
+char *mailbox_cache_get_msgid(struct mailbox *mailbox,
+			 struct index_record *record)
 {
- struct stat sbuf;
- unsigned generation;
- int retry = 0;
+ char *env;
+ char *envtokensNUMENVTOKENS;
+ char *msgid;
+
+ if (mailbox_cacherecord(mailbox, record))
+	return NULL;
+
+ if (cacheitem_size(record, CACHE_ENVELOPE) <= 2)
+	return NULL;
+
+ /* get msgid out of the envelope
+ *
+ * get a working copy; strip outer ()'s
+ * +1 -> skip the leading paren
+ * -2 -> don't include the size of the outer parens
+ */
+ env = xstrndup(cacheitem_base(record, CACHE_ENVELOPE) + 1,
+		 cacheitem_size(record, CACHE_ENVELOPE) - 2);
+ parse_cached_envelope(env, envtokens, VECTOR_SIZE(envtokens));
 
- /* already got everything? great */
- if (mailbox->cache_fd != -1 && !mailbox->need_cache_refresh)
-	return 0;
+ msgid = envtokensENV_MSGID ? xstrdup(envtokensENV_MSGID) : NULL;
 
- retry:
- /* open the file */
- if (mailbox->cache_fd == -1) {
-	char *fname;
-
-	/* it's bogus to be dirty here */
-	if (mailbox->cache_dirty)
-	 abort();
+ /* free stuff */
+ free(env);
 
-	fname = mailbox_meta_fname(mailbox, META_CACHE);
-	mailbox->cache_fd = open(fname, O_RDWR, 0);
-	if (mailbox->cache_fd == -1)
-	 goto fail;
- }
+ return msgid;
+}
 
- /* get the size and inode */
- if (fstat(mailbox->cache_fd, &sbuf) == -1) {
-	syslog(LOG_ERR, "IOERROR: fstating cache %s: %m", mailbox->name);
-	goto fail;
- }
- mailbox->cache_buf.len = sbuf.st_size;
- if (mailbox->cache_buf.len < 4)
-	goto fail;
+static int mailbox_index_islocked(struct mailbox *mailbox, int write)
+{
+ if (mailbox->index_locktype == LOCK_EXCLUSIVE) return 1;
+ if (mailbox->index_locktype == LOCK_SHARED && !write) return 1;
+ return 0;
+}
 
- map_refresh(mailbox->cache_fd, 0, (const char **)&mailbox->cache_buf.s,
-		&mailbox->cache_len, mailbox->cache_buf.len, "cache",
-		mailbox->name);
+static int cache_append_record(struct mappedfile *mf, struct index_record *record)
+{
+ const struct buf *buf = cache_buf(record);
+ size_t offset = mappedfile_size(mf);
+ int n;
 
- generation = ntohl(*((bit32 *)(mailbox->cache_buf.s)));
- if (generation < mailbox->i.generation_no && !retry) {
-	/* try a rename - maybe we got killed between renames in repack */
-	map_free((const char **)&mailbox->cache_buf.s, &mailbox->cache_len);
-	close(mailbox->cache_fd);
-	mailbox->cache_fd = -1;
-	syslog(LOG_NOTICE, "WARNING: trying to rename cache file %s (%d < %d)",
-	 mailbox->name, generation, mailbox->i.generation_no);
-	mailbox_meta_rename(mailbox, META_CACHE);
-	retry = 1;
-	goto retry;
- }
- if (generation != mailbox->i.generation_no) {
-	map_free((const char **)&mailbox->cache_buf.s, &mailbox->cache_len);
-	goto fail;
+ n = mappedfile_pwritebuf(mf, buf, offset);
+ if (n < 0) {
+	syslog(LOG_ERR, "failed to append " SIZE_T_FMT " bytes to cache", buf->len);
+	return IMAP_IOERROR;
 }
 
- mailbox->need_cache_refresh = 0;
+ record->cache_offset = offset;
 
 return 0;
+}
 
-fail:
- /* rebuild the cache from scratch! */
- syslog(LOG_ERR, "IOERROR: %s failed to open cache - rebuilding",
-	 mailbox->name);
-
- {
-	struct index_record record;
-	const char *fname;
-	uint32_t recno;
-	uint32_t offset;
-	char buf4;
-
-	/* make sure we have a file */
-	if (mailbox->cache_fd == -1) {
-	 fname = mailbox_meta_fname(mailbox, META_CACHE);
-	 mailbox->cache_fd = open(fname, O_RDWR|O_TRUNC|O_CREAT, 0666);
-	}
-
-	/* update the generation number */
-	*((bit32 *)(buf)) = htonl(mailbox->i.generation_no);
-	retry_write(mailbox->cache_fd, buf, 4);
+static struct mappedfile *cache_getfile(ptrarray_t *list, const char *fname,
+					int readonly, uint32_t generation)
+{
+ struct mappedfile *cachefile = NULL;
+ int openflags = readonly ? 0 : MAPPEDFILE_CREATE | MAPPEDFILE_RW;
+ int i;
+ char buf4;
 
-	for (recno = 1; recno <= mailbox->i.num_records; recno++) {
-	 if (mailbox_read_index_record(mailbox, recno, &record))
-		continue;
-	 if (record.system_flags & FLAG_UNLINKED)
-		continue;
-	 fname = mailbox_message_fname(mailbox, record.uid);
-	 offset = record.cache_offset; /* gets overwritten by parse */
-	 if (message_parse(fname, &record))
-		continue;
-	 lseek(mailbox->cache_fd, offset, SEEK_SET);
-	 retry_write(mailbox->cache_fd, cache_base(&record),
-			cache_size(&record));
-	}
-	(void)fsync(mailbox->cache_fd);
+ for (i = 0; i < list->count; i++) {
+	cachefile = ptrarray_nth(list, i);
+	if (!strcmp(fname, mappedfile_fname(cachefile)))
+	 return cachefile;
+ }
 
-	/* get the size and inode */
-	fstat(mailbox->cache_fd, &sbuf);
-	mailbox->cache_buf.len = sbuf.st_size;
+ /* guess we didn't find it - open a new one */
+ cachefile = NULL;
+ if (mappedfile_open(&cachefile, fname, openflags)) {
+	syslog(LOG_ERR, "IOERROR: failed to open cache file %s", fname);
+	return NULL;
+ }
 
-	map_refresh(mailbox->cache_fd, 0, (const char **)&mailbox->cache_buf.s,
-		 &mailbox->cache_len, mailbox->cache_buf.len, "cache",
-		 mailbox->name);
+ if (!readonly && !mappedfile_size(cachefile)) {
+	/* zero byte file? Set the generation */
+	*((uint32_t *)buf) = htonl(generation);
+	mappedfile_pwrite(cachefile, buf, 4, 0);
+	mappedfile_commit(cachefile);
 }
 
- mailbox->need_cache_refresh = 0;
- return 0;
+ ptrarray_append(list, cachefile);
+
+ return cachefile;
 }
 
-int mailbox_index_islocked(struct mailbox *mailbox, int write)
+static struct mappedfile *mailbox_cachefile(struct mailbox *mailbox,
+					 struct index_record *record)
 {
- if (mailbox->index_locktype == LOCK_EXCLUSIVE) return 1;
- if (mailbox->index_locktype == LOCK_SHARED && !write) return 1;
- return 0;
+ const char *fname;
+
+ if (record->system_flags & FLAG_ARCHIVED)
+	fname = mailbox_meta_fname(mailbox, META_ARCHIVECACHE);
+ else
+	fname = mailbox_meta_fname(mailbox, META_CACHE);
+
+ return cache_getfile(&mailbox->caches, fname, mailbox->is_readonly, mailbox->i.generation_no);
+}
+
+static struct mappedfile *repack_cachefile(struct mailbox_repack *repack,
+					 struct index_record *record)
+{
+ const char *fname;
+
+ if (record->system_flags & FLAG_ARCHIVED)
+	fname = mailbox_meta_newfname(repack->mailbox, META_ARCHIVECACHE);
+ else
+	fname = mailbox_meta_newfname(repack->mailbox, META_CACHE);
+
+ return cache_getfile(&repack->caches, fname, /*readonly*/0, repack->i.generation_no);
 }
 
 /* return the offset for the start of the record! */
-int mailbox_append_cache(struct mailbox *mailbox,
-			 struct index_record *record)
+static int mailbox_append_cache(struct mailbox *mailbox,
+				struct index_record *record)
 {
+ struct mappedfile *cachefile;
 int r;
 
- /* no cache content */
- if (!record->crec.len)
-	return 0;
+ assert(mailbox_index_islocked(mailbox, 1));
 
 /* already been written */
 if (record->cache_offset)
 	return 0;
 
- /* ensure we have a cache fd */
- r = mailbox_open_cache(mailbox);
- if (r) {
+ /* no cache content */
+ if (!record->crec.len) {
+	/* make one! */
+	const char *fname = mailbox_record_fname(mailbox, record);
+	syslog(LOG_ERR, "IOERROR: no cache for %s %u, parsing and saving",
+	 mailbox->name, record->uid);
+	r = message_parse(fname, record);
+	if (r) return r;
+	mailbox_index_dirty(mailbox);
+	mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
+ }
+
+ cachefile = mailbox_cachefile(mailbox, record);
+ if (!cachefile) {
 	syslog(LOG_ERR, "Failed to open cache to %s for %u",
 		mailbox->name, record->uid);
-	return r; /* unable to append */
+	return IMAP_IOERROR; /* unable to append */
 }
 
- r = cache_append_record(mailbox->cache_fd, record);
+ r = cache_append_record(cachefile, record);
 if (r) {
 	syslog(LOG_ERR, "Failed to append cache to %s for %u",
 	 mailbox->name, record->uid);
 	return r;
 }
 
- mailbox->cache_dirty = 1;
- mailbox->need_cache_refresh = 1;
-
 return 0;
 }
 
-int mailbox_cacherecord(struct mailbox *mailbox,
-			struct index_record *record)
+EXPORTED int mailbox_cacherecord(struct mailbox *mailbox,
+				 struct index_record *record)
 {
- uint32_t crc;
+ struct mappedfile *cachefile;
 int r = 0;
 
 /* do we already have a record loaded? */
 if (record->crec.len)
 	return 0;
 
- if (!record->cache_offset)
-	r = IMAP_IOERROR;
- if (r) goto done;
+ /* make sure there's a file to read from */
+ cachefile = mailbox_cachefile(mailbox, record);
+ if (!cachefile)
+	goto err;
 
- r = mailbox_open_cache(mailbox);
- if (r) goto done;
+ /* do we have an offset? */
+ if (!record->cache_offset)
+	goto err;
 
 /* try to parse the cache record */
- r = cache_parserecord(&mailbox->cache_buf,
-			 record->cache_offset, &record->crec);
+ r = cache_parserecord(cachefile, record->cache_offset, &record->crec);
 
- if (r) goto done;
- crc = crc32_buf(cache_buf(record));
- if (crc != record->cache_crc)
-	r = IMAP_MAILBOX_CRC;
+ /* check the checksum */
+ if (!r && crc32_buf(cache_buf(record)) != record->cache_crc)
+	r = IMAP_MAILBOX_CHECKSUM;
 
-done:
- if (r) 
+ if (r) goto err;
+ return 0;
+
+err:
+ if (!cachefile)
+	syslog(LOG_ERR, "IOERROR: missing cache file for %s uid %u",
+	 mailbox->name, record->uid);
+ else if (!record->cache_offset)
+	syslog(LOG_ERR, "IOERROR: missing cache offset for %s uid %u",
+	 mailbox->name, record->uid);
+ else if (r)
 	syslog(LOG_ERR, "IOERROR: invalid cache record for %s uid %u (%s)",
 	 mailbox->name, record->uid, error_message(r));
 
- return r;
-}
-
-int cache_append_record(int fd, struct index_record *record)
-{
- unsigned offset;
- unsigned size = cache_size(record);
- int n;
-
- /* no parsed cache present */
- if (!record->crec.len)
-	return 0;
-
- /* cache offset already there - probably already been written */
- if (record->cache_offset)
-	return 0;
+ /* parse the file again */
+ {
+	/* parse directly into the cache for this record */
+	const char *fname = mailbox_record_fname(mailbox, record);
+	if (!fname) {
+	 syslog(LOG_ERR, "IOERROR: no spool file for %s uid %u",
+		 mailbox->name, record->uid);
+	 return IMAP_IOERROR;
+	}
 
- if (record->cache_crc != crc32_buf(cache_buf(record)))
-	return IMAP_MAILBOX_CRC;
+	r = message_parse(fname, record);
+	if (r) {
+	 syslog(LOG_ERR, "IOERROR: failed to parse message for %s uid %u",
+		 mailbox->name, record->uid);
+	 return r;
+	}
 
- offset = lseek(fd, 0L, SEEK_END);
- n = retry_write(fd, cache_base(record), size);
- if (n < 0) {
-	syslog(LOG_ERR, "failed to append %u bytes to cache", size);
-	return IMAP_IOERROR;
+	/* if we can add it, do that now */
+	if (cachefile && mailbox_index_islocked(mailbox, 1)) {
+	 r = cache_append_record(cachefile, record);
+	 if (!r) r = mailbox_rewrite_index_record(mailbox, record);
+	 if (r) {
+		syslog(LOG_ERR, "IOERROR: failed to append cache to %s for %u",
+		 mailbox->name, record->uid);
+		/* but ignore, we have a valid read at least */
+	 }
+	 else {
+		/* mark for repack */
+		mailbox_index_dirty(mailbox);
+		mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
+	 }
+	}
 }
 
- record->cache_offset = offset;
-
 return 0;
 }
 
-int mailbox_commit_cache(struct mailbox *mailbox)
+static int mailbox_commit_cache(struct mailbox *mailbox)
 {
- if (!mailbox->cache_dirty)
-	return 0;
-
- mailbox->cache_dirty = 0;
-
- /* not open! That's bad */
- if (mailbox->cache_fd == -1)
-	abort(); 
+ int i;
 
- /* just fsync is all that's needed to commit */
- (void)fsync(mailbox->cache_fd);
+ for (i = 0; i < mailbox->caches.count; i++) {
+	struct mappedfile *cachefile = ptrarray_nth(&mailbox->caches, i);
+	int r = mappedfile_commit(cachefile);
+	if (r) return r;
+ }
 
 return 0;
 }
@@ -687,7 +729,7 @@
 /*
 * Set the updatenotifier function
 */
-void mailbox_set_updatenotifier(mailbox_notifyproc_t *notifyproc)
+HIDDEN void mailbox_set_updatenotifier(mailbox_notifyproc_t *notifyproc)
 {
 updatenotifier = notifyproc;
 }
@@ -700,15 +742,30 @@
 return updatenotifier;
 }
 
-/* create the unique identifier for a mailbox named 'name' with
- * uidvalidity 'uidvalidity'. 'uniqueid' should be at least 17 bytes
- * long. the unique identifier is just the mailbox name hashed to 32
- * bits followed by the uid, both converted to hex. 
+/*
+ * Create the unique identifier for a mailbox named 'name' with
+ * uidvalidity 'uidvalidity'. We use Ted Ts'o's libuuid if available,
+ * otherwise we fall back to the legacy Cyrus algorithm which uses the
+ * mailbox name hashed to 32 bits followed by the uid, both converted to
+ * hex.
 */
-#define PRIME (2147484043UL)
 
-void mailbox_make_uniqueid(struct mailbox *mailbox)
+EXPORTED void mailbox_make_uniqueid(struct mailbox *mailbox)
 {
+#ifdef HAVE_LIBUUID
+ uuid_t uu;
+
+ uuid_clear(uu);	/* Just In Case */
+ uuid_generate(uu);
+ free(mailbox->uniqueid);
+ /* 36 bytes of uuid plus \0 */
+ mailbox->uniqueid = xmalloc(37);
+ /* Solaris has an older libuuid which has uuid_unparse() but not
+ * uuid_unparse_lower(), so we post-process the result ourself. */
+ uuid_unparse(uu, mailbox->uniqueid);
+ lcase(mailbox->uniqueid);
+#else
+#define PRIME (2147484043UL)
 unsigned hash = 0;
 const char *name = mailbox->name;
 
@@ -723,77 +780,107 @@
 
 snprintf(mailbox->uniqueid, 32, "%08x%08x",
 	 hash, mailbox->i.uidvalidity);
+#endif /* !HAVE_LIBUUID */
 
 mailbox->header_dirty = 1;
 }
 
 /*
- * Maps in the content for the message with UID 'uid' in 'mailbox'.
- * Returns map in 'basep' and 'lenp'
+ * Maps in the content for the message with UID 'uid' in 'mailbox',
+ * into a read-only struct buf. Use buf_free() to free the data.
 */
-int mailbox_map_message(struct mailbox *mailbox, unsigned long uid,
-			const char **basep, unsigned long *lenp)
+EXPORTED int mailbox_map_record(struct mailbox *mailbox,
+				struct index_record *record,
+				struct buf *data)
 {
 int msgfd;
- char *fname;
+ const char *fname;
 struct stat sbuf;
 
- fname = mailbox_message_fname(mailbox, uid);
+ xstats_inc(MESSAGE_MAP);
+ fname = mailbox_record_fname(mailbox, record);
 
 msgfd = open(fname, O_RDONLY, 0666);
+ if (msgfd == -1) {
+	/* let's try the other file, just in case we're in the middle
+	 * of an archiving */
+	if (record->system_flags & FLAG_ARCHIVED)
+	 fname = mailbox_spool_fname(mailbox, record->uid);
+	else
+	 fname = mailbox_archive_fname(mailbox, record->uid);
+	msgfd = open(fname, O_RDONLY, 0666);
+ }
 if (msgfd == -1) return errno;
 
 if (fstat(msgfd, &sbuf) == -1) {
 	syslog(LOG_ERR, "IOERROR: fstat on %s: %m", fname);
 	fatal("can't fstat message file", EC_OSFILE);
 }
- *basep = 0;
- *lenp = 0;
- map_refresh(msgfd, 1, basep, lenp, sbuf.st_size, fname, mailbox->name);
+ buf_free(data);
+ buf_init_mmap(data, /*onceonly*/1, msgfd, fname, sbuf.st_size, mailbox->name);
 close(msgfd);
 
 return 0;
 }
 
-/*
- * Releases the buffer obtained from mailbox_map_message()
- */
-void mailbox_unmap_message(struct mailbox *mailbox __attribute__((unused)),
-			 unsigned long uid __attribute__((unused)),
-			 const char **basep, unsigned long *lenp)
-{
- map_free(basep, lenp);
-}
-
 static void mailbox_release_resources(struct mailbox *mailbox)
 {
- if (mailbox->i.dirty || mailbox->cache_dirty)
+ int i;
+
+ if (mailbox->i.dirty)
 	abort();
 
 /* just close the header */
- if (mailbox->header_fd != -1) {
-	close(mailbox->header_fd);
-	mailbox->header_fd = -1;
- }
+ xclose(mailbox->header_fd);
 
 /* release and unmap index */
- if (mailbox->index_fd != -1) {
-	close(mailbox->index_fd);
-	mailbox->index_fd = -1;
- }
+ xclose(mailbox->index_fd);
 if (mailbox->index_base)
 	map_free(&mailbox->index_base, &mailbox->index_len);
 
- /* release and unmap cache */
- if (mailbox->cache_fd != -1) {
-	close(mailbox->cache_fd);
-	mailbox->cache_fd = -1;
+ /* release caches */
+ for (i = 0; i < mailbox->caches.count; i++) {
+	struct mappedfile *cachefile = ptrarray_nth(&mailbox->caches, i);
+	mappedfile_close(&cachefile);
 }
- if (mailbox->cache_buf.s)
-	map_free((const char **)&mailbox->cache_buf.s, &mailbox->cache_len);
+ ptrarray_fini(&mailbox->caches);
+}
+
+/*
+ * Open the index file for 'mailbox'
+ */
+static int mailbox_open_index(struct mailbox *mailbox)
+{
+ struct stat sbuf;
+ const char *fname;
+ int openflags = mailbox->is_readonly ? O_RDONLY : O_RDWR;
+
+ mailbox_release_resources(mailbox);
+
+ /* open and map the index file */
+ fname = mailbox_meta_fname(mailbox, META_INDEX);
+ if (!fname)
+	return IMAP_MAILBOX_BADNAME;
+
+ mailbox->index_fd = open(fname, openflags, 0);
+ if (mailbox->index_fd == -1)
+	return IMAP_IOERROR;
+
+ /* don't open the cache yet, it will be loaded by lazy-loading
+ * later */
+
+ fstat(mailbox->index_fd, &sbuf);
+ mailbox->index_ino = sbuf.st_ino;
+ mailbox->index_mtime = sbuf.st_mtime;
+ mailbox->index_size = sbuf.st_size;
+ map_refresh(mailbox->index_fd, 0, &mailbox->index_base,
+		&mailbox->index_len, mailbox->index_size,
+		"index", mailbox->name);
+
+ return 0;
 }
 
-int mailbox_mboxlock_reopen(struct mailboxlist *listitem, int locktype)
+static int mailbox_mboxlock_reopen(struct mailboxlist *listitem, int locktype)
 {
 struct mailbox *mailbox = &listitem->m;
 int r;
@@ -811,12 +898,12 @@
 * Open and read the header of the mailbox with name 'name'
 * The structure pointed to by 'mailbox' is initialized.
 */
-int mailbox_open_advanced(const char *name,
-			 struct mailbox **mailboxptr,
-			 int locktype,
-			 int index_locktype)
+static int mailbox_open_advanced(const char *name,
+				 int locktype,
+				 int index_locktype,
+				 struct mailbox **mailboxptr)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 struct mailboxlist *listitem;
 struct mailbox *mailbox = NULL;
 int r = 0;
@@ -856,17 +943,24 @@
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) goto done;
 
- if (mbentry.mbtype & MBTYPE_MOVING) {
+ if (mbentry->mbtype & MBTYPE_MOVING) {
+	mboxlist_entry_free(&mbentry);
 	r = IMAP_MAILBOX_MOVED;
 	goto done;
 }
 
- mailbox->part = xstrdup(mbentry.partition);
+ mailbox->part = xstrdup(mbentry->partition);
+
 /* Note that the header does have the ACL information, but it is only
 * a backup, and the mboxlist data is considered authoritative, so
 * we will just use what we were passed */
- mailbox->acl = xstrdup(mbentry.acl);
- mailbox->mbtype = mbentry.mbtype;
+ mailbox->acl = xstrdup(mbentry->acl);
+ mailbox->mbtype = mbentry->mbtype;
+
+ mboxlist_entry_free(&mbentry);
+
+ if (index_locktype == LOCK_SHARED)
+	mailbox->is_readonly = 1;
 
 r = mailbox_open_index(mailbox);
 if (r) {
@@ -877,14 +971,14 @@
 
 lockindex:
 /* this will open, map and parse the header file */
- r = mailbox_lock_index(mailbox, index_locktype);
+ r = mailbox_lock_index_internal(mailbox, index_locktype);
 if (r) {
 	syslog(LOG_ERR, "IOERROR: locking index %s: %s",
 	 mailbox->name, error_message(r));
 	goto done;
 }
 
- /* we may be in the process of deleting this mailbox */
+ /* oops, a race, it got deleted meanwhile. That's OK */
 if (mailbox->i.options & OPT_MAILBOX_DELETED) {
 	r = IMAP_MAILBOX_NONEXISTENT;
 	goto done;
@@ -897,69 +991,48 @@
 return r;
 }
 
-int mailbox_open_irl(const char *name, struct mailbox **mailboxptr)
+EXPORTED int mailbox_open_irl(const char *name, struct mailbox **mailboxptr)
 {
- return mailbox_open_advanced(name, mailboxptr, LOCK_SHARED, LOCK_SHARED);
+ return mailbox_open_advanced(name, LOCK_SHARED, LOCK_SHARED,
+				 mailboxptr);
 }
 
-int mailbox_open_iwl(const char *name, struct mailbox **mailboxptr)
+EXPORTED int mailbox_open_iwl(const char *name, struct mailbox **mailboxptr)
 {
- return mailbox_open_advanced(name, mailboxptr, LOCK_SHARED, LOCK_EXCLUSIVE);
+ return mailbox_open_advanced(name, LOCK_SHARED, LOCK_EXCLUSIVE,
+				 mailboxptr);
 }
 
-int mailbox_open_exclusive(const char *name, struct mailbox **mailboxptr)
+EXPORTED int mailbox_open_irlnb(const char *name, struct mailbox **mailboxptr)
 {
- return mailbox_open_advanced(name, mailboxptr, LOCK_EXCLUSIVE,
-				 LOCK_EXCLUSIVE);
+ return mailbox_open_advanced(name,
+				 LOCK_SHARED|LOCK_NONBLOCK,
+				 /* cannot do nonblocking lock on index...why? */
+				 LOCK_SHARED,
+				 mailboxptr);
 }
 
-/*
- * Open the index file for 'mailbox'
- */
-int mailbox_open_index(struct mailbox *mailbox)
+HIDDEN int mailbox_open_exclusive(const char *name, struct mailbox **mailboxptr)
 {
- struct stat sbuf;
- char *fname;
-
- mailbox_release_resources(mailbox);
-
- /* open and map the index file */
- fname = mailbox_meta_fname(mailbox, META_INDEX);
- if (!fname)
-	return IMAP_MAILBOX_BADNAME;
-
- mailbox->index_fd = open(fname, O_RDWR, 0);
- if (mailbox->index_fd == -1)
-	return IMAP_IOERROR;
-
- /* don't open the cache yet, it will be loaded by lazy-loading
- * later */
-
- fstat(mailbox->index_fd, &sbuf);
- mailbox->index_ino = sbuf.st_ino;
- mailbox->index_mtime = sbuf.st_mtime;
- mailbox->index_size = sbuf.st_size;
- map_refresh(mailbox->index_fd, 0, &mailbox->index_base,
-		&mailbox->index_len, mailbox->index_size,
-		"index", mailbox->name);
-
- return 0;
+ return mailbox_open_advanced(name, LOCK_EXCLUSIVE, LOCK_EXCLUSIVE,
+				 mailboxptr);
 }
 
-void mailbox_index_dirty(struct mailbox *mailbox)
+EXPORTED void mailbox_index_dirty(struct mailbox *mailbox)
 {
 assert(mailbox_index_islocked(mailbox, 1));
 mailbox->i.dirty = 1;
 }
 
-void mailbox_modseq_dirty(struct mailbox *mailbox)
+EXPORTED void mailbox_modseq_dirty(struct mailbox *mailbox)
 {
 assert(mailbox_index_islocked(mailbox, 1));
 
 if (mailbox->modseq_dirty)
 	return;
 
- mailbox->i.highestmodseq++;
+ mailbox->i.highestmodseq = mboxname_nextmodseq(mailbox->name,
+			 mailbox->i.highestmodseq);
 mailbox->last_updated = time(0);
 mailbox->modseq_dirty = 1;
 mailbox_index_dirty(mailbox);
@@ -968,12 +1041,11 @@
 /*
 * Close the mailbox 'mailbox', freeing all associated resources.
 */
-void mailbox_close(struct mailbox **mailboxptr)
+EXPORTED void mailbox_close(struct mailbox **mailboxptr)
 {
 int flag;
 struct mailbox *mailbox = *mailboxptr;
 struct mailboxlist *listitem;
- int expunge_days = config_getint(IMAPOPT_EXPUNGE_DAYS);
 
 /* be safe against double-close */
 if (!mailbox) return;
@@ -990,31 +1062,25 @@
 	return;
 }
 
- /* auto-cleanup */
- if (mailbox->i.first_expunged &&
-	(mailbox->index_locktype == LOCK_EXCLUSIVE)) {
-	time_t floor = time(NULL) - (expunge_days * 86400);
-	/* but only if we're more than a full week older than 
-	 * the expunge time, * so it doesn't turn into lots
-	 * of bitty rewrites.
-	 * Also, cyr_expire can get first bite if it's been set
-	 * to run... */
-	if (mailbox->i.first_expunged < floor - (8 * 86400)) {
-	 mailbox_expunge_cleanup(mailbox, floor, NULL);
-	 /* XXX - handle error code? */
-	}
+ /* get a re-read of the options field for cleanup purposes */
+ if (mailbox->index_fd != -1) {
+	if (!mailbox->index_locktype)
+	 mailbox_lock_index(mailbox, LOCK_SHARED);
+	/* drop the index lock here because we'll lose our right to it
+	 * when try to upgrade the mboxlock anyway. */
+	mailbox_unlock_index(mailbox, NULL);
 }
 
- /* drop the index lock here because we'll lose our right to it
- * when try to upgrade the mboxlock anyway. */
- mailbox_unlock_index(mailbox, NULL);
-
 /* do we need to try and clean up? (not if doing a shutdown,
 * speed is probably more important!) */
 if (!in_shutdown && (mailbox->i.options & MAILBOX_CLEANUP_MASK)) {
 	int r = mailbox_mboxlock_reopen(listitem, LOCK_NONBLOCKING);
+	/* we need to re-open the index because we dropped the mboxname lock,
+	 * so the file may have changed */
 	if (!r) r = mailbox_open_index(mailbox);
-	if (!r) r = mailbox_lock_index(mailbox, LOCK_EXCLUSIVE);
+	/* lock_internal so DELETED doesn't cause it to appear to be
+	 * NONEXISTENT */
+	if (!r) r = mailbox_lock_index_internal(mailbox, LOCK_EXCLUSIVE);
 	if (!r) {
 	 /* finish cleaning up */
 	 if (mailbox->i.options & OPT_MAILBOX_DELETED)
@@ -1024,6 +1090,9 @@
 	 else if (mailbox->i.options & OPT_MAILBOX_NEEDS_UNLINK)
 		mailbox_index_unlink(mailbox);
 	 /* or we missed out - someone else beat us to it */
+
+	 /* anyway, unlock again */
+	 mailbox_unlock_index(mailbox, NULL);
 	}
 	/* otherwise someone else has the mailbox locked 
 	 * already, so they can handle the cleanup in
@@ -1049,25 +1118,28 @@
 
 /*
 * Read the header of 'mailbox'
+ * format:
+ * MAGIC
+ * quotaroot TAB uniqueid
+ * userflag1 SPACE userflag2 SPACE userflag3 ... (with no trailing space)
+ * user1 TAB user1acl TAB user2 TAB user2acl TAB (with trailing tab!)
 */
-int mailbox_read_header(struct mailbox *mailbox, char **aclptr)
+HIDDEN int mailbox_read_header(struct mailbox *mailbox, char **aclptr)
 {
 int r = 0;
 int flag;
 const char *name, *p, *tab, *eol;
- int oldformat = 0;
 const char *fname;
 struct stat sbuf;
 const char *base = NULL;
- unsigned long len = 0;
+ size_t len = 0;
 unsigned magic_size = sizeof(MAILBOX_HEADER_MAGIC) - 1;
 
 /* can't be dirty if we're reading it */
 if (mailbox->header_dirty)
 	abort();
 
- if (mailbox->header_fd != -1)
-	close(mailbox->header_fd);
+ xclose(mailbox->header_fd);
 
 fname = mailbox_meta_fname(mailbox, META_HEADER);
 mailbox->header_fd = open(fname, O_RDONLY, 0);
@@ -1078,8 +1150,7 @@
 }
 
 if (fstat(mailbox->header_fd, &sbuf) == -1) {
-	close(mailbox->header_fd);
-	mailbox->header_fd = 1;
+	xclose(mailbox->header_fd);
 	r = IMAP_IOERROR;
 	goto done;
 }
@@ -1096,40 +1167,43 @@
 	goto done;
 }
 
- /* Read quota file pathname */
+ /* Read quota data line */
 p = base + sizeof(MAILBOX_HEADER_MAGIC)-1;
 tab = memchr(p, '\t', sbuf.st_size - (p - base));
 eol = memchr(p, '\n', sbuf.st_size - (p - base));
- if (!tab || tab > eol || !eol) {
-	oldformat = 1;
-	if (!eol) {
-	 r = IMAP_MAILBOX_BADFORMAT;
-	 goto done;
-	}
-	else {
-	 syslog(LOG_DEBUG, "mailbox '%s' has old cyrus.header",
-		 mailbox->name);
-	}
-	tab = eol;
+ if (!eol) {
+	r = IMAP_MAILBOX_BADFORMAT;
+	goto done;
 }
+
+ /* quotaroot (if present) */
 free(mailbox->quotaroot);
- mailbox->quotaroot = NULL;
+ if (!tab || tab > eol) {
+	syslog(LOG_DEBUG, "mailbox '%s' has old cyrus.header",
+	 mailbox->name);
+	tab = eol;
+ }
 if (p < tab) {
 	mailbox->quotaroot = xstrndup(p, tab - p);
 }
+ else {
+	mailbox->quotaroot = NULL;
+ }
 
- if (oldformat) {
-	/* uniqueid needs to be generated when we know the uidvalidity */
-	mailbox->uniqueid = NULL;
- } else {
-	/* read uniqueid */
+ /* read uniqueid (should always exist unless old format) */
+ free(mailbox->uniqueid);
+ mailbox->uniqueid = NULL;
+ if (tab < eol) {
 	p = tab + 1;
 	if (p == eol) {
 	 r = IMAP_MAILBOX_BADFORMAT;
 	 goto done;
 	}
-	mailbox->uniqueid = xstrndup(p, eol - p);
+	tab = memchr(p, '\t', sbuf.st_size - (p - base));
+	if (!tab || tab > eol) tab = eol;
+	mailbox->uniqueid = xstrndup(p, tab - p);
 }
+ /* else, uniqueid needs to be generated when we know the uidvalidity */
 
 /* Read names of user flags */
 p = eol + 1;
@@ -1172,7 +1246,7 @@
 }
 
 /* set a new ACL - only dirty if changed */
-int mailbox_set_acl(struct mailbox *mailbox, const char *acl,
+EXPORTED int mailbox_set_acl(struct mailbox *mailbox, const char *acl,
 		 int dirty_modseq)
 {
 if (mailbox->acl) {
@@ -1188,7 +1262,7 @@
 }
 
 /* set a new QUOTAROOT - only dirty if changed */
-int mailbox_set_quotaroot(struct mailbox *mailbox, const char *quotaroot)
+EXPORTED int mailbox_set_quotaroot(struct mailbox *mailbox, const char *quotaroot)
 {
 if (mailbox->quotaroot) {
 	if (quotaroot && !strcmp(mailbox->quotaroot, quotaroot))
@@ -1211,12 +1285,15 @@
 }
 
 /* find or create a user flag - dirty header if change needed */
-int mailbox_user_flag(struct mailbox *mailbox, const char *flag,
-		 int *flagnum)
+EXPORTED int mailbox_user_flag(struct mailbox *mailbox, const char *flag,
+		 int *flagnum, int create)
 {
 int userflag;
 int emptyflag = -1;
 
+ if (!imparse_isatom(flag))
+	return IMAP_INVALID_IDENTIFIER;
+
 for (userflag = 0; userflag < MAX_USER_FLAGS; userflag++) {
 	if (mailbox->flagnameuserflag) {
 	 if (!strcasecmp(flag, mailbox->flagnameuserflag))
@@ -1228,6 +1305,9 @@
 }
 
 if (userflag == MAX_USER_FLAGS) {
+	if (!create)
+	 return IMAP_NOTFOUND;
+
 	if (emptyflag == -1) 
 	 return IMAP_USERFLAG_EXHAUSTED;
 
@@ -1241,14 +1321,71 @@
 	mailbox->header_dirty = 1;
 }
 
- *flagnum = userflag;
+ if (flagnum) *flagnum = userflag;
+
+ return 0;
+}
+
+/* Remove a user flag from the mailbox, so that the slot can
+ * be reused. Called from cyr_expire when we've made certain
+ * that no record uses the flag anymore. */
+EXPORTED int mailbox_remove_user_flag(struct mailbox *mailbox, int flagnum)
+{
+ if (flagnum < 0 || flagnum >= MAX_USER_FLAGS)
+	return IMAP_INTERNAL;	/* invalid flag number */
+
+ if (!mailbox->flagnameflagnum)
+	return 0;		/* already gone */
+
+ /* need to be index locked to make flag changes */
+ if (!mailbox_index_islocked(mailbox, 1))
+	return IMAP_MAILBOX_LOCKED;
 
+ free(mailbox->flagnameflagnum);
+ mailbox->flagnameflagnum = NULL;
+ mailbox->header_dirty = 1;
 return 0;
 }
 
-int mailbox_buf_to_index_header(const char *buf, struct index_header *i)
+int mailbox_record_hasflag(struct mailbox *mailbox,
+			 struct index_record *record,
+			 const char *flag)
+{
+ int userflag;
+
+ if (!mailbox) return 0;
+ if (!flag) return 0;
+ if (!record) return 0;
+
+ if (flag0 == '\\') {
+	if (!strcasecmp(flag, "\\answered"))
+	 return ((record->system_flags & FLAG_ANSWERED) ? 1 : 0);
+	if (!strcasecmp(flag, "\\deleted"))
+	 return ((record->system_flags & FLAG_DELETED) ? 1 : 0);
+	if (!strcasecmp(flag, "\\draft"))
+	 return ((record->system_flags & FLAG_DRAFT) ? 1 : 0);
+	if (!strcasecmp(flag, "\\flagged"))
+	 return ((record->system_flags & FLAG_FLAGGED) ? 1 : 0);
+	if (!strcasecmp(flag, "\\seen")) {
+	 /* NOTE: this is a special case because it depends
+	 * who the userid is. We will only return the user
+	 * or global seen value */
+	 return ((record->system_flags & FLAG_SEEN) ? 1 : 0);
+	}
+	/* unknown system flag is never present */
+	return 0;
+ }
+
+ if (mailbox_user_flag(mailbox, flag, &userflag, 0))
+	return 0;
+
+ return ((record->user_flagsuserflag/32 & (1<<(userflag&31))) ? 1 : 0);
+}
+
+HIDDEN int mailbox_buf_to_index_header(const char *buf, struct index_header *i)
 {
 uint32_t crc;
+ bit32 qannot;
 
 i->dirty = 0;
 
@@ -1260,11 +1397,7 @@
 i->num_records = ntohl(*((bit32 *)(buf+OFFSET_NUM_RECORDS)));
 i->last_appenddate = ntohl(*((bit32 *)(buf+OFFSET_LAST_APPENDDATE)));
 i->last_uid = ntohl(*((bit32 *)(buf+OFFSET_LAST_UID)));
-#ifdef HAVE_LONG_LONG_INT
- i->quota_mailbox_used = align_ntohll(buf+OFFSET_QUOTA_MAILBOX_USED64);
-#else
- i->quota_mailbox_used = ntohl(*((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)));
-#endif
+ i->quota_mailbox_used = align_ntohll(buf+OFFSET_QUOTA_MAILBOX_USED);
 i->pop3_last_login = ntohl(*((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)));
 i->uidvalidity = ntohl(*((bit32 *)(buf+OFFSET_UIDVALIDITY)));
 i->deleted = ntohl(*((bit32 *)(buf+OFFSET_DELETED)));
@@ -1272,13 +1405,8 @@
 i->flagged = ntohl(*((bit32 *)(buf+OFFSET_FLAGGED)));
 i->options = ntohl(*((bit32 *)(buf+OFFSET_MAILBOX_OPTIONS)));
 i->leaked_cache_records = ntohl(*((bit32 *)(buf+OFFSET_LEAKED_CACHE)));
-#ifdef HAVE_LONG_LONG_INT
- i->highestmodseq = align_ntohll(buf+OFFSET_HIGHESTMODSEQ_64);
- i->deletedmodseq = align_ntohll(buf+OFFSET_DELETEDMODSEQ_64);
-#else
- i->highestmodseq = ntohl(*((bit32 *)(buf+OFFSET_HIGHESTMODSEQ)));
- i->deletedmodseq = ntohl(*((bit32 *)(buf+OFFSET_DELETEDMODSEQ)));
-#endif
+ i->highestmodseq = align_ntohll(buf+OFFSET_HIGHESTMODSEQ);
+ i->deletedmodseq = align_ntohll(buf+OFFSET_DELETEDMODSEQ);
 i->exists = ntohl(*((bit32 *)(buf+OFFSET_EXISTS)));
 i->first_expunged = ntohl(*((bit32 *)(buf+OFFSET_FIRST_EXPUNGED)));
 i->last_repack_time = ntohl(*((bit32 *)(buf+OFFSET_LAST_REPACK_TIME)));
@@ -1287,13 +1415,19 @@
 i->recentuid = ntohl(*((bit32 *)(buf+OFFSET_RECENTUID)));
 i->recenttime = ntohl(*((bit32 *)(buf+OFFSET_RECENTTIME)));
 i->header_crc = ntohl(*((bit32 *)(buf+OFFSET_HEADER_CRC)));
+ i->pop3_show_after = ntohl(*((bit32 *)(buf+OFFSET_POP3_SHOW_AFTER)));
+ qannot = ntohl(*((bit32 *)(buf+OFFSET_QUOTA_ANNOT_USED)));
+ /* this field is stored as a 32b unsigned on disk but 64b signed
+ * in memory, so we need to be careful about sign extension */
+ i->quota_annot_used = (quota_t)((unsigned long long)qannot);
+ i->sync_crc_vers = ntohl(*((bit32 *)(buf+OFFSET_SYNC_CRC_VERS)));
 
 if (!i->exists)
 	i->options |= OPT_POP3_NEW_UIDL;
 
 crc = crc32_map(buf, OFFSET_HEADER_CRC);
 if (crc != i->header_crc)
-	return IMAP_MAILBOX_CRC;
+	return IMAP_MAILBOX_CHECKSUM;
 
 return 0;
 }
@@ -1316,11 +1450,9 @@
 
 	mailbox->index_size = sbuf.st_size;
 
-	/* the cache will be stale too */
-	mailbox->need_cache_refresh = 1;
 }
 
- /* always refresh, so we're safe for map_nommap */
+ /* always refresh, we may be using map_nommap */
 map_refresh(mailbox->index_fd, 1, &mailbox->index_base,
 		&mailbox->index_len, mailbox->index_size,
 		"index", mailbox->name);
@@ -1366,7 +1498,7 @@
 /*
 * Read an index record from a mapped index file
 */
-int mailbox_buf_to_index_record(const char *buf,
+HIDDEN int mailbox_buf_to_index_record(const char *buf,
 				struct index_record *record)
 {
 uint32_t crc;
@@ -1391,18 +1523,15 @@
 record->content_lines = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_LINES)));
 record->cache_version = ntohl(*((bit32 *)(buf+OFFSET_CACHE_VERSION)));
 message_guid_import(&record->guid, (unsigned char *)buf+OFFSET_MESSAGE_GUID);
-#ifdef HAVE_LONG_LONG_INT
- record->modseq = ntohll(*((bit64 *)(buf+OFFSET_MODSEQ_64)));
-#else
- record->modseq = ntohl(*((bit32 *)(buf+OFFSET_MODSEQ)));
-#endif
+ record->modseq = ntohll(*((bit64 *)(buf+OFFSET_MODSEQ)));
+ record->cid = ntohll(*(bit64 *)(buf+OFFSET_CID));
 record->cache_crc = ntohl(*((bit32 *)(buf+OFFSET_CACHE_CRC)));
 record->record_crc = ntohl(*((bit32 *)(buf+OFFSET_RECORD_CRC)));
 
 /* check CRC32 */
 crc = crc32_map(buf, OFFSET_RECORD_CRC);
 if (crc != record->record_crc)
-	return IMAP_MAILBOX_CRC;
+	return IMAP_MAILBOX_CHECKSUM;
 
 return 0;
 }
@@ -1410,7 +1539,7 @@
 /*
 * Read an index record from a mailbox
 */
-int mailbox_read_index_record(struct mailbox *mailbox,
+EXPORTED int mailbox_read_index_record(struct mailbox *mailbox,
 			 uint32_t recno,
 			 struct index_record *record)
 {
@@ -1436,34 +1565,134 @@
 return r;
 }
 
+EXPORTED int mailbox_has_conversations(struct mailbox *mailbox)
+{
+ char *path;
+
+ /* not needed */
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+
+ /* we never store data about deleted mailboxes */
+ if (mboxname_isdeletedmailbox(mailbox->name, NULL))
+	return 0;
+
+ path = conversations_getmboxpath(mailbox->name);
+ if (!path) return 0;
+ free(path);
+
+ return 1;
+}
+
+static int mailbox_lock_conversations(struct mailbox *mailbox)
+{
+ /* does this mailbox have conversations? */
+ if (!mailbox_has_conversations(mailbox))
+	return 0;
+
+ /* already locked */
+ if (conversations_get_mbox(mailbox->name))
+	return 0;
+
+ return conversations_open_mbox(mailbox->name, &mailbox->local_cstate);
+}
+
 /*
- * bsearch() function to compare two index record buffers by UID
+ * bsearch() comparison function for searching on UID.
 */
 static int rec_compar(const void *key, const void *mem)
 {
 uint32_t uid = *((uint32_t *) key);
+ uint32_t recuid = ntohl(*((bit32 *)((const char *)mem+OFFSET_UID)));
+ if (uid < recuid) return -1;
+ return (uid > recuid);
+}
+
+static uint32_t mailbox_getuid(struct mailbox *mailbox, uint32_t recno)
+{
 struct index_record record;
- int r;
+ record.uid = 0;
+ /* XXX - cheaper memory-access reads? */
+ mailbox_read_index_record(mailbox, recno, &record);
+ return record.uid;
+}
 
- if ((r = mailbox_buf_to_index_record(mem, &record))) return r;
 
- if (uid < record.uid) return -1;
- return (uid > record.uid);
+/*
+ * Returns the recno of the message with UID 'uid'.
+ * If no message with UID 'uid', returns the message with
+ * the higest UID not greater than 'uid'.
+ */
+EXPORTED uint32_t mailbox_finduid(struct mailbox *mailbox, uint32_t uid)
+{
+ uint32_t low = 1;
+ uint32_t high = mailbox->i.num_records;
+ uint32_t mid;
+ uint32_t miduid;
+
+ while (low <= high) {
+	mid = (high - low)/2 + low;
+	miduid = mailbox_getuid(mailbox, mid);
+	if (miduid == uid)
+	 return mid;
+	else if (miduid > uid)
+	 high = mid - 1;
+	else
+	 low = mid + 1;
+ }
+ return high;
 }
 
 /*
- * Find the index record in mailbox corresponding to UID
+ * Perform a binary search on the mailbox index file to read the record
+ * for uid 'uid' into 'record'. If 'oldrecord' is not NULL then it is
+ * assumed to point a correct and current index record from an earlier
+ * call, and the search is bounded by that record. Returns 0 on success
+ * or an IMAP error code on failure.
 */
-int mailbox_find_index_record(struct mailbox *mailbox, uint32_t uid,
-			 struct index_record *record)
+EXPORTED int mailbox_find_index_record(struct mailbox *mailbox, uint32_t uid,
+				 struct index_record *record,
+				 const struct index_record *oldrecord)
 {
- const void *mem, *base = mailbox->index_base + mailbox->i.start_offset;
+ const char *mem, *base = mailbox->index_base + mailbox->i.start_offset;
+ const char *low = base;
 size_t num_records = mailbox->i.num_records;
 size_t size = mailbox->i.record_size;
 int r;
 
- mem = bsearch(&uid, base, num_records, size, rec_compar);
- if (!mem) return CYRUSDB_NOTFOUND;
+ if (uid > mailbox->i.last_uid) return IMAP_NOTFOUND;
+
+ if (oldrecord) {
+	const char *oldmem = base + (oldrecord->recno-1) * size;
+	if (uid == oldrecord->uid) {
+	 /* already found it */
+	 if (record != oldrecord)
+		memcpy(record, oldrecord, sizeof(struct index_record));
+	 return 0;
+	}
+	else if (uid == oldrecord->uid+1) {
+	 /* are we at the end? */
+	 if (oldrecord->recno == mailbox->i.num_records)
+		return IMAP_NOTFOUND;
+	 /* Optimise for the common case of moving up by one uid.
+	 * The index file is in UID order so the record we want
+	 * is either the next one or is not present. */
+	 low = oldmem + size;
+	 num_records = 1;
+	}
+	else if (uid < oldrecord->uid) {
+	 /* target is before the old record */
+	 num_records = oldrecord->recno-1;
+	}
+	else {
+	 /* target is after the old record */
+	 low = oldmem + size;
+	 num_records -= oldrecord->recno;
+	}
+ }
+
+ mem = bsearch(&uid, low, num_records, size, rec_compar);
+ if (!mem) return IMAP_NOTFOUND;
 
 if ((r = mailbox_buf_to_index_record(mem, record))) return r;
 
@@ -1475,21 +1704,37 @@
 /*
 * Lock the index file for 'mailbox'. Reread index file header if necessary.
 */
-int mailbox_lock_index(struct mailbox *mailbox, int locktype)
+static int mailbox_lock_index_internal(struct mailbox *mailbox, int locktype)
 {
- char *fname;
 struct stat sbuf;
 int r = 0;
+ const char *header_fname = mailbox_meta_fname(mailbox, META_HEADER);
+ const char *index_fname = mailbox_meta_fname(mailbox, META_INDEX);
 
 assert(mailbox->index_fd != -1);
 assert(!mailbox->index_locktype);
 
 restart:
+ r = 0;
 
- if (locktype == LOCK_EXCLUSIVE)
-	r = lock_blocking(mailbox->index_fd);
- else
-	r = lock_shared(mailbox->index_fd);
+ if (locktype == LOCK_EXCLUSIVE) {
+	/* handle read-only case cleanly - we need to re-open read-write first! */
+	if (mailbox->is_readonly) {
+	 mailbox->is_readonly = 0;
+	 r = mailbox_open_index(mailbox);
+	}
+	/* XXX - this could be handled out a layer, but we always
+	 * need to have a locked conversations DB */
+	if (!r) r = mailbox_lock_conversations(mailbox);
+	if (!r) r = lock_blocking(mailbox->index_fd, index_fname);
+ }
+ else if (locktype == LOCK_SHARED) {
+	r = lock_shared(mailbox->index_fd, index_fname);
+ }
+ else {
+	/* this function does not support nonblocking locks */
+	fatal("invalid locktype for index", EC_SOFTWARE);
+ }
 
 /* double check that the index exists and has at least enough
 * data to check the version number */
@@ -1499,7 +1744,7 @@
 	else if (mailbox->index_size < OFFSET_NUM_RECORDS)
 	 r = IMAP_MAILBOX_BADFORMAT;
 	if (r)
-	 lock_unlock(mailbox->index_fd);
+	 lock_unlock(mailbox->index_fd, index_fname);
 }
 
 if (r) {
@@ -1509,12 +1754,12 @@
 }
 
 mailbox->index_locktype = locktype;
+ gettimeofday(&mailbox->starttime, 0);
 
- fname = mailbox_meta_fname(mailbox, META_HEADER);
- r = stat(fname, &sbuf);
+ r = stat(header_fname, &sbuf);
 if (r == -1) {
 	syslog(LOG_ERR, "IOERROR: stating header %s for %s: %m",
-	 fname, mailbox->name);
+	 header_fname, mailbox->name);
 	mailbox_unlock_index(mailbox, NULL);
 	return IMAP_IOERROR;
 }
@@ -1542,13 +1787,11 @@
 
 	 prev_locktype = listitem->l->locktype;
 
-	 if (prev_locktype != LOCK_EXCLUSIVE) {
-		/* we need to switch to an exclusive lock while upgrading */
-		r = mailbox_mboxlock_reopen(listitem, LOCK_EXCLUSIVE);
-		if (r) return r;
-		r = mailbox_open_index(mailbox);
-		if (r) return r;
-	 }
+	 /* we need to switch to an exclusive lock while upgrading */
+	 r = mailbox_mboxlock_reopen(listitem, LOCK_EXCLUSIVE);
+	 if (r) return r;
+	 r = mailbox_open_index(mailbox);
+	 if (r) return r;
 
 	 /* lie about our index lock status - the exclusive namelock
 	 * provides equivalent properties - and we know it won't
@@ -1557,13 +1800,20 @@
 	 r = upgrade_index(mailbox);
 	 if (r) return r;
 
+	 /* recalculate all counts */
+	 r = mailbox_open_index(mailbox);
+	 if (r) return r;
+	 r = mailbox_read_index_header(mailbox);
+	 if (r) return r;
+	 r = mailbox_index_recalc(mailbox);
+	 if (r) return r;
+	 r = mailbox_commit(mailbox);
+	 if (r) return r;
+
 	 /* we have to downgrade again afterwards so a "SELECT" won't
 	 * hold an exclusive lock forever */
-	 if (prev_locktype != LOCK_EXCLUSIVE) {
-		r = mailbox_mboxlock_reopen(listitem, prev_locktype);
-		if (r) return r;
-	 }
-	 /* either way, must refresh index here. The old one is stale */
+	 r = mailbox_mboxlock_reopen(listitem, prev_locktype);
+	 if (r) return r;
 	 r = mailbox_open_index(mailbox);
 	 if (r) return r;
 
@@ -1588,25 +1838,24 @@
 	 mailbox->name, (unsigned int)mailbox->header_file_crc,
 	 (unsigned int)mailbox->i.header_file_crc);
 	mailbox_unlock_index(mailbox, NULL);
-	return IMAP_MAILBOX_CRC;
+	return IMAP_MAILBOX_CHECKSUM;
 }
 
- /* fix up 2.4.0 bug breakage */
- if (mailbox->i.uidvalidity == 0) {
-	mailbox->i.uidvalidity = time(0);
-	if (locktype == LOCK_EXCLUSIVE) {
-	 mailbox_index_dirty(mailbox);
-	 mailbox_commit(mailbox);
-	 syslog(LOG_ERR, "%s: fixing zero uidvalidity", mailbox->name);
-	}
- }
- if (mailbox->i.highestmodseq == 0) {
-	mailbox->i.highestmodseq = 1;
-	if (locktype == LOCK_EXCLUSIVE) {
-	 mailbox_index_dirty(mailbox);
-	 mailbox_commit(mailbox);
-	 syslog(LOG_ERR, "%s: fixing zero highestmodseq", mailbox->name);
-	}
+ return 0;
+}
+
+EXPORTED int mailbox_lock_index(struct mailbox *mailbox, int locktype)
+{
+ int r = mailbox_lock_index_internal(mailbox, locktype);
+ if (r) return r;
+
+ /* otherwise, sanity checks for regular use, but not for internal
+ * use during cleanup */
+
+ /* we may be in the process of deleting this mailbox */
+ if (mailbox->i.options & OPT_MAILBOX_DELETED) {
+	mailbox_unlock_index(mailbox, NULL);
+	return IMAP_MAILBOX_NONEXISTENT;
 }
 
 return 0;
@@ -1615,10 +1864,15 @@
 /*
 * Release lock on the index file for 'mailbox'
 */
-void mailbox_unlock_index(struct mailbox *mailbox, struct statusdata *sdata)
+EXPORTED void mailbox_unlock_index(struct mailbox *mailbox, struct statusdata *sdata)
 {
+ struct timeval endtime;
+ double timediff;
+ int r;
+ const char *index_fname = mailbox_meta_fname(mailbox, META_INDEX);
+
 /* naughty - you can't unlock a dirty mailbox! */
- int r = mailbox_commit(mailbox);
+ r = mailbox_commit(mailbox);
 if (r) {
 	syslog(LOG_ERR, "IOERROR: failed to commit mailbox %s, "
 	 "probably need to reconstruct",
@@ -1630,6 +1884,7 @@
 	if (updatenotifier) updatenotifier(mailbox->name);
 	sync_log_mailbox(mailbox->name);
 	statuscache_invalidate(mailbox->name, sdata);
+
 	mailbox->has_changed = 0;
 }
 else if (sdata) {
@@ -1638,23 +1893,46 @@
 }
 
 if (mailbox->index_locktype) {
-	if (lock_unlock(mailbox->index_fd))
+	if (lock_unlock(mailbox->index_fd, index_fname))
 	 syslog(LOG_ERR, "IOERROR: unlocking index of %s: %m", 
 		mailbox->name);
+	mailbox->index_locktype = 0;
+ }
+
+ gettimeofday(&endtime, 0);
+ timediff = timesub(&mailbox->starttime, &endtime);
+ if (timediff > 1.0) {
+	syslog(LOG_NOTICE, "mailbox: longlock %s for %0.1f seconds",
+	 mailbox->name, timediff);
 }
 
- mailbox->index_locktype = 0;
+ if (mailbox->local_cstate) {
+	int r = conversations_commit(&mailbox->local_cstate);
+	if (r)
+	 syslog(LOG_ERR, "Error committing to conversations database for mailbox %s: %s",
+		 mailbox->name, error_message(r));
+ }
+}
+
+EXPORTED int mailbox_yield_index(struct mailbox *mailbox)
+{
+ int locktype = mailbox->index_locktype;
+
+ if (!locktype) return 0;
+
+ mailbox_unlock_index(mailbox, NULL);
+ return mailbox_lock_index(mailbox, locktype);
 }
 
 /*
 * Write the header file for 'mailbox'
 */
-int mailbox_commit_header(struct mailbox *mailbox)
+static int mailbox_commit_header(struct mailbox *mailbox)
 {
 int flag;
 int fd;
 int r = 0;
- char *quotaroot;
+ const char *quotaroot;
 const char *newfname;
 struct iovec iov10;
 int niov;
@@ -1733,9 +2011,10 @@
 return 0;
 }
 
-bit32 mailbox_index_header_to_buf(struct index_header *i, unsigned char *buf)
+static bit32 mailbox_index_header_to_buf(struct index_header *i, unsigned char *buf)
 {
 bit32 crc;
+ bit32 options = i->options & MAILBOX_OPT_VALID;
 
 *((bit32 *)(buf+OFFSET_GENERATION_NO)) = htonl(i->generation_no);
 *((bit32 *)(buf+OFFSET_FORMAT)) = htonl(i->format);
@@ -1747,32 +2026,17 @@
 *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(i->last_uid);
 
 /* quotas may be 64bit now */
-#ifdef HAVE_LONG_LONG_INT
- *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(i->quota_mailbox_used);
-#else	
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(i->quota_mailbox_used);
-#endif
+ align_htonll(buf+OFFSET_QUOTA_MAILBOX_USED, i->quota_mailbox_used);
 
 *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(i->pop3_last_login);
 *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(i->uidvalidity);
 *((bit32 *)(buf+OFFSET_DELETED)) = htonl(i->deleted);
 *((bit32 *)(buf+OFFSET_ANSWERED)) = htonl(i->answered);
 *((bit32 *)(buf+OFFSET_FLAGGED)) = htonl(i->flagged);
- *((bit32 *)(buf+OFFSET_MAILBOX_OPTIONS)) = htonl(i->options & MAILBOX_OPT_VALID);
+ *((bit32 *)(buf+OFFSET_MAILBOX_OPTIONS)) = htonl(options);
 *((bit32 *)(buf+OFFSET_LEAKED_CACHE)) = htonl(i->leaked_cache_records);
-#ifdef HAVE_LONG_LONG_INT
- align_htonll(buf+OFFSET_HIGHESTMODSEQ_64, i->highestmodseq);
- align_htonll(buf+OFFSET_DELETEDMODSEQ_64, i->deletedmodseq);
-#else
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ_64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ)) = htonl(i->highestmodseq);
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_DELETEDMODSEQ_64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_DELETEDMODSEQ)) = htonl(i->deletedmodseq);
-#endif
+ align_htonll(buf+OFFSET_HIGHESTMODSEQ, i->highestmodseq);
+ align_htonll(buf+OFFSET_DELETEDMODSEQ, i->deletedmodseq);
 *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(i->exists);
 *((bit32 *)(buf+OFFSET_FIRST_EXPUNGED)) = htonl(i->first_expunged);
 *((bit32 *)(buf+OFFSET_LAST_REPACK_TIME)) = htonl(i->last_repack_time);
@@ -1780,9 +2044,12 @@
 *((bit32 *)(buf+OFFSET_SYNC_CRC)) = htonl(i->sync_crc);
 *((bit32 *)(buf+OFFSET_RECENTUID)) = htonl(i->recentuid);
 *((bit32 *)(buf+OFFSET_RECENTTIME)) = htonl(i->recenttime);
- *((bit32 *)(buf+OFFSET_SPARE0)) = htonl(0); /* RESERVED */
- *((bit32 *)(buf+OFFSET_SPARE1)) = htonl(0); /* RESERVED */
- *((bit32 *)(buf+OFFSET_SPARE2)) = htonl(0); /* RESERVED */
+ *((bit32 *)(buf+OFFSET_POP3_SHOW_AFTER)) = htonl(i->pop3_show_after);
+ /* this field is 64b in memory but 32b on disk - as it counts
+ * bytes stored in dbs and the dbs are 32b anyway there should
+ * be no problem */
+ *((bit32 *)(buf+OFFSET_QUOTA_ANNOT_USED)) = htonl((bit32)i->quota_annot_used);
+ *((bit32 *)(buf+OFFSET_SYNC_CRC_VERS)) = htonl(i->sync_crc_vers);
 
 /* Update checksum */
 crc = htonl(crc32_map((char *)buf, OFFSET_HEADER_CRC));
@@ -1791,12 +2058,11 @@
 return crc;
 }
 
-int mailbox_commit_quota(struct mailbox *mailbox)
+HIDDEN int mailbox_commit_quota(struct mailbox *mailbox)
 {
- struct txn *tid = NULL;
- int r;
- struct quota q;
- quota_t qdiff;
+ int res;
+ int changed = 0;
+ quota_t quota_usageQUOTA_NUMRESOURCES;
 
 /* not dirty */
 if (!mailbox->quota_dirty)
@@ -1804,43 +2070,35 @@
 
 mailbox->quota_dirty = 0;
 
- /* unchanged */
- qdiff = mailbox->i.quota_mailbox_used - mailbox->quota_previously_used;
- if (!qdiff)
-	return 0;
-
 /* no quota root means we don't track quota. That's OK */
 if (!mailbox->quotaroot)
 	return 0;
 
- assert(mailbox_index_islocked(mailbox, 1));
-
- q.root = mailbox->quotaroot;
- r = quota_read(&q, &tid, 1);
- if (!r) {
-	/* check we won't underflow */
-	if ((quota_t)-qdiff > (quota_t)q.used)
-	 q.used = 0;
-	else
-	 q.used += qdiff;
-	r = quota_write(&q, &tid);
+ mailbox_get_usage(mailbox, quota_usage);
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	quota_usageres -= mailbox->quota_previously_usedres;
+	if (quota_usageres != 0) {
+	 changed++;
+	}
 }
+ /* unchanged */
+ if (!changed)
+	return 0;
 
- if (!r) quota_commit(&tid);
- else {
-	quota_abort(&tid);
-	/* XXX - fail here? It's tempting */
-	syslog(LOG_ERR, "LOSTQUOTA: unable to record quota file %s",
-	 mailbox->quotaroot);
- }
+ assert(mailbox_index_islocked(mailbox, 1));
+
+ quota_update_useds(mailbox->quotaroot, quota_usage, mailbox->name);
+ /* XXX - fail upon issue? It's tempting */
 
 return 0;
 }
 
+
+
 /*
 * Write the index header for 'mailbox'
 */
-int mailbox_commit(struct mailbox *mailbox)
+EXPORTED int mailbox_commit(struct mailbox *mailbox)
 {
 /* XXX - ibuf for alignment? */
 static unsigned char bufINDEX_HEADER_SIZE;
@@ -1853,6 +2111,9 @@
 r = mailbox_commit_quota(mailbox);
 if (r) return r;
 
+ r = annotate_state_commit(&mailbox->annot_state);
+ if (r) return r;
+
 r = mailbox_commit_header(mailbox);
 if (r) return r;
 
@@ -1874,6 +2135,12 @@
 	return IMAP_IOERROR;
 }
 
+ if (config_auditlog && mailbox->modseq_dirty)
+	syslog(LOG_NOTICE, "auditlog: modseq sessionid=<%s> "
+	 "mailbox=<%s> uniqueid=<%s> highestmodseq=<" MODSEQ_FMT ">",
+	 session_id(), mailbox->name, mailbox->uniqueid,
+	 mailbox->i.highestmodseq);
+
 /* remove all dirty flags! */
 mailbox->i.dirty = 0;
 mailbox->modseq_dirty = 0;
@@ -1888,7 +2155,7 @@
 /*
 * Put an index record into a buffer suitable for writing to a file.
 */
-bit32 mailbox_index_record_to_buf(struct index_record *record,
+static bit32 mailbox_index_record_to_buf(struct index_record *record,
 				 unsigned char *buf)
 {
 int n;
@@ -1909,13 +2176,8 @@
 *((bit32 *)(buf+OFFSET_CONTENT_LINES)) = htonl(record->content_lines);
 *((bit32 *)(buf+OFFSET_CACHE_VERSION)) = htonl(record->cache_version);
 message_guid_export(&record->guid, buf+OFFSET_MESSAGE_GUID);
-#ifdef HAVE_LONG_LONG_INT
- *((bit64 *)(buf+OFFSET_MODSEQ_64)) = htonll(record->modseq);
-#else
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_MODSEQ_64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_MODSEQ)) = htonl(record->modseq);
-#endif
+ *((bit64 *)(buf+OFFSET_MODSEQ)) = htonll(record->modseq);
+ *((bit64 *)(buf+OFFSET_CID)) = htonll(record->cid);
 *((bit32 *)(buf+OFFSET_CACHE_CRC)) = htonl(record->cache_crc); 
 
 /* calculate the checksum */
@@ -1925,10 +2187,73 @@
 return crc;
 }
 
-bit32 make_sync_crc(struct mailbox *mailbox, struct index_record *record)
+
+static void mailbox_quota_dirty(struct mailbox *mailbox)
+{
+ /* track quota use */
+ if (!mailbox->quota_dirty) {
+	mailbox->quota_dirty = 1;
+	mailbox_get_usage(mailbox, mailbox->quota_previously_used);
+ }
+}
+
+static void header_update_counts(struct index_header *i,
+				 struct index_record *record,
+				 int is_add)
+{
+ int num = is_add ? 1 : -1;
+
+ /* we don't track counts for EXPUNGED records */
+ if (record->system_flags & FLAG_EXPUNGED)
+	return;
+
+ /* update mailbox header fields */
+ if (record->system_flags & FLAG_ANSWERED)
+	i->answered += num;
+
+ if (record->system_flags & FLAG_FLAGGED)
+	i->flagged += num;
+
+ if (record->system_flags & FLAG_DELETED)
+	i->deleted += num;
+
+ if (is_add) {
+	i->exists++;
+	i->quota_mailbox_used += record->size;
+ }
+ else {
+	if (i->exists) i->exists--;
+
+	/* corruption prevention - check we don't go negative */
+	if (i->quota_mailbox_used > record->size)
+	 i->quota_mailbox_used -= record->size;
+	else
+	 i->quota_mailbox_used = 0;
+ }
+}
+
+/*************************** Sync CRC algorithms ***************************/
+
+typedef struct mailbox_crcalgo mailbox_crcalgo_t;
+struct mailbox_crcalgo {
+ unsigned version;
+ uint32_t (*record)(const struct mailbox *, const struct index_record *);
+ uint32_t (*annot)(unsigned int uid, const char *entry,
+		 const char *userid, const struct buf *value);
+};
+
+struct annot_calc_rock
+{
+ const mailbox_crcalgo_t *algo;
+ uint32_t crc;
+ quota_t used;
+};
+
+static uint32_t crc32_record(const struct mailbox *mailbox,
+			 const struct index_record *record)
 {
 char buf4096;
- bit32 flagcrc = 0;
+ uint32_t flagcrc = 0;
 int flag;
 
 /* expunged flags have no sync CRC */
@@ -1960,7 +2285,7 @@
 	flagcrc ^= crc32_cstring(buf);
 }
 
- snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
+ snprintf(buf, sizeof(buf), "%u " MODSEQ_FMT " %lu (%u) %lu %s",
 	 record->uid, record->modseq, record->last_updated,
 	 flagcrc,
 	 record->internaldate,
@@ -1969,66 +2294,341 @@
 return crc32_cstring(buf);
 }
 
-static void mailbox_quota_dirty(struct mailbox *mailbox)
+static int cmpcase(const void *a, const void *b)
 {
- /* track quota use */
- if (!mailbox->quota_dirty) {
-	mailbox->quota_dirty = 1;
-	mailbox->quota_previously_used = mailbox->i.quota_mailbox_used;
- }
+ return strcasecmp(*(const char **)a, *(const char **)b);
 }
 
-static void header_update_counts(struct index_header *i,
-				 struct index_record *record,
-				 int is_add)
+static uint32_t md5_record(const struct mailbox *mailbox,
+			const struct index_record *record)
 {
- int num = is_add ? 1 : -1;
+ MD5_CTX ctx;
+ union {
+	uint32_t b32;
+	unsigned char md516;
+ } result;
+ unsigned int i;
+ unsigned int nflags = 0;
+ int n;
+ const char *flagsMAX_USER_FLAGS + /*system flags*/5;
+ char buf256;
+ static struct buf flagbuf = BUF_INITIALIZER;
 
- /* we don't track counts for EXPUNGED records */
+ /* expunged flags have no sync CRC */
 if (record->system_flags & FLAG_EXPUNGED)
-	return;
+	return 0;
 
- /* update mailbox header fields */
- if (record->system_flags & FLAG_ANSWERED)
-	i->answered += num;
+ MD5Init(&ctx);
 
+ /* system flags - already sorted lexically */
+ if (record->system_flags & FLAG_ANSWERED)
+	flagsnflags++ = "\\answered";
+ if (record->system_flags & FLAG_DELETED)
+	flagsnflags++ = "\\deleted";
+ if (record->system_flags & FLAG_DRAFT)
+	flagsnflags++ = "\\draft";
 if (record->system_flags & FLAG_FLAGGED)
-	i->flagged += num;
+	flagsnflags++ = "\\flagged";
+ if (record->system_flags & FLAG_SEEN)
+	flagsnflags++ = "\\seen";
 
- if (record->system_flags & FLAG_DELETED)
-	i->deleted += num;
+ /* user flags */
+ for (i = 0; i < MAX_USER_FLAGS; i++) {
+	if (!mailbox->flagnamei)
+	 continue;
+	if (!(record->user_flagsi/32 & (1<<(i&31))))
+	 continue;
+	flagsnflags++ = mailbox->flagnamei;
+ }
 
- if (is_add) {
-	i->exists++;
-	i->quota_mailbox_used += record->size;
+ /*
+ * There is a potential optimisation here: we only need to sort if
+ * there were any user flags because the system flags are added
+ * pre-sorted. However, we expect never to achieve that in
+ * production, so we don't code it.
+ */
+ qsort(flags, nflags, sizeof(char *), cmpcase);
+
+ n = snprintf(buf, sizeof(buf), "%u", record->uid);
+ MD5Update(&ctx, buf, n);
+
+ MD5Update(&ctx, " ", 1);
+
+ n = snprintf(buf, sizeof(buf), "%llu", record->modseq);
+ MD5Update(&ctx, buf, n);
+
+ MD5Update(&ctx, " ", 1);
+
+ n = snprintf(buf, sizeof(buf), "%lu", record->last_updated);
+ MD5Update(&ctx, buf, n);
+
+ MD5Update(&ctx, " (", 2);
+
+ for (i = 0 ; i < nflags ; i++) {
+	if (i)
+	 MD5Update(&ctx, " ", 1);
+
+	buf_reset(&flagbuf);
+	buf_appendcstr(&flagbuf, flagsi);
+	buf_cstring(&flagbuf);
+	lcase(flagbuf.s);
+	MD5Update(&ctx, flagbuf.s, flagbuf.len);
 }
- else {
-	if (i->exists) i->exists--;
 
+ MD5Update(&ctx, ") ", 2);
+
+ n = snprintf(buf, sizeof(buf), "%lu", record->internaldate);
+ MD5Update(&ctx, buf, n);
+
+ MD5Update(&ctx, " ", 1);
+
+ MD5Update(&ctx, message_guid_encode(&record->guid), 2*MESSAGE_GUID_SIZE);
+
+ MD5Update(&ctx, " ", 1);
+
+ n = snprintf(buf, sizeof(buf), "%llu", record->cid);
+ MD5Update(&ctx, buf, n);
+
+ MD5Final(result.md5, &ctx);
+
+ return ntohl(result.b32);
+}
+
+static uint32_t md5_annot(unsigned int uid, const char *entry,
+		 const char *userid, const struct buf *value)
+{
+ MD5_CTX ctx;
+ union {
+	uint32_t b32;
+	unsigned char md516;
+ } result;
+ char buf32;
+
+ MD5Init(&ctx);
+
+ snprintf(buf, sizeof(buf), "%u", uid);
+ MD5Update(&ctx, buf, strlen(buf));
+ MD5Update(&ctx, " ", 1);
+ MD5Update(&ctx, entry, strlen(entry));
+ MD5Update(&ctx, " ", 1);
+ MD5Update(&ctx, userid, strlen(userid));
+ MD5Update(&ctx, " ", 1);
+ MD5Update(&ctx, value->s, value->len);
+
+ MD5Final(result.md5, &ctx);
+
+ return ntohl(result.b32);
+}
+
+static const mailbox_crcalgo_t crcalgos = {
+ {
+	1,		 /* historical 2.4.x CRC algorithm */
+	crc32_record,
+	NULL },
+ {
+	2,		 /* XOR the first 16 bytes of md5s instead */
+	md5_record,
+	md5_annot },
+ { 0, NULL, NULL }
+};
+
+static const mailbox_crcalgo_t *mailbox_find_crcalgo(unsigned minvers, unsigned maxvers)
+{
+ const mailbox_crcalgo_t *alg;
+ const mailbox_crcalgo_t *best = NULL;
+
+ for (alg = crcalgos ; alg->version ; alg++) {
+	if (alg->version < minvers)
+	 continue;
+	if (alg->version > maxvers)
+	 continue;
+	if (best && best->version > alg->version)
+	 continue;
+	best = alg;
+ }
+ return best;
+}
+
+EXPORTED unsigned mailbox_best_crcvers(unsigned minvers, unsigned maxvers)
+{
+ const mailbox_crcalgo_t *alg = mailbox_find_crcalgo(minvers, maxvers);
+ if (!alg) return 0;
+ return alg->version;
+}
+
+static const mailbox_crcalgo_t *mailbox_get_crcalgo(struct mailbox *mailbox)
+{
+ const mailbox_crcalgo_t *alg = NULL;
+
+ if (mailbox->i.sync_crc_vers) {
+	alg = mailbox_find_crcalgo(mailbox->i.sync_crc_vers,
+				 mailbox->i.sync_crc_vers);
+	if (!alg && mailbox_index_islocked(mailbox, /*write*/1)) {
+	 mailbox->i.sync_crc_vers = 0;	/* invalidate the CRC version */
+	 mailbox_index_dirty(mailbox);
+	}
+ }
+
+ return alg;
+}
+
+EXPORTED void mailbox_annot_changed(struct mailbox *mailbox,
+			 unsigned int uid,
+			 const char *entry,
+			 const char *userid,
+			 const struct buf *oldval,
+			 const struct buf *newval)
+{
+ const mailbox_crcalgo_t *alg = mailbox_get_crcalgo(mailbox);
+
+ /* we are dirtying both index and quota */
+ mailbox_index_dirty(mailbox);
+ mailbox_quota_dirty(mailbox);
+
+ /* update sync_crc - NOTE, only per-message annotations count */
+ if (uid && alg && alg->annot) {
+	if (oldval->len)
+	 mailbox->i.sync_crc ^= alg->annot(uid, entry, userid, oldval);
+	if (newval->len)
+	 mailbox->i.sync_crc ^= alg->annot(uid, entry, userid, newval);
+ }
+
+ /* corruption prevention - check we don't go negative */
+ if (mailbox->i.quota_annot_used > (quota_t)oldval->len)
+	mailbox->i.quota_annot_used -= oldval->len;
+ else
+	mailbox->i.quota_annot_used = 0;
+
+ mailbox->i.quota_annot_used += newval->len;
+}
+
+static int calc_one_annot(const char *mailbox __attribute__((unused)),
+			 uint32_t uid,
+			 const char *entry,
+			 const char *userid,
+			 const struct buf *value,
+			 void *rock)
+{
+ struct annot_calc_rock *cr = (struct annot_calc_rock *)rock;
+
+ /* update sync_crc - NOTE, only per-message annotations count */
+ if (uid && cr->algo && cr->algo->annot)
+	cr->crc ^= cr->algo->annot(uid, entry, userid, value);
+
+ /* always count the size */
+ cr->used += value->len;
+
+ return 0;
+}
+
+static void mailbox_annot_update_counts(struct mailbox *mailbox,
+					struct index_record *record,
+					int is_add)
+{
+ struct annot_calc_rock cr = { mailbox_get_crcalgo(mailbox), 0, 0 };
+
+ /* expunged records don't count */
+ if (record && record->system_flags & FLAG_EXPUNGED) return;
+
+ annotatemore_findall(mailbox->name, record ? record->uid : 0, /* all entries*/"*",
+			 calc_one_annot, &cr);
+
+ mailbox->i.sync_crc ^= cr.crc;
+
+ if (is_add)
+	mailbox->i.quota_annot_used += cr.used;
+ else {
 	/* corruption prevention - check we don't go negative */
-	if (i->quota_mailbox_used > record->size)
-	 i->quota_mailbox_used -= record->size;
+	if (mailbox->i.quota_annot_used > cr.used)
+	 mailbox->i.quota_annot_used -= cr.used;
 	else
-	 i->quota_mailbox_used = 0;
+	 mailbox->i.quota_annot_used = 0;
+ }
+}
+
+/*
+ * Calculate a sync CRC for the entire @mailbox using CRC algorithm
+ * version @vers, optionally forcing recalculation
+ */
+EXPORTED uint32_t mailbox_sync_crc(struct mailbox *mailbox, unsigned vers, int force)
+{
+ annotate_state_t *astate = NULL;
+ const mailbox_crcalgo_t *alg;
+ struct index_record record;
+ uint32_t recno;
+ uint32_t crc = 0;
+
+ /* check if we can use the persistent incremental CRC */
+ if (vers == mailbox->i.sync_crc_vers && !force) {
+	return mailbox->i.sync_crc;
+ }
+ /* otherwise, we're on the slow path */
+
+ /* find the algorithm */
+ alg = mailbox_find_crcalgo(vers, vers);
+ if (!alg) return 0;
+
+ if (alg->annot) {
+	/* hold annotations DB open - failure to load is an error */
+	if (mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, &astate))
+	 return 0;
+
+	/* and make sure it stays locked for the whole process */
+	annotate_state_begin(astate);
+ }
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	/* we can't send bogus records, just skip them! */
+	if (mailbox_read_index_record(mailbox, recno, &record))
+	 continue;
+
+	/* always skip EXPUNGED messages, they have no CRC */
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	if (alg->record) 
+	 crc ^= alg->record(mailbox, &record);
+
+	if (alg->annot) {
+	 struct annot_calc_rock cr = { alg, 0, 0 };
+	 annotatemore_findall(mailbox->name, record.uid, /* all entries*/"*",
+				 calc_one_annot, &cr);
+	 crc ^= cr.crc;
+	}
+ }
+
+ /* possibly upgrade the persistent CRC version */
+ if (mailbox_index_islocked(mailbox, /*write*/1)) {
+	mailbox->i.sync_crc = crc;
+	mailbox->i.sync_crc_vers = vers;
+	mailbox_index_dirty(mailbox);
 }
+
+ /* return the newly calculated CRC */
+ return crc;
 }
 
 static void mailbox_index_update_counts(struct mailbox *mailbox,
 					struct index_record *record,
 					int is_add)
 {
+ const mailbox_crcalgo_t *alg = mailbox_get_crcalgo(mailbox);
+
 mailbox_quota_dirty(mailbox);
 mailbox_index_dirty(mailbox);
 header_update_counts(&mailbox->i, record, is_add);
- /* xor doesn't care if it's an add! */
- mailbox->i.sync_crc ^= make_sync_crc(mailbox, record);
+
+ if (alg && alg->record)
+	mailbox->i.sync_crc ^= alg->record(mailbox, record);
 }
 
-int mailbox_index_recalc(struct mailbox *mailbox)
+
+EXPORTED int mailbox_index_recalc(struct mailbox *mailbox)
 {
+ annotate_state_t *astate = NULL;
 struct index_record record;
- int r = 0;
 uint32_t recno;
+ int r = 0;
 
 assert(mailbox_index_islocked(mailbox, 1));
 
@@ -2041,12 +2641,489 @@
 mailbox->i.deleted = 0;
 mailbox->i.exists = 0;
 mailbox->i.quota_mailbox_used = 0;
+ mailbox->i.quota_annot_used = 0;
 mailbox->i.sync_crc = 0;
 
+ /* mailbox level annotations */
+ mailbox_annot_update_counts(mailbox, NULL, 1);
+
+ /* hold annotations DB open */
+ r = mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, &astate);
+ if (r) goto out;
+
+ /* and make sure it stays locked for the whole process */
+ annotate_state_begin(astate);
+
 for (recno = 1; recno <= mailbox->i.num_records; recno++) {
 	r = mailbox_read_index_record(mailbox, recno, &record);
-	if (r) return r;
+	if (r) goto out;
+
 	mailbox_index_update_counts(mailbox, &record, 1);
+	mailbox_annot_update_counts(mailbox, &record, 1);
+ }
+
+out:
+ return r;
+}
+
+static int mailbox_update_carddav(struct mailbox *mailbox,
+				 struct index_record *old,
+				 struct index_record *new)
+{
+ const char *userid = mboxname_to_userid(mailbox->name);
+ struct carddav_db *carddavdb = NULL;
+ struct param *param;
+ struct body *body = NULL;
+ struct carddav_data *cdata = NULL;
+ const char *resource = NULL;
+ int r = 0;
+
+ /* conditions in which there's nothing to do */
+ if (!new) goto done;
+ if (!userid) goto done;
+
+ /* phantom record - never really existed here */
+ if (!old && (new->system_flags && FLAG_EXPUNGED))
+	goto done;
+
+ r = mailbox_cacherecord(mailbox, new);
+ if (r) goto done;
+
+ /* Get resource URL from filename param in Content-Disposition header */
+ message_read_bodystructure(new, &body);
+ for (param = body->disposition_params; param; param = param->next) {
+ if (!strcmp(param->attribute, "FILENAME")) {
+ resource = param->value;
+ }
+ }
+
+ assert(resource);
+
+ carddavdb = carddav_open(userid, 0);
+
+ /* Find existing record for this resource */
+ carddav_lookup_resource(carddavdb, mailbox->name, resource, 1, &cdata);
+
+ /* XXX - if not matching by UID, skip - this record doesn't refer to the current item */
+
+ if (new->system_flags & FLAG_EXPUNGED) {
+	/* is there an existing record? */
+	if (!cdata) goto done;
+
+	/* does it still come from this UID? */
+	if (cdata->dav.imap_uid != new->uid) goto done;
+
+	/* delete entry */
+	r = carddav_delete(carddavdb, cdata->dav.rowid, 0);
+ }
+ else {
+	struct buf msg_buf = BUF_INITIALIZER;
+	VObjectIterator i;
+	VObject *vcard;
+
+	/* already seen this message, so do we update it? No */
+	if (old) goto done;
+
+	/* Load message containing the resource and parse vcard data */
+	r = mailbox_map_record(mailbox, new, &msg_buf);
+	if (r) goto done;
+
+	vcard = Parse_MIME(buf_base(&msg_buf) + new->header_size,
+			 new->size - new->header_size);
+	buf_free(&msg_buf);
+	if (!vcard) goto done;
+
+	/* Create mapping entry from resource name to UID */
+	cdata->dav.mailbox = mailbox->name;
+	cdata->dav.resource = resource;
+	cdata->dav.imap_uid = new->uid;
+
+	if (!cdata->dav.creationdate)
+	 cdata->dav.creationdate = new->internaldate;
+
+	initPropIterator(&i, vcard);
+	while (moreIteration(&i)) {
+	 VObject *prop = nextVObject(&i);
+	 const char *name = vObjectName(prop);
+	 const wchar_t *propval = vObjectUStringZValue(prop);
+
+	 if (!name) continue;
+	 if (!propval) continue;
+
+	 if (!strcmp(name, "UID")) {
+		cdata->vcard_uid = fakeCString(propval);
+	 }
+	 else if (!strcmp(name, "N")) {
+		cdata->name = fakeCString(propval);
+	 }
+	 else if (!strcmp(name, "FN")) {
+		cdata->fullname = fakeCString(propval);
+	 }
+	 else if (!strcmp(name, "NICKNAME")) {
+		cdata->nickname = fakeCString(propval);
+	 }
+	 else if (!strcmp(name, "EMAIL")) {
+		/* XXX - insert if primary */
+		strarray_append(&cdata->emails, fakeCString(propval));
+	 }
+	 else if (!strcmp(name, "X-ADDRESSBOOKSERVER-MEMBER")) {
+		const char *item = fakeCString(propval);
+		if (!strncmp(item, "urn:uuid:", 9))
+		 strarray_append(&cdata->member_uids, item+9);
+	 }
+	}
+
+	r = carddav_write(carddavdb, cdata, 0);
+ }
+
+done:
+ if (carddavdb) {
+	carddav_commit(carddavdb);
+	carddav_close(carddavdb);
+ }
+
+ return r;
+}
+
+static int mailbox_update_caldav(struct mailbox *mailbox,
+				 struct index_record *old,
+				 struct index_record *new)
+{
+ const char *userid = mboxname_to_userid(mailbox->name);
+ struct caldav_db *caldavdb = NULL;
+ struct param *param;
+ struct body *body = NULL;
+ struct caldav_data *cdata = NULL;
+ const char *resource = NULL;
+ const char *sched_tag = NULL;
+ int r = 0;
+
+ /* conditions in which there's nothing to do */
+ if (!new) goto done;
+ if (!userid) goto done;
+
+ /* phantom record - never really existed here */
+ if (!old && (new->system_flags && FLAG_EXPUNGED))
+	goto done;
+
+ r = mailbox_cacherecord(mailbox, new);
+ if (r) goto done;
+
+ /* Get resource URL from filename param in Content-Disposition header */
+ message_read_bodystructure(new, &body);
+ for (param = body->disposition_params; param; param = param->next) {
+ if (!strcmp(param->attribute, "FILENAME")) {
+ resource = param->value;
+ }
+ else if (!strcmp(param->attribute, "SCHEDULE-TAG")) {
+ sched_tag = param->value;
+ }
+ }
+
+ caldavdb = caldav_open(userid, 0);
+
+ /* Find existing record for this resource */
+ caldav_lookup_resource(caldavdb, mailbox->name, resource, 1, &cdata);
+
+ /* XXX - if not matching by UID, skip - this record doesn't refer to the current item */
+
+ if (new->system_flags & FLAG_EXPUNGED) {
+	/* is there an existing record? */
+	if (!cdata) goto done;
+
+	/* does it still come from this UID? */
+	if (cdata->dav.imap_uid != new->uid) goto done;
+
+	/* delete entry */
+	r = caldav_delete(caldavdb, cdata->dav.rowid, 0);
+ }
+ else {
+	struct buf msg_buf = BUF_INITIALIZER;
+	icalcomponent *ical = NULL;
+
+	/* already seen this message, so do we update it? No */
+	if (old) goto done;
+
+	r = mailbox_map_record(mailbox, new, &msg_buf);
+	if (r) goto done;
+
+	ical = icalparser_parse_string(buf_base(&msg_buf) + new->header_size);
+	buf_free(&msg_buf);
+	if (!ical) goto done;
+
+	cdata->dav.creationdate = new->internaldate;
+	cdata->dav.mailbox = mailbox->name;
+	cdata->dav.imap_uid = new->uid;
+	cdata->dav.resource = resource;
+	cdata->sched_tag = sched_tag;
+
+	caldav_make_entry(ical, cdata);
+
+	r = caldav_write(caldavdb, cdata, 0);
+
+	icalcomponent_free(ical);
+ }
+
+done:
+ message_free_body(body);
+ free(body);
+
+ if (caldavdb) {
+	caldav_commit(caldavdb);
+	caldav_close(caldavdb);
+ }
+
+ return r;
+}
+
+static int mailbox_update_dav(struct mailbox *mailbox,
+			 struct index_record *old,
+			 struct index_record *new)
+{
+ if (mailbox->mbtype & MBTYPE_ADDRESSBOOK)
+	return mailbox_update_carddav(mailbox, old, new);
+ if (mailbox->mbtype & MBTYPE_CALENDAR)
+	return mailbox_update_caldav(mailbox, old, new);
+ return 0;
+}
+
+EXPORTED int mailbox_update_conversations(struct mailbox *mailbox,
+				 struct index_record *old,
+				 struct index_record *new)
+{
+ int r = 0;
+ struct mboxname_parts parts;
+ conversation_t *conv = NULL;
+ int delta_num_records = 0;
+ int delta_exists = 0;
+ int delta_unseen = 0;
+ int is_trash = 0;
+ int delta_size = 0;
+ int *delta_counts = NULL;
+ int i;
+ modseq_t modseq = 0;
+ struct index_record *record = NULL;
+ struct conversations_state *cstate = NULL;
+
+ if (!mailbox_has_conversations(mailbox))
+	return 0;
+
+ cstate = conversations_get_mbox(mailbox->name);
+ if (!cstate)
+	return IMAP_CONVERSATIONS_NOT_OPEN;
+
+ /* IRIS-2534: check if it's the trash folder - XXX - should be separate
+ * conversation root or similar more useful method in future */
+ if (mboxname_to_parts(mailbox->name, &parts))
+	return IMAP_MAILBOX_BADNAME;
+
+ if (!strcmpsafe(parts.box, "Trash"))
+	is_trash = 1;
+
+ mboxname_free_parts(&parts);
+
+ /* handle unlinked items as if they didn't exist */
+ if (old && (old->system_flags & FLAG_UNLINKED)) old = NULL;
+ if (new && (new->system_flags & FLAG_UNLINKED)) new = NULL;
+
+ if (!old && !new)
+	return 0;
+
+ if (old && new) {
+	assert(old->uid == new->uid);
+	assert(old->modseq <= new->modseq);
+	/* this flag cannot go away */
+	if ((old->system_flags & FLAG_EXPUNGED))
+	 assert((new->system_flags & FLAG_EXPUNGED));
+
+	if (old->cid != new->cid) {
+	 /* handle CID being renamed, by calling ourselves. Always remove
+	 * BEFORE adding so that the old 'B' record can be deleted, and
+	 * hence the old CID be cleaned up in a rename case */
+	 r = mailbox_update_conversations(mailbox, old, NULL);
+	 if (!r && new->cid) /* handle ctl_conversationdb -z correctly */
+		r = mailbox_update_conversations(mailbox, NULL, new);
+	 return r;
+	}
+ }
+
+ if (new && !old) {
+	/* add the conversation */
+	mailbox_cacherecord(mailbox, new); /* make sure it's loaded */
+	r = message_update_conversations(cstate, new, &conv);
+	if (r) return r;
+	record = new;
+	/* possible if silent (i.e. replica) */
+	if (!record->cid) return 0;
+ }
+ else {
+	record = new ? new : old;
+	/* skip out on non-CIDed records */
+	if (!record->cid) return 0;
+
+	r = conversation_load(cstate, record->cid, &conv);
+	if (r)
+	 return r;
+	if (!conv) {
+	 if (!new) {
+		/* We're trying to delete a conversation that's already
+		 * gone...don't try to hard */
+		syslog(LOG_NOTICE, "conversation "CONV_FMT" already "
+				 "deleted, ignoring", record->cid);
+		return 0;
+	 }
+	 conv = conversation_new(cstate);
+	}
+ }
+
+ if (cstate->counted_flags)
+	delta_counts = xzmalloc(sizeof(int) * cstate->counted_flags->count);
+
+ /* calculate the changes */
+ if (old) {
+	/* decrease any relevent counts */
+	if (!(old->system_flags & FLAG_EXPUNGED)) {
+	 delta_exists--;
+	 delta_size -= old->size;
+	 /* drafts don't update the 'unseen' counter so that
+	 * they never turn a conversation "unread" */
+	 if (!is_trash && !(old->system_flags & (FLAG_SEEN|FLAG_DRAFT)))
+		delta_unseen--;
+	 if (cstate->counted_flags) {
+		for (i = 0; i < cstate->counted_flags->count; i++) {
+		 const char *flag = strarray_nth(cstate->counted_flags, i);
+		 if (mailbox_record_hasflag(mailbox, old, flag))
+			delta_countsi--;
+		}
+	 }
+	}
+	delta_num_records--;
+	modseq = MAX(modseq, old->modseq);
+ }
+ if (new) {
+	/* add any counts */
+	if (!(new->system_flags & FLAG_EXPUNGED)) {
+	 delta_exists++;
+	 delta_size += new->size;
+	 /* drafts don't update the 'unseen' counter so that
+	 * they never turn a conversation "unread" */
+	 if (!is_trash && !(new->system_flags & (FLAG_SEEN|FLAG_DRAFT)))
+		delta_unseen++;
+	 if (cstate->counted_flags) {
+		for (i = 0; i < cstate->counted_flags->count; i++) {
+		 const char *flag = strarray_nth(cstate->counted_flags, i);
+		 if (mailbox_record_hasflag(mailbox, new, flag))
+			delta_countsi++;
+		}
+	 }
+	}
+	delta_num_records++;
+	modseq = MAX(modseq, new->modseq);
+ }
+
+ /* XXX - combine this with the earlier cache parsing */
+ if (!mailbox_cacherecord(mailbox, record)) {
+	char *env = NULL;
+	char *envtokensNUMENVTOKENS;
+	struct address addr = { NULL, NULL, NULL, NULL, NULL, NULL };
+
+	/* Need to find the sender */
+
+	/* +1 -> skip the leading paren */
+	env = xstrndup(cacheitem_base(record, CACHE_ENVELOPE) + 1,
+		 cacheitem_size(record, CACHE_ENVELOPE) - 1);
+
+	parse_cached_envelope(env, envtokens, VECTOR_SIZE(envtokens));
+
+	if (envtokensENV_FROM)
+	 message_parse_env_address(envtokensENV_FROM, &addr);
+
+	/* XXX - internaldate vs gmtime? */
+	conversation_update_sender(conv,
+				 addr.name, addr.route,
+				 addr.mailbox, addr.domain,
+				 record->gmtime, delta_exists);
+	free(env);
+ }
+
+ conversation_update(cstate, conv, mailbox->name,
+			delta_num_records,
+			delta_exists, delta_unseen,
+			delta_size, delta_counts, modseq);
+
+ r = conversation_save(cstate, record->cid, conv);
+
+ conversation_free(conv);
+ free(delta_counts);
+ return r;
+}
+
+EXPORTED int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *modseqp)
+{
+ conv_status_t status = CONV_STATUS_INIT;
+ int r;
+
+ if (modseqp)
+	*modseqp = 0;
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+
+ if (!mailbox->local_cstate)
+	return IMAP_INTERNAL;
+
+ r = conversation_getstatus(mailbox->local_cstate, mailbox->name, &status);
+ if (r) return r;
+
+ *modseqp = status.modseq;
+
+ return 0;
+}
+
+/* Used in replication */
+EXPORTED int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t newmodseq, int force)
+{
+ conv_status_t status = CONV_STATUS_INIT;
+ int r;
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+
+ if (!mailbox->local_cstate)
+	return IMAP_INTERNAL;
+
+ r = conversation_getstatus(mailbox->local_cstate, mailbox->name, &status);
+ if (r) return r;
+
+ if (newmodseq > status.modseq || (force && newmodseq < status.modseq)) {
+	status.modseq = newmodseq;
+	r = conversation_setstatus(mailbox->local_cstate, mailbox->name, &status);
+ }
+
+ return r;
+}
+
+/* NOTE: maybe make this able to return error codes if we have
+ * support for transactional mailbox updates later. For now,
+ * we expect callers to have already done all sanity checking */
+static int mailbox_update_indexes(struct mailbox *mailbox,
+				 struct index_record *old,
+				 struct index_record *new)
+{
+ int r = 0;
+
+ r = mailbox_update_dav(mailbox, old, new);
+ if (r) return r;
+
+ r = mailbox_update_conversations(mailbox, old, new);
+
+ /* NOTE - we do these last */
+
+ if (old) {
+	mailbox_index_update_counts(mailbox, old, 0);
+ }
+ if (new) {
+	mailbox_index_update_counts(mailbox, new, 1);
 }
 
 return 0;
@@ -2056,8 +3133,8 @@
 * Rewrite an index record in a mailbox - updates all
 * necessary tracking fields automatically.
 */
-int mailbox_rewrite_index_record(struct mailbox *mailbox,
-				 struct index_record *record)
+EXPORTED int mailbox_rewrite_index_record(struct mailbox *mailbox,
+					 struct index_record *record)
 {
 int n;
 int r;
@@ -2074,7 +3151,11 @@
 	 record->recno <= mailbox->i.num_records);
 
 r = mailbox_read_index_record(mailbox, record->recno, &oldrecord);
- if (r) return r;
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: re-reading: %s %u",
+	 mailbox->name, record->uid);
+	return r;
+ }
 
 /* the UID has to match, of course, for it to be the same
 * record. XXX - test fields like "internaldate", etc here
@@ -2090,22 +3171,19 @@
 	assert(record->system_flags & FLAG_EXPUNGED);
 }
 
+ if (oldrecord.system_flags & FLAG_ARCHIVED) {
+	/* it is also a sin to unarchive a message, except in the
+	 * the very odd case of a reconstruct. So let's see about
+	 * that */
+	if (!(record->system_flags & FLAG_ARCHIVED))
+	 syslog(LOG_ERR, "IOERROR: bogus removal of archived flag for %s %u",
+		 mailbox->name, record->uid);
+ }
+
 /* handle immediate expunges here... */
 if (immediate && (record->system_flags & FLAG_EXPUNGED))
 	record->system_flags |= FLAG_UNLINKED;
 
- if (record->system_flags & FLAG_UNLINKED) {
-	if (expunge_mode == IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE)
-	 mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
-	mailbox->i.options |= OPT_MAILBOX_NEEDS_UNLINK;
- }
- else {
-	/* write the cache record before buffering the message, it
-	 * will set the cache_offset field. */
-	r = mailbox_append_cache(mailbox, record);
-	if (r) return r;
- }
-
 /* make sure highestmodseq gets updated unless we're
 * being silent about it (i.e. marking an already EXPUNGED
 * message as UNLINKED, or just updating the content_lines
@@ -2119,11 +3197,20 @@
 	record->last_updated = mailbox->last_updated;
 }
 
- /* remove the counts for the old copy, and add them for
- * the new copy */
+ if (record->system_flags & FLAG_UNLINKED) {
+	/* mark required actions */
+	if (expunge_mode == IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE)
+	 mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
+	mailbox->i.options |= OPT_MAILBOX_NEEDS_UNLINK;
+ }
+ else {
+	/* rewrite the cache record if required anyway */
+	r = mailbox_append_cache(mailbox, record);
+	if (r) return r;
+ }
 
- mailbox_index_update_counts(mailbox, &oldrecord, 0);
- mailbox_index_update_counts(mailbox, record, 1);
+ r = mailbox_update_indexes(mailbox, &oldrecord, record);
+ if (r) return r;
 
 mailbox_index_record_to_buf(record, buf);
 
@@ -2145,17 +3232,21 @@
 }
 
 /* expunged tracking */
- if ((record->system_flags & FLAG_EXPUNGED) && 
+ if ((record->system_flags & FLAG_EXPUNGED) &&
 	!(oldrecord.system_flags & FLAG_EXPUNGED)) {
+
 	if (!mailbox->i.first_expunged ||
 	 mailbox->i.first_expunged > record->last_updated)
 	 mailbox->i.first_expunged = record->last_updated;
 
+	mailbox_annot_update_counts(mailbox, &oldrecord, 0);
+
 	if (config_auditlog)
 	 syslog(LOG_NOTICE, "auditlog: expunge sessionid=<%s> "
-		 "mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s>",
+		 "mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s> cid=<%s>",
 		session_id(), mailbox->name, mailbox->uniqueid,
-		record->uid, message_guid_encode(&record->guid));
+		record->uid, message_guid_encode(&record->guid),
+	 conversation_id_encode(record->cid));
 }
 
 return mailbox_refresh_index_map(mailbox);
@@ -2164,7 +3255,7 @@
 /* append a single message to a mailbox - also updates everything
 * automatically. These two functions are the ONLY way to modify
 * the contents or tracking fields of a message */
-int mailbox_append_index_record(struct mailbox *mailbox,
+EXPORTED int mailbox_append_index_record(struct mailbox *mailbox,
 				struct index_record *record)
 {
 indexbuffer_t ibuf;
@@ -2212,10 +3303,20 @@
 	record->sentdate = mktime(tm);
 }
 
+ /* update the highestmodseq if needed */
+ if (record->silent) {
+	mailbox_index_dirty(mailbox);
+ }
+ else {
+	mailbox_modseq_dirty(mailbox);
+	record->modseq = mailbox->i.highestmodseq;
+	record->last_updated = mailbox->last_updated;
+ }
+
 if (!(record->system_flags & FLAG_UNLINKED)) {
 	/* make the file timestamp correct */
 	settime.actime = settime.modtime = record->internaldate;
-	if (utime(mailbox_message_fname(mailbox, record->uid), &settime) == -1)
+	if (utime(mailbox_record_fname(mailbox, record), &settime) == -1)
 	 return IMAP_IOERROR;
 
 	/* write the cache record before buffering the message, it
@@ -2224,21 +3325,11 @@
 	if (r) return r;
 }
 
- /* update the highestmodseq if needed */
- if (record->silent) {
-	mailbox_index_dirty(mailbox);
- }
- else {
-	mailbox_modseq_dirty(mailbox);
-	record->modseq = mailbox->i.highestmodseq;
-	record->last_updated = mailbox->last_updated;
- }
-
- /* add counts */
- mailbox_index_update_counts(mailbox, record, 1);
+ r = mailbox_update_indexes(mailbox, NULL, record);
+ if (r) return r;
 
 mailbox_index_record_to_buf(record, buf);
- 
+
 recno = mailbox->i.num_records + 1;
 
 offset = mailbox->i.start_offset +
@@ -2263,9 +3354,10 @@
 mailbox->index_size += INDEX_RECORD_SIZE;
 
 if (config_auditlog)
-	syslog(LOG_NOTICE, "auditlog: append sessionid=<%s> mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s>",
+	syslog(LOG_NOTICE, "auditlog: append sessionid=<%s> mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s> cid=<%s>",
 	 session_id(), mailbox->name, mailbox->uniqueid, record->uid,
-	 message_guid_encode(&record->guid));
+	 message_guid_encode(&record->guid),
+	 conversation_id_encode(record->cid));
 
 /* expunged tracking */
 if (record->system_flags & FLAG_EXPUNGED) {
@@ -2275,9 +3367,10 @@
 
 	if (config_auditlog)
 	 syslog(LOG_NOTICE, "auditlog: expunge sessionid=<%s> "
-		 "mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s>",
+		 "mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s> cid=<%s>",
 		 session_id(), mailbox->name, mailbox->uniqueid,
-		 record->uid, message_guid_encode(&record->guid));
+		 record->uid, message_guid_encode(&record->guid),
+		 conversation_id_encode(record->cid));
 }
 
 /* yep, it could even be pre-unlinked in 'default' expunge mode, joy */
@@ -2292,16 +3385,34 @@
 return mailbox_refresh_index_map(mailbox);
 }
 
-static void mailbox_message_unlink(struct mailbox *mailbox, uint32_t uid)
+static void mailbox_message_unlink(struct mailbox *mailbox,
+				 struct index_record *record)
 {
- const char *fname = mailbox_message_fname(mailbox, uid);
+ const char *fname = mailbox_record_fname(mailbox, record);
+ int r;
+
+ /* XXX - reports errors other than ENOENT ? */
 
 /* no error, we removed a file */
 if (unlink(fname) == 0) {
 	if (config_auditlog)
 	 syslog(LOG_NOTICE, "auditlog: unlink sessionid=<%s> "
 		 "mailbox=<%s> uniqueid=<%s> uid=<%u>",
-		 session_id(), mailbox->name, mailbox->uniqueid, uid);
+		 session_id(), mailbox->name, mailbox->uniqueid, record->uid);
+ }
+
+ r = mailbox_get_annotate_state(mailbox, record->uid, NULL);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to open annotations %s %u: %s",
+	 mailbox->name, record->uid, error_message(r));
+	return;
+ }
+
+ r = annotate_msg_cleanup(mailbox, record->uid);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to cleanup annotations %s %u: %s",
+	 mailbox->name, record->uid, error_message(r));
+	return;
 }
 }
 
@@ -2322,7 +3433,7 @@
 	if (r) return r;
 
 	if (record.system_flags & FLAG_UNLINKED)
-	 mailbox_message_unlink(mailbox, record.uid);
+	 mailbox_message_unlink(mailbox, &record);
 }
 
 /* need to clear the flag, even if nothing needed unlinking! */
@@ -2333,8 +3444,8 @@
 return 0;
 }
 
-int mailbox_repack_setup(struct mailbox *mailbox,
-			 struct mailbox_repack **repackptr)
+HIDDEN int mailbox_repack_setup(struct mailbox *mailbox,
+				struct mailbox_repack **repackptr)
 {
 struct mailbox_repack *repack = xzmalloc(sizeof(struct mailbox_repack));
 const char *fname;
@@ -2346,16 +3457,14 @@
 repack->mailbox = mailbox;
 repack->i = mailbox->i; /* struct copy */
 repack->newindex_fd = -1;
- repack->newcache_fd = -1;
 
 /* new files */
 fname = mailbox_meta_newfname(mailbox, META_INDEX);
 repack->newindex_fd = open(fname, O_RDWR|O_TRUNC|O_CREAT, 0666);
- if (repack->newindex_fd == -1) goto fail;
-
- fname = mailbox_meta_newfname(mailbox, META_CACHE);
- repack->newcache_fd = open(fname, O_RDWR|O_TRUNC|O_CREAT, 0666);
- if (repack->newcache_fd == -1) goto fail;
+ if (repack->newindex_fd == -1) {
+	syslog(LOG_ERR, "IOERROR: failed to create %s: %m", fname);
+	goto fail;
+ }
 
 /* update the generation number */
 repack->i.generation_no++;
@@ -2364,24 +3473,25 @@
 repack->i.num_records = 0;
 repack->i.quota_mailbox_used = 0;
 repack->i.num_records = 0;
- repack->i.sync_crc = 0; /* no records is blank */
+ /*
+ * Note, we don't recalculate the mailbox' sync CRC on repack, because
+ * the sync CRC may depend on annotation values which we don't want to
+ * go looking up at this time. A call to mailbox_index_recalc() will
+ * however recalculate the sync CRC from scratch.
+ */
 repack->i.answered = 0;
 repack->i.deleted = 0;
 repack->i.flagged = 0;
- repack->i.exists = 0; 
+ repack->i.exists = 0;
 repack->i.first_expunged = 0;
 repack->i.leaked_cache_records = 0;
 
 /* prepare initial header buffer */
 mailbox_index_header_to_buf(&repack->i, buf);
 
- /* write initial headers */
- n = retry_write(repack->newcache_fd, buf, 4);
+ n = retry_write(repack->newindex_fd, buf, INDEX_HEADER_SIZE);
 if (n == -1) goto fail;
 
- n = retry_write(repack->newindex_fd, buf, INDEX_HEADER_SIZE);
- if (n == -1) goto fail; 
- 
 *repackptr = repack;
 return 0;
 
@@ -2390,24 +3500,25 @@
 return IMAP_IOERROR;
 }
 
-int mailbox_repack_add(struct mailbox_repack *repack,
-		 struct index_record *record)
+HIDDEN int mailbox_repack_add(struct mailbox_repack *repack,
+			 struct index_record *record)
 {
- int r;
- int n;
+ struct mappedfile *cachefile;
 indexbuffer_t ibuf;
 unsigned char *buf = ibuf.buf;
+ int r;
+ int n;
+
+ cachefile = repack_cachefile(repack, record);
 
 /* write out the new cache record - need to clear the cache_offset
 * so it gets reset in the new record */
 record->cache_offset = 0;
- r = cache_append_record(repack->newcache_fd, record);
+ r = cache_append_record(cachefile, record);
 if (r) return r;
 
 /* update counters */
 header_update_counts(&repack->i, record, 1);
- /* sync_crc needs mailbox for user_flag names */
- repack->i.sync_crc ^= make_sync_crc(repack->mailbox, record);
 
 /* write the index record out */
 mailbox_index_record_to_buf(record, buf);
@@ -2421,29 +3532,49 @@
 }
 
 /* clean up memory structures and abort repack */
-void mailbox_repack_abort(struct mailbox_repack **repackptr)
+HIDDEN void mailbox_repack_abort(struct mailbox_repack **repackptr)
 {
 struct mailbox_repack *repack = *repackptr;
+ int i;
+
 if (!repack) return; /* safe against double-free */
- if (repack->newcache_fd != -1) close(repack->newcache_fd);
- unlink(mailbox_meta_newfname(repack->mailbox, META_CACHE));
- if (repack->newindex_fd != -1) close(repack->newindex_fd);
+
+ /* close and remove index */
+ xclose(repack->newindex_fd);
 unlink(mailbox_meta_newfname(repack->mailbox, META_INDEX));
+
+ /* close and remove all new caches */
+ for (i = 0; i < repack->caches.count; i++) {
+	struct mappedfile *cachefile = ptrarray_nth(&repack->caches, i);
+	char *fname = xstrdup(mappedfile_fname(cachefile));
+	mappedfile_commit(cachefile); /* gotta commit to clear the dirty flag. Alternative would be an unlink function */
+	mappedfile_unlock(cachefile);
+	mappedfile_close(&cachefile);
+	unlink(fname);
+	free(fname);
+ }
+ ptrarray_fini(&repack->caches);
+
 free(repack);
 *repackptr = NULL;
 }
 
-int mailbox_repack_commit(struct mailbox_repack **repackptr)
+HIDDEN int mailbox_repack_commit(struct mailbox_repack **repackptr)
 {
+ strarray_t cachefiles = STRARRAY_INITIALIZER;
 indexbuffer_t ibuf;
 unsigned char *buf = ibuf.buf;
 struct mailbox_repack *repack = *repackptr;
 int r = IMAP_IOERROR;
+ int i;
 
 assert(repack);
 
 repack->i.last_repack_time = time(0);
 
+ assert(repack->i.sync_crc_vers == repack->mailbox->i.sync_crc_vers);
+ assert(repack->i.sync_crc == repack->mailbox->i.sync_crc);
+
 /* rewrite the header with updated details */
 mailbox_index_header_to_buf(&repack->i, buf);
 
@@ -2457,26 +3588,51 @@
 if (fsync(repack->newindex_fd) < 0)
 	goto fail;
 
- if (fsync(repack->newcache_fd) < 0)
-	goto fail;
+ xclose(repack->newindex_fd);
 
- close(repack->newcache_fd);
- repack->newcache_fd = -1;
- close(repack->newindex_fd);
- repack->newindex_fd = -1;
+ /* NOTE: cache files need commiting before index is renamed */
+ for (i = 0; i < repack->caches.count; i++) {
+	struct mappedfile *cachefile = ptrarray_nth(&repack->caches, i);
+	r = mappedfile_commit(cachefile);
+	if (r) goto fail;
+ }
 
 /* rename index first - loader will handle un-renamed cache if
 * the generation is lower */
 r = mailbox_meta_rename(repack->mailbox, META_INDEX);
 if (r) goto fail;
 
- mailbox_meta_rename(repack->mailbox, META_CACHE);
+ /* which cache files might currently exist? */
+ strarray_add(&cachefiles, mailbox_meta_fname(repack->mailbox, META_CACHE));
+ strarray_add(&cachefiles, mailbox_meta_fname(repack->mailbox, META_ARCHIVECACHE));
+
+ /* now the cache files can be renamed */
+ for (i = 0; i < repack->caches.count; i++) {
+	struct mappedfile *cachefile = ptrarray_nth(&repack->caches, i);
+	char *newname = xstrdup(mappedfile_fname(cachefile));
+	size_t len = strlen(newname)-4;
+	assert(!strcmp(newname+len, ".NEW"));
+	newnamelen = '\0'; /* STRIP .NEW */
+	mappedfile_rename(cachefile, newname);
+	mappedfile_close(&cachefile);
+	strarray_remove_all(&cachefiles, newname);
+	free(newname);
+ }
+ ptrarray_fini(&repack->caches);
+
+ for (i = 0; i < cachefiles.count; i++) {
+	const char *fname = strarray_nth(&cachefiles, i);
+	if (!unlink(fname))
+	 syslog(LOG_NOTICE, "Removed unused cache file %s", fname);
+ }
 
+ strarray_fini(&cachefiles);
 free(repack);
 *repackptr = NULL;
 return 0;
 
 fail:
+ strarray_fini(&cachefiles);
 mailbox_repack_abort(repackptr);
 return r;
 }
@@ -2504,10 +3660,12 @@
 	/* we aren't keeping unlinked files, that's kind of the point */
 	if (record.system_flags & FLAG_UNLINKED) {
 	 /* just in case it was left lying around */
-	 /* XXX - log error if unlink fails */
-	 mailbox_message_unlink(mailbox, record.uid);
+	 mailbox_message_unlink(mailbox, &record);
+
+	 /* track the modseq for QRESYNC purposes */
 	 if (record.modseq > repack->i.deletedmodseq)
 		repack->i.deletedmodseq = record.modseq;
+
 	 continue;
 	}
 
@@ -2517,15 +3675,15 @@
 
 	r = mailbox_repack_add(repack, &record);
 	if (r) goto fail;
-
-	/* update the sync crc */
-	mailbox->i.sync_crc ^= make_sync_crc(mailbox, &record);
 }
 
 /* we unlinked any "needs unlink" in the process */
 repack->i.options &= ~(OPT_MAILBOX_NEEDS_REPACK|OPT_MAILBOX_NEEDS_UNLINK);
 
- return mailbox_repack_commit(&repack);
+ r = mailbox_repack_commit(&repack);
+ if (r) goto fail;
+
+ return 0;
 
 fail:
 mailbox_repack_abort(&repack);
@@ -2557,19 +3715,136 @@
 }
 
 /*
+ * Move messages between spool and archive partition
+ * function pointed to by 'decideproc' is called (with 'deciderock') to
+ * determine which messages to move. If deciderock return 0, the message
+ * should be in the spool - if 1, the message should be in the archive.
+ */
+EXPORTED void mailbox_archive(struct mailbox *mailbox,
+			 mailbox_decideproc_t *decideproc, void *deciderock)
+{
+ int r;
+ int dirtycache = 0;
+ uint32_t recno;
+ struct index_record record;
+ const char *srcname;
+ const char *destname;
+ char *spoolcache = xstrdup(mailbox_meta_fname(mailbox, META_CACHE));
+ char *archivecache = xstrdup(mailbox_meta_fname(mailbox, META_ARCHIVECACHE));
+ int differentcache = strcmp(spoolcache, archivecache);
+ free(spoolcache);
+ free(archivecache);
+
+ assert(mailbox_index_islocked(mailbox, 1));
+ assert(decideproc);
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	const char *action = NULL;
+	/* skip damaged records */
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) {
+	 syslog(LOG_ERR, "IOERROR archive %s recno %u failed to read index record: %s",
+		 mailbox->name, recno, error_message(r));
+	 continue;
+	}
+
+	/* skip already unlinked records */
+	if (record.system_flags & FLAG_UNLINKED)
+	 continue;
+
+	if (decideproc(mailbox, &record, deciderock)) {
+	 if (record.system_flags & FLAG_ARCHIVED)
+		continue;
+	 srcname = mailbox_spool_fname(mailbox, record.uid);
+	 destname = mailbox_archive_fname(mailbox, record.uid);
+
+	 /* load cache before changing the flags */
+	 r = mailbox_cacherecord(mailbox, &record);
+	 if (r) {
+		syslog(LOG_ERR, "IOERROR archive %s %u failed to read cache: %s",
+		 mailbox->name, record.uid, error_message(r));
+		continue;
+	 }
+
+	 record.system_flags |= FLAG_ARCHIVED;
+	 action = "archive";
+	}
+	else {
+	 if (!(record.system_flags & FLAG_ARCHIVED))
+		continue;
+	 destname = mailbox_spool_fname(mailbox, record.uid);
+	 srcname = mailbox_archive_fname(mailbox, record.uid);
+
+	 /* load cache before changing the flags */
+	 r = mailbox_cacherecord(mailbox, &record);
+	 if (r) {
+		syslog(LOG_ERR, "IOERROR archive %s %u failed to read cache: %s",
+		 mailbox->name, record.uid, error_message(r));
+		continue;
+	 }
+
+	 record.system_flags &= ~FLAG_ARCHIVED;
+	 action = "unarchive";
+	}
+
+	/* got a file to copy! */
+	if (strcmp(srcname, destname)) {
+	 r = cyrus_copyfile(srcname, destname, COPYFILE_MKDIR);
+	 if (r) {
+		syslog(LOG_ERR, "IOERROR archive %s %u failed to copyfile (%s => %s): %s",
+		 mailbox->name, record.uid, srcname, destname, error_message(r));
+		continue;
+	 }
+	}
+
+	/* got a new cache record to write */
+	if (differentcache) {
+	 dirtycache = 1;
+	 record.cache_offset = 0;
+	 if (mailbox_append_cache(mailbox, &record))
+		continue;
+	}
+
+	/* rewrite the index record */
+	record.silent = 1;
+	if (mailbox_rewrite_index_record(mailbox, &record))
+	 continue;
+
+	if (config_auditlog)
+	 syslog(LOG_NOTICE, "auditlog: %s sessionid=<%s> mailbox=<%s> uniqueid=<%s> uid=<%u> guid=<%s> cid=<%s>",
+		 action, session_id(), mailbox->name, mailbox->uniqueid, record.uid,
+		 message_guid_encode(&record.guid), conversation_id_encode(record.cid));
+
+	/* finally clean up the original */
+	if (strcmp(srcname, destname))
+	 unlink(srcname);
+ }
+
+ /* if we have stale cache records, we'll need a repack */
+ if (dirtycache) {
+	mailbox_index_dirty(mailbox);
+	mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
+ }
+}
+
+/*
 * Perform an expunge operation on 'mailbox'. If nonzero, the
 * function pointed to by 'decideproc' is called (with 'deciderock') to
 * determine which messages to expunge. If 'decideproc' is a null pointer,
 * then messages with the \Deleted flag are expunged.
+ *
+ *	event_type - the event among MessageExpunge, MessageExpire (zero means
+ *		 don't send notification)
 */
-int mailbox_expunge(struct mailbox *mailbox,
+EXPORTED int mailbox_expunge(struct mailbox *mailbox,
 		 mailbox_decideproc_t *decideproc, void *deciderock,
-		 unsigned *nexpunged)
+		 unsigned *nexpunged, int event_type)
 {
 int r = 0;
 int numexpunged = 0;
 uint32_t recno;
 struct index_record record;
+ struct mboxevent *mboxevent = NULL;
 
 assert(mailbox_index_islocked(mailbox, 1));
 
@@ -2579,6 +3854,9 @@
 	return 0;
 }
 
+ if (event_type)
+	mboxevent = mboxevent_new(event_type);
+
 if (!decideproc) decideproc = expungedeleted;
 
 for (recno = 1; recno <= mailbox->i.num_records; recno++) {
@@ -2596,21 +3874,32 @@
 	 record.system_flags |= FLAG_EXPUNGED;
 
 	 r = mailbox_rewrite_index_record(mailbox, &record);
-	 if (r) return IMAP_IOERROR;
+	 if (r) {
+		mboxevent_free(&mboxevent);
+		return IMAP_IOERROR;
+	 }
+
+	 mboxevent_extract_record(mboxevent, mailbox, &record);
 	}
 }
 
 if (numexpunged > 0) {
 	syslog(LOG_NOTICE, "Expunged %d messages from %s",
 	 numexpunged, mailbox->name);
+
+	/* send the MessageExpunge or MessageExpire event notification */
+	mboxevent_extract_mailbox(mboxevent, mailbox);
+	mboxevent_set_numunseen(mboxevent, mailbox, -1);
+	mboxevent_notify(mboxevent);
 }
+ mboxevent_free(&mboxevent);
 
 if (nexpunged) *nexpunged = numexpunged;
 
 return 0;
 }
 
-int mailbox_expunge_cleanup(struct mailbox *mailbox, time_t expunge_mark,
+EXPORTED int mailbox_expunge_cleanup(struct mailbox *mailbox, time_t expunge_mark,
 			 unsigned *ndeleted)
 {
 uint32_t recno;
@@ -2650,8 +3939,8 @@
 	record.system_flags |= FLAG_UNLINKED;
 	record.silent = 1;
 	if (mailbox_rewrite_index_record(mailbox, &record)) {
-	 syslog(LOG_ERR, "failed to write changes to %s recno %d",
-		 mailbox->name, recno);
+	 syslog(LOG_ERR, "IOERROR: failed to mark unlinked %s %u (recno %d)",
+		 mailbox->name, record.uid, recno);
 	 break;
 	}
 }
@@ -2667,7 +3956,7 @@
 return r;
 }
 
-int mailbox_internal_seen(struct mailbox *mailbox, const char *userid)
+EXPORTED int mailbox_internal_seen(struct mailbox *mailbox, const char *userid)
 {
 /* shared seen - everyone's state is internal */
 if (mailbox->i.options & OPT_IMAP_SHAREDSEEN)
@@ -2681,26 +3970,55 @@
 return mboxname_userownsmailbox(userid, mailbox->name);
 }
 
+/*
+ * Return the number of message without \Seen flag in a mailbox.
+ * Suppose that authenticated user is the owner or sharedseen is enabled
+ */
+unsigned mailbox_count_unseen(struct mailbox *mailbox)
+{
+ struct index_record record;
+ uint32_t recno;
+ unsigned count = 0;
+
+ assert(mailbox_index_islocked(mailbox, 0));
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	if (mailbox_read_index_record(mailbox, recno, &record)) {
+	 syslog(LOG_WARNING, "%s: detecting bogus index record %u", mailbox->name,
+		 recno);
+	 continue;
+	}
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	if (!(record.system_flags & FLAG_SEEN))
+	 count++;
+ }
+
+ return count;
+}
+
 /* returns a mailbox locked in MAILBOX EXCLUSIVE mode, so you
 * don't need to lock the index file to work with it :) */
-int mailbox_create(const char *name,
+EXPORTED int mailbox_create(const char *name,
+		 uint32_t mbtype,
 		 const char *part,
 		 const char *acl,
 		 const char *uniqueid,
 		 int options,
 		 unsigned uidvalidity,
+		 modseq_t highestmodseq,
 		 struct mailbox **mailboxptr)
- 
 {
 int r = 0;
 char quotarootMAX_MAILBOX_BUFFER;
 int hasquota;
- char *fname;
+ const char *fname;
 struct mailbox *mailbox = NULL;
 int n;
- char generation_buf4;
- int createfnames = { META_INDEX, META_CACHE, META_HEADER, 0 };
+ int createfnames = { META_INDEX, META_HEADER, 0 };
 struct mailboxlist *listitem;
+ strarray_t *initial_flags = NULL;
 
 /* if we already have this name open then that's an error too */
 listitem = find_listitem(name);
@@ -2716,6 +4034,7 @@
 
 mailbox->part = xstrdup(part);
 mailbox->acl = xstrdup(acl);
+ mailbox->mbtype = mbtype;
 
 hasquota = quota_findroot(quotaroot, sizeof(quotaroot), name);
 
@@ -2735,7 +4054,7 @@
 }
 
 /* ensure we can fit the longest possible file name */
- fname = mailbox_message_fname(mailbox, UINT32_MAX);
+ fname = mailbox_datapath(mailbox);
 if (!fname) {
 	syslog(LOG_ERR, "IOERROR: Mailbox name too long (%s)", mailbox->name);
 	r = IMAP_MAILBOX_BADNAME;
@@ -2760,37 +4079,48 @@
 	r = IMAP_IOERROR;
 	goto done;
 }
- r = lock_blocking(mailbox->index_fd);
+ r = lock_blocking(mailbox->index_fd, fname);
 if (r) {
 	syslog(LOG_ERR, "IOERROR: locking %s: %m", fname);
 	r = IMAP_IOERROR;
 	goto done;
 }
 mailbox->index_locktype = LOCK_EXCLUSIVE;
-
- fname = mailbox_meta_fname(mailbox, META_CACHE);
- if (!fname) {
-	syslog(LOG_ERR, "IOERROR: Mailbox name too long (%s)", mailbox->name);
-	r = IMAP_MAILBOX_BADNAME;
-	goto done;
- }
- mailbox->cache_fd = open(fname, O_RDWR|O_TRUNC|O_CREAT, 0666);
- if (mailbox->cache_fd == -1) {
-	syslog(LOG_ERR, "IOERROR: creating %s: %m", fname);
+ r = mailbox_lock_conversations(mailbox);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: locking conversations %s %s",
+	 mailbox->name, error_message(r));
 	r = IMAP_IOERROR;
 	goto done;
 }
- 
- if (hasquota) mailbox_set_quotaroot(mailbox, quotaroot);
+
+ if (hasquota) {
+	mailbox_set_quotaroot(mailbox, quotaroot);
+	memset(mailbox->quota_previously_used, 0, sizeof(mailbox->quota_previously_used));
+	mailbox->quota_dirty = 1;
+ }
+
+ /* ensure a UIDVALIDITY is set */
+ if (!uidvalidity)
+	uidvalidity = mboxname_nextuidvalidity(name, time(0));
+ else
+	mboxname_setuidvalidity(mailbox->name, uidvalidity);
+
+ /* and highest modseq */
+ if (!highestmodseq)
+	highestmodseq = mboxname_nextmodseq(mailbox->name, 0);
+ else
+	mboxname_setmodseq(mailbox->name, highestmodseq);
 
 /* init non-zero fields */
 mailbox_index_dirty(mailbox);
 mailbox->i.minor_version = MAILBOX_MINOR_VERSION;
 mailbox->i.start_offset = INDEX_HEADER_SIZE;
 mailbox->i.record_size = INDEX_RECORD_SIZE;
- mailbox->i.uidvalidity = uidvalidity;
 mailbox->i.options = options;
- mailbox->i.highestmodseq = 1;
+ mailbox->i.uidvalidity = uidvalidity;
+ mailbox->i.highestmodseq = highestmodseq;
+ mailbox->i.sync_crc_vers = MAILBOX_CRC_VERSION_MAX;
 
 /* initialise header size field so appends calculate the
 * correct map size */
@@ -2803,14 +4133,18 @@
 	mailbox->uniqueid = xstrdup(uniqueid);
 }
 
- /* write out the initial generation number to the cache file */
- *((bit32 *)generation_buf) = htonl(mailbox->i.generation_no);
- n = retry_write(mailbox->cache_fd, generation_buf, 4);
- if (n != 4 || fsync(mailbox->cache_fd)) {
-	syslog(LOG_ERR, "IOERROR: writing initial cache for %s: %m",
-	 mailbox->name);
-	r = IMAP_IOERROR;
-	goto done;
+ /* pre-set any required permanent flags */
+ if (config_getstring(IMAPOPT_MAILBOX_INITIAL_FLAGS)) {
+	const char *val = config_getstring(IMAPOPT_MAILBOX_INITIAL_FLAGS);
+	int i;
+
+	initial_flags = strarray_split(val, NULL, 0);
+
+	for (i = 0; i < initial_flags->count; i++) {
+	 const char *flag = strarray_nth(initial_flags, i);
+	 r = mailbox_user_flag(mailbox, flag, NULL, /*create*/1);
+	 if (r) goto done;
+	}
 }
 
 r = seen_create_mailbox(NULL, mailbox);
@@ -2820,9 +4154,9 @@
 
 if (config_auditlog)
 	syslog(LOG_NOTICE, "auditlog: create sessionid=<%s> "
-			 "mailbox=<%s> uniqueid=<%s>",
-			 session_id(), 
-			 mailbox->name, mailbox->uniqueid);
+			 "mailbox=<%s> uniqueid=<%s> uidvalidity=<%u>",
+			 session_id(), mailbox->name,
+			 mailbox->uniqueid, mailbox->i.uidvalidity);
 
 done:
 if (!r && mailboxptr)
@@ -2830,13 +4164,15 @@
 else
 	mailbox_close(&mailbox);
 
+ strarray_free(initial_flags);
+
 return r;
 }
 
 /*
 * Remove all files in directory
 */
-static void mailbox_delete_files(char *path)
+static void mailbox_delete_files(const char *path)
 {
 DIR *dirp;
 struct dirent *f;
@@ -2886,34 +4222,106 @@
 		 void *rock)
 {
 const char *part = (const char *)rock;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry;
 int r;
 
 r = mboxlist_lookup(name, &mbentry, 0);
+ /* deleted mailboxes don't count as children */
+ if (r == IMAP_MAILBOX_NONEXISTENT) return 0;
 if (r) return r;
 
- if (!strcmp(part, mbentry.partition))
+ if (!strcmp(part, mbentry->partition))
 	r = CYRUSDB_DONE;
 
+ mboxlist_entry_free(&mbentry);
+
 return r;
 }
 
-/*
- * Delete and close the mailbox 'mailbox'. Closes 'mailbox' whether
- * or not the deletion was successful. Requires a locked mailbox.
- */
-int mailbox_delete(struct mailbox **mailboxptr)
+EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+{
+ struct index_record record;
+ uint32_t recno;
+ int r = 0;
+
+ if (!(mailbox->mbtype & (MBTYPE_ADDRESSBOOK|MBTYPE_CALENDAR)))
+	return 0;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) return r;
+
+	r = mailbox_update_dav(mailbox, NULL, &record);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+EXPORTED int mailbox_add_conversations(struct mailbox *mailbox)
+{
+ struct index_record record;
+ uint32_t recno;
+ int r = 0;
+
+ if (!mailbox_has_conversations(mailbox))
+	return 0;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) return r;
+
+	/* not assigned, skip */
+	if (!record.cid)
+	 continue;
+
+	r = mailbox_update_conversations(mailbox, NULL, &record);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+static int mailbox_delete_conversations(struct mailbox *mailbox)
+{
+ struct conversations_state *cstate;
+ struct index_record record;
+ uint32_t recno;
+ int r;
+
+ if (!mailbox_has_conversations(mailbox))
+	return 0;
+
+ cstate = conversations_get_mbox(mailbox->name);
+ if (!cstate)
+	return IMAP_CONVERSATIONS_NOT_OPEN;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) return r;
+
+	/* not assigned, skip */
+	if (!record.cid)
+	 continue;
+
+	r = mailbox_update_conversations(mailbox, &record, NULL);
+	if (r) return r;
+ }
+
+ return conversations_rename_folder(cstate, mailbox->name, NULL);
+}
+
+static int mailbox_delete_internal(struct mailbox **mailboxptr)
 {
 int r = 0;
 struct mailbox *mailbox = *mailboxptr;
- 
- /* mark the mailbox deleted */
- mailbox_index_dirty(mailbox);
- mailbox->i.options |= OPT_MAILBOX_DELETED;
 
 /* mark the quota removed */
 mailbox_quota_dirty(mailbox);
- mailbox->i.quota_mailbox_used = 0;
+
+ /* mark the mailbox deleted */
+ mailbox_index_dirty(mailbox);
+ mailbox->i.options |= OPT_MAILBOX_DELETED;
 
 /* commit the changes */
 r = mailbox_commit(mailbox);
@@ -2922,6 +4330,10 @@
 /* remove any seen */
 seen_delete_mailbox(NULL, mailbox);
 
+ /* clean up annotations */
+ r = annotate_delete_mailbox(mailbox);
+ if (r) return r;
+
 /* can't unlink any files yet, because our promise to other
 * users of the mailbox applies! Can only unlink with an
 * exclusive lock. mailbox_close will try to get one of 
@@ -2936,43 +4348,81 @@
 			 session_id(), 
 			 mailbox->name, mailbox->uniqueid);
 
+ proc_killmbox(mailbox->name);
+
 mailbox_close(mailboxptr);
 
 return 0;
 }
 
+/*
+ * Delete and close the mailbox 'mailbox'. Closes 'mailbox' whether
+ * or not the deletion was successful. Requires a locked mailbox.
+ */
+EXPORTED int mailbox_delete(struct mailbox **mailboxptr)
+{
+ struct mailbox *mailbox = *mailboxptr;
+ int r;
+
+ r = mailbox_delete_conversations(mailbox);
+ if (r) return r;
+
+ return mailbox_delete_internal(mailboxptr);
+}
+
+struct meta_file {
+ unsigned long metaflag;
+ int optional;
+ int nolink;
+};
+
+static struct meta_file meta_files = {
+ { META_HEADER, 0, 1 },
+ { META_INDEX, 0, 1 },
+ { META_CACHE, 1, 1 },
+ { META_SQUAT, 1, 0 },
+ { META_ANNOTATIONS, 1, 1 },
+ { META_ARCHIVECACHE, 1, 1 },
+ { 0, 0, 0 }
+};
+
 /* XXX - move this part of cleanup into mboxlist. Really
 * needs to be done with mailboxes.db locked so nobody can
 * try to create a mailbox while the delete is underway.
 * VERY tight race condition exists right now... */
 /* we need an exclusive namelock for this */
-int mailbox_delete_cleanup(const char *part, const char *name)
+HIDDEN int mailbox_delete_cleanup(const char *part, const char *name)
 {
- char nbufMAX_MAILBOX_BUFFER;
- char pbufMAX_MAILBOX_PATH+1, mbufMAX_MAILBOX_PATH+1;
- char *ntail, *ptail, *mtail = NULL;
- char *path, *mpath;
- struct mboxlist_entry mbentry;
+ strarray_t paths = STRARRAY_INITIALIZER;
+ int i;
+ mbentry_t *mbentry;
+ struct meta_file *mf;
 int r;
+ char nbufMAX_MAILBOX_NAME;
+ char *ntail;
+ char *p;
+
+ strncpy(nbuf, name, sizeof(nbuf));
+ ntail = nbuf + strlen(nbuf);
 
- /* XXX - use explicit paths to each type of file */
+ /* XXX - double XXX - this is a really ugly function. It should be
+ * using mboxname_parts and walking back up the 'boxes' list */
 
- /* Flush data (message file) directory */
- path = mboxname_datapath(part, name, 0);
- mailbox_delete_files(path);
- strlcpy(pbuf, path, sizeof(pbuf));
- ptail = pbuf + strlen(pbuf);
-
- /* Flush metadata directory */
- mpath = mboxname_metapath(part, name, 0, 0);
- if (strcmp(path, mpath)) {
-	mailbox_delete_files(mpath);
-	strlcpy(mbuf, mpath, sizeof(mbuf));
-	mtail = mbuf + strlen(mbuf);
+ strarray_add(&paths, mboxname_datapath(part, name, 0));
+
+ /* find the directory for every one of the meta files */
+ for (mf = meta_files; mf->metaflag; mf++) {
+	char *fname = xstrdup(mboxname_metapath(part, name, mf->metaflag, 0));
+	p = strrchr(fname, '/');
+	if (p) *p = '\0';
+	strarray_add(&paths, fname);
+	free(fname);
 }
 
- strlcpy(nbuf, name, sizeof(nbuf));
- ntail = nbuf + strlen(nbuf);
+ for (i = 0; i < paths.count; i++) {
+	const char *path = strarray_nth(&paths, i);
+	mailbox_delete_files(path);
+ }
 
 do {
 	/* Check if the mailbox has children */
@@ -2980,23 +4430,16 @@
 	r = mboxlist_findall(NULL, nbuf, 1, NULL, NULL, chkchildren, (void *)part);
 	if (r != 0) break; /* We short-circuit with CYRUSDB_DONE */
 
-	/* No children, remove mailbox spool dir(s) */
-	if (rmdir(pbuf)) {
-	 syslog(LOG_NOTICE,
-		 "Remove of supposedly empty directory %s failed: %m",
-		 pbuf);
-	}
-	ptail = strrchr(pbuf, '/');
-	*ptail ='\0';
-
-	if (mtail) {
-	 if (rmdir(mbuf)) {
+	/* no children, remove the directories */
+	for (i = 0; i < paths.count; i++) {
+	 char *path = paths.datai; /* need direct reference, because we're fiddling */
+	 r = rmdir(path);
+	 if (r && errno != -ENOENT)
 		syslog(LOG_NOTICE,
 		 "Remove of supposedly empty directory %s failed: %m",
-		 mbuf);
-	 }
-	 mtail = strrchr(mbuf, '/');
-	 *mtail ='\0';
+		 path);
+	 p = strrchr(path, '/');
+	 if (p) *p = '\0';
 	}
 
 	/* Check if parent mailbox exists */
@@ -3016,52 +4459,34 @@
 	r = mboxlist_lookup(nbuf, &mbentry, NULL);
 	/* if it's not being moved, and not the same partition, then it's safe to
 	 * clean up the parent directory too */
-	if (!r && !(mbentry.mbtype & MBTYPE_MOVING) && strcmp(mbentry.partition, part))
-	 r = IMAP_MAILBOX_NONEXISTENT;
+	if (!r) {
+	 if (!(mbentry->mbtype & MBTYPE_MOVING) && strcmp(mbentry->partition, part))
+		r = IMAP_MAILBOX_NONEXISTENT;
+	 mboxlist_entry_free(&mbentry);
+	}
 } while (r == IMAP_MAILBOX_NONEXISTENT);
 
+ strarray_fini(&paths);
+
 return 0;
 }
 
-struct meta_file {
- unsigned long metaflag;
- int optional;
- int nolink;
-};
-
-static struct meta_file meta_files = {
- { META_HEADER, 0, 1 },
- { META_INDEX, 0, 1 },
- { META_CACHE, 0, 1 },
- { META_SQUAT, 1, 0 },
- { 0, 0, 0 }
-};
-
-int mailbox_copy_files(struct mailbox *mailbox, const char *newpart,
-		 const char *newname)
+EXPORTED int mailbox_copy_files(struct mailbox *mailbox, const char *newpart,
+				const char *newname)
 {
 char oldbufMAX_MAILBOX_PATH, newbufMAX_MAILBOX_PATH;
- const char *path;
 struct meta_file *mf;
 uint32_t recno;
 struct index_record record;
- int r;
-
- /* make initial paths */
- path = mboxname_datapath(newpart, newname, 0);
- cyrus_mkdir(path, 0755);
- mkdir(path, 0755);
- path = mboxname_metapath(newpart, newname, 0, 0);
- cyrus_mkdir(path, 0755);
- mkdir(path, 0755);
+ int r = 0;
 
 /* Copy over meta files */
 for (mf = meta_files; mf->metaflag; mf++) {
 	struct stat sbuf;
 
-	strncpy(oldbuf, mailbox_meta_fname(mailbox, mf->metaflag),
+	xstrncpy(oldbuf, mailbox_meta_fname(mailbox, mf->metaflag),
 		MAX_MAILBOX_PATH);
-	strncpy(newbuf, mboxname_metapath(newpart, newname, mf->metaflag, 0),
+	xstrncpy(newbuf, mboxname_metapath(newpart, newname, mf->metaflag, 0),
 		MAX_MAILBOX_PATH);
 
 	unlink(newbuf); /* Make link() possible */
@@ -3079,10 +4504,14 @@
 	if (record.system_flags & FLAG_UNLINKED)
 	 continue;
 
-	strncpy(oldbuf, mailbox_message_fname(mailbox, record.uid),
-		MAX_MAILBOX_PATH);
-	strncpy(newbuf, mboxname_datapath(newpart, newname, record.uid),
+	xstrncpy(oldbuf, mailbox_record_fname(mailbox, &record),
 		MAX_MAILBOX_PATH);
+	if (record.system_flags & FLAG_ARCHIVED)
+	 xstrncpy(newbuf, mboxname_archivepath(newpart, newname, record.uid),
+		 MAX_MAILBOX_PATH);
+	else
+	 xstrncpy(newbuf, mboxname_datapath(newpart, newname, record.uid),
+		 MAX_MAILBOX_PATH);
 
 	r = mailbox_copyfile(oldbuf, newbuf, 0);
 	if (r) return r;
@@ -3096,45 +4525,53 @@
 'user.foo'.*/
 /* requires a write-locked oldmailbox pointer, since we delete it 
 immediately afterwards */
-int mailbox_rename_copy(struct mailbox *oldmailbox, 
+HIDDEN int mailbox_rename_copy(struct mailbox *oldmailbox,
 			const char *newname,
 			const char *newpartition,
+			unsigned uidvalidity,
 			const char *userid, int ignorequota,
 			struct mailbox **newmailboxptr)
 {
 int r;
 struct mailbox *newmailbox = NULL;
+ struct conversations_state *oldcstate = NULL;
+ struct conversations_state *newcstate = NULL;
 char *newquotaroot = NULL;
 
 assert(mailbox_index_islocked(oldmailbox, 1));
 
+ /* we can't rename back from a deleted mailbox, because the conversations
+ * information will be wrong. Ideally we might re-calculate, but for now
+ * we just throw a big fat error */
+ if (mboxname_isdeletedmailbox(oldmailbox->name, NULL)) {
+	syslog(LOG_ERR, "can't rename a deleted mailbox %s", oldmailbox->name);
+	return IMAP_MAILBOX_BADNAME;
+ }
+
+ /* create uidvalidity if not explicitly requested */
+ if (!uidvalidity)
+	uidvalidity = mboxname_nextuidvalidity(newname, oldmailbox->i.uidvalidity);
+
 /* Create new mailbox */
- r = mailbox_create(newname, newpartition,
-		 oldmailbox->acl, NULL,
-		 oldmailbox->i.options,
-		 time(0), &newmailbox);
+ r = mailbox_create(newname, oldmailbox->mbtype, newpartition,
+		 oldmailbox->acl, (userid ? NULL : oldmailbox->uniqueid),
+		 oldmailbox->i.options, uidvalidity,
+		 oldmailbox->i.highestmodseq, &newmailbox);
 
 if (r) return r;
 
 /* Check quota if necessary */
- if (!ignorequota && newmailbox->quotaroot && (!oldmailbox->quotaroot || 
-	strcmp(oldmailbox->quotaroot, newmailbox->quotaroot))) {
-	struct quota q;
-
-	q.root = newmailbox->quotaroot;
-	r = quota_read(&q, NULL, 1);
-
-	/* check if the limit is exceeded */
-	if (!r && q.limit >= 0 && q.used + oldmailbox->i.quota_mailbox_used >
-	 (uquota_t) q.limit * QUOTA_UNITS) {
-		r = IMAP_QUOTA_EXCEEDED;
-	}
+ if (!ignorequota && newmailbox->quotaroot &&
+	strcmpsafe(oldmailbox->quotaroot, newmailbox->quotaroot)) {
 
+	quota_t usageQUOTA_NUMRESOURCES;
+	mailbox_get_usage(oldmailbox, usage);
+	r = mailbox_quota_check(newmailbox, usage);
 	/* then we abort - no space to rename */
-	if (r && r != IMAP_QUOTAROOT_NONEXISTENT)
+	if (r)
 	 goto fail;
 }
- if (newmailbox->quotaroot) newquotaroot = xstrdup(newmailbox->quotaroot);
+ newquotaroot = xstrdupnull(newmailbox->quotaroot);
 
 r = mailbox_copy_files(oldmailbox, newpartition, newname);
 if (r) goto fail;
@@ -3151,19 +4588,53 @@
 r = mailbox_read_header(newmailbox, NULL);
 if (r) goto fail;
 
- /* update uidvalidity */
- newmailbox->i.uidvalidity = time(0);
-
 /* INBOX rename - change uniqueid */
 if (userid) mailbox_make_uniqueid(newmailbox);
 
 r = seen_copy(userid, oldmailbox, newmailbox);
 if (r) goto fail;
 
+ /* copy any mailbox annotations */
+ r = annotate_rename_mailbox(oldmailbox, newmailbox);
+ if (r) goto fail;
+
 /* mark the "used" back to zero, so it updates the new quota! */
 mailbox_set_quotaroot(newmailbox, newquotaroot);
 mailbox_quota_dirty(newmailbox);
- newmailbox->quota_previously_used = 0;
+ memset(newmailbox->quota_previously_used, 0, sizeof(newmailbox->quota_previously_used));
+
+ /* re-set the UIDVALIDITY, it will have been the old one in the index header */
+ mailbox_index_dirty(newmailbox);
+ newmailbox->i.uidvalidity = uidvalidity;
+ /* and bump the modseq too */
+ mailbox_modseq_dirty(newmailbox);
+
+ /* NOTE: in the case of renaming a user to another user, we
+ * don't rename the conversations DB - instead we re-create
+ * the records in the target user. Sorry, was too complex
+ * otherwise handling all the special cases */
+ if (mailbox_has_conversations(oldmailbox)) {
+	oldcstate = conversations_get_mbox(oldmailbox->name);
+	assert(oldcstate);
+ }
+
+ if (mailbox_has_conversations(newmailbox)) {
+	newcstate = conversations_get_mbox(newmailbox->name);
+	assert(newcstate);
+ }
+
+ if (oldcstate && newcstate && !strcmp(oldcstate->path, newcstate->path)) {
+	/* we can just rename within the same user */
+	r = conversations_rename_folder(oldcstate, oldmailbox->name, newname);
+ }
+ else {
+	/* have to handle each one separately */
+	if (oldcstate)
+	 r = mailbox_delete_conversations(oldmailbox);
+	if (newcstate)
+	 r = mailbox_add_conversations(newmailbox);
+ }
+ if (r) goto fail;
 
 /* commit the index changes */
 r = mailbox_commit(newmailbox);
@@ -3172,7 +4643,7 @@
 if (config_auditlog)
 	syslog(LOG_NOTICE, "auditlog: rename sessionid=<%s> "
 			 "oldmailbox=<%s> newmailbox=<%s> uniqueid=<%s>",
-			 session_id(), 
+			 session_id(),
 			 oldmailbox->name, newname, newmailbox->uniqueid);
 
 if (newmailboxptr) *newmailboxptr = newmailbox;
@@ -3193,7 +4664,7 @@
 return r;
 }
 
-int mailbox_rename_cleanup(struct mailbox **mailboxptr, int isinbox) 
+EXPORTED int mailbox_rename_cleanup(struct mailbox **mailboxptr, int isinbox)
 {
 int r = 0;
 struct mailbox *oldmailbox = *mailboxptr;
@@ -3201,11 +4672,11 @@
 
 if (isinbox) {
 	/* Expunge old mailbox */
-	r = mailbox_expunge(oldmailbox, expungeall, (char *)0, NULL);
+	r = mailbox_expunge(oldmailbox, expungeall, (char *)0, NULL, 0);
 	if (!r) r = mailbox_commit(oldmailbox);
 	mailbox_close(mailboxptr);
 } else {
-	r = mailbox_delete(mailboxptr);
+	r = mailbox_delete_internal(mailboxptr);
 }
 
 if (r) {
@@ -3222,70 +4693,14 @@
 /*
 * Copy (or link) the file 'from' to the file 'to'
 */
-static int mailbox_copyfile_core(const char *from, const char *to,
-				 int nolink)
+EXPORTED int mailbox_copyfile(const char *from, const char *to, int nolink)
 {
- int srcfd, destfd;
- struct stat sbuf;
- const char *src_base = 0;
- unsigned long src_size = 0;
- int n;
+ int flags = COPYFILE_MKDIR;
+ if (nolink) flags |= COPYFILE_NOLINK;
 
- if (!nolink) {
-	if (link(from, to) == 0) return 0;
-	if (errno == EEXIST) {
-	 if (unlink(to) == -1) {
-		syslog(LOG_ERR, "IOERROR: unlinking to recreate %s: %m", to);
-		return IMAP_IOERROR;
-	 }
-	 if (link(from, to) == 0) return 0;
-	}
- }
-
- destfd = open(to, O_RDWR|O_TRUNC|O_CREAT, 0666);
- if (destfd == -1) {
-	syslog(LOG_ERR, "IOERROR: creating %s: %m", to);
+ if (cyrus_copyfile(from, to, flags))
 	return IMAP_IOERROR;
- }
-
- srcfd = open(from, O_RDONLY, 0666);
- if (srcfd == -1) {
-	syslog(LOG_ERR, "IOERROR: opening %s: %m", from);
-	close(destfd);
-	return IMAP_IOERROR;
- }
-
-
- if (fstat(srcfd, &sbuf) == -1) {
-	syslog(LOG_ERR, "IOERROR: fstat on %s: %m", from);
-	close(srcfd);
-	close(destfd);
-	return IMAP_IOERROR;
- }
- map_refresh(srcfd, 1, &src_base, &src_size, sbuf.st_size, from, 0);
-
- n = retry_write(destfd, src_base, src_size);
-
- if (n == -1 || fsync(destfd)) {
-	map_free(&src_base, &src_size);
-	close(srcfd);
-	close(destfd);
-	syslog(LOG_ERR, "IOERROR: writing %s: %m", to);
-	return IMAP_IOERROR;
- }
- map_free(&src_base, &src_size);
- close(srcfd);
- close(destfd);
- return 0;
-}
 
-int mailbox_copyfile(const char *from, const char *to, int nolink)
-{
- /* try to make the target dir if initial copy fails */
- if (mailbox_copyfile_core(from, to, nolink)) {
-	cyrus_mkdir(to, 0755);
-	return mailbox_copyfile_core(from, to, nolink);
- }
 return 0;
 }
 
@@ -3295,39 +4710,48 @@
 
 #define UIDGROW 300
 
-struct found_files {
- unsigned long *uids;
+struct found_uid {
+ uint32_t uid;
+ unsigned isarchive:1;
+};
+
+struct found_uids {
+ struct found_uid *found;
 unsigned nalloc;
 unsigned nused;
+ unsigned pos;
 };
+#define FOUND_UIDS_INITIALIZER \
+ { NULL, 0, 0, 0 }
 
-static int sort_uid(const void *a, const void *b)
+static int sort_found(const void *a, const void *b)
 {
- return *(unsigned long *)a - *(unsigned long *)b;
-}
-
-static void init_files(struct found_files *ff)
-{
- ff->uids = NULL;
- ff->nused = 0;
- ff->nalloc = 0;
+ struct found_uid *fa = (struct found_uid *)a;
+ struct found_uid *fb = (struct found_uid *)b;
+ if (fa->uid != fb->uid)
+	return fa->uid - fb->uid;
+ return fa->isarchive - fb->isarchive;
 }
 
-static void add_files(struct found_files *ff, unsigned long uid)
+static void add_found(struct found_uids *ff, uint32_t uid, int isarchive)
 {
 /* make sure there's space */
 if (ff->nused >= ff->nalloc) {
 	ff->nalloc += UIDGROW;
-	ff->uids = xrealloc(ff->uids, ff->nalloc * sizeof(unsigned long));
+	ff->found = xrealloc(ff->found, ff->nalloc * sizeof(struct found_uid));
 }
- ff->uidsff->nused++ = uid;
+ ff->foundff->nused.uid = uid;
+ ff->foundff->nused.isarchive = !!isarchive;
+ ff->nused++;
 }
 
-static void free_files(struct found_files *ff)
+static void free_found(struct found_uids *ff)
 {
- if (ff->nalloc)
-	free(ff->uids);
- init_files(ff);
+ free(ff->found);
+ ff->found = NULL;
+ ff->nalloc = 0;
+ ff->nused = 0;
+ ff->pos = 0;
 }
 
 static int parse_datafilename(const char *name, uint32_t *uidp)
@@ -3347,10 +4771,10 @@
 return parseuint32(name, &p, uidp);
 }
 
-static int find_files(struct mailbox *mailbox, struct found_files *files,
+static int find_files(struct mailbox *mailbox, struct found_uids *files,
 		 int flags)
 {
- const char *dirpath;
+ strarray_t paths = STRARRAY_INITIALIZER;
 DIR *dirp;
 struct dirent *dirent;
 uint32_t uid;
@@ -3358,59 +4782,55 @@
 char bufMAX_MAILBOX_PATH;
 struct stat sbuf;
 int r;
+ int i;
 
- init_files(files);
-
- dirpath = mailbox_datapath(mailbox);
- if (!dirpath) return IMAP_MAILBOX_BADNAME;
-
- dirp = opendir(dirpath);
- if (!dirp) {
-	printf("%s data directory is missing %s\n", mailbox->name, dirpath);
-	/* need to re-create data directory */
-	if (cyrus_mkdir(dirpath, 0755) == -1)
-	 return IMAP_IOERROR;
-	if (mkdir(dirpath, 0755) == -1) 
-	 return IMAP_IOERROR;
-	return 0;
- }
-
- /* data directory is fine */
- while ((dirent = readdir(dirp)) != NULL) {
-	p = dirent->d_name;
-	if (*p == '.') continue; /* dot files */
-	if (!strncmp(p, "cyrus.", 6)) continue; /* cyrus.* files */
-
-	r = parse_datafilename(p, &uid);
+ strarray_add(&paths, mailbox_datapath(mailbox));
+ strarray_add(&paths, mboxname_archivepath(mailbox->part, mailbox->name, 0));
 
-	if (r) {
-	 /* check if it's a directory */
-	 snprintf(buf, MAX_MAILBOX_PATH, "%s/%s", dirpath, dirent->d_name);
-	 if (stat(buf, &sbuf) == -1) continue; /* ignore emepheral */
-	 if (!S_ISDIR(sbuf.st_mode)) {
-		if (!(flags & RECONSTRUCT_IGNORE_ODDFILES)) {
-		 printf("%s odd file %s\n", mailbox->name, buf);
-		 syslog(LOG_ERR, "%s odd file %s", mailbox->name, buf);
-		 if (flags & RECONSTRUCT_REMOVE_ODDFILES)
-			unlink(buf);
-		 else {
-			printf("run reconstruct with -O to remove odd files\n");
-			syslog(LOG_ERR, "run reconstruct with -O to "
-					"remove odd files");
+ for (i = 0; i < paths.count; i++) {
+	const char *dirpath = strarray_nth(&paths, i);
+	int isarchive = strcmp(dirpath, mailbox_datapath(mailbox));
+
+	dirp = opendir(dirpath);
+	if (!dirp) continue;
+
+	/* data directory is fine */
+	while ((dirent = readdir(dirp)) != NULL) {
+	 p = dirent->d_name;
+	 if (*p == '.') continue; /* dot files */
+	 if (!strncmp(p, "cyrus.", 6)) continue; /* cyrus.* files */
+
+	 r = parse_datafilename(p, &uid);
+
+	 if (r) {
+		/* check if it's a directory */
+		snprintf(buf, MAX_MAILBOX_PATH, "%s/%s", dirpath, dirent->d_name);
+		if (stat(buf, &sbuf) == -1) continue; /* ignore ephemeral */
+		if (!S_ISDIR(sbuf.st_mode)) {
+		 if (!(flags & RECONSTRUCT_IGNORE_ODDFILES)) {
+			printf("%s odd file %s\n", mailbox->name, buf);
+			syslog(LOG_ERR, "%s odd file %s", mailbox->name, buf);
+			if (flags & RECONSTRUCT_REMOVE_ODDFILES)
+			 unlink(buf);
+			else {
+			 printf("run reconstruct with -O to remove odd files\n");
+			 syslog(LOG_ERR, "run reconstruct with -O to "
+					 "remove odd files");
+			}
 		 }
 		}
 	 }
+	 else {
+		/* it's one of ours :) */
+		add_found(files, uid, isarchive);
+	 }
 	}
-	else {
-	 /* it's one of ours :) */
-	 add_files(files, uid);
-	}
- }
 
- closedir(dirp);
+	closedir(dirp);
+ }
 
 /* make sure UIDs are sorted for comparison */
- qsort(files->uids, files->nused, sizeof(unsigned long), sort_uid);
+ qsort(files->found, files->nused, sizeof(unsigned long), sort_found);
 
 return 0;
 }
@@ -3420,7 +4840,7 @@
 const char *fname;
 int expunge_fd = -1;
 const char *expunge_base = NULL;
- unsigned long expunge_len = 0; /* mapped size */
+ size_t expunge_len = 0; /* mapped size */
 unsigned long expunge_num;
 unsigned long emapnum;
 uint32_t erecno;
@@ -3468,7 +4888,7 @@
 for (erecno = 1; erecno <= expunge_num; erecno++) {
 	bufp = expunge_base + eoffset + (erecno-1)*expungerecord_size;
 	uid = ntohl(*((bit32 *)(bufp+OFFSET_UID)));
-	fname = mailbox_message_fname(mailbox, uid);
+	fname = mboxname_datapath(mailbox->part, mailbox->name, uid);
 	unlink(fname);
 	count++;
 }
@@ -3481,7 +4901,7 @@
 
 done:
 if (expunge_base) map_free(&expunge_base, &expunge_len);
- if (expunge_fd != -1) close(expunge_fd);
+ xclose(expunge_fd);
 }
 
 /* this is kind of like mailbox_create, but we try to rescue
@@ -3491,7 +4911,7 @@
 struct mailbox *mailbox = NULL;
 int options = config_getint(IMAPOPT_MAILBOX_DEFAULT_OPTIONS)
 		| OPT_POP3_NEW_UIDL;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 struct mailboxlist *listitem;
 int r;
 
@@ -3513,10 +4933,11 @@
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) goto done;
 
- syslog(LOG_NOTICE, "create new mailbox %s", name);
+ mailbox->part = xstrdup(mbentry->partition);
+ mailbox->acl = xstrdup(mbentry->acl);
+ mailbox->mbtype = mbentry->mbtype;
 
- mailbox->part = xstrdup(mbentry.partition);
- mailbox->acl = xstrdup(mbentry.acl);
+ syslog(LOG_NOTICE, "create new mailbox %s", name);
 
 /* Attempt to open index */
 r = mailbox_open_index(mailbox);
@@ -3527,10 +4948,14 @@
 	/* no cyrus.index file at all - well, we're in a pickle!
 * no point trying to rescue anything else... */
 	mailbox_close(&mailbox);
-	return mailbox_create(name, mbentry.partition, mbentry.acl,
-			 NULL, options, time(0), mbptr);
+	r = mailbox_create(name, mbentry->mbtype, mbentry->partition, mbentry->acl,
+			 NULL, options, 0, 0, mbptr);
+	mboxlist_entry_free(&mbentry);
+	return r;
 }
 
+ mboxlist_entry_free(&mbentry);
+
 /* read header, if it is not there, we need to create it */
 r = mailbox_read_header(mailbox, NULL);
 if (r) {
@@ -3572,8 +4997,14 @@
 	printf("%s: update acl from header %s => %s\n", mailbox->name,
 	 mailbox->acl, acl);
 	if (make_changes) {
-	 r = mboxlist_update(mailbox->name, mailbox->mbtype,
-				mailbox->part, acl, 0);
+	 mbentry_t *mbentry = NULL;
+	 r = mboxlist_lookup(mailbox->name, &mbentry, NULL);
+	 if (!r) {
+		free(mbentry->acl);
+		mbentry->acl = xstrdup(acl);
+		r = mboxlist_update(mbentry, 0);
+	 }
+	 mboxlist_entry_free(&mbentry);
 	}
 }
 
@@ -3653,11 +5084,11 @@
 if (old->cache_crc != new->cache_crc) {
 	match = 0;
 }
- if (cache_size(old) != cache_size(new)) {
+ if (cache_len(old) != cache_len(new)) {
 	match = 0;
 }
 /* only compare cache records if size matches */
- else if (memcmp(cache_base(old), cache_base(new), cache_size(new))) {
+ else if (memcmp(cache_base(old), cache_base(new), cache_len(new))) {
 	match = 0;
 }
 
@@ -3668,9 +5099,9 @@
 					 struct index_record *record,
 					 bit32 *valid_user_flags,
 					 int flags, int have_file,
-					 struct found_files *discovered)
+					 struct found_uids *discovered)
 {
- char *fname = mailbox_message_fname(mailbox, record->uid);
+ const char *fname = mailbox_record_fname(mailbox, record);
 int r = 0;
 int i;
 struct index_record copy;
@@ -3683,7 +5114,7 @@
 
 /* does the file actually exist? */
 if (have_file && do_stat) {
- 	if (stat(fname, &sbuf) == -1 || (sbuf.st_size == 0)) {
+	if (stat(fname, &sbuf) == -1 || (sbuf.st_size == 0)) {
 	 have_file = 0;
 	}
 	else if (record->size != (unsigned) sbuf.st_size) {
@@ -3691,7 +5122,7 @@
 	}
 	did_stat = 1;
 }
-	
+
 if (!have_file) {
 	/* well, that's OK if it's supposed to be missing! */
 	if (record->system_flags & FLAG_UNLINKED)
@@ -3754,7 +5185,7 @@
 	 }
 	 else if (flags & RECONSTRUCT_GUID_REWRITE) {
 		/* treat this file as discovered */
-		add_files(discovered, record->uid);
+		add_found(discovered, record->uid, record->system_flags & FLAG_ARCHIVED);
 		printf("%s uid %u marking for uid upgrade\n",
 		 mailbox->name, record->uid);
 		syslog(LOG_ERR, "%s uid %u marking for uid upgrade",
@@ -3785,6 +5216,21 @@
 	}
 }
 
+ if (!record->size) {
+	/* dang, guess it failed to parse */
+
+	printf("%s uid %u failed to parse\n", mailbox->name, record->uid);
+	syslog(LOG_ERR, "%s uid %u failed to parse", mailbox->name, record->uid);
+
+	if (!make_changes) return 0;
+
+	/* otherwise we have issues, mark it unlinked */
+	unlink(fname);
+	record->system_flags |= FLAG_EXPUNGED | FLAG_UNLINKED;
+	mailbox->i.options |= OPT_MAILBOX_NEEDS_REPACK;
+	return mailbox_rewrite_index_record(mailbox, record);
+ }
+
 /* get internaldate from the file if not set */
 if (!record->internaldate) {
 	if (did_stat || stat(fname, &sbuf) != -1)
@@ -3800,7 +5246,8 @@
 	syslog(LOG_ERR, "%s uid %u future modseq " MODSEQ_FMT " found",
 		 mailbox->name, record->uid, record->modseq);
 	mailbox_index_dirty(mailbox);
-	mailbox->i.highestmodseq = record->modseq;
+	mailbox->i.highestmodseq = mboxname_setmodseq(mailbox->name,
+						 record->modseq);
 }
 
 if (record->uid > mailbox->i.last_uid) {
@@ -3837,20 +5284,28 @@
 return mailbox_rewrite_index_record(mailbox, record);
 }
 
-static int mailbox_reconstruct_append(struct mailbox *mailbox, uint32_t uid,
+static int mailbox_reconstruct_append(struct mailbox *mailbox, uint32_t uid, int isarchive,
 				 int flags)
 {
- char *fname = mailbox_message_fname(mailbox, uid);
+ /* XXX - support archived */
+ const char *fname;
 int r = 0;
 struct index_record record;
 struct stat sbuf;
 int make_changes = flags & RECONSTRUCT_MAKE_CHANGES;
 
+ if (isarchive)
+	fname = mboxname_archivepath(mailbox->part, mailbox->name, uid);
+ else
+	fname = mboxname_datapath(mailbox->part, mailbox->name, uid);
+
 /* possible if '0.' file exists */
 if (!uid) {
 	/* filthy hack - copy the path to '1.' and replace 1 with 0 */
-	fname = xstrdup(mailbox_message_fname(mailbox, 1));
-	fnamestrlen(fname)-2 = '0';
+	char *hack;
+	fname = mboxname_datapath(mailbox->part, mailbox->name, 1);
+	hack = (char *)fname;
+	hackstrlen(fname)-2 = '0';
 }
 
 if (stat(fname, &sbuf) == -1) r = IMAP_MAILBOX_NONEXISTENT;
@@ -3870,6 +5325,9 @@
 r = message_parse(fname, &record);
 if (r) return r;
 
+ if (isarchive)
+	record.system_flags |= FLAG_ARCHIVED;
+
 /* copy the timestamp from the file if not calculated */
 if (!record.internaldate)
 	record.internaldate = sbuf.st_mtime;
@@ -3891,18 +5349,23 @@
 	if (!make_changes) return 0;
 
 	oldfname = xstrdup(fname);
-	newfname = xstrdup(mailbox_message_fname(mailbox, record.uid));
+	newfname = xstrdup(mailbox_record_fname(mailbox, &record));
 	r = rename(oldfname, newfname);
 	free(oldfname);
 	free(newfname);
 	if (r) return IMAP_IOERROR;
 }
 
+
 /* XXX - inform of changes */
 if (!make_changes)
 	return 0;
 
- return mailbox_append_index_record(mailbox, &record);
+ r = mailbox_append_index_record(mailbox, &record);
+
+ /* XXX - copy per-message annotations? */
+
+ return r;
 }
 
 
@@ -3919,6 +5382,15 @@
 	 old->quota_mailbox_used, new->quota_mailbox_used);
 }
 
+ if (old->quota_annot_used != new->quota_annot_used) {
+	printf("%s updating quota_annot_used: "
+	 QUOTA_T_FMT " => " QUOTA_T_FMT "\n", mailbox->name,
+	 old->quota_annot_used, new->quota_annot_used);
+	syslog(LOG_ERR, "%s updating quota_annot_used: "
+	 QUOTA_T_FMT " => " QUOTA_T_FMT, mailbox->name,
+	 old->quota_annot_used, new->quota_annot_used);
+ }
+
 if (old->answered != new->answered) {
 	syslog(LOG_ERR, "%s: updating answered %u => %u",
 	 mailbox->name, old->answered, new->answered);
@@ -3947,10 +5419,18 @@
 	 mailbox->name, old->exists, new->exists);
 }
 
- if (old->sync_crc != new->sync_crc) {
-	syslog(LOG_ERR, "%s: updating sync_crc %08X => %08X",
+ if (old->sync_crc_vers != new->sync_crc_vers) {
+	syslog(LOG_ERR, "%s: updating sync_crc_vers %u => %u",
+	 mailbox->name, old->sync_crc_vers, new->sync_crc_vers);
+	printf("%s: updating sync_crc_vers %u => %u\n",
+	 mailbox->name, old->sync_crc_vers, new->sync_crc_vers);
+ }
+ else if (old->sync_crc != new->sync_crc) {
+	/* note that the sync_crc can't be compared if the
+	 * algorithm versions are different */
+	syslog(LOG_ERR, "%s: updating sync_crc %u => %u",
 	 mailbox->name, old->sync_crc, new->sync_crc);
-	printf("%s: updating sync_crc %08X => %08X\n",
+	printf("%s: updating sync_crc %u => %u\n",
 	 mailbox->name, old->sync_crc, new->sync_crc);
 }
 }
@@ -3995,22 +5475,86 @@
 return 0;
 }
 
+static int addannot_uid(const char *mailbox __attribute__((unused)),
+ uint32_t uid,
+ const char *entry __attribute__((unused)),
+ const char *userid __attribute__((unused)),
+ const struct buf *value __attribute__((unused)),
+ void *rock)
+{
+ struct found_uids *annots = (struct found_uids *)rock;
+
+ /* take advantage of the guarantee that all annotations with the same UID
+ * will be together in a 'foreach' response */
+ if (!annots->nused || annots->foundannots->nused-1.uid != uid) {
+	/* we don't support an archive annotations DB yet */
+	add_found(annots, uid, /*isarchive*/0);
+ }
+
+ return 0;
+}
+
+
+static int find_annots(struct mailbox *mailbox, struct found_uids *annots)
+{
+ int r = 0;
+
+ r = annotatemore_findall(mailbox->name, ANNOTATE_ANY_UID, "*",
+			 addannot_uid, annots);
+ if (r) return r;
+
+ /* make sure UIDs are sorted for comparison */
+ qsort(annots->found, annots->nused, sizeof(unsigned long), sort_found);
+
+ return 0;
+}
+
+static int reconstruct_delannots(struct mailbox *mailbox,
+				 struct found_uids *delannots,
+				 int flags)
+{
+ int make_changes = (flags & RECONSTRUCT_MAKE_CHANGES);
+ int r = 0;
+
+ r = mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, NULL);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to open annotations %s: %s",
+	 mailbox->name, error_message(r));
+	goto out;
+ }
+
+ while (delannots->pos < delannots->nused) {
+	uint32_t uid = delannots->founddelannots->pos.uid;
+	syslog(LOG_NOTICE, "removing stale annotations for %u", uid);
+	printf("removing stale annotations for %u\n", uid);
+	if (make_changes) {
+	 r = annotate_msg_cleanup(mailbox, uid);
+	 if (r) goto out;
+	}
+	delannots->pos++;
+ }
+
+out:
+ return r;
+}
+
 
 /*
 * Reconstruct the single mailbox named 'name'
 */
-int mailbox_reconstruct(const char *name, int flags)
+EXPORTED int mailbox_reconstruct(const char *name, int flags)
 {
 /* settings */
 int make_changes = (flags & RECONSTRUCT_MAKE_CHANGES);
 
 int r = 0;
- uint32_t msg;
 int i, flag;
 struct index_record record;
 struct mailbox *mailbox = NULL;
- struct found_files files;
- struct found_files discovered;
+ struct found_uids files = FOUND_UIDS_INITIALIZER;
+ struct found_uids discovered = FOUND_UIDS_INITIALIZER;
+ struct found_uids annots = FOUND_UIDS_INITIALIZER;
+ struct found_uids delannots = FOUND_UIDS_INITIALIZER;
 struct index_header old_header;
 int have_file;
 uint32_t recno;
@@ -4052,39 +5596,14 @@
 	valid_user_flagsflag/32 |= 1<<(flag&31);
 }
 
- r = mailbox_open_cache(mailbox);
- if (r) {
-	const char *fname = mailbox_meta_fname(mailbox, META_CACHE);
-	char buf4;
-	int n;
-
-	printf("%s: missing cache file, recreating\n",
-	 mailbox->name);
-	syslog(LOG_ERR, "%s: missing cache file, recreating",
-	 mailbox->name);
-
-	if (!make_changes) goto close;
-
-	if (cyrus_mkdir(fname, 0755)) goto close;
-	mailbox->cache_fd = open(fname, O_RDWR|O_TRUNC|O_CREAT, 0666);
-	if (mailbox->cache_fd == -1) goto close;
-
-	/* set the generation number */
-	*((bit32 *)(buf)) = htonl(mailbox->i.generation_no);
-	n = retry_write(mailbox->cache_fd, buf, 4);
-	if (n != 4) goto close;
-
-	/* ensure that next user will create the MMAPing */
-	mailbox->need_cache_refresh = 1;
- }
-
 /* find cyrus.expunge file if present */
 cleanup_stale_expunged(mailbox);
 
 r = find_files(mailbox, &files, flags);
 if (r) goto close;
- init_files(&discovered);
- msg = 0;
+
+ r = find_annots(mailbox, &annots);
+ if (r) goto close;
 
 for (recno = 1; recno <= mailbox->i.num_records; recno++) {
 	r = mailbox_read_index_record(mailbox, recno, &record);
@@ -4104,17 +5623,52 @@
 
 	last_seen_uid = record.uid;
 
+	/* bogus annotations? */
+	while (annots.pos < annots.nused && annots.foundannots.pos.uid < record.uid) {
+	 add_found(&delannots, annots.foundannots.pos.uid, /*isarchive*/0);
+	 annots.pos++;
+	}
+
+	/* skip over current */
+	while (annots.pos < annots.nused && annots.foundannots.pos.uid == record.uid) {
+	 annots.pos++;
+	}
+
 	/* lower UID file exists */
-	while (msg < files.nused && files.uidsmsg < record.uid) {
-	 add_files(&discovered, files.uidsmsg);
-	 msg++;
+	while (files.pos < files.nused && files.foundfiles.pos.uid < record.uid) {
+	 add_found(&discovered, files.foundfiles.pos.uid, files.foundfiles.pos.isarchive);
+	 files.pos++;
 	}
 
 	/* if they match, advance the pointer */
 	have_file = 0;
-	if (msg < files.nused && files.uidsmsg == record.uid) {
-	 have_file = 1;
-	 msg++;
+	while (files.pos < files.nused && files.foundfiles.pos.uid == record.uid) {
+	 if (have_file) {
+		/* we can just unlink this one, already processed one copy */
+		const char *fname = mboxname_archivepath(mailbox->part, mailbox->name, record.uid);
+		printf("Removing duplicate archive file %s\n", fname);
+		unlink(fname);
+	 }
+	 else {
+		if (files.foundfiles.pos.isarchive) {
+		 if (!(record.system_flags & FLAG_ARCHIVED)) {
+			/* oops, it's really archived - let's fix that right now */
+			record.system_flags |= FLAG_ARCHIVED;
+			printf("Marking file as archived %s %u\n", mailbox->name, record.uid);
+			mailbox_rewrite_index_record(mailbox, &record);
+		 }
+		}
+		else {
+		 if (record.system_flags & FLAG_ARCHIVED) {
+			/* oops, non-archived copy exists, let's use that */
+			record.system_flags &= ~FLAG_ARCHIVED;
+			printf("Marking file as not archived %s %u\n", mailbox->name, record.uid);
+			mailbox_rewrite_index_record(mailbox, &record);
+		 }
+		}
+		have_file = 1;
+	 }
+	 files.pos++;
 	}
 
 	r = mailbox_reconstruct_compare_update(mailbox, &record,
@@ -4125,25 +5679,51 @@
 }
 
 /* add discovered messages before last_uid to the list in order */
- while (msg < files.nused && files.uidsmsg <= mailbox->i.last_uid) {
-	add_files(&discovered, files.uidsmsg);
-	msg++;
+ while (files.pos < files.nused && files.foundfiles.pos.uid <= mailbox->i.last_uid) {
+	add_found(&discovered, files.foundfiles.pos.uid, files.foundfiles.pos.isarchive);
+	files.pos++;
 }
 
 /* messages AFTER last_uid can keep the same UID (see also, restore
- * from list .index file) - so don't bother moving those */
- while (msg < files.nused) {
-	r = mailbox_reconstruct_append(mailbox, files.uidsmsg, flags);
+ * from lost .index file) - so don't bother moving those */
+ while (files.pos < files.nused) {
+	uint32_t uid = files.foundfiles.pos.uid;
+	r = mailbox_reconstruct_append(mailbox, files.foundfiles.pos.uid,
+				 files.foundfiles.pos.isarchive, flags);
+	if (r) goto close;
+	files.pos++;
+
+	/* we can keep this annotation too... */
+
+	/* bogus annotations? */
+	while (annots.pos < annots.nused && annots.foundannots.pos.uid < uid) {
+	 add_found(&delannots, annots.foundannots.pos.uid, /*isarchive*/0);
+	 annots.pos++;
+	}
+
+	/* skip over current */
+	while (annots.pos < annots.nused && annots.foundannots.pos.uid == uid) {
+	 annots.pos++;
+	}
+ }
+
+ /* bogus annotations after the end? */
+ while (annots.pos < annots.nused) {
+	add_found(&delannots, annots.foundannots.pos.uid, /*isarchive*/0);
+	annots.pos++;
+ }
+
+ /* handle new list - note, we don't copy annotations for these */
+ while (discovered.pos < discovered.nused) {
+	r = mailbox_reconstruct_append(mailbox, discovered.founddiscovered.pos.uid,
+				 discovered.founddiscovered.pos.isarchive, flags);
 	if (r) goto close;
-	msg++;
+	discovered.pos++;
 }
- 
- /* handle new list */
- msg = 0;
- while (msg < discovered.nused) {
-	r = mailbox_reconstruct_append(mailbox, discovered.uidsmsg, flags);
+
+ if (delannots.nused) {
+	r = reconstruct_delannots(mailbox, &delannots, flags);
 	if (r) goto close;
-	msg++;
 }
 
 /* make sure we have enough index file mmaped */
@@ -4159,17 +5739,18 @@
 reconstruct_compare_headers(mailbox, &old_header, &mailbox->i);
 
 /* fix up 2.4.0 bug breakage */
- if (mailbox->i.uidvalidity == 0) {
+ if (!mailbox->i.uidvalidity) {
 	if (make_changes) {
-	 mailbox->i.uidvalidity = time(0);
+	 mailbox->i.uidvalidity = mboxname_nextuidvalidity(mailbox->name,
+							 time(0));
 	 mailbox_index_dirty(mailbox);
 	}
 	syslog(LOG_ERR, "%s: zero uidvalidity", mailbox->name);
 }
- if (mailbox->i.highestmodseq == 0) {
+ if (!mailbox->i.highestmodseq) {
 	if (make_changes) {
 	 mailbox_index_dirty(mailbox);
-	 mailbox->i.highestmodseq = 1;
+	 mailbox->i.highestmodseq = mboxname_nextmodseq(mailbox->name, 0);
 	}
 	syslog(LOG_ERR, "%s: zero highestmodseq", mailbox->name);
 }
@@ -4182,15 +5763,102 @@
 	 * write any changes */
 	mailbox->i.dirty = 0;
 	mailbox->quota_dirty = 0;
-	mailbox->cache_dirty = 0;
 	mailbox->modseq_dirty = 0;
 	mailbox->header_dirty = 0;
 }
 
 close:
- free_files(&files);
- free_files(&discovered);
+ free_found(&files);
+ free_found(&discovered);
+ free_found(&annots);
+ free_found(&delannots);
 mailbox_close(&mailbox);
 return r;
 }
 
+/*
+ * Gets messages usage.
+ */
+EXPORTED void mailbox_get_usage(struct mailbox *mailbox,
+			quota_t usageQUOTA_NUMRESOURCES)
+{
+ int res;
+
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	usageres = 0;
+ }
+
+ if (!(mailbox->i.options & OPT_MAILBOX_DELETED)) {
+	usageQUOTA_STORAGE = mailbox->i.quota_mailbox_used;
+	usageQUOTA_MESSAGE = mailbox->i.exists;
+	usageQUOTA_ANNOTSTORAGE = mailbox->i.quota_annot_used;
+	usageQUOTA_NUMFOLDERS = 1;
+ }
+ /* else: mailbox is being deleted, thus its new usage is 0 */
+}
+
+EXPORTED int mailbox_get_annotate_state(struct mailbox *mailbox,
+			 unsigned int uid,
+			 annotate_state_t **statep)
+{
+ int r = 0;
+
+ if (statep) *statep = NULL;
+
+ if (!mailbox->annot_state)
+	mailbox->annot_state = annotate_state_new();
+
+ r = annotate_state_set_message(mailbox->annot_state, mailbox, uid);
+ if (r) return r;
+
+ /* lock immediately if we have a write lock */
+ if (mailbox_index_islocked(mailbox, /*write*/1))
+	annotate_state_begin(mailbox->annot_state);
+
+ if (statep) *statep = mailbox->annot_state;
+
+ return 0;
+}
+
+int mailbox_cid_rename(struct mailbox *mailbox,
+		 conversation_id_t from_cid,
+		 conversation_id_t to_cid)
+{
+ uint32_t recno, num_records;
+ struct index_record record;
+ int r;
+
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+
+ num_records = mailbox->i.num_records;
+ for (recno = 1; recno <= num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) {
+	 syslog(LOG_ERR, "mailbox_cid_rename: error "
+			 "reading record %u, mailbox %s: %s",
+			 recno, mailbox->name, error_message(r));
+	 return r;
+	}
+
+	if (record.cid != from_cid)
+	 continue;
+
+	/*
+	 * Just rename the CID in place - injecting a copy at the end
+	 * messes with clients that just use UID ordering, like Apple's
+	 * IOS email client */
+
+	record.cid = to_cid;
+	r = mailbox_rewrite_index_record(mailbox, &record);
+
+	if (r) {
+	 syslog(LOG_ERR, "mailbox_cid_rename: error "
+			 "rewriting record %u, mailbox %s: %s from %llu to %llu",
+			 recno, mailbox->name, error_message(r), from_cid, to_cid);
+	 return r;
+	}
+ }
+
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/mailbox.h -> cyrus-imapd-2.5.tar.gz/imap/mailbox.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mailbox.h,v 1.98 2010/06/28 12:04:20 brong Exp $
 */
 
 #ifndef INCLUDED_MAILBOX_H
@@ -50,12 +48,13 @@
 #include <limits.h>
 #include <config.h>
 
-#include "auth.h"
 #include "byteorder64.h"
+#include "conversations.h"
 #include "message_guid.h"
-#include "prot.h"
+#include "ptrarray.h"
 #include "quota.h"
 #include "sequence.h"
+#include "util.h"
 
 #define MAX_MAILBOX_NAME 490
 /* enough space for all possible rewrites and DELETED.* and stuff */
@@ -68,7 +67,7 @@
 "\"The best thing about this system was that it had lots of goals.\"\n" \
 "\t--Jim Morris on Andrew\n")
 
-#define MAILBOX_MINOR_VERSION	12
+#define MAILBOX_MINOR_VERSION	13
 #define MAILBOX_CACHE_MINOR_VERSION 3
 
 #define FNAME_HEADER "/cyrus.header"
@@ -76,13 +75,16 @@
 #define FNAME_CACHE "/cyrus.cache"
 #define FNAME_SQUAT "/cyrus.squat"
 #define FNAME_EXPUNGE "/cyrus.expunge"
+#define FNAME_ANNOTATIONS "/cyrus.annotations"
 
 enum meta_filename {
 META_HEADER = 1,
 META_INDEX,
 META_CACHE,
 META_SQUAT,
- META_EXPUNGE
+ META_EXPUNGE,
+ META_ANNOTATIONS,
+ META_ARCHIVECACHE
 };
 
 #define MAILBOX_FNAME_LEN 256
@@ -90,7 +92,8 @@
 #define LOCK_NONE 0
 #define LOCK_SHARED 1
 #define LOCK_EXCLUSIVE 2
-#define LOCK_NONBLOCKING 3
+#define LOCK_NONBLOCK	4 /* flag to OR in */
+#define LOCK_NONBLOCKING (LOCK_NONBLOCK|LOCK_EXCLUSIVE)
 
 #define NUM_CACHE_FIELDS 10
 
@@ -100,7 +103,7 @@
 };
 
 struct cacherecord {
- struct buf *base;
+ const struct buf *buf;
 unsigned offset;
 unsigned len;
 struct cacheitem itemNUM_CACHE_FIELDS;
@@ -110,14 +113,17 @@
 const char *userid;
 unsigned statusitems;
 
- unsigned messages;
- unsigned recent;
- unsigned uidnext;
- unsigned uidvalidity;
- unsigned unseen;
+ uint32_t messages;
+ uint32_t recent;
+ uint32_t uidnext;
+ uint32_t uidvalidity;
+ uint32_t unseen;
 modseq_t highestmodseq;
+ conv_status_t xconv;
 };
 
+#define STATUSDATA_INIT { NULL, 0, 0, 0, 0, 0, 0, 0, CONV_STATUS_INIT }
+
 struct index_record {
 uint32_t uid;
 time_t internaldate;
@@ -127,12 +133,13 @@
 time_t gmtime;
 uint32_t cache_offset;
 time_t last_updated;
- bit32 system_flags;
- bit32 user_flagsMAX_USER_FLAGS/32;
+ uint32_t system_flags;
+ uint32_t user_flagsMAX_USER_FLAGS/32;
 uint32_t content_lines;
 uint32_t cache_version;
 struct message_guid guid;
 modseq_t modseq;
+ conversation_id_t cid;
 bit32 cache_crc;
 bit32 record_crc;
 
@@ -155,7 +162,7 @@
 uint32_t num_records;
 time_t last_appenddate;
 uint32_t last_uid;
- uquota_t quota_mailbox_used;
+ quota_t quota_mailbox_used;
 time_t pop3_last_login;
 uint32_t uidvalidity;
 
@@ -173,25 +180,27 @@
 
 bit32 header_file_crc;
 bit32 sync_crc;
+ bit32 sync_crc_vers;
 
 uint32_t recentuid;
 time_t recenttime;
 
 uint32_t header_crc;
+ time_t pop3_show_after;
+ quota_t quota_annot_used;
 };
 
 struct mailbox {
 int index_fd;
- int cache_fd;
 int lock_fd;
 int header_fd;
 
+ ptrarray_t caches;
 const char *index_base;
- unsigned long index_len;	/* mapped size */
- struct buf cache_buf;
- unsigned long cache_len;	/* mapped size */
+ size_t index_len;	/* mapped size */
 
 int index_locktype; /* 0 = none, 1 = shared, 2 = exclusive */
+ int is_readonly; /* true = open index and cache files readonly */
 
 ino_t header_file_ino;
 bit32 header_file_crc;
@@ -199,11 +208,10 @@
 time_t index_mtime;
 ino_t index_ino;
 size_t index_size;
- int need_cache_refresh;
 
 /* Information in mailbox list */
 char *name;
- int mbtype;
+ uint32_t mbtype;
 char *part;
 char *acl;
 
@@ -214,14 +222,21 @@
 char *quotaroot;
 char *flagnameMAX_USER_FLAGS;
 
+ struct timeval starttime;
+
+ /* annotations */
+ struct annotate_state *annot_state;
+
+ /* conversations */
+ struct conversations_state *local_cstate;
+
 /* change management */
 int modseq_dirty;
 int header_dirty;
- int cache_dirty;
 int quota_dirty;
 int has_changed;
 time_t last_updated; /* for appends*/
- quota_t quota_previously_used; /* for quota change */
+ quota_t quota_previously_usedQUOTA_NUMRESOURCES; /* for quota change */
 };
 
 /* Offsets of index/expunge header fields
@@ -237,8 +252,7 @@
 #define OFFSET_NUM_RECORDS 20
 #define OFFSET_LAST_APPENDDATE 24
 #define OFFSET_LAST_UID 28
-#define OFFSET_QUOTA_MAILBOX_USED64 32 /* offset for 64bit quotas */
-#define OFFSET_QUOTA_MAILBOX_USED 36 /* offset for 32bit quotas */
+#define OFFSET_QUOTA_MAILBOX_USED 32 /* offset for 64bit quotas */
 #define OFFSET_POP3_LAST_LOGIN 40
 #define OFFSET_UIDVALIDITY 44
 #define OFFSET_DELETED 48 /* added for ACAP */
@@ -246,10 +260,8 @@
 #define OFFSET_FLAGGED 56
 #define OFFSET_MAILBOX_OPTIONS 60
 #define OFFSET_LEAKED_CACHE 64 /* Number of leaked records in cache file */
-#define OFFSET_HIGHESTMODSEQ_64 68 /* CONDSTORE (64-bit modseq) */
-#define OFFSET_HIGHESTMODSEQ 72 /* CONDSTORE (32-bit modseq) */
-#define OFFSET_DELETEDMODSEQ_64 76 /* CONDSTORE (64-bit modseq) */
-#define OFFSET_DELETEDMODSEQ 80 /* CONDSTORE (32-bit modseq) */
+#define OFFSET_HIGHESTMODSEQ 68 /* CONDSTORE (64-bit modseq) */
+#define OFFSET_DELETEDMODSEQ 76 /* CONDSTORE (64-bit modseq) */
 #define OFFSET_EXISTS 84 /* Non-expunged records */
 #define OFFSET_FIRST_EXPUNGED 88 /* last_updated of oldest expunged message */
 #define OFFSET_LAST_REPACK_TIME 92 /* time of last expunged cleanup */
@@ -257,10 +269,17 @@
 #define OFFSET_SYNC_CRC 100 /* XOR of SYNC CRCs of unexpunged records */
 #define OFFSET_RECENTUID 104 /* last UID the owner was told about */
 #define OFFSET_RECENTTIME 108 /* last timestamp for seen data */
-#define OFFSET_SPARE0 112 /* Spares - only use these if the index */
-#define OFFSET_SPARE1 116 /* record size remains the same */
-#define OFFSET_SPARE2 120 /* (see note above about spares) */
+#define OFFSET_POP3_SHOW_AFTER 112 /* time after which to show messages
+				 * to POP3 */
+#define OFFSET_QUOTA_ANNOT_USED 116 /* bytes of per-mailbox and per-message 
+				 * annotations for this mailbox */
+			 /* Spares - only use these if the index */
+			 /* record size remains the same */
+#define OFFSET_SYNC_CRC_VERS 120 /* version of algorithm used for SYNC_CRC field */
 #define OFFSET_HEADER_CRC 124 /* includes all zero for the spares! */
+/* NEXT UPDATE - add Bug #3562 "TOTAL_MAILBOX_USED" field, 64 bit
+ * value which counts the total size of all files included expunged
+ * files. This will need a header size change, hence putting it off */
 
 /* Offsets of index_record fields in index/expunge file
 *
@@ -281,11 +300,10 @@
 #define OFFSET_CONTENT_LINES 52 /* added for nntpd */
 #define OFFSET_CACHE_VERSION 56
 #define OFFSET_MESSAGE_GUID 60
-#define OFFSET_MODSEQ_64 80 /* CONDSTORE (64-bit modseq) */
-#define OFFSET_MODSEQ 84 /* CONDSTORE (32-bit modseq) */
-#define OFFSET_CACHE_CRC 88 /* CRC32 of cache record */
-#define OFFSET_RECORD_CRC 92
-
+#define OFFSET_MODSEQ 80 /* CONDSTORE (64-bit modseq) */
+#define OFFSET_CID 88 /* conversation id, added in v13 */
+#define OFFSET_CACHE_CRC 96 /* CRC32 of cache record */
+#define OFFSET_RECORD_CRC 100
 
 #define INDEX_HEADER_SIZE (OFFSET_HEADER_CRC+4)
 #define INDEX_RECORD_SIZE (OFFSET_RECORD_CRC+4)
@@ -295,9 +313,16 @@
 #define FLAG_DELETED (1<<2)
 #define FLAG_DRAFT (1<<3)
 #define FLAG_SEEN (1<<4)
+#define FLAG_ARCHIVED (1<<29)
 #define FLAG_UNLINKED (1<<30)
 #define FLAG_EXPUNGED (1U<<31)
 
+#define FLAGS_SYSTEM (FLAG_ANSWERED|FLAG_FLAGGED|FLAG_DELETED|FLAG_DRAFT|FLAG_SEEN)
+#define FLAGS_INTERNAL (FLAG_ARCHIVED|FLAG_UNLINKED|FLAG_EXPUNGED)
+/* for replication */
+#define FLAGS_LOCAL (FLAG_ARCHIVED|FLAG_UNLINKED)
+#define FLAGS_GLOBAL (FLAGS_SYSTEM|FLAG_EXPUNGED)
+
 #define OPT_POP3_NEW_UIDL (1<<0)	/* added for Outlook stupidity */
 /* NOTE: not used anymore - but don't reuse it */
 #define OPT_IMAP_CONDSTORE (1<<1)	/* added for CONDSTORE extension */
@@ -342,11 +367,7 @@
 typedef union {
 unsigned char bufINDEX_HEADER_SIZE > INDEX_RECORD_SIZE ?
 		 INDEX_HEADER_SIZE : INDEX_RECORD_SIZE;
-#ifdef HAVE_LONG_LONG_INT
 bit64 align8; /* align on 8-byte boundary */
-#else
- bit32 align4; /* align on 4-byte boundary */
-#endif
 } indexbuffer_t;
 
 /* Access assistance macros for memory-mapped cache file data */
@@ -404,39 +425,34 @@
 
 /* file names on disk */
 #define META_FNAME_NEW 1
-extern char *mailbox_meta_fname(struct mailbox *mailbox, int metafile);
-extern char *mailbox_meta_newfname(struct mailbox *mailbox, int metafile);
+extern const char *mailbox_meta_fname(struct mailbox *mailbox, int metafile);
+extern const char *mailbox_meta_newfname(struct mailbox *mailbox, int metafile);
 extern int mailbox_meta_rename(struct mailbox *mailbox, int metafile);
 
-extern char *mailbox_message_fname(struct mailbox *mailbox, 
-				 unsigned long uid);
-extern char *mailbox_datapath(struct mailbox *mailbox);
+extern const char *mailbox_record_fname(struct mailbox *mailbox,
+					struct index_record *record);
+extern const char *mailbox_datapath(struct mailbox *mailbox);
 
-/* map individual messages in */
-extern int mailbox_map_message(struct mailbox *mailbox, unsigned long uid,
-				 const char **basep, unsigned long *lenp);
-extern void mailbox_unmap_message(struct mailbox *mailbox,
-				 unsigned long uid,
-				 const char **basep, unsigned long *lenp);
+extern int mailbox_map_record(struct mailbox *mailbox,
+			 struct index_record *record,
+			 struct buf *data);
 
 /* cache record API */
-int mailbox_open_cache(struct mailbox *mailbox);
-int cache_parserecord(struct buf *cachebase,
-		 unsigned cache_offset, struct cacherecord *crec);
 int mailbox_cacherecord(struct mailbox *mailbox,
 			struct index_record *record);
-int cache_append_record(int fd, struct index_record *record);
-int mailbox_append_cache(struct mailbox *mailbox,
-			 struct index_record *record);
+char *mailbox_cache_get_msgid(struct mailbox *mailbox,
+			 struct index_record *record);
 const char *cacheitem_base(struct index_record *record, int field);
 unsigned cacheitem_size(struct index_record *record, int field);
 struct buf *cacheitem_buf(struct index_record *record, int field);
 const char *cache_base(struct index_record *record);
-unsigned cache_size(struct index_record *record);
+size_t cache_len(struct index_record *record);
 struct buf *cache_buf(struct index_record *record);
+
 /* opening and closing */
 extern int mailbox_open_iwl(const char *name,
 			 struct mailbox **mailboxptr);
+extern int mailbox_open_irlnb(const char *name, struct mailbox **);
 extern int mailbox_open_irl(const char *name,
 			 struct mailbox **mailboxptr);
 extern int mailbox_open_exclusive(const char *name,
@@ -458,18 +474,26 @@
 extern int mailbox_append_index_record(struct mailbox *mailbox,
 				 struct index_record *record);
 extern int mailbox_find_index_record(struct mailbox *mailbox, uint32_t uid,
-				 struct index_record *record);
+				 struct index_record *record,
+				 const struct index_record *oldrecord);
+extern uint32_t mailbox_finduid(struct mailbox *mailbox, uint32_t uid);
 
 extern int mailbox_set_acl(struct mailbox *mailbox, const char *acl,
 			 int dirty_modseq);
 extern int mailbox_set_quotaroot(struct mailbox *mailbox, const char *quotaroot);
 extern int mailbox_user_flag(struct mailbox *mailbox, const char *flag,
-			 int *flagnum);
+			 int *flagnum, int create);
+extern int mailbox_remove_user_flag(struct mailbox *mailbox, int flagnum);
+extern int mailbox_record_hasflag(struct mailbox *mailbox,
+				 struct index_record *record,
+				 const char *flag);
 extern int mailbox_commit(struct mailbox *mailbox);
 
 /* seen state check */
 extern int mailbox_internal_seen(struct mailbox *mailbox, const char *userid);
 
+extern unsigned mailbox_count_unseen(struct mailbox *mailbox);
+
 /* index locking operations */
 extern int mailbox_lock_index(struct mailbox *mailbox, int locktype);
 
@@ -477,21 +501,27 @@
 				 unsigned *ndeleted);
 extern int mailbox_expunge(struct mailbox *mailbox,
 			 mailbox_decideproc_t *decideproc, void *deciderock,
-			 unsigned *nexpunged);
+			 unsigned *nexpunged, int event_type);
+extern void mailbox_archive(struct mailbox *mailbox,
+			 mailbox_decideproc_t *decideproc, void *deciderock);
 extern int mailbox_cleanup(struct mailbox *mailbox, int iscurrentdir,
 			 mailbox_decideproc_t *decideproc, void *deciderock);
 extern void mailbox_unlock_index(struct mailbox *mailbox, struct statusdata *sd);
+/* unlock and immediately lock again with the same type */
+extern int mailbox_yield_index(struct mailbox *mailbox);
 
-extern int mailbox_create(const char *name, const char *part, const char *acl,
+extern int mailbox_create(const char *name, uint32_t mbtype, const char *part, const char *acl,
 			 const char *uniqueid, int options, unsigned uidvalidity,
+			 modseq_t highestmodseq,
 			 struct mailbox **mailboxptr);
 
 extern int mailbox_copy_files(struct mailbox *mailbox, const char *newpart,
 			 const char *newname);
 extern int mailbox_delete_cleanup(const char *part, const char *name);
 
-extern int mailbox_rename_copy(struct mailbox *oldmailbox, 
+extern int mailbox_rename_copy(struct mailbox *oldmailbox,
 			 const char *newname, const char *newpart,
+			 unsigned uidvalidity,
 			 const char *userid, int ignorequota,
 			 struct mailbox **newmailboxptr);
 extern int mailbox_rename_cleanup(struct mailbox **mailboxptr, int isinbox);
@@ -500,11 +530,9 @@
 extern int mailbox_copyfile(const char *from, const char *to, int nolink);
 
 extern int mailbox_reconstruct(const char *name, int flags);
-
-extern int mailbox_index_recalc(struct mailbox *mailbox);
+extern void mailbox_make_uniqueid(struct mailbox *mailbox);
 
 /* for upgrade index */
-extern int mailbox_open_index(struct mailbox *mailbox);
 extern int mailbox_buf_to_index_record(const char *buf,
 				 struct index_record *record);
 extern int mailbox_buf_to_index_header(const char *buf,
@@ -515,14 +543,50 @@
 struct mailbox *mailbox;
 struct index_header i;
 int newindex_fd;
- int newcache_fd;
+ ptrarray_t caches;
 };
 
+#define MAILBOX_CRC_VERSION_MIN		1
+#define MAILBOX_CRC_VERSION_MAX		2
+
 extern int mailbox_repack_setup(struct mailbox *mailbox,
 			 struct mailbox_repack **repackptr);
 extern int mailbox_repack_add(struct mailbox_repack *repack,
 			 struct index_record *record);
 extern void mailbox_repack_abort(struct mailbox_repack **repackptr);
 extern int mailbox_repack_commit(struct mailbox_repack **repackptr);
+extern int mailbox_index_recalc(struct mailbox *mailbox);
+
+#define mailbox_quota_check(mailbox, delta) \
+	(mailbox->quotaroot ? quota_check_useds((mailbox)->quotaroot, delta) : 0)
+void mailbox_get_usage(struct mailbox *mailbox,
+			quota_t usageQUOTA_NUMRESOURCES);
+void mailbox_annot_changed(struct mailbox *mailbox,
+			 unsigned int uid,
+			 const char *entry,
+			 const char *userid,
+			 const struct buf *oldval,
+			 const struct buf *newval);
+
+extern int mailbox_get_annotate_state(struct mailbox *mailbox,
+				 unsigned int uid,
+				 struct annotate_state **statep);
+
+uint32_t mailbox_sync_crc(struct mailbox *mailbox, unsigned vers, int recalc);
+unsigned mailbox_best_crcvers(unsigned minvers, unsigned maxvers);
+
+/* Rename a CID. Note - this is just one mailbox! */
+extern int mailbox_cid_rename(struct mailbox *mailbox,
+			 conversation_id_t from_cid,
+			 conversation_id_t to_cid);
+extern int mailbox_update_conversations(struct mailbox *mailbox,
+					struct index_record *old,
+					struct index_record *new);
+extern int mailbox_add_conversations(struct mailbox *mailbox);
+extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
+extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force);
+extern int mailbox_has_conversations(struct mailbox *mailbox);
+
+extern int mailbox_add_dav(struct mailbox *mailbox);
 
 #endif /* INCLUDED_MAILBOX_H */

cyrus-imapd-2.4.17.tar.gz/imap/mbdump.c -> cyrus-imapd-2.5.tar.gz/imap/mbdump.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mbdump.c,v 1.46 2010/01/06 17:01:36 murch Exp $
 */
 
 #include <config.h>
@@ -55,20 +53,17 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <dirent.h>
-#include <unistd.h>
 #include <utime.h>
 
-#include "assert.h"
 #include "annotate.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
-#include "imparse.h"
+#include "imap/imap_err.h"
 #include "map.h"
+#include "mappedfile.h"
 #include "mbdump.h"
 #include "mboxkey.h"
 #include "mboxlist.h"
@@ -78,8 +73,6 @@
 #include "sequence.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
-#include "upgrade_index.h"
 #include "user.h"
 #include "util.h"
 #include "index.h"
@@ -89,6 +82,12 @@
 		 const char *filename, const char *ftag,
 		 const char *fbase, unsigned long flen);
 
+static void downgrade_header(struct index_header *i, char *buf, int version,
+			 int header_size, int record_size)
+			 __attribute__((noinline));
+static void header_set_num_records(char *buf, unsigned int nrecords)
+			 __attribute__((noinline));
+
 /* support for downgrading index files on copying back to an
 * earlier version of Cyrus */
 static void downgrade_header(struct index_header *i, char *buf, int version,
@@ -119,13 +118,7 @@
 *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(i->last_uid);
 
 /* quotas may be 64bit now */
-#ifdef HAVE_LONG_LONG_INT
- *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(i->quota_mailbox_used);
-#else
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(i->quota_mailbox_used);
-#endif
+ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonll(i->quota_mailbox_used);
 
 *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(i->pop3_last_login);
 *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(i->uidvalidity);
@@ -136,13 +129,7 @@
 *((bit32 *)(buf+OFFSET_LEAKED_CACHE)) = htonl(i->leaked_cache_records);
 /* don't put values in the "SPARE" spots */
 if (version < 8) return;
-#ifdef HAVE_LONG_LONG_INT
- align_htonll(buf+OFFSET_HIGHESTMODSEQ_64, i->highestmodseq);
-#else
- /* zero the unused 32bits */
- *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ_64)) = htonl(0);
- *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ)) = htonl(i->highestmodseq);
-#endif
+ align_htonll(buf+OFFSET_HIGHESTMODSEQ, i->highestmodseq);
 }
 
 static void downgrade_record(struct index_record *record, char *buf,
@@ -151,7 +138,7 @@
 int n;
 unsigned UP_content_offset = record->header_size;
 unsigned UP_validflags = 15;
- unsigned UP_modseqbase = OFFSET_MODSEQ_64;
+ unsigned UP_modseqbase = OFFSET_MODSEQ;
 
 /* GUID was UUID and only 12 bytes long in versions 8 and 9.
 * it doesn't hurt to write it to the buffer in older versions,
@@ -178,13 +165,12 @@
 *((bit32 *)(buf+OFFSET_CACHE_VERSION)) = htonl(record->cache_version);
 message_guid_export(&record->guid,
 			(unsigned char *)buf+OFFSET_MESSAGE_GUID);
-#ifdef HAVE_LONG_LONG_INT
 *((bit64 *)(buf+UP_modseqbase)) = htonll(record->modseq);
-#else
- /* zero the unused 32bits */
- *((bit32 *)(buf+UP_modseqbase)) = htonl(0);
- *((bit32 *)(buf+UP_modseqbase)) = htonl(record->modseq);
-#endif
+}
+
+static void header_set_num_records(char *buf, unsigned int nrecords)
+{
+ *((bit32 *)(buf+OFFSET_NUM_RECORDS)) = htonl(nrecords);
 }
 
 /* create a downgraded index file in cyrus.index. We don't copy back
@@ -276,7 +262,7 @@
 	oldindex_fd = open(oldname, O_RDWR|O_TRUNC|O_CREAT, 0666);
 	if (oldindex_fd == -1) goto fail;
 
-	*((bit32 *)(hbuf+OFFSET_NUM_RECORDS)) = htonl(nexpunge);
+	header_set_num_records(hbuf, nexpunge);
 
 	/* Write header - everything we'll say */
 	n = retry_write(oldindex_fd, hbuf, header_size);
@@ -352,28 +338,31 @@
 };
 
 static int dump_annotations(const char *mailbox __attribute__((unused)),
+			 uint32_t uid __attribute__((unused)),
 			 const char *entry,
 			 const char *userid,
-			 struct annotation_data *attrib, void *rock) 
+			 const struct buf *value, void *rock)
 {
 struct dump_annotation_rock *ctx = (struct dump_annotation_rock *)rock;
 
 /* "A-" userid entry */
 /* entry is delimited by its leading / */
- unsigned long ename_size = 2 + strlen(userid) + strlen(entry);
+ char *ename;
+ static const char contenttype = "text/plain"; /* fake */
 
 /* Transfer all attributes for this annotation, don't transfer size
 * separately since that can be implicitly determined */
- prot_printf(ctx->pout,
-		" {%ld%s}\r\nA-%s%s (%ld {" SIZE_T_FMT "%s}\r\n%s"
-		" {" SIZE_T_FMT "%s}\r\n%s)",
-		ename_size, (!ctx->tag ? "+" : ""),
-		userid, entry,
-		attrib->modifiedsince,
-		attrib->size, (!ctx->tag ? "+" : ""),
-		attrib->value,
-		strlen(attrib->contenttype), (!ctx->tag ? "+" : ""),
-		attrib->contenttype);
+
+ prot_putc(' ', ctx->pout);
+ ename = strconcat("A-", userid, entry, (char *)NULL);
+ prot_printliteral(ctx->pout, ename, strlen(ename));
+ free(ename);
+
+ prot_printf(ctx->pout, " (%ld ", 0L); /* was modifiedsince */
+ prot_printliteral(ctx->pout, value->s, value->len);
+ prot_putc(' ', ctx->pout);
+ prot_printliteral(ctx->pout, contenttype, strlen(contenttype));
+ prot_putc(')', ctx->pout);
 
 return 0;
 }
@@ -385,7 +374,7 @@
 {
 int filefd;
 const char *base;
- unsigned long len;
+ size_t len;
 struct stat sbuf;
 char c;
 
@@ -444,11 +433,11 @@
 	}
 
 	prot_printf(pout, "%s {%lu%s}\r\n",
-		 ftag, len, (sync ? "+" : ""));
+		 ftag, (long unsigned)len, (sync ? "+" : ""));
 } else {
 	prot_printf(pout, " {" SIZE_T_FMT "%s}\r\n%s {%lu%s}\r\n",
 		 strlen(ftag), (sync ? "+" : ""),
-		 ftag, len, (sync ? "+" : ""));
+		 ftag, (long unsigned)len, (sync ? "+" : ""));
 }
 prot_write(pout, base, len);
 if (!fbase) map_free(&base, &len);
@@ -475,7 +464,7 @@
 enum { SEEN_DB = 0, SUBS_DB = 1, MBOXKEY_DB = 2 };
 static int NUM_USER_DATA_FILES = 3;
 
-int dump_mailbox(const char *tag, struct mailbox *mailbox, uint32_t uid_start,
+EXPORTED int dump_mailbox(const char *tag, struct mailbox *mailbox, uint32_t uid_start,
 		 int oldversion,
 		 struct protstream *pin, struct protstream *pout,
 		 struct auth_state *auth_state __attribute((unused)))
@@ -487,10 +476,14 @@
 const char *fname;
 int first = 1;
 int i;
+ struct quota q;
 struct data_file *df;
 struct seqset *expunged_seq = NULL;
+ const char *dirpath = mailbox_datapath(mailbox);
+
+ /* XXX - archivepath */
 
- mbdir = opendir(mailbox_datapath(mailbox));
+ mbdir = opendir(dirpath);
 if (!mbdir && errno == EACCES) {
 	syslog(LOG_ERR,
 	 "could not dump mailbox %s (permission denied)", mailbox->name);
@@ -510,16 +503,16 @@
 /* The first member is either a number (if it is a quota root), or NIL
 * (if it isn't) */
 {
-	struct quota q;
-
-	q.root = mailbox->name;
+	quota_init(&q, mailbox->name);
 	r = quota_read(&q, NULL, 0);
 
 	if (!r) {
-	 prot_printf(pout, "%d", q.limit);
+	 prot_printf(pout, "%d", q.limitsQUOTA_STORAGE);
 	} else {
 	 prot_printf(pout, "NIL");
 	 if (r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
+	 /* do not send other quota data later */
+	 quota_free(&q);
 	}
 }
 
@@ -537,9 +530,13 @@
 	 break;
 
 	case META_CACHE:
-	 if (mailbox->cache_buf.s) {
-		fbase = mailbox->cache_buf.s;
-		flen = mailbox->cache_buf.len;
+	 {
+		/* XXX - multi-cache-file support */
+		struct mappedfile *cachefile = ptrarray_nth(&mailbox->caches, 0);
+		if (cachefile) {
+		 fbase = mappedfile_base(cachefile);
+		 flen = mappedfile_size(cachefile);
+		}
 	 }
 	 break;
 
@@ -569,6 +566,7 @@
 while ((next = readdir(mbdir)) != NULL) {
 	char *name = next->d_name; /* Alias */
 	char *p = name;
+	char *fullpath;
 	uint32_t uid;
 
 	/* special case for '.' (well, it gets '..' too) */
@@ -588,9 +586,10 @@
 	 continue;
 
 	/* construct path/filename */
-	fname = mailbox_message_fname(mailbox, uid);
+	fullpath = strconcat(dirpath, "/", name, (char *)NULL);
+	r = dump_file(0, !tag, pin, pout, fullpath, name, NULL, 0);
+	free(fullpath);
 
-	r = dump_file(0, !tag, pin, pout, fname, name, NULL, 0);
 	if (r) goto done;
 }
 
@@ -602,8 +601,8 @@
 	struct dump_annotation_rock actx;
 	actx.tag = tag;
 	actx.pout = pout;
-	annotatemore_findall(mailbox->name, "*", dump_annotations,
-			 (void *) &actx, NULL);
+	annotatemore_findall(mailbox->name, 0, "*", dump_annotations,
+			 (void *) &actx);
 }
 
 /* Dump user files if this is an inbox */
@@ -687,6 +686,42 @@
 	 
 } /* end if user INBOX */
 
+ /* Dump quota data */
+ if (q.root) {
+	const char *ename = "X-QUOTA";
+	int res;
+
+	/* ensure there is data to transmit */
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 /* STORAGE quota was already sent */
+	 if ((res != QUOTA_STORAGE) && (q.limitsres >= 0)) {
+		break;
+	 }
+	}
+
+	if (res < QUOTA_NUMRESOURCES) {
+	 int sent = 0;
+
+	 prot_putc(' ', pout);
+	 prot_printliteral(pout, ename, strlen(ename));
+	 prot_printf(pout, " (");
+
+	 for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+		if (q.limitsres < 0) {
+		 continue;
+		}
+		if (sent++) {
+		 prot_putc(' ', pout);
+		}
+		prot_printliteral(pout, quota_namesres, strlen(quota_namesres));
+		prot_putc(' ', pout);
+		prot_printf(pout, "%d", q.limitsres);
+	 }
+	 prot_putc(')', pout);
+	}
+	quota_free(&q);
+ }
+
 done:
 
 prot_printf(pout,")\r\n");
@@ -770,7 +805,7 @@
 return 0;
 }
 
-int undump_mailbox(const char *mbname, 
+EXPORTED int undump_mailbox(const char *mbname,
 		 struct protstream *pin, struct protstream *pout,
 		 struct auth_state *auth_state __attribute((unused)))
 {
@@ -783,12 +818,14 @@
 int sieve_usehomedir = config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR);
 const char *userid = NULL;
 char *annotation = NULL;
- char *contenttype = NULL;
- char *content = NULL;
+ struct buf content = BUF_INITIALIZER;
 char *seen_file = NULL;
 char *mboxkey_file = NULL;
- uquota_t old_quota_used = 0;
+ quota_t old_quota_usageQUOTA_NUMRESOURCES;
+ int res;
+ int newquotasQUOTA_NUMRESOURCES;
 int quotalimit = -1;
+ annotate_state_t *astate = NULL;
 
 memset(&file, 0, sizeof(file));
 memset(&data, 0, sizeof(data));
@@ -815,8 +852,12 @@
 	/* Remove any existing quotaroot */
 	mboxlist_unsetquota(mbname);
 } else if (sscanf(data.s, "%d", &quotalimit) == 1) {
-	/* Set a Quota (may be -1 for "unlimited") */ 
-	mboxlist_setquota(mbname, quotalimit, 0);
+	/* Set a Quota (may be -1 for "unlimited") */
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 newquotasres = QUOTA_UNLIMITED;
+	}
+	newquotasQUOTA_STORAGE = quotalimit;
+	/* quota will actually be applied later */
 } else {
 	/* Huh? */
 	buf_free(&data);
@@ -834,15 +875,21 @@
 
 r = mailbox_open_exclusive(mbname, &mailbox);
 if (r == IMAP_MAILBOX_NONEXISTENT) {
-	struct mboxlist_entry mbentry;
+	mbentry_t *mbentry = NULL;
 	r = mboxlist_lookup(mbname, &mbentry, NULL);
-	if (!r) r = mailbox_create(mbname, mbentry.partition, mbentry.acl,
-				 NULL, 0, 0, &mailbox);
+	if (!r) r = mailbox_create(mbname, mbentry->mbtype,
+				 mbentry->partition, mbentry->acl,
+				 NULL, 0, 0, 0, &mailbox);
+	mboxlist_entry_free(&mbentry);
 }
 if(r) goto done;
 
 /* track quota use */
- old_quota_used = mailbox->i.quota_mailbox_used;
+ mailbox_get_usage(mailbox, old_quota_usage);
+
+ astate = annotate_state_new();
+ r = annotate_state_set_mailbox(astate, mailbox);
+ if (r) goto done;
 
 while(1) {
 	char fnamebufMAX_MAILBOX_PATH + 1024;
@@ -851,8 +898,7 @@
 	unsigned long cutoff = ULONG_MAX / 10;
 	unsigned digit, cutlim = ULONG_MAX % 10;
 	annotation = NULL;
-	contenttype = NULL;
-	content = NULL;
+	buf_reset(&content);
 	seen_file = NULL;
 	mboxkey_file = NULL;
 	
@@ -864,11 +910,8 @@
 
 	if(!strncmp(file.s, "A-", 2)) {
 	 /* Annotation */
-	 size_t contentsize;
-	 uint32_t modtime = 0;
 	 int i;
 	 char *tmpuserid;
-	 const char *ptr;
 
 	 for(i=2; file.si; i++) {
 		if(file.si == '/') break;
@@ -890,7 +933,7 @@
 		goto done;
 	 }	 
 
-	 /* Parse the modtime */
+	 /* Parse the modtime...and ignore it */
 	 c = getword(pin, &data);
 	 if (c != ' ') {
 		r = IMAP_PROTOCOL_ERROR;
@@ -898,17 +941,8 @@
 		goto done;
 	 }
 
-	 r = parseuint32(data.s, &ptr, &modtime);
-	 if (r || *ptr) {
-		r = IMAP_PROTOCOL_ERROR;
-		free(tmpuserid);
-		goto done;
-	 }
-
-	 c = getbastring(pin, pout, &data);
+	 c = getbastring(pin, pout, &content);
 	 /* xxx binary */
-	 content = xstrdup(data.s);
-	 contentsize = data.len;
 
 	 if(c != ' ') {
 		r = IMAP_PROTOCOL_ERROR;
@@ -916,8 +950,8 @@
 		goto done;
 	 }
 
+	 /* got the contenttype...and ignore it */
 	 c = getastring(pin, pout, &data);
-	 contenttype = xstrdup(data.s);
 	 
 	 if(c != ')') {
 		r = IMAP_PROTOCOL_ERROR;
@@ -925,16 +959,13 @@
 		goto done;
 	 }
 
-	 annotatemore_write_entry(mbname, annotation, tmpuserid, content,
-				 contenttype, contentsize, modtime, NULL);
+	 annotate_state_write(astate, annotation, tmpuserid,
+				 &content);
 
 	 free(tmpuserid);
 	 free(annotation);
-	 free(content);
-	 free(contenttype);
 	 annotation = NULL;
-	 content = NULL;
-	 contenttype = NULL;
+	 buf_reset(&content);
 
 	 c = prot_getc(pin);
 	 if(c == ')') break; /* that was the last item */
@@ -945,6 +976,50 @@
 
 	 continue;
 	}
+	else if (!strcmp(file.s, "X-QUOTA")) {
+	 /* Quota */
+	 if (prot_getc(pin) != '(') {
+		r = IMAP_PROTOCOL_ERROR;
+		goto done;
+	 }
+
+	 for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+		newquotasres = QUOTA_UNLIMITED;
+	 }
+
+	 for (;;) {
+		/* XXX - limit is actually stored in an int value */
+		int32_t limit = 0;
+
+		c = getastring(pin, pout, &content);
+		if (c != ' ') {
+		 r = IMAP_PROTOCOL_ERROR;
+		 goto done;
+		}
+		/* ignore unknown resources */
+		res = quota_name_to_resource(content.s);
+
+		c = getint32(pin, &limit);
+		if (res >= 0) {
+		 newquotasres = limit;
+		}
+
+		if (c == ')') break;
+		else if (c != ' ') {
+		 r = IMAP_PROTOCOL_ERROR;
+		 goto done;
+		}
+	 }
+
+	 c = prot_getc(pin);
+	 if (c == ')') break; /* that was the last item */
+	 else if (c != ' ') {
+		r = IMAP_PROTOCOL_ERROR;
+		goto done;
+	 }
+
+	 continue;
+	}
 
 	/* read size of literal */
 	c = prot_getc(pin);
@@ -1033,7 +1108,7 @@
 			/* Non-fatal,
 			 let's get the file transferred if we can */
 		 }
-		 
+
 		}
 	 }
 	} else {
@@ -1050,7 +1125,7 @@
 		if (!parseuint32(file.s, &ptr, &uid)) {
 		 /* is it really a data file? */
 		 if (ptr && ptr0 == '.' && ptr1 == '\0')
-			path = mailbox_message_fname(mailbox, uid);
+			path = mboxname_datapath(mailbox->part, mailbox->name, uid);
 		}
 	 }
 	 if (!path) {
@@ -1138,11 +1213,26 @@
 buf_free(&file);
 buf_free(&data);
 
+ if (r)
+	annotate_state_abort(&mailbox->annot_state);
+
 if (curfile >= 0) close(curfile);
 /* we fiddled the files under the hood, so we can't do anything
 * BUT close it */
 mailbox_close(&mailbox);
 
+ /* time to apply quota (mailbox must be unlocked) */
+ if (!r) {
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 if (newquotasres != QUOTA_UNLIMITED) {
+		break;
+	 }
+	}
+	if (res < QUOTA_NUMRESOURCES) {
+	 mboxlist_setquotas(mbname, newquotas, 0);
+	}
+ }
+
 /* let's make sure the modification times are right */
 if (!r) {
 	struct index_record record;
@@ -1158,24 +1248,21 @@
 	}
 
 	/* update the quota if necessary */
-	if (mailbox->quotaroot &&
-	 old_quota_used != mailbox->i.quota_mailbox_used) {
-	 struct txn *tid = NULL;
-	 struct quota q;
-
-	 q.root = mailbox->quotaroot;
-	 r = quota_read(&q, &tid, 1);
-	 if (!r) {
-		q.used += mailbox->i.quota_mailbox_used - old_quota_used;
-		r = quota_write(&q, &tid);
+	if (mailbox->quotaroot) {
+	 quota_t quota_usageQUOTA_NUMRESOURCES;
+	 int res;
+	 int changed = 0;
+
+	 mailbox_get_usage(mailbox, quota_usage);
+	 for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+		quota_usageres -= old_quota_usageres;
+		if (quota_usageres != 0) {
+		 changed++;
+		}
 	 }
-	 if (!r) quota_commit(&tid);
-	 else {
-		quota_abort(&tid);
-		syslog(LOG_ERR, "LOSTQUOTA: unable to record add of " 
-		 UQUOTA_T_FMT " bytes in quota %s",
-		 mailbox->i.quota_mailbox_used - old_quota_used,
-		 mailbox->quotaroot);
+
+	 if (changed) {
+		r = quota_update_useds(mailbox->quotaroot, quota_usage, 0);
 	 }
 	}
 
@@ -1184,7 +1271,7 @@
 	 if (r) continue;
 	 if (record.system_flags & FLAG_UNLINKED)
 		continue; /* no file! */
-	 fname = mailbox_message_fname(mailbox, record.uid);
+	 fname = mailbox_record_fname(mailbox, &record);
 	 settime.actime = settime.modtime = record.internaldate;
 	 if (utime(fname, &settime) == -1) {
 		r = IMAP_IOERROR;
@@ -1197,10 +1284,12 @@
 done2:
 /* just in case we failed during the modifications, close again */
 mailbox_close(&mailbox);
- 
+ if (!r)
+	r = annotate_state_commit(&astate);
+ else
+	annotate_state_abort(&astate);
 free(annotation);
- free(content);
- free(contenttype);
+ buf_free(&content);
 free(seen_file);
 free(mboxkey_file);

cyrus-imapd-2.4.17.tar.gz/imap/mbdump.h -> cyrus-imapd-2.5.tar.gz/imap/mbdump.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/mbexamine.c -> cyrus-imapd-2.5.tar.gz/imap/mbexamine.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mbexamine.c,v 1.25 2010/01/06 17:01:36 murch Exp $
 */
 
 #include <config.h>
@@ -49,15 +47,12 @@
 #endif
 #include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <fcntl.h>
-#include <ctype.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -76,26 +71,20 @@
 # endif
 #endif
 
-#include "acl.h"
 #include "assert.h"
-#include "bsearch.h"
-#include "convert_code.h"
 #include "exitcodes.h"
 #include "index.h"
 #include "global.h"
-#include "imap_err.h"
-#include "imparse.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "message.h"
 #include "message_guid.h"
 #include "mboxname.h"
 #include "mboxlist.h"
 #include "seen.h"
-#include "retry.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 extern int optind;
 extern char *optarg;
@@ -103,19 +92,14 @@
 /* current namespace */
 static struct namespace recon_namespace;
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 /* forward declarations */
-int do_examine(char *name, int matchlen, int maycreate, void *rock);
-int do_quota(char *name, int matchlen, int maycreate, void *rock);
-void usage(void);
+static int do_examine(char *name, int matchlen, int maycreate, void *rock);
+static int do_quota(char *name, int matchlen, int maycreate, void *rock);
+static void usage(void);
 void shut_down(int code);
 
-int code = 0;
-
-unsigned wantuid = 0;
-unsigned wantvalue = 0;
+static unsigned wantuid = 0;
+static unsigned wantvalue = 0;
 
 int main(int argc, char **argv)
 {
@@ -124,7 +108,7 @@
 char *alt_config = NULL;
 int quotachk = 0;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -158,7 +142,7 @@
 	}
 }
 
- cyrus_init(alt_config, "mbexamine", 0);
+ cyrus_init(alt_config, "mbexamine", 0, 0);
 
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(&recon_namespace, 1)) != 0) {
@@ -191,10 +175,10 @@
 mboxlist_close();
 mboxlist_done();
 
- exit(code);
+ exit(0);
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "usage: mbexamine -C <alt_config> -s seqnum mailbox...\n"
@@ -203,18 +187,18 @@
 exit(EC_USAGE);
 }
 
-void print_rec(char *name, struct buf *citem)
+static void print_rec(const char *name, const struct buf *citem)
 {
- printf(" %s>{%d}%.*s\n", name, citem->len, citem->len, citem->s); 
+ printf(" %s>{" SIZE_T_FMT "}%.*s\n", name, citem->len, (int)citem->len, citem->s); 
 }
 
 /*
 * mboxlist_findall() callback function to examine a mailbox
 */
-int do_examine(char *name,
-	 int matchlen __attribute__((unused)),
-	 int maycreate __attribute__((unused)),
-	 void *rock __attribute__((unused)))
+static int do_examine(char *name,
+		 int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
 {
 unsigned i, msgno, recno;
 int r = 0;
@@ -260,8 +244,8 @@
 printf(" Minor Version: %d\n", mailbox->i.minor_version);
 printf(" Header Size: %u bytes Record Size: %u bytes\n",
 	 mailbox->i.start_offset, mailbox->i.record_size);
- printf(" Number of Messages: %u Mailbox Size: " UQUOTA_T_FMT " bytes\n",
-	 mailbox->i.exists, mailbox->i.quota_mailbox_used);
+ printf(" Number of Messages: %u Mailbox Size: " QUOTA_T_FMT " bytes Annotations Size: " QUOTA_T_FMT " bytes\n",
+	 mailbox->i.exists, mailbox->i.quota_mailbox_used, mailbox->i.quota_annot_used);
 printf(" Last Append Date: (%lu) %s",
 	 mailbox->i.last_appenddate, ctime(&mailbox->i.last_appenddate));
 printf(" UIDValidity: %u Last UID: %u\n",
@@ -327,6 +311,10 @@
 	 printf(" MODSEQ:" MODSEQ_FMT, record.modseq);
 	}
 
+	if (mailbox->i.minor_version >= 13) {
+	 printf(" CID: %llu", record.cid);
+	}
+
 	printf("\n");
 
 	printf(" > USERFLAGS:");
@@ -363,20 +351,20 @@
 /*
 * mboxlist_findall() callback function to examine a mailbox quota usage
 */
-int do_quota(char *name,
-	 int matchlen __attribute__((unused)),
-	 int maycreate __attribute__((unused)),
-	 void *rock __attribute__((unused)))
+static int do_quota(char *name,
+		 int matchlen __attribute__((unused)),
+		 int maycreate __attribute__((unused)),
+		 void *rock __attribute__((unused)))
 {
 uint32_t recno;
 int r = 0;
 char ext_name_bufMAX_MAILBOX_PATH+1;
 struct mailbox *mailbox = NULL;
 struct index_record record;
- uquota_t total = 0;
- char *fname;
+ quota_t total = 0;
+ const char *fname;
 struct stat sbuf;
- 
+
 signals_poll();
 
 /* Convert internal name to external */
@@ -400,7 +388,7 @@
 	if (record.system_flags & FLAG_EXPUNGED)
 	 continue;
 
-	fname = mailbox_message_fname(mailbox, record.uid);
+	fname = mailbox_record_fname(mailbox, &record);
 
 	if (stat(fname, &sbuf) != 0) {
 	 syslog(LOG_WARNING,

cyrus-imapd-2.5.tar.gz/imap/mboxevent.c Added

@@ -0,0 +1,1369 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Sébastien Michel from Atos Worldline
+ */
+#include <config.h>
+#ifdef ENABLE_MBOXEVENT
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <jansson.h>
+
+#include "annotate.h"
+#include "assert.h"
+#include "caldav_db.h"
+#include "carddav_db.h"
+#include "exitcodes.h"
+#include "imapurl.h"
+#include "libconfig.h"
+#include "map.h"
+#include "times.h"
+#include "xmalloc.h"
+
+#include "map.h"
+#include "mboxevent.h"
+#include "mboxname.h"
+#include "notify.h"
+#include "global.h"
+
+#define MESSAGE_EVENTS (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_EXPIRE|\
+			EVENT_MESSAGE_EXPUNGE|EVENT_MESSAGE_NEW|\
+			EVENT_MESSAGE_COPY|EVENT_MESSAGE_MOVE)
+
+#define FLAGS_EVENTS (EVENT_FLAGS_SET|EVENT_FLAGS_CLEAR|EVENT_MESSAGE_READ|\
+			EVENT_MESSAGE_TRASH)
+
+#define MAILBOX_EVENTS (EVENT_MAILBOX_CREATE|EVENT_MAILBOX_DELETE|\
+			EVENT_MAILBOX_RENAME|EVENT_MAILBOX_SUBSCRIBE|\
+			EVENT_MAILBOX_UNSUBSCRIBE)
+
+#define QUOTA_EVENTS (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN|EVENT_QUOTA_CHANGE)
+
+
+#define FILL_STRING_PARAM(e,p,v) e->paramsp.value = (uint64_t)v; \
+				 e->paramsp.type = EVENT_PARAM_STRING; \
+				 e->paramsp.filled = 1
+#define FILL_ARRAY_PARAM(e,p,v) e->paramsp.value = (uint64_t)v; \
+				 e->paramsp.type = EVENT_PARAM_ARRAY; \
+				 e->paramsp.filled = 1
+#define FILL_UNSIGNED_PARAM(e,p,v) e->paramsp.value = (uint64_t)v; \
+				 e->paramsp.type = EVENT_PARAM_INT; \
+				 e->paramsp.filled = 1
+
+static const char *notifier = NULL;
+static struct namespace namespace;
+
+static const char *client_id = NULL;
+
+static strarray_t *excluded_flags;
+static strarray_t *excluded_specialuse;
+static int enable_subfolder = 1;
+
+static int enabled_events = 0;
+static unsigned long extra_params;
+
+static struct mboxevent event_template =
+{ 0,
+ /* ordered to optimize the parsing of the notification message */
+ { { EVENT_TIMESTAMP, "timestamp", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_SERVICE, "service", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_SERVER_ADDRESS, "serverAddress", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_CLIENT_ADDRESS, "clientAddress", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_OLD_MAILBOX_ID, "oldMailboxID", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_OLD_UIDSET, "vnd.cmu.oldUidset", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MAILBOX_ID, "mailboxID", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_URI, "uri", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MODSEQ, "modseq", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_DISK_QUOTA, "diskQuota", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_DISK_USED, "diskUsed", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_MAX_MESSAGES, "maxMessages", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_MESSAGES, "messages", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_UNSEEN_MESSAGES, "vnd.cmu.unseenMessages", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_CONVEXISTS, "vnd.fastmail.convExists", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_CONVUNSEEN, "vnd.fastmail.convUnseen", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_UIDNEXT, "uidnext", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_UIDSET, "uidset", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_PID, "pid", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+ { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MBTYPE, "vnd.cmu.mbtype", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_DAV_FILENAME, "vnd.cmu.davFilename", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_DAV_UID, "vnd.cmu.davUid", EVENT_PARAM_STRING, 0, 0 },
+ /* always at end to let the parser to easily truncate this part */
+ { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_CLIENT_ID, "vnd.fastmail.clientId", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_SESSION_ID, "vnd.fastmail.sessionId", EVENT_PARAM_STRING, 0, 0 },
+ { EVENT_MESSAGE_CONTENT, "messageContent", EVENT_PARAM_STRING, 0, 0 }
+ },
+ STRARRAY_INITIALIZER, { 0, 0 }, NULL, STRARRAY_INITIALIZER, NULL, NULL, NULL
+};
+
+static char *json_formatter(enum event_type type, struct event_parameter params);
+#ifndef NDEBUG
+static int filled_params(enum event_type type, struct mboxevent *mboxevent);
+#endif
+static int mboxevent_expected_param(enum event_type type, enum event_param param);
+
+EXPORTED void mboxevent_init(void)
+{
+ const char *options;
+ int groups;
+
+ if (!(notifier = config_getstring(IMAPOPT_EVENT_NOTIFIER)))
+	return;
+
+ /* some don't want to notify events for some IMAP flags */
+ options = config_getstring(IMAPOPT_EVENT_EXCLUDE_FLAGS);
+ excluded_flags = strarray_split(options, NULL, 0);
+
+ /* some don't want to notify events on some folders (ie. Sent, Spam) */
+ /* identify those folders with IMAP SPECIAL-USE */
+ options = config_getstring(IMAPOPT_EVENT_EXCLUDE_SPECIALUSE);
+ excluded_specialuse = strarray_split(options, NULL, 0);
+
+ /* special meaning to disable event notification on all sub folders */
+ if (strarray_find_case(excluded_specialuse, "ALL", 0) >= 0)
+	enable_subfolder = 0;
+
+ /* get event types's extra parameters */
+ extra_params = config_getbitfield(IMAPOPT_EVENT_EXTRA_PARAMS);
+
+ /* groups of related events to turn on notification */
+ groups = config_getbitfield(IMAPOPT_EVENT_GROUPS);
+ if (groups & IMAP_ENUM_EVENT_GROUPS_MESSAGE)
+	enabled_events |= MESSAGE_EVENTS;
+
+ if (groups & IMAP_ENUM_EVENT_GROUPS_QUOTA)
+	enabled_events |= QUOTA_EVENTS;
+
+ if (groups & IMAP_ENUM_EVENT_GROUPS_FLAGS)
+	enabled_events |= FLAGS_EVENTS;
+
+ if (groups & IMAP_ENUM_EVENT_GROUPS_ACCESS)
+	enabled_events |= (EVENT_LOGIN|EVENT_LOGOUT);
+
+ if (groups & IMAP_ENUM_EVENT_GROUPS_MAILBOX)
+	enabled_events |= MAILBOX_EVENTS;
+}
+
+EXPORTED void mboxevent_setnamespace(struct namespace *n)
+{
+ namespace = *n;
+ /* standardize IMAP URL format */
+ namespace.isadmin = 0;
+}
+
+static int mboxevent_enabled_for_mailbox(struct mailbox *mailbox)
+{
+ struct buf attrib = BUF_INITIALIZER;
+ strarray_t *specialuse = NULL;
+ int enabled = 1;
+ int i = 0;
+ int r = 0;
+
+ if (!enable_subfolder && (mboxname_isusermailbox(mailbox->name, 1)) == NULL) {
+	enabled = 0;
+	goto done;
+ }
+
+ /* test if the mailbox has a special-use attribute in the exclude list */
+ if (strarray_size(excluded_specialuse) > 0) {
+	const char *userid = mboxname_to_userid(mailbox->name);
+
+	r = annotatemore_lookup(mailbox->name, "/specialuse", userid, &attrib);
+	if (r) goto done; /* XXX - return -1? Failure? */
+
+	/* get info and set flags */
+	specialuse = strarray_split(buf_cstring(&attrib), NULL, 0);
+
+	for (i = 0; i < strarray_size(specialuse) ; i++) {
+	 const char *attribute = strarray_nth(specialuse, i);
+	 if (strarray_find(excluded_specialuse, attribute, 0) >= 0) {
+		enabled = 0;
+		goto done;
+	 }
+	}
+ }
+
+done:
+ strarray_free(specialuse);
+ buf_free(&attrib);
+ return enabled;
+}
+
+EXPORTED struct mboxevent *mboxevent_new(enum event_type type)
+{
+ struct mboxevent *mboxevent = NULL;
+ /* event notification is completely disabled */
+ if (!notifier)
+	return NULL;
+
+ /* the group to which belong the event is not enabled */
+ if (!(enabled_events & type))
+	return NULL;
+
+ mboxevent = xmalloc(sizeof(struct mboxevent));
+ memcpy(mboxevent, &event_template, sizeof(struct mboxevent));
+
+ mboxevent->type = type;
+
+ /* From RFC 5423:
+ * the time at which the event occurred that triggered the notification
+ * (...). This MAY be an approximate time.
+ *
+ * so it seems appropriate here */
+ if (mboxevent_expected_param(type, EVENT_TIMESTAMP))
+	gettimeofday(&mboxevent->timestamp, NULL);
+
+ FILL_UNSIGNED_PARAM(mboxevent, EVENT_PID, getpid());
+
+ if (mboxevent_expected_param(type, EVENT_CLIENT_ID) && client_id)
+	FILL_STRING_PARAM(mboxevent, EVENT_CLIENT_ID, xstrdup(client_id));
+
+ if (mboxevent_expected_param(type, EVENT_SESSION_ID))
+	FILL_STRING_PARAM(mboxevent, EVENT_SESSION_ID, xstrdup(session_id()));
+
+ return mboxevent;
+}
+
+struct mboxevent *mboxevent_enqueue(enum event_type type,
+				 struct mboxevent **mboxevents)
+{
+ struct mboxevent *mboxevent = NULL;
+ struct mboxevent *ptr;
+
+ if (!(mboxevent = mboxevent_new(type)))
+	return NULL;
+
+ if (mboxevents) {
+	if (*mboxevents == NULL)
+	 *mboxevents = mboxevent;
+	else {
+	 /* append the newly created event at end of the chained list */
+	 ptr = *mboxevents;
+	 while (ptr->next)
+		ptr = ptr->next;
+	 ptr->next = mboxevent;
+	 mboxevent->prev = ptr;
+	}
+ }
+
+ return mboxevent;
+}
+
+EXPORTED void mboxevent_free(struct mboxevent **mboxevent)
+{
+ struct mboxevent *event = *mboxevent;
+ int i;
+
+ if (!event)
+	return;
+
+ seqset_free(event->uidset);
+ seqset_free(event->olduidset);
+ strarray_fini(&event->midset);
+
+ for (i = 0; i <= MAX_PARAM; i++) {
+	if (event->paramsi.filled && event->paramsi.type == EVENT_PARAM_STRING)
+	 free((char *)event->paramsi.value);
+ }
+
+ if (event->prev)
+	event->prev->next = event->next;
+
+ if (event->next)
+	event->next->prev = event->prev;
+
+ free(event);
+
+ *mboxevent = NULL;
+}
+
+void mboxevent_freequeue(struct mboxevent **mboxevent)
+{
+ struct mboxevent *next, *event = *mboxevent;
+
+ if (!event)
+	return;
+
+ do {
+	next = event->next;
+	mboxevent_free(&event);
+	event = next;
+ }
+ while (event);
+
+ *mboxevent = NULL;
+}
+
+static int mboxevent_expected_param(enum event_type type, enum event_param param)
+{
+ switch (param) {
+ case EVENT_BODYSTRUCTURE:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_BODYSTRUCTURE) &&
+	 (type & (EVENT_MESSAGE_NEW|EVENT_MESSAGE_APPEND));
+ case EVENT_CLIENT_ADDRESS:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_CLIENTADDRESS) &&
+	 (type & (EVENT_LOGIN|EVENT_LOGOUT));
+ case EVENT_DISK_QUOTA:
+	return type & QUOTA_EVENTS;
+ case EVENT_DISK_USED:
+	return (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN) ||
+		/* quota usage is not known on event MessageNew, MessageAppend,
+		 * MessageCopy and MessageExpunge.
+		 * Thus, some code refactoring is needed to support diskUsed
+		 * extra parameter */
+		((extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_DISKUSED) &&
+		 (type & (EVENT_QUOTA_CHANGE))));
+ case EVENT_ENVELOPE:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_ENVELOPE) &&
+	 (type & (EVENT_MESSAGE_NEW|EVENT_MESSAGE_APPEND));
+ case EVENT_FLAG_NAMES:
+	return (type & (EVENT_FLAGS_SET|EVENT_FLAGS_CLEAR)) ||
+	 ((extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_FLAGNAMES) &&
+		(type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW)));
+ case EVENT_CLIENT_ID:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CLIENTID;
+ case EVENT_SESSION_ID:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_SESSIONID;
+ case EVENT_MAILBOX_ID:
+	return (type & MAILBOX_EVENTS);
+ case EVENT_MBTYPE:
+	return (type & MAILBOX_EVENTS);
+ case EVENT_MAX_MESSAGES:
+	return type & QUOTA_EVENTS;
+ case EVENT_MESSAGE_CONTENT:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_MESSAGECONTENT) &&
+	 (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
+ case EVENT_MESSAGE_SIZE:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_MESSAGESIZE) &&
+	 (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
+ case EVENT_MESSAGE_CID:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) &&
+	 (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
+ case EVENT_DAV_FILENAME:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVFILENAME) &&
+	 (type & EVENT_CALENDAR);
+ case EVENT_DAV_UID:
+	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVUID) &&
+	 (type & EVENT_CALENDAR);
+ case EVENT_MESSAGES:
+	if (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN))
+	 return 1;
+	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_MESSAGES))
+	 return 0;
+	break;
+ case EVENT_MODSEQ:
+	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_MODSEQ))
+	 return 0;
+	break;
+ case EVENT_OLD_MAILBOX_ID:
+	return type & (EVENT_MESSAGE_COPY|EVENT_MESSAGE_MOVE|EVENT_MAILBOX_RENAME);
+ case EVENT_SERVER_ADDRESS:
+	return type & (EVENT_LOGIN|EVENT_LOGOUT);
+ case EVENT_SERVICE:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_SERVICE;
+ case EVENT_TIMESTAMP:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_TIMESTAMP;
+ case EVENT_UIDNEXT:
+	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_UIDNEXT))
+	 return 0;
+	break;
+ case EVENT_UIDSET:
+	if (type & (EVENT_MESSAGE_NEW|EVENT_MESSAGE_APPEND))
+	 return 0;
+	break;
+ case EVENT_URI:
+	return 1;
+ case EVENT_PID:
+	return 1;
+ case EVENT_USER:
+	return type & (EVENT_MAILBOX_SUBSCRIBE|EVENT_MAILBOX_UNSUBSCRIBE|\
+		 EVENT_LOGIN|EVENT_LOGOUT);
+ case EVENT_MIDSET:
+	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_MIDSET))
+	 return 0;
+	break;
+ case EVENT_UNSEEN_MESSAGES:
+	if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_UNSEENMESSAGES))
+	 return 0;
+	break;
+ case EVENT_CONVEXISTS:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CONVEXISTS;
+ case EVENT_CONVUNSEEN:
+	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CONVUNSEEN;
+ case EVENT_OLD_UIDSET:
+	return type & (EVENT_MESSAGE_COPY|EVENT_MESSAGE_MOVE);
+ }
+
+ /* test if the parameter is related to a message event */
+ return type & (MESSAGE_EVENTS|FLAGS_EVENTS);
+}
+
+#define TIMESTAMP_MAX 32
+EXPORTED void mboxevent_notify(struct mboxevent *mboxevents)
+{
+ enum event_type type;
+ struct mboxevent *event;
+ char stimestampTIMESTAMP_MAX+1;
+ char *formatted_message;
+
+ /* nothing to notify */
+ if (!mboxevents)
+	return;
+
+ /* loop over the chained list of events */
+ for (event = mboxevents; event; event = event->next) {
+	if (event->type == EVENT_CANCELLED)
+	 continue;
+
+	/* swap FlagsSet and FlagsClear notification order depending the presence of
+	 * the \Seen flag because it changes the value of vnd.cmu.unseenMessages.
+	 * kinda bogus because it only finds two next to each other, but hey */
+	if (event->type == EVENT_FLAGS_SET &&
+	 event->next &&
+	 event->next->type == EVENT_FLAGS_CLEAR &&
+	 strarray_find_case(&event->next->flagnames, "\\Seen", 0) >= 0) {
+
+	 struct mboxevent *other = event->next;
+	 event->next = other->next;
+	 other->next = event;
+	 event = other;
+	}
+
+	/* verify that at least one message has been added depending the event type */
+	if (event->type & (MESSAGE_EVENTS|FLAGS_EVENTS)) {
+	 if (event->type & (EVENT_MESSAGE_NEW|EVENT_MESSAGE_APPEND)) {
+		if (!event->paramsEVENT_URI.filled)
+		 continue;
+	 }
+	 else
+		if (event->uidset == NULL)
+		 continue;
+	}
+
+	/* others quota are not supported by RFC 5423 */
+	if ((event->type & QUOTA_EVENTS) &&
+	 !event->paramsEVENT_DISK_QUOTA.filled &&
+	 !event->paramsEVENT_MAX_MESSAGES.filled)
+	 continue;
+
+	/* finish to fill event parameters structure */
+
+	if (mboxevent_expected_param(event->type, EVENT_SERVICE)) {
+	 FILL_STRING_PARAM(event, EVENT_SERVICE, xstrdup(config_ident));
+	}
+
+	if (mboxevent_expected_param(event->type, EVENT_TIMESTAMP)) {
+	 timeval_to_iso8601(&event->timestamp, timeval_ms,
+			 stimestamp, sizeof(stimestamp));
+	 FILL_STRING_PARAM(event, EVENT_TIMESTAMP, xstrdup(stimestamp));
+	}
+
+	if (event->uidset) {
+	 FILL_STRING_PARAM(event, EVENT_UIDSET, seqset_cstring(event->uidset));
+	}
+	if (strarray_size(&event->midset) > 0) {
+	 FILL_ARRAY_PARAM(event, EVENT_MIDSET, &event->midset);
+	}
+	if (event->olduidset) {
+	 FILL_STRING_PARAM(event, EVENT_OLD_UIDSET, seqset_cstring(event->olduidset));
+	}
+
+	/* may split FlagsSet event in several event notifications */
+	do {
+	 type = event->type;
+	 /* prefer MessageRead and MessageTrash to FlagsSet as advised in the RFC */
+	 if (type == EVENT_FLAGS_SET) {
+		int i;
+
+		if ((i = strarray_find(&event->flagnames, "\\Deleted", 0)) >= 0) {
+		 type = EVENT_MESSAGE_TRASH;
+		 strarray_remove(&event->flagnames, i);
+		}
+		else if ((i = strarray_find(&event->flagnames, "\\Seen", 0)) >= 0) {
+		 type = EVENT_MESSAGE_READ;
+		 strarray_remove(&event->flagnames, i);
+		}
+	 }
+
+	 if (strarray_size(&event->flagnames) > 0) {
+		/* don't send flagNames parameter for those events */
+		if (type != EVENT_MESSAGE_TRASH && type != EVENT_MESSAGE_READ) {
+		 char *flagnames = strarray_join(&event->flagnames, " ");
+		 FILL_STRING_PARAM(event, EVENT_FLAG_NAMES, flagnames);
+
+		 /* stop to loop for flagsSet event here */
+		 strarray_fini(&event->flagnames);
+		}
+	 }
+
+	 /* check if expected event parameters are filled */
+	 assert(filled_params(type, event));
+
+	 /* notification is ready to send */
+	 formatted_message = json_formatter(type, event->params);
+	 notify(notifier, "EVENT", NULL, NULL, NULL, 0, NULL, formatted_message);
+
+	 free(formatted_message);
+	}
+	while (strarray_size(&event->flagnames) > 0);
+ }
+
+ return;
+}
+
+void mboxevent_add_flags(struct mboxevent *event, char *flagnamesMAX_USER_FLAGS,
+			 bit32 system_flags, bit32 user_flagsMAX_USER_FLAGS/32)
+{
+ unsigned flag, flagmask = 0;
+
+ if (!event)
+	return;
+
+ /* add system flags */
+ if (system_flags & FLAG_DELETED) {
+	if (strarray_find_case(excluded_flags, "\\Deleted", 0) < 0)
+	 strarray_add_case(&event->flagnames, "\\Deleted");
+ }
+ if (system_flags & FLAG_ANSWERED) {
+	if (strarray_find_case(excluded_flags, "\\Answered", 0) < 0)
+	 strarray_add_case(&event->flagnames, "\\Answered");
+ }
+ if (system_flags & FLAG_FLAGGED) {
+	if (strarray_find_case(excluded_flags, "\\Flagged", 0) < 0)
+	 strarray_add_case(&event->flagnames, "\\Flagged");
+ }
+ if (system_flags & FLAG_DRAFT) {
+	if (strarray_find_case(excluded_flags, "\\Draft", 0) < 0)
+	 strarray_add_case(&event->flagnames, "\\Draft");
+ }
+ if (system_flags & FLAG_SEEN) {
+	if (strarray_find_case(excluded_flags, "\\Seen", 0) < 0)
+	 strarray_add_case(&event->flagnames, "\\Seen");
+ }
+
+ /* add user flags */
+ for (flag = 0; flag < MAX_USER_FLAGS; flag++) {
+	if ((flag & 31) == 0) {
+	 flagmask = user_flagsflag/32;
+	}
+	if (!(flagnamesflag && (flagmask & (1<<(flag & 31)))))
+	 continue;
+
+	if (strarray_find_case(excluded_flags, flagnamesflag, 0) < 0)
+	 strarray_add_case(&event->flagnames, flagnamesflag);
+ }
+}
+
+void mboxevent_add_flag(struct mboxevent *event, const char *flag)
+{
+ if (!event)
+	return;
+
+ if (mboxevent_expected_param(event->type, EVENT_FLAG_NAMES))
+	strarray_add_case(&event->flagnames, flag);
+}
+
+EXPORTED void mboxevent_set_access(struct mboxevent *event,
+				 const char *serveraddr, const char *clientaddr,
+				 const char *userid, const char *mailboxname)
+{
+ char urlMAX_MAILBOX_PATH+1;
+ struct imapurl imapurl;
+ char extnameMAX_MAILBOX_NAME;
+
+ if (!event)
+	return;
+
+ /* only notify Logout after successful Login */
+ if (!userid && event->type & EVENT_LOGOUT) {
+	event->type = EVENT_CANCELLED;
+	return;
+ }
+
+ /* all events needs uri parameter */
+ if (!event->paramsEVENT_URI.filled) {
+	memset(&imapurl, 0, sizeof(struct imapurl));
+	imapurl.server = config_servername;
+
+	if (mailboxname != NULL) {
+	 char *user = (char *)mboxname_to_userid(mailboxname);
+
+	 /* translate internal mailbox name to external */
+	 assert(namespace.mboxname_toexternal != NULL);
+	 (*namespace.mboxname_toexternal)(&namespace, mailboxname, user, extname);
+	 imapurl.mailbox = extname;
+
+	 if (user) {
+		/* translate any separators in user */
+		mboxname_hiersep_toexternal(&namespace, user,
+					 config_virtdomains ? strcspn(user, "@") : 0);
+		imapurl.user = user;
+	 }
+	}
+
+	imapurl_toURL(url, &imapurl);
+	FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+
+	if (event->type & MAILBOX_EVENTS) {
+	 FILL_STRING_PARAM(event, EVENT_MAILBOX_ID, xstrdup(url));
+	}
+ }
+
+ if (serveraddr && mboxevent_expected_param(event->type, EVENT_SERVER_ADDRESS)) {
+	FILL_STRING_PARAM(event, EVENT_SERVER_ADDRESS, xstrdup(serveraddr));
+ }
+ if (clientaddr && mboxevent_expected_param(event->type, EVENT_CLIENT_ADDRESS)) {
+	FILL_STRING_PARAM(event, EVENT_CLIENT_ADDRESS, xstrdup(clientaddr));
+ }
+ if (userid && mboxevent_expected_param(event->type, EVENT_USER)) {
+	/* translate any separators in user */
+	char *user = xstrdup(userid);
+	mboxname_hiersep_toexternal(&namespace, user,
+				 config_virtdomains ? strcspn(user, "@") : 0);
+	FILL_STRING_PARAM(event, EVENT_USER, user);
+ }
+}
+
+EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *mailbox,
+				 struct index_record *record)
+{
+ char *msgid = NULL;
+
+ if (!event)
+	return;
+
+ /* add modseq only on first call, cancel otherwise */
+ if (mboxevent_expected_param(event->type, EVENT_MODSEQ)) {
+	if (event->uidset == NULL || (seqset_first(event->uidset) == seqset_last(event->uidset))) {
+	 FILL_UNSIGNED_PARAM(event, EVENT_MODSEQ, record->modseq);
+	}
+	else {
+	 /* From RFC 5423:
+	 * modseq May be included with any notification referring
+	 * to one message.
+	 *
+	 * thus cancel inclusion of modseq parameter
+	 */
+	 event->paramsEVENT_MODSEQ.filled = 0;
+	}
+ }
+
+ /* add UID to uidset */
+ if (event->uidset == NULL)
+	event->uidset = seqset_init(0, SEQ_SPARSE);
+ seqset_add(event->uidset, record->uid, 1);
+
+ if (event->type == EVENT_CANCELLED)
+	return;
+
+ /* add Message-Id to midset or NIL if doesn't exists */
+ if (mboxevent_expected_param(event->type, (EVENT_MIDSET))) {
+	msgid = mailbox_cache_get_msgid(mailbox, record);
+	strarray_add(&event->midset, msgid ? msgid : "NIL");
+
+	if (msgid)
+	 free(msgid);
+ }
+
+ /* add message size */
+ if (mboxevent_expected_param(event->type, EVENT_MESSAGE_SIZE)) {
+	FILL_UNSIGNED_PARAM(event, EVENT_MESSAGE_SIZE, record->size);
+ }
+
+ /* add message CID */
+ if (mboxevent_expected_param(event->type, EVENT_MESSAGE_CID)) {
+	FILL_STRING_PARAM(event, EVENT_MESSAGE_CID,
+			 xstrdup(conversation_id_encode(record->cid)));
+ }
+
+ /* add vnd.cmu.envelope */
+ if (mboxevent_expected_param(event->type, EVENT_ENVELOPE)) {
+	FILL_STRING_PARAM(event, EVENT_ENVELOPE,
+			 xstrndup(cacheitem_base(record, CACHE_ENVELOPE),
+				 cacheitem_size(record, CACHE_ENVELOPE)));
+ }
+
+ /* add bodyStructure */
+ if (mboxevent_expected_param(event->type, EVENT_BODYSTRUCTURE)) {
+	FILL_STRING_PARAM(event, EVENT_BODYSTRUCTURE,
+			 xstrndup(cacheitem_base(record, CACHE_BODYSTRUCTURE),
+				 cacheitem_size(record, CACHE_BODYSTRUCTURE)));
+ }
+
+ /* add caldav items */
+ if ((mailbox->mbtype & (MBTYPES_DAV)) &&
+	(mboxevent_expected_param(event->type, EVENT_DAV_FILENAME) ||
+	 mboxevent_expected_param(event->type, EVENT_DAV_UID))) {
+	struct body *body = NULL;
+	const char *resource = NULL;
+	struct param *param;
+
+	if (mailbox_cacherecord(mailbox, record))
+	 return;
+	message_read_bodystructure(record, &body);
+
+	for (param = body->disposition_params; param; param = param->next) {
+	 if (!strcmp(param->attribute, "FILENAME")) {
+		resource = param->value;
+	 }
+	}
+
+	FILL_STRING_PARAM(event, EVENT_DAV_FILENAME, xstrdup(resource));
+
+	if (mboxevent_expected_param(event->type, EVENT_DAV_UID)) {
+	 const char *userid = mboxname_to_userid(mailbox->name);
+	 if (!userid) return;
+	 if (mailbox->mbtype & MBTYPE_ADDRESSBOOK) {
+		struct carddav_db *carddavdb = NULL;
+		struct carddav_data *cdata = NULL;
+		carddavdb = carddav_open(userid, 0);
+		carddav_lookup_resource(carddavdb, mailbox->name, resource, 0, &cdata);
+		FILL_STRING_PARAM(event, EVENT_DAV_UID, xstrdup(cdata->vcard_uid));
+		carddav_close(carddavdb);
+	 }
+	 if (mailbox->mbtype & MBTYPE_CALENDAR) {
+		struct caldav_db *caldavdb = NULL;
+		struct caldav_data *cdata = NULL;
+		caldavdb = caldav_open(userid, 0);
+		caldav_lookup_resource(caldavdb, mailbox->name, resource, 0, &cdata);
+		FILL_STRING_PARAM(event, EVENT_DAV_UID, xstrdup(cdata->ical_uid));
+		caldav_close(caldavdb);
+	 }
+	}
+ }
+
+}
+
+void mboxevent_extract_copied_record(struct mboxevent *event,
+				 const struct mailbox *mailbox, uint32_t uid)
+{
+ int first = 0;
+
+ if (!event)
+	return;
+
+ /* add the source message's UID to oldUidset */
+ if (event->olduidset == NULL) {
+	event->olduidset = seqset_init(0, SEQ_SPARSE);
+	first = 1;
+ }
+ seqset_add(event->olduidset, uid, 1);
+
+ /* generate an IMAP URL to reference the old mailbox */
+ if (first)
+	mboxevent_extract_old_mailbox(event, mailbox);
+}
+
+void mboxevent_extract_content(struct mboxevent *event,
+			 const struct index_record *record, FILE* content)
+{
+ const char *base = NULL;
+ unsigned long len = 0;
+ size_t offset, size, truncate;
+
+ if (!event)
+	return;
+
+ if (!mboxevent_expected_param(event->type, EVENT_MESSAGE_CONTENT))
+	return;
+
+ truncate = config_getint(IMAPOPT_EVENT_CONTENT_SIZE);
+
+ switch (config_getenum(IMAPOPT_EVENT_CONTENT_INCLUSION_MODE)) {
+ /* include message up to 'truncate' in size with the notification */
+ case IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_STANDARD:
+	if (!truncate || record->size <= truncate) {
+	 offset = 0;
+	 size = record->size;
+	}
+	else {
+	 /* XXX RFC 5423 suggests to include a URLAUTH RFC4467 reference
+	 * for larger messages. IMAP URL of mailboxID seems enough though */
+	 return;
+	}
+	break;
+ /* include message truncated to a size of 'truncate' */
+ case IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_MESSAGE:
+	offset = 0;
+	size = (truncate && (record->size > truncate)) ?
+		truncate : record->size;
+	break;
+ /* include headers truncated to a size of 'truncate' */
+ case IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_HEADER:
+	offset = 0;
+	size = (truncate && (record->header_size > truncate)) ?
+		truncate : record->header_size;
+	break;
+ /* include body truncated to a size of 'truncate' */
+ case IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_BODY:
+	offset = record->header_size;
+	size = (truncate && ((record->size - record->header_size) > truncate)) ?
+		truncate : record->size - record->header_size;
+	break;
+ /* include full headers and body truncated to a size of 'truncate' */
+ case IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_HEADERBODY:
+	offset = 0;
+	size = (truncate && ((record->size - record->header_size) > truncate)) ?
+		record->header_size + truncate : record->size;
+	break;
+ /* never happen */
+ default:
+	return;
+ }
+
+ map_refresh(fileno(content), 1, &base, &len, record->size, "new message", 0);
+ FILL_STRING_PARAM(event, EVENT_MESSAGE_CONTENT, xstrndup(base+offset, size));
+ map_free(&base, &len);
+}
+
+void mboxevent_extract_quota(struct mboxevent *event, const struct quota *quota,
+			 enum quota_resource res)
+{
+ struct imapurl imapurl;
+ char urlMAX_MAILBOX_PATH+1;
+ char extnameMAX_MAILBOX_NAME;
+
+ if (!event)
+	return;
+
+ switch(res) {
+ case QUOTA_STORAGE:
+	if (mboxevent_expected_param(event->type, EVENT_DISK_QUOTA)) {
+	 if (quota->limitsres >= 0)
+		FILL_UNSIGNED_PARAM(event, EVENT_DISK_QUOTA, quota->limitsres);
+	}
+	if (mboxevent_expected_param(event->type, EVENT_DISK_USED)) {
+	 FILL_UNSIGNED_PARAM(event, EVENT_DISK_USED,
+			 quota->usedsres / quota_unitsres);
+	}
+	break;
+ case QUOTA_MESSAGE:
+	if (quota->limitsres >= 0)
+	 FILL_UNSIGNED_PARAM(event, EVENT_MAX_MESSAGES, quota->limitsres);
+	FILL_UNSIGNED_PARAM(event, EVENT_MESSAGES, quota->usedsres);
+	break;
+ default:
+	/* others quota are not supported by RFC 5423 */
+	break;
+ }
+
+ /* From RFC 5423 :
+ * The parameters SHOULD include at least the relevant user
+ * and quota and, optionally, the mailbox.
+ *
+ * It seems that it does not correspond to the concept of
+ * quota root specified in RFC 2087. Thus we fill uri with quota root
+ */
+ if (!event->paramsEVENT_URI.filled && event->type & QUOTA_EVENTS) {
+	char *user = (char *)mboxname_to_userid(quota->root);
+
+	memset(&imapurl, 0, sizeof(struct imapurl));
+	imapurl.server = config_servername;
+
+	/* translate internal mailbox name to external */
+	assert(namespace.mboxname_toexternal != NULL);
+	(*namespace.mboxname_toexternal)(&namespace, quota->root, user, extname);
+	imapurl.mailbox = extname;
+
+	if (user) {
+	 /* translate any separators in user */
+	 mboxname_hiersep_toexternal(&namespace, user,
+					config_virtdomains ? strcspn(user, "@") : 0);
+	 imapurl.user = user;
+	}
+
+	imapurl_toURL(url, &imapurl);
+	FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+ }
+}
+
+EXPORTED void mboxevent_set_numunseen(struct mboxevent *event,
+				 struct mailbox *mailbox, int numunseen)
+{
+ if (!event)
+	return;
+
+ if (mboxevent_expected_param(event->type, EVENT_UNSEEN_MESSAGES)) {
+	unsigned count = (numunseen >= 0) ? (unsigned)numunseen
+					 : mailbox_count_unseen(mailbox);
+	/* as event notification is focused on mailbox, we don't care about the
+	 * authenticated user but the mailbox's owner.
+	 * it could be a problem only if it is a shared or public folder */
+	FILL_UNSIGNED_PARAM(event, EVENT_UNSEEN_MESSAGES, count);
+ }
+}
+
+EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event,
+					struct mailbox *mailbox)
+{
+ struct imapurl imapurl;
+ char urlMAX_MAILBOX_PATH+1;
+ char extnameMAX_MAILBOX_NAME;
+ char *user;
+
+ if (!event)
+	return;
+
+ /* mboxevent_extract_mailbox should be called only once */
+ if (event->paramsEVENT_URI.filled)
+	return;
+
+ /* verify if event notification should be disabled for this mailbox */
+ if (!mboxevent_enabled_for_mailbox(mailbox)) {
+	event->type = EVENT_CANCELLED;
+	return;
+ }
+
+ /* translate internal mailbox name to external */
+ user = (char *)mboxname_to_userid(mailbox->name);
+ memset(&imapurl, 0, sizeof(struct imapurl));
+ imapurl.server = config_servername;
+ imapurl.uidvalidity = mailbox->i.uidvalidity;
+
+ assert(namespace.mboxname_toexternal != NULL);
+ (*namespace.mboxname_toexternal)(&namespace, mailbox->name, user, extname);
+ imapurl.mailbox = extname;
+
+ if (user) {
+	/* translate any separators in user */
+	mboxname_hiersep_toexternal(&namespace, user,
+				 config_virtdomains ? strcspn(user, "@") : 0);
+
+	imapurl.user = user;
+ }
+
+ if (event->type & (EVENT_MESSAGE_NEW|EVENT_MESSAGE_APPEND) && event->uidset) {
+	imapurl.uid = seqset_first(event->uidset);
+	/* don't add uidset parameter to MessageNew and MessageAppend events */
+	seqset_free(event->uidset);
+	event->uidset = NULL;
+ }
+
+ /* all events needs uri parameter */
+ imapurl_toURL(url, &imapurl);
+ FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+
+ FILL_STRING_PARAM(event, EVENT_MBTYPE,
+	xstrdup(mboxlist_mbtype_to_string(mailbox->mbtype)));
+
+ /* mailbox related events also require mailboxID */
+ if (event->type & MAILBOX_EVENTS) {
+	FILL_STRING_PARAM(event, EVENT_MAILBOX_ID, xstrdup(url));
+ }
+ if (mboxevent_expected_param(event->type, EVENT_UIDNEXT)) {
+	FILL_UNSIGNED_PARAM(event, EVENT_UIDNEXT, mailbox->i.last_uid+1);
+ }
+
+ /* From RFC 5423 :
+ * messages
+ * Included with QuotaExceed and QuotaWithin notifications relating
+ * to a user or mailbox message count quota. May be included with
+ * other notifications.
+ *
+ * Number of messages in the mailbox. This is typically included
+ * with message addition and deletion events.
+ *
+ * we are in case messages is relative to the number of messages in the
+ * mailbox and not the message count quota.
+ */
+ if (mboxevent_expected_param(event->type, EVENT_MESSAGES)) {
+	FILL_UNSIGNED_PARAM(event, EVENT_MESSAGES, mailbox->i.exists);
+ }
+
+ if (mboxevent_expected_param(event->type, EVENT_CONVEXISTS) ||
+	mboxevent_expected_param(event->type, EVENT_CONVUNSEEN)) {
+	conv_status_t status = CONV_STATUS_INIT;
+
+	if (mailbox->local_cstate)
+	 conversation_getstatus(mailbox->local_cstate, mailbox->name, &status);
+
+	if (mboxevent_expected_param(event->type, EVENT_CONVEXISTS))
+	 FILL_UNSIGNED_PARAM(event, EVENT_CONVEXISTS, status.exists);
+
+	if (mboxevent_expected_param(event->type, EVENT_CONVUNSEEN))
+	 FILL_UNSIGNED_PARAM(event, EVENT_CONVUNSEEN, status.unseen);
+ }
+}
+
+void mboxevent_extract_old_mailbox(struct mboxevent *event,
+				 const struct mailbox *mailbox)
+{
+ struct imapurl imapurl;
+ char urlMAX_MAILBOX_PATH+1;
+ char extnameMAX_MAILBOX_NAME;
+ char *user;
+
+ if (!event)
+	return;
+
+ user = (char *)mboxname_to_userid(mailbox->name);
+
+ memset(&imapurl, 0, sizeof(struct imapurl));
+ imapurl.server = config_servername;
+ imapurl.uidvalidity = mailbox->i.uidvalidity;
+
+ /* translate internal mailbox name to external */
+ assert(namespace.mboxname_toexternal != NULL);
+ (*namespace.mboxname_toexternal)(&namespace, mailbox->name, user, extname);
+ imapurl.mailbox = extname;
+
+ if (user) {
+ /* translate any separators in user */
+	mboxname_hiersep_toexternal(&namespace, user,
+				 config_virtdomains ? strcspn(user, "@") : 0);
+	imapurl.user = user;
+ }
+
+ imapurl_toURL(url, &imapurl);
+ FILL_STRING_PARAM(event, EVENT_OLD_MAILBOX_ID, xstrdup(url));
+}
+
+EXPORTED void mboxevent_set_client_id(const char *id)
+{
+ if (client_id)
+	free((char *)client_id);
+ client_id = xstrdupnull(id);
+}
+
+static const char *event_to_name(enum event_type type)
+{
+ if (type == (EVENT_MESSAGE_NEW|EVENT_CALENDAR))
+	return "MessageNew";
+
+ switch (type) {
+ case EVENT_MESSAGE_APPEND:
+	return "MessageAppend";
+ case EVENT_MESSAGE_EXPIRE:
+	return "MessageExpire";
+ case EVENT_MESSAGE_EXPUNGE:
+	return "MessageExpunge";
+ case EVENT_MESSAGE_NEW:
+	return "MessageNew";
+ case EVENT_MESSAGE_COPY:
+	return "vnd.cmu.MessageCopy";
+ case EVENT_MESSAGE_MOVE:
+	return "vnd.cmu.MessageMove";
+ case EVENT_QUOTA_EXCEED:
+	return "QuotaExceed";
+ case EVENT_QUOTA_WITHIN:
+	return "QuotaWithin";
+ case EVENT_QUOTA_CHANGE:
+	return "QuotaChange";
+ case EVENT_MESSAGE_READ:
+	return "MessageRead";
+ case EVENT_MESSAGE_TRASH:
+	return "MessageTrash";
+ case EVENT_FLAGS_SET:
+	return "FlagsSet";
+ case EVENT_FLAGS_CLEAR:
+	return "FlagsClear";
+ case EVENT_LOGIN:
+	return "Login";
+ case EVENT_LOGOUT:
+	return "Logout";
+ case EVENT_MAILBOX_CREATE:
+	return "MailboxCreate";
+ case EVENT_MAILBOX_DELETE:
+	return "MailboxDelete";
+ case EVENT_MAILBOX_RENAME:
+	return "MailboxRename";
+ case EVENT_MAILBOX_SUBSCRIBE:
+	return "MailboxSubscribe";
+ case EVENT_MAILBOX_UNSUBSCRIBE:
+	return "MailboxUnSubscribe";
+ default:
+	fatal("Unknown message event", EC_SOFTWARE);
+ }
+
+ /* never happen */
+ return NULL;
+}
+
+static char *json_formatter(enum event_type type, struct event_parameter params)
+{
+ int param, ival;
+ char *val, *ptr, *result;
+ json_t *event_json = json_object();
+ json_t *jarray;
+
+ json_object_set_new(event_json, "event", json_string(event_to_name(type)));
+
+ for (param = 0; param <= MAX_PARAM; param++) {
+
+	if (!paramsparam.filled)
+	 continue;
+
+	switch (paramsparam.id) {
+	case EVENT_CLIENT_ADDRESS:
+	 /* come from saslprops structure */
+	 val = strdup((char *)paramsparam.value);
+	 ptr = strchr(val, ';');
+	 *ptr++ = '\0';
+
+	 json_object_set_new(event_json, "clientIP", json_string(val));
+
+	 if (parseint32(ptr, (const char **)&ptr, &ival) >= 0)
+		json_object_set_new(event_json, "clientPort", json_integer(ival));
+
+	 free(val);
+	 break;
+	case EVENT_SERVER_ADDRESS:
+	 /* come from saslprops structure */
+	 val = strdup((char *)paramsparam.value);
+	 ptr = strchr(val, ';');
+	 *ptr++ = '\0';
+
+	 json_object_set_new(event_json, "serverDomain", json_string(val));
+
+	 if (parseint32(ptr, (const char **)&ptr, &ival) >= 0)
+		json_object_set_new(event_json, "serverPort", json_integer(ival));
+
+	 free(val);
+	 break;
+	default:
+	 switch (paramsparam.type) {
+	 case EVENT_PARAM_INT:
+		json_object_set_new(event_json, paramsparam.name,
+				 json_integer(paramsparam.value));
+		break;
+	 case EVENT_PARAM_STRING:
+		json_object_set_new(event_json, paramsparam.name,
+				 json_string((char *)paramsparam.value));
+		break;
+	 case EVENT_PARAM_ARRAY:
+		jarray = json_array();
+		strarray_t *sarray = (strarray_t *)paramsparam.value;
+		int i;
+
+		for (i = 0; i < strarray_size(sarray); i++) {
+		 json_array_append_new(jarray, json_string(strarray_nth(sarray, i)));
+		}
+
+		json_object_set_new(event_json, paramsparam.name, jarray);
+		break;
+	 }
+	 break;
+	}
+ }
+
+ result = json_dumps(event_json, JSON_PRESERVE_ORDER|JSON_COMPACT);
+ json_decref(event_json);
+
+ return result;
+
+}
+
+#ifndef NDEBUG
+/* overrides event->type with event_type because FlagsSet may be derived to
+ * MessageTrash or MessageRead */
+static int filled_params(enum event_type type, struct mboxevent *event)
+{
+ struct buf missing = BUF_INITIALIZER;
+ int param, ret = 1;
+
+ if (!event)
+	return 0;
+
+ for (param = 0; param <= MAX_PARAM; param++) {
+
+	if (mboxevent_expected_param(type, param) &&
+		!event->paramsparam.filled) {
+	 switch (event->paramsparam.id) {
+	 case EVENT_DISK_QUOTA:
+		return event->paramsEVENT_MAX_MESSAGES.filled;
+	 case EVENT_DISK_USED:
+		return event->paramsEVENT_MESSAGES.filled;
+	 case EVENT_FLAG_NAMES:
+		/* flagNames may be included with MessageAppend and MessageNew
+		 * also we don't expect it here. */
+		if (!(type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW)))
+		 buf_appendcstr(&missing, " flagNames");
+		break;
+	 case EVENT_MAX_MESSAGES:
+		return event->paramsEVENT_DISK_QUOTA.filled;
+	 case EVENT_MESSAGE_CONTENT:
+		/* messageContent is not included in standard mode if the size
+		 * of the message exceed the limit */
+		if (config_getenum(IMAPOPT_EVENT_CONTENT_INCLUSION_MODE) !=
+		 IMAP_ENUM_EVENT_CONTENT_INCLUSION_MODE_STANDARD)
+		 buf_appendcstr(&missing, " messageContent");
+		break;
+	 case EVENT_MESSAGES:
+		return event->paramsEVENT_DISK_USED.filled;
+	 case EVENT_MODSEQ:
+		/* modseq is not included if notification refers to several
+		 * messages */
+		if (!event->uidset || (seqset_first(event->uidset) == seqset_last(event->uidset)))
+		 buf_appendcstr(&missing, " modseq");
+		break;
+	 case EVENT_CLIENT_ID:
+		return event->paramsEVENT_CLIENT_ID.filled;
+	 case EVENT_SESSION_ID:
+		return event->paramsEVENT_SESSION_ID.filled;
+	 default:
+		buf_appendcstr(&missing, " ");
+		buf_appendcstr(&missing, event->paramsparam.name);
+		break;
+	 }
+	}
+ }
+
+ if (buf_len(&missing)) {
+	syslog(LOG_ALERT, "Cannot notify event %s: missing parameters:%s",
+	 event_to_name(type), buf_cstring(&missing));
+	ret = 0;
+ }
+
+ buf_free(&missing);
+ return ret;
+}
+#endif /* NDEBUG */
+
+#else /* !ENABLE_MBOXEVENT */
+
+#include "mboxevent.h"
+
+EXPORTED void mboxevent_init(void)
+{
+}
+
+EXPORTED void mboxevent_setnamespace(struct namespace *n __attribute__((unused)))
+{
+}
+
+EXPORTED struct mboxevent *mboxevent_new(enum event_type type __attribute__((unused)))
+{
+ return NULL;
+}
+
+struct mboxevent *mboxevent_enqueue(enum event_type type __attribute__((unused)),
+				 struct mboxevent **mboxevents __attribute__((unused)))
+{
+ return NULL;
+}
+
+EXPORTED void mboxevent_free(struct mboxevent **mboxevent __attribute__((unused)))
+{
+}
+
+void mboxevent_freequeue(struct mboxevent **mboxevent __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_notify(struct mboxevent *mboxevents __attribute__((unused)))
+{
+}
+
+void mboxevent_add_flags(struct mboxevent *event __attribute__((unused)),
+			 char *flagnamesMAX_USER_FLAGS __attribute__((unused)),
+			 bit32 system_flags __attribute__((unused)),
+			 bit32 user_flagsMAX_USER_FLAGS/32 __attribute__((unused)))
+{
+}
+
+void mboxevent_add_flag(struct mboxevent *event __attribute__((unused)),
+			const char *flag __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_set_access(struct mboxevent *event __attribute__((unused)),
+				 const char *serveraddr __attribute__((unused)),
+				 const char *clientaddr __attribute__((unused)),
+				 const char *userid __attribute__((unused)),
+				 const char *mailboxname __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_extract_record(struct mboxevent *event __attribute__((unused)),
+				 struct mailbox *mailbox __attribute__((unused)),
+				 struct index_record *record __attribute__((unused)))
+{
+}
+
+void mboxevent_extract_copied_record(struct mboxevent *event __attribute__((unused)),
+				 const struct mailbox *mailbox __attribute__((unused)),
+				 uint32_t uid __attribute__((unused)))
+{
+}
+
+void mboxevent_extract_content(struct mboxevent *event __attribute__((unused)),
+			 const struct index_record *record __attribute__((unused)),
+			 FILE* content __attribute__((unused)))
+{
+}
+
+void mboxevent_extract_quota(struct mboxevent *event __attribute__((unused)),
+			 const struct quota *quota __attribute__((unused)),
+			 enum quota_resource res __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_set_numunseen(struct mboxevent *event __attribute__((unused)),
+				 struct mailbox *mailbox __attribute__((unused)),
+				 int numunseen __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event __attribute__((unused)),
+					struct mailbox *mailbox __attribute__((unused)))
+{
+}
+
+EXPORTED void mboxevent_set_client_id(const char *id)
+{
+}
+
+void mboxevent_extract_old_mailbox(struct mboxevent *event __attribute__((unused)),
+				 const struct mailbox *mailbox __attribute__((unused)))
+{
+}
+
+#endif /* !ENABLE_MBOXEVENT */

cyrus-imapd-2.5.tar.gz/imap/mboxevent.h Added

@@ -0,0 +1,289 @@
+/* mboxevent.h -- interface for message store event notifications
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Sébastien Michel from Atos Worldline
+ */
+
+#ifndef _MBOXEVENT_H
+#define _MBOXEVENT_H
+
+#include "strarray.h"
+
+#include "mailbox.h"
+#include "mboxname.h"
+
+
+/*
+ * event types defined in RFC 5423 - Internet Message Store Events
+ */
+enum event_type {
+ EVENT_CANCELLED = (0),
+ /* Message Addition and Deletion */
+ EVENT_MESSAGE_APPEND = (1<<0),
+ EVENT_MESSAGE_EXPIRE = (1<<1),
+ EVENT_MESSAGE_EXPUNGE = (1<<2),
+ EVENT_MESSAGE_NEW = (1<<3),
+ EVENT_MESSAGE_COPY = (1<<4), /* additional event type to notify IMAP COPY */
+ EVENT_MESSAGE_MOVE = (1<<5), /* additional event type to notify IMAP MOVE */
+ EVENT_QUOTA_EXCEED = (1<<6),
+ EVENT_QUOTA_WITHIN = (1<<7),
+ EVENT_QUOTA_CHANGE = (1<<8),
+ /* Message Flags */
+ EVENT_MESSAGE_READ = (1<<9),
+ EVENT_MESSAGE_TRASH = (1<<10),
+ EVENT_FLAGS_SET = (1<<11),
+ EVENT_FLAGS_CLEAR = (1<<12),
+ /* Access Accounting */
+ EVENT_LOGIN = (1<<13),
+ EVENT_LOGOUT = (1<<14),
+ /* Mailbox Management */
+ EVENT_MAILBOX_CREATE = (1<<15),
+ EVENT_MAILBOX_DELETE = (1<<16),
+ EVENT_MAILBOX_RENAME = (1<<17),
+ EVENT_MAILBOX_SUBSCRIBE = (1<<18),
+ EVENT_MAILBOX_UNSUBSCRIBE = (1<<19),
+ EVENT_CALENDAR = (1<<20)
+};
+
+/*
+ * event parameters defined in RFC 5423 - Internet Message Store Events
+ *
+ * ordered to optimize the parsing of the notification message
+ */
+enum event_param {
+ EVENT_TIMESTAMP,
+ EVENT_SERVICE,
+ EVENT_SERVER_ADDRESS, /* gather serverDomain and serverPort together */
+ EVENT_CLIENT_ADDRESS, /* gather clientIP and clientPort together */
+ EVENT_OLD_MAILBOX_ID,
+ EVENT_OLD_UIDSET,
+ EVENT_MAILBOX_ID,
+ EVENT_URI,
+ EVENT_MODSEQ,
+ EVENT_DISK_QUOTA,
+ EVENT_DISK_USED,
+ EVENT_MAX_MESSAGES,
+ EVENT_MESSAGES,
+ EVENT_UNSEEN_MESSAGES,
+ EVENT_CONVEXISTS,
+ EVENT_CONVUNSEEN,
+ EVENT_UIDNEXT,
+ EVENT_UIDSET,
+ EVENT_MIDSET,
+ EVENT_FLAG_NAMES,
+ EVENT_PID,
+ EVENT_USER,
+ EVENT_MESSAGE_SIZE,
+ EVENT_MESSAGE_CID,
+ EVENT_MBTYPE,
+ EVENT_DAV_FILENAME,
+ EVENT_DAV_UID,
+ EVENT_ENVELOPE,
+ EVENT_BODYSTRUCTURE,
+ EVENT_CLIENT_ID,
+ EVENT_SESSION_ID,
+ EVENT_MESSAGE_CONTENT
+};
+
+/* messageContent number that is always the last */
+#define MAX_PARAM EVENT_MESSAGE_CONTENT
+
+enum event_param_type {
+ EVENT_PARAM_INT,
+ EVENT_PARAM_STRING,
+ EVENT_PARAM_ARRAY
+};
+
+struct event_parameter {
+ enum event_param id;
+ const char *name;
+ enum event_param_type type;
+ uint64_t value;
+ int filled;
+};
+
+struct mboxevent {
+ enum event_type type;	/* event type */
+
+ /* array of event parameters */
+ struct event_parameter paramsMAX_PARAM+1;
+
+ strarray_t flagnames;
+ struct timeval timestamp;
+ struct seqset *uidset;
+ strarray_t midset;
+ struct seqset *olduidset;
+
+ struct mboxevent *prev;
+ struct mboxevent *next;
+};
+
+
+/*
+ * Call this initializer once only at start
+ */
+void mboxevent_init();
+
+/*
+ * Set the namespace to translate internal mailbox name to external name
+ */
+void mboxevent_setnamespace(struct namespace *n);
+
+/*
+ * Create a new mboxevent structure for the given event type.
+ * Allocate resources for configured extra parameters.
+ *
+ * return the initialized event state or NULL if notification is disabled
+ */
+struct mboxevent *mboxevent_new(enum event_type type);
+
+/*
+ * Create a new mboxevent structure for the given event type.
+ * Append this new structure at end of the given mboxevent list.
+ * Allocate resources for configured extra parameters.
+ *
+ * return the initialized event state or NULL if notification is disabled
+ */
+struct mboxevent *mboxevent_enqueue(enum event_type type,
+ struct mboxevent **events);
+
+/*
+ * Send the queue of event notifications
+ */
+void mboxevent_notify(struct mboxevent *mboxevents);
+
+/*
+ * Release any allocated resources of this given event
+ */
+void mboxevent_free(struct mboxevent **event);
+
+/*
+ * Release any allocated resources of this given list of events
+ */
+void mboxevent_freequeue(struct mboxevent **event);
+
+/*
+ * Add this set of system flags and user flags to flagNames parameter.
+ * Exclude flags present in event_exclude_flags setting.
+ */
+void mboxevent_add_flags(struct mboxevent *event, char *flagnamesMAX_USER_FLAGS,
+ bit32 system_flags, bit32 user_flagsMAX_USER_FLAGS/32);
+
+/*
+ * Add the given flag to flagNames parameter.
+ * event_exclude_flags doesn't apply here
+ */
+void mboxevent_add_flag(struct mboxevent *event, const char *flag);
+
+/*
+ * Extract data related to message store access accounting
+ */
+void mboxevent_set_access(struct mboxevent *event,
+ const char *serveraddr, const char *clientaddr,
+ const char *userid, const char *mailboxname);
+/*
+ * Extract data from the given record to fill these event parameters :
+ * - uidset from UID
+ * - vnd.cmu.midset from Message-Id in ENVELOPE structure
+ * - messageSize
+ * - bodyStructure
+ *
+ * Called once per message and always before mboxevent_extract_mailbox
+ */
+void mboxevent_extract_record(struct mboxevent *event,
+ struct mailbox *mailbox,
+ struct index_record *record);
+
+/*
+ * Fill event parameter about the copied message.
+ * Called once per message and always before mboxevent_extract_mailbox
+ */
+void mboxevent_extract_copied_record(struct mboxevent *event,
+				 const struct mailbox *mailbox, uint32_t uid);
+
+/*
+ * Extract message content to include to event notification
+ */
+void mboxevent_extract_content(struct mboxevent *event,
+ const struct index_record *record, FILE* content);
+
+/*
+ * Extract quota limit, quota usage and quota root to include to event
+ * notification
+ */
+void mboxevent_extract_quota(struct mboxevent *event, const struct quota *quota,
+ enum quota_resource res);
+
+/*
+ * Set the given number of unseen message if positive or scan the entire mailbox
+ * to count it.
+ */
+void mboxevent_set_numunseen(struct mboxevent *event, struct mailbox *mailbox,
+ int numunseen);
+/*
+ * Extract meta-data from the given mailbox to fill mailboxID event parameter and
+ * optionally these ones depending the type of the event:
+ * - messages
+ * - uidnext
+ * - vnd.cmu.unseenMessages
+ *
+ * Must be called once per event or the notification will failed (Except for
+ * Login and Logout events)
+ * Mailbox must be locked to count the number of \Seen flags
+ *
+ * It is necessary to call this function after all changes on mailbox to get the
+ * right values of messages, uidnext and vnd.cmu.unseenMessages event parameters
+ */
+void mboxevent_extract_mailbox(struct mboxevent *event, struct mailbox *mailbox);
+
+/*
+ * Extract meta-data from the given mailbox to fill oldMailboxID event parameter
+ */
+void mboxevent_extract_old_mailbox(struct mboxevent *event,
+ const struct mailbox *mailbox);
+
+
+/*
+ * set the client tag used by vnd.fastmail.clientTagj
+ */
+void mboxevent_set_client_id(const char *);
+
+#endif /* _MBOXEVENT_H */

cyrus-imapd-2.4.17.tar.gz/imap/mboxkey.c -> cyrus-imapd-2.5.tar.gz/imap/mboxkey.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mboxkey.c,v 1.8 2010/01/06 17:01:36 murch Exp $
 */
 
 #include <config.h>
@@ -47,7 +45,6 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <string.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <errno.h>
@@ -66,7 +63,7 @@
 #include "global.h"
 #include "xmalloc.h"
 #include "mailbox.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mboxkey.h"
 
 #define FNAME_MBOXKEYSUFFIX ".mboxkey" /* per user mailbox key extension */
@@ -90,7 +87,7 @@
 static void abortcurrent(struct mboxkey *s)
 {
 if (s && s->tid) {
-	int r = DB->abort(s->db, s->tid);
+	int r = cyrusdb_abort(s->db, s->tid);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error aborting txn: %s", 
 		 cyrusdb_strerror(r));
@@ -99,7 +96,7 @@
 }
 }
 
-char *mboxkey_getpath(const char *userid)
+HIDDEN char *mboxkey_getpath(const char *userid)
 {
 char *fname = xmalloc(strlen(config_dir) + sizeof(FNAME_DOMAINDIR) +
 			 sizeof(FNAME_USERDIR) + strlen(userid) +
@@ -123,7 +120,7 @@
 return fname;
 }
 
-int mboxkey_open(const char *user,
+EXPORTED int mboxkey_open(const char *user,
 		 int flags,
 		 struct mboxkey **mboxkeydbptr)
 {
@@ -151,7 +148,7 @@
 /* otherwise, close the existing database */
 if (mboxkeydb) {
 	abortcurrent(mboxkeydb);
-	r = (DB->close)(mboxkeydb->db);
+	r = cyrusdb_close(mboxkeydb->db);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing mboxkeydb: %s", 
 		 cyrusdb_strerror(r));
@@ -165,7 +162,7 @@
 
 /* open the mboxkeydb corresponding to user */
 fname = mboxkey_getpath(user);
- r = (DB->open)(fname, (flags & MBOXKEY_CREATE) ? CYRUSDB_CREATE : 0,
+ r = cyrusdb_open(DB, fname, (flags & MBOXKEY_CREATE) ? CYRUSDB_CREATE : 0,
 		 &mboxkeydb->db);
 if (r != 0) {
 	int level = (flags & MBOXKEY_CREATE) ? LOG_ERR : LOG_DEBUG;
@@ -192,15 +189,15 @@
 {
 int r;
 const char *data;
- int datalen;
+ size_t datalen;
 unsigned short version, s;
 
 assert(mboxkeydb && mailbox);
 if (rw || mboxkeydb->tid) {
-	r = DB->fetchlock(mboxkeydb->db, mailbox, strlen(mailbox),
+	r = cyrusdb_fetchlock(mboxkeydb->db, mailbox, strlen(mailbox),
 			 &data, &datalen, &mboxkeydb->tid);
 } else {
-	r = DB->fetch(mboxkeydb->db, mailbox, strlen(mailbox),
+	r = cyrusdb_fetch(mboxkeydb->db, mailbox, strlen(mailbox),
 		 &data, &datalen, NULL);
 }
 switch (r) {
@@ -234,7 +231,7 @@
 return 0;
 }
 
-int mboxkey_read(struct mboxkey *mboxkeydb, const char *mailbox,
+EXPORTED int mboxkey_read(struct mboxkey *mboxkeydb, const char *mailbox,
 		 const char **mboxkey, size_t *mboxkeylen)
 {
 if (MBOXKEY_DEBUG) {
@@ -256,7 +253,7 @@
 return mboxkey_readit(mboxkeydb, mailbox, mboxkey, mboxkeylen, 1);
 }
 
-int mboxkey_write(struct mboxkey *mboxkeydb, const char *mailbox,
+EXPORTED int mboxkey_write(struct mboxkey *mboxkeydb, const char *mailbox,
 		 const char *mboxkey, size_t mboxkeylen)
 {
 int r;
@@ -270,7 +267,7 @@
 }
 
 if (!mboxkey) {
-	r = DB->delete(mboxkeydb->db, mailbox, strlen(mailbox),
+	r = cyrusdb_delete(mboxkeydb->db, mailbox, strlen(mailbox),
 		 &mboxkeydb->tid, 1);
 }
 else {
@@ -282,7 +279,7 @@
 	memcpy(data, &s, sizeof(s));
 	memcpy(data+sizeof(s), mboxkey, mboxkeylen);
 
-	r = DB->store(mboxkeydb->db, mailbox, strlen(mailbox),
+	r = cyrusdb_store(mboxkeydb->db, mailbox, strlen(mailbox),
 		 data, datalen, &mboxkeydb->tid);
 	free(data);
 }
@@ -303,7 +300,7 @@
 return r;
 }
 
-int mboxkey_close(struct mboxkey *mboxkeydb)
+EXPORTED int mboxkey_close(struct mboxkey *mboxkeydb)
 {
 int r;
 
@@ -313,7 +310,7 @@
 }
 
 if (mboxkeydb->tid) {
-	r = DB->commit(mboxkeydb->db, mboxkeydb->tid);
+	r = cyrusdb_commit(mboxkeydb->db, mboxkeydb->tid);
 	if (r != CYRUSDB_OK) {
 	 syslog(LOG_ERR, "DBERROR: error committing mboxkey txn; "
 		 "mboxkey state lost: %s", cyrusdb_strerror(r));
@@ -326,7 +323,7 @@
 
 	/* free the old database hanging around */
 	abortcurrent(lastmboxkey);
-	r = (DB->close)(lastmboxkey->db);
+	r = cyrusdb_close(lastmboxkey->db);
 	if (r != CYRUSDB_OK) {
 	 syslog(LOG_ERR, "DBERROR: error closing lastmboxkey: %s",
 		 cyrusdb_strerror(r));
@@ -344,7 +341,7 @@
 return 0;
 }
 
-int mboxkey_delete_user(const char *user)
+EXPORTED int mboxkey_delete_user(const char *user)
 {
 char *fname = mboxkey_getpath(user);
 int r = 0;
@@ -390,7 +387,7 @@
 	 mboxkeydb->user);
 }
 
- r = DB->commit(mboxkeydb->db, mboxkeydb->tid);
+ r = cyrusdb_commit(mboxkeydb->db, mboxkeydb->tid);
 if (r != CYRUSDB_OK) {
 	syslog(LOG_ERR, "DBERROR: error committing mboxkey txn; "
 	 "mboxkey state lost: %s", cyrusdb_strerror(r));
@@ -400,7 +397,7 @@
 return 0;
 }
 
-int mboxkey_done(void)
+EXPORTED int mboxkey_done(void)
 {
 int r = 0;
 
@@ -410,7 +407,7 @@
 
 if (lastmboxkey) {
 	abortcurrent(lastmboxkey);
-	r = (DB->close)(lastmboxkey->db);
+	r = cyrusdb_close(lastmboxkey->db);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing lastmboxkey: %s",
 		 cyrusdb_strerror(r));
@@ -435,18 +432,18 @@
 * XXX We currently have nothing to compare against.
 */
 static int mboxkey_merge_cb(void *rockp,
-			 const char *key, int keylen,
-			 const char *tmpdata, int tmpdatalen) 
+			 const char *key, size_t keylen,
+			 const char *tmpdata, size_t tmpdatalen) 
 {
 int r;
 struct mboxkey_merge_rock *rockdata = (struct mboxkey_merge_rock *)rockp;
 struct db *tgtdb = rockdata->db;
 const char *tgtdata;
- int tgtdatalen;
+ size_t tgtdatalen;
 
 if (!tgtdb) return IMAP_INTERNAL;
 
- r = DB->fetchlock(tgtdb, key, keylen, &tgtdata, &tgtdatalen,
+ r = cyrusdb_fetchlock(tgtdb, key, keylen, &tgtdata, &tgtdatalen,
 		 &(rockdata->tid));
 if(!r && tgtdata) {
 	unsigned short version, s;
@@ -463,35 +460,35 @@
 	assert(version == MBOXKEY_VERSION);
 }
 
- return DB->store(tgtdb, key, keylen, tmpdata, tmpdatalen,
+ return cyrusdb_store(tgtdb, key, keylen, tmpdata, tmpdatalen,
 		 &(rockdata->tid));
 }
 
-int mboxkey_merge(const char *tmpfile, const char *tgtfile) 
+HIDDEN int mboxkey_merge(const char *tmpfile, const char *tgtfile)
 {
 int r = 0;
 struct db *tmp = NULL, *tgt = NULL;
 struct mboxkey_merge_rock rock;
 
 /* xxx does this need to be CYRUSDB_CREATE? */
- r = (DB->open)(tmpfile, CYRUSDB_CREATE, &tmp);
+ r = cyrusdb_open(DB, tmpfile, CYRUSDB_CREATE, &tmp);
 if(r) goto done;
 	 
- r = (DB->open)(tgtfile, CYRUSDB_CREATE, &tgt);
+ r = cyrusdb_open(DB, tgtfile, CYRUSDB_CREATE, &tgt);
 if(r) goto done;
 
 rock.db = tgt;
 rock.tid = NULL;
 
- r = DB->foreach(tmp, "", 0, NULL, mboxkey_merge_cb, &rock, &rock.tid);
+ r = cyrusdb_foreach(tmp, "", 0, NULL, mboxkey_merge_cb, &rock, &rock.tid);
 
- if(r) DB->abort(rock.db, rock.tid);
- else DB->commit(rock.db, rock.tid);
+ if(r) cyrusdb_abort(rock.db, rock.tid);
+ else cyrusdb_commit(rock.db, rock.tid);
 
 done:
 
- if(tgt) (DB->close)(tgt);
- if(tmp) (DB->close)(tmp);
+ if(tgt) cyrusdb_close(tgt);
+ if(tmp) cyrusdb_close(tmp);
 
 return r;
 }

cyrus-imapd-2.4.17.tar.gz/imap/mboxkey.h -> cyrus-imapd-2.5.tar.gz/imap/mboxkey.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/mboxlist.c -> cyrus-imapd-2.5.tar.gz/imap/mboxlist.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mboxlist.c,v 1.275 2010/07/23 19:19:03 wescraig Exp $
 */
 
 #include <config.h>
@@ -50,12 +48,10 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <ctype.h>
 #include <syslog.h>
 
 #include <sys/ipc.h>
@@ -63,16 +59,15 @@
 
 #include "acl.h"
 #include "annotate.h"
-#include "auth.h"
-#include "bsearch.h"
 #include "glob.h"
 #include "assert.h"
 #include "global.h"
 #include "cyrusdb.h"
 #include "util.h"
 #include "mailbox.h"
+#include "mboxevent.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
@@ -90,47 +85,149 @@
 
 cyrus_acl_canonproc_t mboxlist_ensureOwnerRights;
 
-struct db *mbdb;
+EXPORTED struct db *mbdb;
 
 static int mboxlist_dbopen = 0;
 
-static int mboxlist_opensubs();
-static void mboxlist_closesubs();
+static int mboxlist_opensubs(const char *userid, struct db **ret);
+static void mboxlist_closesubs(struct db *sub);
 
 static int mboxlist_rmquota(const char *name, int matchlen, int maycreate,
 			 void *rock);
 static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
 				void *rock);
 
-char *mboxlist_makeentry(int mbtype, const char *part, const char *acl)
+EXPORTED mbentry_t *mboxlist_entry_create(void)
+{
+ mbentry_t *ret = xzmalloc(sizeof(mbentry_t));
+ /* xxx - initialiser functions here? */
+ return ret;
+}
+
+EXPORTED void mboxlist_entry_free(mbentry_t **mbentryptr)
+{
+ mbentry_t *mbentry = *mbentryptr;
+
+ /* idempotent */
+ if (!mbentry) return;
+
+ free(mbentry->name);
+
+ free(mbentry->partition);
+ free(mbentry->server);
+ free(mbentry->acl);
+ free(mbentry->uniqueid);
+
+ free(mbentry->legacy_specialuse);
+
+ free(mbentry);
+
+ *mbentryptr = NULL;
+}
+
+static void _write_acl(struct dlist *dl, const char *aclstr)
+{
+ const char *p, *q;
+ struct dlist *al = dlist_newkvlist(dl, "A");
+
+ p = aclstr;
+
+ while (p && *p) {
+	char *name,*val;
+
+	q = strchr(p, '\t');
+	if (!q) break;
+
+	name = xstrndup(p, q-p);
+	q++;
+
+	p = strchr(q, '\t');
+	if (p) {
+	 val = xstrndup(q, p-q);
+	 p++;
+	}
+	else
+	 val = xstrdup(q);
+
+	dlist_setatom(al, name, val);
+
+	free(name);
+	free(val);
+ }
+}
+
+EXPORTED const char *mboxlist_mbtype_to_string(uint32_t mbtype)
 {
- char *mboxent = (char *) xmalloc(sizeof(char) * 
-				 (30 + strlen(acl) + strlen(part)));
- sprintf(mboxent, "%d %s %s", mbtype, part, acl);
- return mboxent;
+ static struct buf buf = BUF_INITIALIZER;
+
+ buf_reset(&buf);
+
+ if (mbtype & MBTYPE_DELETED)
+	buf_putc(&buf, 'd');
+ if (mbtype & MBTYPE_MOVING)
+	buf_putc(&buf, 'm');
+ if (mbtype & MBTYPE_NETNEWS)
+	buf_putc(&buf, 'n');
+ if (mbtype & MBTYPE_REMOTE)
+	buf_putc(&buf, 'r');
+ if (mbtype & MBTYPE_RESERVE)
+	buf_putc(&buf, 'z');
+ if (mbtype & MBTYPE_CALENDAR)
+	buf_putc(&buf, 'c');
+ if (mbtype & MBTYPE_ADDRESSBOOK)
+	buf_putc(&buf, 'a');
+
+ return buf_cstring(&buf);
+}
+
+EXPORTED char *mboxlist_entry_cstring(mbentry_t *mbentry)
+{
+ struct buf buf = BUF_INITIALIZER;
+ struct dlist *dl = dlist_newkvlist(NULL, mbentry->name);
+
+ if (mbentry->acl)
+	_write_acl(dl, mbentry->acl);
+
+ if (mbentry->uniqueid)
+	dlist_setatom(dl, "I", mbentry->uniqueid);
+
+ if (mbentry->partition)
+	dlist_setatom(dl, "P", mbentry->partition);
+
+ if (mbentry->server)
+	dlist_setatom(dl, "S", mbentry->server);
+
+ if (mbentry->mbtype)
+	dlist_setatom(dl, "T", mboxlist_mbtype_to_string(mbentry->mbtype));
+
+ if (mbentry->uidvalidity)
+	dlist_setnum32(dl, "V", mbentry->uidvalidity);
+
+ dlist_setdate(dl, "M", time(NULL));
+
+ dlist_printbuf(dl, 0, &buf);
+
+ dlist_free(&dl);
+
+ return buf_release(&buf);
 }
 
 /*
- * Lookup 'name' in the mailbox list.
- * The capitalization of 'name' is canonicalized to the way it appears
- * in the mailbox list.
- * If 'path' is non-nil, a pointer to the full pathname of the mailbox
- * is placed in the char * pointed to by it. If 'acl' is non-nil, a pointer
- * to the mailbox ACL is placed in the char * pointed to by it.
+ * read a single record from the mailboxes.db and return a pointer to it
 */
-static int mboxlist_read(const char *name, const char **dataptr, int *datalenptr,
+static int mboxlist_read(const char *name, const char **dataptr, size_t *datalenptr,
 			 struct txn **tid, int wrlock)
 {
 int namelen = strlen(name);
 int r;
 
- if (namelen == 0) {
+ if (!namelen)
 	return IMAP_MAILBOX_NONEXISTENT;
- }
+
 if (wrlock) {
-	r = DB->fetchlock(mbdb, name, namelen, dataptr, datalenptr, tid);
+	r = cyrusdb_fetchlock(mbdb, name, namelen, dataptr, datalenptr, tid);
 } else {
-	r = DB->fetch(mbdb, name, namelen, dataptr, datalenptr, tid);
+	r = cyrusdb_fetch(mbdb, name, namelen, dataptr, datalenptr, tid);
 }
 
 switch (r) {
@@ -157,74 +254,236 @@
 /* never get here */
 }
 
-static int mboxlist_mylookup(const char *name, struct mboxlist_entry *entry,
+static char *_parse_acl(struct dlist *di)
+{
+ struct buf buf = BUF_INITIALIZER;
+ struct dlist *ai;
+
+ /* gotta make it all tabby again */
+ for (ai = di->head; ai; ai = ai->next) {
+	buf_printf(&buf, "%s\t", ai->name);
+	buf_printf(&buf, "%s\t", dlist_cstring(ai));
+ }
+
+ return buf_release(&buf);
+}
+
+EXPORTED uint32_t mboxlist_string_to_mbtype(const char *string)
+{
+ uint32_t mbtype = 0;
+
+ if (!string) return 0; /* null just means default */
+
+ for (; *string; string++) {
+	switch (*string) {
+	case 'a':
+	 mbtype |= MBTYPE_ADDRESSBOOK;
+	 break;
+	case 'c':
+	 mbtype |= MBTYPE_CALENDAR;
+	 break;
+	case 'd':
+	 mbtype |= MBTYPE_DELETED;
+	 break;
+	case 'm':
+	 mbtype |= MBTYPE_MOVING;
+	 break;
+	case 'n':
+	 mbtype |= MBTYPE_NETNEWS;
+	 break;
+	case 'r':
+	 mbtype |= MBTYPE_REMOTE;
+	 break;
+	case 'z':
+	 mbtype |= MBTYPE_RESERVE;
+	 break;
+	}
+ }
+
+ return mbtype;
+}
+
+/*
+ * parse a record read from the mailboxes.db into its parts.
+ *
+ * full dlist format is:
+ * A: _a_cl
+ * I: unique_i_d
+ * M: _m_time
+ * P: _p_artition
+ * S: _s_erver
+ * T: _t_ype
+ * V: uid_v_alidity
+ */
+EXPORTED int mboxlist_parse_entry(mbentry_t **mbentryptr,
+				 const char *name, size_t namelen,
+				 const char *data, size_t datalen)
+{
+ int r = IMAP_MAILBOX_BADFORMAT;
+ char *freeme = NULL;
+ char **target;
+ char *p, *q;
+ mbentry_t *mbentry = mboxlist_entry_create();
+
+ if (!datalen)
+	goto done;
+
+ /* copy name */
+ if (namelen)
+	mbentry->name = xstrndup(name, namelen);
+ else
+	mbentry->name = xstrdup(name);
+
+ /* check for DLIST mboxlist */
+ if (*data == '%') {
+	struct dlist *dl = NULL;
+	struct dlist *di;
+	r = dlist_parsemap(&dl, 0, data, datalen);
+	if (r) goto done;
+	if (!dl) goto done;
+	for (di = dl->head; di; di = di->next) {
+	 switch(di->name0) {
+	 case 'A':
+		mbentry->acl = _parse_acl(di);
+		break;
+	 case 'I':
+		mbentry->uniqueid = xstrdupnull(dlist_cstring(di));
+		break;
+	 case 'M':
+		mbentry->mtime = dlist_num(di);
+		break;
+	 case 'P':
+		mbentry->partition = xstrdupnull(dlist_cstring(di));
+		break;
+	 case 'S':
+		mbentry->server = xstrdupnull(dlist_cstring(di));
+		break;
+	 case 'T':
+		mbentry->mbtype = mboxlist_string_to_mbtype(dlist_cstring(di));
+		break;
+	 case 'V':
+		mbentry->uidvalidity = dlist_num(di);
+		break;
+	 }
+	}
+	dlist_free(&dl);
+
+	r = 0;
+	goto done;
+ }
+
+ /* copy data */
+ freeme = p = xstrndup(data, datalen);
+
+ /* check for extended mboxlist entry */
+ if (*p == '(') {
+	int last = 0;
+	p++; /* past leading '(' */
+	while (!last) {
+	 target = NULL;
+	 q = p;
+	 while (*q && *q != ' ' && *q != ')') q++;
+	 if (*q != ' ') break;
+	 *q++ = '\0';
+	 if (!strcmp(p, "uniqueid")) target = &mbentry->uniqueid;
+	 if (!strcmp(p, "specialuse")) target = &mbentry->legacy_specialuse;
+	 p = q;
+	 while (*q && *q != ' ' && *q != ')') q++;
+	 if (*q != ' ') last = 1;
+	 if (*q) *q++ = '\0';
+	 if (target) *target = xstrdup(p);
+	 p = q;
+	}
+	if (*p == ' ') p++; /* past trailing ' ' */
+ }
+
+ /* copy out interesting parts */
+ mbentry->mbtype = strtol(p, &p, 10);
+ if (*p == ' ') p++;
+
+ q = p;
+ while (*q && *q != ' ' && *q != '!') q++;
+ if (*q == '!') {
+	*q++ = '\0';
+	mbentry->server = xstrdup(p);
+	p = q;
+	while (*q && *q != ' ') q++;
+ }
+ if (*q) *q++ = '\0';
+ mbentry->partition = xstrdup(p);
+
+ mbentry->acl = xstrdup(q);
+
+ r = 0;
+
+done:
+ if (!r && mbentryptr)
+	*mbentryptr = mbentry;
+ else mboxlist_entry_free(&mbentry);
+ free(freeme);
+ return r;
+}
+
+/* read a record and parse into parts */
+static int mboxlist_mylookup(const char *name,
+			 mbentry_t **mbentryptr,
 			 struct txn **tid, int wrlock)
 {
- int acllen;
- static char partitionMAX_PARTITION_LEN+HOSTNAME_SIZE+2;
- static char *aclresult;
- static int aclresultalloced;
 int r;
 const char *data;
- char *p, *q;
- int datalen;
- int mbtype;
+ size_t datalen;
 
 r = mboxlist_read(name, &data, &datalen, tid, wrlock);
 if (r) return r;
 
- /* copy out interesting parts */
- mbtype = strtol(data, &p, 10);
+ return mboxlist_parse_entry(mbentryptr, name, 0, data, datalen);
+}
 
- if (!p)
-	return IMAP_IOERROR;
+/*
+ * Lookup 'name' in the mailbox list, ignoring reserved records
+ */
+EXPORTED int mboxlist_lookup(const char *name, mbentry_t **entryptr,
+			 struct txn **tid)
+{
+ mbentry_t *entry = NULL;
+ int r;
 
- if (*p == ' ' && (p - data) < datalen) p++;
- q = partition;
- while (*p != ' ' && (p - data) < datalen) { /* copy out partition name */
-	*q++ = *p++;
- }
- *q = '\0';
- p++;
+ r = mboxlist_mylookup(name, &entry, tid, 0);
+
+ if (r) return r;
 
- acllen = datalen - (p - data);
- if (acllen >= aclresultalloced) {
-	aclresultalloced = acllen + 100;
-	aclresult = xrealloc(aclresult, aclresultalloced);
+ /* Ignore "reserved" entries, like they aren't there */
+ if (entry->mbtype & MBTYPE_RESERVE) {
+	mboxlist_entry_free(&entry);
+	return IMAP_MAILBOX_RESERVED;
 }
- memcpy(aclresult, p, acllen);
- aclresultacllen = '\0';
 
- if (entry) {
-	entry->name = name;
-	entry->partition = partition;
-	entry->mbtype = mbtype;
-	entry->acl = aclresult;
+ /* Ignore "deleted" entries, like they aren't there */
+ if (entry->mbtype & MBTYPE_DELETED) {
+	mboxlist_entry_free(&entry);
+	return IMAP_MAILBOX_NONEXISTENT;
 }
 
- /* here we go, ignore them! */
- if (mbtype & MBTYPE_RESERVE)
-	return IMAP_MAILBOX_RESERVED;
+ if (entryptr) *entryptr = entry;
+ else mboxlist_entry_free(&entry);
 
 return 0;
 }
 
-/*
- * Lookup 'name' in the mailbox list.
- * The capitalization of 'name' is canonicalized to the way it appears
- * in the mailbox list.
- * If 'acl' is non-nil, a pointer to the mailbox ACL is placed in the char
- * pointed to by it.
- */
-int mboxlist_lookup(const char *name, struct mboxlist_entry *entry, struct txn **tid)
+/* now this is just silly, but hey */
+EXPORTED int mboxlist_lookup_allow_reserved(const char *name,
+				 mbentry_t **entryptr,
+				 struct txn **tid)
 {
- return mboxlist_mylookup(name, entry, tid, 0);
+ return mboxlist_mylookup(name, entryptr, tid, 0);
 }
 
-int mboxlist_findstage(const char *name, char *stagedir, size_t sd_len) 
+/* given a mailbox name, find the staging directory. XXX - this should
+ * require more locking, and staging directories should be by pid */
+HIDDEN int mboxlist_findstage(const char *name, char *stagedir, size_t sd_len)
 {
 const char *root;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 
 assert(stagedir != NULL);
@@ -233,55 +492,57 @@
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) return r;
 
- root = config_partitiondir(mbentry.partition);
+ root = config_partitiondir(mbentry->partition);
+ mboxlist_entry_free(&mbentry);
+
 if (!root) return IMAP_PARTITION_UNKNOWN;
 
 snprintf(stagedir, sd_len, "%s/stage./", root);
- 
+
 return 0;
 }
 
-int mboxlist_update(const char *name, int mbtype, 
-		 const char *part,
-		 const char *acl, int localonly)
+EXPORTED int mboxlist_update(mbentry_t *mbentry, int localonly)
 {
 int r = 0, r2 = 0;
 char *mboxent = NULL;
 struct txn *tid = NULL;
- 
- mboxent = mboxlist_makeentry(mbtype, part, acl);
- r = DB->store(mbdb, name, strlen(name), mboxent, strlen(mboxent), &tid);
+
+ mboxent = mboxlist_entry_cstring(mbentry);
+ r = cyrusdb_store(mbdb, mbentry->name, strlen(mbentry->name),
+		 mboxent, strlen(mboxent), &tid);
 free(mboxent);
 mboxent = NULL;
 
+ /* commit the change to mupdate */
 if (!r && !localonly && config_mupdate_server) {
 mupdate_handle *mupdate_h = NULL;
-	/* commit the update to MUPDATE */
-	char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
-	
-	snprintf(buf, sizeof(buf), "%s!%s", config_servername, part);
-	
+
 	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
-	if(r) {
+	if (r) {
 	 syslog(LOG_ERR,
 		 "cannot connect to mupdate server for update of '%s'",
-		 name);
+		 mbentry->name);
 	} else {
-	 r = mupdate_activate(mupdate_h, name, buf, acl);
-	 if(r) {
+	 char *location = strconcat(config_servername, "!",
+				 mbentry->partition, (char *)NULL);
+	 r = mupdate_activate(mupdate_h, mbentry->name,
+				 location, mbentry->acl);
+	 free(location);
+	 if (r) {
 		syslog(LOG_ERR,
 		 "MUPDATE: can't update mailbox entry for '%s'",
-		 name);
+		 mbentry->name);
 	 }
 	}
 	mupdate_disconnect(&mupdate_h);
 }
 
 if (tid) {
-	if(r) {
-	 r2 = DB->abort(mbdb, tid);
+	if (r) {
+	 r2 = cyrusdb_abort(mbdb, tid);
 	} else {
-	 r2 = DB->commit(mbdb, tid);
+	 r2 = cyrusdb_commit(mbdb, tid);
 	}
 }
 
@@ -293,253 +554,251 @@
 return r;
 }
 
-/*
- * Check/set up for mailbox creation
- */
-/* xxx shouldn't we be using mbtype or getting rid of it entirely? */
-static int
-mboxlist_mycreatemailboxcheck(const char *mboxname,
-			 int new_mbtype __attribute__((unused)),
-			 const char *partition,
-			 int isadmin, const char *userid,
-			 struct auth_state *auth_state,
-			 char **newacl, char **newpartition,
-			 int RMW, int localonly, int force_user_create,
-			 struct txn **tid)
+static int mboxlist_findparent(const char *mboxname,
+			 mbentry_t **mbentryp)
 {
- int r;
- struct mboxlist_entry mbentry;
- char *name = xstrdup(mboxname);
- char *mbox = name;
+ mbentry_t *mbentry = NULL;
+ char *parent = xstrdup(mboxname);
+ int parentlen = 0;
 char *p;
- char *defaultacl, *identifier, *rights;
- char parentMAX_MAILBOX_BUFFER;
- unsigned long parentlen;
- char *parentname = NULL;
- unsigned long parentpartitionlen = 0;
- unsigned long parentacllen = 0;
- int user_folder_limit;
- char *ourpartition = NULL;
- char *ouracl;
- 
- /* Check for invalid name/partition */
- if (partition && strlen(partition) > MAX_PARTITION_LEN) {
-	return IMAP_PARTITION_UNKNOWN;
- }
- if (config_virtdomains && (p = strchr(name, '!'))) {
-	/* pointer to mailbox w/o domain prefix */
-	mbox = p + 1;
- }
- r = mboxname_policycheck(mbox);
- /* filthy hack to support rename pre-check semantics, which
- will go away when we refactor this code */
- if (r && force_user_create != 1) return r;
+ int r = IMAP_MAILBOX_NONEXISTENT;
 
- /* you must be a real admin to create a local-only mailbox */
- if(!isadmin && localonly) return IMAP_PERMISSION_DENIED;
- if(!isadmin && force_user_create) return IMAP_PERMISSION_DENIED;
+ while ((parentlen==0) && (p = strrchr(parent, '.')) && !strchr(p, '!')) {
+	*p = '\0';
 
- /* User has admin rights over their own mailbox namespace */
- if (mboxname_userownsmailbox(userid, name) && strchr(mbox+5, '.') &&
-	(config_implicitrights & ACL_ADMIN)) {
-	isadmin = 1;
+	mboxlist_entry_free(&mbentry);
+	r = mboxlist_lookup(parent, &mbentry, NULL);
+	if (r != IMAP_MAILBOX_NONEXISTENT)
+	 break;
 }
 
- /* Check to see if new mailbox exists */
- r = mboxlist_mylookup(name, &mbentry, tid, RMW);
- switch (r) {
- case 0:
-	r = IMAP_MAILBOX_EXISTS;
-	
-	/* Lie about error if privacy demands */
-	if (!isadmin && 
-	 !(cyrus_acl_myrights(auth_state, mbentry.acl) & ACL_LOOKUP)) {
-	 r = IMAP_PERMISSION_DENIED;
-	}
+ free(parent);
 
-	return r; 
-	break;
- case IMAP_MAILBOX_NONEXISTENT:
-	break;
+ if (r)
+	mboxlist_entry_free(&mbentry);
+ else
+	*mbentryp = mbentry;
 
- default:
-	return r;
-	break;
+ return r;
+}
+
+static int mboxlist_create_partition(const char *mboxname,
+				 const char *part,
+				 char **out)
+{
+ mbentry_t *parent = NULL;
+
+ if (!part) {
+	int r = mboxlist_findparent(mboxname, &parent);
+	if (!r) part = parent->partition;
 }
 
- /* Search for a parent - stop if we hit the domain separator */
- strlcpy(parent, name, sizeof(parent));
- parentlen = 0;
- while ((parentlen==0) && (p = strrchr(parent, '.')) && !strchr(p, '!')) {
-	*p = '\0';
+ /* use defaultpartition if specified */
+ if (!part && config_defpartition)
+	part = config_defpartition;
 
-	r = mboxlist_mylookup(parent, &mbentry, tid, 0);
-	switch (r) {
-	case 0:
-	 parentlen = strlen(parent);
-	 parentname = parent;
+ /* look for partition with free space */
+ if (!part)
+	part = find_free_partition(NULL);
 
-	 parentpartitionlen = strlen(mbentry.partition);
+ /* Configuration error */
+ if (strlen(part) > MAX_PARTITION_LEN)
+	goto err;
 
-	 parentacllen = strlen(mbentry.acl);
-	 break;
+ if (!config_partitiondir(part))
+	goto err;
 
-	case IMAP_MAILBOX_NONEXISTENT:
-	 break;
+ *out = xstrdupnull(part);
 
-	default:
-	 return r;
-	 break;
-	}
+ mboxlist_entry_free(&parent);
+ return 0;
+
+err:
+ mboxlist_entry_free(&parent);
+ return IMAP_PARTITION_UNKNOWN;
+}
+
+/*
+ * Check if a mailbox can be created. There is no other setup at this
+ * stage, just the check!
+ */
+static int mboxlist_create_namecheck(const char *mboxname,
+				 const char *userid,
+				 struct auth_state *auth_state,
+				 int isadmin, int force_subdirs)
+{
+ mbentry_t *mbentry = NULL;
+ const char *p;
+ int r = 0;
+
+ /* policy first */
+ r = mboxname_policycheck(mboxname);
+ if (r) goto done;
+
+ /* is this the user's INBOX namespace? */
+ if (!isadmin && mboxname_userownsmailbox(userid, mboxname)) {
+	/* User has admin rights over their own mailbox namespace */
+	if (config_implicitrights & ACL_ADMIN)
+	 isadmin = 1;
 }
 
- /* check the folder limit - XXX bogus for two reasons! (user is admin, domain check failure) */
- if (!isadmin && (user_folder_limit = config_getint(IMAPOPT_USER_FOLDER_LIMIT))) {
-	char bufMAX_MAILBOX_NAME+1;
-	strncpy(buf, mbox, MAX_MAILBOX_NAME);
-	if (!strncmp(buf, "user.", 5)) {
-	 char *firstdot = strchr(buf+5, '.');
-	 if (firstdot) *firstdot = '\0';
-	 if (mboxlist_count_inferiors(buf, isadmin, userid, auth_state) + 1
-					 >= user_folder_limit) {
-		syslog(LOG_ERR, "LIMIT: refused to create %s for %s because of limit %d",
-			 mbox, userid, user_folder_limit);
-		return IMAP_PERMISSION_DENIED;
+ /* Check to see if mailbox already exists */
+ r = mboxlist_lookup(mboxname, &mbentry, NULL);
+ if (r != IMAP_MAILBOX_NONEXISTENT) {
+	if (!r) {
+	 r = IMAP_MAILBOX_EXISTS;
+
+	 /* Lie about error if privacy demands */
+	 if (!isadmin &&
+		!(cyrus_acl_myrights(auth_state, mbentry->acl) & ACL_LOOKUP)) {
+		r = IMAP_PERMISSION_DENIED;
 	 }
 	}
+
+	goto done;
 }
+ mboxlist_entry_free(&mbentry);
+
+ /* look for a parent mailbox */
+ r = mboxlist_findparent(mboxname, &mbentry);
+ if (r == 0) {
+	/* found a parent */
+	char rootMAX_MAILBOX_NAME+1;
 
- if (parentlen != 0) {
 	/* check acl */
 	if (!isadmin &&
-	 !(cyrus_acl_myrights(auth_state, mbentry.acl) & ACL_CREATE)) {
-	 return IMAP_PERMISSION_DENIED;
+	 !(cyrus_acl_myrights(auth_state, mbentry->acl) & ACL_CREATE)) {
+	 r = IMAP_PERMISSION_DENIED;
+	 goto done;
 	}
 
- 	/* Copy partition, if not specified */
-	if (partition == NULL) {
-	 ourpartition = xmalloc(parentpartitionlen + 1);
-	 memcpy(ourpartition, mbentry.partition, parentpartitionlen);
-	 ourpartitionparentpartitionlen = '\0';
-	} else {
-	 ourpartition = xstrdup(partition);
+	/* check quota */
+	if (quota_findroot(root, sizeof(root), mboxname)) {
+	 quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_DONTCARE_INITIALIZER;
+	 qdiffsQUOTA_NUMFOLDERS = 1;
+	 r = quota_check_useds(root, qdiffs);
+	 if (r) goto done;
 	}
-
-	/* Copy ACL */
-	ouracl = xmalloc(parentacllen + 1);
-	memcpy(ouracl, mbentry.acl, parentacllen);
-	ouraclparentacllen = '\0';
-
-	/* Canonicalize case of parent prefix */
-	strncpy(name, parent, strlen(parent));
- } else { /* parentlen == 0, no parent mailbox */
+ }
+ else if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* no parent mailbox */
 	if (!isadmin) {
-	 return IMAP_PERMISSION_DENIED;
+	 r = IMAP_PERMISSION_DENIED;
+	 goto done;
 	}
-	
-	ouracl = xstrdup("");
-	if (!strncmp(mbox, "user.", 5)) {
-	 char *firstdot = strchr(mbox+5, '.');
-	 if (!force_user_create && firstdot) {
-		/* Disallow creating user.X.* when no user.X */
-		free(name);
-		free(ouracl);
-		return IMAP_PERMISSION_DENIED;
-	 }
 
-	 /*
-	 * Users by default have all access to their personal mailbox(es),
-	 * Nobody else starts with any access to same.
-	 *
-	 * If this is a forced user create, we might have to avoid creating
-	 * an acl for the wrong user.
-	 */
-	 if(firstdot) *firstdot = '\0';
-	 identifier = xmalloc(mbox - name + strlen(mbox+5) + 1);
-	 strcpy(identifier, mbox+5);
-	 if(firstdot) *firstdot = '.';
-
-	 if (config_getswitch(IMAPOPT_UNIXHIERARCHYSEP)) {
-		/*
-		 * The mailboxname is now in the internal format,
-		 * so we we need to change DOTCHARs back to '.'
-		 * in the identifier in order to have the correct ACL.
-		 */
-		for (p = identifier; *p; p++) {
-		 if (*p == DOTCHAR) *p = '.';
-		}
-	 }
-	 if (mbox != name) {
-		/* add domain to identifier */
-		sprintf(identifier+strlen(identifier),
-			"@%.*s", (int) (mbox - name - 1), name);
-	 }
-	 cyrus_acl_set(&ouracl, identifier, ACL_MODE_SET, ACL_ALL,
-		 (cyrus_acl_canonproc_t *)0, (void *)0);
-	 free(identifier);
-	} else {
-	 defaultacl = identifier = 
-		xstrdup(config_getstring(IMAPOPT_DEFAULTACL));
-	 for (;;) {
-		while (*identifier && Uisspace(*identifier)) identifier++;
-		rights = identifier;
-		while (*rights && !Uisspace(*rights)) rights++;
-		if (!*rights) break;
-		*rights++ = '\0';
-		while (*rights && Uisspace(*rights)) rights++;
-		if (!*rights) break;
-		p = rights;
-		while (*p && !Uisspace(*p)) p++;
-		if (*p) *p++ = '\0';
-		cyrus_acl_set(&ouracl, identifier, ACL_MODE_SET, cyrus_acl_strtomask(rights),
-			(cyrus_acl_canonproc_t *)0, (void *)0);
-		identifier = p;
+	p = mboxname_isusermailbox(mboxname, 0);
+	if (p) {
+	 char *firstdot = strchr(p, '.');
+	 if (!force_subdirs && firstdot) {
+		/* Disallow creating user.X.* when no user.X */
+		r = IMAP_PERMISSION_DENIED;
+		goto done;
 	 }
-	 free(defaultacl);
 	}
 
-	if (!partition) { 
-	 if (config_mupdate_server &&
-		(config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_STANDARD) &&
-		!config_getstring(IMAPOPT_PROXYSERVERS)) {
-		/* proxy-only server -- caller will find a server */
-		partition = NULL;
-	 }
-	 else {
-		/* use defaultpartition if specified */
-		partition = (char *)config_defpartition;
+	/* otherwise no parent is OK */
+	r = 0;
+ }
 
-		/* otherwise find partition with most available space */
-		if (!partition) partition = find_free_partition(NULL);
+done:
+ mboxlist_entry_free(&mbentry);
 
-		if (strlen(partition) > MAX_PARTITION_LEN) {
-		 /* Configuration error */
-		 fatal("name of default partition is too long", EC_CONFIG);
-		}
+ return r;
+}
+
+static int mboxlist_create_acl(const char *mboxname, char **out)
+{
+ mbentry_t *mbentry = NULL;
+ const char *owner;
+ int r;
+
+ char *defaultacl;
+ char *identifier;
+ char *rights;
+ char *p;
+
+ r = mboxlist_findparent(mboxname, &mbentry);
+ if (!r) {
+	*out = xstrdup(mbentry->acl);
+	mboxlist_entry_free(&mbentry);
+	return 0;
+ }
+
+ *out = xstrdup("");
+ owner = mboxname_to_userid(mboxname);
+ if (owner) {
+	/* owner gets full permission on own mailbox by default */
+	if (config_getswitch(IMAPOPT_UNIXHIERARCHYSEP)) {
+	 /*
+	 * The mailboxname is now in the internal format,
+	 * so we we need to change DOTCHARs back to '.'
+	 * in the identifier in order to have the correct ACL.
+	 */
+	 for (p = (char *)owner; *p; p++) {
+		if (*p == DOTCHAR) *p = '.';
 	 }
 	}
-	if (partition) ourpartition = xstrdup(partition);
+	cyrus_acl_set(out, owner, ACL_MODE_SET, ACL_ALL,
+		 (cyrus_acl_canonproc_t *)0, (void *)0);
+	return 0;
 }
 
- if (newpartition) *newpartition = ourpartition;
- else free(ourpartition);
- if (newacl) *newacl = ouracl;
- else free(ouracl);
+ defaultacl = identifier = xstrdup(config_getstring(IMAPOPT_DEFAULTACL));
+ for (;;) {
+	while (*identifier && Uisspace(*identifier)) identifier++;
+	rights = identifier;
+	while (*rights && !Uisspace(*rights)) rights++;
+	if (!*rights) break;
+	*rights++ = '\0';
+	while (*rights && Uisspace(*rights)) rights++;
+	if (!*rights) break;
+	p = rights;
+	while (*p && !Uisspace(*p)) p++;
+	if (*p) *p++ = '\0';
+	cyrus_acl_set(out, identifier, ACL_MODE_SET, cyrus_acl_strtomask(rights),
+		 (cyrus_acl_canonproc_t *)0, (void *)0);
+	identifier = p;
+ }
+ free(defaultacl);
 
 return 0;
 }
 
-int
-mboxlist_createmailboxcheck(const char *name, int mbtype,
-			 const char *partition, 
-			 int isadmin, const char *userid, 
-			 struct auth_state *auth_state, 
-			 char **newacl, char **newpartition,
-			 int forceuser)
+/* and this API just plain sucks */
+EXPORTED int mboxlist_createmailboxcheck(const char *name, int mbtype __attribute__((unused)),
+				const char *partition, 
+				int isadmin, const char *userid, 
+				struct auth_state *auth_state, 
+				char **newacl, char **newpartition,
+				int forceuser)
 {
- return mboxlist_mycreatemailboxcheck(name, mbtype, partition, isadmin,
-					 userid, auth_state, newacl, 
-					 newpartition, 0, 0, forceuser, NULL);
+ char *part = NULL;
+ char *acl = NULL;
+ int r = 0;
+
+ r = mboxlist_create_namecheck(name, userid, auth_state,
+				 isadmin, forceuser);
+ if (r) goto done;
+
+ if (newacl) {
+	r = mboxlist_create_acl(name, &acl);
+	if (r) goto done;
+ }
+
+ if (newpartition) {
+	r = mboxlist_create_partition(name, partition, &part);
+	if (r) goto done;
+ }
+
+ done:
+ if (r || !newacl) free(acl);
+ else *newacl = acl;
+
+ if (r || !newpartition) free(part);
+ else *newpartition = part;
+
+ return r;
 }
 
 /*
@@ -553,77 +812,92 @@
 *
 */
 
-int mboxlist_createmailbox_full(const char *name, int mbtype,
+static int mboxlist_createmailbox_full(const char *mboxname, int mbtype,
 				const char *partition,
 				int isadmin, const char *userid,
 				struct auth_state *auth_state,
 				int options, unsigned uidvalidity,
+				modseq_t highestmodseq,
 				const char *copyacl, const char *uniqueid,
 				int localonly, int forceuser, int dbonly,
 				struct mailbox **mboxptr)
 {
 int r;
 char *newpartition = NULL;
- mupdate_handle *mupdate_h = NULL;
 char *mboxent = NULL;
 char *acl = NULL;
 struct mailbox *newmailbox = NULL;
 int isremote = mbtype & MBTYPE_REMOTE;
+ mbentry_t *newmbentry = NULL;
+ mbentry_t *mbentry = NULL;
+
+ r = mboxlist_create_namecheck(mboxname, userid, auth_state,
+				 isadmin, forceuser);
+ if (r) goto done;
 
- /* Must be atleast MAX_PARTITION_LEN + 30 for partition, need
- * MAX_PARTITION_LEN + HOSTNAME_SIZE + 2 for mupdate location */
- char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
+ /* check if a previous deleted mailbox existed */
+ r = mboxlist_mylookup(mboxname, &mbentry, NULL, 0);
+ if (!r && mbentry->mbtype == MBTYPE_DELETED) {
+	/* changing the unique id since last time? */
+	if (strcmpsafe(uniqueid, mbentry->uniqueid)) {
+	 /* then the UIDVALIDITY must be higher than before */
+	 if (uidvalidity <= mbentry->uidvalidity)
+		uidvalidity = mbentry->uidvalidity+1;
+	}
+ }
 
 if (copyacl) {
-	newpartition = xstrdup(partition);
 	acl = xstrdup(copyacl);
 }
 else {
-	/* 2. verify ACL's to best of ability (CRASH: abort) */
-	r = mboxlist_mycreatemailboxcheck(name, mbtype, partition, isadmin, 
-					 userid, auth_state, 
-					 &acl, &newpartition, 0, localonly,
-					 forceuser, NULL);
+	r = mboxlist_create_acl(mboxname, &acl);
 	if (r) goto done;
 }
 
- if (!newpartition) {
-	r = IMAP_IOERROR;
-	goto done;
- }
+ r = mboxlist_create_partition(mboxname, partition, &newpartition);
+ if (r) goto done;
 
 if (!dbonly && !isremote) {
 	/* Filesystem Operations */
-	r = mailbox_create(name, newpartition, acl, uniqueid,
-			 options, uidvalidity, &newmailbox);
+	r = mailbox_create(mboxname, mbtype, newpartition, acl, uniqueid,
+			 options, uidvalidity, highestmodseq, &newmailbox);
+	if (r) goto done; /* CREATE failed */ 
 }
 
- if (r) goto done; /* CREATE failed */ 
-
 /* all is well - activate the mailbox */
- mboxent = mboxlist_makeentry(mbtype, newpartition, acl);
- r = DB->store(mbdb, name, strlen(name), mboxent, strlen(mboxent), NULL);
+ newmbentry = mboxlist_entry_create();
+ newmbentry->acl = xstrdupnull(acl);
+ newmbentry->mbtype = mbtype;
+ newmbentry->partition = xstrdupnull(newpartition);
+ if (newmailbox) {
+	newmbentry->uniqueid = xstrdupnull(newmailbox->uniqueid);
+	newmbentry->uidvalidity = newmailbox->i.uidvalidity;
+ }
+ mboxent = mboxlist_entry_cstring(newmbentry);
+ r = cyrusdb_store(mbdb, mboxname, strlen(mboxname),
+		 mboxent, strlen(mboxent), NULL);
 
 if (r) {
 	syslog(LOG_ERR, "DBERROR: failed to insert to mailboxes list %s: %s", 
-	 name, cyrusdb_strerror(r));
+	 mboxname, cyrusdb_strerror(r));
 	r = IMAP_IOERROR;
 }
 
 /* 9. set MUPDATE entry as commited (CRASH: commited) */
 if (!r && config_mupdate_server && !localonly) {
-	/* commit the mailbox in MUPDATE */
-	snprintf(buf, sizeof(buf), "%s!%s", config_servername, newpartition);
+	mupdate_handle *mupdate_h = NULL;
+	char *loc = strconcat(config_servername, "!", newpartition, (char *)NULL);
 
 	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
-	if (!r) r = mupdate_reserve(mupdate_h, name, buf);
-	if (!r) r = mupdate_activate(mupdate_h, name, buf, acl);
+	if (!r) r = mupdate_reserve(mupdate_h, mboxname, loc);
+	if (!r) r = mupdate_activate(mupdate_h, mboxname, loc, acl);
 	if (r) {
-	 syslog(LOG_ERR,
-		 "MUPDATE: can't commit mailbox entry for '%s'", name);
-	 DB->delete(mbdb, name, strlen(name), NULL, 0);
+	 syslog(LOG_ERR, "MUPDATE: can't commit mailbox entry for '%s'",
+		 mboxname);
+	 cyrusdb_delete(mbdb, mboxname, strlen(mboxname), NULL, 0);
 	}
 	if (mupdate_h) mupdate_disconnect(&mupdate_h);
+	free(loc);
 }
 
 done:
@@ -633,70 +907,88 @@
 	else mailbox_close(&newmailbox);
 }
 
- if (acl) free(acl);
- if (newpartition) free(newpartition);
- if (mboxent) free(mboxent);
- 
+ free(acl);
+ free(newpartition);
+ free(mboxent);
+ mboxlist_entry_free(&mbentry);
+ mboxlist_entry_free(&newmbentry);
+
 return r;
 }
 
-int mboxlist_createmailbox(const char *name, int mbtype,
+EXPORTED int mboxlist_createmailbox(const char *name, int mbtype,
 			 const char *partition, 
 			 int isadmin, const char *userid, 
 			 struct auth_state *auth_state,
-			 int localonly, int forceuser, int dbonly)
+			 int localonly, int forceuser, int dbonly,
+			 int notify, struct mailbox **mailboxptr)
 {
- int options = config_getint(IMAPOPT_MAILBOX_DEFAULT_OPTIONS) | OPT_POP3_NEW_UIDL;
- unsigned uidvalidity = time(0);
- return mboxlist_createmailbox_full(name, mbtype, partition,
-				 isadmin, userid, auth_state,
-				 options, uidvalidity, NULL, NULL,
-				 localonly, forceuser, dbonly, NULL);
+ int options = config_getint(IMAPOPT_MAILBOX_DEFAULT_OPTIONS)
+		 | OPT_POP3_NEW_UIDL;
+ int r;
+ struct mailbox *mailbox = NULL;
+
+ r = mboxlist_createmailbox_full(name, mbtype, partition,
+				 isadmin, userid, auth_state,
+				 options, 0, 0, NULL, NULL, localonly,
+				 forceuser, dbonly, &mailbox);
+
+ if (notify && !r) {
+	/* send a MailboxCreate event notification */
+	struct mboxevent *mboxevent = mboxevent_new(EVENT_MAILBOX_CREATE);
+	mboxevent_extract_mailbox(mboxevent, mailbox);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
+ if (mailboxptr && !r) *mailboxptr = mailbox;
+ else mailbox_close(&mailbox);
+
+ return r;
 }
 
-int mboxlist_createsync(const char *name, int mbtype,
+EXPORTED int mboxlist_createsync(const char *name, int mbtype,
 			const char *partition,
 			const char *userid, struct auth_state *auth_state,
 			int options, unsigned uidvalidity,
+			modseq_t highestmodseq,
 			const char *acl, const char *uniqueid,
 			struct mailbox **mboxptr)
 {
 return mboxlist_createmailbox_full(name, mbtype, partition,
 				 1, userid, auth_state,
-				 options, uidvalidity, acl, uniqueid,
+				 options, uidvalidity,
+				 highestmodseq, acl, uniqueid,
 				 0, 1, 0, mboxptr);
 }
 
 /* insert an entry for the proxy */
-int mboxlist_insertremote(const char *name, int mbtype,
-			 const char *host, const char *acl,
+EXPORTED int mboxlist_insertremote(mbentry_t *mbentry,
 			 struct txn **tid)
 {
- char *mboxent, *p;
+ char *mboxent;
 int r = 0;
 
- assert(name != NULL && host != NULL);
-
- if ((p = strchr(host, '!'))) {
- /* remote mailbox */
- size_t len = (p - host);
- if (config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_UNIFIED &&
-	 len == strlen(config_servername) &&
-	 !strncasecmp(host, config_servername, len)) {
-	/* its on our server, make it a local mailbox */
-	mbtype &= ~MBTYPE_REMOTE;
-	host += len + 1;
- }
- else {
-	/* make sure its a remote mailbox */
-	mbtype |= MBTYPE_REMOTE;
- }
+ if (mbentry->server) {
+	/* remote mailbox */
+	if (config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_UNIFIED &&
+	 !strcasecmp(mbentry->server, config_servername)) {
+	 /* its on our server, make it a local mailbox */
+	 mbentry->mbtype &= ~MBTYPE_REMOTE;
+	 mbentry->server = NULL;
+	}
+	else {
+	 /* make sure it's a remote mailbox */
+	 mbentry->mbtype |= MBTYPE_REMOTE;
+	}
 }
 
- mboxent = mboxlist_makeentry(mbtype, host, acl);
+ mboxent = mboxlist_entry_cstring(mbentry);
 
 /* database put */
- r = DB->store(mbdb, name, strlen(name), mboxent, strlen(mboxent), tid);
+ r = cyrusdb_store(mbdb, mbentry->name, strlen(mbentry->name),
+		 mboxent, strlen(mboxent), tid);
 switch (r) {
 case CYRUSDB_OK:
 	break;
@@ -705,25 +997,25 @@
 	break;
 default:
 	syslog(LOG_ERR, "DBERROR: error updating database %s: %s",
-	 name, cyrusdb_strerror(r));
+	 mbentry->name, cyrusdb_strerror(r));
 	r = IMAP_IOERROR;
 	break;
 }
 
 free(mboxent);
- 
+
 return r;
 }
 
 /* Special function to delete a remote mailbox.
 * Only affects mboxlist.
 * Assumes admin powers. */
-int mboxlist_deleteremote(const char *name, struct txn **in_tid) 
+EXPORTED int mboxlist_deleteremote(const char *name, struct txn **in_tid)
 {
 int r;
 struct txn **tid;
 struct txn *lcl_tid = NULL;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 
 if(in_tid) {
 	tid = in_tid;
@@ -745,7 +1037,7 @@
 	goto done;
 }
 
- if((mbentry.mbtype & MBTYPE_REMOTE) && !strchr(mbentry.partition, '!')) {
+ if ((mbentry->mbtype & MBTYPE_REMOTE) && !mbentry->server) {
 	syslog(LOG_ERR,
 	 "mboxlist_deleteremote called on non-remote mailbox: %s",
 	 name);
@@ -754,7 +1046,7 @@
 
 retry_del:
 /* delete entry */
- r = DB->delete(mbdb, name, strlen(name), tid, 0);
+ r = cyrusdb_delete(mbdb, name, strlen(name), tid, 0);
 switch (r) {
 case CYRUSDB_OK: /* success */
 	break;
@@ -768,7 +1060,7 @@
 
 /* commit db operations, but only if we weren't passed a transaction */
 if (!in_tid) {
-	r = DB->commit(mbdb, *tid);
+	r = cyrusdb_commit(mbdb, *tid);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: failed on commit: %s",
 		 cyrusdb_strerror(r));
@@ -778,27 +1070,26 @@
 }
 
 done:
- if(r && !in_tid && tid) {
+ if (r && !in_tid && tid) {
 	/* Abort the transaction if it is still in progress */
-	DB->abort(mbdb, *tid);
+	cyrusdb_abort(mbdb, *tid);
 }
 
 return r;
 }
-	
+
 /*
 * Delayed Delete a mailbox: translate delete into rename
- *
- * XXX local_only?
 */
-int
+EXPORTED int
 mboxlist_delayed_deletemailbox(const char *name, int isadmin,
 			 const char *userid,
-			 struct auth_state *auth_state, int checkacl,
-			 int local_only __attribute__((unused)),
+			 struct auth_state *auth_state,
+			 struct mboxevent *mboxevent,
+			 int checkacl,
 			 int force)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 char newnameMAX_MAILBOX_BUFFER;
 int r;
 long myrights;
@@ -822,24 +1113,27 @@
 	if (!isadmin) return(IMAP_PERMISSION_DENIED);
 }
 
- r = mboxlist_mylookup(name, &mbentry, NULL, 1);
+ r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) return r;
 
 /* check if user has Delete right (we've already excluded non-admins
 * from deleting a user mailbox) */
 if (checkacl) {
-	myrights = cyrus_acl_myrights(auth_state, mbentry.acl);
+	myrights = cyrus_acl_myrights(auth_state, mbentry->acl);
 	if (!(myrights & ACL_DELETEMBOX)) {
 	 /* User has admin rights over their own mailbox namespace */
 	 if (mboxname_userownsmailbox(userid, name) &&
 		(config_implicitrights & ACL_ADMIN)) {
 		isadmin = 1;
 	 }
-	 
+
 	 /* Lie about error if privacy demands */
 	 r = (isadmin || (myrights & ACL_LOOKUP)) ?
 		IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
-	 return(r);
+
+	 mboxlist_entry_free(&mbentry);
+
+	 return r;
 	}
 }
 
@@ -847,15 +1141,15 @@
 mboxname_todeleted(name, newname, 1);
 
 /* Get mboxlist_renamemailbox to do the hard work. No ACL checks needed */
- r = mboxlist_renamemailbox((char *)name, newname, mbentry.partition,
+ r = mboxlist_renamemailbox((char *)name, newname, mbentry->partition,
+			 0 /* uidvalidity */,
 1 /* isadmin */, userid,
- auth_state, force, 1);
- if (r) goto out;
+ auth_state,
+			 mboxevent,
+ force, 1);
 
- /* Rename mailbox annotations */
- r = annotatemore_rename(name, newname, NULL, NULL);
+ mboxlist_entry_free(&mbentry);
 
-out:
 return r;
 }
 
@@ -872,12 +1166,14 @@
 * 7. delete from mupdate
 *
 */
-int mboxlist_deletemailbox(const char *name, int isadmin,
-			 const char *userid,
-			 struct auth_state *auth_state, int checkacl,
-			 int local_only, int force)
+EXPORTED int mboxlist_deletemailbox(const char *name, int isadmin,
+				 const char *userid,
+				 struct auth_state *auth_state,
+				 struct mboxevent *mboxevent,
+				 int checkacl,
+				 int local_only, int force)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 long myrights;
 struct mailbox *mailbox = NULL;
@@ -903,22 +1199,25 @@
 	if (!isadmin) { r = IMAP_PERMISSION_DENIED; goto done; }
 }
 
- r = mboxlist_mylookup(name, &mbentry, NULL, 1);
+ r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) goto done;
 
- isremote = mbentry.mbtype & MBTYPE_REMOTE;
+ if (mbentry->mbtype & MBTYPE_DELETED)
+	goto done;
+
+ isremote = mbentry->mbtype & MBTYPE_REMOTE;
 
 /* check if user has Delete right (we've already excluded non-admins
 * from deleting a user mailbox) */
 if (checkacl) {
-	myrights = cyrus_acl_myrights(auth_state, mbentry.acl);
+	myrights = cyrus_acl_myrights(auth_state, mbentry->acl);
 	if(!(myrights & ACL_DELETEMBOX)) {
 	 /* User has admin rights over their own mailbox namespace */
 	 if (mboxname_userownsmailbox(userid, name) &&
 		(config_implicitrights & ACL_ADMIN)) {
 		isadmin = 1;
 	 }
-	 
+
 	 /* Lie about error if privacy demands */
 	 r = (isadmin || (myrights & ACL_LOOKUP)) ?
 		IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
@@ -951,32 +1250,46 @@
 }
 if (r && !force) goto done;
 
- /* delete entry */
- r = DB->delete(mbdb, name, strlen(name), NULL, 0);
- if (r) {
-	syslog(LOG_ERR, "DBERROR: error deleting %s: %s",
-	 name, cyrusdb_strerror(r));
-	r = IMAP_IOERROR;
-	if (!force) goto done;
+ if (!isremote && !mboxname_isdeletedmailbox(name, NULL)) {
+	/* store a DELETED marker */
+	mbentry_t *newmbentry = mboxlist_entry_create();
+	newmbentry->name = xstrdupnull(name);
+	newmbentry->mbtype = MBTYPE_DELETED;
+	if (mailbox) {
+	 newmbentry->uidvalidity = mailbox->i.uidvalidity;
+	 newmbentry->uniqueid = xstrdupnull(mailbox->uniqueid);
+	}
+	r = mboxlist_update(newmbentry, /*localonly*/1);
+	mboxlist_entry_free(&newmbentry);
+ }
+ else {
+	/* delete entry (including DELETED.* mailboxes, no need
+	 * to keep that rubbish around) */
+	r = cyrusdb_delete(mbdb, name, strlen(name), NULL, 0);
+	if (r) {
+	 syslog(LOG_ERR, "DBERROR: error deleting %s: %s",
+		 name, cyrusdb_strerror(r));
+	 r = IMAP_IOERROR;
+	 if (!force) goto done;
+	}
+	if (r && !force) goto done;
 }
- if (r && !force) goto done;
 
 /* delete underlying mailbox */
 if (!isremote && mailbox) {
-	r = mailbox_delete(&mailbox);
- }
- if (r) goto done;
+	/* only on a real delete do we delete from the remote end as well */
+	sync_log_unmailbox(mailbox->name);
+	mboxevent_extract_mailbox(mboxevent, mailbox);
 
- /* Clean up annotations */
- r = annotatemore_delete(name);
- if (r) {
-	syslog(LOG_ERR,
-	 "Failed to delete annotations with mailbox '%s': %s",
-	 name, error_message(r));
+	r = mailbox_delete(&mailbox);
+	/* abort event notification */
+	if (r && mboxevent)
+	 mboxevent_free(&mboxevent);
 }
 
 done:
 mailbox_close(&mailbox);
+ mboxlist_entry_free(&mbentry);
 
 return r;
 }
@@ -986,9 +1299,11 @@
 * higher level). This only supports local mailboxes. Remote
 * mailboxes are handled up in imapd.c
 */
-int mboxlist_renamemailbox(const char *oldname, const char *newname, 
-			 const char *partition, int isadmin, 
-			 const char *userid, struct auth_state *auth_state,
+EXPORTED int mboxlist_renamemailbox(const char *oldname, const char *newname,
+			 const char *partition, unsigned uidvalidity,
+			 int isadmin, const char *userid,
+			 struct auth_state *auth_state,
+			 struct mboxevent *mboxevent,
 			 int forceuser, int ignorequota)
 {
 int r;
@@ -1002,6 +1317,7 @@
 char *newpartition = NULL;
 char *mboxent = NULL;
 mupdate_handle *mupdate_h = NULL;
+ mbentry_t *newmbentry = NULL;
 
 /* 1. open mailbox */
 r = mailbox_open_iwl(oldname, &oldmailbox);
@@ -1023,7 +1339,7 @@
 
 /* special case: same mailbox, must be a partition move */
 if (!strcmp(oldname, newname)) {
-	char *oldpath = mailbox_datapath(oldmailbox);
+	const char *oldpath = mailbox_datapath(oldmailbox);
 
 	/* Only admin can move mailboxes between partitions */
 	if (!isadmin) {
@@ -1061,10 +1377,15 @@
 	newpartition = xstrdup(partition);
 	r = mailbox_copy_files(oldmailbox, newpartition, newname);
 	if (r) goto done;
-	mboxent = mboxlist_makeentry(oldmailbox->mbtype, newpartition,
-				 oldmailbox->acl);
-	r = DB->store(mbdb, newname, strlen(newname), 
-		 mboxent, strlen(mboxent), &tid);
+	newmbentry = mboxlist_entry_create();
+	newmbentry->mbtype = oldmailbox->mbtype;
+	newmbentry->partition = xstrdupnull(newpartition);
+	newmbentry->acl = xstrdupnull(oldmailbox->acl);
+	newmbentry->uidvalidity = oldmailbox->i.uidvalidity;
+	mboxent = mboxlist_entry_cstring(newmbentry);
+	r = cyrusdb_store(mbdb, newname, strlen(newname), 
+		 mboxent, strlen(mboxent), &tid);
+	mboxlist_entry_free(&newmbentry);
 	if (r) goto done;
 
 	/* skip ahead to the commit */
@@ -1073,7 +1394,7 @@
 
 /* RENAME of some user's INBOX */
 if (mboxname_isusermailbox(oldname, 1)) {
-	if (mboxname_isdeletedmailbox(newname)) {
+	if (mboxname_isdeletedmailbox(newname, NULL)) {
 	 /* delete user is OK */
 	}
 	else if (mboxname_isusermailbox(newname, 1)) {
@@ -1095,35 +1416,58 @@
 	}
 }
 
- r = mboxlist_mycreatemailboxcheck(newname, 0, partition, isadmin, 
-				 userid, auth_state, NULL, 
-				 &newpartition, 1, 0, forceuser, NULL);
+ r = mboxlist_create_namecheck(newname, userid, auth_state,
+				 isadmin, forceuser);
+ if (r) goto done;
+
+ r = mboxlist_create_partition(newname, partition, &newpartition);
 if (r) goto done;
 
 if (!newpartition) newpartition = xstrdup(config_defpartition);
 
 /* Rename the actual mailbox */
- syslog(LOG_INFO, "Rename: %s -> %s", oldname, newname);
-
- r = mailbox_rename_copy(oldmailbox, newname, newpartition,
+ r = mailbox_rename_copy(oldmailbox, newname, newpartition, uidvalidity,
 			 isusermbox ? userid : NULL, ignorequota,
 			 &newmailbox);
 if (r) goto done;
 
+ syslog(LOG_INFO, "Rename: %s -> %s", oldname, newname);
+
 /* create new entry */
- mboxent = mboxlist_makeentry(newmailbox->mbtype, newmailbox->part,
-				 newmailbox->acl);
+ newmbentry = mboxlist_entry_create();
+ newmbentry->name = xstrdupnull(newmailbox->name);
+ newmbentry->mbtype = newmailbox->mbtype;
+ newmbentry->partition = xstrdupnull(newmailbox->part);
+ newmbentry->acl = xstrdupnull(newmailbox->acl);
+ newmbentry->uidvalidity = newmailbox->i.uidvalidity;
+ newmbentry->uniqueid = xstrdupnull(newmailbox->uniqueid);
+ mboxent = mboxlist_entry_cstring(newmbentry);
+
 do {
 	r = 0;
 
 	/* delete the old entry */
-	if (!isusermbox)
-	 r = DB->delete(mbdb, oldname, strlen(oldname), &tid, 0);
+	if (!isusermbox) {
+	 /* store a DELETED marker */
+	 char *oldmboxent = NULL;
+	 mbentry_t *oldmbentry = mboxlist_entry_create();
+	 oldmbentry->name = xstrdupnull(oldmailbox->name);
+	 oldmbentry->mbtype = MBTYPE_DELETED;
+	 oldmbentry->uidvalidity = oldmailbox->i.uidvalidity;
+	 oldmbentry->uniqueid = xstrdupnull(oldmailbox->uniqueid);
+	 oldmboxent = mboxlist_entry_cstring(oldmbentry);
+
+	 r = cyrusdb_store(mbdb, oldname, strlen(oldname),
+			 oldmboxent, strlen(oldmboxent), &tid);
+
+	 mboxlist_entry_free(&oldmbentry);
+	 free(oldmboxent);
+	}
 
 	/* create a new entry */
 	if (!r)
-	 r = DB->store(mbdb, newname, strlen(newname), 
-			 mboxent, strlen(mboxent), &tid);
+	 r = cyrusdb_store(mbdb, newname, strlen(newname),
+			 mboxent, strlen(mboxent), &tid);
 
 	switch (r) {
 	case 0: /* success */
@@ -1132,7 +1476,7 @@
 	 tid = NULL;
 	 break;
 	default:
-	 syslog(LOG_ERR, "DBERROR: error renaming %s %s: %s",
+	 syslog(LOG_ERR, "DBERROR: rename failed on store %s %s: %s",
 		 oldname, newname, cyrusdb_strerror(r));
 	 r = IMAP_IOERROR;
 	 goto done;
@@ -1143,10 +1487,10 @@
 dbdone:
 
 /* 3. Commit transaction */
- r = DB->commit(mbdb, tid);
+ r = cyrusdb_commit(mbdb, tid);
 tid = NULL;
 if (r) {
-	syslog(LOG_ERR, "DBERROR: failed on commit %s %s: %s",
+	syslog(LOG_ERR, "DBERROR: rename failed on commit %s %s: %s",
 	 oldname, newname, cyrusdb_strerror(r));
 	r = IMAP_IOERROR;
 	goto done;
@@ -1154,25 +1498,22 @@
 
 if (config_mupdate_server) {
 	/* commit the mailbox in MUPDATE */
-	char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
-	const char *acl = newmailbox ? newmailbox->acl : oldmailbox->acl;
+	char *loc = strconcat(config_servername, "!", newpartition, (char *)NULL);
 
-	snprintf(buf, sizeof(buf), "%s!%s",
-		 config_servername, newpartition);
-	
 	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
 	if (!partitionmove) {
 	 if (!r && !isusermbox)
 		r = mupdate_delete(mupdate_h, oldname);
-	 if (!r) r = mupdate_reserve(mupdate_h, newname, buf);
+	 if (!r) r = mupdate_reserve(mupdate_h, newname, loc);
 	}
-	if (!r) r = mupdate_activate(mupdate_h, newname, buf, acl);
+	if (!r) r = mupdate_activate(mupdate_h, newname, loc, newmbentry->acl);
 	if (r) {
 	 syslog(LOG_ERR,
 		 "MUPDATE: can't commit mailbox entry for '%s'",
 		 newname);
 	}
 	if (mupdate_h) mupdate_disconnect(&mupdate_h);
+	free(loc);
 }
 
 done: /* Commit or cleanup */
@@ -1187,6 +1528,17 @@
 	mailbox_close(&oldmailbox);
 } else {
 	if (newmailbox) {
+	 /* prepare the event notification */
+	 if (mboxevent) {
+		/* case of delayed delete */
+		if (mboxevent->type == EVENT_MAILBOX_DELETE)
+		 mboxevent_extract_mailbox(mboxevent, oldmailbox);
+		else {
+		 mboxevent_extract_mailbox(mboxevent, newmailbox);
+		 mboxevent_extract_old_mailbox(mboxevent, oldmailbox);
+		}
+	 }
+
 	 mailbox_rename_cleanup(&oldmailbox, isusermbox);
 	 mailbox_close(&newmailbox);
 	}
@@ -1208,16 +1560,66 @@
 
 	/* log the rename */
 	sync_log_mailbox_double(oldname, newname);
+	/* and log an append so that squatter indexes it */
+	sync_log_append(newname);
 }
- 
+
 /* free memory */
 free(newpartition);
 free(mboxent);
+ mboxlist_entry_free(&newmbentry);
 
 return r;
 }
 
 /*
+ * Verify if the 'user' is the mailbox 'name' owner.
+ */
+static int mboxlist_is_owner(struct namespace *namespace,
+			 const char *name, int domainlen,
+			 const char *user, int userlen)
+{
+ struct buf extname = BUF_INITIALIZER;
+ const char *username = NULL;
+ const char *dot_position = NULL;
+
+ /* is_user_mbox */
+ if (strncmp(name+domainlen, "user.", 5))
+	return 0;
+
+ /* get external representation of owner to check against given user */
+ username = name + domainlen + 5;
+ dot_position = strchr(username, '.');
+ buf_setmap(&extname, username, dot_position ?
+	dot_position - username : (int)strlen(username));
+ mboxname_hiersep_toexternal(namespace,
+	(char *)buf_cstring(&extname), buf_len(&extname));
+
+ /* starts_with_user */
+ if (strncmp(buf_cstring(&extname), user, userlen)) {
+	buf_free(&extname);
+	return 0;
+ }
+ buf_free(&extname);
+
+ /* is_exactly_user */
+ if (!(usernameuserlen == '\0' || usernameuserlen == '.'))
+	return 0;
+
+ return 1;
+}
+
+/*
+ * Check if the admin rights are present in the 'rights'
+ */
+static int mboxlist_have_admin_rights(const char* rights) {
+ int access = cyrus_acl_strtomask(rights);
+ int have_admin_access = access & ACL_ADMIN;
+
+ return have_admin_access;
+}
+
+/*
 * Change the ACL for mailbox 'name' so that 'identifier' has the
 * rights enumerated in the string 'rights'. If 'rights' is the null
 * pointer, removes the ACL entry for 'identifier'. 'isadmin' is
@@ -1231,19 +1633,25 @@
 * 6. Change mupdate entry 
 *
 */
-int mboxlist_setacl(const char *name, const char *identifier,
-		 const char *rights, 
+EXPORTED int mboxlist_setacl(struct namespace *namespace, const char *name,
+		 const char *identifier, const char *rights,
 		 int isadmin, const char *userid, 
 		 struct auth_state *auth_state)
 {
- struct mboxlist_entry mbentry;
- int useridlen = strlen(userid), domainlen = 0;
+ mbentry_t *mbentry = NULL;
+ int useridlen = strlen(userid);
+ int domainlen = 0;
+ int identifierlen = strlen(identifier);
 char *cp, ident256;
 const char *domain = NULL;
 int r;
 int myrights;
 int mode = ACL_MODE_SET;
- int isusermbox = 0, anyoneuseracl = 1;
+ int isusermbox = 0;
+ int isidentifiermbox = 0;
+ int anyoneuseracl = 1;
+ int ensure_owner_rights = 0;
+ const char *mailbox_owner = NULL;
 struct mailbox *mailbox = NULL;
 char *newacl = NULL;
 char *mboxent = NULL;
@@ -1262,6 +1670,7 @@
 	 except for "anonymous", "anyone", the global admin
 	 and users in the default domain */
 	if ((cp = strchr(identifier, '@'))) {
+	 identifierlen = cp - identifier;
 	 if (rights &&
 		((domain && strncasecmp(cp+1, domain, strlen(cp+1))) ||
 		 (!domain && (!config_defdomain ||
@@ -1290,15 +1699,32 @@
 	identifier = ident;
 }
 
- if (!strncmp(name+domainlen, "user.", 5) &&
-	(!(cp = strchr(userid, '.')) || (cp - userid) > useridlen) &&
-	!strncmp(name+domainlen+5, userid, useridlen) &&
-	(namedomainlen+5+useridlen == '\0' ||
-	 namedomainlen+5+useridlen == '.')) {
+ /* checks if the mailbox belongs to the user who is trying to change the
+ access rights */
+ if (mboxlist_is_owner(namespace, name, domainlen, userid, useridlen)) {
 	isusermbox = 1;
 }
 anyoneuseracl = config_getswitch(IMAPOPT_ANYONEUSERACL);
 
+ /* checks if the identifier is the mailbox owner */
+ if (mboxlist_is_owner(namespace, name, domainlen,
+	identifier, identifierlen))
+ {
+	isidentifiermbox = 1;
+ }
+
+ /* who is the mailbox owner? */
+ if (isusermbox) {
+	mailbox_owner = userid;
+ }
+ else if (isidentifiermbox) {
+	mailbox_owner = identifier;
+ }
+
+ /* ensure the access rights if the folder owner is the current user or
+ the identifier */
+ ensure_owner_rights = isusermbox || isidentifiermbox;
+
 /* 1. Start Transaction */
 /* lookup the mailbox to make sure it exists and get its acl */
 do {
@@ -1306,16 +1732,17 @@
 } while(r == IMAP_AGAIN);
 
 /* Can't do this to an in-transit or reserved mailbox */
- if(!r && mbentry.mbtype & (MBTYPE_MOVING | MBTYPE_RESERVE)) {
+ if (!r && mbentry->mbtype & (MBTYPE_MOVING | MBTYPE_RESERVE | MBTYPE_DELETED)) {
 	r = IMAP_MAILBOX_NOTSUPPORTED;
 }
 
 /* if it is not a remote mailbox, we need to unlock the mailbox list,
 * lock the mailbox, and re-lock the mailboxes list */
 /* we must do this to obey our locking rules */
- if (!r && !(mbentry.mbtype & MBTYPE_REMOTE)) {
-	DB->abort(mbdb, tid);
+ if (!r && !(mbentry->mbtype & MBTYPE_REMOTE)) {
+	cyrusdb_abort(mbdb, tid);
 	tid = NULL;
+	mboxlist_entry_free(&mbentry);
 
 	/* open & lock mailbox header */
 r = mailbox_open_iwl(name, &mailbox);
@@ -1324,7 +1751,7 @@
 	 do {
 		/* lookup the mailbox to make sure it exists and get its acl */
 		r = mboxlist_mylookup(name, &mbentry, &tid, 1);
-	 } while( r == IMAP_AGAIN );
+	 } while (r == IMAP_AGAIN);
 	}
 
 	if(r) goto done;
@@ -1332,7 +1759,7 @@
 
 /* 2. Check Rights */
 if (!r && !isadmin) {
-	myrights = cyrus_acl_myrights(auth_state, mbentry.acl);
+	myrights = cyrus_acl_myrights(auth_state, mbentry->acl);
 	if (!(myrights & ACL_ADMIN)) {
 	 r = (myrights & ACL_LOOKUP) ?
 		IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
@@ -1349,7 +1776,7 @@
 /* 3. Set DB Entry */
 if(!r) {
 	/* Make change to ACL */
-	newacl = xstrdup(mbentry.acl);
+	newacl = xstrdup(mbentry->acl);
 	if (rights && *rights) {
 	 /* rights are present and non-empty */
 	 mode = ACL_MODE_SET;
@@ -1361,17 +1788,38 @@
 		rights++;
 		mode = ACL_MODE_REMOVE;
 	 }
-	 
+	 /* do not allow non-admin user to remove the admin rights from mailbox owner */
+	 if (!isadmin && isidentifiermbox) {
+		int has_admin_rights = mboxlist_have_admin_rights(rights);
+		if ((has_admin_rights && mode == ACL_MODE_REMOVE) ||
+		 (!has_admin_rights && mode != ACL_MODE_REMOVE)) {
+		 syslog(LOG_ERR, "Denied removal of admin rights on "
+			 "folder \"%s\" (owner: %s) by user \"%s\"", name,
+			 mailbox_owner, userid);
+		 r = IMAP_PERMISSION_DENIED;
+		 goto done;
+		}
+	 }
+
 	 if (cyrus_acl_set(&newacl, identifier, mode,
 			 cyrus_acl_strtomask(rights),
-			 isusermbox ? mboxlist_ensureOwnerRights : 0,
-			 (void *)userid)) {
+			 ensure_owner_rights ? mboxlist_ensureOwnerRights : 0,
+			 (void *)mailbox_owner)) {
 		r = IMAP_INVALID_IDENTIFIER;
 	 }
 	} else {
+	 /* do not allow to remove the admin rights from mailbox owner */
+	 if (!isadmin && isidentifiermbox) {
+		syslog(LOG_ERR, "Denied removal of admin rights on "
+		 "folder \"%s\" (owner: %s) by user \"%s\"", name,
+		 mailbox_owner, userid);
+		r = IMAP_PERMISSION_DENIED;
+		goto done;
+	 }
+
 	 if (cyrus_acl_remove(&newacl, identifier,
-				 isusermbox ? mboxlist_ensureOwnerRights : 0,
-				 (void *)userid)) {
+				 ensure_owner_rights ? mboxlist_ensureOwnerRights : 0,
+				 (void *)mailbox_owner)) {
 		r = IMAP_INVALID_IDENTIFIER;
 	 }
 	}
@@ -1379,13 +1827,15 @@
 
 if(!r) {
 	/* ok, change the database */
-	mboxent = mboxlist_makeentry(mbentry.mbtype, mbentry.partition, newacl);
+	free(mbentry->acl);
+	mbentry->acl = xstrdupnull(newacl);
+	mboxent = mboxlist_entry_cstring(mbentry);
 
 	do {
-	 r = DB->store(mbdb, name, strlen(name),
-			 mboxent, strlen(mboxent), &tid);
+	 r = cyrusdb_store(mbdb, name, strlen(name),
+			 mboxent, strlen(mboxent), &tid);
 	} while(r == CYRUSDB_AGAIN);
- 
+
 	if(r) {
 	 syslog(LOG_ERR, "DBERROR: error updating acl %s: %s",
 		 name, cyrusdb_strerror(r));
@@ -1395,7 +1845,7 @@
 
 /* 4. Change backup copy (cyrus.header) */
 /* we already have it locked from above */
- if (!r && !(mbentry.mbtype & MBTYPE_REMOTE)) {
+ if (!r && !(mbentry->mbtype & MBTYPE_REMOTE)) {
 	mailbox_set_acl(mailbox, newacl, 1);
 	/* want to commit immediately to ensure ordering */
 	r = mailbox_commit(mailbox);
@@ -1403,7 +1853,7 @@
 
 /* 5. Commit transaction */
 if (!r) {
-	if((r = DB->commit(mbdb, tid)) != 0) {
+	if((r = cyrusdb_commit(mbdb, tid)) != 0) {
 	 syslog(LOG_ERR, "DBERROR: failed on commit: %s",
 		 cyrusdb_strerror(r));
 	 r = IMAP_IOERROR;
@@ -1417,7 +1867,7 @@
 	/* commit the update to MUPDATE */
 	char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
 
-	snprintf(buf, sizeof(buf), "%s!%s", config_servername, mbentry.partition);
+	snprintf(buf, sizeof(buf), "%s!%s", config_servername, mbentry->partition);
 
 	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
 	if(r) {
@@ -1438,8 +1888,8 @@
 done:
 if (r && tid) {
 	/* if we are mid-transaction, abort it! */
-	int r2 = DB->abort(mbdb, tid);
-	if(r2) {
+	int r2 = cyrusdb_abort(mbdb, tid);
+	if (r2) {
 	 syslog(LOG_ERR,
 		 "DBERROR: error aborting txn in mboxlist_setacl: %s",
 		 cyrusdb_strerror(r2));
@@ -1448,6 +1898,7 @@
 mailbox_close(&mailbox);
 free(mboxent);
 free(newacl);
+ mboxlist_entry_free(&mbentry);
 
 return r;
 }
@@ -1463,10 +1914,10 @@
 * 4. Change mupdate entry 
 *
 */
-int
+EXPORTED int
 mboxlist_sync_setacls(const char *name, const char *newacl)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 struct txn *tid = NULL;
 
@@ -1474,24 +1925,25 @@
 /* lookup the mailbox to make sure it exists and get its acl */
 do {
 	r = mboxlist_mylookup(name, &mbentry, &tid, 1);
- } while(r == IMAP_AGAIN); 
+ } while(r == IMAP_AGAIN);
 
 /* Can't do this to an in-transit or reserved mailbox */
- if (!r && mbentry.mbtype & (MBTYPE_MOVING | MBTYPE_RESERVE)) {
+ if (!r && mbentry->mbtype & (MBTYPE_MOVING | MBTYPE_RESERVE | MBTYPE_DELETED)) {
 	r = IMAP_MAILBOX_NOTSUPPORTED;
 }
 
 /* 2. Set DB Entry */
 if (!r) {
 	/* ok, change the database */
-	char *mboxent = mboxlist_makeentry(mbentry.mbtype,
-					 mbentry.partition, newacl);
+	free(mbentry->acl);
+	mbentry->acl = xstrdupnull(newacl);
+	char *mboxent = mboxlist_entry_cstring(mbentry);
 
 	do {
-	 r = DB->store(mbdb, name, strlen(name),
-			 mboxent, strlen(mboxent), &tid);
+	 r = cyrusdb_store(mbdb, name, strlen(name),
+			 mboxent, strlen(mboxent), &tid);
 	} while (r == CYRUSDB_AGAIN);
- 
+
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error updating acl %s: %s",
 		 name, cyrusdb_strerror(r));
@@ -1503,7 +1955,7 @@
 
 /* 3. Commit transaction */
 if (!r) {
-	r = DB->commit(mbdb, tid);
+	r = cyrusdb_commit(mbdb, tid);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: failed on commit %s: %s",
 		 name, cyrusdb_strerror(r));
@@ -1517,10 +1969,10 @@
 mupdate_handle *mupdate_h = NULL;
 	/* commit the update to MUPDATE */
 	char bufMAX_PARTITION_LEN + HOSTNAME_SIZE + 2;
-	sprintf(buf, "%s!%s", config_servername, mbentry.partition);
+	sprintf(buf, "%s!%s", config_servername, mbentry->partition);
 
 	r = mupdate_connect(config_mupdate_server, NULL, &mupdate_h, NULL);
-	if(r) {
+	if (r) {
 	 syslog(LOG_ERR,
 		 "cannot connect to mupdate server for syncacl on '%s'",
 		 name);
@@ -1537,7 +1989,7 @@
 
 if (r && tid) {
 	/* if we are mid-transaction, abort it! */
-	int r2 = DB->abort(mbdb, tid);
+	int r2 = cyrusdb_abort(mbdb, tid);
 	if (r2) {
 	 syslog(LOG_ERR,
 		 "DBERROR: error aborting txn in sync_setacls %s: %s",
@@ -1545,6 +1997,8 @@
 	}
 }
 
+ mboxlist_entry_free(&mbentry);
+
 return r;
 }
 
@@ -1556,9 +2010,11 @@
 int inboxoffset;
 const char *inboxcase;
 const char *usermboxname;
- int usermboxnamelen;
+ size_t usermboxnamelen;
 int checkmboxlist;
+ int issubs;
 int checkshared;
+ struct db *db;
 int isadmin;
 struct auth_state *auth_state;
 char *prev;
@@ -1568,29 +2024,31 @@
 };
 
 /* return non-zero if we like this one */
-static int find_p(void *rockp, 
-		 const char *key, int keylen,
-		 const char *data, int datalen)
+static int find_p(void *rockp,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct find_rock *rock = (struct find_rock *) rockp;
 long minmatch;
 struct glob *g = rock->g;
 long matchlen;
+ mbentry_t *mbentry = NULL;
+ int ret = 0;
 
 /* don't list mailboxes outside of the default domain */
- if (!rock->domainlen && !rock->isadmin && memchr(key, '!', keylen)) return 0; 
+ if (!rock->domainlen && !rock->isadmin && memchr(key, '!', keylen)) return 0;
 
 minmatch = 0;
 if (rock->inboxoffset) {
 	char namebufMAX_MAILBOX_BUFFER;
 
-	if(keylen >= (int) sizeof(namebuf)) {
+	if (keylen >= (int) sizeof(namebuf)) {
 	 syslog(LOG_ERR, "oversize keylen in mboxlist.c:find_p()");
 	 return 0;
 	}
 	memcpy(namebuf, key, keylen);
 	namebufkeylen = '\0';
-	
+
 	if (rock->inboxoffset) {
 	 namebufrock->inboxoffset = rock->inboxcase0;
 	 namebufrock->inboxoffset+1 = rock->inboxcase1;
@@ -1598,7 +2056,7 @@
 	 namebufrock->inboxoffset+3 = rock->inboxcase3;
 	 namebufrock->inboxoffset+4 = rock->inboxcase4;
 	}
-	
+
 	matchlen = glob_test(g, namebuf+rock->inboxoffset,
 			 keylen-rock->inboxoffset, &minmatch);
 } else {
@@ -1626,66 +2084,48 @@
 	return 0;
 }
 
- /* Suppress deleted hierarchy unless admin: overrides ACL_LOOKUP test */
- if (!rock->isadmin) {
-	char namebufMAX_MAILBOX_BUFFER;
+ /* subs DB has empty keys */
+ if (rock->issubs)
+	return 1;
 
-	memcpy(namebuf, key, keylen);
-	namebufkeylen = '\0';
-	if (mboxname_isdeletedmailbox(namebuf))
-	 return 0;
- }
+ /* ignore entirely deleted records */
+ if (mboxlist_parse_entry(&mbentry, key, keylen, data, datalen))
+	return 0;
 
+ /* nobody sees tombstones */
+ if (mbentry->mbtype & MBTYPE_DELETED)
+	goto done;
 
 /* check acl */
 if (!rock->isadmin) {
-	/* check the acls */
-	const char *p, *acl;
-	int rights;
-	int acllen;
-	static char *aclbuf = NULL;
-	static int aclbufsz = 0;
-
-	p = strchr(data, ' ');
-	if (!p) {
-	 syslog(LOG_ERR, "%s: can't find partition", key);
-	 return 0;
-	}
-	p++;
-	acl = strchr(p, ' ');
-	if (!acl) {
-	 syslog(LOG_ERR, "%s: can't find acl", key);
-	 return 0;
-	}
-	acl++;
-	acllen = datalen - (acl - data);
-	if (acllen >= aclbufsz) {
-	 aclbufsz = acllen + 500;
-	 aclbuf = xrealloc(aclbuf, aclbufsz);
-	}
-	memcpy(aclbuf, acl, acllen);
-	aclbufacllen = '\0';
+	/* always suppress deleted for non-admin */
+	if (mboxname_isdeletedmailbox(mbentry->name, NULL)) goto done;
 
-	rights = cyrus_acl_myrights(rock->auth_state, aclbuf);
-	if (!(rights & ACL_LOOKUP)) {
-	 return 0;
-	}
+	/* also suppress calendar */
+	if (mboxname_iscalendarmailbox(mbentry->name, mbentry->mbtype)) goto done;
+
+	/* and addressbook */
+	if (mboxname_isaddressbookmailbox(mbentry->name, mbentry->mbtype)) goto done;
+
+	/* check the acls */
+	if (!(cyrus_acl_myrights(rock->auth_state, mbentry->acl) & ACL_LOOKUP)) goto done;
 }
- 
+
 /* if we get here, close enough for us to spend the time
 acting interested */
- return 1;
+ ret = 1;
+
+done:
+ mboxlist_entry_free(&mbentry);
+ return ret;
 }
 
 static int check_name(struct find_rock *rock,
 		 const char *base, int len)
 {
 if (rock->prev) {
-	/* check if name is not a substring of the last sent. Note,
-	 * you actually have to check 1 character PAST the length,
-	 * so you don't forget to tell about subfolders. */
-	if (len <= rock->prevlen && !memcmp(base, rock->prev, len+1))
-	 return 0;
+	if (cyrusdb_compar(rock->db, base, len, rock->prev, rock->prevlen) < 0)
+	 return 0; /* previous name, skip it */
 	free(rock->prev);
 }
 
@@ -1695,10 +2135,10 @@
 return 1;
 }
 
-static int find_cb(void *rockp,
-		 const char *key, int keylen,
+static int find_cb(void *rockp, 
+		 const char *key, size_t keylen,
 		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused)))
+		 size_t datalen __attribute__((unused)))
 {
 char namebufMAX_MAILBOX_BUFFER;
 struct find_rock *rock = (struct find_rock *) rockp;
@@ -1790,13 +2230,79 @@
 return r;
 }
 
-int mboxlist_allmbox(const char *prefix, foreach_cb *proc, void *rock)
+static int skipdel_cb(void *rock __attribute__((unused)),
+		 const char *key,
+		 size_t keylen,
+		 const char *data,
+		 size_t datalen)
 {
+ mbentry_t *mbentry = NULL;
 int r;
+ int res = 1;
+
+ r = mboxlist_parse_entry(&mbentry, key, keylen, data, datalen);
+ if (r) return 0;
+
+ if (mbentry->mbtype & MBTYPE_DELETED)
+	res = 0;
+
+ mboxlist_entry_free(&mbentry);
+
+ return res;
+}
+
+EXPORTED int mboxlist_allmbox(const char *prefix, foreach_cb *proc, void *rock,
+			 int incdel)
+{
 char *search = prefix ? (char *)prefix : "";
 
- r = DB->foreach(mbdb, search, strlen(search), NULL, proc, rock, 0);
+ return cyrusdb_foreach(mbdb, search, strlen(search),
+			 incdel ? NULL : skipdel_cb,
+			 proc, rock, 0);
+}
+
+EXPORTED int mboxlist_allusermbox(const char *userid, foreach_cb *proc,
+				 void *rock, int incdel)
+{
+ char *inbox = mboxname_user_mbox(userid, 0);
+ size_t inboxlen = strlen(inbox);
+ char *search = strconcat(inbox, ".", (char *)NULL);
+ const char *data = NULL;
+ size_t datalen = 0;
+ int r;
+
+ r = cyrusdb_fetch(mbdb, inbox, inboxlen, &data, &datalen, NULL);
+ if (!r) {
+	/* process inbox first */
+	if (incdel || skipdel_cb(rock, inbox, inboxlen, data, datalen))
+	 r = proc(rock, inbox, inboxlen, data, datalen);
+ }
+ else if (r == CYRUSDB_NOTFOUND) {
+	/* don't process inbox! */
+	r = 0;
+ }
+ if (r) goto done;
+
+ /* process all the sub folders */
+ r = cyrusdb_foreach(mbdb, search, strlen(search),
+			incdel ? NULL : skipdel_cb,
+			proc, rock, 0);
+ if (r) goto done;
+
+ /* don't check if delayed delete is enabled, maybe the caller wants to
+ * clean up deleted stuff after it's been turned off */
+ if (incdel) {
+	const char *prefix = config_getstring(IMAPOPT_DELETEDPREFIX);
+	char *name = strconcat(prefix, ".", inbox, ".", (char *)NULL);
+	r = cyrusdb_foreach(mbdb, name, strlen(name),
+			 incdel ? NULL : skipdel_cb,
+			 proc, rock, 0);
+	free(name);
+ }
 
+done:
+ free(search);
+ free(inbox);
 return r;
 }
 
@@ -1810,18 +2316,18 @@
 * case it wants some persistant storage or extra data.
 */
 /* Find all mailboxes that match 'pattern'. */
-int mboxlist_findall(struct namespace *namespace,
+EXPORTED int mboxlist_findall(struct namespace *namespace,
 		 const char *pattern, int isadmin, const char *userid, 
 		 struct auth_state *auth_state, int (*proc)(), void *rock)
 {
 struct find_rock cbrock;
 char usermboxnameMAX_MAILBOX_BUFFER;
- int usermboxnamelen = 0;
+ size_t usermboxnamelen = 0;
 const char *data;
- int datalen;
+ size_t datalen;
 int r = 0;
 char *p;
- int prefixlen;
+ size_t prefixlen;
 int userlen = userid ? strlen(userid) : 0, domainlen = 0;
 char domainpatMAX_MAILBOX_BUFFER = ""; /* do intra-domain fetches only */
 char *pat = NULL;
@@ -1874,11 +2380,13 @@
 cbrock.isadmin = isadmin;
 cbrock.auth_state = auth_state;
 cbrock.checkmboxlist = 0;	/* don't duplicate work */
+ cbrock.issubs = 0;
 cbrock.checkshared = 0;
 cbrock.proc = proc;
 cbrock.procrock = rock;
 cbrock.prev = NULL;
 cbrock.prevlen = 0;
+ cbrock.db = mbdb;
 
 /* Build usermboxname */
 if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > userlen)) &&
@@ -1897,22 +2405,20 @@
 /* Check for INBOX first of all */
 if (userid) {
 	if (GLOB_TEST(cbrock.g, "INBOX") != -1) {
-	 r = DB->fetch(mbdb, usermboxname, usermboxnamelen,
-			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 r = cyrusdb_fetch(mbdb, usermboxname, usermboxnamelen,
+			 &data, &datalen, NULL);
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(cbrock.inboxcase, 5, 1, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 	else if (!strncmp(pattern,
 			 usermboxname+domainlen, usermboxnamelen-domainlen) &&
 		 GLOB_TEST(cbrock.g, usermboxname+domainlen) != -1) {
-	 r = DB->fetch(mbdb, usermboxname, usermboxnamelen,
-			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 r = cyrusdb_fetch(mbdb, usermboxname, usermboxnamelen,
+			 &data, &datalen, NULL);
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(usermboxname, usermboxnamelen, 1, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 	strlcat(usermboxname, ".", sizeof(usermboxname));
 	usermboxnamelen++;
@@ -1956,10 +2462,10 @@
 
 	cbrock.find_namespace = NAMESPACE_INBOX;
 	/* iterate through prefixes matching usermboxname */
-	r = DB->foreach(mbdb,
-			usermboxname, usermboxnamelen,
-			&find_p, &find_cb, &cbrock,
-			NULL);
+	r = cyrusdb_foreach(mbdb,
+			 usermboxname, usermboxnamelen,
+			 &find_p, &find_cb, &cbrock,
+			 NULL);
 
 	free(cbrock.prev);
 	cbrock.prev = NULL;
@@ -1980,10 +2486,10 @@
 	/* search for all remaining mailboxes.
 	 just bother looking at the ones that have the same pattern
 	 prefix. */
-	r = DB->foreach(mbdb,
-			domainpat, domainlen + prefixlen,
-			&find_p, &find_cb, &cbrock,
-			NULL);
+	r = cyrusdb_foreach(mbdb,
+			 domainpat, domainlen + prefixlen,
+			 &find_p, &find_cb, &cbrock,
+			 NULL);
 
 	free(cbrock.prev);
 	cbrock.prev = NULL;
@@ -1997,20 +2503,20 @@
 return r;
 }
 
-int mboxlist_findall_alt(struct namespace *namespace,
+HIDDEN int mboxlist_findall_alt(struct namespace *namespace,
 			 const char *pattern, int isadmin, const char *userid,
 			 struct auth_state *auth_state, int (*proc)(),
 			 void *rock)
 {
 struct find_rock cbrock;
 char usermboxnameMAX_MAILBOX_BUFFER, patbufMAX_MAILBOX_BUFFER;
- int usermboxnamelen = 0;
+ size_t usermboxnamelen = 0;
 const char *data;
- int datalen;
+ size_t datalen;
 int r = 0;
 char *p;
- int prefixlen, len;
- int userlen = userid ? strlen(userid) : 0, domainlen = 0;
+ size_t prefixlen, len;
+ size_t userlen = userid ? strlen(userid) : 0, domainlen = 0;
 char domainpatMAX_MAILBOX_BUFFER; /* do intra-domain fetches only */
 char *pat = NULL;
 
@@ -2031,20 +2537,22 @@
 cbrock.isadmin = isadmin;
 cbrock.auth_state = auth_state;
 cbrock.checkmboxlist = 0;	/* don't duplicate work */
+ cbrock.issubs = 0;
 cbrock.checkshared = 0;
 cbrock.proc = proc;
 cbrock.procrock = rock;
 cbrock.prev = NULL;
 cbrock.prevlen = 0;
+ cbrock.db = mbdb;
 
 /* Build usermboxname */
- if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > userlen)) &&
+ if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > (int)userlen)) &&
 	strlen(userid)+5 < MAX_MAILBOX_BUFFER) {
 	if (domainlen)
 	 snprintf(usermboxname, sizeof(usermboxname),
 		 "%s!", userid+userlen+1);
 	snprintf(usermboxname+domainlen, sizeof(usermboxname)-domainlen,
-		 "user.%.*s", userlen, userid);
+		 "user.%.*s", (int)userlen, userid);
 	usermboxnamelen = strlen(usermboxname);
 }
 else {
@@ -2054,12 +2562,11 @@
 /* Check for INBOX first of all */
 if (userid) {
 	if (GLOB_TEST(cbrock.g, "INBOX") != -1) {
-	 r = DB->fetch(mbdb, usermboxname, usermboxnamelen,
-			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 r = cyrusdb_fetch(mbdb, usermboxname, usermboxnamelen,
+			 &data, &datalen, NULL);
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(cbrock.inboxcase, 5, 0, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 
 	strlcat(usermboxname, ".", sizeof(usermboxname));
@@ -2098,10 +2605,10 @@
 	cbrock.find_namespace = NAMESPACE_INBOX;
 
 	/* iterate through prefixes matching usermboxname */
-	DB->foreach(mbdb,
-		 usermboxname, usermboxnamelen,
-		 &find_p, &find_cb, &cbrock,
-		 NULL);
+	cyrusdb_foreach(mbdb,
+			usermboxname, usermboxnamelen,
+			&find_p, &find_cb, &cbrock,
+			NULL);
 
 	free(cbrock.prev);
 	cbrock.prev = NULL;
@@ -2142,10 +2649,10 @@
 
 	 /* iterate through prefixes matching usermboxname */
 	 strlcpy(domainpat+domainlen, "user", sizeof(domainpat)-domainlen);
-	 DB->foreach(mbdb,
-			domainpat, strlen(domainpat),
-			&find_p, &find_cb, &cbrock,
-			NULL);
+	 cyrusdb_foreach(mbdb,
+			 domainpat, strlen(domainpat),
+			 &find_p, &find_cb, &cbrock,
+			 NULL);
 
 	 glob_free(&cbrock.g);
 	 free(cbrock.prev);
@@ -2195,20 +2702,20 @@
 		}
 
 		domainpatdomainlen = '\0';
-		DB->foreach(mbdb,
-			 domainpat, domainlen,
-			 &find_p, &find_cb, &cbrock,
-			 NULL);
+		cyrusdb_foreach(mbdb,
+				domainpat, domainlen,
+				&find_p, &find_cb, &cbrock,
+				NULL);
 	 }
 	 else if (patternlen == '.') {
 		strlcpy(domainpat+domainlen, pattern+len+1,
 			sizeof(domainpat)-domainlen);
 		cbrock.g = glob_init(domainpat, GLOB_HIERARCHY);
 
-		DB->foreach(mbdb,
-			 domainpat, domainlen+prefixlen-(len+1),
-			 &find_p, &find_cb, &cbrock,
-			NULL);
+		cyrusdb_foreach(mbdb,
+				domainpat, domainlen+prefixlen-(len+1),
+				&find_p, &find_cb, &cbrock,
+				NULL);
 	 }
 	 free(cbrock.prev);
 	 cbrock.prev = NULL;
@@ -2233,31 +2740,62 @@
 }
 
 /*
- * Set the quota on or create a quota root
+ * Set all the resource quotas on, or create a quota root.
 */
-int mboxlist_setquota(const char *root, int newquota, int force)
+EXPORTED int mboxlist_setquotas(const char *root,
+		 int newquotasQUOTA_NUMRESOURCES, int force)
 {
 char patternMAX_MAILBOX_PATH+1;
 struct quota q;
 int have_mailbox = 1;
 int r;
+ int res;
 struct txn *tid = NULL;
- struct mboxlist_entry mbentry;
+ struct mboxevent *mboxevents = NULL;
+ struct mboxevent *quotachange_event = NULL;
+ struct mboxevent *quotawithin_event = NULL;
 
 if (!root0 || root0 == '.' || strchr(root, '/')
 	|| strchr(root, '*') || strchr(root, '%') || strchr(root, '?')) {
 	return IMAP_MAILBOX_BADNAME;
 }
 
- q.root = root;
+ quota_init(&q, root);
 r = quota_read(&q, &tid, 1);
 
 if (!r) {
+	int changed = 0;
+	int underquota;
+
 	/* has it changed? */
-	if (q.limit != newquota) {
-	 q.limit = newquota;
-	 r = quota_write(&q, &tid);
+	for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	 if (q.limitsres != newquotasres) {
+		underquota = 0;
+
+		/* prepare a QuotaChange event notification */
+		if (quotachange_event == NULL)
+		 quotachange_event = mboxevent_enqueue(EVENT_QUOTA_CHANGE,
+		 &mboxevents);
+
+		/* prepare a QuotaWithin event notification if now under quota */
+		if (quota_is_overquota(&q, res, NULL) &&
+		 (!quota_is_overquota(&q, res, newquotas) || newquotasres == -1)) {
+		 if (quotawithin_event == NULL)
+			quotawithin_event = mboxevent_enqueue(EVENT_QUOTA_WITHIN,
+			 &mboxevents);
+		 underquota++;
+		}
+
+		q.limitsres = newquotasres;
+		changed++;
+
+		mboxevent_extract_quota(quotachange_event, &q, res);
+		if (underquota)
+		 mboxevent_extract_quota(quotawithin_event, &q, res);
+	 }
 	}
+	if (changed)
+	 r = quota_write(&q, &tid);
 	if (!r)
 	 quota_commit(&tid);
 	goto done;
@@ -2277,6 +2815,7 @@
 	strlcat(pattern, "*", sizeof(pattern));
 }
 else {
+	mbentry_t *mbentry = NULL;
 	strlcat(pattern, ".*", sizeof(pattern));
 
 	/* look for a top-level mailbox in the proposed quotaroot */
@@ -2287,26 +2826,36 @@
 		 mboxlist_findall(NULL, pattern, 1, NULL, NULL,
 				 child_cb, (void *) &force);
 	 }
-
 	 /* are we going to force the create anyway? */
-	 if (!force) goto done;
-	 have_mailbox = 0;
-	}
-	else {
-	 if (mbentry.mbtype & (MBTYPE_REMOTE | MBTYPE_MOVING)) {
-		/* Can't set quota on a remote mailbox */
-		r = IMAP_MAILBOX_NOTSUPPORTED;
-		goto done;
+	 if (force) {
+		have_mailbox = 0;
+		r = 0;
 	 }
 	}
+	else if (mbentry->mbtype & (MBTYPE_REMOTE | MBTYPE_MOVING)) {
+	 /* Can't set quota on a remote mailbox */
+	 r = IMAP_MAILBOX_NOTSUPPORTED;
+	}
+	mboxlist_entry_free(&mbentry);
+	if (r) goto done;
 }
 
+ /* safe against quota -f and other root change races */
+ r = quota_changelock();
+ if (r) goto done;
+
 /* initialise the quota */
- q.used = 0;
- q.limit = newquota;
+ memcpy(q.limits, newquotas, sizeof(q.limits));
 r = quota_write(&q, &tid);
 if (r) goto done;
 
+ /* prepare a QuotaChange event notification */
+ quotachange_event = mboxevent_enqueue(EVENT_QUOTA_CHANGE, &mboxevents);
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+ 	if (q.limitsres != QUOTA_UNLIMITED)
+ 	 mboxevent_extract_quota(quotachange_event, &q, res);
+ }
+
 quota_commit(&tid);
 
 /* recurse through mailboxes, setting the quota and finding
@@ -2318,9 +2867,18 @@
 /* submailboxes - we're using internal names here */
 mboxlist_findall(NULL, pattern, 1, 0, 0, mboxlist_changequota, (void *)root);
 
+ quota_changelockrelease();
+
 done:
- if (tid) quota_abort(&tid);
- if (!r) sync_log_quota(root);
+ quota_free(&q);
+ if (r && tid) quota_abort(&tid);
+ if (!r) {
+	sync_log_quota(root);
+
+	/* send QuotaChange and QuotaWithin event notifications */
+	mboxevent_notify(mboxevents);
+ }
+ mboxevent_freequeue(&mboxevents);
 
 return r;
 }
@@ -2328,7 +2886,7 @@
 /*
 * Remove a quota root
 */
-int mboxlist_unsetquota(const char *root)
+EXPORTED int mboxlist_unsetquota(const char *root)
 {
 char patternMAX_MAILBOX_PATH+1;
 struct quota q;
@@ -2339,11 +2897,16 @@
 	return IMAP_MAILBOX_BADNAME;
 }
 
- q.root = root;
+ quota_init(&q, root);
 r = quota_read(&q, NULL, 0);
 /* already unset */
- if (r == IMAP_QUOTAROOT_NONEXISTENT) return 0;
- if (r) return r;
+ if (r == IMAP_QUOTAROOT_NONEXISTENT) {
+	r = 0;
+	goto done;
+ }
+ if (r) goto done;
+
+ r = quota_changelock();
 
 /*
 * Have to remove it from all affected mailboxes
@@ -2362,8 +2925,12 @@
 mboxlist_findall(NULL, pattern, 1, 0, 0, mboxlist_rmquota, (void *)root);
 
 r = quota_deleteroot(root);
+ quota_changelockrelease();
+
 if (!r) sync_log_quota(root);
 
+ done:
+ quota_free(&q);
 return r;
 }
 
@@ -2371,10 +2938,8 @@
 * ACL access canonicalization routine which ensures that 'owner'
 * retains lookup, administer, and create rights over a mailbox.
 */
-int mboxlist_ensureOwnerRights(rock, identifier, myrights)
-void *rock;
-const char *identifier;
-int myrights;
+EXPORTED int mboxlist_ensureOwnerRights(void *rock, const char *identifier,
+			 int myrights)
 {
 char *owner = (char *)rock;
 if (strcmp(identifier, owner) != 0) return myrights;
@@ -2431,17 +2996,18 @@
 int r = 0;
 struct mailbox *mailbox = NULL;
 const char *root = (const char *) rock;
- struct quota q;
- struct txn *tid = NULL;
+ int res;
+ quota_t quota_usageQUOTA_NUMRESOURCES;
 
 assert(root);
 
 r = mailbox_open_iwl(name, &mailbox);
 if (r) goto done;
 
+ mailbox_get_usage(mailbox, quota_usage);
+
 if (mailbox->quotaroot) {
-	struct txn *oldtid = NULL;
-	struct quota oldq;
+	quota_t quota_diffQUOTA_NUMRESOURCES;
 
 	if (strlen(mailbox->quotaroot) >= strlen(root)) {
 	 /* Part of a child quota root - skip */
@@ -2449,44 +3015,19 @@
 	}
 
 	/* remove usage from the old quotaroot */
-	oldq.root = mailbox->quotaroot;
-	r = quota_read(&oldq, &oldtid, 1);
-	if (!r) {
-	 if (oldq.used >= mailbox->i.quota_mailbox_used) {
-		oldq.used -= mailbox->i.quota_mailbox_used;
-	 }
-	 else {
-		oldq.used = 0;
-	 }
-	 r = quota_write(&oldq, &oldtid);
-	}
-	if (!r) quota_commit(&oldtid);
-	else {
-	 quota_abort(&oldtid);
-	 syslog(LOG_ERR,
-		 "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
-		 mailbox->i.quota_mailbox_used, mailbox->quotaroot);
+	for (res = 0; res < QUOTA_NUMRESOURCES ; res++) {
+	 quota_diffres = -quota_usageres;
 	}
+	r = quota_update_useds(mailbox->quotaroot, quota_diff,
+			 mailbox->name);
 }
 
 /* update (or set) the quotaroot */
 r = mailbox_set_quotaroot(mailbox, root);
 if (r) goto done;
 
- /* read the new quota root */
- tid = NULL;
- q.root = root;
- r = quota_read(&q, &tid, 1);
-
- if (!r) {
-	/* track this mailbox's usage */
-	q.used += mailbox->i.quota_mailbox_used;
-	r = quota_write(&q, &tid);
- }
-
- /* and commit the new quota */
- if (!r) quota_commit( &tid);
- else quota_abort(&tid);
+ /* update the new quota root */
+ r = quota_update_useds(root, quota_usage, mailbox->name);
 
 done:
 mailbox_close(&mailbox);
@@ -2502,16 +3043,14 @@
 }
 
 /* must be called after cyrus_init */
-void mboxlist_init(int myflags)
+EXPORTED void mboxlist_init(int myflags)
 {
- int r;
-
 if (myflags & MBOXLIST_SYNC) {
-	r = DB->sync();
+	cyrusdb_sync(DB);
 }
 }
 
-void mboxlist_open(const char *fname)
+EXPORTED void mboxlist_open(const char *fname)
 {
 int ret, flags;
 char *tofree = NULL;
@@ -2530,7 +3069,7 @@
 	flags |= CYRUSDB_MBOXSORT;
 }
 
- ret = (DB->open)(fname, flags, &mbdb);
+ ret = cyrusdb_open(DB, fname, flags, &mbdb);
 if (ret != 0) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
 	 cyrusdb_strerror(ret));
@@ -2544,12 +3083,12 @@
 mboxlist_dbopen = 1;
 }
 
-void mboxlist_close(void)
+EXPORTED void mboxlist_close(void)
 {
 int r;
 
 if (mboxlist_dbopen) {
-	r = (DB->close)(mbdb);
+	r = cyrusdb_close(mbdb);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing mailboxes: %s",
 		 cyrusdb_strerror(r));
@@ -2558,7 +3097,7 @@
 }
 }
 
-void mboxlist_done(void)
+EXPORTED void mboxlist_done(void)
 {
 /* DB->done() handled by cyrus_done() */
 }
@@ -2584,7 +3123,7 @@
 	flags |= CYRUSDB_MBOXSORT;
 }
 
- r = (SUBDB->open)(subsfname, flags, ret);
+ r = cyrusdb_open(SUBDB, subsfname, flags, ret);
 if (r != CYRUSDB_OK) {
 	r = IMAP_IOERROR;
 }
@@ -2598,7 +3137,7 @@
 */
 static void mboxlist_closesubs(struct db *sub)
 {
- (SUBDB->close)(sub);
+ cyrusdb_close(sub);
 }
 
 /*
@@ -2607,7 +3146,7 @@
 * is the user's login id. For each matching mailbox, calls
 * 'proc' with the name of the mailbox.
 */
-int mboxlist_findsub(struct namespace *namespace,
+EXPORTED int mboxlist_findsub(struct namespace *namespace,
 		 const char *pattern, int isadmin __attribute__((unused)),
 		 const char *userid, struct auth_state *auth_state, 
 		 int (*proc)(), void *rock, int force)
@@ -2615,13 +3154,13 @@
 struct db *subs = NULL;
 struct find_rock cbrock;
 char usermboxnameMAX_MAILBOX_BUFFER;
- int usermboxnamelen = 0;
+ size_t usermboxnamelen = 0;
 const char *data;
- int datalen;
+ size_t datalen;
 int r = 0;
 char *p;
- int prefixlen;
- int userlen = userid ? strlen(userid) : 0, domainlen = 0;
+ size_t prefixlen;
+ size_t userlen = userid ? strlen(userid) : 0, domainlen = 0;
 char domainpatMAX_MAILBOX_BUFFER; /* do intra-domain fetches only */
 char *pat = NULL;
 
@@ -2633,7 +3172,7 @@
 	snprintf(domainpat, sizeof(domainpat), "%s!%s", p+1, pattern);
 }
 else
-	strncpy(domainpat, pattern, sizeof(domainpat));
+	xstrncpy(domainpat, pattern, sizeof(domainpat));
 
 cbrock.g = glob_init(pattern, GLOB_HIERARCHY|GLOB_INBOXCASE);
 cbrock.namespace = NULL;
@@ -2642,6 +3181,7 @@
 cbrock.isadmin = 1;		/* user can always see their subs */
 cbrock.auth_state = auth_state;
 cbrock.checkmboxlist = !force;
+ cbrock.issubs = 1;
 cbrock.checkshared = 0;
 cbrock.proc = proc;
 cbrock.procrock = rock;
@@ -2654,14 +3194,16 @@
 	goto done;
 }
 
+ cbrock.db = subs;
+
 /* Build usermboxname */
- if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > userlen)) &&
+ if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > (int)userlen)) &&
 	strlen(userid)+5 < MAX_MAILBOX_BUFFER) {
 	if (domainlen)
 	 snprintf(usermboxname, sizeof(usermboxname),
 		 "%s!", userid+userlen+1);
 	snprintf(usermboxname+domainlen, sizeof(usermboxname)-domainlen,
-		 "user.%.*s", userlen, userid);
+		 "user.%.*s", (int)userlen, userid);
 	usermboxnamelen = strlen(usermboxname);
 }
 else {
@@ -2671,22 +3213,20 @@
 /* Check for INBOX first of all */
 if (userid) {
 	if (GLOB_TEST(cbrock.g, "INBOX") != -1) {
-	 r = SUBDB->fetch(subs, usermboxname, usermboxnamelen,
+	 r = cyrusdb_fetch(subs, usermboxname, usermboxnamelen,
 			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(cbrock.inboxcase, 5, 1, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 	else if (!strncmp(pattern,
 			 usermboxname+domainlen, usermboxnamelen-domainlen) &&
 		 GLOB_TEST(cbrock.g, usermboxname+domainlen) != -1) {
-	 r = SUBDB->fetch(subs, usermboxname, usermboxnamelen,
+	 r = cyrusdb_fetch(subs, usermboxname, usermboxnamelen,
 			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(usermboxname, usermboxnamelen, 1, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 	strlcat(usermboxname, ".", sizeof(usermboxname));
 	usermboxnamelen++;
@@ -2727,10 +3267,10 @@
 
 	cbrock.find_namespace = NAMESPACE_INBOX;
 	/* iterate through prefixes matching usermboxname */
-	SUBDB->foreach(subs,
-		 usermboxname, usermboxnamelen,
-		 &find_p, &find_cb, &cbrock,
-		 NULL);
+	cyrusdb_foreach(subs,
+			usermboxname, usermboxnamelen,
+			&find_p, &find_cb, &cbrock,
+			NULL);
 	free(cbrock.prev);
 	cbrock.prev = NULL;
 	cbrock.prevlen = 0;
@@ -2755,8 +3295,8 @@
 	}
 	/* search for all remaining mailboxes.
 	 just bother looking at the ones that have the same pattern prefix. */
-	SUBDB->foreach(subs, domainpat, domainlen + prefixlen,
-		 &find_p, &find_cb, &cbrock, NULL);
+	cyrusdb_foreach(subs, domainpat, domainlen + prefixlen,
+			&find_p, &find_cb, &cbrock, NULL);
 	free(cbrock.prev);
 	cbrock.prev = NULL;
 	cbrock.prevlen = 0;
@@ -2770,7 +3310,7 @@
 return r;
 }
 
-int mboxlist_allsubs(const char *userid, foreach_cb *proc, void *rock)
+EXPORTED int mboxlist_allsubs(const char *userid, foreach_cb *proc, void *rock)
 {
 struct db *subs = NULL;
 int r;
@@ -2779,14 +3319,14 @@
 r = mboxlist_opensubs(userid, &subs);
 if (r) return r;
 
- r = SUBDB->foreach(subs, "", 0, NULL, proc, rock, 0);
+ r = cyrusdb_foreach(subs, "", 0, NULL, proc, rock, 0);
 
 mboxlist_closesubs(subs);
 
 return r;
 }
 
-int mboxlist_findsub_alt(struct namespace *namespace,
+HIDDEN int mboxlist_findsub_alt(struct namespace *namespace,
 			 const char *pattern, int isadmin __attribute__((unused)),
 			 const char *userid, struct auth_state *auth_state, 
 			 int (*proc)(), void *rock, int force)
@@ -2794,13 +3334,13 @@
 struct db *subs = NULL;
 struct find_rock cbrock;
 char usermboxnameMAX_MAILBOX_BUFFER, patbufMAX_MAILBOX_BUFFER;
- int usermboxnamelen = 0;
+ size_t usermboxnamelen = 0;
 const char *data;
- int datalen;
+ size_t datalen;
 int r = 0;
 char *p;
- int prefixlen, len;
- int userlen = userid ? strlen(userid) : 0, domainlen = 0;
+ size_t prefixlen, len;
+ size_t userlen = userid ? strlen(userid) : 0, domainlen = 0;
 char domainpatMAX_MAILBOX_BUFFER; /* do intra-domain fetches only */
 char *pat = NULL;
 
@@ -2821,6 +3361,7 @@
 cbrock.isadmin = 1;		/* user can always see their subs */
 cbrock.auth_state = auth_state;
 cbrock.checkmboxlist = !force;
+ cbrock.issubs = 1;
 cbrock.checkshared = 0;
 cbrock.proc = proc;
 cbrock.procrock = rock;
@@ -2833,14 +3374,16 @@
 	goto done;
 }
 
+ cbrock.db = subs;
+
 /* Build usermboxname */
- if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > userlen)) &&
+ if (userid && (!(p = strchr(userid, '.')) || ((p - userid) > (int)userlen)) &&
 	strlen(userid)+5 < MAX_MAILBOX_BUFFER) {
 	if (domainlen)
 	 snprintf(usermboxname, sizeof(usermboxname),
 		 "%s!", userid+userlen+1);
 	snprintf(usermboxname+domainlen, sizeof(usermboxname)-domainlen,
-		 "user.%.*s", userlen, userid);
+		 "user.%.*s", (int)userlen, userid);
 	usermboxnamelen = strlen(usermboxname);
 }
 else {
@@ -2850,12 +3393,11 @@
 /* Check for INBOX first of all */
 if (userid) {
 	if (GLOB_TEST(cbrock.g, "INBOX") != -1) {
-	 r = SUBDB->fetch(subs, usermboxname, usermboxnamelen,
-			 &data, &datalen, NULL);
-	 if (!r && data) {
+	 r = cyrusdb_fetch(subs, usermboxname, usermboxnamelen,
+			 &data, &datalen, NULL);
+	 if (r == CYRUSDB_NOTFOUND) r = 0;
+	 else if (!r)
 		r = (*proc)(cbrock.inboxcase, 5, 0, rock);
-	 }
-	 else if (r == CYRUSDB_NOTFOUND) r = 0;
 	}
 	strlcat(usermboxname, ".", sizeof(usermboxname));
 	usermboxnamelen++;
@@ -2890,10 +3432,10 @@
 	cbrock.find_namespace = NAMESPACE_INBOX;
 
 	/* iterate through prefixes matching usermboxname */
-	SUBDB->foreach(subs,
-		 usermboxname, usermboxnamelen,
-		 &find_p, &find_cb, &cbrock,
-		 NULL);
+	cyrusdb_foreach(subs,
+			usermboxname, usermboxnamelen,
+			&find_p, &find_cb, &cbrock,
+			NULL);
 	free(cbrock.prev);
 	cbrock.prev = NULL;
 	cbrock.prevlen = 0;
@@ -2941,10 +3483,10 @@
 	
 	 /* iterate through prefixes matching usermboxname */
 	 strlcpy(domainpat+domainlen, "user", sizeof(domainpat)-domainlen);
-	 SUBDB->foreach(subs,
-			 domainpat, strlen(domainpat),
-			 &find_p, &find_cb, &cbrock,
-			 NULL);
+	 cyrusdb_foreach(subs,
+			 domainpat, strlen(domainpat),
+			 &find_p, &find_cb, &cbrock,
+			 NULL);
 	 free(cbrock.prev);
 	 cbrock.prev = NULL;
 	 cbrock.prevlen = 0;
@@ -2995,10 +3537,10 @@
 		}
 
 		domainpatdomainlen = '\0';
-		SUBDB->foreach(subs,
-			 domainpat, domainlen,
-			 &find_p, &find_cb, &cbrock,
-			 NULL);
+		cyrusdb_foreach(subs,
+				domainpat, domainlen,
+				&find_p, &find_cb, &cbrock,
+				NULL);
 		free(cbrock.prev);
 		cbrock.prev = NULL;
 		cbrock.prevlen = 0;
@@ -3008,10 +3550,10 @@
 		 sizeof(domainpat)-domainlen);
 		cbrock.g = glob_init(domainpat, GLOB_HIERARCHY);
 
-		SUBDB->foreach(subs,
-			 domainpat, domainlen+prefixlen-(len+1),
-			 &find_p, &find_cb, &cbrock,
-			 NULL);
+		cyrusdb_foreach(subs,
+				domainpat, domainlen+prefixlen-(len+1),
+				&find_p, &find_cb, &cbrock,
+				NULL);
 		free(cbrock.prev);
 		cbrock.prev = NULL;
 		cbrock.prevlen = 0;
@@ -3028,16 +3570,16 @@
 }
 
 /* returns CYRUSDB_NOTFOUND if the folder doesn't exist, and 0 if it does! */
-int mboxlist_checksub(const char *name, const char *userid)
+EXPORTED int mboxlist_checksub(const char *name, const char *userid)
 {
 int r;
 struct db *subs;
 const char *val;
- int vallen;
+ size_t vallen;
 
 r = mboxlist_opensubs(userid, &subs);
 
- if (!r) r = SUBDB->fetch(subs, name, strlen(name), &val, &vallen, NULL);
+ if (!r) r = cyrusdb_fetch(subs, name, strlen(name), &val, &vallen, NULL);
 
 mboxlist_closesubs(subs);
 return r;
@@ -3049,13 +3591,15 @@
 * if 'force' is set, force the subscription through even if
 * we don't know about 'name'.
 */
-int mboxlist_changesub(const char *name, const char *userid, 
-		 struct auth_state *auth_state, int add, int force)
+EXPORTED int mboxlist_changesub(const char *name, const char *userid,
+				struct auth_state *auth_state, 
+				int add, int force, int notify)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 struct db *subs;
- 
+ struct mboxevent *mboxevent;
+
 if ((r = mboxlist_opensubs(userid, &subs)) != 0) {
 	return r;
 }
@@ -3066,16 +3610,17 @@
 	 mboxlist_closesubs(subs);
 	 return r;
 	}
-	if ((cyrus_acl_myrights(auth_state, mbentry.acl) & ACL_LOOKUP) == 0) {
+	if ((cyrus_acl_myrights(auth_state, mbentry->acl) & ACL_LOOKUP) == 0) {
 	 mboxlist_closesubs(subs);
+	 mboxlist_entry_free(&mbentry);
 	 return IMAP_MAILBOX_NONEXISTENT;
 	}
 }
 
 if (add) {
-	r = SUBDB->store(subs, name, strlen(name), "", 0, NULL);
+	r = cyrusdb_store(subs, name, strlen(name), "", 0, NULL);
 } else {
-	r = SUBDB->delete(subs, name, strlen(name), NULL, 0);
+	r = cyrusdb_delete(subs, name, strlen(name), NULL, 0);
 	/* if it didn't exist, that's ok */
 	if (r == CYRUSDB_EXISTS) r = CYRUSDB_OK;
 }
@@ -3092,60 +3637,39 @@
 
 sync_log_subscribe(userid, name);
 mboxlist_closesubs(subs);
+ mboxlist_entry_free(&mbentry);
+
+ /* prepare a MailboxSubscribe or MailboxUnSubscribe event notification */
+ if (notify && r == 0) {
+	mboxevent = mboxevent_new(add ? EVENT_MAILBOX_SUBSCRIBE :
+					EVENT_MAILBOX_UNSUBSCRIBE);
+
+	mboxevent_set_access(mboxevent, NULL, NULL, userid, name);
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
 return r;
 }
 
 /* Transaction Handlers */
-int mboxlist_commit(struct txn *tid) 
+EXPORTED int mboxlist_commit(struct txn *tid)
 {
 assert(tid);
 
- return DB->commit(mbdb, tid);
+ return cyrusdb_commit(mbdb, tid);
 }
 
-int mboxlist_abort(struct txn *tid) 
+int mboxlist_abort(struct txn *tid)
 {
 assert(tid);
 
- return DB->abort(mbdb, tid);
+ return cyrusdb_abort(mbdb, tid);
 }
 
-int mboxlist_delayed_delete_isenabled(void)
+EXPORTED int mboxlist_delayed_delete_isenabled(void)
 {
 enum enum_value config_delete_mode = config_getenum(IMAPOPT_DELETE_MODE);
 
 return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
 }
-
-/* Callback used by mboxlist_count_inferiors below */
-static int
-mboxlist_count_addmbox(char *name __attribute__((unused)),
- int matchlen __attribute__((unused)),
- int maycreate __attribute__((unused)),
- void *rock)
-{
- int *count = (int *)rock;
-
- (*count)++;
- 
- return 0;
-}
-
-/* Count how many children a mailbox has */
-int
-mboxlist_count_inferiors(const char *mailboxname, int isadmin,
-			 const char *userid, struct auth_state *authstate)
-{
- int count = 0;
- char mailboxname2MAX_MAILBOX_BUFFER;
- char *p;
-
- strcpy(mailboxname2, mailboxname);
- p = mailboxname2 + strlen(mailboxname2); /* end of mailboxname */
- strcpy(p, ".*");
-
- mboxlist_findall(NULL, mailboxname2, isadmin, userid,
- authstate, mboxlist_count_addmbox, &count);
-
- return(count);
-}

cyrus-imapd-2.4.17.tar.gz/imap/mboxlist.h -> cyrus-imapd-2.5.tar.gz/imap/mboxlist.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mboxlist.h,v 1.48 2010/01/06 17:01:37 murch Exp $
 */
 
 #ifndef INCLUDED_MBOXLIST_H
@@ -47,8 +45,10 @@
 
 #include "config.h"
 #include "cyrusdb.h"
+#include "dlist.h"
 #include "mailbox.h"
 #include "auth.h"
+#include "mboxevent.h"
 #include "mboxname.h"
 
 extern struct db *mbdb;
@@ -68,6 +68,11 @@
 #define MBTYPE_NETNEWS (1<<2) /* Netnews Mailbox - NO LONGER USED */
 #define MBTYPE_MOVING (1<<3) /* Mailbox in mid-transfer (part is remotehost!localpart) */
 #define MBTYPE_DELETED (1<<4) /* Mailbox has been deleted, but not yet cleaned up */
+#define MBTYPE_CALENDAR (1<<5) /* Calendar Mailbox */
+#define MBTYPE_ADDRESSBOOK (1<<6) /* Addressbook Mailbox */
+
+#define MBTYPES_DAV (MBTYPE_CALENDAR|MBTYPE_ADDRESSBOOK)
+#define MBTYPES_NONIMAP (MBTYPE_NETNEWS|MBTYPES_DAV)
 
 /* master name of the mailboxes file */
 #define FNAME_MBOXLIST "/mailboxes.db"
@@ -76,25 +81,49 @@
 
 /* each mailbox has the following data */
 struct mboxlist_entry {
- const char *name;
+ char *name;
+ time_t mtime;
+ uint32_t uidvalidity;
 int mbtype;
 char *partition;
-				/* holds remote machine for REMOTE mailboxes */
+ char *server; /* holds remote machine for REMOTE mailboxes */
 char *acl;
+ /* extra fields */
+ char *uniqueid;
+ /* legacy upgrade support */
+ char *legacy_specialuse;
 };
 
+typedef struct mboxlist_entry mbentry_t;
+
+mbentry_t *mboxlist_entry_create();
+
+EXPORTED int mboxlist_parse_entry(mbentry_t **mbentryptr,
+				 const char *name, size_t namelen,
+				 const char *data, size_t datalen);
+
+void mboxlist_entry_free(mbentry_t **mbentryptr);
+
+/* formats a cstring from a mboxlist_entry. Caller must free
+ * after use */
+char *mboxlist_entry_cstring(mbentry_t *mbentry);
+
+const char *mboxlist_mbtype_to_string(uint32_t mbtype);
+uint32_t mboxlist_string_to_mbtype(const char *string);
+
 /* Lookup 'name' in the mailbox list. */
-int mboxlist_lookup(const char *name, struct mboxlist_entry *entry, struct txn **tid);
+int mboxlist_lookup(const char *name, mbentry_t **mbentryptr,
+		 struct txn **tid);
+int mboxlist_lookup_allow_reserved(const char *name,
+				 mbentry_t **mbentryptr,
+				 struct txn **tid);
 
 /* insert/delete stub entries */
-int mboxlist_insertremote(const char *name, int mbtype, const char *host,
-			 const char *acl, struct txn **rettid);
+int mboxlist_insertremote(mbentry_t *mbentry, struct txn **rettid);
 int mboxlist_deleteremote(const char *name, struct txn **in_tid);
 
 /* Update a mailbox's entry */
-int mboxlist_update(const char *name, int mbtype, 
-		 const char *part, 
-		 const char *acl, int localonly);
+int mboxlist_update(mbentry_t *mbentry, int localonly);
 
 /* check user's ability to create mailbox */
 int mboxlist_createmailboxcheck(const char *name, int mbtype,
@@ -108,44 +137,58 @@
 /* localonly creates the local mailbox without touching mupdate */
 /* forceuser allows the creation of user.x.<name> without a user.x */
 /* dbonly skips filesystem operations (e.g. reconstruct) */
+/* notify sends a MailboxCreate event notification */
+/* if given a mailbox pointer, return the still-locked mailbox
+ * for further manipulation */
 int mboxlist_createmailbox(const char *name, int mbtype,
 			 const char *partition,
 			 int isadmin, const char *userid, 
 			 struct auth_state *auth_state,
-			 int localonly, int forceuser, int dbonly);
+			 int localonly, int forceuser, int dbonly,
+			 int notify, struct mailbox **mailboxptr);
 
 /* create mailbox from sync */
 int mboxlist_createsync(const char *name, int mbtype,
 			const char *partition, 
 			const char *userid, struct auth_state *auth_state,
-			int options, unsigned uidvalidity, const char *acl,
+			int options, unsigned uidvalidity, 
+			modseq_t highestmodseq, const char *acl,
 			const char *uniqueid, struct mailbox **mboxptr);
 
 /* delated delete */
 /* Translate delete into rename */
+/* prepare MailboxDelete notification if mboxevent is not NULL */
 int
 mboxlist_delayed_deletemailbox(const char *name, int isadmin, const char *userid, 
- struct auth_state *auth_state, int checkacl,
- int local_only, int force);
+ struct auth_state *auth_state,
+ struct mboxevent *mboxevent,
+			 int checkacl,
+ int force);
 /* Delete a mailbox. */
 /* setting local_only disables any communication with the mupdate server
 * and deletes the mailbox from the filesystem regardless of if it is
 * MBTYPE_REMOTE or not */
 /* force ignores errors and just tries to wipe the mailbox off the face of
 * the planet */
+/* prepare MailboxDelete notification if mboxevent is not NULL */
 int mboxlist_deletemailbox(const char *name, int isadmin, const char *userid, 
-			 struct auth_state *auth_state, int checkacl,
+			 struct auth_state *auth_state,
+			 struct mboxevent *mboxevent,
+			 int checkacl,
 			 int local_only, int force);
 
 /* Rename/move a mailbox (hierarchical) */
+/* prepare MailboxRename notification if mboxevent is not NULL */
 int mboxlist_renamemailbox(const char *oldname, const char *newname,
-			 const char *partition, int isadmin,
-			 const char *userid, struct auth_state *auth_state,
+			 const char *partition, unsigned uidvalidity,
+			 int isadmin, const char *userid,
+			 struct auth_state *auth_state,
+			 struct mboxevent *mboxevent,
 			 int forceuser, int ignorequota);
 
 /* change ACL */
-int mboxlist_setacl(const char *name, const char *identifier,
-		 const char *rights, int isadmin, 
+int mboxlist_setacl(struct namespace *namespace, const char *name,
+		 const char *identifier, const char *rights, int isadmin,
 		 const char *userid, struct auth_state *auth_state);
 
 /* Change all ACLs on mailbox */
@@ -162,7 +205,9 @@
 
 /* direct access to subs DB */
 int mboxlist_allsubs(const char *userid, foreach_cb *proc, void *rock);
-int mboxlist_allmbox(const char *prefix, foreach_cb *proc, void *rock);
+int mboxlist_allmbox(const char *prefix, foreach_cb *proc, void *rock, int incdel);
+int mboxlist_allusermbox(const char *userid, foreach_cb *proc, void *rock,
+			 int include_deleted);
 
 /* Find subscribed mailboxes that match 'pattern'. */
 int mboxlist_findsub(struct namespace *namespace,
@@ -183,16 +228,14 @@
 
 /* Change 'user's subscription status for mailbox 'name'. */
 int mboxlist_changesub(const char *name, const char *userid, 
-		 struct auth_state *auth_state, int add, int force);
+		 struct auth_state *auth_state,
+		 int add, int force, int notify);
 
 /* set or create quota root */
-int mboxlist_setquota(const char *root, int newquota, int force);
+int mboxlist_setquotas(const char *root,
+		 int newquotasQUOTA_NUMRESOURCES, int force);
 int mboxlist_unsetquota(const char *root);
 
-/* returns a malloc() string that is the representation in the mailboxes 
- file. for ctl_mboxlist */
-char *mboxlist_makeentry(int mbtype, const char *part, const char *acl);
-
 /* open the mailboxes db */
 void mboxlist_open(const char *name);
 
@@ -212,9 +255,4 @@
 
 int mboxlist_delayed_delete_isenabled(void);
 
-/* Small utility routine for limit_user_folders */
-int mboxlist_count_inferiors(const char *mboxname, int isadmin,
-			 const char *userid,
-			 struct auth_state *authstate);
-
 #endif

cyrus-imapd-2.4.17.tar.gz/imap/mboxname.c -> cyrus-imapd-2.5.tar.gz/imap/mboxname.c Changed

@@ -38,15 +38,13 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mboxname.c,v 1.51 2010/06/28 12:04:30 brong Exp $
 */
 
 #include <config.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <syslog.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -56,8 +54,11 @@
 #include "exitcodes.h"
 #include "glob.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
+#include "map.h"
+#include "retry.h"
+#include "user.h"
 #include "util.h"
 #include "xmalloc.h"
 
@@ -65,6 +66,8 @@
 #include "mboxlist.h"
 #include "cyr_lock.h"
 
+static int mboxname_strip_deletedprefix(char *name, char **ptr);
+
 struct mboxlocklist {
 struct mboxlocklist *next;
 struct mboxlock l;
@@ -76,7 +79,7 @@
 static struct namespace *admin_namespace;
 
 /* Mailbox patterns which the design of the server prohibits */
-static char *badmboxpatterns = {
+static const char * const badmboxpatterns = {
 "",
 "*\t*",
 "*\n*",
@@ -85,7 +88,6 @@
 "*.",
 "*..*",
 "user",
- "*.INBOX.INBOX*",
 };
 #define NUM_BADMBOXPATTERNS (sizeof(badmboxpatterns)/sizeof(*badmboxpatterns))
 
@@ -113,6 +115,8 @@
 };
 #define CHARMOD64(c) (index_mod64(unsigned char)(c))
 
+#define FNAME_SHAREDPREFIX "shared"
+
 
 static struct mboxlocklist *create_lockitem(const char *name)
 {
@@ -128,22 +132,19 @@
 return item;
 }
 
-struct mboxlocklist *find_lockitem(const char *name)
+static struct mboxlocklist *find_lockitem(const char *name)
 {
 struct mboxlocklist *item;
- struct mboxlocklist *previtem = NULL;
 
- /* remove from the active list */
 for (item = open_mboxlocks; item; item = item->next) {
 	if (!strcmp(name, item->l.name))
 	 return item;
-	previtem = item;
 }
 
 return NULL;
 }
 
-void remove_lockitem(struct mboxlocklist *remitem)
+static void remove_lockitem(struct mboxlocklist *remitem)
 {
 struct mboxlocklist *item;
 struct mboxlocklist *previtem = NULL;
@@ -154,8 +155,11 @@
 		previtem->next = item->next;
 	 else
 		open_mboxlocks = item->next;
-	 if (item->l.lock_fd != -1)
+	 if (item->l.lock_fd != -1) {
+		if (item->l.locktype)
+		 lock_unlock(item->l.lock_fd, item->l.name);
 		close(item->l.lock_fd);
+	 }
 	 free(item->l.name);
 	 free(item);
 	 return;
@@ -168,12 +172,17 @@
 
 /* name locking support */
 
-int mboxname_lock(const char *mboxname, struct mboxlock **mboxlockptr,
-		 int locktype)
+EXPORTED int mboxname_lock(const char *mboxname, struct mboxlock **mboxlockptr,
+		 int locktype_and_flags)
 {
 const char *fname;
 int r = 0;
 struct mboxlocklist *lockitem;
+ int nonblock;
+ int locktype;
+
+ nonblock = !!(locktype_and_flags & LOCK_NONBLOCK);
+ locktype = (locktype_and_flags & ~LOCK_NONBLOCK);
 
 fname = mboxname_lockpath(mboxname);
 if (!fname)
@@ -183,8 +192,6 @@
 
 /* already open? just use this one */
 if (lockitem) {
-	if (locktype == LOCK_NONBLOCKING)
-	 locktype = LOCK_EXCLUSIVE;
 	/* can't change locktype! */
 	if (lockitem->l.locktype != locktype)
 	 return IMAP_MAILBOX_LOCKED;
@@ -211,23 +218,12 @@
 	goto done;
 }
 
- switch (locktype) {
- case LOCK_SHARED:
-	r = lock_shared(lockitem->l.lock_fd);
-	if (!r) lockitem->l.locktype = LOCK_SHARED;
-	break;
- case LOCK_EXCLUSIVE:
-	r = lock_blocking(lockitem->l.lock_fd);
-	if (!r) lockitem->l.locktype = LOCK_EXCLUSIVE;
-	break;
- case LOCK_NONBLOCKING:
-	r = lock_nonblocking(lockitem->l.lock_fd);
-	if (r == -1) r = IMAP_MAILBOX_LOCKED;
-	else if (!r) lockitem->l.locktype = LOCK_EXCLUSIVE;
-	break;
- default:
-	fatal("unknown lock type", EC_SOFTWARE);
- }
+ r = lock_setlock(lockitem->l.lock_fd,
+		 locktype == LOCK_EXCLUSIVE,
+		 nonblock, fname);
+ if (!r) lockitem->l.locktype = locktype;
+ else if (errno == EWOULDBLOCK) r = IMAP_MAILBOX_LOCKED;
+ else r = errno;
 
 done:
 if (r) remove_lockitem(lockitem);
@@ -236,7 +232,7 @@
 return r;
 }
 
-void mboxname_release(struct mboxlock **mboxlockptr)
+EXPORTED void mboxname_release(struct mboxlock **mboxlockptr)
 {
 struct mboxlocklist *lockitem;
 struct mboxlock *lock = *mboxlockptr;
@@ -264,6 +260,48 @@
 * one end to the other and such. Yay flexibility.
 */
 
+EXPORTED int mboxname_parts_to_internal(struct mboxname_parts *parts,
+					char *result)
+{
+ char *p = result;
+ size_t sz = MAX_MAILBOX_NAME;
+ size_t len;
+ const char *dp = config_getstring(IMAPOPT_DELETEDPREFIX);
+ const char *pf = "";
+
+ if (parts->domain) {
+	len = snprintf(p, sz, "%s!", parts->domain);
+	p += len;
+	sz -= len;
+	if (!sz) return IMAP_MAILBOX_BADNAME;
+ }
+
+ if (parts->is_deleted) {
+	len = snprintf(p, sz, "%s%s", pf, dp);
+	p += len;
+	sz -= len;
+	if (!sz) return IMAP_MAILBOX_BADNAME;
+	pf = ".";
+ }
+
+ if (parts->userid) {
+	len = snprintf(p, sz, "%suser.%s", pf, parts->userid);
+	p += len;
+	sz -= len;
+	if (!sz) return IMAP_MAILBOX_BADNAME;
+	pf = ".";
+ }
+
+ if (parts->box) {
+	len = snprintf(p, sz, "%s%s", pf, parts->box);
+	p += len;
+	sz -= len;
+	if (!sz) return IMAP_MAILBOX_BADNAME;
+ }
+
+ return 0;
+}
+
 /* Handle conversion from the standard namespace to the internal namespace */
 static int mboxname_tointernal(struct namespace *namespace, const char *name,
 			 const char *userid, char *result)
@@ -508,44 +546,52 @@
 */
 
 /* Handle conversion from the internal namespace to the standard namespace */
-static int mboxname_toexternal(struct namespace *namespace, const char *name,
+static int mboxname_toexternal(struct namespace *namespace, const char *mboxname,
 			 const char *userid, char *result)
 {
- char *domain = NULL, *cp;
- size_t domainlen = 0, resultlen;
+ struct mboxname_parts mbparts;
+ struct mboxname_parts userparts;
 
 /* Blank the result, just in case */
 result0 = '\0';
 
- if(strlen(name) > MAX_MAILBOX_NAME) return IMAP_MAILBOX_BADNAME;
- 
- if (config_virtdomains && (cp = strchr(name, '!'))) {
-	domain = (char*) name;
-	domainlen = cp++ - name;
-	name = cp;
+ if (strlen(mboxname) > MAX_MAILBOX_NAME)
+	return IMAP_MAILBOX_BADNAME;
 
-	/* don't use the domain if it matches the user's domain */
-	if (userid && (cp = strchr(userid, '@')) &&
-	 (strlen(++cp) == domainlen) && !strncmp(domain, cp, domainlen))
-	 domain = NULL;
- }
+ mboxname_to_parts(mboxname, &mbparts);
+ mboxname_userid_to_parts(userid, &userparts);
 
- strcpy(result, name);
+ if (mbparts.userid) {
+	if (!namespace->isadmin && !mbparts.is_deleted &&
+	 mboxname_parts_same_userid(&mbparts, &userparts)) {
+	 strcpy(result, "INBOX");
+	}
+	else if (mbparts.is_deleted) {
+	 const char *dp = config_getstring(IMAPOPT_DELETEDPREFIX);
+	 sprintf(result, "%s.user.%s", dp, mbparts.userid);
+	}
+	else {
+	 sprintf(result, "user.%s", mbparts.userid);
+	}
+
+	if (mbparts.box)
+	 strcat(result, ".");
+ }
+ if (mbparts.box)
+	strcat(result, mbparts.box);
 
 /* Translate any separators in mailboxname */
 mboxname_hiersep_toexternal(namespace, result, 0);
 
- resultlen = strlen(result);
-
- /* Append domain */
- if (domain) {
-	if(resultlen+domainlen+1 > MAX_MAILBOX_NAME) 
-	 return IMAP_MAILBOX_BADNAME;
-
-	snprintf(result+resultlen, MAX_MAILBOX_BUFFER-resultlen, 
-		 "@%.*s", (int) domainlen, domain);
+ /* Append domain - only if not the same as the user */
+ if (mbparts.domain &&
+	strcmpsafe(userparts.domain, mbparts.domain)) {
+	strcat(result, "@");
+	strcat(result, mbparts.domain);
 }
 
+ mboxname_free_parts(&mbparts);
+ mboxname_free_parts(&userparts);
 return 0;
 }
 
@@ -634,7 +680,7 @@
 /*
 * Create namespace based on config options.
 */
-int mboxname_init_namespace(struct namespace *namespace, int isadmin)
+EXPORTED int mboxname_init_namespace(struct namespace *namespace, int isadmin)
 {
 const char *prefix;
 
@@ -694,7 +740,7 @@
 return 0;
 }
 
-struct namespace *mboxname_get_adminnamespace()
+EXPORTED struct namespace *mboxname_get_adminnamespace()
 {
 static struct namespace ns;
 if (!admin_namespace) {
@@ -709,7 +755,7 @@
 * representation to its internal representation '.'.
 * If using the unixhierarchysep '/', all '.'s get translated to DOTCHAR.
 */
-char *mboxname_hiersep_tointernal(struct namespace *namespace, char *name,
+EXPORTED char *mboxname_hiersep_tointernal(struct namespace *namespace, char *name,
 				 int length)
 {
 char *p;
@@ -735,7 +781,7 @@
 * representation '.' to its external representation.
 * If using the unixhierarchysep '/', all DOTCHAR get translated to '.'.
 */
-char *mboxname_hiersep_toexternal(struct namespace *namespace, char *name,
+EXPORTED char *mboxname_hiersep_toexternal(struct namespace *namespace, char *name,
 int length)
 {
 char *p;
@@ -759,7 +805,7 @@
 /*
 * Return nonzero if 'userid' owns the (internal) mailbox 'name'.
 */
-int mboxname_userownsmailbox(const char *userid, const char *name)
+EXPORTED int mboxname_userownsmailbox(const char *userid, const char *name)
 {
 struct namespace internal = NAMESPACE_INITIALIZER;
 char inboxnameMAX_MAILBOX_BUFFER;
@@ -776,7 +822,7 @@
 * If (internal) mailbox 'name' is a user's mailbox (optionally INBOX),
 * returns a pointer to the userid, otherwise returns NULL.
 */
-char *mboxname_isusermailbox(const char *name, int isinbox)
+EXPORTED char *mboxname_isusermailbox(const char *name, int isinbox)
 {
 const char *p;
 const char *start = name;
@@ -795,17 +841,14 @@
 	return NULL;
 }
 
-/*
- * If (internal) mailbox 'name' is a DELETED mailbox
- * returns boolean
- */
-int mboxname_isdeletedmailbox(const char *name)
+/* NOTE - name must have had domain removed already */
+static int mboxname_strip_deletedprefix(char *name, char **ptr)
 {
 static const char *deletedprefix = NULL;
 static int deletedprefix_len = 0;
- int domainlen = 0;
- char *p;
 
+ /* cache for efficiency, this code can get called 
+ * in an inner loop */
 if (!deletedprefix) {
 	deletedprefix = config_getstring(IMAPOPT_DELETEDPREFIX);
 	deletedprefix_len = strlen(deletedprefix);
@@ -814,52 +857,294 @@
 /* if the prefix is blank, then nothing is deleted */
 if (!deletedprefix_len) return 0;
 
+ if (strncmp(name, deletedprefix, deletedprefix_len))
+	return IMAP_MAILBOX_BADNAME;
+
+ if (namedeletedprefix_len != '.')
+	return IMAP_MAILBOX_BADNAME;
+
+ *ptr = name + deletedprefix_len + 1;
+
+ return 0;
+}
+
+/*
+ * If (internal) mailbox 'name' is a DELETED mailbox
+ * returns boolean
+ */
+EXPORTED int mboxname_isdeletedmailbox(const char *name, time_t *timestampp)
+{
+ int domainlen = 0;
+ char *rest = NULL;
+ char *p;
+ int i;
+
 if (config_virtdomains && (p = strchr(name, '!')))
 	domainlen = p - name + 1;
 
- return ((!strncmp(name + domainlen, deletedprefix, deletedprefix_len) &&
-	 namedomainlen + deletedprefix_len == '.') ? 1 : 0);
+ if (mboxname_strip_deletedprefix((char *)(name + domainlen), &rest))
+	return 0;
+
+ /* Sanity check for 8 hex digits only at the end */
+ p = strrchr(rest, '.');
+ if (!p)
+	return 0;
+ p++;
+
+ for (i = 0 ; i < 7; i++) {
+ if (!Uisxdigit(pi))
+	 return 0;
+ }
+ if (p8 != '\0')
+	return 0;
+
+ if (timestampp)
+	*timestampp = (time_t)strtoul(p, NULL, 16);
+
+ return 1;
+}
+
+/*
+ * If (internal) mailbox 'name' is a CALENDAR mailbox
+ * returns boolean
+ */
+int mboxname_iscalendarmailbox(const char *name, int mbtype)
+{
+ static const char *calendarprefix = NULL;
+ static int calendarprefix_len = 0;
+ const char *p;
+ const char *start = name;
+
+ if (mbtype & MBTYPE_CALENDAR) return 1; /* Only works on backends */
+
+ if (!calendarprefix) {
+	calendarprefix = config_getstring(IMAPOPT_CALENDARPREFIX);
+	if (calendarprefix) calendarprefix_len = strlen(calendarprefix);
+ }
+
+ /* if the prefix is blank, then no calendars */
+ if (!calendarprefix_len) return 0;
+
+ /* step past the domain part */
+ if (config_virtdomains && (p = strchr(start, '!')))
+	start = p + 1;
+
+ /* step past the user part */
+ if (!strncmp(start, "user.", 5) && (p = strchr(start+5, '.')))
+	start = p + 1;
+
+ return ((!strncmp(start, calendarprefix, calendarprefix_len) &&
+	 (startcalendarprefix_len == '\0' ||
+	 startcalendarprefix_len == '.')) ? 1 : 0);
+}
+
+/*
+ * If (internal) mailbox 'name' is a ADDRESSBOOK mailbox
+ * returns boolean
+ */
+int mboxname_isaddressbookmailbox(const char *name, int mbtype)
+{
+ static const char *addressbookprefix = NULL;
+ static int addressbookprefix_len = 0;
+ const char *p;
+ const char *start = name;
+
+ if (mbtype & MBTYPE_ADDRESSBOOK) return 1; /* Only works on backends */
+
+ if (!addressbookprefix) {
+	addressbookprefix = config_getstring(IMAPOPT_ADDRESSBOOKPREFIX);
+	if (addressbookprefix) addressbookprefix_len = strlen(addressbookprefix);
+ }
+
+ /* if the prefix is blank, then no addressbooks */
+ if (!addressbookprefix_len) return 0;
+
+ /* step past the domain part */
+ if (config_virtdomains && (p = strchr(start, '!')))
+	start = p + 1;
+
+ /* step past the user part */
+ if (!strncmp(start, "user.", 5) && (p = strchr(start+5, '.')))
+	start = p + 1;
+
+ return ((!strncmp(start, addressbookprefix, addressbookprefix_len) &&
+	 (startaddressbookprefix_len == '\0' ||
+	 startaddressbookprefix_len == '.')) ? 1 : 0);
 }
 
 /*
 * Translate (internal) inboxname into corresponding userid.
 */
-char *mboxname_to_userid(const char *mboxname)
+EXPORTED const char *mboxname_to_userid(const char *mboxname)
 {
 static char useridMAX_MAILBOX_BUFFER;
- const char *domain = NULL, *cp;
- char *rp;
- int domainlen = 0;
+ char *ret;
+ struct mboxname_parts parts;
+
+ if (mboxname_to_parts(mboxname, &parts))
+	return NULL;
 
- if (config_virtdomains && (cp = strchr(mboxname, '!'))) {
-	/* locate, save, and skip domain */
-	domain = mboxname;
-	domainlen = cp++ - mboxname;
+ if (parts.userid == NULL) {
+	ret = NULL;
 } else {
-	cp = mboxname;
+	if (parts.domain)
+	 snprintf(userid, sizeof(userid), "%s@%s", parts.userid, parts.domain);
+	else
+	 xstrncpy(userid, parts.userid, sizeof(userid));
+	ret = userid;
 }
 
- /* not a user mailbox? */
- if (strncmp(cp, "user.", 5))
-	return NULL;
+ mboxname_free_parts(&parts);
+ return ret;
+}
 
- /* skip "user." */
- strcpy(userid, cp + 5);
+EXPORTED char *mboxname_user_mbox(const char *userid, const char *subfolder)
+{
+ struct buf mbox = BUF_INITIALIZER;
 
- /* find end of userid */
- rp = strchr(userid, '.');
- if (!rp) rp = userid + strlen(userid);
+ if (!userid) return NULL;
 
- if (domain) {
-	/* append domain */
-	sprintf(rp, "@%.*s", domainlen, domain);
+ if (config_virtdomains) {
+	const char *atp;
+	atp = strchr(userid, '@');
+	if (atp) {
+	 buf_printf(&mbox, "%s!user.%.*s", atp+1, (int)(atp-userid), userid);
+	 goto userdone;
+	}
 }
- else {
-	/* otherwise close off at end of userid anyway */
-	*rp = '\0';
+
+ /* otherwise it's simple */
+ buf_printf(&mbox, "user.%s", userid);
+
+ userdone:
+ if (subfolder)
+	buf_printf(&mbox, ".%s", subfolder);
+
+ return buf_release(&mbox);
+}
+
+/*
+ * Check whether two parts have the same userid.
+ * Returns: 1 if the userids are the same, 0 if not.
+ */
+EXPORTED int mboxname_parts_same_userid(struct mboxname_parts *a,
+			 struct mboxname_parts *b)
+{
+ int r;
+
+ r = strcmpsafe(a->domain, b->domain);
+ if (!r)
+	r = strcmpsafe(a->userid, b->userid);
+ return !r;
+}
+
+/*
+ * Check whether two mboxnames have the same userid.
+ * Needed for some corner cases in the COPY command.
+ * Returns: 1 if the userids are the same, 0 if not,
+ *	 or negative error.
+ */
+EXPORTED int mboxname_same_userid(const char *name1, const char *name2)
+{
+ struct mboxname_parts parts1, parts2;
+ int r;
+
+ if (mboxname_to_parts(name1, &parts1))
+	return IMAP_MAILBOX_BADNAME;
+ if (mboxname_to_parts(name2, &parts2)) {
+	mboxname_free_parts(&parts1);
+	return IMAP_MAILBOX_BADNAME;
+ }
+
+ r = mboxname_parts_same_userid(&parts1, &parts2);
+
+ mboxname_free_parts(&parts1);
+ mboxname_free_parts(&parts2);
+
+ return r;
+}
+
+/*
+ * Split an (internal) inboxname into it's constituent
+ * parts, filling out and returning a parts structure.
+ * The caller must clean up the parts structure by
+ * calling mboxname_free_parts().
+ * Returns 0 on success, -ve error otherwise.
+ */
+EXPORTED int mboxname_to_parts(const char *mboxname, struct mboxname_parts *parts)
+{
+ char *b, *e; /* beginning and end of string parts */
+
+ mboxname_init_parts(parts);
+
+ if (!mboxname)
+	return 0;
+
+ b = parts->freeme = xstrdup(mboxname);
+
+ if (config_virtdomains && (e = strchr(b, '!'))) {
+	parts->domain = b;
+	*e++ = '\0';
+	b = e;
+ }
+
+ if (!mboxname_strip_deletedprefix(b, &b)) {
+	parts->is_deleted = 1;
+ }
+
+ if (!strncmp(b, "user.", 5)) {
+	/* user mailbox */
+	b += 5;
+	parts->userid = b;
+	/* find end of userid */
+	e = strchr(b, '.');
+	if (e) {
+	 *e++ = '\0';
+	 b = e;
+	} else {
+	 b += strlen(b);
+	}
+ } else {
+	/* shared mailbox - nothing to strip */
+ }
+
+ if (*b) parts->box = b;
+
+ return 0;
+}
+
+EXPORTED int mboxname_userid_to_parts(const char *userid, struct mboxname_parts *parts)
+{
+ char *b, *e; /* beginning and end of string parts */
+
+ mboxname_init_parts(parts);
+
+ if (!userid)
+	return 0;
+
+ b = parts->freeme = xstrdup(userid);
+
+ parts->userid = b;
+
+ if (config_virtdomains && (e = strchr(b, '@'))) {
+	*e++ = '\0';
+	parts->domain = e;
 }
 
- return(userid);
+ return 0;
+}
+
+EXPORTED void mboxname_init_parts(struct mboxname_parts *parts)
+{
+ memset(parts, 0, sizeof(*parts));
+}
+
+EXPORTED void mboxname_free_parts(struct mboxname_parts *parts)
+{
+ if (parts->freeme) {
+	free(parts->freeme);
+	memset(parts, 0, sizeof(*parts));
+ }
 }
 
 /*
@@ -904,8 +1189,9 @@
 * Restrictions are hardwired for now.
 */
 #define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
-int mboxname_policycheck(const char *name)
+HIDDEN int mboxname_policycheck(const char *name)
 {
+ const char *p;
 unsigned i;
 struct glob *g;
 int sawutf7 = 0;
@@ -922,17 +1208,21 @@
 * A thorough fix might remove the prefix and timestamp
 * then continue with the check
 */
- if (mboxname_isdeletedmailbox(name))
+ if (mboxname_isdeletedmailbox(name, NULL))
 	return 0;
 
 if (strlen(name) > MAX_MAILBOX_NAME)
 	return IMAP_MAILBOX_BADNAME;
 
- /* because directory hashing could create ambiguous naming for
- * a folder if the first item is a single character long, reject
- * single character top level names */
- if (name1 == '.' || name1 == '\0')
-	return IMAP_MAILBOX_BADNAME;
+ /* find the virtual domain, if any. We don't sanity check domain
+ names yet - maybe we should */
+ p = strchr(name, '!');
+ if (p) {
+	if (config_virtdomains)
+	 name = p + 1;
+	else
+	 return IMAP_MAILBOX_BADNAME;
+ }
 
 for (i = 0; i < NUM_BADMBOXPATTERNS; i++) {
 	g = glob_init(badmboxpatternsi, GLOB_ICASE);
@@ -1010,10 +1300,13 @@
 	 name++;		/* Skip over terminating '-' */
 	}
 	else {
+	 /* If we're using unixhierarchysep, DOTCHAR is allowed */
 	 if (!strchr(GOODCHARS, *name) &&
-		/* If we're using unixhierarchysep, DOTCHAR is allowed */
 		!(unixsep && *name == DOTCHAR))
 		return IMAP_MAILBOX_BADNAME;
+	 /* If we're not using virtdomains, '@' is not permitted in the mboxname */
+	 if (!config_virtdomains && *name == '@')
+		return IMAP_MAILBOX_BADNAME;
 	 name++;
 	 sawutf7 = 0;
 	}
@@ -1021,7 +1314,7 @@
 return 0;
 }
 
-int mboxname_is_prefix(const char *longstr, const char *shortstr)
+EXPORTED int mboxname_is_prefix(const char *longstr, const char *shortstr)
 {
 int longlen = strlen(longstr);
 int shortlen = strlen(shortstr);
@@ -1091,7 +1384,7 @@
 }
 
 /* note: mboxname must be internal */
-char *mboxname_datapath(const char *partition, const char *mboxname, unsigned long uid)
+EXPORTED char *mboxname_datapath(const char *partition, const char *mboxname, unsigned long uid)
 {
 static char pathresultMAX_MAILBOX_PATH+1;
 const char *root;
@@ -1102,7 +1395,40 @@
 if (!root) return NULL;
 
 if (!mboxname) {
-	strncpy(pathresult, root, MAX_MAILBOX_PATH);
+	xstrncpy(pathresult, root, MAX_MAILBOX_PATH);
+	return pathresult;
+ }
+
+ mboxname_hash(pathresult, MAX_MAILBOX_PATH, root, mboxname);
+
+ if (uid) {
+	int len = strlen(pathresult);
+	snprintf(pathresult + len, MAX_MAILBOX_PATH - len, "/%lu.", uid);
+ }
+ pathresultMAX_MAILBOX_PATH = '\0';
+
+ if (strlen(pathresult) == MAX_MAILBOX_PATH)
+	return NULL;
+
+ return pathresult;
+}
+
+/* note: mboxname must be internal */
+EXPORTED char *mboxname_archivepath(const char *partition, const char *mboxname, unsigned long uid)
+{
+ static char pathresultMAX_MAILBOX_PATH+1;
+ const char *root;
+
+ if (!partition) return NULL;
+
+ root = config_archivepartitiondir(partition);
+ if (!root) root = config_partitiondir(partition);
+ if (!root) return NULL;
+
+ /* XXX - dedup with datapath above - but make sure to keep the results
+ * in separate buffers and/or audit the callers */
+ if (!mboxname) {
+	xstrncpy(pathresult, root, MAX_MAILBOX_PATH);
 	return pathresult;
 }
 
@@ -1122,6 +1448,12 @@
 
 char *mboxname_lockpath(const char *mboxname)
 {
+ return mboxname_lockpath_suffix(mboxname, ".lock");
+}
+
+char *mboxname_lockpath_suffix(const char *mboxname,
+			 const char *suffix)
+{
 static char lockresultMAX_MAILBOX_PATH+1;
 char basepathMAX_MAILBOX_PATH+1;
 const char *root = config_getstring(IMAPOPT_MBOXNAME_LOCKPATH);
@@ -1135,7 +1467,7 @@
 mboxname_hash(lockresult, MAX_MAILBOX_PATH, root, mboxname);
 
 len = strlen(lockresult);
- snprintf(lockresult + len, MAX_MAILBOX_PATH - len, "%s", ".lock");
+ snprintf(lockresult + len, MAX_MAILBOX_PATH - len, "%s", suffix);
 lockresultMAX_MAILBOX_PATH = '\0';
 
 if (strlen(lockresult) == MAX_MAILBOX_PATH)
@@ -1144,11 +1476,12 @@
 return lockresult;
 }
 
-char *mboxname_metapath(const char *partition, const char *mboxname,
+EXPORTED char *mboxname_metapath(const char *partition, const char *mboxname,
 			int metafile, int isnew)
 {
 static char metaresultMAX_MAILBOX_PATH;
 int metaflag = 0;
+ int archiveflag = 0;
 const char *root = NULL;
 const char *filename = NULL;
 char confkey256;
@@ -1183,6 +1516,17 @@
 	metaflag = IMAP_ENUM_METAPARTITION_FILES_SQUAT;
 	filename = FNAME_SQUAT;
 	break;
+ case META_ANNOTATIONS:
+	snprintf(confkey, 256, "metadir-index-%s", partition);
+	metaflag = IMAP_ENUM_METAPARTITION_FILES_ANNOTATIONS;
+	filename = FNAME_ANNOTATIONS;
+	break;
+ case META_ARCHIVECACHE:
+	snprintf(confkey, 256, "metadir-archivecache-%s", partition);
+	metaflag = IMAP_ENUM_METAPARTITION_FILES_ARCHIVECACHE;
+	filename = FNAME_CACHE;
+	archiveflag = 1;
+	break;
 case 0:
 	break;
 default:
@@ -1195,6 +1539,9 @@
 if (!root && (!metaflag || (config_metapartition_files & metaflag)))
 	root = config_metapartitiondir(partition);
 
+ if (!root && archiveflag)
+	root = config_archivepartitiondir(partition);
+
 if (!root)
 	root = config_partitiondir(partition);
 
@@ -1202,7 +1549,7 @@
 	return NULL;
 
 if (!mboxname) {
-	strncpy(metaresult, root, MAX_MAILBOX_PATH);
+	xstrncpy(metaresult, root, MAX_MAILBOX_PATH);
 	return metaresult;
 }
 
@@ -1222,13 +1569,13 @@
 return metaresult;
 }
 
-void mboxname_todeleted(const char *name, char *result, int withtime)
+EXPORTED void mboxname_todeleted(const char *name, char *result, int withtime)
 {
 int domainlen = 0;
 char *p;
 const char *deletedprefix = config_getstring(IMAPOPT_DELETEDPREFIX);
 
- strncpy(result, name, MAX_MAILBOX_BUFFER);
+ xstrncpy(result, name, MAX_MAILBOX_BUFFER);
 
 if (config_virtdomains && (p = strchr(name, '!')))
 domainlen = p - name + 1; 
@@ -1243,3 +1590,256 @@
 		 deletedprefix, name+domainlen);
 }
 }
+
+EXPORTED int mboxname_make_parent(char *name)
+{
+ int domainlen = 0;
+ char *p;
+
+ if (config_virtdomains && (p = strchr(name, '!')))
+	domainlen = p - name + 1;
+
+ if (!name0 || !strcmp(name+domainlen, "user"))
+	return 0;				/* stop now */
+
+ p = strrchr(name, '.');
+
+ if (p && (p - name > domainlen))		/* don't split subdomain */
+	*p = '\0';
+ else if (!namedomainlen)			/* server entry */
+	name0 = '\0';
+ else					/* domain entry */
+	namedomainlen = '\0';
+
+ return 1;
+}
+
+/* NOTE: caller must free, which is different from almost every
+ * other interface in the whole codebase. Grr */
+EXPORTED char *mboxname_conf_getpath(struct mboxname_parts *parts, const char *suffix)
+{
+ char *fname = NULL;
+ char c2, d2;
+ 
+ if (parts->domain) {
+	if (parts->userid) {
+	 fname = strconcat(config_dir,
+			 FNAME_DOMAINDIR,
+			 dir_hash_b(parts->domain, config_fulldirhash, d),
+			 "/", parts->domain,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts->userid, config_fulldirhash, c),
+			 "/", parts->userid, ".", suffix,
+			 (char *)NULL);
+	}
+	else {
+	 fname = strconcat(config_dir,
+			 FNAME_DOMAINDIR,
+			 dir_hash_b(parts->domain, config_fulldirhash, d),
+			 "/", parts->domain,
+			 "/", FNAME_SHAREDPREFIX, ".", suffix,
+			 (char *)NULL);
+	}
+ }
+ else {
+	if (parts->userid) {
+	 fname = strconcat(config_dir,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts->userid, config_fulldirhash, c),
+			 "/", parts->userid, ".", suffix,
+			 (char *)NULL);
+	}
+	else {
+	 fname = strconcat(config_dir,
+			 "/", FNAME_SHAREDPREFIX, ".", suffix,
+			 (char *)NULL);
+	}
+ }
+
+ return fname;
+}
+
+static bit64 mboxname_readval(const char *mboxname, const char *metaname)
+{
+ bit64 fileval = 0;
+ struct mboxname_parts parts;
+ char *fname = NULL;
+ const char *base = NULL;
+ size_t len = 0;
+ int fd = -1;
+
+ mboxname_to_parts(mboxname, &parts);
+
+ fname = mboxname_conf_getpath(&parts, metaname);
+ if (!fname) goto done;
+
+ fd = open(fname, O_RDONLY);
+
+ /* read the value - note: we don't care if it's being rewritten,
+ * we'll still get a consistent read on either the old or new
+ * value */
+ if (fd != -1) {
+	struct stat sbuf;
+	if (fstat(fd, &sbuf)) {
+	 syslog(LOG_ERR, "IOERROR: failed to stat fd %s: %m", fname);
+	 goto done;
+	}
+	map_refresh(fd, 1, &base, &len, sbuf.st_size, metaname, mboxname);
+	if (len > 0)
+	 parsenum(base, NULL, len, &fileval);
+	map_free(&base, &len);
+ }
+
+ done:
+ if (fd != -1) close(fd);
+ mboxname_free_parts(&parts);
+ free(fname);
+ return fileval;
+}
+
+/* XXX - inform about errors? Any error causes the value of at least
+ last+1 to be returned. An error only on writing causes
+ max(last, fileval) + 1 to still be returned */
+static bit64 mboxname_setval(const char *mboxname, const char *metaname,
+			 bit64 last, int add)
+{
+ int fd = -1;
+ int newfd = -1;
+ char *fname = NULL;
+ char newfnameMAX_MAILBOX_PATH;
+ struct stat sbuf, fbuf;
+ const char *base = NULL;
+ size_t len = 0;
+ bit64 fileval = 0;
+ bit64 retval = last + add;
+ char numbuf30;
+ struct mboxname_parts parts;
+ int n;
+
+ mboxname_to_parts(mboxname, &parts);
+
+ fname = mboxname_conf_getpath(&parts, metaname);
+ if (!fname) goto done;
+
+ /* get a blocking lock on fd */
+ for (;;) {
+	fd = open(fname, O_RDWR | O_CREAT, 0644);
+	if (fd == -1) {
+	 /* OK to not exist - try creating the directory first */
+	 if (cyrus_mkdir(fname, 0755)) goto done;
+	 fd = open(fname, O_RDWR | O_CREAT, 0644);
+	}
+	if (fd == -1) {
+	 syslog(LOG_ERR, "IOERROR: failed to create %s: %m", fname);
+	 goto done;
+	}
+	if (lock_blocking(fd, fname)) {
+	 syslog(LOG_ERR, "IOERROR: failed to lock %s: %m", fname);
+	 goto done;
+	}
+	if (fstat(fd, &sbuf)) {
+	 syslog(LOG_ERR, "IOERROR: failed to stat fd %s: %m", fname);
+	 goto done;
+	}
+	if (stat(fname, &fbuf)) {
+	 syslog(LOG_ERR, "IOERROR: failed to stat file %s: %m", fname);
+	 goto done;
+	}
+	if (sbuf.st_ino == fbuf.st_ino) break;
+	lock_unlock(fd, fname);
+	close(fd);
+	fd = -1;
+ }
+
+ /* read the old value */
+ if (fd != -1) {
+	map_refresh(fd, 1, &base, &len, sbuf.st_size, metaname, mboxname);
+	if (len > 0)
+	 parsenum(base, NULL, len, &fileval);
+	map_free(&base, &len);
+	if (fileval > last) last = fileval;
+ }
+
+ retval = last + add;
+
+ /* unchanged, no need to write */
+ if (retval == fileval)
+	goto done;
+
+ snprintf(newfname, MAX_MAILBOX_PATH, "%s.NEW", fname);
+ newfd = open(newfname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
+ if (newfd == -1) {
+	syslog(LOG_ERR, "IOERROR: failed to open for write %s: %m", newfname);
+	goto done;
+ }
+
+ snprintf(numbuf, 30, "%llu", retval);
+ n = retry_write(newfd, numbuf, strlen(numbuf));
+ if (n < 0) {
+	syslog(LOG_ERR, "IOERROR: failed to write %s: %m", newfname);
+	goto done;
+ }
+
+ if (fdatasync(newfd)) {
+	syslog(LOG_ERR, "IOERROR: failed to fdatasync %s: %m", newfname);
+	goto done;
+ }
+
+ close(newfd);
+ newfd = -1;
+
+ if (rename(newfname, fname)) {
+	syslog(LOG_ERR, "IOERROR: failed to rename %s: %m", newfname);
+	goto done;
+ }
+
+ done:
+ if (newfd != -1) close(newfd);
+ if (fd != -1) {
+	lock_unlock(fd, fname);
+	close(fd);
+ }
+ mboxname_free_parts(&parts);
+ free(fname);
+ return retval;
+}
+
+EXPORTED modseq_t mboxname_readmodseq(const char *mboxname)
+{
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+ return (modseq_t)mboxname_readval(mboxname, "modseq");
+}
+
+EXPORTED modseq_t mboxname_nextmodseq(const char *mboxname, modseq_t last)
+{
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return last + 1;
+ return (modseq_t)mboxname_setval(mboxname, "modseq", (bit64)last, 1);
+}
+
+EXPORTED modseq_t mboxname_setmodseq(const char *mboxname, modseq_t val)
+{
+ return (modseq_t)mboxname_setval(mboxname, "modseq", (bit64)val, 0);
+}
+
+EXPORTED uint32_t mboxname_readuidvalidity(const char *mboxname)
+{
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return 0;
+ return (uint32_t)mboxname_readval(mboxname, "uidvalidity");
+}
+
+EXPORTED uint32_t mboxname_nextuidvalidity(const char *mboxname, uint32_t last)
+{
+ if (!config_getswitch(IMAPOPT_CONVERSATIONS))
+	return last + 1;
+ return (uint32_t)mboxname_setval(mboxname, "uidvalidity", (bit64)last, 1);
+}
+
+EXPORTED uint32_t mboxname_setuidvalidity(const char *mboxname, uint32_t val)
+{
+ return (uint32_t)mboxname_setval(mboxname, "uidvalidity", (bit64)val, 0);
+}
+
+

cyrus-imapd-2.4.17.tar.gz/imap/mboxname.h -> cyrus-imapd-2.5.tar.gz/imap/mboxname.h Changed

@@ -38,14 +38,13 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mboxname.h,v 1.18 2010/01/06 17:01:37 murch Exp $
  */
 
 #ifndef INCLUDED_MBOXNAME_H
 #define INCLUDED_MBOXNAME_H
 
 #include "auth.h"
+#include "util.h"
 
 #define MAX_NAMESPACE_PREFIX 40
 
@@ -88,7 +87,15 @@
 struct mboxlock {
     char *name;
     int lock_fd;
-    int locktype;
+    int locktype;	/* LOCK_NONE or LOCK_SHARED or LOCK_EXCLUSIVE */
+};
+
+struct mboxname_parts {
+    const char *domain;
+    const char *userid;	    /* userid WITHOUT the domain */
+    const char *box;
+    int is_deleted;
+    char *freeme;
 };
 
 int mboxname_lock(const char *mboxname, struct mboxlock **mboxlockptr,
@@ -128,18 +135,63 @@
 char *mboxname_isusermailbox(const char *name, int isinbox);
 
 /*
- * If (internal) mailbox 'name' is in the DELETED namespace
+ * If (internal) mailbox 'name' is in the DELETED namespace.
+ * If timestampp is not NULL, the delete timestamp encoded in
+ * the name is parsed and filled in.
+ * returns boolean
+ */
+int mboxname_isdeletedmailbox(const char *name, time_t *timestampp);
+
+/*
+ * Split an (internal) inboxname into it's constituent parts.
+ * also: userid
+ */
+int mboxname_to_parts(const char *mboxname, struct mboxname_parts *parts);
+int mboxname_userid_to_parts(const char *userid, struct mboxname_parts *parts);
+
+/*
+ * Create an (internal) mboxname from parts
+ */
+
+int mboxname_parts_to_internal(struct mboxname_parts *parts, char *target);
+
+/*
+ * Cleanup up a mboxname_parts structure.
+ */
+void mboxname_init_parts(struct mboxname_parts *parts);
+void mboxname_free_parts(struct mboxname_parts *parts);
+
+
+/*
+ * If (internal) mailbox 'name' is a CALENDAR mailbox
+ * returns boolean
+ */
+int mboxname_iscalendarmailbox(const char *name, int mbtype);
+
+/*
+ * If (internal) mailbox 'name' is a ADDRESSBOOK mailbox
  * returns boolean
  */
-int mboxname_isdeletedmailbox(const char *name);
+int mboxname_isaddressbookmailbox(const char *name, int mbtype);
 
 /* check if one mboxname is a parent or same as the other */
 int mboxname_is_prefix(const char *longstr, const char *shortstr);
 
 /*
- * Translate (internal) inboxname into corresponding userid.
+ * Translate (internal) inboxname into corresponding userid,
+ * and vice-versa.
+ */
+const char *mboxname_to_userid(const char *mboxname);
+/* returns a malloc'd mailbox */
+char *mboxname_user_mbox(const char *userid, const char *subfolder);
+
+/*
+ * Check whether two mboxnames have the same userid.
  */
-char *mboxname_to_userid(const char *mboxname);
+int mboxname_parts_same_userid(struct mboxname_parts *a,
+			       struct mboxname_parts *b);
+int mboxname_same_userid(const char *mboxname1, const char *mboxname2);
+
 
 /*
  * Access files (or directories by leaving last parameter
@@ -149,15 +201,20 @@
 		   const char *root,
 		   const char *name);
 
-char *mboxname_datapath(const char *partition, 
+char *mboxname_datapath(const char *partition,
 			const char *mboxname,
 			unsigned long uid);
 
+char *mboxname_archivepath(const char *partition,
+			   const char *mboxname,
+			   unsigned long uid);
+
 char *mboxname_metapath(const char *partition,
 			const char *mboxname,
 			int metafile, int isnew);
 
 char *mboxname_lockpath(const char *mboxname);
+char *mboxname_lockpath_suffix(const char *mboxname, const char *suffix);
 
 /*
  * Return nonzero if (internal) mailbox 'name' consists of legal characters.
@@ -169,4 +226,22 @@
 
 void mboxname_todeleted(const char *name, char *result, int withtime);
 
+/*
+ * Given a writable buffer containing an internal mbox name,
+ * convert that buffer in-place to be the name of the mbox'
+ * parent (by truncating off the last component).
+ * Returns 0 if no more truncation is possible, 1 otherwise.
+ */
+int mboxname_make_parent(char *namebuf);
+
+char *mboxname_conf_getpath(struct mboxname_parts *parts,
+			    const char *suffix);
+
+modseq_t mboxname_readmodseq(const char *mboxname);
+modseq_t mboxname_nextmodseq(const char *mboxname, modseq_t last);
+modseq_t mboxname_setmodseq(const char *mboxname, modseq_t val);
+uint32_t mboxname_readuidvalidity(const char *mboxname);
+uint32_t mboxname_nextuidvalidity(const char *mboxname, uint32_t last);
+uint32_t mboxname_setuidvalidity(const char *mboxname, uint32_t val);
+
 #endif

cyrus-imapd-2.4.17.tar.gz/imap/mbpath.c -> cyrus-imapd-2.5.tar.gz/imap/mbpath.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mbpath.c,v 1.23 2010/01/06 17:01:37 murch Exp $
 */
 
 #include <config.h>
@@ -49,22 +47,15 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include "acl.h"
 #include "util.h"
-#include "auth.h"
-#include "prot.h"
-#include "imparse.h"
-#include "cyr_lock.h"
 #include "global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "xmalloc.h"
 #include "mboxlist.h"
@@ -75,9 +66,6 @@
 /* current namespace */
 static struct namespace mbpath_namespace;
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 static int 
 usage(void) {
 fprintf(stderr,"usage: mbpath -C <alt_config> -q -s -m <mailbox name>...\n");
@@ -90,13 +78,13 @@
 int
 main(int argc, char **argv)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int rc, i, quiet = 0, stop_on_error=0, metadata=0;
 int opt;		/* getopt() returns an int */
 char *alt_config = NULL;
 char bufMAX_MAILBOX_PATH+1;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -120,7 +108,7 @@
 }
 }
 
- cyrus_init(alt_config, "mbpath", 0);
+ cyrus_init(alt_config, "mbpath", 0, 0);
 
 if ((rc = mboxname_init_namespace(&mbpath_namespace, 1)) != 0) {
 fatal(error_message(rc), -1);
@@ -131,19 +119,23 @@
 
 for (i = optind; i < argc; i++) {
 /* Translate mailboxname */
- (*mbpath_namespace.mboxname_tointernal)(&mbpath_namespace, argvi, NULL, buf);
+ (*mbpath_namespace.mboxname_tointernal)(&mbpath_namespace,
+					 argvi, NULL, buf);
 
 if ((rc = mboxlist_lookup(buf, &mbentry, NULL)) == 0) {
- if (mbentry.mbtype & MBTYPE_REMOTE) {
-	printf("%s\n", mbentry.partition);
- } else {
-	const char *path;
-	if (metadata)
-	 path = mboxname_metapath(mbentry.partition, mbentry.name, 0, 0);
-	else
-	 path = mboxname_datapath(mbentry.partition, mbentry.name, 0);
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	printf("%s!%s\n", mbentry->server, mbentry->partition);
+ } else if (metadata) {
+	const char *path = mboxname_metapath(mbentry->partition, 
+					 mbentry->name, 0, 0);
+	printf("%s\n", path);
+ }
+ else {
+	const char *path = mboxname_datapath(mbentry->partition, 
+					 mbentry->name, 0);
 	printf("%s\n", path);
 }
+ mboxlist_entry_free(&mbentry);
 } else {
 if (!quiet && (rc == IMAP_MAILBOX_NONEXISTENT)) {
 	fprintf(stderr, "Invalid mailbox name: %s\n", argvi);

cyrus-imapd-2.5.tar.gz/imap/mbtool.c Added

@@ -0,0 +1,250 @@
+/* mbtool.c - tool to fiddle mailboxes
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <syslog.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/stat.h>
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+# define dirent direct
+# define NAMLEN(dirent) (dirent)->d_namlen
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
+#endif
+
+#include "assert.h"
+#include "exitcodes.h"
+#include "index.h"
+#include "global.h"
+#include "imap/imap_err.h"
+#include "mailbox.h"
+#include "message.h"
+#include "message_guid.h"
+#include "mboxname.h"
+#include "mboxlist.h"
+#include "seen.h"
+#include "times.h"
+#include "util.h"
+#include "xmalloc.h"
+
+extern int optind;
+extern char *optarg;
+
+/* current namespace */
+static struct namespace recon_namespace;
+
+/* forward declarations */
+static int do_cmd(char *name, int matchlen, int maycreate, void *rock);
+
+static void usage(void);
+void shut_down(int code);
+
+enum {
+ CMD_TIME = 1,
+};
+
+int main(int argc, char **argv)
+{
+ int opt, i, r;
+ int cmd = 0;
+ char bufMAX_MAILBOX_PATH+1;
+ char *alt_config = NULL;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ /* Ensure we're up-to-date on the index file format */
+ assert(INDEX_HEADER_SIZE == (OFFSET_HEADER_CRC+4));
+ assert(INDEX_RECORD_SIZE == (OFFSET_RECORD_CRC+4));
+
+ while ((opt = getopt(argc, argv, "C:t")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 't':
+	 cmd = CMD_TIME;
+	 break;
+
+	default:
+	 usage();
+	}
+ }
+
+ cyrus_init(alt_config, "mbtool", 0, 0);
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&recon_namespace, 1)) != 0) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ signals_set_shutdown(&shut_down);
+ signals_add_handlers(0);
+
+ if (optind == argc) {
+	usage();
+ }
+
+ for (i = optind; i < argc; i++) {
+	/* Handle virtdomains and separators in mailboxname */
+	(*recon_namespace.mboxname_tointernal)(&recon_namespace, argvi,
+					 NULL, buf);
+	(*recon_namespace.mboxlist_findall)(&recon_namespace, buf, 1, 0, 0,
+					 do_cmd, &cmd);
+ }
+
+ mboxlist_close();
+ mboxlist_done();
+
+ exit(0);
+}
+
+static void usage(void)
+{
+ fprintf(stderr,
+	 "usage: mbtool -C <alt_config> mailbox...\n");
+ exit(EC_USAGE);
+}
+
+/*
+ * mboxlist_findall() callback function to examine a mailbox
+ */
+static int do_timestamp(char *name)
+{
+ unsigned recno;
+ int r = 0;
+ char ext_name_bufMAX_MAILBOX_PATH+1;
+ struct mailbox *mailbox = NULL;
+ struct index_record record;
+ char olddateRFC822_DATETIME_MAX+1;
+ char newdateRFC822_DATETIME_MAX+1;
+
+ signals_poll();
+
+ /* Convert internal name to external */
+ (*recon_namespace.mboxname_toexternal)(&recon_namespace, name,
+					 "cyrus", ext_name_buf);
+ printf("Working on %s...\n", ext_name_buf);
+
+ /* Open/lock header */
+ r = mailbox_open_iwl(name, &mailbox);
+ if (r) return r;
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) goto done;
+
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* 1 day is close enough */
+	if (abs(record.internaldate - record.gmtime) < 86400)
+	 continue;
+
+	time_to_rfc822(record.internaldate, olddate, sizeof(olddate));
+	time_to_rfc822(record.gmtime, newdate, sizeof(newdate));
+	printf(" %u: %s => %s\n", record.uid, olddate, newdate);
+
+	/* switch internaldate */
+	record.internaldate = record.gmtime;
+
+	r = mailbox_rewrite_index_record(mailbox, &record);
+	if (r) goto done;
+ }
+
+ done:
+ mailbox_close(&mailbox);
+
+ return r;
+}
+
+int do_cmd(char *name,
+	 int matchlen __attribute__((unused)),
+	 int maycreate __attribute__((unused)),
+	 void *rock)
+{
+ int *valp = (int *)rock;
+
+ if (*valp == CMD_TIME)
+	return do_timestamp(name);
+
+ return 0;
+}
+
+/*
+ * Cleanly shut down and exit
+ */
+void shut_down(int code) __attribute__((noreturn));
+void shut_down(int code)
+{
+ in_shutdown = 1;
+
+ mboxlist_close();
+ mboxlist_done();
+ exit(code);
+}

cyrus-imapd-2.4.17.tar.gz/imap/message.c -> cyrus-imapd-2.5.tar.gz/imap/message.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message.c,v 1.118 2010/06/28 12:04:38 brong Exp $
 */
 
 #include <config.h>
@@ -47,6 +45,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -57,14 +56,18 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
+#include "arrayu64.h"
+#include "assert.h"
 #include "crc32.h"
+#include "dlist.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "prot.h"
+#include "hash.h"
 #include "map.h"
 #include "mailbox.h"
-#include "mkgmtime.h"
 #include "message.h"
+#include "message_priv.h"
 #include "message_guid.h"
 #include "parseaddr.h"
 #include "charset.h"
@@ -72,9 +75,18 @@
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
+#include "strarray.h"
+#include "ptrarray.h"
 #include "global.h"
 #include "retry.h"
+#include "imap/rfc822_header.h"
+#include "rfc822tok.h"
+#include "times.h"
+
+static int message_map_file(message_t *m, const char *fname);
+static int message_parse_cbodystructure(message_t *m);
+
+#define DEBUG 0
 
 /* Message being parsed */
 struct msg {
@@ -84,12 +96,7 @@
 int encode;
 };
 
-/* List of pending multipart boundaries */
-struct boundary {
- char **id;
- int count;
- int alloc;
-};
+#define MAX_FIELDNAME_LENGTH 256
 
 /* (draft standard) MIME tspecials */
 #define TSPECIALS "()<>@,;:\\\"/?="
@@ -97,59 +104,67 @@
 /* Default MIME Content-type */
 #define DEFAULT_CONTENT_TYPE "TEXT/PLAIN; CHARSET=us-ascii"
 
-static int message_parse_body P((struct msg *msg,
+static int message_parse_body(struct msg *msg,
 				 struct body *body,
-				 char *defaultContentType,
-				 struct boundary *boundaries));
+				 const char *defaultContentType,
+				 strarray_t *boundaries);
 
-static int message_parse_headers P((struct msg *msg,
+static int message_parse_headers(struct msg *msg,
 				 struct body *body,
-				 char *defaultContentType,
-				 struct boundary *boundaries));
-static void message_parse_address P((char *hdr, struct address **addrp));
-static void message_parse_encoding P((char *hdr, char **hdrp));
-static void message_parse_charset P((struct body *body, int *encoding, int *charset));
-static void message_parse_string P((char *hdr, char **hdrp));
-static void message_parse_header P((char *hdr, struct ibuf *ibuf));
-static void message_parse_type P((char *hdr, struct body *body));
-/* static */ void message_parse_disposition P((char *hdr, struct body *body));
-static void message_parse_params P((char *hdr, struct param **paramp));
-static void message_fold_params P((struct param **paramp));
-static void message_parse_language P((char *hdr, struct param **paramp));
-static void message_parse_rfc822space P((char **s));
-static void message_parse_received_date P((char *hdr, char **hdrp));
+				 const char *defaultContentType,
+				 strarray_t *boundaries);
+static void message_parse_address(const char *hdr, struct address **addrp);
+static void message_parse_encoding(const char *hdr, char **hdrp);
+static void message_parse_charset(const struct body *body,
+				 int *encoding, int *charset);
+static void message_parse_string(const char *hdr, char **hdrp);
+static void message_parse_header(const char *hdr, struct buf *buf);
+static void message_parse_type(const char *hdr, struct body *body);
+static void message_parse_disposition(const char *hdr, struct body *body);
+static void message_parse_params(const char *hdr, struct param **paramp);
+static void message_fold_params(struct param **paramp);
+static void message_parse_language(const char *hdr, struct param **paramp);
+static void message_parse_rfc822space(const char **s);
+static void message_parse_received_date(const char *hdr, char **hdrp);
 
-static void message_parse_multipart P((struct msg *msg,
+static void message_parse_multipart(struct msg *msg,
 				 struct body *body,
-				 struct boundary *boundaries));
-static void message_parse_content P((struct msg *msg,
+				 strarray_t *boundaries);
+static void message_parse_content(struct msg *msg,
 				 struct body *body,
-				 struct boundary *boundaries));
+				 strarray_t *boundaries);
 
-static char *message_getline P((char *s, unsigned n, struct msg *msg));
-static int message_pendingboundary P((const char *s, int len,
-				 char **boundaries, int *boundaryct));
-
-static void message_write_envelope P((struct ibuf *ibuf, struct body *body));
-static void message_write_body P((struct ibuf *ibuf, struct body *body,
-				 int newformat));
-static void message_write_address P((struct ibuf *ibuf,
-				 struct address *addrlist));
-static void message_write_nstring P((struct ibuf *ibuf, char *s));
-static void message_write_text P((struct ibuf *ibuf, char *s));
-static void message_write_text_lcase P((struct ibuf *ibuf, char *s));
-static void message_write_number P((struct ibuf *ibuf, unsigned n));
-static void message_write_section P((struct ibuf *ibuf, struct body *body));
-static void message_write_charset P((struct ibuf *ibuf, struct body *body));
-static void message_write_bit32 P((struct ibuf *ibuf, bit32 val));
-static void message_write_searchaddr P((struct ibuf *ibuf,
-					struct address *addrlist));
-
-static void message_ibuf_init P((struct ibuf *ibuf));
-static void message_ibuf_copy P((struct ibuf *desc, struct ibuf *src));
-static int message_ibuf_ensure P((struct ibuf *ibuf, unsigned len));
-static void message_ibuf_pad P((struct ibuf *ibuf));
-static void message_ibuf_free P((struct ibuf *ibuf));
+static char *message_getline(struct buf *, struct msg *msg);
+static int message_pendingboundary(const char *s, int slen, strarray_t *);
+
+static void message_write_envelope(struct buf *buf, const struct body *body);
+static void message_write_address(struct buf *buf,
+				 const struct address *addrlist);
+static void message_write_text_lcase(struct buf *buf, const char *s);
+static void message_write_section(struct buf *buf, const struct body *body);
+static void message_write_charset(struct buf *buf, const struct body *body);
+static void message_write_searchaddr(struct buf *buf,
+				 const struct address *addrlist);
+static int message_need(message_t *m, unsigned int need);
+static void message_yield(message_t *m, unsigned int yield);
+
+/*
+ * Convert a string to uppercase. Returns the string.
+ *
+ * This differs from the ucase() function in lib/util.c by using the
+ * libc tolower() instead of our hardcoded builtin lookup table.
+ * Whether this is a good thing is unclear, but that's what the old code
+ * did so I'm going to preserve it - gnb
+ */
+static char *message_ucase(char *s)
+{
+ char *p;
+
+ for (p = s ; *p ; p++)
+	if (Uislower(*p))
+	 *p = toupper((int) *p);
+ return s;
+}
 
 /*
 * Copy a message of 'size' bytes from 'from' to 'to',
@@ -158,12 +173,8 @@
 * Caller must have initialized config_* routines (with cyrus_init) to read
 * imapd.conf before calling.
 */
-int
-message_copy_strict(from, to, size, allow_null)
-struct protstream *from;
-FILE *to;
-unsigned size;
-int allow_null;
+EXPORTED int message_copy_strict(struct protstream *from, FILE *to,
+				 unsigned size, int allow_null)
 {
 char buf4096+1;
 unsigned char *p, *endp;
@@ -264,7 +275,7 @@
 }
 }
 
-int message_parse(const char *fname, struct index_record *record)
+EXPORTED int message_parse(const char *fname, struct index_record *record)
 {
 struct body *body = NULL;
 FILE *f;
@@ -276,7 +287,7 @@
 r = message_parse_file(f, NULL, NULL, &body);
 if (!r) r = message_create_record(record, body);
 
- if (f) fclose(f);
+ fclose(f);
 
 if (body) {
 	message_free_body(body);
@@ -294,14 +305,14 @@
 * If msg_base/msg_len are non-NULL, the file will remain memory-mapped
 * and returned to the caller. The caller MUST unmap the file.
 */
-int message_parse_file(FILE *infile,
-		 const char **msg_base, unsigned long *msg_len,
+EXPORTED int message_parse_file(FILE *infile,
+		 const char **msg_base, size_t *msg_len,
 		 struct body **body)
 {
 int fd = fileno(infile);
 struct stat sbuf;
 const char *tmp_base;
- unsigned long tmp_len;
+ size_t tmp_len;
 int unmap = 0, r;
 
 if (!msg_base) {
@@ -322,7 +333,7 @@
 if (!*msg_base || !*msg_len)
 	return IMAP_IOERROR; /* zero length file? */
 
- if (!*body) *body = (struct body *) xmalloc(sizeof(struct body));
+ if (!*body) *body = (struct body *) xzmalloc(sizeof(struct body));
 r = message_parse_mapped(*msg_base, *msg_len, *body);
 
 if (unmap) map_free(msg_base, msg_len);
@@ -343,7 +354,7 @@
 *
 * XXX can we do this with mmap()?
 */
-int message_parse_binary_file(FILE *infile, struct body **body)
+EXPORTED int message_parse_binary_file(FILE *infile, struct body **body)
 {
 int fd = fileno(infile);
 struct stat sbuf;
@@ -367,9 +378,9 @@
 	return IMAP_IOERROR;
 }
 
- if (!*body) *body = (struct body *) xmalloc(sizeof(struct body));
+ if (!*body) *body = (struct body *) xzmalloc(sizeof(struct body));
 message_parse_body(&msg, *body,
-		 DEFAULT_CONTENT_TYPE, (struct boundary *)0);
+		 DEFAULT_CONTENT_TYPE, (strarray_t *)0);
 
 message_guid_generate(&(*body)->guid, msg.base, msg.len);
 
@@ -386,11 +397,10 @@
 return 0;
 }
 
-
 /*
 * Parse the message at 'msg_base' of length 'msg_len'.
 */
-int message_parse_mapped(const char *msg_base, unsigned long msg_len,
+EXPORTED int message_parse_mapped(const char *msg_base, unsigned long msg_len,
 			 struct body *body)
 {
 struct msg msg;
@@ -401,13 +411,81 @@
 msg.encode = 0;
 
 message_parse_body(&msg, body,
-		 DEFAULT_CONTENT_TYPE, (struct boundary *)0);
+		 DEFAULT_CONTENT_TYPE, (strarray_t *)0);
 
 message_guid_generate(&body->guid, msg_base, msg_len);
 
 return 0;
 }
 
+/*
+ * Prune the header section in buf to include only those headers
+ * listed in headers or (if headers_not is non-empty) those headers
+ * not in headers_not.
+ */
+void message_pruneheader(char *buf, const strarray_t *headers,
+			 const strarray_t *headers_not)
+{
+ char *p, *colon, *nextheader;
+ int goodheader;
+ char *endlastgood = buf;
+ char **l;
+ int count = 0;
+ int maxlines = config_getint(IMAPOPT_MAXHEADERLINES);
+
+ p = buf;
+ while (*p && *p != '\r') {
+	colon = strchr(p, ':');
+	if (colon && headers_not && headers_not->count) {
+	 goodheader = 1;
+	 for (l = headers_not->data ; *l ; l++) {
+		if ((size_t) (colon - p) == strlen(*l) &&
+		 !strncasecmp(p, *l, colon - p)) {
+		 goodheader = 0;
+		 break;
+		}
+	 }
+	} else {
+	 goodheader = 0;
+	}
+	if (colon && headers && headers->count) {
+	 for (l = headers->data ; *l ; l++) {
+		if ((size_t) (colon - p) == strlen(*l) &&
+		 !strncasecmp(p, *l, colon - p)) {
+		 goodheader = 1;
+		 break;
+		}
+	 }
+	}
+
+	nextheader = p;
+	do {
+	 nextheader = strchr(nextheader, '\n');
+	 if (nextheader) nextheader++;
+	 else nextheader = p + strlen(p);
+	} while (*nextheader == ' ' || *nextheader == '\t');
+
+	if (goodheader) {
+	 if (endlastgood != p) {
+		/* memmove and not strcpy since this is all within a
+		 * single buffer */
+		memmove(endlastgood, p, strlen(p) + 1);
+		nextheader -= p - endlastgood;
+	 }
+	 endlastgood = nextheader;
+	}
+	p = nextheader;
+
+	/* stop giant headers causing massive loops */
+	if (maxlines) {
+	 count++;
+	 if (count > maxlines) break;
+	}
+ }
+
+ *endlastgood = '\0';
+}
+
 static void message_find_part(struct body *body, const char *section,
 			 const char **content_types,
 			 const char *msg_base, unsigned long msg_len,
@@ -474,9 +552,9 @@
 *
 * The caller MUST free the array of allocated bodypart(s).
 */
-void message_fetch_part(struct message_content *msg,
-			const char **content_types,
-			struct bodypart ***parts)
+EXPORTED void message_fetch_part(struct message_content *msg,
+				 const char **content_types,
+				 struct bodypart ***parts)
 {
 int n = 0; /* running count of the number of matching parts */
 
@@ -490,28 +568,23 @@
 * and fills in appropriate information in the index record pointed to
 * by 'record'.
 */
-int
-message_create_record(record, body)
-struct index_record *record;
-struct body *body;
+HIDDEN int message_create_record(struct index_record *record,
+			 const struct body *body)
 {
 if (!record->internaldate) {
-	if (config_getenum(IMAPOPT_INTERNALDATE_HEURISTIC) 
-	 == IMAP_ENUM_INTERNALDATE_HEURISTIC_RECEIVEDHEADER &&
-	 body->received_date)
-	 record->internaldate = message_parse_date(
-			body->received_date,
-			PARSE_DATE|PARSE_TIME|PARSE_ZONE|
-			PARSE_NOCREATE|PARSE_GMT);
+	if (body->received_date &&
+		config_getenum(IMAPOPT_INTERNALDATE_HEURISTIC) 
+		== IMAP_ENUM_INTERNALDATE_HEURISTIC_RECEIVEDHEADER)
+	 time_from_rfc822(body->received_date, &record->internaldate);
 }
 
-
- record->sentdate = message_parse_date(body->date, PARSE_NOCREATE);
+ /* used for sent time searching, truncated to day with no TZ */
+ if (day_from_rfc822(body->date, &record->sentdate) < 0)
+	record->sentdate = 0;
 
 /* used for sent time sorting, full gmtime of Date: header */
- record->gmtime = message_parse_date(body->date,
-		 PARSE_DATE|PARSE_TIME|PARSE_ZONE|
-		 PARSE_NOCREATE|PARSE_GMT);
+ if (time_from_rfc822(body->date, &record->gmtime) < 0)
+	record->gmtime = 0;
 
 record->size = body->header_size + body->content_size;
 record->header_size = body->header_size;
@@ -523,28 +596,36 @@
 return 0;
 }
 
+static enum rfc822_header
+message_header_lookup(const char *buf, const char **valp)
+{
+ unsigned int len = strcspn(buf, ":\r\n");
+ if (buflen != ':')
+	return RFC822_BAD;
+ if (valp)
+	*valp = buf+len+1;
+ return rfc822_header_from_string_len(buf, len);
+}
+
+
 /*
 * Parse a body-part
 */
-static int
-message_parse_body(msg, body, defaultContentType, boundaries)
-struct msg *msg;
-struct body *body;
-char *defaultContentType;
-struct boundary *boundaries;
+static int message_parse_body(struct msg *msg, struct body *body,
+			 const char *defaultContentType,
+			 strarray_t *boundaries)
 {
- struct boundary newboundaries;
+ strarray_t newboundaries = STRARRAY_INITIALIZER;
 int sawboundary;
 
 memset(body, 0, sizeof(struct body));
- newboundaries.id = 0;
+ buf_init(&body->cacheheaders);
 
 /* No passed-in boundary structure, create a new, empty one */
 if (!boundaries) {
 	boundaries = &newboundaries;
-	boundaries->alloc = boundaries->count = 0;
-	/* We're at top-level--set up to store cached headers */
-	message_ibuf_init(&body->cacheheaders);
+	/* We're at top-level--preallocate space to store cached headers */
+	buf_ensure(&body->cacheheaders, 1024);
 }
 
 sawboundary = message_parse_headers(msg, body, defaultContentType,
@@ -586,7 +667,7 @@
 }
 
 /* Free up boundary storage if necessary */
- if (newboundaries.id) free(newboundaries.id);
+ strarray_fini(&newboundaries);
 
 return 0;
 }
@@ -594,46 +675,34 @@
 /*
 * Parse the headers of a body-part
 */
-#define HEADGROWSIZE 1000
-static int
-message_parse_headers(msg, body, defaultContentType,
-		 boundaries)
-struct msg *msg;
-struct body *body;
-char *defaultContentType;
-struct boundary *boundaries;
-{
- static int alloced = 0;
- static char *headers;
- int left, len;
+static int message_parse_headers(struct msg *msg, struct body *body,
+				 const char *defaultContentType,
+				 strarray_t *boundaries)
+{
+ struct buf headers = BUF_INITIALIZER;
 char *next;
+ int len;
 int sawboundary = 0;
 int maxlines = config_getint(IMAPOPT_MAXHEADERLINES);
 int have_max = 0;
+ const char *value;
 
 body->header_offset = msg->offset;
 
- if (!alloced) {
-	headers = xmalloc(alloced = HEADGROWSIZE);
- }
-
- next = headers;
- *next++ = '\n';		/* Leading newline to prime the pump */
- left = alloced - 3;		/* Allow for leading newline, added CR */
-				/* and trailing NUL */
+ buf_putc(&headers, '\n');	/* Leading newline to prime the pump */
 
 /* Slurp up all of the headers into 'headers' */
- while (message_getline(next, left, msg) &&
+ while ((next = message_getline(&headers, msg)) &&
 	 (next-1 != '\n' ||
 	 (*next != '\r' || next1 != '\n'))) {
 
 	len = strlen(next);
 
 	if (next-1 == '\n' && *next == '-' &&
-	 message_pendingboundary(next, len, boundaries->id, &boundaries->count)) {
+	 message_pendingboundary(next, len, boundaries)) {
 	 body->boundary_size = len;
 	 body->boundary_lines++;
-	 if (next - 1 > headers) {
+	 if (next - 1 > headers.s) {
 		body->boundary_size += 2;
 		body->boundary_lines++;
 		next-2 = '\0';
@@ -644,26 +713,14 @@
 	 sawboundary = 1;
 	 break;
 	}
-
-	left -= len;
-	next += len;
-
-	/* Allocate more header space if necessary */
-	if (left < 100) {
-	 len = next - headers;
-	 alloced += HEADGROWSIZE;
-	 left += HEADGROWSIZE;
-	 headers = xrealloc(headers, alloced);
-	 next = headers + len;
-	}
 }
 
 body->content_offset = msg->offset;
- body->header_size = strlen(headers+1);
+ body->header_size = strlen(headers.s+1);
 
 /* Scan over the slurped-up headers for interesting header information */
 body->header_lines = -1;	/* Correct for leading newline */
- for (next = headers; *next; next++) {
+ for (next = headers.s; *next; next++) {
 	if (*next == '\n') {
 	 body->header_lines++;
 
@@ -678,154 +735,102 @@
 		continue;
 	 }
 
-	 /* Check for headers in generic cache */
-	 if (body->cacheheaders.start &&
+	 if (/* space preallocated, i.e. must be top-level body */
+		body->cacheheaders.s &&
+		/* this is not a continuation line */
 		(next1 != ' ') && (next1 != '\t') &&
+		/* this header is supposed to be cached */
 		mailbox_cached_header_inline(next+1) != BIT32_MAX) {
+		 /* append to the headers cache */
 		 message_parse_header(next+1, &body->cacheheaders);
 	 }
 
-	 switch (next1) {
-	 case 'b':
-	 case 'B':
-		if (!strncasecmp(next+2, "cc:", 3)) {
-		 message_parse_address(next+5, &body->bcc);
-		}
+	 switch (message_header_lookup(next+1, &value)) {
+	 case RFC822_BCC:
+		message_parse_address(value, &body->bcc);
 		break;
-		
-	 case 'c':
-	 case 'C':
-		if (!strncasecmp(next+2, "c:", 2)) {
-		 message_parse_address(next+4, &body->cc);
-		}
-		if (!strncasecmp(next+2, "ontent-", 7)) {
-		 switch (next9) {
-		 case 'd':
-		 case 'D':
-			if (!strncasecmp(next+10, "escription:", 11)) {
-			 message_parse_string(next+21, &body->description);
-			}
-			else if (!strncasecmp(next+10, "isposition:", 11)) {
-			 message_parse_disposition(next+21, body);
-			}
-			break;
-
-		 case 'i':
-		 case 'I':
-			if (!strncasecmp(next+10, "d:", 2)) {
-			 message_parse_string(next+12, &body->id);
-			}
-			break;
-
-		 case 'l':
-		 case 'L':
-			if (!strncasecmp(next+10, "anguage:", 8)) {
-			 message_parse_language(next+18, &body->language);
-			}
-			else if (!strncasecmp(next+10, "ocation:", 8)) {
-			 message_parse_string(next+18, &body->location);
-			}
-			break;
-
-		 case 'm':
-		 case 'M':
-			if (!strncasecmp(next+10, "d5:", 3)) {
-			 message_parse_string(next+13, &body->md5);
-			}
-			break;
-
-		 case 't':
-		 case 'T':
-			if (!strncasecmp(next+10, "ransfer-encoding:", 17)) {
-			 message_parse_encoding(next+27, &body->encoding);
-
-			 /* If we're encoding binary, replace "binary"
-			 with "base64" in CTE header body */
-			 if (msg->encode &&
-				!strcmp(body->encoding, "BINARY")) {
-				char *p = (char*)
-				 stristr(msg->base + body->header_offset +
-					 (next - headers) + 27,
-					 "binary");
-				memcpy(p, "base64", 6);
-			 }
-			}
-			else if (!strncasecmp(next+10, "ype:", 4)) {
-			 message_parse_type(next+14, body);
-			}
-			break;
-		 }
-		}
+	 case RFC822_CC:
+		message_parse_address(value, &body->cc);
 		break;
-
-	 case 'd':
-	 case 'D':
-		if (!strncasecmp(next+2, "ate:", 4)) {
-		 message_parse_string(next+6, &body->date);
-		}
+	 case RFC822_CONTENT_DESCRIPTION:
+		message_parse_string(value, &body->description);
 		break;
-
-	 case 'f':
-	 case 'F':
-		if (!strncasecmp(next+2, "rom:", 4)) {
-		 message_parse_address(next+6, &body->from);
-		}
+	 case RFC822_CONTENT_DISPOSITION:
+		message_parse_disposition(value, body);
 		break;
-
-	 case 'i':
-	 case 'I':
-		if (!strncasecmp(next+2, "n-reply-to:", 11)) {
-		 message_parse_string(next+13, &body->in_reply_to);
-		}
+	 case RFC822_CONTENT_ID:
+		message_parse_string(value, &body->id);
 		break;
-
-	 case 'm':
-	 case 'M':
-		if (!strncasecmp(next+2, "essage-id:", 10)) {
-		 message_parse_string(next+12, &body->message_id);
-		}
+	 case RFC822_CONTENT_LANGUAGE:
+		message_parse_language(value, &body->language);
 		break;
-
-	 case 'r':
-	 case 'R':
-		if (!strncasecmp(next+2, "eply-to:", 8)) {
-		 message_parse_address(next+10, &body->reply_to);
-		}
-		if (!strncasecmp(next+2, "eceived:", 8)) {
-		 message_parse_received_date(next+10, &body->received_date);
-		}
-
+	 case RFC822_CONTENT_LOCATION:
+		message_parse_string(value, &body->location);
+		break;
+	 case RFC822_CONTENT_MD5:
+		message_parse_string(value, &body->md5);
 		break;
+	 case RFC822_CONTENT_TRANSFER_ENCODING:
+		message_parse_encoding(value, &body->encoding);
 
-	 case 's':
-	 case 'S':
-		if (!strncasecmp(next+2, "ubject:", 7)) {
-		 message_parse_string(next+9, &body->subject);
-		}
-		if (!strncasecmp(next+2, "ender:", 6)) {
-		 message_parse_address(next+8, &body->sender);
+		/* If we're encoding binary, replace "binary"
+		 with "base64" in CTE header body */
+		if (msg->encode &&
+		 !strcmp(body->encoding, "BINARY")) {
+		 char *p = (char*)
+			stristr(msg->base + body->header_offset +
+				(next - headers.s) + 27,
+				"binary");
+		 memcpy(p, "base64", 6);
 		}
 		break;
-
-	 case 't':
-	 case 'T':
-		if (!strncasecmp(next+2, "o:", 2)) {
-		 message_parse_address(next+4, &body->to);
+	 case RFC822_CONTENT_TYPE:
+		message_parse_type(value, body);
+		break;
+	 case RFC822_DATE:
+		message_parse_string(value, &body->date);
+		break;
+	 case RFC822_FROM:
+		message_parse_address(value, &body->from);
+		break;
+	 case RFC822_IN_REPLY_TO:
+		message_parse_string(value, &body->in_reply_to);
+		break;
+	 case RFC822_MESSAGE_ID:
+		message_parse_string(value, &body->message_id);
+		break;
+	 case RFC822_REPLY_TO:
+		message_parse_address(value, &body->reply_to);
+		break;
+	 case RFC822_RECEIVED:
+		message_parse_received_date(value, &body->received_date);
+		break;
+	 case RFC822_REFERENCES:
+		message_parse_string(value, &body->references);
+		break;
+	 case RFC822_SUBJECT:
+		message_parse_string(value, &body->subject);
+		break;
+	 case RFC822_SENDER:
+		message_parse_address(value, &body->sender);
+		break;
+	 case RFC822_TO:
+		message_parse_address(value, &body->to);
+		break;
+	 case RFC822_X_DELIVEREDINTERNALDATE:
+		/* Explicit x-deliveredinternaldate overrides received: headers */
+		if (body->received_date) {
+		 free(body->received_date);
+		 body->received_date = 0;
 		}
+		message_parse_string(value, &body->received_date);
 		break;
-
-	 case 'x':
-	 case 'X':
-		if (!strncasecmp(next+2, "-deliveredinternaldate:", 23)) {
- /* Explicit x-deliveredinternaldate overrides received: headers */
- if (body->received_date) {
- free(body->received_date);
- body->received_date = 0;
- }
-		 message_parse_string(next+25, &body->received_date);
- }
+	 case RFC822_X_ME_MESSAGE_ID:
+		message_parse_string(value, &body->x_me_message_id);
+		break;
+	 default:
 		break;
-	 } /* switch(next1) */
+	 } /* switch() */
 	} /* if (*next == '\n') */
 }
 
@@ -833,6 +838,7 @@
 if (!body->type) {
 	message_parse_type(defaultContentType, body);
 }
+ buf_free(&headers);
 return sawboundary;
 }
 
@@ -840,20 +846,18 @@
 * Parse a list of RFC-822 addresses from a header, appending them
 * to the address list pointed to by 'addrp'.
 */
-static void
-message_parse_address(hdr, addrp)
-char *hdr;
-struct address **addrp;
+static void message_parse_address(const char *hdr, struct address **addrp)
 {
 char *hdrend, hdrendchar = '\0';
 
 /* Find end of header */
- hdrend = hdr;
+ hdrend = (char *)hdr;
 do {
 	hdrend = strchr(hdrend+1, '\n');
 } while (hdrend && (hdrend1 == ' ' || hdrend1 == '\t'));
 
 /* Put a NUL character at the end of header */
+ /* gnb:TODO this is evil and should be stopped */
 if (hdrend) {
 	if (hdrend > hdr && hdrend-1 == '\r') hdrend--;
 	hdrendchar = *hdrend;
@@ -869,13 +873,10 @@
 /*
 * Parse a Content-Transfer-Encoding from a header.
 */
-static void
-message_parse_encoding(hdr, hdrp)
-char *hdr;
-char **hdrp;
+static void message_parse_encoding(const char *hdr, char **hdrp)
 {
 int len;
- char *p;
+ const char *p;
 
 /* Ignore if we already saw one of these headers */
 if (*hdrp) return;
@@ -895,18 +896,14 @@
 if (p) return;
 
 /* Save encoding token */
- *hdrp = xmalloc(len + 1);
- strlcpy(*hdrp, hdr, len + 1);
- for (p = *hdrp; *p; p++) {
-	if (Uislower(*p)) *p = toupper((int) *p);
- }
+ *hdrp = message_ucase(xstrndup(hdr, len));
 }
 
 /* 
 * parse a charset and encoding out of a body structure
 */
-static void
-message_parse_charset(struct body *body, int *e_ptr, int *c_ptr)
+static void message_parse_charset(const struct body *body,
+				 int *e_ptr, int *c_ptr)
 {
 int encoding = ENCODING_NONE;
 int charset = 0;
@@ -946,7 +943,8 @@
 if (!body->type || !strcmp(body->type, "TEXT")) {
 	for (param = body->params; param; param = param->next) {
 	 if (!strcasecmp(param->attribute, "charset")) {
-		charset = charset_lookupname(param->value);
+		if (param->value && *param->value)
+		 charset = charset_lookupname(param->value);
 		break;
 	 }
 	}
@@ -966,13 +964,10 @@
 /*
 * Parse an uninterpreted header
 */
-static void
-message_parse_string(hdr, hdrp)
-char *hdr;
-char **hdrp;
+static void message_parse_string(const char *hdr, char **hdrp)
 {
- int len;
- char *hdrend;
+ const char *hdrend;
+ char *he;
 
 /* Ignore if we already saw one of these headers */
 if (*hdrp) return;
@@ -993,19 +988,17 @@
 }
 
 /* Save header value */
- len = hdrend - hdr;
- *hdrp = xmalloc(len + 1);
- strlcpy(*hdrp, hdr, len + 1);
+ *hdrp = xstrndup(hdr, (hdrend - hdr));
 
 /* Un-fold header (overlapping buffers, use memmove) */
- hdrend = *hdrp;
- while ((hdrend = strchr(hdrend, '\n'))!=NULL) {
-	if (hdrend > *hdrp && hdrend-1 == '\r') {
-	 hdrend--;
-	 memmove(hdrend, hdrend+2, strlen(hdrend+2)+1);
+ he = *hdrp;
+ while ((he = strchr(he, '\n'))!=NULL) {
+	if (he > *hdrp && he-1 == '\r') {
+	 he--;
+	 memmove(he, he+2, strlen(he+2)+1);
 	}
 	else {
-	 memmove(hdrend, hdrend+1, strlen(hdrend+1)+1);
+	 memmove(he, he+1, strlen(he+1)+1);
 	}
 }
 }
@@ -1014,12 +1007,10 @@
 * Cache a header
 */
 static void
-message_parse_header(hdr, ibuf)
-char *hdr;
-struct ibuf *ibuf;
+message_parse_header(const char *hdr, struct buf *buf)
 {
 int len;
- char *hdrend;
+ const char *hdrend;
 
 /* Find end of header */
 hdrend = hdr;
@@ -1035,26 +1026,20 @@
 
 /* Save header value */
 len = hdrend - hdr;
- message_ibuf_ensure(ibuf, len+2);
- strncpy(ibuf->end, hdr, len);
- ibuf->end += len;
- *(ibuf->end)++ = '\r';
- *(ibuf->end)++ = '\n';
+ buf_appendmap(buf, hdr, len);
+ buf_putc(buf, '\r');
+ buf_putc(buf, '\n');
 }
 
 /*
 * Parse a Content-Type from a header.
 */
-static void
-message_parse_type(hdr, body)	 
-char *hdr;
-struct body *body;
+static void message_parse_type(const char *hdr, struct body *body)
 {
- char *type;
+ const char *type;
 int typelen;
- char *subtype;
+ const char *subtype;
 int subtypelen;
- char *p;
 
 /* Ignore if we already saw one of these headers */
 if (body->type) return;
@@ -1095,16 +1080,8 @@
 if (hdr && *hdr != ';') return;
 
 /* Save content type & subtype */
- body->type = xmalloc(typelen + 1);
- strlcpy(body->type, type, typelen + 1);
- for (p = body->type; *p; p++) {
-	if (Uislower(*p)) *p = toupper((int) *p);
- }
- body->subtype = xmalloc(subtypelen + 1);
- strlcpy(body->subtype, subtype, subtypelen + 1);
- for (p = body->subtype; *p; p++) {
-	if (Uislower(*p)) *p = toupper((int) *p);
- }
+ body->type = message_ucase(xstrndup(type, typelen));
+ body->subtype = message_ucase(xstrndup(subtype, subtypelen));
 
 /* Parse parameter list */
 if (hdr) {
@@ -1116,14 +1093,10 @@
 /*
 * Parse a Content-Disposition from a header.
 */
-/* static */ void
-message_parse_disposition(hdr, body)	 
-char *hdr;
-struct body *body;
+static void message_parse_disposition(const char *hdr, struct body *body)
 {
- char *disposition;
+ const char *disposition;
 int dispositionlen;
- char *p;
 
 /* Ignore if we already saw one of these headers */
 if (body->disposition) return;
@@ -1146,12 +1119,7 @@
 if (hdr && *hdr != ';') return;
 
 /* Save content disposition */
- body->disposition = xmalloc(dispositionlen + 1);
- strlcpy(body->disposition, disposition, dispositionlen + 1);
-
- for (p = body->disposition; *p; p++) {
-	if (Uislower(*p)) *p = toupper((int) *p);
- }
+ body->disposition = message_ucase(xstrndup(disposition, dispositionlen));
 
 /* Parse parameter list */
 if (hdr) {
@@ -1161,17 +1129,21 @@
 }
 
 /*
- * Parse a parameter list from a header
+ * Parse a parameter list from a header.
+ *
+ * 'hdr' points into the message, and is not expected to
+ * be nul-terminated. Handles continuation headers.
+ *
+ * Malformed parameters are handled by skipping to the
+ * next ';' or end of line, which should mark the next
+ * parameter.
 */
-static void
-message_parse_params(hdr, paramp)
-char *hdr;
-struct param **paramp;
+static void message_parse_params(const char *hdr, struct param **paramp)
 {
 struct param *param;
- char *attribute;
+ const char *attribute;
 int attributelen;
- char *value;
+ const char *value;
 int valuelen;
 char *p;
 
@@ -1183,7 +1155,7 @@
 	/* Find end of attribute */
 	attribute = hdr;
 	for (; *hdr && !Uisspace(*hdr) && *hdr != '=' && *hdr != '('; hdr++) {
-	 if (*hdr < ' ' || strchr(TSPECIALS, *hdr)) return;
+	 if (*hdr < ' ' || strchr(TSPECIALS, *hdr)) goto skip;
 	}
 	attributelen = hdr - attribute;
 
@@ -1192,7 +1164,7 @@
 	if (!hdr) return;
 
 	/* Ignore param if no '=' character */
-	if (*hdr++ != '=') return;
+	if (*hdr++ != '=') goto skip;
 
 	/* Skip whitespace before value */
 	message_parse_rfc822space(&hdr);
@@ -1208,8 +1180,9 @@
 		 if (!*hdr) return;
 		}
 		if (*hdr == '\r') {
+		 /* check for continuation headers */
 		 if (hdr1 == '\n' && (hdr2 == ' ' || hdr2 == '\t')) hdr += 2;
- 		 else return;
+		 else return; /* end of header field */
 		}
 		hdr++;
 	 }
@@ -1217,7 +1190,7 @@
 	}
 	else {
 	 for (; *hdr && !Uisspace(*hdr) && *hdr != ';' && *hdr != '('; hdr++) {
-		if (*hdr < ' ' || strchr(TSPECIALS, *hdr)) return;
+		if (*hdr < ' ' || strchr(TSPECIALS, *hdr)) goto skip;
 	 }
 	}
 	valuelen = hdr - value;
@@ -1226,17 +1199,16 @@
 	message_parse_rfc822space(&hdr);
 
 	/* Ignore parameter if not at end of header or parameter delimiter */
-	if (hdr && *hdr++ != ';') return;
+	if (hdr && *hdr++ != ';') {
+skip:
+	 hdr += strcspn(hdr, ";\r\n");
+	 if (*hdr == ';') hdr++;
+	 continue;
+	}
 		 
 	/* Save attribute/value pair */
-	*paramp = param = (struct param *)xmalloc(sizeof(struct param));
-	memset(param, 0, sizeof(struct param));
-	param->attribute = xmalloc(attributelen + 1);
-	strlcpy(param->attribute, attribute, attributelen + 1);
-
-	for (p = param->attribute; *p; p++) {
-	 if (Uislower(*p)) *p = toupper((int) *p);
-	}
+	*paramp = param = (struct param *)xzmalloc(sizeof(struct param));
+	param->attribute = message_ucase(xstrndup(attribute, attributelen));
 	param->value = xmalloc(valuelen + 1);
 	if (*value == '\"') {
 	 p = param->value;
@@ -1257,9 +1229,6 @@
 }
 }
 
-/* Alphabet for hex encoding */
-static char basis_hex = "0123456789ABCDEF";
-
 /*
 * Decode RFC-2231 parameter continuations
 *
@@ -1273,8 +1242,7 @@
 * of "foo*0"/"foo*0*" to either "foo" or "foo*", depending on whether
 * the value has extended syntax or not.
 */
-static void
-message_fold_params(struct param **params)
+static void message_fold_params(struct param **params)
 {
 struct param *thisparam;	/* The "foo*1" param we're folding */
 struct param **continuation; /* Pointer to the "foo*2" param */
@@ -1341,8 +1309,7 @@
 				*from == '*' || *from == '\'' ||
 				*from == '%' || strchr(TSPECIALS, *from)) {
 				*to++ = '%';
-				*to++ = basis_hex(*from>>4) & 0xf;
-				*to++ = basis_hex*from & 0xf;
+				to += bin_to_hex(from, 1, to, BH_UPPER);
 			 } else {
 				*to++ = *from;
 			 }
@@ -1388,8 +1355,7 @@
 				*from == '*' || *from == '\'' ||
 				*from == '%' || strchr(TSPECIALS, *from)) {
 				*to++ = '%';
-				*to++ = basis_hex(*from>>4) & 0xf;
-				*to++ = basis_hex*from & 0xf;
+				to += bin_to_hex(from, 1, to, BH_UPPER);
 			 } else {
 				*to++ = *from;
 			 }
@@ -1430,15 +1396,11 @@
 /*
 * Parse a language list from a header
 */
-static void
-message_parse_language(hdr, paramp)
-char *hdr;
-struct param **paramp;
+static void message_parse_language(const char *hdr, struct param **paramp)
 {
 struct param *param;
- char *value;
+ const char *value;
 int valuelen;
- char *p;
 
 for (;;) {
 	/* Skip over leading whitespace */
@@ -1463,14 +1425,8 @@
 	if (hdr && *hdr++ != ',') return;
 		 
 	/* Save value pair */
-	*paramp = param = (struct param *)xmalloc(sizeof(struct param));
-	memset(param, 0, sizeof(struct param));
-	param->value = xmalloc(valuelen + 1);
-	strlcpy(param->value, value, valuelen + 1);
-
-	for (p = param->value; *p; p++) {
-	 if (Uislower(*p)) *p = toupper((int) *p);
-	}
+	*paramp = param = (struct param *)xzmalloc(sizeof(struct param));
+	param->value = message_ucase(xstrndup(value, valuelen));
 
 	/* Get ready to parse the next parameter */
 	paramp = &param->next;
@@ -1478,212 +1434,11 @@
 }
 
 /*
- * Parse a RFC-822 date from a header.
- * Only parses to day granularity--ignores the time of day.
- */
-time_t
-message_parse_date(hdr, flags)
-char *hdr;
-unsigned flags;
-{
- struct tm tm;
- time_t t;
- char month4;
- static char *monthname = {
-	"jan", "feb", "mar", "apr", "may", "jun",
-	"jul", "aug", "sep", "oct", "nov", "dec"
- };
- int zone_off = 0;
-
- if (!hdr) goto baddate;
-
- memset(&tm, 0, sizeof(tm));
-
- message_parse_rfc822space(&hdr);
- if (!hdr) goto baddate;
-
- if (Uisalpha(*hdr)) {
-	/* Day name -- skip over it */
-	hdr++;
-	if (!Uisalpha(*hdr)) goto baddate;
-	hdr++;
-	if (!Uisalpha(*hdr)) goto baddate;
-	hdr++;
-	message_parse_rfc822space(&hdr);
-	if (!hdr || *hdr++ != ',') goto baddate;
-	message_parse_rfc822space(&hdr);
-	if (!hdr) goto baddate;
- }
-
- if (!Uisdigit(*hdr)) goto baddate;
- tm.tm_mday = *hdr++ - '0';
- if (Uisdigit(*hdr)) {
-	tm.tm_mday = tm.tm_mday*10 + *hdr++ - '0';
- }
- 
- /* Parse month name */
- message_parse_rfc822space(&hdr);
- if (!hdr) goto baddate;
- month0 = *hdr++;
- if (!Uisalpha(month0)) goto baddate;
- month1 = *hdr++;
- if (!Uisalpha(month1)) goto baddate;
- month2 = *hdr++;
- if (!Uisalpha(month2)) goto baddate;
- month3 = '\0';
- lcase(month);
- for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
-	if (!strcmp(month, monthnametm.tm_mon)) break;
- }
- if (tm.tm_mon == 12) goto baddate;
- 
- /* Parse year */
- message_parse_rfc822space(&hdr);
- if (!hdr || !Uisdigit(*hdr)) goto baddate;
- tm.tm_year = *hdr++ - '0';
- if (!Uisdigit(*hdr)) goto baddate;
- tm.tm_year = tm.tm_year * 10 + *hdr++ - '0';
- if (Uisdigit(*hdr)) {
-	if (tm.tm_year < 19) goto baddate;
-	tm.tm_year -= 19;
-	tm.tm_year = tm.tm_year * 10 + *hdr++ - '0';
-	if (!Uisdigit(*hdr)) goto baddate;
-	tm.tm_year = tm.tm_year * 10 + *hdr++ - '0';
- } else {
-	if (tm.tm_year < 70) {
-	 /* two-digit year, probably after 2000.
-	 * This patent was overturned, right?
-	 */
-	 tm.tm_year += 100;
-	}
- }
- if (Uisdigit(*hdr)) {
- /* five-digit date */
- goto baddate;
- }
-
- message_parse_rfc822space(&hdr);
- if (hdr && (flags & PARSE_TIME)) {
-	/* Parse hour */
-	if (!hdr || !Uisdigit(*hdr)) goto badtime;
-	tm.tm_hour = *hdr++ - '0';
-	if (!Uisdigit(*hdr)) goto badtime;
-	tm.tm_hour = tm.tm_hour * 10 + *hdr++ - '0';
-	if (!hdr || *hdr++ != ':') goto badtime;
-
-	/* Parse min */
-	if (!hdr || !Uisdigit(*hdr)) goto badtime;
-	tm.tm_min = *hdr++ - '0';
-	if (!Uisdigit(*hdr)) goto badtime;
-	tm.tm_min = tm.tm_min * 10 + *hdr++ - '0';
-
-	if (*hdr == ':') {
-	 /* Parse sec */
-	 if (!++hdr || !Uisdigit(*hdr)) goto badtime;
-	 tm.tm_sec = *hdr++ - '0';
-	 if (!Uisdigit(*hdr)) goto badtime;
-	 tm.tm_sec = tm.tm_sec * 10 + *hdr++ - '0';
-	}
-
-	message_parse_rfc822space(&hdr);
-	if (hdr && (flags & PARSE_ZONE)) {
-	 /* Parse timezone offset */
-	 if (*hdr == '+' || *hdr == '-') {
-		/* Parse numeric offset */
-		int east = (*hdr++ == '-');
-
-		if (!hdr || !Uisdigit(*hdr)) goto badzone;
-		zone_off = *hdr++ - '0';
-		if (!hdr || !Uisdigit(*hdr)) goto badzone;
-		zone_off = zone_off * 10 + *hdr++ - '0';
-		if (!hdr || !Uisdigit(*hdr)) goto badzone;
-		zone_off = zone_off * 6 + *hdr++ - '0';
-		if (!hdr || !Uisdigit(*hdr)) goto badzone;
-		zone_off = zone_off * 10 + *hdr++ - '0';
-
-		if (east) zone_off = -zone_off;
-	 }
-	 else if (Uisalpha(*hdr)) {
-		char zone4;
-
-		zone0 = *hdr++;
-		if (!Uisalpha(*hdr)) {
-		 /* Parse military (single-char) zone */
-		 zone1 = '\0';
-		 lcase(zone);
-		 if (zone0 < 'j')
-			zone_off = (zone0 - 'a' + 1) * 60;
-		 else if (zone0 == 'j')
-			goto badzone;
-		 else if (zone0 <= 'm')
-			zone_off = (zone0 - 'a') * 60;
-		 else if (zone0 < 'z')
-			zone_off = ('m' - zone0) * 60;
-		 else
-			zone_off = 0;
-		}
-		else {
-		 zone1 = *hdr++;
-		 if (!Uisalpha(*hdr)) {
-			/* Parse UT (universal time) */
-			zone2 = '\0';
-			lcase(zone);
-			if (strcmp(zone, "ut")) goto badzone;
-			zone_off = 0;
-		 }
-		 else {
-			/* Parse 3-char time zone */
-			char *p;
-
-			zone2 = *hdr;
-			zone3 = '\0';
-			lcase(zone);
-			/* GMT (Greenwich mean time) */
-			if (!strcmp(zone, "gmt")) zone_off = 0;
-
-			/* US time zone */
-			else {
-			 p = strchr("aecmpyhb", zone0);
-			 if (!p || zone2 != 't') goto badzone;
-			 zone_off = (strlen(p) - 12) * 60;
-			 if (zone1 == 'd') zone_off += 60;
-			 else if (zone1 != 's') goto badzone;
-			}
-		 }
-		}
-	 }
-	 else
- badzone:
-		zone_off = 0;
-	}
- }
- else
- badtime:
-	tm.tm_hour = 12;
-
- tm.tm_isdst = -1;
-
- if (flags & PARSE_GMT)
-	t = mkgmtime(&tm);
- else
-	t = mktime(&tm);
- /* Don't return -1; it's never right. Return the current time instead.
- * That's much closer than 1969.
- */
- if (t >= 0) return (t - zone_off * 60);
- 
- baddate:
- return (flags & PARSE_NOCREATE) ? 0 : time(0);
-}
-
-/*
 * Skip over RFC-822 whitespace and comments
 */
-static void
-message_parse_rfc822space(s)
-char **s;
+static void message_parse_rfc822space(const char **s)
 {
- char *p = *s;
+ const char *p = *s;
 int commentlevel = 0;
 
 if (!p) return;
@@ -1691,7 +1446,7 @@
 	if (*p == '\n') {
 	 p++;
 	 if (*p != ' ' && *p != '\t') {
-		*s = 0;
+		*s = 0;	 /* end of header field, no continuation */
 		return;
 	 }
 	}
@@ -1726,7 +1481,7 @@
 	else p++;
 }
 if (*p == 0) {
-	*s = 0;
+	*s = 0;	 /* embedded NUL */
 }
 else {
 	*s = p;
@@ -1736,15 +1491,12 @@
 /*
 * Parse the content of a MIME multipart body-part
 */
-static void
-message_parse_multipart(msg, body, boundaries)
-struct msg *msg;
-struct body *body;
-struct boundary *boundaries;
+static void message_parse_multipart(struct msg *msg, struct body *body,
+				 strarray_t *boundaries)
 {
 struct body preamble, epilogue;
 struct param *boundary;
- char *defaultContentType = DEFAULT_CONTENT_TYPE;
+ const char *defaultContentType = DEFAULT_CONTENT_TYPE;
 int i, depth;
 int limit = config_getint(IMAPOPT_BOUNDARY_LIMIT);
 
@@ -1766,15 +1518,8 @@
 	return;
 }
 
- /* Expand boundaries array if necessary */
- if (boundaries->count == boundaries->alloc) {
-	boundaries->alloc += 20;
-	boundaries->id = (char **)xrealloc((char *)boundaries->id,
-					 boundaries->alloc * sizeof(char *));
- }
- 
 /* Add the new boundary id */
- boundaries->idboundaries->count++ = boundary->value;
+ strarray_append(boundaries, boundary->value);
 depth = boundaries->count;
 
 /* Parse preamble */
@@ -1785,14 +1530,15 @@
 	 (limit == 0 ? 1 : boundaries->count < limit)) {
 	body->subpart = (struct body *)xrealloc((char *)body->subpart,
 				 (body->numparts+1)*sizeof(struct body));
-	message_parse_body(msg, &body->subpartbody->numparts++,
+	message_parse_body(msg, &body->subpartbody->numparts,
 			 defaultContentType, boundaries);
 	if (msg->offset == msg->len &&
-	 body->subpartbody->numparts-1.boundary_size == 0) {
+	 body->subpartbody->numparts.boundary_size == 0) {
 	 /* hit the end of the message, therefore end all pending
 	 multiparts */
-	 boundaries->count = 0;
+	 strarray_truncate(boundaries, 0);
 	}
+	body->numparts++;
 }
 
 if (boundaries->count == depth-1) {
@@ -1853,11 +1599,8 @@
 /*
 * Parse the content of a generic body-part
 */
-static void
-message_parse_content(msg, body, boundaries)
-struct msg *msg;
-struct body *body;
-struct boundary *boundaries;
+static void message_parse_content(struct msg *msg, struct body *body,
+				 strarray_t *boundaries)
 {
 const char *line, *endline;
 unsigned long s_offset = msg->offset;
@@ -1881,7 +1624,7 @@
 	msg->offset += len;
 
 	if (line0 == '-' && line1 == '-' &&
-	 message_pendingboundary(line, len, boundaries->id, &boundaries->count)) {
+	 message_pendingboundary(line, len, boundaries)) {
 	 body->boundary_size = len;
 	 body->boundary_lines++;
 	 if (body->content_lines) {
@@ -1939,10 +1682,7 @@
 }
 }
 
-static void
-message_parse_received_date(hdr, hdrp)
-char *hdr;
-char **hdrp;
+static void message_parse_received_date(const char *hdr, char **hdrp)
 {
 char *curp, *hdrbuf = 0;
 
@@ -1976,26 +1716,25 @@
 
 
 /*
- * Read a line from 'msg' (or at most 'n' characters) into 's'
+ * Read a line from @msg into @buf. Returns a pointer to the start of
+ * the line inside @buf, or NULL at the end of @msg.
 */
-static char *
-message_getline(s, n, msg)
-char *s;
-unsigned n;
-struct msg *msg;
+static char *message_getline(struct buf *buf, struct msg *msg)
 {
- char *rval = s;
+ unsigned int oldlen = buf_len(buf);
+ int c;
 
- if (n == 0) return 0;
- n--;			/* Allow for terminating nul */
-
- while (msg->offset < msg->len && n--) {
-	if ((*s++ = msg->basemsg->offset++) == '\n') break;
+ while (msg->offset < msg->len) {
+	c = msg->basemsg->offset++;
+	buf_putc(buf, c);
+	if (c == '\n')
+	 break;
 }
- *s = '\0';
+ buf_cstring(buf);
 
- if (s == rval) return 0;
- return rval;
+ if (buf_len(buf) == oldlen)
+	return 0;
+ return buf->s + oldlen;
 }
 
 
@@ -2004,11 +1743,8 @@
 * If we hit a terminating boundary, the integer pointed to by
 * 'boundaryct' is modified appropriately.
 */
-static int message_pendingboundary(s, slen, boundaries, boundaryct)
-const char *s;
-int slen;
-char **boundaries;
-int *boundaryct;
+static int message_pendingboundary(const char *s, int slen,
+				 strarray_t *boundaries)
 {
 int i, len;
 int rfc2046_strict = config_getswitch(IMAPOPT_RFC2046_STRICT);
@@ -2021,15 +1757,15 @@
 bbase = s + 2;
 blen = slen - 2;
 
- for (i = 0; i < *boundaryct; ++i) {
-	len = strlen(boundariesi);
+ for (i = 0; i < boundaries->count ; ++i) {
+	len = strlen(boundaries->datai);
 	/* basic sanity check and overflow protection */
 	if (blen < len) continue;
 
-	if (!strncmp(bbase, boundariesi, len)) {
+	if (!strncmp(bbase, boundaries->datai, len)) {
 	 /* trailing '--', it's the end of this part */
 	 if (blen >= len+2 && bbaselen == '-' && bbaselen+1 == '-')
-		*boundaryct = i;
+		strarray_truncate(boundaries, i);
 	 else if (!rfc2046_strict && blen > len+1 &&
 		 bbaselen && !Uisspace(bbaselen)) {
 		/* Allow substring matches in the boundary.
@@ -2047,37 +1783,36 @@
 return 0;
 }
 
+
 /*
 * Write the cache information for the message parsed to 'body'
 * to 'outfile'.
 */
-int
-message_write_cache(record, body)
-struct index_record *record;
-struct body *body;
+int message_write_cache(struct index_record *record, const struct body *body)
 {
 static struct buf cacheitem_buffer;
- struct ibuf ib10;
+ struct buf ibNUM_CACHE_FIELDS;
 struct body toplevel;
 char *subject;
- int len;
 int i;
 
 /* initialise data structures */
 buf_reset(&cacheitem_buffer);
- for (i = 0; i < 10; i++)
-	message_ibuf_init(&ibi);
+ for (i = 0; i < NUM_CACHE_FIELDS; i++)
+	buf_init(&ibi);
 
 toplevel.type = "MESSAGE";
 toplevel.subtype = "RFC822";
- toplevel.subpart = body;
+ /* we cast away const because we know that we're only using
+ * toplevel.subpart as const in message_write_section(). */
+ toplevel.subpart = (struct body *)body;
 
- subject = charset_decode_mimeheader(body->subject, NULL, 0);
+ subject = charset_parse_mimeheader(body->subject);
 
- /* copy into ibufs */
+ /* copy into bufs */
 message_write_envelope(&ibCACHE_ENVELOPE, body);
 message_write_body(&ibCACHE_BODYSTRUCTURE, body, 1);
- message_ibuf_copy(&ibCACHE_HEADERS, &body->cacheheaders); 
+ buf_copy(&ibCACHE_HEADERS, &body->cacheheaders);
 message_write_body(&ibCACHE_BODY, body, 0);
 message_write_section(&ibCACHE_SECTION, &toplevel);
 message_write_searchaddr(&ibCACHE_FROM, body->from);
@@ -2089,71 +1824,59 @@
 free(subject);
 
 /* append the records to the buffer */
- for (i = 0; i < 10; i++) {
-	message_ibuf_pad(&ibi);
-	record->crec.itemi.len = ibi.end - ibi.start;
-	buf_appendbit32(&cacheitem_buffer, record->crec.itemi.len);
-	record->crec.itemi.offset = buf_len(&cacheitem_buffer);
-	buf_appendmap(&cacheitem_buffer, ibi.start, (record->crec.itemi.len + 3) & ~3);
-	message_ibuf_free(&ibi);
+ for (i = 0; i < NUM_CACHE_FIELDS; i++) {
+	record->crec.itemi.len = buf_len(&ibi);
+	record->crec.itemi.offset = buf_len(&cacheitem_buffer) + sizeof(uint32_t);
+	message_write_xdrstring(&cacheitem_buffer, &ibi);
+	buf_free(&ibi);
 }
 
- len = buf_len(&cacheitem_buffer);
-
 /* copy the fields into the message */
 record->cache_offset = 0; /* calculate on write! */
 record->cache_version = MAILBOX_CACHE_MINOR_VERSION;
- record->cache_crc = crc32_map(cacheitem_buffer.s, len); /* XXX - hacky */
- record->crec.base = &cacheitem_buffer;
+ record->cache_crc = crc32_buf(&cacheitem_buffer);
+ record->crec.buf = &cacheitem_buffer;
 record->crec.offset = 0; /* we're at the start of the buffer */
- record->crec.len = len;
+ record->crec.len = buf_len(&cacheitem_buffer);
 
 return 0;
 }
 
-/* Append character 'c' to 'ibuf' */
-#define PUTIBUF(ibuf,c) (((void)((ibuf)->end<(ibuf)->last || message_ibuf_ensure((ibuf),1))),(*((ibuf)->end)++ = (c)))
 
 /*
- * Write the IMAP envelope for 'body' to 'ibuf'
+ * Write the IMAP envelope for 'body' to 'buf'
 */
-static void
-message_write_envelope(ibuf, body)
-struct ibuf *ibuf;
-struct body *body;
-{
- PUTIBUF(ibuf, '(');
- message_write_nstring(ibuf, body->date);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->subject);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->from);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->sender ? body->sender : body->from);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->reply_to ? body->reply_to : body->from);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->to);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->cc);
- PUTIBUF(ibuf, ' ');
- message_write_address(ibuf, body->bcc);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->in_reply_to);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->message_id);
- PUTIBUF(ibuf, ')');
+static void message_write_envelope(struct buf *buf, const struct body *body)
+{
+ buf_putc(buf, '(');
+ message_write_nstring(buf, body->date);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->subject);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->from);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->sender ? body->sender : body->from);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->reply_to ? body->reply_to : body->from);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->to);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->cc);
+ buf_putc(buf, ' ');
+ message_write_address(buf, body->bcc);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->in_reply_to);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->message_id);
+ buf_putc(buf, ')');
 }
 
 /*
 * Write the BODY (if 'newformat' is zero) or BODYSTRUCTURE
- * (if 'newformat' is nonzero) for 'body' to 'ibuf'.
+ * (if 'newformat' is nonzero) for 'body' to 'buf'.
 */
-static void
-message_write_body(ibuf, body, newformat)
-struct ibuf *ibuf;
-struct body *body;
-int newformat;
+HIDDEN void message_write_body(struct buf *buf, const struct body *body,
+			 int newformat)
 {
 struct param *param;
 
@@ -2167,294 +1890,285 @@
 	 if (!zerotextbody.type) {
 		message_parse_type(DEFAULT_CONTENT_TYPE, &zerotextbody);
 	 }
-	 message_write_body(ibuf, &zerotextbody, newformat);
+	 message_write_body(buf, &zerotextbody, newformat);
 	 return;
 	}
 
 	/* Multipart types get a body_multipart */
-	PUTIBUF(ibuf, '(');
+	buf_putc(buf, '(');
 	for (i = 0; i < body->numparts; i++) {
-	 message_write_body(ibuf, &body->subparti, newformat);
+	 message_write_body(buf, &body->subparti, newformat);
 	}
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, body->subtype);
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, body->subtype);
 
 	if (newformat) {
-	 PUTIBUF(ibuf, ' ');
+	 buf_putc(buf, ' ');
 	 if ((param = body->params)!=NULL) {
-		PUTIBUF(ibuf, '(');
+		buf_putc(buf, '(');
 		while (param) {
-		 message_write_nstring(ibuf, param->attribute);
-		 PUTIBUF(ibuf, ' ');
-		 message_write_nstring(ibuf, param->value);
+		 message_write_nstring(buf, param->attribute);
+		 buf_putc(buf, ' ');
+		 message_write_nstring(buf, param->value);
 		 if ((param = param->next)!=NULL) {
-			PUTIBUF(ibuf, ' ');
+			buf_putc(buf, ' ');
 		 }
 		}
-		PUTIBUF(ibuf, ')');
+		buf_putc(buf, ')');
 	 }
-	 else message_write_nstring(ibuf, (char *)0);
-	 PUTIBUF(ibuf, ' ');
+	 else message_write_nstring(buf, (char *)0);
+	 buf_putc(buf, ' ');
 	 if (body->disposition) {
-		PUTIBUF(ibuf, '(');
-		message_write_nstring(ibuf, body->disposition);
-		PUTIBUF(ibuf, ' ');
+		buf_putc(buf, '(');
+		message_write_nstring(buf, body->disposition);
+		buf_putc(buf, ' ');
 		if ((param = body->disposition_params)!=NULL) {
-		 PUTIBUF(ibuf, '(');
+		 buf_putc(buf, '(');
 		 while (param) {
-			message_write_nstring(ibuf, param->attribute);
-			PUTIBUF(ibuf, ' ');
-			message_write_nstring(ibuf, param->value);
+			message_write_nstring(buf, param->attribute);
+			buf_putc(buf, ' ');
+			message_write_nstring(buf, param->value);
 			if ((param = param->next)!=NULL) {
-			 PUTIBUF(ibuf, ' ');
+			 buf_putc(buf, ' ');
 			}
 		 }
-		 PUTIBUF(ibuf, ')');
+		 buf_putc(buf, ')');
 		}
-		else message_write_nstring(ibuf, (char *)0);
-		PUTIBUF(ibuf, ')');
+		else message_write_nstring(buf, (char *)0);
+		buf_putc(buf, ')');
 	 }
 	 else {
-		message_write_nstring(ibuf, (char *)0);
+		message_write_nstring(buf, (char *)0);
 	 }
-	 PUTIBUF(ibuf, ' ');
+	 buf_putc(buf, ' ');
 	 if ((param = body->language)!=NULL) {
-		PUTIBUF(ibuf, '(');
+		buf_putc(buf, '(');
 		while (param) {
-		 message_write_nstring(ibuf, param->value);
+		 message_write_nstring(buf, param->value);
 		 if ((param = param->next)!=NULL) {
-			PUTIBUF(ibuf, ' ');
+			buf_putc(buf, ' ');
 		 }
 		}
-		PUTIBUF(ibuf, ')');
+		buf_putc(buf, ')');
 	 }
-	 else message_write_nstring(ibuf, (char *)0);
-	 PUTIBUF(ibuf, ' ');
-	 message_write_nstring(ibuf, body->location);
+	 else message_write_nstring(buf, (char *)0);
+	 buf_putc(buf, ' ');
+	 message_write_nstring(buf, body->location);
 	}
 
-	PUTIBUF(ibuf, ')');
+	buf_putc(buf, ')');
 	return;
 }
 
- PUTIBUF(ibuf, '(');
- message_write_nstring(ibuf, body->type);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->subtype);
- PUTIBUF(ibuf, ' ');
+ buf_putc(buf, '(');
+ message_write_nstring(buf, body->type);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->subtype);
+ buf_putc(buf, ' ');
 
 if ((param = body->params)!=NULL) {
-	PUTIBUF(ibuf, '(');
+	buf_putc(buf, '(');
 	while (param) {
-	 message_write_nstring(ibuf, param->attribute);
-	 PUTIBUF(ibuf, ' ');
-	 message_write_nstring(ibuf, param->value);
+	 message_write_nstring(buf, param->attribute);
+	 buf_putc(buf, ' ');
+	 message_write_nstring(buf, param->value);
 	 if ((param = param->next)!=NULL) {
-		PUTIBUF(ibuf, ' ');
+		buf_putc(buf, ' ');
 	 }
 	}
-	PUTIBUF(ibuf, ')');
+	buf_putc(buf, ')');
 }
- else message_write_nstring(ibuf, (char *)0);
- PUTIBUF(ibuf, ' ');
+ else message_write_nstring(buf, (char *)0);
+ buf_putc(buf, ' ');
 
- message_write_nstring(ibuf, body->id);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->description);
- PUTIBUF(ibuf, ' ');
- message_write_nstring(ibuf, body->encoding ? body->encoding : "7BIT");
- PUTIBUF(ibuf, ' ');
- message_write_number(ibuf, body->content_size);
+ message_write_nstring(buf, body->id);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->description);
+ buf_putc(buf, ' ');
+ message_write_nstring(buf, body->encoding ? body->encoding : "7BIT");
+ buf_putc(buf, ' ');
+ buf_printf(buf, "%lu", body->content_size);
 
 if (strcmp(body->type, "TEXT") == 0) {
 	/* Text types get a line count */
-	PUTIBUF(ibuf, ' ');
-	message_write_number(ibuf, body->content_lines);
+	buf_putc(buf, ' ');
+	buf_printf(buf, "%lu", body->content_lines);
 }
 else if (strcmp(body->type, "MESSAGE") == 0
 	 && strcmp(body->subtype, "RFC822") == 0) {
 	/* Message/rfc822 gets a body_msg */
-	PUTIBUF(ibuf, ' ');
-	message_write_envelope(ibuf, body->subpart);
-	PUTIBUF(ibuf, ' ');
-	message_write_body(ibuf, body->subpart, newformat);
-	PUTIBUF(ibuf, ' ');
-	message_write_number(ibuf, body->content_lines);
+	buf_putc(buf, ' ');
+	message_write_envelope(buf, body->subpart);
+	buf_putc(buf, ' ');
+	message_write_body(buf, body->subpart, newformat);
+	buf_putc(buf, ' ');
+	buf_printf(buf, "%lu", body->content_lines);
 }
 
 if (newformat) {
 	/* Add additional fields for BODYSTRUCTURE */
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, body->md5);
-	PUTIBUF(ibuf, ' ');
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, body->md5);
+	buf_putc(buf, ' ');
 	if (body->disposition) {
-	 PUTIBUF(ibuf, '(');
-	 message_write_nstring(ibuf, body->disposition);
-	 PUTIBUF(ibuf, ' ');
+	 buf_putc(buf, '(');
+	 message_write_nstring(buf, body->disposition);
+	 buf_putc(buf, ' ');
 	 if ((param = body->disposition_params)!=NULL) {
-		PUTIBUF(ibuf, '(');
+		buf_putc(buf, '(');
 		while (param) {
-		 message_write_nstring(ibuf, param->attribute);
-		 PUTIBUF(ibuf, ' ');
-		 message_write_nstring(ibuf, param->value);
+		 message_write_nstring(buf, param->attribute);
+		 buf_putc(buf, ' ');
+		 message_write_nstring(buf, param->value);
 		 if ((param = param->next)!=NULL) {
-			PUTIBUF(ibuf, ' ');
+			buf_putc(buf, ' ');
 		 }
 		}
-		PUTIBUF(ibuf, ')');
+		buf_putc(buf, ')');
 	 }
-	 else message_write_nstring(ibuf, (char *)0);
-	 PUTIBUF(ibuf, ')');
+	 else message_write_nstring(buf, (char *)0);
+	 buf_putc(buf, ')');
 	}
 	else {
-	 message_write_nstring(ibuf, (char *)0);
+	 message_write_nstring(buf, (char *)0);
 	}
-	PUTIBUF(ibuf, ' ');
+	buf_putc(buf, ' ');
 	if ((param = body->language)!=NULL) {
-	 PUTIBUF(ibuf, '(');
+	 buf_putc(buf, '(');
 	 while (param) {
-		message_write_nstring(ibuf, param->value);
+		message_write_nstring(buf, param->value);
 		if ((param = param->next)!=NULL) {
-		 PUTIBUF(ibuf, ' ');
+		 buf_putc(buf, ' ');
 		}
 	 }
-	 PUTIBUF(ibuf, ')');
+	 buf_putc(buf, ')');
+	}
+	else message_write_nstring(buf, (char *)0);
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, body->location);
+
+	if (newformat > 1 && !body->numparts) {
+	 /* even newer extension fields for annotation callout */
+	 buf_printf(buf, " (OFFSET %lu HEADERSIZE %lu)",
+		 body->content_offset,
+		 body->header_size);
 	}
-	else message_write_nstring(ibuf, (char *)0);
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, body->location);
 }
 
- PUTIBUF(ibuf, ')');
+ buf_putc(buf, ')');
 }
 
 /*
- * Write the address list 'addrlist' to 'ibuf'
+ * Write the address list 'addrlist' to 'buf'
 */
-static void
-message_write_address(ibuf, addrlist)
-struct ibuf *ibuf;
-struct address *addrlist;
+static void message_write_address(struct buf *buf,
+				 const struct address *addrlist)
 {
 /* If no addresses, write out NIL */
 if (!addrlist) {
-	message_write_nstring(ibuf, (char *)0);
+	message_write_nstring(buf, (char *)0);
 	return;
 }
 
- PUTIBUF(ibuf, '(');
+ buf_putc(buf, '(');
 
 while (addrlist) {
-	PUTIBUF(ibuf, '(');
-	message_write_nstring(ibuf, addrlist->name);
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, addrlist->route);
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, addrlist->mailbox);
-	PUTIBUF(ibuf, ' ');
-	message_write_nstring(ibuf, addrlist->domain);
-	PUTIBUF(ibuf, ')');
+	buf_putc(buf, '(');
+	message_write_nstring(buf, addrlist->name);
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, addrlist->route);
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, addrlist->mailbox);
+	buf_putc(buf, ' ');
+	message_write_nstring(buf, addrlist->domain);
+	buf_putc(buf, ')');
 	addrlist = addrlist->next;
 }
 
- PUTIBUF(ibuf, ')');
+ buf_putc(buf, ')');
 }
 
 /*
- * Write the nil-or-string 's' to 'ibuf'
+ * Write the nil-or-string 's' to 'buf'
 */
-static void
-message_write_nstring(ibuf, s)
-struct ibuf *ibuf;
-char *s;
+EXPORTED void message_write_nstring(struct buf *buf, const char *s)
 {
- char *p;
- int len = 0;
+ message_write_nstring_map(buf, s, (s ? strlen(s) : 0));
+}
+
+EXPORTED void message_write_nstring_map(struct buf *buf,
+			 const char *s,
+			 unsigned int len)
+{
+ const char *p;
+ int is_literal = 0;
 
 /* Write null pointer as NIL */
 if (!s) {
-	message_ibuf_ensure(ibuf, 3);
-	*(ibuf->end)++ = 'N';
-	*(ibuf->end)++ = 'I';
-	*(ibuf->end)++ = 'L';
+	buf_appendcstr(buf, "NIL");
 	return;
 }
 
- /* Look for any non-QCHAR characters */
- for (p = s; *p; p++) {
-	len++;
-	if (*p & 0x80 || *p == '\r' || *p == '\n'
-	 || *p == '\"' || *p == '%' || *p == '\\') break;
+ if (len >= 1024)
+ {
+	is_literal = 1;
+ }
+ else
+ {
+	/* Look for any non-QCHAR characters */
+	for (p = s; (unsigned)(p-s) < len ; p++) {
+	 if (!*p || *p & 0x80 || *p == '\r' || *p == '\n'
+		|| *p == '\"' || *p == '%' || *p == '\\') {
+		is_literal = 1;
+		break;
+	 }
+	}
 }
 
- if (*p || len >= 1024) {
+ if (is_literal) {
 	/* Write out as literal */
-	char buf100;
-	snprintf(buf, sizeof(buf), "{" SIZE_T_FMT "}\r\n", strlen(s));
-	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
-	for (p = buf; *p; p++) *(ibuf->end)++ = *p;
-	for (p = s; *p; p++) *(ibuf->end)++ = *p;
+	buf_printf(buf, "{%u}\r\n", len);
+	buf_appendmap(buf, s, len);
 }
 else {
 	/* Write out as quoted string */
-	message_ibuf_ensure(ibuf, strlen(s)+2);
-	*(ibuf->end)++ = '\"';
-	for (p = s; *p; p++) *(ibuf->end)++ = *p;
-	*(ibuf->end)++ = '\"';
+	buf_putc(buf, '"');
+	buf_appendmap(buf, s, len);
+	buf_putc(buf, '"');
 }
 }
 
 /*
- * Write the text 's' to 'ibuf'
- */
-static void
-message_write_text(ibuf, s)
-struct ibuf *ibuf;
-char *s;
-{
- char *p;
-
- message_ibuf_ensure(ibuf, strlen(s));
- for (p = s; *p; p++) *(ibuf->end)++ = *p;
-}
-
-/*
- * Write the text 's' to 'ibuf', converting to lower case as we go.
+ * Append the string @s to the buffer @buf in a binary
+ * format almost exactly
 */
-static void
-message_write_text_lcase(ibuf, s)
-struct ibuf *ibuf;
-char *s;
+EXPORTED void message_write_xdrstring(struct buf *buf, const struct buf *s)
 {
- char *p;
+ unsigned padlen;
 
- message_ibuf_ensure(ibuf, strlen(s));
- for (p = s; *p; p++) *(ibuf->end)++ = TOLOWER(*p);
+ /* 32b string length in network order */
+ buf_appendbit32(buf, buf_len(s));
+ /* bytes of string */
+ buf_appendmap(buf, s->s, s->len);
+ /* 0 to 3 bytes padding */
+ padlen = (4 - (s->len & 3)) & 3;
+ buf_appendmap(buf, "\0\0\0", padlen);
 }
 
 /*
- * Write out the IMAP number 'n' to 'ibuf'
+ * Write the text 's' to 'buf', converting to lower case as we go.
 */
-static void
-message_write_number(ibuf, n)
-struct ibuf *ibuf;
-unsigned n;
+static void message_write_text_lcase(struct buf *buf, const char *s)
 {
- char buf100, *p;
-
- snprintf(buf, sizeof(buf), "%u", n);
+ const char *p;
 
- message_ibuf_ensure(ibuf, strlen(buf));
- for (p = buf; *p; p++) *(ibuf->end)++ = *p;
+ for (p = s; *p; p++) buf_putc(buf, TOLOWER(*p));
 }
 
 /*
- * Write out the FETCH BODYsection location/size information to 'ibuf'.
+ * Write out the FETCH BODYsection location/size information to 'buf'.
 */
-static void
-message_write_section(ibuf, body)
-struct ibuf *ibuf;
-struct body *body;
+static void message_write_section(struct buf *buf, const struct body *body)
 {
 int part;
 
@@ -2466,28 +2180,28 @@
 	 * Nested parts of a message/rfc822 containing a multipart
 	 * are the sub-parts of the multipart.
 	 */
-	 message_write_bit32(ibuf, body->subpart->numparts+1);
-	 message_write_bit32(ibuf, body->subpart->header_offset);
-	 message_write_bit32(ibuf, body->subpart->header_size);
-	 message_write_bit32(ibuf, body->subpart->content_offset);
-	 message_write_bit32(ibuf, body->subpart->content_size);
-	 message_write_bit32(ibuf, (-1<<16)|ENCODING_NONE);
+	 buf_appendbit32(buf, body->subpart->numparts+1);
+	 buf_appendbit32(buf, body->subpart->header_offset);
+	 buf_appendbit32(buf, body->subpart->header_size);
+	 buf_appendbit32(buf, body->subpart->content_offset);
+	 buf_appendbit32(buf, body->subpart->content_size);
+	 buf_appendbit32(buf, (-1<<16)|ENCODING_NONE);
 	 for (part = 0; part < body->subpart->numparts; part++) {
-		message_write_bit32(ibuf, body->subpart->subpartpart.header_offset);
-		message_write_bit32(ibuf, body->subpart->subpartpart.header_size);
-		message_write_bit32(ibuf, body->subpart->subpartpart.content_offset);
+		buf_appendbit32(buf, body->subpart->subpartpart.header_offset);
+		buf_appendbit32(buf, body->subpart->subpartpart.header_size);
+		buf_appendbit32(buf, body->subpart->subpartpart.content_offset);
 		if (body->subpart->subpartpart.numparts == 0 &&
 		 strcmp(body->subpart->subpartpart.type, "MULTIPART") == 0) {
 		 /* Treat 0-part multipart as 0-length text */
-		 message_write_bit32(ibuf, 0);
+		 buf_appendbit32(buf, 0);
 		}
 		else {
-		 message_write_bit32(ibuf, body->subpart->subpartpart.content_size);
+		 buf_appendbit32(buf, body->subpart->subpartpart.content_size);
 		}
-		message_write_charset(ibuf, &body->subpart->subpartpart);
+		message_write_charset(buf, &body->subpart->subpartpart);
 	 }
 	 for (part = 0; part < body->subpart->numparts; part++) {
-		message_write_section(ibuf, &body->subpart->subpartpart);
+		message_write_section(buf, &body->subpart->subpartpart);
 	 }
 	}
 	else {
@@ -2496,25 +2210,25 @@
 	 * Part 1 of a message/rfc822 containing a non-multipart
 	 * is the message body.
 	 */
-	 message_write_bit32(ibuf, 2);
-	 message_write_bit32(ibuf, body->subpart->header_offset);
-	 message_write_bit32(ibuf, body->subpart->header_size);
-	 message_write_bit32(ibuf, body->subpart->content_offset);
-	 message_write_bit32(ibuf, body->subpart->content_size);
-	 message_write_bit32(ibuf, (-1<<16)|ENCODING_NONE);
-	 message_write_bit32(ibuf, body->subpart->header_offset);
-	 message_write_bit32(ibuf, body->subpart->header_size);
-	 message_write_bit32(ibuf, body->subpart->content_offset);
+	 buf_appendbit32(buf, 2);
+	 buf_appendbit32(buf, body->subpart->header_offset);
+	 buf_appendbit32(buf, body->subpart->header_size);
+	 buf_appendbit32(buf, body->subpart->content_offset);
+	 buf_appendbit32(buf, body->subpart->content_size);
+	 buf_appendbit32(buf, (-1<<16)|ENCODING_NONE);
+	 buf_appendbit32(buf, body->subpart->header_offset);
+	 buf_appendbit32(buf, body->subpart->header_size);
+	 buf_appendbit32(buf, body->subpart->content_offset);
 	 if (strcmp(body->subpart->type, "MULTIPART") == 0) {
 		/* Treat 0-part multipart as 0-length text */
-		message_write_bit32(ibuf, 0);
-		message_write_bit32(ibuf, (-1<<16)|ENCODING_NONE);
+		buf_appendbit32(buf, 0);
+		buf_appendbit32(buf, (-1<<16)|ENCODING_NONE);
 	 }
 	 else {
-		message_write_bit32(ibuf, body->subpart->content_size);
-		message_write_charset(ibuf, body->subpart);
+		buf_appendbit32(buf, body->subpart->content_size);
+		message_write_charset(buf, body->subpart);
 	 }
-	 message_write_section(ibuf, body->subpart);
+	 message_write_section(buf, body->subpart);
 	}
 }
 else if (body->numparts) {
@@ -2522,81 +2236,56 @@
 	 * Cannot fetch part 0 of a multipart.
 	 * Nested parts of a multipart are the sub-parts.
 	 */
-	message_write_bit32(ibuf, body->numparts+1);	
-	message_write_bit32(ibuf, 0);
-	message_write_bit32(ibuf, -1);
-	message_write_bit32(ibuf, 0);
-	message_write_bit32(ibuf, -1);
-	message_write_bit32(ibuf, (-1<<16)|ENCODING_NONE);
+	buf_appendbit32(buf, body->numparts+1);	
+	buf_appendbit32(buf, 0);
+	buf_appendbit32(buf, -1);
+	buf_appendbit32(buf, 0);
+	buf_appendbit32(buf, -1);
+	buf_appendbit32(buf, (-1<<16)|ENCODING_NONE);
 	for (part = 0; part < body->numparts; part++) {
-	 message_write_bit32(ibuf, body->subpartpart.header_offset);
-	 message_write_bit32(ibuf, body->subpartpart.header_size);
-	 message_write_bit32(ibuf, body->subpartpart.content_offset);
+	 buf_appendbit32(buf, body->subpartpart.header_offset);
+	 buf_appendbit32(buf, body->subpartpart.header_size);
+	 buf_appendbit32(buf, body->subpartpart.content_offset);
 	 if (body->subpartpart.numparts == 0 &&
 		strcmp(body->subpartpart.type, "MULTIPART") == 0) {
 		/* Treat 0-part multipart as 0-length text */
-		message_write_bit32(ibuf, 0);
-		message_write_bit32(ibuf, (-1<<16)|ENCODING_NONE);
+		buf_appendbit32(buf, 0);
+		buf_appendbit32(buf, (-1<<16)|ENCODING_NONE);
 	 }
 	 else {
-		message_write_bit32(ibuf, body->subpartpart.content_size);
-		message_write_charset(ibuf, &body->subpartpart);
+		buf_appendbit32(buf, body->subpartpart.content_size);
+		message_write_charset(buf, &body->subpartpart);
 	 }
 	}
 	for (part = 0; part < body->numparts; part++) {
-	 message_write_section(ibuf, &body->subpartpart);
+	 message_write_section(buf, &body->subpartpart);
 	}
 }
 else {
 	/*
 	 * Leaf section--no part 0 or nested parts
 	 */
-	message_write_bit32(ibuf, 0);
+	buf_appendbit32(buf, 0);
 }
 }
 
 /*
- * Write the 32-bit charset/encoding value for section 'body' to 'ibuf'
+ * Write the 32-bit charset/encoding value for section 'body' to 'buf'
 */
-static void
-message_write_charset(ibuf, body)
-struct ibuf *ibuf;
-struct body *body;
+static void message_write_charset(struct buf *buf, const struct body *body)
 {
 int encoding, charset;
 
 message_parse_charset(body, &encoding, &charset);
 
- message_write_bit32(ibuf, (charset<<16)|encoding);
-}
-
-/*
- * Write the 32-bit integer quantitiy 'val' to 'ibuf'
- */
-static void
-message_write_bit32(ibuf, val)
-struct ibuf *ibuf;
-bit32 val;
-{
- bit32 buf;
- unsigned i;
- char *p = (char *)&buf;
- 
- message_ibuf_ensure(ibuf, sizeof(bit32));
- buf = htonl(val);
-
- for (i=0; i < sizeof(bit32); i++) {
-	*(ibuf->end)++ = *p++;
- }
+ buf_appendbit32(buf, (charset<<16)|encoding);
 }
 
 /*
- * Unparse the address list 'addrlist' to 'ibuf'
+ * Unparse the address list 'addrlist' to 'buf'
 */
-static void
-message_write_searchaddr(ibuf, addrlist)
-struct ibuf *ibuf;
-struct address *addrlist;
+static void message_write_searchaddr(struct buf *buf,
+				 const struct address *addrlist)
 {
 int prevaddr = 0;
 char* tmp;
@@ -2606,43 +2295,43 @@
 	/* Handle RFC-822 group addresses */
 	if (!addrlist->domain) {
 	 if (addrlist->mailbox) {
-		if (prevaddr) PUTIBUF(ibuf, ',');
+		if (prevaddr) buf_putc(buf, ',');
 		
-		tmp = charset_decode_mimeheader(addrlist->mailbox, NULL, 0);
-		message_write_text(ibuf, tmp);
+		tmp = charset_parse_mimeheader(addrlist->mailbox);
+		buf_appendcstr(buf, tmp);
 		free(tmp);
 		tmp = NULL;
-		PUTIBUF(ibuf, ':');
+		buf_putc(buf, ':');
 	
 		/* Suppress a trailing comma */
 		prevaddr = 0;
 	 }
 	 else {
-		PUTIBUF(ibuf, ';');
+		buf_putc(buf, ';');
 		prevaddr = 1;
 	 }
 	}
 	else {
-	 if (prevaddr) PUTIBUF(ibuf, ',');
+	 if (prevaddr) buf_putc(buf, ',');
 
 	 if (addrlist->name) {
-		tmp = charset_decode_mimeheader(addrlist->name, NULL, 0);
-		message_write_text(ibuf, tmp);
+		tmp = charset_parse_mimeheader(addrlist->name);
+		buf_appendcstr(buf, tmp);
 		free(tmp); tmp = NULL;
-		PUTIBUF(ibuf, ' ');
+		buf_putc(buf, ' ');
 	 }
 
-	 PUTIBUF(ibuf, '<');
+	 buf_putc(buf, '<');
 	 if (addrlist->route) {
-		message_write_text_lcase(ibuf, addrlist->route);
-		PUTIBUF(ibuf, ':');
+		message_write_text_lcase(buf, addrlist->route);
+		buf_putc(buf, ':');
 	 }
 
-	 message_write_text_lcase(ibuf, addrlist->mailbox);
-	 PUTIBUF(ibuf, '@');
+	 message_write_text_lcase(buf, addrlist->mailbox);
+	 buf_putc(buf, '@');
 
-	 message_write_text_lcase(ibuf, addrlist->domain);
-	 PUTIBUF(ibuf, '>');
+	 message_write_text_lcase(buf, addrlist->domain);
+	 buf_putc(buf, '>');
 	 prevaddr = 1;
 	}
 
@@ -2651,88 +2340,15 @@
 }
 
 /*
- * Initialize 'ibuf'
- */
-#define IBUFGROWSIZE 1000
-static void 
-message_ibuf_init(ibuf)
-struct ibuf *ibuf;
-{
- char *s = xmalloc(IBUFGROWSIZE);
-
- ibuf->start = ibuf->end = s + sizeof(bit32);
- ibuf->last = ibuf->start + IBUFGROWSIZE - sizeof(bit32);
-}
-
-static void
-message_ibuf_copy(dest, src)
-struct ibuf *dest;
-struct ibuf *src;
-{
- unsigned len = src->end - src->start;
- message_ibuf_ensure(dest, len);
- strncpy(dest->end, src->start, len);
- dest->end += len;
-}
-
-/*
- * Ensure 'ibuf' has enough free space to append 'len' bytes.
- */
-static int
-message_ibuf_ensure(struct ibuf *ibuf,
-		 unsigned len)
-{
- char *s;
- int size;
-
- if ((unsigned) (ibuf->last - ibuf->end) >= len) return 0;
- if (len < IBUFGROWSIZE) len = IBUFGROWSIZE;
-
- s = ibuf->start - sizeof(bit32);
- size = len + (ibuf->last - ibuf->start);
- s = xrealloc(s, size + sizeof(bit32));
- s += sizeof(bit32);
- ibuf->end = (ibuf->end - ibuf->start) + s;
- ibuf->start = s;
- ibuf->last = s + size;
-
- return 1;
-}
-
-/*
- * Copy the value in to the cache iov
- */
-static void
-message_ibuf_pad(ibuf)
-struct ibuf *ibuf;
-{
- /* make sure we can write these things out, ho hum */
- message_ibuf_ensure(ibuf, 3);
- ibuf->end0 = '\0';
- ibuf->end1 = '\0';
- ibuf->end2 = '\0';
-}
-
-/*
- * Free the space used by 'ibuf'
- */
-static void
-message_ibuf_free(ibuf)
-struct ibuf *ibuf;
-{
- free(ibuf->start - sizeof(bit32));
-}
-
-/*
 * Free the parsed body-part 'body'
 */
-void
-message_free_body(body)
-struct body *body;
+EXPORTED void message_free_body(struct body *body)
 {
 struct param *param, *nextparam;
 int part;
 
+ if (!body) return;
+
 if (body->type) {
 	free(body->type);
 	free(body->subtype);
@@ -2772,6 +2388,8 @@
 if (body->bcc) parseaddr_free(body->bcc);
 if (body->in_reply_to) free(body->in_reply_to);
 if (body->message_id) free(body->message_id);
+ if (body->x_me_message_id) free(body->x_me_message_id);
+ if (body->references) free(body->references);
 if (body->received_date) free(body->received_date);
 
 if (body->subpart) {
@@ -2786,9 +2404,7 @@
 	free(body->subpart);
 }
 
- if (body->cacheheaders.start) {
-	message_ibuf_free(&body->cacheheaders);
- }
+ buf_free(&body->cacheheaders);
 
 if (body->decoded_body) free(body->decoded_body);
 }
@@ -2799,11 +2415,18 @@
 * When inside a list (ncom > 0), we parse the individual tokens but don't
 * isolate them -- we return the entire list as a single token.
 */
-void parse_cached_envelope(char *env, char *tokens, int tokens_size)
+HIDDEN void parse_cached_envelope(char *env, char *tokens, int tokens_size)
 {
 char *c;
 int i = 0, ncom = 0, len;
 
+ /*
+ * We have no way of indicating that we parsed less than
+ * the requested number of tokens, but we can at least
+ * ensure that the array is correctly initialised to NULL.
+ */
+ memset(tokens, 0, tokens_size*sizeof(char*));
+
 c = env;
 while (*c != '\0') {
 	switch (*c) {
@@ -2871,3 +2494,1749 @@
 	}
 }
 }
+
+EXPORTED char *parse_nstring(char **str)
+{
+ char *cp = *str, *val;
+
+ if (*cp == '"') { /* quoted string */
+	val = cp+1; /* skip " */
+	do {
+	 cp = strchr(cp+1, '"');
+	 if (!cp) return NULL; /* whole thing is broken */
+	} while (*(cp-1) == '\\'); /* skip escaped " */
+	*cp++ = '\0';
+ }
+ else if (*cp == '{') {
+	int len = 0;
+	/* yeah, it may be a literal too */
+	cp++;
+	while (cyrus_isdigit((int) *cp)) {
+	 len = len*10 + *cp - '0';
+	 cp++;
+	}
+	cp += 3;		/* skip close brace & CRLF */
+	val = cp;
+	vallen = '\0';
+	cp += len;
+ }
+ else { /* NIL */
+	val = NULL;
+	cp += 3;
+ }
+
+ *str = cp;
+ return val;
+}
+
+HIDDEN void message_parse_env_address(char *str, struct address *addr)
+{
+ if (*str == '(') str++; /* skip ( */
+ addr->name = parse_nstring(&str);
+ str++; /* skip SP */
+ addr->route = parse_nstring(&str);
+ str++; /* skip SP */
+ addr->mailbox = parse_nstring(&str);
+ str++; /* skip SP */
+ addr->domain = parse_nstring(&str);
+}
+
+/*
+ * Read an nstring from cached bodystructure.
+ * Analog to mesage_write_nstring().
+ * If 'copy' is set, returns a freshly allocated copy of the string,
+ * otherwise is returns a pointer to the string which will be overwritten
+ * on the next call to message_read_nstring()
+ */
+static int message_read_nstring(struct protstream *strm, char **str, int copy)
+{
+ static struct buf buf = BUF_INITIALIZER;
+ int c;
+
+ c = getnstring(strm, NULL, &buf);
+
+ if (str) {
+	if (!buf.s) *str = NULL;
+	else if (copy) *str = xstrdup(buf.s);
+	else *str = buf.s;
+ }
+
+ return c;
+}
+
+/*
+ * Read a parameter list from cached bodystructure.
+ * If withattr is set, attribute/value pairs will be read,
+ * otherwise, just values are read.
+ */
+static int message_read_params(struct protstream *strm, struct param **paramp,
+			 int withattr)
+{
+ int c;
+
+ if ((c = prot_getc(strm)) == '(') {
+	/* parse list */
+	struct param *param;
+
+	do {
+	 *paramp = param = (struct param *) xzmalloc(sizeof(struct param));
+
+	 if (withattr) {
+		/* attribute */
+		c = message_read_nstring(strm, &param->attribute, 1);
+	 }
+
+	 /* value */
+	 c = message_read_nstring(strm, &param->value, 1);
+
+	 /* get ready to append the next parameter */
+	 paramp = &param->next;
+
+	} while (c == ' ');
+
+	if (c == ')') c = prot_getc(strm);
+ }
+ else {
+	/* NIL */
+	prot_ungetc(c, strm);
+	c = message_read_nstring(strm, NULL, 0);
+ }
+
+ return c;
+}
+
+/*
+ * Read an address part from cached bodystructure.
+ * The string is appended to 'buf' (including NUL).
+ */
+static int message_read_addrpart(struct protstream *strm,
+				 const char **part, unsigned *off, struct buf *buf)
+{
+ int c;
+
+ c = message_read_nstring(strm, (char **)part, 0);
+ if (*part) {
+	*off = buf->len;
+	buf_appendmap(buf, *part, strlen(*part)+1);
+ }
+
+ return c;
+}
+
+/*
+ * Read an address list from cached bodystructure.
+ * Analog to mesage_write_address()
+ */
+static int message_read_address(struct protstream *strm, struct address **addrp)
+{
+ int c;
+
+ if ((c = prot_getc(strm)) == '(') {
+	/* parse list */
+	struct address *addr;
+	struct buf buf;
+	unsigned nameoff = 0, rtoff = 0, mboxoff = 0, domoff = 0;
+
+	do {
+	 *addrp = addr = (struct address *) xzmalloc(sizeof(struct address));
+	 buf_init(&buf);
+
+	 /* opening '(' */
+	 c = prot_getc(strm);
+
+	 /* name */
+	 c = message_read_addrpart(strm, &addr->name, &nameoff, &buf);
+
+	 /* route */
+	 c = message_read_addrpart(strm, &addr->route, &rtoff, &buf);
+
+	 /* mailbox */
+	 c = message_read_addrpart(strm, &addr->mailbox, &mboxoff, &buf);
+
+	 /* host */
+	 c = message_read_addrpart(strm, &addr->domain, &domoff, &buf);
+
+	 /* addr parts must now point into our freeme string */
+	 if (buf.len) {
+		char *freeme = addr->freeme = buf.s;
+
+		if (addr->name) addr->name = freeme+nameoff;
+		if (addr->route) addr->route = freeme+rtoff;
+		if (addr->mailbox) addr->mailbox = freeme+mboxoff;
+		if (addr->domain) addr->domain = freeme+domoff;
+	 }
+
+	 /* get ready to append the next address */
+	 addrp = &addr->next;
+
+	} while (((c = prot_getc(strm)) == '(') && prot_ungetc(c, strm));
+
+	if (c == ')') c = prot_getc(strm);
+ }
+ else {
+	/* NIL */
+	prot_ungetc(c, strm);
+	c = message_read_nstring(strm, NULL, 0);
+ }
+
+ return c;
+}
+
+/*
+ * Read a cached envelope response.
+ * Analog to mesage_write_envelope()
+ */
+static int message_read_envelope(struct protstream *strm, struct body *body)
+{
+ int c;
+
+ /* opening '(' */
+ c = prot_getc(strm);
+
+ /* date */
+ c = message_read_nstring(strm, &body->date, 1);
+
+ /* subject */
+ c = message_read_nstring(strm, &body->subject, 1);
+
+ /* from */
+ c = message_read_address(strm, &body->from);
+
+ /* sender */
+ c = message_read_address(strm, &body->sender);
+
+ /* reply-to */
+ c = message_read_address(strm, &body->reply_to);
+
+ /* to */
+ c = message_read_address(strm, &body->to);
+
+ /* cc */
+ c = message_read_address(strm, &body->cc);
+
+ /* bcc */
+ c = message_read_address(strm, &body->bcc);
+
+ /* in-reply-to */
+ c = message_read_nstring(strm, &body->in_reply_to, 1);
+
+ /* message-id */
+ c = message_read_nstring(strm, &body->message_id, 1);
+
+ if (c == ')') c = prot_getc(strm);
+
+ return c;
+}
+
+/*
+ * Read cached bodystructure response.
+ * Analog to mesage_write_body()
+ */
+static int message_read_body(struct protstream *strm, struct body *body)
+{
+#define prot_peek(strm) prot_ungetc(prot_getc(strm), strm)
+
+ int c;
+
+ /* opening '(' */
+ c = prot_getc(strm);
+
+ /* check for multipart */
+ if ((c = prot_peek(strm)) == '(') {
+
+	body->type = xstrdup("MULTIPART");
+	do {
+	 body->subpart =
+		(struct body *)xrealloc((char *)body->subpart,
+					(body->numparts+1)*sizeof(struct body));
+	 memset(&body->subpartbody->numparts, 0, sizeof(struct body));
+	 c = message_read_body(strm, &body->subpartbody->numparts++);
+
+	} while (((c = prot_getc(strm)) == '(') && prot_ungetc(c, strm));
+
+	/* body subtype */
+	c = message_read_nstring(strm, &body->subtype, 1);
+
+	/* extension data */
+
+	/* body parameters */
+	c = message_read_params(strm, &body->params, 1);
+ }
+ else {
+	/* non-multipart */
+
+	/* body type */
+	c = message_read_nstring(strm, &body->type, 1);
+
+	/* body subtype */
+	c = message_read_nstring(strm, &body->subtype, 1);
+
+	/* body parameters */
+	c = message_read_params(strm, &body->params, 1);
+
+	/* body id */
+	c = message_read_nstring(strm, &body->id, 1);
+
+	/* body description */
+	c = message_read_nstring(strm, &body->description, 1);
+
+	/* body encoding */
+	c = message_read_nstring(strm, &body->encoding, 1);
+
+	/* body size */
+	c = getint32(strm, (int32_t *) &body->content_size);
+
+	if (!strcmp(body->type, "TEXT")) {
+	 /* body lines */
+	 c = getint32(strm, (int32_t *) &body->content_lines);
+	}
+	else if (!strcmp(body->type, "MESSAGE") &&
+		 !strcmp(body->subtype, "RFC822")) {
+
+	 body->subpart = (struct body *) xzmalloc(sizeof(struct body));
+
+	 /* envelope structure */
+	 c = message_read_envelope(strm, body->subpart);
+
+	 /* body structure */
+	 c = message_read_body(strm, body->subpart);
+	 c = prot_getc(strm); /* trailing SP */
+
+	 /* body lines */
+	 c = getint32(strm, (int32_t *) &body->content_lines);
+	}
+
+	/* extension data */
+
+	/* body MD5 */
+	c = message_read_nstring(strm, &body->md5, 1);
+ }
+
+ /* common extension data */
+
+ /* body disposition */
+ if ((c = prot_getc(strm)) == '(') {
+	c = message_read_nstring(strm, &body->disposition, 1);
+
+	c = message_read_params(strm, &body->disposition_params, 1);
+	if (c == ')') c = prot_getc(strm); /* trailing SP */
+ }
+ else {
+	/* NIL */
+	prot_ungetc(c, strm);
+	c = message_read_nstring(strm, &body->disposition, 1);
+ }
+
+ /* body language */
+ if ((c = prot_peek(strm)) == '(') {
+	c = message_read_params(strm, &body->language, 0);
+ }
+ else {
+	char *lang;
+
+	c = message_read_nstring(strm, &lang, 1);
+	if (lang) {
+	 body->language = (struct param *) xzmalloc(sizeof(struct param));
+	 body->language->value = lang;
+	}
+ }
+
+ /* body location */
+ c = message_read_nstring(strm, &body->location, 1);
+
+ /* XXX We currently don't store any other extension data.
+ MUST keep in sync with message_write_body() */
+
+ return c;
+}
+
+/*
+ * Read cached binary bodystructure.
+ * Analog to mesage_write_section()
+ */
+static void message_read_binarybody(struct body *body, const char **sect)
+{
+ bit32 n, i;
+ const char *p = *sect;
+ struct body *subpart;
+
+ n = CACHE_ITEM_BIT32(*sect);
+ p = *sect += CACHE_ITEM_SIZE_SKIP;
+ if (!n) return;
+
+ if (!strcmp(body->type, "MESSAGE") && !strcmp(body->subtype, "RFC822") &&
+	body->subpart->numparts) {
+	subpart = body->subpart->subpart;
+	body = body->subpart;
+ }
+ else {
+	/* If a message/rfc822 contains a non-multipart,
+	 we don't care about part 0 (message header) */
+	subpart = body->subpart;
+	body = NULL;
+ }
+
+ if (!body) {
+	/* skip header part */
+	p += 5 * CACHE_ITEM_SIZE_SKIP;
+ }
+ else {
+	/* read header part */
+	body->header_offset = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	body->header_size = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	body->content_offset = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	body->content_size = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	body->charset_cte = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+ }
+
+ /* read body parts */
+ for (i = 0; i < n-1; i++) {
+	subparti.header_offset = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	subparti.header_size = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	subparti.content_offset = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	subparti.content_size = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+	subparti.charset_cte = CACHE_ITEM_BIT32(p);
+	p += CACHE_ITEM_SIZE_SKIP;
+ }
+
+ /* read sub-parts */
+ for (*sect = p, i = 0; i < n-1; i++) {
+	message_read_binarybody(&subparti, sect);
+ }
+
+}
+
+/*
+ * Read cached envelope, binary bodystructure response and binary bodystructure
+ * of the specified record. Populates 'body' which must be freed by the caller.
+ */
+EXPORTED void message_read_bodystructure(struct index_record *record, struct body **body)
+{
+ struct protstream *strm;
+ struct body toplevel;
+ const char *binbody;
+
+ memset(&toplevel, 0, sizeof(struct body));
+ toplevel.type = "MESSAGE";
+ toplevel.subtype = "RFC822";
+ toplevel.subpart = *body = xzmalloc(sizeof(struct body));
+
+ /* Read envelope response from cache */
+ strm = prot_readmap(cacheitem_base(record, CACHE_ENVELOPE),
+			cacheitem_size(record, CACHE_ENVELOPE));
+ prot_setisclient(strm, 1); /* no-sync literals */
+
+ message_read_envelope(strm, *body);
+ prot_free(strm);
+
+ /* Read bodystructure response from cache */
+ strm = prot_readmap(cacheitem_base(record, CACHE_BODYSTRUCTURE),
+			cacheitem_size(record, CACHE_BODYSTRUCTURE));
+ prot_setisclient(strm, 1); /* no-sync literals */
+
+ message_read_body(strm, *body);
+ prot_free(strm);
+
+ /* Read binary bodystructure from cache */
+ binbody = cacheitem_base(record, CACHE_SECTION);
+ message_read_binarybody(&toplevel, &binbody);
+}
+
+static void de_nstring_buf(struct buf *src, struct buf *dst)
+{
+ char *p, *q;
+
+ if (src->s && src->len == 3 && !memcmp(src->s, "NIL", 3)) {
+	buf_free(dst);
+	return;
+ }
+ buf_cstring(src); /* ensure nstring parse doesn't overrun */
+ q = src->s;
+ p = parse_nstring(&q);
+ buf_setmap(dst, p, q-p);
+ buf_cstring(dst);
+}
+
+static void message1_get_subject(struct index_record *record, struct buf *buf)
+{
+ struct buf tmp = BUF_INITIALIZER;
+ buf_copy(&tmp, cacheitem_buf(record, CACHE_SUBJECT));
+ de_nstring_buf(&tmp, buf);
+ buf_free(&tmp);
+}
+
+/*
+ * Generate a conversation id from the given message.
+ * The conversation id is defined as the first 64b of
+ * the SHA1 of the message, except that an all-zero
+ * conversation id is not valid.
+ */
+static conversation_id_t generate_conversation_id(
+			 const struct index_record *record)
+{
+ conversation_id_t cid = 0;
+ size_t i;
+
+ assert(record->guid.status == GUID_NONNULL);
+
+ for (i = 0 ; i < sizeof(cid) ; i++) {
+	cid <<= 8;
+	cid |= record->guid.valuei;
+ }
+
+ /*
+ * We carefully avoid returning NULLCONVERSATION as
+ * a new cid, as that would confuse matters no end.
+ */
+ if (cid == NULLCONVERSATION)
+	cid = 1;
+
+ return cid;
+}
+
+/*
+ * In RFC2822, the In-Reply-To field is explicitly required to contain
+ * only message-ids, whitespace and commas. The old RFC822 was less
+ * well specified and allowed all sorts of stuff. We used to be equally
+ * liberal here in parsing the field. Sadly some versions of the NMH
+ * mailer will generate In-Reply-To containing email addresses which we
+ * cannot tell from message-ids, leading to massively confused
+ * threading. So we have to be slightly stricter.
+ */
+static int is_valid_rfc2822_inreplyto(const char *p)
+{
+ if (!p)
+	return 1;
+
+ /* skip any whitespace */
+ while (*p && (isspace(*p) || *p == ','))
+	p++;
+
+ return (!*p || *p == '<');
+}
+
+/*
+ * Update the conversations database for the given
+ * mailbox, to account for the given message.
+ * @body may be NULL, in which case we get everything
+ * we need out of the cache item in @record.
+ */
+EXPORTED int message_update_conversations(struct conversations_state *state,
+					 struct index_record *record,
+					 conversation_t **convp)
+{
+ char *hdrs4;
+ char *c_refs = NULL, *c_env = NULL, *c_me_msgid = NULL;
+ struct buf msubject = BUF_INITIALIZER;
+ strarray_t msgidlist = STRARRAY_INITIALIZER;
+ arrayu64_t matchlist = ARRAYU64_INITIALIZER;
+ arrayu64_t emptylist = ARRAYU64_INITIALIZER;
+ arrayu64_t cids = ARRAYU64_INITIALIZER;
+ conversation_t *conv = NULL;
+ const char *msubj = NULL;
+ int i;
+ int j;
+ int r = 0;
+ char *msgid = NULL;
+
+ /*
+ * Gather all the msgids mentioned in the message, starting with
+ * the oldest message in the References: header, then any mesgids
+ * mentioned in the In-Reply-To: header, and finally the message's
+ * own Message-Id:. In general this will result in duplicates (a
+ * correct References: header will contain as its last entry the
+ * msgid in In-Reply-To:), so we weed those out before proceeding
+ * to the database.
+ */
+ if (cache_len(record)) {
+	/* we have cache loaded, get what we need there */
+	strarray_t want = STRARRAY_INITIALIZER;
+	char *envtokensNUMENVTOKENS;
+
+	/* get References from cached headers */
+	c_refs = xstrndup(cacheitem_base(record, CACHE_HEADERS),
+			 cacheitem_size(record, CACHE_HEADERS));
+	strarray_append(&want, "references");
+	message_pruneheader(c_refs, &want, 0);
+	hdrs0 = c_refs;
+
+	/* get In-Reply-To, Message-ID out of the envelope
+	 *
+	 * get a working copy; strip outer ()'s
+	 * +1 -> skip the leading paren
+	 * -2 -> don't include the size of the outer parens
+	 */
+	c_env = xstrndup(cacheitem_base(record, CACHE_ENVELOPE) + 1,
+			 cacheitem_size(record, CACHE_ENVELOPE) - 2);
+	parse_cached_envelope(c_env, envtokens, NUMENVTOKENS);
+	hdrs1 = envtokensENV_INREPLYTO;
+	hdrs2 = envtokensENV_MSGID;
+
+	/* get X-ME-Message-ID from cached headers */
+	c_me_msgid = xstrndup(cacheitem_base(record, CACHE_HEADERS),
+			 cacheitem_size(record, CACHE_HEADERS));
+	strarray_set(&want, 0, "x-me-message-id");
+	message_pruneheader(c_me_msgid, &want, 0);
+	hdrs3 = c_me_msgid;
+
+	strarray_fini(&want);
+
+	message1_get_subject(record, &msubject);
+
+	/* work around stupid message_guid API */
+	message_guid_isnull(&record->guid);
+ }
+ else {
+	/* nope, now we're screwed */
+	return IMAP_INTERNAL;
+ }
+
+ if (!is_valid_rfc2822_inreplyto(hdrs1))
+	hdrs1 = NULL;
+
+ /* Note that a NULL subject, e.g. due to a missing Subject: header
+ * field in the original message, is normalised to "" not NULL */
+ conversation_normalise_subject(&msubject);
+ msubj = buf_cstring(&msubject);
+
+ for (i = 0 ; i < 4 ; i++) {
+	while ((msgid = find_msgid(hdrsi, &hdrsi)) != NULL) {
+	 /*
+	 * The issue of case sensitivity of msgids is curious.
+	 * RFC2822 seems to imply they're case-insensitive,
+	 * without explicitly stating so. So here we punt
+	 * on that being the case.
+	 *
+	 * Note that the THREAD command elsewhere in Cyrus
+	 * assumes otherwise.
+	 */
+	 msgid = lcase(msgid);
+
+	 /* already seen this one? */
+	 if (strarray_find(&msgidlist, msgid, 0) >= 0) {
+		free(msgid);
+		continue;
+	 }
+
+	 strarray_appendm(&msgidlist, msgid);
+
+	 /* Lookup the conversations database to work out which
+	 * conversation ids that message belongs to. */
+	 r = conversations_get_msgid(state, msgid, &cids);
+	 if (r) goto out;
+
+	 for (j = 0; j < cids.count; j++) {
+		conversation_id_t cid = arrayu64_nth(&cids, j);
+		r = conversation_load(state, cid, &conv);
+		if (r) goto out;
+		if (!conv)
+		 arrayu64_add(&emptylist, cid);
+		/* IRIS-1576 if X-ME-Message-ID says the messages are
+		* linked, ignore any difference in Subject: header fields. */
+		else if (i == 3 || !strcmpsafe(conv->subject, msubj))
+		 arrayu64_add(&matchlist, cid);
+	 }
+
+	 conversation_free(conv);
+	 conv = NULL;
+	}
+ }
+
+ if (!record->silent) {
+	conversation_id_t newcid = record->cid;
+	conversation_id_t val;
+
+	/* Work out the new CID this message will belong to.
+	 * Use the MAX of any CIDs found - as NULLCONVERSATION is
+	 * numerically zero this will be the only non-NULL CID or
+	 * the MAX of two or more non-NULL CIDs */
+	val = arrayu64_max(&matchlist);
+	if (val > newcid) newcid = val;
+
+	val = arrayu64_max(&emptylist);
+	if (val > newcid) newcid = val;
+
+	if (!newcid)
+	 newcid = generate_conversation_id(record);
+
+	/* Mark any CID renames */
+	for (i = 0 ; i < matchlist.count ; i++)
+	 conversations_rename_cid(state, arrayu64_nth(&matchlist, i), newcid);
+
+	if (record->cid) conversations_rename_cid(state, record->cid, newcid);
+	else record->cid = newcid;
+ }
+
+ if (!record->cid) goto out;
+
+ /* for CIDs with no 'B' record (hence, no existing members) it is
+ * safe to rename all the entries for that CID to the higher numbered
+ * cid. In both master and replica cases, this will execute once the
+ * last message has its CID renamed */
+ for (i = 0; i < emptylist.count; i++) {
+	conversation_id_t item = arrayu64_nth(&emptylist, i);
+	conversations_rename_cidentry(state, item, record->cid);
+ }
+
+ r = conversation_load(state, record->cid, &conv);
+ if (r) goto out;
+
+ if (!conv) conv = conversation_new(state);
+
+ /* Create the subject header if not already set */
+ if (!conv->subject)
+	conv->subject = xstrdupnull(msubj);
+
+ /*
+ * Update the database to add records for all the message-ids
+ * not already mentioned. Note that add_msgid does the right
+ * thingtm when the cid already exists.
+ */
+ for (i = 0 ; i < msgidlist.count ; i++) {
+	r = conversations_add_msgid(state, strarray_nth(&msgidlist, i), record->cid);
+	if (r) goto out;
+ }
+
+out:
+ free(msgid);
+ strarray_fini(&msgidlist);
+ arrayu64_fini(&matchlist);
+ arrayu64_fini(&emptylist);
+ arrayu64_fini(&cids);
+ free(c_refs);
+ free(c_env);
+ free(c_me_msgid);
+ buf_free(&msubject);
+
+ if (r)
+	conversation_free(conv);
+ else if (convp)
+	*convp = conv;
+ else {
+	r = conversation_save(state, record->cid, conv);
+	conversation_free(conv);
+ }
+
+ return r;
+}
+
+
+/*
+ Format of the CACHE_SECTION cache item is a binary encoding
+ tree of MIME sections. In something like rpcgen notation
+ (see RFC 4506):
+
+ struct part {
+	uint32_t header_offset;
+	uint32_t header_size;
+	uint32_t content_offset;
+	uint32_t content_size;
+	uint16_t charset;
+	uint16_t encoding;
+ };
+
+ struct section {
+	unsigned int numparts;
+	struct part partsnumparts;
+	struct sectionnumparts-1;
+ };
+*/
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+EXPORTED message_t *message_new(void)
+{
+ message_t *m = xzmalloc(sizeof(*m));
+
+ m->refcount = 1;
+
+ return m;
+}
+
+static void message_free(message_t *m)
+{
+ assert(m->refcount == 0);
+
+ message_yield(m, M_ALL);
+
+ free(m->filename);
+ m->filename = NULL;
+
+ free(m);
+}
+
+EXPORTED message_t *message_new_from_data(const char *base, size_t len)
+{
+ message_t *m = message_new();
+ buf_init_ro(&m->map, base, len);
+ m->have = m->given = M_MAP;
+ return m;
+}
+
+EXPORTED message_t *message_new_from_mailbox(struct mailbox *mailbox, unsigned int recno)
+{
+ message_t *m = message_new();
+ m->mailbox = mailbox;
+ m->record.recno = recno;
+ m->have = m->given = M_MAILBOX;
+ return m;
+}
+
+EXPORTED message_t *message_new_from_record(struct mailbox *mailbox,
+					 const struct index_record *record)
+{
+ message_t *m = message_new();
+ assert(record->uid > 0);
+ m->mailbox = mailbox;
+ m->record = *record;
+ m->have = m->given = M_MAILBOX|M_RECORD|M_UID;
+ return m;
+}
+
+EXPORTED message_t *message_new_from_index(struct mailbox *mailbox,
+					 const struct index_record *record,
+					 uint32_t msgno,
+					 uint32_t indexflags)
+{
+ message_t *m = message_new();
+ assert(record->uid > 0);
+ m->mailbox = mailbox;
+ m->record = *record;
+ m->msgno = msgno;
+ m->indexflags = indexflags;
+ m->have = m->given = M_MAILBOX|M_RECORD|M_UID|M_INDEX;
+ return m;
+}
+
+EXPORTED message_t *message_new_from_filename(const char *filename)
+{
+ message_t *m = message_new();
+ m->filename = xstrdup(filename);
+ m->have = m->given = M_FILENAME;
+ return m;
+}
+
+EXPORTED message_t *message_ref(message_t *m)
+{
+ m->refcount++;
+ assert(m->refcount >= 1);
+ return m;
+}
+
+EXPORTED void message_unref(message_t **mp)
+{
+ message_t *m;
+
+ if (!mp || !(m = *mp)) return;
+ assert(m->refcount >= 1);
+ if (--m->refcount == 0)
+	message_free(m);
+ *mp = NULL;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+/*
+ * Open or create resources which we need but do not yet have.
+ */
+static int message_need(message_t *m, unsigned int need)
+{
+#define is_missing(flags) ((need & ~(m->have)) & (flags))
+#define found(flags)	 (m->have |= (flags))
+ int r = 0;
+
+ if (!is_missing(M_ALL))
+	return 0;	/* easy, we already have it */
+
+ if (is_missing(M_MAILBOX)) {
+	/* We can't get this for ourselves,
+	 * it needs to be passed in by the caller */
+	return IMAP_NOTFOUND;
+ }
+
+ if (is_missing(M_FILENAME)) {
+	const char *filename;
+	r = message_need(m, M_MAILBOX|M_RECORD);
+	if (r) return r;
+	filename = mailbox_record_fname(m->mailbox, &m->record);
+	if (!filename) return IMAP_NOTFOUND;
+	m->filename = xstrdup(filename);
+	found(M_FILENAME);
+ }
+
+ if (is_missing(M_RECORD|M_UID)) {
+	r = message_need(m, M_MAILBOX);
+	if (r) return r;
+	r = mailbox_read_index_record(m->mailbox, m->record.recno, &m->record);
+	if (r) return r;
+	found(M_RECORD|M_UID);
+ }
+
+ if (is_missing(M_MAP)) {
+	r = message_need(m, M_FILENAME);
+	if (r) return r;
+	r = message_map_file(m, m->filename);
+	if (r) return r;
+	found(M_MAP);
+ }
+
+ if (is_missing(M_CACHE)) {
+	r = message_need(m, M_MAILBOX|M_RECORD);
+	if (r) return r;
+	r = mailbox_cacherecord(m->mailbox, &m->record);
+	if (r) return r;
+	found(M_CACHE);
+ }
+
+ if (is_missing(M_CACHEBODY)) {
+	if (message_need(m, M_CACHE) == 0) {
+	 r = message_parse_cbodystructure(m);
+	 if (r) return r;
+	 found(M_CACHEBODY);
+	}
+	else
+	 return message_need(m, M_FULLBODY);
+ }
+
+ if (is_missing(M_FULLBODY)) {
+	r = message_need(m, M_MAP);
+	if (r) return r;
+	m->body = (struct body *)xzmalloc(sizeof(struct body));
+	r = message_parse_mapped(m->map.s, m->map.len, m->body);
+	if (r) return r;
+	found(M_CACHEBODY|M_FULLBODY);
+ }
+
+ /* Check that we got everything we asked for and could get */
+ assert(!is_missing(M_ALL));
+
+ return 0;
+#undef found
+#undef is_missing
+}
+
+/*
+ * Yield open resources.
+ */
+static void message_yield(message_t *m, unsigned int yield)
+{
+ /* Can only yield those resources we have. */
+ yield &= m->have;
+
+ /* Do not yield resources we were given at initialisation
+ * time, they cannot be rebuilt again later. */
+ yield &= ~m->given;
+
+ /* nothing to free for these - they're not constructed
+ * or have no dynamically allocated memory */
+ yield &= ~(M_MAILBOX|M_RECORD|M_FILENAME|M_UID|M_CACHE);
+
+ if ((yield & M_MAP)) {
+	buf_free(&m->map);
+	m->have &= ~M_MAP;
+ }
+
+ if ((yield & M_BODY)) {
+	message_free_body(m->body);
+	free(m->body);
+	m->body = NULL;
+	m->have &= ~M_BODY;
+ }
+
+ /* Check we yielded everything we could */
+ assert((yield & m->have) == 0);
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+/*
+ * Parse various information out of the cyrus.cache.
+ */
+
+/*
+ * Skip either a single NIL or a balanced possibly-nested list of
+ * nstrings. Useful for ignoring various constructs from the
+ * BODYSTRUCTURE cache.
+ */
+static int skip_nil_or_nstring_list(struct protstream *prot)
+{
+ int r = IMAP_MAILBOX_BADFORMAT;
+ int c;
+ struct buf word = BUF_INITIALIZER;
+
+ c = prot_getc(prot);
+ if (c == EOF)
+	goto out; /* ran out of data */
+ if (c == '(') {
+	/* possibly-nested list of atoms */
+	int treedepth = 1;
+	do {
+	 c = prot_getc(prot);
+	 if (c == ' ')
+		c = prot_getc(prot);
+	 if (c != ')' && c != '(') {
+		prot_ungetc(c, prot);
+		c = getnstring(prot, NULL, &word);
+#if DEBUG
+		if (word.len)
+		 fprintf(stderr, "%sskipping string \"%s\" at %d\n",
+			 indent(depth), word.s, treedepth);
+#endif
+	 }
+	 if (c == '(')
+		treedepth++;
+	 else if (c == ')')
+		treedepth--;
+	 else if (c == ' ')
+		prot_ungetc(c, prot);
+	 else
+		goto out;
+	} while (treedepth);
+	c = prot_getc(prot);
+	if (c != ' ') goto out;
+	r = 0;
+ }
+ else {
+	prot_ungetc(c, prot);
+	c = getnstring(prot, NULL, &word);
+	if (c == ' ' && !word.len) {
+	 /* 'NIL' */
+#if DEBUG
+	 fprintf(stderr, "%sskipping NIL\n", indent(depth));
+#endif
+	 r = 0;
+	 goto out;
+	}
+ }
+ /* else, error */
+
+out:
+ buf_free(&word);
+ return r;
+}
+
+static int parse_mime_params(struct protstream *prot, struct param **prev)
+{
+ int c;
+ struct buf key = BUF_INITIALIZER;
+ struct buf val = BUF_INITIALIZER;
+ struct param *param;
+
+ c = prot_getc(prot);
+ if (c != '(') {
+	/* must be NIL */
+	if (c != 'N') goto err;
+	c = prot_getc(prot);
+	if (c != 'I') goto err;
+	c = prot_getc(prot);
+	if (c != 'L') goto err;
+	return prot_getc(prot);
+ }
+
+ /* otherwise we have a list */
+ do {
+	c = getnstring(prot, NULL, &key);
+	if (c != ' ') goto err;
+	c = getnstring(prot, NULL, &val);
+	if (c != ' ' && c != ')') goto err;
+	param = (struct param *)xzmalloc(sizeof(struct param));
+	param->attribute = buf_releasenull(&key);
+	param->value = buf_releasenull(&val);
+	*prev = param;
+	prev = &param;
+ } while (c == ' ');
+
+ return prot_getc(prot);
+
+err:
+ buf_free(&key);
+ buf_free(&val);
+ return EOF;
+}
+
+static int parse_bodystructure_part(struct protstream *prot, struct body *body)
+{
+ int c;
+ int r = 0;
+ struct buf buf = BUF_INITIALIZER;
+
+ memset(body, 0, sizeof(struct body));
+
+ c = prot_getc(prot);
+ if (c != '(') {
+badformat:
+	r = IMAP_MAILBOX_BADFORMAT;
+	goto out;
+ }
+
+ c = prot_getc(prot);
+ prot_ungetc(c, prot);
+ if (c == '(') {
+	while (c == '(') {
+	 body->numparts++;
+	 body->subpart = (struct body *)xrealloc((char *)body->subpart,
+					 body->numparts*sizeof(struct body));
+
+	 r = parse_bodystructure_part(prot, &body->subpartbody->numparts-1);
+	 if (r) goto out;
+
+	 c = prot_getc(prot);
+	 prot_ungetc(c, prot);
+	}
+
+	c = prot_getc(prot);
+	if (c != ' ') goto badformat;
+
+	body->type = xstrdup("MULTIPART");
+ }
+ else {
+	/* parse mime-type */
+	c = getnstring(prot, NULL, &buf);
+	if (c != ' ') goto badformat;
+
+	body->type = buf_releasenull(&buf);
+ }
+
+ /* parse mime-subtype */
+ c = getnstring(prot, NULL, &buf);
+ if (c != ' ') goto badformat;
+ body->subtype = buf_releasenull(&buf);
+
+ /* parse mime-params */
+ c = parse_mime_params(prot, &body->params);
+ if (c != ' ') goto badformat;
+
+ if (strcmp(body->type, "MULTIPART")) {
+	/* msgid */
+	c = getnstring(prot, NULL, &buf);
+	if (c != ' ') goto badformat;
+	body->message_id = buf_releasenull(&buf);
+
+	/* description */
+	c = getnstring(prot, NULL, &buf);
+	if (c != ' ') goto badformat;
+	body->description = buf_releasenull(&buf);
+
+	/* encoding */
+	c = getnstring(prot, NULL, &buf);
+	if (c != ' ') goto badformat;
+	body->encoding = buf_releasenull(&buf);
+
+	/* content-size */
+	c = getword(prot, &buf);
+	if (c != ' ') goto badformat;
+	body->content_size = atoi(buf_cstring(&buf));
+
+	if (!strcmpsafe(body->type, "TEXT")) {
+	 /* parse content-lines */
+	 c = getword(prot, &buf);
+	 if (c != ' ') goto badformat;
+	 body->content_lines = atoi(buf_cstring(&buf));
+	}
+
+	else if (!strcmpsafe(body->type, "MESSAGE") &&
+		 !strcmpsafe(body->subtype, "RFC822")) {
+	 body->numparts = 1;
+	 body->subpart = xzmalloc(sizeof(struct body));
+
+	 /* skip envelope */
+	 r = skip_nil_or_nstring_list(prot);
+	 if (r) goto out;
+
+	 /* process body */
+	 r = parse_bodystructure_part(prot, body->subpart);
+	 if (r) goto out;
+
+	 /* skip trailing space (parse_bs_part doesn't eat it) */
+	 c = prot_getc(prot);
+	 if (c != ' ') goto badformat;
+
+	 /* parse content-lines */
+	 c = getword(prot, &buf);
+	 if (c != ' ') goto badformat;
+	 body->content_lines = atoi(buf_cstring(&buf));
+	}
+
+	/* parse md5sum */
+	c = getnstring(prot, NULL, &buf);
+	if (c != ' ') goto badformat;
+	body->md5 = buf_releasenull(&buf);
+ }
+
+ /* skips disposition-and-params */
+ r = skip_nil_or_nstring_list(prot);
+ if (r) goto out;
+
+ /* parse languages */ /* TODO */
+ r = skip_nil_or_nstring_list(prot);
+ if (r) goto out;
+
+ /* location */
+ c = getnstring(prot, NULL, &buf);
+ if (c != ')') goto badformat; /* final field */
+ body->location = buf_releasenull(&buf);
+
+ r = 0;
+out:
+ buf_free(&buf);
+ return r;
+}
+
+static int parse_bodystructure_sections(const char **cachestrp, const char *cacheend, struct body *body)
+{
+ struct body *this;
+ int nsubparts;
+ int part;
+
+ if (*cachestrp + 4 > cacheend)
+	return IMAP_MAILBOX_BADFORMAT;
+
+ nsubparts = CACHE_ITEM_BIT32(*cachestrp);
+ *cachestrp += 4;
+
+ if (*cachestrp + 4*5*nsubparts > cacheend)
+	return IMAP_MAILBOX_BADFORMAT;
+
+ if (strcmp(body->type, "MESSAGE") == 0
+	&& strcmp(body->subtype, "RFC822") == 0) {
+	if (strcmp(body->subpart->type, "MULTIPART") == 0) {
+	 /*
+	 * Part 0 of a message/rfc822 is the message header/text.
+	 * Nested parts of a message/rfc822 containing a multipart
+	 * are the sub-parts of the multipart.
+	 */
+	 if (body->subpart->numparts + 1 != nsubparts)
+		return IMAP_MAILBOX_BADFORMAT;
+
+	 body->subpart->header_offset = CACHE_ITEM_BIT32(*cachestrp+0*4);
+	 body->subpart->header_size = CACHE_ITEM_BIT32(*cachestrp+1*4);
+	 body->subpart->content_offset = CACHE_ITEM_BIT32(*cachestrp+2*4);
+	 body->subpart->content_size = CACHE_ITEM_BIT32(*cachestrp+3*4);
+	 *cachestrp += 5*4;
+
+	 for (part = 0; part < body->subpart->numparts; part++) {
+		this = &body->subpart->subpartpart;
+		this->header_offset = CACHE_ITEM_BIT32(*cachestrp+0*4);
+		this->header_size = CACHE_ITEM_BIT32(*cachestrp+1*4);
+		this->content_offset = CACHE_ITEM_BIT32(*cachestrp+2*4);
+		this->content_size = CACHE_ITEM_BIT32(*cachestrp+3*4);
+		*cachestrp += 5*4;
+	 }
+
+	 /* and parse subparts */
+	 for (part = 0; part < body->subpart->numparts; part++) {
+		this = &body->subpart->subpartpart;
+		if (parse_bodystructure_sections(cachestrp, cacheend, this))
+		 return IMAP_MAILBOX_BADFORMAT;
+	 }
+	}
+	else {
+	 /*
+	 * Part 0 of a message/rfc822 is the message header/text.
+	 * Part 1 of a message/rfc822 containing a non-multipart
+	 * is the message body.
+	 */
+
+	 if (2 != nsubparts)
+		return IMAP_MAILBOX_BADFORMAT;
+
+	 /* data is the same in body, just grab the first one */
+	 body->subpart->header_offset = CACHE_ITEM_BIT32(*cachestrp+0*4);
+	 body->subpart->header_size = CACHE_ITEM_BIT32(*cachestrp+1*4);
+	 body->subpart->content_offset = CACHE_ITEM_BIT32(*cachestrp+2*4);
+	 body->subpart->content_size = CACHE_ITEM_BIT32(*cachestrp+3*4);
+	 *cachestrp += 10*4;
+
+	 /* and parse subpart */
+	 if (parse_bodystructure_sections(cachestrp, cacheend, body->subpart))
+	 return IMAP_MAILBOX_BADFORMAT;
+	}
+ }
+ else if (body->numparts) {
+	/*
+	 * Cannot fetch part 0 of a multipart.
+	 * Nested parts of a multipart are the sub-parts.
+	 */
+	if (body->numparts + 1 != nsubparts)
+	 return IMAP_MAILBOX_BADFORMAT;
+	*cachestrp += 5*4;
+	for (part = 0; part < body->numparts; part++) {
+	 this = &body->subpartpart;
+	 this->header_offset = CACHE_ITEM_BIT32(*cachestrp+0*4);
+	 this->header_size = CACHE_ITEM_BIT32(*cachestrp+1*4);
+	 this->content_offset = CACHE_ITEM_BIT32(*cachestrp+2*4);
+	 this->content_size = CACHE_ITEM_BIT32(*cachestrp+3*4);
+	 *cachestrp += 5*4;
+	}
+
+	for (part = 0; part < body->numparts; part++) {
+	 this = &body->subpartpart;
+	 if (parse_bodystructure_sections(cachestrp, cacheend, this))
+		return IMAP_MAILBOX_BADFORMAT;
+	}
+ }
+ else {
+	/*
+	 * Leaf section--no part 0 or nested parts
+	 */
+	if (nsubparts != 0)
+	 return IMAP_MAILBOX_BADFORMAT;
+ }
+
+ return 0;
+}
+
+static int message_parse_cbodystructure(message_t *m)
+{
+ struct protstream *prot = NULL;
+ const char *cachestr = cacheitem_base(&m->record, CACHE_SECTION);
+ const char *cacheend = cachestr + cacheitem_size(&m->record, CACHE_SECTION);
+ struct body toplevel;
+ int r;
+
+ /* We're reading the cache - double check we have it */
+ assert(m->have & M_CACHE);
+
+ prot = prot_readmap(cacheitem_base(&m->record, CACHE_BODYSTRUCTURE),
+			cacheitem_size(&m->record, CACHE_BODYSTRUCTURE));
+ if (!prot)
+	return IMAP_MAILBOX_BADFORMAT;
+ prot_setisclient(prot, 1);	/* don't crash parsing literals */
+
+ m->body = xzmalloc(sizeof(struct body));
+ r = parse_bodystructure_part(prot, m->body);
+ if (r) syslog(LOG_ERR, "IOERROR: parsing body structure for %s %u (%.*s)",
+		 m->mailbox->name, m->record.uid,
+		 (int)cacheitem_size(&m->record, CACHE_BODYSTRUCTURE),
+		 cacheitem_base(&m->record, CACHE_BODYSTRUCTURE));
+ if (r) goto done;
+
+ memset(&toplevel, 0, sizeof(struct body));
+ toplevel.type = "MESSAGE";
+ toplevel.subtype = "RFC822";
+ toplevel.subpart = m->body;
+
+ r = parse_bodystructure_sections(&cachestr, cacheend, &toplevel);
+ if (r) syslog(LOG_ERR, "IOERROR: parsing section structure for %s %u (%.*s)",
+		 m->mailbox->name, m->record.uid,
+		 (int)cacheitem_size(&m->record, CACHE_BODYSTRUCTURE),
+		 cacheitem_base(&m->record, CACHE_BODYSTRUCTURE));
+
+done:
+ prot_free(prot);
+
+ return r;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static int message_map_file(message_t *m, const char *fname)
+{
+ int fd;
+ struct stat sbuf;
+
+ fd = open(fname, O_RDONLY, 0666);
+ if (fd == -1) return errno;
+
+ if (fstat(fd, &sbuf) == -1) {
+	syslog(LOG_ERR, "IOERROR: fstat on %s: %m", fname);
+	fatal("can't fstat message file", EC_OSFILE);
+ }
+ if (!S_ISREG(sbuf.st_mode)) {
+	close(fd);
+	return EINVAL;
+ }
+ buf_free(&m->map);
+ buf_init_mmap(&m->map, /*onceonly*/1, fd, fname, sbuf.st_size,
+		 m->mailbox ? m->mailbox->name : NULL);
+ close(fd);
+
+ return 0;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static void body_get_leaf_types(struct body *body, strarray_t *types)
+{
+ int i;
+
+ if (strcmpsafe(body->type, "MULTIPART") &&
+	strcmpsafe(body->type, "MESSAGE")) {
+	strarray_append(types, body->type);
+	strarray_append(types, body->subtype);
+ }
+
+ for (i = 0; i < body->numparts; i++) {
+	body_get_leaf_types(&body->subparti, types);
+ }
+}
+
+static int body_foreach_text_section(struct body *body,
+				 struct message *message,
+				 int (*proc)(int isbody, int charset, int encoding,
+						 const char *subtype, struct buf *data, void *rock),
+				 void *rock)
+{
+ struct buf data = BUF_INITIALIZER;
+ int i;
+ int r;
+
+ if (body->header_size) {
+	buf_init_ro(&data, message->map.s + body->header_offset, body->header_size);
+	r = proc(/*isbody*/0, 0, 0, NULL, &data, rock);
+	buf_free(&data);
+
+	if (r) return r;
+ }
+
+ if (!strcmpsafe(body->type, "TEXT")) {
+	int encoding, charset;
+	message_parse_charset(body, &encoding, &charset);
+
+	buf_init_ro(&data, message->map.s + body->content_offset, body->content_size);
+	r = proc(/*isbody*/1, charset, encoding,
+		 body->subtype, &data, rock);
+	buf_free(&data);
+
+	if (r) return r;
+ }
+
+ for (i = 0; i < body->numparts; i++) {
+	r = body_foreach_text_section(&body->subparti, message, proc, rock);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+/*
+ * Iterate 'proc' over all the MIME header sections and body sections of
+ * type TEXT, in the message 'm', preorder. The 'proc' is called with
+ * 'partno' equal to zero for header sections, non-zero for body
+ * sections. If 'proc' returns non-zero, the iteration finishes early
+ * and the return value of 'proc' is returned. Otherwise returns 0.
+ */
+EXPORTED int message_foreach_text_section(message_t *m,
+			 int (*proc)(int isbody, int charset, int encoding,
+				 const char *subtype, struct buf *data, void *rock),
+			 void *rock)
+{
+ int r = message_need(m, M_CACHEBODY|M_MAP);
+ if (r) return r;
+ return body_foreach_text_section(m->body, m, proc, rock);
+}
+
+/*
+ * Get the MIME content types of all leaf sections, i.e. sections whose
+ * type is not multipart or message. Strings are added to the array in
+ * pairs, type first then subtype.
+ */
+EXPORTED int message_get_leaf_types(message_t *m, strarray_t *types)
+{
+ int r = message_need(m, M_CACHEBODY);
+ if (r) return r;
+ body_get_leaf_types(m->body, types);
+ return 0;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+EXPORTED int message_get_bcc(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "bcc", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_cc(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "cc", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_to(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "to", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_from(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "from", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_listid(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "list-id", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_messageid(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "message-id", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_subject(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "subject", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_mailinglist(message_t *m, struct buf *buf)
+{
+ return message_get_field(m, "mailing-list", MESSAGE_RAW, buf);
+}
+
+EXPORTED int message_get_size(message_t *m, uint32_t *sizep)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *sizep = m->record.size;
+ return 0;
+}
+
+EXPORTED int message_get_uid(message_t *m, uint32_t *uidp)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *uidp = m->record.uid;
+ return 0;
+}
+
+EXPORTED int message_get_cid(message_t *m, conversation_id_t *cidp)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *cidp = m->record.cid;
+ return 0;
+}
+
+EXPORTED int message_get_modseq(message_t *m, modseq_t *modseqp)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *modseqp = m->record.modseq;
+ return 0;
+}
+
+EXPORTED int message_get_msgno(message_t *m, uint32_t *msgnop)
+{
+ int r = message_need(m, M_INDEX);
+ if (r) return r;
+ *msgnop = m->msgno;
+ return 0;
+}
+
+EXPORTED int message_get_userflags(message_t *m, uint32_t *flagsp)
+{
+ int r = message_need(m, M_RECORD);
+ int i;
+ if (r) return r;
+ for (i = 0; i < MAX_USER_FLAGS/32; i++)
+	flagspi = m->record.user_flagsi;
+ return 0;
+}
+
+EXPORTED int message_get_systemflags(message_t *m, uint32_t *flagsp)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *flagsp = m->record.system_flags;
+ return 0;
+}
+
+EXPORTED int message_get_indexflags(message_t *m, uint32_t *flagsp)
+{
+ int r = message_need(m, M_INDEX);
+ if (r) return r;
+ *flagsp = m->indexflags;
+ return 0;
+}
+
+EXPORTED int message_get_sentdate(message_t *m, time_t *datep)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *datep = m->record.sentdate;
+ return 0;
+}
+
+EXPORTED int message_get_internaldate(message_t *m, time_t *datep)
+{
+ int r = message_need(m, M_RECORD);
+ if (r) return r;
+ *datep = m->record.internaldate;
+ return 0;
+}
+
+EXPORTED int message_get_fname(message_t *m, const char **fnamep)
+{
+ int r = message_need(m, M_FILENAME);
+ if (r) return r;
+ *fnamep = m->filename;
+ return 0;
+}
+
+static void extract_one(struct buf *buf,
+			const char *name,
+			int format,
+			int has_name,
+			struct buf *raw)
+{
+ char *p = NULL;
+
+ if (has_name && !(format & MESSAGE_FIELDNAME)) {
+	/* remove the fieldname and colon */
+	int pos = buf_findchar(raw, 0, ':');
+	assert(pos > 0);
+	buf_remove(raw, 0, pos+1);
+ }
+ else if (!has_name && (format & MESSAGE_FIELDNAME)) {
+	/* insert a fieldname and colon */
+	buf_insertcstr(raw, 0, ":");
+	buf_insertcstr(raw, 0, name);
+ }
+
+ if (!(format & MESSAGE_APPEND))
+	buf_reset(buf);
+
+ switch (format & _MESSAGE_FORMAT_MASK) {
+ case MESSAGE_RAW:
+	/* Logically, we're appending to the resulting buffer.
+	 * However if the buf is empty we can save a memory copy
+	 * by setting it up as a CoW buffer. This means that
+	 * the caller will need to call buf_cstring() if they
+	 * need a C string. */
+	if (!raw->alloc)
+	 buf_cowappendmap(buf, raw->s, raw->len);
+	else
+	 buf_append(buf, raw);
+	break;
+ case MESSAGE_DECODED:
+	p = charset_parse_mimeheader(buf_cstring(raw));
+	buf_appendcstr(buf, p);
+	break;
+ case MESSAGE_SNIPPET:
+	p = charset_decode_mimeheader(buf_cstring(raw), CHARSET_SNIPPET);
+	buf_appendcstr(buf, p);
+	break;
+ case MESSAGE_SEARCH:
+	/* TODO: need a variant of decode_mimeheader() which
+	 * takes two struct buf* and a search flag */
+	p = charset_decode_mimeheader(buf_cstring(raw), charset_flags);
+	buf_appendcstr(buf, p);
+	break;
+ }
+
+ free(p);
+}
+
+EXPORTED int message_get_field(message_t *m, const char *hdr, int flags, struct buf *buf)
+{
+ strarray_t want = STRARRAY_INITIALIZER;
+ struct buf raw = BUF_INITIALIZER;
+ int hasname = 1;
+
+ /* the 5 standalone cache fields */
+ if (!strcasecmp(hdr, "from")) {
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	buf_setmap(&raw, cacheitem_base(&m->record, CACHE_FROM),
+			 cacheitem_size(&m->record, CACHE_FROM));
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+ else if (!strcasecmp(hdr, "to")) {
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	buf_setmap(&raw, cacheitem_base(&m->record, CACHE_TO),
+			 cacheitem_size(&m->record, CACHE_TO));
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+ else if (!strcasecmp(hdr, "cc")) {
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	buf_setmap(&raw, cacheitem_base(&m->record, CACHE_CC),
+			 cacheitem_size(&m->record, CACHE_CC));
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+ else if (!strcasecmp(hdr, "bcc")) {
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	buf_setmap(&raw, cacheitem_base(&m->record, CACHE_BCC),
+			 cacheitem_size(&m->record, CACHE_BCC));
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+ else if (!strcasecmp(hdr, "subject")) {
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	buf_setmap(&raw, cacheitem_base(&m->record, CACHE_SUBJECT),
+			 cacheitem_size(&m->record, CACHE_SUBJECT));
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+
+ /* message-id is from the envelope */
+ else if (!strcasecmp(hdr, "message-id")) {
+	char *envtokensNUMENVTOKENS;
+	char *c_env;
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	c_env = xstrndup(cacheitem_base(&m->record, CACHE_ENVELOPE) + 1,
+			 cacheitem_size(&m->record, CACHE_ENVELOPE) - 2);
+	parse_cached_envelope(c_env, envtokens, NUMENVTOKENS);
+	if (envtokensENV_MSGID)
+	 buf_appendcstr(&raw, envtokensENV_MSGID);
+	free(c_env);
+	if (raw.len == 3 && raw.s0 == 'N' && raw.s1 == 'I' && raw.s2 == 'L')
+	 buf_reset(&raw);
+	hasname = 0;
+ }
+
+ else if (mailbox_cached_header(hdr) != BIT32_MAX) {
+	/* it's in the cache */
+	char *headers = NULL;
+	int r = message_need(m, M_CACHE);
+	if (r) return r;
+	headers = xstrndup(cacheitem_base(&m->record, CACHE_HEADERS),
+			 cacheitem_size(&m->record, CACHE_HEADERS));
+	strarray_append(&want, hdr);
+	message_pruneheader(headers, &want, NULL);
+	buf_appendcstr(&raw, headers);
+	free(headers);
+	hasname = 1;
+ }
+ else {
+	char *headers = NULL;
+	int r = message_need(m, M_MAP|M_CACHEBODY);
+	if (r) return r;
+	headers = xstrndup(m->map.s + m->body->header_offset, m->body->header_size);
+	strarray_append(&want, hdr);
+	message_pruneheader(headers, &want, NULL);
+	buf_appendcstr(&raw, headers);
+	free(headers);
+	hasname = 1;
+ }
+
+ if (raw.len)
+	extract_one(buf, hdr, flags, hasname, &raw);
+
+ buf_free(&raw);
+ strarray_fini(&want);
+
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/message.h -> cyrus-imapd-2.5.tar.gz/imap/message.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message.h,v 1.13 2010/01/06 17:01:37 murch Exp $
 */
 
 #ifndef INCLUDED_MESSAGE_H
@@ -57,11 +55,8 @@
 
 #include "prot.h"
 #include "mailbox.h"
-
-/* cyrus.cache file item buffer */
-struct ibuf {
- char *start, *end, *last;
-};
+#include "strarray.h"
+#include "util.h"
 
 /*
 * Parsed form of a body-part
@@ -79,6 +74,7 @@
 struct param *disposition_params;
 struct param *language;
 char *location;
+ int charset_cte;		/* charset/encoding in binary bodystructure */
 
 /* Location/size information */
 long header_offset;
@@ -108,12 +104,14 @@
 struct address *bcc;
 char *in_reply_to;
 char *message_id;
+ char *x_me_message_id;
+ char *references;
 char *received_date;
 
 /*
 * Cached headers. Only filled in at top-level
 */
- struct ibuf cacheheaders;
+ struct buf cacheheaders;
 
 /*
 * decoded body. Filled in as needed.
@@ -135,21 +133,9 @@
 
 extern int message_parse(const char *fname, struct index_record *record);
 
-/* Flags for parsing message date/time - to be bitwise OR'd */
-#define PARSE_DATE	(1<<0) /* Default (always parsed) */
-#define PARSE_TIME	(1<<1)
-#define PARSE_ZONE	(1<<2)
-#define PARSE_GMT	(1<<3) /* Output time in GMT rather than local timezone */
-#define PARSE_NOCREATE	(1<<15) /* Don't create one if its missing/invalid */
-
-extern time_t message_parse_date P((char *hdr, unsigned flags));
-
-/* declare this here so it can be used externally, but remain opaque */
-struct body;
-
 struct message_content {
 const char *base; /* memory mapped file */
- unsigned long len;
+ size_t len;
 struct body *body; /* parsed body structure */
 };
 
@@ -159,8 +145,6 @@
 const char *decoded_body;
 };
 
-/* Calculate the number of entries in a vector */
-#define VECTOR_SIZE(vector) (sizeof(vector)/sizeof(vector0))
 
 extern void parse_cached_envelope P((char *env, char *tokens, int tokens_size));
 
@@ -168,15 +152,135 @@
 				 struct body *body));
 extern int message_parse_binary_file P((FILE *infile, struct body **body));
 extern int message_parse_file P((FILE *infile,
-				 const char **msg_base, unsigned long *msg_len,
+				 const char **msg_base, size_t *msg_len,
 				 struct body **body));
+extern void message_pruneheader(char *buf, const strarray_t *headers,
+				const strarray_t *headers_not);
 extern void message_fetch_part P((struct message_content *msg,
 				 const char **content_types,
 				 struct bodypart ***parts));
-extern int message_write_cache P((struct index_record *record, struct body *body));
+extern void message_write_nstring(struct buf *buf, const char *s);
+extern void message_write_nstring_map(struct buf *buf, const char *s, unsigned int len);
+extern void message_write_body(struct buf *buf, const struct body *body,
+				 int newformat);
+extern void message_write_xdrstring(struct buf *buf, const struct buf *s);
+extern int message_write_cache P((struct index_record *record, const struct body *body));
 
 extern int message_create_record P((struct index_record *message_index,
-				 struct body *body));
+				 const struct body *body));
 extern void message_free_body P((struct body *body));
 
+/* NOTE - scribbles on its input */
+extern void message_parse_env_address(char *str, struct address *addr);
+
+extern char *parse_nstring(char **str);
+
+extern void message_read_bodystructure(struct index_record *record,
+				 struct body **body);
+
+extern int message_update_conversations(struct conversations_state *, struct index_record *, conversation_t **);
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+/* New message API */
+
+typedef struct message message_t;
+struct mailbox;
+
+/* Flags for use as the 'format' argument to
+ * message_get_field() and part_get_field(). */
+enum message_format
+{
+ /* Original raw octets from the on-the-wire RFC5322 format,
+ * including folding and RFC2047 encoding of non-ASCII characters.
+ * The result may point into a mapping and not be NUL-terminated,
+ * use buf_cstring() if necessary. */
+ MESSAGE_RAW=	1,
+ /* Unfolded and RFC2047 decoded */
+ MESSAGE_DECODED,
+ /* Unfolded, RFC2047 decoded, and HTML-escaped */
+ MESSAGE_SNIPPET,
+ /* Unfolded, RFC2047 decoded, and search-normalised */
+ MESSAGE_SEARCH,
+
+#define _MESSAGE_FORMAT_MASK	(0x7)
+
+ /* This flag can be OR'd into the format argument to request that
+ * the field name and a colon ':' are left in the result. Normally
+ * only the field value is returned. This is useful when calling
+ * multiple times with MESSAGE_APPEND, to accumulate multiple headers
+ * in the buffer. */
+ MESSAGE_FIELDNAME=		(1<<5),
+
+ /* This flag can be OR'd into the format argument to request that
+ * all the fields of the given name are returned. Normally only
+ * the first is returned, which is faster. */
+ MESSAGE_MULTIPLE=		(1<<6),
+
+ /* This flag can be OR'd into the format argument to request that
+ * results be appended to the buffer; normally the buffer is reset
+ * first. */
+ MESSAGE_APPEND=		(1<<7)
+};
+
+enum message_indexflags
+{
+ MESSAGE_SEEN=		(1<<0),
+ MESSAGE_RECENT=		(1<<1),
+};
+
+extern message_t *message_new(void);
+extern message_t *message_new_from_data(const char *base, size_t len);
+extern message_t *message_new_from_mailbox(struct mailbox *mailbox,
+					 unsigned int recno);
+extern message_t *message_new_from_record(struct mailbox *,
+				 const struct index_record *);
+extern message_t *message_new_from_index(struct mailbox *,
+					 const struct index_record *,
+					 uint32_t msgno,
+					 uint32_t indexflags);
+extern message_t *message_new_from_filename(const char *filename);
+
+extern message_t *message_ref(message_t *m);
+extern void message_unref(message_t **m);
+
+extern int message_get_field(message_t *m, const char *name,
+			 int format, struct buf *buf);
+extern int message_get_header(message_t *m, int format, struct buf *buf);
+extern int message_get_body(message_t *m, int format, struct buf *buf);
+extern int message_get_type(message_t *m, const char **strp);
+extern int message_get_subtype(message_t *m, const char **strp);
+extern int message_get_charset(message_t *m, int *csp);
+extern int message_get_encoding(message_t *m, int *encp);
+extern int message_get_num_parts(message_t *m, unsigned int *np);
+extern int message_get_messageid(message_t *m, struct buf *buf);
+extern int message_get_listid(message_t *m, struct buf *buf);
+extern int message_get_mailinglist(message_t *m, struct buf *buf);
+extern int message_get_from(message_t *m, struct buf *buf);
+extern int message_get_to(message_t *m, struct buf *buf);
+extern int message_get_cc(message_t *m, struct buf *buf);
+extern int message_get_bcc(message_t *m, struct buf *buf);
+extern int message_get_inreplyto(message_t *m, struct buf *buf);
+extern int message_get_references(message_t *m, struct buf *buf);
+extern int message_get_subject(message_t *m, struct buf *buf);
+extern int message_get_date(message_t *m, time_t *tp);
+extern int message_get_mailbox(message_t *m, struct mailbox **);
+extern int message_get_uid(message_t *m, uint32_t *uidp);
+extern int message_get_cid(message_t *m, conversation_id_t *cidp);
+extern int message_get_internaldate(message_t *m, time_t *);
+extern int message_get_sentdate(message_t *m, time_t *);
+extern int message_get_modseq(message_t *m, modseq_t *modseqp);
+extern int message_get_systemflags(message_t *m, uint32_t *);
+extern int message_get_userflags(message_t *m, uint32_t *flagsp);
+extern int message_get_indexflags(message_t *m, uint32_t *);
+extern int message_get_size(message_t *m, uint32_t *sizep);
+extern int message_get_msgno(message_t *m, uint32_t *msgnop);
+extern int message_get_fname(message_t *m, const char **fnamep);
+extern int message_foreach_text_section(message_t *m,
+		 int (*proc)(int isbody, int charset, int encoding,
+			 const char *subtype, struct buf *data, void *rock),
+		 void *rock);
+extern int message_get_leaf_types(message_t *m, strarray_t *types);
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
 #endif /* INCLUDED_MESSAGE_H */

cyrus-imapd-2.4.17.tar.gz/imap/message_guid.c -> cyrus-imapd-2.5.tar.gz/imap/message_guid.c Changed

@@ -38,13 +38,10 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message_guid.c,v 1.9 2010/01/06 17:01:37 murch Exp $
 */
 
 #include <config.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "assert.h"
 #include "global.h"
@@ -277,7 +274,7 @@
 *
 ************************************************************************/
 
-void message_guid_generate(struct message_guid *guid,
+EXPORTED void message_guid_generate(struct message_guid *guid,
 			 const char *msg_base, unsigned long msg_len)
 {
 guid->status = GUID_NULL;
@@ -293,7 +290,7 @@
 *
 ************************************************************************/
 
-void message_guid_copy(struct message_guid *dst, struct message_guid *src)
+EXPORTED void message_guid_copy(struct message_guid *dst, const struct message_guid *src)
 {
 memcpy(dst, src, sizeof(struct message_guid));
 }
@@ -304,13 +301,13 @@
 *
 ************************************************************************/
 
-int message_guid_equal(struct message_guid *g1,
+EXPORTED int message_guid_equal(struct message_guid *g1,
 		 struct message_guid *g2)
 {
 return (memcmp(g1->value, g2->value, MESSAGE_GUID_SIZE) == 0);
 }
 
-int message_guid_cmp(struct message_guid *g1,
+EXPORTED int message_guid_cmp(struct message_guid *g1,
 		 struct message_guid *g2)
 {
 return memcmp(g1->value, g2->value, MESSAGE_GUID_SIZE);
@@ -323,11 +320,11 @@
 *
 ************************************************************************/
 
-unsigned long message_guid_hash(struct message_guid *guid, int hash_size)
+EXPORTED unsigned long message_guid_hash(const struct message_guid *guid, int hash_size)
 {
 int i;
 unsigned long result = 0;
- unsigned char *s = &guid->value0;
+ const unsigned char *s = &guid->value0;
 
 assert(hash_size > 1);
 
@@ -349,7 +346,7 @@
 *
 ************************************************************************/
 
-void message_guid_set_null(struct message_guid *guid)
+EXPORTED void message_guid_set_null(struct message_guid *guid)
 {
 guid->status = GUID_NULL;
 memset(guid->value, 0, MESSAGE_GUID_SIZE);
@@ -361,7 +358,7 @@
 *
 ************************************************************************/
 
-int message_guid_isnull(struct message_guid *guid)
+EXPORTED int message_guid_isnull(struct message_guid *guid)
 {
 if (guid->status == GUID_UNKNOWN) {
 	unsigned char *p = guid->value;
@@ -381,8 +378,7 @@
 *
 ************************************************************************/
 
-void message_guid_export(const struct message_guid *guid,
-			 unsigned char *buf)
+EXPORTED void message_guid_export(const struct message_guid *guid, unsigned char *buf)
 {
 memcpy(buf, guid->value, MESSAGE_GUID_SIZE);
 }
@@ -394,17 +390,12 @@
 *
 ************************************************************************/
 
-struct message_guid *message_guid_import(struct message_guid *guid,
-					 const unsigned char *buf)
+EXPORTED void message_guid_import(struct message_guid *guid,
+			 const unsigned char *buf)
 {
- static struct message_guid tmp;
-
- if (!guid) guid = &tmp;
-
+ assert(guid);
 guid->status = GUID_UNKNOWN;
 memcpy(guid->value, buf, MESSAGE_GUID_SIZE);
-
- return(guid);
 }
 
 
@@ -417,22 +408,12 @@
 *
 ************************************************************************/
 
-static char XDIGIT = "0123456789abcdef";
-
-char *message_guid_encode(const struct message_guid *guid)
+EXPORTED char *message_guid_encode(const struct message_guid *guid)
 {
 static char text2*MESSAGE_GUID_SIZE+1;
- const unsigned char *v = guid->value;
- char *p = text;
- int i;
-
- for (i = 0; i < MESSAGE_GUID_SIZE; i++, v++) {
- *p++ = XDIGIT(*v >> 4) & 0xf;
- *p++ = XDIGIT*v & 0xf;
- }
- *p = '\0';
-
- return(text);
+ int r = bin_to_hex(&guid->value, MESSAGE_GUID_SIZE, text, BH_LOWER);
+ assert(r == 2*MESSAGE_GUID_SIZE);
+ return text;
 }
 
 /* message_guid_decode() *************************************************
@@ -442,26 +423,9 @@
 * 
 ************************************************************************/
 
-int message_guid_decode(struct message_guid *guid, const char *text)
+EXPORTED int message_guid_decode(struct message_guid *guid, const char *text)
 {
- unsigned char *v = guid->value, msn, lsn;
- const char *p = text;
- int i;
-
- guid->status = GUID_NULL;
-
- for (i = 0; i < MESSAGE_GUID_SIZE; i++, v++) {
-	if (!Uisxdigit(*p)) return(0);
-	msn = (*p > '9') ? tolower((int) *p) - 'a' + 10 : *p - '0';
-	p++;
-
-	if (!Uisxdigit(*p)) return(0);
-	lsn = (*p > '9') ? tolower((int) *p) - 'a' + 10 : *p - '0';
-	p++;
-	
-	*v = (unsigned char) (msn << 4) | lsn;
-	if (*v) guid->status = GUID_NONNULL;
- }
-
- return(*p == '\0');
+ int r = hex_to_bin(text, 0, &guid->value);
+ guid->status = (r > 0 ? GUID_NONNULL : GUID_NULL);
+ return (r == MESSAGE_GUID_SIZE);
 }

cyrus-imapd-2.4.17.tar.gz/imap/message_guid.h -> cyrus-imapd-2.5.tar.gz/imap/message_guid.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message_guid.h,v 1.7 2010/01/06 17:01:37 murch Exp $
  */
 
 #ifndef MESSAGE_GUID_H
@@ -65,7 +63,7 @@
 			   const char *msg_base, unsigned long msg_len);
 
 /* Copy a GUID */
-void message_guid_copy(struct message_guid *dst, struct message_guid *src);
+void message_guid_copy(struct message_guid *dst, const struct message_guid *src);
 
 /* Compare a pair of GUIDs: Returns 1 => match. */
 int message_guid_equal(struct message_guid *guid1,
@@ -76,7 +74,7 @@
 /* Convert GUID into hash value for hash table lookup
  * Returns: positive int in range 0, hash_size-1
  */
-unsigned long message_guid_hash(struct message_guid *guid, int hash_size);
+unsigned long message_guid_hash(const struct message_guid *guid, int hash_size);
 
   /* Create a NULL GUID */
 void message_guid_set_null(struct message_guid *guid);
@@ -87,14 +85,13 @@
 /* Export Message GUID as byte sequence (MESSAGE_GUID_SIZE)
  * (Wrapper for memcpy() with current implementation)
  */
-void message_guid_export(const struct message_guid *guid,
-			 unsigned char *buf);
+void message_guid_export(const struct message_guid *guid, unsigned char *buf);
 
 /* Import Message GUID from packed sequence (MESSAGE_GUID_SIZE)
  * (Wrapper for memcpy() with current implementation)
  */
-struct message_guid *message_guid_import(struct message_guid *guid,
-					 const unsigned char *buf);
+void message_guid_import(struct message_guid *guid,
+			 const unsigned char *buf);
 
 
 /* Routines for manipulating text value */

cyrus-imapd-2.5.tar.gz/imap/message_priv.h Added

@@ -0,0 +1,96 @@
+/* message_priv.h -- private details of the message_t object
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: message.h,v 1.13 2010/01/06 17:01:37 murch Exp $
+ */
+
+#ifndef __CYRUS_MESSAGE_PRIV_H__
+#define __CYRUS_MESSAGE_PRIV_H__
+
+#include <stdio.h>
+
+#include "message.h"
+#include "mailbox.h"
+#include "charset.h"
+#include "util.h"
+
+/*
+ * Flags for the 'have' and 'given' bitmask fields. 'Given' is the
+ * resources we were initialised with by the caller, which are presumed
+ * to belong to the caller and will not be freed. 'Have' is the
+ * resources we have, including both those given us and those we created
+ * or opened ourselves. Resources are created or opened on demand, and
+ * can be shut down again to minimise resource usage, so we need to
+ * track the status of all these resources.
+ */
+#define M_MAILBOX	(1<<0)	 /* an open mailbox* */
+#define M_FILENAME 	(1<<1)	 /* filename of a message on disk */
+#define M_RECORD	(1<<2)	 /* a valid index_record */
+#define M_UID		(1<<3)	 /* valid UID in index_record */
+#define M_MAP		(1<<4)	 /* mmap()ed raw message data */
+#define M_CACHE		(1<<5)	 /* mmap()ed cyrus.cache */
+#define M_CACHEBODY	(1<<6)	 /* MIME header details from fields, or
+				 * BODYSTRUCTURE from cyrus.cache */
+#define M_FULLBODY	(1<<7)	 /* BODY parsed from the raw message */
+#define M_CHEADER	(1<<8)	 /* header from cyrus.cache */
+#define M_CENVELOPE	(1<<9)	 /* envelope from cyrus.cache */
+#define M_INDEX		(1<<10)	 /* per-index bits: msgno & indexflags */
+#define M_ALL		(~0U)	 /* everything */
+
+#define M_BODY (M_CACHEBODY|M_FULLBODY) /* for yield masking */
+
+struct message
+{
+ int refcount;
+ unsigned short have;
+ unsigned short given;
+ char *filename;
+ struct mailbox *mailbox;
+ unsigned int msgno;
+ uint32_t indexflags;
+ struct buf map;
+ struct body *body;
+ char **envelope;
+ struct index_record record;
+};
+
+
+#endif /* __CYRUS_MESSAGE_PRIV_H__ */

cyrus-imapd-2.5.tar.gz/imap/message_test.c Added

@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/* cyrus includes */
+#include "assert.h"
+#include "bsearch.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "imap_err.h"
+#include "index.h"
+#include "search_engines.h"
+#include "conversations.h"
+#include "mailbox.h"
+#include "mboxlist.h"
+#include "message.h"
+#include "sysexits.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#if !HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+static int usage(const char *name);
+
+int verbose = 0;
+enum { PART_TREE, TEXT_SECTIONS, TEXT_RECEIVER } dump_mode = PART_TREE;
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static void dump_octets(FILE *fp, const char *base, unsigned int len)
+{
+ unsigned int i;
+
+ while (len > 0) {
+	fputs(" ", fp);
+	for (i = 0 ; i < 16 && i < len ; i++)
+	 fprintf(fp, "%02x ", ((unsigned char *)base)i);
+	for (; i < 16 ; i++)
+	 fputs(" ", fp);
+	fputs(" ", fp);
+	for (i = 0 ; i < 16 && i < len ; i++)
+	 fputc((isprint(basei) && !isspace(basei) ? basei : '.'), fp);
+	fputc('\n', fp);
+
+	i = (len > 16 ? 16 : len);
+	len -= i;
+	base += i;
+ }
+}
+
+static void dump_buf(FILE *fp, const struct buf *data)
+{
+#define MAX_TEXT 512
+ if (verbose || data->len <= MAX_TEXT) {
+	dump_octets(fp, data->s, data->len);
+ }
+ else {
+	dump_octets(fp, data->s, MAX_TEXT/2);
+	fputs(" ...\n", fp);
+	dump_octets(fp, data->s + data->len - MAX_TEXT/2, MAX_TEXT/2);
+ }
+#undef MAX_TEXT
+}
+
+static int dump_one_section(int partno, int charset, int encoding,
+			 const char *subtype, struct buf *data,
+			 void *rock __attribute__((unused)))
+{
+#define MAX_TEXT 512
+ printf("SECTION partno=%d length=%llu subtype=%s charset=%s encoding=%s\n",
+	 partno, (unsigned long long)data->len, subtype, charset_name(charset), encoding_name(encoding));
+ dump_buf(stdout, data);
+ return 0;
+#undef MAX_TEXT
+}
+
+static int dump_text_sections(message_t *message)
+{
+ return message_foreach_text_section(message, dump_one_section, NULL);
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static int dump_message(message_t *message)
+{
+ return dump_text_sections(message);
+}
+
+int main(int argc, char **argv)
+{
+ int c;
+ const char *alt_config = NULL;
+ const char *filename = NULL;
+ const char *mboxname = NULL;
+ int recno = 1;
+ int record_flag = 0;
+ int r = 0;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((c = getopt(argc, argv, "Rf:m:pr:stvC:")) != EOF) {
+	switch (c) {
+
+	case 'f':
+	 filename = optarg;
+	 break;
+
+	case 'm':
+	 mboxname = optarg;
+	 break;
+
+	case 'p':
+	 dump_mode = PART_TREE;
+	 break;
+
+	case 'r':
+	 recno = atoi(optarg);
+	 if (recno <= 0)
+		usage(argv0);
+	 break;
+
+	case 's':
+	 dump_mode = TEXT_SECTIONS;
+	 break;
+
+	case 't':
+	 dump_mode = TEXT_RECEIVER;
+	 break;
+
+	case 'v':
+	 verbose++;
+	 break;
+
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'R':
+	 record_flag = 1;
+	 break;
+
+	default:
+	 usage(argv0);
+	 break;
+	}
+ }
+
+ if (optind != argc)
+	usage(argv0);
+ if (mboxname && filename)
+	usage(argv0);
+
+ cyrus_init(alt_config, "message_test", 0, CONFIG_NEED_PARTITION_DATA);
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ if (mboxname && record_flag) {
+	struct mailbox *mailbox = NULL;
+	struct index_record record;
+	message_t *message = NULL;
+
+	r = mailbox_open_irl(mboxname, &mailbox);
+	if (r) {
+	 fprintf(stderr, "Failed to open mailbox %s: %s\n",
+		 mboxname, error_message(r));
+	 return 1;
+	}
+
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) {
+	 fprintf(stderr, "Failed to read index record %u of %s: %s\n",
+		 recno, mboxname, error_message(r));
+	 return 1;
+	}
+
+	message = message_new_from_record(mailbox, &record);
+	r = dump_message(message);
+	if (r) {
+	 fprintf(stderr, "Error dumping message: %s\n",
+		 error_message(r));
+	 return 1;
+	}
+
+	message_unref(&message);
+	mailbox_close(&mailbox);
+ }
+ else if (mboxname) {
+	struct mailbox *mailbox = NULL;
+	message_t *message = NULL;
+
+	r = mailbox_open_irl(mboxname, &mailbox);
+	if (r) {
+	 fprintf(stderr, "Failed to open mailbox %s: %s\n",
+		 mboxname, error_message(r));
+	 return 1;
+	}
+
+	message = message_new_from_mailbox(mailbox, recno);
+	r = dump_message(message);
+	if (r) {
+	 fprintf(stderr, "Error dumping message: %s\n",
+		 error_message(r));
+	 return 1;
+	}
+
+	message_unref(&message);
+	mailbox_close(&mailbox);
+ }
+ else if (filename) {
+	message_t *message = NULL;
+
+	message = message_new_from_filename(filename);
+	r = dump_message(message);
+	if (r) {
+	 fprintf(stderr, "Error dumping message: %s\n",
+		 error_message(r));
+	 return 1;
+	}
+
+	message_unref(&message);
+ }
+ else {
+	message_t *message = NULL;
+	int c;
+	struct buf buf = BUF_INITIALIZER;
+
+	while ((c = fgetc(stdin)) != EOF)
+	 buf_putc(&buf, c);
+	message = message_new_from_data(buf.s, buf.len);
+	dump_message(message);
+	if (r) {
+	 fprintf(stderr, "Error dumping message: %s\n",
+		 error_message(r));
+	 return 1;
+	}
+
+	message_unref(&message);
+	buf_free(&buf);
+ }
+
+ mboxlist_close();
+ mboxlist_done();
+
+ cyrus_done();
+
+ return r;
+}
+
+static int usage(const char *name)
+{
+ fprintf(stderr, "usage: %s format-options -m mailbox -r recno -R\n", name);
+ fprintf(stderr, " %s format-options -f filename\n", name);
+ fprintf(stderr, " %s format-options < message\n", name);
+ fprintf(stderr, "format-options :=\n");
+ fprintf(stderr, "-p		dump message part tree\n");
+ fprintf(stderr, "-s		dump text sections\n");
+ fprintf(stderr, "-t		dump output from search text receiver\n");
+ exit(EC_USAGE);
+}
+
+void fatal(const char* s, int code)
+{
+ fprintf(stderr, "message_test: %s\n", s);
+ cyrus_done();
+ exit(code);
+}
+
+

cyrus-imapd-2.4.17.tar.gz/imap/mupdate-client.c -> cyrus-imapd-2.5.tar.gz/imap/mupdate-client.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mupdate-client.c,v 1.63 2010/07/23 19:25:39 wescraig Exp $
 */
 
 #include <config.h>
@@ -51,11 +49,7 @@
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 #include <syslog.h>
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -68,12 +62,8 @@
 #include <sys/select.h>
 #endif
 
-#include "assert.h"
-#include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imparse.h"
-#include "iptostring.h"
 #include "mupdate.h"
 #include "prot.h"
 #include "protocol.h"
@@ -85,21 +75,22 @@
 const char service_name = "mupdate";
 
 static struct protocol_t mupdate_protocol =
-{ "mupdate", "mupdate",
- { 1, "* OK" },
- { NULL, NULL, "* OK", NULL,
- { { "* AUTH ", CAPA_AUTH },
- { "* STARTTLS", CAPA_STARTTLS },
- { "* COMPRESS \"DEFLATE\"", CAPA_COMPRESS },
- { NULL, 0 } } },
- { "S01 STARTTLS", "S01 OK", "S01 NO", 1 },
- { "A01 AUTHENTICATE", USHRT_MAX, 1, "A01 OK", "A01 NO", "", "*", NULL, 0 },
- { "Z01 COMPRESS \"DEFLATE\"", NULL, "Z01 OK" },
- { "N01 NOOP", NULL, "N01 OK" },
- { "Q01 LOGOUT", NULL, "Q01 " }
+{ "mupdate", "mupdate", TYPE_STD,
+ { { { 1, "* OK" },
+ { NULL, NULL, "* OK", NULL,
+	CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD,
+	{ { "AUTH", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { "COMPRESS=DEFLATE", CAPA_COMPRESS },
+	 { NULL, 0 } } },
+ { "S01 STARTTLS", "S01 OK", "S01 NO", 1 },
+ { "A01 AUTHENTICATE", USHRT_MAX, 1, "A01 OK", "A01 NO", "", "*", NULL, 0 },
+ { "Z01 COMPRESS \"DEFLATE\"", NULL, "Z01 OK" },
+ { "N01 NOOP", NULL, "N01 OK" },
+ { "Q01 LOGOUT", NULL, "Q01 " } } }
 };
 
-int mupdate_connect(const char *server,
+EXPORTED int mupdate_connect(const char *server,
 		 const char *port __attribute__((unused)),
 		 mupdate_handle **handle,
 		 sasl_callback_t *cbs)
@@ -131,7 +122,7 @@
 }
 
 h->conn = backend_connect(NULL, server, &mupdate_protocol,
-			 "", cbs, &status);
+			 "", cbs, &status, -1);
 
 /* xxx unclear that this is correct, but it prevents a memory leak */
 if (local_cbs) free_callbacks(cbs);
@@ -147,7 +138,7 @@
 return 0;
 }
 
-void mupdate_disconnect(mupdate_handle **hp)
+EXPORTED void mupdate_disconnect(mupdate_handle **hp)
 {
 mupdate_handle *h;
 
@@ -163,7 +154,7 @@
 buf_free(&(h->arg2));
 buf_free(&(h->arg3));
 
- if(h->acl_buf) free(h->acl_buf);
+ free(h->acl);
 
 free(h); 
 *hp = NULL;
@@ -180,7 +171,7 @@
 return -1;
 }
 
-int mupdate_activate(mupdate_handle *handle, 
+EXPORTED int mupdate_activate(mupdate_handle *handle,
 		 const char *mailbox, const char *server,
 		 const char *acl)
 {
@@ -216,7 +207,7 @@
 }
 }
 
-int mupdate_reserve(mupdate_handle *handle,
+HIDDEN int mupdate_reserve(mupdate_handle *handle,
 		 const char *mailbox, const char *server)
 {
 int ret;
@@ -250,7 +241,7 @@
 }
 }
 
-int mupdate_deactivate(mupdate_handle *handle,
+EXPORTED int mupdate_deactivate(mupdate_handle *handle,
 		 const char *mailbox, const char *server)
 {
 int ret;
@@ -284,7 +275,7 @@
 }
 }
 
-int mupdate_delete(mupdate_handle *handle,
+EXPORTED int mupdate_delete(mupdate_handle *handle,
 		 const char *mailbox)
 {
 int ret;
@@ -322,27 +313,14 @@
 strlcpy(h->server_buf, mdata->server, sizeof(h->server_buf));
 
 if(!strncmp(cmd, "MAILBOX", 7)) {
-	size_t len = strlen(mdata->acl) + 1;
-	
 	h->mailboxdata_buf.t = ACTIVE;
 	
-	if(len > h->acl_buf_len) {
-	 /* we want to at least double the buffer */
-	 if (len < 2 * h->acl_buf_len) {
-		len = 2 * h->acl_buf_len;
-	 }
-
-	 h->acl_buf = xrealloc(h->acl_buf, len);
-	 strcpy(h->acl_buf, mdata->acl);
-	}
+	free(h->acl);
+	h->acl = xstrdup(mdata->acl);
 } else if (!strncmp(cmd, "RESERVE", 7)) {
 	h->mailboxdata_buf.t = RESERVE;
-	if(!h->acl_buf) {
-	 h->acl_buf = xstrdup("");
-	 h->acl_buf_len = 1;
-	} else {
-	 h->acl_buf0 = '\0';
-	}
+	free(h->acl);
+	h->acl = xstrdup("");
 } else {
 	/* Bad command */
 	return 1;
@@ -350,12 +328,12 @@
 
 h->mailboxdata_buf.mailbox = h->mailbox_buf;
 h->mailboxdata_buf.server = h->server_buf;
- h->mailboxdata_buf.acl = h->acl_buf;
+ h->mailboxdata_buf.acl = h->acl;
 
 return 0;
 }
 
-int mupdate_find(mupdate_handle *handle, const char *mailbox,
+EXPORTED int mupdate_find(mupdate_handle *handle, const char *mailbox,
 		 struct mupdate_mailboxdata **target) 
 {
 int ret;
@@ -387,7 +365,7 @@
 }
 }
 
-int mupdate_list(mupdate_handle *handle, mupdate_callback callback,
+EXPORTED int mupdate_list(mupdate_handle *handle, mupdate_callback callback,
 		 const char *prefix, void *context) 
 {
 int ret;
@@ -416,7 +394,7 @@
 }
 
 
-int mupdate_noop(mupdate_handle *handle, mupdate_callback callback,
+EXPORTED int mupdate_noop(mupdate_handle *handle, mupdate_callback callback,
 		 void *context)
 {
 int ret;
@@ -443,7 +421,7 @@
 goto done; }} while(0)
 
 /* Scarf up the incoming data and perform the requested operations */
-int mupdate_scarf(mupdate_handle *handle, 
+EXPORTED int mupdate_scarf(mupdate_handle *handle,
 		 mupdate_callback callback,
 		 void *context, 
 		 int wait_for_ok, 
@@ -658,7 +636,7 @@
 return r;
 }
 
-void kick_mupdate(void)
+EXPORTED void kick_mupdate(void)
 {
 char buf2048;
 struct sockaddr_un srvaddr;

cyrus-imapd-2.4.17.tar.gz/imap/mupdate-client.h -> cyrus-imapd-2.5.tar.gz/imap/mupdate-client.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/mupdate-slave.c -> cyrus-imapd-2.5.tar.gz/imap/mupdate-slave.c Changed

@@ -38,24 +38,16 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mupdate-slave.c,v 1.33 2010/07/27 19:22:54 wescraig Exp $
 */
 
 #include <config.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <signal.h>
-#include <ctype.h>
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 #include <syslog.h>
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -73,15 +65,12 @@
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
 #include "global.h"
-#include "assert.h"
-#include "imparse.h"
-#include "iptostring.h"
 #include "mpool.h"
 #include "mupdate.h"
 #include "exitcodes.h"
 
 /* Returns file descriptor of kick socket (or does not return) */
-static int open_kick_socket() 
+static int open_kick_socket(void)
 {
 int r,s,len;
 char fnamebuf2048;

cyrus-imapd-2.4.17.tar.gz/imap/mupdate.c -> cyrus-imapd-2.5.tar.gz/imap/mupdate.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mupdate.c,v 1.114 2010/07/27 19:54:06 wescraig Exp $
 */
 
 #include <config.h>
@@ -75,11 +73,11 @@
 #include "mupdate-client.h"
 #include "telemetry.h"
 
+#include "strarray.h"
 #include "assert.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
-#include "iptostring.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "mboxlist.h"
 #include "mpool.h"
@@ -89,7 +87,6 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
-#include "xstrlcat.h"
 #include "xstrlcpy.h"
 
 /* Sent to clients that we can't accept a connection for. */
@@ -115,12 +112,6 @@
 char mailboxMAX_MAILBOX_BUFFER;
 };
 
-struct stringlist 
-{
- char *str;
- struct stringlist *next;
-};
-
 struct conn {
 int fd;
 int logfd;
@@ -154,7 +145,7 @@
 
 /* UPDATE command handling */
 const char *streaming; /* tag */
- struct stringlist *streaming_hosts; /* partial updates */
+ strarray_t *streaming_hosts; /* partial updates */
 
 /* pending changes to send, in reverse order */
 pthread_mutex_t m;
@@ -192,7 +183,7 @@
 * must lock listener first. You must have both listener_mutex and
 * idle_connlist_mutex locked to remove anything from the idle_connlist */
 static pthread_mutex_t idle_connlist_mutex = PTHREAD_MUTEX_INITIALIZER;
-struct conn *idle_connlist = NULL; /* protected by listener_mutex */
+static struct conn *idle_connlist = NULL; /* protected by listener_mutex */
 static pthread_mutex_t connection_count_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int connection_count = 0;
 static pthread_mutex_t idle_worker_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -200,36 +191,36 @@
 static pthread_mutex_t worker_count_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int worker_count = 0;
 
-pthread_mutex_t connlist_mutex = PTHREAD_MUTEX_INITIALIZER;
-struct conn *connlist = NULL;
+static pthread_mutex_t connlist_mutex = PTHREAD_MUTEX_INITIALIZER;
+static struct conn *connlist = NULL;
 
 /* ---- connection signaling pipe */
 static int conn_pipe2;
 
 /* ---- database access ---- */
-pthread_mutex_t mailboxes_mutex = PTHREAD_MUTEX_INITIALIZER;
-struct conn *updatelist = NULL;
+static pthread_mutex_t mailboxes_mutex = PTHREAD_MUTEX_INITIALIZER;
+static struct conn *updatelist = NULL;
 
 /* --- prototypes --- */
 static void conn_free(struct conn *C);
-mupdate_docmd_result_t docmd(struct conn *c);
-void cmd_authenticate(struct conn *C,
+static mupdate_docmd_result_t docmd(struct conn *c);
+static void cmd_authenticate(struct conn *C,
 		 const char *tag, const char *mech,
 		 const char *clientstart);
-void cmd_set(struct conn *C, 
+static void cmd_set(struct conn *C,
 	 const char *tag, const char *mailbox,
 	 const char *server, const char *acl, enum settype t);
-void cmd_find(struct conn *C, const char *tag, const char *mailbox,
+static void cmd_find(struct conn *C, const char *tag, const char *mailbox,
 	 int send_ok, int send_delete);
-void cmd_list(struct conn *C, const char *tag, const char *host_prefix);
-void cmd_startupdate(struct conn *C, const char *tag,
-		 struct stringlist *partial);
-void cmd_starttls(struct conn *C, const char *tag);
-void cmd_compress(struct conn *C, const char *tag, const char *alg);
+static void cmd_list(struct conn *C, const char *tag, const char *host_prefix);
+static void cmd_startupdate(struct conn *C, const char *tag,
+		 strarray_t *partial);
+static void cmd_starttls(struct conn *C, const char *tag);
+static void cmd_compress(struct conn *C, const char *tag, const char *alg);
 void shut_down(int code);
 static int reset_saslconn(struct conn *c);
-void database_init();
-void sendupdates(struct conn *C, int flushnow);
+static void database_init(void);
+static void sendupdates(struct conn *C, int flushnow);
 
 extern int saslserver(sasl_conn_t *conn, const char *mech,
 		 const char *init_resp, const char *resp_prefix,
@@ -237,11 +228,6 @@
 		 struct protstream *pin, struct protstream *pout,
 		 int *sasl_result, char **success_data);
 
-/* Functions for manipulating stringlists */
-static void stringlist_add(struct stringlist **list, const char *string);
-static void stringlist_free(struct stringlist **list);
-static int stringlist_contains(struct stringlist *list, const char *str);
-
 /* --- prototypes in mupdate-slave.c */
 void *mupdate_client_start(void *rock);
 void *mupdate_placebo_kick_start(void *rock);
@@ -255,12 +241,8 @@
 static struct conn *conn_new(int fd)
 {
 struct conn *C = xzmalloc(sizeof(struct conn));
- struct sockaddr_storage localaddr, remoteaddr;
+ const char *clienthost, *localip, *remoteip;
 int r; 
- int haveaddr = 0;
- socklen_t salen;
- char hbufNI_MAXHOST;
- int niflags;
 
 C->fd = fd;
 C->logfd = -1;
@@ -283,45 +265,15 @@
 pthread_mutex_unlock(&connection_count_mutex); /* UNLOCK */
 
 /* Find out name of client host */
- salen = sizeof(remoteaddr);
- if (getpeername(C->fd, (struct sockaddr *)&remoteaddr, &salen) == 0 &&
-	(remoteaddr.ss_family == AF_INET ||
-	 remoteaddr.ss_family == AF_INET6)) {
-	niflags = 0;
-#ifdef NI_WITHSCOPEID
-	if (remoteaddr.ss_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, niflags) == 0)
-	 strlcpy(C->clienthost, hbuf, sizeof(C->clienthost)-30);
-	else
-	 strlcpy(C->clienthost, "Unknown", sizeof(C->clienthost)-30);
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(C->clienthost, " ", sizeof(C->clienthost));
-	strlcat(C->clienthost, hbuf, sizeof(C->clienthost));
-	strlcat(C->clienthost, "", sizeof(C->clienthost));
-	salen = sizeof(localaddr);
-	if (getsockname(C->fd, (struct sockaddr *)&localaddr, &salen) == 0
-	 && iptostring((struct sockaddr *)&remoteaddr, salen,
-			 C->saslprops.ipremoteport_buf,
-			 sizeof(C->saslprops.ipremoteport_buf)) == 0
-	 && iptostring((struct sockaddr *)&localaddr, salen,
-			 C->saslprops.iplocalport_buf,
-			 sizeof(C->saslprops.iplocalport_buf)) == 0) {
-	 haveaddr = 1;
-	}
- }
+ clienthost = get_clienthost(C->fd, &localip, &remoteip);
+ strlcpy(C->clienthost, clienthost, sizeof(C->clienthost));
 
- if(haveaddr) {
+ if (localip && remoteip) {
+	strlcpy(C->saslprops.ipremoteport_buf, remoteip,
+		sizeof(C->saslprops.ipremoteport_buf));
 	C->saslprops.ipremoteport = C->saslprops.ipremoteport_buf;
+	strlcpy(C->saslprops.iplocalport_buf, remoteip,
+		sizeof(C->saslprops.iplocalport_buf));
 	C->saslprops.iplocalport = C->saslprops.iplocalport_buf;
 }
 
@@ -428,47 +380,11 @@
 buf_free(&(C->arg2));
 buf_free(&(C->arg3));
 
- if(C->streaming_hosts) stringlist_free(&(C->streaming_hosts));
+ if(C->streaming_hosts) strarray_free(C->streaming_hosts);
 
 free(C);
 }
 
-static void stringlist_add(struct stringlist **list, const char *string) 
-{
- struct stringlist *tmp;
-
- assert(list);
- assert(string);
- 
- tmp = xmalloc(sizeof(struct stringlist));
- tmp->str = xstrdup(string);
- 
- tmp->next = *list;
- *list = tmp;
-}
-
-static void stringlist_free(struct stringlist **list) 
-{
- struct stringlist *tmp, *tmp_next;
- for(tmp = *list; tmp; tmp=tmp_next) {
-	tmp_next = tmp->next;
-	free(tmp->str);
-	free(tmp);
- }
- *list = NULL;
-}
-
-/* returns true if the list contains an exact match */
-static int stringlist_contains(struct stringlist *list, const char *str) 
-{
- struct stringlist *tmp;
- for(tmp = list; tmp; tmp=tmp->next) {
-	if(!strcmp(str, tmp->str)) return 1;
- }
- return 0;
-}
-
-
 /*
 * The auth_*.c backends called by mysasl_proxy_policy()
 * use static variables which we need to protect with a mutex.
@@ -685,7 +601,7 @@
 shut_down(error);
 }
 
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 static int recurse_code = 0;
 
@@ -702,7 +618,7 @@
 #define CHECKNEWLINE(c, ch) do { if ((ch) == '\r') (ch)=prot_getc((c)->pin); \
 		 if ((ch) != '\n') goto extraargs; } while (0)
 
-mupdate_docmd_result_t docmd(struct conn *c)
+static mupdate_docmd_result_t docmd(struct conn *c)
 {
 mupdate_docmd_result_t ret = DOCMD_OK;
 int ch;
@@ -961,21 +877,22 @@
 case 'U':
 	if (!c->userid) goto nologin;
 	else if (!strcmp(c->cmd.s, "Update")) {
-	 struct stringlist *arg = NULL;
+	 strarray_t *arg = NULL;
 	 int counter = 30; /* limit on number of processed hosts */
 	 
 	 while(ch == ' ') {
 		/* Hey, look, more bits of a PARTIAL-UPDATE command */
 		ch = getstring(c->pin, c->pout, &(c->arg1));
 		if(c->arg1.s0 == '\0') {
-		 stringlist_free(&arg);
+		 strarray_free(arg);
 		 goto badargs;
 		}
 		if(counter-- == 0) {
-		 stringlist_free(&arg);
+		 strarray_free(arg);
 		 goto extraargs;
 		}
-		stringlist_add(&arg,c->arg1.s);
+		if (!arg) arg = strarray_new();
+		strarray_append(arg, c->arg1.s);
 	 }
 
 	 CHECKNEWLINE(c, ch);
@@ -1067,6 +984,7 @@
 		 char **envp __attribute__((unused)))
 {
 int flag;
+ int r;
 
 /* First check that we can handle the new connection. */
 pthread_mutex_lock(&connection_count_mutex); /* LOCK */
@@ -1077,11 +995,12 @@
 if (flag) {
 	/* Do the nonblocking write, if it fails, too bad for them. */
 	nonblock(fd, 1);
-	write(fd,SERVER_UNABLE_STRING,sizeof(SERVER_UNABLE_STRING));
+	r = write(fd,SERVER_UNABLE_STRING,sizeof(SERVER_UNABLE_STRING));
 	close(fd);
 
 	syslog(LOG_ERR,
 	 "Server too busy, dropping connection.");
+	if (r) return 0; /* filthy hack to avoid warning on 'r' */
 } else if(write(conn_pipe1, &fd, sizeof(fd)) == -1) {
 	/* signal that a new file descriptor is available.
 	 * If it fails... */
@@ -1445,7 +1364,7 @@
 }
 
 /* read from disk database must be unlocked. */
-void database_init()
+static void database_init(void)
 {
 pthread_mutex_lock(&mailboxes_mutex); /* LOCK */
 
@@ -1456,16 +1375,24 @@
 }
 
 /* log change to database. database must be locked. */
-void database_log(const struct mbent *mb, struct txn **mytid)
+static void database_log(const struct mbent *mb, struct txn **mytid)
 {
+ mbentry_t *mbentry = NULL;
+
+ mbentry = mboxlist_entry_create();
+ mbentry->name = xstrdupnull(mb->mailbox);
+ mbentry->server = xstrdupnull(mb->server);
+ mbentry->acl = xstrdupnull(mb->acl);
+
 switch (mb->t) {
 case SET_ACTIVE:
-	mboxlist_insertremote(mb->mailbox, 0, mb->server, mb->acl, mytid);
+	mbentry->mbtype = 0;
+	mboxlist_insertremote(mbentry, mytid);
 	break;
 
 case SET_RESERVE:
-	mboxlist_insertremote(mb->mailbox, MBTYPE_RESERVE, mb->server,
-			 "", mytid);
+	mbentry->mbtype = MBTYPE_RESERVE;
+	mboxlist_insertremote(mbentry, mytid);
 	break;
 
 case SET_DELETE:
@@ -1477,49 +1404,61 @@
 	 mailbox can have! */
 	abort();
 }
+
+ mboxlist_entry_free(&mbentry);
 }
 
 /* lookup in database. database must be locked */
 /* This could probabally be more efficient and avoid some copies */
 /* passing in a NULL pool implies that we should use regular xmalloc,
 * a non-null pool implies we should use the mpool functionality */
-struct mbent *database_lookup(const char *name, struct mpool *pool) 
+static struct mbent *database_lookup(const char *name, struct mpool *pool)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 struct mbent *out;
+ char *server = NULL;
 int r;
- 
+
 if (!name) return NULL;
- 
- r = mboxlist_lookup(name, &mbentry, NULL);
 
- switch (r) {
- case IMAP_MAILBOX_RESERVED:
+ r = mboxlist_lookup_allow_reserved(name, &mbentry, NULL);
+ if (r) return NULL;
+
+ /* XXX - if mbtype & MBTYPE_DELETED, maybe set a delete */
+
+ if (mbentry->mbtype & MBTYPE_RESERVE) {
 	if(!pool) out = xmalloc(sizeof(struct mbent) + 1);
 	else out = mpool_malloc(pool, sizeof(struct mbent) + 1);
 	out->t = SET_RESERVE;
 	out->acl0 = '\0';
-	break;
-
- case 0:
-	if(!pool) out = xmalloc(sizeof(struct mbent) + strlen(mbentry.acl));
-	else out = mpool_malloc(pool, sizeof(struct mbent) + strlen(mbentry.acl));
+ }
+ else {
+	if(!pool) out = xmalloc(sizeof(struct mbent) + strlen(mbentry->acl));
+	else out = mpool_malloc(pool, sizeof(struct mbent) + strlen(mbentry->acl));
 	out->t = SET_ACTIVE;
-	strcpy(out->acl, mbentry.acl);
-	break;
-
- default:
-	return NULL;
+	strcpy(out->acl, mbentry->acl);
 }
 
+ if (mbentry->server && mbentry->partition)
+	server = strconcat(mbentry->server, "!", mbentry->partition, NULL);
+ else if (mbentry->server)
+	server = xstrdup(mbentry->server);
+ else if (mbentry->partition)
+	server = xstrdup(mbentry->partition);
+ else
+	server = xstrdup("");
+
 out->mailbox = (pool) ? mpool_strdup(pool, name) : xstrdup(name);
- out->server = (pool) ? mpool_strdup(pool, mbentry.partition) 
-			 : xstrdup(mbentry.partition);
+ out->server = (pool) ? mpool_strdup(pool, server)
+			 : xstrdup(server);
+
+ free(server);
+ mboxlist_entry_free(&mbentry);
 
 return out;
 }
 
-void cmd_authenticate(struct conn *C,
+static void cmd_authenticate(struct conn *C,
 		 const char *tag, const char *mech,
 		 const char *clientstart)
 {
@@ -1590,7 +1529,7 @@
 /* INVARIANT: caller MUST hold mailboxes_mutex */
 /* oldserver is the previous value of the server in this update,
 thisserver is the current value of the mailbox's server */
-void log_update(const char *mailbox,
+static void log_update(const char *mailbox,
 		const char *oldserver,
 		const char *thisserver) 
 {
@@ -1604,10 +1543,10 @@
 	
 	/* this might need to be inside the mutex, but I doubt it */
 	if(upc->streaming_hosts
-	 && (!oldserver || !stringlist_contains(upc->streaming_hosts,
-						 oldserver))
-	 && (!thisserver || !stringlist_contains(upc->streaming_hosts,
-						 thisserver))) {
+	 && (!oldserver || strarray_find(upc->streaming_hosts,
+						 oldserver, 0) < 0)
+	 && (!thisserver || strarray_find(upc->streaming_hosts,
+						 thisserver, 0) < 0)) {
 	 /* No Match! Continue! */
 	 continue;
 	}
@@ -1625,7 +1564,7 @@
 }
 }
 
-void cmd_set(struct conn *C, 
+static void cmd_set(struct conn *C,
 	 const char *tag, const char *mailbox,
 	 const char *server, const char *acl, enum settype t)
 {
@@ -1755,7 +1694,7 @@
 } 
 }
 
-void cmd_find(struct conn *C, const char *tag, const char *mailbox,
+static void cmd_find(struct conn *C, const char *tag, const char *mailbox,
 	 int send_ok, int send_delete)
 {
 struct mbent *m;
@@ -1823,7 +1762,7 @@
 	}
 	
 	if(!C->streaming_hosts ||
-	 stringlist_contains(C->streaming_hosts, server)) {
+	 strarray_find(C->streaming_hosts, server, 0) >= 0) {
 	 switch (m->t) {
 	 case SET_ACTIVE:
 		prot_printf(C->pout,
@@ -1856,7 +1795,7 @@
 return 0;
 }
 
-void cmd_list(struct conn *C, const char *tag, const char *host_prefix) 
+static void cmd_list(struct conn *C, const char *tag, const char *host_prefix)
 {
 char pattern2 = {'*','\0'};
 
@@ -1891,7 +1830,7 @@
 * we've registered this connection for streaming, and every X seconds
 * this will be invoked. note that we always send out updates as soon
 * as we get a noop: that resets this counter back */
-struct prot_waitevent *sendupdates_evt(struct protstream *s __attribute__((unused)), 
+static struct prot_waitevent *sendupdates_evt(struct protstream *s __attribute__((unused)),
 				 struct prot_waitevent *ev,
 				 void *rock)
 {
@@ -1903,8 +1842,8 @@
 return ev;
 }
 
-void cmd_startupdate(struct conn *C, const char *tag,
-		 struct stringlist *partial)
+static void cmd_startupdate(struct conn *C, const char *tag,
+		 strarray_t *partial)
 {
 char pattern2 = {'*','\0'};
 
@@ -1940,7 +1879,7 @@
 
 /* send out any pending updates.
 if 'flushnow' is set, flush the output buffer */
-void sendupdates(struct conn *C, int flushnow)
+static void sendupdates(struct conn *C, int flushnow)
 {
 struct pending *p, *q;
 
@@ -1973,7 +1912,7 @@
 }
 
 #ifdef HAVE_SSL
-void cmd_starttls(struct conn *C, const char *tag)
+static void cmd_starttls(struct conn *C, const char *tag)
 {
 int result;
 int *layerp;
@@ -2056,7 +1995,7 @@
 #endif /* HAVE_SSL */
 
 #ifdef HAVE_ZLIB
-void cmd_compress(struct conn *C, const char *tag, const char *alg)
+static void cmd_compress(struct conn *C, const char *tag, const char *alg)
 {
 if (C->compress_done) {
 	prot_printf(C->pout,
@@ -2277,7 +2216,7 @@
 
 /* Read a series of MAILBOX and RESERVE commands and tack them onto a
 * queue */
-int cmd_resync(struct mupdate_mailboxdata *mdata,
+static int cmd_resync(struct mupdate_mailboxdata *mdata,
 	 const char *rock, void *context)
 {
 struct sync_rock *r = (struct sync_rock *)context;
@@ -2432,10 +2371,13 @@
 			 l->mailbox );
 		 err++;
 		} else {
-		 mboxlist_insertremote(r->mailbox, 
-					 (r->t == SET_RESERVE ?
-					 MBTYPE_RESERVE : 0),
-					 r->server, r->acl, &tid);
+		 mbentry_t *mbentry = mboxlist_entry_create();
+		 mbentry->name = xstrdupnull(r->mailbox);
+		 mbentry->mbtype = (r->t == SET_RESERVE ? MBTYPE_RESERVE : 0);
+		 mbentry->server = xstrdupnull(r->server);
+		 mbentry->acl = xstrdupnull(r->acl);
+		 mboxlist_insertremote(mbentry, &tid);
+		 mboxlist_entry_free(&mbentry);
 		}
 	 }
 	 /* Okay, dump these two */
@@ -2466,10 +2408,13 @@
 	 local_boxes.head = l->next;
 	} else /* (ret > 0) */ {
 	 /* Remote without corresponding local, insert it */
-	 mboxlist_insertremote(r->mailbox, 
-				 (r->t == SET_RESERVE ?
-				 MBTYPE_RESERVE : 0),
-				 r->server, r->acl, &tid);
+	 mbentry_t *mbentry = mboxlist_entry_create();
+	 mbentry->name = xstrdupnull(r->mailbox);
+	 mbentry->mbtype = (r->t == SET_RESERVE ? MBTYPE_RESERVE : 0);
+	 mbentry->server = xstrdupnull(r->server);
+	 mbentry->acl = xstrdupnull(r->acl);
+	 mboxlist_insertremote(mbentry, &tid);
+	 mboxlist_entry_free(&mbentry);
 	 remote_boxes->head = r->next;
 	}
 }
@@ -2490,11 +2435,14 @@
 	}
 } else if (r && !l) {
 	/* we have more inserts to do */
-	while(r) {
-	 mboxlist_insertremote(r->mailbox, 
-				 (r->t == SET_RESERVE ?
-				 MBTYPE_RESERVE : 0),
-				 r->server, r->acl, &tid);
+	while (r) {
+	 mbentry_t *mbentry = mboxlist_entry_create();
+	 mbentry->name = xstrdupnull(r->mailbox);
+	 mbentry->mbtype = (r->t == SET_RESERVE ? MBTYPE_RESERVE : 0);
+	 mbentry->server = xstrdupnull(r->server);
+	 mbentry->acl = xstrdupnull(r->acl);
+	 mboxlist_insertremote(mbentry, &tid);
+	 mboxlist_entry_free(&mbentry);
 	 remote_boxes->head = r->next;
 	 r = remote_boxes->head;
 	}
@@ -2550,7 +2498,7 @@
 }
 
 /* Used to free malloc'd mbent's (not for mpool'd mbents) */
-void free_mbent(struct mbent *p) 
+void free_mbent(struct mbent *p)
 {
 if(!p) return;
 free(p->server);

cyrus-imapd-2.4.17.tar.gz/imap/mupdate.h -> cyrus-imapd-2.5.tar.gz/imap/mupdate.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/mupdate_err.et -> cyrus-imapd-2.5.tar.gz/imap/mupdate_err.et Changed

cyrus-imapd-2.4.17.tar.gz/imap/mutex.h -> cyrus-imapd-2.5.tar.gz/imap/mutex.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/mutex_fake.c -> cyrus-imapd-2.5.tar.gz/imap/mutex_fake.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/mutex_pthread.c -> cyrus-imapd-2.5.tar.gz/imap/mutex_pthread.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/nntp_err.et -> cyrus-imapd-2.5.tar.gz/imap/nntp_err.et Changed

cyrus-imapd-2.4.17.tar.gz/imap/nntpd.c -> cyrus-imapd-2.5.tar.gz/imap/nntpd.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: nntpd.c,v 1.83 2010/04/23 20:53:49 murch Exp $
 */
 
 /*
@@ -59,7 +57,6 @@
 #include <stdint.h>
 #endif
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -77,7 +74,6 @@
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
-#include "assert.h"
 #include "acl.h"
 #include "annotate.h"
 #include "append.h"
@@ -88,20 +84,19 @@
 #include "global.h"
 #include "hash.h"
 #include "idle.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "index.h"
-#include "iptostring.h"
 #include "mailbox.h"
 #include "map.h"
 #include "mboxlist.h"
 #include "mkgmtime.h"
 #include "mupdate-client.h"
-#include "nntp_err.h"
+#include "imap/nntp_err.h"
 #include "proc.h"
 #include "prot.h"
 #include "proxy.h"
 #include "retry.h"
-#include "rfc822date.h"
+#include "times.h"
 #include "smtpclient.h"
 #include "spool.h"
 #include "sync_log.h"
@@ -133,28 +128,26 @@
 static SSL *tls_conn;
 #endif /* HAVE_SSL */
 
-sasl_conn_t *nntp_saslconn; /* the sasl connection context */
+static sasl_conn_t *nntp_saslconn; /* the sasl connection context */
 
-int nntp_timeout;
-char newsprefix100 = "";
-struct wildmat *newsgroups = NULL;
-char *nntp_userid = 0, *newsmaster;
-struct auth_state *nntp_authstate = 0, *newsmaster_authstate;
-struct index_state *group_state;
-struct sockaddr_storage nntp_localaddr, nntp_remoteaddr;
-int nntp_haveaddr = 0;
-char nntp_clienthostNI_MAXHOST*2+1 = "local";
-struct protstream *nntp_out = NULL;
-struct protstream *nntp_in = NULL;
-struct protgroup *protin = NULL;
+static int nntp_timeout;
+static char newsprefix100 = "";
+static struct wildmat *newsgroups = NULL;
+static char *nntp_userid = 0, *newsmaster;
+static struct auth_state *nntp_authstate = 0, *newsmaster_authstate;
+static struct index_state *group_state;
+static const char *nntp_clienthost = "local";
+static struct protstream *nntp_out = NULL;
+static struct protstream *nntp_in = NULL;
+static struct protgroup *protin = NULL;
 static int nntp_logfd = -1;
-unsigned nntp_exists = 0;
-unsigned nntp_current = 0;
-unsigned did_capabilities = 0;
-int allowanonymous = 0;
-int singleinstance = 1;	/* attempt single instance store */
+static unsigned nntp_exists = 0;
+static unsigned nntp_current = 0;
+static unsigned did_capabilities = 0;
+static int allowanonymous = 0;
+static int singleinstance = 1;	/* attempt single instance store */
 
-struct stagemsg *stage = NULL;
+static struct stagemsg *stage = NULL;
 
 /* Bitmasks for NNTP modes */
 enum {
@@ -166,7 +159,7 @@
 
 static sasl_ssf_t extprops_ssf = 0;
 static int nntps = 0;
-int nntp_starttls_done = 0;
+static int nntp_starttls_done = 0;
 
 /* the sasl proxy policy context */
 static struct proxy_context nntp_proxyctx = {
@@ -196,21 +189,13 @@
 };
 
 /* response codes for each stage of posting */
-struct {
+static struct {
 int ok, cont, no, fail;
 } post_codes = { { 240, 340, 440, 441 },
 		 { 235, 335, 435, 436 },
 		 { -1, 238, 438, -1 },
 		 { 239, -1, -1, 439 } };
 
-struct wildmat {
- char *pat;
- int not;
-};
-
-static struct wildmat *split_wildmats(char *str);
-static void free_wildmats(struct wildmat *wild);
-
 static void cmdloop(void);
 static int open_group(char *name, int has_prefix,
 		 struct backend **ret, int *postable);
@@ -233,7 +218,7 @@
 static void cmd_over(char *msgid, unsigned long uid, unsigned long last);
 static void cmd_post(char *msgid, int mode);
 static void cmd_starttls(int nntps);
-void usage(void);
+static void usage(void);
 void shut_down(int code) __attribute__ ((noreturn));
 
 extern int saslserver(sasl_conn_t *conn, const char *mech,
@@ -270,48 +255,41 @@
 }
 
 static struct protocol_t nntp_protocol =
-{ "nntp", "nntp",
- { 0, "20" },
- { "CAPABILITIES", NULL, ".", NULL,
- { { "SASL ", CAPA_AUTH },
- { "STARTTLS", CAPA_STARTTLS },
- { NULL, 0 } } },
- { "STARTTLS", "382", "580", 0 },
- { "AUTHINFO SASL", 512, 0, "28", "48", "383 ", "*", &nntp_parsesuccess, 0 },
- { NULL, NULL, NULL },
- { "DATE", NULL, "111" },
- { "QUIT", NULL, "205" }
+{ "nntp", "nntp", TYPE_STD,
+ { { { 0, "20" },
+ { "CAPABILITIES", NULL, ".", NULL,
+	CAPAF_ONE_PER_LINE,
+	{ { "SASL ", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { NULL, 0 } } },
+ { "STARTTLS", "382", "580", 0 },
+ { "AUTHINFO SASL", 512, 0, "28", "48", "383 ", "*", &nntp_parsesuccess, 0 },
+ { NULL, NULL, NULL },
+ { "DATE", NULL, "111" },
+ { "QUIT", NULL, "205" } } }
 };
 
 /* proxy mboxlist_lookup; on misses, it asks the listener for this
 machine to make a roundtrip to the master mailbox server to make
 sure it's up to date */
-static int mlookup(const char *name, char **server, char **aclp, void *tid)
+static int mlookup(const char *name, mbentry_t **mbentryptr)
 {
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 int r;
 
- r = mboxlist_lookup(name, &mbentry, tid);
+ r = mboxlist_lookup(name, &mbentry, NULL);
 if (r == IMAP_MAILBOX_NONEXISTENT && config_mupdate_server) {
 	kick_mupdate();
-	r = mboxlist_lookup(name, &mbentry, tid);
+	mboxlist_entry_free(&mbentry);
+	r = mboxlist_lookup(name, &mbentry, NULL);
 }
 if (r) return r;
- if (mbentry.mbtype & MBTYPE_RESERVE) return IMAP_MAILBOX_RESERVED;
- if (mbentry.mbtype & MBTYPE_MOVING) return IMAP_MAILBOX_MOVED;
- if (mbentry.mbtype & MBTYPE_DELETED) return IMAP_MAILBOX_NONEXISTENT;
-
- if (aclp) *aclp = mbentry.acl;
-
- if (server) {
-	*server = NULL;
-	if (mbentry.mbtype & MBTYPE_REMOTE) {
-	 char *c;
-	 *server = mbentry.partition;
-	 c = strchr(*server, '!');
-	 if(c) *c = '\0';
-	}
- }
+ if (mbentry->mbtype & MBTYPE_RESERVE) r = IMAP_MAILBOX_RESERVED;
+ if (mbentry->mbtype & MBTYPE_MOVING) r = IMAP_MAILBOX_MOVED;
+ if (mbentry->mbtype & MBTYPE_DELETED) r = IMAP_MAILBOX_NONEXISTENT;
+
+ if (mbentryptr && !r) *mbentryptr = mbentry;
+ else mboxlist_entry_free(&mbentry);
 
 return r;
 }
@@ -403,7 +381,7 @@
 
 cyrus_reset_stdio();
 
- strcpy(nntp_clienthost, "local");
+ nntp_clienthost = "local";
 if (nntp_logfd != -1) {
 	close(nntp_logfd);
 	nntp_logfd = -1;
@@ -467,10 +445,11 @@
 if ((prefix = config_getstring(IMAPOPT_NEWSPREFIX)))
 	snprintf(newsprefix, sizeof(newsprefix), "%s.", prefix);
 
- newsgroups = split_wildmats((char *) config_getstring(IMAPOPT_NEWSGROUPS));
+ newsgroups = split_wildmats((char *) config_getstring(IMAPOPT_NEWSGROUPS),
+				config_getstring(IMAPOPT_NEWSPREFIX));
 
 /* initialize duplicate delivery database */
- if (duplicate_init(NULL, 0) != 0) {
+ if (duplicate_init(NULL) != 0) {
 	syslog(LOG_ERR, 
 	 "unable to init duplicate delivery database\n");
 	fatal("unable to init duplicate delivery database", EC_SOFTWARE);
@@ -486,10 +465,10 @@
 
 /* open the user deny db */
 denydb_init(0);
- denydb_open(NULL);
+ denydb_open(0);
 
 /* setup for sending IMAP IDLE notifications */
- idle_enabled();
+ idle_init();
 
 while ((opt = getopt(argc, argv, "srfp:")) != EOF) {
 	switch(opt) {
@@ -520,8 +499,8 @@
 }
 
 /* Initialize the annotatemore extention */
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 newsmaster = (char *) config_getstring(IMAPOPT_NEWSMASTER);
 newsmaster_authstate = auth_newstate(newsmaster);
@@ -541,10 +520,7 @@
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
- socklen_t salen;
- char localip60, remoteip60;
- char hbufNI_MAXHOST;
- int niflags;
+ const char *localip, *remoteip;
 sasl_security_properties_t *secprops=NULL;
 int shutdown;
 char unavail1024;
@@ -558,37 +534,7 @@
 protgroup_insert(protin, nntp_in);
 
 /* Find out name of client host */
- salen = sizeof(nntp_remoteaddr);
- if (getpeername(0, (struct sockaddr *)&nntp_remoteaddr, &salen) == 0 &&
-	(nntp_remoteaddr.ss_family == AF_INET ||
-	 nntp_remoteaddr.ss_family == AF_INET6)) {
-	if (getnameinfo((struct sockaddr *)&nntp_remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-	 strncpy(nntp_clienthost, hbuf, sizeof(hbuf));
-	 strlcat(nntp_clienthost, " ", sizeof(nntp_clienthost));
-	 nntp_clienthostsizeof(nntp_clienthost)-30 = '\0';
-	} else {
-	 nntp_clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&nntp_remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&nntp_remoteaddr, salen, hbuf,
-			sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(nntp_clienthost, "", sizeof(nntp_clienthost));
-	strlcat(nntp_clienthost, hbuf, sizeof(nntp_clienthost));
-	strlcat(nntp_clienthost, "", sizeof(nntp_clienthost));
-	salen = sizeof(nntp_localaddr);
-	if (getsockname(0, (struct sockaddr *)&nntp_localaddr, &salen) == 0) {
-	 nntp_haveaddr = 1;
-	}
-
-	/* Create pre-authentication telemetry log based on client IP */
-	nntp_logfd = telemetry_log(hbuf, nntp_in, nntp_out, 0);
- }
+ nntp_clienthost = get_clienthost(0, &localip, &remoteip);
 
 /* other params should be filled in */
 if (sasl_server_new("nntp", config_servername, NULL, NULL, NULL,
@@ -600,19 +546,22 @@
 sasl_setprop(nntp_saslconn, SASL_SEC_PROPS, secprops);
 sasl_setprop(nntp_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf);
 
- if(iptostring((struct sockaddr *)&nntp_localaddr, salen,
-		 localip, 60) == 0) {
+ if (localip) {
 	sasl_setprop(nntp_saslconn, SASL_IPLOCALPORT, localip);
 	saslprops.iplocalport = xstrdup(localip);
 }
 
- if(iptostring((struct sockaddr *)&nntp_remoteaddr, salen,
-		 remoteip, 60) == 0) {
+ if (remoteip) {
+	char hbufNI_MAXHOST, *p;
+
 	sasl_setprop(nntp_saslconn, SASL_IPREMOTEPORT, remoteip); 
 	saslprops.ipremoteport = xstrdup(remoteip);
- }
 
- proc_register("nntpd", nntp_clienthost, NULL, NULL);
+	/* Create pre-authentication telemetry log based on client IP */
+	strlcpy(hbuf, remoteip, NI_MAXHOST);
+	if ((p = strchr(hbuf, ';'))) *p = '\0';
+	nntp_logfd = telemetry_log(hbuf, nntp_in, nntp_out, 0);
+ }
 
 /* Set inactivity timer */
 nntp_timeout = config_getint(IMAPOPT_NNTPTIMEOUT);
@@ -660,7 +609,7 @@
 shut_down(error);
 }
 
-void usage(void)
+static void usage(void)
 {
 prot_printf(nntp_out, "503 usage: nntpd -C <alt_config> -s\r\n");
 prot_flush(nntp_out);
@@ -706,7 +655,9 @@
 denydb_done();
 
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
+
+ idle_done();
 
 if (nntp_in) {
 	prot_NONBLOCK(nntp_in);
@@ -732,7 +683,7 @@
 exit(code);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 
@@ -852,6 +803,8 @@
 
 	signals_poll();
 
+	proc_register(config_ident, nntp_clienthost, nntp_userid, index_mboxname(group_state), NULL);
+
 	if (!proxy_check_input(protin, nntp_in, nntp_out,
 			 backend_current ? backend_current->in : NULL,
 			 NULL, 0)) {
@@ -865,7 +818,7 @@
 		/* Mailbox has been (re)moved */
 		syslog(LOG_WARNING,
 		 "Newsgroup %s has been (re)moved out from under client",
-		 group_state->mailbox->name);
+		 group_state->mboxname);
 		prot_printf(nntp_out,
 			 "400 Newsgroup has been (re)moved\r\n");
 		shut_down(0);
@@ -893,15 +846,17 @@
 	 if (Uisupper(*p)) *p = tolower((unsigned char) *p);
 	}
 
+	proc_register(config_ident, nntp_clienthost, nntp_userid, index_mboxname(group_state), cmd.s);
+
 	/* Ihave/Takethis only allowed for feeders */
 	if (!(nntp_capa & MODE_FEED) &&
 	 strchr("IT", cmd.s0)) goto noperm;
- 
+
 	/* Body/Date/Group/Newgroups/Newnews/Next/Over/Post/Xhdr/Xover/Xpat
 	 only allowed for readers */
 	if (!(nntp_capa & MODE_READ) &&
 	 strchr("BDGNOPX", cmd.s0)) goto noperm;
- 
+
 	/* Only Authinfo/Capabilities/Check/Head/Help/Ihave/List Active/
 	 Mode/Quit/Starttls/Stat/Takethis allowed when not logged in */
 	if (!nntp_authstate && !allowanonymous &&
@@ -909,7 +864,7 @@
 
 	/* In case a LISTGROUP fails or
 	 a retrieval by msgid makes us switch groups */
-	strcpy(curgroup, group_state ? group_state->mailbox->name : "");
+	strcpy(curgroup, group_state ? group_state->mboxname : "");
 
 	switch (cmd.s0) {
 	case 'A':
@@ -1069,7 +1024,7 @@
 		be = backend_current;
 		if (arg1.len &&
 		 (!is_newsgroup(arg1.s) ||
-		 (r = open_group(arg1.s, 1, &be, NULL)))) goto nogroup;
+		 (r = open_group(arg1.s, 0, &be, NULL)))) goto nogroup;
 		else if (be) {
 		 prot_printf(be->out, "%s", cmd.s);
 		 if (arg1.len) {
@@ -1117,7 +1072,7 @@
 				group_state->last_uid+1,
 				nntp_exists ? index_getuid(group_state, nntp_exists) :
 				group_state->last_uid,
-				group_state->mailbox->name + strlen(newsprefix));
+				group_state->mboxname + strlen(newsprefix));
 
 		 if (LISTGROUP) {
 			int msgno, last_msgno;
@@ -1545,7 +1500,7 @@
 prevgroup:
 	/* Return to previously selected group */
 	if (*curgroup &&
-	 (!group_state || strcmp(curgroup, group_state->mailbox->name))) {
+	 (!group_state || strcmp(curgroup, group_state->mboxname))) {
 	 open_group(curgroup, 1, NULL, NULL);
 	}
 
@@ -1569,27 +1524,26 @@
 unsigned long uid;
 };
 
-static int find_cb(const char *msgid __attribute__((unused)),
-		 const char *mailbox,
+static int find_cb(const duplicate_key_t *dkey,
 		 time_t mark __attribute__((unused)),
 		 unsigned long uid, void *rock)
 {
 struct findrock *frock = (struct findrock *) rock;
 
 /* skip mailboxes that we don't serve as newsgroups */
- if (!is_newsgroup(mailbox)) return 0;
+ if (!is_newsgroup(dkey->to)) return 0;
 
- frock->mailbox = mailbox;
+ frock->mailbox = dkey->to;
 frock->uid = uid;
 
 return CYRUSDB_DONE;
 }
 
-static int find_msgid(char *msgid, char **mailbox, uint32_t *uid)
+static int my_find_msgid(char *msgid, char **mailbox, uint32_t *uid)
 {
 struct findrock frock = { NULL, 0 };
 
- duplicate_find(msgid, &find_cb, &frock);
+ duplicate_find(msgid, find_cb, &frock);
 
 if (!frock.mailbox) return 0;
 
@@ -1654,17 +1608,18 @@
 else if (*str == '<') {
 	/* message-id, find server and/or mailbox */
 	if (!msgid) goto badrange;
-	if (!find_msgid(str, &mboxname, uid)) goto nomsgid;
+	if (!my_find_msgid(str, &mboxname, uid)) goto nomsgid;
 
 	*msgid = str;
 
 	/* open group if its different from our current one */
-	if (!group_state || strcmp(mboxname, group_state->mailbox->name)) {
+	if (!group_state || strcmp(mboxname, group_state->mboxname)) {
 	 if ((r = open_group(mboxname, 1, ret, NULL))) goto nomsgid;
 	}
 }
- else if (backend_current)
-	*ret = backend_current;
+ else if (backend_current) {
+	if (ret) *ret = backend_current;
+ }
 else if (!group_state) goto noopengroup;
 else if (parseuint32(str, &p, uid) || uid == 0) goto badrange;
 else if (p && *p) {
@@ -1717,6 +1672,8 @@
 char *p;
 struct tm tm;
 
+ memset(&tm, 0, sizeof(tm));
+
 /* check format of strings */
 if ((datelen != 6 && datelen != 8) ||
 	strlen(timestr) != 6 || (gmt && strcasecmp(gmt, "GMT")))
@@ -1774,7 +1731,7 @@
 {
 char mailboxnameMAX_MAILBOX_BUFFER;
 int r = 0;
- char *acl, *newserver;
+ mbentry_t *mbentry = NULL;
 struct backend *backend_next = NULL;
 
 /* close local group */
@@ -1786,10 +1743,10 @@
 	name = mailboxname;
 }
 
- if (!r) r = mlookup(name, &newserver, &acl, NULL);
+ if (!r) r = mlookup(name, &mbentry);
 
- if (!r && acl) {
-	int myrights = cyrus_acl_myrights(nntp_authstate, acl);
+ if (!r && mbentry->acl) {
+	int myrights = cyrus_acl_myrights(nntp_authstate, mbentry->acl);
 
 	if (postable) *postable = myrights & ACL_POST;
 	if (!postable && /* allow limited 'r' for LIST ACTIVE */
@@ -1799,14 +1756,18 @@
 	}
 }
 
- if (r) return r;
+ if (r) {
+	mboxlist_entry_free(&mbentry);
+	return r;
+ }
 
- if (newserver) {
+ if (mbentry->server) {
 	/* remote group */
-	backend_next = proxy_findserver(newserver, &nntp_protocol,
+	backend_next = proxy_findserver(mbentry->server, &nntp_protocol,
 					nntp_authstate ? nntp_userid : "anonymous",
 					&backend_cached, &backend_current,
 					NULL, nntp_in);
+	mboxlist_entry_free(&mbentry);
 	if (!backend_next) return IMAP_SERVER_UNAVAILABLE;
 
 	*ret = backend_next;
@@ -1814,6 +1775,8 @@
 else {
 	/* local group */
 	struct index_init init;
+
+	mboxlist_entry_free(&mbentry);
 	memset(&init, 0, sizeof(struct index_init));
 	init.userid = nntp_authstate ? nntp_userid : NULL;
 	init.authstate = nntp_authstate;
@@ -1891,23 +1854,16 @@
 /*
 * duplicate_find() callback function to build Xref content
 */
-struct xref_rock {
- char *buf;
- size_t size;
-};
-
-static int xref_cb(const char *msgid __attribute__((unused)),
-		 const char *mailbox,
+static int xref_cb(const duplicate_key_t *dkey,
 		 time_t mark __attribute__((unused)),
 		 unsigned long uid, void *rock)
 {
- struct xref_rock *xrock = (struct xref_rock *) rock;
- size_t len = strlen(xrock->buf);
+ struct buf *buf = (struct buf *)rock;
 
 /* skip mailboxes that we don't serve as newsgroups */
- if (is_newsgroup(mailbox)) {
-	snprintf(xrock->buf + len, xrock->size - len,
-		 " %s:%lu", mailbox + strlen(newsprefix), uid);
+ if (is_newsgroup(dkey->to)) {
+	buf_printf(buf,
+		 " %s:%lu", dkey->to + strlen(newsprefix), uid);
 }
 
 return 0;
@@ -1917,19 +1873,20 @@
 * Build an Xref header. We have to do this on the fly because there is
 * no way to store it in the article at delivery time.
 */
-static void build_xref(char *msgid, char *buf, size_t size, int body_only)
+static void build_xref(const char *msgid, struct buf *buf, int body_only)
 {
- struct xref_rock xrock = { buf, size };
-
- snprintf(buf, size, "%s%s", body_only ? "" : "Xref: ", config_servername);
- duplicate_find(msgid, &xref_cb, &xrock);
+ if (!body_only)
+	buf_appendcstr(buf, "Xref: ");
+ buf_appendcstr(buf, config_servername);
+ duplicate_find(msgid, xref_cb, buf);
 }
 
 static void cmd_article(int part, char *msgid, unsigned long uid)
 {
 int msgno, by_msgid = (msgid != NULL);
- char *fname;
+ const char *fname;
 FILE *msgfile;
+ message_t *msg;
 
 msgno = index_finduid(group_state, uid);
 if (!msgno || index_getuid(group_state, msgno) != uid) {
@@ -1937,7 +1894,17 @@
 	return;
 }
 
- fname = mailbox_message_fname(group_state->mailbox, uid);
+ msg = index_get_message(group_state, msgno);
+
+ if (!msg) {
+	prot_printf(nntp_out, "502 Could not read index record\r\n");
+	return;
+ }
+
+ if (message_get_fname(msg, &fname)) {
+	prot_printf(nntp_out, "502 Could not read index record\r\n");
+	return;
+ }
 
 msgfile = fopen(fname, "r");
 if (!msgfile) {
@@ -1964,10 +1931,11 @@
 		body = 1;
 		if (output) {
 		 /* add the Xref header */
-		 char xref8192;
+		 struct buf xref = BUF_INITIALIZER;
 
-		 build_xref(msgid, xref, sizeof(xref), 0);
-		 prot_printf(nntp_out, "%s\r\n", xref);
+		 build_xref(msgid, &xref, 0);
+		 prot_printf(nntp_out, "%s\r\n", buf_cstring(&xref));
+		 buf_free(&xref);
 		}
 		if (part == ARTICLE_HEAD) {
 		 /* we're done */
@@ -2006,7 +1974,7 @@
 
 static void cmd_authinfo_user(char *user)
 {
- char *p;
+ const char *p;
 
 if (nntp_authstate) {
 	prot_printf(nntp_out, "502 Already authenticated\r\n");
@@ -2041,12 +2009,16 @@
 static void cmd_authinfo_pass(char *pass)
 {
 int failedloginpause;
+ int r;
+
 /* Conceal password in telemetry log */
 if (nntp_logfd != -1 && pass) {
-	int r; /* avoid warnings */
 	r = ftruncate(nntp_logfd,
 		 lseek(nntp_logfd, -2, SEEK_CUR) - strlen(pass));
-	r = write(nntp_logfd, "...\r\n", 5);
+	if (!r)
+	 r = write(nntp_logfd, "...\r\n", 5);
+	if (r < 0)
+	 syslog(LOG_ERR, "IOERROR: cannot conceal password in telemetry log: %m");
 }
 
 if (nntp_authstate) {
@@ -2118,13 +2090,14 @@
 char *ssfmsg = NULL;
 const void *val;
 int failedloginpause;
+ struct proc_limits limits;
 
 /* Conceal initial response in telemetry log */
 if (nntp_logfd != -1 && resp) {
-	int r; /* avoid warnings */
 	r = ftruncate(nntp_logfd,
 		 lseek(nntp_logfd, -2, SEEK_CUR) - strlen(resp));
 	r = write(nntp_logfd, "...\r\n", 5);
+	r = 0;
 }
 
 if (nntp_userid) {
@@ -2246,11 +2219,6 @@
 }
 nntp_userid = xstrdup((const char *) val);
 
- proc_register("nntpd", nntp_clienthost, nntp_userid, NULL);
-
- syslog(LOG_NOTICE, "login: %s %s %s%s %s", nntp_clienthost, nntp_userid,
-	 mech, nntp_starttls_done ? "+TLS" : "", "User logged in");
-
 sasl_getprop(nntp_saslconn, SASL_SSF, &val);
 ssf = *((sasl_ssf_t *) val);
 
@@ -2270,6 +2238,32 @@
 	}
 }
 
+ limits.procname = "nntpd";
+ limits.clienthost = nntp_clienthost;
+ limits.userid = nntp_userid;
+ if (proc_checklimits(&limits)) {
+	const char *sep = "";
+	prot_printf(nntp_out,
+		 "452 Too many open connections (");
+	if (limits.maxhost) {
+	 prot_printf(nntp_out, "%s%d of %d from %s", sep,
+			limits.host, limits.maxhost, nntp_clienthost);
+	 sep = ", ";
+	}
+	if (limits.maxuser) {
+	 prot_printf(nntp_out, "%s%d of %d for %s", sep,
+			limits.user, limits.maxuser, nntp_userid);
+	}
+	prot_printf(nntp_out, ")\r\n");
+	reset_saslconn(&nntp_saslconn);
+	free(nntp_userid);
+	nntp_userid = NULL;
+	return;
+ }
+
+ syslog(LOG_NOTICE, "login: %s %s %s%s %s", nntp_clienthost, nntp_userid,
+	 mech, nntp_starttls_done ? "+TLS" : "", "User logged in");
+
 if (success_data) {
 	prot_printf(nntp_out, "283 %s\r\n", success_data);
 	free(success_data);
@@ -2318,15 +2312,16 @@
 	/* see if we're looking for metadata */
 	if (hdr0 == ':') {
 	 if (!strcasecmp(":bytes", hdr)) {
-		char xref8192;
+		struct buf xref = BUF_INITIALIZER;
 		unsigned long size = index_getsize(group_state, msgno);
 
 		if (!by_msgid) msgid = index_get_msgid(group_state, msgno);
-		build_xref(msgid, xref, sizeof(xref), 0);
+		build_xref(msgid, &xref, 0);
 		if (!by_msgid) free(msgid);
 
 		prot_printf(nntp_out, "%lu %lu\r\n", by_msgid ? 0 : uid,
-			 size + strlen(xref) + 2); /* +2 for \r\n */
+			 size + xref.len + 2); /* +2 for \r\n */
+		buf_free(&xref);
 	 }
 	 else if (!strcasecmp(":lines", hdr))
 		prot_printf(nntp_out, "%u %lu\r\n",
@@ -2337,14 +2332,16 @@
 			 by_msgid ? 0 : index_getuid(group_state, msgno));
 	}
 	else if (!strcmp(hdr, "xref") && !pat /* XHDR only */) {
-	 char xref8192;
+	 struct buf xref = BUF_INITIALIZER;
 
 	 if (!by_msgid) msgid = index_get_msgid(group_state, msgno);
-	 build_xref(msgid, xref, sizeof(xref), 1);
+	 build_xref(msgid, &xref, 1);
 	 if (!by_msgid) free(msgid);
 
 	 prot_printf(nntp_out, "%u %s\r\n",
-			by_msgid ? 0 : index_getuid(group_state, msgno), xref);
+			by_msgid ? 0 : index_getuid(group_state, msgno),
+			buf_cstring(&xref));
+	 buf_free(&xref);
 	}
 	else if ((body = index_getheader(group_state, msgno, hdr)) &&
 		 (!pat ||			/* XHDR */
@@ -2454,7 +2451,7 @@
 }
 
 struct list_rock {
- int (*proc)();
+ int (*proc)(char *, void *);
 struct wildmat *wild;
 struct hash_table server_table;
 };
@@ -2462,8 +2459,8 @@
 /*
 * mboxlist_findall() callback function to LIST
 */
-int list_cb(char *name, int matchlen, int maycreate __attribute__((unused)),
-	 void *rock)
+static int list_cb(char *name, int matchlen,
+		 int maycreate __attribute__((unused)), void *rock)
 {
 static char lastnameMAX_MAILBOX_BUFFER;
 struct list_rock *lrock = (struct list_rock *) rock;
@@ -2505,7 +2502,7 @@
 /*
 * hash_enumerate() callback function to LIST (proxy)
 */
-void list_proxy(char *server, void *data __attribute__((unused)), void *rock)
+static void list_proxy(const char *server, void *data __attribute__((unused)), void *rock)
 {
 struct enum_rock *erock = (struct enum_rock *) rock;
 struct backend *be;
@@ -2530,7 +2527,7 @@
 /*
 * perform LIST ACTIVE (backend) or create a server hash table (proxy)
 */
-int do_active(char *name, void *rock)
+static int do_active(char *name, void *rock)
 {
 struct list_rock *lrock = (struct list_rock *) rock;
 int r, postable;
@@ -2548,7 +2545,7 @@
 	}
 }
 else {
-	prot_printf(nntp_out, "%s %u %u %c\r\n", name,
+	prot_printf(nntp_out, "%s %u %u %c\r\n", name+strlen(newsprefix),
 		 group_state->exists ? index_getuid(group_state, group_state->exists) :
 		 group_state->mailbox->i.last_uid,
 		 group_state->exists ? index_getuid(group_state, 1) :
@@ -2563,26 +2560,31 @@
 /*
 * perform LIST NEWSGROUPS (backend) or create a server hash table (proxy)
 */
-int do_newsgroups(char *name, void *rock)
+static int do_newsgroups(char *name, void *rock)
 {
 struct list_rock *lrock = (struct list_rock *) rock;
- char *acl, *server;
+ mbentry_t *mbentry = NULL;
 int r;
 
- r = mlookup(name, &server, &acl, NULL);
+ r = mlookup(name, &mbentry);
 
- if (r || !acl || !(cyrus_acl_myrights(nntp_authstate, acl) && ACL_LOOKUP))
+ if (r || !mbentry->acl ||
+	!(cyrus_acl_myrights(nntp_authstate, mbentry->acl) && ACL_LOOKUP)) {
+	mboxlist_entry_free(&mbentry);
 	return 0;
+ }
 
- if (server) {
+ if (mbentry->server) {
 	/* remote group */
-	if (!hash_lookup(server, &lrock->server_table)) {
+	if (!hash_lookup(mbentry->server, &lrock->server_table)) {
 	 /* add this server to our table */
-	 hash_insert(server, (void *)0xDEADBEEF, &lrock->server_table);
+	 hash_insert(mbentry->server, (void *)0xDEADBEEF, &lrock->server_table);
 	}
+	mboxlist_entry_free(&mbentry);
 }
 else {
 	/* local group */
+	mboxlist_entry_free(&mbentry);
 	return CYRUSDB_DONE;
 }
 
@@ -2592,10 +2594,11 @@
 /*
 * annotatemore_findall() callback function to LIST NEWSGROUPS
 */
-int newsgroups_cb(const char *mailbox,
+static int newsgroups_cb(const char *mailbox,
+		 uint32_t uid __attribute__((unused)),
 		 const char *entry __attribute__((unused)),
 		 const char *userid,
-		 struct annotation_data *attrib, void *rock)
+		 const struct buf *value, void *rock)
 {
 struct wildmat *wild = (struct wildmat *) rock;
 
@@ -2615,7 +2618,7 @@
 if (userid0) return 0;
 
 prot_printf(nntp_out, "%s\t%s\r\n", mailbox+strlen(newsprefix),
-		attrib->value);
+		value->s);
 
 return 0;
 }
@@ -2638,7 +2641,8 @@
 	erock.wild = xstrdup(arg2); /* make a copy before we munge it */
 
 	lrock.proc = do_active;
-	lrock.wild = split_wildmats(arg2); /* split the list of wildmats */
+	/* split the list of wildmats */
+	lrock.wild = split_wildmats(arg2, config_getstring(IMAPOPT_NEWSPREFIX));
 
 	/* xxx better way to determine a size for this table? */
 	construct_hash_table(&lrock.server_table, 10, 1);
@@ -2698,7 +2702,8 @@
 	erock.wild = xstrdup(arg2); /* make a copy before we munge it */
 
 	lrock.proc = do_newsgroups;
-	lrock.wild = split_wildmats(arg2); /* split the list of wildmats */
+	/* split the list of wildmats */
+	lrock.wild = split_wildmats(arg2, config_getstring(IMAPOPT_NEWSPREFIX));
 
 	/* xxx better way to determine a size for this table? */
 	construct_hash_table(&lrock.server_table, 10, 1);
@@ -2717,8 +2722,8 @@
 
 	strcpy(pattern, newsprefix);
 	strcat(pattern, "*");
-	annotatemore_findall(pattern, "/comment",
-			 newsgroups_cb, lrock.wild, NULL);
+	annotatemore_findall(pattern, 0, "/comment",
+			 newsgroups_cb, lrock.wild);
 
 	prot_printf(nntp_out, ".\r\n");
 
@@ -2812,37 +2817,29 @@
 struct newrock {
 time_t tstamp;
 struct wildmat *wild;
+ char lastid1024;
 };
 
-static int newnews_cb(const char *msgid, const char *rcpt, time_t mark,
+static int newnews_cb(const duplicate_key_t *dkey, time_t mark,
 		 unsigned long uid, void *rock)
 {
- static char lastid1024;
 struct newrock *nrock = (struct newrock *) rock;
 
- /* We have to reset the initial state.
- * Handle it as a dirty hack.
- */
- if (!msgid) {
-	lastid0 = '\0';
-	return 0;
- }
-
 /* Make sure we don't return duplicate msgids,
 * the message is newer than the tstamp, and
 * the message is in mailbox we serve as a newsgroup..
 */
- if (strcmp(msgid, lastid) && mark >= nrock->tstamp &&
-	uid && is_newsgroup(rcpt)) {
+ if (strcmp(dkey->id, nrock->lastid) && mark >= nrock->tstamp &&
+	uid && is_newsgroup(dkey->to)) {
 	struct wildmat *wild = nrock->wild;
 
 	/* see if the mailbox matches one of our specified wildmats */
-	while (wild->pat && wildmat(rcpt, wild->pat) != 1) wild++;
+	while (wild->pat && wildmat(dkey->to, wild->pat) != 1) wild++;
 
 	/* we have a match, and its not a negative match */
 	if (wild->pat && !wild->not) {
-	 prot_printf(nntp_out, "%s\r\n", msgid);
-	 strlcpy(lastid, msgid, sizeof(lastid));
+	 prot_printf(nntp_out, "%s\r\n", dkey->id);
+	 strlcpy(nrock->lastid, dkey->id, sizeof(nrock->lastid));
 	}
 }
 
@@ -2853,13 +2850,13 @@
 {
 struct newrock nrock;
 
+ memset(&nrock, 0, sizeof(nrock));
 nrock.tstamp = tstamp;
- nrock.wild = split_wildmats(wild);
+ nrock.wild = split_wildmats(wild, config_getstring(IMAPOPT_NEWSPREFIX));
 
 prot_printf(nntp_out, "230 List of new articles follows:\r\n");
 
- newnews_cb(NULL, NULL, 0, 0, NULL);
- duplicate_find("", &newnews_cb, &nrock);
+ duplicate_find("", newnews_cb, &nrock);
 
 prot_printf(nntp_out, ".\r\n");
 
@@ -2881,9 +2878,9 @@
 	 prot_printf(nntp_out, "224 Overview information follows:\r\n");
 
 	if ((over = index_overview(group_state, msgno))) {
-	 char xref8192;
+	 struct buf xref = BUF_INITIALIZER;
 
-	 build_xref(over->msgid, xref, sizeof(xref), 0);
+	 build_xref(over->msgid, &xref, 0);
 
 	 prot_printf(nntp_out, "%lu\t%s\t%s\t%s\t%s\t%s\t%lu\t%lu\t%s\r\n",
 			msgid ? 0 : over->uid,
@@ -2892,8 +2889,9 @@
 			over->date ? over->date : "",
 			over->msgid ? over->msgid : "",
 			over->ref ? over->ref : "",
-			over->bytes + strlen(xref) + 2, /* +2 for \r\n */
-			over->lines, xref);
+			over->bytes + xref.len + 2, /* +2 for \r\n */
+			over->lines, buf_cstring(&xref));
+	 buf_free(&xref);
 	}
 }
 
@@ -2916,16 +2914,14 @@
 char *path;			/* path */
 char *control;		/* control message */
 unsigned long size;		/* size of message in bytes */
-
- char **rcpt;		/* mailboxes to post message */
- int rcpt_num;		/* number of groups */
- char *date;		/* date field of header */ 
+ strarray_t rcpt;		/* mailboxes to post message */
+ char *date;			/* date field of header */ 
 
 hdrcache_t hdrcache;
 };
 
 /* returns non-zero on failure */
-int msg_new(message_data_t **m)
+static int msg_new(message_data_t **m)
 {
 message_data_t *ret = (message_data_t *) xmalloc(sizeof(message_data_t));
 
@@ -2935,8 +2931,7 @@
 ret->path = NULL;
 ret->control = NULL;
 ret->size = 0;
- ret->rcpt = NULL;
- ret->rcpt_num = 0;
+ strarray_init(&ret->rcpt);
 ret->date = NULL;
 
 ret->hdrcache = spool_new_hdrcache();
@@ -2945,130 +2940,81 @@
 return 0;
 }
 
-void msg_free(message_data_t *m)
+static void msg_free(message_data_t *m)
 {
- int i;
-
- if (m->data) {
+ if (m->data)
 	prot_free(m->data);
- }
- if (m->f) {
+ if (m->f)
 	fclose(m->f);
- }
- if (m->id) {
-	free(m->id);
- }
- if (m->path) {
-	free(m->path);
- }
- if (m->control) {
-	free(m->control);
- }
+ free(m->id);
+ free(m->path);
+ free(m->control);
+ free(m->date);
 
- if (m->rcpt) {
-	for (i = 0; i < m->rcpt_num; i++) {
-	 free(m->rcpti);
-	}
-	free(m->rcpt);
- }
- if (m->date) {
-	free(m->date);
- }
+ strarray_fini(&m->rcpt);
 
 spool_free_hdrcache(m->hdrcache);
 
 free(m);
 }
 
-static int parse_groups(const char *groups, message_data_t *msg)
+static void parse_groups(const char *groups, message_data_t *msg)
 {
 const char *p;
 char *rcpt = NULL;
- size_t n;
-
- for (p = groups;; p += n) {
-	/* skip whitespace */
-	while (p && *p && (Uisspace(*p) || *p == ',')) p++;
-
-	if (!p || !*p) return 0;
-
-	if (!(msg->rcpt_num % RCPT_GROW)) { /* time to alloc more */
-	 msg->rcpt = (char **)
-		xrealloc(msg->rcpt, (msg->rcpt_num + RCPT_GROW + 1) * 
-			 sizeof(char *));
-	}
-
-	/* find end of group name */
-	n = strcspn(p, ", \t");
-	rcpt = xrealloc(rcpt, strlen(newsprefix) + n + 1);
-	if (!rcpt) return -1;
+ char *buf = xstrdup(groups);
+ const char sep = ", \t";
 
+ for (p = strtok(buf, sep) ; p ; p = strtok(NULL, sep)) {
 	/* construct the mailbox name */
-	sprintf(rcpt, "%.*s", (int) n, p);
+	free(rcpt);
+	rcpt = strconcat(newsprefix, p, (char *)NULL);
 
 	/* skip mailboxes that we don't serve as newsgroups */
 	if (!is_newsgroup(rcpt)) continue;
 
 	/* Only add mailboxes that exist */
-	if (!mlookup(rcpt, NULL, NULL, NULL)) {
-	 msg->rcptmsg->rcpt_num = rcpt;
-	 msg->rcpt_num++;
-	 msg->rcptmsg->rcpt_num = rcpt = NULL;
+	if (!mlookup(rcpt, NULL)) {
+	 strarray_appendm(&msg->rcpt, rcpt);
+	 rcpt = NULL;
 	}
 }
-
- /* never reached */
+ free(rcpt);
+ free(buf);
 }
 
 /* Create a new header to be cached and/or spooled to disk.
- * 'destname' contains the name of the new header.
- * 'dest' contains an optional existing header body to be appended to.
- * 'src' contains an optional existing header body to add to 'dest'.
- * 'newspostuser' contains an optional userid used to create "post"
- * email addresses from newsgroup names
+ * 'destname' contains the name of the new header.
+ * 'dest' contains an optional existing header body to be appended to.
+ * 'src' contains an optional existing header body to add to 'dest'.
+ * 'newspostuser' contains an optional userid used to create "post"
+ * email addresses from newsgroup names
 */
 static void add_header(const char *destname, const char **dest,
 		 const char **src, const char *newspostuser,
 		 hdrcache_t hdrcache, FILE *f)
 {
- char *newdest = NULL, *fold = NULL, *d;
+ struct buf buf = BUF_INITIALIZER;
+ char *newdest = NULL;
+ int fold = 0;
 
 if (src) {
 	if (!newspostuser) {
 	 /* no translation of source needed - copy as-is to dest */
-	 newdest = xstrdup(src0);
+	 buf_appendcstr(&buf, src0);
 	}
 	else {
 	 /* translate source newsgroups into "post" email addresses */
 	 const char *s, *sep = "";
-	 size_t n, addlen;
-
-	 /* count the number of source addresses */
-	 for (n = 0, s = src0; s; n++) {
-		s = strchr(s, ',');
-		if (s) s++;
-	 }
-
-	 /* estimate size of new addresses */
-	 addlen = strlen(src0) + n*1;			/* +1 for SP */
-	 addlen += n * (strlen(newspostuser)+1);		/* +1 for '+' */
-	 if (config_defdomain)
-		addlen += n * (strlen(config_defdomain)+1);	/* +1 for '@' */
+	 size_t n;
 
 	 if (dest) {
 		/* append to the existing dest header body */
-		addlen += strlen(dest0);
-		dest0 = xrealloc((char *) dest0, addlen + 1);
-		newdest = (char *) dest0;
-		fold = newdest + strlen(newdest) + 1;
+		buf_appendcstr(&buf, dest0);
+		fold = buf.len + 1;
 		sep = ", ";
 	 }
-	 else {
-		/* create a new header body */
-		newdest = xzmalloc(addlen + 1);
-	 }
 
-	 d = newdest + strlen(newdest);
 	 for (s = src0;; s += n) {
 		/* skip whitespace */
 		while (s && *s &&
@@ -3079,15 +3025,20 @@
 		n = strcspn(s, ", \t");
 
 		/* append the new (translated) address */
-		d += sprintf(d, "%s%s+%.*s",
-			 sep, newspostuser, (int) n, s);
-		if (config_defdomain) d += sprintf(d, "@%s", config_defdomain);
+		buf_printf(&buf, "%s%s+%.*s",
+			 sep, newspostuser, (int) n, s);
+		if (config_defdomain) buf_printf(&buf, "@%s", config_defdomain);
 
 		sep = ", ";
 	 }
 	}
+	newdest = buf_release(&buf);
 
-	if (!dest) {
+	if (dest) {
+	 /* replace the existing cached header */
+	 spool_replace_header(xstrdup(destname), newdest, hdrcache);
+	}
+	else {
 	 /* add the new header to the cache */
 	 spool_cache_header(xstrdup(destname), newdest, hdrcache);
 	}
@@ -3099,12 +3050,8 @@
 if (newdest) {
 	/* add the new dest header to the spool file */
 	fprintf(f, "%s: ", destname);
-	d = newdest;
-	if (fold) {
-	 fprintf(f, "%.*s\r\n\t", (int) (fold - d), d);
-	 d = fold;
-	}
-	fprintf(f, "%s\r\n", d);
+	if (fold) fprintf(f, "%.*s\r\n\t", fold, newdest);
+	fprintf(f, "%s\r\n", newdest+fold);
 }
 }
 
@@ -3129,7 +3076,6 @@
 	"Reply-To",	/* need to add "post" email addresses */
 	NULL
 };
- int addlen;
 
 m->f = f;
 
@@ -3146,22 +3092,15 @@
 /* now, using our header cache, fill in the data that we want */
 
 /* get path */
- addlen = strlen(config_servername) + 1;
 if ((body = spool_getheader(m->hdrcache, "path")) != NULL) {
 	/* prepend to the cached path */
-	addlen += strlen(body0);
-	body0 = xrealloc((char *) body0, addlen + 1);
-	memmove((char *) body0 + strlen(config_servername) + 1, body0,
-		strlen(body0) + 1); /* +1 for \0 */
-	strcpy((char *) body0, config_servername);
-	*((char *) body0 + strlen(config_servername)) = '!';
-	m->path = xstrdup(body0);
+	m->path = strconcat(config_servername, "!", body0, (char *)NULL);
+	spool_replace_header(xstrdup("Path"), xstrdup(m->path), m->hdrcache);
 } else {
 	/* no path, create one */
-	addlen += nntp_userid ? strlen(nntp_userid) : strlen("anonymous");
-	m->path = xmalloc(addlen + 1);
-	sprintf(m->path, "%s!%s", config_servername,
-		nntp_userid ? nntp_userid : "anonymous");
+	m->path = strconcat(config_servername, "!",
+			 nntp_userid ? nntp_userid : "anonymous",
+			 (char *)NULL);
 	spool_cache_header(xstrdup("Path"), xstrdup(m->path), m->hdrcache);
 }
 fprintf(f, "Path: %s\r\n", m->path);
@@ -3183,9 +3122,9 @@
 /* get date */
 if ((body = spool_getheader(m->hdrcache, "date")) == NULL) {
 	/* no date, create one */
-	char datestr80;
+	char datestrRFC822_DATETIME_MAX+1;
 
-	rfc822date_gen(datestr, sizeof(datestr), now);
+	time_to_rfc822(now, datestr, sizeof(datestr));
 	m->date = xstrdup(datestr);
 	fprintf(f, "Date: %s\r\n", datestr);
 	spool_cache_header(xstrdup("Date"), xstrdup(datestr), m->hdrcache);
@@ -3197,23 +3136,24 @@
 /* get control */
 if ((body = spool_getheader(m->hdrcache, "control")) != NULL) {
 	size_t len;
+	char *s;
 
 	m->control = xstrdup(body0);
 
 	/* create a recipient for the appropriate pseudo newsgroup */
-	m->rcpt_num = 1;
-	m->rcpt = (char **) xmalloc(sizeof(char *));
 	len = strcspn(m->control, " \t\r\n");
-	m->rcpt0 = xmalloc(strlen(newsprefix) + 8 + len + 1);
-	sprintf(m->rcpt0, "%scontrol.%.*s", newsprefix, (int) len, m->control);
+	s = xmalloc(strlen(newsprefix) + 8 + len + 1);
+	sprintf(s, "%scontrol.%.*s", newsprefix, (int) len, m->control);
+
+	strarray_appendm(&m->rcpt, s);
 } else {
 	m->control = NULL;	/* no control */
 
 	/* get newsgroups */
 	if ((groups = spool_getheader(m->hdrcache, "newsgroups")) != NULL) {
 	 /* parse newsgroups and create recipients */
-	 r = parse_groups(groups0, m);
-	 if (!r && !m->rcpt_num) {
+	 parse_groups(groups0, m);
+	 if (!m->rcpt.count) {
 		r = IMAP_MAILBOX_NONEXISTENT; /* no newsgroups that we serve */
 	 }
 	 if (!r) {
@@ -3274,13 +3214,13 @@
 }
 
 /* spool to the stage of one of the recipients */
- for (i = 0; !stagef && (i < m->rcpt_num); i++) {
-	stagef = append_newstage(m->rcpti, now, 0, &stage);
+ for (i = 0; !stagef && (i < m->rcpt.count); i++) {
+	stagef = append_newstage(m->rcpt.datai, now, 0, &stage);
 }
 
 if (stagef) {
 	const char *base = 0;
-	unsigned long size = 0;
+	size_t size = 0;
 	int n;
 
 	/* copy the header from our tmpfile to the stage */
@@ -3375,32 +3315,39 @@
 static int deliver(message_data_t *msg)
 {
 int n, r = 0, myrights;
- char *rcpt = NULL, *local_rcpt = NULL, *server, *acl;
- unsigned long uid;
+ char *rcpt = NULL;
 struct body *body = NULL;
 struct dest *dlist = NULL;
+ mbentry_t *mbentry = NULL;
 duplicate_key_t dkey = {msg->id, NULL, msg->date};
 
 /* check ACLs of all mailboxes */
- for (n = 0; n < msg->rcpt_num; n++) {
-	rcpt = msg->rcptn;
+ for (n = 0; n < msg->rcpt.count; n++) {
+	rcpt = msg->rcpt.datan;
+	dkey.to = rcpt;
+
+	/* free the mbentry from the last iteration */
+	mboxlist_entry_free(&mbentry);
 
 	/* look it up */
-	r = mlookup(rcpt, &server, &acl, NULL);
-	dkey.to = rcpt;
+	r = mlookup(rcpt, &mbentry);
 	if (r) return IMAP_MAILBOX_NONEXISTENT;
 
-	if (!(acl && (myrights = cyrus_acl_myrights(nntp_authstate, acl)) &&
-	 (myrights & ACL_POST)))
+	if (!(mbentry->acl && (myrights = cyrus_acl_myrights(nntp_authstate, mbentry->acl)) &&
+	 (myrights & ACL_POST))) {
+	 mboxlist_entry_free(&mbentry);
 	 return IMAP_PERMISSION_DENIED;
+	}
 
-	if (server) {
+	if (mbentry->server) {
 	 /* remote group */
-	 proxy_adddest(&dlist, NULL, 0, server, "");
+	 proxy_adddest(&dlist, NULL, 0, mbentry->server, "");
 	}
 	else {
 	 /* local group */
 	 struct appendstate as;
+	 static const quota_t qdiffsQUOTA_NUMRESOURCES =
+				 QUOTA_DIFFS_INITIALIZER;
 
 	 if (msg->id && 
 		duplicate_check(&dkey)) {
@@ -3411,17 +3358,17 @@
 
 	 r = append_setup(&as, rcpt,
 			 nntp_authstate ? nntp_userid : NULL,
-			 nntp_authstate, ACL_POST, 0);
+			 nntp_authstate, ACL_POST, qdiffs, NULL, 0, 0);
 
 	 if (!r) {
 		prot_rewind(msg->data);
 		if (stage) {
 		 r = append_fromstage(&as, &body, stage, 0,
-					 (const char **) NULL, 0, !singleinstance);
+					 NULL, !singleinstance,
+					 /*annotations*/NULL);
 		} else {
 		 /* XXX should never get here */
-		 r = append_fromstream(&as, &body, msg->data, msg->size, 0,
-					 (const char **) NULL, 0);
+		 r = append_fromstream(&as, &body, msg->data, msg->size, 0, NULL);
 		}
 		if (r || ( msg->id && duplicate_check(&dkey) ) ) { 
 		 append_abort(&as);
@@ -3433,18 +3380,20 @@
 		 } 
 		} 
 		else { 
-		 r = append_commit(&as, 0, NULL, &uid, NULL, NULL);
+		 r = append_commit(&as);
 		}
 	 }
 
 	 if (!r && msg->id)
-		duplicate_mark(&dkey, time(NULL), uid);
+		duplicate_mark(&dkey, time(NULL), as.baseuid);
 
-	 if (r) return r;
-
-	 local_rcpt = rcpt;
+	 if (r) {
+		mboxlist_entry_free(&mbentry);
+		return r;
+	 }
 	}
 }
+ mboxlist_entry_free(&mbentry);
 
 if (body) {
 	message_free_body(body);
@@ -3483,6 +3432,7 @@
 snprintf(mailboxname, sizeof(mailboxname), "%s%.*s",
 	 newsprefix, (int) strcspn(group, " \t\r\n"), group);
 
+ /* XXX do we need to notify news mailbox creation ? */
 r = mboxlist_createmailbox(mailboxname, 0, NULL, 0,
 			 newsmaster, newsmaster_authstate, 0, 0, 0);
 
@@ -3566,8 +3516,7 @@
 /*
 * duplicate_find() callback function to cancel articles
 */
-static int cancel_cb(const char *msgid __attribute__((unused)),
-		 const char *name,
+static int cancel_cb(const duplicate_t *dkey,
 		 time_t mark __attribute__((unused)),
 		 unsigned long uid,
 		 void *rock)
@@ -3575,16 +3524,16 @@
 struct mailbox *mailbox = NULL;
 
 /* make sure its a message in a mailbox that we're serving via NNTP */
- if (is_newsgroup(name)) {
+ if (is_newsgroup(dkey->to)) {
 	int r;
 
-	r = mailbox_open_iwl(name, &mailbox);
+	r = mailbox_open_iwl(dkey->to, &mailbox);
 
 	if (!r &&
 	 !(cyrus_acl_myrights(newsmaster_authstate, mailbox->acl) & ACL_DELETEMSG))
 	 r = IMAP_PERMISSION_DENIED;
 
-	if (!r) r = mailbox_expunge(mailbox, expunge_cancelled, &uid, NULL);
+	if (!r) r = mailbox_expunge(mailbox, expunge_cancelled, &uid, NULL, 0);
 	mailbox_close(&mailbox);
 
 	/* if we failed, pass the return code back in the rock */
@@ -3605,7 +3554,7 @@
 *p = '\0';
 
 /* find and expunge the message from all mailboxes */
- duplicate_find(msgid, &cancel_cb, &r);
+ duplicate_find(msgid, cancel_cb, &r);
 
 /* store msgid of cancelled message for IHAVE/CHECK/TAKETHIS
 * (in case we haven't received the message yet)
@@ -3703,14 +3652,14 @@
 
 /* check newsgroups against wildmat to see if we should feed it */
 if (wild && *wild) {
-	wmat = split_wildmats(wild);
+	wmat = split_wildmats(wild, config_getstring(IMAPOPT_NEWSPREFIX));
 
 	feed = 0;
-	for (n = 0; n < msg->rcpt_num; n++) {
+	for (n = 0; n < msg->rcpt.count; n++) {
 	 /* see if the newsgroup matches one of our wildmats */
 	 w = wmat;
 	 while (w->pat &&
-		 wildmat(msg->rcptn, w->pat) != 1) {
+		 wildmat(msg->rcpt.datan, w->pat) != 1) {
 		w++;
 	 }
 
@@ -3880,55 +3829,47 @@
 return;
 }
 
-#define ALLOC_SIZE 10
-
 static void news2mail(message_data_t *msg)
 {
- struct annotation_data attrib;
- int n, i, r;
+ struct buf attrib = BUF_INITIALIZER;
+ int n, r;
 FILE *sm;
- static const char **smbuf = NULL;
- static int allocsize = 0;
+ static strarray_t smbuf = STRARRAY_INITIALIZER;
+ static int smbuf_basic_count;
 int sm_stat;
 pid_t sm_pid;
 char buf4096, to1024 = "";
 
- if (!smbuf) {
-	allocsize += ALLOC_SIZE;
-	smbuf = xzmalloc(allocsize * sizeof(const char *));
-
-	smbuf0 = "sendmail";
-	smbuf1 = "-i";		/* ignore dots */
-	smbuf2 = "-f";
-	smbuf3 = "<>";
-	smbuf4 = "--";
+ if (!smbuf.count) {
+	strarray_append(&smbuf, "sendmail");
+	strarray_append(&smbuf, "-i");		/* ignore dots */
+	strarray_append(&smbuf, "-f");
+	strarray_append(&smbuf, "<>");
+	strarray_append(&smbuf, "--");
+	smbuf_basic_count = smbuf.count;
 }
 
- for (i = 5, n = 0; n < msg->rcpt_num; n++) {
+ for (n = 0; n < msg->rcpt.count ; n++) {
 	/* see if we want to send this to a mailing list */
-	r = annotatemore_lookup(msg->rcptn,
+	buf_free(&attrib);
+	r = annotatemore_lookup(msg->rcpt.datan,
 				"/vendor/cmu/cyrus-imapd/news2mail", "",
 				&attrib);
 	if (r) continue;
 
 	/* add the email address to our argv and to our To: header */
-	if (attrib.value) {
-	 if (i >= allocsize - 1) {
-		allocsize += ALLOC_SIZE;
-		smbuf = xrealloc(smbuf, allocsize * sizeof(const char *));
-	 }
-
-	 smbufi++ = xstrdup(attrib.value);
-	 smbufi = NULL;
+	if (attrib.s) {
+	 strarray_append(&smbuf, buf_cstring(&attrib));
 
 	 if (to0) strlcat(to, ", ", sizeof(to));
-	 strlcat(to, attrib.value, sizeof(to));
+	 strlcat(to, buf_cstring(&attrib), sizeof(to));
 	}
 }
+ buf_free(&attrib);
 
 /* send the message */
- if (i > 5) {
-	sm_pid = open_sendmail(smbuf, &sm);
+ if (smbuf.count > smbuf_basic_count) {
+	sm_pid = open_sendmail((const char **)smbuf.data, &sm);
 
 	if (!sm)
 	 syslog(LOG_ERR, "news2mail: could not spawn sendmail process");
@@ -3988,10 +3929,7 @@
 	}
 
 	/* free the RCPTs */
-	for (i = 5; smbufi; i++) {
-	 free((char *) smbufi);
-	 smbufi = NULL;
-	}
+	strarray_truncate(&smbuf, smbuf_basic_count);
 }
 
 return;
@@ -4005,7 +3943,7 @@
 int r = 0;
 
 /* check if we want this article */
- if (msgid && find_msgid(msgid, &mboxname, NULL)) {
+ if (msgid && my_find_msgid(msgid, &mboxname, NULL)) {
 	/* already have it */
 	syslog(LOG_INFO,
 	 "dupelim: news article id %s already present in mailbox %s",
@@ -4226,54 +4164,3 @@
 fatal("cmd_starttls() called, but no OpenSSL", EC_SOFTWARE);
 }
 #endif /* HAVE_SSL */
-
-static struct wildmat *split_wildmats(char *str)
-{
- const char *prefix;
- char patternMAX_MAILBOX_BUFFER = "", *p, *c;
- struct wildmat *wild = NULL;
- int n = 0;
-
- if ((prefix = config_getstring(IMAPOPT_NEWSPREFIX)))
-	snprintf(pattern, sizeof(pattern), "%s.", prefix);
- p = pattern + strlen(pattern);
-
- /*
- * split the list of wildmats
- *
- * we split them right to left because this is the order in which
- * we want to test them (per RFC3977 section 4.2)
- */
- do {
-	if ((c = strrchr(str, ',')))
-	 *c++ = '\0';
-	else
-	 c = str;
-
-	if (!(n % 10)) /* alloc some more */
-	 wild = xrealloc(wild, (n + 11) * sizeof(struct wildmat));
-
-	if (*c == '!') wildn.not = 1;		/* not */
-	else if (*c == '@') wildn.not = -1;	/* absolute not (feeding) */
-	else wildn.not = 0;
-
-	strncpy(p, wildn.not ? c + 1 : c, pattern+sizeof(pattern) - p);
-	patternsizeof(pattern)-1 = '\0';
-
-	wildn++.pat = xstrdup(pattern);
- } while (c != str);
- wildn.pat = NULL;
-
- return wild;
-}
-
-static void free_wildmats(struct wildmat *wild)
-{
- struct wildmat *w = wild;
-
- while (w->pat) {
-	free(w->pat);
-	w++;
- }
- free(wild);
-}

cyrus-imapd-2.4.17.tar.gz/imap/notify.c -> cyrus-imapd-2.5.tar.gz/imap/notify.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: notify.c,v 1.17 2010/01/06 17:01:38 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +45,6 @@
 #endif
 
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <syslog.h>
 #include <sys/types.h>
@@ -60,7 +57,6 @@
 
 #include "global.h"
 #include "notify.h"
-#include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
 
@@ -81,14 +77,14 @@
 return 0;
 }
 
-void notify(const char *method,
+EXPORTED void notify(const char *method,
 	 const char *class, const char *priority,
 	 const char *user, const char *mailbox,
 	 int nopt, const char **options,
 	 const char *message)
 {
 const char *notify_sock;
- int soc;
+ int soc = -1;
 struct sockaddr_un sun_data;
 char bufNOTIFY_MAXSIZE = "", noptstr20;
 int buflen = 0;
@@ -97,7 +93,7 @@
 soc = socket(AF_UNIX, SOCK_DGRAM, 0);
 if (soc == -1) {
 	syslog(LOG_ERR, "unable to create notify socket(): %m");
-	return;
+	goto out;
 }
 
 memset((char *)&sun_data, 0, sizeof(sun_data));
@@ -137,18 +133,22 @@
 if (r) {
 syslog(LOG_ERR, "notify datagram too large, %s, %s",
 	 user, mailbox);
-	close(soc);
-	return;
+	goto out;
 }
 
 r = sendto(soc, buf, buflen, 0,
 	 (struct sockaddr *)&sun_data, sizeof(sun_data));
- if (r < buflen) {
+
+ if (r < 0) {
 	syslog(LOG_ERR, "unable to sendto() notify socket: %m");
-	return;
+	goto out;
+ }
+ if (r < buflen) {
+	syslog(LOG_ERR, "short write to notify socket");
+	goto out;
 }
 
- close(soc);
-
+out:
+ xclose(soc);
 return;
 }

cyrus-imapd-2.4.17.tar.gz/imap/notify.h -> cyrus-imapd-2.5.tar.gz/imap/notify.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/pop3d.c -> cyrus-imapd-2.5.tar.gz/imap/pop3d.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: pop3d.c,v 1.202 2010/05/25 20:59:19 wescraig Exp $
 */
 
 #include <config.h>
@@ -49,7 +47,6 @@
 #include <unistd.h>
 #endif
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -60,7 +57,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <ctype.h>
 #include "prot.h"
 
 #include <sasl/sasl.h>
@@ -68,20 +64,20 @@
 
 #include "assert.h"
 #include "acl.h"
+#include "autocreate.h"
 #include "util.h"
 #include "auth.h"
-#include "iptostring.h"
 #include "global.h"
 #include "tls.h"
 
 #include "exitcodes.h"
 #include "imapd.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
+#include "mboxevent.h"
 #include "version.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "mboxlist.h"
 #include "idle.h"
 #include "telemetry.h"
@@ -94,6 +90,8 @@
 #include "sync_log.h"
 #include "statuscache.h"
 
+#include "iostat.h"
+
 #ifdef HAVE_KRB
 /* kerberos des is purported to conflict with OpenSSL DES */
 #define DES_DEFS
@@ -115,35 +113,38 @@
 static SSL *tls_conn;
 #endif /* HAVE_SSL */
 
-sasl_conn_t *popd_saslconn; /* the sasl connection context */
-
-int popd_timeout;
-char *popd_userid = 0, *popd_subfolder = 0;
-struct mailbox *popd_mailbox = NULL;
-struct auth_state *popd_authstate = 0;
-int config_popuseacl, config_popuseimapflags;
-struct sockaddr_storage popd_localaddr, popd_remoteaddr;
-int popd_haveaddr = 0;
-char popd_clienthostNI_MAXHOST*2+1 = "local";
-struct protstream *popd_out = NULL;
-struct protstream *popd_in = NULL;
+static sasl_conn_t *popd_saslconn; /* the sasl connection context */
+
+static int popd_timeout;
+static char *popd_userid = 0, *popd_subfolder = 0;
+static char *proxy_userid = 0;
+static struct mailbox *popd_mailbox = NULL;
+static struct auth_state *popd_authstate = 0;
+static int config_popuseacl, config_popuseimapflags;
+static int popd_haveaddr = 0;
+static const char *popd_clienthost = "local";
+static struct protstream *popd_out = NULL;
+static struct protstream *popd_in = NULL;
 static int popd_logfd = -1;
-unsigned popd_exists = 0;
-time_t popd_login_time;
-int count_retr = 0;
-int count_top = 0;
-int count_dele = 0;
-struct msg {
- unsigned uid;
+static unsigned popd_exists = 0;
+static time_t popd_login_time;
+static int count_retr = 0;
+static int count_top = 0;
+static int count_dele = 0;
+static struct msg {
+ uint32_t uid;
 uint32_t recno;
- unsigned size;
- int deleted;
- int seen;
-} *popd_msg = NULL;
+ uint32_t size;
+ int deleted:1;
+ int seen:1;
+} *popd_map = NULL;
+
+static struct io_count *io_count_start;
+static struct io_count *io_count_stop;
 
 static sasl_ssf_t extprops_ssf = 0;
 static int pop3s = 0;
-int popd_starttls_done = 0;
+static int popd_starttls_done = 0;
 
 static int popd_myrights;
 
@@ -162,17 +163,18 @@
 struct backend *backend = NULL;
 
 static struct protocol_t pop3_protocol =
-{ "pop3", "pop",
- { 0, "+OK " },
- { "CAPA", NULL, ".", NULL,
- { { "SASL ", CAPA_AUTH },
- { "STLS", CAPA_STARTTLS },
- { NULL, 0 } } },
- { "STLS", "+OK", "-ERR", 0 },
- { "AUTH", 255, 0, "+OK", "-ERR", "+ ", "*", NULL, 0 },
- { NULL, NULL, NULL },
- { "NOOP", NULL, "+OK" },
- { "QUIT", NULL, "+OK" }
+{ "pop3", "pop", TYPE_STD,
+ { { { 0, "+OK " },
+ { "CAPA", NULL, ".", NULL,
+	CAPAF_ONE_PER_LINE,
+	{ { "SASL", CAPA_AUTH },
+	 { "STLS", CAPA_STARTTLS },
+	 { NULL, 0 } } },
+ { "STLS", "+OK", "-ERR", 0 },
+ { "AUTH", 255, 0, "+OK", "-ERR", "+ ", "*", NULL, 0 },
+ { NULL, NULL, NULL },
+ { "NOOP", NULL, "+OK" },
+ { "QUIT", NULL, "+OK" } } }
 };
 
 static void bitpipe(void);
@@ -194,7 +196,7 @@
 static void uidl_msg(uint32_t msgno);
 static int msg_exists_or_err(uint32_t msgno);
 static int update_seen(void);
-void usage(void);
+static void usage(void);
 void shut_down(int code) __attribute__ ((noreturn));
 
 extern int saslserver(sasl_conn_t *conn, const char *mech,
@@ -206,7 +208,7 @@
 /* Enable the resetting of a sasl_conn_t */
 static int reset_saslconn(sasl_conn_t **conn);
 
-static struct 
+static struct
 {
 char *ipremoteport;
 char *iplocalport;
@@ -231,6 +233,7 @@
 	 sasl_seterror(conn, 0, "buffer overflow while canonicalizing");
 	 return SASL_BUFOVER;
 	}
+
 	memcpy(userbuf, user, ulen);
 	userbufulen = '\0';
 	user = userbuf;
@@ -239,11 +242,10 @@
 	if ((p = strchr(userbuf, '+'))) {
 	 n = config_virtdomains ? strcspn(p, "@") : strlen(p);
 
-	 if (flags & SASL_CU_AUTHZID) {
-		/* make a copy of the subfolder */
-		if (popd_subfolder) free(popd_subfolder);
-		popd_subfolder = xstrndup(p, n);
-	 }
+	 /* make a copy of the subfolder */
+	 if (popd_subfolder) free(popd_subfolder);
+	 popd_subfolder = NULL;
+	 popd_subfolder = xstrndup(p, n);
 
 	 /* strip the subfolder from the authzid */
 	 memmove(p, p+n, strlen(p+n)+1);
@@ -327,7 +329,7 @@
 proc_cleanup();
 
 syslog(LOG_NOTICE, "counts: retr=<%d> top=<%d> dele=<%d>",
- count_retr, count_top, count_dele);
+		 count_retr, count_top, count_dele);
 count_retr = 0;
 count_top = 0;
 count_dele = 0;
@@ -357,9 +359,9 @@
 }
 
 if (config_auditlog)
-	syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>", 
+	syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
 			 session_id(), bytes_in, bytes_out);
- 
+
 popd_in = popd_out = NULL;
 
 #ifdef HAVE_SSL
@@ -371,7 +373,7 @@
 
 cyrus_reset_stdio();
 
- strcpy(popd_clienthost, "local");
+ popd_clienthost = "local";
 if (popd_logfd != -1) {
 	close(popd_logfd);
 	popd_logfd = -1;
@@ -380,6 +382,10 @@
 	free(popd_userid);
 	popd_userid = NULL;
 }
+ if (proxy_userid != NULL) {
+	free(proxy_userid);
+	proxy_userid = NULL;
+ }
 if (popd_subfolder != NULL) {
 	free(popd_subfolder);
 	popd_subfolder = NULL;
@@ -442,15 +448,18 @@
 
 /* open the user deny db */
 denydb_init(0);
- denydb_open(NULL);
+ denydb_open(0);
 
 if (config_getswitch(IMAPOPT_STATUSCACHE)) {
 	/* open statuscache db to optimize handling an empty maildrop */
-	statuscache_open(NULL);
+	statuscache_open();
 }
 
 /* setup for sending IMAP IDLE notifications */
- idle_enabled();
+ idle_init();
+
+ /* setup for mailbox event notifications */
+ mboxevent_init();
 
 /* Set namespace */
 if ((r = mboxname_init_namespace(&popd_namespace, 1)) != 0) {
@@ -458,6 +467,8 @@
 	fatal(error_message(r), EC_CONFIG);
 }
 
+ mboxevent_setnamespace(&popd_namespace);
+
 while ((opt = getopt(argc, argv, "skp:")) != EOF) {
 	switch(opt) {
 	case 's': /* pop3s (do starttls right away) */
@@ -492,11 +503,15 @@
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
- socklen_t salen;
- char hbufNI_MAXHOST;
- char localip60, remoteip60;
- int niflags;
+ const char *localip, *remoteip;
 sasl_security_properties_t *secprops=NULL;
+ struct mboxevent *mboxevent = NULL;
+
+ if (config_iolog) {
+	io_count_start = xmalloc (sizeof (struct io_count));
+	io_count_stop = xmalloc (sizeof (struct io_count));
+	read_io_count(io_count_start);
+ }
 
 session_new_id();
 
@@ -512,38 +527,12 @@
 count_dele = 0;
 
 /* Find out name of client host */
- salen = sizeof(popd_remoteaddr);
- if (getpeername(0, (struct sockaddr *)&popd_remoteaddr, &salen) == 0 &&
-	(popd_remoteaddr.ss_family == AF_INET ||
-	 popd_remoteaddr.ss_family == AF_INET6)) {
-	if (getnameinfo((struct sockaddr *)&popd_remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
- 	 strncpy(popd_clienthost, hbuf, sizeof(hbuf));
-	 strlcat(popd_clienthost, " ", sizeof(popd_clienthost));
-	} else {
-	 popd_clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&popd_remoteaddr, salen, hbuf,
-			sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(popd_clienthost, "", sizeof(popd_clienthost));
-	strlcat(popd_clienthost, hbuf, sizeof(popd_clienthost));
-	strlcat(popd_clienthost, "", sizeof(popd_clienthost));
-	salen = sizeof(popd_localaddr);
-	if (getsockname(0, (struct sockaddr *)&popd_localaddr, &salen) == 0) {
-	 popd_haveaddr = 1;
-	}
- }
+ popd_clienthost = get_clienthost(0, &localip, &remoteip);
 
 /* other params should be filled in */
 if (sasl_server_new("pop", config_servername, NULL, NULL, NULL,
 			NULL, 0, &popd_saslconn) != SASL_OK)
-	fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); 
+	fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL);
 
 /* will always return something valid */
 secprops = mysasl_secprops(0);
@@ -551,21 +540,18 @@
 	fatal("Failed to set SASL property", EC_TEMPFAIL);
 if (sasl_setprop(popd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf) != SASL_OK)
 	fatal("Failed to set SASL property", EC_TEMPFAIL);
- 
- if(iptostring((struct sockaddr *)&popd_localaddr,
-		 salen, localip, 60) == 0) {
+
+ if (localip) {
+	popd_haveaddr = 1;
 	sasl_setprop(popd_saslconn, SASL_IPLOCALPORT, localip);
 	saslprops.iplocalport = xstrdup(localip);
 }
- 
- if(iptostring((struct sockaddr *)&popd_remoteaddr,
-		 salen, remoteip, 60) == 0) {
-	sasl_setprop(popd_saslconn, SASL_IPREMOTEPORT, remoteip); 
+
+ if (remoteip) {
+	sasl_setprop(popd_saslconn, SASL_IPREMOTEPORT, remoteip);
 	saslprops.ipremoteport = xstrdup(remoteip);
 }
 
- proc_register("pop3d", popd_clienthost, NULL, NULL);
-
 /* Set inactivity timer */
 popd_timeout = config_getint(IMAPOPT_POPTIMEOUT);
 if (popd_timeout < 10) popd_timeout = 10;
@@ -575,7 +561,7 @@
 
 if (kflag) kpop();
 
- /* we were connected on pop3s port so we should do 
+ /* we were connected on pop3s port so we should do
 TLS negotiation immediatly */
 if (pop3s == 1) cmd_starttls(1);
 
@@ -600,12 +586,31 @@
 
 /* QUIT executed */
 
+ /* send a Logout event notification */
+ if ((mboxevent = mboxevent_new(EVENT_LOGOUT))) {
+	mboxevent_set_access(mboxevent, saslprops.iplocalport,
+			 NULL, popd_userid, NULL);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
 /* don't bother reusing KPOP connections */
 if (kflag) shut_down(0);
 
 /* cleanup */
 popd_reset();
 
+ if (config_iolog) {
+	read_io_count(io_count_stop);
+	syslog(LOG_INFO,
+	 "POP session stats : I/O read : %d bytes : I/O write : %d bytes",
+		io_count_stop->io_read_count - io_count_start->io_read_count,
+		io_count_stop->io_write_count - io_count_start->io_write_count);
+	free(io_count_start);
+	free(io_count_stop);
+ }
+
 return 0;
 }
 
@@ -615,7 +620,7 @@
 shut_down(error);
 }
 
-void usage(void)
+static void usage(void)
 {
 prot_printf(popd_out, "-ERR usage: pop3d -C <alt_config> -k -s\r\n");
 prot_flush(popd_out);
@@ -638,8 +643,8 @@
 if (popd_mailbox)
 	mailbox_close(&popd_mailbox);
 
- if (popd_msg) {
-	free(popd_msg);
+ if (popd_map) {
+	free(popd_map);
 }
 
 /* close backend connection */
@@ -649,7 +654,7 @@
 }
 
 syslog(LOG_NOTICE, "counts: retr=<%d> top=<%d> dele=<%d>",
- count_retr, count_top, count_dele);
+		 count_retr, count_top, count_dele);
 
 sync_log_done();
 
@@ -667,6 +672,8 @@
 denydb_close();
 denydb_done();
 
+ idle_done();
+
 if (popd_in) {
 	prot_NONBLOCK(popd_in);
 	prot_fill(popd_in);
@@ -681,7 +688,7 @@
 }
 
 if (config_auditlog)
-	syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>", 
+	syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
 			 session_id(), bytes_in, bytes_out);
 
 #ifdef HAVE_SSL
@@ -690,10 +697,20 @@
 
 cyrus_done();
 
+ if (config_iolog) {
+	read_io_count(io_count_stop);
+	syslog(LOG_INFO,
+	 "POP session stats : I/O read : %d bytes : I/O write : %d bytes",
+		io_count_stop->io_read_count - io_count_start->io_read_count,
+		io_count_stop->io_write_count - io_count_start->io_write_count);
+	free (io_count_start);
+	free (io_count_stop);
+ }
+
 exit(code);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 
@@ -755,12 +772,12 @@
 {
 Key_schedule schedule;
 KTEXT_ST ticket;
- char instanceINST_SZ; 
+ char instanceINST_SZ;
 char version9;
 const char *srvtab;
 int r;
 socklen_t len;
- 
+
 if (!popd_haveaddr) {
 	fatal("Cannot get client's IP address", EC_OSERR);
 }
@@ -780,7 +797,7 @@
 		 (struct sockaddr_in *) &popd_remoteaddr,
 		 (struct sockaddr_in *) NULL,
 		 &kdata, (char*) srvtab, schedule, version);
- 
+
 if (r) {
 	prot_printf(popd_out, "-ERR AUTH Kerberos authentication failure: %s\r\n",
 		 krb_err_txtr);
@@ -791,7 +808,7 @@
 	 kdata.prealm, krb_err_txtr);
 	shut_down(0);
 }
- 
+
 r = krb_get_lrealm(klrealm,1);
 if (r) {
 	prot_printf(popd_out, "-ERR AUTH Kerberos failure: %s\r\n",
@@ -817,15 +834,18 @@
 uint32_t msgno;
 int r = 0;
 int numexpunged = 0;
+ struct mboxevent *mboxevent;
+
+ mboxevent = mboxevent_new(EVENT_MESSAGE_EXPUNGE);
 
 /* loop over all known messages looking for deletes */
 for (msgno = 1; msgno <= popd_exists; msgno++) {
 	/* not deleted? skip */
-	if (!popd_msgmsgno.deleted)
+	if (!popd_mapmsgno-1.deleted)
 	 continue;
 
 	/* error reading? abort */
-	r = mailbox_read_index_record(popd_mailbox, popd_msgmsgno.recno, &record);
+	r = mailbox_read_index_record(popd_mailbox, popd_mapmsgno-1.recno, &record);
 	if (r) break;
 
 	/* already expunged? skip */
@@ -833,17 +853,19 @@
 	 continue;
 
 	/* mark expunged */
-	record.system_flags |= FLAG_EXPUNGED;
- numexpunged++;
+	record.system_flags |= FLAG_DELETED | FLAG_EXPUNGED;
+	numexpunged++;
 
 	/* store back to the mailbox */
 	r = mailbox_rewrite_index_record(popd_mailbox, &record);
 	if (r) break;
+
+	mboxevent_extract_record(mboxevent, popd_mailbox, &record);
 }
 
 if (r) {
 	syslog(LOG_ERR, "IOERROR: %s failed to expunge record %u uid %u, aborting",
-	 popd_mailbox->name, msgno, popd_msgmsgno.uid);
+	 popd_mailbox->name, msgno, popd_mapmsgno-1.uid);
 }
 
 if (!r && (numexpunged > 0)) {
@@ -851,6 +873,12 @@
 	 numexpunged, popd_mailbox->name);
 }
 
+ /* send the MessageExpunge event notification */
+ mboxevent_extract_mailbox(mboxevent, popd_mailbox);
+ mboxevent_set_numunseen(mboxevent, popd_mailbox, -1);
+ mboxevent_notify(mboxevent);
+ mboxevent_free(&mboxevent);
+
 return r;
 }
 
@@ -867,12 +895,15 @@
 for (;;) {
 	signals_poll();
 
+	/* register process */
+	proc_register(config_ident, popd_clienthost, popd_userid, popd_mailbox ? popd_mailbox->name : NULL, NULL);
+
 	if (backend) {
 	 /* create a pipe from client to backend */
 	 bitpipe();
 
 	 /* pipe has been closed */
- telemetry_rusage( popd_userid );
+	 telemetry_rusage( popd_userid );
 	 return;
 	}
 
@@ -882,12 +913,12 @@
 	 userdeny(popd_userid, config_ident, inputbuf, sizeof(inputbuf)))) {
 	 for (p = inputbuf; *p == ''; p++); /* can't have be first char */
 	 prot_printf(popd_out, "-ERR SYS/TEMP %s\r\n", p);
- telemetry_rusage( popd_userid );
+	 telemetry_rusage( popd_userid );
 	 shut_down(0);
 	}
 
 	if (!prot_fgets(inputbuf, sizeof(inputbuf), popd_in)) {
- telemetry_rusage( popd_userid );
+	 telemetry_rusage( popd_userid );
 	 shut_down(0);
 	}
 
@@ -938,6 +969,12 @@
 	}
 	lcase(inputbuf);
 
+	if (config_getswitch(IMAPOPT_CHATTY))
+	 syslog(LOG_NOTICE, "command: %s", inputbuf);
+
+	/* register process */
+	proc_register(config_ident, popd_clienthost, popd_userid, popd_mailbox ? popd_mailbox->name : NULL, inputbuf);
+
 	if (!strcmp(inputbuf, "quit")) {
 	 if (!arg) {
 		int pollpadding =config_getint(IMAPOPT_POPPOLLPADDING);
@@ -948,20 +985,18 @@
 		 goto done;
 		if (mailbox_lock_index(popd_mailbox, LOCK_EXCLUSIVE))
 		 goto done;
-		if (popd_mailbox->i.options & OPT_MAILBOX_DELETED)
-		 goto done;
 
 		/* mark dirty in case everything else misses it - we're updating
 		 * at least the last login */
 		mailbox_index_dirty(popd_mailbox);
-		if ((minpollsec > 0) && (pollpadding > 1)) { 
+		if ((minpollsec > 0) && (pollpadding > 1)) {
 		 time_t mintime = popd_login_time - (minpollsec*(pollpadding));
 		 if (popd_mailbox->i.pop3_last_login < mintime) {
-			popd_mailbox->i.pop3_last_login = mintime + minpollsec; 
+			popd_mailbox->i.pop3_last_login = mintime + minpollsec;
 		 } else {
 			popd_mailbox->i.pop3_last_login += minpollsec;
 		 }
-		} else { 
+		} else {
 		 popd_mailbox->i.pop3_last_login = popd_login_time;
 		}
 
@@ -976,10 +1011,10 @@
 
 done:
 		prot_printf(popd_out, "+OK\r\n");
- telemetry_rusage( popd_userid );
+		telemetry_rusage( popd_userid );
 		return;
 	 }
-	 else 
+	 else
 		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
 	}
 	else if (!strcmp(inputbuf, "capa")) {
@@ -1030,9 +1065,9 @@
 	 }
 	 else {
 		for (msgno = 1; msgno <= popd_exists; msgno++) {
-		 if (!popd_msgmsgno.deleted) {
+		 if (!popd_mapmsgno-1.deleted) {
 			nmsgs++;
-			totsize += popd_msgmsgno.size;
+			totsize += popd_mapmsgno-1.size;
 		 }
 		}
 		prot_printf(popd_out, "+OK %u %u\r\n", nmsgs, totsize);
@@ -1042,14 +1077,16 @@
 	 if (arg) {
 		msgno = parse_msgno(&arg);
 		if (msgno) {
-		 prot_printf(popd_out, "+OK %u %u\r\n", msgno, popd_msgmsgno.size);
+		 prot_printf(popd_out, "+OK %u %u\r\n",
+				msgno, popd_mapmsgno-1.size);
 		}
 	 }
 	 else {
 		prot_printf(popd_out, "+OK scan listing follows\r\n");
 		for (msgno = 1; msgno <= popd_exists; msgno++) {
-		 if (!popd_msgmsgno.deleted)
-			prot_printf(popd_out, "%u %u\r\n", msgno, popd_msgmsgno.size);
+		 if (!popd_mapmsgno-1.deleted)
+			prot_printf(popd_out, "%u %u\r\n",
+			msgno, popd_mapmsgno-1.size);
 		}
 		prot_printf(popd_out, ".\r\n");
 	 }
@@ -1060,7 +1097,7 @@
 		msgno = parse_msgno(&arg);
 		if (msgno) {
 		 blat(msgno, -1);
-		 popd_msgmsgno.seen = 1;
+		 popd_mapmsgno-1.seen = 1;
 		 count_retr++;
 		}
 	 }
@@ -1074,7 +1111,7 @@
 	 else {
 		msgno = parse_msgno(&arg);
 		if (msgno) {
-		 popd_msgmsgno.deleted = 1;
+		 popd_mapmsgno-1.deleted = 1;
 		 prot_printf(popd_out, "+OK message deleted\r\n");
 		 count_dele++;
 		}
@@ -1083,16 +1120,16 @@
 	else if (!strcmp(inputbuf, "noop")) {
 	 if (arg)
 		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
-	 else 
+	 else
 		prot_printf(popd_out, "+OK\r\n");
 	}
 	else if (!strcmp(inputbuf, "rset")) {
-	 if (arg) 
+	 if (arg)
 		prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
 	 else {
 		for (msgno = 1; msgno <= popd_exists; msgno++) {
-		 popd_msgmsgno.deleted = 0;
-		 popd_msgmsgno.seen = 0;
+		 popd_mapmsgno-1.deleted = 0;
+		 popd_mapmsgno-1.seen = 0;
 		}
 		prot_printf(popd_out, "+OK\r\n");
 	 }
@@ -1143,7 +1180,7 @@
 	 else {
 		prot_printf(popd_out, "+OK unique-id listing follows\r\n");
 		for (msgno = 1; msgno <= popd_exists; msgno++) {
-		 if (!popd_msgmsgno.deleted)
+		 if (!popd_mapmsgno-1.deleted)
 			uidl_msg(msgno);
 		}
 		prot_printf(popd_out, ".\r\n");
@@ -1170,7 +1207,11 @@
 
 r = parseuint32(p, &p, &msgno);
 
- if (*p) {
+ if (r) {
+	prot_printf(popd_out, "-ERR Not a number\r\n");
+	*ptr = (char *)p;
+ }
+ else if (*p) {
 	prot_printf(popd_out, "-ERR Unexpected extra argument\r\n");
 	*ptr = (char *)p;
 }
@@ -1183,7 +1224,7 @@
 int msg_exists_or_err(uint32_t msgno)
 {
 if (msgno < 1 || msgno > popd_exists ||
-	 popd_msgmsgno.deleted) {
+	 popd_mapmsgno-1.deleted) {
 	prot_printf(popd_out, "-ERR No such message\r\n");
 	return 0;
 }
@@ -1193,12 +1234,12 @@
 void uidl_msg(uint32_t msgno)
 {
 if (popd_mailbox->i.options & OPT_POP3_NEW_UIDL) {
-	prot_printf(popd_out, "%u %u.%u\r\n", msgno, 
+	prot_printf(popd_out, "%u %u.%u\r\n", msgno,
 		 popd_mailbox->i.uidvalidity,
-		 popd_msgmsgno.uid);
+		 popd_mapmsgno-1.uid);
 } else {
 	prot_printf(popd_out, "%u %u\r\n", msgno,
-		 popd_msgmsgno.uid);
+		 popd_mapmsgno-1.uid);
 }
 }
 
@@ -1215,7 +1256,7 @@
 
 if (popd_starttls_done == 1)
 {
-	prot_printf(popd_out, "-ERR %s\r\n", 
+	prot_printf(popd_out, "-ERR %s\r\n",
 		 "Already successfully executed STLS");
 	return;
 }
@@ -1243,7 +1284,7 @@
 	/* must flush our buffers before starting tls */
 	prot_flush(popd_out);
 }
- 
+
 result=tls_start_servertls(0, /* read */
 			 1, /* write */
 			 pop3s ? 180 : popd_timeout,
@@ -1272,7 +1313,7 @@
 
 result = sasl_setprop(popd_saslconn, SASL_AUTH_EXTERNAL, auth_id);
 if (result != SASL_OK) {
- fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
+	fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
 }
 if(saslprops.authid) {
 	free(saslprops.authid);
@@ -1312,14 +1353,14 @@
 				 strlen(popd_apop_chal),
 				 response,
 				 strlen(response));
- 
+
 /* failed authentication */
 if (sasl_result != SASL_OK)
 {
 	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
 	 popd_clienthost, popd_apop_chal,
 	 sasl_errdetail(popd_saslconn));
-	
+
 	failedloginpause = config_getint(IMAPOPT_FAILEDLOGINPAUSE);
 	if (failedloginpause != 0) {
 	 sleep(failedloginpause);
@@ -1327,14 +1368,12 @@
 
 	/* Don't allow user probing */
 	if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
-		
+
 	prot_printf(popd_out, "-ERR AUTH authenticating: %s\r\n",
 		 sasl_errstring(sasl_result, NULL, NULL));
 
-	if (popd_subfolder) {
-	 free(popd_subfolder);
-	 popd_subfolder = 0;
-	}
+	free(popd_subfolder);
+	popd_subfolder = NULL;
 	return;
 }
 
@@ -1346,17 +1385,15 @@
 */
 sasl_result = sasl_getprop(popd_saslconn, SASL_USERNAME, &canon_user);
 if (sasl_result != SASL_OK) {
-	prot_printf(popd_out, 
-		 "-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n", 
+	prot_printf(popd_out,
+		 "-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n",
 		 sasl_result);
-	if (popd_subfolder) {
-	 free(popd_subfolder);
-	 popd_subfolder = 0;
-	}
+	free(popd_subfolder);
+	popd_subfolder = NULL;
 	return;
 }
 popd_userid = xstrdup((const char *) canon_user);
- 
+
 syslog(LOG_NOTICE, "login: %s %s%s APOP%s %s SESSIONID=<%s>", popd_clienthost,
 	 popd_userid, popd_subfolder ? popd_subfolder : "",
 	 popd_starttls_done ? "+TLS" : "", "User logged in", session_id());
@@ -1366,7 +1403,7 @@
 openinbox();
 }
 
-void cmd_user(char *user)
+static void cmd_user(char *user)
 {
 char userbufMAX_MAILBOX_BUFFER, *dot, *domain;
 unsigned userlen;
@@ -1401,9 +1438,10 @@
 	popd_userid = xstrdup(userbuf);
 	prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
 }
+
 }
 
-void cmd_pass(char *pass)
+static void cmd_pass(char *pass)
 {
 int failedloginpause;
 
@@ -1453,7 +1491,7 @@
 			 popd_userid,
 			 strlen(popd_userid),
 			 pass,
-			 strlen(pass))!=SASL_OK) { 
+			 strlen(pass))!=SASL_OK) {
 	syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
 	 popd_clienthost, popd_userid, sasl_errdetail(popd_saslconn));
 	failedloginpause = config_getint(IMAPOPT_FAILEDLOGINPAUSE);
@@ -1462,11 +1500,9 @@
 	}
 	prot_printf(popd_out, "-ERR AUTH Invalid login\r\n");
 	free(popd_userid);
-	popd_userid = 0;
-	if (popd_subfolder) {
-	 free(popd_subfolder);
-	 popd_subfolder = 0;
-	}
+	popd_userid = NULL;
+	free(popd_subfolder);
+	popd_subfolder = NULL;
 	return;
 }
 else {
@@ -1482,8 +1518,8 @@
 	 */
 	sasl_result = sasl_getprop(popd_saslconn, SASL_USERNAME, &val);
 	if (sasl_result != SASL_OK) {
-	 prot_printf(popd_out, 
-			"-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n", 
+	 prot_printf(popd_out,
+			"-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n",
 			sasl_result);
 	 if (popd_subfolder) {
 		free(popd_subfolder);
@@ -1515,7 +1551,7 @@
 
 /* Handle the POP3 Extension extension.
 */
-void cmd_capa()
+static void cmd_capa(void)
 {
 int minpoll = config_getint(IMAPOPT_POPMINPOLL) * 60;
 int expire = config_getint(IMAPOPT_POPEXPIRETIME);
@@ -1555,7 +1591,7 @@
 	 || config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
 	prot_printf(popd_out, "USER\r\n");
 }
- 
+
 if (popd_authstate || (config_serverinfo == IMAP_ENUM_SERVERINFO_ON)) {
 	prot_printf(popd_out,
 		 "IMPLEMENTATION Cyrus POP3%s %s\r\n",
@@ -1567,7 +1603,7 @@
 }
 
 
-void cmd_auth(char *arg)
+static void cmd_auth(char *arg)
 {
 int r, sasl_result;
 char *authtype;
@@ -1586,7 +1622,7 @@
 	int mechnum;
 
 	prot_printf(popd_out, "+OK List of supported mechanisms follows\r\n");
- 
+
 	/* CRLF separated, dot terminated */
 	if (sasl_listmech(popd_saslconn, NULL,
 			 "", "\r\n", "\r\n",
@@ -1596,9 +1632,9 @@
 		prot_printf(popd_out,"%s",sasllist);
 	 }
 	}
- 
+
 	prot_printf(popd_out, ".\r\n");
- 	return;
+	return;
 }
 
 authtype = arg;
@@ -1606,7 +1642,7 @@
 /* according to RFC 2449, since we advertise the "SASL" capability, we
 * must accept an optional second argument as an initial client
 * response (base64 encoded!).
- */ 
+ */
 while (*arg && !Uisspace(*arg)) {
 	arg++;
 }
@@ -1649,20 +1685,19 @@
 
 	 failedloginpause = config_getint(IMAPOPT_FAILEDLOGINPAUSE);
 	 if (failedloginpause != 0) {
-	 sleep(failedloginpause);
+		sleep(failedloginpause);
 	 }
 
 	 /* Don't allow user probing */
 	 if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
-		
+
 	 prot_printf(popd_out, "-ERR AUTH authenticating: %s\r\n",
 			sasl_errstring(sasl_result, NULL, NULL));
 	}
-	
-	if (popd_subfolder) {
-	 free(popd_subfolder);
-	 popd_subfolder = 0;
-	}
+
+	free(popd_subfolder);
+	popd_subfolder = NULL;
+
 	reset_saslconn(&popd_saslconn);
 	return;
 }
@@ -1674,8 +1709,8 @@
 */
 sasl_result = sasl_getprop(popd_saslconn, SASL_USERNAME, &val);
 if (sasl_result != SASL_OK) {
-	prot_printf(popd_out, 
-		 "-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n", 
+	prot_printf(popd_out,
+		 "-ERR AUTH weird SASL error %d getting SASL_USERNAME\r\n",
 		 sasl_result);
 	return;
 }
@@ -1691,8 +1726,8 @@
 				 SASL_CU_AUTHID | SASL_CU_AUTHZID,
 				 NULL, userbuf, sizeof(userbuf), &userlen);
 	if (sasl_result != SASL_OK) {
-	 prot_printf(popd_out, 
-			"-ERR AUTH SASL canonification error %d\r\n", 
+	 prot_printf(popd_out,
+			"-ERR AUTH SASL canonification error %d\r\n",
 			sasl_result);
 	 return;
 	}
@@ -1722,53 +1757,68 @@
 */
 int openinbox(void)
 {
- char useridMAX_MAILBOX_BUFFER, inboxnameMAX_MAILBOX_BUFFER;
- char extnameMAX_MAILBOX_BUFFER = "INBOX";
+ char *inboxname;
 int myrights = 0;
 int r, log_level = LOG_ERR;
 const char *statusline = NULL;
- struct mboxlist_entry mbentry;
- struct statusdata sdata;
+ mbentry_t *mbentry = NULL;
+ struct statusdata sdata = STATUSDATA_INIT;
+ struct proc_limits limits;
+ struct mboxevent *mboxevent;
+
+ /* Make a copy of the external userid for use in proxying */
+ proxy_userid = xstrdup(popd_userid);
 
- /* Translate any separators in userid
- (use a copy since we need the original userid for AUTH to backend) */
- strlcpy(userid, popd_userid, sizeof(userid));
- mboxname_hiersep_tointernal(&popd_namespace, userid,
+ /* Translate any separators in userid */
+ mboxname_hiersep_tointernal(&popd_namespace, popd_userid,
 				config_virtdomains ?
-				strcspn(userid, "@") : 0);
+				strcspn(popd_userid, "@") : 0);
 
- /* Create the mailbox that we're trying to access */
- if (popd_subfolder && popd_subfolder1) {
-	snprintf(extname+5, sizeof(extname)-5, "%c%s",
-		 popd_namespace.hier_sep, popd_subfolder+1);
+ /* send a Login event notification */
+ if ((mboxevent = mboxevent_new(EVENT_LOGIN))) {
+	mboxevent_set_access(mboxevent, saslprops.iplocalport,
+			 saslprops.ipremoteport, popd_userid, NULL);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+ }
+
+ if (popd_subfolder) {
+	/* we need to convert to internal namespace dammit */
+	char *internal_subfolder = xstrdup(popd_subfolder+1); /* remove + */
+	mboxname_hiersep_tointernal(&popd_namespace, internal_subfolder, 0);
+	inboxname = mboxname_user_mbox(popd_userid, internal_subfolder);
+	free(internal_subfolder);
+ }
+ else {
+	inboxname = mboxname_user_mbox(popd_userid, NULL);
+ }
+
+ r = mboxlist_lookup(inboxname, &mbentry, NULL);
+
+ /* Try once again after autocreate_inbox */
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* NOTE - if we have a subfolder, autocreateinbox should still create
+	 * it if it's an autocreate folder - otherwise tough luck */
+	r = autocreate_user(&popd_namespace, popd_userid);
+	if (!r) r = mboxlist_lookup(inboxname, &mbentry, NULL);
 }
- r = (*popd_namespace.mboxname_tointernal)(&popd_namespace, extname,
-					 userid, inboxname);
 
- if (!r) r = mboxlist_lookup(inboxname, &mbentry, NULL);
 if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
-	(!mbentry.acl ||
-	 !((myrights = cyrus_acl_myrights(popd_authstate, mbentry.acl)) & ACL_READ))) {
+	(!mbentry->acl ||
+	 !((myrights = cyrus_acl_myrights(popd_authstate, mbentry->acl)) & ACL_READ))) {
 	r = (myrights & ACL_LOOKUP) ?
 	 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
-	log_level = LOG_INFO;
 }
- else if (!r && (mbentry.mbtype & MBTYPE_DELETED)) {
+ else if (!r && (mbentry->mbtype & MBTYPE_DELETED)) {
 	r = IMAP_MAILBOX_NONEXISTENT;
-	log_level = LOG_INFO;
 }
- if (r) {
-	sleep(3);
-	syslog(log_level, "Unable to locate maildrop %s: %s",
-	 inboxname, error_message(r));
-	prot_printf(popd_out,
-		 "-ERR SYS/PERM Unable to locate maildrop: %s\r\n",
-		 error_message(r));
-	goto fail;
+ else if (!r && (mbentry->mbtype & MBTYPE_RESERVE)) {
+	r = IMAP_MAILBOX_RESERVED;
+ }
+ else if (!r && (mbentry->mbtype & MBTYPE_MOVING)) {
+	r = IMAP_MAILBOX_MOVED;
 }
-
- if (mbentry.mbtype & MBTYPE_RESERVE) r = IMAP_MAILBOX_RESERVED;
- if (mbentry.mbtype & MBTYPE_MOVING) r = IMAP_MAILBOX_MOVED;
 if (r) {
 	sleep(3);
 	log_level = LOG_INFO;
@@ -1780,17 +1830,12 @@
 	goto fail;
 }
 
- if (mbentry.mbtype & MBTYPE_REMOTE) {
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
 	/* remote mailbox */
-	char *server = mbentry.partition;
-	char *c;
-
-	/* xxx hide the fact that we are storing partitions */
-	c = strchr(server, '!');
-	if(c) *c = '\0';
+	char useridMAX_MAILBOX_NAME;
 
 	/* Make a working copy of userid in case we need to alter it */
-	strlcpy(userid, popd_userid, sizeof(userid));
+	strlcpy(userid, proxy_userid, sizeof(userid));
 
 	if (popd_subfolder) {
 	 /* Add the subfolder back to the userid for proxying */
@@ -1801,8 +1846,8 @@
 	 memcpy(p, popd_subfolder, n);
 	}
 
-	backend = backend_connect(NULL, server, &pop3_protocol,
-				 userid, NULL, &statusline);
+	backend = backend_connect(NULL, mbentry->server, &pop3_protocol,
+				 userid, NULL, &statusline, -1);
 
 	if (!backend) {
 	 syslog(LOG_ERR, "couldn't authenticate to backend server");
@@ -1810,19 +1855,19 @@
 			statusline ? statusline :
 			" Authentication to backend server failed\r\n");
 	 prot_flush(popd_out);
-	 
+
 	 goto fail;
 	}
 }
 else if (config_getswitch(IMAPOPT_STATUSCACHE) &&
-	 !(r = statuscache_lookup(inboxname, userid, STATUS_MESSAGES, &sdata)) &&
+	 !(r = statuscache_lookup(inboxname, popd_userid, STATUS_MESSAGES, &sdata)) &&
 	 !sdata.messages) {
 	/* local mailbox (empty) -- don't bother opening the mailbox */
-	syslog(LOG_INFO, "optimized mode for empty maildrop: %s", popd_userid);
+	syslog(LOG_INFO, "optimized mode for empty maildrop: %s", proxy_userid);
 }
 else {
 	/* local mailbox */
-	uint32_t recno, msgno;
+	uint32_t recno, exists;
 	struct index_record record;
 	int minpoll;
 
@@ -1864,10 +1909,11 @@
 	 goto fail;
 	}
 
-	popd_msg = (struct msg *) xrealloc(popd_msg, (popd_mailbox->i.exists+1) *
-					 sizeof(struct msg));
+	free(popd_map);
+	popd_map = (struct msg *)xmalloc(popd_mailbox->i.exists *
+					 sizeof(struct msg));
 	config_popuseimapflags = config_getswitch(IMAPOPT_POPUSEIMAPFLAGS);
-	msgno = 0;
+	exists = 0;
 	for (recno = 1; recno <= popd_mailbox->i.num_records; recno++) {
 	 if (mailbox_read_index_record(popd_mailbox, recno, &record))
 		break;
@@ -1881,51 +1927,71 @@
 		continue;
 	 }
 
-	 msgno++;
-	 popd_msgmsgno.recno = recno;
-	 popd_msgmsgno.uid = record.uid;
-	 popd_msgmsgno.size = record.size;
-	 popd_msgmsgno.deleted = 0;
-	 popd_msgmsgno.seen = 0;
+	 if (popd_mailbox->i.pop3_show_after &&
+		record.internaldate <= popd_mailbox->i.pop3_show_after) {
+		/* Ignore messages older than the "show after" date */
+		continue;
+	 }
 
-	 if (msgno >= popd_mailbox->i.exists)
+	 popd_mapexists.recno = recno;
+	 popd_mapexists.uid = record.uid;
+	 popd_mapexists.size = record.size;
+	 popd_mapexists.deleted = 0;
+	 popd_mapexists.seen = 0;
+	 exists++;
+
+	 if (exists >= popd_mailbox->i.exists)
 		break; /* we're full! */
 	}
-	popd_exists = msgno;
+	popd_exists = exists;
 
 	/* finished our initial read */
 	mailbox_unlock_index(popd_mailbox, NULL);
+ }
 
-	/* Update the statuscache entry if the maildrop is empty */
-	if (config_getswitch(IMAPOPT_STATUSCACHE) && !popd_exists) {
-	 /* We always have message count, uidnext,
-	 * uidvalidity, and highestmodseq for cache */
-	 unsigned statusitems = STATUS_MESSAGES | STATUS_UIDNEXT |
-		STATUS_UIDVALIDITY | STATUS_HIGHESTMODSEQ;
-
-	 statuscache_fill(&sdata, popd_userid, popd_mailbox,
-			 statusitems, 0, 0);
-	 mailbox_close(&popd_mailbox);
-	 statuscache_update(inboxname, &sdata);
+ limits.procname = "pop3d";
+ limits.clienthost = popd_clienthost;
+ limits.userid = proxy_userid;
+ if (proc_checklimits(&limits)) {
+	const char *sep = "";
+	prot_printf(popd_out,
+		 "-ERR Too many open connections (");
+	if (limits.maxhost) {
+	 prot_printf(popd_out, "%s%d of %d from %s", sep,
+			limits.host, limits.maxhost, popd_clienthost);
+	 sep = ", ";
 	}
+	if (limits.maxuser) {
+	 prot_printf(popd_out, "%s%d of %d for %s", sep,
+			limits.user, limits.maxuser, proxy_userid);
+	}
+	prot_printf(popd_out, ")\r\n");
+	mailbox_close(&popd_mailbox);
+	goto fail;
 }
 
- /* register process */
- proc_register("pop3d", popd_clienthost, popd_userid, inboxname);
-
 /* Create telemetry log */
- popd_logfd = telemetry_log(popd_userid, popd_in, popd_out, 0);
+ popd_logfd = telemetry_log(proxy_userid, popd_in, popd_out, 0);
+
+ mboxlist_entry_free(&mbentry);
+ free(inboxname);
 
 if (statusline)
 	prot_printf(popd_out, "+OK%s", statusline);
 else
-	prot_printf(popd_out, "+OK Mailbox locked and ready SESSIONID=<%s>\r\n", session_id());
+	prot_printf(popd_out, "+OK Mailbox locked and ready SESSIONID=<%s>\r\n",
+		 session_id());
 prot_flush(popd_out);
+
 return 0;
 
 fail:
+ mboxlist_entry_free(&mbentry);
+ free(inboxname);
 free(popd_userid);
 popd_userid = 0;
+ free(proxy_userid);
+ proxy_userid = 0;
 if (popd_subfolder) {
 	free(popd_subfolder);
 	popd_subfolder = 0;
@@ -1939,10 +2005,18 @@
 {
 FILE *msgfile;
 char buf4096;
- char *fname;
+ const char *fname;
 int thisline = -2;
+ struct index_record record;
+
+ /* XXX - map file */
 
- fname = mailbox_message_fname(popd_mailbox, popd_msgmsgno.uid);
+ if (mailbox_read_index_record(popd_mailbox, popd_mapmsgno-1.recno, &record)) {
+	prot_printf(popd_out, "-ERR SYS/PERM Could not read index record\r\n");
+	return IMAP_IOERROR;
+ }
+
+ fname = mailbox_record_fname(popd_mailbox, &record);
 msgfile = fopen(fname, "r");
 if (!msgfile) {
 	prot_printf(popd_out, "-ERR SYS/PERM Could not read message file\r\n");
@@ -1957,7 +2031,7 @@
 	}
 	else thisline++;
 
-	if (buf0 == '.') 
+	if (buf0 == '.')
 	 (void)prot_putc('.', popd_out);
 	do {
 	 prot_printf(popd_out, "%s", buf);
@@ -1979,7 +2053,7 @@
 }
 
 /* Reset the given sasl_conn_t to a sane state */
-static int reset_saslconn(sasl_conn_t **conn) 
+static int reset_saslconn(sasl_conn_t **conn)
 {
 int ret;
 sasl_security_properties_t *secprops = NULL;
@@ -1987,18 +2061,18 @@
 sasl_dispose(conn);
 /* do initialization typical of service_main */
 ret = sasl_server_new("pop", config_servername,
- NULL, NULL, NULL,
- NULL, 0, conn);
+			 NULL, NULL, NULL,
+			 NULL, 0, conn);
 if(ret != SASL_OK) return ret;
 
 if(saslprops.ipremoteport)
 ret = sasl_setprop(*conn, SASL_IPREMOTEPORT,
- saslprops.ipremoteport);
+			 saslprops.ipremoteport);
 if(ret != SASL_OK) return ret;
- 
+
 if(saslprops.iplocalport)
 ret = sasl_setprop(*conn, SASL_IPLOCALPORT,
- saslprops.iplocalport);
+			 saslprops.iplocalport);
 if(ret != SASL_OK) return ret;
 secprops = mysasl_secprops(0);
 ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops);
@@ -2065,22 +2139,23 @@
 /* Merge our read messages with the existing \Seen database */
 static int update_seen(void)
 {
- unsigned i;
+ unsigned msgno;
 struct index_record record;
 int r = 0;
 
 if (!config_popuseimapflags)
 	return 0;
 
- if (config_popuseacl && !(popd_myrights & ACL_SEEN))
+ if (config_popuseacl && !(popd_myrights & ACL_SETSEEN))
 	return 0;
 
- /* we know this mailbox must be owned by the user, because 
+ /* we know this mailbox must be owned by the user, because
 * all POP mailboxes are */
- for (i = 1; i <= popd_exists; i++) {
-	if (!popd_msgi.seen)
+ for (msgno = 1; msgno <= popd_exists; msgno++) {
+	if (!popd_mapmsgno-1.seen)
 	 continue; /* don't even need to check */
-	if (mailbox_read_index_record(popd_mailbox, popd_msgi.recno, &record))
+	if (mailbox_read_index_record(popd_mailbox, popd_mapmsgno-1.recno,
+				 &record))
 	 continue;
 	if (record.system_flags & FLAG_EXPUNGED)
 	 continue; /* already expunged */

cyrus-imapd-2.4.17.tar.gz/imap/proc.c -> cyrus-imapd-2.5.tar.gz/imap/proc.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: proc.c,v 1.27 2010/01/06 17:01:38 murch Exp $
 */
 
 #include <config.h>
@@ -49,92 +47,343 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <signal.h>
 #include <syslog.h>
 #include <string.h>
+#include <sys/stat.h>
 
+#include "assert.h"
 #include "exitcodes.h"
 #include "global.h"
 #include "proc.h"
+#include "retry.h"
+#include "util.h"
 #include "xmalloc.h"
 
-#define FNAME_PROCDIR "/proc/"
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+# define dirent direct
+# define NAMLEN(dirent) (dirent)->d_namlen
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
+#endif
+
+
+#define FNAME_PROCDIR "/proc"
 
 static char *procfname = 0;
-static FILE *procfile = 0;
 
-int proc_register(const char *progname, const char *clienthost,
-		 const char *userid, const char *mailbox)
+static char *proc_getdir(void)
+{
+ return strconcat(config_dir, FNAME_PROCDIR, (char *)NULL);
+}
+
+static char *proc_getpath(pid_t pid, int isnew)
+{
+ char *path;
+
+ assert(pid > 0);
+ path = xmalloc(strlen(config_dir)+sizeof(FNAME_PROCDIR)+16);
+ sprintf(path, "%s%s/%s%u%s",
+		config_dir,
+		FNAME_PROCDIR,
+		(isnew ? "." : ""),
+		(unsigned)pid,
+		(isnew ? ".new" : ""));
+ return path;
+}
+
+EXPORTED int proc_register(const char *servicename, const char *clienthost,
+		 const char *userid, const char *mailbox, const char *cmd)
 {
- unsigned pid;
- int pos;
-
- if (!procfname) {
-	pid = getpid();
-
-	if (config_getstring(IMAPOPT_PROC_PATH)) {
-	 const char *procpath = config_getstring(IMAPOPT_PROC_PATH);
-	 int len = strlen(procpath);
-	 if (procpath0 != '/')
-		fatal("proc path must be fully qualified", EC_CONFIG);
-	 if (len < 2)
-		fatal("proc path must not be '/'", EC_CONFIG);
-	 procfname = xmalloc(len + 11); /* space for trailing slash */
-	 if (procpathlen-1 != '/')
-		sprintf(procfname, "%s/%u", procpath, pid);
-	 else
-		sprintf(procfname, "%s%u", procpath, pid);
+ pid_t pid = getpid();
+ FILE *procfile = NULL;
+ char *newfname = NULL;
+
+ if (!procfname)
+	procfname = proc_getpath(pid, /*isnew*/0);
+
+ newfname = proc_getpath(pid, /*isnew*/1);
+
+ procfile = fopen(newfname, "w+");
+ if (!procfile) {
+	if (cyrus_mkdir(newfname, 0755) == -1) {
+	 fatal("couldn't create proc directory", EC_IOERR);
 	}
 	else {
-	 procfname = xmalloc(strlen(config_dir)+sizeof(FNAME_PROCDIR)+10);
-	 sprintf(procfname, "%s%s%u", config_dir, FNAME_PROCDIR, pid);
-	}
-
-	procfile = fopen(procfname, "w+");
-	if (!procfile) {
-	 if (cyrus_mkdir(procfname, 0755) == -1) {
-		fatal("couldn't create proc directory", EC_IOERR);
-	 }
-	 else {
-		syslog(LOG_NOTICE, "created proc directory");
-		procfile = fopen(procfname, "w+");
-		if (!procfile) {
-		 syslog(LOG_ERR, "IOERROR: creating %s: %m", procfname);
-		 fatal("can't write proc file", EC_IOERR);
-		}
+	 syslog(LOG_NOTICE, "created proc directory");
+	 procfile = fopen(newfname, "w+");
+	 if (!procfile) {
+		syslog(LOG_ERR, "IOERROR: creating %s: %m", newfname);
+		fatal("can't write proc file", EC_IOERR);
 	 }
 	}
 }
 
- rewind(procfile);
- fprintf(procfile, "%s", clienthost);
- if (userid) {
-	fprintf(procfile, "\t%s", userid);
-	if (mailbox) {
-	 fprintf(procfile, "\t%s", mailbox);
-	}
- }
- putc('\n', procfile);
- fflush(procfile);
- pos = ftell(procfile);
- if (pos < 0 || ftruncate(fileno(procfile), pos)) {
-	syslog(LOG_ERR, "IOERROR: creating %s: %m", procfname);
+ if (!servicename) servicename = "";
+ if (!clienthost) clienthost = "";
+ if (!userid) userid = "";
+ if (!mailbox) mailbox = "";
+ if (!cmd) cmd = "";
+ fprintf(procfile, "%s\t%s\t%s\t%s\t%s\n", servicename, clienthost, userid, mailbox, cmd);
+ fclose(procfile);
+
+ if (rename(newfname, procfname)) {
+	syslog(LOG_ERR, "IOERROR: renaming %s to %s: %m", newfname, procfname);
+	unlink(newfname);
 	fatal("can't write proc file", EC_IOERR);
 }
-	
 
- setproctitle("%s: %s %s %s", progname, clienthost, 
-		 userid ? userid : "",
-		 mailbox ? mailbox : "");
+ setproctitle("%s: %s %s %s %s", servicename, clienthost, userid, mailbox, cmd);
 
+ free(newfname);
 return 0;
 }
 
-void proc_cleanup(void)
+EXPORTED void proc_cleanup(void)
 {
 if (procfname) {
-	fclose(procfile);
 	unlink(procfname);
 	free(procfname);
 	procfname = NULL;
 }
 }
+
+static int proc_foreach_helper(pid_t pid, procdata_t *func, void *rock)
+{
+ int r = 0;
+ char *buf = NULL;
+ char *path = NULL;
+ int fd = -1;
+
+ path = proc_getpath(pid, /*isnew*/0);
+
+ fd = open(path, O_RDONLY, 0);
+ if (fd != -1) {
+	/* yay, got a file */
+	int n;
+	struct stat sbuf;
+	char *p;
+	char *service = NULL;
+	char *host = NULL;
+	char *user = NULL;
+	char *mailbox = NULL;
+	char *cmd = NULL;
+
+	if (fstat(fd, &sbuf))
+	 goto done;
+	if (!S_ISREG(sbuf.st_mode))
+	 goto done;
+
+	/* grab a copy of the file contents */
+	buf = xmalloc(sbuf.st_size+1);
+	n = retry_read(fd, buf, sbuf.st_size);
+	if (n != sbuf.st_size)
+	 goto done;
+
+	bufsbuf.st_size = '\0';
+
+	/* remove any endline characters */
+	p = strchr(buf, '\r');
+	if (p) *p = '\0';
+	p = strchr(buf, '\n');
+	if (p) *p = '\0';
+
+	/* parse the fields */
+	service = buf;
+	host = strchr(service, '\t');
+	if (!host) goto done;
+	*host++ = '\0';
+	user = strchr(host, '\t');
+	if (user) {
+	 *user++ = '\0';
+	 mailbox = strchr(user, '\t');
+	}
+	if (mailbox) {
+	 *mailbox++ = '\0';
+	 cmd = strchr(mailbox, '\t');
+	}
+	if (cmd) {
+	 *cmd++ = '\0';
+	}
+
+	(*func)(pid, service, host, user, mailbox, cmd, rock);
+ }
+
+done:
+ xclose(fd);
+ free(buf);
+ free(path);
+ return r;
+}
+
+EXPORTED int proc_foreach(procdata_t *func, void *rock)
+{
+ DIR *dirp;
+ struct dirent *dirent;
+ char *path;
+ const char *p;
+ pid_t pid;
+ char *end = NULL;
+ int r = 0;
+
+ path = proc_getdir();
+ dirp = opendir(path);
+
+ if (dirp) {
+	while ((dirent = readdir(dirp)) != NULL) {
+	 p = dirent->d_name;
+	 if (*p == '.') continue; /* dot files */
+	 pid = strtoul(p, &end, 10);
+	 if (pid == 0 || end == NULL || *end || end == p) {
+		syslog(LOG_ERR, "IOERROR: bogus filename \"%s/%s\" in proc_foreach",
+				path, p);
+		continue;
+	 }
+	 r = proc_foreach_helper(pid, func, rock);
+	 if (r) break;
+	}
+	closedir(dirp);
+ }
+
+ free(path);
+ return r;
+}
+
+static int procusage_cb(pid_t pid __attribute__((unused)),
+			const char *servicename __attribute__((unused)),
+			const char *clienthost,
+			const char *userid,
+			const char *mboxname __attribute__((unused)),
+			const char *cmd __attribute__((unused)),
+			void *rock)
+{
+ struct proc_limits *limitsp = (struct proc_limits *)rock;
+
+ /* we only count logged in sessions */
+ if (!userid) return 0;
+
+ if (limitsp->clienthost && !strcmp(clienthost, limitsp->clienthost))
+	limitsp->host++;
+ if (limitsp->userid && !strcmp(userid, limitsp->userid))
+	limitsp->user++;
+
+ return 0;
+}
+
+EXPORTED int proc_checklimits(struct proc_limits *limitsp)
+{
+ limitsp->maxhost = config_getint(IMAPOPT_MAXLOGINS_PER_HOST);
+ limitsp->maxuser = config_getint(IMAPOPT_MAXLOGINS_PER_USER);
+
+ if (!limitsp->maxuser && !limitsp->maxhost)
+	return 0;
+
+ limitsp->host = 0;
+ limitsp->user = 0;
+ proc_foreach(procusage_cb, limitsp);
+
+ if (limitsp->maxhost && limitsp->host >= limitsp->maxhost) return 1;
+ if (limitsp->maxuser && limitsp->user >= limitsp->maxuser) return 1;
+
+ return 0;
+}
+
+struct prockill_data {
+ const char *servicename;
+ const char *clienthost;
+ const char *userid;
+ const char *mboxname;
+ const char *cmd;
+ int sig;
+};
+
+#define PROCKILL_INIT { NULL, NULL, NULL, NULL, NULL, 0 }
+
+static int prockill_cb(pid_t pid,
+		 const char *servicename,
+		 const char *clienthost,
+		 const char *userid,
+		 const char *mboxname,
+		 const char *cmd,
+		 void *rock)
+{
+ struct prockill_data *dat = (struct prockill_data *)rock;
+ pid_t mypid = getpid();
+
+ /* don't kill myself */
+ if (mypid == pid)
+	return 0;
+
+ if (dat->servicename && strcmpsafe(servicename, dat->servicename))
+	return 0;
+
+ if (dat->clienthost && strcmpsafe(clienthost, dat->clienthost))
+	return 0;
+
+ if (dat->userid && strcmpsafe(userid, dat->userid))
+	return 0;
+
+ if (dat->mboxname && strcmpsafe(mboxname, dat->mboxname))
+	return 0;
+
+ if (dat->cmd && strcmpsafe(cmd, dat->cmd))
+	return 0;
+
+ if (dat->sig)
+	kill(pid, dat->sig);
+ else
+	kill(pid, SIGTERM);
+
+ return 0;
+}
+
+
+EXPORTED void proc_killuser(const char *userid)
+{
+ struct prockill_data rock = PROCKILL_INIT;
+
+ /* can't kill all non-connected, that's evil */
+ assert(userid && userid0);
+
+ rock.userid = userid;
+
+ proc_foreach(prockill_cb, &rock);
+}
+
+EXPORTED void proc_killmbox(const char *mboxname)
+{
+ struct prockill_data rock = PROCKILL_INIT;
+
+ /* can't kill all non-selected, that's evil */;
+ assert(mboxname && mboxname0);
+
+ rock.mboxname = mboxname;
+
+ proc_foreach(prockill_cb, &rock);
+}
+
+EXPORTED void proc_killusercmd(const char *userid, const char *cmd, int sig)
+{
+ struct prockill_data rock = PROCKILL_INIT;
+
+ /* can't kill all non-selected, that's evil */;
+ assert(userid && userid0);
+ /* or all cmd either... use proc_killuser if you want that */
+ assert(cmd && cmd0);
+
+ rock.userid = userid;
+ rock.cmd = cmd;
+ rock.sig = sig;
+
+ proc_foreach(prockill_cb, &rock);
+}

cyrus-imapd-2.4.17.tar.gz/imap/proc.h -> cyrus-imapd-2.5.tar.gz/imap/proc.h Changed

@@ -38,19 +38,40 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: proc.c,v 1.27 2010/01/06 17:01:38 murch Exp $
  */
 
 #ifndef _PROC_H
 #define _PROC_H
 
+struct proc_limits {
+    const char *procname;
+    const char *clienthost;
+    const char *userid;
+    int user;
+    int maxuser;
+    int host;
+    int maxhost;
+};
+
+typedef int procdata_t(pid_t pid,
+		       const char *servicename, const char *clienthost,
+		       const char *userid, const char *mailbox,
+		       const char *cmd, void *rock);
+
 extern void setproctitle_init(int argc, char **argv, char **envp);
 extern void setproctitle(const char *fmt, ...);
 
-extern int proc_register(const char *progname, const char *clienthost,
-		         const char *userid, const char *mailbox);
+extern int proc_register(const char *servicename, const char *clienthost,
+		         const char *userid, const char *mailbox, const char *cmd);
 
 extern void proc_cleanup(void);
 
+extern int proc_foreach(procdata_t *func, void *rock);
+
+extern int proc_checklimits(struct proc_limits *limitsp);
+
+extern void proc_killuser(const char *userid);
+extern void proc_killmbox(const char *mboxname);
+extern void proc_killusercmd(const char *userid, const char *cmd, int sig);
+
 #endif /* _PROC_H */

cyrus-imapd-2.4.17.tar.gz/imap/protocol.h -> cyrus-imapd-2.5.tar.gz/imap/protocol.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: protocol.h,v 1.12 2010/01/06 17:01:38 murch Exp $
 */
 
 #ifndef _INCLUDED_PROTOCOL_H
@@ -47,7 +45,16 @@
 
 #include "saslclient.h"
 
-#define MAX_CAPA 8
+enum {
+ /* protocol types */
+ TYPE_STD = 0, /* protocol fits standard template */
+ TYPE_SPEC = 1 /* non-standard needs special functions */
+};
+
+struct stdprot_t;
+struct backend;
+
+#define MAX_CAPA 9
 
 enum {
 /* generic capabilities */
@@ -61,8 +68,6 @@
 */
 };
 
-struct protocol_t;
-
 struct banner_t {
 u_char auto_capa;		/* capability response sent automatically
 				 in banner? */
@@ -74,13 +79,20 @@
 unsigned long flag;
 };
 
+#define CAPAF_MANY_PER_LINE	(0)
+#define CAPAF_ONE_PER_LINE	(1<<0)
+#define CAPAF_SKIP_FIRST_WORD	(1<<1)
+#define CAPAF_QUOTE_WORDS	(1<<2)
+#define CAPAF_DASH_STUFFING	(1<<3)
+
 struct capa_cmd_t {
 const char *cmd;		/* OPTIONAL capability command string */
 const char *arg;		/* OPTIONAL capability command argument */
 const char *resp;		/* end of capability response */
- char *(*parse_mechlist)(const char *str, struct protocol_t *prot);
-				/* OPTIONAL parse capability string,
-				 returns space-separated list of mechs */
+ void (*postcapability)(struct backend *);
+				/* OPTIONAL called after capabilities,
+				 * received from server, are parsed */
+ int formatflags;		/* CAPAF* constants above */
 struct capa_t capaMAX_CAPA+1;/* list of capabilities to parse for
 				 (MUST end with NULL entry) */
 };
@@ -99,9 +111,7 @@
 const char *ok;		/* success response */
 };
 
-struct protocol_t {
- const char *service;	/* INET service name */
- const char *sasl_service;	/* SASL service name */
+struct stdprot_t {
 struct banner_t banner;
 struct capa_cmd_t capa_cmd;
 struct tls_cmd_t tls_cmd;
@@ -111,4 +121,23 @@
 struct simple_cmd_t logout_cmd;
 };
 
+struct protocol_t {
+ const char *service; /* INET service name */
+ const char *sasl_service; /* SASL service name */
+ unsigned type;
+ union {
+ struct stdprot_t std;
+ struct {
+	 /* special protocol */
+	 int (*login)(struct backend *s, const char *userid,
+			sasl_callback_t *cb, const char **status,
+			int noauth);
+	 int (*ping)(struct backend *s, const char *userid);
+	 int (*logout)(struct backend *s);
+ } spec;
+ } u;
+};
+
+
+
 #endif /* _INCLUDED_PROTOCOL_H */

cyrus-imapd-2.4.17.tar.gz/imap/proxy.c -> cyrus-imapd-2.5.tar.gz/imap/proxy.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: proxy.c,v 1.9 2010/01/06 17:01:39 murch Exp $
 */
 
 #include <config.h>
@@ -51,20 +49,17 @@
 #include <syslog.h>
 #include <sys/un.h>
 
-#include "assert.h"
 #include "backend.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mupdate-client.h"
-#include "prot.h"
 #include "proxy.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
-void proxy_adddest(struct dest **dlist, const char *rcpt, int rcpt_num,
-		 char *server, const char *authas)
+EXPORTED void proxy_adddest(struct dest **dlist, const char *rcpt, int rcpt_num,
+		 const char *server, const char *authas)
 {
 struct dest *d;
 
@@ -99,7 +94,7 @@
 }
 }
 
-void proxy_downserver(struct backend *s)
+EXPORTED void proxy_downserver(struct backend *s)
 {
 if (!s || (s->sock == -1)) {
 	/* already disconnected */
@@ -142,8 +137,7 @@
 }
 
 /* return the connection to the server */
-struct backend *
-proxy_findserver(const char *server,		/* hostname of backend */
+EXPORTED struct backend * proxy_findserver(const char *server,		/* hostname of backend */
 		 struct protocol_t *prot,	/* protocol we're speaking */
 		 const char *userid,		/* proxy as userid (ext form)*/
 		 struct backend ***cache,	/* ptr to backend cache */
@@ -166,7 +160,7 @@
 	if (!strcmp(server, ((*cache)i)->hostname)) {
 	 ret = (*cache)i;
 	 /* ping/noop the server */
-	 if ((ret->sock != -1) && backend_ping(ret)) {
+	 if ((ret->sock != -1) && backend_ping(ret, userid)) {
 		backend_disconnect(ret);
 	 }
 	 break;
@@ -176,7 +170,7 @@
 
 if (!ret || (ret->sock == -1)) {
 	/* need to (re)establish connection to server or create one */
-	ret = backend_connect(ret, server, prot, userid, NULL, NULL);
+	ret = backend_connect(ret, server, prot, userid, NULL, NULL, -1);
 	if (!ret) return NULL;
 
 	if (clientin) {
@@ -214,7 +208,7 @@
 * If serverout is NULL:
 * - returns 1 if input from clientin is pending, otherwise returns 0.
 */
-int proxy_check_input(struct protgroup *protin,
+EXPORTED int proxy_check_input(struct protgroup *protin,
 		 struct protstream *clientin,
 		 struct protstream *clientout,
 		 struct protstream *serverin,

cyrus-imapd-2.4.17.tar.gz/imap/proxy.h -> cyrus-imapd-2.5.tar.gz/imap/proxy.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/pushstats.snmp -> cyrus-imapd-2.5.tar.gz/imap/pushstats.snmp Changed

cyrus-imapd-2.4.17.tar.gz/imap/quota.c -> cyrus-imapd-2.5.tar.gz/imap/quota.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: quota.c,v 1.72 2010/01/06 17:01:39 murch Exp $
 */
 
 #include <config.h>
@@ -51,11 +49,11 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
+#include <sys/poll.h>
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -74,16 +72,13 @@
 # endif
 #endif
 
-#include "assert.h"
 #include "bsearch.h"
-#include "cyrusdb.h"
 #include "global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "mboxlist.h"
 #include "mboxname.h"
 #include "quota.h"
@@ -96,34 +91,32 @@
 /* current namespace */
 static struct namespace quota_namespace;
 
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 struct quotaentry {
- struct quota quota;
- char *allocname;
+ char *name;
 int refcount;
 int deleted;
- uquota_t newused;
 };
 
 /* forward declarations */
-void usage(void);
-void reportquota(void);
+static void usage(void);
+static void reportquota(void);
 static int buildquotalist(char *domain, char **roots, int nroots);
 static int fixquotas(char *domain, char **roots, int nroots);
-static int fixquota_mailbox(void *rock, const char *name, int namelen,
-			 const char *val, int vallen);
+static int fixquota_dopass(char *domain, char **roots, int nroots,
+			 foreach_cb *pass);
+static int fixquota_dombox(void *rock, const char *name, size_t namelen,
+			 const char *val, size_t vallen);
 static int fixquota_fixroot(struct mailbox *mailbox, const char *root);
 static int fixquota_finish(int thisquota);
 static int (*compar)(const char *s1, const char *s2);
 
 #define QUOTAGROW 300
 
-struct quotaentry *quota;
-int quota_num = 0, quota_alloc = 0;
+static struct quotaentry *quotaroots;
+static int quota_num = 0, quota_alloc = 0;
+static int quota_todo = 0;
 
-int redofix = 0;
+static int test_sync_mode = 0;
 
 int main(int argc,char **argv)
 {
@@ -131,18 +124,23 @@
 int i;
 int fflag = 0;
 int r, code = 0;
+ int do_report = 1;
 char *alt_config = NULL, *domain = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
- while ((opt = getopt(argc, argv, "C:d:f")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:d:fqZ")) != EOF) {
 	switch (opt) {
 	case 'C': /* alt config file */
 	 alt_config = optarg;
 	 break;
 
+	case 'q':
+	 do_report = 0;
+	 break;
+
 	case 'd':
 	 domain = optarg;
 	 break;
@@ -151,12 +149,21 @@
 	 fflag = 1;
 	 break;
 
+	/* deliberately undocumented option for testing */
+	case 'Z':
+	 test_sync_mode = 1;
+	 break;
+
 	default:
 	 usage();
 	}
 }
 
- cyrus_init(alt_config, "quota", 0);
+ /* always report if not fixing, otherwise we do nothing */
+ if (!fflag)
+	do_report = 1;
+
+ cyrus_init(alt_config, "quota", 0, CONFIG_NEED_PARTITION_DATA);
 
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(&quota_namespace, 1)) != 0) {
@@ -165,7 +172,7 @@
 }
 
 if (config_getswitch(IMAPOPT_IMPROVED_MBOXLIST_SORT))
-	compar = bsearch_compare;
+	compar = bsearch_compare_mbox;
 else
 	compar = strcmp;
 
@@ -179,38 +186,43 @@
 quotadb_init(0);
 quotadb_open(NULL);
 
- r = buildquotalist(domain, argv+optind, argc-optind);
+ quota_changelock();
+
+ if (!r)
+	r = buildquotalist(domain, argv+optind, argc-optind);
 
 if (!r && fflag)
 	r = fixquotas(domain, argv+optind, argc-optind);
 
+ quota_changelockrelease();
+
+ if (r) code = convert_code(r);
+ else if (do_report) reportquota();
+
 quotadb_close();
 quotadb_done();
 
 mboxlist_close();
 mboxlist_done();
 
- if (r) code = convert_code(r);
- else reportquota();
-
 /* just for neatness */
 for (i = 0; i < quota_num; i++)
-	free(quotai.allocname);
- free(quota);
+	free(quotarootsi.name);
+ free(quotaroots);
 
 cyrus_done();
 
 return code;
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
-	 "usage: quota -C <alt_config> -d <domain> -f prefix...\n");
+	 "usage: quota -C <alt_config> -d <domain> -f -q prefix...\n");
 exit(EC_USAGE);
 }
 
-void errmsg(const char *fmt, const char *arg, int err)
+static void errmsg(const char *fmt, const char *arg, int err)
 {
 char buf1024;
 size_t len;
@@ -225,28 +237,122 @@
 fprintf(stderr, "%s\n", buf);
 }
 
+static void test_sync_wait(const char *mboxname)
+{
+ char *filename;
+ struct stat sb;
+ clock_t start;
+ int status = 0;
+ int r;
+#define TIMEOUT	 (30 * CLOCKS_PER_SEC)
+
+ if (!test_sync_mode)
+	return;
+ /* aha, we're in test synchronisation mode */
+
+ syslog(LOG_ERR, "quota -Z waiting for signal to do %s", mboxname);
+
+ filename = strconcat(config_dir, "/quota-sync/", mboxname, (char *)NULL);
+ start = sclock();
+
+ while ((r = stat(filename, &sb)) < 0 && errno == ENOENT) {
+	if (sclock() - start > TIMEOUT) {
+	 status = 2;
+	 break;
+	}
+	status = 1;
+	poll(NULL, 0, 20); /* try again in 20 millisec */
+ }
+
+ switch (status)
+ {
+ case 0:
+	syslog(LOG_ERR, "quota -Z did not wait");
+	break;
+ case 1:
+	syslog(LOG_ERR, "quota -Z waited %2.3f sec",
+			 (sclock() - start) / (double) CLOCKS_PER_SEC);
+	break;
+ case 2:
+	syslog(LOG_ERR, "quota -Z timed out");
+	break;
+ }
+
+ free(filename);
+#undef TIMEOUT
+}
+
+static void test_sync_done(const char *mboxname)
+{
+ char *filename;
+
+ if (!test_sync_mode)
+	return;
+ /* aha, we're in test synchronisation mode */
+
+ syslog(LOG_ERR, "quota -Z done with %s", mboxname);
+
+ filename = strconcat(config_dir, "/quota-sync/", mboxname, (char *)NULL);
+ unlink(filename);
+ free(filename);
+}
+
+
 /*
 * A quotaroot was found, add it to our list
 */
 static int fixquota_addroot(struct quota *q,
 			 void *rock __attribute__((unused)))
 {
+ struct quota localq;
+ struct txn *tid = NULL;
+ int r;
+
 if (quota_num == quota_alloc) {
 	/* Create new qr list entry */
 	quota_alloc += QUOTAGROW;
-	quota = (struct quotaentry *)
-	 xrealloc((char *)quota, quota_alloc * sizeof(struct quotaentry));
-	memset(&quotaquota_num, 0, QUOTAGROW * sizeof(struct quotaentry));
+	quotaroots = (struct quotaentry *)
+	 xrealloc((char *)quotaroots, quota_alloc * sizeof(struct quotaentry));
+	memset(&quotarootsquota_num, 0, QUOTAGROW * sizeof(struct quotaentry));
 }
 
- /* copy this quota */
- quotaquota_num.allocname = xstrdup(q->root);
- quotaquota_num.quota.root = quotaquota_num.allocname;
- quotaquota_num.quota.limit = q->limit;
- quotaquota_num.quota.used = q->used;
- quota_num++;
+ quotarootsquota_num.name = xstrdup(q->root);
 
- return 0;
+ /* get a locked read */
+ quota_init(&localq, quotarootsquota_num.name);
+ r = quota_read(&localq, &tid, 1);
+ if (r) {
+	errmsg("failed reading quota record for '%s'",
+	 q->root, r);
+	goto done;
+ }
+
+ /* clean the scanused data if present */
+ if (localq.scanmbox) {
+	free(localq.scanmbox);
+	localq.scanmbox = NULL;
+
+	r = quota_write(&localq, &tid);
+	if (r) {
+	 errmsg("failed writing quota record for '%s'",
+		 q->root, r);
+	 goto done;
+	}
+ }
+
+done:
+ quota_free(&localq);
+ if (r) {
+	quota_abort(&tid);
+	free(quotarootsquota_num.name);
+	quotarootsquota_num.name = NULL;
+ }
+ else {
+	quota_commit(&tid);
+	quota_num++;
+ }
+
+ return r;
 }
 
 /*
@@ -267,7 +373,7 @@
 
 /* basic case - everything (potentially limited by domain still) */
 if (!nroots) {
-	r = quota_foreach(buf, fixquota_addroot, NULL);
+	r = quota_foreach(buf, fixquota_addroot, buf, NULL);
 	if (r) {
 	 errmsg("failed building quota list for '%s'", buf, IMAP_IOERROR);
 	}
@@ -282,7 +388,7 @@
 	/* change the separator to internal namespace */
 	mboxname_hiersep_tointernal(&quota_namespace, tail, 0);
 
-	r = quota_foreach(buf, fixquota_addroot, NULL);
+	r = quota_foreach(buf, fixquota_addroot, buf, NULL);
 	if (r) {
 	 errmsg("failed building quota list for '%s'", buf, IMAP_IOERROR);
 	 break;
@@ -298,8 +404,8 @@
 
 *thisquota = -1;
 
- for (i = 0; i < quota_num; i++) {
-	const char *root = quotai.quota.root;
+ for (i = quota_todo; i < quota_num; i++) {
+	const char *root = quotarootsi.name;
 
 	/* have we already passed the name, then there can
 	 * be no further matches */
@@ -315,23 +421,45 @@
 }
 
 if (*thisquota >= 0)
-	quota*thisquota.refcount++;
+	quotaroots*thisquota.refcount++;
 
 return 0;
 }
 
 /*
- * Account for mailbox 'name' when fixing the quota roots
+ * Pass 2: account for mailbox 'name' when fixing the quota roots
 */
-static int fixquota_mailbox(void *rock __attribute__((unused)),
-			 const char *name, int namelen,
-			 const char *val __attribute__((unused)),
-			 int vallen __attribute__((unused)))
+static int fixquota_dombox(void *rock,
+			 const char *name, size_t namelen,
+			 const char *val __attribute__((unused)),
+			 size_t vallen __attribute__((unused)))
 {
 int r = 0;
+ const char *prefix = (const char *)rock;
+ size_t prefixlen = (prefix ? strlen(prefix) : 0);
 struct mailbox *mailbox = NULL;
 int thisquota = -1;
 char *mboxname = xstrndup(name, namelen);
+ struct txn *txn = NULL;
+
+ while (quota_todo < quota_num) {
+	const char *root = quotarootsquota_todo.name;
+
+	/* in the future, definitely don't close yet */
+	if (compar(mboxname, root) < 0)
+	 break;
+
+	/* inside the first root, don't close yet */
+	if (mboxname_is_prefix(mboxname, root))
+	 break;
+
+	/* finished, close out now */
+	r = fixquota_finish(quota_todo);
+	quota_todo++;
+	if (r) goto done;
+ }
+
+ test_sync_wait(mboxname);
 
 r = findroot(mboxname, &thisquota);
 if (r) {
@@ -349,24 +477,54 @@
 	/* no matching quotaroot exists, remove from
 	 * mailbox if present */
 	if (mailbox->quotaroot) {
-	 r = fixquota_fixroot(mailbox, (char *)0);
+	 /* unless it's outside the current prefix of course */
+	 if (strlen(mailbox->quotaroot) < prefixlen) goto done;
+	 r = fixquota_fixroot(mailbox, NULL);
+	 if (r) goto done;
 	}
 }
 else {
+	const char *root = quotarootsthisquota.name;
+	quota_t usedsQUOTA_NUMRESOURCES;
+	struct quota localq;
+	int res;
+
 	/* matching quotaroot exists, ensure mailbox has the
 	 * correct root */
 	if (!mailbox->quotaroot ||
-	 strcmp(mailbox->quotaroot, quotathisquota.quota.root) != 0) {
-	 r = fixquota_fixroot(mailbox, quotathisquota.quota.root);
+	 strcmp(mailbox->quotaroot, root) != 0) {
+	 r = fixquota_fixroot(mailbox, root);
+	 if (r) goto done;
+	}
+
+	/* read the current data */
+	quota_init(&localq, root);
+	r = quota_read(&localq, &txn, 1);
+	if (r) goto done;
+
+	/* add the usage for this mailbox */
+	mailbox_get_usage(mailbox, useds);
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++)
+	 localq.scanusedsres += usedsres;
+
+	/* and mention that this mailbox has been scanned */
+	free(localq.scanmbox);
+	localq.scanmbox = xstrdup(mboxname);
+
+	r = quota_write(&localq, &txn);
+	quota_free(&localq);
+
+	if (r) {
+	 quota_abort(&txn);
+	 goto done;
 	}
 
-	/* and track the total usage inside this root */
-	if (!r)
-	 quotathisquota.newused += mailbox->i.quota_mailbox_used;
+	quota_commit(&txn);
 }
 
 done:
 mailbox_close(&mailbox);
+ test_sync_done(mboxname);
 free(mboxname);
 
 return r;
@@ -388,64 +546,74 @@
 }
 
 /*
- * Finish fixing up a quota root
+ * Pass 3: finish fixing up a quota root
 */
 int fixquota_finish(int thisquota)
 {
+ int res;
 int r = 0;
 struct txn *tid = NULL;
+ const char *root = quotarootsthisquota.name;
+ struct quota localq;
 
- if (!quotathisquota.refcount) {
-	printf("%s: removed\n", quotathisquota.quota.root);
-	r = quota_deleteroot(quotathisquota.quota.root);
+ if (!quotarootsthisquota.refcount) {
+	quotarootsthisquota.deleted = 1;
+	printf("%s: removed\n", root);
+	r = quota_deleteroot(root);
 	if (r) {
-	 errmsg("failed deleting quotaroot '%s'",
-		 quotathisquota.quota.root, r);
+	 errmsg("failed deleting quotaroot '%s'", root, r);
 	}
 	return r;
 }
 
- /* nothing changed, all good */
- if (quotathisquota.quota.used == quotathisquota.newused)
-	return 0;
-
 /* re-read the quota with the record locked */
- r = quota_read(&quotathisquota.quota, &tid, 1);
+ quota_init(&localq, root);
+ r = quota_read(&localq, &tid, 1);
 if (r) {
-	errmsg("failed reading quotaroot '%s'",
-	 quotathisquota.quota.root, r);
-	return r;
+	errmsg("failed reading quotaroot '%s'", root, r);
+	goto done;
 }
 
- /* is it still different? */
- if (quotathisquota.quota.used != quotathisquota.newused) {
-	printf("%s: usage was " UQUOTA_T_FMT ", now " UQUOTA_T_FMT "\n",
-	 quotathisquota.quota.root,
-	 quotathisquota.quota.used, quotathisquota.newused);
-	quotathisquota.quota.used = quotathisquota.newused;
-	r = quota_write(&quotathisquota.quota, &tid);
-	if (r) {
-	 errmsg("failed writing quotaroot '%s'",
-		 quotathisquota.quota.root, r);
-	 quota_abort(&tid);
-	 return r;
+ /* is it different? */
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	if (localq.scanusedsres != localq.usedsres) {
+	 printf("%s: %s usage was " QUOTA_T_FMT ", now " QUOTA_T_FMT "\n",
+		root,
+		quota_namesres,
+		localq.usedsres,
+		localq.scanusedsres);
+	 localq.usedsres = localq.scanusedsres;
 	}
 }
 
- quota_commit(&tid);
+ /* remove the scanned data, we're now up-to-date */
+ free(localq.scanmbox);
+ localq.scanmbox = NULL;
 
- return 0;
+ r = quota_write(&localq, &tid);
+ if (r) {
+	errmsg("failed writing quotaroot: '%s'", root, r);
+	goto done;
+ }
+
+done:
+ quota_free(&localq);
+
+ if (r) quota_abort(&tid);
+ else quota_commit(&tid);
+
+ return r;
 }
 
 /*
- * Fix all the quota roots
+ * Run a pass over all the quota roots
 */
-int fixquotas(char *domain, char **roots, int nroots)
+int fixquota_dopass(char *domain, char **roots, int nroots,
+		 foreach_cb *cb)
 {
 int i, r;
 char bufMAX_MAILBOX_BUFFER, *tail;
 size_t domainlen = 0;
- int firstquota = 0;
 
 buf0 = '\0';
 tail = buf;
@@ -456,7 +624,7 @@
 
 /* basic case - everything (potentially limited by domain still) */
 if (!nroots) {
-	r = mboxlist_allmbox(buf, fixquota_mailbox, NULL);
+	r = mboxlist_allmbox(buf, cb, buf, /*incdel*/0);
 	if (r) {
 	 errmsg("processing mbox list for '%s'", buf, IMAP_IOERROR);
 	}
@@ -471,48 +639,79 @@
 	/* change the separator to internal namespace */
 	mboxname_hiersep_tointernal(&quota_namespace, tail, 0);
 
-	r = mboxlist_allmbox(buf, fixquota_mailbox, NULL);
+	r = mboxlist_allmbox(buf, cb, buf, /*incdel*/0);
 	if (r) {
 	 errmsg("processing mbox list for '%s'", buf, IMAP_IOERROR);
 	 break;
 	}
 }
 
- while (!r && firstquota < quota_num) {
-	r = fixquota_finish(firstquota);
-	firstquota++;
+ return r;
+}
+
+/*
+ * Fix all the quota roots
+ */
+int fixquotas(char *domain, char **roots, int nroots)
+{
+ int r;
+
+ r = fixquota_dopass(domain, roots, nroots, fixquota_dombox);
+
+ while (!r && quota_todo < quota_num) {
+	r = fixquota_finish(quota_todo);
+	quota_todo++;
 }
 
 return r;
 }
 
+static void reportquota_resource(struct quota * quota, const char *root, int res)
+{
+ if (quota->limitsres > 0) {
+	printf(" %7" PRIdMAX " %8" PRIdMAX, (intmax_t)quota->limitsres,
+	 (intmax_t)((((intmax_t)quota->usedsres / quota_unitsres)
+	 * 100) / quota->limitsres));
+ }
+ else if (quota->limitsres == 0) {
+	printf(" 0 ");
+ }
+ else {
+	printf(" ");
+ }
+ printf(" %8" PRIdMAX " %20s %s\n",
+	(intmax_t)((intmax_t)quota->usedsres / quota_unitsres),
+	quota_namesres, root);
+}
+
 /*
 * Print out the quota report
 */
-void reportquota(void)
+static void reportquota(void)
 {
 int i;
- char bufMAX_MAILBOX_PATH+1;
+ int res;
 
- printf(" Quota %% Used Used Root\n");
+ printf(" Quota %% Used Used Resource Root\n");
 
 for (i = 0; i < quota_num; i++) {
-	if (quotai.deleted) continue;
-	if (quotai.quota.limit > 0) {
-	 printf(" %7d " QUOTA_REPORT_FMT , quotai.quota.limit,
-		 ((quotai.quota.used / QUOTA_UNITS) * 100) / quotai.quota.limit);
-	}
-	else if (quotai.quota.limit == 0) {
-	 printf(" 0 ");
+	struct quota localq;
+	int r;
+
+	if (quotarootsi.deleted) continue;
+
+	/* XXX - cache these from either the parse or the commit again */
+	quota_init(&localq, quotarootsi.name);
+	r = quota_read(&localq, NULL, 0);
+	if (r) {
+	 quota_free(&localq);
+	 return;
 	}
-	else {
-	 printf(" ");
+
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 reportquota_resource(&localq, quotarootsi.name, res);
 	}
-	/* Convert internal name to external */
-	(*quota_namespace.mboxname_toexternal)(&quota_namespace,
-					 quotai.quota.root,
-					 "cyrus", buf);
-	printf(" " QUOTA_REPORT_FMT " %s\n",
-	 quotai.quota.used / QUOTA_UNITS, buf);
+
+	quota_free(&localq);
 }
 }

cyrus-imapd-2.4.17.tar.gz/imap/quota.h -> cyrus-imapd-2.5.tar.gz/imap/quota.h Changed

@@ -38,67 +38,93 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: quota.h,v 1.5 2010/01/06 17:01:39 murch Exp $
 */
 
 #ifndef INCLUDED_QUOTA_H
 #define INCLUDED_QUOTA_H
 
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+
 #include "cyrusdb.h"
 #include <config.h>
 
 #define FNAME_QUOTADB "/quotas.db"
 
-#define QUOTA_UNITS (1024)
-
-/* Define the proper quota type, it should either be a
- * long or a long long int depending upon what the
- * the compiler supports.
- */
-#ifdef HAVE_LONG_LONG_INT
-typedef unsigned long long int uquota_t;
+/* Define the proper quota type, which is 64 bit and signed */
 typedef long long int quota_t;
-#define UQUOTA_T_FMT "%llu"
 #define QUOTA_T_FMT "%lld"
-#define QUOTA_REPORT_FMT "%8llu"
-#else
-typedef unsigned long uquota_t;
-typedef long quota_t;
-#define UQUOTA_T_FMT "%lu"
-#define QUOTA_T_FMT "%ld"
-#define QUOTA_REPORT_FMT "%8lu"
-#endif
 
 extern struct db *qdb;
 
+enum quota_resource {
+ QUOTA_STORAGE	=0,
+ QUOTA_MESSAGE	=1,
+ QUOTA_ANNOTSTORAGE	=2,
+ QUOTA_NUMFOLDERS	=3,
+#define QUOTA_NUMRESOURCES (QUOTA_NUMFOLDERS+1)
+};
+
+#define QUOTA_DIFFS_INITIALIZER \
+	{ 0, 0, 0, 0 }
+#define QUOTA_DIFFS_DONTCARE_INITIALIZER \
+	{ -1, -1, -1, -1 }
+
 struct quota {
- const char *root;
+ char *root;
 
 /* Information in quota entry */
- uquota_t used;
- int limit;			/* in QUOTA_UNITS */
+ quota_t usedsQUOTA_NUMRESOURCES;
+ int limitsQUOTA_NUMRESOURCES;		/* in QUOTA_UNITS */
+
+ /* information for scanning */
+ char *scanmbox;
+ quota_t scanusedsQUOTA_NUMRESOURCES;
 };
 
+/* special value to indicate no limit applies */
+#define QUOTA_UNLIMITED	 (-1)
+
+extern const char * const quota_namesQUOTA_NUMRESOURCES;
+extern const int quota_unitsQUOTA_NUMRESOURCES;
+int quota_name_to_resource(const char *str);
+
 typedef int quotaproc_t(struct quota *quota, void *rock);
 
-extern void quota_setroot(struct quota *quota, const char *root);
+extern int quota_changelock(void);
+extern void quota_changelockrelease(void);
+
+extern void quota_init(struct quota *quota, const char *root);
+extern void quota_free(struct quota *quota);
 
 extern int quota_read(struct quota *quota, struct txn **tid, int wrlock);
 
+extern int quota_check(const struct quota *quota,
+		 enum quota_resource res, quota_t delta);
+extern void quota_use(struct quota *quota,
+		 enum quota_resource res, quota_t delta);
+
 extern void quota_commit(struct txn **tid);
 
 extern void quota_abort(struct txn **tid);
 
 extern int quota_write(struct quota *quota, struct txn **tid);
 
+extern int quota_update_useds(const char *quotaroot,
+			 const quota_t diffQUOTA_NUMRESOURCES,
+			 const char *mboxname);
+extern int quota_check_useds(const char *quotaroot,
+			 const quota_t diffQUOTA_NUMRESOURCES);
+
 extern int quota_deleteroot(const char *quotaroot);
 
 extern int quota_findroot(char *ret, size_t retlen, const char *name);
 
-extern int quota_foreach(const char *prefix, quotaproc_t *proc, void *rock);
-
-extern void quota_free(struct quota *quota);
+extern int quota_foreach(const char *prefix, quotaproc_t *proc,
+			 void *rock, struct txn **);
 
 /* open the quotas db */
 void quotadb_open(const char *fname);
@@ -113,4 +139,6 @@
 /* done with database stuff */
 void quotadb_done(void);
 
+int quota_is_overquota(const struct quota *quota, enum quota_resource res,
+ int newquotasQUOTA_NUMRESOURCES);
 #endif /* INCLUDED_QUOTA_H */

cyrus-imapd-2.4.17.tar.gz/imap/quota_db.c -> cyrus-imapd-2.5.tar.gz/imap/quota_db.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: quota_db.c,v 1.11 2010/01/06 17:01:39 murch Exp $
 */
 
 #include <config.h>
@@ -50,52 +48,197 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <syslog.h>
 
-#include "assert.h"
 #include "cyrusdb.h"
+#include "dlist.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
+#include "mboxname.h"
+#include "mboxevent.h"
 #include "quota.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
+#include "strarray.h"
 
 #define QDB config_quota_db
 
-struct db *qdb;
+HIDDEN struct db *qdb;
+
+/* skanky reuse of mboxname locks. Ideally we would rename
+ * them to something more general and use them elsewhere */
+static struct mboxlock *qchangelock;
 
 static int quota_dbopen = 0;
 
-static int quota_parseval(const char *data, struct quota *quota)
+/* keywords used when storing fields in the new quota db format */
+static const char * const quota_db_namesQUOTA_NUMRESOURCES = {
+ "S",	/* QUOTA_STORAGE */
+ "M",	/* QUOTA_MESSAGE */
+ "AS",	/* QUOTA_ANNOTSTORAGE */
+ "NF"	/* QUOTA_NUMFOLDERS */
+};
+
+/* IMAP atoms for various quota resources */
+EXPORTED const char * const quota_namesQUOTA_NUMRESOURCES = {
+ "STORAGE",			/* QUOTA_STORAGE -- RFC2087 */
+ "MESSAGE",			/* QUOTA_MESSAGE -- RFC2087 */
+ "X-ANNOTATION-STORAGE",	/* QUOTA_ANNOTSTORAGE */
+ "X-NUM-FOLDERS"		/* QUOTA_NUMFOLDERS */
+};
+
+EXPORTED const int quota_unitsQUOTA_NUMRESOURCES = {
+ 1024,		/* QUOTA_STORAGE -- RFC2087 */
+ 1,			/* QUOTA_MESSAGE -- RFC2087 */
+ 1024,		/* QUOTA_ANNOTSTORAGE */
+ 1			/* QUOTA_NUMFOLDERS */
+};
+
+EXPORTED int quota_name_to_resource(const char *str)
 {
- if (sscanf(data, UQUOTA_T_FMT " %d",
-	 &quota->used, &quota->limit) != 2)
-	return 0;
- return 1;
+ int res;
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (!strcasecmp(str, quota_namesres))
+	 return res;
+ }
+ return -1;
+}
+
+EXPORTED int quota_changelock(void)
+{
+ return mboxname_lock("$QUOTACHANGE", &qchangelock, LOCK_EXCLUSIVE);
+}
+
+EXPORTED void quota_changelockrelease()
+{
+ mboxname_release(&qchangelock);
+}
+
+/*
+ * Initialise a struct quota and set the root field. Quota must be initialised
+ * before use.
+ */
+EXPORTED void quota_init(struct quota *q, const char *root)
+{
+ int res;
+
+ memset(q, 0, sizeof(*q));
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+	q->limitsres = QUOTA_UNLIMITED;
+
+ q->root = xstrdup(root);
+}
+
+/* release all the memory allocated in a struct quota */
+EXPORTED void quota_free(struct quota *q)
+{
+ free(q->scanmbox);
+ free(q->root);
+ memset(q, 0, sizeof(*q));
+}
+
+/*
+ * Parse a quota database entry, which is formatted as a string
+ * containing multiple space-separated fields, into a struct quota.
+ * Returns: 0 on success or an IMAP error code.
+ */
+static int quota_parseval(const char *data, size_t datalen,
+			 struct quota *quota, int iswrite)
+{
+ strarray_t *fields = NULL;
+ int r = IMAP_MAILBOX_BADFORMAT;
+ int i = 0;
+ int res = QUOTA_STORAGE;
+ struct dlist *dl = NULL;
+ quota_t temp;
+
+ /* new dlist format */
+ if (data0 == '%') {
+	if (dlist_parsemap(&dl, 0, data, datalen))
+	 goto out;
+
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 struct dlist *val;
+	 struct dlist *item = dlist_getchild(dl, quota_db_namesres);
+	 if (!item) continue;
+	 val = dlist_getchildn(item, 0);
+	 if (val) quota->usedsres = dlist_num(val);
+	 val = dlist_getchildn(item, 1);
+	 if (val) quota->limitsres = dlist_num(val);
+	}
+
+	/* only read the SCAN stuff if it's a write lock */
+	if (iswrite) {
+	 struct dlist *scan = dlist_getchild(dl, "SCAN");
+	 const char *mboxname = NULL;
+	 if (!scan) goto done;
+	 if (!dlist_getatom(scan, "MBOX", &mboxname)) goto done;
+	 quota->scanmbox = xstrdup(mboxname);
+	 for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+		struct dlist *val = dlist_getchild(scan, quota_db_namesres);
+		if (val) quota->scanusedsres = dlist_num(val);
+	 }
+	}
+
+	goto done;
+ }
+
+ /* parse historical formats */
+ fields = strarray_split(data, NULL, 0);
+ for (;;) {
+	if (i+2 > fields->count)
+	 goto out;	/* need at least 2 more fields */
+	if (sscanf(fields->datai++, QUOTA_T_FMT, &quota->usedsres) != 1)
+	 goto out;
+	if (sscanf(fields->datai++, "%d", &quota->limitsres) != 1)
+	 goto out;
+	/* skip over temporary extra used data from failed quota -f runs */
+	if (i < fields->count &&
+	 sscanf(fields->datai, QUOTA_T_FMT, &temp) == 1) {
+	 i++;
+	}
+	if (i == fields->count)
+	 break;	/* successfully parsed whole line */
+
+	for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	 if (quota_db_namesres && !strcasecmp(fields->datai, quota_db_namesres))
+		break;
+	}
+	if (res == QUOTA_NUMRESOURCES)
+	 goto out;
+
+	i++;
+ }
+
+done:
+ r = 0;
+out:
+ dlist_free(&dl);
+ strarray_free(fields);
+ return r;
 }
 
 /*
 * Read the quota entry 'quota'
 */
-int quota_read(struct quota *quota, struct txn **tid, int wrlock)
+EXPORTED int quota_read(struct quota *quota, struct txn **tid, int wrlock)
 {
 int r;
- int qrlen;
+ size_t qrlen;
 const char *data;
- int datalen;
+ size_t datalen;
 
 if (!quota->root || !(qrlen = strlen(quota->root)))
 	return IMAP_QUOTAROOT_NONEXISTENT;
 
 if (wrlock)
-	r = QDB->fetchlock(qdb, quota->root, qrlen, &data, &datalen, tid);
+	r = cyrusdb_fetchlock(qdb, quota->root, qrlen, &data, &datalen, tid);
 else
-	r = QDB->fetch(qdb, quota->root, qrlen, &data, &datalen, tid);
+	r = cyrusdb_fetch(qdb, quota->root, qrlen, &data, &datalen, tid);
 
 if (!datalen) /* zero byte file can cause no data to be mapped */
 	return IMAP_QUOTAROOT_NONEXISTENT;
@@ -103,21 +246,20 @@
 switch (r) {
 case CYRUSDB_OK:
 	if (!*data) return IMAP_QUOTAROOT_NONEXISTENT;
-	if (!quota_parseval(data, quota)) {
+	r = quota_parseval(data, datalen, quota, wrlock);
+	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error fetching quota "
 			 "root=<%s> value=<%s>",
 		 quota->root, data);
-	 return CYRUSDB_IOERROR;
+	 return r;
 	}
 	break;
 
 case CYRUSDB_AGAIN:
 	return IMAP_AGAIN;
-	break;
 
 case CYRUSDB_NOTFOUND:
 	return IMAP_QUOTAROOT_NONEXISTENT;
-	break;
 }
 
 if (r) {
@@ -129,33 +271,88 @@
 return 0;
 }
 
+EXPORTED int quota_check(const struct quota *q,
+		enum quota_resource res, quota_t delta)
+{
+ quota_t lim;
+
+ if (q->limitsres < 0)
+	return 0;	 /* unlimited */
+
+ /*
+ * We are always allowed to *reduce* usage even if it doesn't get us
+ * below the quota. As a side effect this allows our caller to pass
+ * delta = -1 meaning "don't care about quota checks".
+ */
+ if (delta < 0)
+	return 0;
+
+ lim = (quota_t)q->limitsres * quota_unitsres;
+ if (q->usedsres + delta > lim) {
+	struct mboxevent *mboxevent;
+
+	/* send a QuotaExceed event notification */
+	/* note: IMAP MULTIAPPEND is not taken into account by the RFC 5423.
+	 * so there is a strange behavior to send QuotaExceed notification with
+	 * value of messages/diskUsed less than value of maxMessages/DiskQuota.
+	 */
+	mboxevent = mboxevent_new(EVENT_QUOTA_EXCEED);
+	mboxevent_extract_quota(mboxevent, q, res);
+
+	mboxevent_notify(mboxevent);
+	mboxevent_free(&mboxevent);
+
+	return IMAP_QUOTA_EXCEEDED;
+ }
+ return 0;
+}
+
+EXPORTED void quota_use(struct quota *q,
+	 enum quota_resource res, quota_t delta)
+{
+ /* prevent underflow */
+ if ((delta < 0) && (-delta > q->usedsres)) {
+	syslog(LOG_INFO, "Quota underflow for root %s, resource %s,"
+			 " you may wish to run \"quota -f\"",
+			 q->root, quota_namesres);
+	q->usedsres = 0;
+ }
+ else {
+	q->usedsres += delta;
+ }
+}
+
 struct quota_foreach_t {
 quotaproc_t *proc;
 void *rock;
+ struct txn **tid;
 };
 
 static int do_onequota(void *rock,
-		 const char *key, int keylen,
-		 const char *data, int datalen)
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 int r = 0;
 struct quota quota;
 struct quota_foreach_t *fd = (struct quota_foreach_t *)rock;
 char *root = xstrndup(key, keylen);
+ int iswrite = fd->tid ? 1 : 0;
 
- quota.root = root;
+ quota_init(&quota, root);
 
 /* XXX - error if not parsable? */
- if (datalen && quota_parseval(data, &quota)) {
+ if (datalen && !quota_parseval(data, datalen, &quota, iswrite)) {
 	r = fd->proc(&quota, fd->rock);
 }
 
+ quota_free(&quota);
 free(root);
 
 return r;
 }
 
-int quota_foreach(const char *prefix, quotaproc_t *proc, void *rock)
+EXPORTED int quota_foreach(const char *prefix, quotaproc_t *proc,
+		 void *rock, struct txn **tid)
 {
 int r;
 char *search = prefix ? (char *)prefix : "";
@@ -163,9 +360,10 @@
 
 foreach_d.proc = proc;
 foreach_d.rock = rock;
+ foreach_d.tid = tid;
 
- r = QDB->foreach(qdb, search, strlen(search), NULL,
-		 do_onequota, &foreach_d, NULL);
+ r = cyrusdb_foreach(qdb, search, strlen(search), NULL,
+		 do_onequota, &foreach_d, tid);
 
 return r;
 }
@@ -173,10 +371,10 @@
 /*
 * Commit the outstanding quota transaction
 */
-void quota_commit(struct txn **tid)
+EXPORTED void quota_commit(struct txn **tid)
 {
 if (tid && *tid) {
-	if (QDB->commit(qdb, *tid)) {
+	if (cyrusdb_commit(qdb, *tid)) {
 	 syslog(LOG_ERR, "IOERROR: committing quota: %m");
 	}
 	*tid = NULL;
@@ -186,10 +384,10 @@
 /*
 * Abort the outstanding quota transaction
 */
-void quota_abort(struct txn **tid)
+EXPORTED void quota_abort(struct txn **tid)
 {
 if (tid && *tid) {
-	if (QDB->abort(qdb, *tid)) {
+	if (cyrusdb_abort(qdb, *tid)) {
 	 syslog(LOG_ERR, "IOERROR: aborting quota: %m");
 	}
 	*tid = NULL;
@@ -199,50 +397,183 @@
 /*
 * Write out the quota entry 'quota'
 */
-int quota_write(struct quota *quota, struct txn **tid)
+EXPORTED int quota_write(struct quota *quota, struct txn **tid)
 {
 int r;
- int qrlen, len;
- char buf1024;
+ int qrlen;
+ int res;
+ struct buf buf = BUF_INITIALIZER;
+ struct dlist *dl = NULL;
 
- if (!quota->root) return 0;
+ if (!quota->root) return IMAP_QUOTAROOT_NONEXISTENT;
 
 qrlen = strlen(quota->root);
 if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
 
- len = snprintf(buf, sizeof(buf) - 1,
-		 UQUOTA_T_FMT " %d", quota->used, quota->limit);
- r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
- 
+ dl = dlist_newkvlist(NULL, NULL);
+
+ for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	struct dlist *item = dlist_newlist(dl, quota_db_namesres);
+	dlist_setnum64(item, NULL, quota->usedsres);
+	if (quota->limitsres != QUOTA_UNLIMITED)
+	 dlist_setnum64(item, NULL, quota->limitsres);
+ }
+
+ if (quota->scanmbox) {
+	struct dlist *scan = dlist_newkvlist(dl, "SCAN");
+	dlist_setatom(scan, "MBOX", quota->scanmbox);
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++)
+	 dlist_setnum64(scan, quota_db_namesres, quota->scanusedsres);
+ }
+
+ dlist_printbuf(dl, 0, &buf);
+
+ r = cyrusdb_store(qdb, quota->root, qrlen, buf.s, buf.len, tid);
+
 switch (r) {
 case CYRUSDB_OK:
+	r = 0;
 	break;
 
 case CYRUSDB_AGAIN:
-	return IMAP_AGAIN;
+	r = IMAP_AGAIN;
 	break;
 
 default:
 	syslog(LOG_ERR, "DBERROR: error storing %s: %s",
 	 quota->root, cyrusdb_strerror(r));
-	return IMAP_IOERROR;
+	r = IMAP_IOERROR;
 	break;
 }
 
- return 0;
+ dlist_free(&dl);
+ buf_free(&buf);
+ return r;
+}
+
+EXPORTED int quota_update_useds(const char *quotaroot,
+		 const quota_t diffQUOTA_NUMRESOURCES,
+		 const char *mboxname)
+{
+ struct quota q;
+ struct txn *tid = NULL;
+ int r = 0;
+ struct mboxevent *mboxevents = NULL;
+
+ if (!quotaroot || !*quotaroot)
+	return IMAP_QUOTAROOT_NONEXISTENT;
+
+ quota_init(&q, quotaroot);
+
+ r = quota_read(&q, &tid, 1);
+
+ if (!r) {
+	int res;
+	int cmp = 1;
+	if (q.scanmbox) {
+	 cmp = cyrusdb_compar(qdb, mboxname, strlen(mboxname),
+				 q.scanmbox, strlen(q.scanmbox));
+	}
+	for (res = 0; res < QUOTA_NUMRESOURCES; res++) {
+	 int was_over = quota_is_overquota(&q, res, NULL);
+	 quota_use(&q, res, diffres);
+	 if (cmp <= 0)
+		q.scanusedsres += diffres;
+
+	 if (was_over && !quota_is_overquota(&q, res, NULL)) {
+		struct mboxevent *mboxevent =
+		 mboxevent_enqueue(EVENT_QUOTA_WITHIN, &mboxevents);
+		mboxevent_extract_quota(mboxevent, &q, res);
+	 }
+	}
+	r = quota_write(&q, &tid);
+ }
+
+ if (r) {
+	quota_abort(&tid);
+	goto out;
+ }
+ quota_commit(&tid);
+
+ mboxevent_notify(mboxevents);
+
+out:
+ quota_free(&q);
+ if (r) {
+	syslog(LOG_ERR, "LOSTQUOTA: unable to record change of "
+	 QUOTA_T_FMT " bytes and " QUOTA_T_FMT " messages in quota %s: %s",
+	 diffQUOTA_STORAGE, diffQUOTA_MESSAGE,
+	 quotaroot, error_message(r));
+ }
+
+ mboxevent_freequeue(&mboxevents);
+
+ return r;
+}
+
+EXPORTED int quota_check_useds(const char *quotaroot,
+		 const quota_t diffQUOTA_NUMRESOURCES)
+{
+ int r = 0;
+ struct quota q;
+ int res;
+
+ /*
+ * We are always allowed to *reduce* usage even if it doesn't get us
+ * below the quota. As a side effect this allows our caller to pass
+ * delta = -1 meaning "don't care about quota checks".
+ */
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (diffres >= 0)
+	 break;
+ }
+ if (res == QUOTA_NUMRESOURCES)
+	return 0;	 /* all negative */
+
+ quota_init(&q, quotaroot);
+ r = quota_read(&q, NULL, /*wrlock*/0);
+
+ if (r == IMAP_QUOTAROOT_NONEXISTENT) {
+	r = 0;
+	goto done;
+ }
+ if (r) goto done;
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	r = quota_check(&q, res, diffres);
+	if (r) goto done;
+ }
+
+done:
+ quota_free(&q);
+ return r;
 }
 
 /*
 * Remove the quota root 'quota'
 */
-int quota_deleteroot(const char *quotaroot)
+EXPORTED int quota_deleteroot(const char *quotaroot)
 {
- int qrlen;
+ int r;
 
- qrlen = strlen(quotaroot);
- if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
+ if (!quotaroot || !*quotaroot)
+	return IMAP_QUOTAROOT_NONEXISTENT;
+
+ r = cyrusdb_delete(qdb, quotaroot, strlen(quotaroot), NULL, 0);
 
- return QDB->delete(qdb, quotaroot, qrlen, NULL, 0);
+ switch (r) {
+ case CYRUSDB_OK:
+ case CYRUSDB_NOTFOUND: /* shouldn't happen anyway */
+	return 0;
+
+ case CYRUSDB_AGAIN:
+	return IMAP_AGAIN;
+
+ default:
+	syslog(LOG_ERR, "DBERROR: error deleting quotaroot %s: %s",
+	 quotaroot, cyrusdb_strerror(r));
+	return IMAP_IOERROR;
+ }
 }
 
 /*
@@ -251,7 +582,7 @@
 *
 * returns true if a quotaroot is found, 0 otherwise. 
 */
-int quota_findroot(char *ret, size_t retlen, const char *name)
+EXPORTED int quota_findroot(char *ret, size_t retlen, const char *name)
 {
 char *tail, *p, *mbox;
 
@@ -261,7 +592,7 @@
 mbox = (config_virtdomains && (p = strchr(ret, '!'))) ? p+1 : ret;
 tail = mbox + strlen(mbox);
 
- while (QDB->fetch(qdb, ret, strlen(ret), NULL, NULL, NULL)) {
+ while (cyrusdb_fetch(qdb, ret, strlen(ret), NULL, NULL, NULL)) {
 	tail = strrchr(mbox, '.');
 	if (!tail) break;
 	*tail = '\0';
@@ -271,20 +602,18 @@
 
 /* check for a domain quota */
 *mbox = '\0';
- return (QDB->fetch(qdb, ret, strlen(ret), NULL, NULL, NULL) == 0);
+ return (cyrusdb_fetch(qdb, ret, strlen(ret), NULL, NULL, NULL) == 0);
 }
 
 /* must be called after cyrus_init */
-void quotadb_init(int myflags)
+EXPORTED void quotadb_init(int myflags)
 {
- int r;
-
 if (myflags & QUOTADB_SYNC) {
-	r = QDB->sync();
+	cyrusdb_sync(QDB);
 }
 }
 
-void quotadb_open(const char *fname)
+EXPORTED void quotadb_open(const char *fname)
 {
 int ret;
 char *tofree = NULL;
@@ -302,7 +631,7 @@
 if (config_getswitch(IMAPOPT_IMPROVED_MBOXLIST_SORT))
 	flags |= CYRUSDB_MBOXSORT;
 
- ret = (QDB->open)(fname, flags, &qdb);
+ ret = cyrusdb_open(QDB, fname, flags, &qdb);
 if (ret != 0) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
 	 cyrusdb_strerror(ret));
@@ -316,12 +645,12 @@
 quota_dbopen = 1;
 }
 
-void quotadb_close(void)
+EXPORTED void quotadb_close(void)
 {
 int r;
 
 if (quota_dbopen) {
-	r = (QDB->close)(qdb);
+	r = cyrusdb_close(qdb);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing quotas: %s",
 		 cyrusdb_strerror(r));
@@ -330,7 +659,15 @@
 }
 }
 
-void quotadb_done(void)
+EXPORTED void quotadb_done(void)
 {
 /* DB->done() handled by cyrus_done() */
 }
+
+EXPORTED int quota_is_overquota(const struct quota *quota, enum quota_resource res,
+ int newquotasQUOTA_NUMRESOURCES)
+{
+ int limit = newquotas ? newquotasres : quota->limitsres;
+
+ return limit >= 0 && quota->usedsres >= ((quota_t)limit * quota_unitsres);
+}

cyrus-imapd-2.4.17.tar.gz/imap/reconstruct.c -> cyrus-imapd-2.5.tar.gz/imap/reconstruct.c Changed

@@ -1,4 +1,4 @@
-/* reconstruct.c -- program to reconstruct a mailbox 
+/* reconstruct.c -- program to reconstruct a mailbox
 *
 * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
 *
@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: reconstruct.c,v 1.112 2010/01/06 17:01:39 murch Exp $
 */
 
 #include <config.h>
@@ -52,13 +50,10 @@
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
-#include <ctype.h>
-#include <utime.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif
@@ -82,13 +77,10 @@
 
 #include "acl.h"
 #include "assert.h"
-#include "bsearch.h"
-#include "crc32.h"
 #include "hash.h"
-#include "imparse.h"
-#include "global.h"
+#include "imap/global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "map.h"
 #include "message.h"
@@ -96,43 +88,30 @@
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
-#include "global.h"
+#include "strarray.h"
 #include "mboxname.h"
 #include "mboxlist.h"
 #include "quota.h"
 #include "seen.h"
-#include "retry.h"
-#include "convert_code.h"
 #include "util.h"
 #include "sync_log.h"
-#include "cyr_lock.h"
 
 extern int optind;
 extern char *optarg;
 
-struct discovered {
- char *name;
- struct discovered *next;
-};
-
 hash_table unqid_table;
 
 /* current namespace */
 static struct namespace recon_namespace;
 
-/* config.c stuff */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 /* forward declarations */
-void do_mboxlist(void);
-int do_reconstruct(char *name, int matchlen, int maycreate, void *rock);
-int reconstruct(char *name, struct discovered *l);
-void usage(void);
-char * getmailname (char * mailboxname);
+static void do_mboxlist(void);
+static int do_reconstruct(char *name, int matchlen, int maycreate, void *rock);
+static void usage(void);
 
 extern cyrus_acl_canonproc_t mboxlist_ensureOwnerRights;
 
-int reconstruct_flags = RECONSTRUCT_MAKE_CHANGES | RECONSTRUCT_DO_STAT;
+static int reconstruct_flags = RECONSTRUCT_MAKE_CHANGES | RECONSTRUCT_DO_STAT;
 
 int main(int argc, char **argv)
 {
@@ -143,13 +122,11 @@
 int xflag = 0;
 char bufMAX_MAILBOX_PATH+1;
 char *fname;
- struct discovered head;
+ strarray_t discovered = STRARRAY_INITIALIZER;
 char *alt_config = NULL;
 char *start_part = NULL;
 
- memset(&head, 0, sizeof(head));
-
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -182,7 +159,7 @@
 	 break;
 
 	case 'g':
-	 fprintf(stderr, "deprecated option -g used\n");
+	 fprintf(stderr, "reconstruct: deprecated option -g ignored\n");
 	 break;
 
 	case 'G':
@@ -198,7 +175,7 @@
 	 break;
 
 	case 'k':
-	 fprintf(stderr, "deprecated option -k used\n");
+	 fprintf(stderr, "reconstruct: deprecated option -k ignored\n");
 	 break;
 
 	case 's':
@@ -230,7 +207,7 @@
 	}
 }
 
- cyrus_init(alt_config, "reconstruct", 0);
+ cyrus_init(alt_config, "reconstruct", 0, CONFIG_NEED_PARTITION_DATA);
 global_sasl_init(1,0,NULL);
 
 /* Set namespace -- force standard (internal) */
@@ -269,7 +246,7 @@
 	for (i = optind; i < argc; i++) {
 	 struct stat sbuf;
 
-	 if(strchr(argvi,'%') || strchr(argvi,'*')) {
+	 if (strchr(argvi,'%') || strchr(argvi,'*')) {
 		fprintf(stderr, "Using wildcards with -p is not supported.\n");
 		exit(EC_USAGE);
 	 }
@@ -299,16 +276,17 @@
 		exit(EC_USAGE);
 	 }
 	}
-	
+
 	/* None of them exist. Create them. */
 	for (i = optind; i < argc; i++) {
 	 /* Translate mailboxname */
 	 (*recon_namespace.mboxname_tointernal)(&recon_namespace, argvi,
 						 NULL, buf);
 
+	 /* don't notify mailbox creation here */
 	 r = mboxlist_createmailbox(buf, 0, start_part, 1,
-				 "cyrus", NULL, 0, 0, !xflag);
-	 if(r) {
+				 "cyrus", NULL, 0, 0, !xflag, 0, NULL);
+	 if (r) {
 		fprintf(stderr, "could not create %s\n", argvi);
 	 }
 	}
@@ -341,8 +319,8 @@
 
 	/* reconstruct the first mailbox/pattern */
 	(*recon_namespace.mboxlist_findall)(&recon_namespace, buf, 1, 0,
-					 0, do_reconstruct, 
-					 fflag ? &head : NULL);
+					 0, do_reconstruct,
+					 fflag ? &discovered : NULL);
 	if (rflag) {
 	 /* build a pattern for submailboxes */
 	 char *p = strchr(buf, '@');
@@ -354,33 +332,30 @@
 
 	 /* reconstruct the submailboxes */
 	 (*recon_namespace.mboxlist_findall)(&recon_namespace, buf, 1, 0,
-						0, do_reconstruct, 
-						fflag ? &head : NULL);
+						0, do_reconstruct,
+						fflag ? &discovered : NULL);
 	}
 }
 
 /* examine our list to see if we discovered anything */
- while (head.next) {
-	struct discovered *p;
+ while (discovered.count) {
+	char *name = strarray_shift(&discovered);
 	int r = 0;
 
-	p = head.next;
-	head.next = p->next;
-
 	/* create p (database only) and reconstruct it */
 	/* partition is defined by the parent mailbox */
-	r = mboxlist_createmailbox(p->name, 0, NULL, 1,
-				 "cyrus", NULL, 0, 0, !xflag);
+	/* don't notify mailbox creation here */
+	r = mboxlist_createmailbox(name, 0, NULL, 1,
+				 "cyrus", NULL, 0, 0, !xflag, 0, NULL);
 	if (r) {
 	 fprintf(stderr, "createmailbox %s: %s\n",
-		 p->name, error_message(r));
+		 name, error_message(r));
 	} else {
-	 do_reconstruct(p->name, strlen(p->name), 0, &head);
+	 do_reconstruct(name, strlen(name), 0, &discovered);
 	}
 	/* may have added more things into our list */
 
-	free(p->name);
-	free(p);
+	free(name);
 }
 
 free_hash_table(&unqid_table, free);
@@ -395,27 +370,28 @@
 
 cyrus_done();
 
+ strarray_fini(&discovered);
+
 return 0;
 }
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "usage: reconstruct -C <alt_config> -p partition -ksrfx mailbox...\n");
 fprintf(stderr, " reconstruct -C <alt_config> -m\n");
 exit(EC_USAGE);
-} 
+}
 
 /*
 * mboxlist_findall() callback function to reconstruct a mailbox
 */
-int
-do_reconstruct(char *name,
-	 int matchlen,
-	 int maycreate __attribute__((unused)),
-	 void *rock)
+static int do_reconstruct(char *name,
+			 int matchlen,
+			 int maycreate __attribute__((unused)),
+			 void *rock)
 {
- struct discovered *found = (struct discovered *)rock;
+ strarray_t *discovered = (strarray_t *)rock;
 int r;
 char bufMAX_MAILBOX_NAME;
 static char lastnameMAX_MAILBOX_NAME = "";
@@ -429,9 +405,9 @@
 if (matchlen == (int) strlen(lastname) &&
 	!strncmp(name, lastname, matchlen)) return 0;
 
- if(matchlen >= (int) sizeof(lastname))
+ if (matchlen >= (int) sizeof(lastname))
 	matchlen = sizeof(lastname) - 1;
- 
+
 strncpy(lastname, name, matchlen);
 lastnamematchlen = '\0';
 
@@ -467,7 +443,7 @@
 strncpy(outpath, mailbox_meta_fname(mailbox, META_HEADER), MAX_MAILBOX_NAME);
 mailbox_close(&mailbox);
 
- if (found) {
+ if (discovered) {
 	char fnamebufMAX_MAILBOX_PATH;
 	char *ptr;
 	DIR *dirp;
@@ -487,21 +463,19 @@
 	if (!dirp) return 0;
 
 	while ((dirent = readdir(dirp)) != NULL) {
-	 struct discovered *new;
-
 	 /* mailbox directories never have a dot in them */
 	 if (strchr(dirent->d_name, '.')) continue;
 	 if (stat(dirent->d_name, &sbuf) < 0) continue;
 	 if (!S_ISDIR(sbuf.st_mode)) continue;
 
 	 /* ok, we found a directory that doesn't have a dot in it;
- is there a cyrus.header file? */
+	 is there a cyrus.header file? */
 	 snprintf(fnamebuf, MAX_MAILBOX_PATH, "%s%s",
 		 dirent->d_name, FNAME_HEADER);
 	 if (stat(fnamebuf, &sbuf) < 0) continue;
 
 	 /* ok, we have a real mailbox directory */
-	 snprintf(buf, MAX_MAILBOX_NAME, "%s.%s", 
+	 snprintf(buf, MAX_MAILBOX_NAME, "%s.%s",
 		 name, dirent->d_name);
 
 	 /* does fnamebuf exist as a mailbox in mboxlist? */
@@ -509,16 +483,13 @@
 		r = mboxlist_lookup(buf, NULL, NULL);
 	 } while (r == IMAP_AGAIN);
 	 if (!r) continue; /* mailbox exists; it'll be reconstructed
-			 with a -r */
+				 with a -r */
 
 	 if (r != IMAP_MAILBOX_NONEXISTENT) break; /* erg? */
 	 else r = 0; /* reset error condition */
 
 	 printf("discovered %s\n", buf);
-	 new = (struct discovered *) xmalloc(sizeof(struct discovered));
-	 new->name = strdup(buf);
-	 new->next = found->next;
-	 found->next = new;
+	 strarray_append(discovered, buf);
 	}
 	closedir(dirp);
 }
@@ -529,7 +500,7 @@
 /*
 * Reconstruct the mailboxes list.
 */
-void do_mboxlist(void)
+static void do_mboxlist(void)
 {
 fprintf(stderr, "reconstructing mailboxes.db currently not supported\n");
 exit(EC_USAGE);

cyrus-imapd-2.5.tar.gz/imap/rfc822_header.c Added

@@ -0,0 +1,247 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf /tmp/compile_st_NBXFPK.gperf */
+/* Computed positions: -k'1,10,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('' == 91) && ('\\' == 92) && ('' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+/* Automatically generated by compile_st.pl, do not edit */
+#include "rfc822_header.h"
+struct rfc822_header_desc { const char *name; enum rfc822_header value; };
+#include <string.h>
+
+#define TOTAL_KEYWORDS 22
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 25
+#define MIN_HASH_VALUE 2
+#define MAX_HASH_VALUE 33
+/* maximum key range = 32, duplicates = 0 */
+
+#ifndef GPERF_DOWNCASE
+#define GPERF_DOWNCASE 1
+static unsigned char gperf_downcase256 =
+ {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255
+ };
+#endif
+
+#ifndef GPERF_CASE_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (register const char *s1, register const char *s2, register unsigned int n)
+{
+ for (; n > 0;)
+ {
+ unsigned char c1 = gperf_downcase(unsigned char)*s1++;
+ unsigned char c2 = gperf_downcase(unsigned char)*s2++;
+ if (c1 != 0 && c1 == c2)
+ {
+ n--;
+ continue;
+ }
+ return (int)c1 - (int)c2;
+ }
+ return 0;
+}
+#endif
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register unsigned int len)
+{
+ static const unsigned char asso_values =
+ {
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 5, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 10, 0, 0, 0, 5,
+ 0, 0, 34, 0, 34, 34, 34, 10, 0, 10,
+ 34, 34, 5, 0, 0, 34, 34, 34, 0, 0,
+ 34, 34, 34, 34, 34, 34, 34, 10, 0, 0,
+ 0, 5, 0, 0, 34, 0, 34, 34, 34, 10,
+ 0, 10, 34, 34, 5, 0, 0, 34, 34, 34,
+ 0, 0, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34
+ };
+ register int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values(unsigned char)str9;
+ /*FALLTHROUGH*/
+ case 9:
+ case 8:
+ case 7:
+ case 6:
+ case 5:
+ case 4:
+ case 3:
+ case 2:
+ case 1:
+ hval += asso_values(unsigned char)str0;
+ break;
+ }
+ return hval + asso_values(unsigned char)strlen - 1;
+}
+
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct rfc822_header_desc *
+__rfc822_header_lookup (register const char *str, register unsigned int len)
+{
+ static const struct rfc822_header_desc wordlist =
+ {
+ {"", 0}, {"", 0},
+ {"Cc", RFC822_CC},
+ {"Bcc", RFC822_BCC},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Subject", RFC822_SUBJECT},
+ {"", 0},
+ {"Date", RFC822_DATE},
+ {"Content-Id", RFC822_CONTENT_ID},
+ {"Sender", RFC822_SENDER},
+ {"To", RFC822_TO},
+ {"Received", RFC822_RECEIVED},
+ {"From", RFC822_FROM},
+ {"References", RFC822_REFERENCES},
+ {"Content-MD5", RFC822_CONTENT_MD5},
+ {"Content-Type", RFC822_CONTENT_TYPE},
+ {"", 0},
+ {"Content-Disposition", RFC822_CONTENT_DISPOSITION},
+ {"Message-ID", RFC822_MESSAGE_ID},
+ {"In-Reply-To", RFC822_IN_REPLY_TO},
+ {"", 0},
+ {"Reply-To", RFC822_REPLY_TO},
+ {"Content-Description", RFC822_CONTENT_DESCRIPTION},
+ {"X-ME-Message-ID", RFC822_X_ME_MESSAGE_ID},
+ {"Content-Location", RFC822_CONTENT_LOCATION},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Content-Transfer-Encoding", RFC822_CONTENT_TRANSFER_ENCODING},
+ {"Content-Language", RFC822_CONTENT_LANGUAGE},
+ {"", 0},
+ {"X-Deliveredinternaldate", RFC822_X_DELIVEREDINTERNALDATE}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ register int key = hash (str, len);
+
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlistkey.name;
+
+ if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && slen == '\0')
+ return &wordlistkey;
+ }
+ }
+ return 0;
+}
+
+enum rfc822_header rfc822_header_from_string(const char *s)
+{
+ const struct rfc822_header_desc *d = __rfc822_header_lookup(s, strlen(s));
+ return (d == NULL ? RFC822_BAD : d->value);
+}
+
+enum rfc822_header rfc822_header_from_string_len(const char *s, size_t len)
+{
+ const struct rfc822_header_desc *d = __rfc822_header_lookup(s, len);
+ return (d == NULL ? RFC822_BAD : d->value);
+}
+
+const char *rfc822_header_to_string(enum rfc822_header v)
+{
+ static const char * const strs = {
+	"Bcc", /* RFC822_BCC */
+	"Cc", /* RFC822_CC */
+	"Content-Description", /* RFC822_CONTENT_DESCRIPTION */
+	"Content-Disposition", /* RFC822_CONTENT_DISPOSITION */
+	"Content-Id", /* RFC822_CONTENT_ID */
+	"Content-Language", /* RFC822_CONTENT_LANGUAGE */
+	"Content-Location", /* RFC822_CONTENT_LOCATION */
+	"Content-MD5", /* RFC822_CONTENT_MD5 */
+	"Content-Transfer-Encoding", /* RFC822_CONTENT_TRANSFER_ENCODING */
+	"Content-Type", /* RFC822_CONTENT_TYPE */
+	"Date", /* RFC822_DATE */
+	"From", /* RFC822_FROM */
+	"In-Reply-To", /* RFC822_IN_REPLY_TO */
+	"Message-ID", /* RFC822_MESSAGE_ID */
+	"Reply-To", /* RFC822_REPLY_TO */
+	"Received", /* RFC822_RECEIVED */
+	"References", /* RFC822_REFERENCES */
+	"Subject", /* RFC822_SUBJECT */
+	"Sender", /* RFC822_SENDER */
+	"To", /* RFC822_TO */
+	"X-Deliveredinternaldate", /* RFC822_X_DELIVEREDINTERNALDATE */
+	"X-ME-Message-ID", /* RFC822_X_ME_MESSAGE_ID */
+ };
+ return (v >= 0 && v < (int)(sizeof(strs)/sizeof(strs0)) ? strsv : NULL);
+}

cyrus-imapd-2.5.tar.gz/imap/rfc822_header.h Added

@@ -0,0 +1,37 @@
+/* Automatically generated by compile_st.pl, do not edit */
+#ifndef __STRING_TABLE_rfc822_header_H_
+#define __STRING_TABLE_rfc822_header_H_ 1
+
+#include <string.h>
+
+enum rfc822_header {
+ RFC822_BAD=-1,
+ RFC822_UNKNOWN=-2,
+ RFC822_BCC=0,
+ RFC822_CC=1,
+ RFC822_CONTENT_DESCRIPTION=2,
+ RFC822_CONTENT_DISPOSITION=3,
+ RFC822_CONTENT_ID=4,
+ RFC822_CONTENT_LANGUAGE=5,
+ RFC822_CONTENT_LOCATION=6,
+ RFC822_CONTENT_MD5=7,
+ RFC822_CONTENT_TRANSFER_ENCODING=8,
+ RFC822_CONTENT_TYPE=9,
+ RFC822_DATE=10,
+ RFC822_FROM=11,
+ RFC822_IN_REPLY_TO=12,
+ RFC822_MESSAGE_ID=13,
+ RFC822_REPLY_TO=14,
+ RFC822_RECEIVED=15,
+ RFC822_REFERENCES=16,
+ RFC822_SUBJECT=17,
+ RFC822_SENDER=18,
+ RFC822_TO=19,
+ RFC822_X_DELIVEREDINTERNALDATE=20,
+ RFC822_X_ME_MESSAGE_ID=21,
+};
+extern enum rfc822_header rfc822_header_from_string(const char *s);
+extern enum rfc822_header rfc822_header_from_string_len(const char *s, size_t len);
+extern const char *rfc822_header_to_string(enum rfc822_header v);
+
+#endif /* __STRING_TABLE_rfc822_header_H_ */

cyrus-imapd-2.5.tar.gz/imap/rfc822_header.st Added

@@ -0,0 +1,69 @@
+# rfc822_header.st - string table data for RFC822 headers
+#
+# Copyright (c) 1994-2010 Carnegie Mellon University.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+%ignore-case
+table rfc822_header
+ent RFC822_BAD
+ent RFC822_UNKNOWN
+ent RFC822_BCC "Bcc"
+ent RFC822_CC "Cc"
+ent RFC822_CONTENT_DESCRIPTION "Content-Description"
+ent RFC822_CONTENT_DISPOSITION "Content-Disposition"
+ent RFC822_CONTENT_ID "Content-Id"
+ent RFC822_CONTENT_LANGUAGE "Content-Language"
+ent RFC822_CONTENT_LOCATION "Content-Location"
+ent RFC822_CONTENT_MD5 "Content-MD5"
+ent RFC822_CONTENT_TRANSFER_ENCODING "Content-Transfer-Encoding"
+ent RFC822_CONTENT_TYPE "Content-Type"
+ent RFC822_DATE "Date"
+ent RFC822_FROM "From"
+ent RFC822_IN_REPLY_TO "In-Reply-To"
+ent RFC822_MESSAGE_ID "Message-ID"
+ent RFC822_REPLY_TO "Reply-To"
+ent RFC822_RECEIVED "Received"
+ent RFC822_REFERENCES "References"
+ent RFC822_SUBJECT "Subject"
+ent RFC822_SENDER "Sender"
+ent RFC822_TO "To"
+ent RFC822_X_DELIVEREDINTERNALDATE "X-Deliveredinternaldate"
+ent RFC822_X_ME_MESSAGE_ID "X-ME-Message-ID"
+

cyrus-imapd-2.4.17.tar.gz/imap/saslclient.c -> cyrus-imapd-2.5.tar.gz/imap/saslclient.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: saslclient.c,v 1.20 2010/01/06 17:01:39 murch Exp $
 */
 
 #include <config.h>
@@ -49,11 +47,9 @@
 #include <string.h>
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
-#include <syslog.h>
 
 #include "xmalloc.h"
-#include "prot.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "saslclient.h"
 #include "global.h"
 
@@ -111,7 +107,7 @@
 return SASL_OK;
 }
 
-sasl_callback_t *mysasl_callbacks(const char *username,
+EXPORTED sasl_callback_t *mysasl_callbacks(const char *username,
 				 const char *authname,
 				 const char *realm,
 				 const char *password)
@@ -146,16 +142,11 @@
 if (password) {
 	sasl_secret_t *secret;
 	size_t len = strlen(password);
-	
-	secret = (sasl_secret_t *)xmalloc(sizeof(sasl_secret_t) + len);
-	if(!secret) {
-	 free(ret);
-	 return NULL;
-	}
 
+	secret = (sasl_secret_t *)xmalloc(sizeof(sasl_secret_t) + len);
 	strcpy((char *) secret->data, password);
 	secret->len = len;
-		
+
 	/* password */
 	retn.id = SASL_CB_PASS;
 	retn.proc = (mysasl_cb_ft *) &mysasl_getsecret_cb;
@@ -170,7 +161,7 @@
 return ret;
 }
 
-void free_callbacks(sasl_callback_t *in) 
+EXPORTED void free_callbacks(sasl_callback_t *in)
 {
 int i;
 if(!in) return;
@@ -185,7 +176,7 @@
 #define BASE64_BUF_SIZE	21848	/* per RFC 2222bis: ((16K / 3) + 1) * 4 */
 #define AUTH_BUF_SIZE	BASE64_BUF_SIZE+50	/* data + response overhead */
 
-int saslclient(sasl_conn_t *conn, struct sasl_cmd_t *sasl_cmd,
+HIDDEN int saslclient(sasl_conn_t *conn, struct sasl_cmd_t *sasl_cmd,
 	 const char *mechlist,
 struct protstream *pin, struct protstream *pout,
 	 int *sasl_result, const char **status)

cyrus-imapd-2.4.17.tar.gz/imap/saslclient.h -> cyrus-imapd-2.5.tar.gz/imap/saslclient.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/saslserver.c -> cyrus-imapd-2.5.tar.gz/imap/saslserver.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/search_engines.c -> cyrus-imapd-2.5.tar.gz/imap/search_engines.c Changed

@@ -38,15 +38,11 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: search_engines.c,v 1.12 2010/01/06 17:01:40 murch Exp $
 */
 
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <string.h>
@@ -54,278 +50,281 @@
 #include <unistd.h>
 #endif
 
+#include "imap_err.h"
 #include "index.h"
+#include "message.h"
 #include "global.h"
-#include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
+#include "search_engines.h"
+#include "ptrarray.h"
+
+#ifdef USE_SQUAT
+extern const struct search_engine squat_search_engine;
+#endif
+#ifdef USE_SPHINX
+extern const struct search_engine sphinx_search_engine;
+#endif
+#ifdef USE_XAPIAN
+extern const struct search_engine xapian_search_engine;
+#endif
+
+static const struct search_engine default_search_engine = {
+ "default",
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+};
+
+static const struct search_engine *engine(void)
+{
+ switch (config_getenum(IMAPOPT_SEARCH_ENGINE)) {
+#ifdef USE_XAPIAN
+ case IMAP_ENUM_SEARCH_ENGINE_XAPIAN:
+	return &xapian_search_engine;
+#endif
+#ifdef USE_SPHINX
+ case IMAP_ENUM_SEARCH_ENGINE_SPHINX:
+	return &sphinx_search_engine;
+#endif
+#ifdef USE_SQUAT
+ case IMAP_ENUM_SEARCH_ENGINE_SQUAT:
+	return &squat_search_engine;
+#endif
+ default:
+	return &default_search_engine;
+ }
+}
+
+EXPORTED const char *search_part_as_string(int part)
+{
+ static const char *namesSEARCH_NUM_PARTS = {
+	/* ANY */NULL, "FROM", "TO", "CC",
+	"BCC", "SUBJECT", "LISTID", "TYPE",
+	"HEADERS", "BODY"
+ };
+
+ return (part < 0 || part >= SEARCH_NUM_PARTS ? NULL : namespart);
+}
+
 
-#include "squat.h"
+EXPORTED search_builder_t *search_begin_search(struct mailbox *mailbox, int opts)
+{
+ const struct search_engine *se = engine();
+ return (se->begin_search ?
+	 se->begin_search(mailbox, opts) : NULL);
+}
 
-typedef struct {
- unsigned char* vector;
- struct index_state *state;
- char const* part_types;
- int found_validity;
-} SquatSearchResult;
+EXPORTED void search_end_search(search_builder_t *bx)
+{
+ const struct search_engine *se = engine();
+ if (se->end_search) se->end_search(bx);
+}
 
-static int vector_len(struct index_state *state) {
- return (state->exists >> 3) + 1;
+EXPORTED search_text_receiver_t *search_begin_update(int verbose)
+{
+ const struct search_engine *se = engine();
+ /* We don't fallback to the default search engine here
+ * because the default behaviour is not to index anything */
+ return (se->begin_update ? se->begin_update(verbose) : NULL);
 }
 
-/* The document name is of the form
+static int search_batch_size(void)
+{
+ const struct search_engine *se = engine();
+ return (se->flags & SEARCH_FLAG_CAN_BATCH ?
+	 config_getint(IMAPOPT_SEARCH_BATCHSIZE) : INT_MAX);
+}
+
+/*
+ * Flush a batch of messages to the search engine's indexer code. We
+ * drop the index lock during the presumably CPU and IO heavy parts of
+ * the procedure and re-acquire it afterward, to avoid delaying other
+ * processes like imapds. The reacquisition may of course fail.
+ * Returns an IMAP error code or 0 on success.
+ */
+static int flush_batch(search_text_receiver_t *rx,
+		 struct mailbox *mailbox,
+		 ptrarray_t *batch)
+{
+ int i;
+ int r = 0;
+
+ /* give someone else a chance */
+ mailbox_unlock_index(mailbox, NULL);
+
+ /* prefetch files */
+ for (i = 0 ; i < batch->count ; i++) {
+	message_t *msg = ptrarray_nth(batch, i);
+	const char *fname;
+
+	r = message_get_fname(msg, &fname);
+	if (r) return r;
+	r = warmup_file(fname, 0, 0);
+	if (r) return r; /* means we failed to open a file,
+			 so we'll fail later anyway */
+ }
+
+ for (i = 0 ; i < batch->count ; i++) {
+	message_t *msg = ptrarray_nth(batch, i);
+	if (!r)
+	 r = index_getsearchtext(msg, rx, 0);
+	message_unref(&msg);
+ }
+ ptrarray_truncate(batch, 0);
+
+ if (r) return r;
 
- pnnn.vvv
+ if (rx->flush) {
+	r = rx->flush(rx);
+	if (r) return r;
+ }
 
- Where p is a part_type character (denoting which segment of the message
- is represented by the document), nnn is the UID of the message, and vvv
- is the UID validity value.
+ return r;
+}
 
- This function parses the document name and returns the message
- UID only if the name has the right part type and it corresponds
- to a real message UID.
-*/
-static int parse_doc_name(SquatSearchResult* r, char const* doc_name) {
- int ch = doc_name0;
- char const* t = r->part_types;
- int doc_UID, index;
+EXPORTED int search_update_mailbox(search_text_receiver_t *rx,
+				 struct mailbox *mailbox,
+				 int flags)
+{
+ uint32_t recno;
+ int r = 0;			/* Using IMAP_* not SQUAT_* return codes here */
+ int r2;
+ int first = 1;
+ int was_partial = 0;
+ int batch_size = search_batch_size();
+ ptrarray_t batch = PTRARRAY_INITIALIZER;
+ struct index_record record;
+ int incremental = (flags & SEARCH_UPDATE_INCREMENTAL);
+
+ r = rx->begin_mailbox(rx, mailbox, flags);
+ if (r) return r;
+
+ first = mailbox_finduid(mailbox, rx->first_unindexed_uid(rx));
+ if (!first) first = 1; /* empty mailbox */
+
+ for (recno = first; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) continue;
+
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	if (rx->is_indexed(rx, record.uid))
+	 continue;
+
+	if (incremental && batch.count >= batch_size) {
+	 syslog(LOG_INFO, "search_update_mailbox batching %u messages to %s",
+		 batch.count, mailbox->name);
+	 was_partial = 1;
+	 break;
+	}
 
- if (ch == 'v' && strncmp(doc_name, "validity.", 9) == 0) {
- if ((unsigned) atoi(doc_name + 9) == r->state->mailbox->i.uidvalidity) {
- r->found_validity = 1;
+	ptrarray_append(&batch, message_new_from_record(mailbox, &record));
 }
- return -1;
- }
-
- /* make sure that the document part type is one of the ones we're
- accepting */
- while (*t != 0 && *t != ch) {
- t++;
- }
- if (*t == 0) {
- return -1;
- }
-
- doc_UID = atoi(++doc_name);
- while ((*doc_name >= '0' && *doc_name <= '9') || *doc_name == '-') {
- ++doc_name;
- }
- if (*doc_name != 0) {
- return -1;
- }
- 
- index = index_finduid(r->state, doc_UID);
-
- return index;
+
+ if (batch.count)
+	r = flush_batch(rx, mailbox, &batch);
+
+ ptrarray_fini(&batch);
+ r2 = rx->end_mailbox(rx, mailbox);
+ if (r) return r;
+ if (r2) return r2;
+ if (was_partial) return IMAP_AGAIN;
+ return 0;
 }
 
-static int drop_indexed_docs(void* closure, SquatListDoc const* doc) {
- SquatSearchResult* r = (SquatSearchResult*)closure;
- int doc_uid = parse_doc_name(r, doc->doc_name);
+EXPORTED int search_end_update(search_text_receiver_t *rx)
+{
+ const struct search_engine *se = engine();
+ /* We don't fallback to the default search engine here
+ * because the default behaviour is not to index anything */
+ return (se->end_update ? se->end_update(rx) : 0);
+}
 
- if (doc_uid >= 0) {
- unsigned char* vect = r->vector;
- vectdoc_uid >> 3 &= ~(1 << (doc_uid & 0x7));
- }
- return SQUAT_CALLBACK_CONTINUE;
+EXPORTED search_text_receiver_t *search_begin_snippets(void *internalised,
+						 int verbose,
+						 search_snippet_cb_t proc,
+						 void *rock)
+{
+ const struct search_engine *se = engine();
+ return (se->begin_snippets ? se->begin_snippets(internalised,
+				 verbose, proc, rock) : NULL);
 }
 
-static int fill_with_hits(void* closure, char const* doc) {
- SquatSearchResult* r = (SquatSearchResult*)closure;
- int doc_uid = parse_doc_name(r, doc);
+EXPORTED int search_end_snippets(search_text_receiver_t *rx)
+{
+ const struct search_engine *se = engine();
+ return (se->end_snippets ? se->end_snippets(rx) : 0);
+}
 
- if (doc_uid >= 0) {
- unsigned char* vect = r->vector;
- vectdoc_uid >> 3 |= 1 << (doc_uid & 0x7);
- }
- return SQUAT_CALLBACK_CONTINUE;
+EXPORTED char *search_describe_internalised(void *internalised)
+{
+ const struct search_engine *se = engine();
+ return (se->describe_internalised ?
+	 se->describe_internalised(internalised) : 0);
 }
 
-static int search_strlist(SquatSearchIndex* index, struct index_state *state,
- unsigned char* output, unsigned char* tmp, struct strlist* strs,
- char const* part_types) {
- SquatSearchResult r;
- int i;
- int len = vector_len(state);
-
- r.part_types = part_types;
- r.vector = tmp;
- r.state = state;
- while (strs != NULL) {
- char const* s = strs->s;
-
- memset(tmp, 0, len);
- if (squat_search_execute(index, s, strlen(s), fill_with_hits, &r)
- != SQUAT_OK) {
- if (squat_get_last_error() == SQUAT_ERR_SEARCH_STRING_TOO_SHORT)
- return 1; /* The rest of the search is still viable */
- syslog(LOG_DEBUG, "SQUAT string list search failed on string %s "
- "with part types %s", s, part_types);
- return 0;
- }
- for (i = 0; i < len; i++) {
- outputi &= tmpi;
- }
+EXPORTED void search_free_internalised(void *internalised)
+{
+ const struct search_engine *se = engine();
+ if (se->free_internalised) se->free_internalised(internalised);
+}
 
- strs = strs->next;
- }
- return 1;
+EXPORTED int search_start_daemon(int verbose)
+{
+ const struct search_engine *se = engine();
+ return (se->start_daemon ? se->start_daemon(verbose) : 0);
 }
 
-static unsigned char* search_squat_do_query(SquatSearchIndex* index,
- struct index_state *state, struct searchargs* args) {
- int vlen = vector_len(state);
- unsigned char* vect = xmalloc(vlen);
- unsigned char* t_vect = xmalloc(vlen);
- struct searchsub* sub;
- int found_something = 1;
- 
- memset(vect, 255, vlen);
- 
- if (!(search_strlist(index, state, vect, t_vect, args->to, "t")
- && search_strlist(index, state, vect, t_vect, args->from, "f")
- && search_strlist(index, state, vect, t_vect, args->cc, "c")
- && search_strlist(index, state, vect, t_vect, args->bcc, "b")
- && search_strlist(index, state, vect, t_vect, args->subject, "s")
- && search_strlist(index, state, vect, t_vect, args->header_name, "h")
- && search_strlist(index, state, vect, t_vect, args->header, "h")
- && search_strlist(index, state, vect, t_vect, args->body, "m")
- && search_strlist(index, state, vect, t_vect, args->text, "mh"))) {
- found_something = 0;
- goto cleanup;
- }
-
- sub = args->sublist;
- while (sub != NULL) {
- if (args->sublist->sub2 == NULL) {
- /* do nothing; because our search is conservative (may include false
- positives) we can't compute the NOT (since the result might include
- false negatives, which we do not allow) */
- /* Note that it's OK to do nothing. We'll just be returning more
- false positives. */
- } else {
- unsigned char* sub1_vect =
- search_squat_do_query(index, state, args->sublist->sub1);
- unsigned char* sub2_vect;
- int i;
-
- if (sub1_vect == NULL) {
- found_something = 0;
- goto cleanup;
- }
-
- sub2_vect = search_squat_do_query(index, state, args->sublist->sub2);
-
- if (sub2_vect == NULL) {
- found_something = 0;
- free(sub1_vect);
- goto cleanup;
- }
-
- for (i = 0; i < vlen; i++) {
- vecti &= sub1_vecti | sub2_vecti;
- }
-
- free(sub1_vect);
- free(sub2_vect);
- }
+EXPORTED int search_stop_daemon(int verbose)
+{
+ const struct search_engine *se = engine();
+ return (se->stop_daemon ? se->stop_daemon(verbose) : 0);
+}
 
- sub = sub->next;
- }
-
-cleanup:
- free(t_vect);
- if (!found_something) {
- free(vect);
- return NULL;
- }
- 
- return vect;
+EXPORTED int search_list_files(const char *userid,
+			 strarray_t *files)
+{
+ const struct search_engine *se = engine();
+ return (se->list_files ? se->list_files(userid, files) : 0);
 }
 
-static int search_squat(unsigned* msg_list, struct index_state *state,
- struct searchargs *searchargs) {
- char *fname;
- int fd;
- SquatSearchIndex* index;
- unsigned char* msg_vector;
- int result;
-
- fname = mailbox_meta_fname(state->mailbox, META_SQUAT);
- if ((fd = open(fname, O_RDONLY)) < 0) {
- syslog(LOG_DEBUG, "SQUAT failed to open index file");
- return -1; /* probably not found. Just bail */
- }
- if ((index = squat_search_open(fd)) == NULL) {
- syslog(LOG_DEBUG, "SQUAT failed to open index");
- close(fd);
- return -1;
- }
- if ((msg_vector = search_squat_do_query(index, state, searchargs))
- == NULL) {
- result = -1;
- } else {
- unsigned i;
- unsigned vlen = vector_len(state);
- unsigned char* unindexed_vector = xmalloc(vlen);
- SquatSearchResult r;
- 
- memset(unindexed_vector, 255, vlen);
- r.vector = unindexed_vector;
- r.state = state;
- r.part_types = "tfcbsmh";
- r.found_validity = 0;
- if (squat_search_list_docs(index, drop_indexed_docs, &r) != SQUAT_OK) {
- syslog(LOG_DEBUG, "SQUAT failed to get list of indexed documents");
- result = -1;
- } else if (!r.found_validity) {
- syslog(LOG_DEBUG, "SQUAT didn't find validity record");
- result = -1;
- } else {
- /* Add in any unindexed messages. They must be searched manually. */
- for (i = 0; i < vlen; i++) {
- msg_vectori |= unindexed_vectori;
- }
-
- result = 0;
- for (i = 1; i <= state->exists; i++) {
- if ((msg_vectori >> 3 & (1 << (i & 7))) != 0) {
- msg_listresult = i;
- result++;
- }
- }
- }
- free(msg_vector);
- free(unindexed_vector);
- }
- squat_search_close(index);
- close(fd);
- return result;
+EXPORTED int search_compact(const char *userid,
+			 const char *tempdir,
+			 const strarray_t *srctiers,
+			 const char *desttier,
+			 int flags)
+{
+ const struct search_engine *se = engine();
+ return (se->compact ? se->compact(userid, tempdir, srctiers, desttier, flags) : 0);
 }
 
-int search_prefilter_messages(unsigned *msgno_list, struct index_state *state,
- struct searchargs *searchargs) 
+EXPORTED int search_deluser(const char *userid)
 {
- unsigned i;
- int count;
-
- if (SQUAT_ENGINE) {
-	count = search_squat(msgno_list, state, searchargs);
-	if (count >= 0) {
-	 syslog(LOG_DEBUG, "SQUAT returned %d messages", count);
-	 return count;
-	} else {
-	 /* otherwise, we failed for some reason, so do the default */
-	 syslog(LOG_DEBUG, "SQUAT failed");
-	}
- }
- 
- /* Just put in all possible messages. This falls back to Cyrus' default
- * search. */
- 
- for (i = 0; i < state->exists; i++) {
-	msgno_listi = i + 1;
- }
+ const struct search_engine *se = engine();
+ return (se->deluser ? se->deluser(userid) : 0);
+}
 
- return state->exists;
+const char *search_op_as_string(int op)
+{
+ static char buf33;
+
+ switch (op) {
+ case SEARCH_OP_AND: return "AND";
+ case SEARCH_OP_OR: return "OR";
+ case SEARCH_OP_NOT: return "NOT";
+ default:
+	snprintf(buf, sizeof(buf), "(%d)", op);
+	return buf;
+ }
 }

cyrus-imapd-2.4.17.tar.gz/imap/search_engines.h -> cyrus-imapd-2.5.tar.gz/imap/search_engines.h Changed

@@ -38,21 +38,155 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: search_engines.h,v 1.4 2010/01/06 17:01:40 murch Exp $
 */
 
 #ifndef INCLUDED_SEARCH_ENGINES_H
 #define INCLUDED_SEARCH_ENGINES_H
 
-#include "index.h"
+#include "mailbox.h"
+#include "util.h"
+#include "strarray.h"
+
+typedef int (*search_hit_cb_t)(const char *mboxname, uint32_t uidvalidity,
+			 uint32_t uid, void *rock);
+typedef int (*search_snippet_cb_t)(struct mailbox *, uint32_t uid,
+				 /* SEARCH_PART_* constants */int part,
+				 const char *snippet, void *rock);
+
+typedef struct search_builder search_builder_t;
+struct search_builder {
+/* These values are carefully chosen a) not to clash with the
+ * SEARCH_PART_* constants, and b) to reflect operator precedence */
+#define SEARCH_OP_AND	 101
+#define SEARCH_OP_OR	 102
+#define SEARCH_OP_NOT	 103
+ void (*begin_boolean)(search_builder_t *, int op);
+ void (*end_boolean)(search_builder_t *, int op);
+ void (*match)(search_builder_t *, int part, const char *str);
+ void *(*get_internalised)(search_builder_t *);
+ int (*run)(search_builder_t *, search_hit_cb_t proc, void *rock);
+};
+
+/* These constants are passed into the search_text_receiver_t.begin_part callback to
+ tell it which part of the message is being sent down */
+#define SEARCH_PART_NONE (-1)
+#define SEARCH_PART_ANY	 0
+#define SEARCH_PART_FROM 1
+#define SEARCH_PART_TO 2
+#define SEARCH_PART_CC 3
+#define SEARCH_PART_BCC 4
+#define SEARCH_PART_SUBJECT 5
+#define SEARCH_PART_LISTID 6	/* List-Id or Mailing-List fields */
+#define SEARCH_PART_TYPE 7	/* MIME Content-Type except multipart */
+#define SEARCH_PART_HEADERS 8 /* headers OTHER than the above headers */
+#define SEARCH_PART_BODY 9
+#define SEARCH_NUM_PARTS 10
+
+extern const char *search_part_as_string(int part);
+
+/* The functions in search_text_receiver_t get called at least once for each part of every message.
+ The invocations form a sequence:
+ begin_message(<uid>)
+ receiver->begin_part(<part1>)
+ receiver->append_text(<text>) (1 or more times)
+ receiver->end_part(<part1>)
+ ...
+ receiver->begin_part(<partN>)
+ receiver->append_text(<text>) (1 or more times)
+ receiver->end_part(<partN>)
+ receiver->end_message(<uid>)
 
-/* Fill the msg_list with a list of message IDs which could match the
- * searchargs.
- * Return the number of message IDs inserted.
+ The parts need not arrive in any particular order, but each part
+ can only participate in one begin_part ... append_text ... end_part
+ sequence, and the sequences for different parts cannot be interleaved.
+*/
+typedef struct search_text_receiver search_text_receiver_t;
+struct search_text_receiver {
+ int (*begin_mailbox)(search_text_receiver_t *,
+			 struct mailbox *, int incremental);
+ uint32_t (*first_unindexed_uid)(search_text_receiver_t *);
+ int (*is_indexed)(search_text_receiver_t *, uint32_t uid);
+ void (*begin_message)(search_text_receiver_t *, uint32_t uid);
+ void (*begin_part)(search_text_receiver_t *, int part);
+ void (*append_text)(search_text_receiver_t *, const struct buf *);
+ void (*end_part)(search_text_receiver_t *, int part);
+ int (*end_message)(search_text_receiver_t *);
+ int (*end_mailbox)(search_text_receiver_t *,
+		 struct mailbox *);
+ int (*flush)(search_text_receiver_t *);
+};
+
+#define SEARCH_FLAG_CAN_BATCH	(1<<0)
+struct search_engine {
+ const char *name;
+ unsigned int flags;
+#define _SEARCH_VERBOSE_MASK	(0x7)
+#define SEARCH_VERBOSE(v)	((v)&_SEARCH_VERBOSE_MASK)
+#define SEARCH_MULTIPLE		(1<<3)	/* return results from
+					 * multiple folders */
+#define SEARCH_UNINDEXED	(1<<4)	/* return unindexed messages
+					 * as hits (doesn't work
+					 * with MULTIPLE) */
+#define SEARCH_COMPACT_COPYONE	(1<<5)	/* if only one source, just copy */
+#define SEARCH_COMPACT_FILTER	(1<<6)	/* filter resulting DB for
+					 * expunged records */
+#define SEARCH_COMPACT_AUDIT	(1<<7)	/* check DB for missing records */
+#define SEARCH_COMPACT_REINDEX	(1<<8)	/* re-index all matching messages */
+ search_builder_t *(*begin_search)(struct mailbox *, int opts);
+ void (*end_search)(search_builder_t *);
+ search_text_receiver_t *(*begin_update)(int verbose);
+ int (*end_update)(search_text_receiver_t *);
+ search_text_receiver_t *(*begin_snippets)(void *internalised,
+					 int verbose,
+					 search_snippet_cb_t,
+					 void *rock);
+ int (*end_snippets)(search_text_receiver_t *);
+ char *(*describe_internalised)(void *);
+ void (*free_internalised)(void *);
+ int (*start_daemon)(int verbose);
+ int (*stop_daemon)(int verbose);
+ int (*list_files)(const char *userid, strarray_t *);
+ int (*compact)(const char *userid, const char *tempdir,
+		 const strarray_t *srctiers, const char *desttier,
+		 int flags);
+ int (*deluser)(const char *userid);
+};
+
+/*
+ * Search for messages which could match the query built with the
+ * search_builder_t. Calls 'proc' once for each hit found. If 'single'
+ * is true, only hits in 'mailbox' are reported; otherwise hits in any
+ * folder in the same conversation scope (i.e. the same user) as
+ * reported.
 */
-extern int search_prefilter_messages(unsigned* msg_list,
-				 struct index_state *state,
-				 struct searchargs *searchargs);
+extern search_builder_t *search_begin_search(struct mailbox *, int opts);
+extern void search_end_search(search_builder_t *);
+
+#define SEARCH_UPDATE_INCREMENTAL (1<<0)
+#define SEARCH_UPDATE_NONBLOCKING (1<<1)
+search_text_receiver_t *search_begin_update(int verbose);
+int search_update_mailbox(search_text_receiver_t *rx,
+			 struct mailbox *mailbox,
+			 int flags);
+int search_end_update(search_text_receiver_t *rx);
+search_text_receiver_t *search_begin_snippets(void *internalised,
+					 int verbose,
+					 search_snippet_cb_t proc,
+					 void *rock);
+int search_end_snippets(search_text_receiver_t *rx);
+/* Returns a new string which describes the internalised query, and must
+ * be free()d by the caller. Only useful for whitebox testing. */
+char *search_describe_internalised(void *internalised);
+void search_free_internalised(void *internalised);
+int search_start_daemon(int verbose);
+int search_stop_daemon(int verbose);
+int search_list_files(const char *userid, strarray_t *);
+int search_compact(const char *userid, const char *tempdir,
+		 const strarray_t *srctiers, const char *desttier, int verbose);
+int search_deluser(const char *userid);
+
+
+/* for debugging */
+extern const char *search_op_as_string(int op);
 
 #endif

cyrus-imapd-2.5.tar.gz/imap/search_expr.c Added

@@ -0,0 +1,2402 @@
+/* search_expr.c -- query tree handling for SEARCH
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "assert.h"
+#include "imap_err.h"
+#include "search_expr.h"
+#include "index.h"
+#include "message.h"
+#include "charset.h"
+#include "annotate.h"
+#include "global.h"
+#include "lsort.h"
+#include "xstrlcpy.h"
+#include "xmalloc.h"
+
+#define DEBUG 0
+
+#if DEBUG
+static search_expr_t **the_rootp;
+static search_expr_t *the_focus;
+#endif
+static unsigned nnodes = 0;
+
+static void split(search_expr_t *e,
+		 void (*cb)(const char *, search_expr_t *, search_expr_t *, void *),
+		 void *rock);
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static search_expr_t *append(search_expr_t *parent, search_expr_t *child)
+{
+ search_expr_t **tailp;
+
+ for (tailp = &parent->children ; *tailp ; tailp = &(*tailp)->next)
+	;
+ *tailp = child;
+ child->next = NULL;
+ child->parent = parent;
+
+ return child;
+}
+
+static search_expr_t *detachp(search_expr_t **prevp)
+{
+ search_expr_t *child = *prevp;
+
+ if (child) {
+	*prevp = child->next;
+	child->next = NULL;
+	child->parent = NULL;
+ }
+
+ return child;
+}
+
+static search_expr_t *detach(search_expr_t *parent, search_expr_t *child)
+{
+ search_expr_t **prevp;
+
+ for (prevp = &parent->children ; *prevp && *prevp != child; prevp = &(*prevp)->next)
+	;
+ return detachp(prevp);
+}
+
+/*
+ * Detach the node '*prevp' from the tree, and reparent its children to
+ * '*prevp' parent, preseving '*prevp's location and its children's
+ * order.
+ *
+ * Apparently this operation is called "splat" but I think that's
+ * a damn silly name.
+ */
+static search_expr_t *elide(search_expr_t **prevp)
+{
+ search_expr_t *e = *prevp;
+ search_expr_t *child;
+
+ *prevp = e->children;
+
+ for (child = e->children ; child ; child = child->next) {
+	child->parent = e->parent;
+	prevp = &child->next;
+ }
+ *prevp = e->next;
+
+ e->next = NULL;
+ e->children = NULL;
+ e->parent = NULL;
+
+ return e;
+}
+
+static search_expr_t *interpolate(search_expr_t **prevp, enum search_op op)
+{
+ search_expr_t *e = search_expr_new(NULL, op);
+
+ e->parent = (*prevp)->parent;
+ e->children = (*prevp);
+ e->next = (*prevp)->next;
+ (*prevp)->next = NULL;
+ (*prevp)->parent = e;
+ *prevp = e;
+
+ return e;
+}
+
+/*
+ * Create a new node in a search expression tree, with the given
+ * operation. If 'parent' is not NULL, the new node is attached as the
+ * last child of 'parent'. Returns a new node, never returns NULL.
+ */
+EXPORTED search_expr_t *search_expr_new(search_expr_t *parent, enum search_op op)
+{
+ search_expr_t *e = xzmalloc(sizeof(search_expr_t));
+ e->op = op;
+ if (parent) append(parent, e);
+ nnodes++;
+ return e;
+}
+
+static int complexity_check(int r)
+{
+ unsigned max = (unsigned)config_getint(IMAPOPT_SEARCH_NORMALISATION_MAX);
+ return (max && nnodes >= max ? -1 : r);
+}
+
+/*
+ * Append the given search expression tree 'e' to the end of the
+ * node 'parent'. 'e' must not already have a parent.
+ */
+EXPORTED void search_expr_append(search_expr_t *parent, search_expr_t *e)
+{
+ assert(e->parent == NULL);
+ append(parent, e);
+}
+
+/*
+ * Recursively free a search expression tree including the given node
+ * and all descendant nodes.
+ */
+EXPORTED void search_expr_free(search_expr_t *e)
+{
+ if (!e) return;
+ while (e->children)
+	search_expr_free(detach(e, e->children));
+ if (e->attr) {
+	if (e->attr->internalise) e->attr->internalise(NULL, NULL, &e->internalised);
+	if (e->attr->free) e->attr->free(&e->value);
+ }
+ free(e);
+}
+
+/*
+ * Create and return a new search expression tree which is an
+ * exact duplicate of the given tree.
+ */
+EXPORTED search_expr_t *search_expr_duplicate(const search_expr_t *e)
+{
+ search_expr_t *newe;
+ search_expr_t *child;
+
+ newe = search_expr_new(NULL, e->op);
+ newe->attr = e->attr;
+ if (newe->attr && newe->attr->duplicate)
+	newe->attr->duplicate(&newe->value, &e->value);
+ else
+	newe->value = e->value;
+
+ for (child = e->children ; child ; child = child->next)
+	append(newe, search_expr_duplicate(child));
+
+ return newe;
+}
+
+/*
+ * Apply the given callback to every node in the search expression tree,
+ * in pre-order (i.e. parent before children), as long as the callback
+ * returns zero. Returns the first non-zero return from the callback
+ * (which is typically an error code).
+ */
+EXPORTED int search_expr_apply(search_expr_t *e,
+			 int (*cb)(search_expr_t *, void *),
+			 void *rock)
+{
+ search_expr_t *child;
+ int r;
+
+ r = cb(e, rock);
+ if (r) return r;
+
+ for (child = e->children ; child ; child = child->next) {
+	r = search_expr_apply(child, cb, rock);
+	if (r) break;
+ }
+
+ return r;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static const char *op_strings = {
+ "unknown", "true", "false",
+ "lt", "le", "gt", "ge", "match",
+ "fuzzymatch", "and", "or", "not"
+};
+
+static const char *op_as_string(unsigned int op)
+{
+ return (op < VECTOR_SIZE(op_strings) ? op_stringsop : "WTF?");
+}
+
+static void serialise(const search_expr_t *e, struct buf *buf)
+{
+ const search_expr_t *child;
+
+#if DEBUG
+ if (e == the_focus) buf_putc(buf, '<');
+#endif
+ buf_putc(buf, '(');
+ buf_appendcstr(buf, op_as_string(e->op));
+ if (e->attr) {
+	buf_putc(buf, ' ');
+	buf_appendcstr(buf, e->attr->name);
+	buf_putc(buf, ' ');
+	if (e->attr->serialise) e->attr->serialise(buf, &e->value);
+ }
+ for (child = e->children ; child ; child = child->next) {
+	buf_putc(buf, ' ');
+	serialise(child, buf);
+ }
+ buf_putc(buf, ')');
+#if DEBUG
+ if (e == the_focus) buf_putc(buf, '>');
+#endif
+}
+
+/*
+ * Given an expression tree, return a string which uniquely describes
+ * the tree. The string is designed to be used as a cache key and for
+ * unit tests, not for human readability.
+ *
+ * Returns a new string which must be free()d by the caller.
+ */
+EXPORTED char *search_expr_serialise(const search_expr_t *e)
+{
+ struct buf buf = BUF_INITIALIZER;
+ serialise(e, &buf);
+ return buf_release(&buf);
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static int getseword(struct protstream *prot, char *buf, int maxlen)
+{
+ int c = EOF;
+ int quoted = 0;
+
+ c = prot_getc(prot);
+ if (c == '"')
+	quoted = 1;
+ else
+	prot_ungetc(c, prot);
+
+ while (maxlen > 1 &&
+	 (c = prot_getc(prot)) != EOF &&
+	 (quoted ?
+	 (c != '"') :
+	 (c != ' ' && c != ')'))) {
+	*buf++ = c;
+	maxlen--;
+ }
+ *buf = '\0';
+ if (quoted && c != EOF)
+	c = prot_getc(prot);
+ return c;
+}
+
+static search_expr_t *unserialise(search_expr_t *parent,
+				 struct protstream *prot)
+{
+ int c;
+ search_expr_t *e = NULL;
+ unsigned int op;
+ char tmp128;
+
+ c = prot_getc(prot);
+ if (c != '(')
+	goto bad;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ if (c != ' ' && c != ')')
+	goto bad;
+
+ for (op = 0 ; op < VECTOR_SIZE(op_strings) ; op++) {
+	if (!strcmp(tmp, op_stringsop))
+	 break;
+ }
+ if (op == VECTOR_SIZE(op_strings))
+	goto bad;
+
+ e = search_expr_new(parent, op);
+ if (c == ')')
+	return e; /* SEOP_TRUE, SEOP_FALSE */
+
+ switch (op) {
+ case SEOP_AND:
+ case SEOP_OR:
+ case SEOP_NOT:
+	/* parse children */
+	for (;;) {
+	 if (unserialise(e, prot) == NULL)
+		goto bad;
+	 c = prot_getc(prot);
+	 if (c == ')')
+		break;
+	 if (c != ' ')
+		goto bad;
+	}
+	break;
+ case SEOP_LT:
+ case SEOP_LE:
+ case SEOP_GT:
+ case SEOP_GE:
+ case SEOP_MATCH:
+ case SEOP_FUZZYMATCH:
+	/* parse attribute */
+	c = getseword(prot, tmp, sizeof(tmp));
+	if (c != ' ')
+	 goto bad;
+	e->attr = search_attr_find(tmp);
+	if (e->attr == NULL)
+	 goto bad;
+	/* parse value */
+	if (e->attr->unserialise)
+	 c = e->attr->unserialise(prot, &e->value);
+	if (c != ')')
+	 goto bad;
+	break;
+ default:
+	c = prot_getc(prot);
+	if (c != ')')
+	 goto bad;
+	break;
+ }
+
+ return e;
+
+bad:
+ if (e) {
+	e->op = SEOP_UNKNOWN;
+	if (parent == NULL)
+	 search_expr_free(e);
+ }
+ return NULL;
+}
+
+/*
+ * Given a string generated by search_expr_serialise(),
+ * parse it and return a new expression tree, or NULL if
+ * there were any errors. Used mainly for unit tests.
+ */
+EXPORTED search_expr_t *search_expr_unserialise(const char *s)
+{
+ struct protstream *prot;
+ search_expr_t *root = NULL;
+
+ if (!s || !*s) return NULL;
+ prot = prot_readmap(s, strlen(s));
+ root = unserialise(NULL, prot);
+
+#if DEBUG
+ if (!root) {
+#define MAX_CONTEXT 48
+	int off = ((const char *)prot->ptr - s);
+	int len = strlen(s);
+	int context_begin = off - MIN(off, MAX_CONTEXT);
+	int context_end = off + MIN((len-off), MAX_CONTEXT);
+	int i;
+	fputc('\n', stderr);
+	fprintf(stderr, "ERROR: failed to unserialise string at or near:\n");
+	if (context_begin) fputs("...", stderr);
+	fwrite(s+context_begin, 1, context_end-context_begin, stderr);
+	fputc('\n', stderr);
+	if (context_begin) fputs("---", stderr);
+	for (i = off - context_begin - 1 ; i > 0 ; i--)
+	 fputc('-', stderr);
+	fputc('^', stderr);
+	fputc('\n', stderr);
+ }
+#endif
+
+ prot_free(prot);
+ return root;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+enum {
+ DNF_OR, DNF_AND, DNF_NOT, DNF_CMP
+};
+
+/* expected depth, in a full tree. 0 is rootmost, 3 is leafmost */
+static int dnf_depth(const search_expr_t *e)
+{
+ switch (e->op) {
+ case SEOP_TRUE:
+ case SEOP_FALSE:
+ case SEOP_LT:
+ case SEOP_LE:
+ case SEOP_GT:
+ case SEOP_GE:
+ case SEOP_MATCH:
+ case SEOP_FUZZYMATCH:
+	return DNF_CMP;
+ case SEOP_AND:
+	return DNF_AND;
+ case SEOP_OR:
+	return DNF_OR;
+ case SEOP_NOT:
+	return DNF_NOT;
+ default: assert(0); return -1;
+ }
+ return -1;
+}
+
+static int has_enough_children(const search_expr_t *e)
+{
+ const search_expr_t *child;
+ int min;
+ int n = 0;
+
+ switch (e->op) {
+ case SEOP_OR:
+ case SEOP_AND:
+	min = 2;
+	break;
+ case SEOP_NOT:
+	min = 1;
+	break;
+ default:
+	return 1;
+ }
+
+ for (child = e->children ; child ; child = child->next)
+	if (++n >= min) return 1;
+ return 0;
+}
+
+static int apply_demorgan(search_expr_t **ep, search_expr_t **prevp)
+{
+ search_expr_t *child = *prevp;
+ search_expr_t **grandp;
+
+ /* NOT nodes have exactly one child */
+ assert(*prevp != NULL);
+ assert((*prevp)->next == NULL);
+
+ child->op = (child->op == SEOP_AND ? SEOP_OR : SEOP_AND);
+ for (grandp = &child->children ; *grandp ; grandp = &(*grandp)->next)
+	interpolate(grandp, SEOP_NOT);
+ search_expr_free(elide(ep));
+
+ return complexity_check(1);
+}
+
+static int apply_distribution(search_expr_t **ep, search_expr_t **prevp)
+{
+ search_expr_t *newor;
+ search_expr_t *or;
+ search_expr_t *and;
+ search_expr_t *orchild;
+ search_expr_t *newand;
+ int r = 1;
+
+ newor = interpolate(ep, SEOP_OR);
+ and = detachp(&newor->children);
+ or = detachp(prevp);
+
+ while (complexity_check(r) >= 0) {
+	orchild = detachp(&or->children);
+	if (orchild == NULL) break;
+	newand = search_expr_duplicate(and);
+	append(newand, orchild);
+	append(newor, newand);
+ }
+
+ search_expr_free(and);
+ search_expr_free(or);
+
+ return complexity_check(r);
+}
+
+static int invert(search_expr_t **ep, search_expr_t **prevp)
+{
+ if ((*ep)->op == SEOP_NOT)
+	return apply_demorgan(ep, prevp);
+ else
+	return apply_distribution(ep, prevp);
+}
+
+/* combine compatible boolean parent and child nodes */
+static void combine(search_expr_t **ep, search_expr_t **prevp)
+{
+ switch ((*ep)->op) {
+ case SEOP_NOT:
+	search_expr_free(elide(prevp));
+	search_expr_free(elide(ep));
+	break;
+ case SEOP_AND:
+ case SEOP_OR:
+	search_expr_free(elide(prevp));
+	break;
+ default:
+	break;
+ }
+}
+
+/*
+ * Top-level normalisation step. Returns 1 if it changed the subtree, 0
+ * if it didn't, and -1 on error (such as exceeding a complexity limit).
+ */
+static int normalise(search_expr_t **ep)
+{
+ search_expr_t **prevp;
+ int depth;
+ int changed = -1;
+ int r;
+
+restart:
+ changed++;
+
+#if DEBUG
+ the_focus = *ep;
+ {
+	char *s = search_expr_serialise(*the_rootp);
+	fprintf(stderr, "normalise: tree=%s\n", s);
+	free(s);
+ }
+#endif
+
+ if (!has_enough_children(*ep)) {
+	/* eliminate trivial nodes: AND and ORs with
+	 * a single child, NOTs with none */
+	search_expr_free(elide(ep));
+	goto restart;
+ }
+
+ depth = dnf_depth(*ep);
+ for (prevp = &(*ep)->children ; *prevp ; prevp = &(*prevp)->next)
+ {
+	int child_depth = dnf_depth(*prevp);
+	if (child_depth == depth) {
+	 combine(ep, prevp);
+	 goto restart;
+	}
+	if (child_depth < depth) {
+	 r = invert(ep, prevp);
+	 if (r < 0) return -1;
+	 goto restart;
+	}
+	r = normalise(prevp);
+	if (r < 0) return -1;
+	if (r > 0) goto restart;
+ }
+
+ return complexity_check(changed);
+}
+
+static void *getnext(void *p)
+{
+ return ((search_expr_t *)p)->next;
+}
+
+static void setnext(void *p, void *next)
+{
+ ((search_expr_t *)p)->next = next;
+}
+
+static int compare(void *p1, void *p2, void *calldata)
+{
+ const search_expr_t *e1 = p1;
+ const search_expr_t *e2 = p2;
+ int r;
+
+ r = dnf_depth(e2) - dnf_depth(e1);
+
+ if (!r)
+	r = (e1->attr ? e1->attr->cost : 0)
+	 - (e2->attr ? e2->attr->cost : 0);
+
+ if (!r)
+	r = strcasecmp(e1->attr ? e1->attr->name : "zzz",
+		 e2->attr ? e2->attr->name : "zzz");
+
+ if (!r)
+	r = (int)e1->op - (int)e2->op;
+
+ if (!r) {
+	struct buf b1 = BUF_INITIALIZER;
+	struct buf b2 = BUF_INITIALIZER;
+	if (e1->attr && e1->attr->serialise)
+	 e1->attr->serialise(&b1, &e1->value);
+	if (e2->attr && e2->attr->serialise)
+	 e2->attr->serialise(&b2, &e2->value);
+	r = strcmp(buf_cstring(&b1), buf_cstring(&b2));
+	buf_free(&b1);
+	buf_free(&b2);
+ }
+
+ if (!r) {
+	if (e1->children || e2->children)
+	 r = compare((void *)(e1->children ? e1->children : e1),
+			(void *)(e2->children ? e2->children : e2),
+			calldata);
+ }
+
+ return r;
+}
+
+static void sort_children(search_expr_t *e)
+{
+ search_expr_t *child;
+
+ for (child = e->children ; child ; child = child->next)
+	sort_children(child);
+
+ e->children = lsort(e->children, getnext, setnext, compare, NULL);
+}
+
+/*
+ * Reorganise a search expression tree into Disjunctive Normal Form.
+ * This form is useful for picking out cacheable and runnable sub-queries.
+ *
+ * An expression in DNF has a number of constraints:
+ *
+ * - it contains at most one OR node
+ * - if present the OR node is the root
+ * - NOT nodes if present have only comparisons as children
+ * - it contains at most 4 levels of nodes
+ * - nodes have a strict order of types, down from the root
+ * they are: OR, AND, NOT, comparisons.
+ *
+ * DNF is useful for running queries. Each of the children of the
+ * root OR node can be run as a separate sub-query, and cached
+ * independently because their results are just accumulated together
+ * without any further processing. Each of those children is a single
+ * conjuctive clause which can implemented using an index lookup (or a
+ * scan of all messages) followed by a filtering step. Finally, each of
+ * those conjunctive clauses can be analysed to discover which folders
+ * will need to be opened: no folders, a single specific folder,
+ * all folders, or all folders except some specific folders.
+ *
+ * We also enforce a fixed order on child nodes of any node, so
+ * that all logically equivalent trees are the same shape. This
+ * helps when constructing a cache key from a tree. The sorting
+ * criteria are:
+ *
+ * - NOT nodes after un-negated comparison nodes, then
+ * - comparison nodes sorted lexically on attribute, then
+ * - comparison nodes sorted lexically on stringified value
+ *
+ * Note that IMAP search syntax, when translated most directly into an
+ * expression tree, defines trees whose outermost node is always an AND.
+ * Those trees are not in any kind of normal form but more closely
+ * resemble Conjunctive Normal Form than DNF. Any IMAP search program
+ * containing an OR criterion will require significant juggling to
+ * achieve DNF.
+ *
+ * Takes the root of the tree in *'ep' and returns a possibly reshaped
+ * tree whose root is stored in *'ep'.
+ *
+ * Returns 1 if the subtree was changed, 0 if it wasn't, and -1 on error
+ * (such as exceeding a complexity limit).
+ */
+EXPORTED int search_expr_normalise(search_expr_t **ep)
+{
+ int r;
+
+#if DEBUG
+ the_rootp = ep;
+#endif
+ r = normalise(ep);
+ sort_children(*ep);
+#if DEBUG
+ the_rootp = NULL;
+ the_focus = NULL;
+#endif
+ return r;
+}
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+static int internalise(search_expr_t *e, void *rock)
+{
+ struct index_state *state = rock;
+ if (e->attr && e->attr->internalise)
+	e->attr->internalise(state, &e->value, &e->internalised);
+ return 0;
+}
+
+/*
+ * Prepare the given expression for use with the given mailbox.
+ */
+EXPORTED void search_expr_internalise(struct index_state *state, search_expr_t *e)
+{
+ search_expr_apply(e, internalise, state);
+}
+
+/*
+ * Evaluate the given search expression for the given message,
+ * Returns nonzero if the expression is true, 0 otherwise.
+ */
+EXPORTED int search_expr_evaluate(message_t *m, const search_expr_t *e)
+{
+ search_expr_t *child;
+
+ switch (e->op) {
+ case SEOP_UNKNOWN: assert(0); return 1;
+ case SEOP_TRUE: return 1;
+ case SEOP_FALSE: return 0;
+ case SEOP_LT:
+	assert(e->attr);
+	assert(e->attr->cmp);
+	return (e->attr->cmp(m, &e->value, e->internalised, e->attr->data1) < 0);
+ case SEOP_LE:
+	assert(e->attr);
+	assert(e->attr->cmp);
+	return (e->attr->cmp(m, &e->value, e->internalised, e->attr->data1) <= 0);
+ case SEOP_GT:
+	assert(e->attr);
+	assert(e->attr->cmp);
+	return (e->attr->cmp(m, &e->value, e->internalised, e->attr->data1) > 0);
+ case SEOP_GE:
+	assert(e->attr);
+	assert(e->attr->cmp);
+	return (e->attr->cmp(m, &e->value, e->internalised, e->attr->data1) >= 0);
+ case SEOP_FUZZYMATCH:
+	/* FUZZYMATCH should never be evaluated, as such nodes are
+	 * picked out of the expression during query optimisation and
+	 * used to drive search engine lookups. But the nearest
+	 * approximation would be MATCH. */
+ case SEOP_MATCH:
+	assert(e->attr);
+	assert(e->attr->match);
+	return e->attr->match(m, &e->value, e->internalised, e->attr->data1);
+ case SEOP_AND:
+	for (child = e->children ; child ; child = child->next)
+	 if (!search_expr_evaluate(m, child))
+		return 0;
+	return 1;
+ case SEOP_OR:
+	for (child = e->children ; child ; child = child->next)
+	 if (search_expr_evaluate(m, child))
+		return 1;
+	return 0;
+ case SEOP_NOT:
+	assert(e->children);
+	return !search_expr_evaluate(m, e->children);
+ }
+ return 0;
+}
+
+/* ====================================================================== */
+
+static int uses_attr(search_expr_t *e, void *rock)
+{
+ const search_attr_t *attr = rock;
+ return (e->attr == attr);
+}
+
+/*
+ * Returns non-zero if any comparison node in the given search
+ * expression tree uses the attribute with the given name.
+ */
+EXPORTED int search_expr_uses_attr(const search_expr_t *e, const char *name)
+{
+ const search_attr_t *attr = search_attr_find(name);
+
+ if (!attr) return 0;
+ return search_expr_apply((search_expr_t *)e, uses_attr, (void *)attr);
+}
+
+/* ====================================================================== */
+
+ /* NOTE: older than 'N' days will be a mutable search of course,
+ * but that fact isn't available down here - we only know the
+ * date range itself, and that isn't mutable. So if you need
+ * immutable results, you'll need to maintain a fixed date range
+ * up in the higher level */
+
+static int is_mutable(search_expr_t *e, void *rock __attribute__((unused)))
+{
+ return (e->attr && (e->attr->flags & SEA_MUTABLE));
+}
+
+/*
+ * Return non-zero if the search expression is mutable, i.e. it might
+ * return a different set of messages if run again, assuming that
+ *
+ * a) no folders covered by the search have received new messages, and
+ * b) uidvalidities of folders covered by the search have not changed.
+ *
+ * Basically, mutable searches are on attributes of a message which are
+ * not derived solely from the message text itself and can be changed after
+ * the message is inserted. For example: system flags are mutable, the
+ * From: header field is not.
+ */
+EXPORTED int search_expr_is_mutable(const search_expr_t *e)
+{
+ return search_expr_apply((search_expr_t *)e, is_mutable, NULL);
+}
+
+/* ====================================================================== */
+
+static int get_countability(search_expr_t *e, void *rock)
+{
+ unsigned int *maskp = rock;
+
+ if (e->op == SEOP_TRUE)
+	*maskp |= SEC_EXISTS;
+ else if (e->op == SEOP_FALSE)
+	*maskp |= SEC_EXISTS|SEC_NOT;
+ else if (e->op == SEOP_NOT)
+	*maskp |= SEC_NOT;
+ else if (e->attr) {
+	if (e->attr->get_countability)
+	 *maskp |= e->attr->get_countability(&e->value);
+	else
+	 *maskp |= SEC_UNCOUNTED;
+ }
+
+ return 0;
+}
+
+/*
+ * Analyse the search expression to discover how countable the results are
+ * going to be. By "countable" we mean "predictable from stored state,
+ * without searching every message". Currently that means
+ *
+ * in message mode:
+ * - total number of messages
+ * - number unseen messages
+ * - number seen messages (by inference)
+ * - number recent messages
+ * - number unrecent messages (by inference)
+ * in conversation mode:
+ * - total number of conversations
+ * - number of conversations with unseen messages
+ * - number of conversations with no unseen messages (by inference)
+ *
+ * Returns a mask of SEC_* constants (e.g. SEC_SEEN) describing which
+ * countable attributes are specified by the expression. The special value
+ * SEC_UNCOUNTED means that at least one uncounted attribute was found.
+ * Mask values with more than one bit set are effectively uncountable.
+ *
+ * Note: the heuristics used here are intended for normalised search
+ * expressions, and may not work correctly otherwise. In particular,
+ * SEC_NOT doesn't do quite what you expect.
+ */
+
+EXPORTED unsigned int search_expr_get_countability(const search_expr_t *e)
+{
+ unsigned int mask = 0;
+
+ if (!e)
+	return 0;
+
+ search_expr_apply((search_expr_t *)e, get_countability, &mask);
+ return mask;
+}
+
+/* ====================================================================== */
+
+/*
+ * Neutralise a node: make it always return success. Useful for
+ * changing the logic of an expression without reshaping it.
+ */
+EXPORTED void search_expr_neutralise(search_expr_t *e)
+{
+ /* Leave the children and attribute in place. This might be
+ * wrong, but we are only called for MATCH nodes at the moment
+ * and they seem to be able to tolerate such weirdness. */
+ e->op = SEOP_TRUE;
+}
+
+/* ====================================================================== */
+
+static int is_folder_node(const search_expr_t *e)
+{
+ return (e->op == SEOP_MATCH &&
+	 e->attr &&
+	 !strcasecmp(e->attr->name, "folder"));
+}
+
+static int is_indexed_node(const search_expr_t *e)
+{
+ if (e->op == SEOP_NOT)
+	return is_indexed_node(e->children);
+ return (e->op == SEOP_FUZZYMATCH &&
+	 e->attr &&
+	 e->attr->part != SEARCH_PART_NONE);
+}
+
+static int is_folder_or_indexed(search_expr_t *e, void *rock __attribute__((unused)))
+{
+ return (is_folder_node(e) || is_indexed_node(e));
+}
+
+/*
+ * Split a search expression into one or more parts, each of which
+ * satisfies the earliest of these conditions:
+ *
+ * - contains at least one indexed match node
+ *	(the callback's 'indexed' is non-NULL), or
+ *
+ * - is limited to exactly one folder by a positive folder match node
+ *	(the callback's 'mboxname' is non-NULL), or
+ *
+ * - applies to all folders and is not indexed
+ *	(both the callback's 'mboxname' and 'indexed' are NULL)
+ *
+ * Destroys the original expression as a side effect.
+ *
+ * The callback function 'cb' is called one or more times with up to two
+ * expression trees which have just been detached from the original expression
+ * tree. Both of these trees will be in DNF and will be at most a
+ * conjuctive node, i.e. no disjunctions.
+ *
+ * The 'indexed' tree, if not NULL, contains all the indexed search terms.
+ * The 'scan' tree will never be NULL, although it may be a trivial tree
+ * comprising a single (true) node. It contains an expression that must be
+ * matched by every message reported by the index or the folder scan.
+ *
+ * The callback is responsible for freeing the expression using
+ * search_expr_free(). The callback may be called multiple times with
+ * the same folder/index combination, in which case the expressions should
+ * be considered logically ORed together.
+ *
+ * Does not require the input expression to be normalised, and may
+ * normalise it during processing. Expressions passed to the callback
+ * are always normalised.
+ */
+EXPORTED void search_expr_split_by_folder_and_index(search_expr_t *e,
+		 void (*cb)(const char *, search_expr_t *, search_expr_t *, void *),
+		 void *rock)
+{
+ search_expr_t *copy = NULL;
+
+ if (!search_expr_apply(e, is_folder_or_indexed, NULL)) {
+	/* The expression contains neither a folder match node nor an
+	 * indexable node, which means we can short circuit the whole
+	 * normalisation and splitting process. This optimisation helps
+	 * us cope with the FM web frontends generating queries with
+	 *
+	 * or or or or to "word" cc "word" bcc "word" from "word" subject "word"
+	 *
+	 * for every "word" the user types into the Search box, by
+	 * avoiding the complexity explosion due to normalising all
+	 * those OR nodes.
+	 *
+	 * But - we still sort it. */
+	sort_children(e);
+	cb(NULL, NULL, e, rock);
+	return;
+ }
+
+ copy = search_expr_duplicate(e);
+ nnodes = 0;
+ if (search_expr_normalise(&copy) < 0)
+ {
+	/* We blew the complexity limit because the expression has too
+	 * many ORs. Rats. Give up and scan folders with the original
+	 * expression */
+	search_expr_free(copy);
+	cb(NULL, NULL, e, rock);
+	return;
+ }
+
+ search_expr_free(e);
+ split(copy, cb, rock);
+}
+
+static void split(search_expr_t *e,
+		 void (*cb)(const char *, search_expr_t *, search_expr_t *, void *),
+		 void *rock)
+{
+ search_expr_t *child;
+
+ if (e->op == SEOP_OR) {
+	/* top level node */
+	while ((child = detachp(&e->children)) != NULL)
+	 split(child, cb, rock);
+	search_expr_free(e);
+ }
+ else if (e->op == SEOP_AND) {
+	search_expr_t **prevp;
+	search_expr_t **folder_prevp = NULL;
+	int nfolders = 0;
+	int nindexes = 0;
+
+	for (prevp = &e->children ; *prevp ; prevp = &(*prevp)->next) {
+	 if (is_indexed_node(*prevp)) {
+		nindexes++;
+	 }
+	 if (is_folder_node(*prevp)) {
+		nfolders++;
+		folder_prevp = prevp;
+	 }
+	}
+	if (nindexes) {
+	 /*
+	 * The presence of indexable fields overrides all other
+	 * considerations; we assume it's easier to consult the
+	 * index and then filter out folders later. Note that this
+	 * assumption is broken for SQUAT which is per-folder.
+	 *
+	 * We remove the indexed matches from the conjunction and
+	 * build a new conjunction containing only those matches.
+	 * Note that this assumes the search engine does not give
+	 * false positives, which is also broken for SQUAT.
+	 */
+	 search_expr_t *indexed = search_expr_new(NULL, SEOP_AND);
+
+	 for (prevp = &e->children ; *prevp ; ) {
+		if (is_indexed_node(*prevp))
+		 append(indexed, detachp(prevp));
+		else
+		 prevp = &(*prevp)->next;
+	 }
+	 search_expr_normalise(&indexed);	/* in case of a trivial AND */
+	 if (!e->children) {
+		search_expr_free(e);
+		e = search_expr_new(NULL, SEOP_TRUE);
+	 }
+	 else
+		search_expr_normalise(&e);
+	 cb(NULL, indexed, e, rock);
+	}
+	else if (!nfolders) {
+	 /* No positive folder match: whole expression applies
+	 * to all folders */
+	 cb(NULL, NULL, e, rock);
+	}
+	else if (nfolders == 1) {
+	 /* Exactly one positive folder match: remainder of expression
+	 * applies to this specific folder */
+	 child = detachp(folder_prevp);
+	 /* normalise the remaining subtree - the top node might be
+	 * trivial now that we've detached the folder match */
+	 search_expr_normalise(&e);
+	 cb(child->value.s, NULL, e, rock);
+	 search_expr_free(child);
+	}
+	else {
+	 /* Two or more positive folder matches; this expression
+	 * will never match any messages because messages belong
+	 * to exactly one folder, so just delete it.
+	 * TODO need to uniquify the (match folder) nodes
+	 * before this will work properly */
+	 search_expr_free(e);
+	}
+ }
+ else if (is_folder_node(e)) {
+	cb(e->value.s, NULL, search_expr_new(NULL, SEOP_TRUE), rock);
+	search_expr_free(e);
+ }
+ else if (is_indexed_node(e)) {
+	cb(NULL, e, search_expr_new(NULL, SEOP_TRUE), rock);
+ }
+ else {
+	cb(NULL, NULL, e, rock);
+ }
+}
+
+/* ====================================================================== */
+
+static int search_string_match(message_t *m, const union search_value *v,
+				void *internalised, void *data1)
+{
+ int r;
+ struct buf buf = BUF_INITIALIZER;
+ int (*getter)(message_t *, struct buf *) = (int(*)(message_t *, struct buf *))data1;
+ comp_pat *pat = (comp_pat *)internalised;
+
+ r = getter(m, &buf);
+ if (!r && buf.len)
+	r = charset_searchstring(v->s, pat, buf.s, buf.len, charset_flags);
+ else
+	r = 0;
+ buf_free(&buf);
+
+ return r;
+}
+
+static void search_string_serialise(struct buf *b, const union search_value *v)
+{
+ buf_printf(b, "\"%s\"", v->s);
+}
+
+static int search_string_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp1024;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ v->s = xstrdup(tmp);
+ return c;
+}
+
+static void search_string_internalise(struct index_state *state __attribute__((unused)),
+				 const union search_value *v, void **internalisedp)
+{
+ if (*internalisedp) {
+	charset_freepat(*internalisedp);
+	*internalisedp = NULL;
+ }
+ if (v) {
+	*internalisedp = charset_compilepat(v->s);
+ }
+}
+
+static void search_string_duplicate(union search_value *new,
+				 const union search_value *old)
+{
+ new->s = xstrdup(old->s);
+}
+
+static void search_string_free(union search_value *v)
+{
+ free(v->s);
+ v->s = NULL;
+}
+
+/* ====================================================================== */
+
+static int search_listid_match(message_t *m, const union search_value *v,
+			 void *internalised,
+			 void *data1 __attribute__((unused)))
+{
+ int r;
+ struct buf buf = BUF_INITIALIZER;
+ comp_pat *pat = (comp_pat *)internalised;
+
+ r = message_get_listid(m, &buf);
+ if (!r) {
+	r = charset_searchstring(v->s, pat, buf.s, buf.len, charset_flags);
+	if (r) goto out; // success
+ }
+
+ r = message_get_mailinglist(m, &buf);
+ if (!r) {
+	r = charset_searchstring(v->s, pat, buf.s, buf.len, charset_flags);
+	if (r) goto out; // success
+ }
+
+ r = 0; // failure
+
+out:
+ buf_free(&buf);
+ return r;
+}
+
+/* ====================================================================== */
+
+static int search_contenttype_match(message_t *m, const union search_value *v,
+				 void *internalised,
+				 void *data1 __attribute__((unused)))
+{
+ int r;
+ comp_pat *pat = (comp_pat *)internalised;
+ strarray_t types = STRARRAY_INITIALIZER;
+ int i;
+ char combined128;
+
+ if (!message_get_leaf_types(m, &types)) {
+	for (i = 0 ; i < types.count ; i+= 2) {
+	 const char *type = types.datai;
+	 const char *subtype = types.datai+1;
+
+	 /* match against type */
+	 r = charset_searchstring(v->s, pat, type, strlen(type), charset_flags);
+	 if (r) goto out;	// success
+
+	 /* match against subtype */
+	 r = charset_searchstring(v->s, pat, subtype, strlen(subtype), charset_flags);
+	 if (r) goto out;	// success
+
+	 /* match against combined type_subtype */
+	 snprintf(combined, sizeof(combined), "%s_%s", type, subtype);
+	 r = charset_searchstring(v->s, pat, combined, strlen(combined), charset_flags);
+	 if (r) goto out;	// success
+	}
+ }
+
+ r = 0; // failure
+
+out:
+ strarray_fini(&types);
+ return r;
+}
+
+/* ====================================================================== */
+
+static int search_header_match(message_t *m, const union search_value *v,
+			 void *internalised, void *data1)
+{
+ int r;
+ struct buf buf = BUF_INITIALIZER;
+ const char *field = (const char *)data1;
+ comp_pat *pat = (comp_pat *)internalised;
+
+ r = message_get_field(m, field,
+			 MESSAGE_DECODED|MESSAGE_APPEND|MESSAGE_MULTIPLE,
+			 &buf);
+ if (!r) {
+	if (*v->s) {
+	 r = charset_searchstring(v->s, pat, buf.s, buf.len, charset_flags);
+	}
+	else {
+	 /* RFC3501: If the string to search is zero-length, this matches
+	 * all messages that have a header line with the specified
+	 * field-name regardless of the contents. */
+	 r = buf.len ? 1 : 0;
+	}
+ }
+ else
+	r = 0;
+ buf_free(&buf);
+
+ return r;
+}
+
+/* ====================================================================== */
+
+static void internalise_sequence(const union search_value *v,
+				 void **internalisedp, unsigned maxval)
+{
+ if (*internalisedp) {
+	seqset_free(*internalisedp);
+	*internalisedp = NULL;
+ }
+ if (v) {
+	*internalisedp = seqset_parse(v->s, NULL, maxval);
+ }
+}
+
+static void search_msgno_internalise(struct index_state *state,
+				 const union search_value *v, void **internalisedp)
+{
+ internalise_sequence(v, internalisedp, (state ? state->exists : 0));
+}
+
+static void search_uid_internalise(struct index_state *state,
+				 const union search_value *v, void **internalisedp)
+{
+ internalise_sequence(v, internalisedp, (state ? state->last_uid : 0));
+}
+
+static int search_seq_match(message_t *m,
+			 const union search_value *v __attribute__((unused)),
+			 void *internalised,
+			 void *data1)
+{
+ struct seqset *seq = internalised;
+ int r;
+ uint32_t u;
+ int (*getter)(message_t *, uint32_t *) = (int(*)(message_t *, uint32_t *))data1;
+
+ r = getter(m, &u);
+ if (!r)
+	r = seqset_ismember(seq, u);
+ else
+	r = 0;
+
+ return r;
+}
+
+static void search_seq_serialise(struct buf *b, const union search_value *v)
+{
+ buf_appendcstr(b, v->s);
+}
+
+/* ====================================================================== */
+
+static int search_flags_match(message_t *m, const union search_value *v,
+			 void *internalised __attribute__((unused)),
+			 void *data1)
+{
+ int r;
+ uint32_t u;
+ int (*getter)(message_t *, uint32_t *) = (int(*)(message_t *, uint32_t *))data1;
+
+ r = getter(m, &u);
+ if (!r)
+	r = !!(v->u & u);
+ else
+	r = 0;
+
+ return r;
+}
+
+static void search_systemflags_serialise(struct buf *b, const union search_value *v)
+{
+ if ((v->u & FLAG_ANSWERED))
+	buf_appendcstr(b, "\\Answered");
+ if ((v->u & FLAG_FLAGGED))
+	buf_appendcstr(b, "\\Flagged");
+ if ((v->u & FLAG_DELETED))
+	buf_appendcstr(b, "\\Deleted");
+ if ((v->u & FLAG_DRAFT))
+	buf_appendcstr(b, "\\Draft");
+ if ((v->u & FLAG_SEEN))
+	buf_appendcstr(b, "\\Seen");
+}
+
+static int search_systemflags_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp64;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+
+ if (!strcasecmp(tmp, "\\Answered"))
+	v->u = FLAG_ANSWERED;
+ else if (!strcasecmp(tmp, "\\Flagged"))
+	v->u = FLAG_FLAGGED;
+ else if (!strcasecmp(tmp, "\\Deleted"))
+	v->u = FLAG_DELETED;
+ else if (!strcasecmp(tmp, "\\Draft"))
+	v->u = FLAG_DRAFT;
+ else if (!strcasecmp(tmp, "\\Seen"))
+	v->u = FLAG_SEEN;
+ else
+	return EOF;
+ return c;
+}
+
+static void search_indexflags_serialise(struct buf *b, const union search_value *v)
+{
+ if ((v->u & MESSAGE_SEEN))
+	buf_appendcstr(b, "\\Seen");
+ if ((v->u & MESSAGE_RECENT))
+	buf_appendcstr(b, "\\Recent");
+}
+
+static int search_indexflags_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp64;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+
+ if (!strcasecmp(tmp, "\\Seen"))
+	v->u = MESSAGE_SEEN;
+ else if (!strcasecmp(tmp, "\\Recent"))
+	v->u = MESSAGE_RECENT;
+ else
+	return EOF;
+ return c;
+}
+
+unsigned int search_indexflags_get_countability(const union search_value *v)
+{
+ switch (v->u) {
+ case MESSAGE_SEEN: return SEC_SEEN;
+ case MESSAGE_RECENT: return SEC_RECENT;
+ default: return SEC_UNCOUNTED;
+ }
+}
+
+/* ====================================================================== */
+
+static void search_keyword_internalise(struct index_state *state,
+				 const union search_value *v,
+				 void **internalisedp)
+{
+ int r;
+ int num = 0;
+
+ if (state) {
+	r = mailbox_user_flag(state->mailbox, v->s, &num, /*create*/0);
+	if (!r)
+	 num++;
+	else
+	 num = 0;
+ }
+ *internalisedp = (void*)(unsigned long)num;
+}
+
+static int search_keyword_match(message_t *m,
+				const union search_value *v __attribute__((unused)),
+				void *internalised,
+				void *data1 __attribute__((unused)))
+{
+ int r;
+ int num = (int)(unsigned long)internalised;
+ uint32_t flagsMAX_USER_FLAGS/32;
+
+ if (!num)
+	return 0; /* not a valid flag for this mailbox */
+ num--;
+
+ r = message_get_userflags(m, flags);
+ if (!r)
+	r = !!(flagsnum/32 & (1<<(num % 32)));
+ else
+	r = 0;
+
+ return r;
+}
+
+/* ====================================================================== */
+
+static int search_uint64_cmp(message_t *m, const union search_value *v,
+			 void *internalised __attribute__((unused)),
+			 void *data1)
+{
+ int r;
+ uint64_t u;
+ int (*getter)(message_t *, uint64_t *) = (int(*)(message_t *, uint64_t *))data1;
+
+ r = getter(m, &u);
+ if (!r) {
+	if (u < v->u)
+	 r = -1;
+	else if (u == v->u)
+	 r = 0;
+	else
+	 r = 1;
+ }
+ else
+	r = 0;
+ return r;
+}
+
+static int search_uint64_match(message_t *m, const union search_value *v,
+			 void *internalised __attribute__((unused)),
+			 void *data1)
+{
+ int r;
+ uint64_t u;
+ int (*getter)(message_t *, uint64_t *) = (int(*)(message_t *, uint64_t *))data1;
+
+ r = getter(m, &u);
+ if (!r)
+	r = (v->u == u);
+ else
+	r = 0;
+
+ return r;
+}
+
+static void search_uint64_serialise(struct buf *b, const union search_value *v)
+{
+ buf_printf(b, "%llu", (unsigned long long)v->u);
+}
+
+static int search_uint64_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp32;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ v->u = strtoull(tmp, NULL, 10);
+ return c;
+}
+
+/* ====================================================================== */
+
+static void search_cid_serialise(struct buf *b, const union search_value *v)
+{
+ buf_appendcstr(b, conversation_id_encode(v->u));
+}
+
+static int search_cid_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ conversation_id_t cid;
+ char tmp32;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ if (!conversation_id_decode(&cid, tmp))
+	return EOF;
+ v->u = cid;
+ return c;
+}
+
+/* ====================================================================== */
+
+static void search_folder_internalise(struct index_state *state,
+				 const union search_value *v,
+				 void **internalisedp)
+{
+ if (state)
+	*internalisedp = (void *)(unsigned long)(!strcmp(state->mailbox->name, v->s));
+}
+
+static int search_folder_match(message_t *m __attribute__((unused)),
+			 const union search_value *v __attribute__((unused)),
+			 void *internalised, void *data1 __attribute__((unused)))
+{
+ return (int)(unsigned long)internalised;
+}
+
+unsigned int search_folder_get_countability(const union search_value *v
+					 __attribute__((unused)))
+{
+ return 0;
+}
+
+/* ====================================================================== */
+
+static void search_annotation_internalise(struct index_state *state,
+					 const union search_value *v __attribute__((unused)),
+					 void **internalisedp)
+{
+ if (state)
+	*internalisedp = state->mailbox;
+}
+
+struct search_annot_rock {
+ int result;
+ const struct buf *match;
+};
+
+static int _search_annot_match(const struct buf *match,
+			 const struct buf *value)
+{
+ /* These cases are not explicitly defined in RFC5257 */
+
+ /* NIL matches NIL and nothing else */
+ if (match->s == NULL)
+	return (value->s == NULL);
+ if (value->s == NULL)
+	return 0;
+
+ /* empty matches empty and nothing else */
+ if (match->len == 0)
+	return (value->len == 0);
+ if (value->len == 0)
+	return 0;
+
+ /* RFC5257 seems to define a simple CONTAINS style search */
+ return !!memmem(value->s, value->len,
+		 match->s, match->len);
+}
+
+static void _search_annot_callback(const char *mboxname __attribute__((unused)),
+				 uint32_t uid __attribute__((unused)),
+				 const char *entry __attribute__((unused)),
+				 struct attvaluelist *attvalues, void *rock)
+{
+ struct search_annot_rock *sarock = rock;
+ struct attvaluelist *l;
+
+ for (l = attvalues ; l ; l = l->next) {
+	if (_search_annot_match(sarock->match, &l->value))
+	 sarock->result = 1;
+ }
+}
+
+static int search_annotation_match(message_t *m, const union search_value *v,
+				 void *internalised, void *data1 __attribute__((unused)))
+{
+ struct mailbox *mailbox = (struct mailbox *)internalised;
+ struct searchannot *sa = v->annot;
+ strarray_t entries = STRARRAY_INITIALIZER;
+ strarray_t attribs = STRARRAY_INITIALIZER;
+ annotate_state_t *astate = NULL;
+ struct search_annot_rock rock;
+ uint32_t uid;
+ int r;
+
+ strarray_append(&entries, sa->entry);
+ strarray_append(&attribs, sa->attrib);
+
+ message_get_uid(m, &uid);
+
+ r = mailbox_get_annotate_state(mailbox, uid, &astate);
+ if (r) goto out;
+ annotate_state_set_auth(astate, sa->isadmin,
+			 sa->userid, sa->auth_state);
+
+ memset(&rock, 0, sizeof(rock));
+ rock.match = &sa->value;
+
+ r = annotate_state_fetch(astate,
+			 &entries, &attribs,
+			 _search_annot_callback, &rock,
+			 0);
+ if (r >= 0)
+	r = rock.result;
+
+out:
+ strarray_fini(&entries);
+ strarray_fini(&attribs);
+ return r;
+}
+
+static void search_annotation_serialise(struct buf *b, const union search_value *v)
+{
+ buf_printf(b, "(entry \"%s\" attrib \"%s\" value \"%s\")",
+		v->annot->entry, v->annot->attrib, buf_cstring(&v->annot->value));
+}
+
+/* Note: this won't be usable for execution as it lacks
+ * namespace etc pointers. Nor can it handle binary values. */
+static int search_annotation_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp64;
+ char entry1024;
+ char attrib1024;
+ char value1024;
+
+ c = prot_getc(prot);
+ if (c != '(') return EOF;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ if (c != ' ') return EOF;
+ if (strcmp(tmp, "entry")) return EOF;
+ c = getseword(prot, entry, sizeof(entry));
+ if (c != ' ') return EOF;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ if (c != ' ') return EOF;
+ if (strcmp(tmp, "attrib")) return EOF;
+ c = getseword(prot, attrib, sizeof(attrib));
+ if (c != ' ') return EOF;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ if (c != ' ') return EOF;
+ if (strcmp(tmp, "value")) return EOF;
+ c = getseword(prot, value, sizeof(value));
+ if (c != ')') return EOF;
+
+ v->annot = (struct searchannot *)xzmalloc(sizeof(struct searchannot));
+ v->annot->entry = xstrdup(entry);
+ v->annot->attrib = xstrdup(attrib);
+ buf_appendcstr(&v->annot->value, value);
+ buf_cstring(&v->annot->value);
+
+ c = prot_getc(prot);
+ return c;
+}
+
+static void search_annotation_duplicate(union search_value *new,
+					const union search_value *old)
+{
+ new->annot = (struct searchannot *)xmemdup(old->annot, sizeof(*old->annot));
+ new->annot->entry = xstrdup(new->annot->entry);
+ new->annot->attrib = xstrdup(new->annot->attrib);
+ buf_init(&new->annot->value);
+ buf_append(&new->annot->value, &old->annot->value);
+}
+
+static void search_annotation_free(union search_value *v)
+{
+ if (v->annot) {
+	free(v->annot->entry);
+	free(v->annot->attrib);
+	buf_free(&v->annot->value);
+	free(v->annot);
+	v->annot = NULL;
+ }
+}
+
+/* ====================================================================== */
+
+struct conv_rock {
+ struct conversations_state *cstate;
+ int cstate_is_ours;
+ int num;	 /* -1=invalid, 0=\Seen, 1+=index into cstate->counted_flags+1 */
+};
+
+static void conv_rock_new(struct mailbox *mailbox,
+			 struct conv_rock **rockp);
+static void conv_rock_free(struct conv_rock **rockp);
+
+static void search_convflags_internalise(struct index_state *state,
+					 const union search_value *v,
+					 void **internalisedp)
+{
+ struct conv_rock **rockp = (struct conv_rock **)internalisedp;
+ struct conv_rock *rock;
+
+ conv_rock_free(rockp);
+
+ if (state) {
+	conv_rock_new(state->mailbox, rockp);
+	rock = *rockp;
+	if (rock->cstate) {
+	 if (!strcasecmp(v->s, "\\Seen"))
+		rock->num = 0;
+	 else {
+		rock->num = strarray_find_case(rock->cstate->counted_flags, v->s, 0);
+		/* rock->num might be -1 invalid */
+		if (rock->num >= 0)
+		 rock->num++;
+	 }
+	}
+ }
+}
+
+static int search_convflags_match(message_t *m,
+				 const union search_value *v __attribute__((unused)),
+				 void *internalised,
+				 void *data1 __attribute__((unused)))
+{
+ struct conv_rock *rock = (struct conv_rock *)internalised;
+ conversation_id_t cid = NULLCONVERSATION;
+ conversation_t *conv = NULL;
+ int r;
+
+ if (!rock->cstate) return 0;
+
+ message_get_cid(m, &cid);
+ if (conversation_load(rock->cstate, cid, &conv)) return 0;
+ if (!conv) return 0;
+
+ if (rock->num < 0)
+	r = 0;	 /* invalid flag name */
+ else if (rock->num == 0)
+	r = !conv->unseen;
+ else if (rock->num > 0)
+	r = !!conv->countsrock->num-1;
+
+ conversation_free(conv);
+ return r;
+}
+
+unsigned int search_convflags_get_countability(const union search_value *v)
+{
+ if (!strcasecmp(v->s, "\\Seen"))
+	return SEC_CONVSEEN;
+ return SEC_UNCOUNTED;
+}
+
+static void search_convmodseq_internalise(struct index_state *state,
+					 const union search_value *v __attribute__((unused)),
+					 void **internalisedp)
+{
+ struct conv_rock **rockp = (struct conv_rock **)internalisedp;
+
+ conv_rock_free(rockp);
+
+ if (state) {
+	conv_rock_new(state->mailbox, rockp);
+ }
+}
+
+static int search_convmodseq_match(message_t *m, const union search_value *v,
+				 void *internalised, void *data1 __attribute__((unused)))
+{
+ struct conv_rock *rock = (struct conv_rock *)internalised;
+ conversation_id_t cid = NULLCONVERSATION;
+ conversation_t *conv = NULL;
+ int r;
+
+ if (!rock->cstate) return 0;
+
+ message_get_cid(m, &cid);
+ if (conversation_load(rock->cstate, cid, &conv)) return 0;
+ if (!conv) return 0;
+
+ r = (v->u == conv->modseq);
+
+ conversation_free(conv);
+ return r;
+}
+
+static void conv_rock_new(struct mailbox *mailbox,
+			 struct conv_rock **rockp)
+{
+ struct conv_rock *rock = xzmalloc(sizeof(*rock));
+
+ rock->cstate = conversations_get_mbox(mailbox->name);
+ if (!rock->cstate) {
+	if (conversations_open_mbox(mailbox->name, &rock->cstate))
+	 rock->num = -1;	 /* invalid */
+	else
+	 rock->cstate_is_ours = 1;
+ }
+
+ *rockp = rock;
+}
+
+static void conv_rock_free(struct conv_rock **rockp)
+{
+ struct conv_rock *rock = *rockp;
+ if (rock) {
+	if (rock->cstate_is_ours)
+	 conversations_abort(&rock->cstate);
+	free(rock);
+	*rockp = NULL;
+ }
+}
+
+
+/* ====================================================================== */
+
+static int search_uint32_cmp(message_t *m, const union search_value *v,
+			 void *internalised __attribute__((unused)),
+			 void *data1)
+{
+ int r;
+ uint32_t u;
+ int (*getter)(message_t *, uint32_t *) = (int(*)(message_t *, uint32_t *))data1;
+
+ r = getter(m, &u);
+ if (!r) {
+	if (u < v->u)
+	 r = -1;
+	else if (u == v->u)
+	 r = 0;
+	else
+	 r = 1;
+ }
+ else
+	r = 0;
+ return r;
+}
+
+static int search_uint32_match(message_t *m, const union search_value *v,
+			 void *internalised __attribute__((unused)),
+			 void *data1)
+{
+ int r;
+ uint32_t u;
+ int (*getter)(message_t *, uint32_t *) = (int(*)(message_t *, uint32_t *))data1;
+
+ r = getter(m, &u);
+ if (!r)
+	r = (v->u == u);
+ else
+	r = 0;
+ return r;
+}
+
+static void search_uint32_serialise(struct buf *b, const union search_value *v)
+{
+ buf_printf(b, "%u", (uint32_t)v->u);
+}
+
+static int search_uint32_unserialise(struct protstream *prot, union search_value *v)
+{
+ int c;
+ char tmp32;
+
+ c = getseword(prot, tmp, sizeof(tmp));
+ v->u = strtoul(tmp, NULL, 10);
+ return c;
+}
+
+/* ====================================================================== */
+
+/*
+ * Search part of a message for a substring.
+ */
+
+struct searchmsg_rock
+{
+ const char *substr;
+ comp_pat *pat;
+ int skipheader;
+ int result;
+};
+
+static int searchmsg_cb(int partno, int charset, int encoding,
+			const char *subtype __attribute((unused)),
+			struct buf *data, void *rock)
+{
+ struct searchmsg_rock *sr = (struct searchmsg_rock *)rock;
+
+ if (!partno) {
+	/* header-like */
+	if (sr->skipheader) {
+	 sr->skipheader = 0; /* Only skip top-level message header */
+	 return 0;
+	}
+	sr->result = charset_search_mimeheader(sr->substr, sr->pat,
+					 buf_cstring(data), charset_flags);
+ }
+ else {
+	/* body-like */
+	if (charset < 0 || charset == 0xffff)
+	 return 0;
+	sr->result = charset_searchfile(sr->substr, sr->pat,
+					data->s, data->len,
+					charset, encoding, charset_flags);
+ }
+ if (sr->result) return 1; /* found it, exit early */
+ return 0;
+}
+
+static int search_text_match(message_t *m, const union search_value *v,
+			 void *internalised, void *data1)
+{
+ struct searchmsg_rock sr;
+
+ sr.substr = v->s;
+ sr.pat = (comp_pat *)internalised;
+ sr.skipheader = (int)(unsigned long)data1;
+ sr.result = 0;
+ message_foreach_text_section(m, searchmsg_cb, &sr);
+ return sr.result;
+}
+
+/* ====================================================================== */
+
+static hash_table attrs_by_name = HASH_TABLE_INITIALIZER;
+
+enum search_cost {
+ SEARCH_COST_NONE = 0,
+ SEARCH_COST_INDEX,
+ SEARCH_COST_CONV,
+ SEARCH_COST_ANNOT,
+ SEARCH_COST_CACHE,
+ SEARCH_COST_BODY
+};
+
+/*
+ * Call search_attr_init() before doing any work with search
+ * expressions.
+ */
+EXPORTED void search_attr_init(void)
+{
+ unsigned int i;
+
+ static const search_attr_t attrs = {
+	{
+	 "bcc",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_BCC,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_bcc
+	},{
+	 "cc",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_CC,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_cc
+	},{
+	 "from",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_FROM,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_from
+	},{
+	 "message-id",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_messageid
+	},{
+	 "listid",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_LISTID,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_listid_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 NULL
+	},{
+	 "contenttype",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_TYPE,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_contenttype_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 NULL
+	},{
+	 "subject",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_SUBJECT,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_subject
+	},{
+	 "to",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_TO,
+	 SEARCH_COST_CACHE,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_string_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_to
+	},{
+	 "msgno",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 search_msgno_internalise,
+	 /*cmp*/NULL,
+	 search_seq_match,
+	 search_seq_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_msgno
+	},{
+	 "uid",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 search_uid_internalise,
+	 /*cmp*/NULL,
+	 search_seq_match,
+	 search_seq_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)message_get_uid
+	},{
+	 "systemflags",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 /*cmp*/NULL,
+	 search_flags_match,
+	 search_systemflags_serialise,
+	 search_systemflags_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_systemflags
+	},{
+	 "indexflags",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 /*cmp*/NULL,
+	 search_flags_match,
+	 search_indexflags_serialise,
+	 search_indexflags_unserialise,
+	 search_indexflags_get_countability,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_indexflags
+	},{
+	 "keyword",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 search_keyword_internalise,
+	 /*cmp*/NULL,
+	 search_keyword_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 NULL
+	},{
+	 "convflags",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_CONV,
+	 search_convflags_internalise,
+	 /*cmp*/NULL,
+	 search_convflags_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 search_convflags_get_countability,
+	 search_string_duplicate,
+	 search_string_free,
+	 NULL
+	},{
+	 "convmodseq",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_CONV,
+	 search_convmodseq_internalise,
+	 /*cmp*/NULL,
+	 search_convmodseq_match,
+	 search_uint64_serialise,
+	 search_uint64_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 NULL
+	},{
+	 "modseq",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 search_uint64_cmp,
+	 search_uint64_match,
+	 search_uint64_serialise,
+	 search_uint64_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_modseq
+	},{
+	 "cid",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 search_uint64_cmp,
+	 search_uint64_match,
+	 search_cid_serialise,
+	 search_cid_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_cid
+	},{
+	 "folder",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_NONE,
+	 search_folder_internalise,
+	 /*cmp*/NULL,
+	 search_folder_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 search_folder_get_countability,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)NULL
+	},{
+	 "annotation",
+	 SEA_MUTABLE,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_ANNOT,
+	 search_annotation_internalise,
+	 /*cmp*/NULL,
+	 search_annotation_match,
+	 search_annotation_serialise,
+	 search_annotation_unserialise,
+	 /*get_countability*/NULL,
+	 search_annotation_duplicate,
+	 search_annotation_free,
+	 (void *)NULL
+	},{
+	 "size",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 search_uint32_cmp,
+	 search_uint32_match,
+	 search_uint32_serialise,
+	 search_uint32_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_size
+	},{
+	 "internaldate",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 search_uint32_cmp,
+	 search_uint32_match,
+	 search_uint32_serialise,
+	 search_uint32_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_internaldate
+	},{
+	 "sentdate",
+	 /*flags*/0,
+	 SEARCH_PART_NONE,
+	 SEARCH_COST_INDEX,
+	 /*internalise*/NULL,
+	 search_uint32_cmp,
+	 search_uint32_match,
+	 search_uint32_serialise,
+	 search_uint32_unserialise,
+	 /*get_countability*/NULL,
+	 /*duplicate*/NULL,
+	 /*free*/NULL,
+	 (void *)message_get_sentdate
+	},{
+	 "body",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_BODY,
+	 SEARCH_COST_BODY,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_text_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)1	 /* skipheader flag */
+	},{
+	 "text",
+	 SEA_FUZZABLE,
+	 SEARCH_PART_ANY,
+	 SEARCH_COST_BODY,
+	 search_string_internalise,
+	 /*cmp*/NULL,
+	 search_text_match,
+	 search_string_serialise,
+	 search_string_unserialise,
+	 /*get_countability*/NULL,
+	 search_string_duplicate,
+	 search_string_free,
+	 (void *)0	 /* skipheader flag */
+	}
+ };
+
+ construct_hash_table(&attrs_by_name, VECTOR_SIZE(attrs), 0);
+ for (i = 0 ; i < VECTOR_SIZE(attrs) ; i++)
+	hash_insert(attrsi.name, (void *)&attrsi, &attrs_by_name);
+}
+
+/*
+ * Find and return a search attribute by name. Used when building
+ * comparison nodes in a search expression tree. Name comparison is
+ * case insensitive. Returns a pointer to static data or NULL if there
+ * is no attribute of the given name.
+ */
+EXPORTED const search_attr_t *search_attr_find(const char *name)
+{
+ char tmp128;
+
+ strlcpy(tmp, name, sizeof(tmp));
+ lcase(tmp);
+ return hash_lookup(tmp, &attrs_by_name);
+}
+
+/*
+ * Find and return a search attribute for the named header field. Used
+ * when building comparison nodes for the HEADER search criterion in a
+ * search expression tree. Field name comparison is case insensitive.
+ * Returns a pointer to internally managed data or NULL if there is no
+ * attribute of the given name.
+ */
+EXPORTED const search_attr_t *search_attr_find_field(const char *field)
+{
+ search_attr_t *attr;
+ char *key = NULL;
+ static const search_attr_t proto = {
+	"name",
+	SEA_FUZZABLE,
+	SEARCH_PART_NONE,
+	SEARCH_COST_NONE,
+	search_string_internalise,
+	/*cmp*/NULL,
+	search_header_match,
+	search_string_serialise,
+	search_string_unserialise,
+	/*get_countability*/NULL,
+	search_string_duplicate,
+	search_string_free,
+	NULL
+ };
+
+ /* some header fields can be reduced to search terms */
+ if (!strcasecmp(field, "bcc") ||
+	!strcasecmp(field, "cc") ||
+	!strcasecmp(field, "to") ||
+	!strcasecmp(field, "from") ||
+	!strcasecmp(field, "subject") ||
+	!strcasecmp(field, "message-id"))
+	return search_attr_find(field);
+
+ key = lcase(strconcat("header:", field, (char *)NULL));
+ attr = (search_attr_t *)hash_lookup(key, &attrs_by_name);
+
+ if (!attr) {
+	attr = (search_attr_t *)xzmalloc(sizeof(search_attr_t));
+	*attr = proto;
+	attr->name = key;
+	attr->part = (config_getswitch(IMAPOPT_SEARCH_INDEX_HEADERS)
+			? SEARCH_PART_HEADERS : -1);
+	attr->data1 = strchr(key, ':')+1;
+	hash_insert(attr->name, (void *)attr, &attrs_by_name);
+	key = NULL;	/* attr takes this over */
+ }
+
+ free(key);
+ return attr;
+}
+
+/*
+ * Return non-zero if the given attribute may be used with a
+ * SEOP_FUZZYMATCH operation.
+ */
+EXPORTED int search_attr_is_fuzzable(const search_attr_t *attr)
+{
+ return (attr->part != SEARCH_PART_NONE &&
+	 (attr->flags & SEA_FUZZABLE));
+}
+

cyrus-imapd-2.5.tar.gz/imap/search_expr.h Added

@@ -0,0 +1,154 @@
+/* search_expr.h -- search query tree handling for SEARCH
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: search_engines.h,v 1.4 2010/01/06 17:01:40 murch Exp $
+ */
+
+#ifndef __CYRUS_SEARCH_EXPR_H__
+#define __CYRUS_SEARCH_EXPR_H__
+
+#include "message.h"
+#include "util.h"
+
+struct protstream;
+struct index_state;
+
+enum search_op {
+ SEOP_UNKNOWN,
+ SEOP_TRUE,
+ SEOP_FALSE,
+
+ /* operators for ordinal types: dates, sizes */
+ SEOP_LT,
+ SEOP_LE,
+ SEOP_GT,
+ SEOP_GE,
+
+ /* operators for nonordinal types: strings, uid sequences */
+ SEOP_MATCH,
+ SEOP_FUZZYMATCH,
+
+ SEOP_AND,
+ SEOP_OR,
+ SEOP_NOT,
+};
+
+union search_value {
+ uint64_t u;
+ char *s;
+ struct searchannot *annot;
+};
+
+/* search_attr.flags */
+enum {
+ SEA_MUTABLE =	(1<<0),
+ SEA_FUZZABLE =	(1<<1),
+};
+
+typedef struct search_attr search_attr_t;
+struct search_attr {
+ const char *name;
+ int flags;
+ int part;
+ int cost;
+ void (*internalise)(struct index_state *, const union search_value *,
+		 void **internalisedp);
+ int (*cmp)(message_t *, const union search_value *, void *internalised, void *data1);
+ int (*match)(message_t *, const union search_value *, void *internalised, void *data1);
+ void (*serialise)(struct buf *, const union search_value *);
+ int (*unserialise)(struct protstream*, union search_value *);
+ unsigned int (*get_countability)(const union search_value *);
+ void (*duplicate)(union search_value *, const union search_value *);
+ void (*free)(union search_value *);
+ void *data1;	/* extra data for the functions above */
+};
+
+typedef struct search_expr search_expr_t;
+struct search_expr {
+ enum search_op op;
+ search_expr_t *parent;
+ search_expr_t *next;
+ search_expr_t *children;
+ const search_attr_t *attr;
+ union search_value value;
+ void *internalised;
+};
+
+/* flags for search_expr_get_countability */
+enum {
+ SEC_EXISTS =	 (1<<0),
+ SEC_RECENT =	 (1<<1),
+ SEC_SEEN =		 (1<<2),
+ SEC_CONVSEEN =	 (1<<3),
+ SEC_NOT =		 (1<<29),
+ SEC_UNCOUNTED =	 (1<<30),
+};
+
+extern search_expr_t *search_expr_new(search_expr_t *parent,
+				 enum search_op);
+extern void search_expr_append(search_expr_t *parent, search_expr_t *child);
+extern void search_expr_free(search_expr_t *);
+extern search_expr_t *search_expr_duplicate(const search_expr_t *e);
+extern int search_expr_apply(search_expr_t *e,
+			 int (*cb)(search_expr_t *e, void *rock),
+			 void *rock);
+extern char *search_expr_serialise(const search_expr_t *);
+extern search_expr_t *search_expr_unserialise(const char *s);
+extern int search_expr_normalise(search_expr_t **);
+extern void search_expr_internalise(struct index_state *, search_expr_t *);
+extern int search_expr_evaluate(message_t *m, const search_expr_t *);
+extern int search_expr_uses_attr(const search_expr_t *, const char *);
+extern int search_expr_is_mutable(const search_expr_t *);
+extern unsigned int search_expr_get_countability(const search_expr_t *);
+extern void search_expr_neutralise(search_expr_t *);
+extern void search_expr_split_by_folder_and_index(search_expr_t *e,
+					void (*cb)(const char *mboxname,
+						 search_expr_t *indexed,
+						 search_expr_t *scan,
+						 void *rock),
+					void *rock);
+
+extern void search_attr_init(void);
+extern const search_attr_t *search_attr_find(const char *);
+extern const search_attr_t *search_attr_find_field(const char *field);
+extern int search_attr_is_fuzzable(const search_attr_t *);
+
+#endif

cyrus-imapd-2.5.tar.gz/imap/search_query.c Added

@@ -0,0 +1,869 @@
+/* search_result.c -- search result data structure
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "assert.h"
+#include "imap_err.h"
+#include "search_expr.h"
+#include "search_query.h"
+#include "imapd.h"
+#include "message.h"
+#include "annotate.h"
+#include "global.h"
+#include "bsearch.h"
+#include "xstrlcpy.h"
+#include "xmalloc.h"
+
+/* ====================================================================== */
+
+EXPORTED search_query_t *search_query_new(struct index_state *state,
+					 struct searchargs *searchargs)
+{
+ search_query_t *query;
+
+ query = xzmalloc(sizeof(*query));
+ query->state = state;
+ query->searchargs = searchargs;
+ construct_hash_table(&query->subs_by_folder, 128, 0);
+ construct_hash_table(&query->subs_by_indexed, 128, 0);
+ ptrarray_init(&query->merged_msgdata);
+ construct_hash_table(&query->folders_by_name, 128, 0);
+ ptrarray_init(&query->folders_by_id);
+
+ return query;
+}
+
+static void folder_free(void *data)
+{
+ search_folder_t *folder = data;
+
+ free(folder->mboxname);
+ bv_free(&folder->uids);
+ bv_free(&folder->unchecked_uids);
+ free(folder);
+}
+
+static void subquery_free(void *data)
+{
+ search_subquery_t *sub = data;
+
+ free(sub->mboxname);
+ search_expr_free(sub->indexed);
+ search_expr_free(sub->expr);
+ free(sub);
+}
+
+EXPORTED void search_query_free(search_query_t *query)
+{
+ int i;
+
+ if (!query) return;
+ free_hash_table(&query->subs_by_folder, subquery_free);
+ free_hash_table(&query->subs_by_indexed, subquery_free);
+ search_expr_free(query->global_sub.expr);
+ ptrarray_fini(&query->folders_by_id);
+ free_hash_table(&query->folders_by_name, folder_free);
+ ptrarray_fini(&query->merged_msgdata);
+
+ /* free pending MsgData arrays */
+ for (i = 0 ; i < query->saved_msgdata.count ; i++) {
+	struct search_saved_msgdata *saved = ptrarray_nth(&query->saved_msgdata, i);
+	index_msgdata_free(saved->msgdata, saved->n);
+	free(saved);
+ }
+ ptrarray_fini(&query->saved_msgdata);
+
+ free(query);
+}
+
+/* ====================================================================== */
+
+
+/*
+ * Find the named folder folder. Returns NULL if there are no
+ * search results for that folder.
+ */
+EXPORTED search_folder_t *search_query_find_folder(search_query_t *query,
+						 const char *mboxname)
+{
+ return (search_folder_t *)hash_lookup(mboxname, &query->folders_by_name);
+}
+
+/*
+ * Switch the folder over to reporting MSNs rather than UIDs.
+ */
+EXPORTED void search_folder_use_msn(search_folder_t *folder, struct index_state *state)
+{
+ int uid;
+ unsigned msgno;
+ bitvector_t msns = BV_INITIALIZER;
+
+ search_folder_foreach(folder, uid) {
+	msgno = index_finduid(state, uid);
+	if (index_getuid(state, msgno) == (unsigned)uid)
+	 bv_set(&msns, msgno);
+ }
+ bv_free(&folder->uids);
+ folder->uids = msns;
+}
+
+/*
+ * Return the results for the given folder as a sequence of UIDs (or
+ * MSNs if search_folder_use_msn() has been called). The caller is
+ * responsible for freeing the result using seqset_free()
+ */
+EXPORTED struct seqset *search_folder_get_seqset(const search_folder_t *folder)
+{
+ struct seqset *seq = seqset_init(0, SEQ_SPARSE);
+ int uid;
+
+ for (uid = bv_next_set(&folder->uids, 0) ;
+	 uid != -1 ;
+	 uid = bv_next_set(&folder->uids, uid+1))
+	seqset_add(seq, uid, 1);
+
+ return seq;
+}
+
+/*
+ * Return the results for a given folder as an array of UIDs (or MSNs if
+ * search_folder_use_msn() has been called). Returns the number of
+ * results or zero, and the newly allocated array in *'arrayp'. The
+ * caller is responsible for freeing the result using free().
+ */
+EXPORTED int search_folder_get_array(const search_folder_t *folder, unsigned int **arrayp)
+{
+ int n = search_folder_get_count(folder);
+ unsigned int *p;
+ int uid;
+
+ if (n) {
+
+	p = *arrayp = xzmalloc(sizeof(unsigned int) * n);
+	for (uid = bv_next_set(&folder->uids, 0) ;
+	 uid != -1 ;
+	 uid = bv_next_set(&folder->uids, uid+1))
+	 *p++ = (unsigned)uid;
+ }
+
+ return n;
+}
+
+/*
+ * Return the minimum UID (or MSN if search_folder_use_msn() has been
+ * called).
+ */
+EXPORTED uint32_t search_folder_get_min(const search_folder_t *folder)
+{
+ return bv_first_set(&folder->uids);
+}
+
+/*
+ * Return the maximum UID (or MSN if search_folder_use_msn() has been
+ * called).
+ */
+EXPORTED uint32_t search_folder_get_max(const search_folder_t *folder)
+{
+ return bv_last_set(&folder->uids);
+}
+
+/*
+ * Returns the count of UIDs or MSNs.
+ */
+EXPORTED unsigned int search_folder_get_count(const search_folder_t *folder)
+{
+ return bv_count(&folder->uids);
+}
+
+EXPORTED uint64_t search_folder_get_highest_modseq(const search_folder_t *folder)
+{
+ return folder->highest_modseq;
+}
+
+/* ====================================================================== */
+
+static search_folder_t *query_get_folder(search_query_t *query, const char *mboxname)
+{
+ search_folder_t *folder;
+
+ folder = (search_folder_t *)hash_lookup(mboxname, &query->folders_by_name);
+ if (!folder) {
+	folder = xzmalloc(sizeof(*folder));
+	folder->mboxname = xstrdup(mboxname);
+	folder->id = -1;
+	hash_insert(folder->mboxname, folder, &query->folders_by_name);
+ }
+ return folder;
+}
+
+static search_folder_t *query_get_valid_folder(search_query_t *query,
+					 const char *mboxname,
+					 uint32_t uidvalidity)
+{
+ search_folder_t *folder;
+
+ if (mboxname_isdeletedmailbox(mboxname, 0))
+	return NULL;
+
+ folder = query_get_folder(query, mboxname);
+
+ if (uidvalidity < folder->uidvalidity) {
+	/* these are uids are too old, forget them */
+	return NULL;
+ }
+ if (uidvalidity > folder->uidvalidity) {
+	/* these uids are newer than what we have,
+	 * forget the old ones; or none at all and
+	 * remember the uidvalidity for later */
+	bv_clearall(&folder->uids);
+	bv_clearall(&folder->unchecked_uids);
+	folder->uidvalidity = uidvalidity;
+ }
+
+ return folder;
+}
+
+static void folder_add_uid(search_folder_t *folder, uint32_t uid)
+{
+ bv_set(&folder->uids, uid);
+}
+
+static void folder_add_modseq(search_folder_t *folder, uint64_t modseq)
+{
+ if (modseq > folder->highest_modseq)
+	folder->highest_modseq = modseq;
+}
+
+static int query_begin_index(search_query_t *query,
+			 const char *mboxname,
+			 struct index_state **statep)
+{
+ int r = 0;
+ int needs_refresh = 0;
+
+ /* open an index_state */
+ if (!strcmp(index_mboxname(query->state), mboxname)) {
+	*statep = query->state;
+	needs_refresh = 1;
+ }
+ else {
+	struct index_init init;
+
+	memset(&init, 0, sizeof(struct index_init));
+	init.userid = query->searchargs->userid;
+	init.authstate = query->searchargs->authstate;
+	init.out = query->state->out;
+
+	r = index_open(mboxname, &init, statep);
+	if (r == IMAP_PERMISSION_DENIED) r = IMAP_MAILBOX_NONEXISTENT;
+	if (r == IMAP_MAILBOX_BADTYPE) r = IMAP_MAILBOX_NONEXISTENT;
+	if (r) goto out;
+
+	index_checkflags(*statep, 0, 0);
+ }
+
+ if (query->need_expunge) {
+	/* make sure \Deleted messages are expunged. Will also lock the
+	 * mailbox state and read any new information */
+	r = index_expunge(*statep, NULL, 1);
+	if (r) goto out;
+ }
+ else if (needs_refresh) {
+	/* Expunge considered unhelpful - just refresh */
+	r = index_refresh(*statep);
+	if (r) goto out;
+ }
+
+ r = cmd_cancelled();
+
+out:
+ return r;
+}
+
+static void query_end_index(search_query_t *query,
+			 struct index_state **statep)
+{
+ if (*statep != query->state)
+	index_close(statep);
+ else
+	*statep = NULL;
+}
+
+/* ====================================================================== */
+
+static void add_folder(const char *key __attribute__((unused)),
+		 void *data, void *rock)
+{
+ search_folder_t *folder = data;
+ ptrarray_t *array = rock;
+
+ ptrarray_append(array, folder);
+}
+
+static int compare_folders(const void **v1, const void **v2)
+{
+ const search_folder_t *f1 = (const search_folder_t *)*v1;
+ const search_folder_t *f2 = (const search_folder_t *)*v2;
+
+ return bsearch_compare_mbox(f1->mboxname, f2->mboxname);
+}
+
+/*
+ * Assign a contiguous 0-based sequence of folder ids to the folders
+ * that have any remaining uids in the search results, in folder name
+ * order. The order isn't necessary but helps make the results
+ * consistent which makes testing easier.
+ */
+static void query_assign_folder_ids(search_query_t *query)
+{
+ ptrarray_t folders = PTRARRAY_INITIALIZER;
+ int i;
+
+ /* TODO: need a hash_values() function */
+ hash_enumerate(&query->folders_by_name, add_folder, &folders);
+
+ ptrarray_sort(&folders, compare_folders);
+
+ for (i = 0 ; i < folders.count ; i++) {
+	search_folder_t *folder = ptrarray_nth(&folders, i);
+
+	if (search_folder_get_count(folder) && folder->id < 0) {
+	 folder->id = query->folders_by_id.count;
+	 ptrarray_append(&query->folders_by_id, folder);
+	}
+ }
+
+ ptrarray_fini(&folders);
+}
+
+/* ====================================================================== */
+
+static void query_load_msgdata(search_query_t *query,
+			 search_folder_t *folder,
+			 struct index_state *state,
+			 unsigned *msgno_list, unsigned nmsgs)
+{
+ unsigned i;
+ MsgData **msgdata;
+ struct search_saved_msgdata *saved;
+
+ msgdata = index_msgdata_load(state, msgno_list, nmsgs, query->sortcrit, 0, NULL);
+
+ /* add the new messages to the global list */
+ for (i = 0 ; i < nmsgs ; i++) {
+	ptrarray_append(&query->merged_msgdata, msgdatai);
+	msgdatai->folder = folder;
+ }
+
+ /* save the MsgData array for later deletion */
+ saved = xzmalloc(sizeof(*saved));
+ saved->msgdata = msgdata;
+ saved->n = nmsgs;
+ ptrarray_append(&query->saved_msgdata, saved);
+}
+
+struct subquery_rock {
+ search_query_t *query;
+ search_subquery_t *sub;
+};
+
+/*
+ * After an indexed subquery is run, we have accumulated a number of
+ * unchecked UID hits in folders. Here we check those UIDs for a) not
+ * being deleted since indexing and b) matching any unindexed scan
+ * expression. We also take advantage of having an open index_state to
+ * load some MsgData objects and save them to query->merged_msgdata.
+ */
+static void subquery_post_indexed(const char *key, void *data, void *rock)
+{
+ const char *mboxname = key;
+ search_folder_t *folder = data;
+ struct subquery_rock *qr = rock;
+ search_query_t *query = qr->query;
+ search_subquery_t *sub = qr->sub;
+ struct index_state *state = NULL;
+ unsigned msgno;
+ unsigned nmsgs = 0;
+ unsigned *msgno_list = NULL;
+ int r = 0;
+
+ if (query->error) return;
+ if (!folder->unchecked_dirty) return;
+
+ if (sub->expr && query->verbose) {
+	char *s = search_expr_serialise(sub->expr);
+	syslog(LOG_INFO, "Folder %s: applying scan expression: %s",
+		folder->mboxname, s);
+	free(s);
+ }
+ if (query->sortcrit && query->verbose) {
+	char *s = sortcrit_as_string(query->sortcrit);
+	syslog(LOG_INFO, "Folder %s: loading MsgData for sort criteria %s",
+		folder->mboxname, s);
+	free(s);
+ }
+
+ r = query_begin_index(query, mboxname, &state);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* Silently swallow mailboxes which have been deleted, renamed,
+	 * or had their ACL changed to prevent us reading them, after
+	 * the index was constructed IRIS-2469. */
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+
+ if (!state->exists) goto out;
+
+ search_expr_internalise(state, sub->expr);
+
+ if (query->sortcrit)
+	msgno_list = (unsigned *) xmalloc(state->exists * sizeof(unsigned));
+
+ /* One pass through the folder's message list */
+ for (msgno = 1 ; msgno <= state->exists ; msgno++) {
+	struct index_map *im = &state->mapmsgno-1;
+
+	r = cmd_cancelled();
+	if (r) goto out;
+
+	/* we only want to look at unchecked UIDs */
+	if (!bv_isset(&folder->unchecked_uids, im->uid))
+	 continue;
+
+	/* moot if already in the uids set */
+	if (bv_isset(&folder->uids, im->uid))
+	 continue;
+
+	/* can happen if we didn't "tellchanges" yet */
+	if (im->system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* run the search program */
+	if (!index_search_evaluate(state, sub->expr, msgno))
+	 continue;
+
+	/* we have a new UID that needs to be merged in */
+
+	folder_add_uid(folder, im->uid);
+	folder_add_modseq(folder, im->modseq);
+	if (query->sortcrit)
+	 msgno_listnmsgs++ = msgno;
+ }
+
+ /* msgno_list contains only the MSNs for newly
+ * checked messages */
+ if (query->sortcrit && nmsgs)
+	query_load_msgdata(query, folder, state, msgno_list, nmsgs);
+
+ folder->unchecked_dirty = 0;
+ r = 0;
+
+out:
+ query_end_index(query, &state);
+ free(msgno_list);
+ if (r) query->error = r;
+}
+
+void build_query(search_builder_t *bx, search_expr_t *e)
+{
+ search_expr_t *child;
+ int bop = -1;
+
+ switch (e->op) {
+
+ case SEOP_NOT:
+	bop = SEARCH_OP_NOT;
+	break;
+
+ case SEOP_AND:
+	bop = SEARCH_OP_AND;
+	break;
+
+ case SEOP_OR:
+	bop = SEARCH_OP_OR;
+	break;
+
+ case SEOP_FUZZYMATCH:
+	if (e->attr && e->attr->part >= 0) {
+	 bx->match(bx, e->attr->part, e->value.s);
+	}
+	return;
+
+ default:
+	return;
+ }
+
+ if (e->children) {
+	assert(bop != -1);
+	bx->begin_boolean(bx, bop);
+	for (child = e->children ; child ; child = child->next)
+	 build_query(bx, child);
+	bx->end_boolean(bx, bop);
+ }
+}
+
+static int add_unchecked_uid(const char *mboxname, uint32_t uidvalidity,
+			 uint32_t uid, void *rock)
+{
+ search_query_t *query = rock;
+ search_folder_t *folder = query_get_valid_folder(query, mboxname, uidvalidity);
+ if (folder) {
+	bv_set(&folder->unchecked_uids, uid);
+	folder->unchecked_dirty = 1;
+ }
+ return 0;
+}
+
+static void subquery_run_indexed(const char *key __attribute__((unused)),
+				 void *data, void *rock)
+{
+// const char *mboxname = key;
+ search_subquery_t *sub = data;
+ search_query_t *query = rock;
+ search_builder_t *bx;
+ struct subquery_rock qr;
+ int r;
+
+ if (query->error) return;
+
+ if (query->verbose) {
+	char *s = search_expr_serialise(sub->indexed);
+	syslog(LOG_INFO, "Running indexed subquery: %s", s);
+	free(s);
+ }
+
+ bx = search_begin_search(query->state->mailbox,
+			 (query->multiple ? SEARCH_MULTIPLE : 0)|
+			 SEARCH_VERBOSE(query->verbose));
+ if (!bx) {
+	r = IMAP_INTERNAL;
+	goto out;
+ }
+ build_query(bx, sub->indexed);
+ r = bx->run(bx, add_unchecked_uid, query);
+ search_end_search(bx);
+ if (r) goto out;
+
+ qr.query = query;
+ qr.sub = sub;
+ hash_enumerate(&query->folders_by_name, subquery_post_indexed, &qr);
+
+out:
+ if (r) query->error = r;
+}
+
+static int subquery_run_one_folder(search_query_t *query,
+				 const char *mboxname,
+				 search_expr_t *e)
+{
+ struct index_state *state = NULL;
+ unsigned msgno;
+ search_folder_t *folder = NULL;
+ unsigned nmsgs = 0;
+ unsigned *msgno_list = NULL;
+ int r = 0;
+
+ if (query->verbose) {
+	char *s = search_expr_serialise(e);
+	syslog(LOG_INFO, "Folder %s: running folder scan subquery: %s",
+		mboxname, s);
+	free(s);
+ }
+ if (query->sortcrit && query->verbose) {
+	char *s = sortcrit_as_string(query->sortcrit);
+	syslog(LOG_INFO, "Folder %s: loading MsgData for sort criteria %s",
+		folder->mboxname, s);
+	free(s);
+ }
+
+ r = query_begin_index(query, mboxname, &state);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* Silently swallow mailboxes which have been deleted, renamed,
+	 * or had their ACL changed to prevent us reading them, after
+	 * the index was constructed IRIS-2469. */
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+
+ if (!state->exists) goto out;
+
+ search_expr_internalise(state, e);
+
+ if (query->sortcrit)
+	msgno_list = (unsigned *) xmalloc(state->exists * sizeof(unsigned));
+
+ /* One pass through the folder's message list */
+ for (msgno = 1 ; msgno <= state->exists ; msgno++) {
+	struct index_map *im = &state->mapmsgno-1;
+
+	r = cmd_cancelled();
+	if (r) goto out;
+
+	/* can happen if we didn't "tellchanges" yet */
+	if (im->system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* run the search program */
+	if (!index_search_evaluate(state, e, msgno))
+	 continue;
+
+	if (!folder) {
+	 folder = query_get_valid_folder(query, mboxname, state->uidvalidity);
+	 if (!folder) {
+		r = IMAP_INTERNAL;
+		goto out; /* can't happen */
+	 }
+	}
+
+	/* moot if already in the uids set */
+	if (bv_isset(&folder->uids, im->uid))
+	 continue;
+
+	folder_add_uid(folder, im->uid);
+	folder_add_modseq(folder, im->modseq);
+
+	if (query->sortcrit)
+	 msgno_listnmsgs++ = msgno;
+ }
+
+ if (query->sortcrit && nmsgs)
+	query_load_msgdata(query, folder, state, msgno_list, nmsgs);
+
+ r = 0;
+
+out:
+ query_end_index(query, &state);
+ free(msgno_list);
+ return r;
+}
+
+static void subquery_run_folder(const char *key, void *data, void *rock)
+{
+ const char *mboxname = key;
+ search_subquery_t *sub = data;
+ search_query_t *query = rock;
+ int r;
+
+ if (query->error) return;
+ if (!query->multiple && strcmp(mboxname, index_mboxname(query->state)))
+	return;
+ r = subquery_run_one_folder(query, mboxname, sub->expr);
+ if (r) query->error = r;
+}
+
+static int subquery_run_global(search_query_t *query, const char *mboxname)
+{
+ search_subquery_t *sub;
+ search_expr_t *e, *exprs2;
+ int nexprs = 0;
+ int r;
+
+ sub = (search_subquery_t *)hash_lookup(mboxname, &query->subs_by_folder);
+ if (sub) {
+	/* this folder also has a per-folder scan expression, OR it in */
+	exprsnexprs++ = search_expr_duplicate(sub->expr);
+ }
+
+ if (query->global_sub.expr)
+	exprsnexprs++ = search_expr_duplicate(query->global_sub.expr);
+
+ switch (nexprs) {
+ case 0:
+	e = search_expr_new(NULL, SEOP_TRUE);
+	break;
+ case 1:
+	e = exprs0;
+	break;
+ case 2:
+	e = search_expr_new(NULL, SEOP_OR);
+	search_expr_append(e, exprs0);
+	search_expr_append(e, exprs1);
+	break;
+ }
+
+ r = subquery_run_one_folder(query, mboxname, e);
+ search_expr_free(e);
+ return r;
+}
+
+static int subquery_run_global_cb(void *rock,
+				 const char *key, size_t keylen,
+				 const char *val __attribute((unused)),
+				 size_t vallen __attribute((unused)))
+{
+ search_query_t *query = rock;
+ char *mboxname = xstrndup(key, keylen);
+ int r;
+
+ r = subquery_run_global(query, mboxname);
+ free(mboxname);
+ return r;
+}
+
+static search_subquery_t *subquery_new(void)
+{
+ search_subquery_t *sub = xzmalloc(sizeof(*sub));
+ return sub;
+}
+
+static void query_add_subquery(const char *mboxname,
+			 search_expr_t *indexed,
+			 search_expr_t *e,
+			 void *rock)
+{
+ search_query_t *query = rock;
+ search_subquery_t *sub;
+
+ if (indexed) {
+	char *key = search_expr_serialise(indexed);
+	sub = (search_subquery_t *)hash_lookup(key, &query->subs_by_indexed);
+	if (!sub) {
+	 sub = subquery_new();
+	 sub->indexed = indexed;
+	 hash_insert(key, sub, &query->subs_by_indexed);
+	 query->indexed_count++;
+	}
+	free(key);
+ }
+ else if (mboxname) {
+	sub = (search_subquery_t *)hash_lookup(mboxname, &query->subs_by_folder);
+	if (!sub) {
+	 sub = subquery_new();
+	 sub->mboxname = xstrdup(mboxname);
+	 hash_insert(sub->mboxname, sub, &query->subs_by_folder);
+	 query->folder_count++;
+	}
+ }
+ else {
+	sub = &query->global_sub;
+ }
+
+ if (sub->expr == NULL) {
+	/* adding the first expression: just store it */
+	sub->expr = e;
+ }
+ else if (sub->expr->op != SEOP_OR) {
+	/* adding the second: make a new OR node */
+	search_expr_t *or = search_expr_new(NULL, SEOP_OR);
+	search_expr_append(or, sub->expr);
+	search_expr_append(or, e);
+	sub->expr = or;
+ }
+ else {
+	/* append to the existing OR node */
+	search_expr_append(sub->expr, e);
+ }
+}
+
+EXPORTED int search_query_run(search_query_t *query)
+{
+ int r = 0;
+
+ search_expr_split_by_folder_and_index(query->searchargs->root, query_add_subquery, query);
+ query->searchargs->root = NULL;
+
+ if (query->indexed_count) {
+	/*
+	 * Indexed searches proceed in two phases. The first runs
+	 * all the search engine queries, and builds a set of matched
+	 * uids per folder. The second runs per folder and applies
+	 * any scan expression.
+	 */
+	hash_enumerate(&query->subs_by_indexed, subquery_run_indexed, query);
+	r = query->error;
+	if (r) goto out;
+ }
+
+ if (query->global_sub.expr) {
+	/* We have a scan expression which applies to all folders.
+	 * Walk over every folder, applying the scan expression. */
+	if (query->multiple)
+	 r = mboxlist_allusermbox(mboxname_to_userid(index_mboxname(query->state)),
+				 subquery_run_global_cb, query, /*+deleted*/0);
+	else
+	 r = subquery_run_global(query, index_mboxname(query->state));
+	if (r) goto out;
+ }
+ else if (query->folder_count) {
+	/* We only have scan expressions limited to specific folders,
+	 * let's iterate those folders */
+	hash_enumerate(&query->subs_by_folder, subquery_run_folder, query);
+	r = query->error;
+	if (r) goto out;
+ }
+
+ if (query->need_ids)
+	query_assign_folder_ids(query);
+
+ if (query->sortcrit) {
+	/*
+	 * Do a post-search sorting phase.
+	 *
+	 * Sorts MsgData objects. These really really need to be replaced with
+	 * either message_t objects or some new smaller object which only stores
+	 * exactly the data we need to sort with, according to sortcrit, plus a
+	 * few things we always need like folder, uid, cid etc. But in the
+	 * interests of getting this code working before Christmas we're going
+	 * to use MsgData for now, and in the way that means the least amount of
+	 * code changes.
+	 */
+	index_msgdata_sort((MsgData **)query->merged_msgdata.data,
+			 query->merged_msgdata.count,
+			 query->sortcrit);
+ }
+
+out:
+ return r;
+}
+
+/* ====================================================================== */

cyrus-imapd-2.5.tar.gz/imap/search_query.h Added

@@ -0,0 +1,175 @@
+/* search_result.h -- search result data structure
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_SEARCH_RESULT_H__
+#define __CYRUS_SEARCH_RESULT_H__
+
+#include "mailbox.h"
+#include "message.h"
+#include "conversations.h"
+#include "util.h"
+#include "bitvector.h"
+#include "ptrarray.h"
+
+struct sortcrit;	    /* imapd.h */
+struct searchargs;	    /* imapd.h */
+typedef struct search_subquery search_subquery_t;
+typedef struct search_query search_query_t;
+typedef struct search_folder search_folder_t;
+
+struct search_folder {
+    char *mboxname;
+    uint32_t uidvalidity;
+    uint64_t highest_modseq; /* of returned messages, not the folder */
+    int id;
+    bitvector_t uids;
+    bitvector_t unchecked_uids;
+    int unchecked_dirty;
+};
+
+struct search_subquery {
+    char *mboxname;		/* may be NULL */
+    search_expr_t *indexed;	/* may be NULL */
+    search_expr_t *expr;
+};
+
+struct search_saved_msgdata {
+    /* Used to remember MsgData** arrays returned by
+     * index_msgdata_load() for later freeing. */
+    struct msgdata **msgdata;
+    int n;
+};
+
+struct search_query {
+
+    /*
+     * A query may report results from multiple folders, but we need
+     * this one specific folder to tell us the username to limit the
+     * search engine scope.  Also, for most IMAP search commands we
+     * start with a selected folder anyway so we need to avoid
+     * double-opening it.
+     */
+    struct index_state *state;
+    /*
+     * Input parameters of the query.  Set these after
+     * search_query_new() and before search_query_run().
+     */
+    struct searchargs *searchargs;
+    const struct sortcrit *sortcrit;
+    int multiple;
+    int need_ids;
+    int need_expunge;
+    int verbose;
+
+    /*
+     * A query comprises multiple sub-queries logically ORed together.
+     * The sub-queries are organised by the first of three criteria
+     * which might apply:
+     *
+     *  - subs_by_indexed: one or more indexed match nodes (need to scan
+     *  all messages reported by a given search engine lookup)
+     *
+     *  - subs_by_folder: a single positive folder match node (need to
+     *  scan all messages in a given folder)
+     *
+     *  - global_sub: neither indexed nor folder (need to scan all
+     *  messages in many folders)
+     */
+    hash_table subs_by_indexed;
+    unsigned int indexed_count;
+    hash_table subs_by_folder;
+    unsigned int folder_count;
+    search_subquery_t global_sub;
+
+    /* Used as a temporary holder for errors, e.g. to pass an error from
+     * a hashtable enumeration callback back up to the caller */
+    int error;
+    /*
+     * Resulting messages from a search engine query or a folder scan
+     * need to be organised per-folder both for the secondary scan
+     * (which needs to proceed per-folder to minimise the number of
+     * index_open() calls) and for reporting back to the IMAP client.
+     */
+    hash_table folders_by_name;
+    /*
+     * Some callers need a unique and contiguous 0-based set of integer
+     * ids for folders which have any results.  Note that the
+     * folders_by_name hash table may contain folders with no results in
+     * them, e.g. when the search engine returns hits for a folder which
+     * all subsequently prove to be deleted.
+     */
+    ptrarray_t folders_by_id;
+    /*
+     * Array of search_saved_msgdata objects for later freeing
+     */
+    ptrarray_t saved_msgdata;
+    /*
+     * When sorting in requested, this array contains the final merged
+     * sort results as an array of MsgData*.  The MsgData objects might
+     * be "fake" ones if the results were retrieved from the cache DB,
+     * but the following fields are guaranteed to be usable: uid, cid,
+     * folder.
+     */
+    ptrarray_t merged_msgdata;
+};
+
+extern search_query_t *search_query_new(struct index_state *state,
+					struct searchargs *);
+extern int search_query_run(search_query_t *query);
+extern void search_query_free(search_query_t *query);
+
+extern search_folder_t *search_query_find_folder(search_query_t *query,
+						 const char *mboxname);
+extern void search_folder_use_msn(search_folder_t *, struct index_state *);
+extern struct seqset *search_folder_get_seqset(const search_folder_t *);
+extern int search_folder_get_array(const search_folder_t *, unsigned int **);
+extern uint32_t search_folder_get_min(const search_folder_t *);
+extern uint32_t search_folder_get_max(const search_folder_t *);
+extern unsigned int search_folder_get_count(const search_folder_t *);
+#define search_folder_foreach(folder, u) \
+    for ((u) = bv_next_set(&(folder)->uids, 0) ; \
+	 (u) != -1 ; \
+	 (u) = bv_next_set(&(folder)->uids, (u)+1))
+extern uint64_t search_folder_get_highest_modseq(const search_folder_t *);
+
+
+#endif /* __CYRUS_SEARCH_RESULT_H__ */

cyrus-imapd-2.5.tar.gz/imap/search_sphinx.c Added

@@ -0,0 +1,2389 @@
+/* search_sphinx.c -- glue code for searching with Sphinx
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "index.h"
+#include "imap_err.h"
+#include "global.h"
+#include "retry.h"
+#include "command.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "ptrarray.h"
+#include "bitvector.h"
+#include "mboxlist.h"
+#include "xstats.h"
+#include "search_engines.h"
+#include "cyr_lock.h"
+
+#include <mysql/mysql.h>
+
+struct connection
+{
+ MYSQL *mysql;
+};
+#define CONNECTION_INITIALIZER	{ 0 }
+
+struct latestdb
+{
+ struct db *db;
+ char *path;
+};
+#define LATESTDB_INITIALIZER { 0, 0 }
+#define LATESTDB_VERSION	1
+#define LATESTDB_FNAME		"/latest.db"
+#define LATESTDB_LASTID_KEY	"LASTID"
+
+#define SPHINX_CONFIG	 "/sphinx.conf"
+#define SEARCHD		 "/usr/bin/searchd"
+
+#define INDEXING_LOCK_SUFFIX	".indexing.lock"
+
+static int open_latest(struct mailbox *, struct latestdb *);
+static void close_latest(struct latestdb *);
+static int read_latest(struct latestdb *, struct mailbox *, uint32_t *, int);
+static int write_latest(struct latestdb *, struct mailbox *, uint32_t, int);
+static int doquery(struct connection *, int, const struct buf *);
+static int sphinx_basedir(const struct mailbox *mailbox, char **basedirp, char **indexnamep);
+static int sphinx_setup(const struct mailbox *mailbox, int verbose, int create);
+
+/* Name of columns */
+#define COL_CYRUSID	"cyrusid"
+static const char * const column_by_partSEARCH_NUM_PARTS = {
+ NULL,
+ "header_from",
+ "header_to",
+ "header_cc",
+ "header_bcc",
+ "header_subject",
+ "header_listid",
+ "header_type",
+ "headers",
+ "body"
+};
+
+static void close_connection(struct connection *conn)
+{
+ if (conn->mysql) {
+	xstats_inc(SPHINX_CLOSE);
+	mysql_close(conn->mysql);
+	conn->mysql = NULL;
+	mysql_library_end();
+ }
+}
+
+static int get_connection(struct connection *conn)
+{
+ MYSQL *c = NULL;
+ const char *socket_path = config_getstring(IMAPOPT_SPHINX_SOCKET);
+
+ if (conn->mysql) return 0;	 /* already open */
+
+ close_connection(conn);
+
+ xstats_inc(SPHINX_CONNECT);
+ c = mysql_init(NULL);
+
+ if (!mysql_real_connect(c,
+			 /*host*/NULL,
+			 /*user*/"", /*password*/"",
+			 /*database*/NULL,
+			 /*port*/0, socket_path,
+			 /*client_flag*/0)) {
+	syslog(LOG_ERR, "IOERROR: failed to connect to Sphinx: %s",
+	 mysql_error(c));
+	mysql_close(c);
+	mysql_library_end();
+	return IMAP_IOERROR;
+ }
+
+ conn->mysql = c;
+ return 0;
+}
+
+static int parse_cyrusid(const char *cyrusid,
+			 const char **mboxnamep,
+			 unsigned int *uidvalidityp,
+			 unsigned int *uidp)
+{
+ // user.cassandane.1320711192.196715
+ static struct buf buf = BUF_INITIALIZER;
+ char *p;
+
+ buf_reset(&buf);
+ buf_appendcstr(&buf, cyrusid);
+
+ p = strrchr(buf_cstring(&buf), '.');
+ if (!p)
+	return 0;
+ *p++ = '\0';
+ *uidp = strtoul(p, NULL, 10);
+
+ p = strrchr(buf.s, '.');
+ if (!p)
+	return 0;
+ *p++ = '\0';
+ *uidvalidityp = strtoul(p, NULL, 10);
+
+ *mboxnamep = buf.s;
+
+ return 1;
+}
+
+static const struct buf *make_cyrusid(struct mailbox *mailbox, uint32_t uid)
+{
+ static struct buf buf = BUF_INITIALIZER;
+ // user.cassandane.1320711192.196715
+ buf_reset(&buf);
+ buf_printf(&buf, "%s.%u.%u",
+		 mailbox->name,
+		 mailbox->i.uidvalidity,
+		 uid);
+ return &buf;
+}
+
+/*
+ * Escape a string for MySQL. Note that mysql_real_escape_string
+ * requires a live connection, and we now want to be able to build a
+ * query string before we have a connection. From the MySQL
+ * documentation:
+ *
+ *	Strictly speaking, MySQL requires only that backslash and
+ *	the quote character used to quote the string in the query
+ *	be escaped. mysql_real_escape_string() quotes the other
+ *	characters to make them easier to read in log files.
+ *
+ * Note that we need to escape a number of SphinxQL extended query
+ * syntax metacharacters like ^ and $.
+ */
+static void append_escaped_map(struct buf *buf,
+			 const char *base, unsigned int len,
+			 int quote)
+{
+ static const char metacharacters = "!\"$'-/<=@\\^|~";
+ buf_ensure(buf, len+1);
+
+ buf_putc(buf, quote);
+ for ( ; len ; len--, base++) {
+	int c = *(unsigned char *)base;
+	if (strchr(metacharacters, c))
+	 buf_putc(buf, '\\');
+	buf_putc(buf, c);
+ }
+ buf_putc(buf, quote);
+ buf_cstring(buf);
+}
+
+static void append_escaped(struct buf *to, const struct buf *from, int quote)
+{
+ append_escaped_map(to, from->s, from->len, quote);
+}
+
+static void append_escaped_cstr(struct buf *to, const char *str, int quote)
+{
+ if (str)
+	append_escaped_map(to, str, strlen(str), quote);
+}
+
+struct opnode {
+ int op;	/* SEARCH_OP_* or SEARCH_PART_* constant */
+ char *arg;
+ struct opnode *next;
+ struct opnode *children;
+};
+
+typedef struct sphinx_builder sphinx_builder_t;
+struct sphinx_builder {
+ search_builder_t super;
+ struct mailbox *mailbox;
+ char *indexname;
+ int opts;
+ struct opnode *root;
+ ptrarray_t stack;	 /* points to opnode* */
+};
+
+static struct opnode *opnode_new(int op, const char *arg)
+{
+ struct opnode *on = xzmalloc(sizeof(struct opnode));
+ on->op = op;
+ on->arg = xstrdupnull(arg);
+ return on;
+}
+
+static void opnode_delete(struct opnode *on)
+{
+ struct opnode *child;
+ struct opnode *next;
+
+ for (child = on->children ; child ; child = next) {
+	next = child->next;
+	opnode_delete(child);
+ }
+ free(on->arg);
+ free(on);
+}
+
+static void opnode_detach_child(struct opnode *parent, struct opnode *child)
+{
+ struct opnode **prevp;
+
+ for (prevp = &parent->children ; *prevp ; prevp = &((*prevp)->next)) {
+	if (*prevp == child) {
+	 *prevp = child->next;
+	 child->next = NULL;
+	 return;
+	}
+ }
+}
+
+static void opnode_append_child(struct opnode *parent, struct opnode *child)
+{
+ struct opnode **tailp;
+
+ for (tailp = &parent->children ; *tailp ; tailp = &((*tailp)->next))
+	;
+ *tailp = child;
+ child->next = NULL;
+}
+
+static void opnode_insert_child(struct opnode *parent __attribute__((unused)),
+				struct opnode *after,
+				struct opnode *child)
+{
+ child->next = after->next;
+ after->next = child;
+}
+
+static void begin_boolean(search_builder_t *bx, int op)
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+ struct opnode *top = ptrarray_tail(&bb->stack);
+ struct opnode *on = opnode_new(op, NULL);
+ if (top)
+	opnode_append_child(top, on);
+ else
+	bb->root = on;
+ ptrarray_push(&bb->stack, on);
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "begin_boolean(op=%s)", search_op_as_string(op));
+}
+
+static void end_boolean(search_builder_t *bx, int op __attribute__((unused)))
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "end_boolean");
+ ptrarray_pop(&bb->stack);
+}
+
+static void match(search_builder_t *bx, int part, const char *str)
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+ struct opnode *top = ptrarray_tail(&bb->stack);
+ struct opnode *on;
+
+ if (!str) return;
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "match(part=%s, str=\"%s\")",
+	 search_part_as_string(part), str);
+
+ xstats_inc(SPHINX_MATCH);
+
+ on = opnode_new(part, str);
+ if (top)
+	opnode_append_child(top, on);
+ else
+	bb->root = on;
+}
+
+static void optimise_nodes(struct opnode *parent, struct opnode *on)
+{
+ struct opnode *child;
+ struct opnode *next;
+
+ switch (on->op) {
+ case SEARCH_OP_NOT:
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+	for (child = on->children ; child ; child = next) {
+	 next = child->next;
+	 optimise_nodes(on, child);
+	}
+	if (parent) {
+	 if (!on->children) {
+		/* empty node - remove it */
+		opnode_detach_child(parent, on);
+		opnode_delete(on);
+	 }
+	 else if (on->op != SEARCH_OP_NOT && !on->children->next) {
+		/* logical AND or OR with only one child - replace
+		 * the node with its child */
+		struct opnode *child = on->children;
+		opnode_detach_child(on, child);
+		opnode_insert_child(parent, on, child);
+		opnode_detach_child(parent, on);
+		opnode_delete(on);
+	 }
+	}
+	break;
+ }
+}
+
+/* Sphinx extended query syntax, not SphinxQL */
+static void generate_query(struct buf *query,
+			 struct opnode *on,
+			 struct opnode *parent)
+{
+ struct opnode *child;
+ struct buf arg = BUF_INITIALIZER;
+ int need_paren;
+ int sep;
+
+ buf_init_ro_cstr(&arg, on->arg);
+
+ switch (on->op) {
+
+ case SEARCH_OP_NOT:
+	if (on->children) buf_appendcstr(query, "!");
+	/* fall through - note we treat multiple children to a NOT
+	 * node as if they were ANDed together because that's the
+	 * closest match to IMAP semantics. */
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+
+	need_paren = 0;
+	if (parent && parent->op > on->op)
+	 need_paren = 1;
+	if (on->op == SEARCH_OP_NOT)
+	 need_paren = 1;
+	/* Note that we might have 0, 1, or >1 children, the caller will
+	 * not have optimised the silly cases out. */
+	if (!on->children || !on->children->next)
+	 need_paren = 0;
+
+	sep = (on->op == SEARCH_OP_OR ? '|' : ' ');
+
+	if (need_paren) buf_putc(query, '(');
+	for (child = on->children ; child ; child = child->next) {
+	 generate_query(query, child, on);
+	 if (child->next) buf_putc(query, sep);
+	}
+	if (need_paren) buf_putc(query, ')');
+	break;
+
+ case SEARCH_PART_ANY:
+	assert(on->children == NULL);
+	if (config_getswitch(IMAPOPT_SPHINX_TEXT_EXCLUDES_ODD_HEADERS)) {
+	 /* This horrible hack makes TEXT searches match FROM, TO, CC, BCC
+	 * and SUBJECT but not any other random headers, which is more
+	 * like what users expect. */
+	 int i;
+	 const char *sep = "(";
+	 buf_appendcstr(query, "@");
+	 for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+		if (column_by_parti && i != SEARCH_PART_HEADERS) {
+		 buf_appendcstr(query, sep);
+		 buf_appendcstr(query, column_by_parti);
+		 sep = ",";
+		}
+	 }
+	 buf_appendcstr(query, ") ");
+	}
+	append_escaped(query, &arg, '"');
+	break;
+
+ default:
+	/* other SEARCH_PART_* constants */
+	assert(on->op >= 0 && on->op < SEARCH_NUM_PARTS);
+	assert(on->children == NULL);
+	buf_appendcstr(query, "@");
+	buf_appendcstr(query, column_by_parton->op);
+	buf_appendcstr(query, " ");
+	append_escaped(query, &arg, '"');
+	break;
+ }
+
+ buf_free(&arg);
+}
+
+static void *get_internalised(search_builder_t *bx)
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+ struct opnode *on = bb->root;
+ bb->root = NULL;
+ optimise_nodes(NULL, on);
+ return on;
+}
+
+static char *describe_internalised(void *internalised)
+{
+ struct opnode *on = (struct opnode *)internalised;
+ struct buf buf = BUF_INITIALIZER;
+
+ generate_query(&buf, on, NULL);
+ return buf_release(&buf);
+}
+
+static void free_internalised(void *internalised)
+{
+ struct opnode *on = (struct opnode *)internalised;
+ if (on) opnode_delete(on);
+}
+
+static int run(search_builder_t *bx, search_hit_cb_t proc, void *rock);
+
+static search_builder_t *begin_search(struct mailbox *mailbox, int opts)
+{
+ sphinx_builder_t *bb;
+ int r;
+
+ bb = xzmalloc(sizeof(sphinx_builder_t));
+ bb->super.begin_boolean = begin_boolean;
+ bb->super.end_boolean = end_boolean;
+ bb->super.match = match;
+ bb->super.get_internalised = get_internalised;
+ bb->super.run = run;
+
+ bb->mailbox = mailbox;
+ bb->opts = opts;
+
+ r = sphinx_basedir(mailbox, NULL, &bb->indexname);
+ if (r) {
+	free(bb);
+	return NULL;
+ }
+
+ if ((opts & SEARCH_MULTIPLE))
+	xstats_inc(SPHINX_MULTIPLE);
+ else
+	xstats_inc(SPHINX_SINGLE);
+
+ return &bb->super;
+}
+
+static int run(search_builder_t *bx, search_hit_cb_t proc, void *rock)
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+ struct connection conn = CONNECTION_INITIALIZER;
+ struct buf query = BUF_INITIALIZER;	/* SphinxQL query */
+ struct buf inner_query = BUF_INITIALIZER;	/* Sphinx extended match syntax */
+ MYSQL_RES *res = NULL;
+ MYSQL_ROW row;
+ uint32_t uid;
+ uint32_t latest = 0;
+ int r = 0;
+
+ r = sphinx_setup(bb->mailbox, SEARCH_VERBOSE(bb->opts), /*create*/0);
+ if (r == IMAP_NOTFOUND) {
+	/* there's no index for this user */
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+
+ r = get_connection(&conn);
+ if (r) goto out;
+
+ if ((bb->opts & SEARCH_UNINDEXED)) {
+	/* To avoid races, we want the 'latest' uid we use to be
+	 * an underestimate, because the caller can handle false
+	 * positives but not false negatives. So we fetch it
+	 * first before the main query. */
+	struct latestdb ldb = LATESTDB_INITIALIZER;
+	r = open_latest(bb->mailbox, &ldb);
+	if (!r) goto out;
+	r = read_latest(&ldb, bb->mailbox, &latest,
+			SEARCH_VERBOSE(bb->opts));
+	close_latest(&ldb);
+	if (r) goto out;
+ }
+
+ optimise_nodes(NULL, bb->root);
+ generate_query(&inner_query, bb->root, NULL);
+
+ buf_printf(&query, "SELECT "COL_CYRUSID" FROM %s WHERE MATCH(", bb->indexname);
+ append_escaped(&query, &inner_query, '\'');
+ buf_appendcstr(&query, ")");
+ // get sphinx to sort by most recent date first
+ buf_appendcstr(&query, " ORDER BY "COL_CYRUSID" DESC "
+			 " LIMIT " SPHINX_MAX_MATCHES
+			 " OPTION max_matches=" SPHINX_MAX_MATCHES);
+ buf_cstring(&query);
+
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_NOTICE, "Sphinx query %s", query.s);
+ xstats_inc(SPHINX_QUERY);
+
+ r = mysql_real_query(conn.mysql, query.s, query.len);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: Sphinx query %s failed: %s",
+	 query.s, mysql_error(conn.mysql));
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ res = mysql_use_result(conn.mysql);
+ while ((row = mysql_fetch_row(res))) {
+	const char *mboxname;
+	unsigned int uidvalidity;
+	unsigned int uid;
+	if (SEARCH_VERBOSE(bb->opts) > 1)
+	 syslog(LOG_NOTICE, "Sphinx row cyrusid=%s", row0);
+	xstats_inc(SPHINX_ROW);
+	if (!parse_cyrusid(row0, &mboxname, &uidvalidity, &uid))
+	 // TODO: whine
+	 continue;
+	if (!(bb->opts & SEARCH_MULTIPLE)) {
+	 if (strcmp(mboxname, bb->mailbox->name))
+		continue;
+	 if (uidvalidity != bb->mailbox->i.uidvalidity)
+		continue;
+	}
+	xstats_inc(SPHINX_RESULT);
+	r = proc(mboxname, uidvalidity, uid, rock);
+	if (r) goto out;
+ }
+ r = 0;
+
+ if ((bb->opts & SEARCH_UNINDEXED)) {
+	/* add in the unindexed uids as false positives */
+	for (uid = latest+1 ; uid <= bb->mailbox->i.last_uid ; uid++) {
+	 xstats_inc(SPHINX_UNINDEXED);
+	 r = proc(bb->mailbox->name, bb->mailbox->i.uidvalidity, uid, rock);
+	 if (r) goto out;
+	}
+ }
+
+out:
+ if (res) mysql_free_result(res);
+ close_connection(&conn);
+ buf_free(&query);
+ buf_free(&inner_query);
+ return r;
+}
+
+static void end_search(search_builder_t *bx)
+{
+ sphinx_builder_t *bb = (sphinx_builder_t *)bx;
+
+ ptrarray_fini(&bb->stack);
+ if (bb->root) opnode_delete(bb->root);
+ free(bb->indexname);
+ free(bx);
+}
+
+/* base class for both update and snippet receivers */
+typedef struct sphinx_receiver sphinx_receiver_t;
+struct sphinx_receiver
+{
+ search_text_receiver_t super;
+ int verbose;
+ struct mailbox *mailbox;
+ char *indexname;
+ uint32_t uid;
+ int part;
+ unsigned int parts_total;
+ int truncate_warning;
+ struct buf partsSEARCH_NUM_PARTS;
+ struct buf tmp;		/* SphinxQL query */
+};
+
+/* receiver used for updating the index */
+typedef struct sphinx_update_receiver sphinx_update_receiver_t;
+struct sphinx_update_receiver
+{
+ sphinx_receiver_t super;
+ struct connection conn;
+ int indexing_lock_fd;
+ unsigned int uncommitted;
+ uint32_t latest;
+ struct latestdb latestdb;
+ uint32_t lastid;	 /* largest document ID in the 'tr' table,
+			 * used to assign new document IDs when
+			 * INSERTing into the table */
+};
+
+/* receiver used for extracting snippets after a search */
+typedef struct sphinx_snippet_receiver sphinx_snippet_receiver_t;
+struct sphinx_snippet_receiver
+{
+ sphinx_receiver_t super;
+ struct connection conn;
+ struct opnode *root;
+ search_snippet_cb_t proc;
+ void *rock;
+};
+
+/* Maximum size of a query, determined empirically, is a little bit
+ * under 8MB. That seems like more than enough, so let's limit the
+ * total amount of parts text to 4 MB. */
+#define MAX_PARTS_SIZE	 (4*1024*1024)
+
+static const char *describe_query(struct buf *desc,
+				 const struct buf *query,
+				 unsigned maxlen)
+{
+ buf_reset(desc);
+ buf_appendcstr(desc, "Sphinx query ");
+ if (maxlen && query->len > maxlen) {
+	buf_appendmap(desc, query->s, maxlen);
+	buf_appendcstr(desc, "...");
+ }
+ else {
+	buf_append(desc, query);
+ }
+ return buf_cstring(desc);
+}
+
+static int doquery(struct connection *conn, int verbose, const struct buf *query)
+{
+ int r;
+ struct buf desc = BUF_INITIALIZER;
+ unsigned int maxlen = verbose > 2 ? /*unlimited*/0 : 128;
+
+ if (verbose > 1)
+	syslog(LOG_NOTICE, "%s", describe_query(&desc, query, maxlen));
+
+ r = mysql_real_query(conn->mysql, query->s, query->len);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: %s failed: %s",
+			describe_query(&desc, query, maxlen),
+			mysql_error(conn->mysql));
+	r = IMAP_IOERROR;
+ }
+
+ buf_free(&desc);
+ return r;
+}
+
+#if 0
+/* Dump a result which has had mysql_store_result() called on it */
+static void dump_result(MYSQL_RES *res)
+{
+ uint64_t nrows = mysql_num_rows(res);
+ unsigned int nfields = mysql_num_fields(res);
+ unsigned int i;
+ unsigned int j;
+ MYSQL_FIELD *fields = mysql_fetch_fields(res);
+ MYSQL_ROW *row;
+ struct buf buf = BUF_INITIALIZER;
+
+ syslog(LOG_NOTICE, "Sphinx result: %u rows", (unsigned int)nrows);
+ i = 0;
+ while ((row = mysql_fetch_row(res))) {
+	buf_reset(&buf);
+	for (j = 0 ; j < nfields ; j++)
+	 buf_printf(&buf, " %s=\"%s\"", fieldsj.name, rowj);
+	syslog(LOG_NOTICE, " %u%s", ++i, buf_cstring(&buf));
+ }
+
+ buf_free(&buf);
+ mysql_data_seek(res, 0);	/* rewind */
+}
+#endif
+
+static const char *sphinx_config_file(void)
+{
+ static const char *config_file = NULL;
+
+ if (!config_file)
+	config_file = strconcat(config_dir, SPHINX_CONFIG, (char *)NULL);
+ return config_file;
+}
+
+static const char *sphinx_rootdir(const char *partition)
+{
+ char *confkey;
+ const char *root;
+ if (!partition)
+	partition = config_getstring(IMAPOPT_DEFAULTPARTITION);
+ confkey = strconcat("searchpartition-", partition, NULL);
+ root = config_getoverflowstring(confkey, NULL);
+ free(confkey);
+ return root;
+}
+
+/* When building an index name we need to escape any @ or . characters
+ * in the username. We're slightly more general than that. */
+static void z_escape(struct buf *buf, const char *s)
+{
+ for ( ; *s ; s++) {
+	if (*s == 'Z' || !Uisalnum(*s))
+	 buf_printf(buf, "Z%02X", *(const unsigned char *)s);
+	else
+	 buf_putc(buf, *s);
+ }
+}
+
+/* Returns in *basedir and *indexname new strings which must be free()d */
+static int sphinx_basedir(const struct mailbox *mailbox,
+			 char **basedirp,
+			 char **indexnamep)
+{
+ const char *root;
+ char *basedir = NULL;
+ struct buf indexname = BUF_INITIALIZER;
+ struct mboxname_parts parts;
+ char c2, d2;
+ int r;
+
+ mboxname_init_parts(&parts);
+
+ root = sphinx_rootdir(mailbox->part);
+ if (!root) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ r = mboxname_to_parts(mailbox->name, &parts);
+ if (r) goto out;
+ if (!parts.userid) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ if (parts.domain)
+	basedir = strconcat(root,
+			 FNAME_DOMAINDIR,
+			 dir_hash_b(parts.domain, config_fulldirhash, d),
+			 "/", parts.domain,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts.userid, config_fulldirhash, c),
+			 "/", parts.userid,
+			 (char *)NULL);
+ else
+	basedir = strconcat(root,
+			 FNAME_USERDIR,
+			 dir_hash_b(parts.userid, config_fulldirhash, c),
+			 "/", parts.userid,
+			 (char *)NULL);
+
+ buf_appendcstr(&indexname, "X");
+ z_escape(&indexname, parts.userid);
+ if (parts.domain) {
+	z_escape(&indexname, "@");
+	z_escape(&indexname, parts.domain);
+ }
+
+ r = 0;
+
+out:
+ if (!r && indexnamep)
+	*indexnamep = buf_release(&indexname);
+ buf_free(&indexname);
+ if (!r && basedirp)
+	*basedirp = basedir;
+ else
+	free(basedir);
+ mboxname_free_parts(&parts);
+ return r;
+}
+
+static const char *sphinx_syslog_prefix(void)
+{
+ static const char *prefix = NULL;
+
+ if (!prefix) {
+	prefix = config_getstring(IMAPOPT_SYSLOG_PREFIX);
+	if (!prefix)
+	 prefix = "cyrus";
+ }
+ return prefix;
+}
+
+static int check_directory(const char *dir, int verbose, int create)
+{
+ int r;
+ char *dummyfile = NULL;
+ struct stat sb;
+
+ r = stat(dir, &sb);
+ if (r < 0) {
+	if (errno != ENOENT) {
+	 /* something went wrong - permissions problem most likely */
+	 syslog(LOG_ERR, "IOERROR: unable to stat %s: %m", dir);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+	/* the directory is just missing */
+	if (!create) {
+	 /* caller doesn't care that much */
+	 r = IMAP_NOTFOUND;
+	 goto out;
+	}
+	if (verbose)
+	 syslog(LOG_INFO, "Building directory %s", dir);
+	dummyfile = strconcat(dir, "/dummy", (char *)NULL);
+	cyrus_mkdir(dummyfile, 0700);
+	r = stat(dir, &sb);
+	if (r < 0) {
+	 /* something went wrong - permissions problem most likely */
+	 syslog(LOG_ERR, "IOERROR: unable to stat %s: %m", dir);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+ }
+
+out:
+ free(dummyfile);
+ return r;
+}
+
+static int sphinx_signal(int sig, int verbose)
+{
+ const char *pidfile = config_getstring(IMAPOPT_SPHINX_PIDFILE);
+ int fd = -1;
+ pid_t pid;
+ int r;
+ char buf33;
+
+ fd = open(pidfile, O_RDONLY, 0);
+ if (fd < 0) {
+	if (errno == ENOENT) {
+	 r = IMAP_NOTFOUND;
+	}
+	else {
+	 syslog(LOG_ERR, "IOERROR: unable to open %s for reading: %m", pidfile);
+	 r = IMAP_IOERROR;
+	}
+	goto out;
+ }
+
+ memset(buf, 0, sizeof(buf));
+ r = read(fd, buf, sizeof(buf)-1);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: unable to read %s: %m", pidfile);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ if (r == 0) {
+	syslog(LOG_ERR, "IOERROR: short file %s", pidfile);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ pid = strtoul(buf, NULL, 10);
+ if (pid <= 0) {
+	syslog(LOG_ERR, "IOERROR: invalid contents of %s", pidfile);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ if (verbose)
+	syslog(LOG_INFO, "Sending signal %d to pid %d from %s",
+		sig, (int)pid, pidfile);
+
+ r = kill(pid, sig);
+ if (r < 0) {
+	if (errno == ESRCH) {
+	 r = IMAP_NOTFOUND;
+	}
+	else {
+	 syslog(LOG_ERR, "IOERROR: failed to send signal %d "
+			 "to searchd pid %d: %m",
+			 sig, (int)pid);
+	 r = IMAP_SYS_ERROR;
+	}
+	goto out;
+ }
+
+ r = 0;
+
+out:
+ if (fd >= 0) close(fd);
+ return r;
+}
+
+
+static int sphinx_setup(const struct mailbox *mailbox, int verbose, int create)
+{
+ static const char user_config =
+	"index $indexname\n"
+	"{\n"
+	" type = rt\n"
+	" path = $basedir/rt\n"
+	" morphology = stem_en\n"
+	" charset_type = utf-8\n"
+	" charset_table = 0..9, A..Z->a..z, _, a..z, \\\n"
+	/* Support for Cyrillic from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cyrillic */
+	"	U+0400->U+0435, U+0401->U+0435, U+0402->U+0452, U+0452, \\\n"
+	"	U+0403->U+0433, U+0404->U+0454, U+0454, U+0405->U+0455, \\\n"
+	"	U+0455, U+0406->U+0456, U+0407->U+0456, U+0457->U+0456, \\\n"
+	"	U+0456, U+0408..U+040B->U+0458..U+045B, U+0458..U+045B, \\\n"
+	"	U+040C->U+043A, U+040D->U+0438, U+040E->U+0443, U+040F->U+045F, \\\n"
+	"	U+045F, U+0450->U+0435, U+0451->U+0435, U+0453->U+0433, \\\n"
+	"	U+045C->U+043A, U+045D->U+0438, U+045E->U+0443, U+0460->U+0461, \\\n"
+	"	U+0461, U+0462->U+0463, U+0463, U+0464->U+0465, U+0465, \\\n"
+	"	U+0466->U+0467, U+0467, U+0468->U+0469, U+0469, U+046A->U+046B, \\\n"
+	"	U+046B, U+046C->U+046D, U+046D, U+046E->U+046F, U+046F, \\\n"
+	"	U+0470->U+0471, U+0471, U+0472->U+0473, U+0473, U+0474->U+0475, \\\n"
+	"	U+0476->U+0475, U+0477->U+0475, U+0475, U+0478->U+0479, U+0479, \\\n"
+	"	U+047A->U+047B, U+047B, U+047C->U+047D, U+047D, U+047E->U+047F, \\\n"
+	"	U+047F, U+0480->U+0481, U+0481, U+048A->U+0438, U+048B->U+0438, \\\n"
+	"	U+048C->U+044C, U+048D->U+044C, U+048E->U+0440, U+048F->U+0440, \\\n"
+	"	U+0490->U+0433, U+0491->U+0433, U+0490->U+0433, U+0491->U+0433, \\\n"
+	"	U+0492->U+0433, U+0493->U+0433, U+0494->U+0433, U+0495->U+0433, \\\n"
+	"	U+0496->U+0436, U+0497->U+0436, U+0498->U+0437, U+0499->U+0437, \\\n"
+	"	U+049A->U+043A, U+049B->U+043A, U+049C->U+043A, U+049D->U+043A, \\\n"
+	"	U+049E->U+043A, U+049F->U+043A, U+04A0->U+043A, U+04A1->U+043A, \\\n"
+	"	U+04A2->U+043D, U+04A3->U+043D, U+04A4->U+043D, U+04A5->U+043D, \\\n"
+	"	U+04A6->U+043F, U+04A7->U+043F, U+04A8->U+04A9, U+04A9, \\\n"
+	"	U+04AA->U+0441, U+04AB->U+0441, U+04AC->U+0442, U+04AD->U+0442, \\\n"
+	"	U+04AE->U+0443, U+04AF->U+0443, U+04B0->U+0443, U+04B1->U+0443, \\\n"
+	"	U+04B2->U+0445, U+04B3->U+0445, U+04B4->U+04B5, U+04B5, \\\n"
+	"	U+04B6->U+0447, U+04B7->U+0447, U+04B8->U+0447, U+04B9->U+0447, \\\n"
+	"	U+04BA->U+04BB, U+04BB, U+04BC->U+04BD, U+04BE->U+04BD, \\\n"
+	"	U+04BF->U+04BD, U+04BD, U+04C0->U+04CF, U+04CF, U+04C1->U+0436, \\\n"
+	"	U+04C2->U+0436, U+04C3->U+043A, U+04C4->U+043A, U+04C5->U+043B, \\\n"
+	"	U+04C6->U+043B, U+04C7->U+043D, U+04C8->U+043D, U+04C9->U+043D, \\\n"
+	"	U+04CA->U+043D, U+04CB->U+0447, U+04CC->U+0447, U+04CD->U+043C, \\\n"
+	"	U+04CE->U+043C, U+04D0->U+0430, U+04D1->U+0430, U+04D2->U+0430, \\\n"
+	"	U+04D3->U+0430, U+04D4->U+00E6, U+04D5->U+00E6, U+04D6->U+0435, \\\n"
+	"	U+04D7->U+0435, U+04D8->U+04D9, U+04DA->U+04D9, U+04DB->U+04D9, \\\n"
+	"	U+04D9, U+04DC->U+0436, U+04DD->U+0436, U+04DE->U+0437, \\\n"
+	"	U+04DF->U+0437, U+04E0->U+04E1, U+04E1, U+04E2->U+0438, \\\n"
+	"	U+04E3->U+0438, U+04E4->U+0438, U+04E5->U+0438, U+04E6->U+043E, \\\n"
+	"	U+04E7->U+043E, U+04E8->U+043E, U+04E9->U+043E, U+04EA->U+043E, \\\n"
+	"	U+04EB->U+043E, U+04EC->U+044D, U+04ED->U+044D, U+04EE->U+0443, \\\n"
+	"	U+04EF->U+0443, U+04F0->U+0443, U+04F1->U+0443, U+04F2->U+0443, \\\n"
+	"	U+04F3->U+0443, U+04F4->U+0447, U+04F5->U+0447, U+04F6->U+0433, \\\n"
+	"	U+04F7->U+0433, U+04F8->U+044B, U+04F9->U+044B, U+04FA->U+0433, \\\n"
+	"	U+04FB->U+0433, U+04FC->U+0445, U+04FD->U+0445, U+04FE->U+0445, \\\n"
+	"	U+04FF->U+0445, U+0410..U+0418->U+0430..U+0438, U+0419->U+0438, \\\n"
+	"	U+0430..U+0438, U+041A..U+042F->U+043A..U+044F, U+043A..U+044F,\\\n"
+	/* and this one was missing dammit */
+	"	U+0418->U+0438, U+0439->U+0438, \\\n"
+	/* Sumerian cuneiform which is fun for testing but seems
+	 * to be broken in Spinx. */
+	/*
+	"	U+12000..U+1237F, \\\n"
+	*/
+	/* Support for Chinese/Japanese/Korean, from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cjk */
+	" U+F900->U+8C48, U+F901->U+66F4, U+F902->U+8ECA, U+F903->U+8CC8, \\\n"
+	" U+F904->U+6ED1, U+F905->U+4E32, U+F906->U+53E5, U+F907->U+9F9C, \\\n"
+	" U+F908->U+9F9C, U+F909->U+5951, U+F90A->U+91D1, U+F90B->U+5587, \\\n"
+	" U+F90C->U+5948, U+F90D->U+61F6, U+F90E->U+7669, U+F90F->U+7F85, \\\n"
+	" U+F910->U+863F, U+F911->U+87BA, U+F912->U+88F8, U+F913->U+908F, \\\n"
+	" U+F914->U+6A02, U+F915->U+6D1B, U+F916->U+70D9, U+F917->U+73DE, \\\n"
+	" U+F918->U+843D, U+F919->U+916A, U+F91A->U+99F1, U+F91B->U+4E82, \\\n"
+	" U+F91C->U+5375, U+F91D->U+6B04, U+F91E->U+721B, U+F91F->U+862D, \\\n"
+	" U+F920->U+9E1E, U+F921->U+5D50, U+F922->U+6FEB, U+F923->U+85CD, \\\n"
+	" U+F924->U+8964, U+F925->U+62C9, U+F926->U+81D8, U+F927->U+881F, \\\n"
+	" U+F928->U+5ECA, U+F929->U+6717, U+F92A->U+6D6A, U+F92B->U+72FC, \\\n"
+	" U+F92C->U+90CE, U+F92D->U+4F86, U+F92E->U+51B7, U+F92F->U+52DE, \\\n"
+	" U+F930->U+64C4, U+F931->U+6AD3, U+F932->U+7210, U+F933->U+76E7, \\\n"
+	" U+F934->U+8001, U+F935->U+8606, U+F936->U+865C, U+F937->U+8DEF, \\\n"
+	" U+F938->U+9732, U+F939->U+9B6F, U+F93A->U+9DFA, U+F93B->U+788C, \\\n"
+	" U+F93C->U+797F, U+F93D->U+7DA0, U+F93E->U+83C9, U+F93F->U+9304, \\\n"
+	" U+F940->U+9E7F, U+F941->U+8AD6, U+F942->U+58DF, U+F943->U+5F04, \\\n"
+	" U+F944->U+7C60, U+F945->U+807E, U+F946->U+7262, U+F947->U+78CA, \\\n"
+	" U+F948->U+8CC2, U+F949->U+96F7, U+F94A->U+58D8, U+F94B->U+5C62, \\\n"
+	" U+F94C->U+6A13, U+F94D->U+6DDA, U+F94E->U+6F0F, U+F94F->U+7D2F, \\\n"
+	" U+F950->U+7E37, U+F951->U+964B, U+F952->U+52D2, U+F953->U+808B, \\\n"
+	" U+F954->U+51DC, U+F955->U+51CC, U+F956->U+7A1C, U+F957->U+7DBE, \\\n"
+	" U+F958->U+83F1, U+F959->U+9675, U+F95A->U+8B80, U+F95B->U+62CF, \\\n"
+	" U+F95C->U+6A02, U+F95D->U+8AFE, U+F95E->U+4E39, U+F95F->U+5BE7, \\\n"
+	" U+F960->U+6012, U+F961->U+7387, U+F962->U+7570, U+F963->U+5317, \\\n"
+	" U+F964->U+78FB, U+F965->U+4FBF, U+F966->U+5FA9, U+F967->U+4E0D, \\\n"
+	" U+F968->U+6CCC, U+F969->U+6578, U+F96A->U+7D22, U+F96B->U+53C3, \\\n"
+	" U+F96C->U+585E, U+F96D->U+7701, U+F96E->U+8449, U+F96F->U+8AAA, \\\n"
+	" U+F970->U+6BBA, U+F971->U+8FB0, U+F972->U+6C88, U+F973->U+62FE, \\\n"
+	" U+F974->U+82E5, U+F975->U+63A0, U+F976->U+7565, U+F977->U+4EAE, \\\n"
+	" U+F978->U+5169, U+F979->U+51C9, U+F97A->U+6881, U+F97B->U+7CE7, \\\n"
+	" U+F97C->U+826F, U+F97D->U+8AD2, U+F97E->U+91CF, U+F97F->U+52F5, \\\n"
+	" U+F980->U+5442, U+F981->U+5973, U+F982->U+5EEC, U+F983->U+65C5, \\\n"
+	" U+F984->U+6FFE, U+F985->U+792A, U+F986->U+95AD, U+F987->U+9A6A, \\\n"
+	" U+F988->U+9E97, U+F989->U+9ECE, U+F98A->U+529B, U+F98B->U+66C6, \\\n"
+	" U+F98C->U+6B77, U+F98D->U+8F62, U+F98E->U+5E74, U+F98F->U+6190, \\\n"
+	" U+F990->U+6200, U+F991->U+649A, U+F992->U+6F23, U+F993->U+7149, \\\n"
+	" U+F994->U+7489, U+F995->U+79CA, U+F996->U+7DF4, U+F997->U+806F, \\\n"
+	" U+F998->U+8F26, U+F999->U+84EE, U+F99A->U+9023, U+F99B->U+934A, \\\n"
+	" U+F99C->U+5217, U+F99D->U+52A3, U+F99E->U+54BD, U+F99F->U+70C8, \\\n"
+	" U+F9A0->U+88C2, U+F9A1->U+8AAA, U+F9A2->U+5EC9, U+F9A3->U+5FF5, \\\n"
+	" U+F9A4->U+637B, U+F9A5->U+6BAE, U+F9A6->U+7C3E, U+F9A7->U+7375, \\\n"
+	" U+F9A8->U+4EE4, U+F9A9->U+56F9, U+F9AA->U+5BE7, U+F9AB->U+5DBA, \\\n"
+	" U+F9AC->U+601C, U+F9AD->U+73B2, U+F9AE->U+7469, U+F9AF->U+7F9A, \\\n"
+	" U+F9B0->U+8046, U+F9B1->U+9234, U+F9B2->U+96F6, U+F9B3->U+9748, \\\n"
+	" U+F9B4->U+9818, U+F9B5->U+4F8B, U+F9B6->U+79AE, U+F9B7->U+91B4, \\\n"
+	" U+F9B8->U+96B8, U+F9B9->U+60E1, U+F9BA->U+4E86, U+F9BB->U+50DA, \\\n"
+	" U+F9BC->U+5BEE, U+F9BD->U+5C3F, U+F9BE->U+6599, U+F9BF->U+6A02, \\\n"
+	" U+F9C0->U+71CE, U+F9C1->U+7642, U+F9C2->U+84FC, U+F9C3->U+907C, \\\n"
+	" U+F9C4->U+9F8D, U+F9C5->U+6688, U+F9C6->U+962E, U+F9C7->U+5289, \\\n"
+	" U+F9C8->U+677B, U+F9C9->U+67F3, U+F9CA->U+6D41, U+F9CB->U+6E9C, \\\n"
+	" U+F9CC->U+7409, U+F9CD->U+7559, U+F9CE->U+786B, U+F9CF->U+7D10, \\\n"
+	" U+F9D0->U+985E, U+F9D1->U+516D, U+F9D2->U+622E, U+F9D3->U+9678, \\\n"
+	" U+F9D4->U+502B, U+F9D5->U+5D19, U+F9D6->U+6DEA, U+F9D7->U+8F2A, \\\n"
+	" U+F9D8->U+5F8B, U+F9D9->U+6144, U+F9DA->U+6817, U+F9DB->U+7387, \\\n"
+	" U+F9DC->U+9686, U+F9DD->U+5229, U+F9DE->U+540F, U+F9DF->U+5C65, \\\n"
+	" U+F9E0->U+6613, U+F9E1->U+674E, U+F9E2->U+68A8, U+F9E3->U+6CE5, \\\n"
+	" U+F9E4->U+7406, U+F9E5->U+75E2, U+F9E6->U+7F79, U+F9E7->U+88CF, \\\n"
+	" U+F9E8->U+88E1, U+F9E9->U+91CC, U+F9EA->U+96E2, U+F9EB->U+533F, \\\n"
+	" U+F9EC->U+6EBA, U+F9ED->U+541D, U+F9EE->U+71D0, U+F9EF->U+7498, \\\n"
+	" U+F9F0->U+85FA, U+F9F1->U+96A3, U+F9F2->U+9C57, U+F9F3->U+9E9F, \\\n"
+	" U+F9F4->U+6797, U+F9F5->U+6DCB, U+F9F6->U+81E8, U+F9F7->U+7ACB, \\\n"
+	" U+F9F8->U+7B20, U+F9F9->U+7C92, U+F9FA->U+72C0, U+F9FB->U+7099, \\\n"
+	" U+F9FC->U+8B58, U+F9FD->U+4EC0, U+F9FE->U+8336, U+F9FF->U+523A, \\\n"
+	" U+FA00->U+5207, U+FA01->U+5EA6, U+FA02->U+62D3, U+FA03->U+7CD6, \\\n"
+	" U+FA04->U+5B85, U+FA05->U+6D1E, U+FA06->U+66B4, U+FA07->U+8F3B, \\\n"
+	" U+FA08->U+884C, U+FA09->U+964D, U+FA0A->U+898B, U+FA0B->U+5ED3, \\\n"
+	" U+FA0C->U+5140, U+FA0D->U+55C0, U+FA10->U+585A, U+FA12->U+6674, \\\n"
+	" U+FA15->U+51DE, U+FA16->U+732A, U+FA17->U+76CA, U+FA18->U+793C, \\\n"
+	" U+FA19->U+795E, U+FA1A->U+7965, U+FA1B->U+798F, U+FA1C->U+9756, \\\n"
+	" U+FA1D->U+7CBE, U+FA1E->U+7FBD, U+FA20->U+8612, U+FA22->U+8AF8, \\\n"
+	" U+FA25->U+9038, U+FA26->U+90FD, U+FA2A->U+98EF, U+FA2B->U+98FC, \\\n"
+	" U+FA2C->U+9928, U+FA2D->U+9DB4, U+FA30->U+4FAE, U+FA31->U+50E7, \\\n"
+	" U+FA32->U+514D, U+FA33->U+52C9, U+FA34->U+52E4, U+FA35->U+5351, \\\n"
+	" U+FA36->U+559D, U+FA37->U+5606, U+FA38->U+5668, U+FA39->U+5840, \\\n"
+	" U+FA3A->U+58A8, U+FA3B->U+5C64, U+FA3C->U+5C6E, U+FA3D->U+6094, \\\n"
+	" U+FA3E->U+6168, U+FA3F->U+618E, U+FA40->U+61F2, U+FA41->U+654F, \\\n"
+	" U+FA42->U+65E2, U+FA43->U+6691, U+FA44->U+6885, U+FA45->U+6D77, \\\n"
+	" U+FA46->U+6E1A, U+FA47->U+6F22, U+FA48->U+716E, U+FA49->U+722B, \\\n"
+	" U+FA4A->U+7422, U+FA4B->U+7891, U+FA4C->U+793E, U+FA4D->U+7949, \\\n"
+	" U+FA4E->U+7948, U+FA4F->U+7950, U+FA50->U+7956, U+FA51->U+795D, \\\n"
+	" U+FA52->U+798D, U+FA53->U+798E, U+FA54->U+7A40, U+FA55->U+7A81, \\\n"
+	" U+FA56->U+7BC0, U+FA57->U+7DF4, U+FA58->U+7E09, U+FA59->U+7E41, \\\n"
+	" U+FA5A->U+7F72, U+FA5B->U+8005, U+FA5C->U+81ED, U+FA5D->U+8279, \\\n"
+	" U+FA5E->U+8279, U+FA5F->U+8457, U+FA60->U+8910, U+FA61->U+8996, \\\n"
+	" U+FA62->U+8B01, U+FA63->U+8B39, U+FA64->U+8CD3, U+FA65->U+8D08, \\\n"
+	" U+FA66->U+8FB6, U+FA67->U+9038, U+FA68->U+96E3, U+FA69->U+97FF, \\\n"
+	" U+FA6A->U+983B, U+FA70->U+4E26, U+FA71->U+51B5, U+FA72->U+5168, \\\n"
+	" U+FA73->U+4F80, U+FA74->U+5145, U+FA75->U+5180, U+FA76->U+52C7, \\\n"
+	" U+FA77->U+52FA, U+FA78->U+559D, U+FA79->U+5555, U+FA7A->U+5599, \\\n"
+	" U+FA7B->U+55E2, U+FA7C->U+585A, U+FA7D->U+58B3, U+FA7E->U+5944, \\\n"
+	" U+FA7F->U+5954, U+FA80->U+5A62, U+FA81->U+5B28, U+FA82->U+5ED2, \\\n"
+	" U+FA83->U+5ED9, U+FA84->U+5F69, U+FA85->U+5FAD, U+FA86->U+60D8, \\\n"
+	" U+FA87->U+614E, U+FA88->U+6108, U+FA89->U+618E, U+FA8A->U+6160, \\\n"
+	" U+FA8B->U+61F2, U+FA8C->U+6234, U+FA8D->U+63C4, U+FA8E->U+641C, \\\n"
+	" U+FA8F->U+6452, U+FA90->U+6556, U+FA91->U+6674, U+FA92->U+6717, \\\n"
+	" U+FA93->U+671B, U+FA94->U+6756, U+FA95->U+6B79, U+FA96->U+6BBA, \\\n"
+	" U+FA97->U+6D41, U+FA98->U+6EDB, U+FA99->U+6ECB, U+FA9A->U+6F22, \\\n"
+	" U+FA9B->U+701E, U+FA9C->U+716E, U+FA9D->U+77A7, U+FA9E->U+7235, \\\n"
+	" U+FA9F->U+72AF, U+FAA0->U+732A, U+FAA1->U+7471, U+FAA2->U+7506, \\\n"
+	" U+FAA3->U+753B, U+FAA4->U+761D, U+FAA5->U+761F, U+FAA6->U+76CA, \\\n"
+	" U+FAA7->U+76DB, U+FAA8->U+76F4, U+FAA9->U+774A, U+FAAA->U+7740, \\\n"
+	" U+FAAB->U+78CC, U+FAAC->U+7AB1, U+FAAD->U+7BC0, U+FAAE->U+7C7B, \\\n"
+	" U+FAAF->U+7D5B, U+FAB0->U+7DF4, U+FAB1->U+7F3E, U+FAB2->U+8005, \\\n"
+	" U+FAB3->U+8352, U+FAB4->U+83EF, U+FAB5->U+8779, U+FAB6->U+8941, \\\n"
+	" U+FAB7->U+8986, U+FAB8->U+8996, U+FAB9->U+8ABF, U+FABA->U+8AF8, \\\n"
+	" U+FABB->U+8ACB, U+FABC->U+8B01, U+FABD->U+8AFE, U+FABE->U+8AED, \\\n"
+	" U+FABF->U+8B39, U+FAC0->U+8B8A, U+FAC1->U+8D08, U+FAC2->U+8F38, \\\n"
+	" U+FAC3->U+9072, U+FAC4->U+9199, U+FAC5->U+9276, U+FAC6->U+967C, \\\n"
+	" U+FAC7->U+96E3, U+FAC8->U+9756, U+FAC9->U+97DB, U+FACA->U+97FF, \\\n"
+	" U+FACB->U+980B, U+FACC->U+983B, U+FACD->U+9B12, U+FACE->U+9F9C, \\\n"
+	" U+FACF->U+2284A, U+FAD0->U+22844, U+FAD1->U+233D5, U+FAD2->U+3B9D, \\\n"
+	" U+FAD3->U+4018, U+FAD4->U+4039, U+FAD5->U+25249, U+FAD6->U+25CD0, \\\n"
+	" U+FAD7->U+27ED3, U+FAD8->U+9F43, U+FAD9->U+9F8E, U+2F800->U+4E3D, \\\n"
+	" U+2F801->U+4E38, U+2F802->U+4E41, U+2F803->U+20122, U+2F804->U+4F60, \\\n"
+	" U+2F805->U+4FAE, U+2F806->U+4FBB, U+2F807->U+5002, U+2F808->U+507A, \\\n"
+	" U+2F809->U+5099, U+2F80A->U+50E7, U+2F80B->U+50CF, U+2F80C->U+349E, \\\n"
+	" U+2F80D->U+2063A, U+2F80E->U+514D, U+2F80F->U+5154, U+2F810->U+5164, \\\n"
+	" U+2F811->U+5177, U+2F812->U+2051C, U+2F813->U+34B9, U+2F814->U+5167, \\\n"
+	" U+2F815->U+518D, U+2F816->U+2054B, U+2F817->U+5197, U+2F818->U+51A4, \\\n"
+	" U+2F819->U+4ECC, U+2F81A->U+51AC, U+2F81B->U+51B5, U+2F81C->U+291DF, \\\n"
+	" U+2F81D->U+51F5, U+2F81E->U+5203, U+2F81F->U+34DF, U+2F820->U+523B, \\\n"
+	" U+2F821->U+5246, U+2F822->U+5272, U+2F823->U+5277, U+2F824->U+3515, \\\n"
+	" U+2F825->U+52C7, U+2F826->U+52C9, U+2F827->U+52E4, U+2F828->U+52FA, \\\n"
+	" U+2F829->U+5305, U+2F82A->U+5306, U+2F82B->U+5317, U+2F82C->U+5349, \\\n"
+	" U+2F82D->U+5351, U+2F82E->U+535A, U+2F82F->U+5373, U+2F830->U+537D, \\\n"
+	" U+2F831->U+537F, U+2F832->U+537F, U+2F833->U+537F, U+2F834->U+20A2C, \\\n"
+	" U+2F835->U+7070, U+2F836->U+53CA, U+2F837->U+53DF, U+2F838->U+20B63, \\\n"
+	" U+2F839->U+53EB, U+2F83A->U+53F1, U+2F83B->U+5406, U+2F83C->U+549E, \\\n"
+	" U+2F83D->U+5438, U+2F83E->U+5448, U+2F83F->U+5468, U+2F840->U+54A2, \\\n"
+	" U+2F841->U+54F6, U+2F842->U+5510, U+2F843->U+5553, U+2F844->U+5563, \\\n"
+	" U+2F845->U+5584, U+2F846->U+5584, U+2F847->U+5599, U+2F848->U+55AB, \\\n"
+	" U+2F849->U+55B3, U+2F84A->U+55C2, U+2F84B->U+5716, U+2F84C->U+5606, \\\n"
+	" U+2F84D->U+5717, U+2F84E->U+5651, U+2F84F->U+5674, U+2F850->U+5207, \\\n"
+	" U+2F851->U+58EE, U+2F852->U+57CE, U+2F853->U+57F4, U+2F854->U+580D, \\\n"
+	" U+2F855->U+578B, U+2F856->U+5832, U+2F857->U+5831, U+2F858->U+58AC, \\\n"
+	" U+2F859->U+214E4, U+2F85A->U+58F2, U+2F85B->U+58F7, U+2F85C->U+5906, \\\n"
+	" U+2F85D->U+591A, U+2F85E->U+5922, U+2F85F->U+5962, U+2F860->U+216A8, \\\n"
+	" U+2F861->U+216EA, U+2F862->U+59EC, U+2F863->U+5A1B, U+2F864->U+5A27, \\\n"
+	" U+2F865->U+59D8, U+2F866->U+5A66, U+2F867->U+36EE, U+2F868->U+36FC, \\\n"
+	" U+2F869->U+5B08, U+2F86A->U+5B3E, U+2F86B->U+5B3E, U+2F86C->U+219C8, \\\n"
+	" U+2F86D->U+5BC3, U+2F86E->U+5BD8, U+2F86F->U+5BE7, U+2F870->U+5BF3, \\\n"
+	" U+2F871->U+21B18, U+2F872->U+5BFF, U+2F873->U+5C06, U+2F874->U+5F53, \\\n"
+	" U+2F875->U+5C22, U+2F876->U+3781, U+2F877->U+5C60, U+2F878->U+5C6E, \\\n"
+	" U+2F879->U+5CC0, U+2F87A->U+5C8D, U+2F87B->U+21DE4, U+2F87C->U+5D43, \\\n"
+	" U+2F87D->U+21DE6, U+2F87E->U+5D6E, U+2F87F->U+5D6B, U+2F880->U+5D7C, \\\n"
+	" U+2F881->U+5DE1, U+2F882->U+5DE2, U+2F883->U+382F, U+2F884->U+5DFD, \\\n"
+	" U+2F885->U+5E28, U+2F886->U+5E3D, U+2F887->U+5E69, U+2F888->U+3862, \\\n"
+	" U+2F889->U+22183, U+2F88A->U+387C, U+2F88B->U+5EB0, U+2F88C->U+5EB3, \\\n"
+	" U+2F88D->U+5EB6, U+2F88E->U+5ECA, U+2F88F->U+2A392, U+2F890->U+5EFE, \\\n"
+	" U+2F891->U+22331, U+2F892->U+22331, U+2F893->U+8201, U+2F894->U+5F22, \\\n"
+	" U+2F895->U+5F22, U+2F896->U+38C7, U+2F897->U+232B8, U+2F898->U+261DA, \\\n"
+	" U+2F899->U+5F62, U+2F89A->U+5F6B, U+2F89B->U+38E3, U+2F89C->U+5F9A, \\\n"
+	" U+2F89D->U+5FCD, U+2F89E->U+5FD7, U+2F89F->U+5FF9, U+2F8A0->U+6081, \\\n"
+	" U+2F8A1->U+393A, U+2F8A2->U+391C, U+2F8A3->U+6094, U+2F8A4->U+226D4, \\\n"
+	" U+2F8A5->U+60C7, U+2F8A6->U+6148, U+2F8A7->U+614C, U+2F8A8->U+614E, \\\n"
+	" U+2F8A9->U+614C, U+2F8AA->U+617A, U+2F8AB->U+618E, U+2F8AC->U+61B2, \\\n"
+	" U+2F8AD->U+61A4, U+2F8AE->U+61AF, U+2F8AF->U+61DE, U+2F8B0->U+61F2, \\\n"
+	" U+2F8B1->U+61F6, U+2F8B2->U+6210, U+2F8B3->U+621B, U+2F8B4->U+625D, \\\n"
+	" U+2F8B5->U+62B1, U+2F8B6->U+62D4, U+2F8B7->U+6350, U+2F8B8->U+22B0C, \\\n"
+	" U+2F8B9->U+633D, U+2F8BA->U+62FC, U+2F8BB->U+6368, U+2F8BC->U+6383, \\\n"
+	" U+2F8BD->U+63E4, U+2F8BE->U+22BF1, U+2F8BF->U+6422, U+2F8C0->U+63C5, \\\n"
+	" U+2F8C1->U+63A9, U+2F8C2->U+3A2E, U+2F8C3->U+6469, U+2F8C4->U+647E, \\\n"
+	" U+2F8C5->U+649D, U+2F8C6->U+6477, U+2F8C7->U+3A6C, U+2F8C8->U+654F, \\\n"
+	" U+2F8C9->U+656C, U+2F8CA->U+2300A, U+2F8CB->U+65E3, U+2F8CC->U+66F8, \\\n"
+	" U+2F8CD->U+6649, U+2F8CE->U+3B19, U+2F8CF->U+6691, U+2F8D0->U+3B08, \\\n"
+	" U+2F8D1->U+3AE4, U+2F8D2->U+5192, U+2F8D3->U+5195, U+2F8D4->U+6700, \\\n"
+	" U+2F8D5->U+669C, U+2F8D6->U+80AD, U+2F8D7->U+43D9, U+2F8D8->U+6717, \\\n"
+	" U+2F8D9->U+671B, U+2F8DA->U+6721, U+2F8DB->U+675E, U+2F8DC->U+6753, \\\n"
+	" U+2F8DD->U+233C3, U+2F8DE->U+3B49, U+2F8DF->U+67FA, U+2F8E0->U+6785, \\\n"
+	" U+2F8E1->U+6852, U+2F8E2->U+6885, U+2F8E3->U+2346D, U+2F8E4->U+688E, \\\n"
+	" U+2F8E5->U+681F, U+2F8E6->U+6914, U+2F8E7->U+3B9D, U+2F8E8->U+6942, \\\n"
+	" U+2F8E9->U+69A3, U+2F8EA->U+69EA, U+2F8EB->U+6AA8, U+2F8EC->U+236A3, \\\n"
+	" U+2F8ED->U+6ADB, U+2F8EE->U+3C18, U+2F8EF->U+6B21, U+2F8F0->U+238A7, \\\n"
+	" U+2F8F1->U+6B54, U+2F8F2->U+3C4E, U+2F8F3->U+6B72, U+2F8F4->U+6B9F, \\\n"
+	" U+2F8F5->U+6BBA, U+2F8F6->U+6BBB, U+2F8F7->U+23A8D, U+2F8F8->U+21D0B, \\\n"
+	" U+2F8F9->U+23AFA, U+2F8FA->U+6C4E, U+2F8FB->U+23CBC, U+2F8FC->U+6CBF, \\\n"
+	" U+2F8FD->U+6CCD, U+2F8FE->U+6C67, U+2F8FF->U+6D16, U+2F900->U+6D3E, \\\n"
+	" U+2F901->U+6D77, U+2F902->U+6D41, U+2F903->U+6D69, U+2F904->U+6D78, \\\n"
+	" U+2F905->U+6D85, U+2F906->U+23D1E, U+2F907->U+6D34, U+2F908->U+6E2F, \\\n"
+	" U+2F909->U+6E6E, U+2F90A->U+3D33, U+2F90B->U+6ECB, U+2F90C->U+6EC7, \\\n"
+	" U+2F90D->U+23ED1, U+2F90E->U+6DF9, U+2F90F->U+6F6E, U+2F910->U+23F5E, \\\n"
+	" U+2F911->U+23F8E, U+2F912->U+6FC6, U+2F913->U+7039, U+2F914->U+701E, \\\n"
+	" U+2F915->U+701B, U+2F916->U+3D96, U+2F917->U+704A, U+2F918->U+707D, \\\n"
+	" U+2F919->U+7077, U+2F91A->U+70AD, U+2F91B->U+20525, U+2F91C->U+7145, \\\n"
+	" U+2F91D->U+24263, U+2F91E->U+719C, U+2F91F->U+243AB, U+2F920->U+7228, \\\n"
+	" U+2F921->U+7235, U+2F922->U+7250, U+2F923->U+24608, U+2F924->U+7280, \\\n"
+	" U+2F925->U+7295, U+2F926->U+24735, U+2F927->U+24814, U+2F928->U+737A, \\\n"
+	" U+2F929->U+738B, U+2F92A->U+3EAC, U+2F92B->U+73A5, U+2F92C->U+3EB8, \\\n"
+	" U+2F92D->U+3EB8, U+2F92E->U+7447, U+2F92F->U+745C, U+2F930->U+7471, \\\n"
+	" U+2F931->U+7485, U+2F932->U+74CA, U+2F933->U+3F1B, U+2F934->U+7524, \\\n"
+	" U+2F935->U+24C36, U+2F936->U+753E, U+2F937->U+24C92, U+2F938->U+7570, \\\n"
+	" U+2F939->U+2219F, U+2F93A->U+7610, U+2F93B->U+24FA1, U+2F93C->U+24FB8, \\\n"
+	" U+2F93D->U+25044, U+2F93E->U+3FFC, U+2F93F->U+4008, U+2F940->U+76F4, \\\n"
+	" U+2F941->U+250F3, U+2F942->U+250F2, U+2F943->U+25119, U+2F944->U+25133, \\\n"
+	" U+2F945->U+771E, U+2F946->U+771F, U+2F947->U+771F, U+2F948->U+774A, \\\n"
+	" U+2F949->U+4039, U+2F94A->U+778B, U+2F94B->U+4046, U+2F94C->U+4096, \\\n"
+	" U+2F94D->U+2541D, U+2F94E->U+784E, U+2F94F->U+788C, U+2F950->U+78CC, \\\n"
+	" U+2F951->U+40E3, U+2F952->U+25626, U+2F953->U+7956, U+2F954->U+2569A, \\\n"
+	" U+2F955->U+256C5, U+2F956->U+798F, U+2F957->U+79EB, U+2F958->U+412F, \\\n"
+	" U+2F959->U+7A40, U+2F95A->U+7A4A, U+2F95B->U+7A4F, U+2F95C->U+2597C, \\\n"
+	" U+2F95D->U+25AA7, U+2F95E->U+25AA7, U+2F95F->U+7AEE, U+2F960->U+4202, \\\n"
+	" U+2F961->U+25BAB, U+2F962->U+7BC6, U+2F963->U+7BC9, U+2F964->U+4227, \\\n"
+	" U+2F965->U+25C80, U+2F966->U+7CD2, U+2F967->U+42A0, U+2F968->U+7CE8, \\\n"
+	" U+2F969->U+7CE3, U+2F96A->U+7D00, U+2F96B->U+25F86, U+2F96C->U+7D63, \\\n"
+	" U+2F96D->U+4301, U+2F96E->U+7DC7, U+2F96F->U+7E02, U+2F970->U+7E45, \\\n"
+	" U+2F971->U+4334, U+2F972->U+26228, U+2F973->U+26247, U+2F974->U+4359, \\\n"
+	" U+2F975->U+262D9, U+2F976->U+7F7A, U+2F977->U+2633E, U+2F978->U+7F95, \\\n"
+	" U+2F979->U+7FFA, U+2F97A->U+8005, U+2F97B->U+264DA, U+2F97C->U+26523, \\\n"
+	" U+2F97D->U+8060, U+2F97E->U+265A8, U+2F97F->U+8070, U+2F980->U+2335F, \\\n"
+	" U+2F981->U+43D5, U+2F982->U+80B2, U+2F983->U+8103, U+2F984->U+440B, \\\n"
+	" U+2F985->U+813E, U+2F986->U+5AB5, U+2F987->U+267A7, U+2F988->U+267B5, \\\n"
+	" U+2F989->U+23393, U+2F98A->U+2339C, U+2F98B->U+8201, U+2F98C->U+8204, \\\n"
+	" U+2F98D->U+8F9E, U+2F98E->U+446B, U+2F98F->U+8291, U+2F990->U+828B, \\\n"
+	" U+2F991->U+829D, U+2F992->U+52B3, U+2F993->U+82B1, U+2F994->U+82B3, \\\n"
+	" U+2F995->U+82BD, U+2F996->U+82E6, U+2F997->U+26B3C, U+2F998->U+82E5, \\\n"
+	" U+2F999->U+831D, U+2F99A->U+8363, U+2F99B->U+83AD, U+2F99C->U+8323, \\\n"
+	" U+2F99D->U+83BD, U+2F99E->U+83E7, U+2F99F->U+8457, U+2F9A0->U+8353, \\\n"
+	" U+2F9A1->U+83CA, U+2F9A2->U+83CC, U+2F9A3->U+83DC, U+2F9A4->U+26C36, \\\n"
+	" U+2F9A5->U+26D6B, U+2F9A6->U+26CD5, U+2F9A7->U+452B, U+2F9A8->U+84F1, \\\n"
+	" U+2F9A9->U+84F3, U+2F9AA->U+8516, U+2F9AB->U+273CA, U+2F9AC->U+8564, \\\n"
+	" U+2F9AD->U+26F2C, U+2F9AE->U+455D, U+2F9AF->U+4561, U+2F9B0->U+26FB1, \\\n"
+	" U+2F9B1->U+270D2, U+2F9B2->U+456B, U+2F9B3->U+8650, U+2F9B4->U+865C, \\\n"
+	" U+2F9B5->U+8667, U+2F9B6->U+8669, U+2F9B7->U+86A9, U+2F9B8->U+8688, \\\n"
+	" U+2F9B9->U+870E, U+2F9BA->U+86E2, U+2F9BB->U+8779, U+2F9BC->U+8728, \\\n"
+	" U+2F9BD->U+876B, U+2F9BE->U+8786, U+2F9BF->U+45D7, U+2F9C0->U+87E1, \\\n"
+	" U+2F9C1->U+8801, U+2F9C2->U+45F9, U+2F9C3->U+8860, U+2F9C4->U+8863, \\\n"
+	" U+2F9C5->U+27667, U+2F9C6->U+88D7, U+2F9C7->U+88DE, U+2F9C8->U+4635, \\\n"
+	" U+2F9C9->U+88FA, U+2F9CA->U+34BB, U+2F9CB->U+278AE, U+2F9CC->U+27966, \\\n"
+	" U+2F9CD->U+46BE, U+2F9CE->U+46C7, U+2F9CF->U+8AA0, U+2F9D0->U+8AED, \\\n"
+	" U+2F9D1->U+8B8A, U+2F9D2->U+8C55, U+2F9D3->U+27CA8, U+2F9D4->U+8CAB, \\\n"
+	" U+2F9D5->U+8CC1, U+2F9D6->U+8D1B, U+2F9D7->U+8D77, U+2F9D8->U+27F2F, \\\n"
+	" U+2F9D9->U+20804, U+2F9DA->U+8DCB, U+2F9DB->U+8DBC, U+2F9DC->U+8DF0, \\\n"
+	" U+2F9DD->U+208DE, U+2F9DE->U+8ED4, U+2F9DF->U+8F38, U+2F9E0->U+285D2, \\\n"
+	" U+2F9E1->U+285ED, U+2F9E2->U+9094, U+2F9E3->U+90F1, U+2F9E4->U+9111, \\\n"
+	" U+2F9E5->U+2872E, U+2F9E6->U+911B, U+2F9E7->U+9238, U+2F9E8->U+92D7, \\\n"
+	" U+2F9E9->U+92D8, U+2F9EA->U+927C, U+2F9EB->U+93F9, U+2F9EC->U+9415, \\\n"
+	" U+2F9ED->U+28BFA, U+2F9EE->U+958B, U+2F9EF->U+4995, U+2F9F0->U+95B7, \\\n"
+	" U+2F9F1->U+28D77, U+2F9F2->U+49E6, U+2F9F3->U+96C3, U+2F9F4->U+5DB2, \\\n"
+	" U+2F9F5->U+9723, U+2F9F6->U+29145, U+2F9F7->U+2921A, U+2F9F8->U+4A6E, \\\n"
+	" U+2F9F9->U+4A76, U+2F9FA->U+97E0, U+2F9FB->U+2940A, U+2F9FC->U+4AB2, \\\n"
+	" U+2F9FD->U+29496, U+2F9FE->U+980B, U+2F9FF->U+980B, U+2FA00->U+9829, \\\n"
+	" U+2FA01->U+295B6, U+2FA02->U+98E2, U+2FA03->U+4B33, U+2FA04->U+9929, \\\n"
+	" U+2FA05->U+99A7, U+2FA06->U+99C2, U+2FA07->U+99FE, U+2FA08->U+4BCE, \\\n"
+	" U+2FA09->U+29B30, U+2FA0A->U+9B12, U+2FA0B->U+9C40, U+2FA0C->U+9CFD, \\\n"
+	" U+2FA0D->U+4CCE, U+2FA0E->U+4CED, U+2FA0F->U+9D67, U+2FA10->U+2A0CE, \\\n"
+	" U+2FA11->U+4CF8, U+2FA12->U+2A105, U+2FA13->U+2A20E, U+2FA14->U+2A291, \\\n"
+	" U+2FA15->U+9EBB, U+2FA16->U+4D56, U+2FA17->U+9EF9, U+2FA18->U+9EFE, \\\n"
+	" U+2FA19->U+9F05, U+2FA1A->U+9F0F, U+2FA1B->U+9F16, U+2FA1C->U+9F3B, \\\n"
+	" U+2FA1D->U+2A600, U+2F00->U+4E00, U+2F01->U+4E28, U+2F02->U+4E36, \\\n"
+	" U+2F03->U+4E3F, U+2F04->U+4E59, U+2F05->U+4E85, U+2F06->U+4E8C, \\\n"
+	" U+2F07->U+4EA0, U+2F08->U+4EBA, U+2F09->U+513F, U+2F0A->U+5165, \\\n"
+	" U+2F0B->U+516B, U+2F0C->U+5182, U+2F0D->U+5196, U+2F0E->U+51AB, \\\n"
+	" U+2F0F->U+51E0, U+2F10->U+51F5, U+2F11->U+5200, U+2F12->U+529B, \\\n"
+	" U+2F13->U+52F9, U+2F14->U+5315, U+2F15->U+531A, U+2F16->U+5338, \\\n"
+	" U+2F17->U+5341, U+2F18->U+535C, U+2F19->U+5369, U+2F1A->U+5382, \\\n"
+	" U+2F1B->U+53B6, U+2F1C->U+53C8, U+2F1D->U+53E3, U+2F1E->U+56D7, \\\n"
+	" U+2F1F->U+571F, U+2F20->U+58EB, U+2F21->U+5902, U+2F22->U+590A, \\\n"
+	" U+2F23->U+5915, U+2F24->U+5927, U+2F25->U+5973, U+2F26->U+5B50, \\\n"
+	" U+2F27->U+5B80, U+2F28->U+5BF8, U+2F29->U+5C0F, U+2F2A->U+5C22, \\\n"
+	" U+2F2B->U+5C38, U+2F2C->U+5C6E, U+2F2D->U+5C71, U+2F2E->U+5DDB, \\\n"
+	" U+2F2F->U+5DE5, U+2F30->U+5DF1, U+2F31->U+5DFE, U+2F32->U+5E72, \\\n"
+	" U+2F33->U+5E7A, U+2F34->U+5E7F, U+2F35->U+5EF4, U+2F36->U+5EFE, \\\n"
+	" U+2F37->U+5F0B, U+2F38->U+5F13, U+2F39->U+5F50, U+2F3A->U+5F61, \\\n"
+	" U+2F3B->U+5F73, U+2F3C->U+5FC3, U+2F3D->U+6208, U+2F3E->U+6236, \\\n"
+	" U+2F3F->U+624B, U+2F40->U+652F, U+2F41->U+6534, U+2F42->U+6587, \\\n"
+	" U+2F43->U+6597, U+2F44->U+65A4, U+2F45->U+65B9, U+2F46->U+65E0, \\\n"
+	" U+2F47->U+65E5, U+2F48->U+66F0, U+2F49->U+6708, U+2F4A->U+6728, \\\n"
+	" U+2F4B->U+6B20, U+2F4C->U+6B62, U+2F4D->U+6B79, U+2F4E->U+6BB3, \\\n"
+	" U+2F4F->U+6BCB, U+2F50->U+6BD4, U+2F51->U+6BDB, U+2F52->U+6C0F, \\\n"
+	" U+2F53->U+6C14, U+2F54->U+6C34, U+2F55->U+706B, U+2F56->U+722A, \\\n"
+	" U+2F57->U+7236, U+2F58->U+723B, U+2F59->U+723F, U+2F5A->U+7247, \\\n"
+	" U+2F5B->U+7259, U+2F5C->U+725B, U+2F5D->U+72AC, U+2F5E->U+7384, \\\n"
+	" U+2F5F->U+7389, U+2F60->U+74DC, U+2F61->U+74E6, U+2F62->U+7518, \\\n"
+	" U+2F63->U+751F, U+2F64->U+7528, U+2F65->U+7530, U+2F66->U+758B, \\\n"
+	" U+2F67->U+7592, U+2F68->U+7676, U+2F69->U+767D, U+2F6A->U+76AE, \\\n"
+	" U+2F6B->U+76BF, U+2F6C->U+76EE, U+2F6D->U+77DB, U+2F6E->U+77E2, \\\n"
+	" U+2F6F->U+77F3, U+2F70->U+793A, U+2F71->U+79B8, U+2F72->U+79BE, \\\n"
+	" U+2F73->U+7A74, U+2F74->U+7ACB, U+2F75->U+7AF9, U+2F76->U+7C73, \\\n"
+	" U+2F77->U+7CF8, U+2F78->U+7F36, U+2F79->U+7F51, U+2F7A->U+7F8A, \\\n"
+	" U+2F7B->U+7FBD, U+2F7C->U+8001, U+2F7D->U+800C, U+2F7E->U+8012, \\\n"
+	" U+2F7F->U+8033, U+2F80->U+807F, U+2F81->U+8089, U+2F82->U+81E3, \\\n"
+	" U+2F83->U+81EA, U+2F84->U+81F3, U+2F85->U+81FC, U+2F86->U+820C, \\\n"
+	" U+2F87->U+821B, U+2F88->U+821F, U+2F89->U+826E, U+2F8A->U+8272, \\\n"
+	" U+2F8B->U+8278, U+2F8C->U+864D, U+2F8D->U+866B, U+2F8E->U+8840, \\\n"
+	" U+2F8F->U+884C, U+2F90->U+8863, U+2F91->U+897E, U+2F92->U+898B, \\\n"
+	" U+2F93->U+89D2, U+2F94->U+8A00, U+2F95->U+8C37, U+2F96->U+8C46, \\\n"
+	" U+2F97->U+8C55, U+2F98->U+8C78, U+2F99->U+8C9D, U+2F9A->U+8D64, \\\n"
+	" U+2F9B->U+8D70, U+2F9C->U+8DB3, U+2F9D->U+8EAB, U+2F9E->U+8ECA, \\\n"
+	" U+2F9F->U+8F9B, U+2FA0->U+8FB0, U+2FA1->U+8FB5, U+2FA2->U+9091, \\\n"
+	" U+2FA3->U+9149, U+2FA4->U+91C6, U+2FA5->U+91CC, U+2FA6->U+91D1, \\\n"
+	" U+2FA7->U+9577, U+2FA8->U+9580, U+2FA9->U+961C, U+2FAA->U+96B6, \\\n"
+	" U+2FAB->U+96B9, U+2FAC->U+96E8, U+2FAD->U+9751, U+2FAE->U+975E, \\\n"
+	" U+2FAF->U+9762, U+2FB0->U+9769, U+2FB1->U+97CB, U+2FB2->U+97ED, \\\n"
+	" U+2FB3->U+97F3, U+2FB4->U+9801, U+2FB5->U+98A8, U+2FB6->U+98DB, \\\n"
+	" U+2FB7->U+98DF, U+2FB8->U+9996, U+2FB9->U+9999, U+2FBA->U+99AC, \\\n"
+	" U+2FBB->U+9AA8, U+2FBC->U+9AD8, U+2FBD->U+9ADF, U+2FBE->U+9B25, \\\n"
+	" U+2FBF->U+9B2F, U+2FC0->U+9B32, U+2FC1->U+9B3C, U+2FC2->U+9B5A, \\\n"
+	" U+2FC3->U+9CE5, U+2FC4->U+9E75, U+2FC5->U+9E7F, U+2FC6->U+9EA5, \\\n"
+	" U+2FC7->U+9EBB, U+2FC8->U+9EC3, U+2FC9->U+9ECD, U+2FCA->U+9ED1, \\\n"
+	" U+2FCB->U+9EF9, U+2FCC->U+9EFD, U+2FCD->U+9F0E, U+2FCE->U+9F13, \\\n"
+	" U+2FCF->U+9F20, U+2FD0->U+9F3B, U+2FD1->U+9F4A, U+2FD2->U+9F52, \\\n"
+	" U+2FD3->U+9F8D, U+2FD4->U+9F9C, U+2FD5->U+9FA0, U+3042->U+3041, \\\n"
+	" U+3044->U+3043, U+3046->U+3045, U+3048->U+3047, U+304A->U+3049, \\\n"
+	" U+304C->U+304B, U+304E->U+304D, U+3050->U+304F, U+3052->U+3051, \\\n"
+	" U+3054->U+3053, U+3056->U+3055, U+3058->U+3057, U+305A->U+3059, \\\n"
+	" U+305C->U+305B, U+305E->U+305D, U+3060->U+305F, U+3062->U+3061, \\\n"
+	" U+3064->U+3063, U+3065->U+3063, U+3067->U+3066, U+3069->U+3068, \\\n"
+	" U+3070->U+306F, U+3071->U+306F, U+3073->U+3072, U+3074->U+3072, \\\n"
+	" U+3076->U+3075, U+3077->U+3075, U+3079->U+3078, U+307A->U+3078, \\\n"
+	" U+307C->U+307B, U+307D->U+307B, U+3084->U+3083, U+3086->U+3085, \\\n"
+	" U+3088->U+3087, U+308F->U+308E, U+3094->U+3046, U+3095->U+304B, \\\n"
+	" U+3096->U+3051, U+30A2->U+30A1, U+30A4->U+30A3, U+30A6->U+30A5, \\\n"
+	" U+30A8->U+30A7, U+30AA->U+30A9, U+30AC->U+30AB, U+30AE->U+30AD, \\\n"
+	" U+30B0->U+30AF, U+30B2->U+30B1, U+30B4->U+30B3, U+30B6->U+30B5, \\\n"
+	" U+30B8->U+30B7, U+30BA->U+30B9, U+30BC->U+30BB, U+30BE->U+30BD, \\\n"
+	" U+30C0->U+30BF, U+30C2->U+30C1, U+30C5->U+30C4, U+30C7->U+30C6, \\\n"
+	" U+30C9->U+30C8, U+30D0->U+30CF, U+30D1->U+30CF, U+30D3->U+30D2, \\\n"
+	" U+30D4->U+30D2, U+30D6->U+30D5, U+30D7->U+30D5, U+30D9->U+30D8, \\\n"
+	" U+30DA->U+30D8, U+30DC->U+30DB, U+30DD->U+30DB, U+30E4->U+30E3, \\\n"
+	" U+30E6->U+30E5, U+30E8->U+30E7, U+30EF->U+30EE, U+30F4->U+30A6, \\\n"
+	" U+30AB->U+30F5, U+30B1->U+30F6, U+30F7->U+30EF, U+30F8->U+30F0, \\\n"
+	" U+30F9->U+30F1, U+30FA->U+30F2, U+30AF->U+31F0, U+30B7->U+31F1, \\\n"
+	" U+30B9->U+31F2, U+30C8->U+31F3, U+30CC->U+31F4, U+30CF->U+31F5, \\\n"
+	" U+30D2->U+31F6, U+30D5->U+31F7, U+30D8->U+31F8, U+30DB->U+31F9, \\\n"
+	" U+30E0->U+31FA, U+30E9->U+31FB, U+30EA->U+31FC, U+30EB->U+31FD, \\\n"
+	" U+30EC->U+31FE, U+30ED->U+31FF, U+FF66->U+30F2, U+FF67->U+30A1, \\\n"
+	" U+FF68->U+30A3, U+FF69->U+30A5, U+FF6A->U+30A7, U+FF6B->U+30A9, \\\n"
+	" U+FF6C->U+30E3, U+FF6D->U+30E5, U+FF6E->U+30E7, U+FF6F->U+30C3, \\\n"
+	" U+FF71->U+30A1, U+FF72->U+30A3, U+FF73->U+30A5, U+FF74->U+30A7, \\\n"
+	" U+FF75->U+30A9, U+FF76->U+30AB, U+FF77->U+30AD, U+FF78->U+30AF, \\\n"
+	" U+FF79->U+30B1, U+FF7A->U+30B3, U+FF7B->U+30B5, U+FF7C->U+30B7, \\\n"
+	" U+FF7D->U+30B9, U+FF7E->U+30BB, U+FF7F->U+30BD, U+FF80->U+30BF, \\\n"
+	" U+FF81->U+30C1, U+FF82->U+30C3, U+FF83->U+30C6, U+FF84->U+30C8, \\\n"
+	" U+FF85->U+30CA, U+FF86->U+30CB, U+FF87->U+30CC, U+FF88->U+30CD, \\\n"
+	" U+FF89->U+30CE, U+FF8A->U+30CF, U+FF8B->U+30D2, U+FF8C->U+30D5, \\\n"
+	" U+FF8D->U+30D8, U+FF8E->U+30DB, U+FF8F->U+30DE, U+FF90->U+30DF, \\\n"
+	" U+FF91->U+30E0, U+FF92->U+30E1, U+FF93->U+30E2, U+FF94->U+30E3, \\\n"
+	" U+FF95->U+30E5, U+FF96->U+30E7, U+FF97->U+30E9, U+FF98->U+30EA, \\\n"
+	" U+FF99->U+30EB, U+FF9A->U+30EC, U+FF9B->U+30ED, U+FF9C->U+30EF, \\\n"
+	" U+FF9D->U+30F3, U+FFA0->U+3164, U+FFA1->U+3131, U+FFA2->U+3132, \\\n"
+	" U+FFA3->U+3133, U+FFA4->U+3134, U+FFA5->U+3135, U+FFA6->U+3136, \\\n"
+	" U+FFA7->U+3137, U+FFA8->U+3138, U+FFA9->U+3139, U+FFAA->U+313A, \\\n"
+	" U+FFAB->U+313B, U+FFAC->U+313C, U+FFAD->U+313D, U+FFAE->U+313E, \\\n"
+	" U+FFAF->U+313F, U+FFB0->U+3140, U+FFB1->U+3141, U+FFB2->U+3142, \\\n"
+	" U+FFB3->U+3143, U+FFB4->U+3144, U+FFB5->U+3145, U+FFB6->U+3146, \\\n"
+	" U+FFB7->U+3147, U+FFB8->U+3148, U+FFB9->U+3149, U+FFBA->U+314A, \\\n"
+	" U+FFBB->U+314B, U+FFBC->U+314C, U+FFBD->U+314D, U+FFBE->U+314E, \\\n"
+	" U+FFC2->U+314F, U+FFC3->U+3150, U+FFC4->U+3151, U+FFC5->U+3152, \\\n"
+	" U+FFC6->U+3153, U+FFC7->U+3154, U+FFCA->U+3155, U+FFCB->U+3156, \\\n"
+	" U+FFCC->U+3157, U+FFCD->U+3158, U+FFCE->U+3159, U+FFCF->U+315A, \\\n"
+	" U+FFD2->U+315B, U+FFD3->U+315C, U+FFD4->U+315D, U+FFD5->U+315E, \\\n"
+	" U+FFD6->U+315F, U+FFD7->U+3160, U+FFDA->U+3161, U+FFDB->U+3162, \\\n"
+	" U+FFDC->U+3163, U+3131->U+1100, U+3132->U+1101, U+3133->U+11AA, \\\n"
+	" U+3134->U+1102, U+3135->U+11AC, U+3136->U+11AD, U+3137->U+1103, \\\n"
+	" U+3138->U+1104, U+3139->U+1105, U+313A->U+11B0, U+313B->U+11B1, \\\n"
+	" U+313C->U+11B2, U+313D->U+11B3, U+313E->U+11B4, U+313F->U+11B5, \\\n"
+	" U+3140->U+111A, U+3141->U+1106, U+3142->U+1107, U+3143->U+1108, \\\n"
+	" U+3144->U+1121, U+3145->U+1109, U+3146->U+110A, U+3147->U+110B, \\\n"
+	" U+3148->U+110C, U+3149->U+110D, U+314A->U+110E, U+314B->U+110F, \\\n"
+	" U+314C->U+1110, U+314D->U+1111, U+314E->U+1112, U+314F->U+1161, \\\n"
+	" U+3150->U+1162, U+3151->U+1163, U+3152->U+1164, U+3153->U+1165, \\\n"
+	" U+3154->U+1166, U+3155->U+1167, U+3156->U+1168, U+3157->U+1169, \\\n"
+	" U+3158->U+116A, U+3159->U+116B, U+315A->U+116C, U+315B->U+116D, \\\n"
+	" U+315C->U+116E, U+315D->U+116F, U+315E->U+1170, U+315F->U+1171, \\\n"
+	" U+3160->U+1172, U+3161->U+1173, U+3162->U+1174, U+3163->U+1175, \\\n"
+	" U+3165->U+1114, U+3166->U+1115, U+3167->U+11C7, U+3168->U+11C8, \\\n"
+	" U+3169->U+11CC, U+316A->U+11CE, U+316B->U+11D3, U+316C->U+11D7, \\\n"
+	" U+316D->U+11D9, U+316E->U+111C, U+316F->U+11DD, U+3170->U+11DF, \\\n"
+	" U+3171->U+111D, U+3172->U+111E, U+3173->U+1120, U+3174->U+1122, \\\n"
+	" U+3175->U+1123, U+3176->U+1127, U+3177->U+1129, U+3178->U+112B, \\\n"
+	" U+3179->U+112C, U+317A->U+112D, U+317B->U+112E, U+317C->U+112F, \\\n"
+	" U+317D->U+1132, U+317E->U+1136, U+317F->U+1140, U+3180->U+1147, \\\n"
+	" U+3181->U+114C, U+3182->U+11F1, U+3183->U+11F2, U+3184->U+1157, \\\n"
+	" U+3185->U+1158, U+3186->U+1159, U+3187->U+1184, U+3188->U+1185, \\\n"
+	" U+3189->U+1188, U+318A->U+1191, U+318B->U+1192, U+318C->U+1194, \\\n"
+	" U+318D->U+119E, U+318E->U+11A1, U+A490->U+A408, U+A491->U+A1B9, \\\n"
+	" U+4E00..U+9FBB, U+3400..U+4DB5, U+20000..U+2A6D6, U+FA0E, U+FA0F, \\\n"
+	" U+FA11, U+FA13, U+FA14, U+FA1F, U+FA21, U+FA23, U+FA24, U+FA27, U+FA28, \\\n"
+	" U+FA29, U+3105..U+312C, U+31A0..U+31B7, U+3041, U+3043, U+3045, U+3047, \\\n"
+	" U+3049, U+304B, U+304D, U+304F, U+3051, U+3053, U+3055, U+3057, U+3059, \\\n"
+	" U+305B, U+305D, U+305F, U+3061, U+3063, U+3066, U+3068, U+306A..U+306F, \\\n"
+	" U+3072, U+3075, U+3078, U+307B, U+307E..U+3083, U+3085, U+3087, \\\n"
+	" U+3089..U+308E, U+3090..U+3093, U+30A1, U+30A3, U+30A5, U+30A7, U+30A9, \\\n"
+	" U+30AD, U+30AF, U+30B3, U+30B5, U+30BB, U+30BD, U+30BF, U+30C1, U+30C3, \\\n"
+	" U+30C4, U+30C6, U+30CA, U+30CB, U+30CD, U+30CE, U+30DE, U+30DF, U+30E1, \\\n"
+	" U+30E2, U+30E3, U+30E5, U+30E7, U+30EE, U+30F0..U+30F3, U+30F5, U+30F6, \\\n"
+	" U+31F0, U+31F1, U+31F2, U+31F3, U+31F4, U+31F5, U+31F6, U+31F7, U+31F8, \\\n"
+	" U+31F9, U+31FA, U+31FB, U+31FC, U+31FD, U+31FE, U+31FF, U+AC00..U+D7A3, \\\n"
+	" U+1100..U+1159, U+1161..U+11A2, U+11A8..U+11F9, U+A000..U+A48C, \\\n"
+	" U+A492..U+A4C6\n"
+	"	ngram_chars = \\\n"
+	/* Support for Chinese/Japanese/Korean, from
+	 * http://sphinxsearch.com/wiki/doku.php?id=charset_tables#cjk */
+	"	U+4E00..U+9FBB, U+3400..U+4DB5, U+20000..U+2A6D6, U+FA0E, U+FA0F, \\\n"
+	"	U+FA11, U+FA13, U+FA14, U+FA1F, U+FA21, U+FA23, U+FA24, U+FA27, U+FA28, \\\n"
+	"	U+FA29, U+3105..U+312C, U+31A0..U+31B7, U+3041, U+3043, U+3045, U+3047, \\\n"
+	"	U+3049, U+304B, U+304D, U+304F, U+3051, U+3053, U+3055, U+3057, U+3059, \\\n"
+	"	U+305B, U+305D, U+305F, U+3061, U+3063, U+3066, U+3068, U+306A..U+306F, \\\n"
+	"	U+3072, U+3075, U+3078, U+307B, U+307E..U+3083, U+3085, U+3087, \\\n"
+	"	U+3089..U+308E, U+3090..U+3093, U+30A1, U+30A3, U+30A5, U+30A7, U+30A9, \\\n"
+	"	U+30AD, U+30AF, U+30B3, U+30B5, U+30BB, U+30BD, U+30BF, U+30C1, U+30C3, \\\n"
+	"	U+30C4, U+30C6, U+30CA, U+30CB, U+30CD, U+30CE, U+30DE, U+30DF, U+30E1, \\\n"
+	"	U+30E2, U+30E3, U+30E5, U+30E7, U+30EE, U+30F0..U+30F3, U+30F5, U+30F6, \\\n"
+	"	U+31F0, U+31F1, U+31F2, U+31F3, U+31F4, U+31F5, U+31F6, U+31F7, U+31F8, \\\n"
+	"	U+31F9, U+31FA, U+31FB, U+31FC, U+31FD, U+31FE, U+31FF, U+AC00..U+D7A3, \\\n"
+	"	U+1100..U+1159, U+1161..U+11A2, U+11A8..U+11F9, U+A000..U+A48C, \\\n"
+	"	U+A492..U+A4C6\n"
+	"	ngram_len = 1\n"
+	"\n"
+	" rt_attr_string = cyrusid\n"
+	" rt_field = header_from\n"
+	" rt_field = header_to\n"
+	" rt_field = header_cc\n"
+	" rt_field = header_bcc\n"
+	" rt_field = header_subject\n"
+	" rt_field = header_listid\n"
+	" rt_field = header_type\n"
+	" rt_field = headers\n"
+	" rt_field = body\n"
+	"}\n"
+	"\n";
+ static const char global_config =
+	"searchd\n"
+	"{\n"
+	" listen = $socket:mysql41\n"
+	" log = syslog\n"
+	" pid_file = $pidfile\n"
+	" binlog_path = $rootdir/binlog\n"
+	" compat_sphinxql_magics = 0\n"
+	" workers = threads\n"
+	" max_matches = " SPHINX_MAX_MATCHES "\n"
+	"}\n"
+	/* This index exists only to allow the searchd to start before
+	 * any real user indexes have been added */
+	"index dummy\n"
+	"{\n"
+	" type = rt\n"
+	" path = $rootdir/dummy\n"
+	" rt_field = dummy\n"
+	"}\n";
+ const char *rootdir = NULL;
+ char *basedir = NULL;
+ char *binlogdir = NULL;
+ char *indexname = NULL;
+ const char *config_file = NULL;
+ char *new_config_file = NULL;
+ int fd = -1;
+ struct buf bits = BUF_INITIALIZER;
+ struct buf user = BUF_INITIALIZER;
+ struct buf global = BUF_INITIALIZER;
+ int changed = 0;
+ int r;
+
+ config_file = sphinx_config_file();
+ if (verbose) {
+	if (mailbox)
+	 syslog(LOG_INFO, "Sphinx setting up config file %s for mailbox %s",
+		 config_file, mailbox->name);
+	else
+	 syslog(LOG_INFO, "Sphinx setting up config file %s",
+		 config_file);
+ }
+
+ /* Read the old file */
+ fd = open(config_file, O_RDONLY, 0);
+ if (fd >= 0) {
+	struct stat sb;
+
+	r = fstat(fd, &sb);
+	if (r < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to fstat %s: %m",
+		 config_file);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+	buf_ensure(&bits, sb.st_size+1);
+	bits.len = sb.st_size;
+	r = retry_read(fd, bits.s, bits.len);
+	buf_cstring(&bits);
+	if (r < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to read %s: %m",
+		 config_file);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+	close(fd);
+	fd = -1;
+
+	if (verbose)
+	 syslog(LOG_INFO, "Sphinx read %d bytes of config file %s",
+		 bits.len, config_file);
+ }
+ else if (errno != ENOENT) {
+	/* it's ok to be missing the file - we build it from scratch */
+	syslog(LOG_ERR, "IOERROR: unable to open %s for reading: %m",
+	 config_file);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* adjust the file contents */
+ if (buf_findline(&bits, global_config) < 0) {
+
+	/* See if the root directory already exists */
+	rootdir = sphinx_rootdir(NULL);
+	binlogdir = strconcat(rootdir, "/binlog", (char *)NULL);
+	r = check_directory(binlogdir, verbose, create);
+	if (r) goto out;
+
+	buf_init_ro_cstr(&global, global_config);
+	buf_replace_all(&global, "$socket", config_getstring(IMAPOPT_SPHINX_SOCKET));
+	buf_replace_all(&global, "$pidfile", config_getstring(IMAPOPT_SPHINX_PIDFILE));
+	buf_replace_all(&global, "$rootdir", rootdir);
+	buf_append(&bits, &global);
+	changed++;
+	if (verbose)
+	 syslog(LOG_INFO, "Sphinx adding section \"searchd\"");
+ }
+
+ if (mailbox) {
+
+	r = sphinx_basedir(mailbox, &basedir, &indexname);
+	if (r) {
+	 syslog(LOG_ERR, "IOERROR: unable to name sphinx basedir for %s: %s",
+		 mailbox->name, error_message(r));
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+
+	/* see if the base directory already exists */
+	r = check_directory(basedir, verbose, create);
+	if (r) goto out;
+
+	buf_init_ro_cstr(&user, user_config);
+	buf_replace_all(&user, "$indexname", indexname);
+	if (buf_findline(&bits, user.s) < 0) {
+	 buf_replace_all(&user, "$basedir", basedir);
+	 buf_append(&bits, &user);
+	 changed++;
+	 if (verbose)
+		syslog(LOG_INFO, "Sphinx adding section \"index %s\"", indexname);
+	}
+ }
+
+ if (changed) {
+
+	/* Write the new config file back */
+	/* TODO: locking so multiple imapds don't all try to do this
+	 * at the same time */
+
+	new_config_file = strconcat(config_file, ".new", (char *)NULL);
+	if (verbose)
+	 syslog(LOG_INFO, "Sphinx writing new config file %s", new_config_file);
+
+	fd = open(new_config_file, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+	if (fd < 0) {
+	 /* build the directory and retry */
+	 cyrus_mkdir(new_config_file, 0700);
+	 fd = open(new_config_file, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+	}
+	if (fd < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to open %s for writing: %m",
+		 new_config_file);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+
+	r = retry_write(fd, bits.s, bits.len);
+	if (r < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to write %s: %m",
+		 new_config_file);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+
+	close(fd);
+	fd = -1;
+
+	if (verbose)
+	 syslog(LOG_INFO, "Sphinx renaming config file %s into place", config_file);
+
+	r = rename(new_config_file, config_file);
+	if (r < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to rename %s to %s: %m",
+		 new_config_file, config_file);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+ }
+
+ r = sphinx_signal(changed ? SIGHUP : 0, verbose);
+ if (r == IMAP_NOTFOUND) {
+	/* searchd not running, start it */
+	if (verbose)
+	 syslog(LOG_INFO, "Sphinx starting searchd");
+
+	r = run_command(SEARCHD, "--config", config_file,
+			"--syslog-prefix", sphinx_syslog_prefix(), (char *)NULL);
+	if (r)
+	 syslog(LOG_ERR, "Failed to start searchd: %s", error_message(r));
+ }
+
+out:
+ if (fd >= 0) close(fd);
+ if (new_config_file) unlink(new_config_file);
+ free(new_config_file);
+ free(basedir);
+ free(indexname);
+ free(binlogdir);
+ buf_free(&bits);
+ buf_free(&user);
+ buf_free(&global);
+ return r;
+}
+
+
+static int open_latest(struct mailbox *mailbox, struct latestdb *ldb)
+{
+ char *basedir = NULL;
+ char *path = NULL;
+ int r;
+
+ r = sphinx_basedir(mailbox, &basedir, NULL);
+ if (r) return r;
+ path = strconcat(basedir, LATESTDB_FNAME, NULL);
+ free(basedir);
+
+ if (!strcmpsafe(path, ldb->path)) {
+	free(path);
+	return 0;
+ }
+
+ /* need to open a new DB */
+
+ close_latest(ldb);
+
+ r = cyrusdb_open(config_getstring(IMAPOPT_SEARCH_INDEXED_DB),
+		 path, CYRUSDB_CREATE, &ldb->db);
+ if (r) {
+	syslog(LOG_ERR, "DBERROR: opening %s: %s",
+	 path, cyrusdb_strerror(r));
+	r = IMAP_IOERROR;
+ }
+
+ if (r) {
+	free(path);
+ }
+ else {
+	ldb->path = path;
+ }
+ return r;
+}
+
+static void close_latest(struct latestdb *ldb)
+{
+ free(ldb->path);
+ ldb->path = NULL;
+
+ if (ldb->db) {
+	cyrusdb_close(ldb->db);
+	ldb->db = NULL;
+ }
+}
+
+/*
+ * Read the most recently indexed UID for the current mailboxfrom the
+ * 'latest' DB in the Sphinx directory.
+ * Returns 0 on success or an IMAP error code.
+ */
+static int read_latest(struct latestdb *ldb,
+		 struct mailbox *mailbox,
+		 uint32_t *latestp,
+		 int verbose)
+{
+ struct buf key = BUF_INITIALIZER;
+ struct buf buf = BUF_INITIALIZER;
+ const char *data = NULL;
+ size_t datalen = 0;
+ int r = 0;
+ unsigned int version = 0;
+ unsigned int uid = 0;
+
+ *latestp = 0;
+ if (verbose > 1)
+	syslog(LOG_INFO, "read_latest db=%s mailbox=%s uidvalidity=%u",
+	 ldb->path, mailbox->name, mailbox->i.uidvalidity);
+
+ buf_printf(&key, "%s.%u", mailbox->name, mailbox->i.uidvalidity);
+
+ r = cyrusdb_fetch(ldb->db,
+		 key.s, key.len,
+		 &data, &datalen,
+		 (struct txn **)NULL);
+ if (r == CYRUSDB_NOTFOUND) {
+	if (verbose > 1) syslog(LOG_INFO, "read_latest defaults to 0");
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+ buf_init_ro(&buf, data, datalen);
+ buf_cstring(&buf);
+
+ r = sscanf(buf.s, "%u %u", &version, &uid);
+ if (r != 2 || version != LATESTDB_VERSION) {
+	r = IMAP_MAILBOX_BADFORMAT;
+	goto out;
+ }
+
+ if (verbose > 1) syslog(LOG_INFO, "read_latest uid=%u", uid);
+ *latestp = uid;
+ r = 0;
+
+out:
+ buf_free(&key);
+ buf_free(&buf);
+ return r;
+}
+
+static int write_latest(struct latestdb *ldb,
+			struct mailbox *mailbox,
+			uint32_t uid,
+			int verbose)
+{
+ struct buf key = BUF_INITIALIZER;
+ struct buf data = BUF_INITIALIZER;
+ struct txn *txn = NULL;
+ int r = 0;
+
+ if (verbose)
+	syslog(LOG_INFO, "write_latest db=%s mailbox=%s uidvalidity=%u uid=%u",
+	 ldb->path, mailbox->name, mailbox->i.uidvalidity, uid);
+
+ buf_printf(&key, "%s.%u", mailbox->name, mailbox->i.uidvalidity);
+ buf_printf(&data, "%u %u", LATESTDB_VERSION, uid);
+
+ do {
+	r = cyrusdb_store(ldb->db,
+			 key.s, key.len,
+			 data.s, data.len,
+			 &txn);
+ } while (r == CYRUSDB_AGAIN);
+ if (!r)
+	r = cyrusdb_commit(ldb->db, txn);
+ else
+	cyrusdb_abort(ldb->db, txn);
+
+ buf_free(&data);
+ buf_free(&key);
+ return r;
+}
+
+/*
+ * Read the last document ID from the "latest" DB. This is a
+ * temporary measure until we can get autoincrement behaviour
+ * working for Sphinx.
+ *
+ * Returns: 0 on success or an IMAP error code.
+ */
+static int read_lastid(struct latestdb *ldb,
+		 uint32_t *lastidp,
+		 int verbose)
+{
+ struct buf key = BUF_INITIALIZER;
+ struct buf buf = BUF_INITIALIZER;
+ const char *data = NULL;
+ size_t datalen = 0;
+ int r = 0;
+ unsigned int version = 0;
+ unsigned int id = 0;
+
+ *lastidp = 0;
+ if (verbose > 1) syslog(LOG_INFO, "read_lastid db=%s", ldb->path);
+
+ buf_init_ro_cstr(&key, LATESTDB_LASTID_KEY);
+
+ r = cyrusdb_fetch(ldb->db,
+		 key.s, key.len,
+		 &data, &datalen,
+		 (struct txn **)NULL);
+ if (r == CYRUSDB_NOTFOUND) {
+	if (verbose > 1) syslog(LOG_INFO, "read_lastid defaults to 0");
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+ buf_init_ro(&buf, data, datalen);
+ buf_cstring(&buf);
+
+ r = sscanf(buf.s, "%u %u", &version, &id);
+ if (r != 2 || version != LATESTDB_VERSION) {
+	r = IMAP_MAILBOX_BADFORMAT;
+	goto out;
+ }
+
+ if (verbose > 1) syslog(LOG_INFO, "read_lastid id=%u", id);
+ *lastidp = id;
+ r = 0;
+
+out:
+ buf_free(&key);
+ buf_free(&buf);
+ return r;
+}
+
+static int write_lastid(struct latestdb *ldb,
+			uint32_t lastid,
+			int verbose)
+{
+ struct buf key = BUF_INITIALIZER;
+ struct buf data = BUF_INITIALIZER;
+ struct txn *txn = NULL;
+ int r = 0;
+
+ if (verbose > 1)
+	syslog(LOG_INFO, "write_lastid db=%s lastid=%u", ldb->path, lastid);
+
+ buf_init_ro_cstr(&key, LATESTDB_LASTID_KEY);
+ buf_printf(&data, "%u %u", LATESTDB_VERSION, lastid);
+
+ do {
+	r = cyrusdb_store(ldb->db,
+			 key.s, key.len,
+			 data.s, data.len,
+			 &txn);
+ } while (r == CYRUSDB_AGAIN);
+ if (!r)
+	r = cyrusdb_commit(ldb->db, txn);
+ else
+	cyrusdb_abort(ldb->db, txn);
+
+
+ buf_free(&data);
+ buf_free(&key);
+ return r;
+}
+
+static int flush(search_text_receiver_t *rx)
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+ int r = 0;
+
+ if (!tr->uncommitted) return 0;
+
+ /* We write the lastid out first, to avoid a future instance
+ * allocating a duplicate Sphinx document id should we crash */
+ r = write_lastid(&tr->latestdb, tr->lastid, tr->super.verbose);
+ if (r) return r;
+
+ if (tr->super.verbose > 1)
+	syslog(LOG_NOTICE, "Sphinx committing %u updates",
+		tr->uncommitted);
+
+ r = mysql_commit(tr->conn.mysql);
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: Sphinx COMMIT failed for "
+			"mailbox %s, %u messages ending at uid %u: %s",
+			tr->super.mailbox->name,
+			tr->uncommitted,
+			tr->super.uid,
+			mysql_error(tr->conn.mysql));
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* We write out the latestid for the mailbox only after successfully
+ * updating the index, to avoid a future instance not realising that
+ * there are unindexed messages should we fail to index */
+ r = write_latest(&tr->latestdb, tr->super.mailbox, tr->latest,
+		 tr->super.verbose);
+ if (r) goto out;
+
+ tr->uncommitted = 0;
+ buf_reset(&tr->super.tmp);
+
+out:
+ return r;
+}
+
+static void begin_message(search_text_receiver_t *rx, uint32_t uid)
+{
+ sphinx_receiver_t *tr = (sphinx_receiver_t *)rx;
+ int i;
+
+ tr->uid = uid;
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++)
+	buf_reset(&tr->partsi);
+ tr->parts_total = 0;
+ tr->truncate_warning = 0;
+}
+
+static void begin_part(search_text_receiver_t *rx, int part)
+{
+ sphinx_receiver_t *tr = (sphinx_receiver_t *)rx;
+
+ tr->part = part;
+}
+
+static void append_text(search_text_receiver_t *rx,
+			const struct buf *text)
+{
+ sphinx_receiver_t *tr = (sphinx_receiver_t *)rx;
+
+ if (tr->part) {
+	unsigned len = text->len;
+	if (tr->parts_total + len > MAX_PARTS_SIZE) {
+	 if (!tr->truncate_warning++)
+		syslog(LOG_ERR, "Sphinx: truncating text from "
+				"message mailbox %s uid %u",
+				tr->mailbox->name, tr->uid);
+	 len = MAX_PARTS_SIZE - tr->parts_total;
+	}
+	if (len) {
+	 tr->parts_total += len;
+	 buf_appendmap(&tr->partstr->part, text->s, len);
+	}
+ }
+}
+
+static void end_part(search_text_receiver_t *rx,
+		 int part __attribute__((unused)))
+{
+ sphinx_receiver_t *tr = (sphinx_receiver_t *)rx;
+
+ if (tr->verbose > 1)
+	syslog(LOG_NOTICE, "Sphinx: %u bytes in part %s",
+	 tr->partstr->part.len, search_part_as_string(tr->part));
+
+ tr->part = 0;
+}
+
+static void log_keywords(sphinx_update_receiver_t *tr)
+{
+ int i;
+ int r;
+ struct buf query = BUF_INITIALIZER;
+ MYSQL_RES *res = NULL;
+ MYSQL_ROW row = NULL;
+
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+	if (!tr->super.partsi.len) continue;
+	buf_reset(&query);
+	buf_appendcstr(&query, "CALL KEYWORDS(");
+	append_escaped(&query, &tr->super.partsi, '\'');
+	buf_appendcstr(&query, ", ");
+	append_escaped_cstr(&query, tr->super.indexname, '\'');
+	buf_appendcstr(&query, ",0)");
+	r = doquery(&tr->conn, tr->super.verbose, &query);
+
+	res = mysql_use_result(tr->conn.mysql);
+	if (!res) continue;
+
+	while ((row = mysql_fetch_row(res)))
+	 syslog(LOG_INFO, "keyword %s\n", row0);
+	mysql_free_result(res);
+ }
+ buf_free(&query);
+}
+
+static int end_message_update(search_text_receiver_t *rx)
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+ struct buf *query = &tr->super.tmp;
+ int i;
+ int r;
+
+ if (!tr->conn.mysql) return IMAP_INTERNAL;
+
+ buf_reset(query);
+ buf_printf(query, "INSERT INTO %s (id,"COL_CYRUSID, tr->super.indexname);
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+	if (tr->super.partsi.len) {
+	 buf_appendcstr(query, ",");
+	 buf_appendcstr(query, column_by_parti);
+	}
+ }
+ buf_appendcstr(query, ") VALUES (");
+ buf_printf(query, "%u,", ++tr->lastid);
+ append_escaped(query, make_cyrusid(tr->super.mailbox, tr->super.uid), '\'');
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+	if (tr->super.partsi.len) {
+	 buf_appendcstr(query, ",");
+	 append_escaped(query, &tr->super.partsi, '\'');
+	}
+ }
+ /* apparently Sphinx doesn't let you explicitly INSERT a NULL */
+ buf_appendcstr(query, ")");
+
+ r = doquery(&tr->conn, tr->super.verbose, query);
+ if (r) goto out; /* TODO: propagate error to the user */
+
+ if (tr->super.verbose > 3) log_keywords(tr);
+
+ ++tr->uncommitted;
+ tr->latest = tr->super.uid;
+
+out:
+ tr->super.uid = 0;
+ return r;
+}
+
+static const char *indexing_lockpath(struct mailbox *mailbox)
+{
+ char *usermbox = mboxname_user_mbox(mboxname_to_userid(mailbox->name), NULL);
+ const char *lockpath = mboxname_lockpath_suffix(usermbox, INDEXING_LOCK_SUFFIX);
+ free(usermbox);
+ return lockpath;
+}
+
+static void indexing_unlock(int *fdp)
+{
+ if (*fdp >= 0) {
+	close(*fdp);
+	*fdp = -1;
+ }
+}
+
+static int indexing_lock(struct mailbox *mailbox, int *fdp)
+{
+ const char *lockpath = indexing_lockpath(mailbox);
+ int fd;
+ int r;
+
+ indexing_unlock(fdp);
+
+ fd = open(lockpath, O_WRONLY|O_CREAT, 0600);
+ if (fd < 0) {
+	if (cyrus_mkdir(lockpath, 0755) < 0) {
+	 syslog(LOG_ERR, "IOERROR: unable to cyrus_mkdir %s: %m", lockpath);
+	 return IMAP_IOERROR;
+	}
+	fd = open(lockpath, O_WRONLY|O_CREAT, 0600);
+ }
+ if (fd < 0) {
+	syslog(LOG_ERR, "IOERROR: unable to create %s: %m", lockpath);
+	return IMAP_IOERROR;
+ }
+
+ r = lock_blocking(fd, lockpath);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: unable to lock %s: %m",
+		lockpath);
+	close(fd);
+	return IMAP_IOERROR;
+ }
+
+ *fdp = fd;
+ return 0;
+}
+
+static int begin_mailbox_update(search_text_receiver_t *rx,
+				struct mailbox *mailbox,
+				int incremental __attribute__((unused)))
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+ int r;
+
+ r = sphinx_setup(mailbox, tr->super.verbose, /*create*/1);
+ if (r) return r;
+
+ r = sphinx_basedir(mailbox, NULL, &tr->super.indexname);
+ if (r) return r;
+
+ r = get_connection(&tr->conn);
+ if (r) return r;
+
+ tr->super.mailbox = mailbox;
+
+ r = indexing_lock(mailbox, &tr->indexing_lock_fd);
+ if (r) return r;
+
+ r = open_latest(mailbox, &tr->latestdb);
+ if (r) return r;
+
+ r = read_lastid(&tr->latestdb, &tr->lastid, tr->super.verbose);
+ if (r) return r;
+
+ r = read_latest(&tr->latestdb, mailbox, &tr->latest, tr->super.verbose);
+ if (r) return r;
+
+ return 0;
+}
+
+static uint32_t first_unindexed_uid(search_text_receiver_t *rx)
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+
+ return tr->latest+1;
+}
+
+static int is_indexed(search_text_receiver_t *rx, uint32_t uid)
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+
+ return (uid <= tr->latest);
+}
+
+static int end_mailbox_update(search_text_receiver_t *rx,
+			 struct mailbox *mailbox
+			 __attribute__((unused)))
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+ int r = 0;
+
+ if (tr->conn.mysql)
+	r = flush(rx);
+
+ tr->super.mailbox = NULL;
+ free(tr->super.indexname);
+ tr->super.indexname = NULL;
+
+ return r;
+}
+
+static search_text_receiver_t *begin_update(int verbose)
+{
+ sphinx_update_receiver_t *tr;
+
+ tr = xzmalloc(sizeof(sphinx_update_receiver_t));
+ tr->super.super.begin_mailbox = begin_mailbox_update;
+ tr->super.super.first_unindexed_uid = first_unindexed_uid;
+ tr->super.super.is_indexed = is_indexed;
+ tr->super.super.begin_message = begin_message;
+ tr->super.super.begin_part = begin_part;
+ tr->super.super.append_text = append_text;
+ tr->super.super.end_part = end_part;
+ tr->super.super.end_message = end_message_update;
+ tr->super.super.end_mailbox = end_mailbox_update;
+ tr->super.super.flush = flush;
+
+ tr->indexing_lock_fd = -1;
+ tr->super.verbose = verbose;
+
+ return &tr->super.super;
+}
+
+static int free_receiver(sphinx_receiver_t *tr)
+{
+ int i;
+ int r = 0;
+
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++)
+	buf_free(&tr->partsi);
+ buf_free(&tr->tmp);
+ free(tr->indexname);
+
+ free(tr);
+
+ return r;
+}
+
+static int end_update(search_text_receiver_t *rx)
+{
+ sphinx_update_receiver_t *tr = (sphinx_update_receiver_t *)rx;
+
+ close_latest(&tr->latestdb);
+ close_connection(&tr->conn);
+ indexing_unlock(&tr->indexing_lock_fd);
+ return free_receiver(&tr->super);
+}
+
+static int begin_mailbox_snippets(search_text_receiver_t *rx,
+				 struct mailbox *mailbox,
+				 int incremental __attribute__((unused)))
+{
+ sphinx_snippet_receiver_t *tr = (sphinx_snippet_receiver_t *)rx;
+ int r;
+
+ r = get_connection(&tr->conn);
+ if (r) return r;
+
+ r = sphinx_basedir(mailbox, NULL, &tr->super.indexname);
+ if (r) return r;
+
+ tr->super.mailbox = mailbox;
+
+ return 0;
+}
+
+/* Generate Sphinx extended query syntax, not SphinxQL, customised for
+ * using CALL SNIPPETS. This differs from the regular query because
+ * CALL SNIPPETS will silently ignore @field modifiers instead of
+ * enforcing them. So we have to emit one CALL SNIPPETS for every
+ * field that may be mentioned in the original query, with a munged
+ * query that contains a disjunction of all the search terms that
+ * might apply to that part. Thanks heaps Sphinx. IRIS-2038 */
+static void generate_snippet_query(struct buf *query,
+				 int part,
+				 struct opnode *on)
+{
+ struct opnode *child;
+ struct buf arg = BUF_INITIALIZER;
+
+ buf_init_ro_cstr(&arg, on->arg);
+
+ switch (on->op) {
+
+ case SEARCH_OP_NOT:
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+	for (child = on->children ; child ; child = child->next)
+	 generate_snippet_query(query, part, child);
+	break;
+
+ case SEARCH_PART_ANY:
+	assert(on->children == NULL);
+	if (part != SEARCH_PART_HEADERS ||
+	 !config_getswitch(IMAPOPT_SPHINX_TEXT_EXCLUDES_ODD_HEADERS)) {
+	 if (query->len) buf_putc(query, '|');
+	 append_escaped(query, &arg, '"');
+	}
+	break;
+
+ default:
+	/* other SEARCH_PART_* constants */
+	assert(on->op >= 0 && on->op < SEARCH_NUM_PARTS);
+	assert(on->children == NULL);
+	if (part == on->op) {
+	 if (query->len) buf_putc(query, '|');
+	 append_escaped(query, &arg, '"');
+	}
+	break;
+ }
+
+ buf_free(&arg);
+}
+
+static int end_message_snippets(search_text_receiver_t *rx)
+{
+ sphinx_snippet_receiver_t *tr = (sphinx_snippet_receiver_t *)rx;
+ struct buf query = BUF_INITIALIZER;
+ struct buf inner_query = BUF_INITIALIZER;
+ MYSQL_RES *res = NULL;
+ MYSQL_ROW row;
+ int i;
+ int r;
+
+ if (!tr->conn.mysql) {
+	r = IMAP_INTERNAL;	 /* need to call begin_mailbox() */
+	goto out;
+ }
+ if (!tr->root) {
+	r = 0;
+	goto out;
+ }
+
+ for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+	if (res) {
+	 mysql_free_result(res);
+	 res = NULL;
+	}
+	if (i == SEARCH_PART_ANY) continue;
+
+	if (!tr->super.partsi.len) continue;
+
+	buf_reset(&inner_query);
+	generate_snippet_query(&inner_query, i, tr->root);
+	if (!inner_query.len) continue;
+
+	buf_reset(&query);
+	buf_appendcstr(&query, "CALL SNIPPETS(");
+	append_escaped(&query, &tr->super.partsi, '\'');
+	buf_appendcstr(&query, ", ");
+	append_escaped_cstr(&query, tr->super.indexname, '\'');
+	buf_appendcstr(&query, ", ");
+	append_escaped(&query, &inner_query, '\'');
+	buf_appendcstr(&query, ", 1 AS query_mode, 1 AS allow_empty)");
+
+	r = doquery(&tr->conn, tr->super.verbose, &query);
+	if (r) goto out;
+
+	res = mysql_store_result(tr->conn.mysql);
+	if (!res) continue;
+
+	row = mysql_fetch_row(res);
+	if (!row) continue;
+
+	if (tr->super.verbose > 1)
+	 syslog(LOG_ERR, "snippet %d \"%s\"", i, row0);
+
+	if (!row00) continue;
+	r = tr->proc(tr->super.mailbox, tr->super.uid, i, row0, tr->rock);
+	if (r) break;
+ }
+
+out:
+ if (res) mysql_free_result(res);
+ buf_free(&query);
+ buf_free(&inner_query);
+ return r;
+}
+
+static int end_mailbox_snippets(search_text_receiver_t *rx,
+				struct mailbox *mailbox
+				 __attribute__((unused)))
+{
+ sphinx_snippet_receiver_t *tr = (sphinx_snippet_receiver_t *)rx;
+
+ tr->super.mailbox = NULL;
+ free(tr->super.indexname);
+ tr->super.indexname = NULL;
+
+ return 0;
+}
+
+static search_text_receiver_t *begin_snippets(void *internalised,
+					 int verbose,
+					 search_snippet_cb_t proc,
+					 void *rock)
+{
+ sphinx_snippet_receiver_t *tr;
+
+ tr = xzmalloc(sizeof(sphinx_snippet_receiver_t));
+ tr->super.super.begin_mailbox = begin_mailbox_snippets;
+ tr->super.super.begin_message = begin_message;
+ tr->super.super.begin_part = begin_part;
+ tr->super.super.append_text = append_text;
+ tr->super.super.end_part = end_part;
+ tr->super.super.end_message = end_message_snippets;
+ tr->super.super.end_mailbox = end_mailbox_snippets;
+
+ tr->super.verbose = verbose;
+ tr->root = (struct opnode *)internalised;
+ tr->proc = proc;
+ tr->rock = rock;
+
+ return &tr->super.super;
+}
+
+static int end_snippets(search_text_receiver_t *rx)
+{
+ sphinx_snippet_receiver_t *tr = (sphinx_snippet_receiver_t *)rx;
+
+ close_connection(&tr->conn);
+ return free_receiver(&tr->super);
+}
+
+static int start_daemon(int verbose)
+{
+ return sphinx_setup(NULL, verbose, /*create*/1);
+}
+
+static int stop_daemon(int verbose)
+{
+ int r;
+
+ if (verbose)
+	syslog(LOG_INFO, "Sphinx stopping searchd");
+
+ r = run_command(SEARCHD, "--config", sphinx_config_file(),
+		 "--syslog-prefix", sphinx_syslog_prefix(),
+		 "--stopwait", (char *)NULL);
+ if (r)
+	syslog(LOG_ERR, "Failed to stop searchd: %s", error_message(r));
+ return r;
+}
+
+const struct search_engine sphinx_search_engine = {
+ "Sphinx",
+ SEARCH_FLAG_CAN_BATCH,
+ begin_search,
+ end_search,
+ begin_update,
+ end_update,
+ begin_snippets,
+ end_snippets,
+ describe_internalised,
+ free_internalised,
+ start_daemon,
+ stop_daemon,
+ /* list_files */NULL, /* XXX: fixme */
+ /* compact */NULL,
+ /* deluser */NULL /* XXX: fixme */
+};
+

cyrus-imapd-2.5.tar.gz/imap/search_squat.c Added

@@ -0,0 +1,1012 @@
+/* search_squat.c -- glue code for searching via SQUAT
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "assert.h"
+#include "index.h"
+#include "global.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "bitvector.h"
+
+#include "imap_err.h"
+#include "search_engines.h"
+#include "squat.h"
+
+#define DEBUG 0
+
+struct opstack {
+ int op;	 /* boolean operator to apply */
+ int valid;	 /* whether msg_vector is valid yet */
+ bitvector_t msg_vector;
+		 /* merged search results, indexed by uid (so
+		 * that bit 0 is not meaningful) */
+};
+
+typedef struct {
+ search_builder_t super;
+ struct mailbox *mailbox;
+ int verbose;
+ SquatSearchIndex *index;
+ int fd;
+ const char *part_types;
+ int found_validity;
+ int depth;
+ int alloc;
+ struct opstack *stack;
+} SquatBuilderData;
+
+static const char *squat_strerror(int err);
+
+static const char * const doctypes_by_partSEARCH_NUM_PARTS = {
+ "mh",
+ "f",
+ "t",
+ "c",
+ "b",
+ "s",
+ "h",
+ "m"
+};
+
+/* The document name is of the form
+
+ pnnn.vvv
+
+ Where p is a part_type character (denoting which segment of the message
+ is represented by the document), nnn is the UID of the message, and vvv
+ is the UID validity value.
+
+ This function parses the document name and returns the UID
+ only if the name has the right part type and it corresponds
+ to a real message UID.
+ Returns a UID (>=1) or zero on error.
+*/
+static unsigned int parse_doc_name(SquatBuilderData *bb, const char *doc_name)
+{
+ int ch = doc_name0;
+ const char *t = bb->part_types;
+ int doc_UID;
+
+ if (ch == 'v' && strncmp(doc_name, "validity.", 9) == 0) {
+	if ((unsigned) atoi(doc_name + 9) == bb->mailbox->i.uidvalidity) {
+	 bb->found_validity = 1;
+	}
+	return 0;
+ }
+
+ /* make sure that the document part type is one of the ones we're
+ accepting */
+ while (*t != 0 && *t != ch) {
+	t++;
+ }
+ if (*t == 0) {
+	return 0;
+ }
+
+ doc_UID = atoi(++doc_name);
+ while ((*doc_name >= '0' && *doc_name <= '9') || *doc_name == '-') {
+	++doc_name;
+ }
+ if (*doc_name != 0) {
+	return 0;
+ }
+
+ return doc_UID;
+}
+
+#if DEBUG
+static void opstack_dump(SquatBuilderData *bb, const char *where)
+{
+ int i;
+ char *desc;
+ struct buf line = BUF_INITIALIZER;
+
+ syslog(LOG_NOTICE, "Squat opstack %s {", where);
+ for (i = 0 ; i < bb->depth ; i++) {
+	struct opstack *o = bb->stack+i;
+
+	buf_reset(&line);
+	buf_printf(&line, "op=%s", search_op_as_string(o->op));
+
+	buf_printf(&line, " valid=%d", o->valid);
+
+	desc = bv_cstring(&o->msg_vector);
+	buf_printf(&line, " msg_vector=%s", desc);
+	free(desc);
+
+	syslog(LOG_NOTICE, "Squat %s", buf_cstring(&line));
+ }
+ syslog(LOG_NOTICE, "Squat }");
+ buf_free(&line);
+}
+#endif
+
+static struct opstack *opstack_top(SquatBuilderData *bb)
+{
+ return (bb->depth ? &bb->stackbb->depth-1 : NULL);
+}
+
+static struct opstack *opstack_push(SquatBuilderData *bb, int op)
+{
+ struct opstack *top;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat opstack_push(op=%s)\n", search_op_as_string(op));
+#endif
+
+ /* push a new op on the stack */
+ if (bb->depth+1 > bb->alloc) {
+	bb->alloc += 16;
+	bb->stack = xrealloc(bb->stack, bb->alloc * sizeof(struct opstack));
+ }
+
+ top = &bb->stackbb->depth++;
+ top->op = op;
+ top->valid = 0;
+ bv_init(&top->msg_vector);
+ bv_setsize(&top->msg_vector, bb->mailbox->i.last_uid+1);
+
+#if DEBUG
+ if (bb->verbose > 1)
+	opstack_dump(bb, "after push");
+#endif
+
+ return top;
+}
+
+static void opstack_pop(SquatBuilderData *bb)
+{
+ struct opstack *child;
+ struct opstack *parent;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat opstack_pop()");
+#endif
+
+ /* pop the last operator off the stack */
+ assert(bb->depth);
+ child = opstack_top(bb);
+ bb->depth--;
+ parent = opstack_top(bb);
+
+ if (parent && child->valid) {
+	/* merge the result with the parent node */
+	if (!parent->valid)
+	 bv_copy(&parent->msg_vector, &child->msg_vector);
+	else if (parent->op == SEARCH_OP_OR)
+	 bv_oreq(&parent->msg_vector, &child->msg_vector);
+	else if (parent->op == SEARCH_OP_AND)
+	 bv_andeq(&parent->msg_vector, &child->msg_vector);
+	parent->valid = 1;
+ }
+
+ bv_free(&child->msg_vector);
+
+#if DEBUG
+ if (bb->verbose > 1)
+	opstack_dump(bb, "after pop");
+#endif
+}
+
+static int drop_indexed_docs(void* closure, const SquatListDoc *doc)
+{
+ SquatBuilderData* bb = (SquatBuilderData*)closure;
+ unsigned int uid = parse_doc_name(bb, doc->doc_name);
+
+ if (uid)
+	bv_clear(&opstack_top(bb)->msg_vector, uid);
+ return SQUAT_CALLBACK_CONTINUE;
+}
+
+static int fill_with_hits(void* closure, char const* doc)
+{
+ SquatBuilderData* bb = (SquatBuilderData*)closure;
+ unsigned int uid = parse_doc_name(bb, doc);
+
+ if (uid)
+	bv_set(&opstack_top(bb)->msg_vector, uid);
+ return SQUAT_CALLBACK_CONTINUE;
+}
+
+static void begin_boolean(search_builder_t *bx, int op)
+{
+ SquatBuilderData *bb = (SquatBuilderData *)bx;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat begin_boolean(op=%s)", search_op_as_string(op));
+#endif
+
+ opstack_push(bb, op);
+}
+
+static void end_boolean(search_builder_t *bx, int op __attribute__((unused)))
+{
+ SquatBuilderData *bb = (SquatBuilderData *)bx;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat end_boolean()");
+#endif
+ opstack_pop(bb);
+}
+
+static void match(search_builder_t *bx, int part, const char *str)
+{
+ SquatBuilderData *bb = (SquatBuilderData *)bx;
+ struct opstack *parent = opstack_top(bb);
+ struct opstack *top;
+ int r;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat match(part=%d str=\"%s\")", part, str);
+#endif
+
+ if (!doctypes_by_partpart)
+	return;
+ if (parent && parent->op == SEARCH_OP_NOT)
+	return;
+
+ top = opstack_push(bb, /*doesn't matter*/0);
+ bb->part_types = doctypes_by_partpart;
+
+ r = squat_search_execute(bb->index, str, strlen(str),
+			 fill_with_hits, bb);
+ if (r != SQUAT_OK) {
+	if (squat_get_last_error() == SQUAT_ERR_SEARCH_STRING_TOO_SHORT)
+	 goto out; /* The rest of the search is still viable */
+	syslog(LOG_ERR, "SQUAT string list search failed on string %s "
+			 "with part types %s: %s",
+			 str, bb->part_types, squat_strerror(r));
+	goto out;
+ }
+ top->valid = 1;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	opstack_dump(bb, "after match");
+#endif
+
+out:
+ opstack_pop(bb);
+}
+
+static void *get_internalised(search_builder_t *bx
+				__attribute__((unused)))
+{
+ return NULL;
+}
+
+static int run(search_builder_t *bx, search_hit_cb_t proc, void *rock);
+
+static search_builder_t *begin_search(struct mailbox *mailbox, int opts)
+{
+ SquatBuilderData *bb;
+ SquatSearchIndex* index;
+ const char *fname;
+ int fd;
+
+ if ((opts & SEARCH_MULTIPLE)) {
+	syslog(LOG_ERR, "Squat does not support multiple-folder searches, sorry");
+	/* although it could with some extra work, but why bother */
+	return NULL;
+ }
+
+ fname = mailbox_meta_fname(mailbox, META_SQUAT);
+ if ((fd = open(fname, O_RDONLY)) < 0) {
+	if (errno != ENOENT)
+	 syslog(LOG_ERR, "SQUAT failed to open index file %s: %s",
+		 fname, squat_strerror(squat_get_last_error()));
+	return NULL; /* probably not found. Just bail */
+ }
+ if ((index = squat_search_open(fd)) == NULL) {
+	syslog(LOG_ERR, "SQUAT failed to open index %s: %s",
+	 fname, squat_strerror(squat_get_last_error()));
+	close(fd);
+	return NULL;
+ }
+
+ bb = xzmalloc(sizeof(SquatBuilderData));
+ bb->super.begin_boolean = begin_boolean;
+ bb->super.end_boolean = end_boolean;
+ bb->super.match = match;
+ bb->super.get_internalised = get_internalised;
+ bb->super.run = run;
+
+ bb->mailbox = mailbox;
+ bb->verbose = (opts & _SEARCH_VERBOSE_MASK);
+ bb->index = index;
+ bb->fd = fd;
+
+ /* Push a boolean node on the stack -- this will be used
+ * at the end of the search to OR in any unindexed messages */
+ opstack_push(bb, SEARCH_OP_OR);
+
+ return &bb->super;
+}
+
+static int add_unindexed(SquatBuilderData *bb)
+{
+ struct opstack *top = opstack_top(bb);
+ int r = 0;
+
+ top = opstack_push(bb, /*doesn't matter*/0);
+ bv_setall(&top->msg_vector);
+ bv_clear(&top->msg_vector, 0); /* UID 0 is not valid */
+ bb->part_types = "tfcbsmh";
+ bb->found_validity = 0;
+
+ r = squat_search_list_docs(bb->index, drop_indexed_docs, bb);
+ if (r != SQUAT_OK) {
+	syslog(LOG_ERR, "SQUAT failed to get list of indexed documents: %s",
+	 squat_strerror(r));
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ if (!bb->found_validity) {
+	syslog(LOG_ERR, "SQUAT didn't find validity record");
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ top->valid = 1;
+ r = 0;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	opstack_dump(bb, "after adding unindexed");
+#endif
+
+out:
+ opstack_pop(bb);
+ return r;
+}
+
+static int run(search_builder_t *bx, search_hit_cb_t proc, void *rock)
+{
+ SquatBuilderData *bb = (SquatBuilderData *)bx;
+ unsigned int uid;
+ int r = 0;
+
+#if DEBUG
+ if (bb->verbose > 1)
+	syslog(LOG_NOTICE, "Squat end_search()");
+#endif
+
+ /* check we had balanced ->begin_boolean and ->end_boolean calls */
+ if (bb->depth != 1)
+	goto out;
+
+ r = add_unindexed(bb);
+ if (r) goto out;
+
+ /* Flatten out the final bit vector into a sequence */
+ for (uid = 1 ; uid <= bb->mailbox->i.last_uid; uid++) {
+	if (bv_isset(&bb->stack0.msg_vector, uid)) {
+	 r = proc(bb->mailbox->name,
+		 bb->mailbox->i.uidvalidity,
+		 uid, rock);
+	 if (r) goto out;
+	}
+ }
+
+out:
+ return r;
+}
+
+static void end_search(search_builder_t *bx)
+{
+ SquatBuilderData *bb = (SquatBuilderData *)bx;
+
+ while (bb->depth) opstack_pop(bb);
+ free(bb->stack);
+ if (bb->index) squat_search_close(bb->index);
+ if (bb->fd >= 0) close(bb->fd);
+ free(bx);
+}
+
+
+/*
+ SQUAT index files are organised as follows:
+
+ There is (at most) one index file for each Cyrus mailbox, named
+ "cyrus.squat", stored in the mailbox directory.
+
+ Source documents are named 'xUID' where UID is the numeric UID of a
+ message and x is a character denoting a part of the message: 'f' ==
+ FROM, 't' == TO, 'b' == BCC, 'c' == CC, 's' == SUBJECT, 'h' == other
+ headers, 'm' == the body. So, a message with UID 331 could give rise
+ to several source documents named "f331", "t331", "b331", "c331",
+ "s331", "h331" and "m331".
+
+ There is also a special source document named "validity.N" where N
+ is the uidvalidity nonce for the mailbox. We use this to detect when
+ the UIDs have been renumbered since we created the index (in which
+ case the index is useless and is ignored).
+
+ Updating creates new indexes for one or more mailboxes. (We do not
+ support true incremental updates to an index yet.) The index is created
+ in "cyrus.squat.tmp" and then, if creation was successful, it is
+ atomically renamed to "cyrus.squat". This guarantees that we don't
+ interfere with anyone who has the old index open.
+*/
+
+/* These stats are gathered 1) per mailbox and 2) for the whole operation. */
+typedef struct {
+ unsigned long indexed_bytes; /* How many bytes of processed message text
+			 have we indexed? */
+ unsigned long indexed_messages; /* How many messages have we indexed? */
+ unsigned long index_size; /* How many bytes is the index using? */
+ time_t start_time; /* When did this operation start? */
+ time_t end_time; /* When did it end? */
+} SquatStats;
+
+typedef struct {
+ search_text_receiver_t super;
+ int verbose;
+ SquatStats mailbox_stats;
+ SquatStats total_stats;
+ SquatIndex *index;
+ int fd;
+ SquatSearchIndex *old_index;
+ int old_fd;
+ struct mailbox *mailbox;
+ int valid;
+ uint32_t uidvalidity;
+ unsigned int mailbox_count;
+ /* Tracks which UIDs were indexed in the old
+ * index (or all 0 if a full update) */
+ bitvector_t indexed;
+ uint32_t uid;
+ int doc_is_open;
+ char doc_name100;
+ struct buf pending_text;
+} SquatReceiverData;
+
+static void start_stats(SquatStats *stats)
+{
+ stats->index_size = 0;
+ stats->indexed_bytes = 0;
+ stats->indexed_messages = 0;
+ stats->start_time = time(NULL);
+}
+
+static void stop_stats(SquatStats *stats)
+{
+ stats->end_time = time(NULL);
+}
+
+static void print_stats(const char *which, const SquatStats *stats)
+{
+ syslog(LOG_NOTICE, "squat: %s indexed %lu messages (%lu bytes) "
+	 "into %lu index bytes in %d seconds\n",
+	 which,
+	 stats->indexed_messages,
+	 stats->indexed_bytes,
+	 stats->index_size,
+	 (int)(stats->end_time - stats->start_time));
+}
+
+static const char *squat_strerror(int err)
+{
+ static char buf64;
+
+ switch (err) {
+ case SQUAT_ERR_SYSERR:
+	return strerror(errno);
+ default:
+	/* There are other error codes, but they only apply for searching,
+	 not index construction */
+	snprintf(buf, sizeof(buf), "unknown squat error %d", err);
+	return buf;
+ }
+}
+
+/* Cyrus passes the text to index in here, after it has canonicalized
+ the text. We figure out what source document the text belongs to,
+ and update the index. */
+static void begin_message(search_text_receiver_t *rx, uint32_t uid)
+{
+ SquatReceiverData *d = (SquatReceiverData *) rx;
+
+ d->uid = uid;
+ d->doc_is_open = 0;
+ d->doc_name0 = '\0';
+ buf_init(&d->pending_text);
+
+ d->mailbox_stats.indexed_messages++;
+ d->total_stats.indexed_messages++;
+}
+
+static void begin_part(search_text_receiver_t *rx, int part)
+{
+ SquatReceiverData *d = (SquatReceiverData *) rx;
+ char part_char = 0;
+
+ /* Figure out what the name of the source document is going to be. */
+ switch (part) {
+ case SEARCH_PART_FROM: part_char = 'f'; break;
+ case SEARCH_PART_TO: part_char = 't'; break;
+ case SEARCH_PART_CC: part_char = 'c'; break;
+ case SEARCH_PART_BCC: part_char = 'b'; break;
+ case SEARCH_PART_SUBJECT: part_char = 's'; break;
+ case SEARCH_PART_HEADERS: part_char = 'h'; break;
+ case SEARCH_PART_BODY:
+	part_char = 'm';
+	break;
+ default:
+	return;
+ }
+
+ snprintf(d->doc_name, sizeof(d->doc_name), "%c%d", part_char, d->uid);
+ d->doc_is_open = 0;
+ buf_reset(&d->pending_text);
+
+ /* The document will be opened lazily later, once we have
+ * accumulated more than the minimum amount of text */
+}
+
+static int do_append(SquatReceiverData *d, const struct buf *text)
+{
+ int s;	 /* SQUAT error */
+
+ if (d->verbose > 3)
+	syslog(LOG_ERR, "squat: writing %llu bytes into message %u\n",
+	 (unsigned long long)text->len, d->uid);
+
+ s = squat_index_append_document(d->index, text->s, text->len);
+ if (s != SQUAT_OK) {
+	syslog(LOG_ERR, "squat: error writing index data "
+			"for mailbox %s uid %u: %s",
+			d->mailbox->name, d->uid,
+			squat_strerror(s));
+	return IMAP_IOERROR;
+ }
+ d->mailbox_stats.indexed_bytes += text->len;
+ d->total_stats.indexed_bytes += text->len;
+ return 0;
+}
+
+static void append_text(search_text_receiver_t *rx,
+			const struct buf *text)
+{
+ SquatReceiverData *d = (SquatReceiverData *) rx;
+ int r = 0;	 /* IMAP error */
+ int s = 0;	 /* SQUAT error */
+
+ if (!d->doc_is_open) {
+	if (text->len + d->pending_text.len < SQUAT_WORD_SIZE) {
+	 /* not enough text yet */
+	 buf_append(&d->pending_text, text);
+	 return;
+	}
+
+	/* just went over the threshold */
+	if (d->verbose > 2)
+	 syslog(LOG_NOTICE, "squat: opening document part '%s'\n",
+		 d->doc_name);
+
+	s = squat_index_open_document(d->index, d->doc_name);
+	if (s != SQUAT_OK) {
+	 syslog(LOG_ERR, "squat: error opening document %s "
+			 "for mailbox %s: %s",
+			 d->doc_name, d->mailbox->name,
+			 squat_strerror(s));
+	 return;
+	}
+	d->doc_is_open = 1;
+
+	/* flush any pending text */
+	if (d->pending_text.len)
+	 r = do_append(d, &d->pending_text);
+	buf_reset(&d->pending_text);
+ }
+
+ if (!r)
+	r = do_append(d, text);
+
+ /* TODO: propagate an error to the caller */
+}
+
+static void end_part(search_text_receiver_t *rx,
+		 int part __attribute__((unused)))
+{
+ SquatReceiverData *d = (SquatReceiverData *) rx;
+ int s = 0;	 /* SQUAT error */
+
+ if (d->doc_is_open) {
+	s = squat_index_close_document(d->index);
+	if (s != SQUAT_OK) {
+	 syslog(LOG_ERR, "squat: error closing document %s "
+			 "for mailbox %s uid %u: %s",
+			 d->doc_name, d->mailbox->name,
+			 d->uid, squat_strerror(s));
+	 return;
+	}
+ }
+ d->doc_is_open = 0;
+ buf_reset(&d->pending_text);
+}
+
+static int end_message(search_text_receiver_t *rx)
+{
+ SquatReceiverData *d = (SquatReceiverData *) rx;
+
+ d->uid = 0;
+ return 0;
+}
+
+/* Let SQUAT tell us what's going on in the expensive
+ squat_index_finish function. */
+static void stats_callback(void *closure,
+			 SquatStatsEvent *params)
+{
+ SquatReceiverData *d = (SquatReceiverData *)closure;
+
+ switch (params->generic.type) {
+ case SQUAT_STATS_COMPLETED_INITIAL_CHAR:
+	if (d->verbose > 1) {
+	 if (params->completed_initial_char.num_words > 0) {
+		printf("Processing index character %d, %d total words, "
+		 "temp file size is %d\n",
+		 params->completed_initial_char.completed_char,
+		 params->completed_initial_char.num_words,
+		 params->completed_initial_char.temp_file_size);
+	 }
+	}
+	break;
+
+ default:
+	;			/* do nothing */
+ }
+}
+
+/* Populate d->indexed map using document names from SquatSearchIndex backend */
+static int doc_check(void *closure, const SquatListDoc *doc)
+{
+ SquatReceiverData *d = (SquatReceiverData *)closure;
+ unsigned long uid;
+
+ /* validity will be replaced with new value in same slot */
+ if (!strncmp(doc->doc_name, "validity.", 9)) {
+	d->uidvalidity = strtoul(doc->doc_name + 9, NULL, 10);
+	return (1);
+ }
+
+ if (!strchr("tfcbsmh", doc->doc_name0)) {
+	syslog(LOG_ERR, "squat: invalid document name: %s", doc->doc_name);
+	d->valid = 0;
+	/* TODO: is this right?? */
+	return (1);
+ }
+
+ uid = strtoul(doc->doc_name + 1, NULL, 10);
+ if (uid > 0) {
+	bv_set(&d->indexed, uid);
+	return (1);
+ }
+
+ /* Remove this UID from the index */
+ return (0);
+}
+
+static int begin_mailbox(search_text_receiver_t *rx,
+			 struct mailbox *mailbox,
+			 int incremental)
+{
+ SquatReceiverData *d = (SquatReceiverData *)rx;
+ SquatOptions options;
+ const char *filename;
+ const char *old_filename;
+ int fd = -1;
+ int old_fd = -1;
+ SquatIndex *index = NULL;
+ SquatSearchIndex *old_index = NULL;
+ int r = 0;	 /* IMAP error code */
+ int s = 0;	 /* SQUAT error code */
+
+ bv_clearall(&d->indexed);
+
+ filename = mailbox_meta_newfname(mailbox, META_SQUAT);
+ if ((fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0) {
+	syslog(LOG_ERR, "squat: unable to create temporary index file %s: %m",
+	 filename);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ options.option_mask = SQUAT_OPTION_TMP_PATH | SQUAT_OPTION_STATISTICS;
+ options.tmp_path = mailbox_datapath(mailbox);
+ options.stats_callback = stats_callback;
+ options.stats_callback_closure = (void *)d;
+ index = squat_index_init(fd, &options);
+ if (index == NULL) {
+	syslog(LOG_ERR, "squat: unable to initialise index %s: %s",
+	 filename, squat_strerror(squat_get_last_error()));
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* Open existing index if it exists */
+ old_filename = mailbox_meta_fname(mailbox, META_SQUAT);
+ if (incremental) {
+	old_fd = open(old_filename, O_RDONLY);
+	/* Silently ignore errors opening the old fd or index
+	 * and fall back to a full update. Probably should
+	 * NOT be silent if the error is anything other than
+	 * a missing index. */
+	if (old_fd >= 0)
+	 old_index = squat_search_open(old_fd);
+	if (old_index == NULL)
+	 incremental = 0;
+ }
+
+ if (incremental) {
+	/* Copy existing document names verbatim. They end up with the same
+	 * doc_IDs as in the old index, which makes trie copying much simpler.
+	 */
+	d->valid = 1;
+	d->uidvalidity = 0L;
+	squat_index_add_existing(index, old_index, doc_check, d);
+
+	if (!d->valid) {
+	 syslog(LOG_ERR, "squat: corrupt old index for mailbox %s, "
+			 "forcing full update",
+			 mailbox->name);
+	 incremental = 0;
+	}
+
+	if (incremental &&
+	 d->uidvalidity != mailbox->i.uidvalidity) {
+	 /* Squat file refers to old mailbox: force full rebuild */
+	 syslog(LOG_ERR, "squat: mailbox %s uidvalidity changed "
+			 "from %u to %u, forcing full update",
+			 mailbox->name,
+			 mailbox->i.uidvalidity,
+			 d->uidvalidity);
+	 incremental = 0;
+	}
+ }
+
+ if (!incremental) {
+	bv_clearall(&d->indexed);
+
+	/* write an empty document at the beginning to record the validity
+	 nonce */
+	snprintf(d->doc_name, sizeof(d->doc_name),
+		 "validity.%u", mailbox->i.uidvalidity);
+	s = squat_index_open_document(index, d->doc_name);
+	if (s != SQUAT_OK) {
+	 syslog(LOG_ERR, "squat: cannot write uidvalidity nonce: %s",
+		 squat_strerror(s));
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+	s = squat_index_close_document(index);
+	if (s != SQUAT_OK) {
+	 syslog(LOG_ERR, "squat: cannot close document for "
+			 "uidvalidity nonce: %s",
+			 squat_strerror(s));
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+ }
+
+out:
+ /* it isn't obvious, but we need to keep old_index and old_fd
+ * around until after new_index has been finished. */
+ if (r) {
+	if (index != NULL) squat_index_destroy(index);
+	d->index = NULL;
+	if (fd >= 0) close(fd);
+	d->fd = -1;
+
+	if (old_index != NULL) squat_search_close(old_index);
+	d->old_index = NULL;
+	if (old_fd >= 0) close(old_fd);
+	d->old_fd = -1;
+
+	d->mailbox = NULL;
+ }
+ else {
+	d->index = index;
+	d->fd = fd;
+
+	d->old_index = old_index;
+	d->old_fd = old_fd;
+
+	d->mailbox = mailbox;
+	start_stats(&d->mailbox_stats);
+ }
+ return r;
+}
+
+static uint32_t first_unindexed_uid(search_text_receiver_t *rx
+				 __attribute__((unused)))
+{
+ return 1;
+}
+
+static int is_indexed(search_text_receiver_t *rx, uint32_t uid)
+{
+ SquatReceiverData *d = (SquatReceiverData *)rx;
+
+ return bv_isset(&d->indexed, uid);
+}
+
+static int end_mailbox(search_text_receiver_t *rx,
+		 struct mailbox *mailbox
+			 __attribute__((unused)))
+{
+ SquatReceiverData *d = (SquatReceiverData *)rx;
+ struct stat sb;
+ int r = 0;	 /* IMAP error code or syscall return */
+ int s = 0;	 /* SQUAT error code */
+
+ if (!d->index)
+	return 0;
+
+ s = squat_index_finish(d->index);
+ if (s != SQUAT_OK) {
+	syslog(LOG_ERR,
+	 "squat: failed to close index for mailbox %s (error %d)",
+	 d->mailbox->name, s);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* Check how big the resulting file is */
+ if (fstat(d->fd, &sb) < 0) {
+	syslog(LOG_ERR, "squat: unable to stat temporary index file: %m");
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ d->mailbox_stats.index_size = sb.st_size;
+ d->total_stats.index_size += sb.st_size;
+
+ r = close(d->fd);
+ d->fd = -1;
+ if (r < 0) {
+	/* This isn't going to happen unless we're on NFS */
+	syslog(LOG_ERR, "squat: unable to complete writing "
+			"temporary index file: %m");
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ /* OK, we successfully created the index under the temporary file name.
+ Let's rename it to make it the real index. */
+ r = mailbox_meta_rename(d->mailbox, META_SQUAT);
+ if (r) goto out;
+
+ if (d->verbose) {
+	stop_stats(&d->mailbox_stats);
+	print_stats(d->mailbox->name, &d->mailbox_stats);
+ }
+ d->mailbox_count++;
+ r = 0;
+
+out:
+ if (d->old_index) squat_search_close(d->old_index);
+ d->old_index = NULL;
+ if (d->old_fd >= 0) close(d->old_fd);
+ d->old_fd = -1;
+
+ d->index = NULL;
+ if (d->fd >= 0) close(d->fd);
+ d->fd = -1;
+
+ d->mailbox = NULL;
+ return r;
+}
+
+static search_text_receiver_t *begin_update(int verbose)
+{
+ SquatReceiverData *d;
+
+ d = xzmalloc(sizeof(SquatReceiverData));
+ d->super.begin_mailbox = begin_mailbox;
+ d->super.first_unindexed_uid = first_unindexed_uid;
+ d->super.is_indexed = is_indexed;
+ d->super.begin_message = begin_message;
+ d->super.begin_part = begin_part;
+ d->super.append_text = append_text;
+ d->super.end_part = end_part;
+ d->super.end_message = end_message;
+ d->super.end_mailbox = end_mailbox;
+
+ d->fd = -1;
+ d->verbose = verbose;
+
+ start_stats(&d->total_stats);
+
+ return &d->super;
+}
+
+static int end_update(search_text_receiver_t *rx)
+{
+ SquatReceiverData *d = (SquatReceiverData *)rx;
+
+ if (d->verbose && d->mailbox_count > 1) {
+	stop_stats(&d->total_stats);
+	print_stats("Total", &d->total_stats);
+ }
+
+ bv_free(&d->indexed);
+ free(d);
+ return 0;
+}
+
+const struct search_engine squat_search_engine = {
+ "SQUAT",
+ 0,
+ begin_search,
+ end_search,
+ begin_update,
+ end_update,
+ /* begin_snippets */NULL,
+ /* end_snippets */NULL,
+ /* describe_internalised */NULL,
+ /* free_internalised */NULL,
+ /* start_daemon */NULL,
+ /* stop_daemon */NULL,
+ /* list_files */NULL,
+ /* compact */NULL,
+ /* deluser */NULL
+};
+

cyrus-imapd-2.5.tar.gz/imap/search_test.c Added

@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/* cyrus includes */
+#include "assert.h"
+#include "bsearch.h"
+#include "exitcodes.h"
+#include "global.h"
+#include "imap_err.h"
+#include "index.h"
+#include "search_engines.h"
+#include "search_expr.h"
+#include "search_query.h"
+#include "message.h"
+#include "sysexits.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#if !HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+static int usage(const char *name);
+
+int verbose = 0;
+
+/* ====================================================================== */
+
+static void dump_one_folder(const char *key __attribute__((unused)),
+			 void *data,
+			 void *rock __attribute__((unused)))
+{
+ search_folder_t *folder = data;
+ int uid;
+
+ printf("mailbox %s\n", folder->mboxname);
+ printf("min %u\n", search_folder_get_min(folder));
+ printf("max %u\n", search_folder_get_max(folder));
+ printf("count %u\n", search_folder_get_count(folder));
+ printf("highestmodseq %llu\n", (unsigned long long)search_folder_get_highest_modseq(folder));
+ search_folder_foreach(folder, uid) {
+	printf("uid %u\n", uid);
+ }
+}
+
+static int do_search(const char *mboxname,
+		 int multiple,
+		 const char *userid,
+		 char **words, int nwords)
+{
+ struct buf querytext = BUF_INITIALIZER;
+ struct namespace ns;
+ struct index_init init;
+ struct index_state *state = NULL;
+ struct protstream *pin = NULL;
+ struct protstream *pout = NULL;
+ struct searchargs *searchargs = NULL;
+ search_query_t *query = NULL;
+ int i;
+ int r;
+ struct timeval start_time, end_time;
+
+ memset(&init, 0, sizeof(struct index_init));
+
+ for (i = 0 ; i < nwords ; i++) {
+	if (i) buf_putc(&querytext, ' ');
+	buf_appendcstr(&querytext, wordsi);
+ }
+ if (verbose)
+	fprintf(stderr, "search_test: IMAP query is \"%s\"\n", buf_cstring(&querytext));
+ buf_putc(&querytext, '\r');
+ buf_cstring(&querytext);
+
+ r = mboxname_init_namespace(&ns, /*isadmin*/0);
+ if (r) {
+	fprintf(stderr, "Failed to initialise namespace: %s\n", error_message(r));
+	goto out;
+ }
+
+ pin = prot_readmap(querytext.s, querytext.len);
+ pout = prot_new(/*fd*/0, /*write*/1);
+
+ init.userid = userid;
+ init.authstate = auth_newstate(userid);
+ init.out = pout;
+
+ r = index_open(mboxname, &init, &state);
+ if (r) {
+	fprintf(stderr, "%s: %s\n", mboxname, error_message(r));
+	goto out;
+ }
+
+ index_checkflags(state, 0, 0);
+
+ searchargs = new_searchargs(".", GETSEARCH_CHARSET_KEYWORD, &ns, userid, init.authstate, /*isadmin*/0);
+
+ gettimeofday(&start_time, NULL);
+
+ r = get_search_program(pin, pout, searchargs);
+ if (r != '\r') {
+	fprintf(stderr, "Couldn't parse IMAP search program\n");
+	goto out;
+ }
+
+ query = search_query_new(state, searchargs);
+ query->multiple = multiple;
+ query->verbose = verbose;
+ r = search_query_run(query);
+ if (r) {
+	fprintf(stderr, "Failed to run query: %s\n", error_message(r));
+	goto out;
+ }
+ gettimeofday(&end_time, NULL);
+
+ hash_enumerate(&query->folders_by_name, dump_one_folder, query);
+
+ if (verbose)
+	fprintf(stderr, "search_test: ran query in %.6f sec\n",
+		timesub(&start_time, &end_time));
+
+out:
+ if (pin) prot_free(pin);
+ if (pout) prot_free(pout);
+ if (searchargs) freesearchargs(searchargs);
+ search_query_free(query);
+ index_close(&state);
+ buf_free(&querytext);
+ if (init.authstate) auth_freestate(init.authstate);
+ return !!r;
+}
+
+/* ====================================================================== */
+
+static int do_serialise(char **words, int nwords)
+{
+ const char *userid = "cassandane";
+ struct buf querytext = BUF_INITIALIZER;
+ struct namespace ns;
+ struct protstream *pin = NULL;
+ struct protstream *pout = NULL;
+ struct searchargs *searchargs = NULL;
+ char *str = NULL;
+ search_expr_t *e = NULL;
+ int i;
+ int r;
+ struct timeval start_time, end_time;
+
+ for (i = 0 ; i < nwords ; i++) {
+	if (i) buf_putc(&querytext, ' ');
+	buf_appendcstr(&querytext, wordsi);
+ }
+ if (verbose)
+	fprintf(stderr, "search_test: IMAP query is \"%s\"\n", buf_cstring(&querytext));
+ buf_putc(&querytext, '\r');
+ buf_cstring(&querytext);
+
+ r = mboxname_init_namespace(&ns, /*isadmin*/0);
+ if (r) {
+	fprintf(stderr, "Failed to initialise namespace: %s\n", error_message(r));
+	goto out;
+ }
+
+ pin = prot_readmap(querytext.s, querytext.len);
+ pout = prot_new(/*fd*/0, /*write*/1);
+
+ searchargs = new_searchargs(".", GETSEARCH_CHARSET_KEYWORD, &ns, userid, auth_newstate(userid), /*isadmin*/0);
+
+ r = get_search_program(pin, pout, searchargs);
+ if (r != '\r') {
+	fprintf(stderr, "Couldn't parse IMAP search program\n");
+	goto out;
+ }
+
+ gettimeofday(&start_time, NULL);
+ str = search_expr_serialise(searchargs->root);
+ gettimeofday(&end_time, NULL);
+ if (verbose)
+	fprintf(stderr, "search_test: serialised query in %.6f sec\n",
+		timesub(&start_time, &end_time));
+
+ gettimeofday(&start_time, NULL);
+ e = search_expr_unserialise(str);
+ gettimeofday(&end_time, NULL);
+ if (verbose)
+	fprintf(stderr, "search_test: unserialised query in %.6f sec\n",
+		timesub(&start_time, &end_time));
+
+out:
+ if (pin) prot_free(pin);
+ if (pout) prot_free(pout);
+ if (searchargs) freesearchargs(searchargs);
+ if (e) search_expr_free(e);
+ free(str);
+ return !!r;
+}
+
+/* ====================================================================== */
+
+int main(int argc, char **argv)
+{
+ int c;
+ const char *alt_config = NULL;
+ const char *userid = NULL;
+ const char *mboxname = NULL;
+ enum { SEARCH, SERIALISE } mode = SEARCH;
+ int multiple = 0;
+ int r = 0;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((c = getopt(argc, argv, "C:LMSm:u:v")) != EOF) {
+	switch (c) {
+
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'L':
+	 mode = SERIALISE;
+	 break;
+
+	case 'M':
+	 multiple = 1;
+	 break;
+
+	case 'S':
+	 multiple = 0;
+	 break;
+
+	case 'm':
+	 mboxname = optarg;
+	 break;
+
+	case 'u':
+	 userid = optarg;
+	 break;
+
+	case 'v':
+	 verbose++;
+	 break;
+
+	default:
+	 usage(argv0);
+	 break;
+	}
+ }
+
+ if (optind == argc)
+	usage(argv0);
+ if (mode == SEARCH && !mboxname)
+	usage(argv0);
+
+ cyrus_init(alt_config, "search_test",
+	 CYRUSINIT_PERROR, CONFIG_NEED_PARTITION_DATA);
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+ search_attr_init();
+
+ switch (mode) {
+
+ case SEARCH:
+	if (!userid) {
+	 userid = mboxname_to_userid(mboxname);
+	 if (!userid)
+		usage(argv0);
+	}
+
+	r = do_search(mboxname, multiple, userid, argv+optind, argc-optind);
+	break;
+
+ case SERIALISE:
+	r = do_serialise(argv+optind, argc-optind);
+	break;
+ }
+
+ mboxlist_close();
+ mboxlist_done();
+
+ cyrus_done();
+
+ return r;
+}
+
+static int usage(const char *name)
+{
+ fprintf(stderr, "usage: %s format-options -m mailbox -u userid searchprogram...\n", name);
+ exit(EC_USAGE);
+}
+
+void fatal(const char* s, int code)
+{
+ fprintf(stderr, "search_test: %s\n", s);
+ cyrus_done();
+ exit(code);
+}
+
+

cyrus-imapd-2.5.tar.gz/imap/search_xapian.c Added

@@ -0,0 +1,2497 @@
+/* search_xapian.c -- glue code for searching with Xapian
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <dirent.h>
+
+#include "assert.h"
+#include "bitvector.h"
+#include "imap_err.h"
+#include "global.h"
+#include "ptrarray.h"
+#include "user.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "mappedfile.h"
+#include "mboxlist.h"
+#include "xstats.h"
+#include "search_engines.h"
+#include "sequence.h"
+#include "cyr_lock.h"
+#include "xapian_wrap.h"
+#include "command.h"
+
+#define INDEXEDDB_VERSION	2
+#define INDEXEDDB_FNAME		"/cyrus.indexed.db"
+#define XAPIAN_DIRNAME		"/xapian"
+#define ACTIVEFILE_METANAME	"xapianactive"
+
+/* Name of columns */
+#define COL_CYRUSID	"cyrusid"
+static const char * const prefix_by_partSEARCH_NUM_PARTS = {
+ NULL,
+ "F",		/* FROM */
+ "T",		/* TO */
+ "C",		/* CC */
+ "B",		/* BCC */
+ "S",		/* SUBJECT */
+ "L",		/* LISTID */
+ "Y",		/* TYPE */
+ "H",		/* HEADERS */
+ "D",		/* BODY */
+};
+
+struct segment
+{
+ int part;
+ int sequence;	/* forces stable sort order JIC */
+ int is_finished;
+ struct buf text;
+};
+
+
+static const char *xapian_rootdir(const char *tier, const char *partition);
+static int xapian_basedir(const char *tier, const char *mboxname, const char *part,
+			 const char *root, char **basedir);
+
+/* ====================================================================== */
+
+/* the "activefile" file lists the tiers and generations of all the
+ * currently active search databases. The format is space separated
+ * records tiername:generation, i.e. "meta:0". If there is no file present,
+ * it is created by finding all the existing search directories (from
+ * filesystem inspection) and prepending default:nextgen where default
+ * is the searchdefaulttier value and nextgen is one higher than the
+ * largest generation found. In the simplest configuration this is
+ * just ":0" */
+
+struct activeitem {
+ char *tier;
+ int generation;
+};
+
+static struct activeitem *activeitem_parse(const char *input)
+{
+ struct activeitem *res = NULL;
+ char *num = strrchr(input, ':');
+
+ if (!num) return NULL;
+
+ res = xzmalloc(sizeof(struct activeitem));
+ res->tier = xstrndup(input, num-input);
+ res->generation = atoi(num+1);
+
+ return res;
+}
+
+static void activeitem_free(struct activeitem *item)
+{
+ if (!item) return;
+ free(item->tier);
+ free(item);
+}
+
+char *activeitem_generate(const char *tier, int generation)
+{
+ struct buf buf = BUF_INITIALIZER;
+ buf_printf(&buf, "%s:%d", tier, generation);
+ return buf_release(&buf);
+}
+
+/* calculate the next name for this tier, by incrementing the generation
+ * to one higher than any existing active record */
+static char *activefile_nextname(const strarray_t *active, const char *tier)
+{
+ int max = -1;
+ int i;
+
+ for (i = 0; i < active->count; i++) {
+	struct activeitem *item = activeitem_parse(strarray_nth(active, i));
+	if (item && !strcmp(item->tier, tier)) {
+	 if (item->generation > max)
+		max = item->generation;
+	}
+	activeitem_free(item);
+ }
+
+ return activeitem_generate(tier, max+1);
+}
+
+/* filter a list of active records to only those in certain tiers.
+ * Used to calculate which databases to use as sources for compression */
+static strarray_t *activefile_filter(const strarray_t *active, const strarray_t *tiers, const char *partition)
+{
+ strarray_t *res = strarray_new();
+ int i;
+
+ for (i = 0; i < active->count; i++) {
+	struct activeitem *item = activeitem_parse(strarray_nth(active, i));
+	/* we want to compress anything which can't possibly exist as well
+	 * as anything which matches the filter tiers */
+	if (!item || strarray_find(tiers, item->tier, 0) >= 0 || !xapian_rootdir(item->tier, partition))
+	 strarray_append(res, strarray_nth(active, i));
+	activeitem_free(item);
+ }
+
+ return res;
+}
+
+/* the activefile file is a per-user meta file */
+static char *activefile_fname(const char *mboxname)
+{
+ const char *userid = mboxname_to_userid(mboxname);
+ if (!userid) return NULL;
+ return user_hash_meta(userid, ACTIVEFILE_METANAME);
+}
+
+/* file format is very simple */
+static strarray_t *activefile_read(struct mappedfile *activefile)
+{
+ return strarray_nsplit(mappedfile_base(activefile), mappedfile_size(activefile), NULL, 1);
+}
+
+/* to write a activefile file safely, we need to do the create .NEW,
+ * write, fsync, rename dance. This unlocks the original file, so
+ * callers will need to lock again if they need a locked file.
+ * The 'mappedfile' API isn't a perfect match for what we need here,
+ * but it's close enough, and avoids open coding the lock dance. */
+static int activefile_write(struct mappedfile *mf, const strarray_t *new)
+{
+ char *newname = strconcat(mappedfile_fname(mf), ".NEW", (char *)NULL);
+ struct mappedfile *newfile = NULL;
+ int r;
+ ssize_t nwritten;
+ char *towrite = NULL;
+
+ r = mappedfile_open(&newfile, newname, MAPPEDFILE_CREATE|MAPPEDFILE_RW);
+ if (r) goto done;
+ r = mappedfile_writelock(newfile);
+ if (r) goto done;
+
+ towrite = strarray_join(new, " ");
+ nwritten = mappedfile_pwrite(newfile, towrite, strlen(towrite), 0);
+ free(towrite);
+ if (nwritten < 0) {
+	/* commit anyway so mappedfile doesn't have kittens
+	 * about the map being closed dirty */
+	r = IMAP_IOERROR;
+	mappedfile_commit(newfile);
+	goto done;
+ }
+
+ r = mappedfile_commit(newfile);
+ if (r) goto done;
+
+ r = mappedfile_rename(newfile, mappedfile_fname(mf));
+ if (r) unlink(newname);
+
+ /* we lose control over the lock here, so we have to release */
+ mappedfile_unlock(mf);
+
+done:
+ if (newfile) {
+	mappedfile_unlock(newfile);
+	mappedfile_close(&newfile);
+ }
+ free(newname);
+
+ return r;
+}
+
+/* if the mappedfile has no content, it needs to be initialised
+ * with some dummy data. Strictly it doesn't, but it makes
+ * reasoning about everything else easier if there's always a
+ * file */
+
+static void inspect_filesystem(const char *mboxname, const char *partition,
+			 strarray_t *found, strarray_t *bogus);
+
+static void _activefile_init(const char *mboxname, const char *partition,
+			 struct mappedfile *activefile)
+{
+ int r = mappedfile_writelock(activefile);
+ const char *tier = config_getstring(IMAPOPT_DEFAULTSEARCHTIER);
+ strarray_t *list = NULL;
+
+ /* failed to lock, doh */
+ if (r) return;
+
+ /* did someone beat us to it? */
+ if (mappedfile_size(activefile)) {
+	mappedfile_unlock(activefile);
+	return;
+ }
+
+ list = strarray_new();
+ inspect_filesystem(mboxname, partition, list, NULL);
+ /* always put the next item on the front so we don't write to any
+ * existing databases */
+ strarray_unshiftm(list, activefile_nextname(list, tier));
+
+ activefile_write(activefile, list);
+
+ strarray_free(list);
+}
+
+static strarray_t *activefile_open(const char *mboxname, const char *partition,
+				 struct mappedfile **activefile, int write)
+{
+ char *fname = activefile_fname(mboxname);
+ int r;
+
+ if (!fname) return NULL;
+
+ /* try to open the file, and populate with initial values if it's empty */
+ r = mappedfile_open(activefile, fname, MAPPEDFILE_CREATE|MAPPEDFILE_RW);
+ if (!r && !mappedfile_size(*activefile))
+	_activefile_init(mboxname, partition, *activefile);
+ free(fname);
+
+ if (r) return NULL;
+
+ /* take the requested lock (a better helper API would allow this to be
+ * specified as part of the open call, but here's where we are */
+ if (write) r = mappedfile_writelock(*activefile);
+ else r = mappedfile_readlock(*activefile);
+ if (r) return NULL;
+
+ /* finally, read the contents */
+ return activefile_read(*activefile);
+}
+
+/* given an item from the activefile file, and the mboxname and partition
+ * to calculate the user, find the path. If dostat is true, also stat the
+ * path and return NULL if it doesn't exist (used for filtering databases
+ * to actually search in */
+static char *activefile_path(const char *mboxname, const char *part, const char *item, int dostat)
+{
+ char *basedir = NULL;
+ struct buf buf = BUF_INITIALIZER;
+ char *dest = NULL;
+ struct activeitem *ai = activeitem_parse(item);
+
+ xapian_basedir(ai->tier, mboxname, part, NULL, &basedir);
+ if (!basedir) goto out;
+ buf_printf(&buf, "%s%s", basedir, XAPIAN_DIRNAME);
+ free(basedir);
+
+ if (ai->generation)
+	buf_printf(&buf, ".%d", ai->generation);
+
+ dest = buf_release(&buf);
+
+ if (dostat) {
+	struct stat sbuf;
+	if (stat(dest, &sbuf)) {
+	 if (errno != ENOENT)
+		syslog(LOG_ERR, "IOERROR: can't read %s for search, check permissions: %m", dest);
+	 free(dest);
+	 dest = NULL;
+	}
+ }
+
+out:
+ activeitem_free(ai);
+ return dest;
+}
+
+/* convert an array of activefile items to an array of database paths,
+ * optionally stripping records where the path doesn't exist */
+static strarray_t *activefile_resolve(const char *mboxname, const char *part,
+					const strarray_t *items, int dostat)
+{
+ strarray_t *result = strarray_new();
+ int i;
+
+ for (i = 0; i < items->count; i++) {
+	char *dir = activefile_path(mboxname, part, strarray_nth(items, i), dostat);
+	if (dir) strarray_appendm(result, dir);
+ }
+
+ return result;
+}
+
+/* ====================================================================== */
+
+/* the filesystem layout is inspectable - this is useful for a couple of
+ * purposes - both rebuilding the activefile if it's lost, and also finding
+ * stale "missing" directories after a successful rebuild */
+
+struct inspectrock {
+ const char *mboxname;
+ const char *partition;
+ strarray_t *found;
+ strarray_t *bogus;
+};
+
+static void inspect_check(const char *key, const char *val __attribute__((unused)), void *rock)
+{
+ struct inspectrock *ir = (struct inspectrock *)rock;
+ const char *match = strstr(key, "searchpartition-");
+ char *basedir = NULL;
+ char *tier = NULL;
+ char *fname = NULL;
+ DIR *dirh = NULL;
+ struct dirent *de;
+ bit64 generation;
+ const char *rest;
+
+ if (!match) goto out;
+ tier = xstrndup(key, match - key);
+
+ if (xapian_basedir(tier, ir->mboxname, ir->partition, NULL, &basedir))
+	goto out;
+
+ dirh = opendir(basedir);
+ if (!dirh) goto out;
+
+ while ((de = readdir(dirh))) {
+	generation = 0;
+	if (de->d_name0 == '.') continue;
+	free(fname);
+	fname = strconcat(basedir, "/", de->d_name, (char *)NULL);
+	/* only 'xapian' directories allowed */
+	if (strncmp(de->d_name, "xapian", 6)) goto bogus;
+
+	/* xapian by itself is tier zero */
+	if (de->d_name6) {
+	 /* otherwise it's xapian.generation */
+	 if (de->d_name6 != '.') goto bogus;
+
+	 /* unless it exactly matches digits, it's either got .NEW on the end or is
+	 * likewise bogus, track it */
+	 if (parsenum(de->d_name + 7, &rest, strlen(de->d_name)-7, &generation) || rest0)
+		goto bogus;
+	}
+
+	/* found one! */
+	strarray_appendm(ir->found, activeitem_generate(tier, (int)generation));
+	continue;
+
+bogus:
+	if (ir->bogus) {
+	 strarray_appendm(ir->bogus, fname);
+	 fname = NULL;
+	}
+ }
+
+out:
+ if (dirh) closedir(dirh);
+ free(fname);
+ free(basedir);
+ free(tier);
+}
+
+static void inspect_filesystem(const char *mboxname, const char *partition,
+			 strarray_t *found, strarray_t *bogus)
+{
+ struct inspectrock rock;
+
+ rock.mboxname = mboxname;
+ rock.partition = partition;
+ rock.found = found;
+ rock.bogus = bogus;
+
+ config_foreachoverflowstring(inspect_check, &rock);
+}
+
+/* ====================================================================== */
+
+/* The "indexed database" contains information about which cyrus messages
+ * are indexed in this sphinx directory. The keys are mailbox.uidvalidity
+ * and the values are "version sequence", where sequence is an IMAP-style
+ * sequence of UIDs. This allows squatter to quickly determine which
+ * messages are not yet indexed in any active database. */
+
+/* parse both the old version 1 (just max UID rather than range) and
+ * current version sequence from a mapped database value */
+static struct seqset *parse_indexed(const char *data, size_t datalen)
+{
+ struct seqset *seq = NULL;
+ const char *rest;
+ bit64 version;
+ char *val;
+
+ if (parsenum(data, &rest, datalen, &version))
+	return NULL;
+
+ if (*rest++ != ' ')
+	return NULL;
+
+ switch(version) {
+ case 1:
+	{
+	 char buf20;
+	 snprintf(buf, 20, "1:%.*s", (int)(datalen - (rest - data)), rest);
+	 return seqset_parse(buf, NULL, 0);
+	}
+ case 2:
+	val = xstrndup(rest, datalen - (rest - data));
+	seq = seqset_parse(val, NULL, 0);
+	free(val);
+	return seq;
+ }
+
+ return NULL;
+}
+
+/*
+ * Read the most indexed UIDs sequence for the current mailbox
+ * from the cyrus.indexed DB in each xapian directory and join
+ * them into a single result.
+ * Returns 0 on success or an IMAP error code.
+ */
+static int read_indexed(const strarray_t *paths,
+		 const char *mboxname,
+		 uint32_t uidvalidity,
+		 struct seqset *res,
+		 int verbose)
+{
+ struct db *db = NULL;
+ struct buf path = BUF_INITIALIZER;
+ struct buf key = BUF_INITIALIZER;
+ const char *data = NULL;
+ size_t datalen = 0;
+ int r = 0;
+ int i;
+
+ buf_printf(&key, "%s.%u", mboxname, uidvalidity);
+
+ for (i = 0; i < paths->count; i++) {
+	struct seqset *seq;
+	buf_reset(&path);
+	buf_printf(&path, "%s%s", strarray_nth(paths, i), INDEXEDDB_FNAME);
+	if (verbose > 1)
+	 syslog(LOG_INFO, "read_indexed db=%s mailbox=%s uidvalidity=%u",
+		 buf_cstring(&path), mboxname, uidvalidity);
+
+	r = cyrusdb_open(config_getstring(IMAPOPT_SEARCH_INDEXED_DB),
+			 buf_cstring(&path), 0, &db);
+	if (r == CYRUSDB_NOTFOUND) {
+	 r = 0;
+	 if (verbose > 1)
+		syslog(LOG_INFO, "read_indexed no db for %s",
+		 buf_cstring(&path));
+	 continue;
+	}
+	if (r) goto out;
+
+	r = cyrusdb_fetch(db,
+			 key.s, key.len,
+			 &data, &datalen,
+			 (struct txn **)NULL);
+	if (r == CYRUSDB_NOTFOUND) {
+	 r = 0;
+	 cyrusdb_close(db);
+	 db = NULL;
+	 if (verbose > 1)
+		syslog(LOG_INFO, "read_indexed no record for %s: %.*s",
+		 buf_cstring(&path), (int)key.len, key.s);
+	 continue;
+	}
+	if (r) goto out;
+
+	seq = parse_indexed(data, datalen);
+	if (seq) {
+	 seqset_join(res, seq);
+	 seqset_free(seq);
+	 if (verbose > 1)
+		syslog(LOG_INFO, "read_indexed seq=%.*s", (int)datalen, data);
+	}
+
+	cyrusdb_close(db);
+	db = NULL;
+ }
+
+out:
+ if (db)
+	cyrusdb_close(db);
+ buf_free(&key);
+ buf_free(&path);
+
+ return r;
+}
+
+/* store the given sequence into the already opened cyrus db
+ * with the given key. If there is an existing sequence in
+ * the DB, then join this sequence to it, so incremental
+ * indexing does what you would expect. */
+static int store_indexed(struct db *db, struct txn **tid,
+			 const char *key, size_t keylen,
+			 const struct seqset *val)
+{
+ struct buf data = BUF_INITIALIZER;
+ char *str = NULL;
+ int r;
+ const char *olddata = NULL;
+ size_t oldlen = 0;
+
+ r = cyrusdb_fetch(db, key, keylen, &olddata, &oldlen, tid);
+ if (r == CYRUSDB_NOTFOUND) {
+	str = seqset_cstring(val);
+ }
+ else if (r) return r;
+ else {
+	struct seqset *seq = parse_indexed(olddata, oldlen);
+	if (seq) {
+	 seqset_join(seq, val);
+	 str = seqset_cstring(seq);
+	 seqset_free(seq);
+	}
+	else {
+	 str = seqset_cstring(val);
+	}
+ }
+
+ if (!str) return 0;
+
+ buf_printf(&data, "%u %s", INDEXEDDB_VERSION, str);
+ r = cyrusdb_store(db, key, keylen, data.s, data.len, tid);
+ buf_free(&data);
+ free(str);
+
+ return r;
+}
+
+/* Given the directory of a xapian database which has just had
+ * messages indexed into it, add the sequence of UIDs to the
+ * record for the given mailbox and uidvalidity */
+static int write_indexed(const char *dir,
+			 const char *mboxname,
+			 uint32_t uidvalidity,
+			 struct seqset *seq,
+			 int verbose)
+{
+ struct buf path = BUF_INITIALIZER;
+ struct buf key = BUF_INITIALIZER;
+ struct db *db = NULL;
+ struct txn *txn = NULL;
+ int r = 0;
+
+ buf_reset(&path);
+ buf_printf(&path, "%s%s", dir, INDEXEDDB_FNAME);
+
+ if (verbose) {
+	char *str = seqset_cstring(seq);
+	syslog(LOG_INFO, "write_indexed db=%s mailbox=%s uidvalidity=%u uids=%s",
+	 buf_cstring(&path), mboxname, uidvalidity, str);
+	free(str);
+ }
+
+ buf_printf(&key, "%s.%u", mboxname, uidvalidity);
+
+ r = cyrusdb_open(config_getstring(IMAPOPT_SEARCH_INDEXED_DB),
+		 buf_cstring(&path), CYRUSDB_CREATE, &db);
+ if (r) goto out;
+
+ r = store_indexed(db, &txn, key.s, key.len, seq);
+ if (!r)
+	r = cyrusdb_commit(db, txn);
+ else
+	cyrusdb_abort(db, txn);
+
+out:
+ if (db) cyrusdb_close(db);
+ buf_free(&path);
+ buf_free(&key);
+ return r;
+}
+
+/* ====================================================================== */
+
+static int parse_cyrusid(const char *cyrusid,
+			 const char **mboxnamep,
+			 unsigned int *uidvalidityp,
+			 unsigned int *uidp)
+{
+ // user.cassandane.1320711192.196715
+ static struct buf buf = BUF_INITIALIZER;
+ char *p;
+
+ buf_reset(&buf);
+ buf_appendcstr(&buf, cyrusid);
+
+ p = strrchr(buf_cstring(&buf), '.');
+ if (!p)
+	return 0;
+ *p++ = '\0';
+ *uidp = strtoul(p, NULL, 10);
+
+ p = strrchr(buf.s, '.');
+ if (!p)
+	return 0;
+ *p++ = '\0';
+ *uidvalidityp = strtoul(p, NULL, 10);
+
+ *mboxnamep = buf.s;
+
+ return 1;
+}
+
+static const char *make_cyrusid(struct mailbox *mailbox, uint32_t uid)
+{
+ static struct buf buf = BUF_INITIALIZER;
+ // user.cassandane.1320711192.196715
+ buf_reset(&buf);
+ buf_printf(&buf, "%s.%u.%u",
+		 mailbox->name,
+		 mailbox->i.uidvalidity,
+		 uid);
+ return buf_cstring(&buf);
+}
+
+/* XXX - replace with cyrus_mkdir and cyrus_copyfile */
+static void remove_dir(const char *dir)
+{
+ run_command("/bin/rm", "-rf", dir, (char *)NULL);
+}
+
+static int copy_files(const char *fromdir, const char *todir)
+{
+ char *fromdir2 = strconcat(fromdir, "/", (char *)NULL);
+ int r = run_command("/usr/bin/rsync", "-a", fromdir2, todir, (char *)NULL);
+
+ free(fromdir2);
+ return r;
+}
+
+/* ====================================================================== */
+
+struct opnode
+{
+ int op;	/* SEARCH_OP_* or SEARCH_PART_* constant */
+ char *arg;
+ struct opnode *next;
+ struct opnode *children;
+};
+
+typedef struct xapian_builder xapian_builder_t;
+struct xapian_builder {
+ search_builder_t super;
+ struct mappedfile *activefile;
+ struct seqset *indexed;
+ struct mailbox *mailbox;
+ xapian_db_t *db;
+ int opts;
+ struct opnode *root;
+ ptrarray_t stack;	 /* points to opnode* */
+ int (*proc)(const char *, uint32_t, uint32_t, void *);
+ void *rock;
+};
+
+static struct opnode *opnode_new(int op, const char *arg)
+{
+ struct opnode *on = xzmalloc(sizeof(struct opnode));
+ on->op = op;
+ on->arg = xstrdupnull(arg);
+ return on;
+}
+
+static void opnode_delete(struct opnode *on)
+{
+ struct opnode *child;
+ struct opnode *next;
+
+ for (child = on->children ; child ; child = next) {
+	next = child->next;
+	opnode_delete(child);
+ }
+ free(on->arg);
+ free(on);
+}
+
+static void opnode_detach_child(struct opnode *parent, struct opnode *child)
+{
+ struct opnode **prevp;
+
+ for (prevp = &parent->children ; *prevp ; prevp = &((*prevp)->next)) {
+	if (*prevp == child) {
+	 *prevp = child->next;
+	 child->next = NULL;
+	 return;
+	}
+ }
+}
+
+static void opnode_append_child(struct opnode *parent, struct opnode *child)
+{
+ struct opnode **tailp;
+
+ for (tailp = &parent->children ; *tailp ; tailp = &((*tailp)->next))
+	;
+ *tailp = child;
+ child->next = NULL;
+}
+
+static void opnode_insert_child(struct opnode *parent __attribute__((unused)),
+				struct opnode *after,
+				struct opnode *child)
+{
+ child->next = after->next;
+ after->next = child;
+}
+
+static void optimise_nodes(struct opnode *parent, struct opnode *on)
+{
+ struct opnode *child;
+ struct opnode *next;
+
+ switch (on->op) {
+ case SEARCH_OP_NOT:
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+	for (child = on->children ; child ; child = next) {
+	 next = child->next;
+	 optimise_nodes(on, child);
+	}
+	if (parent) {
+	 if (!on->children) {
+		/* empty node - remove it */
+		opnode_detach_child(parent, on);
+		opnode_delete(on);
+	 }
+	 else if (on->op != SEARCH_OP_NOT && !on->children->next) {
+		/* logical AND or OR with only one child - replace
+		 * the node with its child */
+		struct opnode *child = on->children;
+		opnode_detach_child(on, child);
+		opnode_insert_child(parent, on, child);
+		opnode_detach_child(parent, on);
+		opnode_delete(on);
+	 }
+	}
+	break;
+ }
+}
+
+static xapian_query_t *opnode_to_query(const xapian_db_t *db, struct opnode *on)
+{
+ struct opnode *child;
+ xapian_query_t *qq = NULL;
+ int i;
+ ptrarray_t childqueries = PTRARRAY_INITIALIZER;
+
+ switch (on->op) {
+ case SEARCH_OP_NOT:
+	if (on->children)
+	 qq = xapian_query_new_not(db, opnode_to_query(db, on->children));
+	break;
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+	for (child = on->children ; child ; child = child->next) {
+	 qq = opnode_to_query(db, child);
+	 if (qq) ptrarray_push(&childqueries, qq);
+	}
+	qq = NULL;
+	if (childqueries.count)
+	 qq = xapian_query_new_compound(db, (on->op == SEARCH_OP_OR),
+					 (xapian_query_t **)childqueries.data,
+					 childqueries.count);
+	break;
+ case SEARCH_PART_ANY:
+	/* Xapian does not have a convenient way of search for "any
+	 * field"; instead we fake it by explicitly searching for
+	 * all of the available prefixes */
+	for (i = 0 ; i < SEARCH_NUM_PARTS ; i++) {
+	 if (prefix_by_parti != NULL)
+		ptrarray_push(&childqueries,
+			 xapian_query_new_match(db, prefix_by_parti, on->arg));
+	}
+	qq = xapian_query_new_compound(db, /*is_or*/1,
+				 (xapian_query_t **)childqueries.data,
+				 childqueries.count);
+	break;
+ default:
+	assert(on->arg != NULL);
+	assert(on->children == NULL);
+	qq = xapian_query_new_match(db, prefix_by_parton->op, on->arg);
+	break;
+ }
+ ptrarray_fini(&childqueries);
+ return qq;
+}
+
+static int xapian_run_cb(const char *cyrusid, void *rock)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)rock;
+ int r;
+ const char *mboxname;
+ unsigned int uidvalidity;
+ unsigned int uid;
+
+ r = parse_cyrusid(cyrusid, &mboxname, &uidvalidity, &uid);
+ if (!r) {
+	syslog(LOG_ERR, "IOERROR: Cannot parse \"%s\" as cyrusid", cyrusid);
+	return IMAP_IOERROR;
+ }
+
+ if (!(bb->opts & SEARCH_MULTIPLE)) {
+	if (strcmp(mboxname, bb->mailbox->name))
+	 return 0;
+	if (uidvalidity != bb->mailbox->i.uidvalidity)
+	 return 0;
+ }
+
+ xstats_inc(SPHINX_RESULT);
+ return bb->proc(mboxname, uidvalidity, uid, bb->rock);
+}
+
+static int run(search_builder_t *bx, search_hit_cb_t proc, void *rock)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+ xapian_query_t *qq = NULL;
+ int r = 0;
+
+ if (bb->db == NULL)
+	return IMAP_NOTFOUND;	 /* there's no index for this user */
+
+ optimise_nodes(NULL, bb->root);
+ qq = opnode_to_query(bb->db, bb->root);
+
+ bb->proc = proc;
+ bb->rock = rock;
+
+ r = xapian_query_run(bb->db, qq, xapian_run_cb, bb);
+ if (r) goto out;
+
+ /* add in the unindexed uids as false positives */
+ if ((bb->opts & SEARCH_UNINDEXED)) {
+	uint32_t uid;
+	for (uid = seqset_firstnonmember(bb->indexed);
+	 uid <= bb->mailbox->i.last_uid ; uid++) {
+	 xstats_inc(SPHINX_UNINDEXED);
+	 r = proc(bb->mailbox->name, bb->mailbox->i.uidvalidity, uid, rock);
+	 if (r) goto out;
+	}
+ }
+
+out:
+ if (qq) xapian_query_free(qq);
+ return r;
+}
+
+static void begin_boolean(search_builder_t *bx, int op)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+ struct opnode *top = ptrarray_tail(&bb->stack);
+ struct opnode *on = opnode_new(op, NULL);
+ if (top)
+	opnode_append_child(top, on);
+ else
+	bb->root = on;
+ ptrarray_push(&bb->stack, on);
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "begin_boolean(op=%s)", search_op_as_string(op));
+}
+
+static void end_boolean(search_builder_t *bx, int op __attribute__((unused)))
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "end_boolean");
+ ptrarray_pop(&bb->stack);
+}
+
+static void match(search_builder_t *bx, int part, const char *str)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+ struct opnode *top = ptrarray_tail(&bb->stack);
+ struct opnode *on;
+
+ if (!str) return;
+ if (SEARCH_VERBOSE(bb->opts))
+	syslog(LOG_INFO, "match(part=%s, str=\"%s\")",
+	 search_part_as_string(part), str);
+
+ xstats_inc(SPHINX_MATCH);
+
+ on = opnode_new(part, str);
+ if (top)
+	opnode_append_child(top, on);
+ else
+	bb->root = on;
+}
+
+static void *get_internalised(search_builder_t *bx)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+ struct opnode *on = bb->root;
+ bb->root = NULL;
+ optimise_nodes(NULL, on);
+ return on;
+}
+
+static char *describe_internalised(void *internalised __attribute__((unused)))
+{
+ return xstrdup("--xapian query--");
+}
+
+static void free_internalised(void *internalised)
+{
+ struct opnode *on = (struct opnode *)internalised;
+ if (on) opnode_delete(on);
+}
+
+static search_builder_t *begin_search(struct mailbox *mailbox, int opts)
+{
+ xapian_builder_t *bb;
+ strarray_t *dirs = NULL;
+ strarray_t *active = NULL;
+ int r;
+
+ xapian_init();
+
+ bb = xzmalloc(sizeof(xapian_builder_t));
+ bb->super.begin_boolean = begin_boolean;
+ bb->super.end_boolean = end_boolean;
+ bb->super.match = match;
+ bb->super.get_internalised = get_internalised;
+ bb->super.run = run;
+
+ bb->mailbox = mailbox;
+ bb->opts = opts;
+
+ /* need to hold a read-only lock on the activefile file until the search
+ * has completed to ensure no databases are deleted out from under us */
+ active = activefile_open(mailbox->name, mailbox->part, &bb->activefile, /*write*/0);
+ if (!active) goto out;
+
+ /* only try to open directories with databases in them */
+ dirs = activefile_resolve(mailbox->name, mailbox->part, active, /*dostat*/1);
+ if (!dirs || !dirs->count) goto out;
+
+ /* if there are directories, open the databases */
+ bb->db = xapian_db_open((const char **)dirs->data);
+ if (!bb->db) goto out;
+
+ /* read the list of all indexed messages to allow (optional) false positives
+ * for unindexed messages */
+ bb->indexed = seqset_init(0, SEQ_MERGE);
+ r = read_indexed(dirs, mailbox->name, mailbox->i.uidvalidity, bb->indexed, /*verbose*/0);
+ if (r) goto out;
+
+ if ((opts & SEARCH_MULTIPLE))
+	xstats_inc(SPHINX_MULTIPLE);
+ else
+	xstats_inc(SPHINX_SINGLE);
+
+out:
+ strarray_free(dirs);
+ strarray_free(active);
+ return &bb->super;
+}
+
+static void end_search(search_builder_t *bx)
+{
+ xapian_builder_t *bb = (xapian_builder_t *)bx;
+
+ seqset_free(bb->indexed);
+ ptrarray_fini(&bb->stack);
+ if (bb->root) opnode_delete(bb->root);
+
+ if (bb->db) xapian_db_close(bb->db);
+
+ /* now that the databases are closed, it's safe to unlock
+ * the active file */
+ if (bb->activefile) {
+	mappedfile_unlock(bb->activefile);
+	mappedfile_close(&bb->activefile);
+ }
+
+ free(bx);
+}
+
+/* ====================================================================== */
+
+/* base class for both update and snippet receivers */
+typedef struct xapian_receiver xapian_receiver_t;
+struct xapian_receiver
+{
+ search_text_receiver_t super;
+ int verbose;
+ struct mailbox *mailbox;
+ uint32_t uid;
+ int part;
+ unsigned int parts_total;
+ int truncate_warning;
+ ptrarray_t segs;
+};
+
+/* receiver used for updating the index */
+typedef struct xapian_update_receiver xapian_update_receiver_t;
+struct xapian_update_receiver
+{
+ xapian_receiver_t super;
+ xapian_dbw_t *dbw;
+ struct mappedfile *activefile;
+ unsigned int uncommitted;
+ unsigned int commits;
+ struct seqset *oldindexed;
+ struct seqset *indexed;
+ strarray_t *activedirs;
+};
+
+/* receiver used for extracting snippets after a search */
+typedef struct xapian_snippet_receiver xapian_snippet_receiver_t;
+struct xapian_snippet_receiver
+{
+ xapian_receiver_t super;
+ xapian_snipgen_t *snipgen;
+ struct opnode *root;
+ search_snippet_cb_t proc;
+ void *rock;
+};
+
+/* Maximum size of a query, determined empirically, is a little bit
+ * under 8MB. That seems like more than enough, so let's limit the
+ * total amount of parts text to 4 MB. */
+#define MAX_PARTS_SIZE	 (4*1024*1024)
+
+static const char *xapian_rootdir(const char *tier, const char *partition)
+{
+ char *confkey;
+ const char *root;
+ if (!partition)
+	partition = config_getstring(IMAPOPT_DEFAULTPARTITION);
+ confkey = strconcat(tier, "searchpartition-", partition, NULL);
+ root = config_getoverflowstring(confkey, NULL);
+ free(confkey);
+ return root;
+}
+
+/* Returns in *basedirp a new string which must be free()d */
+static int xapian_basedir(const char *tier,
+			 const char *mboxname, const char *partition,
+			 const char *root, char **basedirp)
+{
+ char *basedir = NULL;
+ struct mboxname_parts parts;
+ char c2, d2;
+ int r;
+
+ mboxname_init_parts(&parts);
+
+ if (!root)
+	root = xapian_rootdir(tier, partition);
+ if (!root) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ r = mboxname_to_parts(mboxname, &parts);
+ if (r) goto out;
+ if (!parts.userid) {
+	r = IMAP_PARTITION_UNKNOWN;
+	goto out;
+ }
+
+ if (parts.domain)
+	basedir = strconcat(root,
+			 FNAME_DOMAINDIR,
+			 dir_hash_b(parts.domain, config_fulldirhash, d),
+			 "/", parts.domain,
+			 "/", dir_hash_b(parts.userid, config_fulldirhash, c),
+			 FNAME_USERDIR,
+			 parts.userid,
+			 (char *)NULL);
+ else
+	basedir = strconcat(root,
+			 "/", dir_hash_b(parts.userid, config_fulldirhash, c),
+			 FNAME_USERDIR,
+			 parts.userid,
+			 (char *)NULL);
+
+ r = 0;
+
+out:
+ if (!r && basedirp)
+	*basedirp = basedir;
+ else
+	free(basedir);
+ mboxname_free_parts(&parts);
+ return r;
+}
+
+static int check_directory(const char *dir, int verbose, int create)
+{
+ int r;
+ char *dummyfile = NULL;
+ struct stat sb;
+
+ r = stat(dir, &sb);
+ if (r < 0) {
+	if (errno != ENOENT) {
+	 /* something went wrong - permissions problem most likely */
+	 syslog(LOG_ERR, "IOERROR: unable to stat %s: %m", dir);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+	/* the directory is just missing */
+	if (!create) {
+	 /* caller doesn't care that much */
+	 r = IMAP_NOTFOUND;
+	 goto out;
+	}
+	if (verbose)
+	 syslog(LOG_INFO, "Building directory %s", dir);
+	dummyfile = strconcat(dir, "/dummy", (char *)NULL);
+	cyrus_mkdir(dummyfile, 0700);
+	r = stat(dir, &sb);
+	if (r < 0) {
+	 /* something went wrong - permissions problem most likely */
+	 syslog(LOG_ERR, "IOERROR: unable to stat %s: %m", dir);
+	 r = IMAP_IOERROR;
+	 goto out;
+	}
+ }
+
+out:
+ free(dummyfile);
+ return r;
+}
+
+static int flush(search_text_receiver_t *rx)
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+ int r = 0;
+ struct timeval start, end;
+
+ if (!tr->uncommitted) return 0;
+
+ assert(tr->dbw);
+
+ gettimeofday(&start, NULL);
+ r = xapian_dbw_commit_txn(tr->dbw);
+ if (r) goto out;
+ gettimeofday(&end, NULL);
+
+ syslog(LOG_INFO, "Xapian committed %u updates in %.6f sec",
+		tr->uncommitted, timesub(&start, &end));
+
+ /* We write out the indexed list for the mailbox only after successfully
+ * updating the index, to avoid a future instance not realising that
+ * there are unindexed messages should we fail to index */
+ r = write_indexed(strarray_nth(tr->activedirs, 0),
+		 tr->super.mailbox->name, tr->super.mailbox->i.uidvalidity,
+		 tr->indexed, tr->super.verbose);
+ if (r) goto out;
+
+ tr->uncommitted = 0;
+ tr->commits++;
+
+out:
+ return r;
+}
+
+static void free_segments(xapian_receiver_t *tr)
+{
+ int i;
+ struct segment *seg;
+
+ for (i = 0 ; i < tr->segs.count ; i++) {
+	seg = (struct segment *)ptrarray_nth(&tr->segs, i);
+	buf_free(&seg->text);
+	free(seg);
+ }
+ ptrarray_truncate(&tr->segs, 0);
+}
+
+static void begin_message(search_text_receiver_t *rx, uint32_t uid)
+{
+ xapian_receiver_t *tr = (xapian_receiver_t *)rx;
+
+ tr->uid = uid;
+ free_segments(tr);
+ tr->parts_total = 0;
+ tr->truncate_warning = 0;
+}
+
+static void begin_part(search_text_receiver_t *rx, int part)
+{
+ xapian_receiver_t *tr = (xapian_receiver_t *)rx;
+
+ tr->part = part;
+}
+
+static void append_text(search_text_receiver_t *rx,
+			const struct buf *text)
+{
+ xapian_receiver_t *tr = (xapian_receiver_t *)rx;
+ struct segment *seg;
+
+ if (tr->part) {
+	unsigned len = text->len;
+	if (tr->parts_total + len > MAX_PARTS_SIZE) {
+	 if (!tr->truncate_warning++)
+		syslog(LOG_ERR, "Xapian: truncating text from "
+				"message mailbox %s uid %u",
+				tr->mailbox->name, tr->uid);
+	 len = MAX_PARTS_SIZE - tr->parts_total;
+	}
+	if (len) {
+	 tr->parts_total += len;
+
+	 seg = (struct segment *)ptrarray_tail(&tr->segs);
+	 if (!seg || seg->is_finished || seg->part != tr->part) {
+		seg = (struct segment *)xzmalloc(sizeof(*seg));
+		seg->sequence = tr->segs.count;
+		seg->part = tr->part;
+		ptrarray_append(&tr->segs, seg);
+	 }
+	 buf_appendmap(&seg->text, text->s, len);
+	}
+ }
+}
+
+static void end_part(search_text_receiver_t *rx,
+		 int part __attribute__((unused)))
+{
+ xapian_receiver_t *tr = (xapian_receiver_t *)rx;
+ struct segment *seg;
+
+ seg = (struct segment *)ptrarray_tail(&tr->segs);
+ if (seg)
+	seg->is_finished = 1;
+
+ if (tr->verbose > 1)
+	syslog(LOG_NOTICE, "Xapian: %llu bytes in part %s",
+	 (seg ? (unsigned long long)seg->text.len : 0),
+	 search_part_as_string(tr->part));
+
+ tr->part = 0;
+}
+
+static int compare_segs(const void **v1, const void **v2)
+{
+ const struct segment *s1 = *(const struct segment **)v1;
+ const struct segment *s2 = *(const struct segment **)v2;
+ int r;
+
+ r = s1->part - s2->part;
+ if (!r)
+	r = s1->sequence - s2->sequence;
+ return r;
+}
+
+static int end_message_update(search_text_receiver_t *rx)
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+ int i;
+ struct segment *seg;
+ int r = 0;
+
+ if (!tr->dbw) return IMAP_INTERNAL;
+
+ r = xapian_dbw_begin_doc(tr->dbw, make_cyrusid(tr->super.mailbox, tr->super.uid));
+ if (r) goto out;
+
+ ptrarray_sort(&tr->super.segs, compare_segs);
+
+ for (i = 0 ; i < tr->super.segs.count ; i++) {
+	seg = (struct segment *)ptrarray_nth(&tr->super.segs, i);
+	r = xapian_dbw_doc_part(tr->dbw, &seg->text, prefix_by_partseg->part);
+	if (r) goto out;
+ }
+
+ if (!tr->uncommitted) {
+	r = xapian_dbw_begin_txn(tr->dbw);
+	if (r) goto out;
+ }
+ r = xapian_dbw_end_doc(tr->dbw);
+ if (r) goto out;
+ ++tr->uncommitted;
+ /* track that this UID was indexed. Use SEQ_MERGE to avoid a bitty sequence
+ * with lots of holes in it if messages have been expunged meanwhile. */
+ if (!tr->indexed) {
+	tr->indexed = seqset_init(0, SEQ_MERGE);
+ }
+ seqset_add(tr->indexed, tr->super.uid, 1);
+
+out:
+ tr->super.uid = 0;
+ return r;
+}
+
+static int begin_mailbox_update(search_text_receiver_t *rx,
+				struct mailbox *mailbox,
+				int flags __attribute__((unused)))
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+ char *fname = activefile_fname(mailbox->name);
+ strarray_t *active = NULL;
+ int r = 0;
+
+ /* not an indexable mailbox, fine - return a code to avoid
+ * trying to index each message as well */
+ if (!fname) {
+	r = IMAP_MAILBOX_NONEXISTENT;
+	goto out;
+ }
+
+ /* XXX - there's an annoying lock inversion going on here. We have to release
+ * the mailbox lock and then re-establish it after we have the xapianactive file
+ * open. We should really just get an mboxname passed down to this layer, but
+ * that's a much bigger rewrite due to disparate actions being squeezed into an
+ * identical API */
+ mailbox_unlock_index(mailbox, NULL);
+
+ /* XXX - if not incremental, we actually want to throw away all existing up to
+ * this point and write a new one, so we should launch a new file and then
+ * reindex using the same algorithm as the "compress" codepath. The
+ * problem is that the index is per user, not per mailbox */
+
+ /* we grab an activefile writelock to index. Strictly we don't need it, but
+ * doing this guarantees we never write under a client which is reading, which
+ * avoids this:
+ *
+ * IOERROR: Xapian: caught exception: : DatabaseModifiedError: The revision
+ * being read has been discarded - you should call Xapian::Database::reopen()
+ * and retry the operation
+ *
+ * in theory, this will go away eventually, and we can switch back to write: 0
+ * in this code.
+ *
+ * http://grokbase.com/t/xapian/xapian-discuss/0667ppbks8/#20060608j8x5aeept49dv5fm8d02xkczgr
+ *
+ * "This is almost invariably caused by updating a database while reading
+ * from it. If two updates are committed before the read completes, you
+ * get this error (it's DatabaseModifiedError). It's a bit of a pain
+ * and will be going away in the future, but it's not too hard to design
+ * to avoid it happening at least."
+ */
+ active = activefile_open(mailbox->name, mailbox->part, &tr->activefile, /*write*/1);
+ if (!active || !active->count) goto out;
+
+ /* doesn't matter if the first one doesn't exist yet, we'll create it */
+ tr->activedirs = activefile_resolve(mailbox->name, mailbox->part, active, /*dostat*/0);
+ if (!tr->activedirs || !tr->activedirs->count) goto out;
+
+ /* create the directory if needed */
+ r = check_directory(strarray_nth(tr->activedirs, 0), tr->super.verbose, /*create*/1);
+ if (r) goto out;
+
+ /* open the DB */
+ r = xapian_dbw_open(strarray_nth(tr->activedirs, 0), &tr->dbw);
+ if (r) goto out;
+
+ /* read the indexed data from every directory so know what still needs indexing */
+ tr->oldindexed = seqset_init(0, SEQ_MERGE);
+ r = read_indexed(tr->activedirs, mailbox->name, mailbox->i.uidvalidity,
+		 tr->oldindexed, tr->super.verbose);
+ if (r) goto out;
+
+ /* XXX - and of course we have to lock again! (XXX - no support for the nonblocking bit
+ * on this second lock... *sigh*) We don't have the flags to know that we wanted it */
+ r = mailbox_lock_index(mailbox, LOCK_SHARED);
+ if (r) goto out;
+
+ tr->super.mailbox = mailbox;
+
+out:
+ free(fname);
+ strarray_free(active);
+ return r;
+}
+
+static uint32_t first_unindexed_uid(search_text_receiver_t *rx)
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+
+ if (!tr->oldindexed)
+	return 1;
+
+ return seqset_firstnonmember(tr->oldindexed);
+}
+
+static int is_indexed(search_text_receiver_t *rx, uint32_t uid)
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+
+ return (seqset_ismember(tr->oldindexed, uid) || seqset_ismember(tr->indexed, uid));
+}
+
+static int end_mailbox_update(search_text_receiver_t *rx,
+			 struct mailbox *mailbox
+			 __attribute__((unused)))
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+ int r = 0;
+
+ r = flush(rx);
+
+ /* flush before cleaning up, since indexed data is written by flush */
+ if (tr->indexed) {
+	seqset_free(tr->indexed);
+	tr->indexed = NULL;
+ }
+ if (tr->oldindexed) {
+	seqset_free(tr->oldindexed);
+	tr->oldindexed = NULL;
+ }
+
+ tr->super.mailbox = NULL;
+
+ if (tr->dbw) {
+	xapian_dbw_close(tr->dbw);
+	tr->dbw = NULL;
+ }
+
+ /* don't unlock until DB is committed */
+ if (tr->activefile) {
+	mappedfile_unlock(tr->activefile);
+	mappedfile_close(&tr->activefile);
+	tr->activefile = NULL;
+ }
+
+ if (tr->activedirs) {
+	strarray_free(tr->activedirs);
+	tr->activedirs = NULL;
+ }
+
+ return r;
+}
+
+static search_text_receiver_t *begin_update(int verbose)
+{
+ xapian_update_receiver_t *tr;
+
+ xapian_init();
+
+ tr = xzmalloc(sizeof(xapian_update_receiver_t));
+ tr->super.super.begin_mailbox = begin_mailbox_update;
+ tr->super.super.first_unindexed_uid = first_unindexed_uid;
+ tr->super.super.is_indexed = is_indexed;
+ tr->super.super.begin_message = begin_message;
+ tr->super.super.begin_part = begin_part;
+ tr->super.super.append_text = append_text;
+ tr->super.super.end_part = end_part;
+ tr->super.super.end_message = end_message_update;
+ tr->super.super.end_mailbox = end_mailbox_update;
+ tr->super.super.flush = flush;
+
+ tr->super.verbose = verbose;
+
+ return &tr->super.super;
+}
+
+static void free_receiver(xapian_receiver_t *tr)
+{
+ free_segments(tr);
+ ptrarray_fini(&tr->segs);
+ free(tr);
+}
+
+static int end_update(search_text_receiver_t *rx)
+{
+ xapian_update_receiver_t *tr = (xapian_update_receiver_t *)rx;
+
+ free_receiver(&tr->super);
+
+ return 0;
+}
+
+static int begin_mailbox_snippets(search_text_receiver_t *rx,
+				 struct mailbox *mailbox,
+				 int incremental __attribute__((unused)))
+{
+ xapian_snippet_receiver_t *tr = (xapian_snippet_receiver_t *)rx;
+
+ tr->super.mailbox = mailbox;
+
+ return 0;
+}
+
+/* Find match terms for the given part and add them to the Xapian
+ * snippet generator. */
+static void generate_snippet_terms(xapian_snipgen_t *snipgen,
+				 int part,
+				 struct opnode *on)
+{
+ struct opnode *child;
+
+ switch (on->op) {
+
+ case SEARCH_OP_NOT:
+ case SEARCH_OP_OR:
+ case SEARCH_OP_AND:
+	for (child = on->children ; child ; child = child->next)
+	 generate_snippet_terms(snipgen, part, child);
+	break;
+
+ case SEARCH_PART_ANY:
+	assert(on->children == NULL);
+	if (part != SEARCH_PART_HEADERS ||
+	 !config_getswitch(IMAPOPT_SPHINX_TEXT_EXCLUDES_ODD_HEADERS)) {
+	 xapian_snipgen_add_match(snipgen, on->arg);
+	}
+	break;
+
+ default:
+	/* other SEARCH_PART_* constants */
+	assert(on->op >= 0 && on->op < SEARCH_NUM_PARTS);
+	assert(on->children == NULL);
+	if (part == on->op) {
+	 xapian_snipgen_add_match(snipgen, on->arg);
+	}
+	break;
+ }
+}
+
+static int end_message_snippets(search_text_receiver_t *rx)
+{
+ xapian_snippet_receiver_t *tr = (xapian_snippet_receiver_t *)rx;
+ struct buf snippets = BUF_INITIALIZER;
+ unsigned int context_length;
+ int i;
+ struct segment *seg;
+ int last_part = -1;
+ int r;
+
+ if (!tr->snipgen) {
+	r = IMAP_INTERNAL;	 /* need to call begin_mailbox() */
+	goto out;
+ }
+ if (!tr->root) {
+	r = 0;
+	goto out;
+ }
+
+ ptrarray_sort(&tr->super.segs, compare_segs);
+
+ for (i = 0 ; i < tr->super.segs.count ; i++) {
+	seg = (struct segment *)ptrarray_nth(&tr->super.segs, i);
+
+	if (seg->part != last_part) {
+
+	 if (last_part != -1) {
+		r = xapian_snipgen_end_doc(tr->snipgen, &snippets);
+		if (!r && snippets.len)
+		 r = tr->proc(tr->super.mailbox, tr->super.uid, last_part, snippets.s, tr->rock);
+		if (r) break;
+	 }
+
+	 /* TODO: UINT_MAX doesn't behave as expected, which is probably
+	 * a bug, but really any value larger than a reasonable Subject
+	 * length will do */
+	 context_length = (seg->part == SEARCH_PART_HEADERS || seg->part == SEARCH_PART_BODY ? 5 : 1000000);
+	 r = xapian_snipgen_begin_doc(tr->snipgen, context_length);
+	 if (r) break;
+
+	 generate_snippet_terms(tr->snipgen, seg->part, tr->root);
+	}
+
+	r = xapian_snipgen_doc_part(tr->snipgen, &seg->text);
+	if (r) break;
+
+	last_part = seg->part;
+ }
+
+ if (last_part != -1) {
+	r = xapian_snipgen_end_doc(tr->snipgen, &snippets);
+	if (!r && snippets.len)
+	 r = tr->proc(tr->super.mailbox, tr->super.uid, last_part, snippets.s, tr->rock);
+ }
+
+out:
+ buf_free(&snippets);
+ return r;
+}
+
+static int end_mailbox_snippets(search_text_receiver_t *rx,
+				struct mailbox *mailbox
+				 __attribute__((unused)))
+{
+ xapian_snippet_receiver_t *tr = (xapian_snippet_receiver_t *)rx;
+
+ tr->super.mailbox = NULL;
+
+ return 0;
+}
+
+static search_text_receiver_t *begin_snippets(void *internalised,
+					 int verbose,
+					 search_snippet_cb_t proc,
+					 void *rock)
+{
+ xapian_snippet_receiver_t *tr;
+
+ xapian_init();
+
+ tr = xzmalloc(sizeof(xapian_snippet_receiver_t));
+ tr->super.super.begin_mailbox = begin_mailbox_snippets;
+ tr->super.super.begin_message = begin_message;
+ tr->super.super.begin_part = begin_part;
+ tr->super.super.append_text = append_text;
+ tr->super.super.end_part = end_part;
+ tr->super.super.end_message = end_message_snippets;
+ tr->super.super.end_mailbox = end_mailbox_snippets;
+
+ tr->super.verbose = verbose;
+ tr->root = (struct opnode *)internalised;
+ tr->snipgen = xapian_snipgen_new();
+ tr->proc = proc;
+ tr->rock = rock;
+
+ return &tr->super.super;
+}
+
+static int end_snippets(search_text_receiver_t *rx)
+{
+ xapian_snippet_receiver_t *tr = (xapian_snippet_receiver_t *)rx;
+
+ if (tr->snipgen) xapian_snipgen_free(tr->snipgen);
+
+ free_receiver(&tr->super);
+
+ return 0;
+}
+
+static int list_files(const char *userid, strarray_t *files)
+{
+ char *mboxname = mboxname_user_mbox(userid, NULL);
+ struct mboxlist_entry *mbentry = NULL;
+ char *fname = NULL;
+ DIR *dirh = NULL;
+ struct dirent *de;
+ struct stat sb;
+ strarray_t *active = NULL;
+ strarray_t *dirs = NULL;
+ struct mappedfile *activefile = NULL;
+ int r;
+ int i;
+
+ r = mboxlist_lookup(mboxname, &mbentry, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* no user, no worries */
+	r = 0;
+	goto out;
+ }
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to lookup %s", mboxname);
+	goto out;
+ }
+
+ active = activefile_open(mboxname, mbentry->partition, &activefile, /*write*/0);
+ if (!active) goto out;
+ dirs = activefile_resolve(mboxname, mbentry->partition, active, /*dostat*/1);
+
+ for (i = 0; i < dirs->count; i++) {
+	const char *basedir = strarray_nth(dirs, i);
+
+	dirh = opendir(basedir);
+	if (!dirh) continue;
+
+	while ((de = readdir(dirh))) {
+	 if (de->d_name0 == '.') continue;
+	 free(fname);
+	 fname = strconcat(basedir, "/", de->d_name, (char *)NULL);
+	 r = stat(fname, &sb);
+	 if (!r && S_ISREG(sb.st_mode)) {
+		strarray_appendm(files, fname);
+		fname = NULL;
+	 }
+	}
+
+	closedir(dirh);
+	dirh = NULL;
+ }
+
+out:
+ if (activefile) {
+	mappedfile_unlock(activefile);
+	mappedfile_close(&activefile);
+ }
+ strarray_free(active);
+ strarray_free(dirs);
+ free(fname);
+ mboxlist_entry_free(&mbentry);
+ free(mboxname);
+
+ return 0;
+}
+
+struct mbdata {
+ uint32_t uidvalidity;
+ bitvector_t uids;
+};
+
+struct mbfilter {
+ hash_table mboxes;
+ struct db *indexed;
+ struct txn **tid;
+ char *destpath;
+ int flags;
+};
+
+static int copyindexed_cb(void *rock,
+			 const char *key, size_t keylen,
+			 const char *data, size_t datalen)
+{
+ struct mbfilter *filter = (struct mbfilter *)rock;
+ struct seqset *seq = parse_indexed(data, datalen);
+ int r = 0;
+ if (seq) {
+	r = store_indexed(filter->indexed, filter->tid, key, keylen, seq);
+	seqset_free(seq);
+ }
+ return r;
+}
+
+static void free_mbdata(void *rock)
+{
+ struct mbdata *data = (struct mbdata *)rock;
+ if (!data) return;
+ bv_free(&data->uids);
+ free(data);
+}
+
+static int mbox_vector(const char *mboxname, struct mbfilter *filter)
+{
+ struct mbdata *mbdata = xzmalloc(sizeof(struct mbdata));
+ struct buf key = BUF_INITIALIZER;
+ const char *data = NULL;
+ size_t datalen = 0;
+ struct seqset *seq = NULL;
+ struct mailbox *mailbox = NULL;
+ struct index_record record;
+ int verbose = SEARCH_VERBOSE(filter->flags);
+ unsigned recno;
+ int r;
+
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r) {
+	/* XXX - this is just a workaround for bugs in mboxlist_allusermbox */
+	if (r == IMAP_MAILBOX_NONEXISTENT) r = 0;
+	goto done;
+ }
+
+ buf_printf(&key, "%s.%u", mboxname, mailbox->i.uidvalidity);
+
+ r = cyrusdb_fetch(filter->indexed,
+		 key.s, key.len,
+		 &data, &datalen,
+		 (struct txn **)NULL);
+
+ if (r == CYRUSDB_NOTFOUND) {
+	r = 0;
+	goto done;
+ }
+ if (r) goto done;
+
+ seq = parse_indexed(data, datalen);
+ if (!seq) goto done;
+
+ mbdata->uidvalidity = mailbox->i.uidvalidity;
+ bv_setsize(&mbdata->uids, mailbox->i.last_uid);
+
+ if (verbose)
+	printf("Vectoring %s\n", mboxname);
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) goto done;
+
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* we don't expect it to be in this index, don't check for it */
+	if (!seqset_ismember(seq, record.uid))
+	 continue;
+
+	bv_set(&mbdata->uids, record.uid);
+ }
+
+ /* yay, we have succeeded */
+ hash_insert(mboxname, mbdata, &filter->mboxes);
+ mbdata = NULL;
+
+done:
+ buf_free(&key);
+ if (seq) seqset_free(seq);
+ if (mailbox) mailbox_close(&mailbox);
+ if (mbdata) free_mbdata(mbdata);
+ return r;
+}
+
+static int mbox_vector_cb(void *rock,
+			 const char *key, size_t keylen,
+			 const char *val __attribute__((unused)),
+			 size_t vallen __attribute__((unused)))
+{
+ char *mboxname = xstrndup(key, keylen);
+ struct mbfilter *filter = (struct mbfilter *)rock;
+ int r = mbox_vector(mboxname, filter);
+ free(mboxname);
+ return r;
+}
+
+static int build_mbfilter(const char *userid, struct mbfilter *filter)
+{
+ construct_hash_table(&filter->mboxes, 1024, 0);
+ return mboxlist_allusermbox(userid, mbox_vector_cb, filter, /*include_deleted*/0);
+}
+
+static void free_mbfilter(struct mbfilter *filter)
+{
+ free_hash_table(&filter->mboxes, free_mbdata);
+ if (filter->tid) cyrusdb_abort(filter->indexed, *filter->tid);
+ cyrusdb_close(filter->indexed);
+ free(filter->destpath);
+}
+
+static int mbdata_exists_cb(const char *cyrusid, void *rock)
+{
+ struct mbfilter *filter = (struct mbfilter *)rock;
+ int verbose = SEARCH_VERBOSE(filter->flags);
+ const char *mboxname;
+ unsigned int uidvalidity;
+ unsigned int uid;
+ struct mbdata *data;
+ int res = 0;
+
+ if (!parse_cyrusid(cyrusid, &mboxname, &uidvalidity, &uid))
+	goto out; /* failed to parse -> not exists */
+
+ data = (struct mbdata *)hash_lookup(mboxname, &filter->mboxes);
+
+ /* is it an identical mailbox? */
+ if (!data) goto out;
+ if (data->uidvalidity != uidvalidity) goto out;
+
+ /* then check if the UID exists */
+ res = bv_isset(&data->uids, uid);
+
+ if (res) {
+	/* if we find it again, then we don't need a second copy */
+	bv_clear(&data->uids, uid);
+ }
+
+out:
+ if (res) {
+	if (verbose > 2)
+	 printf("filter check %s: EXISTS\n", cyrusid);
+ }
+ else {
+	if (verbose > 1)
+	 printf("filter check %s: MISSING\n", cyrusid);
+ }
+
+ if (filter->flags & SEARCH_COMPACT_FILTER)
+	return res;
+
+ /* don't delete anything */
+ return 1;
+}
+
+static void notify_filter_cb(const char *mboxname, void *data, void *rock)
+{
+ struct mbdata *mbdata = (struct mbdata *)data;
+ struct mbfilter *filter = (struct mbfilter *)rock;
+ struct seqset *seq = seqset_init(0, SEQ_SPARSE);
+ int verbose = SEARCH_VERBOSE(filter->flags);
+ int uid;
+
+ if (verbose)
+	printf("checking for unindexed messages in %s\n", mboxname);
+
+ /* now we just read the bitvector and look for trouble! */
+ for (uid = bv_next_set(&mbdata->uids, 0) ;
+	 uid != -1 ;
+	 uid = bv_next_set(&mbdata->uids, uid+1))
+	seqset_add(seq, uid, 1);
+
+ if (seq->len) {
+	char *seqstr = seqset_cstring(seq);
+	syslog(LOG_ERR, "IOERROR: unindexed messages in %s: %s", mboxname, seqstr);
+	if (verbose)
+	 printf("IOERROR: unindexed messages in %s: %s\n", mboxname, seqstr);
+	free(seqstr);
+ }
+
+ seqset_free(seq);
+}
+
+static void notify_missing_messages(struct mbfilter *filter)
+{
+ hash_enumerate(&filter->mboxes, notify_filter_cb, filter);
+}
+
+static int create_filter(const strarray_t *srcpaths, const char *destpath,
+			 int flags, struct mbfilter *filter)
+{
+ struct buf buf = BUF_INITIALIZER;
+ int r = 0;
+ int i;
+
+ memset(filter, 0, sizeof(struct mbfilter));
+ filter->flags = flags;
+ filter->destpath = xstrdup(destpath);
+
+ /* build the cyrus.indexed.db from the contents of the source dirs */
+
+ buf_reset(&buf);
+ buf_printf(&buf, "%s%s", destpath, INDEXEDDB_FNAME);
+ r = cyrusdb_open(config_getstring(IMAPOPT_SEARCH_INDEXED_DB),
+		 buf_cstring(&buf), CYRUSDB_CREATE, &filter->indexed);
+ if (r) {
+	printf("ERROR: failed to open indexed %s\n", buf_cstring(&buf));
+	goto done;
+ }
+ for (i = 0; i < srcpaths->count; i++) {
+	struct db *db = NULL;
+	buf_reset(&buf);
+	buf_printf(&buf, "%s%s", strarray_nth(srcpaths, i), INDEXEDDB_FNAME);
+	r = cyrusdb_open(config_getstring(IMAPOPT_SEARCH_INDEXED_DB),
+			 buf_cstring(&buf), 0, &db);
+	if (r) {
+	 r = 0;
+	 continue;
+	}
+	r = cyrusdb_foreach(db, "", 0, NULL, copyindexed_cb, filter, NULL);
+	cyrusdb_close(db);
+	if (r) {
+	 printf("ERROR: failed to process indexed db %s\n", strarray_nth(srcpaths, i));
+	 goto done;
+	}
+ }
+ if (filter->tid) r = cyrusdb_commit(filter->indexed, *filter->tid);
+ if (r) {
+	printf("ERROR: failed to commit indexed %s\n", destpath);
+	goto done;
+ }
+
+done:
+ return r;
+}
+
+static int search_filter(const char *userid, const strarray_t *srcpaths,
+			 const char *destpath, int flags)
+{
+ struct mbfilter filter;
+ int verbose = SEARCH_VERBOSE(flags);
+ int r;
+
+ r = create_filter(srcpaths, destpath, flags, &filter);
+ if (r) goto done;
+
+ if (verbose)
+	printf("Building vector table for %s\n", userid);
+ r = build_mbfilter(userid, &filter);
+ if (r) goto done;
+
+ if (verbose)
+	printf("Filtering database %s\n", destpath);
+
+ r = xapian_filter(destpath, (const char **)srcpaths->data,
+		 mbdata_exists_cb, &filter);
+ if (r) goto done;
+
+ if (verbose)
+	printf("done %s\n", destpath);
+
+ if (flags & SEARCH_COMPACT_AUDIT)
+	notify_missing_messages(&filter);
+
+done:
+ free_mbfilter(&filter);
+ return r;
+}
+
+static int reindex_mb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
+{
+ struct mbfilter *filter = (struct mbfilter *)rock;
+ char *mboxname = xstrndup(key, keylen);
+ struct seqset *seq = parse_indexed(data, datalen);
+ xapian_update_receiver_t *tr = NULL;
+ struct mailbox *mailbox = NULL;
+ ptrarray_t batch = PTRARRAY_INITIALIZER;
+ struct index_record record;
+ int verbose = SEARCH_VERBOSE(filter->flags);
+ uint32_t recno;
+ int r = 0;
+ int i;
+ char *dot;
+ uint32_t uidvalidity;
+
+ dot = strrchr(mboxname, '.');
+ *dot++ = '\0';
+ uidvalidity = atol(dot);
+
+ if (!seq) goto done;
+
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r) goto done;
+
+ if (mailbox->i.uidvalidity != uidvalidity) goto done; /* returns 0, nothing to index */
+
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	r = mailbox_read_index_record(mailbox, recno, &record);
+	if (r) goto done;
+
+	if (record.system_flags & FLAG_EXPUNGED)
+	 continue;
+
+	/* it wasn't in the previous index, skip it */
+	if (!seqset_ismember(seq, record.uid))
+	 continue;
+
+	/* add the record to the list */
+	ptrarray_append(&batch, message_new_from_record(mailbox, &record));
+ }
+
+ if (batch.count) {
+	tr = (xapian_update_receiver_t *)begin_update(verbose);
+	/* XXX - errors here could leak... */
+	/* game on */
+	mailbox_unlock_index(mailbox, NULL);
+	/* open the DB */
+	r = xapian_dbw_open(filter->destpath, &tr->dbw);
+	if (r) goto done;
+	tr->super.mailbox = mailbox;
+
+	/* preload */
+	for (i = 0 ; i < batch.count ; i++) {
+	 message_t *msg = ptrarray_nth(&batch, i);
+	 const char *fname;
+
+	 r = message_get_fname(msg, &fname);
+	 if (r) goto done;
+	 r = warmup_file(fname, 0, 0);
+	 if (r) goto done; /* means we failed to open a file,
+				so we'll fail later anyway */
+	}
+
+	/* index the messages */
+	for (i = 0 ; i < batch.count ; i++) {
+	 message_t *msg = ptrarray_nth(&batch, i);
+	 r = index_getsearchtext(msg, &tr->super.super, 0);
+	 message_unref(&msg);
+	}
+	if (r) goto done;
+	if (tr->uncommitted) {
+	 r = xapian_dbw_commit_txn(tr->dbw);
+	 if (r) goto done;
+	}
+ }
+
+done:
+ if (tr) {
+	if (tr->indexed) seqset_free(tr->indexed);
+	if (tr->dbw) xapian_dbw_close(tr->dbw);
+	free_receiver(&tr->super);
+ }
+ mailbox_close(&mailbox);
+ ptrarray_fini(&batch);
+ free(mboxname);
+ seqset_free(seq);
+ return r;
+}
+
+static int search_reindex(const char *userid, const strarray_t *srcpaths,
+			 const char *destpath, int flags)
+{
+ struct buf buf = BUF_INITIALIZER;
+ struct mbfilter filter;
+ int verbose = SEARCH_VERBOSE(flags);
+ int r;
+
+ r = create_filter(srcpaths, destpath, flags, &filter);
+ if (r) goto done;
+
+ if (verbose)
+	printf("Reindexing messages for %s\n", userid);
+
+ r = cyrusdb_foreach(filter.indexed, "", 0, NULL, reindex_mb, &filter, NULL);
+ if (r) {
+	printf("ERROR: failed to reindex to %s\n", destpath);
+	goto done;
+ }
+
+ if (verbose)
+	printf("done %s\n", destpath);
+
+done:
+ free_mbfilter(&filter);
+ buf_free(&buf);
+ return r;
+}
+
+static int search_compress(const char *userid, const strarray_t *srcpaths,
+			 const char *destpath, int flags)
+{
+ struct buf buf = BUF_INITIALIZER;
+ struct mbfilter filter;
+ int verbose = SEARCH_VERBOSE(flags);
+ int r;
+
+ r = create_filter(srcpaths, destpath, flags, &filter);
+ if (r) goto done;
+
+ if (verbose)
+	printf("Compressing messages for %s\n", userid);
+
+ r = xapian_compact_dbs(destpath, (const char **)srcpaths->data);
+ if (r) {
+	printf("ERROR: failed to compress to %s\n", destpath);
+	goto done;
+ }
+
+ if (verbose)
+	printf("done %s\n", destpath);
+
+done:
+ free_mbfilter(&filter);
+ buf_free(&buf);
+ return r;
+}
+
+static int compact_dbs(const char *userid, const char *tempdir,
+		 const strarray_t *srctiers, const char *desttier, int flags)
+{
+ char *mboxname = mboxname_user_mbox(userid, NULL);
+ struct mboxlist_entry *mbentry = NULL;
+ struct mappedfile *activefile = NULL;
+ strarray_t *dirs = NULL;
+ strarray_t *active = NULL;
+ strarray_t *tochange = NULL;
+ char *newdest = NULL;
+ char *destdir = NULL;
+ char *tempdestdir = NULL;
+ char *activestr = NULL;
+ struct buf mytempdir = BUF_INITIALIZER;
+ struct buf buf = BUF_INITIALIZER;
+ int verbose = SEARCH_VERBOSE(flags);
+ int r = 0;
+ int i;
+
+ r = mboxlist_lookup(mboxname, &mbentry, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	/* no user, no worries */
+	r = 0;
+	goto out;
+ }
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: failed to lookup %s", mboxname);
+	goto out;
+ }
+
+ xapian_init();
+
+ /* take an exclusive lock on the activefile file */
+ active = activefile_open(mboxname, mbentry->partition, &activefile, /*write*/1);
+ if (!active || !active->count) goto out;
+
+ activestr = strarray_join(active, ",");
+
+ /* read the activefile file, taking down the names of all paths with a
+ * level less than or equal to that requested */
+ tochange = activefile_filter(active, srctiers, mbentry->partition);
+ if (!tochange || !tochange->count) goto out;
+
+ /* find out which items actually exist from the set to be compressed - first pass */
+ dirs = activefile_resolve(mboxname, mbentry->partition, tochange, /*dostat*/1);
+ if (!dirs || !dirs->count) goto out;
+ /* NOTE: it's safe to keep this list even over the unlock/relock because we
+ * always write out a new first item if necessary, so these will never be
+ * written to after we release the lock - if they don't have content now,
+ * they never will */
+
+ /* register the target name first, and put it at the end of the file */
+ newdest = activefile_nextname(active, desttier);
+ strarray_push(active, newdest);
+
+ if (verbose) {
+	char *target = strarray_join(tochange, ",");
+	printf("compressing %s to %s for %s (active %s)\n", target, newdest, mboxname, activestr);
+	free(target);
+ }
+
+ /* are we going to change the first active? We need to start indexing to
+ * a new location! */
+ if (strarray_find(tochange, strarray_nth(active, 0), 0) >= 0) {
+	/* always recalculate the first name once the destination is chosen,
+	* because we may be compressing to the default tier for some reason */
+	char *newstart = activefile_nextname(active, config_getstring(IMAPOPT_DEFAULTSEARCHTIER));
+	if (verbose) {
+	 printf("adding new initial search location %s\n", newstart);
+	}
+	strarray_unshiftm(active, newstart);
+ }
+
+ destdir = activefile_path(mboxname, mbentry->partition, newdest, /*dostat*/0);
+ tempdestdir = strconcat(destdir, ".NEW", (char *)NULL);
+
+ /* write the new file and release the exclusive lock */
+ activefile_write(activefile, active);
+ mappedfile_unlock(activefile);
+
+ /* take a shared lock */
+ mappedfile_readlock(activefile);
+
+ /* reread and ensure our 'directory zero' is still directory zero,
+ * otherwise abort now */
+ {
+	strarray_t *newactive = activefile_read(activefile);
+	if (strarray_cmp(active, newactive)) {
+	 if (verbose) {
+		printf("aborting compact of %s, lost the race early\n", mboxname);
+	 }
+	 strarray_free(newactive);
+	 goto out;
+	}
+	strarray_free(newactive);
+ }
+
+ /* run the compress to tmpfs */
+ if (tempdir)
+	buf_printf(&mytempdir, "%s/xapian.%d", tempdir, getpid());
+ /* or just directly in place */
+ else
+	buf_printf(&mytempdir, "%s", tempdestdir);
+
+ /* make sure the destination path exists */
+ r = cyrus_mkdir(buf_cstring(&mytempdir), 0755);
+ if (r) goto out;
+ /* and doesn't contain any junk */
+ remove_dir(buf_cstring(&mytempdir));
+ r = mkdir(buf_cstring(&mytempdir), 0755);
+ if (r) goto out;
+
+ if (dirs->count == 1 && (flags & SEARCH_COMPACT_COPYONE)) {
+	if (verbose) {
+	 printf("only one source, copying directly to %s\n", tempdestdir);
+	}
+	cyrus_mkdir(tempdestdir, 0755);
+	remove_dir(tempdestdir);
+	r = copy_files(dirs->data0, tempdestdir);
+ }
+ else if (dirs->count) {
+	if (verbose) {
+	 printf("compacting databases\n");
+	}
+	if (flags & SEARCH_COMPACT_FILTER) {
+	 r = search_filter(userid, dirs, buf_cstring(&mytempdir), flags);
+	 if (r) {
+		printf("ERROR: failed to filter to %s", buf_cstring(&mytempdir));
+		goto out;
+	 }
+	}
+	else if (flags & SEARCH_COMPACT_REINDEX) {
+	 r = search_reindex(userid, dirs, buf_cstring(&mytempdir), flags);
+	 if (r) {
+		printf("ERROR: failed to reindex to %s", buf_cstring(&mytempdir));
+		goto out;
+	 }
+	}
+	else {
+	 r = search_compress(userid, dirs, buf_cstring(&mytempdir), flags);
+	 if (r) {
+		printf("ERROR: failed to reindex to %s", buf_cstring(&mytempdir));
+		goto out;
+	 }
+	}
+
+	/* move the tmpfs files to a temporary name in our target directory */
+	if (tempdir) {
+	 if (verbose) {
+		printf("copying from tempdir to destination\n");
+	 }
+	 cyrus_mkdir(tempdestdir, 0755);
+	 remove_dir(tempdestdir);
+	 r = copy_files(buf_cstring(&mytempdir), tempdestdir);
+	 if (r) {
+		printf("Failed to rsync from %s to %s", buf_cstring(&mytempdir), tempdestdir);
+		goto out;
+	 }
+	}
+ }
+
+ /* release and take an exclusive lock on activefile */
+ mappedfile_unlock(activefile);
+ mappedfile_writelock(activefile);
+
+ /* check that we still have 'directory zero'. If not, delete all
+ * temporary files and abort */
+ {
+	strarray_t *newactive = activefile_read(activefile);
+	if (strarray_cmp(active, newactive)) {
+	 if (verbose) {
+		printf("aborting compact of %s, lost the race late\n", mboxname);
+	 }
+	 strarray_free(newactive);
+	 goto out;
+	}
+	strarray_free(newactive);
+ }
+
+ if (dirs->count) {
+	/* create a new target name one greater than the highest in the
+	 * activefile file for our target directory. Rename our DB to
+	 * that path, then rewrite activefile removing all the source
+	 * items */
+	if (verbose) {
+	 printf("renaming tempdir into place\n");
+	}
+	remove_dir(destdir);
+	r = rename(tempdestdir, destdir);
+	if (r) {
+	 printf("ERROR: failed to rename into place %s to %s\n", tempdestdir, destdir);
+	 goto out;
+	}
+ }
+ else {
+	if (verbose) {
+	 printf("nothing compacted, cleaning up %s\n", newdest);
+	}
+	strarray_append(tochange, newdest);
+ }
+
+ for (i = 0; i < tochange->count; i++)
+	strarray_remove_all(active, tochange->datai);
+
+ activefile_write(activefile, active);
+
+ /* release the lock */
+ mappedfile_unlock(activefile);
+
+ if (verbose) {
+	char *alist = strarray_join(active, ",");
+	printf("finished compact of %s (active %s)\n", mboxname, alist);
+	free(alist);
+ }
+
+ /* finally remove all directories on disk of the source dbs */
+ for (i = 0; i < dirs->count; i++)
+	remove_dir(dirs->datai);
+
+ /* XXX - readdir and remove other directories as well */
+
+out:
+ if (tempdestdir)
+	remove_dir(tempdestdir);
+ if (mytempdir.len)
+	remove_dir(buf_cstring(&mytempdir));
+ strarray_free(dirs);
+ strarray_free(active);
+ strarray_free(tochange);
+ buf_free(&mytempdir);
+ buf_free(&buf);
+ free(newdest);
+ free(activestr);
+ free(destdir);
+ free(tempdestdir);
+ mappedfile_unlock(activefile);
+ mappedfile_close(&activefile);
+ mboxlist_entry_free(&mbentry);
+ free(mboxname);
+
+ return r;
+}
+
+/* cleanup */
+static void delete_one(const char *key, const char *val __attribute__((unused)), void *rock)
+{
+ const char *mboxname = (const char *)rock;
+ const char *partition = NULL;
+ char *tier = NULL;
+ char *basedir = NULL;
+
+ partition = strstr(key, "searchpartition-");
+ if (!partition) return;
+ tier = xstrndup(key, partition - key);
+ partition += 16; /* skip over name */
+
+ xapian_basedir(tier, mboxname, partition, NULL, &basedir);
+ if (basedir)
+	remove_dir(basedir);
+
+ free(basedir);
+ free(tier);
+}
+
+static int delete_user(const char *userid)
+{
+ char *mboxname = mboxname_user_mbox(userid, /*subfolder*/NULL);
+ char *activename = activefile_fname(mboxname);
+
+ config_foreachoverflowstring(delete_one, mboxname);
+ unlink(activename);
+
+ free(activename);
+ free(mboxname);
+
+ return 0;
+}
+
+
+const struct search_engine xapian_search_engine = {
+ "Xapian",
+ SEARCH_FLAG_CAN_BATCH,
+ begin_search,
+ end_search,
+ begin_update,
+ end_update,
+ begin_snippets,
+ end_snippets,
+ describe_internalised,
+ free_internalised,
+ /*start_daemon*/NULL,
+ /*stop_daemon*/NULL,
+ list_files,
+ compact_dbs,
+ delete_user /* XXX: fixme */
+};
+

cyrus-imapd-2.4.17.tar.gz/imap/seen.h -> cyrus-imapd-2.5.tar.gz/imap/seen.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/seen_db.c -> cyrus-imapd-2.5.tar.gz/imap/seen_db.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: seen_db.c,v 1.62 2010/01/06 17:01:40 murch Exp $
 */
 
 #include <config.h>
@@ -47,7 +45,6 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <string.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <errno.h>
@@ -59,17 +56,13 @@
 #include <sys/uio.h>
 #include "cyrusdb.h"
 #include "map.h"
-#include "bsearch.h"
 #include "util.h"
 
 #include "assert.h"
 #include "global.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "mailbox.h"
-#include "imap_err.h"
-#include "statuscache.h"
+#include "imap/imap_err.h"
 #include "seen.h"
 #include "sync_log.h"
 #include "imparse.h"
@@ -90,7 +83,7 @@
 
 #define DB (config_seenstate_db)
 
-char *seen_getpath(const char *userid)
+HIDDEN char *seen_getpath(const char *userid)
 {
 char *fname = xmalloc(strlen(config_dir) + sizeof(FNAME_DOMAINDIR) +
 			 sizeof(FNAME_USERDIR) + strlen(userid) +
@@ -114,7 +107,7 @@
 return fname;
 }
 
-int seen_open(const char *user, 
+EXPORTED int seen_open(const char *user,
 	 int flags,
 	 struct seen **seendbptr)
 {
@@ -136,7 +129,7 @@
 /* open the seendb corresponding to user */
 fname = seen_getpath(user);
 if (flags & SEEN_CREATE) cyrus_mkdir(fname, 0755);
- r = (DB->open)(fname, dbflags, &seendb->db);
+ r = cyrusdb_open(DB, fname, dbflags | CYRUSDB_CONVERT, &seendb->db);
 if (r) {
 	if (!(flags & SEEN_SILENT)) {
 	 int level = (flags & SEEN_CREATE) ? LOG_ERR : LOG_DEBUG;
@@ -163,7 +156,7 @@
 void *rock;
 };
 
-void seen_freedata(struct seendata *sd)
+EXPORTED void seen_freedata(struct seendata *sd)
 {
 free (sd->seenuids);
 }
@@ -191,11 +184,11 @@
 sd->seenuidsuidlen = '\0';
 }
 
-int foreach_proc(void *rock,
+static int foreach_proc(void *rock,
 		 const char *key,
-		 int keylen,
+		 size_t keylen,
 		 const char *data,
-		 int datalen)
+		 size_t datalen)
 {
 struct seendata sd = SEENDATA_INITIALIZER;
 struct seendata_rock *sr = (struct seendata_rock *)rock;
@@ -212,12 +205,12 @@
 return r;
 }
 
-int seen_foreach(struct seen *seendb, seenproc_t *f, void *rock)
+EXPORTED int seen_foreach(struct seen *seendb, seenproc_t *f, void *rock)
 {
 struct seendata_rock sdrock;
 sdrock.f = f;
 sdrock.rock = rock;
- return DB->foreach(seendb->db, "", 0, NULL, foreach_proc, &sdrock, NULL);
+ return cyrusdb_foreach(seendb->db, "", 0, NULL, foreach_proc, &sdrock, NULL);
 }
 
 static int seen_readit(struct seen *seendb, const char *uniqueid,
@@ -225,14 +218,14 @@
 {
 int r;
 const char *data;
- int datalen;
+ size_t datalen;
 
 assert(seendb && uniqueid);
 if (rw || seendb->tid) {
-	r = DB->fetchlock(seendb->db, uniqueid, strlen(uniqueid),
+	r = cyrusdb_fetchlock(seendb->db, uniqueid, strlen(uniqueid),
 			 &data, &datalen, &seendb->tid);
 } else {
-	r = DB->fetch(seendb->db, uniqueid, strlen(uniqueid),
+	r = cyrusdb_fetch(seendb->db, uniqueid, strlen(uniqueid),
 		 &data, &datalen, NULL);
 }
 switch (r) {
@@ -266,7 +259,7 @@
 return 0;
 }
 
-int seen_read(struct seen *seendb, const char *uniqueid, struct seendata *sd)
+EXPORTED int seen_read(struct seen *seendb, const char *uniqueid, struct seendata *sd)
 {
 if (SEEN_DEBUG) {
 	syslog(LOG_DEBUG, "seen_db: seen_read %s (%s)", 
@@ -276,7 +269,7 @@
 return seen_readit(seendb, uniqueid, sd, 0);
 }
 
-int seen_lockread(struct seen *seendb, const char *uniqueid, struct seendata *sd)
+HIDDEN int seen_lockread(struct seen *seendb, const char *uniqueid, struct seendata *sd)
 {
 if (SEEN_DEBUG) {
 	syslog(LOG_DEBUG, "seen_db: seen_lockread %s (%s)", 
@@ -286,7 +279,7 @@
 return seen_readit(seendb, uniqueid, sd, 1);
 }
 
-int seen_write(struct seen *seendb, const char *uniqueid, struct seendata *sd)
+EXPORTED int seen_write(struct seen *seendb, const char *uniqueid, struct seendata *sd)
 {
 int sz = strlen(sd->seenuids) + 50;
 char *data = xmalloc(sz);
@@ -305,7 +298,7 @@
 	 sd->lastchange, sd->seenuids);
 datalen = strlen(data);
 
- r = DB->store(seendb->db, uniqueid, strlen(uniqueid),
+ r = cyrusdb_store(seendb->db, uniqueid, strlen(uniqueid),
 		 data, datalen, &seendb->tid);
 switch (r) {
 case CYRUSDB_OK:
@@ -327,7 +320,7 @@
 return r;
 }
 
-int seen_close(struct seen **seendbptr)
+EXPORTED int seen_close(struct seen **seendbptr)
 {
 struct seen *seendb = *seendbptr;
 int r;
@@ -342,7 +335,7 @@
 	if (SEEN_DEBUG) {
 	 syslog(LOG_DEBUG, "seen_db: committing changes for %s", seendb->user);
 	}
-	r = DB->commit(seendb->db, seendb->tid);
+	r = cyrusdb_commit(seendb->db, seendb->tid);
 	if (r != CYRUSDB_OK) {
 	 syslog(LOG_ERR, "DBERROR: error committing seen txn; "
 		 "seen state lost: %s", cyrusdb_strerror(r));
@@ -350,7 +343,7 @@
 	seendb->tid = NULL;
 }
 
- r = (DB->close)(seendb->db);
+ r = cyrusdb_close(seendb->db);
 if (r) {
 	syslog(LOG_ERR, "DBERROR: error closing: %s",
 	 cyrusdb_strerror(r));
@@ -364,7 +357,7 @@
 return 0;
 }
 
-int seen_create_mailbox(const char *userid, struct mailbox *mailbox)
+HIDDEN int seen_create_mailbox(const char *userid, struct mailbox *mailbox)
 {
 if (SEEN_DEBUG) {
 	syslog(LOG_DEBUG, "seen_db: seen_create_mailbox(%s, %s)", 
@@ -375,7 +368,7 @@
 return 0;
 }
 
-int seen_delete_mailbox(const char *userid, struct mailbox *mailbox)
+EXPORTED int seen_delete_mailbox(const char *userid, struct mailbox *mailbox)
 {
 int r;
 struct seen *seendb = NULL;
@@ -391,7 +384,7 @@
 	return 0;
 
 r = seen_open(userid, SEEN_SILENT, &seendb);
- if (!r) r = DB->delete(seendb->db, uniqueid, strlen(uniqueid),
+ if (!r) r = cyrusdb_delete(seendb->db, uniqueid, strlen(uniqueid),
 			 &seendb->tid, 1);
 seen_close(&seendb);
 
@@ -409,7 +402,7 @@
 return 0;
 }
 
-int seen_delete_user(const char *user)
+HIDDEN int seen_delete_user(const char *user)
 {
 char *fname = seen_getpath(user);
 int r = 0;
@@ -428,7 +421,7 @@
 return r;
 }
 
-int seen_rename_user(const char *olduser, const char *newuser)
+HIDDEN int seen_rename_user(const char *olduser, const char *newuser)
 {
 char *oldfname = seen_getpath(olduser);
 char *newfname = seen_getpath(newuser);
@@ -451,7 +444,7 @@
 return r;
 }
 
-int seen_copy(const char *userid, struct mailbox *oldmailbox,
+HIDDEN int seen_copy(const char *userid, struct mailbox *oldmailbox,
 	 struct mailbox *newmailbox)
 {
 if (SEEN_DEBUG) {
@@ -478,7 +471,7 @@
 return 0;
 }
 
-int seen_done(void)
+EXPORTED int seen_done(void)
 {
 if (SEEN_DEBUG) {
 	syslog(LOG_DEBUG, "seen_db: seen_done()");
@@ -487,7 +480,7 @@
 return 0;
 }
 
-int seen_compare(struct seendata *a, struct seendata *b)
+EXPORTED int seen_compare(struct seendata *a, struct seendata *b)
 {
 if (a->lastuid == b->lastuid &&
 	a->lastread == b->lastread &&
@@ -502,8 +495,8 @@
 * last change times, and ensure that the database uses the newer of
 * the two */
 static int seen_merge_cb(void *rockp,
-			 const char *key, int keylen,
-			 const char *newdata, int newlen) 
+			 const char *key, size_t keylen,
+			 const char *newdata, size_t newlen) 
 {
 int r = 0;
 struct seen *seendb = (struct seen *)rockp;
@@ -535,19 +528,19 @@
 * the already existing "currentfile", but only
 * if the record in newfile is actually newer
 * (or doesn't exist in currentfile yet) */
-int seen_merge(struct seen *seendb, const char *newfile)
+HIDDEN int seen_merge(struct seen *seendb, const char *newfile)
 {
 int r = 0;
 struct db *newdb = NULL;
 
- r = (DB->open)(newfile, 0, &newdb);
+ r = cyrusdb_open(DB, newfile, 0, &newdb);
 /* if it doesn't exist, there's nothing
 * to do, so abort without an error */
 if (r == CYRUSDB_NOTFOUND) return 0;
 
- if (!r) r = DB->foreach(newdb, "", 0, NULL, seen_merge_cb, seendb, NULL);
+ if (!r) r = cyrusdb_foreach(newdb, "", 0, NULL, seen_merge_cb, seendb, NULL);
 
- if (newdb) (DB->close)(newdb);
+ if (newdb) cyrusdb_close(newdb);
 
 return r;
 }

cyrus-imapd-2.4.17.tar.gz/imap/sequence.c -> cyrus-imapd-2.5.tar.gz/imap/sequence.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sequence.c,v 1.1 2010/06/28 12:05:04 brong Exp $
 */
 
 #include <config.h>
@@ -54,7 +52,23 @@
 
 #define SETGROWSIZE 30
 
-struct seqset *seqset_init(unsigned maxval, int flags)
+/*
+ * Allocate and return a new seqset object.
+ *
+ * `maxval' is the maximum insertable value, currently used only to
+ * expand the `*' syntax when parsing sequences from a string.
+ *
+ * `flags' is either
+ *
+ * SEQ_SPARSE - the behaviour you expected
+ *
+ * SEQ_MERGE - assumes that seqset_add() is going to be called
+ *		 with monotonically increasing numbers, and treats
+ *		 interior ranges of numbers which were not explicitly
+ *		 excluded (with ismember=0) as if they had been
+ *		 included. Used to reduce fragmentation in SEEN lists.
+ */
+EXPORTED struct seqset *seqset_init(unsigned maxval, int flags)
 {
 struct seqset *seq = xzmalloc(sizeof(struct seqset));
 
@@ -68,7 +82,13 @@
 return seq;
 }
 
-void seqset_add(struct seqset *seq, unsigned num, int ismember)
+/*
+ * Add a number `num' to the sequence set `seq'. The `ismember'
+ * argument is normally 1, but affects the result for SEQ_MERGE
+ * sequences. Currently assumes that it will be called in
+ * monotonically increasing order of `num's.
+ */
+EXPORTED void seqset_add(struct seqset *seq, unsigned num, int ismember)
 {
 if (!seq) return;
 
@@ -103,7 +123,7 @@
 /* read the final number from a sequence string and return it.
 * if given "numstart", return a pointer to the start of
 * that number in the string */
-unsigned int seq_lastnum(const char *list, const char **numstart)
+EXPORTED unsigned int seq_lastnum(const char *list, const char **numstart)
 {
 const char *tail;
 uint32_t retval = 0;
@@ -208,7 +228,7 @@
 /*
 * Parse a sequence into an array of sorted & merged ranges.
 */
-struct seqset *seqset_parse(const char *sequence,
+EXPORTED struct seqset *seqset_parse(const char *sequence,
 			 struct seqset *set,
 			 unsigned maxval)
 {
@@ -267,7 +287,7 @@
 /*
 * Return nonzero iff 'num' is included in 'sequence'
 */
-int seqset_ismember(struct seqset *seq, unsigned num)
+EXPORTED int seqset_ismember(struct seqset *seq, unsigned num)
 {
 struct seq_range key = {num, num};
 struct seq_range *found;
@@ -308,17 +328,41 @@
 return 0;
 }
 
-unsigned seqset_first(struct seqset *seq)
+/*
+ * Return the first number in the sequence, or 0
+ * if the sequence is empty.
+ */
+EXPORTED unsigned seqset_first(const struct seqset *seq)
 {
- return seq->set0.low;
+ return (seq->len ? seq->set0.low : 0);
 }
 
-unsigned seqset_last(struct seqset *seq)
+/*
+ * Return the last number in the sequence, or 0
+ * if the sequence is empty.
+ */
+EXPORTED unsigned seqset_last(const struct seqset *seq)
+{
+ return (seq->len ? seq->setseq->len-1.high : 0);
+}
+
+/* NOTE: this assumes normalised, and also assumes that '1' is
+ * the first element */
+EXPORTED unsigned seqset_firstnonmember(const struct seqset *seq)
 {
- return seq->setseq->len-1.high;
+ if (!seq->len) return 1;
+ if (seq->set0.low != 1) return 1;
+ return seq->set0.high + 1;
 }
 
-unsigned seqset_getnext(struct seqset *seq)
+/*
+ * Iteration interface for sequences. Returns the next number
+ * in the sequence, or 0 if the end of the sequence has been
+ * reached.
+ * Interferes with the state used for seqset_add() so don't mix
+ * adding and iterating.
+ */
+EXPORTED unsigned seqset_getnext(struct seqset *seq)
 {
 unsigned num;
 unsigned i;
@@ -345,8 +389,11 @@
 return 0;
 }
 
+/*
+ * Merge the numbers in seqset `b' into seqset `a'.
+ */
 /* NOTE - not sort safe! */
-void seqset_join(struct seqset *a, struct seqset *b)
+EXPORTED void seqset_join(struct seqset *a, const struct seqset *b)
 {
 if (a->len + b->len > a->alloc) {
 	a->alloc = a->len + b->len;
@@ -361,67 +408,66 @@
 seqset_simplify(a);
 }
 
-void seqset_append(struct seqset **l, char *sequence, unsigned maxval)
+static void format_num(struct buf *buf, unsigned i)
 {
- struct seqset **tail = l;
-
- while (*tail) {
-	if (!maxval) maxval = (*tail)->maxval;
-	tail = &(*tail)->nextseq;
- }
-
- *tail = seqset_parse(sequence, NULL, maxval);
+ if (i == UINT_MAX)
+	buf_putc(buf, '*');
+ else
+	buf_printf(buf, "%u", i);
 }
 
-#define SEQGROW 300
-
-char *seqset_cstring(struct seqset *seq) 
+/*
+ * Format the seqset `seq' as a string. Returns a newly allocated
+ * string which must be free()d by the caller.
+ */
+EXPORTED char *seqset_cstring(const struct seqset *seq)
 {
- unsigned alloc = 0;
- unsigned offset = 0;
- char *base = NULL;
+ struct buf buf = BUF_INITIALIZER;
 unsigned i;
 
 if (!seq) return NULL;
+ if (!seq->len) return NULL;
 
 for (i = 0; i < seq->len; i++) {
-	/* ensure we have space */
-	if (alloc < offset + 30) {
-	 alloc += SEQGROW;
-	 base = xrealloc(base, alloc);
-	}
-
 	/* join with comma if not the first item */
-	if (i) baseoffset++ = ',';
+	if (i) buf_putc(&buf, ',');
 
 	/* single value only */
 	if (seq->seti.low == seq->seti.high)
-	 sprintf(base+offset, "%u", seq->seti.low);
-
-	/* special case - end of the list */
-	else if (seq->seti.high == UINT_MAX)
-	 sprintf(base+offset, "%u:*", seq->seti.low);
+	 format_num(&buf, seq->seti.low);
 
 	/* value range */
-	else
-	 sprintf(base+offset, "%u:%u", seq->seti.low,
-					 seq->seti.high);
-
-	/* find the end */
-	while (baseoffset) offset++;
+	else {
+	 format_num(&buf, seq->seti.low);
+	 buf_putc(&buf, ':');
+	 format_num(&buf, seq->seti.high);
+	}
 }
 
- return base;
+ return buf_release(&buf);
 }
 
-void seqset_free(struct seqset *l)
+/*
+ * Duplicate the given seqset.
+ */
+EXPORTED struct seqset *seqset_dup(const struct seqset *l)
 {
- struct seqset *n;
+ struct seqset *newl;
 
- while(l) {
-	n = l->nextseq;
-	free(l->set);
-	free(l);
-	l = n;
- }
+ newl = (struct seqset *)xmemdup(l, sizeof(*l));
+ newl->set = (struct seq_range *)xmemdup(newl->set,
+		 newl->alloc * sizeof(struct seq_range));
+
+ return newl;
+}
+
+/*
+ * Free the given seqset (and any others chained to it)
+ */
+EXPORTED void seqset_free(struct seqset *l)
+{
+ if (!l) return;
+
+ free(l->set);
+ free(l);
 }

cyrus-imapd-2.4.17.tar.gz/imap/sequence.h -> cyrus-imapd-2.5.tar.gz/imap/sequence.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sequence.h,v 1.1 2010/06/28 12:05:04 brong Exp $
  */
 
 /* Header for internal usage of index.c + programs that make raw access
@@ -61,7 +59,6 @@
     unsigned prev;
     unsigned maxval;
     int flags;
-    struct seqset *nextseq;
 };
 
 #define SEQ_SPARSE 1
@@ -76,13 +73,14 @@
 extern struct seqset *seqset_parse(const char *sequence,
 				   struct seqset *set,
 				   unsigned maxval);
-extern void seqset_join(struct seqset *a, struct seqset *b);
-extern void seqset_append(struct seqset **l, char *sequence, unsigned maxval);
+extern void seqset_join(struct seqset *a, const struct seqset *b);
 extern int seqset_ismember(struct seqset *set, unsigned num);
 extern unsigned seqset_getnext(struct seqset *set);
-extern unsigned seqset_first(struct seqset *set);
-extern unsigned seqset_last(struct seqset *set);
-extern char *seqset_cstring(struct seqset *set);
-extern void seqset_free(struct seqset *l);
+extern unsigned seqset_first(const struct seqset *set);
+extern unsigned seqset_firstnonmember(const struct seqset *set);
+extern unsigned seqset_last(const struct seqset *set);
+extern char *seqset_cstring(const struct seqset *set);
+extern struct seqset *seqset_dup(const struct seqset *);
+extern void seqset_free(struct seqset *set);
 
 #endif /* SEQUENCE_H */

cyrus-imapd-2.4.17.tar.gz/imap/setproctitle.c -> cyrus-imapd-2.5.tar.gz/imap/setproctitle.c Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: setproctitle.c,v 1.18 2010/01/06 17:01:40 murch Exp $
  */
 /*
  * Copyright (c) 1983, 1995 Eric P. Allman
@@ -91,9 +89,9 @@
 
 extern char **environ;
 #ifdef USE_SETPROCTITLE
-int setproctitle_enable = 1;
+static int setproctitle_enable = 1;
 #else
-int setproctitle_enable = 0;
+static int setproctitle_enable = 0;
 #endif
 
 static char		**Argv = NULL;		/* pointer to argument vector */
@@ -102,7 +100,7 @@
 /*
  * Sets up a process to be able to use setproctitle()
  */
-void setproctitle_init(int argc, char **argv, char **envp)
+EXPORTED void setproctitle_init(int argc, char **argv, char **envp)
 {
     int i;
 
@@ -210,7 +208,7 @@
 #if SPT_TYPE != SPT_BUILTIN
 
 /*VARARGS1*/
-void
+HIDDEN void
 setproctitle(const char *fmt, ...)
 {
 # if SPT_TYPE != SPT_NONE

cyrus-imapd-2.4.17.tar.gz/imap/smmapd.c -> cyrus-imapd-2.5.tar.gz/imap/smmapd.c Changed

@@ -38,8 +38,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: smmapd.c,v 1.23 2010/01/06 17:01:40 murch Exp $
- *
 * smmapd.c -- sendmail socket map daemon
 *
 *
@@ -85,27 +83,29 @@
 #include <string.h>
 #include <syslog.h>
 #include <signal.h>
-#include <ctype.h>
 
 #include "acl.h"
 #include "append.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mboxlist.h"
 #include "mupdate-client.h"
 #include "proc.h"
+#include "quota.h"
+#include "sync_log.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
 
 const char *BB;
-int forcedowncase;
+static int forcedowncase;
 
 extern int optind;
 
-struct protstream *map_in, *map_out;
+static struct protstream *map_in, *map_out;
+static const char *smmapd_clienthost;
 
 /* current namespace */
 static struct namespace map_namespace;
@@ -114,9 +114,9 @@
 const int config_need_data = 0;
 
 /* forward decls */
-int begin_handling(void);
+static int begin_handling(void);
 
-void smmapd_reset(void)
+static void smmapd_reset(void)
 {
 if (map_in) {
 	/* Flush the incoming buffer */
@@ -131,6 +131,8 @@
 	prot_free(map_out);
 }
 
+ smmapd_clienthost = "local";
+
 map_in = map_out = NULL;
 
 cyrus_reset_stdio(); 
@@ -143,6 +145,8 @@
 
 smmapd_reset();
 
+ sync_log_done();
+
 mboxlist_close();
 mboxlist_done();
 
@@ -153,7 +157,7 @@
 exit(code);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 if (recurse_code) {
@@ -193,6 +197,9 @@
 quotadb_init(0);
 quotadb_open(NULL);
 
+ /* so we can log sync information on closing mailboxes */
+ sync_log_init();
+
 /* Set namespace */
 if ((r = mboxname_init_namespace(&map_namespace, 1)) != 0) {
 	syslog(LOG_ERR, "%s", error_message(r));
@@ -212,12 +219,14 @@
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
-
+ const char *localip, *remoteip;
 map_in = prot_new(0, 0);
 map_out = prot_new(1, 1);
 prot_setflushonread(map_in, map_out);
 prot_settimeout(map_in, 360);
 
+ smmapd_clienthost = get_clienthost(0, &localip, &remoteip);
+
 if (begin_handling() != 0) shut_down(0);
 
 /* prepare for new connection */
@@ -225,11 +234,26 @@
 return 0;
 }
 
-int verify_user(const char *key, long quotacheck,
-		struct auth_state *authstate)
+static int check_quotas(const char *name)
+{
+ quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_DONTCARE_INITIALIZER;
+ char rootMAX_MAILBOX_NAME+1;
+ 
+ /* just check the quotas we care about */
+ qdiffsQUOTA_STORAGE = 0;
+ qdiffsQUOTA_MESSAGE = 1;
+
+ if (!quota_findroot(root, sizeof(root), name))
+	return 0; /* no root, fine */
+
+ return quota_check_useds(root, qdiffs);
+}
+
+static int verify_user(const char *key, struct auth_state *authstate)
 {
 char rcptMAX_MAILBOX_BUFFER, namebufMAX_MAILBOX_BUFFER = "";
 char *user = rcpt, *domain = NULL, *mailbox = NULL;
+ mbentry_t *mbentry = NULL;
 int r = 0;
 
 /* make a working copy of the key and split it into user/domain/mailbox */
@@ -283,108 +307,104 @@
 	 }
 	}
 }
+ if (r) goto done;
+
+ /*
+ * check to see if mailbox exists and we can append to it:
+ *
+ * - must have posting privileges on shared folders
+ * - don't care about ACL on INBOX (always allow post)
+ * - must not be overquota
+ */
+ r = mboxlist_lookup(namebuf, &mbentry, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT && config_mupdate_server) {
+	kick_mupdate();
+	mboxlist_entry_free(&mbentry);
+	r = mboxlist_lookup(namebuf, &mbentry, NULL);
+ }
+ if (r) goto done;
+
+ if (!user) {
+	long aclcheck = ACL_POST;
+	int access = cyrus_acl_myrights(authstate, mbentry->acl);
 
- if (!r) {
-	long aclcheck = !user ? ACL_POST : 0;
- struct mboxlist_entry mbentry;
- char *c;
- struct hostent *hp;
- char *host;
- struct sockaddr_in sin,sfrom;
- char buf512;
- int soc, rc;
+	if ((access & aclcheck) != aclcheck) {
+	 r = (access & ACL_LOOKUP) ?
+		IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
+	 goto done;
+	}
+ }
+
+ if ((mbentry->mbtype & MBTYPE_REMOTE)) {
+	struct hostent *hp;
+	struct sockaddr_in sin,sfrom;
+	char buf512;
+	int soc, rc;
 	socklen_t x;
+	/* XXX Perhaps we should support the VRFY command in lmtpd
+	 * and then we could do a VRFY to the correct backend which
+	 * would also do a quotacheck.
+	 */
 
-	/*
-	 * check to see if mailbox exists and we can append to it:
-	 *
-	 * - must have posting privileges on shared folders
-	 * - don't care about ACL on INBOX (always allow post)
-	 * - don't care about message size (1 msg over quota allowed)
+	/* proxy the request to the real backend server to 
+	 * check the quota. if this fails, just return 0
+	 * (asuume under quota)
 	 */
-	r = mboxlist_lookup(namebuf, &mbentry, NULL);
-	if (r == IMAP_MAILBOX_NONEXISTENT && config_mupdate_server) {
-	 kick_mupdate();
-	 r = mboxlist_lookup(namebuf, &mbentry, NULL);
+
+	syslog(LOG_ERR, "verify_user(%s) proxying to host %s",
+	 namebuf, mbentry->server);
+
+	hp = gethostbyname(mbentry->server);
+	if (hp == (struct hostent*) 0) {
+	 syslog(LOG_ERR, "verify_user(%s) failed: can't find host %s",
+		 namebuf, mbentry->server);
+	 mboxlist_entry_free(&mbentry);
+	 return r;
 	}
 
-	if (!r && (mbentry.mbtype & MBTYPE_REMOTE)) {
-	 /* XXX Perhaps we should support the VRFY command in lmtpd
-	 * and then we could do a VRFY to the correct backend which
-	 * would also do a quotacheck.
-	 */
-	 int access = cyrus_acl_myrights(authstate, mbentry.acl);
-
-	 if ((access & aclcheck) != aclcheck) {
-		r = (access & ACL_LOOKUP) ?
-		 IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
- return r;
-	 } else {
- r = 0;
- }
-
- /* proxy the request to the real backend server to 
- * check the quota. if this fails, just return 0
- * (asuume under quota)
- */
-
- host = xstrdup(mbentry.partition);
- c = strchr(host, '!');
- if (c) *c = 0;
-
- syslog(LOG_ERR, "verify_user(%s) proxying to host %s",
- namebuf, host);
-
- hp = gethostbyname(host);
- if (hp == (struct hostent*) 0) {
- syslog(LOG_ERR, "verify_user(%s) failed: can't find host %s",
- namebuf, host);
- return r;
- }
-
- soc = socket(PF_INET, SOCK_STREAM, 0);
-	 if (soc < 0) {
- syslog(LOG_ERR, "verify_user(%s) failed: can't connect to %s", 
- namebuf, host);
-		free(host);
-		return r;
-	 }
- memcpy(&sin.sin_addr.s_addr,hp->h_addr,hp->h_length);
- sin.sin_family = AF_INET;
-
- /* XXX port should be configurable */
- sin.sin_port = htons(12345);
-
- if (connect(soc,(struct sockaddr *) &sin, sizeof(sin)) < 0) { 
- syslog(LOG_ERR, "verify_user(%s) failed: can't connect to %s", 
- namebuf, host);
-		free(host);
- return r;
- }
-
- sprintf(buf,SIZE_T_FMT ":cyrus %s,%c",strlen(key)+6,key,4);
- sendto(soc,buf,strlen(buf),0,(struct sockaddr *)&sin,sizeof(sin));
-
- x = sizeof(sfrom);
- rc = recvfrom(soc,buf,512,0,(struct sockaddr *)&sfrom,&x);
- 
- close(soc);
-
- if (rc >= 0) {
-		bufrc = '\0';
-		prot_printf(map_out, "%s", buf);
-	 }
-	 free(host);
- return -1; /* tell calling function we already replied */
-
-	} else if (!r) {
-	 r = append_check(namebuf, authstate,
-			 aclcheck, (quotacheck < 0 )
-			 || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
-			 quotacheck : 0);
+	soc = socket(PF_INET, SOCK_STREAM, 0);
+	if (soc < 0) {
+	 syslog(LOG_ERR, "verify_user(%s) failed: can't connect to %s", 
+		 namebuf, mbentry->server);
+	 mboxlist_entry_free(&mbentry);
+	 return r;
+	}
+	memcpy(&sin.sin_addr.s_addr,hp->h_addr,hp->h_length);
+	sin.sin_family = AF_INET;
+
+	/* XXX port should be configurable */
+	sin.sin_port = htons(12345);
+
+	if (connect(soc,(struct sockaddr *) &sin, sizeof(sin)) < 0) { 
+	 syslog(LOG_ERR, "verify_user(%s) failed: can't connect to %s", 
+		 namebuf, mbentry->server);
+	 close(soc);
+	 mboxlist_entry_free(&mbentry);
+	 return r;
+	}
+
+	sprintf(buf,SIZE_T_FMT ":cyrus %s,%c",strlen(key)+6,key,4);
+	sendto(soc,buf,strlen(buf),0,(struct sockaddr *)&sin,sizeof(sin));
+
+	x = sizeof(sfrom);
+	rc = recvfrom(soc,buf,512,0,(struct sockaddr *)&sfrom,&x);
+
+	close(soc);
+
+	if (rc >= 0) {
+	 bufrc = '\0';
+	 prot_printf(map_out, "%s", buf);
 	}
+
+	mboxlist_entry_free(&mbentry);
+
+	return -1; /* tell calling function we already replied */
 }
 
+ r = check_quotas(namebuf);
+
+done:
+ mboxlist_entry_free(&mbentry);
 if (r) syslog(LOG_DEBUG, "verify_user(%s) failed: %s", namebuf,
 		 error_message(r));
 
@@ -397,15 +417,15 @@
 */
 #define MAXREQUEST 1024		/* XXX is this reasonable? */
 
-int begin_handling(void)
+static int begin_handling(void)
 {
 int c;
 
 while ((c = prot_getc(map_in)) != EOF) {
-	int r = 0, len = 0, size = 0;
+	int r = 0, len = 0;
 	struct auth_state *authstate = NULL;
 	char requestMAXREQUEST+1;
-	char *mapname = NULL, *key = NULL;
+	char *key = NULL;
 	const char *errstring = NULL;
 
 	if (signals_poll() == SIGHUP) {
@@ -434,7 +454,6 @@
 
 	if (!r) {
 	 requestlen = '\0';
-	 mapname = request;
 	 if (!(key = strchr(request, ' '))) {
 		errstring = "missing key";
 		r = IMAP_PROTOCOL_ERROR;
@@ -444,24 +463,30 @@
 	if (!r) {
 	 *key++ = '\0';
 
-	 r = verify_user(key, size, authstate);
+	 r = verify_user(key, authstate);
 	}
 
 	switch (r) {
 case -1:
- /* reply already sent */
- break;
+	 /* reply already sent */
+	 break;
 
 	case 0:
+	 if (config_getswitch(IMAPOPT_AUDITLOG))
+		syslog(LOG_NOTICE, "auditlog: ok userid=<%s> client=<%s>", key, smmapd_clienthost);
 	 prot_printf(map_out, SIZE_T_FMT ":OK %s,", 3+strlen(key), key);
 	 break;
 
 	case IMAP_MAILBOX_NONEXISTENT:
+	 if (config_getswitch(IMAPOPT_AUDITLOG))
+		syslog(LOG_NOTICE, "auditlog: nonexistent userid=<%s> client=<%s>", key, smmapd_clienthost);
 	 prot_printf(map_out, SIZE_T_FMT ":NOTFOUND %s,",
 			9+strlen(error_message(r)), error_message(r));
 	 break;
 
 	case IMAP_QUOTA_EXCEEDED:
+	 if (config_getswitch(IMAPOPT_AUDITLOG))
+		syslog(LOG_NOTICE, "auditlog: overquota userid=<%s> client=<%s>", key, smmapd_clienthost);
 	 if (!config_getswitch(IMAPOPT_LMTP_OVER_QUOTA_PERM_FAILURE)) {
 		prot_printf(map_out, SIZE_T_FMT ":TEMP %s,", strlen(error_message(r))+5,
 			 error_message(r));
@@ -470,6 +495,8 @@
 	 /* fall through - permanent failure */
 
 	default:
+	 if (config_getswitch(IMAPOPT_AUDITLOG))
+		syslog(LOG_NOTICE, "auditlog: failed userid=<%s> client=<%s>", key, smmapd_clienthost);
 	 if (errstring)
 		prot_printf(map_out, SIZE_T_FMT ":PERM %s (%s),",
 			 5+strlen(error_message(r))+3+strlen(errstring),
@@ -484,9 +511,3 @@
 return 0;
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for smmapd!",
-	 EC_SOFTWARE);
-}

cyrus-imapd-2.4.17.tar.gz/imap/smtpclient.c -> cyrus-imapd-2.5.tar.gz/imap/smtpclient.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/smtpclient.h -> cyrus-imapd-2.5.tar.gz/imap/smtpclient.h Changed

cyrus-imapd-2.5.tar.gz/imap/sphinxmgr_client.c Added

@@ -0,0 +1,162 @@
+/* sphinxmgr_client.c - client for talking to the cyr_sphinxmgr daemon
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "imap_err.h"
+#include "global.h"
+#include "retry.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+
+static int sphinxmgr_request(const char *req, size_t reqsize,
+			 char *reply, size_t maxreply)
+{
+ const char *sockname = config_getstring(IMAPOPT_SPHINXMGR_SOCKET);
+ struct sockaddr_un asun;
+ int r;
+ int s = -1;
+
+ memset(&asun, 0, sizeof(asun));
+ asun.sun_family = AF_UNIX;
+ strlcpy(asun.sun_path, sockname, sizeof(asun.sun_path));
+
+ s = socket(PF_UNIX, SOCK_STREAM, 0);
+ if (s < 0) {
+	syslog(LOG_ERR, "socket(PF_UNIX): %m");
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ r = connect(s, (struct sockaddr *)&asun, sizeof(asun));
+ if (r < 0) {
+	syslog(LOG_ERR, "connect to %s failed: %m", sockname);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ r = retry_write(s, req, reqsize);
+ if (r < 0) {
+	syslog(LOG_ERR, "write to %s failed: %m", sockname);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+
+ r = read(s, reply, maxreply-1);
+ if (r < 0) {
+	syslog(LOG_ERR, "read from %s failed: %m", sockname);
+	r = IMAP_IOERROR;
+	goto out;
+ }
+ replyr = '\0';
+ r = 0;
+
+out:
+ if (s >= 0) close(s);
+ return r;
+}
+
+int sphinxmgr_getsock(const char *mboxname, char **socknamep)
+{
+ int r;
+ char *p;
+ char buf1024;
+
+ snprintf(buf, sizeof(buf), "GETSOCK %s\n", mboxname);
+ r = sphinxmgr_request(buf, strlen(buf), buf, sizeof(buf));
+ if (r) return r;
+ if (strncmp(buf, "OK ", 3)) {
+	syslog(LOG_ERR, "sphinxmgr returned failure: %s", buf);
+	return IMAP_IOERROR;
+ }
+ p = strpbrk(buf+3, " \t\n\r");
+ if (p) *p = '\0';
+ *socknamep = xstrdup(buf+3);
+ return 0;
+}
+
+int sphinxmgr_getconf(const char *mboxname, char **configp)
+{
+ int r;
+ char *p;
+ char buf1024;
+
+ snprintf(buf, sizeof(buf), "GETCONF %s\n", mboxname);
+ r = sphinxmgr_request(buf, strlen(buf), buf, sizeof(buf));
+ if (r) return r;
+ if (strncmp(buf, "OK ", 3)) {
+	syslog(LOG_ERR, "sphinxmgr returned failure: %s", buf);
+	return IMAP_IOERROR;
+ }
+ p = strpbrk(buf+3, " \t\n\r");
+ if (p) *p = '\0';
+ *configp = xstrdup(buf+3);
+ return 0;
+}
+
+int sphinxmgr_stop(const char *mboxname)
+{
+ int r;
+ char buf1024;
+
+ snprintf(buf, sizeof(buf), "STOP %s\n", mboxname);
+ r = sphinxmgr_request(buf, strlen(buf), buf, sizeof(buf));
+ if (r) return r;
+ if (strncmp(buf, "OK ", 3)) {
+	syslog(LOG_ERR, "sphinxmgr returned failure: %s", buf);
+	return IMAP_IOERROR;
+ }
+ return 0;
+}
+

cyrus-imapd-2.5.tar.gz/imap/sphinxmgr_client.h Added

@@ -0,0 +1,54 @@
+/* sphinxmgr_client.h - client for talking to the cyr_sphinxmgr daemon
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_SPHINXMGR_CLIENT_H__
+#define __CYRUS_SPHINXMGR_CLIENT_H__
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include "mailbox.h"
+
+int sphinxmgr_getsock(const char *mboxname, char **socknamep);
+int sphinxmgr_getconf(const char *mboxname, char **configp);
+int sphinxmgr_stop(const char *mboxname);
+
+#endif

cyrus-imapd-2.4.17.tar.gz/imap/spool.c -> cyrus-imapd-2.5.tar.gz/imap/spool.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: spool.c,v 1.16 2010/01/06 17:01:40 murch Exp $
 */
 
 #include <config.h>
@@ -49,55 +47,19 @@
 #endif
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "assert.h"
 #include "spool.h"
-#include "prot.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "exitcodes.h"
-#include "imap_err.h"
-#include "nntp_err.h"
+#include "imap/imap_err.h"
 #include "global.h"
+#include "strarray.h"
 
-#define HEADERCACHESIZE 4009
-
-typedef struct Header header_t;
-
-/* data per message */
-struct Header {
- char *name;
- int ncontents;
- char *contents1;
-};
-
-hdrcache_t spool_new_hdrcache()
-{
- int i;
- hdrcache_t cache;
-
- cache = (hdrcache_t) xmalloc(HEADERCACHESIZE * sizeof(header_t*));
- if (!cache) return NULL;
-
- for (i = 0; i < HEADERCACHESIZE; i++)
-	cachei = NULL;
-
- return cache;
-}
-
-/* hash function used for header cache in struct msg */
-static int hashheader(char *header)
+hdrcache_t spool_new_hdrcache(void)
 {
- int x = 0;
- /* any CHAR except ' ', :, or a ctrl char */
- for (; !Uiscntrl(*header) && (*header != ' ') && (*header != ':'); 
-	 header++) {
-	x *= 256;
-	x += *header;
-	x %= HEADERCACHESIZE;
- }
- return x;
+ hash_table *ht = xmalloc(sizeof(*ht));
+ return construct_hash_table(ht, 4000, 0);
 }
 
 /* take a list of headers, pull the first one out and return it in
@@ -114,11 +76,6 @@
 BODY
 } state;
 
-enum {
- NAMEINC = 128,
- BODYINC = 1024
-};
-
 /* we don't have to worry about dotstuffing here, since it's illegal
 for a header to begin with a dot!
 
@@ -133,23 +90,16 @@
 		 const char **skipheaders)
 {
 int c;
- static char *name = NULL, *body = NULL;
- static int namelen = 0, bodylen = 0;
- int off = 0;
+ static struct buf name = BUF_INITIALIZER;
+ static struct buf body = BUF_INITIALIZER;
 state s = NAME_START;
 int r = 0;
 int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
 int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
 const char **skip = NULL;
 
- if (namelen == 0) {
-	namelen += NAMEINC;
-	name = (char *) xrealloc(name, namelen * sizeof(char));
- }
- if (bodylen == 0) {
-	bodylen += BODYINC;
-	body = (char *) xrealloc(body, bodylen * sizeof(char));
- }
+ buf_reset(&name);
+ buf_reset(&body);
 
 /* there are two ways out of this loop, both via gotos:
 either we successfully read a header (got_header)
@@ -190,20 +140,19 @@
 		r = IMAP_MESSAGE_BADHEADER;
 		goto ph_error;
 	 }
-	 name0 = c;
-	 off = 1;
+	 buf_putc(&name, c);
 	 s = NAME;
 	 break;
 
 	case NAME:
 	 if (c == ' ' || c == '\t' || c == ':') {
-		nameoff = '\0';
+		buf_cstring(&name);
 		/* see if this header is in our skip list */
 		for (skip = skipheaders;
-		 skip && *skip && strcasecmp(name, *skip); skip++);
+		 skip && *skip && strcasecmp(name.s, *skip); skip++);
 		if (!skip || !*skip) {
 		 /* write the header name to the output */
-		 if (fout) fputs(name, fout);
+		 if (fout) fputs(name.s, fout);
 		 skip = NULL;
 		}
 		s = (c == ':' ? BODY_START : COLON);
@@ -213,11 +162,7 @@
 		r = IMAP_MESSAGE_BADHEADER;
 		goto ph_error;
 	 }
-	 nameoff++ = c;
-	 if (off >= namelen - 3) {
-		namelen += NAMEINC;
-		name = (char *) xrealloc(name, namelen);
-	 }
+	 buf_putc(&name, c);
 	 break;
 	
 	case COLON:
@@ -237,7 +182,7 @@
 	case BODY_START:
 	 if (c == ' ' || c == '\t') /* eat the whitespace */
 		break;
-	 off = 0;
+	 buf_reset(&body);
 	 s = BODY;
 	 /* falls through! */
 	case BODY:
@@ -259,7 +204,7 @@
 		}
 		if (c != ' ' && c != '\t') {
 		 /* this is the end of the header */
-		 bodyoff = '\0';
+		 buf_cstring(&body);
 		 prot_ungetc(c, fin);
 		 goto got_header;
 		}
@@ -277,11 +222,7 @@
 		}
 	 }
 	 /* just an ordinary character */
-	 bodyoff++ = c;
-	 if (off >= bodylen - 3) {
-		bodylen += BODYINC;
-		body = (char *) xrealloc(body, bodylen);
-	 }
+	 buf_putc(&body, c);
 	}
 
 	/* copy this to the output */
@@ -301,52 +242,44 @@
 return r;
 
 got_header:
- if (headname != NULL) *headname = xstrdup(name);
- if (contents != NULL) *contents = xstrdup(body);
+ /* Note: xstrdup()ing the string ensures we return
+ * a minimal length string with no allocation slack
+ * at the end */
+ if (headname != NULL) *headname = xstrdup(name.s);
+ if (contents != NULL) *contents = xstrdup(body.s);
 
 return 0;
 }
 
-void spool_cache_header(char *name, char *body, hdrcache_t cache)
+EXPORTED void spool_cache_header(char *name, char *body, hdrcache_t cache)
 {
- int cl, clinit;
+ strarray_t *contents;
 
 lcase(name);
- clinit = cl = hashheader(name);
- while (cachecl != NULL && strcmp(name, cachecl->name)) {
-	cl++;		/* resolve collisions linearly */
-	cl %= HEADERCACHESIZE;
-	if (cl == clinit) break; /* gone all the way around, so bail */
- }
 
- /* found where to put it, so insert it into a list */
- if (cachecl) {
-	/* add this body on */
-	cachecl->contentscachecl->ncontents++ = body;
-
-	/* whoops, won't have room for the null at the end! */
-	if (!(cachecl->ncontents % 8)) {
-	 /* increase the size */
-	 cachecl = (header_t *)
-		xrealloc(cachecl,sizeof(header_t) +
-			 ((8 + cachecl->ncontents) * sizeof(char *)));
-	}
+ contents = (strarray_t *)hash_lookup(name, cache);
+ if (!contents)
+	contents = hash_insert(name, strarray_new(), cache);
+ strarray_appendm(contents, body);
+ free(name);
+}
 
-	/* have no need of this */
-	free(name);
- } else {
-	/* create a new entry in the hash table */
-	cachecl = (header_t *) xmalloc(sizeof(header_t) + 8 * sizeof(char*));
-	cachecl->name = name;
-	cachecl->contents0 = body;
-	cachecl->ncontents = 1;
- }
+EXPORTED void spool_replace_header(char *name, char *body, hdrcache_t cache)
+{
+ strarray_t *contents;
 
- /* we always want a NULL at the end */
- cachecl->contentscachecl->ncontents = NULL;
+ lcase(name);
+
+ contents = (strarray_t *)hash_lookup(name, cache);
+ if (!contents)
+	contents = hash_insert(name, strarray_new(), cache);
+ else
+	strarray_truncate(contents, 0);
+ strarray_appendm(contents, body);
+ free(name);
 }
 
-int spool_fill_hdrcache(struct protstream *fin, FILE *fout, hdrcache_t cache,
+EXPORTED int spool_fill_hdrcache(struct protstream *fin, FILE *fout, hdrcache_t cache,
 			const char **skipheaders)
 {
 int r = 0;
@@ -371,11 +304,10 @@
 return r;
 }
 
-const char **spool_getheader(hdrcache_t cache, const char *phead)
+EXPORTED const char **spool_getheader(hdrcache_t cache, const char *phead)
 {
 char *head;
- const char **ret = NULL;
- int clinit, cl;
+ strarray_t *contents;
 
 assert(cache && phead);
 
@@ -383,47 +315,59 @@
 lcase(head);
 
 /* check the cache */
- clinit = cl = hashheader(head);
- while (cachecl != NULL) {
-	if (!strcmp(head, cachecl->name)) {
-	 ret = (const char **) cachecl->contents;
-	 break;
-	}
-	cl++; /* try next hash bin */
-	cl %= HEADERCACHESIZE;
-	if (cl == clinit) break; /* gone all the way around */
- }
+ contents = (strarray_t *)hash_lookup(head, cache);
 
 free(head);
 
- return ret;
+ return contents ? (const char **)contents->data : NULL;
 }
 
-void spool_free_hdrcache(hdrcache_t cache)
+EXPORTED void spool_free_hdrcache(hdrcache_t cache)
 {
- int i, j;
-
 if (!cache) return;
 
- for (i = 0; i < HEADERCACHESIZE; i++) {
-	if (cachei) {
-	 free(cachei->name);
-	 for (j = 0; j < cachei->ncontents; j++) {
-		free(cachei->contentsj);
-	 }
-	 free(cachei);
-	}
- }
+ free_hash_table(cache, (void (*)(void *))strarray_free);
 free(cache);
 }
 
+struct spool_enum_rock {
+ void (*proc)(const char *, const char *, void *);
+ void *rock;
+};
+
+static void spool_enum_cb(const char *key, void *data, void *rock)
+{
+ struct spool_enum_rock *c = (struct spool_enum_rock *)rock;
+ strarray_t *d = (strarray_t *)data;
+ int i;
+
+ for (i = 0; i < d->count; i++) {
+	const char *val = strarray_nth(d, i);
+	c->proc(key, val, c->rock);
+ }
+}
+
+EXPORTED void spool_enum_hdrcache(hdrcache_t cache,
+			 void (*proc)(const char *, const char *, void *),
+			 void *rock)
+{
+ struct spool_enum_rock cbrock;
+
+ if (!cache) return;
+
+ cbrock.proc = proc;
+ cbrock.rock = rock;
+
+ hash_enumerate(cache, spool_enum_cb, &cbrock);
+}
+
 /* copies the message from fin to fout, massaging accordingly: 
 . newlines are fiddled to \r\n
 . "." terminates 
 . embedded NULs are rejected
 . bare \r are removed
 */
-int spool_copy_msg(struct protstream *fin, FILE *fout)
+EXPORTED int spool_copy_msg(struct protstream *fin, FILE *fout)
 {
 char buf8192, *p;
 int r = 0;

cyrus-imapd-2.4.17.tar.gz/imap/spool.h -> cyrus-imapd-2.5.tar.gz/imap/spool.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: spool.h,v 1.7 2010/01/06 17:01:40 murch Exp $
 */
 
 #ifndef INCLUDED_SPOOL_H
@@ -47,15 +45,21 @@
 
 #include <stdio.h>
 #include "prot.h"
+#include "hash.h"
 
-typedef struct Header **hdrcache_t;
+typedef hash_table *hdrcache_t;
 
-hdrcache_t spool_new_hdrcache();
+hdrcache_t spool_new_hdrcache(void);
 void spool_cache_header(char *name, char *body, hdrcache_t cache);
+void spool_replace_header(char *name, char *newvalue,
+			 hdrcache_t cache);
 int spool_fill_hdrcache(struct protstream *fin, FILE *fout, hdrcache_t cache,
 			const char **skipheaders);
 const char **spool_getheader(hdrcache_t cache, const char *phead);
 void spool_free_hdrcache(hdrcache_t cache);
+void spool_enum_hdrcache(hdrcache_t cache,
+			 void (*proc)(const char *, const char *, void *),
+			 void *rock);
 int spool_copy_msg(struct protstream *fin, FILE *fout);
 
 #endif

cyrus-imapd-2.4.17.tar.gz/imap/squat.c -> cyrus-imapd-2.5.tar.gz/imap/squat.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: squat.c,v 1.12 2010/01/06 17:01:40 murch Exp $
 */
 
 #include <config.h>
@@ -83,7 +81,7 @@
 return len == 0;
 }
 
-SquatSearchIndex* squat_search_open(int fd) {
+EXPORTED SquatSearchIndex* squat_search_open(int fd) {
 struct stat buf;
 SquatSearchIndex* index;
 SquatDiskHeader const* header;
@@ -153,7 +151,7 @@
 return NULL;
 }
 
-int squat_search_list_docs(SquatSearchIndex* index,
+EXPORTED int squat_search_list_docs(SquatSearchIndex* index,
 SquatListDocCallback handler, void* closure) {
 char const* s = index->doc_list;
 
@@ -471,7 +469,7 @@
 of documents, to save memory and the cost of traversing that list
 several times.
 */
-int squat_search_execute(SquatSearchIndex* index, char const* data,
+HIDDEN int squat_search_execute(SquatSearchIndex* index, char const* data,
 int data_len, SquatSearchResultCallback handler, void* closure) {
 int i;
 int min_doc_count_word; /* The subword of 'data' that appears in
@@ -597,7 +595,7 @@
 return SQUAT_ERR;
 }
 
-int squat_search_close(SquatSearchIndex* index) {
+EXPORTED int squat_search_close(SquatSearchIndex* index) {
 int r = SQUAT_OK;
 
 squat_set_last_error(SQUAT_ERR_OK);
@@ -854,7 +852,7 @@
 return(SQUAT_OK);
 }
 
-int squat_scan(SquatSearchIndex* index, char first_char,
+EXPORTED int squat_scan(SquatSearchIndex* index, char first_char,
 SquatScanCallback handler, void* closure)
 {
 char bufSQUAT_WORD_SIZE+1;
@@ -871,8 +869,6 @@
 buf0 = first_char;
 
 return(squat_scan_recurse(s, index->data_end, buf, 1, handler, closure));
-
- return SQUAT_OK;
 }
 
 /* ====================================================================== */
@@ -928,7 +924,7 @@
 }
 }
 
-int squat_count_docs(SquatSearchIndex* index, char first_char, int *counter)
+EXPORTED int squat_count_docs(SquatSearchIndex* index, char first_char, int *counter)
 {
 char bufSQUAT_WORD_SIZE+1;
 const char *s, *t;

cyrus-imapd-2.4.17.tar.gz/imap/squat.h -> cyrus-imapd-2.5.tar.gz/imap/squat.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/squat_build.c -> cyrus-imapd-2.5.tar.gz/imap/squat_build.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: squat_build.c,v 1.17 2010/01/06 17:01:40 murch Exp $
 */
 
 /*
@@ -101,85 +99,80 @@
 #include "message.h"
 
 #include "assert.h"
+#include "util.h"
 #include "index.h"
 #include "xmalloc.h"
 
 /* A simple write-buffering module which avoids copying of the output data. */
 
 typedef struct {
- char* buf; /* The malloc'ed buffer, or NULL if there
-			 isn't one. */
- int buf_size; /* The size of that buffer. */
- int data_len; /* How much data in that buffer is valid. */
- int fd; /* The fd to write to. */
- int total_output_bytes; /* How much data have we written out
-			 through this buffer in total? */
+ struct buf buf;	 /* The extending malloc'ed buffer */
+ int fd; /* The fd to write to. */
+ int total_output_bytes; /* How much data have we written out
+			 through this buffer in total? */
 } SquatWriteBuffer;
 
-static int init_write_buffer(SquatWriteBuffer* b, int buf_size, int fd) {
- b->buf_size = buf_size;
- b->buf = xmalloc(b->buf_size);
- b->fd = fd;
- b->data_len = 0;
- b->total_output_bytes = 0;
+static int init_write_buffer(SquatWriteBuffer* b, int buf_size, int fd)
+{
+ buf_init(&b->buf);
+ buf_ensure(&b->buf, buf_size);
+ b->fd = fd;
+ b->total_output_bytes = 0;
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Make sure that there is enough space in the buffer to write 'len' bytes.
 Return a pointer to where the written data should be placed. */
-static char* prepare_buffered_write(SquatWriteBuffer* b, int len) {
- if (b->data_len + len >= b->buf_size) {
- if (write(b->fd, b->buf, b->data_len) != b->data_len) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- return NULL;
- }
- if (b->buf_size < len) {
- b->buf = (char*)xrealloc(b->buf, len);
- if (b->buf == NULL) {
- squat_set_last_error(SQUAT_ERR_OUT_OF_MEMORY);
- return NULL;
- }
+static char *prepare_buffered_write(SquatWriteBuffer *b, int len)
+{
+ if (b->buf.len + len >= b->buf.alloc) {
+	if (write(b->fd, b->buf.s, b->buf.len) != (long)b->buf.len) {
+	 squat_set_last_error(SQUAT_ERR_SYSERR);
+	 return NULL;
+	}
+	buf_reset(&b->buf);
+	buf_ensure(&b->buf, len);
 }
- b->data_len = 0;
- }
- 
- return b->buf + b->data_len;
+
+ return b->buf.s + b->buf.len;
 }
 
 /* Signal that data has been written up to the mark 'ptr'.
 Call this after prepare_buffered_write. */
-static void complete_buffered_write(SquatWriteBuffer* b, char* ptr) {
- int old_data_len = b->data_len;
-
- b->data_len = ptr - b->buf;
- b->total_output_bytes += b->data_len - old_data_len;
+static void complete_buffered_write(SquatWriteBuffer *b, char *ptr)
+{
+ int oldbytes = b->buf.len;
+ int newbytes = ptr - b->buf.s;
+ buf_truncate(&b->buf, newbytes);
+ b->total_output_bytes += newbytes - oldbytes;
 }
 
 /* Flush the output buffer to the file. Reset the file pointer to the start
 of the file. */
-static int flush_and_reset_buffered_writes(SquatWriteBuffer* b) {
- if (b->data_len > 0) {
- if (write(b->fd, b->buf, b->data_len) != b->data_len) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- return SQUAT_ERR;
+static int flush_and_reset_buffered_writes(SquatWriteBuffer *b)
+{
+ if (b->buf.len) {
+	if (write(b->fd, b->buf.s, b->buf.len) != (long)b->buf.len) {
+	 squat_set_last_error(SQUAT_ERR_SYSERR);
+	 return SQUAT_ERR;
+	}
+	buf_reset(&b->buf);
 }
- b->data_len = 0;
- }
 
- if (lseek(b->fd, 0, SEEK_SET) != 0) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- return SQUAT_ERR;
- }
+ if (lseek(b->fd, 0, SEEK_SET) != 0) {
+	squat_set_last_error(SQUAT_ERR_SYSERR);
+	return SQUAT_ERR;
+ }
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* A circular linked list of document IDs, stored in increasing order
 of document ID. */
 typedef struct _WordDocEntry {
- struct _WordDocEntry* next;
- int doc_ID;
+ struct _WordDocEntry *next;
+ int doc_ID;
 } WordDocEntry;
 
 /* These form the leaves of the "all documents" tries. For each of the
@@ -246,10 +239,10 @@
 
 /* Map docIDs in existing index to docIDs in the new index */
 struct doc_ID_map {
- int *map;
- int alloc;
- int max;
- int new;
+ int *map;
+ int alloc;
+ int max;
+ int new;
 };
 
 struct _SquatIndex {
@@ -316,306 +309,319 @@
 */
 
 /* Copy existing document details verbatim from old to new index */
-static int squat_index_copy_document(SquatIndex* index, char const* name,
- SquatInt64 size)
+static int squat_index_copy_document(SquatIndex *index, char const *name,
+				 SquatInt64 size)
 {
- char* buf;
- int r = squat_index_open_document(index, name);
+ char *buf;
+ int r = squat_index_open_document(index, name);
 
- if (r != SQUAT_OK)
- return(r);
+ if (r != SQUAT_OK)
+	return (r);
 
- squat_set_last_error(SQUAT_ERR_OK);
- if ((buf = prepare_buffered_write(&index->out, 10)) == NULL) {
- return SQUAT_ERR;
- }
- buf = squat_encode_I(buf, size);
- complete_buffered_write(&index->out, buf);
+ squat_set_last_error(SQUAT_ERR_OK);
+ if ((buf = prepare_buffered_write(&index->out, 10)) == NULL) {
+	return SQUAT_ERR;
+ }
+ buf = squat_encode_I(buf, size);
+ complete_buffered_write(&index->out, buf);
 
- index->current_doc_len = -1;
- index->current_doc_ID++;
+ index->current_doc_len = -1;
+ index->current_doc_ID++;
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 static void doc_ID_map_init(struct doc_ID_map *doc_ID_map)
 {
- doc_ID_map->alloc = 50;
- doc_ID_map->map = xmalloc(doc_ID_map->alloc*sizeof(int));
- doc_ID_map->max = 0;
- doc_ID_map->new = 0;
+ doc_ID_map->alloc = 50;
+ doc_ID_map->map = xmalloc(doc_ID_map->alloc * sizeof(int));
+ doc_ID_map->max = 0;
+ doc_ID_map->new = 0;
 }
 
 static void doc_ID_map_free(struct doc_ID_map *doc_ID_map)
 {
- if (doc_ID_map->map) free(doc_ID_map->map);
+ if (doc_ID_map->map)
+	free(doc_ID_map->map);
 
- memset(doc_ID_map, 0, sizeof(struct doc_ID_map));
+ memset(doc_ID_map, 0, sizeof(struct doc_ID_map));
 }
 
 static void doc_ID_map_add(struct doc_ID_map *doc_ID_map, int exists)
 {
- if (doc_ID_map->max == doc_ID_map->alloc) {
- doc_ID_map->alloc *= 2;
- doc_ID_map->map = xrealloc(doc_ID_map->map, doc_ID_map->alloc*sizeof(int));
- }
- if (exists) {
- doc_ID_map->mapdoc_ID_map->max++ = doc_ID_map->new++;
- } else {
- doc_ID_map->mapdoc_ID_map->max++ = 0; /* Does not exist in new index */
- }
+ if (doc_ID_map->max == doc_ID_map->alloc) {
+	doc_ID_map->alloc *= 2;
+	doc_ID_map->map =
+	 xrealloc(doc_ID_map->map, doc_ID_map->alloc * sizeof(int));
+ }
+ if (exists) {
+	doc_ID_map->mapdoc_ID_map->max++ = doc_ID_map->new++;
+ } else {
+	doc_ID_map->mapdoc_ID_map->max++ = 0;	/* Does not exist in new index */
+ }
 }
 
 static int doc_ID_map_lookup(struct doc_ID_map *doc_ID_map, int docID)
 {
- if ((docID < 1) || (docID > doc_ID_map->max))
- return(0);
+ if ((docID < 1) || (docID > doc_ID_map->max))
+	return (0);
 
- return(doc_ID_map->mapdocID);
+ return (doc_ID_map->mapdocID);
 }
 
-static int copy_docIDs(void* closure, SquatListDoc const* doc)
+static int copy_docIDs(void *closure, SquatListDoc const *doc)
 {
- SquatIndex* index = (SquatIndex*)closure;
- struct doc_ID_map *doc_ID_map = &index->doc_ID_map;
- int choice = (index->select_doc)(index->select_doc_closure, doc);
-
- if (choice > 0) {
- doc_ID_map_add(doc_ID_map, 1);
- return(squat_index_copy_document(index, doc->doc_name, doc->size));
- }
-
- /* This docID no longer exists */
- doc_ID_map_add(doc_ID_map, 0);
- return SQUAT_CALLBACK_CONTINUE;
+ SquatIndex *index = (SquatIndex *) closure;
+ struct doc_ID_map *doc_ID_map = &index->doc_ID_map;
+ int choice = (index->select_doc) (index->select_doc_closure, doc);
+
+ if (choice > 0) {
+	doc_ID_map_add(doc_ID_map, 1);
+	return (squat_index_copy_document
+		(index, doc->doc_name, doc->size));
+ }
+
+ /* This docID no longer exists */
+ doc_ID_map_add(doc_ID_map, 0);
+ return SQUAT_CALLBACK_CONTINUE;
 }
 
 /* Comes later */
 static int add_word_to_trie(SquatIndex* index, char const* word_ptr,
 int doc_ID);
 
-static int add_word_callback(void* closure, char *name, int doc_ID)
+static int add_word_callback(void *closure, char *name, int doc_ID)
 {
- SquatIndex* index = (SquatIndex*)closure;
- struct doc_ID_map *doc_ID_map = &index->doc_ID_map;
+ SquatIndex *index = (SquatIndex *) closure;
+ struct doc_ID_map *doc_ID_map = &index->doc_ID_map;
 
- /* Find doc_ID in the new index which corresponds to this old doc_ID */
- if ((doc_ID = doc_ID_map_lookup(doc_ID_map, doc_ID)) == 0)
- return SQUAT_ERR;
+ /* Find doc_ID in the new index which corresponds to this old doc_ID */
+ if ((doc_ID = doc_ID_map_lookup(doc_ID_map, doc_ID)) == 0)
+	return SQUAT_ERR;
 
- add_word_to_trie(index, name+1, doc_ID);
+ add_word_to_trie(index, name + 1, doc_ID);
 
- return SQUAT_CALLBACK_CONTINUE;
+ return SQUAT_CALLBACK_CONTINUE;
 }
 
-int squat_index_add_existing(SquatIndex* index,
- SquatSearchIndex *old_index,
- SquatDocChooserCallback select_doc,
- void *select_doc_closure) {
- index->old_index = old_index;
- index->select_doc = select_doc;
- index->select_doc_closure = select_doc_closure;
+int squat_index_add_existing(SquatIndex *index,
+			 SquatSearchIndex *old_index,
+			 SquatDocChooserCallback select_doc,
+			 void *select_doc_closure)
+{
+ index->old_index = old_index;
+ index->select_doc = select_doc;
+ index->select_doc_closure = select_doc_closure;
 
- return(squat_search_list_docs(old_index, copy_docIDs, index));
+ return (squat_search_list_docs(old_index, copy_docIDs, index));
 }
 
 /* ====================================================================== */
 
 /* Initally, before we see a document, there are no words for the document. */
-static void init_doc_word_table(SquatWordTable** t) {
- SquatWordTable *ret = (SquatWordTable*)xmalloc(sizeof(SquatWordTable));
-
- ret->first_valid_entry = 256;
- ret->last_valid_entry = 0;
- memset(ret->entries, 0, sizeof(ret->entries));
- *t = ret;
+static SquatWordTable *word_table_new(void)
+{
+ SquatWordTable *ret =
+	(SquatWordTable *) xzmalloc(sizeof(SquatWordTable));
+
+ /* Initially there are no valid entries. Set things up so that
+ the obvious tests will set first_valid_entry and
+ last_valid_entry correctly. */
+ ret->first_valid_entry = 256;
+ ret->last_valid_entry = 0;
+ return ret;
 }
 
-SquatIndex* squat_index_init(int fd, SquatOptions const* options) {
- SquatIndex* index;
- unsigned i;
- int path_len;
- char* buf;
- char const* tmp_path;
-
- squat_set_last_error(SQUAT_ERR_OK);
-
- index = (SquatIndex*)xmalloc(sizeof(SquatIndex));
-
- /* Copy processed options into the SquatIndex */
- if (options != NULL && (options->option_mask & SQUAT_OPTION_TMP_PATH) != 0) {
- tmp_path = options->tmp_path;
- } else {
- tmp_path = "/tmp";
- }
- path_len = strlen(tmp_path);
- index->tmp_path = xmalloc(path_len + 1 + 12);
- memcpy(index->tmp_path, tmp_path, path_len);
- strcpy(index->tmp_path + path_len, "/squatXXXXXX");
-
- if (options != NULL &&
- (options->option_mask & SQUAT_OPTION_VALID_CHARS) != 0) {
- int i;
+SquatIndex *squat_index_init(int fd, const SquatOptions *options)
+{
+ SquatIndex *index;
+ unsigned i;
+ char *buf;
+ char const *tmp_path;
+
+ squat_set_last_error(SQUAT_ERR_OK);
+
+ index = (SquatIndex *) xmalloc(sizeof(SquatIndex));
+
+ /* Copy processed options into the SquatIndex */
+ if (options != NULL
+	&& (options->option_mask & SQUAT_OPTION_TMP_PATH) != 0) {
+	tmp_path = options->tmp_path;
+ } else {
+	tmp_path = "/tmp";
+ }
+ index->tmp_path = strconcat(tmp_path, "/squatXXXXXX", (char *)NULL);
+
+ if (options != NULL &&
+	(options->option_mask & SQUAT_OPTION_VALID_CHARS) != 0) {
+	int i;
 
- memset(index->valid_char_bits, 0, sizeof(index->valid_char_bits));
- for (i = 0; options->valid_charsi != 0; i++) {
- int ch = (unsigned char)options->valid_charsi;
+	memset(index->valid_char_bits, 0, sizeof(index->valid_char_bits));
+	for (i = 0; options->valid_charsi != 0; i++) {
+	 int ch = (unsigned char)options->valid_charsi;
 
- index->valid_char_bitsch >> 3 |= 1 << (ch & 7);
+	 index->valid_char_bitsch >> 3 |= 1 << (ch & 7);
+	}
+ } else {
+	memset(index->valid_char_bits, 255,
+	 sizeof(index->valid_char_bits));
 }
- } else {
- memset(index->valid_char_bits, 255, sizeof(index->valid_char_bits));
- }
-
- if (options != NULL &&
- (options->option_mask & SQUAT_OPTION_STATISTICS) != 0) {
- index->stats_callback = options->stats_callback;
- index->stats_callback_closure = options->stats_callback_closure;
- } else {
- index->stats_callback = NULL;
- }
-
- /* Finish initializing the SquatIndex */
- for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
- index->index_buffersi.buf = NULL;
- }
-
- index->doc_ID_list_size = 1000;
- index->doc_ID_list = (char*)xmalloc(index->doc_ID_list_size*sizeof(SquatInt32));
-
- /* Use a 128K write buffer for the main index file */
- if (init_write_buffer(&index->out, 128*1024, fd) != SQUAT_OK) {
- goto cleanup_doc_ID_list;
- }
-
- /* Write out a dummy header. This will be replaced by the real header at the
- end of the process. */
- buf = prepare_buffered_write(&index->out, sizeof(SquatDiskHeader));
- if (buf == NULL) {
- goto cleanup_out_buffer;
- }
- memset(buf, 0, sizeof(SquatDiskHeader));
- complete_buffered_write(&index->out, buf + sizeof(SquatDiskHeader));
-
- index->current_doc_ID = 0;
- init_doc_word_table(&index->doc_word_table);
-
- memset(index->total_num_words, 0, sizeof(index->total_num_words));
-
- index->old_index = NULL; /* Until we are given one */
- doc_ID_map_init(&index->doc_ID_map);
-
- return index;
+
+ if (options != NULL &&
+	(options->option_mask & SQUAT_OPTION_STATISTICS) != 0) {
+	index->stats_callback = options->stats_callback;
+	index->stats_callback_closure = options->stats_callback_closure;
+ } else {
+	index->stats_callback = NULL;
+ }
+
+ /* Finish initializing the SquatIndex */
+ for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
+	buf_init(&index->index_buffersi.buf);
+	index->index_buffersi.fd = -1;
+ }
+
+ index->doc_ID_list_size = 1000;
+ index->doc_ID_list =
+	(char *)xmalloc(index->doc_ID_list_size * sizeof(SquatInt32));
+
+ /* Use a 128K write buffer for the main index file */
+ if (init_write_buffer(&index->out, 128 * 1024, fd) != SQUAT_OK) {
+	goto cleanup_doc_ID_list;
+ }
+
+ /* Write out a dummy header. This will be replaced by the real header at the
+ end of the process. */
+ buf = prepare_buffered_write(&index->out, sizeof(SquatDiskHeader));
+ if (buf == NULL) {
+	goto cleanup_out_buffer;
+ }
+ memset(buf, 0, sizeof(SquatDiskHeader));
+ complete_buffered_write(&index->out, buf + sizeof(SquatDiskHeader));
+
+ index->current_doc_ID = 0;
+ index->doc_word_table = word_table_new();
+
+ memset(index->total_num_words, 0, sizeof(index->total_num_words));
+
+ index->old_index = NULL;	/* Until we are given one */
+ doc_ID_map_init(&index->doc_ID_map);
+
+ return index;
 
 cleanup_out_buffer:
- free(index->out.buf);
+ buf_free(&index->out.buf);
 
 cleanup_doc_ID_list:
- free(index->doc_ID_list);
+ free(index->doc_ID_list);
 
 /*cleanup_tmp_path:*/
- free(index->tmp_path);
+ free(index->tmp_path);
 
 /*cleanup_index:*/
- free(index); 
- return NULL;
+ free(index);
+ return NULL;
 }
 
 /* Initialize a write buffer for a temporary file. We generate the
 temporary file name here. The file is unlinked right away so if we
 crash, the temporary file doesn't need to be cleaned up. */
-static int init_write_buffer_to_temp(SquatIndex* index, SquatWriteBuffer* b) {
- int fd = mkstemp(index->tmp_path);
+static int init_write_buffer_to_temp(SquatIndex *index,
+				 SquatWriteBuffer *b)
+{
+ char *tmp_path = xstrdup(index->tmp_path);
+ int fd = mkstemp(tmp_path);
 
- if (fd < 0) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- return SQUAT_ERR;
- }
+ if (fd < 0) {
+	free(tmp_path);
+	squat_set_last_error(SQUAT_ERR_SYSERR);
+	return SQUAT_ERR;
+ }
 
- if (unlink(index->tmp_path) < 0) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- goto cleanup_fd;
- }
- 
- strcpy(index->tmp_path + strlen(index->tmp_path) - 6, "XXXXXX");
+ if (unlink(tmp_path) < 0) {
+	squat_set_last_error(SQUAT_ERR_SYSERR);
+	goto cleanup_fd;
+ }
 
- if (init_write_buffer(b, 64*1024, fd) != SQUAT_OK) {
- goto cleanup_fd;
- }
+ if (init_write_buffer(b, 64 * 1024, fd) != SQUAT_OK) {
+	goto cleanup_fd;
+ }
 
- return SQUAT_OK;
+ free(tmp_path);
+ return SQUAT_OK;
 
 cleanup_fd:
- close(fd);
- return SQUAT_ERR;
+ close(fd);
+ free(tmp_path);
+ return SQUAT_ERR;
 }
 
-int squat_index_open_document(SquatIndex* index, char const* name) {
- int name_len;
- char* buf;
-
- squat_set_last_error(SQUAT_ERR_OK);
+int squat_index_open_document(SquatIndex *index, char const *name)
+{
+ int name_len;
+ char *buf;
 
- /* Grow the document ID array as necessary */
- if (index->current_doc_ID >= index->doc_ID_list_size) {
- index->doc_ID_list_size *= 2;
- index->doc_ID_list =
- (char*)xrealloc(index->doc_ID_list, index->doc_ID_list_size*sizeof(SquatInt32));
+ squat_set_last_error(SQUAT_ERR_OK);
 
- if (index->doc_ID_list == NULL) {
- squat_set_last_error(SQUAT_ERR_OUT_OF_MEMORY);
- return SQUAT_ERR;
+ /* Grow the document ID array as necessary */
+ if (index->current_doc_ID >= index->doc_ID_list_size) {
+	index->doc_ID_list_size *= 2;
+	index->doc_ID_list =
+	 (char *)xrealloc(index->doc_ID_list,
+			 index->doc_ID_list_size * sizeof(SquatInt32));
 }
- }
-
- /* Store the offset of the new document record into the array */
- squat_encode_32(index->doc_ID_list + index->current_doc_ID*4,
- index->out.total_output_bytes - sizeof(SquatDiskHeader));
 
- /* Now write the new document name out to the file. Later we will
- write the document length right after this. Nobody writes to the
- file in the interim. */
- name_len = strlen(name) + 1;
- if ((buf = prepare_buffered_write(&index->out, name_len)) == NULL) {
- return SQUAT_ERR;
- }
- strcpy(buf, name);
- complete_buffered_write(&index->out, buf + name_len);
+ /* Store the offset of the new document record into the array */
+ squat_encode_32(index->doc_ID_list + index->current_doc_ID * 4,
+		 index->out.total_output_bytes -
+		 sizeof(SquatDiskHeader));
+
+ /* Now write the new document name out to the file. Later we will
+ write the document length right after this. Nobody writes to the
+ file in the interim. */
+ name_len = strlen(name) + 1;
+ if ((buf = prepare_buffered_write(&index->out, name_len)) == NULL) {
+	return SQUAT_ERR;
+ }
+ strcpy(buf, name);
+ complete_buffered_write(&index->out, buf + name_len);
 
- index->current_doc_len = 0;
- index->runover_len = 0;
- memset(index->doc_words, 0, sizeof(index->doc_words));
+ index->current_doc_len = 0;
+ index->runover_len = 0;
+ memset(index->doc_words, 0, sizeof(index->doc_words));
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Destroy the SquatWordTable. The leaf data and the internal nodes are free'd. */
-static void delete_doc_word_table(SquatWordTable* t, int depth) {
- if (depth > 2) {
- unsigned i;
+static void word_table_delete(SquatWordTable *t, int depth)
+{
+ if (depth > 2) {
+	unsigned i;
 
- depth--;
- for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
- SquatWordTableEntry* e = &(t->entriesi);
- 
- if (e->table != NULL) {
- delete_doc_word_table(e->table, depth);
- }
- }
- } else {
- unsigned i;
+	depth--;
+	for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
+	 SquatWordTableEntry *e = &(t->entriesi);
+
+	 if (e->table != NULL) {
+		word_table_delete(e->table, depth);
+	 }
+	}
+ } else {
+	unsigned i;
+
+	/* this happens to work whether the leaf entries are leaf_presence
+	 or leaf_docs. This is ugly but acceptable :-) */
+	for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
+	 SquatWordTableEntry *e = &(t->entriesi);
 
- /* this happens to work whether the leaf entries are leaf_presence
- or leaf_docs. This is ugly but acceptable :-) */
- for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
- SquatWordTableEntry* e = &(t->entriesi);
- 
- if (e->leaf_presence != NULL && ((unsigned long)e->leaf_presence & 1) == 0) {
- free(e->leaf_presence);
- }
+	 if (e->leaf_presence != NULL
+		&& ((unsigned long)e->leaf_presence & 1) == 0) {
+		free(e->leaf_presence);
+	 }
+	}
 }
- }
- free(t);
+ free(t);
 }
 
 #define SQUAT_ADD_NEW_WORD (SQUAT_LAST_BUILTIN + 1)
@@ -624,23 +630,24 @@
 first_valid_entry and last_valid_entry.
 This is faster than scanning to compute them later.
 We return SQUAT_ADD_NEW_WORD if the bit wasn't already set. */
-static int set_presence_bit(SquatWordTableLeafPresence* p, int ch) {
- int mask = 1 << (ch & 7);
- char* ptr = p->presence + (ch >> 3);
-
- if (ch < p->first_valid_entry) {
- p->first_valid_entry = ch;
- }
- if (ch > p->last_valid_entry) {
- p->last_valid_entry = ch;
- }
-
- if ((*ptr & mask) == 0) {
- *ptr |= mask;
- return SQUAT_ADD_NEW_WORD;
- } else {
- return SQUAT_OK;
- }
+static int set_presence_bit(SquatWordTableLeafPresence *p, int ch)
+{
+ int mask = 1 << (ch & 7);
+ char *ptr = p->presence + (ch >> 3);
+
+ if (ch < p->first_valid_entry) {
+	p->first_valid_entry = ch;
+ }
+ if (ch > p->last_valid_entry) {
+	p->last_valid_entry = ch;
+ }
+
+ if ((*ptr & mask) == 0) {
+	*ptr |= mask;
+	return SQUAT_ADD_NEW_WORD;
+ } else {
+	return SQUAT_OK;
+ }
 }
 
 /* Add a word to the SquatWordTable trie.
@@ -648,257 +655,254 @@
 the presence or absence of a word, not the actual document.
 We return SQUAT_ADD_NEW_WORD if this is the first occurrence of the
 word in the trie. */
-static int add_to_table(SquatIndex* index, char const* data, int data_len,
- WordDocEntry* word_entry) {
- SquatWordTable* t = index->doc_word_table;
- int ch;
- SquatWordTableEntry* e;
-
- while (data_len > 2) {
- /* Follow the branch node down to the next level of the trie. */
+static int add_to_table(SquatIndex *index, char const *data, int data_len,
+			WordDocEntry *word_entry)
+{
+ SquatWordTable *t = index->doc_word_table;
+ int ch;
+ SquatWordTableEntry *e;
+
+ while (data_len > 2) {
+	/* Follow the branch node down to the next level of the trie. */
+	ch = (unsigned char)data0;
+	/* Maintain the valid_entry variables so that we don't have to
+	 perform expensive scans of the 256-element arrays
+	 later. Surprisingly, this optimization really matters! */
+	if (ch < t->first_valid_entry) {
+	 t->first_valid_entry = ch;
+	}
+	if (ch > t->last_valid_entry) {
+	 t->last_valid_entry = ch;
+	}
+
+	e = t->entries + ch;
+	t = e->table;
+	/* Allocate the next branch node if it doesn't already exist. */
+	if (t == NULL)
+	 e->table = t = word_table_new();
+
+	data++;
+	data_len--;
+ }
+
+ /* Follow the branch node down to the leaf level */
 ch = (unsigned char)data0;
- /* Maintain the valid_entry variables so that we don't have to
- perform expensive scans of the 256-element arrays
- later. Surprisingly, this optimization really matters! */
 if (ch < t->first_valid_entry) {
- t->first_valid_entry = ch;
+	t->first_valid_entry = ch;
 }
 if (ch > t->last_valid_entry) {
- t->last_valid_entry = ch;
+	t->last_valid_entry = ch;
 }
-
 e = t->entries + ch;
- t = e->table;
- /* Allocate the next branch node if it doesn't already exist. */
- if (t == NULL) {
- t = (SquatWordTable*)xmalloc(sizeof(SquatWordTable));
- e->table = t;
- /* Initially there are no valid entries. Set things up so that
-	 the obvious tests will set first_valid_entry and
-	 last_valid_entry correctly. */
- t->first_valid_entry = 256;
- t->last_valid_entry = 0;
- memset(t->entries, 0, sizeof(t->entries));
- }
-
- data++;
- data_len--;
- }
-
- /* Follow the branch node down to the leaf level */
- ch = (unsigned char)data0;
- if (ch < t->first_valid_entry) {
- t->first_valid_entry = ch;
- }
- if (ch > t->last_valid_entry) {
- t->last_valid_entry = ch;
- }
- e = t->entries + ch;
-
- ch = (unsigned char)data1;
-
- if (word_entry == NULL) {
- /* We are in "per document" mode. */
- if (((unsigned long)e->leaf_presence & 1) != 0) {
- /* We currently have a singleton here. */
- int oldch = e->leaf_presence_singleton >> 1;
-
- /* If the singleton indicates the same word as the current word,
-	 then we don't have to do anything. */
- if (oldch != ch) {
-	/* Otherwise we have to add the new word. This means we have
-	 to convert the singleton to a bit vector. */
- SquatWordTableLeafPresence* p;
-
-	/* Make an empty bit vector. */
- p = (SquatWordTableLeafPresence*)
- xmalloc(sizeof(SquatWordTableLeafPresence));
- p->first_valid_entry = 256;
- p->last_valid_entry = 0;
- memset(p->presence, 0, sizeof(p->presence));
- e->leaf_presence = p;
-
-	/* Update the bit vector */
- set_presence_bit(p, ch);
- return set_presence_bit(p, oldch); /* will always be SQUAT_ADD_NEW_WORD */
- }
- } else if (e->leaf_presence == NULL) {
- /* There's nothing here. Let's make a singleton. */
- /* this next step might be necessary if sizeof(void*) >
-	 sizeof(int). We make sure that the low bit of the pointer in
-	 leaf_presence is definitely 1. */
- e->leaf_presence = (void*)1;
- e->leaf_presence_singleton = (ch << 1) | 1;
- return SQUAT_ADD_NEW_WORD;
- } else {
- /* We already have the bit vector, so let's just set another bit in it. */
- return set_presence_bit(e->leaf_presence, ch);
- }
- } else {
- /* We are in "all documents" mode. */
- SquatWordTableLeafDocs* docs = e->leaf_docs;
- WordDocEntry** entry_ptr;
-
- /* Make a new leaf table if we don't already have one. */
- if (docs == NULL) {
- docs = (SquatWordTableLeafDocs*)
- xmalloc(sizeof(SquatWordTableLeafDocs));
- docs->first_valid_entry = 256;
- docs->last_valid_entry = 0;
- memset(docs->docs, 0, sizeof(docs->docs));
- e->leaf_docs = docs;
- }
 
- entry_ptr = docs->docs + ch;
-
- if (*entry_ptr == NULL) {
- /* Adding a new word, so may need to update the valid_entry markers */
- if (ch < docs->first_valid_entry) {
-	docs->first_valid_entry = ch;
- }
- if (ch > docs->last_valid_entry) {
-	docs->last_valid_entry = ch; 
- }
- /* Create the linked list with the single element 'word_entry'. */
- word_entry->next = word_entry; /* make it circular */
- *entry_ptr = word_entry;
- return SQUAT_ADD_NEW_WORD;
+ ch = (unsigned char)data1;
+
+ if (word_entry == NULL) {
+	/* We are in "per document" mode. */
+	if (((unsigned long)e->leaf_presence & 1) != 0) {
+	 /* We currently have a singleton here. */
+	 int oldch = e->leaf_presence_singleton >> 1;
+
+	 /* If the singleton indicates the same word as the current word,
+	 then we don't have to do anything. */
+	 if (oldch != ch) {
+		/* Otherwise we have to add the new word. This means we have
+		 to convert the singleton to a bit vector. */
+		SquatWordTableLeafPresence *p;
+
+		/* Make an empty bit vector. */
+		p = (SquatWordTableLeafPresence *)
+		 xmalloc(sizeof(SquatWordTableLeafPresence));
+		p->first_valid_entry = 256;
+		p->last_valid_entry = 0;
+		memset(p->presence, 0, sizeof(p->presence));
+		e->leaf_presence = p;
+
+		/* Update the bit vector */
+		set_presence_bit(p, ch);
+		return set_presence_bit(p, oldch);	/* will always be SQUAT_ADD_NEW_WORD */
+	 }
+	} else if (e->leaf_presence == NULL) {
+	 /* There's nothing here. Let's make a singleton. */
+	 /* this next step might be necessary if sizeof(void*) >
+	 sizeof(int). We make sure that the low bit of the pointer in
+	 leaf_presence is definitely 1. */
+	 e->leaf_presence = (void *)1;
+	 e->leaf_presence_singleton = (ch << 1) | 1;
+	 return SQUAT_ADD_NEW_WORD;
+	} else {
+	 /* We already have the bit vector, so let's just set another bit in it. */
+	 return set_presence_bit(e->leaf_presence, ch);
+	}
 } else {
- /* Just add the document to the linked list. word_entry will be
-	 the new last element since the document IDs are strictly
-	 increasing as we build the trie from its temporary file. */
- word_entry->next = (*entry_ptr)->next; /* (*entry_ptr)->next is
-						(still) the first
-						element of the list */
- (*entry_ptr)->next = word_entry; /* the old last element's
-						next now points to the
-						new last element. */
- *entry_ptr = word_entry; /* save the new last element */
+	/* We are in "all documents" mode. */
+	SquatWordTableLeafDocs *docs = e->leaf_docs;
+	WordDocEntry **entry_ptr;
+
+	/* Make a new leaf table if we don't already have one. */
+	if (docs == NULL) {
+	 docs = (SquatWordTableLeafDocs *)
+		xmalloc(sizeof(SquatWordTableLeafDocs));
+	 docs->first_valid_entry = 256;
+	 docs->last_valid_entry = 0;
+	 memset(docs->docs, 0, sizeof(docs->docs));
+	 e->leaf_docs = docs;
+	}
+
+	entry_ptr = docs->docs + ch;
+
+	if (*entry_ptr == NULL) {
+	 /* Adding a new word, so may need to update the valid_entry markers */
+	 if (ch < docs->first_valid_entry) {
+		docs->first_valid_entry = ch;
+	 }
+	 if (ch > docs->last_valid_entry) {
+		docs->last_valid_entry = ch;
+	 }
+	 /* Create the linked list with the single element 'word_entry'. */
+	 word_entry->next = word_entry;	/* make it circular */
+	 *entry_ptr = word_entry;
+	 return SQUAT_ADD_NEW_WORD;
+	} else {
+	 /* Just add the document to the linked list. word_entry will be
+	 the new last element since the document IDs are strictly
+	 increasing as we build the trie from its temporary file. */
+	 word_entry->next = (*entry_ptr)->next;	/* (*entry_ptr)->next is
+							 (still) the first
+							 element of the list */
+	 (*entry_ptr)->next = word_entry;	/* the old last element's
+						 next now points to the
+						 new last element. */
+	 *entry_ptr = word_entry;	/* save the new last element */
+	}
 }
- }
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Add 'doc_ID' to the list of document IDs for word 'word_ptr'
 in the "all documents" trie. */
-static int add_word_to_trie(SquatIndex* index, char const* word_ptr,
- int doc_ID) {
- WordDocEntry* word_entry = index->word_doc_allocator++;
+static int add_word_to_trie(SquatIndex * index, char const *word_ptr,
+			 int doc_ID)
+{
+ WordDocEntry *word_entry = index->word_doc_allocator++;
 
- word_entry->doc_ID = doc_ID;
- add_to_table(index, word_ptr, SQUAT_WORD_SIZE - 1, word_entry);
+ word_entry->doc_ID = doc_ID;
+ add_to_table(index, word_ptr, SQUAT_WORD_SIZE - 1, word_entry);
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Add the word 'data' to the "per document" trie for the current document. */
-static int add_word_to_table(SquatIndex* index, char const* data) {
- int r;
- int i;
- 
- /* Just ignore the word if it uses an invalid character. */
- for (i = 0; i < SQUAT_WORD_SIZE; i++) {
- int ch = (unsigned char)datai;
-
- if ((index->valid_char_bitsch >> 3 & (1 << (ch & 7))) == 0) {
- /* this word contains an invalid character and need not be indexed,
- since search strings will never contain such a character. */
- return SQUAT_OK;
+static int add_word_to_table(SquatIndex *index, char const *data)
+{
+ int r;
+ int i;
+
+ /* Just ignore the word if it uses an invalid character. */
+ for (i = 0; i < SQUAT_WORD_SIZE; i++) {
+	int ch = (unsigned char)datai;
+
+	if ((index->valid_char_bitsch >> 3 & (1 << (ch & 7))) == 0) {
+	 /* this word contains an invalid character and need not be indexed,
+	 since search strings will never contain such a character. */
+	 return SQUAT_OK;
+	}
 }
- }
 
- r = add_to_table(index, data, SQUAT_WORD_SIZE, NULL);
- if (r == SQUAT_ADD_NEW_WORD) {
- /* Remember how many unique words in this document started with
- the given first character. */
- index->doc_words(unsigned char)data0++;
- return SQUAT_OK;
- } else {
- return r;
- }
+ r = add_to_table(index, data, SQUAT_WORD_SIZE, NULL);
+ if (r == SQUAT_ADD_NEW_WORD) {
+	/* Remember how many unique words in this document started with
+	 the given first character. */
+	index->doc_words(unsigned char)data0++;
+	return SQUAT_OK;
+ } else {
+	return r;
+ }
 }
 
-int squat_index_append_document(SquatIndex* index, char const* data,
- int data_len) {
- int i;
- char bufSQUAT_WORD_SIZE;
- int new_runover;
- int new_runover_data;
+int squat_index_append_document(SquatIndex * index, char const *data,
+				int data_len)
+{
+ int i;
+ char bufSQUAT_WORD_SIZE;
+ int new_runover;
+ int new_runover_data;
 
- assert(data_len >= 0);
+ assert(data_len >= 0);
 
- squat_set_last_error(SQUAT_ERR_OK);
+ squat_set_last_error(SQUAT_ERR_OK);
 
- if (data_len == 0) {
- return SQUAT_OK;
- }
-
- /* Scan runover */
- for (i = 0; i < index->runover_len; i++) {
- /* Check if we can make a whole word starting with runover bytes
- from offset i within the runover buffer and with the remaining
- bytes taken from the new text */
- if (index->runover_len - i + data_len >= SQUAT_WORD_SIZE) {
- /* Yep. Build the complete word into 'buf' and then add it. */
- memcpy(buf, index->runover_buf + i, index->runover_len - i);
- memcpy(buf + index->runover_len - i, data,
- SQUAT_WORD_SIZE - (index->runover_len - i));
- if (add_word_to_table(index, buf) != SQUAT_OK) {
- return SQUAT_ERR;
- }
+ if (data_len == 0) {
+	return SQUAT_OK;
 }
- }
 
- /* Scan main text */
- for (i = 0; i <= data_len - SQUAT_WORD_SIZE; i++) {
- if (add_word_to_table(index, data + i) != SQUAT_OK) {
- return SQUAT_ERR;
+ /* Scan runover */
+ for (i = 0; i < index->runover_len; i++) {
+	/* Check if we can make a whole word starting with runover bytes
+	 from offset i within the runover buffer and with the remaining
+	 bytes taken from the new text */
+	if (index->runover_len - i + data_len >= SQUAT_WORD_SIZE) {
+	 /* Yep. Build the complete word into 'buf' and then add it. */
+	 memcpy(buf, index->runover_buf + i, index->runover_len - i);
+	 memcpy(buf + index->runover_len - i, data,
+		 SQUAT_WORD_SIZE - (index->runover_len - i));
+	 if (add_word_to_table(index, buf) != SQUAT_OK) {
+		return SQUAT_ERR;
+	 }
+	}
+ }
+
+ /* Scan main text */
+ for (i = 0; i <= data_len - SQUAT_WORD_SIZE; i++) {
+	if (add_word_to_table(index, data + i) != SQUAT_OK) {
+	 return SQUAT_ERR;
+	}
+ }
+
+ /* Fill runover. We have to be careful to handle all the cases,
+ particularly we just saw less than SQUAT_WORD_SIZE bytes and we
+ need to copy some data from the old runover buffer into the new
+ runover buffer. */
+ new_runover = index->runover_len + data_len;
+ if (new_runover > SQUAT_WORD_SIZE) {
+	new_runover = SQUAT_WORD_SIZE;
+ }
+ new_runover_data = data_len;
+ if (new_runover_data > new_runover) {
+	new_runover_data = new_runover;
 }
- }
-
- /* Fill runover. We have to be careful to handle all the cases,
- particularly we just saw less than SQUAT_WORD_SIZE bytes and we
- need to copy some data from the old runover buffer into the new
- runover buffer. */
- new_runover = index->runover_len + data_len;
- if (new_runover > SQUAT_WORD_SIZE) {
- new_runover = SQUAT_WORD_SIZE;
- }
- new_runover_data = data_len;
- if (new_runover_data > new_runover) {
- new_runover_data = new_runover;
- }
- /* Copy data from the old runover buffer into its new position in
- the new runover buffer */
- memmove(index->runover_buf,
- index->runover_buf + index->runover_len -
- (new_runover - new_runover_data),
- new_runover - new_runover_data);
- /* Copy data from the new text into the new runover buffer */
- memcpy(index->runover_buf + new_runover - new_runover_data,
- data + data_len - new_runover_data, new_runover_data);
- index->runover_len = new_runover;
- 
- /* Tracking how much data we've seen for this document in total */
- index->current_doc_len += data_len;
-
- return SQUAT_OK;
+ /* Copy data from the old runover buffer into its new position in
+ the new runover buffer */
+ memmove(index->runover_buf,
+	 index->runover_buf + index->runover_len -
+	 (new_runover - new_runover_data),
+	 new_runover - new_runover_data);
+ /* Copy data from the new text into the new runover buffer */
+ memcpy(index->runover_buf + new_runover - new_runover_data,
+	 data + data_len - new_runover_data, new_runover_data);
+ index->runover_len = new_runover;
+
+ /* Tracking how much data we've seen for this document in total */
+ index->current_doc_len += data_len;
+
+ return SQUAT_OK;
 }
 
 /* Write the word to the given temporary file. Since each temporary
 file is dedicated to a given initial byte, the word passed to us
 has the initial byte removed. */
-static int output_word(SquatWriteBuffer* b, char const* word) {
- char* buf = prepare_buffered_write(b, SQUAT_WORD_SIZE - 1);
- 
- if (buf == NULL) {
- return SQUAT_ERR;
- }
- memcpy(buf, word, SQUAT_WORD_SIZE - 1);
- complete_buffered_write(b, buf + SQUAT_WORD_SIZE - 1);
+static int output_word(SquatWriteBuffer *b, char const *word)
+{
+ char *buf = prepare_buffered_write(b, SQUAT_WORD_SIZE - 1);
+
+ if (buf == NULL) {
+	return SQUAT_ERR;
+ }
+ memcpy(buf, word, SQUAT_WORD_SIZE - 1);
+ complete_buffered_write(b, buf + SQUAT_WORD_SIZE - 1);
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Write the word data from the trie 't' into the temporary file
@@ -907,745 +911,791 @@
 leading up to 'word'. This function clears the word data after
 writing it out. This makes it ready to handle the next document
 without reallocating everything. */
-static int write_words(SquatIndex* index, SquatWriteBuffer* b,
- SquatWordTable* t, int len, char* word) {
- if (len == 2) {
- /* Handle a branch node that refers to leaves. */
- int i;
-
- for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
- SquatWordTableEntry* e = t->entries + i;
-
- word0 = (char)i;
-
- if (((unsigned long)e->leaf_presence & 1) != 0) {
-	/* Got a singleton at this branch point. Just output the single word. */
- word1 = (char)(e->leaf_presence_singleton >> 1);
- e->leaf_presence = NULL; /* clear the leaf out */
- if (output_word(b, word - (SQUAT_WORD_SIZE - 3)) != SQUAT_OK) {
- return SQUAT_ERR;
- }
- } else if (e->leaf_presence != NULL) {
-	/* Got a bit vector array which we have to scan. */
- /* The following code is performance critical. It can dominate
-	 the performance of the entire indexer. That's why we need
-	 the valid_entry fields! */
- SquatWordTableLeafPresence* p = e->leaf_presence;
- int i;
- int last_byte = p->last_valid_entry >> 3;
-
- for (i = p->first_valid_entry >> 3; i <= last_byte; i++) {
-	 if((unsigned) i >= VECTOR_SIZE(p->presence)) {
-		return SQUAT_ERR;
-	 } else {
-		int bits = (unsigned char)p->presencei;
-		int j;
-		
-		for (j = 0; bits > 0; j++, bits >>= 1) {
-		 if ((bits & 1) != 0) {
-			/* Output a word for each bit that is set */
-			word1 = (char)(i*8 + j);
-			if (output_word(b, word - (SQUAT_WORD_SIZE - 3)) != SQUAT_OK) {
-			 return SQUAT_ERR;
+static int write_words(SquatIndex *index, SquatWriteBuffer *b,
+		 SquatWordTable *t, int len, char *word)
+{
+ if (len == 2) {
+	/* Handle a branch node that refers to leaves. */
+	int i;
+
+	for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
+	 SquatWordTableEntry *e = t->entries + i;
+
+	 word0 = (char)i;
+
+	 if (((unsigned long)e->leaf_presence & 1) != 0) {
+		/* Got a singleton at this branch point. Just output the single word. */
+		word1 = (char)(e->leaf_presence_singleton >> 1);
+		e->leaf_presence = NULL;	/* clear the leaf out */
+		if (output_word(b, word - (SQUAT_WORD_SIZE - 3)) !=
+		 SQUAT_OK) {
+		 return SQUAT_ERR;
+		}
+	 } else if (e->leaf_presence != NULL) {
+		/* Got a bit vector array which we have to scan. */
+		/* The following code is performance critical. It can dominate
+		 the performance of the entire indexer. That's why we need
+		 the valid_entry fields! */
+		SquatWordTableLeafPresence *p = e->leaf_presence;
+		int i;
+		int last_byte = p->last_valid_entry >> 3;
+
+		for (i = p->first_valid_entry >> 3; i <= last_byte; i++) {
+		 if ((unsigned)i >= VECTOR_SIZE(p->presence)) {
+			return SQUAT_ERR;
+		 } else {
+			int bits = (unsigned char)p->presencei;
+			int j;
+
+			for (j = 0; bits > 0; j++, bits >>= 1) {
+			 if ((bits & 1) != 0) {
+				/* Output a word for each bit that is set */
+				word1 = (char)(i * 8 + j);
+				if (output_word
+				 (b,
+				 word - (SQUAT_WORD_SIZE - 3)) !=
+				 SQUAT_OK) {
+				 return SQUAT_ERR;
+				}
+			 }
 			}
 		 }
 		}
+		free(p);
+		e->leaf_presence = NULL;
 	 }
- }
- free(p);
- e->leaf_presence = NULL;
- }
- }
- } else {
- /* Handle an interior branch node. A simple matter of recursion. */
- int i;
+	}
+ } else {
+	/* Handle an interior branch node. A simple matter of recursion. */
+	int i;
 
- for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
- SquatWordTable* new_t = t->entriesi.table;
-
- if (new_t != NULL) {
- word0 = (char)i;
- if (write_words(index, b, new_t, len - 1, word + 1)
- != SQUAT_OK) {
- return SQUAT_ERR;
- }
- }
+	for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
+	 SquatWordTable *new_t = t->entriesi.table;
+
+	 if (new_t != NULL) {
+		word0 = (char)i;
+		if (write_words(index, b, new_t, len - 1, word + 1)
+		 != SQUAT_OK) {
+		 return SQUAT_ERR;
+		}
+	 }
+	}
 }
- }
 
- /* This effectively clears the array because we trust these entries. */
- t->first_valid_entry = 256;
- t->last_valid_entry = 0;
+ /* This effectively clears the array because we trust these entries. */
+ t->first_valid_entry = 256;
+ t->last_valid_entry = 0;
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
-int squat_index_close_document(SquatIndex* index) {
- char* buf;
- unsigned i;
- 
- squat_set_last_error(SQUAT_ERR_OK);
+int squat_index_close_document(SquatIndex *index)
+{
+ char *buf;
+ unsigned i;
 
- /* Write out the length of the current document to the index file,
- just after the document's name. */
- if ((buf = prepare_buffered_write(&index->out, 10)) == NULL) {
- return SQUAT_ERR;
- }
- buf = squat_encode_I(buf, index->current_doc_len);
- complete_buffered_write(&index->out, buf);
-
- if (index->stats_callback != NULL) {
- SquatStatsEvent event;
-
- event.generic.type = SQUAT_STATS_COMPLETED_DOC;
- event.completed_doc.num_unique_words = index->doc_words;
- index->stats_callback(index->stats_callback_closure, &event);
- }
-
- /* For each byte that started a word in the source document, we need
- to dump all the words that occurred starting with that byte to
- the corresponding temporary file. */
- for (i = 0; i < VECTOR_SIZE(index->doc_words); i++) {
- if (index->doc_wordsi > 0) {
- char* write_ptr;
- char word_bufSQUAT_WORD_SIZE - 1;
- int cur_offset;
-
- if (index->index_buffersi.buf == NULL) {
-	/* This is the first document that used a word starting with this byte.
-	 We need to create the temporary file. */
- if (init_write_buffer_to_temp(index, index->index_buffers + i)
- != SQUAT_OK) {
- return SQUAT_ERR;
- }
- }
-
- index->total_num_wordsi += index->doc_wordsi;
-
- /* Write out the document ID and the number of words in this
-	 document that start with the initial byte. Then we write out
-	 the list of words themselves, SQUAT_WORD_SIZE-1 bytes
-	 each. Very simple format for the temporary files. We could
-	 compress them more but why bother? */
- write_ptr = prepare_buffered_write(index->index_buffers + i, 20);
- if (write_ptr == NULL) {
- return SQUAT_ERR;
- }
- write_ptr = squat_encode_I(write_ptr, index->current_doc_ID);
- write_ptr = squat_encode_I(write_ptr, index->doc_wordsi);
- complete_buffered_write(index->index_buffers + i, write_ptr);
- 
- cur_offset = index->index_buffersi.total_output_bytes;
- if (write_words(index, index->index_buffers + i,
- index->doc_word_table->entriesi.table,
- SQUAT_WORD_SIZE - 1, word_buf)
- != SQUAT_OK) {
- return SQUAT_ERR;
- }
- /* Make sure that we actually output the exact number of words
-	 we thought we added to the trie. It's really easy to break
-	 this invariant with bugs in the above code! */
- assert(index->index_buffersi.total_output_bytes - cur_offset
- == (SQUAT_WORD_SIZE - 1)*index->doc_wordsi);
+ squat_set_last_error(SQUAT_ERR_OK);
+
+ /* Write out the length of the current document to the index file,
+ just after the document's name. */
+ if ((buf = prepare_buffered_write(&index->out, 10)) == NULL) {
+	return SQUAT_ERR;
 }
- }
+ buf = squat_encode_I(buf, index->current_doc_len);
+ complete_buffered_write(&index->out, buf);
 
- index->current_doc_len = -1;
+ if (index->stats_callback != NULL) {
+	SquatStatsEvent event;
 
- index->current_doc_ID++;
+	event.generic.type = SQUAT_STATS_COMPLETED_DOC;
+	event.completed_doc.num_unique_words = index->doc_words;
+	index->stats_callback(index->stats_callback_closure, &event);
+ }
+
+ /* For each byte that started a word in the source document, we need
+ to dump all the words that occurred starting with that byte to
+ the corresponding temporary file. */
+ for (i = 0; i < VECTOR_SIZE(index->doc_words); i++) {
+	if (index->doc_wordsi > 0) {
+	 char *write_ptr;
+	 char word_bufSQUAT_WORD_SIZE - 1;
+	 int cur_offset;
+
+	 if (index->index_buffersi.fd < 0) {
+		/* This is the first document that used a word starting with this byte.
+		 We need to create the temporary file. */
+		if (init_write_buffer_to_temp
+		 (index, index->index_buffers + i)
+		 != SQUAT_OK) {
+		 return SQUAT_ERR;
+		}
+	 }
 
- return SQUAT_OK;
+	 index->total_num_wordsi += index->doc_wordsi;
+
+	 /* Write out the document ID and the number of words in this
+	 document that start with the initial byte. Then we write out
+	 the list of words themselves, SQUAT_WORD_SIZE-1 bytes
+	 each. Very simple format for the temporary files. We could
+	 compress them more but why bother? */
+	 write_ptr =
+		prepare_buffered_write(index->index_buffers + i, 20);
+	 if (write_ptr == NULL) {
+		return SQUAT_ERR;
+	 }
+	 write_ptr = squat_encode_I(write_ptr, index->current_doc_ID);
+	 write_ptr = squat_encode_I(write_ptr, index->doc_wordsi);
+	 complete_buffered_write(index->index_buffers + i, write_ptr);
+
+	 cur_offset = index->index_buffersi.total_output_bytes;
+	 if (write_words(index, index->index_buffers + i,
+			 index->doc_word_table->entriesi.table,
+			 SQUAT_WORD_SIZE - 1, word_buf)
+		!= SQUAT_OK) {
+		return SQUAT_ERR;
+	 }
+	 /* Make sure that we actually output the exact number of words
+	 we thought we added to the trie. It's really easy to break
+	 this invariant with bugs in the above code! */
+	 assert(index->index_buffersi.total_output_bytes - cur_offset
+		 == (SQUAT_WORD_SIZE - 1) * index->doc_wordsi);
+	}
+ }
+
+ index->current_doc_len = -1;
+
+ index->current_doc_ID++;
+
+ return SQUAT_OK;
 }
 
 /* Dump out a branch node of an "all documents" trie to the index
 file. It's dumped as a presence table (telling us which branches
 are non-NULL) followed by a list of relative file offsets in
 I-format pointing to the subtries for the non-NULL branches. */
-static int dump_word_table_offsets(SquatIndex* index, SquatWordTable* t,
- int *offset_buf) {
- int start_present = t->first_valid_entry;
- int end_present = t->last_valid_entry;
- char* buf;
- int present_count; /* We store here the actual number of present branches */
-
- if (start_present > end_present) {
- /* There are no non-empty branches so just write an empty presence table */
- if ((buf = prepare_buffered_write(&index->out, 2)) == NULL) {
- return SQUAT_ERR;
- } else {
- buf0 = buf1 = 0;
- complete_buffered_write(&index->out, buf + 2);
- return SQUAT_OK;
+static int dump_word_table_offsets(SquatIndex *index, SquatWordTable *t,
+				 int *offset_buf)
+{
+ int start_present = t->first_valid_entry;
+ int end_present = t->last_valid_entry;
+ char *buf;
+ int present_count;		/* We store here the actual number of present branches */
+
+ if (start_present > end_present) {
+	/* There are no non-empty branches so just write an empty presence table */
+	if ((buf = prepare_buffered_write(&index->out, 2)) == NULL) {
+	 return SQUAT_ERR;
+	} else {
+	 buf0 = buf1 = 0;
+	 complete_buffered_write(&index->out, buf + 2);
+	 return SQUAT_OK;
+	}
 }
- }
-
- /* If there is just one valid entry but its index is < 32, then we
- can't use the one-byte representation for a singleton presence
- because it would be mistaken for the first byte of a (count,
- start) presence vector header. A singleton whose index is >= 32
- can be written out without ambiguity. */
- if (end_present == start_present && end_present >= 32) {
- if ((buf = prepare_buffered_write(&index->out, 1)) == NULL) {
- return SQUAT_ERR;
+
+ /* If there is just one valid entry but its index is < 32, then we
+ can't use the one-byte representation for a singleton presence
+ because it would be mistaken for the first byte of a (count,
+ start) presence vector header. A singleton whose index is >= 32
+ can be written out without ambiguity. */
+ if (end_present == start_present && end_present >= 32) {
+	if ((buf = prepare_buffered_write(&index->out, 1)) == NULL) {
+	 return SQUAT_ERR;
+	} else {
+	 *buf++ = (char)end_present;
+	 present_count = 1;
+	}
 } else {
- *buf++ = (char)end_present;
- present_count = 1;
+	/* We're going to use the presence bit vector format. */
+	int first_byte = start_present >> 3;
+	int byte_count = (end_present >> 3) - first_byte + 1;
+
+	if ((buf =
+	 prepare_buffered_write(&index->out,
+				 2 + byte_count)) == NULL) {
+	 return SQUAT_ERR;
+	} else {
+	 int i;
+
+	 *buf++ = (char)first_byte;
+	 *buf++ = (char)byte_count - 1;	/* subtract 1 to avoid ambiguity
+						 over the value '32' (we
+						 wouldn't use 0 anyway) */
+	 /* Clear the vector */
+	 memset(buf, 0, byte_count);
+	 present_count = 0;
+	 for (i = start_present; i <= end_present; i++) {
+		if (offset_bufi > 0) {
+		 present_count++;
+		 /* Set the bit in the vector. */
+		 buf(i >> 3) - first_byte |= 1 << (i & 7);
+		}
+	 }
+	 buf += byte_count;
+	}
 }
- } else {
- /* We're going to use the presence bit vector format. */
- int first_byte = start_present >> 3;
- int byte_count = (end_present >> 3) - first_byte + 1;
+ complete_buffered_write(&index->out, buf);
 
- if ((buf = prepare_buffered_write(&index->out, 2 + byte_count)) == NULL) {
- return SQUAT_ERR;
+ /* Now we write out the actual offset table in I-format. */
+ if ((buf =
+	 prepare_buffered_write(&index->out,
+				10 * present_count)) == NULL) {
+	return SQUAT_ERR;
 } else {
- int i;
-
- *buf++ = (char)first_byte;
- *buf++ = (char)byte_count - 1; /* subtract 1 to avoid ambiguity
-					over the value '32' (we
-					wouldn't use 0 anyway) */
- /* Clear the vector */
- memset(buf, 0, byte_count);
- present_count = 0;
- for (i = start_present; i <= end_present; i++) {
- if (offset_bufi > 0) {
- present_count++;
-	 /* Set the bit in the vector. */
- buf(i >> 3) - first_byte |= 1 << (i & 7);
- }
- }
- buf += byte_count;
- }
- }
- complete_buffered_write(&index->out, buf);
- 
- /* Now we write out the actual offset table in I-format. */
- if ((buf = prepare_buffered_write(&index->out, 10*present_count)) == NULL) {
- return SQUAT_ERR;
- } else {
- int i;
+	int i;
 
- for (i = start_present; i <= end_present; i++) {
- int off = offset_bufi;
+	for (i = start_present; i <= end_present; i++) {
+	 int off = offset_bufi;
 
- if (off > 0) {
- buf = squat_encode_I(buf, off);
- }
+	 if (off > 0) {
+		buf = squat_encode_I(buf, off);
+	 }
+	}
 }
- }
- complete_buffered_write(&index->out, buf);
+ complete_buffered_write(&index->out, buf);
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Write out the presence table for an "all documents" trie leaf. */
-static int dump_doc_list_present_bits(SquatIndex* index,
- SquatWordTableLeafDocs* docs) {
- int start_present = docs->first_valid_entry;
- int end_present = docs->last_valid_entry;
- char* buf;
- int present_count;
-
- /* If the leaf is empty, we should never get here! */
- assert(start_present <= end_present);
-
- /* if it's a singleton < 32, then we can't use the one-byte
- representation because it would be mistaken for a starting byte */
- if (end_present == start_present && end_present >= 32) {
- if ((buf = prepare_buffered_write(&index->out, 1)) == NULL) {
- return SQUAT_ERR;
+static int dump_doc_list_present_bits(SquatIndex *index,
+				 SquatWordTableLeafDocs *docs)
+{
+ int start_present = docs->first_valid_entry;
+ int end_present = docs->last_valid_entry;
+ char *buf;
+ int present_count;
+
+ /* If the leaf is empty, we should never get here! */
+ assert(start_present <= end_present);
+
+ /* if it's a singleton < 32, then we can't use the one-byte
+ representation because it would be mistaken for a starting byte */
+ if (end_present == start_present && end_present >= 32) {
+	if ((buf = prepare_buffered_write(&index->out, 1)) == NULL) {
+	 return SQUAT_ERR;
+	} else {
+	 *buf++ = (char)end_present;
+	 present_count = 1;
+	}
 } else {
- *buf++ = (char)end_present;
- present_count = 1;
+	int first_byte = start_present >> 3;
+	int byte_count = (end_present >> 3) - first_byte + 1;
+
+	if ((buf =
+	 prepare_buffered_write(&index->out,
+				 2 + byte_count)) == NULL) {
+	 return SQUAT_ERR;
+	} else {
+	 int i;
+
+	 *buf++ = (char)first_byte;
+	 *buf++ = (char)byte_count - 1;
+	 memset(buf, 0, byte_count);
+	 present_count = 0;
+	 for (i = start_present; i <= end_present; i++) {
+		if (docs->docsi != NULL) {
+		 present_count++;
+		 buf(i >> 3) - first_byte |= 1 << (i & 7);
+		}
+	 }
+	 buf += byte_count;
+	}
 }
- } else {
- int first_byte = start_present >> 3;
- int byte_count = (end_present >> 3) - first_byte + 1;
+ complete_buffered_write(&index->out, buf);
 
- if ((buf = prepare_buffered_write(&index->out, 2 + byte_count)) == NULL) {
- return SQUAT_ERR;
- } else {
- int i;
-
- *buf++ = (char)first_byte;
- *buf++ = (char)byte_count - 1;
- memset(buf, 0, byte_count);
- present_count = 0;
- for (i = start_present; i <= end_present; i++) {
- if (docs->docsi != NULL) {
- present_count++;
- buf(i >> 3) - first_byte |= 1 << (i & 7);
- }
- }
- buf += byte_count;
- }
- }
- complete_buffered_write(&index->out, buf);
- 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Write out the document lists for an "all documents" trie leaf. */
-static int dump_doc_list_docs(SquatIndex* index,
- SquatWordTableLeafDocs* docs) {
- int i;
- WordDocEntry** doc_list = docs->docs;
-
- for (i = docs->first_valid_entry; i <= docs->last_valid_entry; i++) {
- if (doc_listi != NULL) {
- WordDocEntry* first_doc;
- WordDocEntry* doc;
- int run_size = 0; /* Bytes required to store the doclist for this word */
- int last_doc_ID;
- int run_seq_delta = 0;
- int run_seq_count;
- int doc_count = 0; /* number of documents containing this word */
- char* buf;
-
- doc = first_doc = doc_listi->next;
-
- last_doc_ID = 0;
- run_seq_count = 0;
- /* First compute the run_size bytes required to store the doclist */
- do {
- if (doc->doc_ID == last_doc_ID + 1 && run_seq_count > 0) {
- run_seq_count++;
- } else {
- if (run_seq_count > 0) {
- if (run_seq_count > 1) {
- run_size += squat_count_encode_I(run_seq_count << 1)
- + squat_count_encode_I(run_seq_delta);
- } else {
- run_size += squat_count_encode_I((run_seq_delta << 1) | 1);
- }
- }
- run_seq_count = 1;
- run_seq_delta = doc->doc_ID - last_doc_ID;
- }
- last_doc_ID = doc->doc_ID;
- doc = doc->next;
- doc_count++;
- } while (doc != first_doc);
- if (run_seq_count > 0) {
- if (run_seq_count > 1) {
- run_size += squat_count_encode_I(run_seq_count << 1)
- + squat_count_encode_I(run_seq_delta);
- } else {
- run_size += squat_count_encode_I((run_seq_delta << 1) | 1);
- }
- }
-
- /* reserve more than enough space in the buffer */
- if ((buf = prepare_buffered_write(&index->out, 10 + run_size))
- == NULL) {
- return SQUAT_ERR;
- }
-
- /* If there's only one document, use singleton document format */
- if (doc_count == 1) {
- buf = squat_encode_I(buf, (doc->doc_ID << 1) | 1);
- } else {
-	/* Store the entire document list, with its size first. */
- buf = squat_encode_I(buf, run_size << 1);
-
- last_doc_ID = 0;
- run_seq_count = 0;
-	/* This logic should mirror the logic above that counts the bytes. */
- do {
- if (doc->doc_ID == last_doc_ID + 1 && run_seq_count > 0) {
- run_seq_count++;
- } else {
- if (run_seq_count > 0) {
- if (run_seq_count > 1) {
- buf = squat_encode_I(buf, run_seq_count << 1);
- buf = squat_encode_I(buf, run_seq_delta);
- } else {
- buf = squat_encode_I(buf, (run_seq_delta << 1) | 1);
- }
- }
- run_seq_count = 1;
- run_seq_delta = doc->doc_ID - last_doc_ID;
- }
- last_doc_ID = doc->doc_ID;
- doc = doc->next;
- } while (doc != first_doc);
- if (run_seq_count > 0) {
- if (run_seq_count > 1) {
- buf = squat_encode_I(buf, run_seq_count << 1);
- buf = squat_encode_I(buf, run_seq_delta);
- } else {
- buf = squat_encode_I(buf, (run_seq_delta << 1) | 1);
- }
- }
- }
-
- complete_buffered_write(&index->out, buf);
+static int dump_doc_list_docs(SquatIndex *index,
+			 SquatWordTableLeafDocs *docs)
+{
+ int i;
+ WordDocEntry **doc_list = docs->docs;
+
+ for (i = docs->first_valid_entry; i <= docs->last_valid_entry; i++) {
+	if (doc_listi != NULL) {
+	 WordDocEntry *first_doc;
+	 WordDocEntry *doc;
+	 int run_size = 0;	/* Bytes required to store the doclist for this word */
+	 int last_doc_ID;
+	 int run_seq_delta = 0;
+	 int run_seq_count;
+	 int doc_count = 0;	/* number of documents containing this word */
+	 char *buf;
+
+	 doc = first_doc = doc_listi->next;
+
+	 last_doc_ID = 0;
+	 run_seq_count = 0;
+	 /* First compute the run_size bytes required to store the doclist */
+	 do {
+		if (doc->doc_ID == last_doc_ID + 1 && run_seq_count > 0) {
+		 run_seq_count++;
+		} else {
+		 if (run_seq_count > 0) {
+			if (run_seq_count > 1) {
+			 run_size +=
+				squat_count_encode_I(run_seq_count << 1)
+				+ squat_count_encode_I(run_seq_delta);
+			} else {
+			 run_size +=
+				squat_count_encode_I((run_seq_delta << 1) |
+						 1);
+			}
+		 }
+		 run_seq_count = 1;
+		 run_seq_delta = doc->doc_ID - last_doc_ID;
+		}
+		last_doc_ID = doc->doc_ID;
+		doc = doc->next;
+		doc_count++;
+	 } while (doc != first_doc);
+	 if (run_seq_count > 0) {
+		if (run_seq_count > 1) {
+		 run_size += squat_count_encode_I(run_seq_count << 1)
+			+ squat_count_encode_I(run_seq_delta);
+		} else {
+		 run_size +=
+			squat_count_encode_I((run_seq_delta << 1) | 1);
+		}
+	 }
+
+	 /* reserve more than enough space in the buffer */
+	 if ((buf = prepare_buffered_write(&index->out, 10 + run_size)) == NULL) {
+		return SQUAT_ERR;
+	 }
+
+	 /* If there's only one document, use singleton document format */
+	 if (doc_count == 1) {
+		buf = squat_encode_I(buf, (doc->doc_ID << 1) | 1);
+	 } else {
+		/* Store the entire document list, with its size first. */
+		buf = squat_encode_I(buf, run_size << 1);
+
+		last_doc_ID = 0;
+		run_seq_count = 0;
+		/* This logic should mirror the logic above that counts the bytes. */
+		do {
+		 if (doc->doc_ID == last_doc_ID + 1
+			&& run_seq_count > 0) {
+			run_seq_count++;
+		 } else {
+			if (run_seq_count > 0) {
+			 if (run_seq_count > 1) {
+				buf =
+				 squat_encode_I(buf,
+						 run_seq_count << 1);
+				buf = squat_encode_I(buf, run_seq_delta);
+			 } else {
+				buf =
+				 squat_encode_I(buf,
+						 (run_seq_delta << 1) |
+						 1);
+			 }
+			}
+			run_seq_count = 1;
+			run_seq_delta = doc->doc_ID - last_doc_ID;
+		 }
+		 last_doc_ID = doc->doc_ID;
+		 doc = doc->next;
+		} while (doc != first_doc);
+		if (run_seq_count > 0) {
+		 if (run_seq_count > 1) {
+			buf = squat_encode_I(buf, run_seq_count << 1);
+			buf = squat_encode_I(buf, run_seq_delta);
+		 } else {
+			buf =
+			 squat_encode_I(buf, (run_seq_delta << 1) | 1);
+		 }
+		}
+	 }
+
+	 complete_buffered_write(&index->out, buf);
+	}
 }
- }
 
- return SQUAT_OK;
+ return SQUAT_OK;
 }
 
 /* Write an "all documents" subtrie to the index file.
 'result_offset' is an absolute offset within the file where this
 subtrie was stored. We free the trie leaves as we go. */
-static int write_trie_word_data(SquatIndex* index, SquatWordTable* t, int len,
- int* result_offset) {
- int i;
- int offsets256; /* Collect the offsets of the subtries in this array. */
- int off;
- SquatWordTableEntry* entries = t->entries;
- int r;
-
- memset(offsets, 0, t->first_valid_entry*sizeof(int));
- if (len > 2) {
- /* interior branch */
- for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
- SquatWordTable* new_t = entriesi.table;
-
- if (new_t != NULL) {
- if (write_trie_word_data(index, new_t, len - 1, offsets + i)
- != SQUAT_OK) {
- return SQUAT_ERR;
- }
- free(entriesi.table);
- entriesi.table = NULL;
- } else {
- offsetsi = 0;
- }
+static int write_trie_word_data(SquatIndex *index, SquatWordTable *t,
+				int len, int *result_offset)
+{
+ int i;
+ int offsets256;		/* Collect the offsets of the subtries in this array. */
+ int off;
+ SquatWordTableEntry *entries = t->entries;
+ int r;
+
+ memset(offsets, 0, t->first_valid_entry * sizeof(int));
+ if (len > 2) {
+	/* interior branch */
+	for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
+	 SquatWordTable *new_t = entriesi.table;
+
+	 if (new_t != NULL) {
+		if (write_trie_word_data
+		 (index, new_t, len - 1, offsets + i)
+		 != SQUAT_OK) {
+		 return SQUAT_ERR;
+		}
+		free(entriesi.table);
+		entriesi.table = NULL;
+	 } else {
+		offsetsi = 0;
+	 }
+	}
+ } else {
+	/* Leaf case */
+	for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
+	 SquatWordTableLeafDocs *leaf_docs = entriesi.leaf_docs;
+
+	 if (leaf_docs != NULL) {
+		offsetsi = index->out.total_output_bytes;
+
+		if (dump_doc_list_present_bits(index, leaf_docs) !=
+		 SQUAT_OK
+		 || dump_doc_list_docs(index, leaf_docs) != SQUAT_OK) {
+		 return SQUAT_ERR;
+		}
+		free(entriesi.leaf_docs);
+		entriesi.leaf_docs = NULL;
+	 } else {
+		offsetsi = 0;
+	 }
+	}
 }
- } else {
- /* Leaf case */
+ memset(offsets + i, 0, (256 - i) * sizeof(int));
+
+ /* Now we've written out our subtries, we know where our branch
+ table is going to be. */
+ *result_offset = off = index->out.total_output_bytes;
+
+ /* Relativize the offsets. This is just to reduce the probable
+ magnitude of the numbers so they will pack better into I-format. */
 for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
- SquatWordTableLeafDocs* leaf_docs = entriesi.leaf_docs;
-
- if (leaf_docs != NULL) {
- offsetsi = index->out.total_output_bytes;
- 
- if (dump_doc_list_present_bits(index, leaf_docs) != SQUAT_OK
- || dump_doc_list_docs(index, leaf_docs) != SQUAT_OK) {
- return SQUAT_ERR;
- }
- free(entriesi.leaf_docs);
- entriesi.leaf_docs = NULL;
- } else {
- offsetsi = 0;
- }
- }
- }
- memset(offsets + i, 0, (256 - i)*sizeof(int));
-
- /* Now we've written out our subtries, we know where our branch
- table is going to be. */
- *result_offset = off = index->out.total_output_bytes;
-
- /* Relativize the offsets. This is just to reduce the probable
- magnitude of the numbers so they will pack better into I-format. */
- for (i = t->first_valid_entry; i <= t->last_valid_entry; i++) {
- if (offsetsi != 0) {
- offsetsi = off - offsetsi;
+	if (offsetsi != 0) {
+	 offsetsi = off - offsetsi;
+	}
 }
- }
 
- r = dump_word_table_offsets(index, t, offsets);
+ r = dump_word_table_offsets(index, t, offsets);
 
- /* Mark this subtrie as empty. */
- t->first_valid_entry = 256;
- t->last_valid_entry = 0;
+ /* Mark this subtrie as empty. */
+ t->first_valid_entry = 256;
+ t->last_valid_entry = 0;
 
- return r;
+ return r;
 }
 
 /* Dump out a complete trie for the given initial byte from its temporary file.
 The absolute offset of the trie's root table within the file is
 returned in 'result_offset'. */
-static int dump_index_trie_words(SquatIndex* index, int first_char,
- int* result_offset) {
- SquatSearchIndex* old_index = index->old_index;
- SquatWriteBuffer* buf = index->index_buffers + first_char;
- int num_words = index->total_num_wordsfirst_char;
- WordDocEntry* doc_table;
- char const* word_list_ptr;
- int r = SQUAT_OK;
- char const* word_ptr;
- int existing = 0;
-
- if (old_index &&
- squat_count_docs(old_index, first_char, &existing) != SQUAT_OK) {
- return(SQUAT_ERR);
- }
-
- /* Allocate all the necessary document-ID linked list entries at once. */
- doc_table = (WordDocEntry*)xmalloc(sizeof(WordDocEntry)*(num_words+existing));
- index->word_doc_allocator = doc_table;
-
- /* Send existing trie across first as those leafs have lowest doc IDs */
- if (old_index) {
- r = squat_scan(old_index, first_char, add_word_callback, index);
- if (r != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
+static int dump_index_trie_words(SquatIndex *index, int first_char,
+				 int *result_offset)
+{
+ SquatSearchIndex *old_index = index->old_index;
+ SquatWriteBuffer *buf = index->index_buffers + first_char;
+ int num_words = index->total_num_wordsfirst_char;
+ WordDocEntry *doc_table;
+ char const *word_list_ptr;
+ int r = SQUAT_OK;
+ char const *word_ptr;
+ int existing = 0;
+
+ if (old_index &&
+	squat_count_docs(old_index, first_char, &existing) != SQUAT_OK) {
+	return (SQUAT_ERR);
+ }
+
+ /* Allocate all the necessary document-ID linked list entries at once. */
+ doc_table =
+	(WordDocEntry *) xmalloc(sizeof(WordDocEntry) *
+				 (num_words + existing));
+ index->word_doc_allocator = doc_table;
+
+ /* Send existing trie across first as those leafs have lowest doc IDs */
+ if (old_index) {
+	r = squat_scan(old_index, first_char, add_word_callback, index);
+	if (r != SQUAT_OK) {
+	 r = SQUAT_ERR;
+	 goto cleanup;
+	}
 }
- }
-
- /* mmap the temporary file. */
- word_list_ptr = mmap(NULL, buf->total_output_bytes, PROT_READ, MAP_SHARED,
- buf->fd, 0);
- if (word_list_ptr == MAP_FAILED) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- r = SQUAT_ERR;
- goto cleanup;
- }
- word_ptr = word_list_ptr;
-
- /* Scan through the file */
- while (num_words > 0) {
- /* For each document, add all its words to the trie with this document ID */
- int doc_ID = (int)squat_decode_I(&word_ptr);
- int doc_words = (int)squat_decode_I(&word_ptr);
- 
- num_words -= doc_words;
-
- while (doc_words > 0) {
- if (add_word_to_trie(index, word_ptr, doc_ID)
- != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup_map;
- }
- word_ptr += SQUAT_WORD_SIZE - 1;
- doc_words--;
+
+ /* mmap the temporary file. */
+ word_list_ptr =
+	mmap(NULL, buf->total_output_bytes, PROT_READ, MAP_SHARED, buf->fd,
+	 0);
+ if (word_list_ptr == MAP_FAILED) {
+	squat_set_last_error(SQUAT_ERR_SYSERR);
+	r = SQUAT_ERR;
+	goto cleanup;
 }
- }
+ word_ptr = word_list_ptr;
+
+ /* Scan through the file */
+ while (num_words > 0) {
+	/* For each document, add all its words to the trie with this document ID */
+	int doc_ID = (int)squat_decode_I(&word_ptr);
+	int doc_words = (int)squat_decode_I(&word_ptr);
 
- /* Make sure we read all the bytes from the temporary file. */
- assert(word_ptr - word_list_ptr == buf->total_output_bytes);
- 
- /* Now dump the trie to the index file. */
- r = write_trie_word_data(index, index->doc_word_table,
- SQUAT_WORD_SIZE - 1, result_offset);
+	num_words -= doc_words;
+
+	while (doc_words > 0) {
+	 if (add_word_to_trie(index, word_ptr, doc_ID)
+		!= SQUAT_OK) {
+		r = SQUAT_ERR;
+		goto cleanup_map;
+	 }
+	 word_ptr += SQUAT_WORD_SIZE - 1;
+	 doc_words--;
+	}
+ }
+
+ /* Make sure we read all the bytes from the temporary file. */
+ assert(word_ptr - word_list_ptr == buf->total_output_bytes);
+
+ /* Now dump the trie to the index file. */
+ r = write_trie_word_data(index, index->doc_word_table,
+			 SQUAT_WORD_SIZE - 1, result_offset);
 
 cleanup_map:
- if (munmap((void*)word_list_ptr, buf->total_output_bytes) != 0
- && r == SQUAT_OK) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- r = SQUAT_ERR;
- }
+ if (munmap((void *)word_list_ptr, buf->total_output_bytes) != 0
+	&& r == SQUAT_OK) {
+	squat_set_last_error(SQUAT_ERR_SYSERR);
+	r = SQUAT_ERR;
+ }
 
 cleanup:
- free(doc_table);
+ free(doc_table);
 
- return r;
+ return r;
 }
 
-static int dump_index_trie_words_no_file(SquatIndex* index,
- int first_char,
- int* result_offset) {
- SquatSearchIndex* old_index = index->old_index;
- WordDocEntry* doc_table;
- int r = SQUAT_OK;
- int existing = 0;
-
- if (!old_index)
- return(SQUAT_OK); /* Should never happen? */
- 
- if (squat_count_docs(old_index, first_char, &existing) != SQUAT_OK)
- return(SQUAT_ERR);
- if (existing == 0)
- return(SQUAT_OK);
-
- /* Allocate all the necessary document-ID linked list entries at once. */
- doc_table = (WordDocEntry*)xmalloc(sizeof(WordDocEntry)*existing);
- index->word_doc_allocator = doc_table;
-
- /* Send existing trie across first as those leafs have lowest doc IDs */
- r = squat_scan(old_index, first_char, add_word_callback, index);
- if (r != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
- 
- if (index->word_doc_allocator > doc_table) {
- /* Now dump the trie to the index file. */
- r = write_trie_word_data(index, index->doc_word_table,
- SQUAT_WORD_SIZE - 1, result_offset);
- }
+static int dump_index_trie_words_no_file(SquatIndex *index,
+					 int first_char,
+					 int *result_offset)
+{
+ SquatSearchIndex *old_index = index->old_index;
+ WordDocEntry *doc_table;
+ int r = SQUAT_OK;
+ int existing = 0;
+
+ if (!old_index)
+	return (SQUAT_OK);	/* Should never happen? */
+
+ if (squat_count_docs(old_index, first_char, &existing) != SQUAT_OK)
+	return (SQUAT_ERR);
+ if (existing == 0)
+	return (SQUAT_OK);
 
- cleanup:
- free(doc_table);
- return r;
+ /* Allocate all the necessary document-ID linked list entries at once. */
+ doc_table = (WordDocEntry *) xmalloc(sizeof(WordDocEntry) * existing);
+ index->word_doc_allocator = doc_table;
+
+ /* Send existing trie across first as those leafs have lowest doc IDs */
+ r = squat_scan(old_index, first_char, add_word_callback, index);
+ if (r != SQUAT_OK) {
+	r = SQUAT_ERR;
+	goto cleanup;
+ }
+
+ if (index->word_doc_allocator > doc_table) {
+	/* Now dump the trie to the index file. */
+	r = write_trie_word_data(index, index->doc_word_table,
+				 SQUAT_WORD_SIZE - 1, result_offset);
+ }
+
+cleanup:
+ free(doc_table);
+ return r;
 }
 
 /* This does the grunt work of completing the index. If OK is false we
 just take the cleanup path ... this is used by squat_index_destroy. */
-static int index_close_internal(SquatIndex* index, int OK) {
- int r = SQUAT_OK;
- int doc_list_offset;
- int doc_ID_list_offset;
- int word_list_offset;
- char* buf;
- unsigned i;
- SquatDiskHeader* header;
- int offset_buf256;
- 
- squat_set_last_error(SQUAT_ERR_OK);
-
- if (!OK) {
- goto cleanup;
- }
-
- /* Close any open document ... this would really be a client bug. */
- if (index->current_doc_len >= 0) {
- squat_index_close_document(index);
- }
-
- /* Clear the current trie. We are now going to use it to build
- all-documents tries. */
- delete_doc_word_table(index->doc_word_table, SQUAT_WORD_SIZE);
- init_doc_word_table(&index->doc_word_table);
-
- /* Write out the array that maps document IDs to offsets of the
- document records. */
- doc_list_offset = sizeof(SquatDiskHeader);
- doc_ID_list_offset = index->out.total_output_bytes + 1;
- if ((buf = prepare_buffered_write(&index->out,
- SQUAT_SAFETY_ZONE + ((index->current_doc_ID + 1)*4))) == NULL) {
- r = SQUAT_ERR;
- goto cleanup;
- }
- *buf++ = 0;
- memcpy(buf, index->doc_ID_list, index->current_doc_ID*4);
- buf += index->current_doc_ID*4;
- memset(buf, 0, 4);
- complete_buffered_write(&index->out, buf + 4);
-
- /* Now write out the trie for every initial byte that we saw. The
- offsets are collected in 'offset_buf'. */
- memset(offset_buf, 0, sizeof(offset_buf));
- for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
- if (index->stats_callback != NULL) {
- SquatStatsEvent event;
-
- event.generic.type = SQUAT_STATS_COMPLETED_INITIAL_CHAR;
- event.completed_initial_char.completed_char = i;
- event.completed_initial_char.num_words = index->total_num_wordsi;
- if (index->index_buffersi.buf != NULL) {
- event.completed_initial_char.temp_file_size =
- index->index_buffersi.total_output_bytes;
- } else {
- event.completed_initial_char.temp_file_size = 0;
- }
- index->stats_callback(index->stats_callback_closure, &event);
+static int index_close_internal(SquatIndex *index, int OK)
+{
+ int r = SQUAT_OK;
+ int doc_list_offset;
+ int doc_ID_list_offset;
+ int word_list_offset;
+ char *buf;
+ unsigned i;
+ SquatDiskHeader *header;
+ int offset_buf256;
+
+ squat_set_last_error(SQUAT_ERR_OK);
+
+ if (!OK) {
+	goto cleanup;
+ }
+
+ /* Close any open document ... this would really be a client bug. */
+ if (index->current_doc_len >= 0) {
+	squat_index_close_document(index);
+ }
+
+ /* Clear the current trie. We are now going to use it to build
+ all-documents tries. */
+ word_table_delete(index->doc_word_table, SQUAT_WORD_SIZE);
+ index->doc_word_table = word_table_new();
+
+ /* Write out the array that maps document IDs to offsets of the
+ document records. */
+ doc_list_offset = sizeof(SquatDiskHeader);
+ doc_ID_list_offset = index->out.total_output_bytes + 1;
+ if ((buf = prepare_buffered_write(&index->out,
+				 SQUAT_SAFETY_ZONE +
+				 ((index->current_doc_ID +
+					1) * 4))) == NULL) {
+	r = SQUAT_ERR;
+	goto cleanup;
+ }
+ *buf++ = 0;
+ memcpy(buf, index->doc_ID_list, index->current_doc_ID * 4);
+ buf += index->current_doc_ID * 4;
+ memset(buf, 0, 4);
+ complete_buffered_write(&index->out, buf + 4);
+
+ /* Now write out the trie for every initial byte that we saw. The
+ offsets are collected in 'offset_buf'. */
+ memset(offset_buf, 0, sizeof(offset_buf));
+ for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
+	if (index->stats_callback != NULL) {
+	 SquatStatsEvent event;
+
+	 event.generic.type = SQUAT_STATS_COMPLETED_INITIAL_CHAR;
+	 event.completed_initial_char.completed_char = i;
+	 event.completed_initial_char.num_words =
+		index->total_num_wordsi;
+	 if (index->index_buffersi.fd >= 0) {
+		event.completed_initial_char.temp_file_size =
+		 index->index_buffersi.total_output_bytes;
+	 } else {
+		event.completed_initial_char.temp_file_size = 0;
+	 }
+	 index->stats_callback(index->stats_callback_closure, &event);
+	}
+
+	if (index->index_buffersi.fd >= 0) {
+	 /* We have to flush the temporary file output buffer before we try to use
+	 the temporary file. */
+	 if (flush_and_reset_buffered_writes(index->index_buffers + i)
+		!= SQUAT_OK
+		|| dump_index_trie_words(index, i,
+					 offset_buf + i) != SQUAT_OK) {
+		r = SQUAT_ERR;
+		goto cleanup;
+	 }
+	 /* Close files and free memory as we go. This could be important
+	 if disk space is low and we're generating a huge index. */
+	 if (close(index->index_buffersi.fd) < 0) {
+		squat_set_last_error(SQUAT_ERR_SYSERR);
+		r = SQUAT_ERR;
+	 }
+	 index->index_buffersi.fd = -1;
+	 buf_free(&index->index_buffersi.buf);
+	} else if (index->old_index) {
+	 /* Only needed if incremental updates going on */
+	 /* Just copy across existing trie if nothing new to merge in */
+	 if (dump_index_trie_words_no_file(index, i, offset_buf + i) !=
+		SQUAT_OK) {
+		r = SQUAT_ERR;
+		goto cleanup;
+	 }
+	}
+ }
+
+ /* Save the offset where the root of the index trie is going to go. */
+ word_list_offset = index->out.total_output_bytes;
+
+ /* Relativize the subtrie offsets. */
+ for (i = 0; i < VECTOR_SIZE(offset_buf); i++) {
+	if (offset_bufi != 0) {
+	 offset_bufi = word_list_offset - offset_bufi;
+
+	 if ((int)i < index->doc_word_table->first_valid_entry) {
+		index->doc_word_table->first_valid_entry = i;
+	 }
+	 index->doc_word_table->last_valid_entry = i;
+	}
 }
 
- if (index->index_buffersi.buf != NULL) {
- /* We have to flush the temporary file output buffer before we try to use
-	 the temporary file. */
- if (flush_and_reset_buffered_writes(index->index_buffers + i) != SQUAT_OK
- || dump_index_trie_words(index, i, offset_buf + i) != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
- /* Close files and free memory as we go. This could be important
-	 if disk space is low and we're generating a huge index. */
- if (close(index->index_buffersi.fd) < 0) {
- squat_set_last_error(SQUAT_ERR_SYSERR);
- r = SQUAT_ERR;
- }
- free(index->index_buffersi.buf);
- index->index_buffersi.buf = NULL;
- } else if (index->old_index) {
- /* Only needed if incremental updates going on */
- /* Just copy across existing trie if nothing new to merge in */
- if (dump_index_trie_words_no_file(index, i, offset_buf + i) != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
+ /* Dump out the offset buffer at last. */
+ if (dump_word_table_offsets(index, index->doc_word_table, offset_buf)
+	!= SQUAT_OK) {
+	r = SQUAT_ERR;
+	goto cleanup;
 }
- }
 
- /* Save the offset where the root of the index trie is going to go. */
- word_list_offset = index->out.total_output_bytes;
+ /* finally, write trailing zeroes and the header ... now that we know
+ we initialized the file with no errors */
+ if ((buf =
+	 prepare_buffered_write(&index->out, SQUAT_SAFETY_ZONE)) == NULL) {
+	r = SQUAT_ERR;
+	goto cleanup;
+ }
+ memset(buf, 0, SQUAT_SAFETY_ZONE);
+ complete_buffered_write(&index->out, buf + SQUAT_SAFETY_ZONE);
 
- /* Relativize the subtrie offsets. */
- for (i = 0; i < VECTOR_SIZE(offset_buf); i++) {
- if (offset_bufi != 0) {
- offset_bufi = word_list_offset - offset_bufi;
+ /* Flush writes before we seek back to the start to write the header */
+ if (flush_and_reset_buffered_writes(&index->out) != SQUAT_OK) {
+	r = SQUAT_ERR;
+	goto cleanup;
+ }
 
- if ((int) i < index->doc_word_table->first_valid_entry) {
- index->doc_word_table->first_valid_entry = i;
- }
- index->doc_word_table->last_valid_entry = i;
+ /* Blat out the header */
+ if ((header = (SquatDiskHeader *) prepare_buffered_write(&index->out,
+							 sizeof
+							 (SquatDiskHeader)))
+	== NULL) {
+	r = SQUAT_ERR;
+	goto cleanup;
+ }
+ memcpy(header->header_text, squat_index_file_header, 8);
+ squat_encode_64(header->doc_list_offset, doc_list_offset);
+ squat_encode_64(header->doc_ID_list_offset, doc_ID_list_offset);
+ squat_encode_64(header->word_list_offset, word_list_offset);
+ memcpy(header->valid_char_bits, index->valid_char_bits,
+	 sizeof(header->valid_char_bits));
+ complete_buffered_write(&index->out, (char *)(header + 1));
+
+ /* Flush out the header */
+ if (flush_and_reset_buffered_writes(&index->out) != SQUAT_OK) {
+	r = SQUAT_ERR;
+	goto cleanup;
 }
- }
-
- /* Dump out the offset buffer at last. */
- if (dump_word_table_offsets(index, index->doc_word_table, offset_buf)
- != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
-
- /* finally, write trailing zeroes and the header ... now that we know
- we initialized the file with no errors */
- if ((buf = prepare_buffered_write(&index->out, SQUAT_SAFETY_ZONE)) == NULL) {
- r = SQUAT_ERR;
- goto cleanup;
- }
- memset(buf, 0, SQUAT_SAFETY_ZONE);
- complete_buffered_write(&index->out, buf + SQUAT_SAFETY_ZONE);
-
- /* Flush writes before we seek back to the start to write the header */
- if (flush_and_reset_buffered_writes(&index->out) != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
-
- /* Blat out the header */
- if ((header = (SquatDiskHeader*)prepare_buffered_write(&index->out,
- sizeof(SquatDiskHeader))) == NULL) {
- r = SQUAT_ERR;
- goto cleanup;
- }
- memcpy(header->header_text, squat_index_file_header, 8);
- squat_encode_64(header->doc_list_offset, doc_list_offset);
- squat_encode_64(header->doc_ID_list_offset, doc_ID_list_offset);
- squat_encode_64(header->word_list_offset, word_list_offset);
- memcpy(header->valid_char_bits, index->valid_char_bits,
- sizeof(header->valid_char_bits));
- complete_buffered_write(&index->out, (char*)(header + 1));
-
- /* Flush out the header */
- if (flush_and_reset_buffered_writes(&index->out) != SQUAT_OK) {
- r = SQUAT_ERR;
- goto cleanup;
- }
-
- /* WOOHOO! It's done! */
+
+ /* WOOHOO! It's done! */
 
 cleanup:
- free(index->out.buf);
- delete_doc_word_table(index->doc_word_table, SQUAT_WORD_SIZE - 1);
- /* If we're bailing out because of an error, we might not have
- released all the temporary file resources. */
- for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
- if (index->index_buffersi.buf != NULL) {
- close(index->index_buffersi.fd);
- free(index->index_buffersi.buf);
+ buf_free(&index->out.buf);
+ word_table_delete(index->doc_word_table, SQUAT_WORD_SIZE - 1);
+ /* If we're bailing out because of an error, we might not have
+ released all the temporary file resources. */
+ for (i = 0; i < VECTOR_SIZE(index->index_buffers); i++) {
+	if (index->index_buffersi.fd >= 0)
+	 close(index->index_buffersi.fd);
+	buf_free(&index->index_buffersi.buf);
 }
- }
- free(index->tmp_path);
- free(index->doc_ID_list);
- doc_ID_map_free(&index->doc_ID_map);
- free(index);
+ free(index->tmp_path);
+ free(index->doc_ID_list);
+ doc_ID_map_free(&index->doc_ID_map);
+ free(index);
 
- return r;
+ return r;
 }
 
-int squat_index_finish(SquatIndex* index) {
- return index_close_internal(index, 1);
+int squat_index_finish(SquatIndex *index)
+{
+ return index_close_internal(index, 1);
 }
 
-int squat_index_destroy(SquatIndex* index) {
- return index_close_internal(index, 0);
+int squat_index_destroy(SquatIndex *index)
+{
+ return index_close_internal(index, 0);
 }

cyrus-imapd-2.5.tar.gz/imap/squat_dump.c Added

@@ -0,0 +1,217 @@
+/* squat_dump.c -- SQUAT-based index dumping tool
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: squatter.c,v 1.26 2010/06/28 12:04:20 brong Exp $
+ */
+
+/*
+ This tool dumps out a SQUAT index in various ways. It's useful
+ for debugging.
+
+ Currently hardcoded for SQUAT, doesn't use struct search_engine.
+*/
+
+#include <config.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <syslog.h>
+#include <string.h>
+
+#include "assert.h"
+#include "global.h"
+#include "exitcodes.h"
+#include "imap/imap_err.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+#include "mboxlist.h"
+#include "mailbox.h"
+#include "mboxname.h"
+#include "squat.h"
+#include "util.h"
+
+extern char *optarg;
+extern int optind;
+
+static int usage(const char *name)
+{
+ fprintf(stderr,
+	 "usage: %s -C <alt_config> mailbox ...\n",
+	 name);
+
+ exit(EC_USAGE);
+}
+
+static const char *squat_strerror(int err)
+{
+ static char buf64;
+
+ switch (err) {
+ case SQUAT_ERR_SYSERR:
+	return strerror(errno);
+ default:
+	/* There are other error codes, but they only apply for searching,
+	 not index construction */
+	snprintf(buf, sizeof(buf), "unknown squat error %d", err);
+	return buf;
+ }
+}
+
+static int dump_doc(void *closure __attribute__((unused)),
+		 const SquatListDoc *doc)
+{
+ printf("DOC %s %llu\n", doc->doc_name, doc->size);
+ return SQUAT_CALLBACK_CONTINUE;
+}
+
+/* This is called once for each mailbox we're told to dump. */
+static int dump_one(char *name)
+{
+ struct mboxlist_entry *mbentry = NULL;
+ struct mailbox *mailbox = NULL;
+ int r;
+ int fd = -1;
+ SquatSearchIndex *index = NULL;
+ char *fname = NULL;
+
+ /* Skip remote mailboxes */
+ r = mboxlist_lookup(name, &mbentry, NULL);
+ if (r) {
+	fprintf(stderr, "error opening looking up %s: %s\n",
+		name, error_message(r));
+	return 1;
+ }
+
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	mboxlist_entry_free(&mbentry);
+	return 0;
+ }
+
+ mboxlist_entry_free(&mbentry);
+
+ r = mailbox_open_irl(name, &mailbox);
+ if (r) {
+	fprintf(stderr, "error opening mailbox %s: %s\n",
+		name, error_message(r));
+	return 1;
+ }
+
+ fname = xstrdup(mailbox_meta_fname(mailbox, META_SQUAT));
+
+ mailbox_close(&mailbox);
+
+ fd = open(fname, O_RDONLY, 0);
+ if (fd < 0) {
+	fprintf(stderr, "error opening file %s: %s\n",
+		fname, error_message(errno));
+	goto out;
+ }
+
+ index = squat_search_open(fd);
+ if (index == NULL) {
+	fprintf(stderr, "error opening index %s: %s\n",
+		fname, squat_strerror(squat_get_last_error()));
+	goto out;
+ }
+
+ printf("MAILBOX %s\n", name);
+
+ r = squat_search_list_docs(index, dump_doc, NULL);
+ if (r != SQUAT_OK) {
+	fprintf(stderr, "error listing index %s: %s\n",
+		fname, squat_strerror(r));
+	goto out;
+ }
+
+out:
+ if (fd >= 0) close(fd);
+ if (index != NULL) squat_search_close(index);
+ free(fname);
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ int opt;
+ char *alt_config = NULL;
+ int i;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*ismaster*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ while ((opt = getopt(argc, argv, "C:")) != EOF) {
+	switch (opt) {
+	case 'C':		/* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	default:
+	 usage(argv0);
+	}
+ }
+
+ cyrus_init(alt_config, "squat_dump", 0, CONFIG_NEED_PARTITION_DATA);
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ if (optind == argc)
+	usage(argv0);
+
+ for (i = optind; i < argc; i++)
+	dump_one(argvi);
+
+ mboxlist_close();
+ mboxlist_done();
+
+ cyrus_done();
+
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/squat_internal.c -> cyrus-imapd-2.5.tar.gz/imap/squat_internal.c Changed

@@ -39,40 +39,43 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: squat_internal.c,v 1.5 2010/01/06 17:01:41 murch Exp $
 */
 
+#include "config.h"
 #include "assert.h"
 #include "squat_internal.h"
 
 static int last_err = SQUAT_ERR_OK;
 
-char const squat_index_file_header8 = "SQUAT 1\n";
+EXPORTED char const squat_index_file_header8 = "SQUAT 1\n";
 
-void squat_set_last_error(int err) {
- last_err = err;
+EXPORTED void squat_set_last_error(int err)
+{
+ last_err = err;
 }
 
-int squat_get_last_error(void) {
- return last_err;
+EXPORTED int squat_get_last_error(void)
+{
+ return last_err;
 }
 
-SquatInt32 squat_decode_32(char const* s) {
- unsigned char* v = (unsigned char*)s;
- return ((SquatInt32)v0 << 24) | ((SquatInt32)v1 << 16)
- | ((SquatInt32)v2 << 8) | (SquatInt32)v3; 
+EXPORTED SquatInt32 squat_decode_32(char const* s)
+{
+ unsigned char* v = (unsigned char*)s;
+ return ((SquatInt32)v0 << 24) | ((SquatInt32)v1 << 16) |
+	 ((SquatInt32)v2 << 8) | (SquatInt32)v3;
 }
 
-char* squat_encode_32(char* s, SquatInt32 v) {
- s0 = (unsigned char)(v >> 24);
- s1 = (unsigned char)(v >> 16);
- s2 = (unsigned char)(v >> 8);
- s3 = (unsigned char)v;
- return s + 4;
+EXPORTED char *squat_encode_32(char* s, SquatInt32 v)
+{
+ s0 = (unsigned char)(v >> 24);
+ s1 = (unsigned char)(v >> 16);
+ s2 = (unsigned char)(v >> 8);
+ s3 = (unsigned char)v;
+ return s + 4;
 }
 
-SquatInt64 squat_decode_64(char const *s)
+EXPORTED SquatInt64 squat_decode_64(char const *s)
 {
 unsigned char* v = (unsigned char*)s;
 return ((SquatInt64)v0 << 56) | ((SquatInt64)v1 << 48) |
@@ -81,115 +84,120 @@
 	 ((SquatInt64)v6 << 8) | (SquatInt64)v7;
 }
 
-char* squat_encode_64(char* s, SquatInt64 v) {
- s0 = (unsigned char)(v >> 56);
- s1 = (unsigned char)(v >> 48);
- s2 = (unsigned char)(v >> 40);
- s3 = (unsigned char)(v >> 32);
- s4 = (unsigned char)(v >> 24);
- s5 = (unsigned char)(v >> 16);
- s6 = (unsigned char)(v >> 8);
- s7 = (unsigned char)v;
- return s + 8;
+EXPORTED char *squat_encode_64(char* s, SquatInt64 v)
+{
+ s0 = (unsigned char)(v >> 56);
+ s1 = (unsigned char)(v >> 48);
+ s2 = (unsigned char)(v >> 40);
+ s3 = (unsigned char)(v >> 32);
+ s4 = (unsigned char)(v >> 24);
+ s5 = (unsigned char)(v >> 16);
+ s6 = (unsigned char)(v >> 8);
+ s7 = (unsigned char)v;
+ return s + 8;
 }
 
-SquatInt64 squat_decode_I(char const** s) {
- int ch;
- SquatInt64 r;
-
- ch = (unsigned char)*(*s)++;
- r = ch;
- while ((ch & 0x80) != 0) {
- ch = (unsigned char)**s;
- ++(*s);
- r = ((r - 0x80) << 7) + ch;
- }
- return r;
+EXPORTED SquatInt64 squat_decode_I(char const** s)
+{
+ int ch;
+ SquatInt64 r;
+
+ ch = (unsigned char)*(*s)++;
+ r = ch;
+ while ((ch & 0x80) != 0) {
+	ch = (unsigned char)**s;
+	++(*s);
+	r = ((r - 0x80) << 7) + ch;
+ }
+ return r;
 }
 
-char const* squat_decode_skip_I(char const* s, int num_to_skip) {
- while (num_to_skip > 0) {
- while ((*s & 0x80) != 0) {
- s++;
+HIDDEN char const *squat_decode_skip_I(char const* s, int num_to_skip)
+{
+ while (num_to_skip > 0) {
+	while ((*s & 0x80) != 0) {
+	 s++;
+	}
+	s++;
+	num_to_skip--;
 }
- s++;
- num_to_skip--;
- }
 
- return s;
+ return s;
 }
 
-int squat_count_encode_I(SquatInt64 v64) {
- int v = (int)v64;
- int shift = 56;
- int result;
-
- assert(v64 >= 0);
-
- if (v == v64) {
- if (v < (1 << 7)) {
- return 1;
- } else if (v < (1 << 14)) {
- return 2;
- } else if (v < (1 << 21)) {
- return 3;
- } else if (v < (1 << 28)) {
- return 4;
+EXPORTED int squat_count_encode_I(SquatInt64 v64)
+{
+ int v = (int)v64;
+ int shift = 56;
+ int result;
+
+ assert(v64 >= 0);
+
+ if (v == v64) {
+	if (v < (1 << 7)) {
+	 return 1;
+	} else if (v < (1 << 14)) {
+	 return 2;
+	} else if (v < (1 << 21)) {
+	 return 3;
+	} else if (v < (1 << 28)) {
+	 return 4;
+	}
 }
- }
 
- while ((int)(v64 >> shift) == 0) {
- shift -= 7;
- }
+ while ((int)(v64 >> shift) == 0) {
+	shift -= 7;
+ }
 
- result = 0;
- while (shift >= 0) {
- shift -= 7;
- result++;
- }
+ result = 0;
+ while (shift >= 0) {
+	shift -= 7;
+	result++;
+ }
 
- return result;
+ return result;
 }
 
-char* squat_encode_I(char* s, SquatInt64 v64) {
- int v = (int)v64;
- int shift = 56;
- int v64_shifted;
-
- assert(v64 >= 0);
-
- if (v == v64) {
- if (v < (1 << 7)) {
- s0 = (unsigned char)v;
- return s + 1;
- } else if (v < (1 << 14)) {
- s0 = (unsigned char)((v >> 7) | 0x80);
- s1 = (unsigned char)(v & 0x7F);
- return s + 2;
- } else if (v < (1 << 21)) {
- s0 = (unsigned char)((v >> 14) | 0x80);
- s1 = (unsigned char)(((v >> 7) & 0x7F) | 0x80);
- s2 = (unsigned char)(v & 0x7F);
- return s + 3;
- } else if (v < (1 << 28)) {
- s0 = (unsigned char)((v >> 21) | 0x80);
- s1 = (unsigned char)(((v >> 14) & 0x7F) | 0x80);
- s2 = (unsigned char)(((v >> 7) & 0x7F) | 0x80);
- s3 = (unsigned char)(v & 0x7F);
- return s + 4;
+EXPORTED char *squat_encode_I(char* s, SquatInt64 v64)
+{
+ int v = (int)v64;
+ int shift = 56;
+ int v64_shifted;
+
+ assert(v64 >= 0);
+
+ if (v == v64) {
+	if (v < (1 << 7)) {
+	 s0 = (unsigned char)v;
+	 return s + 1;
+	} else if (v < (1 << 14)) {
+	 s0 = (unsigned char)((v >> 7) | 0x80);
+	 s1 = (unsigned char)(v & 0x7F);
+	 return s + 2;
+	} else if (v < (1 << 21)) {
+	 s0 = (unsigned char)((v >> 14) | 0x80);
+	 s1 = (unsigned char)(((v >> 7) & 0x7F) | 0x80);
+	 s2 = (unsigned char)(v & 0x7F);
+	 return s + 3;
+	} else if (v < (1 << 28)) {
+	 s0 = (unsigned char)((v >> 21) | 0x80);
+	 s1 = (unsigned char)(((v >> 14) & 0x7F) | 0x80);
+	 s2 = (unsigned char)(((v >> 7) & 0x7F) | 0x80);
+	 s3 = (unsigned char)(v & 0x7F);
+	 return s + 4;
+	}
+ }
+
+ while ((v64_shifted = (int)(v64 >> shift)) == 0) {
+	shift -= 7;
+ }
+ while (shift > 7) {
+	*s++ = (unsigned char)((v64_shifted & 0x7F) | 0x80);
+	shift -= 7;
+	v64_shifted = (int)(v64 >> shift);
 }
- }
-
- while ((v64_shifted = (int)(v64 >> shift)) == 0) {
- shift -= 7;
- }
- while (shift > 7) {
- *s++ = (unsigned char)((v64_shifted & 0x7F) | 0x80);
- shift -= 7;
- v64_shifted = (int)(v64 >> shift);
- }
- s0 = (unsigned char)((v64_shifted & 0x7F) + 0x80);
- s1 = (unsigned char)(v & 0x7F);
- return s + 2;
+ s0 = (unsigned char)((v64_shifted & 0x7F) + 0x80);
+ s1 = (unsigned char)(v & 0x7F);
+ return s + 2;
 }

cyrus-imapd-2.4.17.tar.gz/imap/squat_internal.h -> cyrus-imapd-2.5.tar.gz/imap/squat_internal.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/squatter.c -> cyrus-imapd-2.5.tar.gz/imap/squatter.c Changed

@@ -1,6 +1,6 @@
 /* squatter.c -- SQUAT-based message indexing tool
 *
- * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -38,35 +38,13 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: squatter.c,v 1.26 2010/06/28 12:04:20 brong Exp $
 */
 
 /*
- This is the tool that creates SQUAT indexes for Cyrus mailboxes.
-
- SQUAT index files are organised as follows:
-
- There is (at most) one index file for each Cyrus mailbox, named
- "cyrus.squat", stored in the mailbox directory.
-
- Source documents are named 'xUID' where UID is the numeric UID of a
- message and x is a character denoting a part of the message: 'f' ==
- FROM, 't' == TO, 'b' == BCC, 'c' == CC, 's' == SUBJECT, 'h' == other
- headers, 'm' == the body. So, a messge with UID 331 could give rise
- to several source documents named "f331", "t331", "b331", "c331",
- "s331", "h331" and "m331".
-
- There is also a special source document named "validity.N" where N
- is the validitity nonce for the mailbox. We use this to detect when
- the UIDs have been renumbered since we created the index (in which
- case the index is useless and is ignored).
-
- This tool creates new indexes for one or more mailboxes. (We do not
- support incremental updates to an index yet.) The index is created
- in "cyrus.squat.tmp" and then, if creation was successful, it is
- atomically renamed to "cyrus.squat". This guarantees that we don't
- interfere with anyone who has the old index open.
+ This is the tool that creates/updates search indexes for Cyrus mailboxes.
+
+ Despite the name, it handles whichever search engine in configured
+ by the 'search_engine' option in imapd.conf.
 */
 
 #include <config.h>
@@ -78,462 +56,119 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/poll.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <string.h>
 
 #include "annotate.h"
 #include "assert.h"
+#include "bsearch.h"
 #include "mboxlist.h"
 #include "global.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
+#include "search_engines.h"
+#include "sync_log.h"
 #include "mailbox.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
+#include "ptrarray.h"
+#include "tok.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
-#include "map.h"
-#include "squat.h"
 #include "index.h"
+#include "message.h"
 #include "util.h"
 
-/* global state */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 extern char *optarg;
 extern int optind;
 
 /* current namespace */
 static struct namespace squat_namespace;
 
-/* These stats are gathered 1) per mailbox and 2) for the whole operation. */
-typedef struct {
- unsigned long indexed_bytes; /* How many bytes of processed message text
-			 have we indexed? */
- unsigned long indexed_messages; /* How many messages have we indexed? */
- unsigned long index_size; /* How many bytes is the index using? */
- time_t start_time; /* When did this operation start? */
- time_t end_time; /* When did it end? */
-} SquatStats;
-
 const int SKIP_FUZZ = 60;
 
 static int verbose = 0;
-static int mailbox_count = 0;
-static int skip_unmodified = 0;
 static int incremental_mode = 0;
-static SquatStats total_stats;
+static int recursive_flag = 0;
+static int annotation_flag = 0;
+static int running_daemon = 0;
+static int sleepmicroseconds = 0;
+static const char *temp_root_dir = NULL;
+static search_text_receiver_t *rx = NULL;
 
-static void start_stats(SquatStats* stats) {
- stats->index_size = 0;
- stats->indexed_bytes = 0;
- stats->indexed_messages = 0;
- stats->start_time = time(NULL);
-}
+static const char *name_starts_from = NULL;
 
-static void stop_stats(SquatStats* stats) {
- stats->end_time = time(NULL);
-}
-
-static void print_stats(FILE* out, SquatStats* stats) {
- fprintf(out, "Indexed %lu messages (%lu bytes) "
- "into %lu index bytes in %d seconds\n",
- stats->indexed_messages, stats->indexed_bytes,
- stats->index_size, (int) (stats->end_time - stats->start_time));
-}
+static void shut_down(int code) __attribute__((noreturn));
 
 static int usage(const char *name)
 {
 fprintf(stderr,
-	 "usage: %s -C <alt_config> -r -s -a -v mailbox...\n",
+	 "usage: %s -C <alt_config> -v -s -a mailbox...\n",
+	 name);
+ fprintf(stderr,
+	 "usage: %s -C <alt_config> -v -s -a -u user...\n",
+	 name);
+ fprintf(stderr,
+	 " %s -C <alt_config> -v -s -a -r mailbox ...\n",
+	 name);
+ fprintf(stderr,
+	 " %s -C <alt_config> -v -s -d -n channel -R\n",
+	 name);
+ fprintf(stderr,
+	 " %s -C <alt_config> -v -s -f synclogfile\n",
 	 name);
- 
- exit(EC_USAGE);
-}
-
-static void fatal_syserror(const char* s)
-{
- perror(s);
- exit(99);
-}
 
-static void fatal_squat_error(const char* s)
-{
- int err = squat_get_last_error();
-
- switch (err) {
- case SQUAT_ERR_OUT_OF_MEMORY:
- fprintf(stderr, "SQUAT: Out of memory (%s)\n", s);
- break;
- case SQUAT_ERR_SYSERR:
- perror(s);
- break;
- default:
- /* There are other error codes, but they only apply for searching,
- not index construction */
- fprintf(stderr, "SQUAT: Unknown error %d (%s)\n", err, s);
- }
-
- exit(98);
+ exit(EC_USAGE);
 }
 
 /* ====================================================================== */
 
-/* uid_info is used to track which messages exist in old squat index, by
- * parsing document names (e.g: m456. is part of message UID 456).
- */
-
-struct uid_item {
- unsigned long uid;
- int flagged;
-};
-
-struct uid_info {
- struct uid_item *list;
- unsigned long len;
- unsigned long uidvalidity;
- int valid;
-};
-
-static void uid_info_init(struct uid_info *uid_info, unsigned long exists)
-{
- uid_info->list = xmalloc((exists+1)*sizeof(struct uid_item));
- uid_info->len = exists;
- uid_info->uidvalidity = 0L;
- uid_info->valid = 1;
-}
-
-static void uid_info_free(struct uid_info *uid_info)
-{
- if (uid_info->list != NULL)
- free(uid_info->list);
-
- uid_info->list = NULL;
-}
-
-static void uid_item_init(struct uid_item *uid_item, unsigned long uid)
+static void become_daemon(void)
 {
- uid_item->uid = uid;
- uid_item->flagged = 0;
-}
-
-static struct uid_item *find_uid_item(struct uid_info *uid_info,
- unsigned long uid)
-{
- struct uid_item *list = uid_info->list;
- unsigned long first = 0;
- unsigned long last = uid_info->len;
-
- /* Binary chop on sorted array */
- while (first < last) {
- unsigned long middle = (first + last) / 2;
-
- if (listmiddle.uid == uid)
- return(&listmiddle);
- if (listmiddle.uid < uid)
- first = middle + 1;
- else
- last = middle;
- }
- return(NULL);
-}
-
-/* Populate uid_info map using document names from SquatSearchIndex backend */
-static int doc_check(void *closure, SquatListDoc const* doc)
-{
- struct uid_info *uid_info = (struct uid_info *)closure;
- struct uid_item *uid_item;
- unsigned long uid;
-
- /* validity will be replaced with new value in same slot */
- if (!strncmp(doc->doc_name, "validity.", 9)) {
- uid_info->uidvalidity = strtoul(doc->doc_name+9, NULL, 10);
- return(1);
- }
-
- if (!strchr("tfcbsmh", doc->doc_name0)) {
- syslog(LOG_ERR, "Invalid document name: %s", doc->doc_name);
- uid_info->valid = 0;
- return(1);
- }
-
- uid = strtoul(doc->doc_name+1, NULL, 10);
- if ((uid > 0) && (uid_item=find_uid_item(uid_info, uid))) {
- uid_item->flagged = 1;
- return(1);
- }
-
- /* Remove this UID from the index */
- return(0);
-}
-
-/* ====================================================================== */
-
-
-typedef struct {
- SquatStats* mailbox_stats;
- SquatIndex* index;
- struct mailbox* mailbox;
-} SquatReceiverData;
-
-/* Cyrus passes the text to index in here, after it has canonicalized
- the text. We figure out what source document the text belongs to,
- and update the index. */
-static void search_text_receiver(int uid, int part, int cmd,
- char const* text, int text_len, void* rock) {
- SquatReceiverData* d = (SquatReceiverData*)rock;
-
- if ((cmd & SEARCHINDEX_CMD_BEGINPART) != 0) {
- char buf100;
- char part_char = 0;
- 
- /* Figure out what the name of the source document is going to be. */
- switch (part) {
- case SEARCHINDEX_PART_FROM: part_char = 'f'; break;
- case SEARCHINDEX_PART_TO: part_char = 't'; break;
- case SEARCHINDEX_PART_CC: part_char = 'c'; break;
- case SEARCHINDEX_PART_BCC: part_char = 'b'; break;
- case SEARCHINDEX_PART_SUBJECT: part_char = 's'; break;
- case SEARCHINDEX_PART_HEADERS: part_char = 'h'; break;
- case SEARCHINDEX_PART_BODY:
- part_char = 'm';
- d->mailbox_stats->indexed_messages++;
- total_stats.indexed_messages++;
- break;
- default:
- fatal("Unknown search_text part", EC_SOFTWARE);
- }
-
- snprintf(buf, sizeof(buf), "%c%d", part_char, uid);
-
- /* don't index document parts that are going to be empty (or too
- short to search) */
- if ((cmd & SEARCHINDEX_CMD_ENDPART) != 0
- && ((cmd & SEARCHINDEX_CMD_APPENDPART) == 0
- || text_len < SQUAT_WORD_SIZE)) {
- if (verbose > 2) {
- printf("Skipping tiny document part '%s' (size %d)\n", buf,
- (cmd & SEARCHINDEX_CMD_APPENDPART) == 0 ? 0 : text_len);
- }
- return;
- }
-
- if (verbose > 2) {
- printf("Opening document part '%s'\n", buf);
- }
-
- if (squat_index_open_document(d->index, buf) != SQUAT_OK) {
- fatal_squat_error("Writing index");
- }
- }
-
- if ((cmd & SEARCHINDEX_CMD_APPENDPART) != 0) {
- if (verbose > 3) {
- printf("Writing %d bytes into message %d\n", text_len, uid);
- }
-
- if (squat_index_append_document(d->index, text, text_len) != SQUAT_OK) {
- fatal_squat_error("Writing index data");
+ pid_t pid;
+ int nfds = getdtablesize();
+ int nullfd;
+ int fd;
+
+ nullfd = open("/dev/null", O_RDWR, 0);
+ if (nullfd < 0) {
+	perror("/dev/null");
+	exit(1);
 }
- d->mailbox_stats->indexed_bytes += text_len;
- total_stats.indexed_bytes += text_len;
- }
-
- if ((cmd & SEARCHINDEX_CMD_ENDPART) != 0) {
- if (squat_index_close_document(d->index) != SQUAT_OK) {
- fatal_squat_error("Writing index update");
- }
- }
-}
-
-/* Let SQUAT tell us what's going on in the expensive
- squat_index_finish function. */
-static void stats_callback(void* closure __attribute__((unused)),
-			 SquatStatsEvent* params) {
- switch (params->generic.type) {
- case SQUAT_STATS_COMPLETED_INITIAL_CHAR:
- if (verbose > 1) {
- if (params->completed_initial_char.num_words > 0) {
- printf("Processing index character %d, %d total words, "
- "temp file size is %d\n",
- params->completed_initial_char.completed_char,
- params->completed_initial_char.num_words,
- params->completed_initial_char.temp_file_size);
- }
+ dup2(nullfd, 0);
+ dup2(nullfd, 1);
+ dup2(nullfd, 2);
+ for (fd = 3 ; fd < nfds ; fd++)
+	close(fd);	 /* this will close nullfd too */
+
+ pid = fork();
+ if (pid == -1) {
+	perror("fork");
+	exit(1);
 }
- break;
 
- default:
- ; /* do nothing */
- }
+ if (pid)
+	exit(0); /* parent */
 }
 
-/* Squat a single open mailbox */
-static int squat_single(struct index_state *state, int incremental)
-{
- struct mailbox *mailbox = state->mailbox;
- char *fname;
- char *newfname;
- SquatStats stats;
- SquatOptions options;
- SquatReceiverData data;
- SquatSearchIndex *old_index = NULL;
- char uid_validity_buf30;
- struct uid_info uid_info;
- struct uid_item *uid_item;
- struct stat index_file_info;
- unsigned long lastuid;
- uint32_t msgno;
- int new_index_fd = -1;
- int old_index_fd = -1;
- int r = 0; /* Using IMAP_* not SQUAT_* return codes here */
-
- uid_info_init(&uid_info, state->exists);
-
- newfname = mailbox_meta_newfname(mailbox, META_SQUAT);
- if ((new_index_fd = open(newfname, O_CREAT|O_TRUNC|O_WRONLY, 0666)) < 0)
-	fatal_syserror("Unable to create temporary index file");
-
- options.option_mask = SQUAT_OPTION_TMP_PATH | SQUAT_OPTION_STATISTICS;
- options.tmp_path = mailbox_datapath(mailbox);
- options.stats_callback = stats_callback;
- options.stats_callback_closure = NULL;
- data.index = squat_index_init(new_index_fd, &options);
- if (data.index == NULL)
-	fatal_squat_error("Initializing index");
-
- lastuid = 0;
- uid_item = uid_info.list;
- for (msgno = 1; msgno <= state->exists ; msgno++) {
-	lastuid = state->mapmsgno-1.record.uid;
-	uid_item_init(&uid_itemmsgno-1, lastuid);
- }
- /* Add zero UID as an end of list marker: uid_info_init() assigned space */
- uid_item_init(&uid_itemstate->exists, 0);
-
- /* Open existing index if it exists */
- fname = mailbox_meta_fname(mailbox, META_SQUAT);
- old_index_fd = -1;
- old_index = NULL;
- if (incremental &&
- ((old_index_fd = open(fname, O_RDONLY)) >= 0) &&
- (old_index = squat_search_open(old_index_fd)) == NULL) {
- close(old_index_fd);
- old_index_fd = -1;
- }
-
- /* Fall back to full update if open() or squat_search_open() failed */
- if (!old_index) incremental = 0;
-
- if (incremental) {
- /* Copy existing document names verbatim. They end up with the same
- * doc_IDs as in the old index, which makes trie copying much simpler.
- */
- uid_info.valid = 1;
- uid_info.uidvalidity = 0L;
- squat_index_add_existing(data.index, old_index, doc_check, &uid_info);
-
- if (!uid_info.valid) {
- syslog(LOG_ERR,
- "Corrupt squat index for %s, retrying without incremental",
- mailbox->name);
- r = IMAP_IOERROR;
- goto bail;
- }
-
- if (uid_info.uidvalidity != mailbox->i.uidvalidity) {
- /* Squat file refers to old mailbox: force full rebuild */
- r = IMAP_IOERROR;
- goto bail;
- }
- } else {
- /* write an empty document at the beginning to record the validity
- nonce */
- snprintf(uid_validity_buf, sizeof(uid_validity_buf), 
- "validity.%u", mailbox->i.uidvalidity);
- if (squat_index_open_document(data.index, uid_validity_buf) != SQUAT_OK
- || squat_index_close_document(data.index) != SQUAT_OK) {
- fatal_squat_error("Writing index");
- }
- }
-
- data.mailbox = mailbox;
- data.mailbox_stats = &stats;
- start_stats(&stats);
-
- uid_item = uid_info.list;
- for (msgno = 1; msgno <= state->exists ; msgno++) {
-	unsigned uid = state->mapmsgno-1.record.uid;
-	/* Scan uid_item list for matching UID (ascending order, 0 termination) */
-	while (uid_item->uid && (uid_item->uid < uid))
-	 uid_item++;
-
-	if ((uid_item->uid == uid) && uid_item->flagged)
-	 continue;
-
-	/* This UID didn't appear in the old index file */
-	index_getsearchtext_single(state, msgno, search_text_receiver, &data);
-	uid_item->flagged = 1;
- }
-
- if (squat_index_finish(data.index) != SQUAT_OK) {
-	if (incremental) {
-	 syslog(LOG_ERR,
-		 "Corrupt squat index %s, retrying without incremental update",
-		 mailbox->name);
-	 r = IMAP_IOERROR;
-	 goto bail;
-	}
-	/* Just give up if not incremental */
-	fatal_squat_error("Closing index");
- }
-
- /* Check how big the resulting file is */
- if (fstat(new_index_fd, &index_file_info) < 0) {
- fatal_syserror("Unable to stat temporary index file");
- }
- stats.index_size = index_file_info.st_size;
- total_stats.index_size += index_file_info.st_size;
-
- if (close(new_index_fd) < 0) {
- fatal_syserror("Unable to complete writing temporary index file");
- }
- new_index_fd = -1;
-
- /* OK, we successfully created the index under the temporary file name.
- Let's rename it to make it the real index. */
- if (mailbox_meta_rename(mailbox, META_SQUAT) < 0) {
-	fatal_syserror("Unable to rename temporary index file");
- }
-
- stop_stats(&stats);
- if (verbose > 0) {
-	print_stats(stdout, &stats);
- }
-
- bail:
- if (old_index) squat_search_close(old_index);
- if (old_index_fd >= 0) close(old_index_fd);
- if (new_index_fd >= 0) close(new_index_fd);
- uid_info_free(&uid_info);
-
- return(r);
-}
+/* ====================================================================== */
 
 /* This is called once for each mailbox we're told to index. */
-static int index_me(char *name, int matchlen __attribute__((unused)),
-		 int maycreate __attribute__((unused)),
-		 void *rock) {
- struct mboxlist_entry mbentry;
- struct index_state *state = NULL;
+static int index_one(const char *name, int blocking)
+{
+ mbentry_t *mbentry = NULL;
+ struct mailbox *mailbox = NULL;
 int r;
- char *fname;
- struct stat sbuf;
 char extnameMAX_MAILBOX_BUFFER;
- int use_annot = *((int *) rock);
+ int flags = 0;
+
+ if (incremental_mode)
+	flags |= SEARCH_UPDATE_INCREMENTAL;
 
 /* Convert internal name to external */
 (*squat_namespace.mboxname_toexternal)(&squat_namespace, name,
@@ -542,22 +177,27 @@
 /* Skip remote mailboxes */
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) {
- if (verbose) {
- printf("error opening looking up %s: %s\n",
+	if (verbose) {
+	 printf("error looking up %s: %s\n",
 		 extname, error_message(r));
- }
- syslog(LOG_INFO, "error opening looking up %s: %s\n",
- extname, error_message(r));
+	}
+	syslog(LOG_INFO, "error looking up %s: %s\n",
+	 extname, error_message(r));
 
- return 1;
+	return r;
 }
- if (mbentry.mbtype & MBTYPE_REMOTE) return 0;
+ if (mbentry->mbtype & MBTYPE_REMOTE) {
+	mboxlist_entry_free(&mbentry);
+	return 0;
+ }
+
+ mboxlist_entry_free(&mbentry);
 
 /* make sure the mailbox (or an ancestor) has
 /vendor/cmu/cyrus-imapd/squat set to "true" */
- if (use_annot) {
+ if (annotation_flag) {
 	char bufMAX_MAILBOX_BUFFER = "", *p;
-	struct annotation_data attrib;
+	struct buf attrib = BUF_INITIALIZER;
 	int domainlen = 0;
 
 	if (config_virtdomains && (p = strchr(name, '!')))
@@ -572,7 +212,7 @@
 				 &attrib);
 
 	 if (r ||				/* error */
-		attrib.value ||			/* found an entry */
+		attrib.s ||			/* found an entry */
 		!buf0) {			/* done recursing */
 		break;
 	 }
@@ -587,193 +227,802 @@
 		bufdomainlen = '\0';
 	}
 
-	if (r || !attrib.value || strcasecmp(attrib.value, "true"))
+	if (r || !attrib.s || strcasecmp(attrib.s, "true")) {
+	 buf_free(&attrib);
 	 return 0;
+	}
+	buf_free(&attrib);
 }
 
- r = index_open(name, NULL, &state);
- if (r) {
- if (verbose) {
- printf("error opening %s: %s\n", extname, error_message(r));
- }
- syslog(LOG_INFO, "error opening %s: %s\n", extname, error_message(r));
+again:
+ if (blocking)
+	r = mailbox_open_irl(name, &mailbox);
+ else
+	r = mailbox_open_irlnb(name, &mailbox);
 
- return 1;
+ if (r == IMAP_MAILBOX_LOCKED) {
+	if (verbose) syslog(LOG_INFO, "mailbox %s locked, retrying", extname);
+	return r;
 }
+ if (r) {
+	if (verbose) {
+	 printf("error opening %s: %s\n", extname, error_message(r));
+	}
+	syslog(LOG_INFO, "error opening %s: %s\n", extname, error_message(r));
 
- fname = mailbox_meta_fname(state->mailbox, META_SQUAT);
-
- /* process only changed mailboxes if skip option delected. */
- if (skip_unmodified && !stat(fname, &sbuf)) {
- if (SKIP_FUZZ + state->mailbox->index_mtime < sbuf.st_mtime) {
- syslog(LOG_DEBUG, "skipping mailbox %s", extname);
- if (verbose > 0) {
- printf("Skipping mailbox %s\n", extname);
- }
- index_close(&state);
- return 0;
- }
+	return r;
 }
 
 syslog(LOG_INFO, "indexing mailbox %s... ", extname);
 if (verbose > 0) {
- printf("Indexing mailbox %s... ", extname);
+	printf("Indexing mailbox %s... ", extname);
 }
 
- if (!incremental_mode || (squat_single(state, 1) != 0)) {
- /* Fall back to complete squat */
- squat_single(state, 0);
- }
+ r = search_update_mailbox(rx, mailbox, flags);
 
- index_close(&state);
- mailbox_count++;
+ mailbox_close(&mailbox);
 
- return 0;
-}
+ /* in non-blocking (rolling) mode, only do one batch per mailbox at
+ * a time for fairness IRIS-2471. The squatter will re-insert the
+ * mailbox in the queue */
+ if (blocking && r == IMAP_AGAIN) goto again;
 
-struct tmpnode {
- struct tmpnode *next;
- char *name;
-};
-struct tmplist {
- struct tmpnode *head;
- struct tmpnode *tail;
-};
+ return r;
+}
 
 static int addmbox(char *name,
 		 int matchlen __attribute__((unused)),
 		 int maycreate __attribute__((unused)),
 		 void *rock)
 {
- struct tmplist **lptr = (struct tmplist **) rock;
- struct tmplist *l = *lptr;
- struct tmpnode *n = xmalloc(sizeof (struct tmpnode));
-
- n->next = NULL;
- n->name = xstrdup(name);
-
- if (l->head) {
- l->tail->next = n;
- l->tail = l->tail->next;
- } else {
- l->head = l->tail = n;
- }
+ strarray_t *sa = (strarray_t *) rock;
 
+ if (strcmpsafe(name, name_starts_from) < 0)
+	return 0;
+ if (mboxname_isdeletedmailbox(name, NULL))
+	return 0;
+
+ strarray_append(sa, name);
 return 0;
 }
 
-int main(int argc, char **argv)
+static void expand_mboxnames(strarray_t *sa, int nmboxnames,
+			 const char **mboxnames, int user_mode)
 {
- int opt;
- char *alt_config = NULL;
- int rflag = 0, use_annot = 0;
 int i;
- char bufMAX_MAILBOX_PATH+1;
- int r;
+ char bufMAX_MAILBOX_PATH + 1;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
-	fatal("must run as the Cyrus user", EC_USAGE);
+ if (!nmboxnames) {
+	assert(!recursive_flag);
+	strlcpy(buf, "*", sizeof(buf));
+	(*squat_namespace.mboxlist_findall) (&squat_namespace, buf, 1,
+					 0, 0, addmbox, sa);
 }
 
- setbuf(stdout, NULL);
+ for (i = 0; i < nmboxnames; i++) {
+	if (user_mode) {
+	 char *mbox = mboxname_user_mbox(mboxnamesi, NULL);
+	 strlcpy(buf, mbox, sizeof(buf));
+	 free(mbox);
+	}
+	else {
+	 /* Translate any separators in mailboxname */
+	 (*squat_namespace.mboxname_tointernal) (&squat_namespace,
+						 mboxnamesi, NULL, buf);
+	}
+	strarray_append(sa, buf);
+	if (recursive_flag || user_mode) {
+	 strlcat(buf, ".*", sizeof(buf));
+	 (*squat_namespace.mboxlist_findall) (&squat_namespace, buf, 1,
+						 0, 0, addmbox, sa);
+	}
+ }
+}
 
- while ((opt = getopt(argc, argv, "C:rsiav")) != EOF) {
-	switch (opt) {
-	case 'C': /* alt config file */
- alt_config = optarg;
- break;
+static int do_indexer(const strarray_t *sa)
+{
+ int r = 0;
+ int i;
 
- case 'v': /* verbose */
- verbose++;
- break;
+ rx = search_begin_update(verbose);
+ if (rx == NULL)
+	return 0;	/* no indexer defined */
+
+ for (i = 0 ; i < sa->count ; i++) {
+	r = index_one(sa->datai, /*blocking*/1);
+	if (r == IMAP_MAILBOX_NONEXISTENT)
+	 r = 0;
+	if (r == IMAP_MAILBOX_LOCKED)
+	 r = 0; /* XXX - try again? */
+	if (r) break;
+	if (sleepmicroseconds)
+	 usleep(sleepmicroseconds);
+ }
 
-	case 'r': /* recurse */
-	 rflag = 1;
-	 break;
+ search_end_update(rx);
 
-	case 's': /* skip unmodifed */
-	 skip_unmodified = 1;
- break;
+ return r;
+}
 
-	case 'i': /* incremental mode */
-	 incremental_mode = 1;
- break;
+static int index_single_message(const char *mboxname, uint32_t uid)
+{
+ int r;
+ struct mailbox *mailbox = NULL;
+ message_t *msg = NULL;
+ int begun = 0;
+ struct index_record record;
 
-	case 'a': /* use /squat annotation */
-	 use_annot = 1;
-	 break;
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r) goto out;
 
-	default:
-	 usage("squatter");
+ r = rx->begin_mailbox(rx, mailbox, /*incremental*/1);
+ if (r) goto out;
+ begun = 1;
+
+ if (rx->is_indexed(rx, uid)) goto out;
+
+ r = mailbox_find_index_record(mailbox, uid, &record, NULL);
+ if (r) goto out;
+
+ if (record.system_flags & (FLAG_EXPUNGED|FLAG_UNLINKED)) goto out;
+
+ msg = message_new_from_record(mailbox, &record);
+ if (!msg) goto out;
+
+ if (verbose) fprintf(stderr, "squatter: indexing mailbox:%s uid:%u\n",
+			 mboxname, uid);
+
+ r = index_getsearchtext(msg, rx, 0);
+
+out:
+ if (begun) {
+	int r2 = rx->end_mailbox(rx, mailbox);
+	if (r2 && !r) r = r2;
+ }
+ message_unref(&msg);
+ mailbox_close(&mailbox);
+ return r;
+}
+
+static int do_indexfrom(const char *fromfile)
+{
+ int r;
+ FILE *fp;
+ unsigned lineno = 0;
+ const char *p;
+ tok_t tok;
+ const char *mboxname;
+ uint32_t uid;
+ char bufMAX_MAILBOX_BUFFER+128;
+
+ rx = search_begin_update(verbose);
+ if (rx == NULL) /* no indexer defined */
+	return 0;
+
+ fp = fopen(fromfile, "r");
+ if (!fp) {
+	r = errno;
+	perror(fromfile);
+	goto out;
+ }
+
+ while (fgets(buf, sizeof(buf), fp)) {
+	lineno++;
+	if (buf0 == '#') continue;
+	tok_initm(&tok, buf, "\t", TOK_EMPTY|TOK_TRIMRIGHT);
+
+	/* first token is an mboxname */
+	mboxname = tok_next(&tok);
+	if (!mboxname) {
+syntax_error:
+	 fprintf(stderr, "%s:%u: syntax error, skipping\n",
+		 fromfile, lineno);
+	 continue;
+	}
+
+	/* 2nd token is a uid */
+	p = tok_next(&tok);
+	if (!p) goto syntax_error;
+	uid = strtoul(p, NULL, 0);
+	if (!uid) goto syntax_error;
+
+	/* no more tokens on the line */
+	p = tok_next(&tok);
+	if (p) goto syntax_error;
+
+	r = index_single_message(mboxname, uid);
+	if (r) {
+	 fprintf(stderr, "Failed to index mailbox \"%s\" uid %u: %s\n",
+		 mboxname, uid, error_message(r));
+	 /* ignore errors */
+	 r = 0;
 	}
 }
 
- cyrus_init(alt_config, "squatter", 0);
+out:
+ if (fp) fclose(fp);
+ search_end_update(rx);
+ return r;
+}
 
- syslog(LOG_NOTICE, "indexing mailboxes");
+static int squatter_build_query(search_builder_t *bx, const char *query)
+{
+ tok_t tok = TOK_INITIALIZER(query, NULL, 0);
+ char *p;
+ char *q;
+ int r = 0;
+ int part;
+ int utf8 = charset_lookupname("utf-8");
+
+ while ((p = tok_next(&tok))) {
+	if (!strncasecmp(p, "__begin:", 8)) {
+	 q = p + 8;
+	 if (!strcasecmp(q, "and"))
+		bx->begin_boolean(bx, SEARCH_OP_AND);
+	 else if (!strcasecmp(q, "or"))
+		bx->begin_boolean(bx, SEARCH_OP_OR);
+	 else if (!strcasecmp(q, "not"))
+		bx->begin_boolean(bx, SEARCH_OP_NOT);
+	 else
+		goto error;
+	 continue;
+	}
+	if (!strncasecmp(p, "__end:", 6)) {
+	 q = p + 6;
+	 if (!strcasecmp(q, "and"))
+		bx->end_boolean(bx, SEARCH_OP_AND);
+	 else if (!strcasecmp(q, "or"))
+		bx->end_boolean(bx, SEARCH_OP_OR);
+	 else if (!strcasecmp(q, "not"))
+		bx->end_boolean(bx, SEARCH_OP_NOT);
+	 else
+		goto error;
+	 continue;
+	}
 
- /* Set namespace -- force standard (internal) */
- if ((r = mboxname_init_namespace(&squat_namespace, 1)) != 0) {
-	fatal(error_message(r), EC_CONFIG);
+	/* everything else is a ->match() of some kind */
+	q = strchr(p, ':');
+	if (q) q++;
+	if (!q) {
+	 part = SEARCH_PART_ANY;
+	 q = p;
+	}
+	else if (!strncasecmp(p, "to:", 3))
+	 part = SEARCH_PART_TO;
+	else if (!strncasecmp(p, "from:", 5))
+	 part = SEARCH_PART_FROM;
+	else if (!strncasecmp(p, "cc:", 3))
+	 part = SEARCH_PART_CC;
+	else if (!strncasecmp(p, "bcc:", 4))
+	 part = SEARCH_PART_BCC;
+	else if (!strncasecmp(p, "subject:", 8))
+	 part = SEARCH_PART_SUBJECT;
+	else if (!strncasecmp(p, "listid:", 7))
+	 part = SEARCH_PART_LISTID;
+	else if (!strncasecmp(p, "contenttype:", 12))
+	 part = SEARCH_PART_TYPE;
+	else if (!strncasecmp(p, "header:", 7))
+	 part = SEARCH_PART_HEADERS;
+	else if (!strncasecmp(p, "body:", 5))
+	 part = SEARCH_PART_BODY;
+	else
+	 goto error;
+
+	q = charset_convert(q, utf8, charset_flags);
+	bx->match(bx, part, q);
+	free(q);
 }
+ r = 0;
 
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+out:
+ tok_fini(&tok);
+ return r;
 
- mboxlist_init(0);
- mboxlist_open(NULL);
+error:
+ syslog(LOG_ERR, "bad query expression at \"%s\"", p);
+ r = IMAP_PROTOCOL_ERROR;
+ goto out;
+}
+
+static int print_search_hit(const char *mboxname, uint32_t uidvalidity,
+			 uint32_t uid, void *rock)
+{
+ int single = *(int *)rock;
+
+ if (single)
+	printf("uid %u\n", uid);
+ else
+	printf("mailbox %s\nuidvalidity %u\nuid %u\n", mboxname, uidvalidity, uid);
+ return 0;
+}
+
+static int compact_mbox(const char *userid, const strarray_t *srctiers,
+			const char *desttier, int flags)
+{
+ return search_compact(userid, temp_root_dir, srctiers, desttier, flags);
+}
+
+static int do_compact(const strarray_t *mboxnames, const strarray_t *srctiers,
+		 const char *desttier, int flags)
+{
+ char *prev_userid = NULL;
+ int i;
+ int r = 0;
+
+ for (i = 0 ; i < mboxnames->count ; i++) {
+	const char *userid = mboxname_to_userid(mboxnames->datai);
+	if (!userid) continue;
+
+	if (!strcmpsafe(prev_userid, userid))
+	 continue;
 
- start_stats(&total_stats);
+	r = compact_mbox(userid, srctiers, desttier, flags);
+	if (r) break;
 
- if (optind == argc) {
- struct tmplist *l;
- struct tmpnode *current;
+	free(prev_userid);
+	prev_userid = xstrdupnull(userid);
 
- l = xmalloc(sizeof(struct tmplist));
- l->head = l->tail = NULL;
+	if (sleepmicroseconds)
+	 usleep(sleepmicroseconds);
+ }
+
+ free(prev_userid);
+ return r;
+}
+
+static int do_search(const char *query, int single, const strarray_t *mboxnames)
+{
+ struct mailbox *mailbox = NULL;
+ int i;
+ int r;
+ search_builder_t *bx;
+ int opts = SEARCH_VERBOSE(verbose);
+
+ if (!single)
+	opts |= SEARCH_MULTIPLE;
+
+ for (i = 0 ; i < mboxnames->count ; i++) {
+	const char *mboxname = mboxnames->datai;
 
-	if (rflag) {
-	 fprintf(stderr, "please specify a mailbox to recurse from\n");
-	 exit(EC_USAGE);
+	r = mailbox_open_irl(mboxname, &mailbox);
+	if (r) {
+	 fprintf(stderr, "Cannot open mailbox %s: %s\n",
+		 mboxname, error_message(r));
+	 continue;
+	}
+	if (single)
+	 printf("mailbox %s\n", mboxname);
+
+	bx = search_begin_search(mailbox, opts);
+	if (bx) {
+	 r = squatter_build_query(bx, query);
+	 if (!r)
+		r = bx->run(bx, print_search_hit, &single);
+	 search_end_search(bx);
 	}
-	assert(!rflag);
-	strlcpy(buf, "*", sizeof(buf));
-	(*squat_namespace.mboxlist_findall)(&squat_namespace, buf, 1,
-					 0, 0, addmbox, &l);
 
- for (current = l->head; current; current = current->next) {
- index_me(current->name, strlen(current->name), 0, &use_annot);
- /* Ignore errors: most will be mailboxes moving around */
- }
+	mailbox_close(&mailbox);
 }
 
- for (i = optind; i < argc; i++) {
-	/* Translate any separators in mailboxname */
-	(*squat_namespace.mboxname_tointernal)(&squat_namespace, argvi,
-					 NULL, buf);
-	index_me(buf, 0, 0, &use_annot);
-	if (rflag) {
-	 strlcat(buf, ".*", sizeof(buf));
-	 (*squat_namespace.mboxlist_findall)(&squat_namespace, buf, 1,
-						0, 0, index_me, &use_annot);
+ return 0;
+}
+
+static void add_user(strarray_t *folders, const char *user)
+{
+ char *mbox = mboxname_user_mbox(user, NULL);
+ char *expr = strconcat(mbox, ".*", (char *)NULL);
+
+ strarray_append(folders, mbox);
+ (*squat_namespace.mboxlist_findall) (&squat_namespace, expr, 1,
+					 0, 0, addmbox, folders);
+
+ free(expr);
+ free(mbox);
+}
+
+static strarray_t *read_sync_log_items(sync_log_reader_t *slr)
+{
+ const char *args3;
+ strarray_t *folders = strarray_new();
+
+ while (sync_log_reader_getitem(slr, args) == 0) {
+	if (!strcmp(args0, "APPEND")) {
+	 if (!mboxname_isdeletedmailbox(args1, NULL))
+		strarray_add(folders, args1);
+	}
+	else if (!strcmp(args0, "USER"))
+	 add_user(folders, args1);
+ }
+
+ return folders;
+}
+
+static int do_synclogfile(const char *synclogfile)
+{
+ strarray_t *folders = NULL;
+ sync_log_reader_t *slr;
+ int nskipped = 0;
+ int i;
+ int r;
+
+ slr = sync_log_reader_create_with_filename(synclogfile);
+ r = sync_log_reader_begin(slr);
+ if (r) goto out;
+ folders = read_sync_log_items(slr);
+ sync_log_reader_end(slr);
+
+ /* sort folders for locality of reference in file processing mode */
+ strarray_sort(folders, cmpstringp_raw);
+
+ signals_poll();
+
+ /* have some due items in the queue, try to index them */
+ rx = search_begin_update(verbose);
+ for (i = 0; i < folders->count; i++) {
+	const char *mboxname = strarray_nth(folders, i);
+	if (verbose > 1)
+	 syslog(LOG_INFO, "do_synclogfile: indexing %s", mboxname);
+	r = index_one(mboxname, /*blocking*/1);
+	if (r == IMAP_MAILBOX_NONEXISTENT)
+	 r = 0;
+	if (r == IMAP_MAILBOX_LOCKED || r == IMAP_AGAIN) {
+	 nskipped++;
+	 if (nskipped > 10000) {
+		syslog(LOG_ERR, "IOERROR: skipped too many times at %s", mboxname);
+		break;
+	 }
+	 r = 0;
+	 /* try again at the end */
+	 strarray_append(folders, mboxname);
 	}
+	if (r) {
+	 syslog(LOG_ERR, "IOERROR: failed to index %s: %s",
+		 mboxname, error_message(r));
+	 break;
+	}
+	if (sleepmicroseconds)
+	 usleep(sleepmicroseconds);
 }
+ search_end_update(rx);
+ rx = NULL;
+
+out:
+ strarray_free(folders);
+ sync_log_reader_free(slr);
+ return r;
+}
+
+static void do_rolling(const char *channel)
+{
+ strarray_t *folders = NULL;
+ sync_log_reader_t *slr;
+ int i;
+ int r;
+
+ slr = sync_log_reader_create_with_channel(channel);
+
+ for (;;) {
+	signals_poll();
+	if (shutdown_file(NULL, 0))
+	 shut_down(EC_TEMPFAIL);
 
- if (verbose > 0 && mailbox_count > 1) {
- stop_stats(&total_stats);
- printf("Total over all mailboxes: ");
- print_stats(stdout, &total_stats);
+	r = sync_log_reader_begin(slr);
+	if (r) { /* including IMAP_AGAIN */
+	 usleep(100000); /* 1/10th second */
+	 continue;
+	}
+
+	folders = read_sync_log_items(slr);
+
+	if (folders->count) {
+	 /* have some due items in the queue, try to index them */
+	 rx = search_begin_update(verbose);
+	 for (i = 0; i < folders->count; i++) {
+		const char *mboxname = strarray_nth(folders, i);
+		if (verbose > 1)
+		 syslog(LOG_INFO, "do_rolling: indexing %s", mboxname);
+		r = index_one(mboxname, /*blocking*/0);
+		if (r == IMAP_AGAIN || r == IMAP_MAILBOX_LOCKED) {
+		 /* XXX: alternative, just append to strarray_t *folders ... */
+		 sync_log_channel(channel, "APPEND %s", mboxname);
+		}
+		if (sleepmicroseconds)
+		 usleep(sleepmicroseconds);
+	 }
+	 search_end_update(rx);
+	 rx = NULL;
+	}
+
+	strarray_free(folders);
+	folders = NULL;
 }
 
- syslog(LOG_NOTICE, "done indexing mailboxes");
+ /* XXX - we don't really get here... */
+ strarray_free(folders);
+ sync_log_reader_free(slr);
+}
+
+/*
+ * Run a search daemon in such a way that the natural shutdown
+ * mechanism for Cyrus (sending a SIGTERM to the master process)
+ * will cleanly shut down the search daemon too. For Sphinx
+ * this currently means running a loop in a forked process whose
+ * job it is to live in the master process' process group and thus
+ * receive the SIGTERM that master re-sends.
+ */
+static void do_run_daemon(void)
+{
+ int r;
+
+ /* We start the daemon before forking. This eliminates a
+ * race condition during slot startup by ensuring that
+ * Sphinx is fully running before the rolling squatter
+ * tries to use it. */
+ r = search_start_daemon(verbose);
+ if (r) exit(EC_TEMPFAIL);
 
+ /* tell shut_down() to shut down the searchd too */
+ running_daemon = 1;
+
+ become_daemon();
+ signals_set_shutdown(&shut_down);
+ signals_add_handlers(0);
+
+ for (;;) {
+	signals_poll();		/* will call shut_down() after SIGTERM */
+	poll(NULL, 0, -1);	/* sleeps until signalled */
+ }
+}
+
+static void shut_down(int code)
+{
+ if (running_daemon)
+	search_stop_daemon(verbose);
 seen_done();
 mboxlist_close();
 mboxlist_done();
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 
 cyrus_done();
- 
- return 0;
+
+ exit(code);
+}
+
+int main(int argc, char **argv)
+{
+ int opt;
+ char *alt_config = NULL;
+ int r = IMAP_NOTFOUND;
+ strarray_t mboxnames = STRARRAY_INITIALIZER;
+ const char *query = NULL;
+ int background = 1;
+ const char *channel = "squatter";
+ const char *synclogfile = NULL;
+ int init_flags = CYRUSINIT_PERROR;
+ int multi_folder = 0;
+ int user_mode = 0;
+ int compact_flags = 0;
+ const char *fromfile = NULL;
+ strarray_t *srctiers = NULL;
+ const char *desttier;
+ enum { UNKNOWN, INDEXER, INDEXFROM, SEARCH, ROLLING, SYNCLOG,
+	 START_DAEMON, STOP_DAEMON, RUN_DAEMON, COMPACT } mode = UNKNOWN;
+
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
+	fatal("must run as the Cyrus user", EC_USAGE);
+ }
+
+ setbuf(stdout, NULL);
+
+ while ((opt = getopt(argc, argv, "C:I:N:RAXT:S:Fc:de:f:mn:rsiavz:t:ou")) != EOF) {
+	switch (opt) {
+	case 'C':		/* alt config file */
+	 alt_config = optarg;
+	 break;
+
+	case 'A':
+	 compact_flags |= SEARCH_COMPACT_AUDIT;
+	 break;
+
+	case 'F':
+	 compact_flags |= SEARCH_COMPACT_FILTER;
+	 break;
+
+	case 'X':
+	 compact_flags |= SEARCH_COMPACT_REINDEX;
+	 break;
+
+	case 'N':
+	 name_starts_from = optarg;
+	 break;
+
+	case 'I':		/* indexer, using specified mbox/uids in file */
+	 if (mode != UNKNOWN && mode != INDEXFROM) usage(argv0);
+	 fromfile = optarg;
+	 mode = INDEXFROM;
+	 break;
+
+	case 'R':		/* rolling indexer */
+	 if (mode != UNKNOWN) usage(argv0);
+	 mode = ROLLING;
+	 incremental_mode = 1; /* always incremental if rolling */
+	 break;
+
+	case 'S':		/* sleep time in seconds */
+	 sleepmicroseconds = (atof(optarg) * 1000000);
+	 break;
+
+	case 'T':		/* temporary root directory for search */
+	 temp_root_dir = optarg;
+	 break;
+
+	/* This option is deliberately undocumented, for testing only */
+	case 'c':		/* daemon control mode */
+	 if (mode != UNKNOWN) usage(argv0);
+	 if (!strcmp(optarg, "start"))
+		mode = START_DAEMON;
+	 else if (!strcmp(optarg, "stop"))
+		mode = STOP_DAEMON;
+	 else if (!strcmp(optarg, "run"))
+		mode = RUN_DAEMON;
+	 else
+		usage(argv0);
+	 break;
+
+	case 'd':		/* foreground (with -R) */
+	 background = 0;
+	 break;
+
+	/* This option is deliberately undocumented, for testing only */
+	case 'e':		/* add a search term */
+	 if (mode != UNKNOWN && mode != SEARCH) usage(argv0);
+	 query = optarg;
+	 mode = SEARCH;
+	 break;
+
+	case 'f': /* alternate synclogfile used in SYNCLOG mode */
+	 synclogfile = optarg;
+	 mode = SYNCLOG;
+	 break;
+
+	/* This option is deliberately undocumented, for testing only */
+	case 'm':		/* multi-folder in SEARCH mode */
+	 if (mode != UNKNOWN && mode != SEARCH) usage(argv0);
+	 multi_folder = 1;
+	 mode = SEARCH;
+	 break;
+
+	case 'n':		/* sync channel name (with -R) */
+	 channel = optarg;
+	 break;
+
+	case 'o':		/* copy one DB rather than compressing */
+	 compact_flags |= SEARCH_COMPACT_COPYONE;
+	 break;
+
+	case 'v':		/* verbose */
+	 verbose++;
+	 break;
+
+	case 'r':		/* recurse */
+	 if (mode != UNKNOWN && mode != INDEXER) usage(argv0);
+	 recursive_flag = 1;
+	 mode = INDEXER;
+	 break;
+
+	case 'i':		/* incremental mode */
+	 incremental_mode = 1;
+	 break;
+
+	case 'a':		/* use /squat annotation */
+	 if (mode != UNKNOWN && mode != INDEXER) usage(argv0);
+	 annotation_flag = 1;
+	 mode = INDEXER;
+	 break;
+
+	case 'z':
+	 if (mode != UNKNOWN && mode != COMPACT) usage(argv0);
+	 desttier = optarg;
+	 mode = COMPACT;
+	 break;
+
+	case 't':
+	 if (mode != UNKNOWN && mode != COMPACT) usage(argv0);
+	 srctiers = strarray_split(optarg, ",", 0);
+	 mode = COMPACT;
+	 break;
+
+	case 'u':
+	 user_mode = 1;
+	 break;
+
+	default:
+	 usage("squatter");
+	}
+ }
+
+ compact_flags |= SEARCH_VERBOSE(verbose);
+
+ if (mode == UNKNOWN)
+	mode = INDEXER;
+
+ /* fork and close fds if required */
+ if (mode == ROLLING && background) {
+	become_daemon();
+	init_flags &= ~CYRUSINIT_PERROR;
+ }
+
+ if (mode == COMPACT && (!desttier || !srctiers)) {
+	/* need both src and dest for compact */
+	usage("squatter");
+ }
+
+ cyrus_init(alt_config, "squatter", init_flags, CONFIG_NEED_PARTITION_DATA);
+
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&squat_namespace, 1)) != 0) {
+	fatal(error_message(r), EC_CONFIG);
+ }
+
+ annotate_init(NULL, NULL);
+ annotatemore_open();
+
+ mboxlist_init(0);
+ mboxlist_open(NULL);
+
+ if (mode == ROLLING || mode == SYNCLOG) {
+	signals_set_shutdown(&shut_down);
+	signals_add_handlers(0);
+ }
+
+ switch (mode) {
+ case UNKNOWN:
+	break;
+ case INDEXER:
+	/* -r requires at least one mailbox */
+	if (recursive_flag && optind == argc) usage(argv0);
+	expand_mboxnames(&mboxnames, argc-optind, (const char **)argv+optind, user_mode);
+	syslog(LOG_NOTICE, "indexing mailboxes");
+	r = do_indexer(&mboxnames);
+	syslog(LOG_NOTICE, "done indexing mailboxes");
+	break;
+ case INDEXFROM:
+	syslog(LOG_NOTICE, "indexing messages");
+	r = do_indexfrom(fromfile);
+	syslog(LOG_NOTICE, "done indexing messages");
+	break;
+ case SEARCH:
+	if (recursive_flag && optind == argc) usage(argv0);
+	expand_mboxnames(&mboxnames, argc-optind, (const char **)argv+optind, user_mode);
+	r = do_search(query, !multi_folder, &mboxnames);
+	break;
+ case ROLLING:
+	do_rolling(channel);
+	/* never returns */
+	break;
+ case SYNCLOG:
+	r = do_synclogfile(synclogfile);
+	break;
+ case START_DAEMON:
+	if (optind != argc) usage("squatter");
+	search_start_daemon(verbose);
+	break;
+ case STOP_DAEMON:
+	if (optind != argc) usage("squatter");
+	search_stop_daemon(verbose);
+	break;
+ case RUN_DAEMON:
+	if (optind != argc) usage("squatter");
+	do_run_daemon();
+	break;
+ case COMPACT:
+	if (recursive_flag && optind == argc) usage(argv0);
+	expand_mboxnames(&mboxnames, argc-optind, (const char **)argv+optind, user_mode);
+	r = do_compact(&mboxnames, srctiers, desttier, compact_flags);
+	break;
+ }
+
+ strarray_fini(&mboxnames);
+ shut_down(r ? EC_TEMPFAIL : 0);
 }

cyrus-imapd-2.4.17.tar.gz/imap/statuscache.h -> cyrus-imapd-2.5.tar.gz/imap/statuscache.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: statuscache.h,v 1.3 2010/01/06 17:01:41 murch Exp $
  */
 
 #ifndef STATUSCACHE_H
@@ -51,8 +49,13 @@
 #define FNAME_STATUSCACHEDB "/statuscache.db"
 #define STATUSCACHE_VERSION 4
 
+/* Return the filename of the statuscache database,
+ * used for XWARMUP.  Returns a new string which must
+ * be free()d by the caller. */
+extern char *statuscache_filename(void);
+
 /* open the statuscache db */
-extern void statuscache_open(const char *name);
+extern void statuscache_open(void);
 
 /* fill a statuscache entry */
 extern void statuscache_fill(struct statusdata *sdata, const char *userid,
@@ -68,10 +71,6 @@
 extern int statuscache_lookup(const char *mboxname, const char *userid,
 			      unsigned statusitems, struct statusdata *sdata);
 
-/* update a statuscache entry */
-extern int statuscache_update(const char *mboxname,
-			      struct statusdata *sdata);
-
 /* invalidate (delete) statuscache entry for the mailbox,
    optionally writing the data for one user in the same transaction */
 extern int statuscache_invalidate(const char *mboxname,

cyrus-imapd-2.4.17.tar.gz/imap/statuscache_db.c -> cyrus-imapd-2.5.tar.gz/imap/statuscache_db.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: statuscache_db.c,v 1.8 2010/01/06 17:01:41 murch Exp $
 */
 
 #include <config.h>
@@ -50,20 +48,17 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <ctype.h>
 #include <syslog.h>
 
 #include "assert.h"
 #include "cyrusdb.h"
-#include "exitcodes.h"
 #include "imapd.h"
 #include "global.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mboxlist.h"
 #include "mailbox.h"
 #include "seen.h"
@@ -75,42 +70,44 @@
 
 #define DB config_statuscache_db
 
-struct db *statuscachedb;
+static struct db *statuscachedb;
 static int statuscache_dbopen = 0;
 
-void statuscache_open(const char *fname)
+char *statuscache_filename(void)
 {
- int ret;
- char *tofree = NULL;
+ const char *fname = config_getstring(IMAPOPT_STATUSCACHE_DB_PATH);
 
- if (!fname)
-	fname = config_getstring(IMAPOPT_STATUSCACHE_DB_PATH);
+ if (fname)
+	return xstrdup(fname);
 
 /* create db file name */
- if (!fname) {
-	tofree = strconcat(config_dir, FNAME_STATUSCACHEDB, (char *)NULL);
-	fname = tofree;
- }
+ return strconcat(config_dir, FNAME_STATUSCACHEDB, (char *)NULL);
+}
 
- ret = DB->open(fname, CYRUSDB_CREATE, &statuscachedb);
+EXPORTED void statuscache_open(void)
+{
+ char *fname = statuscache_filename();
+ int ret;
+
+ ret = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &statuscachedb);
 if (ret != 0) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
 	 cyrusdb_strerror(ret));
 	syslog(LOG_ERR, "statuscache in degraded mode");
-	return;
+	goto out;
 }
 
- free(tofree);
-
 statuscache_dbopen = 1;
+out:
+ free(fname);
 }
 
-void statuscache_close(void)
+EXPORTED void statuscache_close(void)
 {
 int r;
 
 if (statuscache_dbopen) {
-	r = DB->close(statuscachedb);
+	r = cyrusdb_close(statuscachedb);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing statuscache: %s",
 		 cyrusdb_strerror(r));
@@ -119,7 +116,7 @@
 }
 }
 
-void statuscache_fill(struct statusdata *sdata, const char *userid,
+HIDDEN void statuscache_fill(struct statusdata *sdata, const char *userid,
 		 struct mailbox *mailbox, unsigned statusitems,
 		 unsigned numrecent, unsigned numunseen)
 {
@@ -137,22 +134,24 @@
 sdata->highestmodseq = mailbox->i.highestmodseq;
 }
 
-void statuscache_done(void)
+EXPORTED void statuscache_done(void)
 {
 /* DB->done() handled by cyrus_done() */
 }
 
 static char *statuscache_buildkey(const char *mailboxname, const char *userid,
-				 int *keylen)
+				 size_t *keylen)
 {
 static char keyMAX_MAILBOX_BUFFER;
- int len;
+ size_t len;
 
 /* Build statuscache key */
 len = strlcpy(key, mailboxname, sizeof(key));
+ /* double % is a safe separator, it can't exist in a mailboxname */
 keylen++ = '%';
 keylen++ = '%';
- len += strlcpy(key + len, userid, sizeof(key) - len);
+ if (userid)
+	len += strlcpy(key + len, userid, sizeof(key) - len);
 
 *keylen = len;
 
@@ -162,7 +161,7 @@
 /*
 * Performs a STATUS command - note: state MAY be NULL here.
 */
-int status_lookup(const char *mboxname, const char *userid,
+EXPORTED int status_lookup(const char *mboxname, const char *userid,
 		 unsigned statusitems, struct statusdata *sdata)
 {
 struct mailbox *mailbox = NULL;
@@ -261,10 +260,11 @@
 return r;
 }
 
-int statuscache_lookup(const char *mboxname, const char *userid,
+EXPORTED int statuscache_lookup(const char *mboxname, const char *userid,
 		 unsigned statusitems, struct statusdata *sdata)
 {
- int keylen, datalen, r = 0;
+ size_t keylen, datalen;
+ int r = 0;
 const char *data = NULL, *dend;
 char *p, *key = statuscache_buildkey(mboxname, userid, &keylen);
 unsigned version;
@@ -273,11 +273,9 @@
 if (!statuscache_dbopen)
 	return IMAP_NO_NOSUCHMSG;
 
- memset(sdata, 0, sizeof(struct statusdata));
-
 /* Check if there is an entry in the database */
 do {
-	r = DB->fetch(statuscachedb, key, keylen, &data, &datalen, NULL);
+	r = cyrusdb_fetch(statuscachedb, key, keylen, &data, &datalen, NULL);
 } while (r == CYRUSDB_AGAIN);
 
 if (r || !data || ((size_t) datalen < sizeof(unsigned))) {
@@ -298,11 +296,7 @@
 if (p < dend) sdata->uidnext = strtoul(p, &p, 10);
 if (p < dend) sdata->uidvalidity = strtoul(p, &p, 10);
 if (p < dend) sdata->unseen = strtoul(p, &p, 10);
-#ifdef HAVE_LONG_LONG_INT
 if (p < dend) sdata->highestmodseq = strtoull(p, &p, 10);
-#else
- if (p < dend) sdata->highestmodseq = strtoul(p, &p, 10);
-#endif
 
 /* Sanity check the data */
 if (!sdata->statusitems || !sdata->uidnext || !sdata->uidvalidity) {
@@ -317,12 +311,12 @@
 return 0;
 }
 
-static int statuscache_update_txn(const char *mboxname,
-				 struct statusdata *sdata,
-				 struct txn **tidptr)
+static int statuscache_store(const char *mboxname,
+			 struct statusdata *sdata,
+			 struct txn **tidptr)
 {
 char data250; /* enough room for 11*(UULONG + SP) */
- int keylen, datalen;
+ size_t keylen, datalen;
 char *key = statuscache_buildkey(mboxname, sdata->userid, &keylen);
 int r;
 
@@ -342,7 +336,7 @@
 		 sdata->uidvalidity, sdata->unseen,
 		 sdata->highestmodseq);
 
- r = DB->store(statuscachedb, key, keylen, data, datalen, tidptr);
+ r = cyrusdb_store(statuscachedb, key, keylen, data, datalen, tidptr);
 
 if (r != CYRUSDB_OK) {
 	syslog(LOG_ERR, "DBERROR: error updating database: %s (%s)",
@@ -352,21 +346,15 @@
 return r;
 }
 
-int statuscache_update(const char *mboxname, struct statusdata *sdata)
-{
- statuscache_update_txn(mboxname, sdata, NULL);
- return 0; 
-}
-
 struct statuscache_deleterock {
 struct db *db;
 struct txn *tid;
 };
 
 static int delete_cb(void *rockp,
- const char *key, int keylen,
+ const char *key, size_t keylen,
 const char *data __attribute__((unused)),
- int datalen __attribute__((unused))) 
+ size_t datalen __attribute__((unused))) 
 {
 int r;
 char buf4096;
@@ -381,7 +369,7 @@
 memcpy(buf, key, keylen);
 
 /* Delete db entry */
- r = DB->delete(rp->db, buf, keylen, &rp->tid, 1);
+ r = cyrusdb_delete(rp->db, buf, keylen, &rp->tid, 1);
 if (r != CYRUSDB_OK) {
 	syslog(LOG_ERR, "DBERROR: error deleting from database: %s", 
 	 cyrusdb_strerror(r));
@@ -390,10 +378,11 @@
 return 0;
 }
 
-int statuscache_invalidate(const char *mboxname, struct statusdata *sdata)
+HIDDEN int statuscache_invalidate(const char *mboxname, struct statusdata *sdata)
 {
- int keylen, r;
+ size_t keylen;
 char *key;
+ int r;
 int doclose = 0;
 struct statuscache_deleterock drock;
 
@@ -403,32 +392,34 @@
 
 /* Open DB if it hasn't been opened */
 if (!statuscache_dbopen) {
-	statuscache_open(NULL);
+	statuscache_open();
 	doclose = 1;
 }
 
 drock.db = statuscachedb;
 drock.tid = NULL;
 
- key = statuscache_buildkey(mboxname, "", &keylen);
+ key = statuscache_buildkey(mboxname, /*userid*/NULL, &keylen);
 
- /* strip off the second NULL that buildkey added, so we match 
- * the entires for all users */
- r = DB->foreach(drock.db, key, keylen - 1, NULL, delete_cb,
+ r = cyrusdb_foreach(drock.db, key, keylen, NULL, delete_cb,
 		 &drock, &drock.tid);
+
 if (r != CYRUSDB_OK) {
 	syslog(LOG_ERR, "DBERROR: error invalidating: %s (%s)",
 	 mboxname, cyrusdb_strerror(r));
 }
 
 if (!r && sdata) {
-	r = statuscache_update_txn(mboxname, sdata, &drock.tid);
+	r = statuscache_store(mboxname, sdata, &drock.tid);
 }
 
- if (r != CYRUSDB_OK)
-	DB->abort(drock.db, drock.tid);
- else
-	DB->commit(drock.db, drock.tid);
+ if (r == CYRUSDB_OK) {
+	cyrusdb_commit(drock.db, drock.tid);
+ }
+ else {
+	syslog(LOG_NOTICE, "DBERROR: failed to store statuscace data for %s", mboxname);
+	if (drock.tid) cyrusdb_abort(drock.db, drock.tid);
+ }
 
 if (doclose)
 	statuscache_close();

cyrus-imapd-2.4.17.tar.gz/imap/sync_client.c -> cyrus-imapd-2.5.tar.gz/imap/sync_client.c Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_client.c,v 1.51 2010/06/28 12:04:20 brong Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -59,28 +57,22 @@
 #include <syslog.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <errno.h>
-#include <ctype.h>
 #include <signal.h>
-#include <utime.h>
 
 #include <netinet/tcp.h>
 
 #include "global.h"
-#include "assert.h"
 #include "append.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
-#include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
 #include "map.h"
 #include "imapd.h"
-#include "imparse.h"
 #include "util.h"
 #include "prot.h"
 #include "message_guid.h"
@@ -89,13 +81,9 @@
 #include "cyr_lock.h"
 #include "backend.h"
 #include "xstrlcat.h"
-#include "xstrlcpy.h"
 #include "signals.h"
 #include "cyrusdb.h"
 
-/* signal to config.c */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 /* ====================================================================== */
 
 /* Static global variables and support routines for sync_client */
@@ -115,19 +103,25 @@
 static int connect_once = 0;
 static int background = 0;
 static int do_compress = 0;
+static int no_copyback = 0;
+
+#define CAPA_CRC_VERSIONS	 (CAPA_COMPRESS<<1)
 
 static struct protocol_t csync_protocol =
-{ "csync", "csync",
- { 1, "* OK" },
- { NULL, NULL, "* OK", NULL,
- { { "* SASL ", CAPA_AUTH },
- { "* STARTTLS", CAPA_STARTTLS },
- { NULL, 0 } } },
- { "STARTTLS", "OK", "NO", 1 },
- { "AUTHENTICATE", USHRT_MAX, 0, "OK", "NO", "+ ", "*", NULL, 0 },
- { NULL, NULL, NULL },
- { "NOOP", NULL, "OK" },
- { "EXIT", NULL, "OK" }
+{ "csync", "csync", TYPE_STD,
+ { { { 1, "* OK" },
+ { NULL, NULL, "* OK", NULL,
+	CAPAF_ONE_PER_LINE|CAPAF_SKIP_FIRST_WORD,
+	{ { "SASL", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { "COMPRESS=DEFLATE", CAPA_COMPRESS },
+	 { "CRC_VERSIONS", CAPA_CRC_VERSIONS },
+	 { NULL, 0 } } },
+ { "STARTTLS", "OK", "NO", 1 },
+ { "AUTHENTICATE", USHRT_MAX, 0, "OK", "NO", "+ ", "*", NULL, 0 },
+ { NULL, NULL, NULL },
+ { "NOOP", NULL, "OK" },
+ { "EXIT", NULL, "OK" } } }
 };
 
 static int do_meta(char *user);
@@ -139,7 +133,7 @@
 
 seen_done();
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 quotadb_close();
 quotadb_done();
 mboxlist_close();
@@ -151,15 +145,16 @@
 static int usage(const char *name)
 {
 fprintf(stderr,
- "usage: %s -S <servername> -C <alt_config> -r -v mailbox...\n", name);
- 
+	 "usage: %s -S <servername> -C <alt_config> -r -v mailbox...\n", name);
+
 exit(EC_USAGE);
 }
 
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 fprintf(stderr, "Fatal error: %s\n", s);
 syslog(LOG_ERR, "Fatal error: %s", s);
+ abort();
 exit(code);
 }
 
@@ -195,9 +190,9 @@
 	if (record.uid <= last_uid)
 	 continue;
 
-	sync_msgid_add(part_list, &record.guid);
+	sync_msgid_insert(part_list, &record.guid);
 }
- 
+
 return(0);
 }
 
@@ -210,23 +205,20 @@
 struct sync_folder *rfolder;
 struct sync_msgid_list *part_list;
 struct mailbox *mailbox = NULL;
+ modseq_t xconvmodseq;
 int r = 0;
 
 /* Find messages we want to upload that are available on server */
 for (mbox = mboxname_list->head; mbox; mbox = mbox->next) {
-	r = mailbox_open_irl(mbox->name, &mailbox);
+	/* XXX - now this kinda sucks - we use a write lock here
+	 * purely for conversations modseq - but we never actually
+	 * USE the value... the whole "add to master folders" actually
+	 * looks a bit pointless... */
+	r = mailbox_open_iwl(mbox->name, &mailbox);
 
 	/* Quietly skip over folders which have been deleted since we
 	 started working (but record fact in case caller cares) */
-	if (r == IMAP_MAILBOX_NONEXISTENT) { 
-	 r = 0; 
-	 continue;
-	}
-
-	/* Quietly ignore objects that we don't have access to.
-	 * Includes directory stubs, which have not underlying cyrus.*
-	 * files in the filesystem */
-	if (r == IMAP_PERMISSION_DENIED) {
+	if (r == IMAP_MAILBOX_NONEXISTENT) {
 	 r = 0;
 	 continue;
 	}
@@ -237,16 +229,28 @@
 	 goto bail;
 	}
 
+	xconvmodseq = 0;
+	if (mailbox_has_conversations(mailbox)) {
+	 r = mailbox_get_xconvmodseq(mailbox, &xconvmodseq);
+	 if (r) {
+		syslog(LOG_ERR, "IOERROR: Failed to get xconvmodseq %s: %s",
+		 mbox->name, error_message(r));
+		goto bail;
+	 }
+	}
+
 	/* mailbox is open from here, no exiting without closing it! */
 
 	part_list = sync_reserve_partlist(reserve_guids, mailbox->part);
 
-	sync_folder_list_add(master_folders, mailbox->uniqueid, mailbox->name, 
+	sync_folder_list_add(master_folders, mailbox->uniqueid, mailbox->name,
+			 mailbox->mbtype,
 			 mailbox->part, mailbox->acl, mailbox->i.options,
 			 mailbox->i.uidvalidity, mailbox->i.last_uid,
-			 mailbox->i.highestmodseq, mailbox->i.sync_crc,
+			 mailbox->i.highestmodseq, 0,
 			 mailbox->i.recentuid, mailbox->i.recenttime,
-			 mailbox->i.pop3_last_login);
+			 mailbox->i.pop3_last_login,
+			 mailbox->i.pop3_show_after, NULL, xconvmodseq);
 
 	rfolder = sync_folder_lookup(replica_folders, mailbox->uniqueid);
 	if (rfolder)
@@ -258,6 +262,7 @@
 }
 
 bail:
+ mailbox_close(&mailbox);
 return r;
 }
 
@@ -284,16 +289,14 @@
 	 syslog(LOG_ERR, "SYNCERROR: reserve: failed to parse GUID %s",
 		 ki->sval);
 	 return IMAP_PROTOCOL_BAD_PARAMETERS;
- }
+	}
 
+	/* afraid we will need this after all */
 	msgid = sync_msgid_lookup(part_list, &tmp_guid);
-	if (!msgid) {
-	 syslog(LOG_ERR, "SYNCERROR: reserve: Got unexpected GUID %s", ki->sval);
-	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+	if (msgid && !msgid->need_upload) {
+	 msgid->need_upload = 1;
+	 part_list->toupload++;
 	}
-
-	msgid->mark = 0;
-	part_list->marked--;
 }
 
 return 0;
@@ -311,24 +314,26 @@
 struct dlist *ki;
 int r;
 
- if (!part_list->count)
+ if (!part_list->toupload)
 	return 0; /* nothing to reserve */
 
 if (!replica_folders->head)
 	return 0; /* nowhere to reserve */
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "PARTITION", partition);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "PARTITION", partition);
 
- ki = dlist_list(kl, "MBOXNAME");
+ ki = dlist_newlist(kl, "MBOXNAME");
 for (folder = replica_folders->head; folder; folder = folder->next)
-	dlist_atom(ki, "MBOXNAME", folder->name);
+	dlist_setatom(ki, "MBOXNAME", folder->name);
 
- ki = dlist_list(kl, "GUID");
+ ki = dlist_newlist(kl, "GUID");
 for (msgid = part_list->head; msgid; msgid = msgid->next) {
-	dlist_atom(ki, "GUID", message_guid_encode(&msgid->guid));
-	msgid->mark = 1;
-	part_list->marked++;
+	if (!msgid->need_upload) continue;
+	dlist_setatom(ki, "GUID", message_guid_encode(&msgid->guid));
+	/* we will re-add the "need upload" if we get a MISSING response */
+	msgid->need_upload = 0;
+	part_list->toupload--;
 }
 
 sync_send_apply(kl, sync_out);
@@ -351,7 +356,7 @@
 struct sync_reserve *reserve;
 int r;
 
- r = find_reserve_all(mboxname_list, master_folders, 
+ r = find_reserve_all(mboxname_list, master_folders,
 			 replica_folders, reserve_guids);
 if (r) return r;
 
@@ -380,29 +385,38 @@
 
 /* Unpleasant: translate remote access error into "please reset me" */
 if (r == IMAP_MAILBOX_NONEXISTENT)
- return 0;
+	return 0;
 
 if (r) return r;
 
 for (kl = kin->head; kl; kl = kl->next) {
 	if (!strcmp(kl->name, "SIEVE")) {
+	 struct message_guid guid;
 	 const char *filename = NULL;
+	 const char *guidstr = NULL;
 	 time_t modtime = 0;
 	 uint32_t active = 0;
 	 if (!sieve_list) goto parse_err;
 	 if (!dlist_getatom(kl, "FILENAME", &filename)) goto parse_err;
 	 if (!dlist_getdate(kl, "LAST_UPDATE", &modtime)) goto parse_err;
-	 dlist_getnum(kl, "ISACTIVE", &active); /* optional */
-	 sync_sieve_list_add(sieve_list, filename, modtime, active);
+	 dlist_getatom(kl, "GUID", &guidstr); /* optional */
+	 if (guidstr) {
+		if (!message_guid_decode(&guid, guidstr)) goto parse_err;
+	 }
+	 else {
+		message_guid_set_null(&guid);
+	 }
+	 dlist_getnum32(kl, "ISACTIVE", &active); /* optional */
+	 sync_sieve_list_add(sieve_list, filename, modtime, &guid, active);
 	}
 
 	else if (!strcmp(kl->name, "QUOTA")) {
 	 const char *root = NULL;
-	 uint32_t limit = 0;
+	 struct sync_quota *sq;
 	 if (!quota_list) goto parse_err;
 	 if (!dlist_getatom(kl, "ROOT", &root)) goto parse_err;
-	 if (!dlist_getnum(kl, "LIMIT", &limit)) goto parse_err;
-	 sync_quota_list_add(quota_list, root, limit);
+	 sq = sync_quota_list_add(quota_list, root);
+	 sync_decode_quota_limits(kl, sq->limits);
 	}
 
 	else if (!strcmp(kl->name, "LSUB")) {
@@ -422,7 +436,7 @@
 	 if (!seen_list) goto parse_err;
 	 if (!dlist_getatom(kl, "UNIQUEID", &uniqueid)) goto parse_err;
 	 if (!dlist_getdate(kl, "LASTREAD", &lastread)) goto parse_err;
-	 if (!dlist_getnum(kl, "LASTUID", &lastuid)) goto parse_err;
+	 if (!dlist_getnum32(kl, "LASTUID", &lastuid)) goto parse_err;
 	 if (!dlist_getdate(kl, "LASTCHANGE", &lastchange)) goto parse_err;
 	 if (!dlist_getatom(kl, "SEENUIDS", &seenuids)) goto parse_err;
 	 sync_seen_list_add(seen_list, uniqueid, lastread,
@@ -432,6 +446,7 @@
 	else if (!strcmp(kl->name, "MAILBOX")) {
 	 const char *uniqueid = NULL;
 	 const char *mboxname = NULL;
+	 const char *mboxtype = NULL;
 	 const char *part = NULL;
 	 const char *acl = NULL;
 	 const char *options = NULL;
@@ -442,27 +457,43 @@
 	 uint32_t recentuid = 0;
 	 time_t recenttime = 0;
 	 time_t pop3_last_login = 0;
+	 time_t pop3_show_after = 0;
+	 struct dlist *al = NULL;
+	 struct sync_annot_list *annots = NULL;
+	 modseq_t xconvmodseq = 0;
+
 	 if (!folder_list) goto parse_err;
 	 if (!dlist_getatom(kl, "UNIQUEID", &uniqueid)) goto parse_err;
 	 if (!dlist_getatom(kl, "MBOXNAME", &mboxname)) goto parse_err;
 	 if (!dlist_getatom(kl, "PARTITION", &part)) goto parse_err;
 	 if (!dlist_getatom(kl, "ACL", &acl)) goto parse_err;
 	 if (!dlist_getatom(kl, "OPTIONS", &options)) goto parse_err;
-	 if (!dlist_getmodseq(kl, "HIGHESTMODSEQ", &highestmodseq)) goto parse_err;
-	 if (!dlist_getnum(kl, "UIDVALIDITY", &uidvalidity)) goto parse_err;
-	 if (!dlist_getnum(kl, "LAST_UID", &last_uid)) goto parse_err;
-	 if (!dlist_getnum(kl, "SYNC_CRC", &sync_crc)) goto parse_err;
-	 if (!dlist_getnum(kl, "RECENTUID", &recentuid)) goto parse_err;
+	 if (!dlist_getnum64(kl, "HIGHESTMODSEQ", &highestmodseq)) goto parse_err;
+	 if (!dlist_getnum32(kl, "UIDVALIDITY", &uidvalidity)) goto parse_err;
+	 if (!dlist_getnum32(kl, "LAST_UID", &last_uid)) goto parse_err;
+	 if (!dlist_getnum32(kl, "SYNC_CRC", &sync_crc)) goto parse_err;
+	 if (!dlist_getnum32(kl, "RECENTUID", &recentuid)) goto parse_err;
 	 if (!dlist_getdate(kl, "RECENTTIME", &recenttime)) goto parse_err;
 	 if (!dlist_getdate(kl, "POP3_LAST_LOGIN", &pop3_last_login)) goto parse_err;
+	 /* optional */
+	 dlist_getdate(kl, "POP3_SHOW_AFTER", &pop3_show_after);
+	 dlist_getatom(kl, "MBOXTYPE", &mboxtype);
+	 dlist_getnum64(kl, "XCONVMODSEQ", &xconvmodseq);
+
+	 if (dlist_getlist(kl, "ANNOTATIONS", &al))
+		decode_annotations(al, &annots);
+
 
-	 sync_folder_list_add(folder_list, uniqueid,
-				 mboxname, part, acl,
+	 sync_folder_list_add(folder_list, uniqueid, mboxname,
+				 mboxlist_string_to_mbtype(mboxtype),
+				 part, acl,
 				 sync_parse_options(options),
-				 uidvalidity, last_uid, 
+				 uidvalidity, last_uid,
 				 highestmodseq, sync_crc,
 				 recentuid, recenttime,
-				 pop3_last_login);
+				 pop3_last_login,
+				 pop3_show_after, annots,
+				 xconvmodseq);
 	}
 	else
 	 goto parse_err;
@@ -478,43 +509,67 @@
 return IMAP_PROTOCOL_BAD_PARAMETERS;
 }
 
-static int user_reset(char *userid)
+static int do_unuser(const char *userid)
 {
 const char *cmd = "UNUSER";
+ struct mailbox *mailbox = NULL;
+ char bufMAX_MAILBOX_BUFFER;
 struct dlist *kl;
+ int r;
 
- kl = dlist_atom(NULL, cmd, userid);
- sync_send_apply(kl, sync_out);
- dlist_free(&kl);
+ /* check local mailbox first */
+ (sync_namespace.mboxname_tointernal)(&sync_namespace, "INBOX",
+					 userid, buf);
+ r = mailbox_open_irl(buf, &mailbox);
 
- return sync_parse_response(cmd, sync_in, NULL);
+ /* only remove from server if there's no local mailbox */
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	kl = dlist_setatom(NULL, cmd, userid);
+	sync_send_apply(kl, sync_out);
+	dlist_free(&kl);
+
+	r = sync_parse_response(cmd, sync_in, NULL);
+	if (r == IMAP_MAILBOX_NONEXISTENT) r = 0;
+ }
+
+ mailbox_close(&mailbox);
+
+ return r;
 }
 
-static int folder_rename(char *oldname, char *newname, char *partition)
+static int folder_rename(const char *oldname, const char *newname,
+			 const char *partition, unsigned uidvalidity)
 {
 const char *cmd = "RENAME";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "OLDMBOXNAME", oldname);
- dlist_atom(kl, "NEWMBOXNAME", newname);
- dlist_atom(kl, "PARTITION", partition);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "OLDMBOXNAME", oldname);
+ dlist_setatom(kl, "NEWMBOXNAME", newname);
+ dlist_setatom(kl, "PARTITION", partition);
+ dlist_setnum32(kl, "UIDVALIDITY", uidvalidity);
+
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
 return sync_parse_response(cmd, sync_in, NULL);
 }
 
-static int folder_delete(char *mboxname)
+static int folder_delete(const char *mboxname)
 {
 const char *cmd = "UNMAILBOX";
 struct dlist *kl;
+ int r;
 
- kl = dlist_atom(NULL, cmd, mboxname);
+ kl = dlist_setatom(NULL, cmd, mboxname);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
- return sync_parse_response(cmd, sync_in, NULL);
+ r = sync_parse_response(cmd, sync_in, NULL);
+ if (r == IMAP_MAILBOX_NONEXISTENT)
+	r = 0;
+
+ return r;
 }
 
 static int set_sub(const char *userid, const char *mboxname, int add)
@@ -522,15 +577,15 @@
 const char *cmd = add ? "SUB" : "UNSUB";
 struct dlist *kl;
 
- if (verbose) 
- printf("%s %s %s\n", cmd, userid, mboxname);
+ if (verbose)
+	printf("%s %s %s\n", cmd, userid, mboxname);
 
 if (verbose_logging)
- syslog(LOG_INFO, "%s %s %s", cmd, userid, mboxname);
+	syslog(LOG_INFO, "%s %s %s", cmd, userid, mboxname);
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "MBOXNAME", mboxname);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setatom(kl, "MBOXNAME", mboxname);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -538,16 +593,16 @@
 }
 
 static int folder_setannotation(const char *mboxname, const char *entry,
-				const char *userid, const char *value)
+				const char *userid, const struct buf *value)
 {
 const char *cmd = "ANNOTATION";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "MBOXNAME", mboxname);
- dlist_atom(kl, "ENTRY", entry);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "VALUE", value);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "MBOXNAME", mboxname);
+ dlist_setatom(kl, "ENTRY", entry);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setmap(kl, "VALUE", value->s, value->len);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -560,10 +615,10 @@
 const char *cmd = "UNANNOTATION";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "MBOXNAME", mboxname);
- dlist_atom(kl, "ENTRY", entry);
- dlist_atom(kl, "USERID", userid);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "MBOXNAME", mboxname);
+ dlist_setatom(kl, "ENTRY", entry);
+ dlist_setatom(kl, "USERID", userid);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -583,11 +638,11 @@
 sieve = sync_sieve_read(userid, filename, &size);
 if (!sieve) return IMAP_IOERROR;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "FILENAME", filename);
- dlist_date(kl, "LAST_UPDATE", last_update);
- dlist_buf(kl, "CONTENT", sieve, size);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setatom(kl, "FILENAME", filename);
+ dlist_setdate(kl, "LAST_UPDATE", last_update);
+ dlist_setmap(kl, "CONTENT", sieve, size);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 free(sieve);
@@ -600,9 +655,9 @@
 const char *cmd = "UNSIEVE";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "FILENAME", filename);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setatom(kl, "FILENAME", filename);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -614,9 +669,9 @@
 const char *cmd = "ACTIVATE_SIEVE";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "FILENAME", filename);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setatom(kl, "FILENAME", filename);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -628,8 +683,8 @@
 const char *cmd = "UNACTIVATE_SIEVE";
 struct dlist *kl;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", userid);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", userid);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -643,13 +698,14 @@
 const char *cmd = "UNQUOTA";
 struct dlist *kl;
 
- kl = dlist_atom(NULL, cmd, root);
+ kl = dlist_setatom(NULL, cmd, root);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
 return sync_parse_response(cmd, sync_in, NULL);
 }
 
+
 static int update_quota_work(struct quota *client,
 			 struct sync_quota *server)
 {
@@ -661,20 +717,28 @@
 
 /* disappeared? Delete it*/
 if (r == IMAP_QUOTAROOT_NONEXISTENT)
- return delete_quota(client->root);
+	return delete_quota(client->root);
 
 if (r) {
- syslog(LOG_INFO, "Warning: failed to read quotaroot %s: %s",
- client->root, error_message(r));
- return r;
+	syslog(LOG_INFO, "Warning: failed to read quotaroot %s: %s",
+	 client->root, error_message(r));
+	return r;
 }
 
- if (server && (client->limit == server->limit))
- return(0);
+ if (server) {
+	int changed = 0;
+	int res;
+	for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	 if (client->limitsres != server->limitsres)
+		changed++;
+	}
+	if (!changed)
+	 return 0;
+ }
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "ROOT", client->root);
- dlist_num(kl, "LIMIT", client->limit);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "ROOT", client->root);
+ sync_encode_quota_limits(kl, client->limits);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -702,6 +766,7 @@
 uint32_t recno;
 struct index_record oldrecord;
 int r;
+ annotate_state_t *astate = NULL;
 
 for (recno = 1; recno <= mailbox->i.num_records; recno++) {
 	r = mailbox_read_index_record(mailbox, recno, &oldrecord);
@@ -717,8 +782,8 @@
 	 newrecord.uid = mailbox->i.last_uid + 1;
 
 	 /* copy the file in to place */
-	 oldfname = xstrdup(mailbox_message_fname(mailbox, oldrecord.uid));
-	 newfname = xstrdup(mailbox_message_fname(mailbox, newrecord.uid));
+	 oldfname = xstrdup(mailbox_record_fname(mailbox, &oldrecord));
+	 newfname = xstrdup(mailbox_record_fname(mailbox, &newrecord));
 	 r = mailbox_copyfile(oldfname, newfname, 0);
 	 free(oldfname);
 	 free(newfname);
@@ -728,6 +793,18 @@
 	 r = mailbox_append_index_record(mailbox, &newrecord);
 	 if (r) return r;
 
+	 /* ensure we have an astate connected to the destination
+	 * mailbox, so that the annotation txn will be committed
+	 * when we close the mailbox */
+	 r = mailbox_get_annotate_state(mailbox, newrecord.uid, &astate);
+	 if (r) return r;
+
+	 /* Copy across any per-message annotations */
+	 r = annotate_msg_copy(mailbox, oldrecord.uid,
+				 mailbox, newrecord.uid,
+				 NULL);
+	 if (r) return r;
+
 	 /* and expunge the old record */
 	 oldrecord.system_flags |= FLAG_EXPUNGED;
 	 r = mailbox_rewrite_index_record(mailbox, &oldrecord);
@@ -749,46 +826,47 @@
 struct dlist *kl;
 int r = 0;
 const char *fname = dlist_reserve_path(mailbox->part, &rp->guid);
+ struct message_guid *guid = NULL;
 struct stat sbuf;
 
 /* already reserved? great */
 if (stat(fname, &sbuf) == 0)
 	return 0;
 
- kl = dlist_new(cmd);
- dlist_atom(kl, "MBOXNAME", mailbox->name);
- dlist_atom(kl, "PARTITION", mailbox->part);
- dlist_atom(kl, "GUID", message_guid_encode(&rp->guid));
- dlist_num(kl, "UID", uid);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "MBOXNAME", mailbox->name);
+ dlist_setatom(kl, "PARTITION", mailbox->part);
+ dlist_setguid(kl, "GUID", &rp->guid);
+ dlist_setnum32(kl, "UID", uid);
 sync_send_lookup(kl, sync_out);
 dlist_free(&kl);
 
 r = sync_parse_response(cmd, sync_in, &kin);
 if (r) return r;
 
- kl = kin->head;
- if (!kl) {
+ if (!dlist_tofile(kin->head, NULL, &guid, NULL, NULL)) {
 	r = IMAP_MAILBOX_NONEXISTENT;
 	goto done;
 }
 
- if (!message_guid_equal(&kl->gval, &rp->guid))
-	r = IMAP_MAILBOX_CRC;
+ if (!message_guid_equal(guid, &rp->guid))
+	r = IMAP_IOERROR;
 
 done:
 dlist_free(&kin);
 return r;
 }
 
-static int copy_remote(struct mailbox *mailbox, unsigned long uid,
+static int copy_remote(struct mailbox *mailbox, uint32_t uid,
 		 struct dlist *kr)
 {
 struct index_record record;
 struct dlist *ki;
 int r;
+ struct sync_annot_list *annots = NULL;
 
 for (ki = kr->head; ki; ki = ki->next) {
-	r = parse_upload(ki, mailbox, &record);
+	r = parse_upload(ki, mailbox, &record, &annots);
 	if (r) return r;
 	if (record.uid == uid) {
 	 /* choose the destination UID */
@@ -797,10 +875,13 @@
 	 /* already fetched the file in the parse phase */
 
 	 /* append the file */
-	 r = sync_append_copyfile(mailbox, &record);
+	 r = sync_append_copyfile(mailbox, &record, annots);
+
+	 sync_annot_list_free(&annots);
 
 	 return r;
 	}
+	sync_annot_list_free(&annots);
 }
 /* not finding the record is an error! (should never happen) */
 return IMAP_MAILBOX_NONEXISTENT;
@@ -808,6 +889,7 @@
 
 static int copyback_one_record(struct mailbox *mailbox,
 			 struct index_record *rp,
+			 const struct sync_annot_list *annots,
 			 struct dlist *kaction)
 {
 int r;
@@ -825,13 +907,13 @@
 	 * we remove from the replica */
 	if (rp->modseq < mailbox->i.deletedmodseq) {
 	 if (kaction)
-		dlist_num(kaction, "EXPUNGE", rp->uid);
+		dlist_setnum32(kaction, "EXPUNGE", rp->uid);
 	}
 	else {
 	 r = fetch_file(mailbox, rp->uid, rp);
 	 if (r) return r;
 	 if (kaction)
-		dlist_num(kaction, "COPYBACK", rp->uid);
+		dlist_setnum32(kaction, "COPYBACK", rp->uid);
 	}
 }
 
@@ -845,7 +927,7 @@
 	/* make sure we're actually making changes now */
 	if (!kaction) return 0;
 	/* append the file */
-	r = sync_append_copyfile(mailbox, rp);
+	r = sync_append_copyfile(mailbox, rp, annots);
 	if (r) return r;
 }
 
@@ -860,7 +942,7 @@
 	return 0;
 
 if (kaction)
-	dlist_num(kaction, "RENUMBER", mp->uid);
+	dlist_setnum32(kaction, "RENUMBER", mp->uid);
 
 return 0;
 }
@@ -873,29 +955,29 @@
 
 if (record->system_flags & FLAG_DELETED) {
 	snprintf(buf, 4096, "%s\\Deleted", sep);
- sep = " ";
+	sep = " ";
 }
 if (record->system_flags & FLAG_ANSWERED) {
 	snprintf(buf, 4096, "%s\\Answered", sep);
- sep = " ";
+	sep = " ";
 }
 if (record->system_flags & FLAG_FLAGGED) {
 	snprintf(buf, 4096, "%s\\Flagged", sep);
- sep = " ";
+	sep = " ";
 }
 if (record->system_flags & FLAG_DRAFT) {
 	snprintf(buf, 4096, "%s\\Draft", sep);
- sep = " ";
+	sep = " ";
 }
 if (record->system_flags & FLAG_EXPUNGED) {
 	snprintf(buf, 4096, "%s\\Expunged", sep);
- sep = " ";
+	sep = " ";
 }
 if (record->system_flags & FLAG_SEEN) {
 	snprintf(buf, 4096, "%s\\Seen", sep);
- sep = " ";
+	sep = " ";
 }
- 
+
 /* print user flags in mailbox order */
 for (flag = 0; flag < MAX_USER_FLAGS; flag++) {
 	if (!mailbox->flagnameflag)
@@ -903,7 +985,7 @@
 	if (!(record->user_flagsflag/32 & (1<<(flag&31))))
 	 continue;
 	snprintf(buf, 4096, "%s%s", sep, mailbox->flagnameflag);
- sep = " ";
+	sep = " ";
 }
 
 return buf;
@@ -913,10 +995,10 @@
 		 struct index_record *record)
 {
 syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
-	 "last_updated:%lu internaldate:%lu flags:(%s)",
+	 "last_updated:%lu internaldate:%lu flags:(%s) cid:" CONV_FMT,
 	 name, record->uid, record->modseq,
 	 record->last_updated, record->internaldate,
-	 make_flags(mailbox, record));
+	 make_flags(mailbox, record), record->cid);
 }
 
 static void log_mismatch(const char *reason, struct mailbox *mailbox,
@@ -932,6 +1014,8 @@
 static int compare_one_record(struct mailbox *mailbox,
 			 struct index_record *mp,
 			 struct index_record *rp,
+			 const struct sync_annot_list *mannots,
+			 const struct sync_annot_list *rannots,
 			 struct dlist *kaction)
 {
 int diff = 0;
@@ -945,16 +1029,22 @@
 	diff = 1;
 else if (mp->internaldate != rp->internaldate)
 	diff = 1;
- else if (mp->system_flags != rp->system_flags)
+ else if ((mp->system_flags & FLAGS_GLOBAL) != rp->system_flags)
 	diff = 1;
 else if (!message_guid_equal(&mp->guid, &rp->guid))
 	diff = 1;
+ else if (mp->cid != rp->cid)
+	diff = 1;
+ else if (diff_annotations(mannots, rannots))
+	diff = 1;
 else {
 	for (i = 0; i < MAX_USER_FLAGS/32; i++) {
 	 if (mp->user_flagsi != rp->user_flagsi)
 		diff = 1;
 	}
 }
+ if (mp->cid != rp->cid)
+	diff = 1;
 
 /* if differences we'll have to rewrite to bump the modseq
 * so that regular replication will cause an update */
@@ -982,13 +1072,14 @@
 		/* we will need to renumber both ends to get in sync */
 
 		/* ORDERING - always lower GUID first */
-		if (message_guid_cmp(&mp->guid, &rp->guid) < 0) {
-		 r = copyback_one_record(mailbox, rp, kaction);
+		if (message_guid_cmp(&mp->guid, &rp->guid) > 0) {
+		 r = copyback_one_record(mailbox, rp, rannots, kaction);
 		 if (!r) r = renumber_one_record(mp, kaction);
 		}
 		else {
 		 r = renumber_one_record(mp, kaction);
-		 if (!r) r = copyback_one_record(mailbox, rp, kaction);
+		 if (!r) r = copyback_one_record(mailbox, rp,
+						 rannots, kaction);
 		}
 
 		return r;
@@ -998,15 +1089,20 @@
 	 if (rp->modseq > mp->modseq &&
 		rp->last_updated >= mp->last_updated) {
 		/* then copy all the flag data over from the replica */
-		mp->system_flags = rp->system_flags;
-		for (i = 0; i < MAX_USER_FLAGS/32; i++) 
+		mp->system_flags = (rp->system_flags & FLAGS_GLOBAL) |
+				 (mp->system_flags & FLAGS_LOCAL);
+		mp->cid = rp->cid;
+		for (i = 0; i < MAX_USER_FLAGS/32; i++)
 		 mp->user_flagsi = rp->user_flagsi;
 
 		log_mismatch("more recent on replica", mailbox, mp, rp);
 	 }
-	 else {
-		log_mismatch("more recent on master", mailbox, mp, rp);
+
+	 if (kaction) {
+		r = apply_annotations(mailbox, mp, mannots, rannots, 0);
+		if (r) return r;
 	 }
+
 	}
 
 	/* are we making changes yet? */
@@ -1031,24 +1127,33 @@
 struct index_record rrecord;
 uint32_t recno = 1;
 uint32_t old_num_records = mailbox->i.num_records;
+ struct sync_annot_list *mannots = NULL;
+ struct sync_annot_list *rannots = NULL;
 int r;
 
 /* while there are more records on either master OR replica,
 * work out what to do with them */
 while (ki || recno <= old_num_records) {
+
+	sync_annot_list_free(&mannots);
+	sync_annot_list_free(&rannots);
+
 	/* most common case - both a master AND a replica record exist */
 	if (ki && recno <= old_num_records) {
 	 r = mailbox_read_index_record(mailbox, recno, &mrecord);
-	 if (r) return r;
-	 r = parse_upload(ki, mailbox, &rrecord);
-	 if (r) return r;
+	 if (r) goto out;
+	 r = read_annotations(mailbox, &mrecord, &mannots);
+	 if (r) goto out;
+	 r = parse_upload(ki, mailbox, &rrecord, &rannots);
+	 if (r) goto out;
 
 	 /* same UID - compare the records */
 	 if (rrecord.uid == mrecord.uid) {
 		r = compare_one_record(mailbox,
 				 &mrecord, &rrecord,
+				 mannots, rannots,
 				 kaction);
-		if (r) return r;
+		if (r) goto out;
 		/* increment both */
 		recno++;
 		ki = ki->next;
@@ -1060,7 +1165,7 @@
 			 mailbox->name, mrecord.uid,
 			 message_guid_encode(&mrecord.guid));
 		 r = renumber_one_record(&mrecord, kaction);
-		 if (r) return r;
+		 if (r) goto out;
 		}
 		/* only increment master */
 		recno++;
@@ -1072,8 +1177,8 @@
 			syslog(LOG_ERR, "SYNCERROR: only exists on replica %s %u (%s)",
 			 mailbox->name, rrecord.uid,
 			 message_guid_encode(&rrecord.guid));
-		 r = copyback_one_record(mailbox, &rrecord, kaction);
-		 if (r) return r;
+		 r = copyback_one_record(mailbox, &rrecord, rannots, kaction);
+		 if (r) goto out;
 		}
 		/* only increment replica */
 		ki = ki->next;
@@ -1083,12 +1188,12 @@
 	/* no more replica records, but still master records */
 	else if (recno <= old_num_records) {
 	 r = mailbox_read_index_record(mailbox, recno, &mrecord);
-	 if (r) return r;
+	 if (r) goto out;
 	 /* if the replica has seen this UID, we need to renumber.
 	 * Otherwise it will replicate fine as-is */
 	 if (mrecord.uid <= last_uid) {
 		r = renumber_one_record(&mrecord, kaction);
-		if (r) return r;
+		if (r) goto out;
 	 }
 	 else if (mrecord.modseq <= highestmodseq) {
 		if (kaction) {
@@ -1096,7 +1201,7 @@
 		 syslog(LOG_NOTICE, "SYNCNOTICE: bumping modseq %s %u",
 			 mailbox->name, mrecord.uid);
 		 r = mailbox_rewrite_index_record(mailbox, &mrecord);
-		 if (r) return r;
+		 if (r) goto out;
 		}
 	 }
 	 recno++;
@@ -1104,22 +1209,26 @@
 
 	/* record only exists on the replica */
 	else {
-	 r = parse_upload(ki, mailbox, &rrecord);
-	 if (r) return r;
+	 r = parse_upload(ki, mailbox, &rrecord, &rannots);
+	 if (r) goto out;
 
 	 if (kaction)
 		syslog(LOG_NOTICE, "SYNCNOTICE: only on replica %s %u",
 		 mailbox->name, rrecord.uid);
 
 	 /* going to need this one */
-	 r = copyback_one_record(mailbox, &rrecord, kaction);
-	 if (r) return r;
+	 r = copyback_one_record(mailbox, &rrecord, rannots, kaction);
+	 if (r) goto out;
 
 	 ki = ki->next;
 	}
 }
+ r = 0;
 
- return 0;
+out:
+ sync_annot_list_free(&mannots);
+ sync_annot_list_free(&rannots);
+ return r;
 }
 
 static int mailbox_full_update(const char *mboxname)
@@ -1137,8 +1246,12 @@
 modseq_t highestmodseq;
 uint32_t uidvalidity;
 uint32_t last_uid;
+ struct sync_annot_list *mannots = NULL;
+ struct sync_annot_list *rannots = NULL;
+ int remote_modseq_was_higher = 0;
+ modseq_t xconvmodseq = 0;
 
- kl = dlist_atom(NULL, cmd, mboxname);
+ kl = dlist_setatom(NULL, cmd, mboxname);
 sync_send_lookup(kl, sync_out);
 dlist_free(&kl);
 
@@ -1160,17 +1273,17 @@
 * doesn't really matter too much, because we'll blat the replica's
 * values anyway! */
 
- if (!dlist_getmodseq(kl, "HIGHESTMODSEQ", &highestmodseq)) {
+ if (!dlist_getnum64(kl, "HIGHESTMODSEQ", &highestmodseq)) {
 	r = IMAP_PROTOCOL_BAD_PARAMETERS;
 	goto done;
 }
 
- if (!dlist_getnum(kl, "UIDVALIDITY", &uidvalidity)) {
+ if (!dlist_getnum32(kl, "UIDVALIDITY", &uidvalidity)) {
 	r = IMAP_PROTOCOL_BAD_PARAMETERS;
 	goto done;
 }
 
- if (!dlist_getnum(kl, "LAST_UID", &last_uid)) {
+ if (!dlist_getnum32(kl, "LAST_UID", &last_uid)) {
 	r = IMAP_PROTOCOL_BAD_PARAMETERS;
 	goto done;
 }
@@ -1180,14 +1293,13 @@
 	goto done;
 }
 
+ /* optional */
+ dlist_getnum64(kl, "XCONVMODSEQ", &xconvmodseq);
+
 /* we'll be updating it! */
 r = mailbox_open_iwl(mboxname, &mailbox);
 if (r) goto done;
 
- /* re-calculate our local CRC just in case it's out of sync */
- r = mailbox_index_recalc(mailbox);
- if (r) goto done;
-
 /* if local UIDVALIDITY is lower, copy from remote, otherwise
 * remote will copy ours when we sync */
 if (mailbox->i.uidvalidity < uidvalidity) {
@@ -1195,17 +1307,20 @@
 	 ", updating %u => %u",
 	 mailbox->name, mailbox->i.uidvalidity, uidvalidity);
 	mailbox_index_dirty(mailbox);
-	mailbox->i.uidvalidity = uidvalidity;
+	mailbox->i.uidvalidity = mboxname_setuidvalidity(mailbox->name,
+							 uidvalidity);
 }
 
 if (mailbox->i.highestmodseq < highestmodseq) {
-	mailbox_modseq_dirty(mailbox);
-	/* highestmodseq on replica is dirty - we must go to at least 
-	 * one higher! */
+	/* highestmodseq on replica is dirty - we must copy and then dirty
+	 * so we go one higher! */
 	syslog(LOG_NOTICE, "SYNCNOTICE: highestmodseq higher on replica %s"
 	 ", updating " MODSEQ_FMT " => " MODSEQ_FMT,
 	 mailbox->name, mailbox->i.highestmodseq, highestmodseq+1);
-	mailbox->i.highestmodseq = highestmodseq+1;
+	mailbox->modseq_dirty = 0;
+	mailbox->i.highestmodseq = highestmodseq;
+	mailbox_modseq_dirty(mailbox);
+	remote_modseq_was_higher = 1;
 }
 
 r = mailbox_update_loop(mailbox, kr->head, last_uid,
@@ -1218,7 +1333,14 @@
 
 /* OK - now we're committed to make changes! */
 
- kaction = dlist_list(NULL, "ACTION");
+ /* this is safe because "larger than" logic is embedded
+ * inside update_xconvmodseq */
+ if (mailbox_has_conversations(mailbox)) {
+	r = mailbox_update_xconvmodseq(mailbox, xconvmodseq, /*force */0);
+	if (r) goto done;
+ }
+
+ kaction = dlist_newlist(NULL, "ACTION");
 r = mailbox_update_loop(mailbox, kr->head, last_uid,
 			 highestmodseq, kaction);
 if (r) goto cleanup;
@@ -1226,24 +1348,34 @@
 /* if replica still has a higher last_uid, bump our local
 * number to match so future records don't clash */
 if (mailbox->i.last_uid < last_uid)
- mailbox->i.last_uid = last_uid;
+	mailbox->i.last_uid = last_uid;
+
+ /* ugly variable reuse */
+ dlist_getlist(kl, "ANNOTATIONS", &ka);
+
+ if (ka) decode_annotations(ka, &rannots);
+ r = read_annotations(mailbox, NULL, &mannots);
+ if (r) goto cleanup;
+ r = apply_annotations(mailbox, NULL, mannots, rannots,
+			 !remote_modseq_was_higher);
+ if (r) goto cleanup;
 
 /* blatant reuse 'r' us */
- kexpunge = dlist_new("EXPUNGE");
- dlist_atom(kexpunge, "MBOXNAME", mailbox->name);
- dlist_atom(kexpunge, "UNIQUEID", mailbox->uniqueid); /* just for safety */
- kuids = dlist_list(kexpunge, "UID");
+ kexpunge = dlist_newkvlist(NULL, "EXPUNGE");
+ dlist_setatom(kexpunge, "MBOXNAME", mailbox->name);
+ dlist_setatom(kexpunge, "UNIQUEID", mailbox->uniqueid); /* just for safety */
+ kuids = dlist_newlist(kexpunge, "UID");
 for (ka = kaction->head; ka; ka = ka->next) {
 	if (!strcmp(ka->name, "EXPUNGE")) {
-	 dlist_num(kuids, "UID", ka->nval);
+	 dlist_setnum32(kuids, "UID", dlist_num(ka));
 	}
 	else if (!strcmp(ka->name, "COPYBACK")) {
-	 r = copy_remote(mailbox, ka->nval, kr);
+	 r = copy_remote(mailbox, dlist_num(ka), kr);
 	 if (r) goto cleanup;
-	 dlist_num(kuids, "UID", ka->nval);
+	 dlist_setnum32(kuids, "UID", dlist_num(ka));
 	}
 	else if (!strcmp(ka->name, "RENUMBER")) {
-	 r = copy_local(mailbox, ka->nval);
+	 r = copy_local(mailbox, dlist_num(ka));
 	 if (r) goto cleanup;
 	}
 }
@@ -1251,12 +1383,15 @@
 /* we still need to do the EXPUNGEs */
 cleanup:
 
+ sync_annot_list_free(&mannots);
+ sync_annot_list_free(&rannots);
+
 /* close the mailbox before sending any expunges
 * to avoid deadlocks */
 mailbox_close(&mailbox);
 
 /* only send expunge if we have some UIDs to expunge */
- if (kuids->head) {
+ if (kuids && kuids->head) {
 	int r2;
 	sync_send_apply(kexpunge, sync_out);
 	r2 = sync_parse_response("EXPUNGE", sync_in, NULL);
@@ -1267,10 +1402,16 @@
 }
 
 done:
- if (mailbox) mailbox_close(&mailbox);
+ if (r && mailbox)
+	annotate_state_abort(&mailbox->annot_state);
+ mailbox_close(&mailbox);
+
 dlist_free(&kin);
 dlist_free(&kaction);
 dlist_free(&kexpunge);
+ /* kuids points into the tree rooted at kexpunge
+ * so we don't need to free it explicitly here */
+
 return r;
 }
 
@@ -1278,16 +1419,42 @@
 {
 /* look for any mismatches */
 unsigned options = mailbox->i.options & MAILBOX_OPTIONS_MASK;
+ modseq_t xconvmodseq = 0;
+
 if (!remote) return 0;
+ if (remote->mbtype != mailbox->mbtype) return 0;
 if (remote->last_uid != mailbox->i.last_uid) return 0;
 if (remote->highestmodseq != mailbox->i.highestmodseq) return 0;
- if (remote->sync_crc != mailbox->i.sync_crc) return 0;
+ if (remote->uidvalidity != mailbox->i.uidvalidity) return 0;
 if (remote->recentuid != mailbox->i.recentuid) return 0;
 if (remote->recenttime != mailbox->i.recenttime) return 0;
 if (remote->pop3_last_login != mailbox->i.pop3_last_login) return 0;
+ if (remote->pop3_show_after != mailbox->i.pop3_show_after) return 0;
 if (remote->options != options) return 0;
 if (strcmp(remote->acl, mailbox->acl)) return 0;
 
+ if (remote->sync_crc != sync_crc_calc(mailbox, /*force*/0)) return 0;
+
+ if (mailbox_has_conversations(mailbox)) {
+	int r = mailbox_get_xconvmodseq(mailbox, &xconvmodseq);
+	if (r) return 0;
+
+	if (remote->xconvmodseq != xconvmodseq) return 0;
+ }
+
+ /* compare annotations */
+ {
+	struct sync_annot_list *mannots = NULL;
+	int r = read_annotations(mailbox, NULL, &mannots);
+	if (r) return 0;
+
+	if (diff_annotations(mannots, remote->annots)) {
+	 sync_annot_list_free(&mannots);
+	 return 0;
+	}
+	sync_annot_list_free(&mannots);
+ }
+
 /* otherwise it's unchanged! */
 return 1;
 }
@@ -1300,21 +1467,25 @@
 struct sync_msgid_list *part_list;
 struct mailbox *mailbox = NULL;
 int r = 0;
- struct dlist *kl = dlist_new("MAILBOX");
- struct dlist *kupload = dlist_list(NULL, "MESSAGE");
+ struct dlist *kl = dlist_newkvlist(NULL, "MAILBOX");
+ struct dlist *kupload = dlist_newlist(NULL, "MESSAGE");
+ annotate_state_t *astate = NULL;
 
- r = mailbox_open_irl(local->name, &mailbox);
+ r = mailbox_open_iwl(local->name, &mailbox);
 if (r == IMAP_MAILBOX_NONEXISTENT) {
-	/* been deleted in the meanwhile... */
-	if (remote)
-	 r = folder_delete(remote->name);
-	else
-	 r = 0;
+	/* been deleted in the meanwhile... it will get picked up by the
+	 * delete call later */
+	r = 0;
 	goto done;
 }
 else if (r)
 	goto done;
 
+ /* hold the annotate state open */
+ mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, &astate);
+ /* and force it to hold a transaction while it does stuff */
+ annotate_state_begin(astate);
+
 /* definitely bad if these don't match! */
 if (strcmp(mailbox->uniqueid, local->uniqueid) ||
 	strcmp(mailbox->part, local->part)) {
@@ -1326,7 +1497,7 @@
 if (remote && !is_repeat) {
 	if (mailbox->i.deletedmodseq > remote->highestmodseq) {
 	 syslog(LOG_NOTICE, "inefficient replication ("
-		 MODSEQ_FMT " > " MODSEQ_FMT ") %s", 
+		 MODSEQ_FMT " > " MODSEQ_FMT ") %s",
 		 mailbox->i.deletedmodseq, remote->highestmodseq,
 		 local->name);
 	 r = IMAP_AGAIN;
@@ -1340,6 +1511,12 @@
 	}
 }
 
+ /* make sure CRC is updated if we're retrying */
+ if (is_repeat) {
+	r = mailbox_index_recalc(mailbox);
+	if (r) goto done;
+ }
+
 /* nothing changed - nothing to send */
 if (is_unchanged(mailbox, remote))
 	goto done;
@@ -1348,26 +1525,18 @@
 r = sync_mailbox(mailbox, remote, part_list, kl, kupload, 1);
 if (r) goto done;
 
- /* upload any messages required */
- if (kupload->head) {
-	/* keep the mailbox locked for shorter time! Unlock the index now
-	 * but don't close it, because we need to guarantee that message 
-	 * files don't get deleted until we're finished with them... */
-	mailbox_unlock_index(mailbox, NULL);
-	sync_send_apply(kupload, sync_out);
+ /* keep the mailbox locked for shorter time! Unlock the index now
+ * but don't close it, because we need to guarantee that message
+ * files don't get deleted until we're finished with them... */
+ mailbox_unlock_index(mailbox, NULL);
+
+ /* upload in small(ish) blocks to avoid timeouts */
+ while (kupload->head) {
+	struct dlist *kul1 = dlist_splice(kupload, 1024);
+	sync_send_apply(kul1, sync_out);
 	r = sync_parse_response("MESSAGE", sync_in, NULL);
-	if (!r) {
-	 /* update our list of reserved messages on the replica */
-	 struct dlist *ki;
-	 struct sync_msgid *msgid;
-	 for (ki = kupload->head; ki; ki = ki->next) {
-		msgid = sync_msgid_lookup(part_list, &ki->gval);
-		if (!msgid)
-		 msgid = sync_msgid_add(part_list, &ki->gval);
-		msgid->mark = 1;
-		part_list->marked++; 
-	 }
-	}
+	dlist_free(&kul1);
+	if (r) goto done; /* abort earlier */
 }
 
 /* close before sending the apply - all data is already read */
@@ -1378,7 +1547,8 @@
 r = sync_parse_response("MAILBOX", sync_in, NULL);
 
 done:
- if (mailbox) mailbox_close(&mailbox);
+ mailbox_close(&mailbox);
+
 dlist_free(&kupload);
 dlist_free(&kl);
 return r;
@@ -1390,11 +1560,14 @@
 {
 int r = update_mailbox_once(local, remote, reserve_guids, 0);
 
+ /* never retry - other end should always sync cleanly */
+ if (no_copyback) return r;
+
 if (r == IMAP_AGAIN) {
 	r = mailbox_full_update(local->name);
 	if (!r) r = update_mailbox_once(local, remote, reserve_guids, 1);
 }
- else if (r == IMAP_MAILBOX_CRC) {
+ else if (r == IMAP_SYNC_CHECKSUM) {
 	syslog(LOG_ERR, "CRC failure on sync for %s, trying full update",
 	 local->name);
 	r = mailbox_full_update(local->name);
@@ -1414,13 +1587,13 @@
 struct dlist *kl;
 
 /* Update seen list */
- kl = dlist_new(cmd);
- dlist_atom(kl, "USERID", user);
- dlist_atom(kl, "UNIQUEID", uniqueid);
- dlist_date(kl, "LASTREAD", sd->lastread);
- dlist_num(kl, "LASTUID", sd->lastuid);
- dlist_date(kl, "LASTCHANGE", sd->lastchange);
- dlist_atom(kl, "SEENUIDS", sd->seenuids);
+ kl = dlist_newkvlist(NULL, cmd);
+ dlist_setatom(kl, "USERID", user);
+ dlist_setatom(kl, "UNIQUEID", uniqueid);
+ dlist_setdate(kl, "LASTREAD", sd->lastread);
+ dlist_setnum32(kl, "LASTUID", sd->lastuid);
+ dlist_setdate(kl, "LASTCHANGE", sd->lastchange);
+ dlist_setatom(kl, "SEENUIDS", sd->seenuids);
 sync_send_apply(kl, sync_out);
 dlist_free(&kl);
 
@@ -1433,11 +1606,11 @@
 struct seen *seendb = NULL;
 struct seendata sd = SEENDATA_INITIALIZER;
 
- if (verbose) 
- printf("SEEN %s %s\n", user, uniqueid);
+ if (verbose)
+	printf("SEEN %s %s\n", user, uniqueid);
 
 if (verbose_logging)
- syslog(LOG_INFO, "SEEN %s %s", user, uniqueid);
+	syslog(LOG_INFO, "SEEN %s %s", user, uniqueid);
 
 /* ignore read failures */
 r = seen_open(user, SEEN_SILENT, &seendb);
@@ -1460,25 +1633,27 @@
 int r = 0;
 struct quota q;
 
- if (verbose) 
- printf("SETQUOTA %s\n", root);
+ if (verbose)
+	printf("SETQUOTA %s\n", root);
 
 if (verbose_logging)
- syslog(LOG_INFO, "SETQUOTA: %s", root);
+	syslog(LOG_INFO, "SETQUOTA: %s", root);
 
- q.root = root;
+ quota_init(&q, root);
 r = update_quota_work(&q, NULL);
+ quota_free(&q);
 
 return r;
 }
 
 static int getannotation_cb(const char *mailbox __attribute__((unused)),
+			 uint32_t uid __attribute__((unused)),
 			 const char *entry, const char *userid,
-			 struct annotation_data *attrib, void *rock)
+			 const struct buf *value, void *rock)
 {
 struct sync_annot_list *l = (struct sync_annot_list *) rock;
 
- sync_annot_list_add(l, entry, userid, attrib->value);
+ sync_annot_list_add(l, entry, userid, value);
 
 return 0;
 }
@@ -1489,22 +1664,25 @@
 struct dlist *kl;
 const char *entry;
 const char *userid;
- const char *value;
+ const char *valmap = NULL;
+ size_t vallen = 0;
+ struct buf value = BUF_INITIALIZER;
 
 for (kl = kin->head; kl; kl = kl->next) {
 	if (!dlist_getatom(kl, "ENTRY", &entry))
 	 return IMAP_PROTOCOL_BAD_PARAMETERS;
 	if (!dlist_getatom(kl, "USERID", &userid))
 	 return IMAP_PROTOCOL_BAD_PARAMETERS;
-	if (!dlist_getatom(kl, "VALUE", &value))
+	if (!dlist_getmap(kl, "VALUE", &valmap, &vallen))
 	 return IMAP_PROTOCOL_BAD_PARAMETERS;
-	sync_annot_list_add(replica_annot, entry, userid, value);
+	buf_init_ro(&value, valmap, vallen);
+	sync_annot_list_add(replica_annot, entry, userid, &value);
 }
 
 return 0;
 }
 
-static int do_getannotation(char *mboxname,
+static int do_getannotation(const char *mboxname,
 			 struct sync_annot_list *replica_annot)
 {
 const char *cmd = "ANNOTATION";
@@ -1513,7 +1691,7 @@
 int r;
 
 /* Update seen list */
- kl = dlist_atom(NULL, cmd, mboxname);
+ kl = dlist_setatom(NULL, cmd, mboxname);
 sync_send_lookup(kl, sync_out);
 dlist_free(&kl);
 
@@ -1526,7 +1704,7 @@
 return r;
 }
 
-static int do_annotation(char *mboxname)
+static int do_annotation(const char *mboxname)
 {
 int r;
 struct sync_annot_list *replica_annot = sync_annot_list_create();
@@ -1537,7 +1715,7 @@
 r = do_getannotation(mboxname, replica_annot);
 if (r) goto bail;
 
- r = annotatemore_findall(mboxname, "*", &getannotation_cb, master_annot, NULL);
+ r = annotatemore_findall(mboxname, 0, "*", &getannotation_cb, master_annot);
 if (r) goto bail;
 
 /* both lists are sorted, so we work our way through the lists
@@ -1560,7 +1738,7 @@
 
 	if (n == 0) {
 	 /* already have the annotation, but is the value different? */
-	 if (!strcmp(ra->value, ma->value)) {
+	 if (!buf_cmp(&ra->value, &ma->value)) {
 		ra = ra->next;
 		ma = ma->next;
 		continue;
@@ -1569,7 +1747,7 @@
 	}
 
 	/* add the current client annotation */
-	r = folder_setannotation(mboxname, ma->entry, ma->userid, ma->value);
+	r = folder_setannotation(mboxname, ma->entry, ma->userid, &ma->value);
 	if (r) goto bail;
 
 	ma = ma->next;
@@ -1583,8 +1761,8 @@
 
 /* ====================================================================== */
 
-int do_folders(struct sync_name_list *mboxname_list,
-	 struct sync_folder_list *replica_folders)
+static int do_folders(struct sync_name_list *mboxname_list,
+	 struct sync_folder_list *replica_folders, int delete_remote)
 {
 int r;
 struct sync_folder_list *master_folders;
@@ -1606,24 +1784,29 @@
 /* Tag folders on server which still exist on the client. Anything
 * on the server which remains untagged can be deleted immediately */
 for (mfolder = master_folders->head; mfolder; mfolder = mfolder->next) {
+	if (mfolder->mark) continue;
 	rfolder = sync_folder_lookup(replica_folders, mfolder->uniqueid);
 	if (!rfolder) continue;
+	if (rfolder->mark) continue;
 	rfolder->mark = 1;
 
-	/* does it need a rename? */
-	if (strcmp(mfolder->name, rfolder->name) || strcmp(mfolder->part, rfolder->part))
-	 sync_rename_list_add(rename_folders, mfolder->uniqueid, rfolder->name, 
-				 mfolder->name, mfolder->part);
+	/* does it need a rename? partition change is a rename too */
+	if (strcmp(mfolder->name, rfolder->name) || strcmp(mfolder->part, rfolder->part)) {
+	 sync_rename_list_add(rename_folders, mfolder->uniqueid, rfolder->name,
+				 mfolder->name, mfolder->part, mfolder->uidvalidity);
+	}
 }
 
 /* Delete folders on server which no longer exist on client */
- for (rfolder = replica_folders->head; rfolder; rfolder = rfolder->next) {
-	if (rfolder->mark) continue;
-	r = folder_delete(rfolder->name);
-	if (r) {
-	 syslog(LOG_ERR, "folder_delete(): failed: %s '%s'", 
-		 rfolder->name, error_message(r));
-	 goto bail;
+ if (delete_remote) {
+	for (rfolder = replica_folders->head; rfolder; rfolder = rfolder->next) {
+	 if (rfolder->mark) continue;
+	 r = folder_delete(rfolder->name);
+	 if (r) {
+		syslog(LOG_ERR, "folder_delete(): failed: %s '%s'",
+		 rfolder->name, error_message(r));
+		goto bail;
+	 }
 	}
 }
 
@@ -1646,7 +1829,8 @@
 	 }
 
 	 /* Found unprocessed item which should rename cleanly */
-	 r = folder_rename(item->oldname, item->newname, item->part);
+	 r = folder_rename(item->oldname, item->newname,
+			 item->part, item->uidvalidity);
 	 if (r) {
 		syslog(LOG_ERR, "do_folders(): failed to rename: %s -> %s ",
 		 item->oldname, item->newname);
@@ -1668,13 +1852,14 @@
 }
 
 for (mfolder = master_folders->head; mfolder; mfolder = mfolder->next) {
+	if (mfolder->mark) continue;
 	/* NOTE: rfolder->name may now be wrong, but we're guaranteed that
 	 * it was successfully renamed above, so just use mfolder->name for
 	 * all commands */
 	rfolder = sync_folder_lookup(replica_folders, mfolder->uniqueid);
 	r = update_mailbox(mfolder, rfolder, reserve_guids);
 	if (r) {
-	 syslog(LOG_ERR, "do_folders(): update failed: %s '%s'", 
+	 syslog(LOG_ERR, "do_folders(): update failed: %s '%s'",
 		 mfolder->name, error_message(r));
 	 goto bail;
 	}
@@ -1687,6 +1872,24 @@
 return r;
 }
 
+static int do_unmailbox(const char *mboxname)
+{
+ struct mailbox *mailbox = NULL;
+ int r;
+
+ r = mailbox_open_irl(mboxname, &mailbox);
+ if (r == IMAP_MAILBOX_NONEXISTENT) {
+	r = folder_delete(mboxname);
+	if (r) {
+	 syslog(LOG_ERR, "folder_delete(): failed: %s '%s'",
+		 mboxname, error_message(r));
+	}
+ }
+ mailbox_close(&mailbox);
+
+ return r;
+}
+
 static int do_mailboxes(struct sync_name_list *mboxname_list)
 {
 struct sync_name *mbox;
@@ -1707,16 +1910,20 @@
 	 syslog(LOG_INFO, "MAILBOX %s", mbox->name);
 }
 
- kl = dlist_list(NULL, "MAILBOXES");
+ kl = dlist_newlist(NULL, "MAILBOXES");
 for (mbox = mboxname_list->head; mbox; mbox = mbox->next)
-	dlist_atom(kl, "MBOXNAME", mbox->name);
+	dlist_setatom(kl, "MBOXNAME", mbox->name);
 sync_send_lookup(kl, sync_out);
 dlist_free(&kl);
 
 r = response_parse("MAILBOXES", replica_folders, NULL, NULL, NULL, NULL);
 
+ /* we don't want to delete remote folders which weren't found locally,
+ * because we may be racing with a rename, and we don't want to lose
+ * the remote files. A real delete will always have inserted a
+ * UNMAILBOX anyway */
 if (!r)
-	r = do_folders(mboxname_list, replica_folders);
+	r = do_folders(mboxname_list, replica_folders, /*delete_remote*/0);
 
 sync_folder_list_free(&replica_folders);
 
@@ -1768,10 +1975,11 @@
 /* set any new or changed quotas */
 for (mitem = master_quotaroots->head; mitem; mitem = mitem->next) {
 	rquota = sync_quota_lookup(replica_quota, mitem->name);
-	q.root = mitem->name;
 	if (rquota)
 	 rquota->done = 1;
+	quota_init(&q, mitem->name);
 	r = update_quota_work(&q, rquota);
+	quota_free(&q);
 	if (r) return r;
 }
 
@@ -1785,8 +1993,9 @@
 return 0;
 }
 
-int do_user_main(char *user, struct sync_folder_list *replica_folders,
-		 struct sync_quota_list *replica_quota)
+static int do_user_main(const char *user,
+			struct sync_folder_list *replica_folders,
+			struct sync_quota_list *replica_quota)
 {
 char bufMAX_MAILBOX_BUFFER;
 int r = 0;
@@ -1815,12 +2024,15 @@
 /* subfolders */
 if (!r) {
 	strlcat(buf, ".*", sizeof(buf));
- r = (sync_namespace.mboxlist_findall)(&sync_namespace, buf, 1,
+	r = (sync_namespace.mboxlist_findall)(&sync_namespace, buf, 1,
 					 user, NULL, do_mailbox_info,
 					 &info);
 }
 
- if (!r) r = do_folders(mboxname_list, replica_folders);
+ /* we know all the folders present on the master, so it's safe to delete
+ * anything not mentioned here on the replica - at least until we get
+ * real tombstones */
+ if (!r) r = do_folders(mboxname_list, replica_folders, /*delete_remote*/1);
 if (!r) r = do_user_quota(master_quotaroots, replica_quota);
 
 sync_name_list_free(&mboxname_list);
@@ -1831,7 +2043,7 @@
 return r;
 }
 
-int do_user_sub(const char *userid, struct sync_name_list *replica_subs)
+static int do_user_sub(const char *userid, struct sync_name_list *replica_subs)
 {
 struct sync_name_list *master_subs = sync_name_list_create();
 struct sync_name *msubs, *rsubs;
@@ -1876,7 +2088,7 @@
 return 0;
 }
 
-static int do_user_seen(char *user, struct sync_seen_list *replica_seen)
+static int do_user_seen(const char *user, struct sync_seen_list *replica_seen)
 {
 int r;
 struct sync_seen *mseen, *rseen;
@@ -1909,7 +2121,7 @@
 return 0;
 }
 
-int do_user_sieve(char *userid, struct sync_sieve_list *replica_sieve)
+static int do_user_sieve(const char *userid, struct sync_sieve_list *replica_sieve)
 {
 int r = 0;
 struct sync_sieve_list *master_sieve;
@@ -1919,18 +2131,26 @@
 
 master_sieve = sync_sieve_list_generate(userid);
 if (!master_sieve) {
- syslog(LOG_ERR, "Unable to list sieve scripts for %s", userid);
- return IMAP_IOERROR;
+	syslog(LOG_ERR, "Unable to list sieve scripts for %s", userid);
+	return IMAP_IOERROR;
 }
 
- /* Upload missing and out of date scripts */
+ /* Upload missing and out of date or mismatching scripts */
 for (mitem = master_sieve->head; mitem; mitem = mitem->next) {
- ritem = sync_sieve_lookup(replica_sieve, mitem->name);
+	ritem = sync_sieve_lookup(replica_sieve, mitem->name);
 	if (ritem) {
 	 ritem->mark = 1;
-	 if (ritem->last_update >= mitem->last_update)
-		continue; /* doesn't need updating */
+	 /* compare the GUID if known */
+	 if (!message_guid_isnull(&ritem->guid)) {
+		if (message_guid_equal(&ritem->guid, &mitem->guid))
+		 continue;
+		/* XXX: copyback support */
+	 }
+	 /* fallback to date comparison */
+	 else if (ritem->last_update >= mitem->last_update)
+		continue; /* changed */
 	}
+
 	r = sieve_upload(userid, mitem->name, mitem->last_update);
 	if (r) goto bail;
 }
@@ -1973,7 +2193,7 @@
 return(r);
 }
 
-int do_user(char *userid)
+static int do_user(const char *userid)
 {
 char bufMAX_MAILBOX_BUFFER;
 int r = 0;
@@ -1985,36 +2205,37 @@
 struct dlist *kl = NULL;
 struct mailbox *mailbox = NULL;
 
- if (verbose) 
- printf("USER %s\n", userid);
+ if (verbose)
+	printf("USER %s\n", userid);
 
 if (verbose_logging)
- syslog(LOG_INFO, "USER %s", userid);
-
- kl = dlist_atom(NULL, "USER", userid);
- sync_send_lookup(kl, sync_out);
- dlist_free(&kl);
-
- r = response_parse("USER",
-		 replica_folders, replica_subs,
-		 replica_sieve, replica_seen, replica_quota);
- /* can happen! */
- if (r == IMAP_MAILBOX_NONEXISTENT) r = 0;
- if (r) goto done;
+	syslog(LOG_INFO, "USER %s", userid);
 
+ /* check local mailbox first */
 (sync_namespace.mboxname_tointernal)(&sync_namespace, "INBOX",
 					 userid, buf);
 r = mailbox_open_irl(buf, &mailbox);
 if (r == IMAP_MAILBOX_NONEXISTENT) {
-	/* user has been removed, RESET server */
-	syslog(LOG_ERR, "Inbox missing on master for %s", userid);
-	r = user_reset(userid);
+	/* user has been removed, skip */
+	r = 0;
 	goto done;
 }
 if (r) goto done;
 
 /* we don't hold locks while sending commands */
 mailbox_close(&mailbox);
+
+ kl = dlist_setatom(NULL, "USER", userid);
+ sync_send_lookup(kl, sync_out);
+ dlist_free(&kl);
+
+ r = response_parse("USER",
+		 replica_folders, replica_subs,
+		 replica_sieve, replica_seen, replica_quota);
+ /* can happen! */
+ if (r == IMAP_MAILBOX_NONEXISTENT) r = 0;
+ if (r) goto done;
+
 r = do_user_main(userid, replica_folders, replica_quota);
 if (r) goto done;
 r = do_user_sub(userid, replica_subs);
@@ -2049,7 +2270,7 @@
 if (verbose_logging)
 	syslog(LOG_INFO, "META %s", userid);
 
- kl = dlist_atom(NULL, "META", userid);
+ kl = dlist_setatom(NULL, "META", userid);
 sync_send_lookup(kl, sync_out);
 dlist_free(&kl);
 
@@ -2077,150 +2298,118 @@
 }
 }
 
-static void remove_folder(char *name, struct sync_action_list *list,
-			 int chk_child)
+/* ====================================================================== */
+
+static int do_sync_mailboxes(struct sync_name_list *mboxname_list,
+			 struct sync_action_list *user_list)
 {
- struct sync_action *action;
- size_t len = strlen(name);
+ int r = 0;
 
- for (action = list->head ; action ; action = action->next) {
-	if (!strncmp(name, action->name, len) &&
-	 ((action->namelen == '\0') ||
-	 (chk_child && (action->namelen == '.')))) {
- action->active = 0;
- }
+ if (mboxname_list->count) {
+	r = do_mailboxes(mboxname_list);
+	if (r) {
+	 /* promote failed personal mailboxes to USER */
+	 int nonuser = 0;
+	 struct sync_name *mbox;
+	 const char *userid;
+
+	 for (mbox = mboxname_list->head; mbox; mbox = mbox->next) {
+		/* done OK? Good :) */
+		if (mbox->mark)
+		 continue;
+
+		userid = mboxname_to_userid(mbox->name);
+		if (userid) {
+		 mbox->mark = 1;
+
+		 sync_action_list_add(user_list, NULL, userid);
+		 if (verbose) {
+			printf(" Promoting: MAILBOX %s -> USER %s\n",
+			 mbox->name, userid);
+		 }
+		 if (verbose_logging) {
+			syslog(LOG_INFO, " Promoting: MAILBOX %s -> USER %s",
+			 mbox->name, userid);
+		 }
+		}
+		else
+		 nonuser = 1; /* there was a non-user mailbox */
+	 }
+	 if (!nonuser) r = 0;
+	}
 }
-}
 
-/* ====================================================================== */
+ return r;
+}
 
-static int do_sync(const char *filename)
+static int do_sync(sync_log_reader_t *slr)
 {
 struct sync_action_list *user_list = sync_action_list_create();
+ struct sync_action_list *unuser_list = sync_action_list_create();
 struct sync_action_list *meta_list = sync_action_list_create();
 struct sync_action_list *mailbox_list = sync_action_list_create();
+ struct sync_action_list *unmailbox_list = sync_action_list_create();
 struct sync_action_list *quota_list = sync_action_list_create();
 struct sync_action_list *annot_list = sync_action_list_create();
 struct sync_action_list *seen_list = sync_action_list_create();
 struct sync_action_list *sub_list = sync_action_list_create();
 struct sync_name_list *mboxname_list = sync_name_list_create();
- static struct buf type, arg1, arg2;
- char *arg1s, *arg2s;
+ const char *args3;
 struct sync_action *action;
- int c;
- int fd = -1;
- int doclose = 0;
- struct protstream *input;
 int r = 0;
 
- if ((filename == NULL) || !strcmp(filename, "-"))
-	fd = 0; /* STDIN */
- else {
-	fd = open(filename, O_RDWR);
-	if (fd < 0) {
-	 syslog(LOG_ERR, "Failed to open %s: %m", filename);
-	 r = IMAP_IOERROR;
-	 goto cleanup;
-	}
-
-	doclose = 1;
-
-	if (lock_blocking(fd) < 0) {
-	 syslog(LOG_ERR, "Failed to lock %s: %m", filename);
-	 r = IMAP_IOERROR;
-	 goto cleanup;
-	}
- }
-
- input = prot_new(fd, 0);
-
 while (1) {
-	if ((c = getword(input, &type)) == EOF)
-	 break;
-
-	/* Ignore blank lines */
-	if (c == '\r') c = prot_getc(input);
-	if (c == '\n')
-	 continue;
-
-	if (c != ' ') {
-	 syslog(LOG_ERR, "Invalid input");
-	 eatline(input, c);
-	 continue;
-	}
-
-	if ((c = getastring(input, 0, &arg1)) == EOF) break;
-	arg1s = arg1.s;
-
-	if (c == ' ') {
-	 if ((c = getastring(input, 0, &arg2)) == EOF) break;
-	 arg2s = arg2.s;
-
-	} else 
-	 arg2s = NULL;
-	
-	if (c == '\r') c = prot_getc(input);
-	if (c != '\n') {
-	 syslog(LOG_ERR, "Garbage at end of input line");
-	 eatline(input, c);
-	 continue;
-	}
-
-	ucase(type.s);
-
-	if (!strcmp(type.s, "USER"))
-	 sync_action_list_add(user_list, NULL, arg1s);
-	else if (!strcmp(type.s, "META"))
-	 sync_action_list_add(meta_list, NULL, arg1s);
-	else if (!strcmp(type.s, "SIEVE"))
-	 sync_action_list_add(meta_list, NULL, arg1s);
-	else if (!strcmp(type.s, "MAILBOX"))
-	 sync_action_list_add(mailbox_list, arg1s, NULL);
-	else if (!strcmp(type.s, "QUOTA"))
-	 sync_action_list_add(quota_list, arg1s, NULL);
-	else if (!strcmp(type.s, "ANNOTATION"))
-	 sync_action_list_add(annot_list, arg1s, NULL);
-	else if (!strcmp(type.s, "SEEN"))
-	 sync_action_list_add(seen_list, arg2s, arg1s);
-	else if (!strcmp(type.s, "SUB"))
-	 sync_action_list_add(sub_list, arg2s, arg1s);
-	else if (!strcmp(type.s, "UNSUB"))
-	 sync_action_list_add(sub_list, arg2s, arg1s);
+	r = sync_log_reader_getitem(slr, args);
+	if (r == EOF) break;
+
+	if (!strcmp(args0, "USER"))
+	 sync_action_list_add(user_list, NULL, args1);
+	else if (!strcmp(args0, "UNUSER"))
+	 sync_action_list_add(unuser_list, NULL, args1);
+	else if (!strcmp(args0, "META"))
+	 sync_action_list_add(meta_list, NULL, args1);
+	else if (!strcmp(args0, "SIEVE"))
+	 sync_action_list_add(meta_list, NULL, args1);
+	else if (!strcmp(args0, "APPEND")) /* just a mailbox event */
+	 sync_action_list_add(mailbox_list, args1, NULL);
+	else if (!strcmp(args0, "MAILBOX"))
+	 sync_action_list_add(mailbox_list, args1, NULL);
+	else if (!strcmp(args0, "UNMAILBOX"))
+	 sync_action_list_add(unmailbox_list, args1, NULL);
+	else if (!strcmp(args0, "QUOTA"))
+	 sync_action_list_add(quota_list, args1, NULL);
+	else if (!strcmp(args0, "ANNOTATION"))
+	 sync_action_list_add(annot_list, args1, NULL);
+	else if (!strcmp(args0, "SEEN"))
+	 sync_action_list_add(seen_list, args2, args1);
+	else if (!strcmp(args0, "SUB"))
+	 sync_action_list_add(sub_list, args2, args1);
+	else if (!strcmp(args0, "UNSUB"))
+	 sync_action_list_add(sub_list, args2, args1);
 	else
-	 syslog(LOG_ERR, "Unknown action type: %s", type.s);
- }
-
- prot_free(input);
- if (doclose) {
-	close(fd);
-	doclose = 0;
+	 syslog(LOG_ERR, "Unknown action type: %s", args0);
 }
 
 /* Optimise out redundant clauses */
 
 for (action = user_list->head; action; action = action->next) {
-	char inboxnameMAX_MAILBOX_BUFFER;
-	char deletednameMAX_MAILBOX_BUFFER;
-
-	/* USER action overrides any MAILBOX action on any of the 
-	 * user's mailboxes or any META, SEEN or SUB/UNSUB
-	 * action for same user */
-	(sync_namespace.mboxname_tointernal)(&sync_namespace, "INBOX",
-					 action->user, inboxname);
-	remove_folder(inboxname, mailbox_list, 1);
-
-	/* remove deleted namespace items as well */
-	if (mboxlist_delayed_delete_isenabled()) {
-	 mboxname_todeleted(inboxname, deletedname, 0);
-	 remove_folder(deletedname, mailbox_list, 1);
-	}
+	/* remove per-user items */
+	remove_meta(action->user, meta_list);
+	remove_meta(action->user, seen_list);
+	remove_meta(action->user, sub_list);
+ }
 
+ /* duplicate removal for unuser - we also strip all the user events */
+ for (action = unuser_list->head; action; action = action->next) {
 	/* remove per-user items */
 	remove_meta(action->user, meta_list);
 	remove_meta(action->user, seen_list);
 	remove_meta(action->user, sub_list);
+
+	/* unuser trumps user */
+	remove_meta(action->user, user_list);
 }
- 
+
 for (action = meta_list->head; action; action = action->next) {
 	/* META action overrides any user SEEN or SUB/UNSUB action
 	 for same user */
@@ -2272,7 +2461,7 @@
 	if (!action->active)
 	 continue;
 
- if (do_seen(action->user, action->name)) {
+	if (do_seen(action->user, action->name)) {
 	 char *userid = mboxname_isusermailbox(action->name, 1);
 	 if (userid && !strcmp(userid, action->user)) {
 		sync_action_list_add(user_list, NULL, action->user);
@@ -2302,17 +2491,17 @@
 	if (!action->active)
 	 continue;
 
- if (user_sub(action->user, action->name)) {
- sync_action_list_add(meta_list, NULL, action->user);
- if (verbose) {
- printf(" Promoting: SUB %s %s -> META %s\n",
- action->user, action->name, action->user);
- }
- if (verbose_logging) {
- syslog(LOG_INFO, " Promoting: SUB %s %s -> META %s",
- action->user, action->name, action->name);
- }
- }
+	if (user_sub(action->user, action->name)) {
+	 sync_action_list_add(meta_list, NULL, action->user);
+	 if (verbose) {
+		printf(" Promoting: SUB %s %s -> META %s\n",
+		 action->user, action->name, action->user);
+	 }
+	 if (verbose_logging) {
+		syslog(LOG_INFO, " Promoting: SUB %s %s -> META %s",
+		 action->user, action->name, action->name);
+	 }
+	}
 }
 
 for (action = mailbox_list->head; action; action = action->next) {
@@ -2320,44 +2509,24 @@
 	 continue;
 
 	sync_name_list_add(mboxname_list, action->name);
+	/* only do up to 1000 mailboxes at a time */
+	if (mboxname_list->count > 1000) {
+	 syslog(LOG_NOTICE, "sync_mailboxes: doing 1000");
+	 r = do_sync_mailboxes(mboxname_list, user_list);
+	 if (r) goto cleanup;
+	 sync_name_list_free(&mboxname_list);
+	 mboxname_list = sync_name_list_create();
+	}
 }
 
- if (mboxname_list->count) {
-	int nonuser = 0;
-	r = do_mailboxes(mboxname_list);
-	if (r) {
-	 /* promote failed personal mailboxes to USER */
-	 struct sync_name *mbox;
-	 char *userid, *p, *useridp;
-
-	 for (mbox = mboxname_list->head; mbox; mbox = mbox->next) {
-		/* done OK? Good :) */
-		if (mbox->mark)
-		 continue;
-
-		useridp = mboxname_isusermailbox(mbox->name, 0);
-		if (useridp) {
-		 userid = xstrdup(useridp);
-		 if ((p = strchr(userid, '.'))) *p = '\0';
-		 mbox->mark = 1;
-
-		 sync_action_list_add(user_list, NULL, userid);
-		 if (verbose) {
-			printf(" Promoting: MAILBOX %s -> USER %s\n",
-			 mbox->name, userid);
-		 }
-		 if (verbose_logging) {
-			syslog(LOG_INFO, " Promoting: MAILBOX %s -> USER %s",
-			 mbox->name, userid);
-		 }
-		 free(userid);
-		}
-		else
-		 nonuser = 1;
-	 }
-	}
+ r = do_sync_mailboxes(mboxname_list, user_list);
+ if (r) goto cleanup;
 
-	if (r && nonuser) goto cleanup;
+ for (action = unmailbox_list->head; action; action = action->next) {
+	if (!action->active)
+	 continue;
+	r = do_unmailbox(action->name);
+	if (r) goto cleanup;
 }
 
 for (action = meta_list->head; action; action = action->next) {
@@ -2381,13 +2550,20 @@
 }
 
 for (action = user_list->head; action; action = action->next) {
+	if (!action->active)
+	 continue;
 	r = do_user(action->user);
 	if (r) goto cleanup;
 }
 
- cleanup:
- if (doclose) close(fd);
+ for (action = unuser_list->head; action; action = action->next) {
+	if (!action->active)
+	 continue;
+	r = do_unuser(action->user);
+	if (r) goto cleanup;
+ }
 
+ cleanup:
 if (r) {
 	if (verbose)
 	 fprintf(stderr, "Error in do_sync(): bailing out! %s\n", error_message(r));
@@ -2396,8 +2572,10 @@
 }
 
 sync_action_list_free(&user_list);
+ sync_action_list_free(&unuser_list);
 sync_action_list_free(&meta_list);
 sync_action_list_free(&mailbox_list);
+ sync_action_list_free(&unmailbox_list);
 sync_action_list_free(&quota_list);
 sync_action_list_free(&annot_list);
 sync_action_list_free(&seen_list);
@@ -2407,6 +2585,26 @@
 return r;
 }
 
+static int do_sync_filename(const char *filename)
+{
+ sync_log_reader_t *slr;
+ int r;
+
+ if ((filename == NULL) || !strcmp(filename, "-"))
+	slr = sync_log_reader_create_with_fd(0); /* STDIN */
+ else
+	slr = sync_log_reader_create_with_filename(filename);
+
+ r = sync_log_reader_begin(slr);
+ if (!r)
+	r = do_sync(slr);
+
+ sync_log_reader_end(slr);
+ sync_log_reader_free(slr);
+ return r;
+}
+
+
 /* ====================================================================== */
 
 enum {
@@ -2415,94 +2613,71 @@
 RESTART_RECONNECT
 };
 
-int do_daemon_work(const char *sync_log_file, const char *sync_shutdown_file,
+static int do_daemon_work(const char *channel, const char *sync_shutdown_file,
 		 unsigned long timeout, unsigned long min_delta,
 		 int *restartp)
 {
 int r = 0;
- char *work_file_name;
 time_t session_start;
 time_t single_start;
 int delta;
 struct stat sbuf;
+ sync_log_reader_t *slr;
 
 *restartp = RESTART_NONE;
-
- /* Create a work log filename. Use the PID so we can
- * try to reprocess it if the sync fails */
- work_file_name = xmalloc(strlen(sync_log_file)+20);
- snprintf(work_file_name, strlen(sync_log_file)+20,
- "%s-%d", sync_log_file, getpid());
+ slr = sync_log_reader_create_with_channel(channel);
 
 session_start = time(NULL);
 
 while (1) {
- single_start = time(NULL);
+	single_start = time(NULL);
 
- signals_poll();
+	signals_poll();
 
 	/* Check for shutdown file */
- if (sync_shutdown_file && !stat(sync_shutdown_file, &sbuf)) {
- unlink(sync_shutdown_file);
- break;
- }
+	if (sync_shutdown_file && !stat(sync_shutdown_file, &sbuf)) {
+	 unlink(sync_shutdown_file);
+	 break;
+	}
 
 	/* See if its time to RESTART */
- if ((timeout > 0) &&
+	if ((timeout > 0) &&
 	 ((single_start - session_start) > (time_t) timeout)) {
- *restartp = RESTART_NORMAL;
- break;
- }
-
- if (stat(work_file_name, &sbuf) == 0) {
-	 /* Existing work log file from our parent < 1 hour old */
-	 /* XXX Is 60 minutes a resonable timeframe? */
-	 syslog(LOG_NOTICE,
-		 "Reprocessing sync log file %s", work_file_name);
+	 *restartp = RESTART_NORMAL;
+	 break;
 	}
-	else {
-	 /* Check for sync_log file */
-	 if (stat(sync_log_file, &sbuf) < 0) {
-		if (min_delta > 0) {
-		 sleep(min_delta);
-		} else {
-		 usleep(100000); /* 1/10th second */
-		}
-		continue;
-	 }
 
-	 /* Move sync_log to our work file */
-	 if (rename(sync_log_file, work_file_name) < 0) {
-		syslog(LOG_ERR, "Rename %s -> %s failed: %m",
-		 sync_log_file, work_file_name);
-		r = IMAP_IOERROR;
-		break;
+	r = sync_log_reader_begin(slr);
+	if (r) {
+	 /* including specifically r == IMAP_AGAIN */
+	 if (min_delta > 0) {
+		sleep(min_delta);
+	 } else {
+		usleep(100000); /* 1/10th second */
 	 }
+	 continue;
 	}
 
 	/* Process the work log */
- if ((r=do_sync(work_file_name))) {
+	if ((r=do_sync(slr))) {
 	 syslog(LOG_ERR,
 		 "Processing sync log file %s failed: %s",
-		 work_file_name, error_message(r));
+		 sync_log_reader_get_file_name(slr), error_message(r));
 	 break;
 	}
 
-	/* Remove the work log */
- if (unlink(work_file_name) < 0) {
- syslog(LOG_ERR, "Unlink %s failed: %m", work_file_name);
-	 r = IMAP_IOERROR;
-	 break;
- }
- delta = time(NULL) - single_start;
+	r = sync_log_reader_end(slr);
+	if (r) break;
+
+	delta = time(NULL) - single_start;
 
- if (((unsigned) delta < min_delta) && ((min_delta-delta) > 0))
- sleep(min_delta-delta);
+	if (((unsigned) delta < min_delta) && ((min_delta-delta) > 0))
+	 sleep(min_delta-delta);
 }
- free(work_file_name);
+ sync_log_reader_free(slr);
 
 if (*restartp == RESTART_NORMAL) {
-	prot_printf(sync_out, "RESTART\r\n"); 
+	prot_printf(sync_out, "RESTART\r\n");
 	prot_flush(sync_out);
 
 	r = sync_parse_response("RESTART", sync_in, NULL);
@@ -2570,11 +2745,12 @@
 return response;
 }
 
-void replica_connect(const char *channel)
+static void replica_connect(const char *channel)
 {
 int wait;
 struct protoent *proto;
 sasl_callback_t *cb;
+ int timeout;
 
 cb = mysasl_callbacks(NULL,
 			 get_config(channel, "sync_authname"),
@@ -2586,7 +2762,8 @@
 
 for (wait = 15;; wait *= 2) {
 	sync_backend = backend_connect(sync_backend, servername,
-				 &csync_protocol, "", cb, NULL);
+				 &csync_protocol, "", cb, NULL,
+				 (verbose > 1 ? fileno(stderr) : -1));
 
 	if (sync_backend || connect_once || wait > 1000) break;
 
@@ -2596,6 +2773,9 @@
 	sleep(wait);
 }
 
+ free_callbacks(cb);
+ cb = NULL;
+
 if (!sync_backend) {
 	fprintf(stderr, "Can not connect to server '%s'\n",
 		servername);
@@ -2606,7 +2786,7 @@
 /* Disable Nagle's Algorithm => increase throughput
 *
 * http://en.wikipedia.org/wiki/Nagle's_algorithm
- */ 
+ */
 if (servername0 != '/') {
 	if (sync_backend->sock >= 0 && (proto = getprotobyname("tcp")) != NULL) {
 	 int on = 1;
@@ -2661,38 +2841,89 @@
 }
 
 #ifdef HAVE_ZLIB
- /* check if we should compress */
- if (do_compress || config_getswitch(IMAPOPT_SYNC_COMPRESS)) {
- prot_printf(sync_backend->out, "COMPRESS DEFLATE\r\n");
- prot_flush(sync_backend->out);
+ /* Does the backend support compression? */
+ if (CAPA(sync_backend, CAPA_COMPRESS)) {
+	prot_printf(sync_backend->out, "COMPRESS DEFLATE\r\n");
+	prot_flush(sync_backend->out);
 
- if (sync_parse_response("COMPRESS", sync_backend->in, NULL)) {
-	 syslog(LOG_ERR, "Failed to enable compression, continuing uncompressed");
+	if (sync_parse_response("COMPRESS", sync_backend->in, NULL)) {
+	 if (do_compress) fatal("Failed to enable compression, aborting", EC_SOFTWARE);
+	 syslog(LOG_NOTICE, "Failed to enable compression, continuing uncompressed");
 	}
 	else {
 	 prot_setcompress(sync_backend->in);
 	 prot_setcompress(sync_backend->out);
- }
+	}
 }
+ else if (do_compress) fatal("Backend does not support compression, aborting", EC_SOFTWARE);
 #endif
 
 /* links to sockets */
 sync_in = sync_backend->in;
 sync_out = sync_backend->out;
 
+ if (verbose > 1) {
+	prot_setlog(sync_in, fileno(stderr));
+	prot_setlog(sync_out, fileno(stderr));
+ }
+
+ /* Set inactivity timer */
+ timeout = config_getint(IMAPOPT_SYNC_TIMEOUT);
+ if (timeout < 3) timeout = 3;
+ prot_settimeout(sync_in, timeout);
+
+ /* SYNC_CRC version negotiation. We look for the server's
+ * capabilities, and if they're provided then try to use them
+ * to initialise ourself. If that fails (e.g. the server
+ * uses only versions unknown to us), fail miserably. */
+ {
+	char *vers_str = backend_get_cap_params(sync_backend, CAPA_CRC_VERSIONS);
+	unsigned min_vers = 0, max_vers = 0, version = 0;
+	struct dlist *kl;
+	int r = 0;
+
+	if (vers_str &&
+	 sscanf(vers_str, "%u-%u", &min_vers, &max_vers) == 2) {
+
+	 version = sync_crc_setup(min_vers, max_vers, /*strict*/0);
+	 if (!version) {
+negfailed:
+		fprintf(stderr, "Can not negotiate SYNC_CRC version with server '%s'\n",
+			servername);
+		syslog(LOG_ERR, "Can not negotiate SYNC_CRC version with server '%s'\n",
+			servername);
+		_exit(1);
+	 }
+
+	 /* server advertised the caps, presumably it knows
+	 * how to handle a SET */
+	 kl = dlist_newkvlist(NULL, "OPTIONS");
+	 dlist_setnum32(kl, "CRC_VERSION", version);
+	 sync_send_set(kl, sync_out);
+	 dlist_free(&kl);
+
+	 r = sync_parse_response("SET", sync_in, NULL);
+	 if (r) goto negfailed;
+	}
+	else {
+	 sync_crc_setup(MAILBOX_CRC_VERSION_MIN, MAILBOX_CRC_VERSION_MIN, /*strict*/0);
+	}
+
+	free(vers_str);
+ }
+
 /* Force use of LITERAL+ so we don't need two way communications */
 prot_setisclient(sync_in, 1);
 prot_setisclient(sync_out, 1);
-
 }
 
-static void replica_disconnect()
+static void replica_disconnect(void)
 {
 backend_disconnect(sync_backend);
 }
 
-void do_daemon(const char *sync_log_file, const char *sync_shutdown_file,
-	 const char *channel, unsigned long timeout, unsigned long min_delta)
+static void do_daemon(const char *channel, const char *sync_shutdown_file,
+		 unsigned long timeout, unsigned long min_delta)
 {
 int r = 0;
 int restart = 1;
@@ -2701,14 +2932,14 @@
 
 while (restart) {
 	replica_connect(channel);
-	r = do_daemon_work(sync_log_file, sync_shutdown_file,
+	r = do_daemon_work(channel, sync_shutdown_file,
 			 timeout, min_delta, &restart);
 	if (r) {
 	 /* See if we're still connected to the server.
 	 * If we are, we had some type of error, so we exit.
 	 * Otherwise, try reconnecting.
 	 */
-	 if (!backend_ping(sync_backend)) restart = 1;
+	 if (!backend_ping(sync_backend, NULL)) restart = 1;
 	}
 	replica_disconnect();
 }
@@ -2741,7 +2972,6 @@
 int wait = 0;
 int timeout = 600;
 int min_delta = 0;
- const char *sync_log_file;
 const char *channel = NULL;
 const char *sync_shutdown_file = NULL;
 char buf512;
@@ -2751,86 +2981,86 @@
 struct sync_name_list *mboxname_list;
 char mailboxnameMAX_MAILBOX_BUFFER;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
 setbuf(stdout, NULL);
 
- while ((opt = getopt(argc, argv, "C:vlS:F:f:w:t:d:n:rRumsoz")) != EOF) {
- switch (opt) {
- case 'C': /* alt config file */
- alt_config = optarg;
- break;
+ while ((opt = getopt(argc, argv, "C:vlS:F:f:w:t:d:n:rRumsozO")) != EOF) {
+	switch (opt) {
+	case 'C': /* alt config file */
+	 alt_config = optarg;
+	 break;
 
- case 'o': /* only try to connect once */
- connect_once = 1;
- break;
+	case 'o': /* only try to connect once */
+	 connect_once = 1;
+	 break;
 
- case 'v': /* verbose */
- verbose++;
- break;
+	case 'v': /* verbose */
+	 verbose++;
+	 break;
 
- case 'l': /* verbose Logging */
- verbose_logging++;
- break;
+	case 'l': /* verbose Logging */
+	 verbose_logging++;
+	 break;
 
 	case 'S': /* Socket descriptor for server */
 	 servername = optarg;
 	 break;
 
- case 'F': /* Shutdown file */
- sync_shutdown_file = optarg;
- break;
+	case 'F': /* Shutdown file */
+	 sync_shutdown_file = optarg;
+	 break;
 
- case 'f': /* input_filename used by user and mailbox modes; OR
+	case 'f': /* input_filename used by user and mailbox modes; OR
 		 alternate sync_log_file used by single-run repeat mode */
- input_filename = optarg;
- break;
+	 input_filename = optarg;
+	 break;
 
- case 'n':
+	case 'n':
 	 channel = optarg;
 	 break;
 
- case 'w':
- wait = atoi(optarg);
- break;
+	case 'w':
+	 wait = atoi(optarg);
+	 break;
 
- case 't':
- timeout = atoi(optarg);
- break;
+	case 't':
+	 timeout = atoi(optarg);
+	 break;
 
- case 'd':
- min_delta = atoi(optarg);
- break;
+	case 'd':
+	 min_delta = atoi(optarg);
+	 break;
 
- case 'r':
+	case 'r':
 	 background = 1;
 	 /* fallthrough */
 
- case 'R':
+	case 'R':
 	 if (mode != MODE_UNKNOWN)
 		fatal("Mutually exclusive options defined", EC_USAGE);
- mode = MODE_REPEAT;
- break;
+	 mode = MODE_REPEAT;
+	 break;
 
- case 'u':
+	case 'u':
 	 if (mode != MODE_UNKNOWN)
 		fatal("Mutually exclusive options defined", EC_USAGE);
- mode = MODE_USER;
- break;
+	 mode = MODE_USER;
+	 break;
 
- case 'm':
+	case 'm':
 	 if (mode != MODE_UNKNOWN)
 		fatal("Mutually exclusive options defined", EC_USAGE);
- mode = MODE_MAILBOX;
- break;
+	 mode = MODE_MAILBOX;
+	 break;
 
- case 's':
+	case 's':
 	 if (mode != MODE_UNKNOWN)
 		fatal("Mutually exclusive options defined", EC_USAGE);
- mode = MODE_META;
- break;
+	 mode = MODE_META;
+	 break;
 
 	case 'z':
 #ifdef HAVE_ZLIB
@@ -2840,16 +3070,21 @@
 #endif
 	 break;
 
- default:
- usage("sync_client");
- }
+	case 'O':
+	 /* don't copy changes back from server */
+	 no_copyback = 1;
+	 break;
+
+	default:
+	 usage("sync_client");
+	}
 }
 
 if (mode == MODE_UNKNOWN)
- fatal("No replication mode specified", EC_USAGE);
+	fatal("No replication mode specified", EC_USAGE);
 
 /* fork if required */
- if (background && !input_filename) {
+ if (background && !input_filename && !getenv("CYRUS_ISDAEMON")) {
 	int pid = fork();
 
 	if (pid == -1) {
@@ -2862,25 +3097,27 @@
 	}
 }
 
- cyrus_init(alt_config, "sync_client", 0);
+ cyrus_init(alt_config, "sync_client",
+	 (verbose > 1 ? CYRUSINIT_PERROR : 0),
+	 CONFIG_NEED_PARTITION_DATA);
 
 /* get the server name if not specified */
 if (!servername)
 	servername = get_config(channel, "sync_host");
 
 if (!servername)
- fatal("sync_host not defined", EC_SOFTWARE);
+	fatal("sync_host not defined", EC_SOFTWARE);
 
 /* Just to help with debugging, so we have time to attach debugger */
 if (wait > 0) {
- fprintf(stderr, "Waiting for %d seconds for gdb attach...\n", wait);
- sleep(wait);
+	fprintf(stderr, "Waiting for %d seconds for gdb attach...\n", wait);
+	sleep(wait);
 }
 
 /* Set namespace -- force standard (internal) */
 config_virtdomains = config_getenum(IMAPOPT_VIRTDOMAINS);
 if ((r = mboxname_init_namespace(&sync_namespace, 1)) != 0) {
- fatal(error_message(r), EC_CONFIG);
+	fatal(error_message(r), EC_CONFIG);
 }
 
 /* open the mboxlist, we'll need it for real work */
@@ -2892,8 +3129,8 @@
 quotadb_open(NULL);
 
 /* open the annotation db */
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 signals_set_shutdown(&shut_down);
 signals_add_handlers(0);
@@ -2997,7 +3234,7 @@
 	/* Open up connection to server */
 	replica_connect(channel);
 
- for (i = optind; i < argc; i++) {
+	for (i = optind; i < argc; i++) {
 	 mboxname_hiersep_tointernal(&sync_namespace, argvi,
 					config_virtdomains ?
 					strcspn(argvi, "@") : 0);
@@ -3022,21 +3259,19 @@
 	 /* Open up connection to server */
 	 replica_connect(channel);
 
-	 exit_rc = do_sync(input_filename);
+	 exit_rc = do_sync_filename(input_filename);
 
 	 replica_disconnect();
 	}
 	else {
 	 /* rolling replication */
-	 sync_log_file = sync_log_fname(channel);
-
 	 if (!sync_shutdown_file)
 		sync_shutdown_file = get_config(channel, "sync_shutdown_file");
 
 	 if (!min_delta)
 		min_delta = get_intconfig(channel, "sync_repeat_interval");
 
-	 do_daemon(sync_log_file, sync_shutdown_file, channel, timeout, min_delta);
+	 do_daemon(channel, sync_shutdown_file, timeout, min_delta);
 	}
 
 	break;

cyrus-imapd-2.4.17.tar.gz/imap/sync_log.c -> cyrus-imapd-2.5.tar.gz/imap/sync_log.c Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_log.c,v 1.7 2010/01/06 17:01:41 murch Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -52,11 +50,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -64,63 +58,65 @@
 #include <errno.h>
 
 #include "assert.h"
+#include "exitcodes.h"
 #include "sync_log.h"
 #include "global.h"
+#include "imap/imap_err.h"
 #include "cyr_lock.h"
 #include "mailbox.h"
 #include "retry.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
-static int sync_log_enabled = 0;
-static const char *suppressed_channel = NULL;
-static char *channel_base;
-static char *channel_end;
+static int sync_log_suppressed = 0;
+static strarray_t *channels = NULL;
+static strarray_t *unsuppressable = NULL;
 
-void sync_log_init(void)
+EXPORTED void sync_log_init(void)
 {
- char *p;
-
- sync_log_enabled = config_getswitch(IMAPOPT_SYNC_LOG);
- channel_base = NULL;
- channel_end = NULL;
- if (config_getstring(IMAPOPT_SYNC_LOG_CHANNELS)) {
-	channel_base = xstrdup(config_getstring(IMAPOPT_SYNC_LOG_CHANNELS));
-	channel_end = channel_base + strlen(channel_base);
-	p = channel_base;
-	while (*p) {
-	 if (*p == ' ') *p = '\0';
-	 p++;
-	}
- }
+ const char *conf;
+ int i;
+
+
+ /* sync_log_init() may be called more than once */
+ if (channels) strarray_free(channels);
+
+ conf = config_getstring(IMAPOPT_SYNC_LOG_CHANNELS);
+ if (!conf) conf = "\"\"";
+ channels = strarray_split(conf, " ", 0);
+ /*
+ * The sysadmin can specify "" in the value of sync_log_channels to
+ * mean the default channel name - this will be useful for sysadmins
+ * who want to start using a sync log channel for squatter but who
+ * have been using the default sync log channel for sync_client.
+ */
+ i = strarray_find(channels, "\"\"", 0);
+ if (i >= 0)
+	strarray_set(channels, i, NULL);
+
+ strarray_free(unsuppressable);
+ unsuppressable = NULL;
+ conf = config_getstring(IMAPOPT_SYNC_LOG_UNSUPPRESSABLE_CHANNELS);
+ if (conf)
+	unsuppressable = strarray_split(conf, " ", 0);
 }
 
-void sync_log_suppress(void)
+EXPORTED void sync_log_suppress(void)
 {
- sync_log_enabled = 0;
+ sync_log_suppressed = 1;
 }
 
-void sync_log_suppress_channel(const char *channelname)
+EXPORTED void sync_log_done(void)
 {
- if (channelname) {
-	/* there can only be one */
-	assert (!suppressed_channel);
-	suppressed_channel = channelname;
- }
- else {
-	suppressed_channel = NULL;
- }
-}
+ strarray_free(channels);
+ channels = NULL;
 
-void sync_log_done(void)
-{
- free(channel_base);
- channel_base = NULL;
+ strarray_free(unsuppressable);
+ unsuppressable = NULL;
 }
 
-char *sync_log_fname(const char *channel)
+static char *sync_log_fname(const char *channel)
 {
 static char bufMAX_MAILBOX_PATH;
 
@@ -134,6 +130,17 @@
 return buf;
 }
 
+static int sync_log_enabled(const char *channel)
+{
+ if (!config_getswitch(IMAPOPT_SYNC_LOG))
+	return 0;	/* entire mechanism is disabled */
+ if (!sync_log_suppressed)
+	return 1;	/* _suppress() wasn't called */
+ if (unsuppressable && strarray_find(unsuppressable, channel, 0) >= 0)
+	return 1;	/* channel is unsuppressable */
+ return 0;		/* suppressed */
+}
+
 static void sync_log_base(const char *channel, const char *string)
 {
 int fd;
@@ -142,9 +149,7 @@
 const char *fname;
 
 /* are we being supressed? */
- if (!sync_log_enabled) return;
- if (channel && suppressed_channel && !strcmp(channel, suppressed_channel))
-	return;
+ if (!sync_log_enabled(channel)) return;
 
 fname = sync_log_fname(channel);
 
@@ -161,10 +166,10 @@
 	 return;
 	}
 
-	if (lock_blocking(fd) == -1) {
+	if (lock_blocking(fd, fname) == -1) {
 	 syslog(LOG_ERR, "sync_log(): Failed to lock %s for %s: %m",
 		 fname, string);
-	 close(fd);
+	 xclose(fd);
 	 return;
 	}
 
@@ -174,10 +179,11 @@
 	 (sbuffd.st_ino == sbuffile.st_ino))
 	 break;
 
-	close(fd);
+	lock_unlock(fd, fname);
+	xclose(fd);
 }
 if (retries >= SYNC_LOG_RETRIES) {
-	close(fd);
+	xclose(fd);
 	syslog(LOG_ERR,
 	 "sync_log(): Failed to lock %s for %s after %d attempts",
 	 fname, string, retries);
@@ -189,7 +195,8 @@
 	 fname, strerror(errno));
 
 (void)fsync(fd); /* paranoia */
- close(fd);
+ lock_unlock(fd, fname);
+ xclose(fd);
 }
 
 static const char *sync_quote_name(const char *name)
@@ -281,36 +288,319 @@
 return buf;
 }
 
-void sync_log_channel(const char *channel, const char *fmt, ...)
+EXPORTED void sync_log(const char *fmt, ...)
 {
 va_list ap;
 const char *val;
+ int i;
+
+ if (!channels) return;
 
 va_start(ap, fmt);
 val = va_format(fmt, ap);
 va_end(ap);
 
- sync_log_base(channel, val);
+ for (i = 0 ; i < channels->count ; i++)
+	sync_log_base(channels->datai, val);
 }
 
-void sync_log(const char *fmt, ...)
+EXPORTED void sync_log_channel(const char *channel, const char *fmt, ...)
 {
 va_list ap;
 const char *val;
- const char *ch;
 
 va_start(ap, fmt);
 val = va_format(fmt, ap);
 va_end(ap);
 
- if (channel_base) {
-	for (ch = channel_base; ch < channel_end; ch += strlen(ch) + 1) {
-	 sync_log_base(ch, val);
-	}
+ sync_log_base(channel, val);
+}
+
+/*
+ * Read-side sync log code
+ */
+struct sync_log_reader
+{
+ /*
+ * This object works in three modes:
+ *
+ * - initialised with a sync log channel
+ *	 - standard mode used by sync_client
+ *	 - slr->log_file != NULL
+ *	 - slr->work_file is the name of a rename()d
+ *	 file that needs to be unlink()ed.
+ *
+ * - initialised with a saved file name
+ *	 - used by the sync_client -f option
+ *	 - slr->log_file = NULL
+ *	 - slr->work_file is the file given us by the user
+ *	 which it's important that we do not unlink()
+ *
+ * - initialised with a file descriptor
+ *	 - slr->log_file = NULL
+ *	 - slr->work_file = NULL
+ *	 - slr->fd is a file descriptor, probably stdin,
+ *	 and possibly a pipe
+ *	 - we cannot unlink() anything even if we wanted to.
+ */
+ char *log_file;
+ char *work_file;
+ int fd;
+ int fd_is_ours;
+ struct protstream *input;
+ struct buf type;
+ struct buf arg1;
+ struct buf arg2;
+};
+
+static sync_log_reader_t *sync_log_reader_alloc(void)
+{
+ sync_log_reader_t *slr = xzmalloc(sizeof(sync_log_reader_t));
+ slr->fd = -1;
+ return slr;
+}
+
+/*
+ * Create a sync log reader object which will read from the given sync log
+ * channel 'channel'. The channel may be NULL for the default channel.
+ * Returns a new object which must be freed with sync_log_reader_free().
+ * Does not return NULL.
+ */
+EXPORTED sync_log_reader_t *sync_log_reader_create_with_channel(const char *channel)
+{
+ sync_log_reader_t *slr = sync_log_reader_alloc();
+ struct buf buf = BUF_INITIALIZER;
+
+ slr->log_file = xstrdup(sync_log_fname(channel));
+
+ /* Create a work log filename. We will process this
+ * first if it exists */
+ buf_printf(&buf, "%s-run", slr->log_file);
+ slr->work_file = buf_release(&buf);
+
+ return slr;
+}
+
+/*
+ * Create a sync log reader object which will read from the given file
+ * 'filename'. Returns a new object which must be freed with
+ * sync_log_reader_free(). Does not return NULL.
+ */
+EXPORTED sync_log_reader_t *sync_log_reader_create_with_filename(const char *filename)
+{
+ sync_log_reader_t *slr = sync_log_reader_alloc();
+ slr->work_file = xstrdup(filename);
+ /* slr->log_file remain NULL, which matters later */
+ return slr;
+}
+
+/*
+ * Create a sync log reader object which will read from the given file
+ * descriptor 'fd'. The file descriptor must be open for reading and
+ * is not closed. Returns a new object which must be freed with
+ * sync_log_reader_free(). Does not return NULL.
+ */
+EXPORTED sync_log_reader_t *sync_log_reader_create_with_fd(int fd)
+{
+ sync_log_reader_t *slr = sync_log_reader_alloc();
+ slr->fd = fd;
+ slr->fd_is_ours = 0;
+ /* slr->log_file remain NULL, which matters later */
+ return slr;
+}
+
+/*
+ * Free a sync log reader object.
+ */
+EXPORTED void sync_log_reader_free(sync_log_reader_t *slr)
+{
+ if (!slr) return;
+ if (slr->input) prot_free(slr->input);
+ if (slr->fd_is_ours && slr->fd >= 0) close(slr->fd);
+ free(slr->log_file);
+ free(slr->work_file);
+ buf_free(&slr->type);
+ buf_free(&slr->arg1);
+ buf_free(&slr->arg2);
+ free(slr);
+}
+
+/*
+ * Begin reading a sync log file. If the reader is reading from a
+ * channel, rename the current log file so it will not be appended to by
+ * the write side code, and open the file. Otherwise, just open the file
+ * (note this is still necessary even when the reader is reading from a
+ * file descriptor).
+ *
+ * When sync_log_reader_begin() returns success, you should loop calling
+ * sync_log_reader_getitem() and handling the items, until it returns
+ * EOF, and then call sync_log_reader_end().
+ *
+ * Returns zero on success, IMAP_AGAIN if reading from a channel and
+ * there is no current log file, or an IMAP error code on failure.
+ */
+EXPORTED int sync_log_reader_begin(sync_log_reader_t *slr)
+{
+ struct stat sbuf;
+ int r;
+
+ if (slr->input) {
+	r = sync_log_reader_end(slr);
+	if (r) return r;
+ }
+
+ if (stat(slr->work_file, &sbuf) == 0) {
+	/* Existing work log file - process this first */
+	syslog(LOG_NOTICE,
+	 "Reprocessing sync log file %s", slr->work_file);
+ }
+ else if (!slr->log_file) {
+	syslog(LOG_ERR, "Failed to stat %s: %m",
+	 slr->log_file);
+	return IMAP_IOERROR;
 }
 else {
-	/* just the regular log path */
-	sync_log_base(NULL, val);
+	/* Check for sync_log file */
+	if (stat(slr->log_file, &sbuf) < 0) {
+	 if (errno == ENOENT)
+		return IMAP_AGAIN; /* no problem, try again later */
+	 syslog(LOG_ERR, "Failed to stat %s: %m",
+		 slr->log_file);
+	 return IMAP_IOERROR;
+	}
+
+	/* Move sync_log to our work file */
+	if (rename(slr->log_file, slr->work_file) < 0) {
+	 syslog(LOG_ERR, "Rename %s -> %s failed: %m",
+		 slr->log_file, slr->work_file);
+	 return IMAP_IOERROR;
+	}
+ }
+
+ if (slr->fd < 0) {
+	int fd = open(slr->work_file, O_RDWR, 0);
+	if (fd < 0) {
+	 syslog(LOG_ERR, "Failed to open %s: %m", slr->work_file);
+	 return IMAP_IOERROR;
+	}
+
+	if (lock_blocking(fd, slr->work_file) < 0) {
+	 syslog(LOG_ERR, "Failed to lock %s: %m", slr->work_file);
+	 close(fd);
+	 return IMAP_IOERROR;
+	}
+
+	slr->fd = fd;
+	slr->fd_is_ours = 1;
+
+	/* we can unlock immediately, since we have serialised
+	 * any process which held the lock over the rename. All
+	 * future attempts to lock this inode will stat and notice
+	 * the rename, so they won't write any more */
+	lock_unlock(slr->fd, slr->work_file);
 }
+
+ slr->input = prot_new(slr->fd, /*write*/0);
+
+ return 0;
 }
 
+EXPORTED const char *sync_log_reader_get_file_name(const sync_log_reader_t *slr)
+{
+ return slr->work_file;
+}
+
+/*
+ * Finish reading a sync log file. Closes the file (and, if the reader
+ * is reading from a channel, unlinks the work file and prepares for the
+ * next file). Returns 0 on success or an IMAP error code on failure.
+ */
+EXPORTED int sync_log_reader_end(sync_log_reader_t *slr)
+{
+ if (!slr->input)
+	return 0;
+
+ if (slr->input) {
+	prot_free(slr->input);
+	slr->input = NULL;
+ }
+
+ if (slr->fd_is_ours && slr->fd >= 0) {
+	lock_unlock(slr->fd, slr->work_file);
+	close(slr->fd);
+	slr->fd = -1;
+ }
+
+ if (slr->log_file) {
+	/* We were initialised with a sync log channel, whose
+	 * log file we rename()d to the work file. Now that
+	 * we've done with the work file we can unlink it.
+	 * Further checks at this point are just paranoia. */
+	if (slr->work_file && unlink(slr->work_file) < 0) {
+	 syslog(LOG_ERR, "Unlink %s failed: %m", slr->work_file);
+	 return IMAP_IOERROR;
+	}
+ }
+
+ return 0;
+}
+
+/*
+ * Read a single log item from a sync log file. The item will be
+ * returned as three constant strings. The first string is the type of
+ * the item (e.g. "MAILBOX") and is always capitalised. The second and
+ * third strings are arguments.
+ *
+ * Returns 0 on success, EOF when the end of the file is reached, or an
+ * IMAP error code on failure.
+ */
+EXPORTED int sync_log_reader_getitem(sync_log_reader_t *slr,
+				 const char *args3)
+{
+ int c;
+ const char *arg1s = NULL;
+ const char *arg2s = NULL;
+
+ if (!slr->input)
+	return EOF;
+
+ for (;;) {
+	if ((c = getword(slr->input, &slr->type)) == EOF)
+	 return EOF;
+
+	/* Ignore blank lines */
+	if (c == '\r') c = prot_getc(slr->input);
+	if (c == '\n')
+	 continue;
+
+	if (c != ' ') {
+	 syslog(LOG_ERR, "Invalid input");
+	 eatline(slr->input, c);
+	 continue;
+	}
+
+	if ((c = getastring(slr->input, 0, &slr->arg1)) == EOF) return EOF;
+	arg1s = slr->arg1.s;
+
+	arg2s = NULL;
+	if (c == ' ') {
+	 if ((c = getastring(slr->input, 0, &slr->arg2)) == EOF) return EOF;
+	 arg2s = slr->arg2.s;
+	}
+
+	if (c == '\r') c = prot_getc(slr->input);
+	if (c != '\n') {
+	 syslog(LOG_ERR, "Garbage at end of input line");
+	 eatline(slr->input, c);
+	 continue;
+	}
+
+	break;
+ }
+
+ ucase(slr->type.s);
+ args0 = slr->type.s;
+ args1 = arg1s;
+ args2 = arg2s;
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/imap/sync_log.h -> cyrus-imapd-2.5.tar.gz/imap/sync_log.h Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_log.h,v 1.7 2010/01/06 17:01:41 murch Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -55,16 +53,26 @@
 void sync_log_done(void);
 
 void sync_log(const char *fmt, ...);
+void sync_log_channel(const char *channel, const char *fmt, ...);
 
 #define sync_log_user(user) \
 sync_log("USER %s\n", user)
 
+#define sync_log_unuser(user) \
+ sync_log("UNUSER %s\n", user)
+
 #define sync_log_sieve(user) \
 sync_log("META %s\n", user)
 
+#define sync_log_append(name) \
+ sync_log("APPEND %s\n", name)
+
 #define sync_log_mailbox(name) \
 sync_log("MAILBOX %s\n", name)
 
+#define sync_log_unmailbox(name) \
+ sync_log("UNMAILBOX %s\n", name)
+
 #define sync_log_mailbox_double(name1, name2) \
 sync_log("MAILBOX %s\nMAILBOX %s\n", name1, name2)
 
@@ -80,32 +88,16 @@
 #define sync_log_subscribe(user, name) \
 sync_log("SUB %s %s\n", user, name)
 
-char *sync_log_fname(const char *channel);
-void sync_log_suppress_channel(const char *channel);
-void sync_log_channel(const char *channel, const char *fmt, ...);
-
-#define sync_log_user_channel(channel, user) \
- sync_log_channel(channel, "USER %s\n", user)
-
-#define sync_log_sieve_channel(channel, user) \
- sync_log_channel(channel, "META %s\n", user)
-
-#define sync_log_mailbox_channel(channel, name) \
- sync_log_channel(channel, "MAILBOX %s\n", name)
-
-#define sync_log_mailbox_double_channel(channel, name1, name2) \
- sync_log_channel(channel, "MAILBOX %s\nMAILBOX %s\n", name1, name2)
-
-#define sync_log_quota_channel(channel, name) \
- sync_log_channel(channel, "QUOTA %s\n", name)
-
-#define sync_log_annotation_channel(channel, name) \
- sync_log_channel(channel, "ANNOTATION %s\n", name)
-
-#define sync_log_seen_channel(channel, user, name) \
- sync_log_channel(channel, "SEEN %s %s\n", user, name)
-
-#define sync_log_subscribe_channel(channel, user, name) \
- sync_log_channel(channel, "SUB %s %s\n", user, name)
+/* read-side sync log code */
+typedef struct sync_log_reader sync_log_reader_t;
+
+sync_log_reader_t *sync_log_reader_create_with_channel(const char *channel);
+sync_log_reader_t *sync_log_reader_create_with_filename(const char *filename);
+sync_log_reader_t *sync_log_reader_create_with_fd(int fd);
+void sync_log_reader_free(sync_log_reader_t *slr);
+int sync_log_reader_begin(sync_log_reader_t *slr);
+const char *sync_log_reader_get_file_name(const sync_log_reader_t *slr);
+int sync_log_reader_end(sync_log_reader_t *slr);
+int sync_log_reader_getitem(sync_log_reader_t *slr, const char *args3);
 
 #endif /* INCLUDED_SYNC_LOG_H */

cyrus-imapd-2.4.17.tar.gz/imap/sync_reset.c -> cyrus-imapd-2.5.tar.gz/imap/sync_reset.c Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_reset.c,v 1.9 2010/06/28 12:04:20 brong Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -56,36 +54,27 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <syslog.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <errno.h>
-#include <ctype.h>
 #include <sys/resource.h>
 
 #include "global.h"
-#include "assert.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
-#include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
 #include "map.h"
-#include "imparse.h"
+#include "proc.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
-#include "retry.h"
 #include "imapd.h"
 #include "user.h"
 #include "sync_support.h"
 /*#include "cdb.h"*/
 
-/* global state */
-const int config_need_data = CONFIG_NEED_PARTITION_DATA;
-
 /* Static global variables and support routines for sync_reset */
 
 extern char *optarg;
@@ -104,7 +93,7 @@
 in_shutdown = 1;
 
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 
 if (sync_userid) free(sync_userid);
 if (sync_authstate) auth_freestate(sync_authstate);
@@ -127,7 +116,7 @@
 exit(EC_USAGE);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 fprintf(stderr, "sync_reset: %s\n", s);
 exit(code);
@@ -137,52 +126,46 @@
 
 static int reset_single(const char *userid)
 {
- struct sync_name_list *list = NULL;
+ struct sync_name_list *sublist = sync_name_list_create();
+ struct sync_name_list *mblist = sync_name_list_create();
 struct sync_name *item;
- char bufMAX_MAILBOX_BUFFER;
 int r = 0;
 
- /* Nuke subscriptions */
- list = sync_name_list_create();
- r = mboxlist_allsubs(userid, addmbox_sub, list);
+ /* XXX: adding an entry to userdeny_db here would avoid the need to
+ * protect against new logins with external proxy rules - Cyrus could
+ * maintain its own safety */
+
+ /* first, disconnect all current connections for this user */
+ proc_killuser(userid);
+
+ r = mboxlist_allsubs(userid, addmbox_sub, sublist);
 if (r) goto fail;
 
 /* ignore failures here - the subs file gets deleted soon anyway */
- for (item = list->head; item; item = item->next) {
-	r = (sync_namespacep->mboxname_tointernal)(sync_namespacep, item->name,
-						 userid, buf);
- if (!r) r = mboxlist_changesub(buf, userid, sync_authstate, 0, 0);
+ for (item = sublist->head; item; item = item->next) {
+	(void)mboxlist_changesub(item->name, userid, sync_authstate, 0, 0, 0);
 }
- sync_name_list_free(&list);
-
- /* Nuke normal folders */
- list = sync_name_list_create();
 
- (sync_namespacep->mboxname_tointernal)(sync_namespacep, "INBOX",
-					 userid, buf);
- strlcat(buf, ".*", sizeof(buf));
- r = (sync_namespacep->mboxlist_findall)(sync_namespacep, buf, 1,
-					 sync_userid, sync_authstate,
-					 addmbox, (void *)list);
+ r = mboxlist_allusermbox(userid, addmbox_sub, mblist, /*incdel*/1);
 if (r) goto fail;
 
- for (item = list->head; item; item = item->next) {
- r = mboxlist_deletemailbox(item->name, 1, sync_userid,
-				 sync_authstate, 0, 0, 1);
- if (r) goto fail;
+ for (item = mblist->head; item; item = item->next) {
+	r = mboxlist_deletemailbox(item->name, 1, sync_userid,
+				 sync_authstate, NULL, 0, 1, 0);
+	if (r == IMAP_MAILBOX_NONEXISTENT) {
+	 printf("skipping already removed mailbox %s\n", item->name);
+	}
+	else if (r) goto fail;
+	/* XXX - cheap and nasty hack around actually cleaning up the entry */
+	r = mboxlist_deleteremote(item->name, NULL);
+	if (r) goto fail;
 }
 
- /* Nuke inbox (recursive nuke possible?) */
- (sync_namespacep->mboxname_tointernal)(sync_namespacep, "INBOX",
-					 userid, buf);
- r = mboxlist_deletemailbox(buf, 1, sync_userid,
-			 sync_authstate, 0, 0, 1);
- if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
-
- r = user_deletedata((char *)userid, sync_userid, sync_authstate, 1);
+ r = user_deletedata(userid, 1);
 
 fail:
- sync_name_list_free(&list);
+ sync_name_list_free(&sublist);
+ sync_name_list_free(&mblist);
 
 return r;
 }
@@ -198,7 +181,7 @@
 int force = 0;
 int i;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -225,7 +208,7 @@
 
 /* Set up default bounds if no command line options provided */
 
- cyrus_init(alt_config, "sync_reset", 0);
+ cyrus_init(alt_config, "sync_reset", 0, CONFIG_NEED_PARTITION_DATA);
 
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(sync_namespacep, 1)) != 0) {
@@ -242,8 +225,8 @@
 signals_set_shutdown(&shut_down);
 signals_add_handlers(0);
 
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 if (!force) {
 fprintf(stderr, "Usage: sync_reset -f user user user ...\n");

cyrus-imapd-2.4.17.tar.gz/imap/sync_server.c -> cyrus-imapd-2.5.tar.gz/imap/sync_server.c Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_server.c,v 1.34 2010/01/06 17:01:41 murch Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -54,7 +52,6 @@
 #include <unistd.h>
 #endif
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -74,27 +71,25 @@
 #include <sasl/saslutil.h>
 
 #include "assert.h"
-#include "acl.h"
 #include "annotate.h"
 #include "append.h"
 #include "auth.h"
+#include "caldav_db.h"
+#include "carddav_db.h"
+#include "dav_db.h"
 #include "dlist.h"
-#include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
 #include "hash.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "imparse.h"
-#include "iptostring.h"
 #include "mailbox.h"
 #include "map.h"
 #include "mboxlist.h"
 #include "proc.h"
 #include "prot.h"
 #include "quota.h"
-#include "retry.h"
 #include "seen.h"
-#include "spool.h"
 #include "statuscache.h"
 #include "sync_log.h"
 #include "telemetry.h"
@@ -104,7 +99,6 @@
 #include "version.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
-#include "xstrlcpy.h"
 
 #include "message_guid.h"
 #include "sync_support.h"
@@ -123,22 +117,22 @@
 static SSL *tls_conn;
 #endif /* HAVE_SSL */
 
-sasl_conn_t *sync_saslconn = NULL; /* the sasl connection context */
-
-char *sync_userid = 0;
-struct namespace sync_namespace;
-struct namespace *sync_namespacep = &sync_namespace;
-struct auth_state *sync_authstate = 0;
-int sync_userisadmin = 0;
-struct sockaddr_storage sync_localaddr, sync_remoteaddr;
-int sync_haveaddr = 0;
-char sync_clienthostNI_MAXHOST*2+1 = "local";
-struct protstream *sync_out = NULL;
-struct protstream *sync_in = NULL;
+static sasl_conn_t *sync_saslconn = NULL; /* the sasl connection context */
+
+static char *sync_userid = 0;
+static struct namespace sync_namespace;
+static struct namespace *sync_namespacep = &sync_namespace;
+static struct auth_state *sync_authstate = 0;
+static int sync_userisadmin = 0;
+static const char *sync_clienthost = "local";
+static struct protstream *sync_out = NULL;
+static struct protstream *sync_in = NULL;
 static int sync_logfd = -1;
 static int sync_starttls_done = 0;
 static int sync_compress_done = 0;
 
+static int opt_force = 0;
+
 /* commands that have specific names */
 static void cmdloop(void);
 static void cmd_authenticate(char *mech, char *resp);
@@ -149,10 +143,11 @@
 
 /* generic commands - in dlist format */
 static void cmd_get(struct dlist *kl);
+static void cmd_set(const struct dlist *kl);
 static void cmd_apply(struct dlist *kl,
 		 struct sync_reserve_list *reserve_list);
 
-void usage(void);
+static void usage(void);
 void shut_down(int code) __attribute__ ((noreturn));
 
 extern int saslserver(sasl_conn_t *conn, const char *mech,
@@ -187,7 +182,7 @@
 if (sync_in) {
 	prot_NONBLOCK(sync_in);
 	prot_fill(sync_in);
-	
+
 	prot_free(sync_in);
 }
 
@@ -195,7 +190,7 @@
 	prot_flush(sync_out);
 	prot_free(sync_out);
 }
- 
+
 sync_in = sync_out = NULL;
 
 #ifdef HAVE_SSL
@@ -207,7 +202,7 @@
 
 cyrus_reset_stdio();
 
- strcpy(sync_clienthost, "local");
+ sync_clienthost = "local";
 if (sync_logfd != -1) {
 	close(sync_logfd);
 	sync_logfd = -1;
@@ -261,11 +256,14 @@
 /* load the SASL plugins */
 global_sasl_init(1, 1, mysasl_cb);
 
- while ((opt = getopt(argc, argv, "p:")) != EOF) {
+ while ((opt = getopt(argc, argv, "p:f")) != EOF) {
 	switch(opt) {
 	case 'p': /* external protection */
 	 extprops_ssf = atoi(optarg);
 	 break;
+	case 'f':
+	 opt_force = 1;
+	 break;
 	default:
 	 usage();
 	}
@@ -273,7 +271,7 @@
 
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(sync_namespacep, 1)) != 0) {
- fatal(error_message(r), EC_CONFIG);
+	fatal(error_message(r), EC_CONFIG);
 }
 
 /* open the mboxlist, we'll need it for real work */
@@ -285,14 +283,18 @@
 quotadb_open(NULL);
 
 /* Initialize the annotatemore extention */
- annotatemore_init(0, NULL, NULL);
- annotatemore_open(NULL);
+ annotate_init(NULL, NULL);
+ annotatemore_open();
 
 /* Open the statuscache so we can invalidate seen states */
 if (config_getswitch(IMAPOPT_STATUSCACHE)) {
-	statuscache_open(NULL);
+	statuscache_open();
 }
 
+ dav_init();
+ caldav_init();
+ carddav_init();
+
 return 0;
 }
 
@@ -323,6 +325,10 @@
 #endif
 }
 
+ /* Tell the client about how we're willing to do SYNC_CRCs */
+ prot_printf(sync_out, "* CRC_VERSIONS %u-%u\r\n",
+		MAILBOX_CRC_VERSION_MIN, MAILBOX_CRC_VERSION_MAX);
+
 prot_printf(sync_out,
 		"* OK %s Cyrus sync server %s\r\n",
 		config_servername, cyrus_version());
@@ -338,11 +344,9 @@
 		 char **envp __attribute__((unused)))
 {
 struct protoent *proto;
- socklen_t salen;
- char localip60, remoteip60;
- char hbufNI_MAXHOST;
- int niflags;
+ const char *localip, *remoteip;
 sasl_security_properties_t *secprops = NULL;
+ int timeout;
 
 signals_poll();
 
@@ -354,38 +358,17 @@
 prot_setisclient(sync_out, 1);
 
 /* Find out name of client host */
- salen = sizeof(sync_remoteaddr);
- if (getpeername(0, (struct sockaddr *)&sync_remoteaddr, &salen) == 0 &&
-	(sync_remoteaddr.ss_family == AF_INET ||
-	 sync_remoteaddr.ss_family == AF_INET6)) {
-	if (getnameinfo((struct sockaddr *)&sync_remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-	 strncpy(sync_clienthost, hbuf, sizeof(hbuf));
-	 strlcat(sync_clienthost, " ", sizeof(sync_clienthost));
-	 sync_clienthostsizeof(sync_clienthost)-30 = '\0';
-	} else {
-	 sync_clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&sync_remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&sync_remoteaddr, salen, hbuf,
-			sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(sync_clienthost, "", sizeof(sync_clienthost));
-	strlcat(sync_clienthost, hbuf, sizeof(sync_clienthost));
-	strlcat(sync_clienthost, "", sizeof(sync_clienthost));
-	salen = sizeof(sync_localaddr);
-	if (getsockname(0, (struct sockaddr *)&sync_localaddr, &salen) == 0) {
-	 sync_haveaddr = 1;
-	}
-
+ sync_clienthost = get_clienthost(0, &localip, &remoteip);
+ if (!strcmp(sync_clienthost, UNIX_SOCKET)) {
+	/* we're not connected to an internet socket! */
+	sync_userid = xstrdup("cyrus");
+	sync_userisadmin = 1;
+ }
+ else {
 	/* other params should be filled in */
 	if (sasl_server_new("csync", config_servername, NULL, NULL, NULL,
 			 NULL, 0, &sync_saslconn) != SASL_OK)
-	 fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); 
+	 fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL);
 
 	/* will always return something valid */
 	secprops = mysasl_secprops(SASL_SEC_NOANONYMOUS);
@@ -394,15 +377,13 @@
 
 	if (sasl_setprop(sync_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf) != SASL_OK)
 	 fatal("Failed to set SASL property", EC_TEMPFAIL);
- 
-	if(iptostring((struct sockaddr *)&sync_localaddr, salen,
-		 localip, 60) == 0) {
+
+	if (localip) {
 	 sasl_setprop(sync_saslconn, SASL_IPLOCALPORT, localip);
 	 saslprops.iplocalport = xstrdup(localip);
 	}
- 
-	if(iptostring((struct sockaddr *)&sync_remoteaddr, salen,
-		 remoteip, 60) == 0) {
+
+	if (remoteip) {
 	 if (sasl_setprop(sync_saslconn, SASL_IPREMOTEPORT, remoteip) != SASL_OK)
 		fatal("failed to set sasl property", EC_TEMPFAIL);
 	 saslprops.ipremoteport = xstrdup(remoteip);
@@ -422,26 +403,24 @@
 	} else {
 	 syslog(LOG_ERR, "unable to getprotobyname(\"tcp\"): %m");
 	}
- } else {
-	/* we're not connected to an internet socket! */
-	strcpy(sync_clienthost, "unix socket");
-	sync_userid = xstrdup("cyrus");
-	sync_userisadmin = 1;
 }
 
- proc_register("sync_server", sync_clienthost, NULL, NULL);
-#if 0
+ proc_register(config_ident, sync_clienthost, NULL, NULL, NULL);
+
 /* Set inactivity timer */
- timeout = config_getint(IMAPOPT_TIMEOUT);
+ timeout = config_getint(IMAPOPT_SYNC_TIMEOUT);
 if (timeout < 3) timeout = 3;
- prot_settimeout(sync_in, timeout*60);
-#endif
+ prot_settimeout(sync_in, timeout);
+
 prot_setflushonread(sync_in, sync_out);
 
 sync_log_init();
 if (!config_getswitch(IMAPOPT_SYNC_LOG_CHAIN))
 	sync_log_suppress();
 
+ /* initialise with defaults */
+ sync_crc_setup(MAILBOX_CRC_VERSION_MIN, MAILBOX_CRC_VERSION_MIN, /*strict*/1);
+
 dobanner();
 
 cmdloop();
@@ -460,7 +439,7 @@
 shut_down(error);
 }
 
-void usage(void)
+static void usage(void)
 {
 prot_printf(sync_out, "* usage: sync_server -C <alt_config>\r\n");
 prot_flush(sync_out);
@@ -476,6 +455,10 @@
 
 proc_cleanup();
 
+ carddav_done();
+ caldav_done();
+ dav_done();
+
 if (config_getswitch(IMAPOPT_STATUSCACHE)) {
 	statuscache_close();
 	statuscache_done();
@@ -489,7 +472,7 @@
 quotadb_done();
 
 annotatemore_close();
- annotatemore_done();
+ annotate_done();
 
 if (sync_in) {
 	prot_NONBLOCK(sync_in);
@@ -511,7 +494,7 @@
 exit(code);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
 static int recurse_code = 0;
 
@@ -526,11 +509,12 @@
 	prot_flush(sync_out);
 }
 syslog(LOG_ERR, "Fatal error: %s", s);
+ abort();
 shut_down(code);
 }
 
 /* Reset the given sasl_conn_t to a sane state */
-static int reset_saslconn(sasl_conn_t **conn) 
+static int reset_saslconn(sasl_conn_t **conn)
 {
 int ret;
 sasl_security_properties_t *secprops = NULL;
@@ -538,13 +522,13 @@
 sasl_dispose(conn);
 /* do initialization typical of service_main */
 ret = sasl_server_new("csync", config_servername,
- NULL, NULL, NULL,
- NULL, 0, conn);
+			 NULL, NULL, NULL,
+			 NULL, 0, conn);
 if (ret != SASL_OK) return ret;
 
 if (saslprops.ipremoteport)
 ret = sasl_setprop(*conn, SASL_IPREMOTEPORT,
- saslprops.ipremoteport);
+			 saslprops.ipremoteport);
 if (ret != SASL_OK) return ret;
 
 if (saslprops.iplocalport)
@@ -588,11 +572,11 @@
 reserve_list = sync_reserve_list_create(SYNC_MESSAGE_LIST_HASH_SIZE);
 
 for (;;) {
- prot_flush(sync_out);
+	prot_flush(sync_out);
 
 	/* Parse command name */
 	if ((c = getword(sync_in, &cmd)) == EOF)
- break;
+	 break;
 
 	if (!cmd.s0) {
 	 prot_printf(sync_out, "BAD Null command\r\n");
@@ -627,7 +611,7 @@
 		}
 		if (c == '\r') c = prot_getc(sync_in);
 		if (c != '\n') goto extraargs;
-		
+
 		if (sync_userid) {
 		 prot_printf(sync_out, "BAD Already authenticated\r\n");
 		 continue;
@@ -642,8 +626,10 @@
 		 cmd_apply(kl, reserve_list);
 		 dlist_free(&kl);
 		}
-		else
+		else {
+		 syslog(LOG_ERR, "IOERROR: received bad APPLY command");
 		 prot_printf(sync_out, "BAD IMAP_PROTOCOL_ERROR Failed to parse APPLY line\r\n");
+		}
 		continue;
 	 }
 	 break;
@@ -657,7 +643,7 @@
 		cmd_compress(arg1.s);
 		continue;
 	 }
- break;
+	 break;
 
 	case 'G':
 	 if (!sync_userid) goto nologin;
@@ -667,8 +653,10 @@
 		 cmd_get(kl);
 		 dlist_free(&kl);
 		}
-		else
+		else {
+		 syslog(LOG_ERR, "IOERROR: received bad GET command");
 		 prot_printf(sync_out, "BAD IMAP_PROTOCOL_ERROR Failed to parse GET line\r\n");
+		}
 		continue;
 	 }
 	 break;
@@ -692,7 +680,7 @@
 	 }
 	 break;
 
- case 'R':
+	case 'R':
 	 if (!strcmp(cmd.s, "Restart")) {
 		if (c == '\r') c = prot_getc(sync_in);
 		if (c != '\n') goto extraargs;
@@ -704,7 +692,7 @@
 	 else if (!sync_userid) goto nologin;
 	 break;
 
- case 'S':
+	case 'S':
 	 if (!strcmp(cmd.s, "Starttls") && tls_enabled()) {
 		if (c == '\r') c = prot_getc(sync_in);
 		if (c != '\n') goto extraargs;
@@ -714,23 +702,36 @@
 
 		/* if we've already done SASL fail */
 		if (sync_userid != NULL) {
-		 prot_printf(sync_out, 
+		 prot_printf(sync_out,
 				"BAD Can't Starttls after authentication\r\n");
 		 continue;
 		}
 		/* check if already did a successful tls */
 		if (sync_starttls_done == 1) {
-		 prot_printf(sync_out, 
+		 prot_printf(sync_out,
 				"BAD Already did a successful Starttls\r\n");
 		 continue;
 		}
 		cmd_starttls();
 		continue;
 	 }
+	 else if (!strcmp(cmd.s, "Set")) {
+		kl = sync_parseline(sync_in);
+		if (kl) {
+		 cmd_set(kl);
+		 dlist_free(&kl);
+		}
+		else {
+		 syslog(LOG_ERR, "IOERROR: received bad SET command");
+		 prot_printf(sync_out, "BAD IMAP_PROTOCOL_ERROR Failed to parse SET line\r\n");
+		}
+		continue;
+	 }
 	 break;
 
- }
+	}
 
+	syslog(LOG_ERR, "IOERROR: received bad command: %s", cmd.s);
 	prot_printf(sync_out, "BAD IMAP_PROTOCOL_ERROR Unrecognized command\r\n");
 	eatline(sync_in, c);
 	continue;
@@ -765,7 +766,7 @@
 {
 int r, sasl_result;
 sasl_ssf_t ssf;
- char *ssfmsg = NULL;
+ const char *ssfmsg = NULL;
 const void *val;
 int failedloginpause;
 
@@ -792,7 +793,7 @@
 			"NO Error reading client response: %s\r\n",
 			errorstring ? errorstring : "");
 	 break;
-	default: 
+	default:
 	 /* failed authentication */
 	 errorstring = sasl_errstring(sasl_result, NULL, NULL);
 
@@ -801,7 +802,7 @@
 
 	 failedloginpause = config_getint(IMAPOPT_FAILEDLOGINPAUSE);
 	 if (failedloginpause != 0) {
-	 sleep(failedloginpause);
+		sleep(failedloginpause);
 	 }
 
 	 if (errorstring) {
@@ -822,16 +823,16 @@
 */
 sasl_result = sasl_getprop(sync_saslconn, SASL_USERNAME, &val);
 if (sasl_result != SASL_OK) {
-	prot_printf(sync_out, "NO weird SASL error %d SASL_USERNAME\r\n", 
+	prot_printf(sync_out, "NO weird SASL error %d SASL_USERNAME\r\n",
 		 sasl_result);
-	syslog(LOG_ERR, "weird SASL error %d getting SASL_USERNAME", 
+	syslog(LOG_ERR, "weird SASL error %d getting SASL_USERNAME",
 	 sasl_result);
 	reset_saslconn(&sync_saslconn);
 	return;
 }
 
 sync_userid = xstrdup((const char *) val);
- proc_register("sync_server", sync_clienthost, sync_userid, NULL);
+ proc_register(config_ident, sync_clienthost, sync_userid, NULL, NULL);
 
 syslog(LOG_NOTICE, "login: %s %s %s%s %s", sync_clienthost, sync_userid,
 	 mech, sync_starttls_done ? "+TLS" : "", "User logged in");
@@ -864,13 +865,6 @@
 sync_logfd = telemetry_log(sync_userid, sync_in, sync_out, 0);
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for sync_server!",
-	 EC_SOFTWARE);
-}
-
 #ifdef HAVE_SSL
 static void cmd_starttls(void)
 {
@@ -880,7 +874,7 @@
 char *auth_id;
 
 if (sync_starttls_done == 1) {
-	prot_printf(sync_out, "NO %s\r\n", 
+	prot_printf(sync_out, "NO %s\r\n",
 		 "Already successfully executed STARTTLS");
 	return;
 }
@@ -902,7 +896,7 @@
 prot_printf(sync_out, "OK %s\r\n", "Begin TLS negotiation now");
 /* must flush our buffers before starting tls */
 prot_flush(sync_out);
- 
+
 result=tls_start_servertls(0, /* read */
 			 1, /* write */
 			 180, /* 3 minutes */
@@ -926,7 +920,7 @@
 
 result = sasl_setprop(sync_saslconn, SASL_AUTH_EXTERNAL, auth_id);
 if (result != SASL_OK) {
- fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
+	fatal("sasl_setprop() failed: cmd_starttls()", EC_TEMPFAIL);
 }
 if (saslprops.authid) {
 	free(saslprops.authid);
@@ -995,8 +989,8 @@
 
 /* Is name already on list? */
 for (p=pl; p; p = p->next) {
- if (!strcmp(p->name, name))
- return(pl);
+	if (!strcmp(p->name, name))
+	 return(pl);
 }
 
 /* Add entry to start of list and return new list */
@@ -1011,14 +1005,13 @@
 partition_list_free(struct partition_list *current)
 {
 while (current) {
- struct partition_list *next = current->next;
+	struct partition_list *next = current->next;
 
- free(current->name);
- free(current);
+	free(current->name);
+	free(current);
 
- current = next;
+	current = next;
 }
- 
 }
 
 static void cmd_restart(struct sync_reserve_list **reserve_listp, int re_alloc)
@@ -1032,21 +1025,21 @@
 
 for (res = l->head; res; res = res->next) {
 	for (msg = res->list->head; msg; msg = msg->next) {
- pl = partition_list_add(res->part, pl);
+	 pl = partition_list_add(res->part, pl);
 
 	 fname = dlist_reserve_path(res->part, &msg->guid);
 	 unlink(fname);
 	}
 }
 sync_reserve_list_free(reserve_listp);
- 
+
 /* Remove all <partition>/sync./<pid> directories referred to above */
 for (p=pl; p ; p = p->next) {
- static char bufMAX_MAILBOX_PATH;
+	static char bufMAX_MAILBOX_PATH;
 
- snprintf(buf, MAX_MAILBOX_PATH, "%s/sync./%lu", 
- config_partitiondir(p->name), (unsigned long)getpid());
- rmdir(buf);
+	snprintf(buf, MAX_MAILBOX_PATH, "%s/sync./%lu",
+		 config_partitiondir(p->name), (unsigned long)getpid());
+	rmdir(buf);
 }
 partition_list_free(pl);
 
@@ -1058,7 +1051,7 @@
 
 /* ====================================================================== */
 
-void reserve_folder(const char *part, const char *mboxname,
+static void reserve_folder(const char *part, const char *mboxname,
 		 struct sync_msgid_list *part_list)
 {
 struct mailbox *mailbox = NULL;
@@ -1071,24 +1064,29 @@
 
 /* Open and lock mailbox */
 r = mailbox_open_irl(mboxname, &mailbox);
- 
+
 if (r) return;
 
- for (recno = 1; 
-	 part_list->marked < part_list->count && recno <= mailbox->i.num_records;
-	 recno++) {
+ for (recno = 1; recno <= mailbox->i.num_records; recno++) {
+	/* ok to skip errors here - just means they'll be uploaded
+	 * rather than reserved */
 	if (mailbox_read_index_record(mailbox, recno, &record))
 	 continue;
 
 	if (record.system_flags & FLAG_UNLINKED)
 	 continue;
 
+	/* do we need it? */
 	item = sync_msgid_lookup(part_list, &record.guid);
-	if (!item || item->mark)
+	if (!item)
+	 continue;
+
+	/* have we already found it? */
+	if (!item->need_upload)
 	 continue;
 
 	/* Attempt to reserve this message */
-	mailbox_msg_path = mailbox_message_fname(mailbox, record.uid);
+	mailbox_msg_path = mailbox_record_fname(mailbox, &record);
 	stage_msg_path = dlist_reserve_path(part, &record.guid);
 
 	/* check that the sha1 of the file on disk is correct */
@@ -1111,8 +1109,11 @@
 	 continue;
 	}
 
-	item->mark = 1;
-	part_list->marked++;
+	item->need_upload = 0;
+	part_list->toupload--;
+
+	/* already found everything, drop out */
+	if (!part_list->toupload) break;
 }
 
 mailbox_close(&mailbox);
@@ -1120,18 +1121,17 @@
 
 static int do_reserve(struct dlist *kl, struct sync_reserve_list *reserve_list)
 {
- struct message_guid tmp_guid;
- struct sync_name_list *missing = sync_name_list_create();
+ struct message_guid *tmpguid;
 struct sync_name_list *folder_names = sync_name_list_create();
 struct sync_msgid_list *part_list;
 struct sync_msgid *item;
 struct sync_name *folder;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 const char *partition = NULL;
 struct dlist *ml;
 struct dlist *gl;
 struct dlist *i;
- struct dlist *kout;
+ struct dlist *kout = NULL;
 
 if (!dlist_getatom(kl, "PARTITION", &partition)) goto parse_err;
 if (!dlist_getlist(kl, "MBOXNAME", &ml)) goto parse_err;
@@ -1139,9 +1139,9 @@
 
 part_list = sync_reserve_partlist(reserve_list, partition);
 for (i = gl->head; i; i = i->next) {
-	if (!i->sval || !message_guid_decode(&tmp_guid, i->sval))
+	if (!dlist_toguid(i, &tmpguid))
 	 goto parse_err;
-	sync_msgid_add(part_list, &tmp_guid);
+	sync_msgid_insert(part_list, tmpguid);
 }
 
 /* need a list so we can mark items */
@@ -1149,46 +1149,51 @@
 	sync_name_list_add(folder_names, i->sval);
 }
 
- for (folder = folder_names->head; 
-	 part_list->marked < part_list->count && folder;
-	 folder = folder->next) {
-	if (mboxlist_lookup(folder->name, &mbentry, 0) ||
-	 strcmp(mbentry.partition, partition))
+ for (folder = folder_names->head; folder; folder = folder->next) {
+	if (!part_list->toupload) break;
+	if (mboxlist_lookup(folder->name, &mbentry, 0))
+	 continue;
+	if (strcmp(mbentry->partition, partition)) {
+	 mboxlist_entry_free(&mbentry);
 	 continue; /* try folders on the same partition first! */
+	}
+	mboxlist_entry_free(&mbentry);
 	reserve_folder(partition, folder->name, part_list);
 	folder->mark = 1;
 }
 
 /* if we have other folders, check them now */
- for (folder = folder_names->head; 
-	 part_list->marked < part_list->count && folder;
-	 folder = folder->next) {
+ for (folder = folder_names->head; folder; folder = folder->next) {
+	if (!part_list->toupload) break;
 	if (folder->mark)
 	 continue;
 	reserve_folder(partition, folder->name, part_list);
+	folder->mark = 1;
 }
 
 /* check if we missed any */
- kout = dlist_list(NULL, "MISSING");
+ kout = dlist_newlist(NULL, "MISSING");
 for (i = gl->head; i; i = i->next) {
-	if (!message_guid_decode(&tmp_guid, i->sval))
-	 continue;
-	item = sync_msgid_lookup(part_list, &tmp_guid);
-	if (item && !item->mark)
-	 dlist_atom(kout, "GUID", i->sval);
+	if (!dlist_toguid(i, &tmpguid))
+	 goto parse_err;
+	item = sync_msgid_lookup(part_list, tmpguid);
+	if (item->need_upload)
+	 dlist_setguid(kout, "GUID", tmpguid);
 }
+
 if (kout->head)
 	sync_send_response(kout, sync_out);
 dlist_free(&kout);
 
 sync_name_list_free(&folder_names);
- sync_name_list_free(&missing);
+ mboxlist_entry_free(&mbentry);
 
 return 0;
 
 parse_err:
+ dlist_free(&kout);
 sync_name_list_free(&folder_names);
- sync_name_list_free(&missing);
+ mboxlist_entry_free(&mbentry);
 
 return IMAP_PROTOCOL_BAD_PARAMETERS;
 }
@@ -1203,14 +1208,12 @@
 static int do_quota(struct dlist *kin)
 {
 const char *root;
- uint32_t limit;
+ int limitsQUOTA_NUMRESOURCES;
 
 if (!dlist_getatom(kin, "ROOT", &root))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "LIMIT", &limit))
-	return IMAP_PROTOCOL_BAD_PARAMETERS;
-
- return mboxlist_setquota(root, limit, 1);
+ sync_decode_quota_limits(kin, limits);
+ return mboxlist_setquotas(root, limits, 1);
 }
 
 /* ====================================================================== */
@@ -1222,15 +1225,21 @@
 struct index_record rrecord;
 uint32_t recno = 1;
 struct dlist *ki;
+ struct sync_annot_list *mannots = NULL;
+ struct sync_annot_list *rannots = NULL;
 int r;
 int i;
+ int has_append = 0;
 
 rrecord.uid = 0;
 for (ki = kr->head; ki; ki = ki->next) {
-	r = parse_upload(ki, mailbox, &mrecord);
+	sync_annot_list_free(&mannots);
+	sync_annot_list_free(&rannots);
+
+	r = parse_upload(ki, mailbox, &mrecord, &mannots);
 	if (r) {
-	 syslog(LOG_ERR, "Failed to parse uploaded record"); 
-	 return r;
+	 syslog(LOG_ERR, "SYNCERROR: failed to parse uploaded record");
+	 return IMAP_PROTOCOL_ERROR;
 	}
 
 	while (rrecord.uid < mrecord.uid) {
@@ -1243,59 +1252,91 @@
 	 /* read another record */
 	 r = mailbox_read_index_record(mailbox, recno, &rrecord);
 	 if (r) {
-		syslog(LOG_ERR, "Failed to read record %s %d",
+		syslog(LOG_ERR, "IOERROR: failed to read record %s %u",
 		 mailbox->name, recno);
-		return r;
+		goto out;
 	 }
 	 recno++;
 	}
 
 	/* found a match, check for updates */
 	if (rrecord.uid == mrecord.uid) {
-	 /* GUID mismatch on a non-expunged record is an error straight away */
+	 /* higher modseq on the replica is an error */
+	 if (rrecord.modseq > mrecord.modseq) {
+		if (opt_force) {
+		 syslog(LOG_NOTICE, "forcesync: higher modseq on replica %s %u (" MODSEQ_FMT " > " MODSEQ_FMT ")",
+			 mailbox->name, mrecord.uid, rrecord.modseq, mrecord.modseq);
+		}
+		else {
+		 syslog(LOG_ERR, "SYNCERROR: higher modseq on replica %s %u (" MODSEQ_FMT " > " MODSEQ_FMT ")",
+			 mailbox->name, mrecord.uid, rrecord.modseq, mrecord.modseq);
+		 r = IMAP_SYNC_CHECKSUM;
+		 goto out;
+		}
+	 }
+
+	 /* everything else only matters if we're not expunged */
 	 if (!(mrecord.system_flags & FLAG_EXPUNGED)) {
+		/* GUID mismatch on a non-expunged record is an error straight away */
 		if (!message_guid_equal(&mrecord.guid, &rrecord.guid)) {
 		 syslog(LOG_ERR, "SYNCERROR: guid mismatch %s %u",
 			 mailbox->name, mrecord.uid);
-		 return IMAP_MAILBOX_CRC;
+		 r = IMAP_SYNC_CHECKSUM;
+		 goto out;
 		}
+
+		/* if it's already expunged on the replica, but alive on the master,
+		 * that's bad */
 		if (rrecord.system_flags & FLAG_EXPUNGED) {
 		 syslog(LOG_ERR, "SYNCERROR: expunged on replica %s %u",
 			 mailbox->name, mrecord.uid);
-		 return IMAP_MAILBOX_CRC;
+		 r = IMAP_SYNC_CHECKSUM;
+		 goto out;
 		}
 	 }
-	 /* higher modseq on the replica is an error */
-	 if (rrecord.modseq > mrecord.modseq) {
-		syslog(LOG_ERR, "SYNCERROR: higher modseq on replica %s %u",
-		 mailbox->name, mrecord.uid);
-		return IMAP_MAILBOX_CRC;
-	 }
 
 	 /* skip out on the first pass */
 	 if (!doupdate) continue;
 
+	 rrecord.cid = mrecord.cid;
 	 rrecord.modseq = mrecord.modseq;
 	 rrecord.last_updated = mrecord.last_updated;
 	 rrecord.internaldate = mrecord.internaldate;
-	 rrecord.system_flags = (mrecord.system_flags & ~FLAG_UNLINKED) |
-				 (rrecord.system_flags & FLAG_UNLINKED);
+	 rrecord.system_flags = (mrecord.system_flags & FLAGS_GLOBAL) |
+				 (rrecord.system_flags & FLAGS_LOCAL);
 	 for (i = 0; i < MAX_USER_FLAGS/32; i++)
 		rrecord.user_flagsi = mrecord.user_flagsi;
+
+	 r = read_annotations(mailbox, &rrecord, &rannots);
+	 if (r) {
+		syslog(LOG_ERR, "Failed to read local annotations %s %u: %s",
+		 mailbox->name, recno, error_message(r));
+		goto out;
+	 }
+
+	 r = apply_annotations(mailbox, &rrecord, rannots, mannots, 0);
+	 if (r) {
+		syslog(LOG_ERR, "Failed to write merged annotations %s %u: %s",
+		 mailbox->name, recno, error_message(r));
+		goto out;
+	 }
+
 	 rrecord.silent = 1;
 	 r = mailbox_rewrite_index_record(mailbox, &rrecord);
 	 if (r) {
-		syslog(LOG_ERR, "IOERROR: failed to rewrite record %s %d",
+		syslog(LOG_ERR, "IOERROR: failed to rewrite record %s %u",
 		 mailbox->name, recno);
-		return r;
+		goto out;
 	 }
 	}
 
 	/* not found and less than LAST_UID, bogus */
 	else if (mrecord.uid <= mailbox->i.last_uid) {
 	 /* Expunged, just skip it */
-	 if (!(mrecord.system_flags & FLAG_EXPUNGED))
-		return IMAP_MAILBOX_CRC;
+	 if (!(mrecord.system_flags & FLAG_EXPUNGED)) {
+		r = IMAP_SYNC_CHECKSUM;
+		goto out;
+	 }
 	}
 
 	/* after LAST_UID, it's an append, that's OK */
@@ -1304,16 +1345,26 @@
 	 if (!doupdate) continue;
 
 	 mrecord.silent = 1;
-	 r = sync_append_copyfile(mailbox, &mrecord);
+	 r = sync_append_copyfile(mailbox, &mrecord, mannots);
 	 if (r) {
 		syslog(LOG_ERR, "IOERROR: failed to append file %s %d",
 		 mailbox->name, recno);
-		return r;
+		goto out;
 	 }
+
+	 has_append = 1;
 	}
 }
 
- return 0;
+ if (has_append)
+	sync_log_append(mailbox->name);
+
+ r = 0;
+
+out:
+ sync_annot_list_free(&mannots);
+ sync_annot_list_free(&rannots);
+ return r;
 }
 
 static int do_mailbox(struct dlist *kin)
@@ -1322,12 +1373,15 @@
 const char *uniqueid;
 const char *partition;
 const char *mboxname;
+ const char *mboxtype = NULL; /* optional */
+ uint32_t mbtype;
 uint32_t last_uid;
 modseq_t highestmodseq;
 uint32_t recentuid;
 time_t recenttime;
 time_t last_appenddate;
 time_t pop3_last_login;
+ time_t pop3_show_after = 0; /* optional */
 uint32_t uidvalidity;
 const char *acl;
 const char *options_str;
@@ -1335,22 +1389,30 @@
 
 uint32_t options;
 
+ /* optional fields */
+ modseq_t xconvmodseq = 0;
+
 struct mailbox *mailbox = NULL;
- uint32_t newcrc;
 struct dlist *kr;
+ struct dlist *ka = NULL;
 int r;
 
+ struct sync_annot_list *mannots = NULL;
+ struct sync_annot_list *rannots = NULL;
+
+ annotate_state_t *astate = NULL;
+
 if (!dlist_getatom(kin, "UNIQUEID", &uniqueid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getatom(kin, "PARTITION", &partition))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getatom(kin, "MBOXNAME", &mboxname))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "LAST_UID", &last_uid))
+ if (!dlist_getnum32(kin, "LAST_UID", &last_uid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getmodseq(kin, "HIGHESTMODSEQ", &highestmodseq))
+ if (!dlist_getnum64(kin, "HIGHESTMODSEQ", &highestmodseq))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "RECENTUID", &recentuid))
+ if (!dlist_getnum32(kin, "RECENTUID", &recentuid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kin, "RECENTTIME", &recenttime))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
@@ -1358,9 +1420,7 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kin, "POP3_LAST_LOGIN", &pop3_last_login))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "SYNC_CRC", &sync_crc))
-	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "UIDVALIDITY", &uidvalidity))
+ if (!dlist_getnum32(kin, "UIDVALIDITY", &uidvalidity))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getatom(kin, "ACL", &acl))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
@@ -1369,59 +1429,163 @@
 if (!dlist_getlist(kin, "RECORD", &kr))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
+ /* Get the CRC */
+ if (!dlist_getnum32(kin, "SYNC_CRC", &sync_crc))
+	return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ /* optional */
+ dlist_getlist(kin, "ANNOTATIONS", &ka);
+ dlist_getdate(kin, "POP3_SHOW_AFTER", &pop3_show_after);
+ dlist_getatom(kin, "MBOXTYPE", &mboxtype);
+ dlist_getnum64(kin, "XCONVMODSEQ", &xconvmodseq);
+
 options = sync_parse_options(options_str);
- 
+ mbtype = mboxlist_string_to_mbtype(mboxtype);
+
 r = mailbox_open_iwl(mboxname, &mailbox);
 if (r == IMAP_MAILBOX_NONEXISTENT) {
-	r = mboxlist_createsync(mboxname, 0, partition,
+	r = mboxlist_createsync(mboxname, mbtype, partition,
 				sync_userid, sync_authstate,
-				options, uidvalidity, acl,
+				options, uidvalidity,
+				highestmodseq, acl,
 				uniqueid, &mailbox);
+	/* set a highestmodseq of 0 so ALL changes are future
+	 * changes and get applied */
+	if (!r) mailbox->i.highestmodseq = 0;
 }
 if (r) {
-	syslog(LOG_ERR, "Failed to open mailbox %s to update", mboxname);
-	return r;
+	syslog(LOG_ERR, "Failed to open mailbox %s to update: %s",
+	 mboxname, error_message(r));
+	goto done;
 }
 
+ if (mailbox->mbtype != mbtype) {
+	syslog(LOG_ERR, "INVALID MAILBOX TYPE %s (%d, %d)", mailbox->name, mailbox->mbtype, mbtype);
+	/* is this even possible? */
+	r = IMAP_MAILBOX_BADTYPE;
+	goto done;
+ }
+
+ /* hold the annotate state open */
+ mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, &astate);
+ /* and make it hold a transaction open */
+ annotate_state_begin(astate);
+
 if (strcmp(mailbox->uniqueid, uniqueid)) {
-	syslog(LOG_ERR, "Mailbox uniqueid changed %s - retry", mboxname);
-	mailbox_close(&mailbox);
-	return IMAP_MAILBOX_MOVED;
+	if (opt_force) {
+	 syslog(LOG_NOTICE, "forcesync: fixing uniqueid %s (%s => %s)",
+		 mboxname, mailbox->uniqueid, uniqueid);
+	 free(mailbox->uniqueid);
+	 mailbox->uniqueid = xstrdup(uniqueid);
+	 mailbox->header_dirty = 1;
+	}
+	else {
+	 syslog(LOG_ERR, "Mailbox uniqueid changed %s (%s => %s) - retry",
+		 mboxname, mailbox->uniqueid, uniqueid);
+	 r = IMAP_MAILBOX_MOVED;
+	 goto done;
+	}
 }
 
 /* skip out now, it's going to mismatch for sure! */
 if (highestmodseq < mailbox->i.highestmodseq) {
-	syslog(LOG_ERR, "higher modseq on replica %s - "
-	 MODSEQ_FMT " < " MODSEQ_FMT,
-	 mboxname, highestmodseq, mailbox->i.highestmodseq);
-	mailbox_close(&mailbox);
-	return IMAP_MAILBOX_CRC;
+	if (opt_force) {
+	 syslog(LOG_NOTICE, "forcesync: higher modseq on replica %s - "
+		 MODSEQ_FMT " < " MODSEQ_FMT,
+		 mboxname, highestmodseq, mailbox->i.highestmodseq);
+	}
+	else {
+	 syslog(LOG_ERR, "higher modseq on replica %s - "
+		 MODSEQ_FMT " < " MODSEQ_FMT,
+		 mboxname, highestmodseq, mailbox->i.highestmodseq);
+	 r = IMAP_SYNC_CHECKSUM;
+	 goto done;
+	}
+ }
+
+ /* skip out now, it's going to mismatch for sure! */
+ if (uidvalidity < mailbox->i.uidvalidity) {
+	if (opt_force) {
+	 syslog(LOG_NOTICE, "forcesync: higher uidvalidity on replica %s - %u < %u",
+		 mboxname, uidvalidity, mailbox->i.uidvalidity);
+	}
+	else {
+	 syslog(LOG_ERR, "higher uidvalidity on replica %s - %u < %u",
+		 mboxname, uidvalidity, mailbox->i.uidvalidity);
+	 r = IMAP_SYNC_CHECKSUM;
+	 goto done;
+	}
 }
 
+ /* skip out now, it's going to mismatch for sure! */
 if (last_uid < mailbox->i.last_uid) {
-	syslog(LOG_ERR, "higher last_uid on replica %s - %u < %u",
-	 mboxname, last_uid, mailbox->i.last_uid);
-	mailbox_close(&mailbox);
-	return IMAP_MAILBOX_CRC;
+	if (opt_force) {
+	 syslog(LOG_NOTICE, "forcesync: higher last_uid on replica %s - %u < %u",
+		 mboxname, last_uid, mailbox->i.last_uid);
+	}
+	else {
+	 syslog(LOG_ERR, "higher last_uid on replica %s - %u < %u",
+		 mboxname, last_uid, mailbox->i.last_uid);
+	 r = IMAP_SYNC_CHECKSUM;
+	 goto done;
+	}
 }
 
+ /* NOTE - this is optional */
+ if (mailbox_has_conversations(mailbox) && xconvmodseq) {
+	modseq_t ourxconvmodseq = 0;
+
+	r = mailbox_get_xconvmodseq(mailbox, &ourxconvmodseq);
+	if (r) {
+	 syslog(LOG_ERR, "Failed to read xconvmodseq for %s: %s",
+		 mboxname, error_message(r));
+	 goto done;
+	}
+
+	/* skip out now, it's going to mismatch for sure! */
+	if (xconvmodseq < ourxconvmodseq) {
+	 if (opt_force) {
+		syslog(LOG_NOTICE, "forcesync: higher xconvmodseq on replica %s - %llu < %llu",
+		 mboxname, xconvmodseq, ourxconvmodseq);
+	 }
+	 else {
+		syslog(LOG_ERR, "higher xconvmodseq on replica %s - %llu < %llu",
+		 mboxname, xconvmodseq, ourxconvmodseq);
+		r = IMAP_SYNC_CHECKSUM;
+		goto done;
+	 }
+	}
+ }
+
+ r = mailbox_compare_update(mailbox, kr, 0);
+ if (r) goto done;
+
+ /* now we're committed to writing something no matter what happens! */
+
+ /* always take the ACL from the master, it's not versioned */
 if (strcmp(mailbox->acl, acl)) {
 	mailbox_set_acl(mailbox, acl, 0);
 	r = mboxlist_sync_setacls(mboxname, acl);
-	if (r) {
-	 mailbox_close(&mailbox);
-	 return r;
-	}
+	if (r) goto done;
 }
 
 r = mailbox_compare_update(mailbox, kr, 0);
+ if (r) goto done;
+
+ /* take all mailbox (not message) annotations - aka metadata,
+ * they're not versioned either */
+ if (ka)
+	decode_annotations(ka, &mannots);
+
+ r = read_annotations(mailbox, NULL, &rannots);
+ if (!r) r = apply_annotations(mailbox, NULL, rannots, mannots, 0);
+
 if (r) {
-	mailbox_close(&mailbox);
-	return r;
+	syslog(LOG_ERR, "syncerror: annotations failed to apply to %s",
+	 mailbox->name);
+	goto done;
 }
 
- /* now we're committed to writing something no matter what happens! */
-
 r = mailbox_compare_update(mailbox, kr, 1);
 if (r) {
 	abort();
@@ -1429,50 +1593,70 @@
 }
 
 mailbox_index_dirty(mailbox);
- assert(mailbox->i.last_uid <= last_uid);
+ if (!opt_force) {
+	assert(mailbox->i.last_uid <= last_uid);
+ }
 mailbox->i.last_uid = last_uid;
- mailbox->i.highestmodseq = highestmodseq;
 mailbox->i.recentuid = recentuid;
 mailbox->i.recenttime = recenttime;
 mailbox->i.last_appenddate = last_appenddate;
 mailbox->i.pop3_last_login = pop3_last_login;
- /* mailbox->i.options = options; ... not really, there's unsyncable stuff in here */
+ mailbox->i.pop3_show_after = pop3_show_after;
+ /* only alter the syncable options */
+ mailbox->i.options = (options & MAILBOX_OPTIONS_MASK) |
+			 (mailbox->i.options & ~MAILBOX_OPTIONS_MASK);
+
+ /* this happens all the time! */
+ if (mailbox->i.highestmodseq != highestmodseq) {
+	mboxname_setmodseq(mailbox->name, highestmodseq);
+	mailbox->i.highestmodseq = highestmodseq;
+ }
 
- if (mailbox->i.uidvalidity < uidvalidity) {
-	syslog(LOG_ERR, "%s uidvalidity higher on master, updating %u => %u",
+ /* this happens rarely, so let us know */
+ if (mailbox->i.uidvalidity != uidvalidity) {
+	syslog(LOG_NOTICE, "%s uidvalidity changed, updating %u => %u",
 	 mailbox->name, mailbox->i.uidvalidity, uidvalidity);
+	/* make sure nothing new gets created with a lower value */
+	mboxname_setuidvalidity(mailbox->name, uidvalidity);
 	mailbox->i.uidvalidity = uidvalidity;
 }
 
- /* try re-calculating the CRC on mismatch... */
- if (mailbox->i.sync_crc != sync_crc) {
-	mailbox_index_recalc(mailbox);
+ if (mailbox_has_conversations(mailbox)) {
+	r = mailbox_update_xconvmodseq(mailbox, xconvmodseq, opt_force);
 }
- newcrc = mailbox->i.sync_crc;
+
+done:
+ sync_annot_list_free(&mannots);
+ sync_annot_list_free(&rannots);
+
+ /* check the CRC too */
+ if (!r && sync_crc != sync_crc_calc(mailbox, 0)) {
+	/* try forcing a recalculation */
+	if (sync_crc != sync_crc_calc(mailbox, 1))
+	 r = IMAP_SYNC_CHECKSUM;
+ }
+
 mailbox_close(&mailbox);
 
- /* check return value */
- if (r) return r;
- if (newcrc != sync_crc)
-	return IMAP_MAILBOX_CRC;
- return 0;
+ return r;
 }
 
 /* ====================================================================== */
 
 static int getannotation_cb(const char *mailbox __attribute__((unused)),
+			 uint32_t uid __attribute__((unused)),
 			 const char *entry, const char *userid,
-			 struct annotation_data *attrib,
+			 const struct buf *value,
 			 void *rock)
 {
 const char *mboxname = (char *)rock;
 struct dlist *kl;
 
- kl = dlist_new("ANNOTATION");
- dlist_atom(kl, "MBOXNAME", mboxname);
- dlist_atom(kl, "ENTRY", entry);
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "VALUE", attrib->value);
+ kl = dlist_newkvlist(NULL, "ANNOTATION");
+ dlist_setatom(kl, "MBOXNAME", mboxname);
+ dlist_setatom(kl, "ENTRY", entry);
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setmap(kl, "VALUE", value->s, value->len);
 sync_send_response(kl, sync_out);
 dlist_free(&kl);
 
@@ -1482,17 +1666,17 @@
 static int do_getannotation(struct dlist *kin)
 {
 const char *mboxname = kin->sval;
- return annotatemore_findall(mboxname, "*", &getannotation_cb,
-				(void *)mboxname, NULL);
+ return annotatemore_findall(mboxname, 0, "*", &getannotation_cb,
+				(void *)mboxname);
 }
 
 static void print_quota(struct quota *q)
 {
 struct dlist *kl;
 
- kl = dlist_new("QUOTA");
- dlist_atom(kl, "ROOT", q->root);
- dlist_num(kl, "LIMIT", q->limit);
+ kl = dlist_newkvlist(NULL, "QUOTA");
+ dlist_setatom(kl, "ROOT", q->root);
+ sync_encode_quota_limits(kl, q->limits);
 sync_send_response(kl, sync_out);
 dlist_free(&kl);
 }
@@ -1501,9 +1685,10 @@
 {
 struct quota q;
 
- q.root = root;
+ quota_init(&q, root);
 if (!quota_read(&q, NULL, 0))
 	print_quota(&q);
+ quota_free(&q);
 
 return 0;
 }
@@ -1520,14 +1705,26 @@
 {
 struct sync_name_list *qrl = (struct sync_name_list *)rock;
 struct mailbox *mailbox = NULL;
- struct dlist *kl = dlist_kvlist(NULL, "MAILBOX");
+ struct dlist *kl = dlist_newkvlist(NULL, "MAILBOX");
+ annotate_state_t *astate = NULL;
 int r;
 
- r = mailbox_open_irl(name, &mailbox);
+ /* XXX - we don't write anything, but there's no interface
+ * to safely get read-only access to the annotation and
+ * other "side" databases here */
+ r = mailbox_open_iwl(name, &mailbox);
 /* doesn't exist? Probably not finished creating or removing yet */
- if (r == IMAP_MAILBOX_NONEXISTENT) return 0;
- if (r == IMAP_MAILBOX_RESERVED) return 0;
- if (r) return r;
+ if (r == IMAP_MAILBOX_NONEXISTENT ||
+	r == IMAP_MAILBOX_RESERVED) {
+	r = 0;
+	goto out;
+ }
+ if (r) goto out;
+
+ /* hold the annotate state open */
+ mailbox_get_annotate_state(mailbox, ANNOTATE_ANY_UID, &astate);
+ /* and make it hold a transaction open */
+ annotate_state_begin(astate);
 
 if (qrl && mailbox->quotaroot &&
 	 !sync_name_lookup(qrl, mailbox->quotaroot))
@@ -1535,8 +1732,10 @@
 
 r = sync_mailbox(mailbox, NULL, NULL, kl, NULL, 0);
 if (!r) sync_send_response(kl, sync_out);
- dlist_free(&kl);
+
+out:
 mailbox_close(&mailbox);
+ dlist_free(&kl);
 
 return r;
 }
@@ -1544,17 +1743,23 @@
 static int do_getfullmailbox(struct dlist *kin)
 {
 struct mailbox *mailbox = NULL;
- struct dlist *kl = dlist_kvlist(NULL, "MAILBOX");
+ struct dlist *kl = dlist_newkvlist(NULL, "MAILBOX");
 int r;
 
- r = mailbox_open_irl(kin->sval, &mailbox);
- if (r) return r;
+ /* XXX again - this is a read-only request, but we
+ * don't have a good way to express that, so we use
+ * write locks anyway */
+ r = mailbox_open_iwl(kin->sval, &mailbox);
+ if (r) goto out;
 
 r = sync_mailbox(mailbox, NULL, NULL, kl, NULL, 1);
- if (!r) sync_send_response(kl, sync_out);
+ if (r) goto out;
+
+ sync_send_response(kl, sync_out);
+
+out:
 dlist_free(&kl);
 mailbox_close(&mailbox);
-
 return r;
 }
 
@@ -1575,12 +1780,12 @@
 {
 struct dlist *kl;
 
- kl = dlist_new("SEEN");
- dlist_atom(kl, "UNIQUEID", uniqueid);
- dlist_date(kl, "LASTREAD", sd->lastread);
- dlist_num(kl, "LASTUID", sd->lastuid);
- dlist_date(kl, "LASTCHANGE", sd->lastchange);
- dlist_atom(kl, "SEENUIDS", sd->seenuids);
+ kl = dlist_newkvlist(NULL, "SEEN");
+ dlist_setatom(kl, "UNIQUEID", uniqueid);
+ dlist_setdate(kl, "LASTREAD", sd->lastread);
+ dlist_setnum32(kl, "LASTUID", sd->lastuid);
+ dlist_setdate(kl, "LASTCHANGE", sd->lastchange);
+ dlist_setatom(kl, "SEENUIDS", sd->seenuids);
 sync_send_response(kl, sync_out);
 dlist_free(&kl);
 
@@ -1610,9 +1815,9 @@
 
 mboxlist_allsubs(userid, addmbox_sub, list);
 
- kl = dlist_list(NULL, "LSUB");
+ kl = dlist_newlist(NULL, "LSUB");
 for (item = list->head; item; item = item->next) {
-	dlist_atom(kl, "MBOXNAME", item->name);
+	dlist_setatom(kl, "MBOXNAME", item->name);
 }
 if (kl->head)
 	sync_send_response(kl, sync_out);
@@ -1634,10 +1839,11 @@
 if (!sieve_list) return 0;
 
 for (sieve = sieve_list->head; sieve; sieve = sieve->next) {
-	kl = dlist_new("SIEVE");
-	dlist_atom(kl, "FILENAME", sieve->name);
-	dlist_date(kl, "LAST_UPDATE", sieve->last_update);
-	dlist_num(kl, "ISACTIVE", sieve->active ? 1 : 0);
+	kl = dlist_newkvlist(NULL, "SIEVE");
+	dlist_setatom(kl, "FILENAME", sieve->name);
+	dlist_setdate(kl, "LAST_UPDATE", sieve->last_update);
+	dlist_setatom(kl, "GUID", message_guid_encode(&sieve->guid));
+	dlist_setnum32(kl, "ISACTIVE", sieve->active ? 1 : 0);
 	sync_send_response(kl, sync_out);
 	dlist_free(&kl);
 }
@@ -1678,10 +1884,10 @@
 
 /* deleted namespace items if enabled */
 if (mboxlist_delayed_delete_isenabled()) {
- char deletednameMAX_MAILBOX_BUFFER;
- mboxname_todeleted(buf, deletedname, 0);
- strlcat(deletedname, ".*", sizeof(deletedname));
- r = (sync_namespace.mboxlist_findall)(sync_namespacep, deletedname, 
+	char deletednameMAX_MAILBOX_BUFFER;
+	mboxname_todeleted(buf, deletedname, 0);
+	strlcat(deletedname, ".*", sizeof(deletedname));
+	r = (sync_namespace.mboxlist_findall)(sync_namespacep, deletedname,
 					 sync_userisadmin,
 					 userid, sync_authstate,
 					 mailbox_cb, quotaroots);
@@ -1692,8 +1898,8 @@
 strlcat(buf, ".*", sizeof(buf));
 r = ((*sync_namespacep).mboxlist_findall)(sync_namespacep, buf,
 					 sync_userisadmin,
- userid, sync_authstate,
- mailbox_cb, quotaroots);
+					 userid, sync_authstate,
+					 mailbox_cb, quotaroots);
 if (r) goto bail;
 
 for (qr = quotaroots->head; qr; qr = qr->next) {
@@ -1719,7 +1925,7 @@
 
 /* Delete with admin priveleges */
 return mboxlist_deletemailbox(mboxname, sync_userisadmin, sync_userid,
-				 sync_authstate, 0, 0, 1);
+				 sync_authstate, NULL, 0, 1, 0);
 }
 
 static int do_rename(struct dlist *kin)
@@ -1727,6 +1933,7 @@
 const char *oldmboxname;
 const char *newmboxname;
 const char *partition;
+ uint32_t uidvalidity = 0;
 
 if (!dlist_getatom(kin, "OLDMBOXNAME", &oldmboxname))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
@@ -1735,8 +1942,12 @@
 if (!dlist_getatom(kin, "PARTITION", &partition))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
+ /* optional */
+ dlist_getnum32(kin, "UIDVALIDITY", &uidvalidity);
+
 return mboxlist_renamemailbox(oldmboxname, newmboxname, partition,
- 1, sync_userid, sync_authstate, 1, 1);
+				 uidvalidity,
+				 1, sync_userid, sync_authstate, NULL, 1, 1);
 }
 
 static int do_changesub(struct dlist *kin)
@@ -1753,7 +1964,7 @@
 if (!dlist_getatom(kin, "USERID", &userid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
- return mboxlist_changesub(mboxname, userid, sync_authstate, add, add);
+ return mboxlist_changesub(mboxname, userid, sync_authstate, add, add, 0);
 }
 
 /* ====================================================================== */
@@ -1764,9 +1975,13 @@
 struct attvaluelist *attvalues = NULL;
 const char *mboxname = NULL;
 const char *entry = NULL;
- const char *value = NULL;
+ const char *mapval = NULL;
+ size_t maplen = 0;
+ struct buf value = BUF_INITIALIZER;
 const char *userid = NULL;
 char *name = NULL;
+ struct mailbox *mailbox = NULL;
+ annotate_state_t *astate = NULL;
 int r;
 
 if (!dlist_getatom(kin, "MBOXNAME", &mboxname))
@@ -1775,18 +1990,37 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getatom(kin, "USERID", &userid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getatom(kin, "VALUE", &value))
+ if (!dlist_getmap(kin, "VALUE", &mapval, &maplen))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
+ buf_init_ro(&value, mapval, maplen);
 
- /* annotatemore_store() expects external mailbox names,
+ /* annotate_state_store() expects external mailbox names,
 so translate the separator character */
 name = xstrdup(mboxname);
 mboxname_hiersep_toexternal(sync_namespacep, name, 0);
 
- appendattvalue(&attvalues, *userid ? "value.priv" : "value.shared", value);
+ r = mailbox_open_iwl(name, &mailbox);
+ if (r) goto done;
+
+ appendattvalue(&attvalues,
+		 *userid ? "value.priv" : "value.shared",
+		 &value);
 appendentryatt(&entryatts, entry, attvalues);
- r = annotatemore_store(name, entryatts, sync_namespacep,
-			 sync_userisadmin, userid, sync_authstate);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate,
+			 sync_userisadmin, userid, sync_authstate);
+ r = annotate_state_set_mailbox(astate, mailbox);
+ if (r) goto done;
+
+ r = annotate_state_store(astate, entryatts);
+
+done:
+ if (!r)
+	r = annotate_state_commit(&astate);
+ else
+	annotate_state_abort(&astate);
+
+ mailbox_close(&mailbox);
 
 freeentryatts(entryatts);
 free(name);
@@ -1801,7 +2035,10 @@
 const char *mboxname = NULL;
 const char *entry = NULL;
 const char *userid = NULL;
+ struct buf empty = BUF_INITIALIZER;
 char *name = NULL;
+ struct mailbox *mailbox = NULL;
+ annotate_state_t *astate = NULL;
 int r;
 
 if (!dlist_getatom(kin, "MBOXNAME", &mboxname))
@@ -1811,16 +2048,34 @@
 if (!dlist_getatom(kin, "USERID", &userid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
+ /* (gnb)TODO: this is broken with unixhierarchysep */
 /* annotatemore_store() expects external mailbox names,
 so translate the separator character */
 name = xstrdup(mboxname);
 mboxname_hiersep_toexternal(sync_namespacep, name, 0);
 
- appendattvalue(&attvalues, *userid ? "value.priv" : "value.shared", NULL);
+ r = mailbox_open_iwl(name, &mailbox);
+ if (r)
+	goto done;
+
+ appendattvalue(&attvalues,
+		 *userid ? "value.priv" : "value.shared",
+		 &empty);
 appendentryatt(&entryatts, entry, attvalues);
- r = annotatemore_store(name, entryatts, sync_namespacep,
-			 sync_userisadmin, userid, sync_authstate);
+ astate = annotate_state_new();
+ annotate_state_set_auth(astate,
+			 sync_userisadmin, userid, sync_authstate);
+ r = annotate_state_set_mailbox(astate, mailbox);
+ if (r) goto done;
+
+ r = annotate_state_store(astate, entryatts);
 
+done:
+ if (!r)
+	r = annotate_state_commit(&astate);
+ else
+	annotate_state_abort(&astate);
+ mailbox_close(&mailbox);
 freeentryatts(entryatts);
 free(name);
 
@@ -1841,7 +2096,7 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kin, "LAST_UPDATE", &last_update))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getbuf(kin, "CONTENT", &content, &len))
+ if (!dlist_getmap(kin, "CONTENT", &content, &len))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
 return sync_sieve_upload(userid, filename, last_update, content, len);
@@ -1898,7 +2153,7 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kin, "LASTREAD", &sd.lastread))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "LASTUID", &sd.lastuid))
+ if (!dlist_getnum32(kin, "LASTUID", &sd.lastuid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kin, "LASTCHANGE", &sd.lastchange))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
@@ -1930,7 +2185,7 @@
 
 /* ignore failures here - the subs file gets deleted soon anyway */
 for (item = list->head; item; item = item->next) {
- mboxlist_changesub(item->name, userid, sync_authstate, 0, 0);
+	mboxlist_changesub(item->name, userid, sync_authstate, 0, 0, 0);
 }
 sync_name_list_free(&list);
 
@@ -1947,19 +2202,19 @@
 if (r) goto fail;
 
 for (item = list->head; item; item = item->next) {
- r = mboxlist_deletemailbox(item->name, sync_userisadmin,
-				 sync_userid, sync_authstate, 0, 0, 1);
- if (r) goto fail;
+	r = mboxlist_deletemailbox(item->name, sync_userisadmin,
+				 sync_userid, sync_authstate, NULL, 0, 0, 1);
+	if (r) goto fail;
 }
 
 /* Nuke inbox (recursive nuke possible?) */
 (sync_namespacep->mboxname_tointernal)(sync_namespacep, "INBOX",
 					 userid, buf);
 r = mboxlist_deletemailbox(buf, sync_userisadmin, sync_userid,
-			 sync_authstate, 0, 0, 1);
+			 sync_authstate, NULL, 0, 1, 0);
 if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
 
- r = user_deletedata((char *)userid, sync_userid, sync_authstate, 1);
+ r = user_deletedata(userid, 1);
 
 fail:
 sync_name_list_free(&list);
@@ -1986,12 +2241,13 @@
 if (!sieve)
 	return IMAP_MAILBOX_NONEXISTENT;
 
- kl = dlist_new("SIEVE");
- dlist_atom(kl, "USERID", userid);
- dlist_atom(kl, "FILENAME", filename);
- dlist_buf(kl, "CONTENT", sieve, size);
+ kl = dlist_newkvlist(NULL, "SIEVE");
+ dlist_setatom(kl, "USERID", userid);
+ dlist_setatom(kl, "FILENAME", filename);
+ dlist_setmap(kl, "CONTENT", sieve, size);
 sync_send_response(kl, sync_out);
 dlist_free(&kl);
+ free(sieve);
 
 return 0;
 }
@@ -2015,16 +2271,19 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getatom(kin, "GUID", &guid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kin, "UID", &uid))
+ if (!dlist_getnum32(kin, "UID", &uid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!message_guid_decode(&tmp_guid, guid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
 fname = mboxname_datapath(partition, mboxname, uid);
- if (stat(fname, &sbuf) == -1)
-	return IMAP_MAILBOX_NONEXISTENT;
+ if (stat(fname, &sbuf) == -1) {
+	fname = mboxname_archivepath(partition, mboxname, uid);
+	if (stat(fname, &sbuf) == -1)
+	 return IMAP_MAILBOX_NONEXISTENT;
+ }
 
- kl = dlist_file(NULL, "MESSAGE", partition, &tmp_guid, sbuf.st_size, fname);
+ kl = dlist_setfile(NULL, "MESSAGE", partition, &tmp_guid, sbuf.st_size, fname);
 sync_send_response(kl, sync_out);
 dlist_free(&kl);
 
@@ -2064,9 +2323,9 @@
 	r = mailbox_read_index_record(mailbox, recno, &record);
 	if (r) goto done;
 	if (record.system_flags & FLAG_EXPUNGED) continue;
-	while (ui && ui->nval < record.uid) ui = ui->next;
+	while (ui && dlist_num(ui) < record.uid) ui = ui->next;
 	if (!ui) break; /* no point continuing */
-	if (record.uid == ui->nval) {
+	if (record.uid == dlist_num(ui)) {
 	 record.system_flags |= FLAG_EXPUNGED;
 	 record.silent = 1; /* so the next sync will succeed */
 	 r = mailbox_rewrite_index_record(mailbox, &record);
@@ -2086,16 +2345,18 @@
 struct sync_msgid *msgid;
 
 for (ki = kin->head; ki; ki = ki->next) {
-	if (ki->type != DL_FILE)
+	struct message_guid *guid;
+	const char *part;
+
+	/* XXX - complain more? */
+	if (!dlist_tofile(ki, &part, &guid, NULL, NULL))
 	 continue;
 
-	part_list = sync_reserve_partlist(reserve_list, ki->part);
-	msgid = sync_msgid_lookup(part_list, &ki->gval);
-	if (!msgid) 
-	 msgid = sync_msgid_add(part_list, &ki->gval);
-	if (!msgid->mark) {
-	 msgid->mark = 1;
-	 part_list->marked++;
+	part_list = sync_reserve_partlist(reserve_list, part);
+	msgid = sync_msgid_insert(part_list, guid);
+	if (msgid->need_upload) {
+	 msgid->need_upload = 0;
+	 part_list->toupload--;
 	}
 }
 
@@ -2114,8 +2375,8 @@
 case IMAP_MAILBOX_NONEXISTENT:
 	prot_printf(sync_out, "NO IMAP_MAILBOX_NONEXISTENT No Such Mailbox\r\n");
 	break;
- case IMAP_MAILBOX_CRC:
-	prot_printf(sync_out, "NO IMAP_MAILBOX_CRC Checksum Failure\r\n");
+ case IMAP_SYNC_CHECKSUM:
+	prot_printf(sync_out, "NO IMAP_SYNC_CHECKSUM Checksum Failure\r\n");
 	break;
 case IMAP_PROTOCOL_ERROR:
 	prot_printf(sync_out, "NO IMAP_PROTOCOL_ERROR Protocol error\r\n");
@@ -2176,8 +2437,10 @@
 else if (!strcmp(kin->name, "UNUSER"))
 	r = do_unuser(kin);
 
- else
+ else {
+	syslog(LOG_ERR, "SYNCERROR: unknown command %s", kin->name);
 	r = IMAP_PROTOCOL_ERROR;
+ }
 
 print_response(r);
 }
@@ -2208,3 +2471,36 @@
 print_response(r);
 }
 
+static int do_set_options(const struct dlist *kin)
+{
+ int r = 0;
+ struct dlist *child;
+ uint32_t crc_version = MAILBOX_CRC_VERSION_MIN;
+
+ for (child = kin->head ; child ; child = child->next) {
+	if (!strcmp(child->name, "CRC_VERSION")) {
+	 dlist_tonum32(child, &crc_version);
+	 r = sync_crc_setup(crc_version, crc_version, /*strict*/1);
+	 if (r < 0) return r;
+	 r = 0;
+	}
+	else {
+	 return IMAP_PROTOCOL_ERROR;
+	}
+ }
+
+ return r;
+}
+
+static void cmd_set(const struct dlist *kin)
+{
+ int r;
+
+ if (!strcmp(kin->name, "OPTIONS"))
+	r = do_set_options(kin);
+ else
+	r = IMAP_PROTOCOL_ERROR;
+
+ print_response(r);
+}
+

cyrus-imapd-2.4.17.tar.gz/imap/sync_support.c -> cyrus-imapd-2.5.tar.gz/imap/sync_support.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sync_support.c,v 1.25 2010/01/06 17:01:41 murch Exp $
 */
 
 #include <config.h>
@@ -57,31 +55,23 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
-#include <ctype.h>
 #include <dirent.h>
 #include <utime.h>
 
 #include "global.h"
-#include "assert.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
-#include "xstrlcat.h"
-#include "xstrlcpy.h"
-#include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
 #include "map.h"
 #include "imapd.h"
-#include "imparse.h"
 #include "message.h"
 #include "util.h"
 #include "user.h"
-#include "retry.h"
-#include "cyr_lock.h"
 #include "prot.h"
 #include "dlist.h"
 
@@ -133,17 +123,12 @@
 }
 
 /* Get a simple line (typically error text) */
-#define BUFGROWSIZE 100
-int sync_getline(struct protstream *in, struct buf *buf)
+static int sync_getline(struct protstream *in, struct buf *buf)
 {
- unsigned len = 0;
 int c;
 
- if (buf->alloc == 0) {
-	buf->alloc = BUFGROWSIZE;
-	buf->s = xmalloc(buf->alloc+1);
- }
-	
+ buf_reset(buf);
+
 for (;;) {
 	c = prot_getc(in);
 
@@ -153,85 +138,45 @@
 		prot_ungetc(c, in);
 		c = '\r';
 	 }
-	 buf->slen = '\0';
-	 buf->len = len;
+	 buf_cstring(buf);
 	 return c;
 	}
-	if (len == buf->alloc) {
-	 buf->alloc += BUFGROWSIZE;
-	 buf->s = xrealloc(buf->s, buf->alloc+1);
-	 if (len > config_maxword) {
-		fatal("word too long", EC_IOERR);
-	 }
-	}
-	buf->slen++ = c;
- }
- return(c);
-}
-
-/*
- * Eat lines up to next OK/NO/BAD response line
- *
- */
-
-int sync_eatlines_unsolicited(struct protstream *in, int c)
-{
- static struct buf response; /* BSS */
- static struct buf line; /* BSS */
-
- if (c != '\n') {
- sync_getline(in, &line); /* Partial line */
- syslog(LOG_ERR, "Discarding: %s", line.s);
- }
-
- do {
- if ((c = getword(in, &response)) == EOF)
- return(IMAP_PROTOCOL_ERROR);
-
- sync_getline(in, &line);
- syslog(LOG_ERR, "Discarding: %s", line.s);
- } while (response.s0 == '*');
-
- if (!strcmp(response.s, "OK") ||
- !strcmp(response.s, "NO") ||
- !strcmp(response.s, "BAD")) {
- syslog(LOG_ERR, "sync_eatlines_unsolicited(): resynchronised okay");
- return(0);
+	if (buf->len > config_maxword)
+	 fatal("word too long", EC_IOERR);
+	buf_putc(buf, c);
 }
-
- syslog(LOG_ERR, "sync_eatlines_unsolicited(): failed to resynchronise!");
- return(IMAP_PROTOCOL_ERROR);
+ return c;
 }
 
 /* ====================================================================== */
 
 void sync_print_flags(struct dlist *kl,
-		 struct mailbox *mailbox, 
+		 struct mailbox *mailbox,
 		 struct index_record *record)
 {
 int flag;
- struct dlist *fl = dlist_list(kl, "FLAGS");
+ struct dlist *fl = dlist_newlist(kl, "FLAGS");
 
 if (record->system_flags & FLAG_DELETED)
-	dlist_flag(fl, "FLAG", "\\Deleted");
+	dlist_setflag(fl, "FLAG", "\\Deleted");
 if (record->system_flags & FLAG_ANSWERED)
-	dlist_flag(fl, "FLAG", "\\Answered");
+	dlist_setflag(fl, "FLAG", "\\Answered");
 if (record->system_flags & FLAG_FLAGGED)
-	dlist_flag(fl, "FLAG", "\\Flagged");
+	dlist_setflag(fl, "FLAG", "\\Flagged");
 if (record->system_flags & FLAG_DRAFT)
-	dlist_flag(fl, "FLAG", "\\Draft");
+	dlist_setflag(fl, "FLAG", "\\Draft");
 if (record->system_flags & FLAG_EXPUNGED)
-	dlist_flag(fl, "FLAG", "\\Expunged");
+	dlist_setflag(fl, "FLAG", "\\Expunged");
 if (record->system_flags & FLAG_SEEN)
-	dlist_flag(fl, "FLAG", "\\Seen");
- 
+	dlist_setflag(fl, "FLAG", "\\Seen");
+
 /* print user flags in mailbox order */
 for (flag = 0; flag < MAX_USER_FLAGS; flag++) {
 	if (!mailbox->flagnameflag)
 	 continue;
 	if (!(record->user_flagsflag/32 & (1<<(flag&31))))
 	 continue;
-	dlist_flag(fl, "FLAG", mailbox->flagnameflag);
+	dlist_setflag(fl, "FLAG", mailbox->flagnameflag);
 }
 }
 
@@ -265,8 +210,9 @@
 	 }
 	}
 	else {
-	 if (mailbox_user_flag(mailbox, s, &userflag)) {
+	 if (mailbox_user_flag(mailbox, s, &userflag, 1)) {
 		syslog(LOG_ERR, "Unable to record user flag: %s", s);
+		free(s);
 		return IMAP_IOERROR;
 	 }
 	 record->user_flagsuserflag/32 |= 1<<(userflag&31);
@@ -279,17 +225,18 @@
 }
 
 int parse_upload(struct dlist *kr, struct mailbox *mailbox,
-			struct index_record *record)
+		 struct index_record *record,
+		 struct sync_annot_list **salp)
 {
 struct dlist *fl;
- const char *guid;
+ struct message_guid *tmpguid;
 int r;
 
 memset(record, 0, sizeof(struct index_record));
 
- if (!dlist_getnum(kr, "UID", &record->uid))
+ if (!dlist_getnum32(kr, "UID", &record->uid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getmodseq(kr, "MODSEQ", &record->modseq))
+ if (!dlist_getnum64(kr, "MODSEQ", &record->modseq))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kr, "LAST_UPDATED", &record->last_updated))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
@@ -297,18 +244,24 @@
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 if (!dlist_getdate(kr, "INTERNALDATE", &record->internaldate))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getnum(kr, "SIZE", &record->size))
+ if (!dlist_getnum32(kr, "SIZE", &record->size))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
- if (!dlist_getatom(kr, "GUID", &guid))
+ if (!dlist_getguid(kr, "GUID", &tmpguid))
 	return IMAP_PROTOCOL_BAD_PARAMETERS;
 
+ record->guid = *tmpguid;
+
 /* parse the flags */
 r = sync_getflags(fl, mailbox, record);
 if (r) return r;
 
- /* check the GUID format */
- if (!message_guid_decode(&record->guid, guid))
-	return IMAP_PROTOCOL_BAD_PARAMETERS;
+ /* OK if it doesn't have one */
+ record->cid = NULLCONVERSATION;
+ dlist_gethex64(kr, "CID", &record->cid);
+
+ /* the ANNOTATIONS list is optional too */
+ if (salp && dlist_getlist(kr, "ANNOTATIONS", &fl))
+	decode_annotations(fl, salp);
 
 return 0;
 }
@@ -322,59 +275,52 @@
 
 /* Pick a sensible default if no size given */
 if (hash_size == 0)
- hash_size = 256;
+	hash_size = 256;
 
 l->head = NULL;
 l->tail = NULL;
 l->hash_size = hash_size;
 l->hash = xzmalloc(hash_size * sizeof(struct sync_msgid *));
 l->count = 0;
- l->marked = 0;
+ l->toupload = 0;
 
 return(l);
 }
 
-struct sync_msgid *sync_msgid_add(struct sync_msgid_list *l,
-				 struct message_guid *guid)
+struct sync_msgid *sync_msgid_insert(struct sync_msgid_list *l,
+				 struct message_guid *guid)
 {
- struct sync_msgid *result;
+ struct sync_msgid *msgid;
 int offset;
 
 if (message_guid_isnull(guid))
- return(NULL);
+	return NULL;
 
- result = xzmalloc(sizeof(struct sync_msgid));
 offset = message_guid_hash(guid, l->hash_size);
 
- message_guid_copy(&result->guid, guid);
+ /* do we already have it? Don't add it again */
+ for (msgid = l->hashoffset ; msgid ; msgid = msgid->hash_next) {
+	if (message_guid_equal(&msgid->guid, guid))
+	 return msgid;
+ }
+
+ msgid = xzmalloc(sizeof(struct sync_msgid));
+ msgid->need_upload = 1;
+ message_guid_copy(&msgid->guid, guid);
 
 l->count++;
+ l->toupload++;
+
 if (l->tail)
- l->tail = l->tail->next = result;
+	l->tail = l->tail->next = msgid;
 else
- l->head = l->tail = result;
+	l->head = l->tail = msgid;
 
 /* Insert at start of list */
- result->hash_next = l->hashoffset;
- l->hashoffset = result;
+ msgid->hash_next = l->hashoffset;
+ l->hashoffset = msgid;
 
- return(result);
-}
-
-void sync_msgid_remove(struct sync_msgid_list *l,
-		 struct message_guid *guid)
-{
- int offset = message_guid_hash(guid, l->hash_size);
- struct sync_msgid *msgid;
-
- if (message_guid_isnull(guid)) return;
-
- for (msgid = l->hashoffset ; msgid ; msgid = msgid->hash_next) {
-	if (message_guid_equal(&msgid->guid, guid)) {
-	 message_guid_set_null(&msgid->guid);
-	 return;
-	}
- }
+ return msgid;
 }
 
 void sync_msgid_list_free(struct sync_msgid_list **lp)
@@ -384,9 +330,9 @@
 
 current = l->head;
 while (current) {
- next = current->next;
- free(current);
- current = next;
+	next = current->next;
+	free(current);
+	current = next;
 }
 free(l->hash);
 free(l);
@@ -401,12 +347,13 @@
 struct sync_msgid *msgid;
 
 if (message_guid_isnull(guid))
- return(NULL);
+	return(NULL);
 
 for (msgid = l->hashoffset ; msgid ; msgid = msgid->hash_next) {
- if (message_guid_equal(&msgid->guid, guid))
- return(msgid);
+	if (message_guid_equal(&msgid->guid, guid))
+	 return(msgid);
 }
+
 return(NULL);
 }
 
@@ -478,31 +425,36 @@
 
 struct sync_folder *sync_folder_list_add(struct sync_folder_list *l,
 					 const char *uniqueid, const char *name,
-					 const char *part, const char *acl, 
+					 uint32_t mbtype,
+					 const char *part, const char *acl,
 					 uint32_t options,
-					 uint32_t uidvalidity, 
+					 uint32_t uidvalidity,
 					 uint32_t last_uid,
 					 modseq_t highestmodseq,
 					 uint32_t crc,
 					 uint32_t recentuid,
 					 time_t recenttime,
-					 time_t pop3_last_login)
+					 time_t pop3_last_login,
+					 time_t pop3_show_after,
+					 struct sync_annot_list *annots,
+					 modseq_t xconvmodseq)
 {
 struct sync_folder *result = xzmalloc(sizeof(struct sync_folder));
 
 if (l->tail)
- l->tail = l->tail->next = result;
+	l->tail = l->tail->next = result;
 else
- l->head = l->tail = result;
+	l->head = l->tail = result;
 
 l->count++;
 
 result->next = NULL;
 
- result->uniqueid = (uniqueid) ? xstrdup(uniqueid) : NULL;
- result->name = (name) ? xstrdup(name) : NULL;
- result->part = (part) ? xstrdup(part) : NULL;
- result->acl = (acl) ? xstrdup(acl) : NULL;
+ result->uniqueid = xstrdupnull(uniqueid);
+ result->name = xstrdupnull(name);
+ result->mbtype = mbtype;
+ result->part = xstrdupnull(part);
+ result->acl = xstrdupnull(acl);
 result->uidvalidity = uidvalidity;
 result->last_uid = last_uid;
 result->highestmodseq = highestmodseq;
@@ -511,6 +463,9 @@
 result->recentuid = recentuid;
 result->recenttime = recenttime;
 result->pop3_last_login = pop3_last_login;
+ result->pop3_show_after = pop3_show_after;
+ result->annots = annots; /* NOTE: not a copy! */
+ result->xconvmodseq = xconvmodseq;
 
 result->mark = 0;
 result->reserve = 0;
@@ -524,36 +479,12 @@
 struct sync_folder *p;
 
 for (p = l->head; p; p = p->next) {
- if (!strcmp(p->uniqueid, uniqueid))
- return p;
- }
- return NULL;
-}
-
-struct sync_folder *sync_folder_lookup_byname(struct sync_folder_list *l,
-					 const char *name)
-{
- struct sync_folder *p;
-
- for (p = l->head; p; p = p->next) {
- if (!strcmp(p->name, name))
- return p;
+	if (!strcmp(p->uniqueid, uniqueid))
+	 return p;
 }
 return NULL;
 }
 
-int sync_folder_mark(struct sync_folder_list *l, const char *uniqueid)
-{
- struct sync_folder *p = sync_folder_lookup(l, uniqueid);
-
- if (p) {
-	p->mark = 1;
-	return 1;
- }
-
- return 0;
-}
-
 void sync_folder_list_free(struct sync_folder_list **lp)
 {
 struct sync_folder_list *l = *lp;
@@ -563,13 +494,14 @@
 
 current = l->head;
 while (current) {
- next = current->next;
- free(current->uniqueid);
- free(current->name);
- free(current->part);
- free(current->acl);
- free(current);
- current = next;
+	next = current->next;
+	free(current->uniqueid);
+	free(current->name);
+	free(current->part);
+	free(current->acl);
+	sync_annot_list_free(&current->annots);
+	free(current);
+	current = next;
 }
 free(l);
 *lp = NULL;
@@ -590,16 +522,17 @@
 }
 
 struct sync_rename *sync_rename_list_add(struct sync_rename_list *l,
-					 const char *uniqueid, const char *oldname,
-					 const char *newname, const char *partition)
+					 const char *uniqueid, const char *oldname,
+					 const char *newname, const char *partition,
+					 unsigned uidvalidity)
 {
 struct sync_rename *result
- = xzmalloc(sizeof(struct sync_rename));
+	= xzmalloc(sizeof(struct sync_rename));
 
 if (l->tail)
- l->tail = l->tail->next = result;
+	l->tail = l->tail->next = result;
 else
- l->head = l->tail = result;
+	l->head = l->tail = result;
 
 l->count++;
 
@@ -608,6 +541,7 @@
 result->oldname = xstrdup(oldname);
 result->newname = xstrdup(newname);
 result->part = xstrdup(partition);
+ result->uidvalidity = uidvalidity;
 result->done = 0;
 
 return result;
@@ -619,8 +553,8 @@
 struct sync_rename *p;
 
 for (p = l->head; p; p = p->next) {
- if (!strcmp(p->oldname, oldname))
- return p;
+	if (!strcmp(p->oldname, oldname))
+	 return p;
 }
 
 return NULL;
@@ -635,13 +569,13 @@
 
 current = l->head;
 while (current) {
- next = current->next;
- free(current->uniqueid);
- free(current->oldname);
- free(current->newname);
- free(current->part);
- free(current);
- current = next;
+	next = current->next;
+	free(current->uniqueid);
+	free(current->oldname);
+	free(current->newname);
+	free(current->part);
+	free(current);
+	current = next;
 }
 free(l);
 *lp = NULL;
@@ -662,21 +596,23 @@
 }
 
 struct sync_quota *sync_quota_list_add(struct sync_quota_list *l,
-					 const char *root, int limit)
+				 const char *root)
 {
 struct sync_quota *result
- = xzmalloc(sizeof(struct sync_quota));
+	= xzmalloc(sizeof(struct sync_quota));
+ int res;
 
 if (l->tail)
- l->tail = l->tail->next = result;
+	l->tail = l->tail->next = result;
 else
- l->head = l->tail = result;
+	l->head = l->tail = result;
 
 l->count++;
 
 result->next = NULL;
 result->root = xstrdup(root);
- result->limit = limit;
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+	result->limitsres = QUOTA_UNLIMITED;
 result->done = 0;
 
 return result;
@@ -688,8 +624,8 @@
 struct sync_quota *p;
 
 for (p = l->head; p; p = p->next) {
- if (!strcmp(p->root, name))
- return p;
+	if (!strcmp(p->root, name))
+	 return p;
 }
 
 return NULL;
@@ -704,18 +640,55 @@
 
 current = l->head;
 while (current) {
- next = current->next;
- free(current->root);
- free(current);
- current = next;
+	next = current->next;
+	free(current->root);
+	free(current);
+	current = next;
 }
 free(l);
 *lp = NULL;
 }
 
+void sync_encode_quota_limits(struct dlist *kl, const int limitsQUOTA_NUMRESOURCES)
+{
+ int res;
+
+ /*
+ * For backwards compatibility, we encode the STORAGE limit as LIMIT
+ * and we always report it even if it's QUOTA_UNLIMITED. This is
+ * kinda screwed up but should work. For QUOTA_UNLIMITED < 0, we
+ * send a very large unsigned number across the wire, and parse it
+ * back as QUOTA_UNLIMITED at the other end. Spit and string.
+ */
+ dlist_setnum32(kl, "LIMIT", limitsQUOTA_STORAGE);
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (limitsres >= 0)
+	 dlist_setnum32(kl, quota_namesres, limitsres);
+ }
+}
+
+void sync_decode_quota_limits(/*const*/ struct dlist *kl, int limitsQUOTA_NUMRESOURCES)
+{
+ uint32_t limit = 0;
+ int res;
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++)
+	limitsres = QUOTA_UNLIMITED;
+
+ /* For backwards compatibility */
+ if (dlist_getnum32(kl, "LIMIT", &limit))
+	limitsQUOTA_STORAGE = limit;
+
+ for (res = 0 ; res < QUOTA_NUMRESOURCES ; res++) {
+	if (dlist_getnum32(kl, quota_namesres, &limit))
+	 limitsres = limit;
+ }
+}
+
 /* ====================================================================== */
 
-struct sync_sieve_list *sync_sieve_list_create()
+struct sync_sieve_list *sync_sieve_list_create(void)
 {
 struct sync_sieve_list *l = xzmalloc(sizeof (struct sync_sieve_list));
 
@@ -727,44 +700,46 @@
 }
 
 void sync_sieve_list_add(struct sync_sieve_list *l, const char *name,
-			 time_t last_update, int active)
+			 time_t last_update, struct message_guid *guidp,
+			 int active)
 {
 struct sync_sieve *item = xzmalloc(sizeof(struct sync_sieve));
 
 item->name = xstrdup(name);
 item->last_update = last_update;
 item->active = active;
+ message_guid_copy(&item->guid, guidp);
 item->mark = 0;
 
 if (l->tail)
- l->tail = l->tail->next = item;
+	l->tail = l->tail->next = item;
 else
- l->head = l->tail = item;
+	l->head = l->tail = item;
 
 l->count++;
 }
 
-struct sync_sieve *sync_sieve_lookup(struct sync_sieve_list *l, char *name)
+struct sync_sieve *sync_sieve_lookup(struct sync_sieve_list *l, const char *name)
 {
 struct sync_sieve *p;
 
 for (p = l->head; p; p = p->next) {
- if (!strcmp(p->name, name))
- return p;
+	if (!strcmp(p->name, name))
+	 return p;
 }
 
 return NULL;
 }
 
-void sync_sieve_list_set_active(struct sync_sieve_list *l, char *name)
+void sync_sieve_list_set_active(struct sync_sieve_list *l, const char *name)
 {
 struct sync_sieve *item;
 
 for (item = l->head; item; item = item->next) {
- if (!strcmp(item->name, name)) {
- item->active = 1;
- break;
- }
+	if (!strcmp(item->name, name)) {
+	 item->active = 1;
+	 break;
+	}
 }
 }
 
@@ -795,39 +770,48 @@
 struct stat sbuf;
 int count;
 
-
- if (!(mbdir = opendir(sieve_path)))
- return(list);
+ mbdir = opendir(sieve_path);
+ if (!mbdir) return list;
 
 active0 = '\0';
 while((next = readdir(mbdir)) != NULL) {
- if(!strcmp(next->d_name, ".") || !strcmp(next->d_name, ".."))
- continue;
-
- snprintf(filename, sizeof(filename), "%s/%s",
- sieve_path, next->d_name);
-
- if (stat(filename, &sbuf) < 0)
- continue;
-
- if (!strcmp(next->d_name, "defaultbc")) {
- if (sbuf.st_mode & S_IFLNK) {
- count = readlink(filename, active, 2047);
-
- if (count >= 0) {
- activecount = '\0';
- } else {
- /* XXX Report problem? */
- }
- }
- continue;
- }
- sync_sieve_list_add(list, next->d_name, sbuf.st_mtime, 0);
+	uint32_t size;
+	char *result;
+	struct message_guid guid;
+	if (!strcmp(next->d_name, ".") || !strcmp(next->d_name, ".."))
+	 continue;
+
+	snprintf(filename, sizeof(filename), "%s/%s",
+		 sieve_path, next->d_name);
+
+	if (stat(filename, &sbuf) < 0)
+	 continue;
+
+	if (!strcmp(next->d_name, "defaultbc")) {
+	 if (sbuf.st_mode & S_IFLNK) {
+		count = readlink(filename, active, 2047);
+
+		if (count >= 0) {
+		 activecount = '\0';
+		} else {
+		 /* XXX Report problem? */
+		}
+	 }
+	 continue;
+	}
+
+	/* calculate the sha1 on the fly, relatively cheap */
+	result = sync_sieve_read(userid, next->d_name, &size);
+	if (!result) continue;
+	message_guid_generate(&guid, result, size);
+
+	sync_sieve_list_add(list, next->d_name, sbuf.st_mtime, &guid, 0);
+	free(result);
 }
 closedir(mbdir);
 
 if (active0)
- sync_sieve_list_set_active(list, active);
+	sync_sieve_list_set_active(list, active);
 
 return list;
 }
@@ -843,7 +827,7 @@
 int c;
 
 if (sizep)
- *sizep = 0;
+	*sizep = 0;
 
 snprintf(filename, sizeof(filename), "%s/%s", sieve_path, name);
 
@@ -859,13 +843,13 @@
 s = result = xmalloc(count+1);
 
 if (sizep)
- *sizep = count;
+	*sizep = count;
 
 while (count > 0) {
- if ((c=fgetc(file)) == EOF)
- break;
- *s++ = c;
- count--;
+	if ((c=fgetc(file)) == EOF)
+	 break;
+	*s++ = c;
+	count--;
 }
 fclose(file);
 *s = '\0';
@@ -894,18 +878,18 @@
 }
 
 snprintf(tmpname, sizeof(tmpname), "%s/sync_tmp-%lu",
- sieve_path, (unsigned long)getpid());
+	 sieve_path, (unsigned long)getpid());
 snprintf(newname, sizeof(newname), "%s/%s", sieve_path, name);
 
 if ((file=fopen(tmpname, "w")) == NULL) {
- return(IMAP_IOERROR);
+	return(IMAP_IOERROR);
 }
 
 /* XXX - error handling */
 fwrite(content, 1, len, file);
 
 if ((fflush(file) != 0) || (fsync(fileno(file)) < 0))
- r = IMAP_IOERROR;
+	r = IMAP_IOERROR;
 
 fclose(file);
 
@@ -913,10 +897,10 @@
 utimbuf.modtime = last_update;
 
 if (!r && (utime(tmpname, &utimbuf) < 0))
- r = IMAP_IOERROR;
+	r = IMAP_IOERROR;
 
 if (!r && (rename(tmpname, newname) < 0))
- r = IMAP_IOERROR;
+	r = IMAP_IOERROR;
 
 sync_log_sieve(userid);
 
@@ -932,9 +916,9 @@
 snprintf(target, sizeof(target), "%s", name);
 snprintf(active, sizeof(active), "%s/%s", sieve_path, "defaultbc");
 unlink(active);
- 
+
 if (symlink(target, active) < 0)
- return(IMAP_IOERROR);
+	return(IMAP_IOERROR);
 
 sync_log_sieve(userid);
 
@@ -950,7 +934,7 @@
 unlink(active);
 
 sync_log_sieve(userid);
- 
+
 return(0);
 }
 
@@ -966,36 +950,36 @@
 int count;
 
 if (!(mbdir = opendir(sieve_path)))
- return(IMAP_IOERROR);
+	return(IMAP_IOERROR);
 
 while((next = readdir(mbdir)) != NULL) {
- if(!strcmp(next->d_name, ".") || !strcmp(next->d_name, ".."))
- continue;
-
- snprintf(filename, sizeof(filename), "%s/%s",
- sieve_path, next->d_name);
-
- if (stat(filename, &sbuf) < 0)
- continue;
-
- if (!strcmp(next->d_name, "defaultbc")) {
- if (sbuf.st_mode & S_IFLNK) {
- count = readlink(filename, active, 2047);
-
- if (count >= 0) {
- activecount = '\0';
- if (!strcmp(active, name))
- is_default = 1;
- }
- }
- continue;
- }
+	if(!strcmp(next->d_name, ".") || !strcmp(next->d_name, ".."))
+	 continue;
+
+	snprintf(filename, sizeof(filename), "%s/%s",
+		 sieve_path, next->d_name);
+
+	if (stat(filename, &sbuf) < 0)
+	 continue;
+
+	if (!strcmp(next->d_name, "defaultbc")) {
+	 if (sbuf.st_mode & S_IFLNK) {
+		count = readlink(filename, active, 2047);
+
+		if (count >= 0) {
+		 activecount = '\0';
+		 if (!strcmp(active, name))
+			is_default = 1;
+		}
+	 }
+	 continue;
+	}
 }
 closedir(mbdir);
 
 if (is_default) {
- snprintf(filename, sizeof(filename), "%s/defaultbc", sieve_path);
- unlink(filename);
+	snprintf(filename, sizeof(filename), "%s/defaultbc", sieve_path);
+	unlink(filename);
 }
 
 snprintf(filename, sizeof(filename), "%s/%s", sieve_path, name);
@@ -1008,7 +992,7 @@
 
 /* ====================================================================== */
 
-struct sync_name_list *sync_name_list_create()
+struct sync_name_list *sync_name_list_create(void)
 {
 struct sync_name_list *l = xzmalloc(sizeof (struct sync_name_list));
 l->head = NULL;
@@ -1024,9 +1008,9 @@
 struct sync_name *item = xzmalloc(sizeof(struct sync_name));
 
 if (l->tail)
- l->tail = l->tail->next = item;
+	l->tail = l->tail->next = item;
 else
- l->head = l->tail = item;
+	l->head = l->tail = item;
 
 l->count++;
 
@@ -1055,10 +1039,10 @@
 
 current = (*lp)->head;
 while (current) {
- next = current->next;
- free(current->name);
- free(current);
- current = next;
+	next = current->next;
+	free(current->name);
+	free(current);
+	current = next;
 }
 free(*lp);
 *lp = NULL;
@@ -1066,7 +1050,7 @@
 
 /* ====================================================================== */
 
-struct sync_seen_list *sync_seen_list_create()
+struct sync_seen_list *sync_seen_list_create(void)
 {
 struct sync_seen_list *l = xzmalloc(sizeof (struct sync_seen_list));
 l->head = NULL;
@@ -1083,9 +1067,9 @@
 struct sync_seen *item = xzmalloc(sizeof(struct sync_seen));
 
 if (l->tail)
- l->tail = l->tail->next = item;
+	l->tail = l->tail->next = item;
 else
- l->head = l->tail = item;
+	l->head = l->tail = item;
 
 l->count++;
 
@@ -1130,7 +1114,7 @@
 
 /* ====================================================================== */
 
-struct sync_annot_list *sync_annot_list_create()
+struct sync_annot_list *sync_annot_list_create(void)
 {
 struct sync_annot_list *l = xzmalloc(sizeof (struct sync_annot_list));
 
@@ -1142,19 +1126,19 @@
 
 void sync_annot_list_add(struct sync_annot_list *l,
 			 const char *entry, const char *userid,
-			 const char *value)
+			 const struct buf *value)
 {
 struct sync_annot *item = xzmalloc(sizeof(struct sync_annot));
 
 item->entry = xstrdup(entry);
 item->userid = xstrdup(userid);
- item->value = xstrdup(value);
+ buf_copy(&item->value, value);
 item->mark = 0;
 
 if (l->tail)
- l->tail = l->tail->next = item;
+	l->tail = l->tail->next = item;
 else
- l->head = l->tail = item;
+	l->head = l->tail = item;
 
 l->count++;
 }
@@ -1164,14 +1148,16 @@
 struct sync_annot_list *l = *lp;
 struct sync_annot *current, *next;
 
+ if (!l)
+	return;
 current = l->head;
 while (current) {
- next = current->next;
- if (current->entry) free(current->entry);
- if (current->userid) free(current->userid);
- if (current->value) free(current->value);
- free(current);
- current = next;
+	next = current->next;
+	if (current->entry) free(current->entry);
+	if (current->userid) free(current->userid);
+	buf_free(&current->value);
+	free(current);
+	current = next;
 }
 free(l);
 *lp = NULL;
@@ -1190,14 +1176,15 @@
 return(l);
 }
 
-void sync_action_list_add(struct sync_action_list *l, char *name, char *user)
+void sync_action_list_add(struct sync_action_list *l,
+			 const char *name, const char *user)
 {
 struct sync_action *current;
 
 if (!name && !user) return;
 
 for (current = l->head ; current ; current = current->next) {
- if ((!name || (current->name && !strcmp(current->name, name))) &&
+	if ((!name || (current->name && !strcmp(current->name, name))) &&
 	 (!user || (current->user && !strcmp(current->user, user)))) {
 	 current->active = 1; /* Make sure active */
 	 return;
@@ -1208,14 +1195,14 @@
 
 current = xzmalloc(sizeof(struct sync_action));
 current->next = NULL;
- current->name = (name) ? xstrdup(name) : NULL;
- current->user = (user) ? xstrdup(user) : NULL;
+ current->name = xstrdupnull(name);
+ current->user = xstrdupnull(user);
 current->active = 1;
 
 if (l->tail)
- l->tail = l->tail->next = current;
+	l->tail = l->tail->next = current;
 else
- l->head = l->tail = current;
+	l->head = l->tail = current;
 
 l->count++;
 
@@ -1228,13 +1215,13 @@
 
 current = l->head;
 while (current) {
- next = current->next;
+	next = current->next;
 
- if (current->name) free(current->name);
- if (current->user) free(current->user);
+	if (current->name) free(current->name);
+	if (current->user) free(current->user);
 
- free(current);
- current = next;
+	free(current);
+	current = next;
 }
 free(l);
 *lp = NULL;
@@ -1247,16 +1234,16 @@
 struct index_record record;
 
 while (low <= high) {
- mid = (high - low)/2 + low;
+	mid = (high - low)/2 + low;
 	if (mailbox_read_index_record(mailbox, mid, &record))
 	 return 0;
 
- if (record.uid == uid)
- return mid;
- else if (record.uid > uid)
- high = mid - 1;
- else
- low = mid + 1;
+	if (record.uid == uid)
+	 return mid;
+	else if (record.uid > uid)
+	 high = mid - 1;
+	else
+	 low = mid + 1;
 }
 return 0;
 }
@@ -1267,21 +1254,23 @@
 	 void *rock)
 {
 struct sync_name_list *list = (struct sync_name_list *) rock;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 
 if (mboxlist_lookup(name, &mbentry, NULL))
 	return 0;
 
 /* only want normal mailboxes... */
- if (!(mbentry.mbtype & (MBTYPE_RESERVE | MBTYPE_MOVING | MBTYPE_REMOTE))) 
+ if (!(mbentry->mbtype & (MBTYPE_RESERVE | MBTYPE_MOVING | MBTYPE_REMOTE)))
 	sync_name_list_add(list, name);
 
+ mboxlist_entry_free(&mbentry);
+
 return 0;
 }
 
-int addmbox_sub(void *rock, const char *key, int keylen,
+int addmbox_sub(void *rock, const char *key, size_t keylen,
 		const char *data __attribute__((unused)),
-		int datalen __attribute__((unused)))
+		size_t datalen __attribute__((unused)))
 {
 struct sync_name_list *list = (struct sync_name_list *) rock;
 
@@ -1320,6 +1309,14 @@
 prot_flush(out);
 }
 
+void sync_send_set(struct dlist *kl, struct protstream *out)
+{
+ prot_printf(out, "SET ");
+ dlist_print(kl, 1, out);
+ prot_printf(out, "\r\n");
+ prot_flush(out);
+}
+
 struct dlist *sync_parseline(struct protstream *in)
 {
 struct dlist *dl = NULL;
@@ -1341,44 +1338,25 @@
 			 struct sync_msgid_list *part_list,
 			 struct dlist *kupload)
 {
- struct sync_msgid *msgid;
- char *fname;
- struct index_record record2;
- struct stat sbuf;
- int r;
+ struct sync_msgid *msgid = sync_msgid_insert(part_list, &record->guid);
+ const char *fname;
 
- /* is it already reserved? */
- msgid = sync_msgid_lookup(part_list, &record->guid);
- if (msgid && msgid->mark) 
+ /* already uploaded, great */
+ if (!msgid->need_upload)
 	return 0;
 
- /* have to make sure the file exists */
- fname = mailbox_message_fname(mailbox, record->uid);
+ /* we'll trust that it exists - if not, we'll bail later,
+ * but right now we're under locks, so be fast */
+ fname = mailbox_record_fname(mailbox, record);
 if (!fname) return IMAP_MAILBOX_BADNAME;
 
- if (stat(fname, &sbuf) < 0) {
-	syslog(LOG_ERR, "IOERROR: failed to stat file %s", fname);
-	return IMAP_IOERROR;
- }
+ dlist_setfile(kupload, "MESSAGE", mailbox->part,
+		 &record->guid, record->size, fname);
 
- if ((unsigned) sbuf.st_size != record->size) {
-	syslog(LOG_ERR, "IOERROR: size mismatch %s %u (%lu != %u)",
-	 mailbox->name, record->uid, sbuf.st_size, record->size);
-	return IMAP_IOERROR;
- }
-
- /* parse the file to make sure the GUID matches */
- memset(&record2, 0, sizeof(struct index_record));
- r = message_parse(fname, &record2);
- if (r) return r;
- if (!message_guid_equal(&record->guid, &record2.guid)) {
-	syslog(LOG_ERR, "IOERROR: GUID mismatch %s %u",
-	 mailbox->name, record->uid);
-	return IMAP_IOERROR;
- }
-
- dlist_file(kupload, "MESSAGE", mailbox->part,
-	 &record->guid, record->size, fname);
+ /* note that we will be sending it, so it doesn't need to be
+ * sent again */
+ msgid->need_upload = 0;
+ part_list->toupload--;
 
 return 0;
 }
@@ -1389,30 +1367,41 @@
 		 struct dlist *kl, struct dlist *kupload,
 		 int printrecords)
 {
-
- dlist_atom(kl, "UNIQUEID", mailbox->uniqueid);
- dlist_atom(kl, "MBOXNAME", mailbox->name);
- dlist_num(kl, "LAST_UID", mailbox->i.last_uid);
- dlist_modseq(kl, "HIGHESTMODSEQ", mailbox->i.highestmodseq);
- dlist_num(kl, "RECENTUID", mailbox->i.recentuid);
- dlist_date(kl, "RECENTTIME", mailbox->i.recenttime);
- dlist_date(kl, "LAST_APPENDDATE", mailbox->i.last_appenddate);
- dlist_date(kl, "POP3_LAST_LOGIN", mailbox->i.pop3_last_login);
- dlist_num(kl, "UIDVALIDITY", mailbox->i.uidvalidity);
- dlist_atom(kl, "PARTITION", mailbox->part);
- dlist_atom(kl, "ACL", mailbox->acl);
- dlist_atom(kl, "OPTIONS", sync_encode_options(mailbox->i.options));
- dlist_num(kl, "SYNC_CRC", mailbox->i.sync_crc);
- if (mailbox->quotaroot) 
-	dlist_atom(kl, "QUOTAROOT", mailbox->quotaroot);
+ modseq_t xconvmodseq = 0;
+ int r = 0;
+
+ dlist_setatom(kl, "UNIQUEID", mailbox->uniqueid);
+ dlist_setatom(kl, "MBOXNAME", mailbox->name);
+ if (mailbox->mbtype)
+	dlist_setatom(kl, "MBOXTYPE", mboxlist_mbtype_to_string(mailbox->mbtype));
+ dlist_setnum32(kl, "LAST_UID", mailbox->i.last_uid);
+ dlist_setnum64(kl, "HIGHESTMODSEQ", mailbox->i.highestmodseq);
+ dlist_setnum32(kl, "RECENTUID", mailbox->i.recentuid);
+ dlist_setdate(kl, "RECENTTIME", mailbox->i.recenttime);
+ dlist_setdate(kl, "LAST_APPENDDATE", mailbox->i.last_appenddate);
+ dlist_setdate(kl, "POP3_LAST_LOGIN", mailbox->i.pop3_last_login);
+ dlist_setdate(kl, "POP3_SHOW_AFTER", mailbox->i.pop3_show_after);
+ dlist_setnum32(kl, "UIDVALIDITY", mailbox->i.uidvalidity);
+ dlist_setatom(kl, "PARTITION", mailbox->part);
+ dlist_setatom(kl, "ACL", mailbox->acl);
+ dlist_setatom(kl, "OPTIONS", sync_encode_options(mailbox->i.options));
+ dlist_setnum32(kl, "SYNC_CRC", sync_crc_calc(mailbox, /*force*/0));
+ if (mailbox->quotaroot)
+	dlist_setatom(kl, "QUOTAROOT", mailbox->quotaroot);
+ if (mailbox_has_conversations(mailbox)) {
+	r = mailbox_get_xconvmodseq(mailbox, &xconvmodseq);
+	if (!r && xconvmodseq)
+	 dlist_setnum64(kl, "XCONVMODSEQ", xconvmodseq);
+ }
 
 if (printrecords) {
 	struct index_record record;
 	struct dlist *il;
-	struct dlist *rl = dlist_list(kl, "RECORD");
+	struct dlist *rl = dlist_newlist(kl, "RECORD");
 	uint32_t recno;
 	int send_file;
 	uint32_t prevuid = 0;
+	struct sync_annot_list *annots = NULL;
 
 	for (recno = 1; recno <= mailbox->i.num_records; recno++) {
 	 /* we can't send bogus records */
@@ -1449,22 +1438,41 @@
 		send_file = 0;
 
 	 if (send_file) {
-		int r = sync_send_file(mailbox, &record, part_list, kupload);
-		if (r) return r;
+		r = sync_send_file(mailbox, &record, part_list, kupload);
+		if (r) goto done;
 	 }
 
-	 il = dlist_kvlist(rl, "RECORD");
-	 dlist_num(il, "UID", record.uid);
-	 dlist_modseq(il, "MODSEQ", record.modseq);
-	 dlist_date(il, "LAST_UPDATED", record.last_updated);
+	 il = dlist_newkvlist(rl, "RECORD");
+	 dlist_setnum32(il, "UID", record.uid);
+	 dlist_setnum64(il, "MODSEQ", record.modseq);
+	 dlist_setdate(il, "LAST_UPDATED", record.last_updated);
 	 sync_print_flags(il, mailbox, &record);
-	 dlist_date(il, "INTERNALDATE", record.internaldate);
-	 dlist_num(il, "SIZE", record.size);
-	 dlist_atom(il, "GUID", message_guid_encode(&record.guid));
+	 dlist_setdate(il, "INTERNALDATE", record.internaldate);
+	 dlist_setnum32(il, "SIZE", record.size);
+	 dlist_setatom(il, "GUID", message_guid_encode(&record.guid));
+
+	 dlist_sethex64(il, "CID", record.cid);
+
+	 r = read_annotations(mailbox, &record, &annots);
+	 if (r) goto done;
+
+	 if (annots) {
+		encode_annotations(il, annots);
+		sync_annot_list_free(&annots);
+	 }
+	}
+
+	r = read_annotations(mailbox, NULL, &annots);
+	if (r) goto done;
+
+	if (annots) {
+	 encode_annotations(kl, annots);
+	 sync_annot_list_free(&annots);
 	}
 }
 
- return 0;
+done:
+ return r;
 }
 
 int sync_parse_response(const char *cmd, struct protstream *in,
@@ -1475,12 +1483,15 @@
 struct dlist *kl = NULL;
 int c;
 
- if ((c = getword(in, &response)) == EOF)
- return IMAP_PROTOCOL_ERROR;
+ if ((c = getword(in, &response)) == EOF) {
+	syslog(LOG_ERR, "IOERROR: zero length response to %s (%s)",
+	 cmd, prot_error(in));
+	return IMAP_PROTOCOL_ERROR;
+ }
 
 if (c != ' ') goto parse_err;
 
- kl = dlist_new(cmd);
+ kl = dlist_newlist(NULL, cmd);
 while (!strcmp(response.s, "*")) {
 	struct dlist *item = sync_parseline(in);
 	if (!item) goto parse_err;
@@ -1492,46 +1503,47 @@
 if (!strcmp(response.s, "OK")) {
 	if (klp) *klp = kl;
 	else dlist_free(&kl);
- eatline(in, c);
- return 0;
+	eatline(in, c);
+	return 0;
 }
 if (!strcmp(response.s, "NO")) {
 	dlist_free(&kl);
- sync_getline(in, &errmsg);
- syslog(LOG_ERR, "%s received NO response: %s", cmd, errmsg.s);
+	sync_getline(in, &errmsg);
+	syslog(LOG_ERR, "%s received NO response: %s", cmd, errmsg.s);
 
- /* Slight hack to transform certain error strings into equivalent
- * imap_err value so that caller has some idea of cause. Match
+	/* Slight hack to transform certain error strings into equivalent
+	 * imap_err value so that caller has some idea of cause. Match
 	 * this to the logic at print_response in sync_server */
- if (!strncmp(errmsg.s, "IMAP_INVALID_USER ",
- strlen("IMAP_INVALID_USER ")))
- return IMAP_INVALID_USER;
- else if (!strncmp(errmsg.s, "IMAP_MAILBOX_NONEXISTENT ",
- strlen("IMAP_MAILBOX_NONEXISTENT ")))
- return IMAP_MAILBOX_NONEXISTENT;
- else if (!strncmp(errmsg.s, "IMAP_MAILBOX_CRC ",
- strlen("IMAP_MAILBOX_CRC ")))
- return IMAP_MAILBOX_CRC;
- else if (!strncmp(errmsg.s, "IMAP_PROTOCOL_ERROR ",
- strlen("IMAP_PROTOCOL_ERROR ")))
- return IMAP_PROTOCOL_ERROR;
- else if (!strncmp(errmsg.s, "IMAP_PROTOCOL_BAD_PARAMETERS ",
- strlen("IMAP_PROTOCOL_BAD_PARAMETERS ")))
- return IMAP_PROTOCOL_BAD_PARAMETERS;
- else
- return IMAP_REMOTE_DENIED;
+	if (!strncmp(errmsg.s, "IMAP_INVALID_USER ",
+		 strlen("IMAP_INVALID_USER ")))
+	 return IMAP_INVALID_USER;
+	else if (!strncmp(errmsg.s, "IMAP_MAILBOX_NONEXISTENT ",
+			 strlen("IMAP_MAILBOX_NONEXISTENT ")))
+	 return IMAP_MAILBOX_NONEXISTENT;
+	else if (!strncmp(errmsg.s, "IMAP_SYNC_CHECKSUM ",
+			 strlen("IMAP_SYNC_CHECKSUM ")))
+	 return IMAP_SYNC_CHECKSUM;
+	else if (!strncmp(errmsg.s, "IMAP_PROTOCOL_ERROR ",
+			 strlen("IMAP_PROTOCOL_ERROR ")))
+	 return IMAP_PROTOCOL_ERROR;
+	else if (!strncmp(errmsg.s, "IMAP_PROTOCOL_BAD_PARAMETERS ",
+			 strlen("IMAP_PROTOCOL_BAD_PARAMETERS ")))
+	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+	else
+	 return IMAP_REMOTE_DENIED;
 }
 
 parse_err:
 dlist_free(&kl);
 sync_getline(in, &errmsg);
- syslog(LOG_ERR, "%s received %s response: %s",
- cmd, response.s, errmsg.s);
+ syslog(LOG_ERR, "IOERROR: %s received %s response: %s",
+	 cmd, response.s, errmsg.s);
 return IMAP_PROTOCOL_ERROR;
 }
 
 int sync_append_copyfile(struct mailbox *mailbox,
-			 struct index_record *record)
+			 struct index_record *record,
+			 const struct sync_annot_list *annots)
 {
 const char *fname, *destname;
 struct message_guid tmp_guid;
@@ -1559,11 +1571,12 @@
 }
 
 if (!message_guid_equal(&tmp_guid, &record->guid)) {
-	syslog(LOG_ERR, "IOERROR: guid mismatch on parse %s", fname);
-	return IMAP_MAILBOX_CRC;
+	syslog(LOG_ERR, "IOERROR: guid mismatch on parse %s (%s)",
+	 fname, message_guid_encode(&record->guid));
+	return IMAP_IOERROR;
 }
 
- destname = mailbox_message_fname(mailbox, record->uid);
+ destname = mailbox_record_fname(mailbox, record);
 cyrus_mkdir(destname, 0755);
 r = mailbox_copyfile(fname, destname, 0);
 if (r) {
@@ -1572,7 +1585,255 @@
 	return r;
 }
 
+ /* apply the remote annotations */
+ r = apply_annotations(mailbox, record, NULL, annots, 0);
+ if (r) {
+	syslog(LOG_ERR, "Failed to apply annotations: %s",
+	 error_message(r));
+	return r;
+ }
+
 just_write:
 return mailbox_append_index_record(mailbox, record);
 }
 
+/* ====================================================================== */
+
+static int read_one_annot(const char *mailbox __attribute__((unused)),
+			 uint32_t uid __attribute__((unused)),
+			 const char *entry,
+			 const char *userid,
+			 const struct buf *value,
+			 void *rock)
+{
+ struct sync_annot_list **salp = (struct sync_annot_list **)rock;
+
+ if (!*salp)
+	*salp = sync_annot_list_create();
+ sync_annot_list_add(*salp, entry, userid, value);
+ return 0;
+}
+
+/*
+ * Read all the annotations in the local annotations database
+ * for the message given by @mailbox and @record, returning them
+ * as a new sync_annot_list. The caller should free the new
+ * list with sync_annot_list_free().
+ * If record is NULL, return the mailbox annotations
+ *
+ * Returns: non-zero on error,
+ *	 resulting sync_annot_list in *@resp
+ */
+int read_annotations(const struct mailbox *mailbox,
+		 const struct index_record *record,
+		 struct sync_annot_list **resp)
+{
+ *resp = NULL;
+ return annotatemore_findall(mailbox->name, record ? record->uid : 0,
+				/* all entries*/"*",
+				read_one_annot, (void *)resp);
+}
+
+/*
+ * Encode the given list of annotations @sal as a dlist
+ * structure with the given @parent.
+ */
+void encode_annotations(struct dlist *parent,
+			const struct sync_annot_list *sal)
+{
+ const struct sync_annot *sa;
+ struct dlist *annots = NULL;
+ struct dlist *aa;
+
+ if (!sal)
+	return;
+ for (sa = sal->head ; sa ; sa = sa->next) {
+	if (!annots)
+	 annots = dlist_newlist(parent, "ANNOTATIONS");
+
+	aa = dlist_newkvlist(annots, "A");
+	dlist_setatom(aa, "ENTRY", sa->entry);
+	dlist_setatom(aa, "USERID", sa->userid);
+	dlist_setmap(aa, "VALUE", sa->value.s, sa->value.len);
+ }
+}
+
+/*
+ * Decode the given list of encoded annotations @annots and create
+ * a new sync_annot_list in *@salp, which the caller should free
+ * with sync_annot_list_free().
+ *
+ * Returns: zero on success or Cyrus error code.
+ */
+int decode_annotations(/*const*/struct dlist *annots,
+		 struct sync_annot_list **salp)
+{
+ struct dlist *aa;
+ const char *entry;
+ const char *userid;
+ const char *v;
+ size_t l;
+ struct buf value = BUF_INITIALIZER;
+
+ *salp = NULL;
+ if (strcmp(annots->name, "ANNOTATIONS"))
+	return IMAP_PROTOCOL_BAD_PARAMETERS;
+
+ for (aa = annots->head ; aa ; aa = aa->next) {
+	if (!*salp)
+	 *salp = sync_annot_list_create();
+	if (!dlist_getatom(aa, "ENTRY", &entry))
+	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+	if (!dlist_getatom(aa, "USERID", &userid))
+	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+	if (!dlist_getmap(aa, "VALUE", &v, &l))
+	 return IMAP_PROTOCOL_BAD_PARAMETERS;
+	buf_init_ro(&value, v, l);
+	sync_annot_list_add(*salp, entry, userid, &value);
+ }
+ return 0;
+}
+
+/*
+ * Merge a local and remote list of annotations, and apply the resulting
+ * list of annotations to the local annotation database, storing new values
+ * or deleting old values as necessary. Manages its own annotations
+ * transaction.
+ * Record may be null, to process mailbox annotations.
+ */
+
+static int diff_annotation(const struct sync_annot *a,
+			 const struct sync_annot *b,
+			 int diff_value)
+{
+ int diff = 0;
+
+ if (!a && !b) return 0;
+
+ if (a)
+	diff--;
+ if (b)
+	diff++;
+
+ if (!diff)
+	diff = strcmp(a->entry, b->entry);
+ if (!diff)
+	diff = strcmp(a->userid, b->userid);
+ if (!diff && diff_value)
+	diff = buf_cmp(&a->value, &b->value);
+
+ return diff;
+}
+
+int diff_annotations(const struct sync_annot_list *local_annots,
+		 const struct sync_annot_list *remote_annots)
+{
+ const struct sync_annot *local = (local_annots ? local_annots->head : NULL);
+ const struct sync_annot *remote = (remote_annots ? remote_annots->head : NULL);
+ while (local || remote) {
+	int r = diff_annotation(local, remote, 1);
+	if (r) return r;
+	if (local) local = local->next;
+	if (remote) remote = remote->next;
+ }
+
+ return 0;
+}
+
+int apply_annotations(struct mailbox *mailbox,
+		 const struct index_record *record,
+		 const struct sync_annot_list *local_annots,
+		 const struct sync_annot_list *remote_annots,
+		 int local_wins)
+{
+ const struct sync_annot *local = (local_annots ? local_annots->head : NULL);
+ const struct sync_annot *remote = (remote_annots ? remote_annots->head : NULL);
+ const struct sync_annot *chosen;
+ static const struct buf novalue = BUF_INITIALIZER;
+ const struct buf *value;
+ int r = 0;
+ int diff;
+ annotate_state_t *astate = NULL;
+
+ if (record) {
+	r = mailbox_get_annotate_state(mailbox, record->uid, &astate);
+ }
+ else {
+	astate = annotate_state_new();
+	r = annotate_state_set_mailbox(astate, mailbox);
+ }
+ if (r) goto out;
+
+ /*
+ * We rely here on the database scan order resulting in lists
+ * of annotations that are ordered lexically on entry then userid.
+ * We walk over both lists at once, choosing an annotation from
+ * either the local list only (diff < 0), the remote list only
+ * (diff > 0), or both lists (diff == 0).
+ */
+ while (local || remote) {
+	diff = diff_annotation(local, remote, 0);
+	chosen = 0;
+	if (diff < 0) {
+	 chosen = local;
+	 value = (local_wins ? &local->value : &novalue);
+	 local = local->next;
+	}
+	else if (diff > 0) {
+	 chosen = remote;
+	 value = (local_wins ? &novalue : &remote->value);
+	 remote = remote->next;
+	}
+	else {
+	 chosen = remote;
+	 value = (local_wins ? &local->value : &remote->value);
+	 diff = buf_cmp(&local->value, &remote->value);
+	 local = local->next;
+	 remote = remote->next;
+	 if (!diff)
+		continue; /* same value, skip */
+	}
+
+	r = annotate_state_write(astate, chosen->entry,
+				 chosen->userid, value);
+	if (r)
+	 break;
+ }
+
+out:
+ if (!record) {
+	/* need to manage our own txn for the global db */
+	if (!r)
+	 r = annotate_state_commit(&astate);
+	else
+	 annotate_state_abort(&astate);
+ }
+ /* else, the struct mailbox manages it for us */
+
+ return r;
+}
+
+/* ====================================================================== */
+
+static unsigned sync_crc_vers;
+
+int sync_crc_setup(unsigned minvers, unsigned maxvers, int strict)
+{
+ sync_crc_vers = mailbox_best_crcvers(minvers, maxvers);
+ if (strict) {
+	if (sync_crc_vers < minvers || sync_crc_vers > maxvers) {
+	 syslog(LOG_ERR, "IOERROR: failed to negotiate CRC: %u (%u %u)",
+		 sync_crc_vers, minvers, maxvers);
+	 return IMAP_PROTOCOL_ERROR;
+	}
+ }
+
+ return sync_crc_vers;
+}
+
+uint32_t sync_crc_calc(struct mailbox *mailbox, int force)
+{
+ return mailbox_sync_crc(mailbox, sync_crc_vers, force);
+}
+
+/* ====================================================================== */

cyrus-imapd-2.4.17.tar.gz/imap/sync_support.h -> cyrus-imapd-2.5.tar.gz/imap/sync_support.h Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: sync_support.h,v 1.12 2010/01/06 17:01:42 murch Exp $
- *
 * Original version written by David Carter <dpc22@cam.ac.uk>
 * Rewritten and integrated into Cyrus by Ken Murchison <ken@oceana.com>
 */
@@ -56,8 +54,6 @@
 #define SYNC_MESSAGE_LIST_HASH_SIZE (65536)
 #define SYNC_MESSAGE_LIST_MAX_OPEN_FILES (64)
 
-int sync_eatlines_unsolicited(struct protstream *pin, int c);
-
 void sync_printdate(struct protstream *out, time_t time);
 time_t sync_parsedate(const char *s);
 int sync_getflags(struct dlist *kl,
@@ -89,7 +85,7 @@
 struct sync_msgid *next;
 struct sync_msgid *hash_next;
 struct message_guid guid;
- int mark;
+ int need_upload;
 };
 
 struct sync_msgid_list {
@@ -98,13 +94,13 @@
 struct sync_msgid **hash;
 int hash_size;
 int count; /* Total number of messages in list */
- int marked; /* Number of reserved messages in list */
+ int toupload; /* Number of messages needing upload in list */
 };
 
 struct sync_msgid_list *sync_msgid_list_create(int hash_size);
 
-struct sync_msgid *sync_msgid_add(struct sync_msgid_list *list,
-				 struct message_guid *guid);
+struct sync_msgid *sync_msgid_insert(struct sync_msgid_list *list,
+				 struct message_guid *guid);
 
 void sync_msgid_remove(struct sync_msgid_list *l,
 		 struct message_guid *guid);
@@ -139,18 +135,22 @@
 struct sync_folder *next;
 char *uniqueid;
 char *name;
+ uint32_t mbtype;
 char *part;
 char *acl;
- unsigned last_uid;
+ uint32_t last_uid;
 modseq_t highestmodseq;
- unsigned options;
- unsigned long uidvalidity;
- bit32 sync_crc;
- unsigned long recentuid;
+ uint32_t options;
+ uint32_t uidvalidity;
+ uint32_t sync_crc;
+ uint32_t recentuid;
 time_t recenttime;
 time_t pop3_last_login;
+ time_t pop3_show_after;
+ struct sync_annot_list *annots;
+ modseq_t xconvmodseq;
 struct quota quota;
- int mark; 
+ int mark;
 int reserve; /* Folder has been processed by reserve operation */
 };
 
@@ -163,15 +163,19 @@
 
 struct sync_folder *sync_folder_list_add(struct sync_folder_list *l,
 					 const char *uniqueid, const char *name,
-					 const char *part, const char *acl, 
+					 uint32_t mbtype,
+					 const char *part, const char *acl,
 					 uint32_t options,
-					 uint32_t uidvalidity, 
+					 uint32_t uidvalidity,
 					 uint32_t last_uid,
 					 modseq_t highestmodseq,
 					 uint32_t crc,
 					 uint32_t recentuid,
 					 time_t recenttime,
-					 time_t pop3_last_login);
+					 time_t pop3_last_login,
+					 time_t pop3_show_after,
+					 struct sync_annot_list *annot,
+					 modseq_t xconvmodseq);
 
 struct sync_folder *sync_folder_lookup(struct sync_folder_list *l,
 				 const char *uniqueid);
@@ -191,6 +195,7 @@
 char *oldname;
 char *newname;
 char *part;
+ unsigned uidvalidity;
 int done;
 };
 
@@ -204,8 +209,9 @@
 
 
 struct sync_rename *sync_rename_list_add(struct sync_rename_list *l,
-					 const char *id, const char *oldname,
-					 const char *newname, const char *partition);
+					 const char *id, const char *oldname,
+					 const char *newname, const char *partition,
+					 unsigned uidvalidity);
 
 struct sync_rename *sync_rename_lookup(struct sync_rename_list *l,
 					 const char *oldname);
@@ -217,7 +223,7 @@
 struct sync_quota {
 struct sync_quota *next;
 char *root;
- int limit;
+ int limitsQUOTA_NUMRESOURCES;
 int done;
 };
 
@@ -230,13 +236,16 @@
 struct sync_quota_list *sync_quota_list_create(void);
 
 struct sync_quota *sync_quota_list_add(struct sync_quota_list *l,
-					 const char *root, int limit);
+				 const char *root);
 
 struct sync_quota *sync_quota_lookup(struct sync_quota_list *l,
 					 const char *name);
 
 void sync_quota_list_free(struct sync_quota_list **lp);
 
+void sync_encode_quota_limits(struct dlist *kl, const int limitsQUOTA_NUMRESOURCES);
+void sync_decode_quota_limits(/*const*/ struct dlist *kl, int limitsQUOTA_NUMRESOURCES);
+
 /* ====================================================================== */
 
 struct sync_name {
@@ -295,6 +304,7 @@
 char *user;
 char *name;
 time_t last_update;
+ struct message_guid guid;
 int active;
 int mark;
 };
@@ -308,12 +318,13 @@
 struct sync_sieve_list *sync_sieve_list_create(void);
 
 void sync_sieve_list_add(struct sync_sieve_list *l,
-			 const char *name, time_t last_update, int active);
+			 const char *name, time_t last_update, 
+			 struct message_guid *guidp, int active);
 
 struct sync_sieve *sync_sieve_lookup(struct sync_sieve_list *l,
-					 char *name);
+				 const char *name);
 
-void sync_sieve_list_set_active(struct sync_sieve_list *l, char *name);
+void sync_sieve_list_set_active(struct sync_sieve_list *l, const char *name);
 
 void sync_sieve_list_free(struct sync_sieve_list **lp);
 
@@ -336,7 +347,7 @@
 struct sync_annot *next;
 char *entry;
 char *userid;
- char *value;
+ struct buf value;
 int mark;
 };
 
@@ -350,7 +361,7 @@
 
 void sync_annot_list_add(struct sync_annot_list *l,
 			 const char *entry, const char *userid,
-			 const char *value);
+			 const struct buf *value);
 
 void sync_annot_list_free(struct sync_annot_list **lp);
 
@@ -370,8 +381,8 @@
 
 struct sync_action_list *sync_action_list_create(void);
 
-void sync_action_list_add(struct sync_action_list *l, char *name,
-			 char *user);
+void sync_action_list_add(struct sync_action_list *l,
+		 const char *name, const char *user);
 
 void sync_action_list_free(struct sync_action_list **lp);
 
@@ -380,15 +391,16 @@
 void sync_send_response(struct dlist *kl, struct protstream *out);
 void sync_send_apply(struct dlist *kl, struct protstream *out);
 void sync_send_lookup(struct dlist *kl, struct protstream *out);
+void sync_send_set(struct dlist *kl, struct protstream *out);
 
 struct dlist *sync_parseline(struct protstream *in);
 
 /* ====================================================================== */
 
 int addmbox(char *name, int matchlen, int maycreate, void *rock);
-int addmbox_sub(void *rockp, const char *key, int keylen,
+int addmbox_sub(void *rockp, const char *key, size_t keylen,
 		const char *data __attribute__((unused)),
-		int datalen __attribute__((unused)));
+		size_t datalen __attribute__((unused)));
 
 int sync_mailbox(struct mailbox *mailbox,
 		 struct sync_folder *remote,
@@ -397,9 +409,33 @@
 		 int printrecords);
 
 int parse_upload(struct dlist *kr, struct mailbox *mailbox,
-		 struct index_record *record);
+		 struct index_record *record,
+		 struct sync_annot_list **annotsp);
 int sync_append_copyfile(struct mailbox *mailbox,
-			 struct index_record *record);
+			 struct index_record *record,
+			 const struct sync_annot_list *sal);
+
+/* ====================================================================== */
+
+int read_annotations(const struct mailbox *,
+		 const struct index_record *,
+		 struct sync_annot_list **);
+void encode_annotations(struct dlist *parent,
+			const struct sync_annot_list *);
+int decode_annotations(/*const*/struct dlist *,
+		 struct sync_annot_list **);
+int apply_annotations(struct mailbox *mailbox,
+		 const struct index_record *record,
+		 const struct sync_annot_list *local_annots,
+		 const struct sync_annot_list *remote_annots,
+		 int local_wins);
+int diff_annotations(const struct sync_annot_list *local_annots,
+		 const struct sync_annot_list *remote_annots);
+
+/* ====================================================================== */
+
+int sync_crc_setup(unsigned minv, unsigned maxv, int strict);
+uint32_t sync_crc_calc(struct mailbox *mailbox, int force);
 
 /* ====================================================================== */

cyrus-imapd-2.4.17.tar.gz/imap/syncnews.c -> cyrus-imapd-2.5.tar.gz/imap/syncnews.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: syncnews.c,v 1.30 2010/01/06 17:01:42 murch Exp $
 */
 
 #include <config.h>
@@ -57,11 +55,10 @@
 #include <netinet/in.h>
 #include <sys/stat.h>
 
-#include "assert.h"
 #include "global.h"
 #include "xmalloc.h"
 #include "exitcodes.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "mboxlist.h"
 #include "convert_code.h"
@@ -81,7 +78,7 @@
 /* Forward declarations */
 void readactive(char *active);
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr, "usage: syncnews -C <alt_config> active\n");
 exit(EC_USAGE);
@@ -92,7 +89,7 @@
 int opt;
 char *alt_config = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -245,7 +242,7 @@
 for (i = 0; i < group_num; i++) {
 	if (!group_seeni) {
 	 r = mboxlist_createmailbox(groupi, 0, "news",
-				 1, "anonymous", NULL, 0, 0, 0);
+				 1, "anonymous", NULL, 0, 0, 0, NULL, 0, NULL);
 
 	 if (r == IMAP_MAILBOX_BADNAME) {
 		printf("ignored %s\n", groupi);

cyrus-imapd-2.4.17.tar.gz/imap/telemetry.c -> cyrus-imapd-2.5.tar.gz/imap/telemetry.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: telemetry.c,v 1.12 2010/06/28 12:03:12 brong Exp $
 */
 
 #include <config.h>
@@ -59,13 +57,14 @@
 #include "global.h"
 
 /* create telemetry log; return fd of log */
-int telemetry_log(const char *userid, struct protstream *pin, 
+EXPORTED int telemetry_log(const char *userid, struct protstream *pin,
 		 struct protstream *pout, int usetimestamp)
 {
 char buf1024;
+ char buf21024;
 int fd = -1;
 time_t now;
- int n;
+ int r;
 
 if(usetimestamp) {
 	struct timeval tv;
@@ -78,7 +77,7 @@
 		 (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec);
 } else {
 	/* use pid */
-	snprintf(buf, sizeof(buf), "%s%s%s/%s-%lu", 
+	snprintf(buf, sizeof(buf), "%s%s%s/%s-%lu",
 		 config_dir, FNAME_LOGDIR, userid, config_ident,
 		 (unsigned long) getpid());
 }
@@ -87,18 +86,20 @@
 
 if (fd != -1) {
 	now = time(NULL);
-	snprintf(buf, sizeof(buf), "---------- %s %s\n", 
+	snprintf(buf2, sizeof(buf2), "---------- %s %s\n",
 		 userid, ctime(&now));
-	n = write(fd, buf, strlen(buf));
+	r = write(fd, buf2, strlen(buf2));
+	if (r < 0)
+	 syslog(LOG_ERR, "IOERROR: unable to write to telemetry log %s: %m", buf);
 
 	prot_setlog(pin, fd);
 	prot_setlog(pout, fd);
 }
- 
+
 return fd;
 }
 
-void telemetry_rusage(char *userid)
+EXPORTED void telemetry_rusage(char *userid)
 {
 static struct rusage	previous;
 struct rusage		current;

cyrus-imapd-2.4.17.tar.gz/imap/telemetry.h -> cyrus-imapd-2.5.tar.gz/imap/telemetry.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/tls.c -> cyrus-imapd-2.5.tar.gz/imap/tls.c Changed

@@ -42,8 +42,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: tls.c,v 1.67 2010/01/06 17:01:42 murch Exp $
 */
 
 /*
@@ -123,8 +121,6 @@
 #include "assert.h"
 #include "nonblock.h"
 #include "xmalloc.h"
-#include "xstrlcat.h"
-#include "xstrlcpy.h"
 #include "tls.h"
 
 /* Session caching/reuse stuff */
@@ -136,9 +132,6 @@
 static struct db *sessdb = NULL;
 static int sess_dbopen = 0;
 
-/* We must keep some of the info available */
-static const char hexcodes = "0123456789ABCDEF";
-
 enum {
 var_imapd_tls_loglevel = 0,
 var_proxy_tls_loglevel = 0,
@@ -155,7 +148,7 @@
 static int do_dump = 0;		/* actively dumping protocol? */
 
 
-int tls_enabled(void)
+EXPORTED int tls_enabled(void)
 {
 const char *val;
 
@@ -172,7 +165,7 @@
 * tim - this seems to just be giving logging messages
 */
 
-static void apps_ssl_info_callback(SSL * s, int where, int ret)
+static void apps_ssl_info_callback(const SSL * s, int where, int ret)
 {
 char *str;
 int w;
@@ -255,9 +248,9 @@
 
 if (ret == NULL) {
 	ret = get_dh1024();
-	syslog(LOG_NOTICE, "imapd:Loading hard-coded DH parameters");
+	syslog(LOG_DEBUG, "imapd:Loading hard-coded DH parameters");
 } else {
-	syslog(LOG_NOTICE, "imapd:Loading DH parameters from file");
+	syslog(LOG_DEBUG, "imapd:Loading DH parameters from file");
 }
 
 if (bio != NULL) BIO_free(bio);
@@ -314,6 +307,22 @@
 }
 
 
+#if (OPENSSL_VERSION_NUMBER >= 0x0090806fL)
+static int servername_callback(SSL *ssl, int *ad __attribute__((unused)),
+			 void *arg __attribute__((unused)))
+{
+ const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+
+ if (servername) {
+	syslog(LOG_DEBUG, "TLS Server Name Indication (SNI) Extension: \"%s\"",
+	 servername);
+ }
+
+ return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
+
 /*
 * taken from OpenSSL crypto/bio/b_dump.c, modified to save a lot of strcpy
 * and strcat by Matti Aarnio.
@@ -471,7 +480,7 @@
 if (len) {
 	/* store the session in our database */
 	do {
-	 ret = DB->store(sessdb, (const char *) sess->session_id,
+	 ret = cyrusdb_store(sessdb, (const char *) sess->session_id,
 			 sess->session_id_length,
 			 (const char *) data, len + sizeof(time_t), NULL);
 	} while (ret == CYRUSDB_AGAIN);
@@ -506,18 +515,14 @@
 if (!sess_dbopen) return;
 
 do {
-	ret = DB->delete(sessdb, (const char *) id, idlen, NULL, 1);
+	ret = cyrusdb_delete(sessdb, (const char *) id, idlen, NULL, 1);
 } while (ret == CYRUSDB_AGAIN);
 
 /* log this transaction */
 if (var_imapd_tls_loglevel > 0) {
-	int i;
 	char idstrSSL_MAX_SSL_SESSION_ID_LENGTH*2 + 1;
 
-	for (i = 0; i < idlen; i++) {
-	 sprintf(idstr+i*2, "%02X", idi);
-	}
-	 
+	bin_to_hex(id, idlen, idstr, BH_UPPER);
 	syslog(LOG_DEBUG, "remove TLS session: id=%s", idstr);
 }
 }
@@ -547,7 +552,7 @@
 {
 int ret;
 const char *data = NULL;
- int len = 0;
+ size_t len = 0;
 time_t expire = 0, now = time(0);
 SSL_SESSION *sess = NULL;
 
@@ -557,7 +562,7 @@
 if (!sess_dbopen) return NULL;
 
 do {
-	ret = DB->fetch(sessdb, (const char *) id, idlen, &data, &len, NULL);
+	ret = cyrusdb_fetch(sessdb, (const char *) id, idlen, &data, &len, NULL);
 } while (ret == CYRUSDB_AGAIN);
 
 if (!ret && data) {
@@ -618,7 +623,7 @@
 */
 
 /* must be called after cyrus_init */
-int tls_init_serverengine(const char *ident,
+EXPORTED int tls_init_serverengine(const char *ident,
 			 int verifydepth,
 			 int askcert,
 			 int tlsonly)
@@ -667,7 +672,7 @@
 	off |= SSL_OP_NO_SSLv3;
 }
 SSL_CTX_set_options(s_ctx, off);
- SSL_CTX_set_info_callback(s_ctx, (void (*)()) apps_ssl_info_callback);
+ SSL_CTX_set_info_callback(s_ctx, apps_ssl_info_callback);
 
 /* Don't use an internal session cache */
 SSL_CTX_sess_set_cache_size(s_ctx, 1); /* 0 is unlimited, so use 1 */
@@ -705,7 +710,7 @@
 	 fname = tofree;
 	}
 
-	r = (DB->open)(fname, CYRUSDB_CREATE, &sessdb);
+	r = cyrusdb_open(DB, fname, CYRUSDB_CREATE, &sessdb);
 	if (r != 0) {
 	 syslog(LOG_ERR, "DBERROR: opening %s: %s",
 		 fname, cyrusdb_strerror(ret));
@@ -757,6 +762,10 @@
 	 | SSL_VERIFY_CLIENT_ONCE;
 SSL_CTX_set_verify(s_ctx, verify_flags, verify_callback);
 
+#if (OPENSSL_VERSION_NUMBER >= 0x0090806fL)
+ SSL_CTX_set_tlsext_servername_callback(s_ctx, servername_callback);
+#endif
+
 if (askcert || requirecert) {
 if (CAfile == NULL) {
 	 syslog(LOG_ERR, 
@@ -808,11 +817,10 @@
 * filled in if the client authenticated. 'ret' is the SSL connection
 * on success.
 */
-int tls_start_servertls(int readfd, int writefd, int timeout,
+EXPORTED int tls_start_servertls(int readfd, int writefd, int timeout,
 			int *layerbits, char **authid, SSL **ret)
 {
 int sts;
- int j;
 unsigned int n;
 const SSL_CIPHER *cipher;
 X509 *peer;
@@ -964,16 +972,7 @@
 	 syslog(LOG_DEBUG, "issuer=%s", peer_issuer);
 
 	if (X509_digest(peer, EVP_md5(), md, &n)) {
-	 for (j = 0; j < (int) n; j++)
-	 {
-		fingerprintj * 3 = hexcodes(mdj & 0xf0) >> 4;
-		fingerprint(j * 3) + 1 = hexcodes(mdj & 0x0f);
-		if (j + 1 != (int) n) {
-		 fingerprint(j * 3) + 2 = '_';
-		} else {
-		 fingerprint(j * 3) + 2 = '\0';
-		}
-	 }
+	 bin_to_hex(md, n, fingerprint, BH_UPPER|BH_SEPARATOR('_'));
 	 if (var_imapd_tls_loglevel >= 2)
 		syslog(LOG_DEBUG, "fingerprint=%s", fingerprint);
 	}
@@ -1032,7 +1031,7 @@
 return r;
 }
 
-int tls_reset_servertls(SSL **conn)
+EXPORTED int tls_reset_servertls(SSL **conn)
 {
 int r = 0;
 
@@ -1059,12 +1058,12 @@
 return r;
 }
 
-int tls_shutdown_serverengine(void)
+EXPORTED int tls_shutdown_serverengine(void)
 {
 int r;
 
 if (tls_serverengine && sess_dbopen) {
-	r = (DB->close)(sessdb);
+	r = cyrusdb_close(sessdb);
 	if (r) {
 	 syslog(LOG_ERR, "DBERROR: error closing tlsdb: %s",
 		 cyrusdb_strerror(r));
@@ -1085,8 +1084,8 @@
 int deletions;
 };
 
-static int prune_p(void *rock, const char *id, int idlen,
-		 const char *data, int datalen)
+static int prune_p(void *rock, const char *id, size_t idlen,
+		 const char *data, size_t datalen)
 {
 struct prunerock *prock = (struct prunerock *) rock;
 time_t expire;
@@ -1100,7 +1099,7 @@
 
 /* log this transaction */
 if (var_imapd_tls_loglevel > 0) {
-	int i;
+	size_t i;
 	char idstrSSL_MAX_SSL_SESSION_ID_LENGTH*2 + 1;
 
 	assert(idlen <= SSL_MAX_SSL_SESSION_ID_LENGTH);
@@ -1117,9 +1116,9 @@
 return (expire < time(0));
 }
 
-static int prune_cb(void *rock, const char *id, int idlen,
+static int prune_cb(void *rock, const char *id, size_t idlen,
 		 const char *data __attribute__((unused)), 
- int datalen __attribute__((unused)))
+ size_t datalen __attribute__((unused)))
 {
 struct prunerock *prock = (struct prunerock *) rock;
 
@@ -1131,7 +1130,7 @@
 }
 
 /* must be called after cyrus_init */
-int tls_prune_sessions(void)
+EXPORTED int tls_prune_sessions(void)
 {
 const char *fname = NULL;
 char *tofree = NULL;
@@ -1146,7 +1145,7 @@
 	fname = tofree;
 }
 
- ret = (DB->open)(fname, 0, &sessdb);
+ ret = cyrusdb_open(DB, fname, 0, &sessdb);
 if (ret != CYRUSDB_OK) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s",
 	 fname, cyrusdb_strerror(ret));
@@ -1156,8 +1155,8 @@
 	/* check each session in our database */
 	sess_dbopen = 1;
 	prock.count = prock.deletions = 0;
-	DB->foreach(sessdb, "", 0, &prune_p, &prune_cb, &prock, NULL);
-	(DB->close)(sessdb);
+	cyrusdb_foreach(sessdb, "", 0, &prune_p, &prune_cb, &prock, NULL);
+	cyrusdb_close(sessdb);
 	sessdb = NULL;
 	sess_dbopen = 0;
 
@@ -1171,7 +1170,7 @@
 }
 
 /* fill string buffer with info about tls connection */
-int tls_get_info(SSL *conn, char *buf, size_t len)
+EXPORTED int tls_get_info(SSL *conn, char *buf, size_t len)
 {
 int usebits = 0;
 int algbits = 0;
@@ -1185,7 +1184,7 @@
 return (strlen(buf));
 }
 
-int tls_init_clientengine(int verifydepth,
+HIDDEN int tls_init_clientengine(int verifydepth,
 			 char *var_tls_cert_file,
 			 char *var_tls_key_file)
 {
@@ -1208,7 +1207,8 @@
 	printf("TLS client engine: cannot seed PRNG\n");
 	return -1;
 }
- 
+
+ /* XXX May need to use only SSLv3 for iSchedule */
 c_ctx = SSL_CTX_new(TLSv1_client_method());
 if (c_ctx == NULL) {
 	return (-1);
@@ -1216,7 +1216,7 @@
 
 off |= SSL_OP_ALL;		/* Work around all known bugs */
 SSL_CTX_set_options(c_ctx, off);
- SSL_CTX_set_info_callback(c_ctx, (void (*)()) apps_ssl_info_callback);
+ SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback);
 
 CAfile = config_getstring(IMAPOPT_TLS_CA_FILE);
 CApath = config_getstring(IMAPOPT_TLS_CA_PATH);
@@ -1251,7 +1251,7 @@
 return (0);
 }
 
-int tls_start_clienttls(int readfd, int writefd,
+HIDDEN int tls_start_clienttls(int readfd, int writefd,
 			int *layerbits, char **authid, SSL **ret,
 			SSL_SESSION **sess)
 {
@@ -1371,8 +1371,8 @@
 	tls_conn = NULL;
 }
 *ret = tls_conn;
- return r;
 
+ return r;
 }
 
 #else

cyrus-imapd-2.4.17.tar.gz/imap/tls.h -> cyrus-imapd-2.5.tar.gz/imap/tls.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/tls_prune.c -> cyrus-imapd-2.5.tar.gz/imap/tls_prune.c Changed

cyrus-imapd-2.4.17.tar.gz/imap/unexpunge.c -> cyrus-imapd-2.5.tar.gz/imap/unexpunge.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: unexpunge.c,v 1.15 2010/01/06 17:01:42 murch Exp $
 */
 
 #include <config.h>
@@ -50,52 +48,42 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <syslog.h>
-#include <errno.h>
 #include <signal.h>
 
 #include "annotate.h"
-#include "cyrusdb.h"
-#include "duplicate.h"
 #include "exitcodes.h"
 #include "global.h"
-#include "hash.h"
-#include "imap_err.h"
+#include "imap/imap_err.h"
 #include "index.h"
 #include "libcyr_cfg.h"
-#include "cyr_lock.h"
 #include "map.h"
 #include "mailbox.h"
 #include "mboxlist.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "sync_log.h"
 
-/* global state */
-const int config_need_data = 0;
-
 /* current namespace */
 static struct namespace unex_namespace;
 
-int verbose = 0;
-int unsetdeleted = 0;
+static int verbose = 0;
+static int unsetdeleted = 0;
+static const char *addflag = NULL;
 
-void usage(void)
+static void usage(void)
 {
 fprintf(stderr,
 	 "unexpunge -C <altconfig> -l <mailbox>\n"
- "unexpunge -C <altconfig> -t time-interval -d -v mailbox\n"
-	 "unexpunge -C <altconfig> -a -d -v <mailbox>\n"
-	 "unexpunge -C <altconfig> -u -d -v <mailbox> <uid>...\n");
+ "unexpunge -C <altconfig> -t time-interval -d -v -f flag mailbox\n"
+	 "unexpunge -C <altconfig> -a -d -v -f flag <mailbox>\n"
+	 "unexpunge -C <altconfig> -u -d -v -f flag <mailbox> <uid>...\n");
 exit(-1);
 }
 
-int compare_uid(const void *a, const void *b)
+static int compare_uid(const void *a, const void *b)
 {
 return *((unsigned long *) a) - *((unsigned long *) b);
 }
@@ -108,7 +96,7 @@
 MODE_UID
 };
 
-void list_expunged(const char *mboxname)
+static void list_expunged(const char *mboxname)
 {
 struct mailbox *mailbox = NULL;
 struct index_record *records = NULL;
@@ -181,23 +169,25 @@
 mailbox_close(&mailbox);
 }
 
-int restore_expunged(struct mailbox *mailbox, int mode, unsigned long *uids,
+static int restore_expunged(struct mailbox *mailbox, int mode, unsigned long *uids,
 		 unsigned nuids, time_t time_since, unsigned *numrestored,
 		 const char *mboxname)
 {
 uint32_t recno;
- uint32_t olduid;
 struct index_record record;
+ struct index_record newrecord;
+ annotate_state_t *astate = NULL;
 unsigned uidnum = 0;
 char oldfnameMAX_MAILBOX_PATH;
 const char *fname;
+ const char *userid = mboxname_to_userid(mailbox->name);
 int r = 0;
 
 *numrestored = 0;
 
 for (recno = 1; recno <= mailbox->i.num_records; recno++) {
 	r = mailbox_read_index_record(mailbox, recno, &record);
-	if (r) return r;
+	if (r) goto done;
 
 	/* still active */
 	if (!(record.system_flags & FLAG_EXPUNGED))
@@ -221,38 +211,62 @@
 	 /* otherwise we want this one */
 	}
 
-	/* mark the old one unlinked so we don't see it again */
-	olduid = record.uid;
-	record.system_flags |= FLAG_UNLINKED;
-	r = mailbox_rewrite_index_record(mailbox, &record);
-	if (r) return r;
+	/* work on a copy */
+	newrecord = record;
 
 	/* duplicate the old filename */
-	fname = mailbox_message_fname(mailbox, olduid);
-	strncpy(oldfname, fname, MAX_MAILBOX_PATH);
+	fname = mailbox_record_fname(mailbox, &record);
+	xstrncpy(oldfname, fname, MAX_MAILBOX_PATH);
 
 	/* bump the UID, strip the flags */
-	record.uid = mailbox->i.last_uid + 1;
-	record.system_flags &= ~(FLAG_UNLINKED|FLAG_EXPUNGED);
+	newrecord.uid = mailbox->i.last_uid + 1;
+	newrecord.system_flags &= ~FLAG_EXPUNGED;
 	if (unsetdeleted)
-	 record.system_flags &= ~FLAG_DELETED;
+	 newrecord.system_flags &= ~FLAG_DELETED;
 
 	/* copy the message file */
-	fname = mailbox_message_fname(mailbox, record.uid);
+	fname = mailbox_record_fname(mailbox, &newrecord);
 	r = mailbox_copyfile(oldfname, fname, 0);
-	if (r) return r;
+	if (r) goto done;
+
+	/* add the flag if requested */
+	if (addflag) {
+	 int userflag = 0;
+	 r = mailbox_user_flag(mailbox, addflag, &userflag, 1);
+	 if (r) goto done;
+	 newrecord.user_flagsuserflag/32 |= 1<<(userflag&31);
+	}
 
 	/* and append the new record */
-	mailbox_append_index_record(mailbox, &record);
+	r = mailbox_append_index_record(mailbox, &newrecord);
+	if (r) goto done;
+
+	/* ensure we have an astate connected to the destination
+	 * mailbox, so that the annotation txn will be committed
+	 * when we close the mailbox */
+	r = mailbox_get_annotate_state(mailbox, newrecord.uid, &astate);
+	if (r) goto done;
+
+	/* and copy over any annotations */
+	r = annotate_msg_copy(mailbox, record.uid,
+			 mailbox, newrecord.uid,
+			 userid);
+	if (r) goto done;
 
 	if (verbose)
 	 printf("Unexpunged %s: %u => %u\n",
-		 mboxname, olduid, record.uid);
+		 mboxname, record.uid, newrecord.uid);
+
+	/* mark the old one unlinked so we don't see it again */
+	record.system_flags |= FLAG_UNLINKED;
+	r = mailbox_rewrite_index_record(mailbox, &record);
+	if (r) goto done;
 
 	(*numrestored)++;
 }
 
- return 0;
+done:
+ return r;
 }
 
 int main(int argc, char *argv)
@@ -270,11 +284,11 @@
 unsigned nuids = 0;
 char *mboxname = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
- while ((opt = getopt(argc, argv, "C:laudt:v")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:laudt:f:v")) != EOF) {
 	switch (opt) {
 	case 'C': /* alt config file */
 	 alt_config = optarg;
@@ -325,6 +339,10 @@
 	 unsetdeleted = 1;
 	 break;
 
+	case 'f':
+	 addflag = optarg;
+	 break;
+
 	case 'v':
 	 verbose = 1;
 	 break;
@@ -339,7 +357,8 @@
 if (mode == MODE_UNKNOWN ||
 	(optind + (mode == MODE_UID ? 1 : 0)) >= argc) usage();
 
- cyrus_init(alt_config, "unexpunge", 0);
+
+ cyrus_init(alt_config, "unexpunge", 0, 0);
 
 mboxlist_init(0);
 mboxlist_open(NULL);
@@ -349,6 +368,11 @@
 
 sync_log_init();
 
+ if (addflag && addflag0 == '\\') {
+	syslog(LOG_ERR, "can't set a system flag");
+	fatal("can't set a system flag", EC_SOFTWARE);
+ }
+
 /* Set namespace -- force standard (internal) */
 if ((r = mboxname_init_namespace(&unex_namespace, 1)) != 0) {
 	syslog(LOG_ERR, "%s", error_message(r));

cyrus-imapd-2.4.17.tar.gz/imap/upgrade_index.c -> cyrus-imapd-2.5.tar.gz/imap/upgrade_index.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mailbox.c,v 1.199 2010/01/06 17:01:36 murch Exp $
 */
 #include <config.h>
 
@@ -49,7 +47,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <syslog.h>
 #include <utime.h>
 
@@ -70,16 +67,14 @@
 # endif
 #endif
 
+#include "annotate.h"
 #include "assert.h"
 #include "crc32.h"
-#include "exitcodes.h"
 #include "global.h"
-#include "imap_err.h"
-#include "cyr_lock.h"
+#include "imap/imap_err.h"
 #include "mailbox.h"
 #include "message.h"
 #include "map.h"
-#include "retry.h"
 #include "seen.h"
 #include "util.h"
 #include "sequence.h"
@@ -100,7 +95,8 @@
 static void upgrade_index_record(struct mailbox *mailbox,
 				 const char *buf,
 				 struct index_record *record,
-				 int record_size)
+				 int record_size,
+				 int oldversion)
 {
 char recordbufINDEX_RECORD_SIZE;
 struct utimbuf settime;
@@ -115,7 +111,22 @@
 * for sure */
 mailbox_buf_to_index_record(recordbuf, record);
 
- fname = mailbox_message_fname(mailbox, record->uid);
+ if (oldversion == 12) {
+	/* avoid re-parsing the message by copying the old cache_crc,
+	 * but only if the old RECORD_CRC matches */
+	if (crc32_map(buf, 92) == ntohl(*((bit32 *)(buf+92)))) { 
+	 record->cache_crc = ntohl(*((bit32 *)(buf+88)));
+	 /* we need to read the cache record in here, so that repack
+	 * will write it out to a new cache file */
+	 if (!mailbox_cacherecord(mailbox, record))
+		return;
+	 /* record failed, drop through */
+	 record->cache_offset = 0;
+	}
+	/* CRC failed, drop through */
+ }
+
+ fname = mailbox_record_fname(mailbox, record);
 
 if (message_parse(fname, record)) {
 	/* failed to create, don't try to write */
@@ -135,7 +146,7 @@
 /*
 * Upgrade an index/expunge file for 'mailbox'
 */
-int upgrade_index(struct mailbox *mailbox)
+HIDDEN int upgrade_index(struct mailbox *mailbox)
 {
 uint32_t recno, erecno;
 uint32_t uid, euid;
@@ -153,9 +164,9 @@
 struct index_record record;
 int expunge_fd = -1;
 const char *expunge_base = NULL;
- unsigned long expunge_len = 0; /* mapped size */
+ size_t expunge_len = 0; /* mapped size */
 unsigned long emapnum;
- bit32 eversion, eoffset, expungerecord_size = 0;
+ bit32 eversion = 0, eoffset = 0, expungerecord_size = 0;
 struct expunge_data *expunge_data = NULL;
 struct mailbox_repack *repack = NULL;
 int r;
@@ -187,7 +198,7 @@
 * something isn't correctly mounted. We don't want to wipe out
 * all the index records due to IOERRORs just because the admin
 * made a temporary mistake */
- datadirname = mailbox_message_fname(mailbox, 0);
+ datadirname = mailbox_datapath(mailbox);
 if (stat(datadirname, &sbuf)) {
 	syslog(LOG_ERR, "IOERROR: unable to find data directory %s "
 			"for mailbox %s, refusing to upgrade",
@@ -202,35 +213,32 @@
 else 
 	memcpy(hbuf, mailbox->index_base, oldstart_offset);
 
- /* QUOTA_MAILBOX_USED64 added with minor version 6 */
+ /* QUOTA_MAILBOX_USED changed to 64 bit added with minor version 6 */
 if (oldminor_version < 6) {
 	/* upgrade quota to 64-bits (bump existing fields) */
-	memmove(hbuf+OFFSET_QUOTA_MAILBOX_USED, hbuf+OFFSET_QUOTA_MAILBOX_USED64,
-		INDEX_HEADER_SIZE - OFFSET_QUOTA_MAILBOX_USED);
+	memmove(hbuf+OFFSET_QUOTA_MAILBOX_USED + 4, hbuf+OFFSET_QUOTA_MAILBOX_USED,
+		INDEX_HEADER_SIZE - (OFFSET_QUOTA_MAILBOX_USED + 4));
 	/* zero the unused 32-bits */
-	*((bit32 *)(hbuf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
+	*((bit32 *)(hbuf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(0);
 }
 
 /* ignore the result - we EXPECT a CRC32 mismatch */
 mailbox_buf_to_index_header(hbuf, &mailbox->i);
 
- /* HIGHESTMODSEQ_64 added with minor version 8 */
- if (oldminor_version < 8)
-	mailbox->i.highestmodseq = 1;
-
 /* new version fields */
 mailbox->i.minor_version = MAILBOX_MINOR_VERSION;
 mailbox->i.start_offset = INDEX_HEADER_SIZE;
 mailbox->i.record_size = INDEX_RECORD_SIZE;
 
- /* upgrade other fields as necessary
- *
- * minor version wasn't updated religiously in the early days,
+ /* upgrade other fields as necessary */
+ if (!mailbox->i.highestmodseq)
+	mailbox->i.highestmodseq = mboxname_nextmodseq(mailbox->name, 0);
+ if (!mailbox->i.uidvalidity)
+	mailbox->i.uidvalidity = mboxname_nextuidvalidity(mailbox->name,
+							 time(NULL));
+
+ /* minor version wasn't updated religiously in the early days,
 * so we need to use the old offset instead */
- if (oldstart_offset < OFFSET_POP3_LAST_LOGIN)
-	mailbox->i.pop3_last_login = 0;
- if (oldstart_offset < OFFSET_UIDVALIDITY)
-	mailbox->i.uidvalidity = 1;
 if (oldstart_offset < OFFSET_MAILBOX_OPTIONS)
 	mailbox->i.options = config_getint(IMAPOPT_MAILBOX_DEFAULT_OPTIONS);
 
@@ -326,7 +334,8 @@
 }
 no_expunge:
 
- mailbox_repack_setup(mailbox, &repack);
+ r = mailbox_repack_setup(mailbox, &repack);
+ if (r) goto fail;
 
 /* Write the rest of new index */
 recno = 1;
@@ -349,27 +358,42 @@
 
 	/* case: index UID is first, or the same */
 	if (uid <= euid) {
-	 upgrade_index_record(mailbox, bufp, &record, oldrecord_size);
+	 upgrade_index_record(mailbox, bufp, &record, oldrecord_size,
+				 oldminor_version);
 	 recno++;
 	 if (uid == euid) /* duplicate in both, skip expunged */
 		erecno++;
 	}
 	else {
 	 upgrade_index_record(mailbox, expunge_dataerecno-1.base,
-				 &record, expungerecord_size);
+				 &record, expungerecord_size, eversion);
 	 record.system_flags |= FLAG_EXPUNGED;
 	 erecno++;
 	}
 
+	/* user seen was merged into the index with version 12 */
 	if (oldminor_version < 12 && seqset_ismember(seq, record.uid))
 	 record.system_flags |= FLAG_SEEN;
 
+	/* CID was added with version 13 */
+	if (oldminor_version < 13)
+	 record.cid = 0;
+
 	r = mailbox_repack_add(repack, &record);
 	if (r) goto fail;
 }
 
+ /* older than 13 didn't count MESSAGE or NUMFOLDERS usage for quota */
+ if (oldminor_version < 13 && mailbox->quotaroot) {
+	quota_t qdiffsQUOTA_NUMRESOURCES = QUOTA_DIFFS_INITIALIZER;
+	qdiffsQUOTA_MESSAGE = repack->i.exists;
+	qdiffsQUOTA_NUMFOLDERS = 1;
+	quota_update_useds(mailbox->quotaroot, qdiffs, mailbox->name);
+ }
+
 r = mailbox_repack_commit(&repack);
 if (r) goto fail;
+ mailbox->i.dirty = 0;
 
 /* don't need this file any more! */
 unlink(mailbox_meta_fname(mailbox, META_EXPUNGE));
@@ -385,10 +409,6 @@
 seqset_free(seq);
 free(expunge_data);
 
- /* it's definitely changed! */
- r = mailbox_open_index(mailbox);
- if (r) return r;
-
 return 0;
 
 fail:

cyrus-imapd-2.4.17.tar.gz/imap/upgrade_index.h -> cyrus-imapd-2.5.tar.gz/imap/upgrade_index.h Changed

cyrus-imapd-2.4.17.tar.gz/imap/user.c -> cyrus-imapd-2.5.tar.gz/imap/user.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: user.c,v 1.28 2010/01/06 17:01:42 murch Exp $
 */
 
 #include <config.h>
@@ -50,7 +48,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <syslog.h>
@@ -73,17 +70,20 @@
 #endif
 
 #include "global.h"
-#include "user.h"
+#include "imap/imap_err.h"
+#include "mailbox.h"
 #include "mboxkey.h"
 #include "mboxlist.h"
-#include "mailbox.h"
-#include "util.h"
-#include "seen.h"
+#include "mboxname.h"
+#include "proc.h"
 #include "quota.h"
+#include "search_engines.h"
+#include "seen.h"
+#include "user.h"
+#include "util.h"
 #include "xmalloc.h"
-#include "sync_log.h"
 
-#define FNAME_SUBSSUFFIX ".sub"
+#define FNAME_SUBSSUFFIX "sub"
 
 #if 0
 static int user_deleteacl(char *name, int matchlen, int maycreate, void* rock)
@@ -125,7 +125,7 @@
 }
 #endif
 
-const char *user_sieve_path(const char *user)
+EXPORTED const char *user_sieve_path(const char *user)
 {
 static char sieve_path2048;
 char hash, *domain;
@@ -183,43 +183,53 @@
 return 0;
 }
 
-int user_deletedata(char *user, char *userid __attribute__((unused)),
-		 struct auth_state *authstate __attribute__((unused)),
-		 int wipe_user)
+EXPORTED int user_deletedata(const char *userid, int wipe_user)
 {
 char *fname;
 
 /* delete seen state and mbox keys */
 if(wipe_user) {
-	seen_delete_user(user);
+	seen_delete_user(userid);
 	/* XXX what do we do about multiple backends? */
-	mboxkey_delete_user(user);
+	mboxkey_delete_user(userid);
 }
 
 /* delete subscriptions */
- fname = user_hash_subs(user);
+ fname = user_hash_subs(userid);
 (void) unlink(fname);
 free(fname);
 
 /* delete quotas */
- user_deletequotaroots(user);
-
- /* delete ACLs - we're using the internal names here */
-#if 0
- /* xxx no reason to do this if user_deleteacl is a stub anyway. */
- if(wipe_user) {
-	const char pat = "*";
-	mboxlist_findall(NULL, pat, sizeof(pat), userid,
-			 authstate, user_deleteacl,
-			 user);
- }
-#endif
+ user_deletequotaroots(userid);
 
 /* delete sieve scripts */
- user_deletesieve(user);
+ user_deletesieve(userid);
+
+ /* NOTE: even if conversations aren't enabled, we want to clean up */
+
+ /* delete conversations file */
+ fname = conversations_getuserpath(userid);
+ (void) unlink(fname);
+ free(fname);
+
+ /* delete highestmodseq file */
+ fname = user_hash_meta(userid, "modseq");
+ (void) unlink(fname);
+ free(fname);
+
+ /* XXX: one could make an argument for keeping the UIDVALIDITY
+ * file forever, so that UIDVALIDITY never gets reused. */
+
+ /* delete uidvalidity file */
+ fname = user_hash_meta(userid, "uidvalidity");
+ (void) unlink(fname);
+ free(fname);
+
+ /* delete all the search engine data (if any) */
+ search_deluser(userid);
+
+ proc_killuser(userid);
 
- sync_log_user(user);
- 
 return 0;
 }
 
@@ -257,7 +267,7 @@
 	return 0;
 }
 
- return mboxlist_changesub(name, rrock->newuser, NULL, 1, 1);
+ return mboxlist_changesub(name, rrock->newuser, NULL, 1, 1, 1);
 }
 
 static int user_renamesieve(char *olduser, char *newuser)
@@ -326,7 +336,7 @@
 return r;
 }
 
-int user_renamedata(char *olduser, char *newuser,
+EXPORTED int user_renamedata(char *olduser, char *newuser,
 		 char *userid __attribute__((unused)),
 		 struct auth_state *authstate)
 {
@@ -380,23 +390,24 @@
 	/* move sieve scripts */
 	user_renamesieve(olduser, newuser);
 }
- 
+
 return r;
 }
 
-int user_renameacl(char *name, char *olduser, char *newuser)
+EXPORTED int user_renameacl(struct namespace *namespace, char *name,
+			 char *olduser, char *newuser)
 {
 int r = 0;
 char *acl;
 char *rights, *nextid;
- struct mboxlist_entry mbentry;
+ mbentry_t *mbentry = NULL;
 char *aclalloc;
 
 r = mboxlist_lookup(name, &mbentry, NULL);
 if (r) return r;
 
 /* setacl re-calls mboxlist_lookup and will stomp on us */
- aclalloc = acl = xstrdup(mbentry.acl);
+ aclalloc = acl = xstrdup(mbentry->acl);
 
 while (!r && acl) {
 	rights = strchr(acl, '\t');
@@ -409,48 +420,51 @@
 
 	if (!strcmp(acl, olduser)) {
 	 /* copy ACL for olduser to newuser */
-	 r = mboxlist_setacl(name, newuser, rights, 1, newuser, NULL);
+	 r = mboxlist_setacl(namespace, name, newuser, rights, 1, newuser, NULL);
 	 /* delete ACL for olduser */
 	 if (!r)
-		r = mboxlist_setacl(name, olduser, (char *)0, 1, newuser, NULL);
+		r = mboxlist_setacl(namespace, name, olduser, (char *)0, 1, newuser, NULL);
 	}
 
 	acl = nextid;
 }
 
 free(aclalloc);
+ mboxlist_entry_free(&mbentry);
 
 return r;
 }
 
-int user_copyquotaroot(char *oldname, char *newname)
+EXPORTED int user_copyquotaroot(char *oldname, char *newname)
 {
 int r = 0;
 struct quota q;
 
- q.root = oldname;
+ quota_init(&q, oldname);
 r = quota_read(&q, NULL, 0);
- if (!r) mboxlist_setquota(newname, q.limit, 0);
+ if (!r)
+	mboxlist_setquotas(newname, q.limits, 0);
+ quota_free(&q);
 
 return r;
 }
 
 static int find_p(void *rockp,
-		 const char *key, int keylen,
+		 const char *key, size_t keylen,
 		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused)))
+		 size_t datalen __attribute__((unused)))
 {
 char *inboxname = (char *)rockp;
- int inboxlen = strlen(inboxname);
+ size_t inboxlen = strlen(inboxname);
 
 return (!strncmp(key, inboxname, inboxlen) &&
 	 (keylen == inboxlen || keyinboxlen == '.'));
 }
 
 static int find_cb(void *rockp __attribute__((unused)),
-		 const char *key, int keylen,
+		 const char *key, size_t keylen,
 		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused)))
+		 size_t datalen __attribute__((unused)))
 {
 char *root;
 int r;
@@ -478,36 +492,40 @@
 }
 
 if (!r) {
-	r = config_quota_db->foreach(qdb, inboxname, strlen(inboxname),
+	r = cyrusdb_foreach(qdb, inboxname, strlen(inboxname),
 				 &find_p, &find_cb, inboxname, NULL);
 }
 
 return r;
 }
 
-/* hash the userid to a file containing the subscriptions for that user */
-char *user_hash_subs(const char *userid)
+EXPORTED char *user_hash_meta(const char *userid, const char *suffix)
 {
- char *fname = xmalloc(strlen(config_dir) + sizeof(FNAME_DOMAINDIR) +
-			 sizeof(FNAME_USERDIR) + strlen(userid) +
-			 sizeof(FNAME_SUBSSUFFIX) + 10);
- char c, *domain;
+ struct mboxname_parts parts;
+ const char *domain;
+ char *result;
+
+ mboxname_init_parts(&parts);
 
 if (config_virtdomains && (domain = strchr(userid, '@'))) {
-	char d = (char) dir_hash_c(domain+1, config_fulldirhash);
-	*domain = '\0'; /* split user@domain */
-	c = (char) dir_hash_c(userid, config_fulldirhash);
-	sprintf(fname, "%s%s%c/%s%s%c/%s%s", config_dir, FNAME_DOMAINDIR, d,
-		domain+1, FNAME_USERDIR, c, userid, FNAME_SUBSSUFFIX);
-	*domain = '@'; /* replace '@' */
+	char *bareuserid = xstrndup(userid, domain-userid);
+	parts.userid = bareuserid;
+	parts.domain = domain + 1;
+	result = mboxname_conf_getpath(&parts, suffix);
+	free(bareuserid);
 }
 else {
-	c = (char) dir_hash_c(userid, config_fulldirhash);
-	sprintf(fname, "%s%s%c/%s%s", config_dir, FNAME_USERDIR, c, userid,
-		FNAME_SUBSSUFFIX);
+	parts.userid = userid;
+	result = mboxname_conf_getpath(&parts, suffix);
 }
 
- return fname;
-}
+ /* doesn't do anything here, but included for completeness */
+ mboxname_free_parts(&parts);
 
+ return result;
+}
 
+HIDDEN char *user_hash_subs(const char *userid)
+{
+ return user_hash_meta(userid, FNAME_SUBSSUFFIX);
+}

cyrus-imapd-2.4.17.tar.gz/imap/user.h -> cyrus-imapd-2.5.tar.gz/imap/user.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: user.h,v 1.8 2010/01/06 17:01:42 murch Exp $
  */
 
 #ifndef INCLUDED_USER_H
@@ -55,8 +53,7 @@
  *
  * wipe-user says to delete seen state also (remove the user from the murder)
  */
-int user_deletedata(char *user, char *userid, struct auth_state *authstate,
-		    int wipe_user);
+int user_deletedata(const char *userid, int wipe_user);
 
 /* Rename/copy user meta-data (seen state, subscriptions, sieve scripts)
  * from 'olduser' to 'newuser'.
@@ -65,7 +62,8 @@
 		    struct auth_state *authstate);
 
 /* Rename ACL for 'olduser' to 'newuser' on mailbox 'name'. */
-int user_renameacl(char *name, char *olduser, char *newuser);
+int user_renameacl(struct namespace *namespace, char *name,
+		   char *olduser, char *newuser);
 
 /* Copy a quotaroot from mailbox 'oldname' to 'newname' */
 int user_copyquotaroot(char *oldname, char *newname);
@@ -76,4 +74,7 @@
 /* find the subscriptions file for user */
 char *user_hash_subs(const char *user);
 
+/* find any sort of file for the user */
+char *user_hash_meta(const char *userid, const char *suffix);
+
 #endif

cyrus-imapd-2.4.17.tar.gz/imap/userdeny.h -> cyrus-imapd-2.5.tar.gz/imap/userdeny.h Changed

@@ -38,26 +38,26 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: userdeny.h,v 1.1 2010/04/23 19:48:52 murch Exp $
 */
 
 #ifndef INCLUDED_USERDENY_H
 #define INCLUDED_USERDENY_H
 
-#include "cyrusdb.h"
 #include <config.h>
 
-#define FNAME_USERDENYDB "/user_deny.db"
-#define USERDENY_VERSION 2
-
-extern struct db *denydb;
-
 extern int userdeny(const char *user, const char *service,
 		 char *msgbuf, size_t bufsiz);
+extern int denydb_set(const char *user, const char *service,
+		 const char *msg);
+extern int denydb_delete(const char *user);
+
+/* iterate the user deny db */
+typedef int (*denydb_proc_t)(const char *user, const char *services,
+			 const char *message, void *rock);
+extern int denydb_foreach(denydb_proc_t, void *rock);
 
 /* open the user deny db */
-void denydb_open(const char *fname);
+int denydb_open(int create);
 
 /* close the database */
 void denydb_close(void);

cyrus-imapd-2.4.17.tar.gz/imap/userdeny_db.c -> cyrus-imapd-2.5.tar.gz/imap/userdeny_db.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: userdeny_db.c,v 1.1 2010/04/23 19:48:52 murch Exp $
 */
 
 #include <config.h>
@@ -56,38 +54,83 @@
 #include "cyrusdb.h"
 #include "global.h"
 #include "userdeny.h"
+#include "imap/imap_err.h"
+#include "tok.h"
 #include "wildmat.h"
-#include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
+
+#define FNAME_USERDENYDB "/user_deny.db"
+#define USERDENY_VERSION 2
 
 #define DENYDB config_userdeny_db
 
-struct db *denydb;
+static struct db *denydb;
 
-static int deny_dbopen = 0;
+static const char default_message = "Access to this service has been blocked";
 
+/* parse the data */
+static int parse_record(struct buf *buf,
+			char **wildp,
+			const char **msgp)
+{
+ const char *msg = default_message;
+ char *wild;
+ unsigned long version;
+
+ buf_cstring(buf); /* use a working copy */
+
+ /* check version */
+ if (((version = strtoul(buf->s, &wild, 10)) < 1) ||
+	(version > USERDENY_VERSION))
+	return IMAP_MAILBOX_BADFORMAT;
+
+ if (*wild++ != '\t')
+	return IMAP_MAILBOX_BADFORMAT;
+
+ /* check if we have a deny message */
+ if (version == USERDENY_VERSION) {
+	char *p = strchr(wild, '\t');
+	if (p) {
+	 *p++ = '\0';
+	 msg = p;
+	}
+ }
+
+ *wildp = wild;
+ *msgp = msg;
+
+ return 0;
+}
 
 /*
 * userdeny() checks to see if 'user' is denied access to 'service'
 * Returns 1 if a matching deny entry exists in DB, otherwise returns 0.
 */
-int userdeny(const char *user, const char *service, char *msgbuf, size_t bufsiz)
+EXPORTED int userdeny(const char *user, const char *service, char *msgbuf, size_t bufsiz)
 {
 int r, ret = 0; /* allow access by default */
 const char *data = NULL;
- int datalen;
+ size_t datalen;
+ struct buf buf = BUF_INITIALIZER;
+ char *wild = NULL;
+ const char *msg = NULL;
+ tok_t tok;
+ char *pat;
+ int not;
+
+ if (!denydb) denydb_open(/*create*/0);
+ if (!denydb) return 0;
 
- if (!deny_dbopen) return 0;
+ memset(&tok, 0, sizeof(tok));
 
 /* fetch entry for user */
 syslog(LOG_DEBUG, "fetching user_deny.db entry for '%s'", user);
 do {
-	r = DENYDB->fetch(denydb, user, strlen(user), &data, &datalen, NULL);
+	r = cyrusdb_fetch(denydb, user, strlen(user), &data, &datalen, NULL);
 } while (r == CYRUSDB_AGAIN);
 
 /* XXX Should we try to reopen the DB if we get IOERROR?
- This might be necessary when using SQL backend
+	 This might be necessary when using SQL backend
 	 and we lose the connection.
 */
 
@@ -98,120 +141,245 @@
 		 "DENYDB_ERROR: error reading entry '%s': %s",
 		 user, cyrusdb_strerror(r));
 	}
- } else {
+	goto out;
+ }
+ buf_init_ro(&buf, data, datalen);
+
 	/* parse the data */
-	char *buf, *wild;
-	unsigned long version;
+ r = parse_record(&buf, &wild, &msg);
+ if (r) {
+	syslog(LOG_WARNING,
+	 "DENYDB_ERROR: invalid entry for '%s'", user);
+	goto out;
+ }
 
-	buf = xstrndup(data, datalen); /* use a working copy */
+ /* scan wildmat right to left for a match against our service */
+ syslog(LOG_DEBUG, "wild: '%s' service: '%s'", wild, service);
+ tok_initm(&tok, wild, ",", 0);
+ while ((pat = tok_next(&tok))) {
+	/* XXX trim leading & trailing whitespace? */
 
-	/* check version */
-	if (((version = strtoul(buf, &wild, 10)) < 1) ||
-	 (version > USERDENY_VERSION)) {
-	 syslog(LOG_WARNING,
-		 "DENYDB_ERROR: invalid version for entry '%s': %lu",
-		 user, version);
-	} else if (*wild++ != '\t') {
-	 syslog(LOG_WARNING,
-		 "DENYDB_ERROR: missing wildmat for entry '%s'", user);
-	} else {
-	 char *pat, *msg = "Access to this service has been blocked";
-	 int not;
-
-	 /* check if we have a deny message */
-	 switch (version) {
-	 case USERDENY_VERSION:
-		if ((msg = strchr(wild, '\t'))) *msg++ = '\0';
-		break;
-	 }
-
-	 /* scan wildmat right to left for a match against our service */
-	 syslog(LOG_DEBUG, "wild: '%s' service: '%s'", wild, service);
-	 do {
-		/* isolate next pattern */
-		if ((pat = strrchr(wild, ','))) {
-		 *pat++ = '\0';
-		} else {
-		 pat = wild;
-		}
-
-		/* XXX trim leading & trailing whitespace? */
-
-		/* is it a negated pattern? */
-		not = (*pat == '!');
-		if (not) ++pat;
-
-		syslog(LOG_DEBUG, "pat %d:'%s'", not, pat);
-
-		/* see if pattern matches our service */
-		if (wildmat(service, pat)) {
-		 /* match ==> we're done */
-		 ret = !not;
-		 if (msgbuf) strlcpy(msgbuf, msg, bufsiz);
-		 break;
-		}
-
-		/* continue until we reach head of wildmat */
-	 } while (pat != wild);
-	}
+	/* is it a negated pattern? */
+	not = (*pat == '!');
+	if (not) ++pat;
+
+	syslog(LOG_DEBUG, "pat %d:'%s'", not, pat);
 
-	free(buf);
+	/* see if pattern matches our service */
+	if (wildmat(service, pat)) {
+	 /* match ==> we're done */
+	 ret = !not;
+	 if (msgbuf) strlcpy(msgbuf, msg, bufsiz);
+	 break;
+	}
 }
 
+out:
+ tok_fini(&tok);
+ buf_free(&buf);
 return ret;
 }
 
-/* must be called after cyrus_init */
-void denydb_init(int myflags)
+/*
+ * Add an entry to the deny DB. Message 'msg' may be NULL, resulting
+ * in a default message being used. Service name 'service' may be NULL,
+ * resulting in all services being blocked for the user. The username
+ * 'user' is a required argument. Returns an IMAP error code or 0 on
+ * success.
+ */
+EXPORTED int denydb_set(const char *user, const char *service, const char *msg)
 {
+ struct txn *txn = NULL;
+ struct buf data = BUF_INITIALIZER;
+ int r = 0;
+
+ if (!denydb) {
+	r = IMAP_INTERNAL;
+	goto out;
+ }
+
+ if (!service)
+	service = "*";
+
+ if (!user || strchr(service, '\t')) {
+	/* the service field may not contain a TAB, it's the field separator */
+	r = IMAP_INVALID_IDENTIFIER;
+	goto out;
+ }
+
+ /* compose the record */
+ buf_printf(&data, "%u\t", USERDENY_VERSION);
+ buf_appendcstr(&data, service);
+ buf_putc(&data, '\t');
+ buf_appendcstr(&data, (msg ? msg : default_message));
+
+ /* write the record */
+ do {
+	r = cyrusdb_store(denydb,
+			 user, strlen(user),
+			 data.s, data.len,
+			 &txn);
+ } while (r == CYRUSDB_AGAIN);
+
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: couldn't store denydb record for %s: %s",
+			user, cyrusdb_strerror(r));
+	r = IMAP_IOERROR;
+ }
+
+out:
+ if (txn) {
+	if (r) cyrusdb_abort(denydb, txn);
+	else cyrusdb_commit(denydb, txn);
+ }
+ buf_free(&data);
+ return r;
+}
+
+/*
+ * Remove a deny DB record; this has the effect of allowing the given
+ * user access to all services. Returns an IMAP error code or 0 on
+ * success. It is not an error to remove an non-existant record.
+ */
+EXPORTED int denydb_delete(const char *user)
+{
+ struct txn *txn = NULL;
+ int r = 0;
+
+ if (!denydb) return 0;
+
+ if (!user) return r;
+
+ /* remove the record */
+ do {
+	r = cyrusdb_delete(denydb,
+			 user, strlen(user),
+			 &txn, /*force*/1);
+ } while (r == CYRUSDB_AGAIN);
+
+ if (r) {
+	syslog(LOG_ERR, "IOERROR: couldn't delete denydb record for %s: %s",
+			user, cyrusdb_strerror(r));
+	r = IMAP_IOERROR;
+ }
+
+ if (txn) {
+	if (r) cyrusdb_abort(denydb, txn);
+	else cyrusdb_commit(denydb, txn);
+ }
+ return r;
+}
+
+struct denydb_rock
+{
+ denydb_proc_t proc;
+ void *rock;
+};
+
+static int denydb_foreach_cb(void *rock,
+			 const char *key, size_t keylen,
+			 const char *data, size_t datalen)
+{
+ struct denydb_rock *dr = (struct denydb_rock *)rock;
+ struct buf user = BUF_INITIALIZER;
+ struct buf buf = BUF_INITIALIZER;
+ char *wild = NULL;
+ const char *msg = NULL;
 int r;
 
+ /* ensure we have a nul-terminated user string */
+ buf_appendmap(&user, key, keylen);
+ buf_cstring(&user);
+
+ /* get fields from the record */
+ buf_init_ro(&buf, data, datalen);
+ r = parse_record(&buf, &wild, &msg);
+ if (r) {
+	syslog(LOG_WARNING,
+	 "DENYDB_ERROR: invalid entry for '%s'", user.s);
+	r = 0;	/* whatever, keep going */
+	goto out;
+ }
+
+ r = dr->proc(user.s, wild, msg, dr->rock);
+
+out:
+ buf_free(&user);
+ buf_free(&buf);
+ return r;
+}
+
+EXPORTED int denydb_foreach(denydb_proc_t proc, void *rock)
+{
+ struct denydb_rock dr;
+
+ if (!denydb) return 0;
+
+ dr.proc = proc;
+ dr.rock = rock;
+
+ return cyrusdb_foreach(denydb, "", 0,
+			 denydb_foreach_cb, NULL, &dr,
+			 /* txn */NULL);
+}
+
+/* must be called after cyrus_init */
+EXPORTED void denydb_init(int myflags)
+{
 if (myflags & DENYDB_SYNC) {
-	r = DENYDB->sync();
+	cyrusdb_sync(DENYDB);
 }
 }
 
-void denydb_open(const char *fname)
+/*
+ * Open the user deny database. If 'create' is true and the database
+ * does not exist, create it. Returns 0 on success or an IMAP error
+ * code.
+ */
+EXPORTED int denydb_open(int create)
 {
+ const char *fname;
 int ret;
 char *tofree = NULL;
 
- if (!fname)
-	fname = config_getstring(IMAPOPT_USERDENY_DB_PATH);
+ fname = config_getstring(IMAPOPT_USERDENY_DB_PATH);
 
 /* create db file name */
 if (!fname) {
-	tofree =strconcat(config_dir, FNAME_USERDENYDB, (char *)NULL);
+	tofree = strconcat(config_dir, FNAME_USERDENYDB, (char *)NULL);
 	fname = tofree;
 }
 
- ret = (DENYDB->open)(fname, 0, &denydb);
- if (ret == CYRUSDB_OK) {
-	deny_dbopen = 1;
- } else if (errno != ENOENT) {
+ ret = cyrusdb_open(DENYDB, fname, (create ? CYRUSDB_CREATE : 0), &denydb);
+ if (ret == CYRUSDB_NOTFOUND) {
 	/* ignore non-existent DB, report all other errors */
+	ret = ENOENT;
+ }
+ else if (ret != CYRUSDB_OK) {
 	syslog(LOG_WARNING, "DENYDB_ERROR: opening %s: %s", fname,
 	 cyrusdb_strerror(ret));
+	ret = IMAP_IOERROR;
 }
 
 free(tofree);
+ return ret;
 }
 
-void denydb_close(void)
+EXPORTED void denydb_close(void)
 {
 int r;
 
- if (deny_dbopen) {
-	r = (DENYDB->close)(denydb);
+ if (denydb) {
+	r = cyrusdb_close(denydb);
 	if (r) {
 	 syslog(LOG_ERR, "DENYDB_ERROR: error closing: %s",
 		 cyrusdb_strerror(r));
 	}
-	deny_dbopen = 0;
+	denydb = NULL;
 }
 }
 
-void denydb_done(void)
+EXPORTED void denydb_done(void)
 {
 /* DB->done() handled by cyrus_done() */
 }

cyrus-imapd-2.4.17.tar.gz/imap/version.c -> cyrus-imapd-2.5.tar.gz/imap/version.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: version.c,v 1.25 2010/02/03 16:37:42 murch Exp $
 */
 
 #include <config.h>
@@ -59,15 +57,13 @@
 #include <string.h>
 #include "../xversion.h"
 #include "version.h"
-#include "prot.h"
-#include "cyrusdb.h"
 #include "map.h"
 #include "cyr_lock.h"
 #include "nonblock.h"
 #include "idle.h"
 
 #ifdef USE_SIEVE
-#include "sieve_interface.h"
+#include "sieve/sieve_interface.h"
 #endif
 
 static char id_resp_commandMAXIDVALUELEN;
@@ -84,7 +80,7 @@
 #define CYRUS_VERSION _CYRUS_VERSION
 #endif
 
-const char *cyrus_version()
+EXPORTED const char *cyrus_version(void)
 {
 return CYRUS_VERSION;
 }
@@ -92,7 +88,7 @@
 /*
 * Grab the command line args for the ID response.
 */
-void id_getcmdline(int argc, char **argv)
+EXPORTED void id_getcmdline(int argc, char **argv)
 {
 snprintf(id_resp_command, MAXIDVALUELEN, "%s", *argv);
 while (--argc > 0) {
@@ -106,7 +102,7 @@
 * Output the ID response.
 * We do NOT close the parameter list so other stuff can be added later.
 */
-void id_response(struct protstream *pout)
+EXPORTED void id_response(struct protstream *pout)
 {
 struct utsname os;
 const char *sasl_imp;

cyrus-imapd-2.4.17.tar.gz/imap/version.h -> cyrus-imapd-2.5.tar.gz/imap/version.h Changed

cyrus-imapd-2.5.tar.gz/imap/xapian_wrap.cpp Added

@@ -0,0 +1,527 @@
+
+#include <config.h>
+#include <sys/types.h>
+#include <syslog.h>
+
+extern "C" {
+#include "imap_err.h"
+#include "xmalloc.h"
+#include "xapian_wrap.h"
+};
+
+#include <xapian.h>
+
+#define SLOT_CYRUSID	 0
+
+/* ====================================================================== */
+
+void xapian_init(void)
+{
+ static int init = 0;
+ static /* NOT const */ char enable_ngrams = "XAPIAN_CJK_NGRAM=1";
+
+ if (!init) {
+	putenv(enable_ngrams);
+	init = 1;
+ }
+}
+
+/* ====================================================================== */
+
+int xapian_compact_dbs(const char *dest, const char **sources)
+{
+ int r = 0;
+
+ try {
+	Xapian::Compactor *c = new Xapian::Compactor;
+
+	while (*sources) {
+	 c->add_source(*sources++);
+	}
+
+	c->set_destdir(dest);
+
+	/* we never write to compresion targets again */
+	c->set_compaction_level(Xapian::Compactor::FULLER);
+
+	c->set_multipass(true);
+
+	c->compact();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+/* ====================================================================== */
+
+struct xapian_dbw
+{
+ Xapian::WritableDatabase *database;
+ Xapian::Stem *stemmer;
+ Xapian::TermGenerator *term_generator;
+ Xapian::Document *document;
+};
+
+int xapian_dbw_open(const char *path, xapian_dbw_t **dbwp)
+{
+ xapian_dbw_t *dbw = 0;
+ int r = 0;
+
+ try {
+	dbw = (xapian_dbw_t *)xzmalloc(sizeof(xapian_dbw_t));
+	int action = Xapian::DB_CREATE_OR_OPEN;
+	dbw->database = new Xapian::WritableDatabase(path, action);
+	dbw->term_generator = new Xapian::TermGenerator();
+	dbw->stemmer = new Xapian::Stem("en");
+	dbw->term_generator->set_stemmer(*dbw->stemmer);
+	dbw->term_generator->set_stemming_strategy(Xapian::TermGenerator::STEM_ALL);
+ }
+ catch (const Xapian::DatabaseLockError &err) {
+	/* somebody else is already indexing this user. They may be doing a different
+	 * mailbox, so we need to re-insert this mailbox into the queue! */
+	r = IMAP_MAILBOX_LOCKED;
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ if (r)
+	free(dbw);
+ else
+	*dbwp = dbw;
+
+ return r;
+}
+
+void xapian_dbw_close(xapian_dbw_t *dbw)
+{
+ if (!dbw) return;
+ try {
+	delete dbw->database;
+	delete dbw->term_generator;
+	delete dbw->stemmer;
+	delete dbw->document;
+	free(dbw);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+}
+
+
+int xapian_dbw_begin_txn(xapian_dbw_t *dbw)
+{
+ int r = 0;
+ try {
+	dbw->database->begin_transaction();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+int xapian_dbw_commit_txn(xapian_dbw_t *dbw)
+{
+ int r = 0;
+ try {
+	dbw->database->commit_transaction();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+int xapian_dbw_cancel_txn(xapian_dbw_t *dbw)
+{
+ int r = 0;
+ try {
+	dbw->database->cancel_transaction();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+int xapian_dbw_begin_doc(xapian_dbw_t *dbw, const char *cyrusid)
+{
+ int r = 0;
+ try {
+	if (dbw->document) {
+	 delete dbw->document;
+	 dbw->document = 0;
+	}
+	dbw->document = new Xapian::Document();
+	dbw->document->add_value(SLOT_CYRUSID, cyrusid);
+	dbw->term_generator->set_document(*dbw->document);
+	dbw->term_generator->set_termpos(1);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+int xapian_dbw_doc_part(xapian_dbw_t *dbw, const struct buf *part, const char *prefix)
+{
+ int r = 0;
+ try {
+	dbw->term_generator->index_text(Xapian::Utf8Iterator(part->s, part->len), 1, prefix);
+	dbw->term_generator->increase_termpos();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+int xapian_dbw_end_doc(xapian_dbw_t *dbw)
+{
+ int r = 0;
+ try {
+	dbw->database->add_document(*dbw->document);
+	delete dbw->document;
+	dbw->document = 0;
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+ return r;
+}
+
+/* ====================================================================== */
+
+struct xapian_db
+{
+ std::string *paths;
+ Xapian::Database *database;
+ Xapian::Stem *stemmer;
+ Xapian::QueryParser *parser;
+};
+
+xapian_db_t *xapian_db_open(const char **paths)
+{
+ xapian_db_t *db = NULL;
+ const char *thispath = "(unknown)";
+
+ try {
+	db = (xapian_db_t *)xzmalloc(sizeof(xapian_db_t));
+	db->paths = new std::string();
+	db->database = new Xapian::Database();
+	while (*paths) {
+	 thispath = *paths++;
+	 db->database->add_database(Xapian::Database(thispath));
+	 db->paths->append(thispath);
+	 db->paths->append(" ");
+	 thispath = "(unknown)";
+	}
+	db->stemmer = new Xapian::Stem("en");
+	db->parser = new Xapian::QueryParser;
+	db->parser->set_stemming_strategy(Xapian::QueryParser::STEM_ALL);
+	db->parser->set_stemmer(*db->stemmer);
+	db->parser->set_default_op(Xapian::Query::OP_AND);
+	db->parser->set_database(*db->database);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 thispath, err.get_description().c_str());
+	db = NULL;
+ }
+ return db;
+}
+
+void xapian_db_close(xapian_db_t *db)
+{
+ try {
+	delete db->database;
+	delete db->stemmer;
+	delete db->parser;
+	delete db->paths;
+	free(db);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+}
+
+xapian_query_t *xapian_query_new_match(const xapian_db_t *db, const char *prefix, const char *str)
+{
+ try {
+	// We don't use FLAG_BOOLEAN because Cyrus is doing boolean for us
+	// TODO: FLAG_AUTO_SYNONYMS
+	// quote the query for phrase management
+	std::string quoted = std::string("\"") + str + "\"";
+	Xapian::Query query = db->parser->parse_query(
+				 quoted,
+				 (Xapian::QueryParser::FLAG_PHRASE |
+				 Xapian::QueryParser::FLAG_LOVEHATE |
+				 Xapian::QueryParser::FLAG_WILDCARD),
+				 std::string(prefix));
+	return (xapian_query_t *)new Xapian::Query(query);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+}
+
+xapian_query_t *xapian_query_new_compound(const xapian_db_t *db __attribute__((unused)),
+					 int is_or, xapian_query_t **children, int n)
+{
+ try {
+	// I want to use std::initializer_list<Xapian::Query*> here
+	// but that requires "experimental" gcc C++0x support :(
+	std::vector<Xapian::Query*> v;
+	for (int i = 0 ; i < n ; i++)
+	 v.push_back((Xapian::Query *)childreni);
+	Xapian::Query *compound = new Xapian::Query(
+				 is_or ? Xapian::Query::OP_OR : Xapian::Query::OP_AND,
+				 v.begin(), v.end());
+	// 'compound' owns a refcount on each child. We need to
+	// drop the one we got when we allocated the children
+	for (int i = 0 ; i < n ; i++)
+	 delete (Xapian::Query *)childreni;
+	return (xapian_query_t *)compound;
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	return 0;
+ }
+}
+
+/* Xapian does not have an OP_NOT. WTF? We fake it with
+ * OP_AND_NOT where the left child is MatchAll */
+xapian_query_t *xapian_query_new_not(const xapian_db_t *db __attribute__((unused)),
+				 xapian_query_t *child)
+{
+ try {
+	Xapian::Query *qq = new Xapian::Query(
+					Xapian::Query::OP_AND_NOT,
+					Xapian::Query::MatchAll,
+					*(Xapian::Query *)child);
+	// 'compound' owns a refcount on each child. We need to
+	// drop the one we got when we allocated the children
+	delete (Xapian::Query *)child;
+	return (xapian_query_t *)qq;
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	return 0;
+ }
+}
+
+void xapian_query_free(xapian_query_t *qq)
+{
+ try {
+	Xapian::Query *query = (Xapian::Query *)qq;
+	delete query;
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+}
+
+int xapian_query_run(const xapian_db_t *db, const xapian_query_t *qq,
+		 int (*cb)(const char *cyrusid, void *rock), void *rock)
+{
+ const Xapian::Query *query = (const Xapian::Query *)qq;
+ int r = 0;
+
+ try {
+	Xapian::Enquire enquire(*db->database);
+	enquire.set_query(*query);
+	Xapian::MSet matches = enquire.get_mset(0, db->database->get_doccount());
+	for (Xapian::MSetIterator i = matches.begin() ; i != matches.end() ; ++i) {
+	 Xapian::Document d = i.get_document();
+	 std::string cyrusid = d.get_value(SLOT_CYRUSID);
+	 /* ignore documents with no cyrusid. Shouldn't happen, but has been seen */
+	 if (cyrusid.length() == 0) {
+		syslog(LOG_ERR, "IOERROR: Xapian: zero length cyrusid for document id %u in index files %s",
+				d.get_docid(), db->paths->c_str());
+		continue;
+	 }
+	 r = cb(cyrusid.c_str(), rock);
+	 if (r) break;
+	}
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+struct xapian_snipgen
+{
+ Xapian::Stem *stemmer;
+ Xapian::SnippetGenerator *snippet_generator;
+};
+
+xapian_snipgen_t *xapian_snipgen_new(void)
+{
+ xapian_snipgen_t *snipgen = NULL;
+
+ try {
+	snipgen = (xapian_snipgen_t *)xzmalloc(sizeof(xapian_snipgen_t));
+
+	snipgen->stemmer = new Xapian::Stem("en");
+	snipgen->snippet_generator = new Xapian::SnippetGenerator;
+	snipgen->snippet_generator->set_stemmer(*snipgen->stemmer);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+
+ return snipgen;
+}
+
+void xapian_snipgen_free(xapian_snipgen_t *snipgen)
+{
+ try {
+	delete snipgen->snippet_generator;
+	delete snipgen->stemmer;
+	free(snipgen);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+ }
+}
+
+int xapian_snipgen_add_match(xapian_snipgen_t *snipgen, const char *match)
+{
+ int r = 0;
+
+ try {
+	snipgen->snippet_generator->add_match(match);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+int xapian_snipgen_begin_doc(xapian_snipgen_t *snipgen, unsigned int context_length)
+{
+ int r = 0;
+
+ try {
+	snipgen->snippet_generator->reset();
+	snipgen->snippet_generator->set_context_length(context_length);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+int xapian_snipgen_doc_part(xapian_snipgen_t *snipgen, const struct buf *part)
+{
+ int r = 0;
+
+ try {
+	snipgen->snippet_generator->accept_text(Xapian::Utf8Iterator(part->s, part->len));
+	snipgen->snippet_generator->increase_termpos();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+int xapian_snipgen_end_doc(xapian_snipgen_t *snipgen, struct buf *buf)
+{
+ int r = 0;
+
+ try {
+	buf_reset(buf);
+	buf_appendcstr(buf, snipgen->snippet_generator->get_snippets().c_str());
+	buf_cstring(buf);
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s: %s",
+		 err.get_context().c_str(), err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+
+/* cb returns true if document should be copied, false if not */
+int xapian_filter(const char *dest, const char **sources,
+		 int (*cb)(const char *cyrusid, void *rock),
+		 void *rock)
+{
+ int r = 0;
+ int count = 0;
+
+ try {
+	/* create a destination database */
+	Xapian::WritableDatabase destdb = Xapian::WritableDatabase(dest, Xapian::DB_CREATE);
+
+	/* With multiple databases as above, the docids are interleaved, so it
+	 * might be worth trying to open each source and copy its documents to
+	 * destdb in turn for better locality of reference, and so better cache
+	 * use. -- Olly on the mailing list */
+	while (*sources) {
+	 Xapian::Database srcdb = Xapian::Database(*sources++);
+
+	 /* copy all matching documents to the new DB */
+	 for (Xapian::ValueIterator it = srcdb.valuestream_begin(SLOT_CYRUSID);
+				 it != srcdb.valuestream_end(SLOT_CYRUSID); it++) {
+		if (cb((*it).c_str(), rock)) {
+		 destdb.add_document(srcdb.get_document(it.get_docid()));
+		}
+	 }
+	}
+
+	/* commit all changes explicitly */
+	destdb.commit();
+ }
+ catch (const Xapian::Error &err) {
+	syslog(LOG_ERR, "IOERROR: Xapian: caught exception: %s",
+	 err.get_description().c_str());
+	r = IMAP_IOERROR;
+ }
+
+ return r;
+}
+

cyrus-imapd-2.5.tar.gz/imap/xapian_wrap.h Added

@@ -0,0 +1,91 @@
+/* xapian_wrap.h --  C++ hiding wrapper API for Xapian
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_IMAP_XAPIAN_WRAP__
+#define __CYRUS_IMAP_XAPIAN_WRAP__
+
+#include "util.h"
+
+typedef struct xapian_dbw xapian_dbw_t;
+typedef struct xapian_db xapian_db_t;
+typedef struct xapian_query xapian_query_t;
+typedef struct xapian_snipgen xapian_snipgen_t;
+
+extern void xapian_init(void);
+
+/* compaction interface */
+extern int xapian_compact_dbs(const char *dest, const char **sources);
+
+/* write-side interface */
+extern int xapian_dbw_open(const char *path, xapian_dbw_t **dbwp);
+extern void xapian_dbw_close(xapian_dbw_t *dbw);
+extern int xapian_dbw_begin_txn(xapian_dbw_t *dbw);
+extern int xapian_dbw_commit_txn(xapian_dbw_t *dbw);
+extern int xapian_dbw_cancel_txn(xapian_dbw_t *dbw);
+extern int xapian_dbw_begin_doc(xapian_dbw_t *dbw, const char *cyrusid);
+extern int xapian_dbw_doc_part(xapian_dbw_t *dbw, const struct buf *part, const char *prefix);
+extern int xapian_dbw_end_doc(xapian_dbw_t *dbw);
+
+/* query-side interface */
+extern xapian_db_t *xapian_db_open(const char **paths);
+extern void xapian_db_close(xapian_db_t *);
+extern xapian_query_t *xapian_query_new_match(const xapian_db_t *, const char *prefix, const char *term);
+extern xapian_query_t *xapian_query_new_compound(const xapian_db_t *, int is_or, xapian_query_t **children, int n);
+extern xapian_query_t *xapian_query_new_not(const xapian_db_t *, xapian_query_t *);
+extern void xapian_query_free(xapian_query_t *);
+extern int xapian_query_run(const xapian_db_t *, const xapian_query_t *,
+			    int (*cb)(const char *cyrusid, void *rock), void *rock);
+
+/* snippets interface */
+extern xapian_snipgen_t *xapian_snipgen_new(void);
+extern void xapian_snipgen_free(xapian_snipgen_t *);
+extern int xapian_snipgen_add_match(xapian_snipgen_t *snipgen, const char *match);
+extern int xapian_snipgen_begin_doc(xapian_snipgen_t *snipgen, unsigned context_length);
+extern int xapian_snipgen_doc_part(xapian_snipgen_t *snipgen, const struct buf *part);
+extern int xapian_snipgen_end_doc(xapian_snipgen_t *snipgen, struct buf *);
+
+/* filter interface */
+extern int xapian_filter(const char *dest, const char **sources,
+			 int (*cb)(const char *cyrusid, void *rock),
+			 void *rock);
+
+#endif

cyrus-imapd-2.5.tar.gz/imap/xcal.c Added

@@ -0,0 +1,1168 @@
+/* xcal.c -- Routines for converting iCalendar to/from xCal
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#include <stdio.h> /* for snprintf() */
+#include <stddef.h> /* for offsetof() macro */
+#include <syslog.h>
+
+#include <libxml/tree.h>
+
+#include "httpd.h"
+#include "util.h"
+#include "version.h"
+#include "xcal.h"
+
+
+extern icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind);
+extern const char* icalrecur_freq_to_string(icalrecurrencetype_frequency kind);
+extern const char* icalrecur_weekday_to_string(icalrecurrencetype_weekday kind);
+
+
+/*
+ * Determine the type (kind) of an iCalendar property value.
+ */
+const char *icalproperty_value_kind_as_string(icalproperty *prop)
+{
+ icalvalue_kind kind = ICAL_NO_VALUE;
+ icalparameter *val_param;
+
+ val_param = icalproperty_get_first_parameter(prop, ICAL_VALUE_PARAMETER);
+ if (val_param) {
+	/* Use the kind specified in the VALUE param */
+	kind = icalparameter_value_to_value_kind(
+	 icalparameter_get_value(val_param));
+ }
+
+ if (kind == ICAL_NO_VALUE) {
+	icalvalue *value = icalproperty_get_value(prop);
+
+	if (value) {
+	 /* Use the kind determined from the property value */
+	 kind = icalvalue_isa(value);
+	}
+ }
+
+ if (kind == ICAL_NO_VALUE) {
+	/* Use the default kind for the property */
+	kind = icalproperty_kind_to_value_kind(icalproperty_isa(prop));
+ }
+
+ switch (kind) {
+ case ICAL_X_VALUE:
+	return "unknown";
+
+ case ICAL_ACTION_VALUE:
+ case ICAL_CARLEVEL_VALUE:
+ case ICAL_CLASS_VALUE:
+ case ICAL_CMD_VALUE:
+ case ICAL_METHOD_VALUE:
+ case ICAL_QUERYLEVEL_VALUE:
+ case ICAL_STATUS_VALUE:
+ case ICAL_TRANSP_VALUE:
+	return "text";
+
+ default:
+	return icalvalue_kind_to_string(kind);
+ }
+} 
+
+
+/*
+ * Construct an ISO.8601.2004 string for an iCalendar Date/Date-Time.
+ */
+const char *icaltime_as_iso_string(const struct icaltimetype tt)
+{
+ static char str21;
+ const char *fmt;
+
+ if (tt.is_date) fmt = "%04d-%02d-%02d";
+ else if (tt.is_utc) fmt = "%04d-%02d-%02dT%02d:%02d:%02dZ";
+ else fmt = "%04d-%02d-%02dT%02d:%02d:%02d";
+
+ snprintf(str, sizeof(str), fmt, tt.year, tt.month, tt.day,
+	 tt.hour, tt.minute, tt.second);
+
+ return str;
+}
+
+
+/*
+ * Construct an ISO.8601.2004 string for an iCalendar UTC Offset.
+ */
+const char *icalvalue_utcoffset_as_iso_string(const icalvalue* value)
+{ 
+ static char str10;
+ const char *fmt;
+ int off, h, m, s;
+ char sign;
+
+ off = icalvalue_get_utcoffset(value);
+
+ if (abs(off) == off) sign = '+';
+ else sign = '-';
+
+ h = off/3600;
+ m = (off - (h*3600))/ 60;
+ s = (off - (h*3600) - (m*60));
+
+ if (s > 0) fmt = "%c%02d:%02d:%02d";
+ else fmt = "%c%02d:%02d";
+
+ snprintf(str, sizeof(str), fmt, sign, abs(h), abs(m), abs(s));
+
+ return str;
+}
+
+
+static const struct {
+ const char *str;
+ int limit;
+ size_t offset;
+} recurmap =
+{
+ { "bysecond", ICAL_BY_SECOND_SIZE,
+ offsetof(struct icalrecurrencetype, by_second)	},
+ { "byminute", ICAL_BY_MINUTE_SIZE,
+ offsetof(struct icalrecurrencetype, by_minute)	},
+ { "byhour",	 ICAL_BY_HOUR_SIZE,
+ offsetof(struct icalrecurrencetype, by_hour)	},
+ { "byday",	 ICAL_BY_DAY_SIZE,
+ offsetof(struct icalrecurrencetype, by_day)	},
+ { "bymonthday", ICAL_BY_MONTHDAY_SIZE,
+ offsetof(struct icalrecurrencetype, by_month_day)	},
+ { "byyearday", ICAL_BY_YEARDAY_SIZE,
+ offsetof(struct icalrecurrencetype, by_year_day)	},
+ { "byweekno", ICAL_BY_WEEKNO_SIZE,
+ offsetof(struct icalrecurrencetype, by_week_no)	},
+ { "bymonth", ICAL_BY_MONTH_SIZE,
+ offsetof(struct icalrecurrencetype, by_month)	},
+ { "bysetpos", ICAL_BY_SETPOS_SIZE,
+ offsetof(struct icalrecurrencetype, by_set_pos)	},
+ { 0, 0, 0 },
+};
+
+
+/*
+ * Add iCalendar recur-rule-parts to a structured element.
+ */
+void icalrecurrencetype_add_as_xxx(struct icalrecurrencetype *recur, void *obj,
+				 void (*add_int)(void *, const char *, int),
+				 void (*add_str)(void *, const char *,
+						 const char *))
+{
+ int i, j;
+
+ if (recur->freq == ICAL_NO_RECURRENCE) return;
+
+ add_str(obj, "freq", icalrecur_freq_to_string(recur->freq));
+
+ /* until and count are mutually exclusive */
+ if (recur->until.year) {
+	add_str(obj, "until", icaltime_as_iso_string(recur->until));
+ }
+ else if (recur->count) add_int(obj, "count", recur->count);
+
+ if (recur->interval != 1) add_int(obj, "interval", recur->interval);
+
+ /* Monday is the default, so no need to include it */
+ if (recur->week_start != ICAL_MONDAY_WEEKDAY && 
+	recur->week_start != ICAL_NO_WEEKDAY) {
+	const char *daystr;
+
+	daystr = icalrecur_weekday_to_string(
+	 icalrecurrencetype_day_day_of_week(recur->week_start));
+	add_str(obj, "wkst", daystr);
+ }
+
+ /* The BY* parameters can each take a list of values.
+ *
+ * Each of the lists is terminated with the value
+ * ICAL_RECURRENCE_ARRAY_MAX unless the the list is full.
+ */
+ for (j = 0; recurmapj.str; j++) {
+	short *array = (short *)((size_t) recur + recurmapj.offset);
+	int limit = recurmapj.limit - 1;
+
+	for (i = 0; i < limit && arrayi != ICAL_RECURRENCE_ARRAY_MAX; i++) {
+	 if (j == 3) { /* BYDAY */
+		const char *daystr;
+		int pos;
+
+		daystr = icalrecur_weekday_to_string(
+		 icalrecurrencetype_day_day_of_week(arrayi));
+		pos = icalrecurrencetype_day_position(arrayi); 
+
+		if (pos != 0) {
+		 char temp20;
+
+		 snprintf(temp, sizeof(temp), "%d%s", pos, daystr);
+		 daystr = temp;
+		} 
+
+		add_str(obj, recurmapj.str, daystr);
+	 }
+	 else add_int(obj, recurmapj.str, arrayi);
+	}
+ }
+}
+
+
+/*
+ * Add an XML element for an iCalendar Period.
+ */
+static void icalperiodtype_add_as_xml_element(xmlNodePtr xtype,
+					 struct icalperiodtype p)
+{
+ const char *start;
+ const char *end;
+
+ start = icaltime_as_iso_string(p.start);
+ xmlNewTextChild(xtype, NULL, BAD_CAST "start", BAD_CAST start);
+
+ if (!icaltime_is_null_time(p.end)) {
+	end = icaltime_as_iso_string(p.end);
+	xmlNewTextChild(xtype, NULL, BAD_CAST "end", BAD_CAST end);
+ }
+ else {
+	end = icaldurationtype_as_ical_string(p.duration);
+	xmlNewTextChild(xtype, NULL, BAD_CAST "duration", BAD_CAST end);
+ }
+}
+
+
+/*
+ * Add an iCalendar recur-rule-part to a XML recur element.
+ */
+static void icalrecur_add_int_as_xml_element(void *xrecur, const char *rpart,
+					 int i)
+{
+ char ibuf20;
+
+ snprintf(ibuf, sizeof(ibuf), "%d", i);
+ xmlNewTextChild((xmlNodePtr) xrecur, NULL, BAD_CAST rpart, BAD_CAST ibuf);
+}
+
+static void icalrecur_add_string_as_xml_element(void *xrecur, const char *rpart,
+						const char *s)
+{
+ xmlNewTextChild((xmlNodePtr) xrecur, NULL, BAD_CAST rpart, BAD_CAST s);
+}
+
+
+/*
+ * Construct an XML element for an iCalendar parameter.
+ */
+static xmlNodePtr icalparameter_as_xml_element(icalparameter *param)
+{
+ icalparameter_kind kind;
+ icalparameter_value value;
+ const char *kind_string, *type_string, *value_string;
+ xmlNodePtr xparam;
+
+ kind = icalparameter_isa(param);
+
+ switch (kind) {
+ case ICAL_X_PARAMETER:
+ kind_string = icalparameter_get_xname(param);
+	break;
+
+ case ICAL_IANA_PARAMETER:
+	kind_string = icalparameter_get_iana_name(param);
+	break;
+
+ default:
+	kind_string = icalparameter_kind_to_string(kind);
+	if (kind_string) break;
+
+ case ICAL_NO_PARAMETER:
+ case ICAL_ANY_PARAMETER:
+	 icalerror_set_errno(ICAL_BADARG_ERROR);
+	 return NULL;
+ }
+
+ /* Get value type */
+ switch (kind) {
+ case ICAL_ALTREP_PARAMETER:
+ case ICAL_DIR_PARAMETER:
+	type_string = "uri";
+	break;
+
+ case ICAL_DELEGATEDFROM_PARAMETER:
+ case ICAL_DELEGATEDTO_PARAMETER:
+ case ICAL_MEMBER_PARAMETER:
+ case ICAL_SENTBY_PARAMETER:
+	type_string = "cal-address";
+	break;
+
+ case ICAL_RSVP_PARAMETER:
+	type_string = "boolean";
+	break;
+
+ default:
+	type_string = "text";
+	break;
+ }
+
+ /* XXX Need to handle multi-valued parameters */
+ value = icalparameter_get_value(param);
+ if (value == ICAL_VALUE_X) value_string = icalparameter_get_xvalue(param);
+ else value_string = icalparameter_enum_to_string(value);
+ if (!value_string) return NULL;
+
+ xparam = xmlNewNode(NULL, BAD_CAST lcase(icalmemory_tmp_copy(kind_string)));
+ xmlNewTextChild(xparam, NULL, BAD_CAST type_string, BAD_CAST value_string);
+
+ return xparam;
+}
+
+
+/*
+ * Add the proper XML element for an iCalendar value.
+ */
+static void icalproperty_add_value_as_xml_element(xmlNodePtr xprop,
+						 icalproperty *prop)
+						 
+{
+ const char *type, *str = NULL;
+ xmlNodePtr xtype;
+ const icalvalue *value;
+ char buf40;
+
+ /* Add type */
+ type = lcase(icalmemory_tmp_copy(
+		 icalproperty_value_kind_as_string(prop)));
+ xtype = xmlNewChild(xprop, NULL, BAD_CAST type, NULL);
+
+
+ /* Add value */
+ value = icalproperty_get_value(prop);
+
+ switch (icalvalue_isa(value)) {
+ case ICAL_DATE_VALUE:
+	str = icaltime_as_iso_string(icalvalue_get_date(value));
+	break;
+
+ case ICAL_DATETIME_VALUE:
+	str = icaltime_as_iso_string(icalvalue_get_datetime(value));
+	break;
+
+ case ICAL_DATETIMEPERIOD_VALUE: {
+	struct icaldatetimeperiodtype dtp =
+	 icalvalue_get_datetimeperiod(value);
+
+	if (!icaltime_is_null_time(dtp.time)) {
+	 str = icaltime_as_iso_string(dtp.time);
+	 break;
+	}
+	else {
+	 icalperiodtype_add_as_xml_element(xtype, dtp.period);
+	 return;
+	}
+ }
+
+ case ICAL_GEO_VALUE: {
+	struct icalgeotype geo = icalvalue_get_geo(value);
+
+	snprintf(buf, sizeof(buf), "%f", geo.lat);
+	xmlNewTextChild(xtype, NULL, BAD_CAST "latitude", BAD_CAST buf);
+	snprintf(buf, sizeof(buf), "%f", geo.lon);
+	xmlNewTextChild(xtype, NULL, BAD_CAST "longitude", BAD_CAST buf);
+	return;
+ }
+
+ case ICAL_PERIOD_VALUE:
+	icalperiodtype_add_as_xml_element(xtype, icalvalue_get_period(value));
+	return;
+
+ case ICAL_RECUR_VALUE: {
+	struct icalrecurrencetype recur = icalvalue_get_recur(value);
+
+	icalrecurrencetype_add_as_xxx(&recur, xtype,
+				 &icalrecur_add_int_as_xml_element,
+				 &icalrecur_add_string_as_xml_element);
+	return;
+ }
+
+ case ICAL_REQUESTSTATUS_VALUE: {
+	struct icalreqstattype stat = icalvalue_get_requeststatus(value);
+	
+	if (!stat.desc) stat.desc = icalenum_reqstat_desc(stat.code);
+
+	snprintf(buf, sizeof(buf), "%u.%u",
+		 icalenum_reqstat_major(stat.code),
+		 icalenum_reqstat_minor(stat.code));
+	xmlNewTextChild(xtype, NULL, BAD_CAST "code", BAD_CAST buf);
+	xmlNewTextChild(xtype, NULL, BAD_CAST "description", BAD_CAST stat.desc);
+	if (stat.debug)
+	 xmlNewTextChild(xtype, NULL, BAD_CAST "data", BAD_CAST stat.debug);
+
+	return;
+ }
+
+ case ICAL_TRIGGER_VALUE: {
+	struct icaltriggertype trig = icalvalue_get_trigger(value);
+
+	if (!icaltime_is_null_time(trig.time))
+	 str = icaltime_as_iso_string(trig.time);
+	else
+	 str = icaldurationtype_as_ical_string(trig.duration);
+	break;
+ }
+
+ case ICAL_UTCOFFSET_VALUE:
+	str = icalvalue_utcoffset_as_iso_string(value);
+	break;
+
+ default:
+	str = icalvalue_as_ical_string(value);
+	break;
+ }
+
+ if (str) xmlAddChild(xtype, xmlNewText(BAD_CAST str));
+}
+
+
+/*
+ * Construct an XML element for an iCalendar property.
+ */
+static xmlNodePtr icalproperty_as_xml_element(icalproperty *prop)
+{ 
+ icalproperty_kind prop_kind;
+ const char *x_name, *property_name = NULL; 
+ icalparameter *param;
+ xmlNodePtr xprop, xparams = NULL;
+
+ if (!prop) return NULL;
+ 
+ prop_kind = icalproperty_isa(prop);
+ x_name = icalproperty_get_x_name(prop);
+
+ if (prop_kind == ICAL_X_PROPERTY && x_name)
+	property_name = x_name;
+ else
+	property_name = icalproperty_kind_to_string(prop_kind);
+
+ if (!property_name) {
+	icalerror_warn("Got a property of an unknown kind.");
+	return NULL;
+ }
+
+ /* Create property */
+ xprop = xmlNewNode(NULL,
+		 BAD_CAST lcase(icalmemory_tmp_copy(property_name)));
+
+
+ /* Add parameters */
+ for (param = icalproperty_get_first_parameter(prop, ICAL_ANY_PARAMETER);
+	 param != 0;
+	 param = icalproperty_get_next_parameter(prop, ICAL_ANY_PARAMETER)) {
+
+	if (icalparameter_isa(param) == ICAL_VALUE_PARAMETER) continue;
+
+	if (!xparams)
+	 xparams = xmlNewChild(xprop, NULL, BAD_CAST "parameters", NULL);
+
+	xmlAddChild(xparams, icalparameter_as_xml_element(param));
+ }
+
+
+ /* Add value */
+ /* XXX Need to handle multi-valued properties */
+ icalproperty_add_value_as_xml_element(xprop, prop);
+
+ return xprop;
+}
+
+
+/*
+ * Construct a XML element for an iCalendar component.
+ */
+static xmlNodePtr icalcomponent_as_xml_element(icalcomponent *comp)
+{
+ icalcomponent *c;
+ icalproperty *p;
+ icalcomponent_kind kind;
+ const char* kind_string;
+ xmlNodePtr xcomp, xprops = NULL, xsubs = NULL;
+
+ if (!comp) return NULL;
+
+ kind = icalcomponent_isa(comp);
+ switch (kind) {
+ case ICAL_NO_COMPONENT:
+	return NULL;
+	break;
+
+ case ICAL_X_COMPONENT:
+	kind_string = ""; //comp->x_name;
+	break;
+
+ default:
+	kind_string = icalcomponent_kind_to_string(kind);
+ }
+
+
+ /* Create component */
+ xcomp = xmlNewNode(NULL,
+		 BAD_CAST lcase(icalmemory_tmp_copy(kind_string)));
+
+
+ /* Add properties */
+ for (p = icalcomponent_get_first_property(comp, ICAL_ANY_PROPERTY);
+	 p;
+	 p = icalcomponent_get_next_property(comp, ICAL_ANY_PROPERTY)) {
+
+	if (!xprops)
+	 xprops = xmlNewChild(xcomp, NULL, BAD_CAST "properties", NULL);
+
+	xmlAddChild(xprops, icalproperty_as_xml_element(p));
+ }
+
+
+ /* Add sub-components */
+ for (c = icalcomponent_get_first_component(comp, ICAL_ANY_COMPONENT);
+	 c;
+	 c = icalcomponent_get_next_component(comp, ICAL_ANY_COMPONENT)) {
+
+	if (!xsubs)
+	 xsubs = xmlNewChild(xcomp, NULL, BAD_CAST "components", NULL);
+
+	xmlAddChild(xsubs, icalcomponent_as_xml_element(c));
+ }
+
+ return xcomp;
+}
+
+
+/*
+ * Construct a xcal string for an iCalendar component.
+ */
+const char *icalcomponent_as_xcal_string(icalcomponent *ical)
+{
+ xmlDocPtr doc;
+ xmlNodePtr root, xcomp;
+ int bufsiz;
+ const char *xcal = NULL;
+
+ if (!ical) return NULL;
+
+ doc = xmlNewDoc(BAD_CAST "1.0");
+ root = xmlNewNode(NULL, BAD_CAST "icalendar");
+ xmlNewNs(root, BAD_CAST XML_NS_ICALENDAR, NULL);
+ xmlDocSetRootElement(doc, root);
+
+ xcomp = icalcomponent_as_xml_element(ical);
+
+ xmlAddChild(root, xcomp);
+
+ if (!xmlStrcmp(xcomp->name, BAD_CAST "vcalendar")) {
+	/* Complete iCalendar stream */
+	xmlChar *buf;
+
+	xmlDocDumpFormatMemoryEnc(doc, &buf, &bufsiz, "utf-8",
+				 config_httpprettytelemetry);
+	xcal = icalmemory_tmp_copy((char *) buf);
+
+	xmlFree(buf);
+ }
+ else {
+	/* Single iCalendar object */
+	xmlBufferPtr xbuf = xmlBufferCreate();
+
+	bufsiz = xmlNodeDump(xbuf, doc, xcomp,
+			 0, config_httpprettytelemetry);
+	xcal = icalmemory_tmp_copy((char *) xbuf);
+
+	xmlBufferFree(xbuf);
+ }
+
+ xmlFreeDoc(doc);
+
+ return xcal;
+}
+
+
+/* Add an iCalendar recurrence rule part to icalrecurrencetype.
+ *
+ * XXX The following structure is opaque libical, but for some stupid
+ * reason the icalrecur_add_by*rules() functions require it even though
+ * all they use is the rt field. MUST keep this in sync with icalrecur.c
+ */
+struct icalrecur_parser {
+ const char* rule;
+ char* copy;
+ char* this_clause;
+ char* next_clause;
+
+ struct icalrecurrencetype rt;
+};
+
+extern icalrecurrencetype_frequency icalrecur_string_to_freq(const char* str);
+extern void icalrecur_add_byrules(struct icalrecur_parser *parser, short *array,
+				 int size, char* vals);
+extern void icalrecur_add_bydayrules(struct icalrecur_parser *parser,
+				 const char* vals);
+
+struct icalrecurrencetype *icalrecur_add_rule(struct icalrecurrencetype **rt,
+					 const char *rpart, void *data,
+					 int (*get_int)(void *),
+					 const char* (*get_str)(void *))
+{
+ static struct icalrecur_parser parser;
+
+ if (!*rt) {
+	/* Initialize */
+	*rt = &parser.rt;
+	icalrecurrencetype_clear(*rt);
+ }
+
+ if (!strcmp(rpart, "freq")) {
+	(*rt)->freq = icalrecur_string_to_freq(get_str(data));
+ }
+ else if (!strcmp(rpart, "count")) {
+	(*rt)->count = get_int(data);
+ }
+ else if (!strcmp(rpart, "until")) {
+	(*rt)->until = icaltime_from_string(get_str(data));
+ }
+ else if (!strcmp(rpart, "interval")) {
+	(*rt)->interval = get_int(data);
+	if ((*rt)->interval < 1) (*rt)->interval = 1; /* MUST be >= 1 */
+ }
+ else if (!strcmp(rpart, "wkst")) {
+	(*rt)->week_start = icalrecur_string_to_weekday(get_str(data));
+ }
+ else if (!strcmp(rpart, "byday")) {
+	icalrecur_add_bydayrules(&parser, get_str(data));
+ }
+ else {
+	int i;
+
+	for (i = 0; recurmapi.str && strcmp(rpart, recurmapi.str); i++);
+
+	if (recurmapi.str) {
+	 short *array =
+		(short *)((size_t) *rt + recurmapi.offset);
+	 int limit = recurmapi.limit;
+
+	 icalrecur_add_byrules(&parser, array, limit,
+				 icalmemory_tmp_copy(get_str(data)));
+	}
+	else {
+	 syslog(LOG_WARNING, "Unknown recurrence rule-part: %s", rpart);
+	 icalrecurrencetype_clear(*rt);
+	 *rt = NULL;
+	}
+ }
+
+ return *rt;
+}
+
+
+int xmlElementContent_to_int(void *content)
+{
+ return atoi((const char *) content);
+}
+
+const char *xmlElementContent_to_str(void *content)
+{
+ return (const char *) content;
+}
+
+
+/*
+ * Construct an iCalendar property value from XML content.
+ */
+static icalvalue *xml_element_to_icalvalue(xmlNodePtr xtype,
+					 icalvalue_kind kind)
+{
+ icalvalue *value = NULL;
+ xmlNodePtr node;
+ xmlChar *content = NULL;
+
+ switch (kind) {
+
+ case ICAL_GEO_VALUE: {
+	struct icalgeotype geo;
+
+	node = xmlFirstElementChild(xtype);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <latitude> XML element");
+	 break;
+	}
+	else if (xmlStrcmp(node->name, BAD_CAST "latitude")) {
+	 syslog(LOG_WARNING,
+		 "Expected <latitude> XML element, received %s", node->name);
+	 break;
+	}
+
+	content = xmlNodeGetContent(node);
+	geo.lat = atof((const char *) content);
+
+	node = xmlNextElementSibling(node);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <longitude> XML element");
+	 break;
+	}
+	else if (xmlStrcmp(node->name, BAD_CAST "longitude")) {
+	 syslog(LOG_WARNING,
+		 "Expected <longitude> XML element, received %s", node->name);
+	 break;
+	}
+
+	xmlFree(content);
+	content = xmlNodeGetContent(node);
+	geo.lon = atof((const char *) content);
+
+	value = icalvalue_new_geo(geo);
+
+	break;
+ }
+
+ case ICAL_PERIOD_VALUE: {
+	struct icalperiodtype p;
+
+	p.start = p.end = icaltime_null_time();
+	p.duration = icaldurationtype_from_int(0);
+
+	node = xmlFirstElementChild(xtype);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <start> XML element");
+	 break;
+	}
+	else if (xmlStrcmp(node->name, BAD_CAST "start")) {
+	 syslog(LOG_WARNING,
+		 "Expected <start> XML element, received %s", node->name);
+	 break;
+	}
+
+	content = xmlNodeGetContent(node);
+	p.start = icaltime_from_string((const char *) content);
+	if (icaltime_is_null_time(p.start)) break;
+
+	node = xmlNextElementSibling(node);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <end> / <duration> XML element");
+	 break;
+	}
+	else if (!xmlStrcmp(node->name, BAD_CAST "end")) {
+	 xmlFree(content);
+	 content = xmlNodeGetContent(node);
+	 p.end = icaltime_from_string((const char *) content);
+	 if (icaltime_is_null_time(p.end)) break;
+	}
+	else if (!xmlStrcmp(node->name, BAD_CAST "duration")) {
+	 xmlFree(content);
+	 content = xmlNodeGetContent(node);
+	 p.duration = icaldurationtype_from_string((const char *) content);
+	 if (icaldurationtype_as_int(p.duration) == 0) break;
+	}
+	else {
+	 syslog(LOG_WARNING,
+		 "Expected <end> / <duration> XML element, received %s",
+		 node->name);
+	 break;
+	}
+
+	value = icalvalue_new_period(p);
+
+	break;
+ }
+
+ case ICAL_RECUR_VALUE: {
+	struct icalrecurrencetype *rt = NULL;
+
+	for (node = xmlFirstElementChild(xtype); node;
+	 node = xmlNextElementSibling(node)) {
+
+	 content = xmlNodeGetContent(node);
+	 rt = icalrecur_add_rule(&rt, (const char *) node->name, content,
+				 &xmlElementContent_to_int,
+				 &xmlElementContent_to_str);
+	 xmlFree(content);
+	 content = NULL;
+	 if (!rt) break;
+	}
+
+	if (rt && rt->freq != ICAL_NO_RECURRENCE)
+	 value = icalvalue_new_recur(*rt);
+
+	break;
+ }
+
+ case ICAL_REQUESTSTATUS_VALUE: {
+	struct icalreqstattype rst = { ICAL_UNKNOWN_STATUS, NULL, NULL };
+	short maj, min;
+
+	node = xmlFirstElementChild(xtype);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <code> XML element");
+	 break;
+	}
+	else if (xmlStrcmp(node->name, BAD_CAST "code")) {
+	 syslog(LOG_WARNING,
+		 "Expected <code> XML element, received %s", node->name);
+	 break;
+	}
+
+	content = xmlNodeGetContent(node);
+	if (sscanf((const char *) content, "%hd.%hd", &maj, &min) == 2) {
+	 rst.code = icalenum_num_to_reqstat(maj, min);
+	}
+	if (rst.code == ICAL_UNKNOWN_STATUS) {
+	 syslog(LOG_WARNING, "Unknown request-status code");
+	 break;
+	}
+
+	node = xmlNextElementSibling(node);
+	if (!node) {
+	 syslog(LOG_WARNING, "Missing <description> XML element");
+	 break;
+	}
+	else if (xmlStrcmp(node->name, BAD_CAST "description")) {
+	 syslog(LOG_WARNING,
+		 "Expected <description> XML element, received %s",
+		 node->name);
+	 break;
+	}
+
+	xmlFree(content);
+	content = xmlNodeGetContent(node);
+	rst.desc = (const char *) content;
+
+	node = xmlNextElementSibling(node);
+	if (node) {
+	 if (xmlStrcmp(node->name, BAD_CAST "data")) {
+		syslog(LOG_WARNING,
+		 "Expected <data> XML element, received %s", node->name);
+		break;
+	 }
+
+	 xmlFree(content);
+	 content = xmlNodeGetContent(node);
+	 rst.debug = (const char *) content;
+	}
+
+	value = icalvalue_new_requeststatus(rst);
+	break;
+ }
+
+ case ICAL_UTCOFFSET_VALUE: {
+	int n, utcoffset, hours, minutes, seconds = 0;
+	char sign;
+
+	content = xmlNodeGetContent(xtype);
+	n = sscanf((const char *) content, "%c%02d:%02d:%02d",
+		 &sign, &hours, &minutes, &seconds);
+
+	if (n < 3) {
+	 syslog(LOG_WARNING, "Unexpected utc-offset format");
+	 break;
+	}
+
+	utcoffset = hours*3600 + minutes*60 + seconds;
+
+	if (sign == '-') utcoffset = -utcoffset;
+
+	value = icalvalue_new_utcoffset(utcoffset);
+	break;
+ }
+
+ default:
+	content = xmlNodeGetContent(xtype);
+	value = icalvalue_new_from_string(kind, (const char *) content);
+	break;
+ }
+
+ if (content) xmlFree(content);
+
+ return value;
+}
+
+
+/*
+ * Construct an iCalendar property from a XML element.
+ */
+static icalproperty *xml_element_to_icalproperty(xmlNodePtr xprop)
+{
+ const char *propname, *typestr;
+ icalproperty_kind kind;
+ icalproperty *prop = NULL;
+ icalvalue_kind valkind;
+ icalvalue *value;
+ xmlNodePtr node;
+
+ /* Get the property type */
+ propname = ucase(icalmemory_tmp_copy((const char *) xprop->name));
+ kind = icalenum_string_to_property_kind(propname);
+ if (kind == ICAL_NO_PROPERTY) {
+	syslog(LOG_WARNING, "Unknown xCal property type: %s", propname);
+	return NULL;
+ }
+
+ /* Create new property */
+ prop = icalproperty_new(kind);
+ if (!prop) {
+	syslog(LOG_ERR, "Creation of new %s property failed", propname);
+	return NULL;
+ }
+ if (kind == ICAL_X_PROPERTY) icalproperty_set_x_name(prop, propname);
+
+
+ /* Add parameters */
+ node = xmlFirstElementChild(xprop);
+ if (node && !xmlStrcmp(node->name, BAD_CAST "parameters")) {
+	xmlNodePtr xparam;
+
+	for (xparam = xmlFirstElementChild(node); xparam;
+	 xparam = xmlNextElementSibling(xparam)) {
+	 char *paramname =
+		ucase(icalmemory_tmp_copy((const char *) xparam->name));
+	 xmlChar *paramval = xmlNodeGetContent(xmlFirstElementChild(xparam));
+
+	 /* XXX Need to handle multi-valued parameters */
+	 icalproperty_set_parameter_from_string(prop, paramname,
+						 (const char *) paramval);
+
+	 xmlFree(paramval);
+	}
+
+	node = xmlNextElementSibling(node);
+ }
+
+ /* Get the value type */
+ if (!node) {
+	syslog(LOG_WARNING, "Missing xCal value for %s property",
+	 propname);
+	return NULL;
+ }
+ typestr = ucase(icalmemory_tmp_copy((const char *) node->name));
+ valkind = !strcmp(typestr, "UNKNOWN") ? ICAL_X_VALUE :
+	icalenum_string_to_value_kind(typestr);
+ if (valkind == ICAL_NO_VALUE) {
+	syslog(LOG_WARNING, "Unknown xCal value type for %s property: %s",
+	 propname, typestr);
+	return NULL;
+ }
+ else if (valkind == ICAL_TEXT_VALUE) {
+	/* "text" also includes enumerated types - grab type from property */
+	valkind = icalproperty_kind_to_value_kind(kind);
+ }
+
+
+ /* Add value */
+ /* XXX Need to handle multi-valued properties */
+ value = xml_element_to_icalvalue(node, valkind);
+ if (!value) {
+	syslog(LOG_ERR, "Parsing %s property value failed", propname);
+	goto error;
+ }
+
+ icalproperty_set_value(prop, value);
+
+
+ /* Sanity check */ 
+ if ((node = xmlNextElementSibling(node))) {
+	syslog(LOG_WARNING,
+	"Unexpected XML element in property: %s", node->name);
+	goto error;
+ }
+
+ return prop;
+
+ error:
+ icalproperty_free(prop);
+ return NULL;
+}
+
+
+/*
+ * Construct an iCalendar component from a XML element.
+ */
+static icalcomponent *xml_element_to_icalcomponent(xmlNodePtr xcomp)
+{
+ icalcomponent_kind kind;
+ icalcomponent *comp = NULL;
+ xmlNodePtr node, xprop, xsub;
+
+ if (!xcomp) return NULL;
+
+ /* Get component type */
+ kind =
+	icalenum_string_to_component_kind(
+	 ucase(icalmemory_tmp_copy((const char *) xcomp->name)));
+ if (kind == ICAL_NO_COMPONENT) {
+	syslog(LOG_WARNING, "Unknown xCal component type: %s", xcomp->name);
+	return NULL;
+ }
+
+ /* Create new component */
+ comp = icalcomponent_new(kind);
+ if (!comp) {
+	syslog(LOG_ERR, "Creation of new %s component failed", xcomp->name);
+	return NULL;
+ }
+
+ /* Add properties */
+ node = xmlFirstElementChild(xcomp);
+ if (!node || xmlStrcmp(node->name, BAD_CAST "properties")) {
+	syslog(LOG_WARNING,
+	 "Expected <properties> XML element, received %s", node->name);
+	goto error;
+ }
+ for (xprop = xmlFirstElementChild(node); xprop;
+	 xprop = xmlNextElementSibling(xprop)) {
+	icalproperty *prop = xml_element_to_icalproperty(xprop);
+
+	if (!prop) goto error;
+
+	icalcomponent_add_property(comp, prop);
+ }
+
+ /* Add sub-components */
+ if (!(node = xmlNextElementSibling(node))) return comp;
+
+ if (xmlStrcmp(node->name, BAD_CAST "components")) {
+	syslog(LOG_WARNING,
+	 "Expected <components> XML element, received %s", node->name);
+	goto error;
+ }
+
+ for (xsub = xmlFirstElementChild(node); xsub;
+	 xsub = xmlNextElementSibling(xsub)) {
+	icalcomponent *sub = xml_element_to_icalcomponent(xsub);
+
+	if (!sub) goto error;
+
+	icalcomponent_add_component(comp, sub);
+ }
+
+ /* Sanity check */ 
+ if ((node = xmlNextElementSibling(node))) {
+	syslog(LOG_WARNING,
+	"Unexpected XML element in component: %s", node->name);
+	goto error;
+ }
+
+ return comp;
+
+ error:
+ icalcomponent_free(comp);
+ return NULL;
+}
+
+
+/*
+ * Construct an iCalendar component from an xCal string.
+ */
+icalcomponent *xcal_string_as_icalcomponent(const char *str)
+{
+ xmlParserCtxtPtr ctxt;
+ xmlDocPtr doc = NULL;
+ xmlNodePtr root;
+ icalcomponent *ical = NULL;
+
+ if (!str) return NULL;
+
+ /* Parse the XML request */
+ ctxt = xmlNewParserCtxt();
+ if (ctxt) {
+	doc = xmlCtxtReadMemory(ctxt, str, strlen(str), NULL, NULL,
+				XML_PARSE_NOWARNING);
+	xmlFreeParserCtxt(ctxt);
+ }
+ if (!doc) {
+	syslog(LOG_WARNING, "XML parse error");
+	return NULL;
+ }
+
+ /* Get root element */
+ if (!(root = xmlDocGetRootElement(doc)) ||
+	xmlStrcmp(root->name, BAD_CAST "icalendar") ||
+	xmlStrcmp(root->ns->href, BAD_CAST XML_NS_ICALENDAR)) {
+	syslog(LOG_WARNING,
+	 "XML root element is not %s:icalendar", XML_NS_ICALENDAR);
+	goto done;
+ }
+
+ ical = xml_element_to_icalcomponent(xmlFirstElementChild(root));
+
+ done:
+ xmlFreeDoc(doc);
+
+ return ical;
+}
+
+
+const char *begin_xcal(struct buf *buf)
+{
+ /* Begin xCal stream */
+ buf_reset(buf);
+ buf_printf_markup(buf, 0, "<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+ buf_printf_markup(buf, 0, "<icalendar xmlns=\"%s\">", XML_NS_ICALENDAR);
+ buf_printf_markup(buf, 1, "<vcalendar>");
+ buf_printf_markup(buf, 2, "<properties>");
+ buf_printf_markup(buf, 3, "<prodid>");
+ buf_printf_markup(buf, 4, "<text>-//CyrusIMAP.org/Cyrus %s//EN</text>",
+		 cyrus_version());
+ buf_printf_markup(buf, 3, "</prodid>");
+ buf_printf_markup(buf, 3, "<version>");
+ buf_printf_markup(buf, 4, "<text>2.0</text>");
+ buf_printf_markup(buf, 3, "</version>");
+ buf_printf_markup(buf, 2, "</properties>");
+ buf_printf_markup(buf, 2, "<components>");
+
+ return "";
+}
+
+
+void end_xcal(struct buf *buf)
+{
+ /* End xCal stream */
+ buf_reset(buf);
+ buf_printf_markup(buf, 2, "</components>");
+ buf_printf_markup(buf, 1, "</vcalendar>");
+ buf_printf_markup(buf, 0, "</icalendar>");
+}

cyrus-imapd-2.5.tar.gz/imap/xcal.h Added

@@ -0,0 +1,70 @@
+/* xcal.h -- Routines for converting iCalendar to/from xCal
+ *
+ * Copyright (c) 1994-2013 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <config.h>
+
+#include <libical/ical.h>
+
+#include "util.h"
+
+#define XML_NS_ICALENDAR	"urn:ietf:params:xml:ns:icalendar-2.0"
+
+extern const char *icalproperty_value_kind_as_string(icalproperty *prop);
+extern const char *icaltime_as_iso_string(const struct icaltimetype tt);
+extern const char *icalvalue_utcoffset_as_iso_string(const icalvalue* value);
+extern void icalrecurrencetype_add_as_xxx(struct icalrecurrencetype *recur,
+					 void *obj,
+					 void (*add_int)(void *, const char *,
+							 int),
+					 void (*add_str)(void *, const char *,
+							 const char *));
+extern struct icalrecurrencetype *
+icalrecur_add_rule(struct icalrecurrencetype **rt,
+		 const char *rpart, void *data,
+		 int (*get_int)(void *),
+		 const char* (*get_str)(void *));
+
+extern const char *icalcomponent_as_xcal_string(icalcomponent* comp);
+extern icalcomponent *xcal_string_as_icalcomponent(const char *str);
+extern const char *begin_xcal(struct buf *buf);
+extern void end_xcal(struct buf *buf);

cyrus-imapd-2.5.tar.gz/imap/xstats.c Added

@@ -0,0 +1,52 @@
+/* xstats.c -- trivial stats for searching
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include "xstats.h"
+
+
+EXPORTED uint32_t xstatsXSTATS_NUM_METRICS;
+EXPORTED const char *xstats_namesXSTATS_NUM_METRICS = {
+#define X(x) _STRINGIFY(x)
+#include "xstats_metrics.h"
+#undef X
+};

cyrus-imapd-2.5.tar.gz/imap/xstats.h Added

@@ -0,0 +1,71 @@
+/* xstats.h -- trivial stats for searching
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_IMAP_XSTATS_H__
+#define __CYRUS_IMAP_XSTATS_H__
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+#include <config.h>
+
+#define _PASTE(a,b)		a##b
+#define _STRINGIFY(x)		#x
+
+enum
+{
+#define X(x)	_PASTE(XSTATS_,x)
+#include "xstats_metrics.h"
+#undef X
+ XSTATS_NUM_METRICS
+};
+extern uint32_t xstatsXSTATS_NUM_METRICS;	/* 32b wrapping counters */
+extern const char *xstats_namesXSTATS_NUM_METRICS;
+
+#define xstats_inc(m)		(xstats_PASTE(XSTATS_,m)++)
+#define xstats_add(m, x)	(xstats_PASTE(XSTATS_,m) += (x))
+
+/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+
+#endif /* __CYRUS_IMAP_XSTATS_H__ */

cyrus-imapd-2.5.tar.gz/imap/xstats_metrics.h Added

@@ -0,0 +1,62 @@
+/* xstats_metric.h -- canonical list of trivial stats for searching
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+X(CONV_LOAD),
+X(CONV_SAVE),
+X(CONV_GET_MODSEQ),
+X(CONV_NEW),
+X(MSGDATA_LOAD),
+X(MESSAGE_MAP),
+X(SEARCH_EVALUATE),
+X(SEARCH_HEADER),
+X(SEARCH_CACHE_HEADER),
+X(SEARCH_BODY),
+X(SEARCH_TRIVIAL),
+X(SEARCH_RESULT),
+X(SPHINX_MULTIPLE),
+X(SPHINX_SINGLE),
+X(SPHINX_MATCH),
+X(SPHINX_CONNECT),
+X(SPHINX_CLOSE),
+X(SPHINX_QUERY),
+X(SPHINX_ROW),
+X(SPHINX_RESULT),
+X(SPHINX_UNINDEXED),

cyrus-imapd-2.4.17.tar.gz/imtest/imtest.c -> cyrus-imapd-2.5.tar.gz/imtest/imtest.c Changed

@@ -40,55 +40,45 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imtest.c,v 1.129 2010/01/06 17:01:43 murch Exp $
 */
 
 #include "config.h"
 
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-
+#include <limits.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <signal.h>
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#include <limits.h>
-#include <unistd.h>
-
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <netdb.h>
-#include <sys/socket.h>
 #include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include <sys/msg.h>
+#include <sys/ipc.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
 
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
-#include <pwd.h>
-
-#include "prot.h"
 #include "hash.h"
 #include "imparse.h"
 #include "iptostring.h"
+#include "md5.h"
+#include "prot.h"
+#include "retry.h"
+#include "strarray.h"
 #include "stristr.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
 #include "xstrlcpy.h"
-#include "md5.h"
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
@@ -110,12 +100,12 @@
 } imt_stat;
 
 /* global vars */
-sasl_conn_t *conn;
-int sock; /* socket descriptor */
+static sasl_conn_t *conn;
+static int sock; /* socket descriptor */
 
-int verbose=0;
+static int verbose=0;
 
-struct protstream *pout, *pin;
+static struct protstream *pout, *pin;
 
 static char *authname = NULL;
 static char *username = NULL;
@@ -129,25 +119,19 @@
 #define CONFIGHASHSIZE 30 /* relatively small */
 
 static struct hash_table confighash;
-int mysasl_config(void*, const char*, const char*, const char**, unsigned*);
+static int mysasl_config(void*, const char*, const char*, const char**, unsigned*);
 
 extern int _sasl_debug;
 extern char *optarg;
 
-struct stringlist 
-{
- char *str;
- struct stringlist *next;
-};
-
-struct stringlist *strlist_head = NULL;
+static strarray_t stashed_strings = STRARRAY_INITIALIZER;
 
 /* callbacks we support */
 static sasl_callback_t callbacks = {
 {
-	SASL_CB_ECHOPROMPT, NULL, NULL 
+	SASL_CB_ECHOPROMPT, NULL, NULL
 }, {
-	SASL_CB_NOECHOPROMPT, NULL, NULL 
+	SASL_CB_NOECHOPROMPT, NULL, NULL
 }, {
 #ifdef SASL_CB_GETREALM
 	SASL_CB_GETREALM, NULL, NULL
@@ -159,7 +143,7 @@
 }, {
 	SASL_CB_PASS, NULL, NULL 
 }, {
-	SASL_CB_GETOPT, &mysasl_config, NULL 
+ SASL_CB_GETOPT, (int (*)(void))&mysasl_config, NULL
 }, {
 	SASL_CB_LIST_END, NULL, NULL
 }
@@ -253,8 +237,8 @@
 };
 
 
-void imtest_fatal(const char *msg, ...) __attribute__((noreturn));
-void imtest_fatal(const char *msg, ...)
+static void imtest_fatal(const char *msg, ...) __attribute__((noreturn));
+static void imtest_fatal(const char *msg, ...)
 {
 struct stat sbuf;
 if (output_socket && output_socket_opened &&
@@ -274,7 +258,7 @@
 }
 
 /* libcyrus makes us define this */
-void fatal(const char *msg, int code __attribute__((unused)))
+EXPORTED void fatal(const char *msg, int code __attribute__((unused)))
 {
 imtest_fatal(msg);
 }
@@ -320,13 +304,13 @@
 static char peer_CNCCERT_BUFSIZ;
 static char issuer_CNCCERT_BUFSIZ;
 
-char *tls_peer_CN = NULL;
-char *tls_issuer_CN = NULL;
+static char *tls_peer_CN = NULL;
+static char *tls_issuer_CN = NULL;
 
-const char *tls_protocol = NULL;
-const char *tls_cipher_name = NULL;
-int	tls_cipher_usebits = 0;
-int	tls_cipher_algbits = 0;
+static const char *tls_protocol = NULL;
+static const char *tls_cipher_name = NULL;
+static int	tls_cipher_usebits = 0;
+static int	tls_cipher_algbits = 0;
 
 /*
 * Set up the cert things on the server side. We do need both the
@@ -428,7 +412,7 @@
 * tim - this seems to just be giving logging messages
 */
 
-static void apps_ssl_info_callback(SSL * s, int where, int ret)
+static void apps_ssl_info_callback(const SSL * s, int where, int ret)
 {
 char *str;
 int w;
@@ -478,8 +462,8 @@
 }
 
 
-char *var_tls_CAfile="";
-char *var_tls_CApath="";
+static char *var_tls_CAfile="";
+static char *var_tls_CApath="";
 /*
 * This is the setup routine for the SSL client. 
 *
@@ -513,7 +497,7 @@
 
 off |= SSL_OP_ALL;		/* Work around all known bugs */
 SSL_CTX_set_options(tls_ctx, off);
- SSL_CTX_set_info_callback(tls_ctx, (void (*)()) apps_ssl_info_callback);
+ SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback);
 
 if (strlen(var_tls_CAfile) == 0)
 	CAfile = NULL;
@@ -649,7 +633,7 @@
 return (ret);
 }
 
-int tls_start_clienttls(unsigned *layer, char **authid)
+static int tls_start_clienttls(unsigned *layer, char **authid)
 {
 int sts;
 const SSL_CIPHER *cipher;
@@ -741,7 +725,7 @@
 return IMTEST_OK;
 }
 
-void do_starttls(int ssl, char *keyfile, unsigned *ssf)
+static void do_starttls(int ssl, char *keyfile, unsigned *ssf)
 {
 int result;
 char *auth_id;
@@ -852,7 +836,7 @@
 
 #define BUFSIZE 16384
 
-imt_stat getauthline(struct sasl_cmd_t *sasl_cmd, char **line, int *linelen)
+static imt_stat getauthline(struct sasl_cmd_t *sasl_cmd, char **line, int *linelen)
 {
 char bufBUFSIZE;
 int saslresult;
@@ -925,29 +909,18 @@
 return ret;
 }
 
-void interaction (int id, const char *challenge, const char *prompt,
+static void interaction (int id, const char *challenge, const char *prompt,
 		 char **tresult, unsigned int *tlen)
 {
+ char *s;
 char result1024;
- 
- struct stringlist *cur;
- 
- cur = malloc(sizeof(struct stringlist));
- if(!cur) {
-	*tlen=0;
-	*tresult=NULL;
-	return;
- }
- 
- cur->str = NULL;
- cur->next = strlist_head;
- strlist_head = cur;
- 
+
 if (id==SASL_CB_PASS && !cmdline_password) {
 	printf("%s: ", prompt);
-	cur->str=strdup(cyrus_getpass(""));
-	*tlen=strlen(cur->str);
-	*tresult = cur->str;
+	s = xstrdup(cyrus_getpass(""));
+	strarray_appendm(&stashed_strings, s);
+	*tlen = strlen(s);
+	*tresult = s;
 	return;
 } else if (id==SASL_CB_PASS && cmdline_password) {
 	strcpy(result, cmdline_password);
@@ -970,7 +943,7 @@
 } else {
 	int c;
 	
-	if (((id==SASL_CB_ECHOPROMPT) || (id=SASL_CB_NOECHOPROMPT)) &&
+	if (((id==SASL_CB_ECHOPROMPT) || (id==SASL_CB_NOECHOPROMPT)) &&
 	 (challenge != NULL)) {
 	 printf("Server challenge: %s\n", challenge);
 	}
@@ -978,24 +951,21 @@
 	if (id==SASL_CB_NOECHOPROMPT) {
 	 strcpy(result, cyrus_getpass(""));
 	} else {
-	 fgets(result, sizeof(result) - 1, stdin);
-	 c = strlen(result);
-	 resultc - 1 = '\0';
+	 result0 = '\0';
+	 if (fgets(result, sizeof(result) - 1, stdin) != NULL) {
+		c = strlen(result);
+		resultc - 1 = '\0';
+	 }
 	}
 }
- 
- *tlen = strlen(result);
- cur->str = (char *) malloc(*tlen+1);
- if(!cur->str) {
-	*tresult = NULL;
-	return;
- }
- memset(cur->str, 0, *tlen+1);
- memcpy(cur->str, result, *tlen);
- *tresult = cur->str;
+
+ s = xstrdup(result);
+ strarray_appendm(&stashed_strings, s);
+ *tlen = strlen(s);
+ *tresult = s;
 }
 
-void fillin_interactions(sasl_interact_t *tlist)
+static void fillin_interactions(sasl_interact_t *tlist)
 {
 while (tlist->id!=SASL_CB_LIST_END)
 	{
@@ -1022,7 +992,7 @@
 return str;
 }
 
-int auth_sasl(struct sasl_cmd_t *sasl_cmd, char *mechlist)
+static int auth_sasl(struct sasl_cmd_t *sasl_cmd, char *mechlist)
 {
 sasl_interact_t *client_interact = NULL;
 int saslresult;
@@ -1034,11 +1004,12 @@
 char inbase644096;
 int inbase64len;
 char cmdbuf40;
- int sendliteral = sasl_cmd->quote;
+ int sendliteral;
 int initial_response = 1;
 imt_stat status;
 
 if (!sasl_cmd || !sasl_cmd->cmd) return IMTEST_FAIL;
+ sendliteral = sasl_cmd->quote;
 
 do { /* start authentication */
 	saslresult = sasl_client_start(conn, mechlist, &client_interact,
@@ -1362,7 +1333,7 @@
 		 imtest_fatal("prot_read");
 		}
 		if(output_socket)
-		 write(fd_out, buf, count);
+		 retry_write(fd_out, buf, count);
 		else {
 		 /* use the stream API */
 		 bufcount = '\0';
@@ -1404,7 +1375,7 @@
 	 } else {
 		if (!output_socket) {
 		 /* echo for the user - if not in socket mode */
-		 write(1, buf, numr);
+		 retry_write(1, buf, numr);
 		} 
 
 		if (output_socket && protocol->pipe) {
@@ -1522,7 +1493,8 @@
 	/* check for auth */
 	if (prot->capa_cmd.auth &&
 	 (tmp = strstr(str, prot->capa_cmd.auth)) != NULL) {
-	 free(ret); /* avoid memory leak if duplicate mechlists */
+	 if (ret) free(ret);
+
 	 if (prot->capa_cmd.parse_mechlist)
 		ret = prot->capa_cmd.parse_mechlist(str, prot);
 	 else
@@ -2097,7 +2069,7 @@
 		printf("Server did not advertise AUTHINFO USER\n");
 		result = IMTEST_FAIL;
 	 } else {
-		result = auth_nntp(user_enabled);
+		result = auth_nntp();
 	 }
 	} else if (!mechlist || !stristr(mechlist, mech)) {
 	 printf("Server did not advertise SASL %s\n", ucase(mech));
@@ -2231,7 +2203,7 @@
 /*****************************************************************************/
 
 /* didn't give correct parameters; let's exit */
-void usage(char *prog, char *prot)
+static void usage(char *prog, char *prot)
 {
 printf("Usage: %s options hostname\n", prog);
 printf(" -p port : port to use (default=standard port for protocol)\n");
@@ -2389,9 +2361,7 @@
 int reauth = 1;
 int dochallenge = 0, noinitresp = 0;
 char *val;
- 
- struct stringlist *cur, *cur_next;
- 
+
 if (!construct_hash_table(&confighash, CONFIGHASHSIZE, 1)) {
 	imtest_fatal("could not construct config hash table");
 }
@@ -2736,13 +2706,7 @@
 	} else {
 	 const char *s = sasl_errstring(result, NULL, NULL);
 	 
-	 fprintf(stderr, "Authentication failed. %s\n", s);
-
-	 if (output_socket) {
-		/* send LOGOUT and exit */
-		logout(&protocol->logout_cmd, 0);
-		exit(1);
-	 }
+	 printf("Authentication failed. %s\n", s);
 	}
 	
 	result = sasl_getprop(conn, SASL_SSF, &ssfp);
@@ -2797,14 +2761,10 @@
 	 pipe in a filename if applicable */
 	interactive(protocol, filename);
 }
- 
- for (cur = strlist_head; cur; cur = cur_next) {
-	cur_next = cur->next;
-	free(cur->str);
-	free(cur);
- }
 
+ while (stashed_strings.count)
+	free(strarray_pop(&stashed_strings));
 free_hash_table(&confighash, free);
- 
+
 exit(0);
 }

cyrus-imapd-2.4.17.tar.gz/lib/acl.c -> cyrus-imapd-2.5.tar.gz/lib/acl.c Changed

@@ -39,8 +39,6 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: acl.c,v 1.14 2010/01/06 17:01:43 murch Exp $
- *
  * Author: Chris Newman
  * Start Date: 6/28/93
  *
@@ -54,7 +52,7 @@
 
 /* convert a string to an acl bit vector
  */
-int cyrus_acl_strtomask(const char *str)
+EXPORTED int cyrus_acl_strtomask(const char *str)
 {
     const char *deleteright = libcyrus_config_getstring(CYRUSOPT_DELETERIGHT);
     long legacy_create = 0;
@@ -65,7 +63,7 @@
 	switch (*str) {
 	    case 'l': result |= ACL_LOOKUP; break;
 	    case 'r': result |= ACL_READ; break;
-	    case 's': result |= ACL_SEEN; break;
+	    case 's': result |= ACL_SETSEEN; break;
 	    case 'w': result |= ACL_WRITE; break;
 	    case 'i': result |= ACL_INSERT; break;
 	    case 'p': result |= ACL_POST; break;
@@ -78,6 +76,7 @@
 	    case 'd': /* legacy DELETE macro - build member rights */
 		legacy_delete = (ACL_DELETEMSG | ACL_EXPUNGE); break;
 	    case 'a': result |= ACL_ADMIN; break;
+	    case 'n': result |= ACL_ANNOTATEMSG; break;
 	    case '0': result |= ACL_USER0; break;
 	    case '1': result |= ACL_USER1; break;
 	    case '2': result |= ACL_USER2; break;
@@ -113,7 +112,7 @@
 
 /* convert an acl bit vector to a string
  */
-char *cyrus_acl_masktostr(int acl, char *str)
+EXPORTED char *cyrus_acl_masktostr(int acl, char *str)
 {
     char *pos = str;
     const char *deleteright = libcyrus_config_getstring(CYRUSOPT_DELETERIGHT);
@@ -128,7 +127,7 @@
 
     if (acl & ACL_LOOKUP) *pos++ = 'l';
     if (acl & ACL_READ) *pos++ = 'r';
-    if (acl & ACL_SEEN) *pos++ = 's';
+    if (acl & ACL_SETSEEN) *pos++ = 's';
     if (acl & ACL_WRITE) *pos++ = 'w';
     if (acl & ACL_INSERT) *pos++ = 'i';
     if (acl & ACL_POST) *pos++ = 'p';
@@ -145,6 +144,7 @@
 	*pos++ = 'd';
     }
     if (acl & ACL_ADMIN) *pos++ = 'a';
+    if (acl & ACL_ANNOTATEMSG) *pos++ = 'n';
     if (acl & ACL_USER0) *pos++ = '0';
     if (acl & ACL_USER1) *pos++ = '1';
     if (acl & ACL_USER2) *pos++ = '2';

cyrus-imapd-2.4.17.tar.gz/lib/acl.h -> cyrus-imapd-2.5.tar.gz/lib/acl.h Changed

@@ -39,8 +39,6 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: acl.h,v 1.20 2010/01/06 17:01:43 murch Exp $
- *
  * Author: Chris Newman
  * Start Date: 6/28/93
  */
@@ -56,7 +54,7 @@
 /* ACL bits */
 #define ACL_LOOKUP	0x000001L
 #define ACL_READ	0x000002L
-#define ACL_SEEN	0x000004L
+#define ACL_SETSEEN	0x000004L
 #define ACL_WRITE	0x000008L
 #define ACL_INSERT	0x000010L
 #define ACL_POST	0x000020L
@@ -65,8 +63,7 @@
 #define ACL_DELETEMSG	0x000100L
 #define ACL_EXPUNGE	0x000200L
 #define ACL_ADMIN 	0x000400L
-#define ACL_ALL		0x0007FFL
-#define ACL_USER0	0x000800L
+#define ACL_ANNOTATEMSG	0x000800L
 #define ACL_USER1	0x001000L
 #define ACL_USER2	0x002000L
 #define ACL_USER3	0x004000L
@@ -76,9 +73,22 @@
 #define ACL_USER7	0x040000L
 #define ACL_USER8	0x080000L
 #define ACL_USER9	0x100000L
-#define ACL_FULL	0x1FFFFFL
+#define ACL_USER0	0x200000L
+
+/* ALL: all non-user ACLs */
+#define ACL_ALL		(ACL_LOOKUP|ACL_READ|ACL_SETSEEN|ACL_WRITE\
+			|ACL_INSERT|ACL_POST|ACL_CREATE|ACL_DELETEMBOX\
+			|ACL_DELETEMSG|ACL_EXPUNGE|ACL_ADMIN\
+			|ACL_ANNOTATEMSG)
+/* FULL: ALL ACLs including user ACLs */
+#define ACL_FULL	(ACL_USER1|ACL_USER2|ACL_USER3|ACL_USER4|ACL_USER5\
+			|ACL_USER6|ACL_USER7|ACL_USER8|ACL_USER9|ACL_USER0\
+			|ACL_ALL)
 
-#define ACL_READ_WRITE	(ACL_SEEN|ACL_WRITE|ACL_INSERT|ACL_DELETEMSG|ACL_EXPUNGE)
+/* READ-WRITE: removed from regular ACL if you EXAMINE a mailbox,
+   so that nothing accidentally tries to write */
+#define ACL_READ_WRITE (ACL_SETSEEN|ACL_WRITE|ACL_INSERT\
+		       |ACL_DELETEMSG|ACL_EXPUNGE|ACL_ANNOTATEMSG)
 
 #define ACL_MODE_SET 0
 #define ACL_MODE_ADD 1
@@ -100,7 +110,7 @@
  * Calculate the set of rights the user in 'auth_state' has in the ACL 'acl'.
  * 'acl' must be writable, but is restored to its original condition.
  */
-extern int cyrus_acl_myrights(struct auth_state *auth_state, char *acl);
+extern int cyrus_acl_myrights(struct auth_state *auth_state, const char *acl);
 
 /*  cyrus_acl_set(acl, identifier, mode, access, canonproc, canonrock) Modify the
  * ACL pointed to by 'acl' to modify the rights granted to

cyrus-imapd-2.4.17.tar.gz/lib/acl_afs.c -> cyrus-imapd-2.5.tar.gz/lib/acl_afs.c Changed

@@ -46,8 +46,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: acl_afs.c,v 1.29 2010/01/06 17:01:43 murch Exp $
 */
 
 #include <config.h>
@@ -63,8 +61,9 @@
 * Calculate the set of rights the user in 'auth_state' has in the ACL 'acl'.
 * 'acl' must be writable, but is restored to its original condition.
 */
-int cyrus_acl_myrights(struct auth_state *auth_state, char *acl)
+EXPORTED int cyrus_acl_myrights(struct auth_state *auth_state, const char *origacl)
 {
+ char *acl = xstrdupsafe(origacl);
 char *thisid, *rights, *nextid;
 long acl_positive = 0, acl_negative = 0;
 long *acl_ptr;
@@ -91,27 +90,22 @@
 	if (auth_memberof(auth_state, thisid)) {
 	 *acl_ptr |= cyrus_acl_strtomask(rights);
 	}
-
-	/* Put the delimiters back */
-	rights-1 = '\t';
-	nextid-1 = '\t';
 }
 
+ free(acl);
+
 return acl_positive & ~acl_negative;
 }
-	
+
 /*
 * Modify the ACL pointed to by 'acl' to make the rights granted to
 * 'identifier' the set specified in the mask 'access'. The pointer
 * pointed to by 'acl' must have been obtained from malloc().
 */
-int cyrus_acl_set(acl, identifier, mode, access, canonproc, canonrock)
-char **acl;
-const char *identifier;
-int mode;
-int access;
-cyrus_acl_canonproc_t *canonproc;
-void *canonrock;
+EXPORTED int cyrus_acl_set(char **acl, const char *identifier,
+		 int mode, int access,
+		 cyrus_acl_canonproc_t *canonproc,
+		 void *canonrock)
 {
 const char *canonid;
 char *newidentifier = 0;
@@ -211,7 +205,7 @@
 * Remove any entry for 'identifier' in the ACL pointed to by 'acl'.
 * The pointer pointed to by 'acl' must have been obtained from malloc().
 */
-int cyrus_acl_remove(char **acl, const char *identifier, 
+EXPORTED int cyrus_acl_remove(char **acl, const char *identifier,
 	 cyrus_acl_canonproc_t canonproc, void *canonrock)
 {
 return cyrus_acl_set(acl, identifier, ACL_MODE_SET, 0, canonproc, canonrock);

cyrus-imapd-2.5.tar.gz/lib/arrayu64.c Added

@@ -0,0 +1,290 @@
+/* arrayu64.c - expanding array of 64 bit unsigned numbers
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Bron Gondwana
+ * Start Date: 2013/02/12
+ */
+
+#include <string.h>
+#include "arrayu64.h"
+#include "xmalloc.h"
+
+EXPORTED arrayu64_t *arrayu64_new(void)
+{
+ return xzmalloc(sizeof(arrayu64_t));
+}
+
+EXPORTED void arrayu64_fini(arrayu64_t *au)
+{
+ if (!au)
+	return;
+ free(au->data);
+ au->data = NULL;
+ au->count = 0;
+ au->alloc = 0;
+}
+
+EXPORTED void arrayu64_free(arrayu64_t *au)
+{
+ if (!au)
+	return;
+ arrayu64_fini(au);
+ free(au);
+}
+
+#define QUANTUM	 16
+static void ensure_alloc(arrayu64_t *au, int newalloc)
+{
+ if (newalloc <= au->alloc)
+	return;
+ newalloc = ((newalloc + QUANTUM-1) / QUANTUM) * QUANTUM;
+ au->data = xrealloc(au->data, sizeof(uint64_t) * newalloc);
+ memset(au->data + au->alloc, 0, sizeof(uint64_t) * (newalloc - au->alloc));
+ au->alloc = newalloc;
+}
+
+/*
+ * Normalise the index passed by a caller, to a value in the range
+ * 0..count-1, or < 0 for invalid, assuming the function we're
+ * performing does not have the side effect of expanding the array.
+ * Note that doesn't necessarily mean the array is read-only, e.g.
+ * arrayu64_remove() modifies the array but does not expand the array if
+ * given an index outside the array's current bounds. In Perl style,
+ * negative indexes whose absolute value is less than the length of the
+ * array are treated as counting back from the end, e.g. idx=-1 means
+ * the final element.
+ */
+static inline int adjust_index_ro(const arrayu64_t *au, int idx)
+{
+ if (idx >= au->count)
+	return -1;
+ else if (idx < 0)
+	idx += au->count;
+ return idx;
+}
+
+/*
+ * Like adjust_index_ro(), with extra complication that the function
+ * we're performing will expand the array if either the adjusted index
+ * points outside the current bounds of the array, or @grow tells us
+ * that we're about to need more space in the array.
+ */
+static inline int adjust_index_rw(arrayu64_t *au, int idx, int grow)
+{
+ if (idx >= au->count) {
+	/* expanding the array as a side effect @idx pointing
+	 * outside the current bounds, plus perhaps @grow */
+	ensure_alloc(au, idx+grow);
+ } else if (idx < 0) {
+	/* adjust Perl-style negative indeces */
+	idx += au->count;
+	if (idx >= 0 && grow)
+	 ensure_alloc(au, au->count+grow);
+ } else if (grow) {
+	/* expanding the array due to an insert or append */
+	ensure_alloc(au, au->count+grow);
+ }
+ return idx;
+}
+
+EXPORTED arrayu64_t *arrayu64_dup(const arrayu64_t *au)
+{
+ arrayu64_t *new = arrayu64_new();
+ int i;
+
+ arrayu64_truncate(new, au->count);
+
+ for (i = 0 ; i < au->count ; i++)
+	new->datai = au->datai;
+
+ return new;
+}
+
+EXPORTED int arrayu64_append(arrayu64_t *au, uint64_t val)
+{
+ int pos = au->count++;
+ ensure_alloc(au, au->count);
+ au->datapos = val;
+ return pos;
+}
+
+EXPORTED int arrayu64_add(arrayu64_t *au, uint64_t val)
+{
+ int pos = arrayu64_find(au, val, 0);
+ if (pos < 0) pos = arrayu64_append(au, val);
+ return pos;
+}
+
+EXPORTED void arrayu64_set(arrayu64_t *au, int idx, uint64_t val)
+{
+ if ((idx = adjust_index_rw(au, idx, 0)) < 0)
+	return;
+ au->dataidx = val;
+ /* adjust the count if we just sparsely expanded the array */
+ if (idx >= au->count)
+	au->count = idx+1;
+}
+
+
+EXPORTED void arrayu64_insert(arrayu64_t *au, int idx, uint64_t val)
+{
+ if ((idx = adjust_index_rw(au, idx, 1)) < 0)
+	return;
+ if (idx < au->count)
+	memmove(au->data+idx+1, au->data+idx,
+		sizeof(uint64_t) * (au->count-idx));
+ au->dataidx = val;
+ au->count++;
+}
+
+EXPORTED uint64_t arrayu64_remove(arrayu64_t *au, int idx)
+{
+ uint64_t val;
+ if ((idx = adjust_index_ro(au, idx)) < 0)
+	return 0;
+ val = au->dataidx;
+ au->count--;
+ if (idx < au->count)
+	memmove(au->data+idx, au->data+idx+1,
+		sizeof(uint64_t) * (au->count-idx));
+ au->dataau->count = 0;
+ return val;
+}
+
+EXPORTED int arrayu64_remove_all(arrayu64_t *au, uint64_t val)
+{
+ int i = 0;
+ int count = 0;
+
+ for (;;) {
+	i = arrayu64_find(au, val, i);
+	if (i < 0)
+	 break;
+	count++;
+	arrayu64_remove(au, i);
+ }
+
+ return count;
+}
+
+EXPORTED void arrayu64_truncate(arrayu64_t *au, int newlen)
+{
+ if (newlen == au->count)
+	return;
+
+ if (newlen > au->count) {
+	ensure_alloc(au, newlen);
+ }
+ else {
+	memset(au->data+newlen, 0, sizeof(uint64_t) * (au->count - newlen));
+ }
+
+ au->count = newlen;
+}
+
+/* note: values outside the range are all zero */
+EXPORTED uint64_t arrayu64_nth(const arrayu64_t *au, int idx)
+{
+ if ((idx = adjust_index_ro(au, idx)) < 0)
+	return 0;
+ return au->dataidx;
+}
+
+EXPORTED uint64_t arrayu64_max(const arrayu64_t *au)
+{
+ uint64_t max = 0;
+ int i;
+
+ for (i = 0; i < au->count; i++) {
+	if (au->datai > max)
+	 max = au->datai;
+ }
+
+ return max;
+}
+
+static int _numeric_sort(const void *a, const void *b)
+{
+ uint64_t *av = (uint64_t *)a;
+ uint64_t *bv = (uint64_t *)b;
+
+ if (av == bv)
+	return 0;
+ if (av < bv)
+	return -1;
+ return 1;
+}
+
+EXPORTED void arrayu64_sort(arrayu64_t *au, compar_t *cmp)
+{
+ if (!cmp) cmp = _numeric_sort;
+ qsort(au->data, au->count, sizeof(uint64_t), cmp);
+}
+
+EXPORTED void arrayu64_uniq(arrayu64_t *au)
+{
+ int i;
+
+ for (i = 1; i < au->count; i++) {
+	if (au->datai-1 == au->datai)
+	 arrayu64_remove(au, i--);
+ }
+}
+
+EXPORTED int arrayu64_find(arrayu64_t *au, uint64_t val, int idx)
+{
+ int i;
+
+ if ((idx = adjust_index_ro(au, idx)) < 0)
+	return -1;
+
+ for (i = idx; i < au->count; i++) {
+	if (au->datai == val)
+	 return i;
+ }
+
+ return -1;
+}
+
+EXPORTED int arrayu64_size(const arrayu64_t *au)
+{
+ return au->count;
+}

cyrus-imapd-2.5.tar.gz/lib/arrayu64.h Added

@@ -0,0 +1,91 @@
+/* arrayu64.h - an expanding array of 64 bit unsigned integers
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Greg Banks
+ * Start Date: 2011/01/11
+ */
+
+#ifndef __CYRUS_ARRAYU64_H__
+#define __CYRUS_ARRAYU64_H__
+
+#include <sys/types.h>
+#include "util.h"
+
+typedef struct
+{
+ int count;
+ int alloc;
+ uint64_t *data;
+} arrayu64_t;
+
+#define ARRAYU64_INITIALIZER	{ 0, 0, NULL }
+#define arrayu64_init(sa) (memset((sa), 0, sizeof(arrayu64_t)))
+void arrayu64_fini(arrayu64_t *);
+
+arrayu64_t *arrayu64_new(void);
+void arrayu64_free(arrayu64_t *);
+
+int arrayu64_append(arrayu64_t *, uint64_t);
+int arrayu64_add(arrayu64_t *, uint64_t);
+int arrayu64_find(arrayu64_t *, uint64_t, int start);
+void arrayu64_set(arrayu64_t *, int idx, uint64_t);
+void arrayu64_insert(arrayu64_t *, int idx, uint64_t);
+uint64_t arrayu64_remove(arrayu64_t *, int idx);
+/* returns number removed */
+int arrayu64_remove_all(arrayu64_t *, uint64_t);
+uint64_t arrayu64_nth(const arrayu64_t *, int idx);
+void arrayu64_truncate(arrayu64_t *, int newlen);
+arrayu64_t *arrayu64_dup(const arrayu64_t *);
+
+uint64_t arrayu64_max(const arrayu64_t *);
+
+#define arrayu64_shift(sa)	 arrayu64_remove((sa), 0)
+#define arrayu64_unshift(sa, s)	 arrayu64_insert((sa), 0, (s))
+
+#define arrayu64_pop(sa)	 arrayu64_remove((sa), -1)
+#define arrayu64_push(sa, s)	 arrayu64_append((sa), (s))
+
+void arrayu64_sort(arrayu64_t *, compar_t *);
+void arrayu64_uniq(arrayu64_t *);
+
+int arrayu64_size(const arrayu64_t *);
+
+#endif /* __CYRUS_ARRAYU64_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/assert.c -> cyrus-imapd-2.5.tar.gz/lib/assert.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/assert.h -> cyrus-imapd-2.5.tar.gz/lib/assert.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/auth.c -> cyrus-imapd-2.5.tar.gz/lib/auth.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth.c,v 1.4 2010/01/06 17:01:43 murch Exp $
 */
 
 #include <config.h>
@@ -61,7 +59,7 @@
 #endif
 NULL };
 
-static struct auth_mech *auth_fromname()
+static struct auth_mech *auth_fromname(void)
 {
 int i;
 const char *name = libcyrus_config_getstring(CYRUSOPT_AUTH_MECH);
@@ -85,36 +83,30 @@
 return auth;
 }
 
-int auth_memberof(auth_state, identifier)
-struct auth_state *auth_state;
-const char *identifier;
+EXPORTED int auth_memberof(struct auth_state *auth_state, const char *identifier)
 {
 struct auth_mech *auth = auth_fromname();
 
 return auth->memberof(auth_state, identifier);
 }
 
-char *auth_canonifyid(identifier, len)
-const char *identifier;
-size_t len;
+EXPORTED const char *auth_canonifyid(const char *identifier, size_t len)
 {
 struct auth_mech *auth = auth_fromname();
 
 return auth->canonifyid(identifier, len);
 }
 
-struct auth_state *auth_newstate(identifier)
-const char *identifier;
+EXPORTED struct auth_state *auth_newstate(const char *identifier)
 {
 struct auth_mech *auth = auth_fromname();
 
 return auth->newstate(identifier);
 }
 
-void auth_freestate(auth_state)
-struct auth_state *auth_state;
+EXPORTED void auth_freestate(struct auth_state *auth_state)
 {
 struct auth_mech *auth = auth_fromname();
 
- auth->freestate(auth_state);
+ if (auth_state) auth->freestate(auth_state);
 }

cyrus-imapd-2.4.17.tar.gz/lib/auth.h -> cyrus-imapd-2.5.tar.gz/lib/auth.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth.h,v 1.19 2010/01/06 17:01:43 murch Exp $
  */
 
 #ifndef INCLUDED_AUTH_H
@@ -50,7 +48,7 @@
 struct auth_mech {
     const char *name;
 
-    char *(*canonifyid)(const char *identifier, size_t len);
+    const char *(*canonifyid)(const char *identifier, size_t len);
     int (*memberof)(struct auth_state *auth_state, 
              const char *identifier);
     struct auth_state *(*newstate)(const char *identifier);
@@ -71,7 +69,7 @@
  *                  failure */
 /* identifier: id to canonify */
 /* len: length of id, or 0 to do strlen(identifier) */
-char *auth_canonifyid(const char *identifier, size_t len);
+const char *auth_canonifyid(const char *identifier, size_t len);
 
 int auth_memberof(struct auth_state *auth_state, 
  	 const char *identifier);

cyrus-imapd-2.4.17.tar.gz/lib/auth_krb.c -> cyrus-imapd-2.5.tar.gz/lib/auth_krb.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth_krb.c,v 1.46 2010/01/06 17:01:43 murch Exp $
 */
 
 #include <config.h>
@@ -100,9 +98,7 @@
 *	2	User is in the group that is identifier
 *	3	User is identifer
 */
-static int mymemberof(auth_state, identifier)
-struct auth_state *auth_state;
-const char *identifier;
+static int mymemberof(struct auth_state *auth_state, const char *identifier)
 {
 char anameANAME_SZ;
 char instINST_SZ;
@@ -142,10 +138,7 @@
 * MAX_K_NAME_SZ. Returns 1 on success, 0 on failure.
 */
 static int
-parse_krbequiv_line(src, principal, localuser)
-const char *src;
-char *principal;
-char *localuser;
+parse_krbequiv_line(const char *src, char *principal, char *localuser)
 {
 int i;
 
@@ -251,9 +244,7 @@
 * Returns a pointer to a static buffer containing the canonical form
 * or NULL if 'identifier' is invalid.
 */
-static char *mycanonifyid(identifier, len)
-const char *identifier;
-size_t len;
+static const char *mycanonifyid(const char *identifier, size_t len)
 {
 static char retbufMAX_K_NAME_SZ+1;
 char anameANAME_SZ;
@@ -318,8 +309,7 @@
 * points to a 16-byte binary key to cache identifier's information
 * with.
 */
-static struct auth_state *mynewstate(identifier)
-const char *identifier;
+static struct auth_state *mynewstate(const char *identifier)
 {
 struct auth_state *newstate;
 
@@ -335,8 +325,7 @@
 return newstate;
 }
 
-static void myfreestate(auth_state)
-struct auth_state *auth_state;
+static void myfreestate(struct auth_state *auth_state)
 {
 free((char *)auth_state);
 }
@@ -351,7 +340,7 @@
 	return 0;
 }
 
-static char *mycanonifyid(
+static const char *mycanonifyid(
 const char *identifier __attribute__((unused)), 
 size_t len __attribute__((unused)))
 {
@@ -374,7 +363,7 @@
 
 #endif
 
-struct auth_mech auth_krb = 
+HIDDEN struct auth_mech auth_krb =
 {
 "krb",		/* name */

cyrus-imapd-2.4.17.tar.gz/lib/auth_krb5.c -> cyrus-imapd-2.5.tar.gz/lib/auth_krb5.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth_krb5.c,v 1.8 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
@@ -59,8 +57,6 @@
 
 #include <krb5.h>
 
-#include "auth.h"
-
 struct auth_state {
 char *userid; /* Canonified Userid */
 };
@@ -75,7 +71,7 @@
 */
 static int mymemberof(struct auth_state *auth_state, const char *identifier)
 {
- char *ident;
+ const char *ident;
 int ret=0;
 
 if (strcmp(identifier,"anyone") == 0) return 1;
@@ -86,7 +82,7 @@
 
 ident = auth_canonifyid(identifier,0);
 
- if(!strcmp(ident, auth_state->userid)) {
+ if (!strcmp(ident, auth_state->userid)) {
 	ret = 3;
 }
 
@@ -98,7 +94,7 @@
 * Returns a pointer to a static buffer containing the canonical form
 * or NULL if 'identifier' is invalid.
 */
-static char *mycanonifyid(const char *identifier, size_t len)
+static const char *mycanonifyid(const char *identifier, size_t len)
 {
 static char *retbuf = NULL;
 krb5_context context;
@@ -181,7 +177,8 @@
 static struct auth_state *mynewstate(const char *identifier)
 {
 struct auth_state *newstate;
- char *ident;
+ const char *ident;
+
 ident = auth_canonifyid(identifier, 0);
 if (!ident) return NULL;
 
@@ -209,7 +206,7 @@
 	return 0;
 }
 
-static char *mycanonifyid(
+static const char *mycanonifyid(
 const char *identifier __attribute__((unused)), 
 size_t len __attribute__((unused)))
 {
@@ -232,7 +229,7 @@
 
 #endif
 
-struct auth_mech auth_krb5 = 
+HIDDEN struct auth_mech auth_krb5 =
 {
 "krb5",		/* name */

cyrus-imapd-2.4.17.tar.gz/lib/auth_pts.c -> cyrus-imapd-2.5.tar.gz/lib/auth_pts.c Changed

@@ -38,14 +38,13 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth_pts.c,v 1.16 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -54,18 +53,15 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 
-#include "auth.h"
 #include "auth_pts.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "libcyr_cfg.h"
-#include "cyr_lock.h"
 #include "retry.h"
 #include "strhash.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 static char *canonuser_id = NULL;
 static struct auth_state *canonuser_cache = NULL;
@@ -77,8 +73,8 @@
 #define TS_WRITE 2
 #define TS_RW 3
 
-static int
-timeout_select (int sock, int op, int sec) {
+static int timeout_select(int sock, int op, int sec)
+{
 struct timeval tv;
 int r;
 fd_set rfds, wfds, *rp, *wp;
@@ -123,8 +119,8 @@
 }
 
 
-static int
-nb_connect(int s, struct sockaddr *sa, socklen_t slen, int sec) {
+static int nb_connect(int s, struct sockaddr *sa, socklen_t slen, int sec)
+{
 int flags, r, rc=0;
 
 if ((flags = fcntl(s, F_GETFL,0)) == -1) {
@@ -226,7 +222,7 @@
 * Returns a pointer to a static buffer containing the canonical form
 * or NULL if 'identifier' is invalid.
 */
-static char *mycanonifyid(const char *identifier,
+static const char *mycanonifyid(const char *identifier,
 		 size_t len __attribute__((unused)))
 {
 static char retbufPTS_DB_KEYSIZE;
@@ -328,7 +324,7 @@
 return output;
 }
 
-static struct cyrusdb_backend *the_ptscache_db = NULL;
+static const char *the_ptscache_db = NULL;
 
 /* Returns 0 on success */
 static int ptload(const char *identifier, struct auth_state **state) 
@@ -336,7 +332,7 @@
 struct auth_state *fetched = NULL;
 size_t id_len;
 const char *data = NULL;
- int dsize;
+ size_t dsize;
 const char *fname = NULL;
 char *tofree = NULL;
 struct db *ptdb;
@@ -352,8 +348,7 @@
 
 /* xxx this sucks, but it seems to be the only way to satisfy the linker */
 if(the_ptscache_db == NULL) {
-	the_ptscache_db =
-	 cyrusdb_fromname(libcyrus_config_getstring(CYRUSOPT_PTSCACHE_DB));
+	the_ptscache_db = libcyrus_config_getstring(CYRUSOPT_PTSCACHE_DB);
 }
 
 if(!state || *state) {
@@ -366,7 +361,7 @@
 	tofree = strconcat(config_dir, PTS_DBFIL, (char *)NULL);
 	fname = tofree;
 }
- r = (the_ptscache_db->open)(fname, CYRUSDB_CREATE, &ptdb);
+ r = cyrusdb_open(the_ptscache_db, fname, CYRUSDB_CREATE, &ptdb);
 if (r != 0) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
 	 cyrusdb_strerror(ret));
@@ -385,7 +380,7 @@
 }
 
 /* fetch the current record for the user */
- r = the_ptscache_db->fetch(ptdb, identifier, id_len,
+ r = cyrusdb_fetch(ptdb, identifier, id_len,
 			 &data, &dsize, NULL);
 if (r && r != CYRUSDB_NOTFOUND) {
 syslog(LOG_ERR, "auth_newstate: error fetching record: %s",
@@ -483,7 +478,7 @@
 }
 
 /* fetch the current record for the user */
- r = the_ptscache_db->fetch(ptdb, identifier, id_len, 
+ r = cyrusdb_fetch(ptdb, identifier, id_len, 
 			 &data, &dsize, NULL);
 if (r != 0 || !data) {
 	syslog(LOG_ERR, "ptload(): error fetching record: %s"
@@ -511,7 +506,7 @@
 }
 
 /* close and unlock the database */
- (the_ptscache_db->close)(ptdb);
+ (cyrusdb_close)(ptdb);
 
 return rc;
 }
@@ -521,7 +516,7 @@
 free(auth_state);
 }
 
-struct auth_mech auth_pts = 
+HIDDEN struct auth_mech auth_pts =
 {
 "pts",		/* name */

cyrus-imapd-2.4.17.tar.gz/lib/auth_pts.h -> cyrus-imapd-2.5.tar.gz/lib/auth_pts.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/auth_unix.c -> cyrus-imapd-2.5.tar.gz/lib/auth_unix.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: auth_unix.c,v 1.53 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
@@ -52,16 +50,16 @@
 #include "auth.h"
 #include "libcyr_cfg.h"
 #include "xmalloc.h"
+#include "strarray.h"
 #include "util.h"
 
 struct auth_state {
 char userid81;
- char **group;
- int ngroups;
+ strarray_t groups;
 };
 
 static struct auth_state auth_anonymous = {
- "anonymous", 0, 0
+ "anonymous", STRARRAY_INITIALIZER
 };
 
 /*
@@ -72,9 +70,7 @@
 *	2	User is in the group that is identifier
 *	3	User is identifer
 */
-static int mymemberof(auth_state, identifier)
-struct auth_state *auth_state;
-const char *identifier;
+static int mymemberof(struct auth_state *auth_state, const char *identifier)
 {
 int i;
 
@@ -86,8 +82,8 @@
 
 if (strncmp(identifier, "group:", 6) != 0) return 0;
 
- for (i=0; i<auth_state->ngroups; i++) {
-	if (strcmp(identifier+6, auth_state->groupi) == 0) return 2;
+ for (i=0; i<auth_state->groups.count ; i++) {
+	if (strcmp(identifier+6, auth_state->groups.datai) == 0) return 2;
 }
 return 0;
 }
@@ -151,18 +147,15 @@
 * representations: one for getpwent calls and one for folder names. The
 * latter canonicalizes to a MUTF7 representation.
 */
-static char *mycanonifyid(identifier, len)
-const char *identifier;
-size_t len;
+static const char *mycanonifyid(const char *identifier, size_t len)
 {
 static char retbuf81;
 struct group *grp;
- char sawalpha;
 char *p;
 int username_tolower = 0;
 
- if(!len) len = strlen(identifier);
- if(len >= sizeof(retbuf)) return NULL;
+ if (!len) len = strlen(identifier);
+ if (len >= sizeof(retbuf)) return NULL;
 
 memmove(retbuf, identifier, len);
 retbuflen = '\0';
@@ -189,28 +182,18 @@
 * Lowercase usernames if requested.
 */
 username_tolower = libcyrus_config_getswitch(CYRUSOPT_USERNAME_TOLOWER);
- sawalpha = 0;
- for(p = retbuf; *p; p++) {
+ for (p = retbuf; *p; p++) {
 	if (username_tolower && Uisupper(*p))
 	 *p = tolower((unsigned char)*p);
 
 	switch (allowedchars*(unsigned char*) p) {
 	case 0:
 	 return NULL;
-	 
-	case 2:
-	 sawalpha = 1;
-	 /* FALL THROUGH */
-	 
 	default:
-	 ;
+	 break;
 	}
 }
 
- /* we used to enforce "has to be one alpha char" */
- /* now we don't */
- /* if (!sawalpha) return NULL; */
-
 return retbuf;
 }
 
@@ -226,7 +209,7 @@
 struct group *grp;
 #if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
 gid_t gid, *groupids = NULL;
- int ret, ngroups = 10;
+ int ret, ngroups = 10, oldngroups;
 #else
 char **mem;
 #endif
@@ -238,8 +221,7 @@
 newstate = (struct auth_state *)xmalloc(sizeof(struct auth_state));
 
 strcpy(newstate->userid, identifier);
- newstate->ngroups = 0;
- newstate->group = NULL;
+ strarray_init(&newstate->groups);
 
 if(!libcyrus_config_getswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE))
 	return newstate;
@@ -254,29 +236,22 @@
 	groupids = (gid_t *)xrealloc((gid_t *)groupids,
 				 ngroups * sizeof(gid_t));
 
-	newstate->ngroups = ngroups; /* copy of ngroups for comparision */
+	oldngroups = ngroups; /* copy of ngroups for comparision */
 	ret = getgrouplist(identifier, gid, groupids, &ngroups);
 	/*
 	 * This is tricky. We do this as long as getgrouplist tells us to
 	 * realloc _and_ the number of groups changes. It tells us to realloc
 	 * also in the case of failure...
 	 */
- } while (ret == -1 && ngroups != newstate->ngroups);
+ } while (ret == -1 && ngroups != oldngroups);
 
- if (ret == -1) {
-	newstate->ngroups = 0;
-	newstate->group = NULL;
+ if (ret == -1)
 	goto err;
- }
 
- newstate->ngroups = 0;
- newstate->group = (char **)xmalloc(ngroups * sizeof(char *));
 while (ngroups--) {
 	if (pwd || groupidsngroups != gid) {
-	 if ((grp = getgrgid(groupidsngroups))) {
-		newstate->ngroups++;
-		newstate->groupnewstate->ngroups-1 = xstrdup(grp->gr_name);
-	 }
+	 if ((grp = getgrgid(groupidsngroups)))
+		strarray_append(&newstate->groups, grp->gr_name);
 	}
 }
 
@@ -290,12 +265,8 @@
 	 if (!strcmp(*mem, identifier)) break;
 	}
 
-	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-	 newstate->ngroups++;
-	 newstate->group = (char **)xrealloc((char *)newstate->group,
-						newstate->ngroups * sizeof(char *));
-	 newstate->groupnewstate->ngroups-1 = xstrdup(grp->gr_name);
-	}
+	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid))
+	 strarray_append(&newstate->groups, grp->gr_name);
 }
 endgrent();
 #endif /* HAVE_GETGROUPLIST */
@@ -303,20 +274,14 @@
 return newstate;
 }
 
-static void myfreestate(auth_state)
-struct auth_state *auth_state;
+static void myfreestate(struct auth_state *auth_state)
 {
- if (auth_state->group) {
-	while (auth_state->ngroups) {
-	 free((char *)auth_state->group--auth_state->ngroups);
-	}
-	free((char *)auth_state->group);
- }
- free((char *)auth_state);
+ strarray_fini(&auth_state->groups);
+ free(auth_state);
 }
 
 
-struct auth_mech auth_unix = 
+HIDDEN struct auth_mech auth_unix =
 {
 "unix",		/* name */

cyrus-imapd-2.5.tar.gz/lib/bitvector.c Added

@@ -0,0 +1,311 @@
+/* bitvector.c -- bit vector functions
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "xmalloc.h"
+#include "bitvector.h"
+#include "util.h"
+
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+
+#define BITS_PER_UNIT	8
+#define vidx(x)		((x) >> 3)
+#define visaligned(x)	(!((x) & 0x7))
+#define vmask(x)	(1 << ((x) & 0x7))
+#define vtailmask(x)	((unsigned char)(0xff << ((x) & 0x7)))
+#define vlen(x)		vidx((x)+7)
+#define QUANTUM		(256)
+
+EXPORTED void bv_init(bitvector_t *bv)
+{
+ memset(bv, 0, sizeof(*bv));
+}
+
+/* Ensure that the array contains enough memory for @len
+ * bits, expanding the bitvector if necessary */
+static void bv_ensure(bitvector_t *bv, unsigned int len)
+{
+ len = vlen(len);	 /* now number of bytes */
+ if (len > bv->alloc) {
+	unsigned int newalloc = ((len + QUANTUM-1) / QUANTUM) * QUANTUM;
+	bv->bits = (unsigned char *)xrealloc(bv->bits, newalloc);
+	memset(bv->bits + bv->alloc, 0, newalloc - bv->alloc);
+	bv->alloc = newalloc;
+ }
+}
+
+EXPORTED void bv_setsize(bitvector_t *bv, unsigned int len)
+{
+ bv_ensure(bv, len);
+ if (len < bv->length) {
+	/* shrinking - need to clear old bits */
+	memset(bv->bits+vlen(len), 0, vlen(bv->length) - vlen(len));
+	bv->bitsvidx(len) &= ~vtailmask(len);
+ }
+ bv->length = len;
+}
+
+EXPORTED void bv_prealloc(bitvector_t *bv, unsigned int len)
+{
+ bv_ensure(bv, len);
+}
+
+EXPORTED void bv_copy(bitvector_t *to, const bitvector_t *from)
+{
+ bv_setsize(to, from->length);
+ memcpy(to->bits, from->bits, vlen(from->length));
+}
+
+EXPORTED void bv_clearall(bitvector_t *bv)
+{
+ if (bv->length)
+	memset(bv->bits, 0, vlen(bv->length));
+}
+
+EXPORTED void bv_setall(bitvector_t *bv)
+{
+ if (bv->length)
+	memset(bv->bits, 0xff, vlen(bv->length));
+}
+
+EXPORTED int bv_isset(const bitvector_t *bv, unsigned int i)
+{
+ if (i >= bv->length)
+	return 0;
+ return !!(bv->bitsvidx(i) & vmask(i));
+}
+
+EXPORTED void bv_set(bitvector_t *bv, unsigned int i)
+{
+ bv_ensure(bv, i+1);
+ bv->bitsvidx(i) |= vmask(i);
+ if (i >= bv->length)
+	bv->length = i+1;
+}
+
+EXPORTED void bv_clear(bitvector_t *bv, unsigned int i)
+{
+ if (i < bv->length) {
+	bv_ensure(bv, i+1);
+	bv->bitsvidx(i) &= ~vmask(i);
+ }
+}
+
+EXPORTED void bv_andeq(bitvector_t *a, const bitvector_t *b)
+{
+ unsigned int n;
+ unsigned int i;
+
+ bv_ensure(a, b->length);
+ if (!a->length)
+	return;
+ n = vlen(b->length+1);
+ for (i = 0 ; i <= n ; i++)
+	a->bitsi &= b->bitsi;
+ n = vlen(a->length);
+ for ( ; i <= n ; i++)
+	a->bitsi = 0;
+ a->length = MAX(a->length, b->length);
+}
+
+EXPORTED void bv_oreq(bitvector_t *a, const bitvector_t *b)
+{
+ unsigned int n;
+ unsigned int i;
+
+ bv_ensure(a, b->length);
+ n = vlen(b->length+1);
+ for (i = 0 ; i <= n ; i++)
+	a->bitsi |= b->bitsi;
+ a->length = MAX(a->length, b->length);
+}
+
+/*
+ * Returns the bit position of the next set bit which is after or equal
+ * to position 'start'. Passing start = 0 returns the first set bit.
+ * Returns a bit position or -1 if there are no more set bits.
+ */
+EXPORTED int bv_next_set(const bitvector_t *bv, int start)
+{
+ int i;
+
+ if (start < 0 || start >= (int)bv->length) return -1;
+
+ for (i = start ; i < (int)bv->length && !visaligned(i) ; i++)
+	if (bv->bitsvidx(i) & vmask(i))
+	 return i;
+
+ while (i < (int)bv->length) {
+	if (!bv->bitsvidx(i)) {
+	 i += BITS_PER_UNIT;
+	}
+	else {
+	 if (bv->bitsvidx(i) & vmask(i))
+		return i;
+	 i++;
+	}
+ }
+
+ return -1;
+}
+
+/*
+ * Returns the bit position of the previous set bit which is before or
+ * equal to position 'start'. Passing start = bv->vector-1 returns the
+ * last set bit. Returns a bit position or -1 if there are no more set
+ * bits.
+ */
+EXPORTED int bv_prev_set(const bitvector_t *bv, int start)
+{
+ int i;
+
+ if (start < 0 || start >= (int)bv->length) return -1;
+
+ for (i = start ; i < (int)bv->length && !visaligned(i) ; i--)
+	if (bv->bitsvidx(i) & vmask(i))
+	 return i;
+
+ while (i >= 0) {
+	if (!bv->bitsvidx(i)) {
+	 i -= BITS_PER_UNIT;
+	}
+	else {
+	 if (bv->bitsvidx(i) & vmask(i))
+		return i;
+	 i--;
+	}
+ }
+
+ return -1;
+}
+
+EXPORTED int bv_first_set(const bitvector_t *bv)
+{
+ return bv_next_set(bv, 0);
+}
+
+EXPORTED int bv_last_set(const bitvector_t *bv)
+{
+ return bv_prev_set(bv, bv->length-1);
+}
+
+static unsigned int bitcount(unsigned int i)
+{
+ /* http://stackoverflow.com/questions/109023/how-to-count-the-number-of-set-bits-in-a-32-bit-integer */
+ i = i - ((i >> 1) & 0x55555555);
+ i = (i & 0x33333333) + ((i >> 2) & 0x33333333);
+ return (((i + (i >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
+}
+
+EXPORTED unsigned bv_count(const bitvector_t *bv)
+{
+ unsigned i;
+ unsigned int n = 0;
+
+ for (i = 0 ; i < bv->length ; i += BITS_PER_UNIT)
+	n += bitcount(bv->bitsvidx(i));
+ return n;
+}
+
+/* Returns a string which describes the state of the bitvector,
+ * useful for debugging. Returns a new string which must be free'd
+ * by the caller */
+EXPORTED char *bv_cstring(const bitvector_t *bv)
+{
+ struct buf buf = BUF_INITIALIZER;
+ unsigned int i;
+ unsigned int first = ~0U;
+ unsigned int last;
+ const char *sep = "";
+
+ if (bv->length) {
+	buf_truncate(&buf, vlen(bv->length)*2);
+	bin_to_hex(bv->bits, vlen(bv->length), buf.s, 0);
+ }
+
+ buf_putc(&buf, '');
+
+ for (i = 0 ; i < bv->length ; i++) {
+	if (bv->bitsvidx(i) & vmask(i)) {
+	 if (first == ~0U)
+		first = i;
+	}
+	else if (first != ~0U) {
+	 last = i-1;
+	 if (first == last)
+		buf_printf(&buf, "%s%u", sep, first);
+	 else
+		buf_printf(&buf, "%s%u-%u", sep, first, last);
+	 sep = ",";
+	 first = ~0U;
+	}
+ }
+
+ if (first != ~0U) {
+	last = bv->length-1;
+	if (first == last)
+	 buf_printf(&buf, "%s%u", sep, first);
+	else
+	 buf_printf(&buf, "%s%u-%u", sep, first, last);
+ }
+
+ buf_putc(&buf, '');
+ return buf_release(&buf);
+}
+
+EXPORTED void bv_free(bitvector_t *bv)
+{
+ if (bv->alloc)
+	free(bv->bits);
+ bv->length = 0;
+ bv->alloc = 0;
+ bv->bits = NULL;
+}
+
+

cyrus-imapd-2.5.tar.gz/lib/bitvector.h Added

@@ -0,0 +1,82 @@
+/* bitvector.h -- bit vector functions
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS_LIB_BITVECTOR_H__
+#define __CYRUS_LIB_BITVECTOR_H__
+
+#include <config.h>
+#include <sys/types.h>
+#include <limits.h>
+
+typedef struct bitvector bitvector_t;
+
+struct bitvector
+{
+ unsigned int length;
+ unsigned int alloc;
+ /* TODO: should use natural word size, uint32_t or uint64_t,
+ * for faster searching in bv_next_set() */
+ unsigned char *bits;
+};
+
+#define BV_INITIALIZER	{ 0, 0, NULL }
+
+extern void bv_init(bitvector_t *);
+extern void bv_setsize(bitvector_t *, unsigned int i);
+extern void bv_prealloc(bitvector_t *, unsigned int);
+extern void bv_copy(bitvector_t *to, const bitvector_t *from);
+extern void bv_clearall(bitvector_t *);
+extern void bv_setall(bitvector_t *);
+extern int bv_isset(const bitvector_t *, unsigned int);
+extern void bv_set(bitvector_t *, unsigned int);
+extern void bv_clear(bitvector_t *, unsigned int);
+extern void bv_andeq(bitvector_t *a, const bitvector_t *b);
+extern void bv_oreq(bitvector_t *a, const bitvector_t *b);
+extern int bv_next_set(const bitvector_t *, int start);
+extern int bv_prev_set(const bitvector_t *, int start);
+extern int bv_first_set(const bitvector_t *);
+extern int bv_last_set(const bitvector_t *);
+extern unsigned bv_count(const bitvector_t *);
+extern char *bv_cstring(const bitvector_t *);
+extern void bv_free(bitvector_t *);
+
+#endif /* __CYRUS_LIB_BITVECTOR_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/bsearch.c -> cyrus-imapd-2.5.tar.gz/lib/bsearch.c Changed

@@ -38,15 +38,13 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bsearch.c,v 1.24 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
 #include <string.h>
 
 #include "bsearch.h"
-#include "util.h"		/* TOLOWER and convert_to_lowercase */
+#include "util.h"
 
 /* Case-dependent comparison converter.
 * Treats \r and \t as end-of-string and treats '.' lower than
@@ -89,10 +87,9 @@
 };
 
 /*
- * Search for a line starting with 'word'. The search ignores case if
- * 'caseSensitive' is nonzero. The search is performed in 'base',
- * which is of length 'len'. 'hint' gives a idea of where to start
- * looking.
+ * Search for a line starting with 'word'. The search respects case.
+ * The search is performed in 'base', which is of length 'len'.
+ * 'hint' gives a idea of where to start looking.
 *
 * On success, the offset in 'base' of the found line is returned and
 * the length of the found line is put in the unsigned long pointed to
@@ -100,12 +97,11 @@
 * be inserted is returned and zero is put in the unsigned long pointed to
 * by 'linelenp'.
 */
-int bsearch_mem(const char *word,
-		int caseSensitive,
-		const char *base,
-		unsigned long len,
-		unsigned long hint,
-		unsigned long *linelenp)
+HIDDEN int bsearch_mem_mbox(const char *word,
+		 const char *base,
+		 unsigned long len,
+		 unsigned long hint,
+		 unsigned long *linelenp)
 {
 int firstsearch = 1;
 unsigned long start = 0, end = len - 1, mid, offset;
@@ -148,29 +144,15 @@
 	wordp = word;
 	p = base+offset;
 
-	if (caseSensitive) {
-	 while (n-- > 0 && (cmp = TOCOMPARE(*wordp) - TOCOMPARE(*p)) == 0) {
-		wordp++;
-		p++;
-	 }
-	 if (n >= 0 && !*wordp) {
-		cmp = TOCOMPARE('\t') - TOCOMPARE(*p);
-	 }
-	 else if (!cmp) {
-		cmp = 1;
-	 }
+	while (n-- > 0 && (cmp = TOCOMPARE(*wordp) - TOCOMPARE(*p)) == 0) {
+	 wordp++;
+	 p++;
 	}
-	else {
-	 while (n-- > 0 && (cmp = TOLOWER(*wordp) - TOLOWER(*p)) == 0) {
-		wordp++;
-		p++;
-	 }
-	 if (n >= 0 && !*wordp) {
-		cmp = TOLOWER('\t') - TOLOWER(*p);
-	 }
-	 else if (!cmp) {
-		cmp = 1;
-	 }
+	if (n >= 0 && !*wordp) {
+	 cmp = TOCOMPARE('\t') - TOCOMPARE(*p);
+	}
+	else if (!cmp) {
+	 cmp = 1;
 	}
 
 	if (!cmp) {
@@ -195,7 +177,7 @@
 return p - base + 1;
 }
 
-int bsearch_compare(const char *s1, const char *s2)
+EXPORTED int bsearch_compare_mbox(const char *s1, const char *s2)
 {
 int cmp;
 char c2;
@@ -214,7 +196,7 @@
 }
 }
 
-int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2)
+HIDDEN int bsearch_ncompare_mbox(const char *s1, int l1, const char *s2, int l2)
 {
 int min = l1 < l2 ? l1 : l2;
 int cmp = 0;
@@ -232,3 +214,43 @@
 }
 }
 
+/* direct from the qsort manpage */
+EXPORTED int cmpstringp_raw(const void *p1, const void *p2)
+{
+ /* The actual arguments to this function are "pointers to
+ pointers to char", but strcmp(3) arguments are "pointers
+ to char", hence the following cast plus dereference */
+
+ return strcmpsafe(* (char * const *) p1, * (char * const *) p2);
+}
+
+EXPORTED int cmpstringp_mbox(const void *p1, const void *p2)
+{
+ const char *s1 = *((const char **)p1);
+ const char *s2 = *((const char **)p2);
+ int cmp = 0;
+
+ while (*s1 && *s2 && (cmp = TOCOMPARE(*s1) - TOCOMPARE(*s2)) == 0) {
+ s1++;
+ s2++;
+ }
+
+ return cmp;
+}
+
+
+HIDDEN int bsearch_ncompare_raw(const char *s1, int l1, const char *s2, int l2)
+{
+ int min = l1 < l2 ? l1 : l2;
+ int r = memcmp(s1, s2, min);
+
+ if (!r) {
+	if (l1 > l2)
+	 r = 1;
+	else if (l2 > l1)
+	 r = -1;
+ }
+
+ return r;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/bsearch.h -> cyrus-imapd-2.5.tar.gz/lib/bsearch.h Changed

@@ -38,20 +38,23 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bsearch.h,v 1.10 2010/01/06 17:01:44 murch Exp $
  */
 
 #ifndef INCLUDED_BSEARCH_H
 #define INCLUDED_BSEARCH_H
 
-extern int bsearch_mem(const char *word, int caseSensitive,
-		       const char *base, unsigned long len,
-		       unsigned long hint,
-		       unsigned long *linelenp);
+extern int bsearch_mem_mbox(const char *word,
+			    const char *base, unsigned long len,
+			    unsigned long hint,
+			    unsigned long *linelenp);
+
+extern int bsearch_compare_mbox(const char *s1, const char *s2);
+
+extern int bsearch_ncompare_mbox(const char *s1, int l1, const char *s2, int l2);
 
-extern int bsearch_compare(const char *s1, const char *s2);
+extern int bsearch_ncompare_raw(const char *s1, int l1, const char *s2, int l2);
 
-extern int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2);
+extern int cmpstringp_raw(const void *p1, const void *p2);
+extern int cmpstringp_mbox(const void *p1, const void *p2);
 
 #endif /* INCLUDED_BSEARCH_H */

cyrus-imapd-2.4.17.tar.gz/lib/byteorder64.c -> cyrus-imapd-2.5.tar.gz/lib/byteorder64.c Changed

@@ -38,16 +38,12 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: byteorder64.c,v 1.5 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
 #include "byteorder64.h"
 
-#if defined(HAVE_LONG_LONG_INT)
-
-#if !defined(WORDS_BIGENDIAN)
+#ifdef CYRUS_BYTESWAP
 
 #include <netinet/in.h>
 
@@ -63,7 +59,7 @@
 * The macro htonll() is defined in byteorder64.h,
 * and if needed refers to _htonll() here.
 */
-unsigned long long _htonll(unsigned long long x)
+EXPORTED unsigned long long _htonll(unsigned long long x)
 {
 union byteswap_64_u u1;
 union byteswap_64_u u2;
@@ -83,7 +79,7 @@
 * The macro ntohll() is defined in byteorder64.h, and if needed,
 * refers to _ntohll() here.
 */
-unsigned long long _ntohll(unsigned long long x)
+EXPORTED unsigned long long _ntohll(unsigned long long x)
 {
 union byteswap_64_u u1;
 union byteswap_64_u u2;
@@ -96,22 +92,20 @@
 return u2.a;
 }
 
-#endif /* !defined(WORDS_BIGENDIAN) */
+#endif /* CYRUS_BYTESWAP */
 
 #include <string.h>
 
-void *align_htonll(void *dst, unsigned long long src)
+EXPORTED void *align_htonll(void *dst, unsigned long long src)
 {
 unsigned long long tmp = htonll(src);
 return memcpy(dst, (void *) &tmp, sizeof(unsigned long long));
 }
 
-unsigned long long align_ntohll(const void *src)
+EXPORTED unsigned long long align_ntohll(const void *src)
 {
 unsigned long long dst;
 
 memcpy((void *) &dst, src, sizeof(unsigned long long));
 return ntohll(dst);
 }
-
-#endif /* defined(HAVE_LONG_LONG_INT) */

cyrus-imapd-2.4.17.tar.gz/lib/byteorder64.h -> cyrus-imapd-2.5.tar.gz/lib/byteorder64.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: byteorder64.h,v 1.5 2010/01/06 17:01:44 murch Exp $
 */
 
 #ifndef _BYTEORDER64_H
@@ -47,25 +45,42 @@
 
 #include <config.h>
 
-#ifdef HAVE_LONG_LONG_INT
+/* http://stackoverflow.com/a/4410728/94253 */
+
+#if defined(__linux__)
+# include <endian.h>
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+# include <sys/endian.h>
+#elif defined(__OpenBSD__)
+# include <sys/types.h>
+# define be16toh(x) betoh16(x)
+# define be32toh(x) betoh32(x)
+# define be64toh(x) betoh64(x)
+#endif
 
 /* 64-bit host/network byte-order swap macros */
-#ifdef WORDS_BIGENDIAN
-#define htonll(x) (x)
-#define ntohll(x) (x)
-#else
-#define htonll(x) _htonll(x)
-#define ntohll(x) _ntohll(x)
 
+#if defined (WORDS_BIGENDIAN)
+# define htonll(x) (x)
+# define ntohll(x) (x)
+#else
+# if defined (be64toh) && defined(htobe64)
+# define htonll(x) htobe64(x)
+# define ntohll(x) be64toh(x)
+# else
 /* little-endian 64-bit host/network byte-order swap functions */
+# define CYRUS_BYTESWAP
 extern unsigned long long _htonll(unsigned long long);
 extern unsigned long long _ntohll(unsigned long long);
+# define htonll(x) _htonll(x)
+# define ntohll(x) _ntohll(x)
+# endif
+#endif
+
 
-#endif /* WORDS_BIGENDIAN */
 
 /* 64-bit host/network byte-order swap functions to/from non-aligned buffers */
 extern void *align_htonll(void *dst, unsigned long long src);
 extern unsigned long long align_ntohll(const void *src);
 
-#endif /* HAVE_LONG_LONG_INT */
 #endif /* _BYTEORDER64_H */

cyrus-imapd-2.4.17.tar.gz/lib/charset.c -> cyrus-imapd-2.5.tar.gz/lib/charset.c Changed

@@ -38,12 +38,9 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: charset.c,v 1.55 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -51,22 +48,43 @@
 #include "charset.h"
 #include "xmalloc.h"
 #include "chartable.h"
+#include "hash.h"
+#include "htmlchar.h"
 #include "util.h"
 
-/* unicode canon translations */
-extern const int chartables_translation_multichar;
-extern const unsigned char chartables_translation_block16256;
-extern const unsigned char chartables_translation_block8256;
-extern const int chartables_translation256;
-
-/* named character sets */
-extern const struct charset chartables_charset_table;
-extern const int chartables_num_charsets;
+#define U_REPLACEMENT	0xfffd
+
+#define unicode_isvalid(c) \
+	(!((c >= 0xd800 && c <= 0xdfff) || ((unsigned)c > 0x10ffff)))
+
+char QPSAFECHAR256 = {
+/* control chars are unsafe */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* http://en.wikipedia.org/wiki/Quoted-printable */
+/* All printable ASCII characters (decimal values between 33 and 126) */
+/* may be represented by themselves, except "=" (decimal 61). */
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+/* all high bits are unsafe */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
 
 struct qp_state {
 int isheader;
 int bytesleft;
- int codepoint;
+ unsigned char lastoctet;
 };
 
 struct b64_state {
@@ -74,6 +92,10 @@
 int codepoint;
 };
 
+struct unfold_state {
+ int state;
+};
+
 struct table_state {
 const struct charmap (*curtable)256;
 const struct charmap (*initialtable)256;
@@ -84,7 +106,7 @@
 };
 
 struct canon_state {
- int spacemode;
+ int flags;
 int seenspace;
 };
 
@@ -102,6 +124,42 @@
 size_t offset;
 };
 
+enum html_state {
+ HDATA,
+ HTAGOPEN,
+ HENDTAGOPEN,
+ HTAGNAME,
+ HSCTAG,
+ HTAGPARAMS,
+ HCHARACTER,
+ HCHARACTER2,
+ HCHARACTERHASH,
+ HCHARACTERHEX,
+ HCHARACTERDEC,
+ HSCRIPTDATA,
+ HSCRIPTLT,
+ HSTYLEDATA,
+ HSTYLELT,
+ HBOGUSCOMM,
+ HMUDECOPEN,
+ HCOMMSTART,
+ HCOMMSTARTDASH,
+ HCOMM,
+ HCOMMENDDASH,
+ HCOMMEND,
+ HCOMMENDBANG
+};
+
+struct striphtml_state {
+ struct buf name;
+#define HBEGIN		(1<<0)
+#define HEND		(1<<1)
+ unsigned int ends;
+ /* state stack */
+ int depth;
+ enum html_state stack2;
+};
+
 struct convert_rock;
 
 typedef void convertproc_t(struct convert_rock *rock, int c);
@@ -116,11 +174,14 @@
 
 #define GROWSIZE 100
 
+int charset_debug;
+static const char *convert_name(struct convert_rock *rock);
+
 #define XX 127
 /*
 * Table for decoding hexadecimal in quoted-printable
 */
-static const char index_hex256 = {
+static const unsigned char index_hex256 = {
 XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
 XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
 XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
@@ -163,12 +224,56 @@
 };
 #define CHAR64(c) (index_64(unsigned char)(c))
 
+EXPORTED int encoding_lookupname(const char *s)
+{
+ switch (s0) {
+ case '7':
+	if (!strcasecmp(s, "7BIT"))
+	 return ENCODING_NONE;
+	break;
+ case '8':
+	if (!strcasecmp(s, "8BIT"))
+	 return ENCODING_NONE;
+	break;
+ case 'B':
+ case 'b':
+	if (!strcasecmp(s, "BASE64"))
+	 return ENCODING_BASE64;
+	if (!strcasecmp(s, "BINARY"))
+	 return ENCODING_NONE;
+	break;
+ case 'Q':
+ case 'q':
+	if (!strcasecmp(s, "QUOTED-PRINTABLE"))
+	 return ENCODING_QP;
+	break;
+ }
+ return ENCODING_UNKNOWN;
+}
+
+EXPORTED const char *encoding_name(int encoding)
+{
+ switch (encoding) {
+ case ENCODING_NONE: return "NONE";
+ case ENCODING_QP: return "QUOTED-PRINTABLE";
+ case ENCODING_BASE64: return "BASE64";
+ case ENCODING_UNKNOWN: return "UNKNOWN";
+ default: return "WTF";
+ }
+}
+
 static inline void convert_putc(struct convert_rock *rock, int c)
 {
+ if (charset_debug) {
+	if ((unsigned)c < 0xff)
+	 fprintf(stderr, "%s(0x%x = '%c')\n", convert_name(rock), c, c);
+	else
+	 fprintf(stderr, "%s(0x%x)\n", convert_name(rock), c);
+ }
 rock->f(rock, c);
 }
 
-void convert_cat(struct convert_rock *rock, const char *s)
+static void convert_cat(struct convert_rock *rock, const char *s)
 {
 while (*s) {
 	convert_putc(rock, (unsigned char)*s);
@@ -176,7 +281,7 @@
 }
 }
 
-void convert_catn(struct convert_rock *rock, const char *s, size_t len)
+static void convert_catn(struct convert_rock *rock, const char *s, size_t len)
 {
 while (len-- > 0) {
 	convert_putc(rock, (unsigned char)*s);
@@ -186,37 +291,59 @@
 
 /* convertproc_t conversion functions */
 
-void qp2byte(struct convert_rock *rock, int c) 
+static void qp2byte(struct convert_rock *rock, int c)
 {
 struct qp_state *s = (struct qp_state *)rock->state;
 int val;
 
+ assert(c == U_REPLACEMENT || (unsigned)c <= 0xff);
+
 if (s->bytesleft) {
 	s->bytesleft--;
-	val = HEXCHAR(c);
-	if (val == XX) {
-	 /* mark invalid regardless */
-	 s->codepoint = -1;
+
+	 /* the replacement char is not part of a valid sequence */
+	if (c == U_REPLACEMENT) {
+invalid:
+	 /* RFC2045 says "...A reasonable approach by a robust
+	 * implementation might be to include the "=" character
+	 * and the following character in the decoded data without
+	 * any transformation..." */
+	 convert_putc(rock->next, '=');
+	 if (!s->bytesleft)
+		convert_putc(rock->next, s->lastoctet);
+	 convert_putc(rock->next, c);
+	 s->bytesleft = 0;
 	 return;
 	}
-	if (s->codepoint != -1) {
-	 /* don't blat the invalid marker, but still absorb
-	 * the second char */
-	 s->codepoint = (s->codepoint << 4) + val;
+
+	/* detect and swallow soft line breaks */
+	if (s->bytesleft == 1 && c == '\r') {
+	 s->lastoctet = c;
+	 return;
 	}
+	if (s->bytesleft == 0 && s->lastoctet == '\r') {
+	 if (c == '\n')
+		return;
+	 goto invalid;
+	}
+
+	val = HEXCHAR(c);
+	if (val == XX)
+	 goto invalid;
+	/* if we got this far, we have two valid hex chars */
 	if (!s->bytesleft) {
-	 if (s->codepoint == -1)
-		convert_putc(rock->next, 0xfffd);
-	 else
-		convert_putc(rock->next, s->codepoint & 0xff);
+	 val |= (HEXCHAR(s->lastoctet) << 4);
+	 assert((unsigned)val <= 0xff);
+	 convert_putc(rock->next, val);
 	}
+	s->lastoctet = c;
 	return;
 }
 
 /* start an encoded byte */
 if (c == '=') {
 	s->bytesleft = 2;
-	s->codepoint = 0;
+	s->lastoctet = 0;
 	return;
 }
 
@@ -226,7 +353,7 @@
 convert_putc(rock->next, c);
 }
 
-void b64_2byte(struct convert_rock *rock, int c) 
+static void b64_2byte(struct convert_rock *rock, int c)
 {
 struct b64_state *s = (struct b64_state *)rock->state;
 char b = CHAR64(c);
@@ -256,51 +383,132 @@
 }
 }
 
-void stripnl2uni(struct convert_rock *rock, int c)
+/*
+ * This filter unfolds folded RFC2822 header field lines, i.e. it strips
+ * a CRLF pair only if the first character after the CRLF is LWS, and
+ * leaves other CRLF or lone CR or LF alone. In particular the CRLFs
+ * which *separate* different header fields are preserved. This allows
+ * the 'keep' and 'merge' whitespace options to behave as expected when
+ * the search engine is term-based, i.e. uses whitespace and punctuation
+ * to find indexing terms.
+ */
+static void unfold2uni(struct convert_rock *rock, int c)
 {
- if (c != '\r' && c != '\n')
+ struct unfold_state *s = (struct unfold_state *)rock->state;
+
+ switch (s->state) {
+ case 0:
+	if (c == '\r')
+	 s->state = 1;
+	else
+	 convert_putc(rock->next, c);
+	break;
+ case 1:
+	if (c == '\n')
+	 s->state = 2;
+	else {
+	 convert_putc(rock->next, '\r');
+	 convert_putc(rock->next, c);
+	 s->state = 0;
+	}
+	break;
+ case 2:
+	if (c != ' ' && c != '\t') {
+	 convert_putc(rock->next, '\r');
+	 convert_putc(rock->next, '\n');
+	}
 	convert_putc(rock->next, c);
+	s->state = 0;
+	break;
+ }
 }
 
-void table2uni(struct convert_rock *rock, int c)
+/* Given an octet which is a codepoint in some 7bit or 8bit character
+ * set, or the Unicode replacement character, emit the corresponding
+ * Unicode codepoint. */
+static void table2uni(struct convert_rock *rock, int c)
 {
 struct table_state *s = (struct table_state *)rock->state;
- struct charmap *map = (struct charmap *)&s->curtable0c & 0xff;
+ struct charmap *map;
 
- /* propogate errors */
- if (c == 0xfffd) {
+ if (c == U_REPLACEMENT) {
 	convert_putc(rock->next, c);
 	return;
 }
 
+ assert((unsigned)c <= 0xff);
+ map = (struct charmap *)&s->curtable0c & 0xff;
 if (map->c)
 	convert_putc(rock->next, map->c);
 
 s->curtable = s->initialtable + map->next;
 }
 
-void utf8_2uni(struct convert_rock *rock, int c)
+/* Given an octet in a UTF-8 encoded string, possibly emit a Unicode
+ * code point */
+static void utf8_2uni(struct convert_rock *rock, int c)
 {
 struct table_state *s = (struct table_state *)rock->state;
 
- /* propogate errors */
- if (c == 0xfffd) {
-	convert_putc(rock->next, c);
+ if (c == U_REPLACEMENT) {
+emit_replacement:
+	convert_putc(rock->next, U_REPLACEMENT);
+	s->bytesleft = 0;
+	s->codepoint = 0;
 	return;
 }
 
+ assert((unsigned)c <= 0xff);
+
+ /*
+ * The following bytes are never valid in UTF-8 streams:
+ *
+ * C0-C1	could only be used for overlong encoding of
+ *		basic ASCII characters
+ * F5-FD	start bytes of sequences that could only encode
+ *		numbers larger than the 0x10FFFF limit of Unicode
+ * FE-FF	not valid start bytes or anything else
+ *
+ * Thanks to http://en.wikipedia.org/wiki/UTF-8
+ *
+ * These checks are interspersed with bitwise checks below.
+ *
+ * When we see a valid leading character but a sequence has
+ * not finished, we have detected an ill-formed sequence. The
+ * correct thing to do according to Section 3.9 of the Unicode
+ * standard 6.0 is to jettison the current sequence, emit the
+ * Replacement character and begin a new sequence with the new
+ * character. From the standard:
+ *
+ *	 For example, with the input UTF-8 code unit sequence
+ *	 <C2 41 42>, such a UTF-8 conversion process must not
+ *	 return <U+FFFD> or <U+FFFD, U+0042>, because either of
+ *	 those outputs would be the result of misinterpreting
+ *	 a well-formed subsequence as being part of the ill-formed
+ *	 subsequence. The expected return value for such a process
+ *	 would instead be <U+FFFD, U+0041, U+0042>.
+ */
+
 if ((c & 0xf8) == 0xf0) { /* 11110xxx */
 	/* first of a 4 char sequence */
+	if (s->bytesleft)	/* incomplete sequence */
+	 convert_putc(rock->next, U_REPLACEMENT);
+	if (c >= 0xf5 && c <= 0xf7) goto emit_replacement;
 	s->bytesleft = 3;
 	s->codepoint = c & 0x07; /* 00000111 */
 }
 else if ((c & 0xf0) == 0xe0) { /* 1110xxxx */
 	/* first of a 3 char sequence */
+	if (s->bytesleft)	/* incomplete sequence */
+	 convert_putc(rock->next, U_REPLACEMENT);
 	s->bytesleft = 2;
 	s->codepoint = c & 0x0f; /* 00001111 */
 }
 else if ((c & 0xe0) == 0xc0) { /* 110xxxxx */
 	/* first of a 2 char sequence */
+	if (s->bytesleft)	/* incomplete sequence */
+	 convert_putc(rock->next, U_REPLACEMENT);
+	if (c == 0xc0 || c == 0xc1) goto emit_replacement;
 	s->bytesleft = 1;
 	s->codepoint = c & 0x1f; /* 00011111 */
 }
@@ -310,30 +518,40 @@
 	 s->codepoint = (s->codepoint << 6) + (c & 0x3f); /* 00111111 */
 	 s->bytesleft--;
 	 if (!s->bytesleft) {
-	 convert_putc(rock->next, s->codepoint);
+		convert_putc(rock->next, s->codepoint);
 		s->codepoint = 0;
 	 }
 	}
+	else
+	 goto emit_replacement;
+ }
+ else if (c >= 0xf8 && c <= 0xff) {
+	goto emit_replacement;
 }
 else { /* plain ASCII char */
+	if (s->bytesleft)	/* incomplete sequence */
+	 convert_putc(rock->next, U_REPLACEMENT);
 	convert_putc(rock->next, c);
 	s->bytesleft = 0;
 	s->codepoint = 0;
 }
 }
 
-void utf7_2uni (struct convert_rock *rock, int c)
+/* Given an octet in a UTF-7 encoded string, possibly emit a Unicode
+ * code point */
+static void utf7_2uni (struct convert_rock *rock, int c)
 {
 struct table_state *s = (struct table_state *)rock->state;
 
- /* propogate errors */
- if (c == 0xfffd) {
+ if (c == U_REPLACEMENT) {
 	convert_putc(rock->next, c);
 	return;
 }
 
+ assert((unsigned)c <= 0xff);
+
 if (c & 0x80) { /* skip 8-bit chars */
-	convert_putc(rock->next, 0xfffd);
+	convert_putc(rock->next, U_REPLACEMENT);
 	return;
 }
 
@@ -390,16 +608,21 @@
 }
 }
 
-void uni2searchform(struct convert_rock *rock, int c)
+/*
+ * Given a Unicode codepoint, emit one or more Unicode codepoints in
+ * search-normalised form (having applied recursive Unicode
+ * decomposition, like U+2026 HORIZONTAL ELLIPSIS to the three
+ * characters U+2E U+2E U+2E).
+ */
+static void uni2searchform(struct convert_rock *rock, int c)
 {
 struct canon_state *s = (struct canon_state *)rock->state;
 int i;
 int code;
 unsigned char table16, table8;
 
- /* invalid character becomes a capital X */
- if (c == 0xfffd) {
-	convert_putc(rock->next, 'X');
+ if (c == U_REPLACEMENT) {
+	convert_putc(rock->next, c);
 	return;
 }
 
@@ -429,19 +652,14 @@
 
 /* special case: whitespace or control characters */
 if (code == ' ' || code == '\r' || code == '\n') {
-	switch (s->spacemode) {
-	case 0:
+	if (s->flags & CHARSET_SKIPSPACE) {
 	 return;
-
-	case 1:
+	}
+	if (s->flags & CHARSET_MERGESPACE) {
 	 if (s->seenspace)
 		return;
 	 s->seenspace = 1;
 	 code = ' '; /* one SPACE char */
-	 break;
-
-	default:
-	 break; /* keep it unchanged */
 	}
 }
 else
@@ -455,13 +673,74 @@
 
 /* case - multiple characters */
 for (i = -code; chartables_translation_multichari; i++) {
+	int c = chartables_translation_multichari;
+	/* diacritical character range. This duplicates the
+	 * behaviour of Cyrus versions before 2.5 */
+	if (s->flags & CHARSET_SKIPDIACRIT) {
+	 if ((c & ~0xff) == 0x300)
+		continue;
+	}
 	/* note: whitespace already stripped from multichar sequences... */
-	convert_putc(rock->next, chartables_translation_multichari);
+	convert_putc(rock->next, c);
+ }
+}
+
+/*
+ * Given a Unicode codepoint, emit one or more Unicode codepoints in
+ * HTML form, suitable for generating search snippets.
+ */
+static void uni2html(struct convert_rock *rock, int c)
+{
+ struct canon_state *s = (struct canon_state *)rock->state;
+
+ if (c == U_REPLACEMENT) {
+	convert_putc(rock->next, c);
+	return;
+ }
+
+ if (c == '<') {
+	convert_cat(rock->next, "&lt;");
+	return;
+ }
+
+ if (c == '>') {
+	convert_cat(rock->next, "&gt;");
+	return;
+ }
+
+ if (c == '&') {
+	convert_cat(rock->next, "&amp;");
+	return;
 }
+
+ /* special case: whitespace or control characters */
+ if (c == ' ' || c == '\r' || c == '\n') {
+	if (s->flags & CHARSET_SKIPSPACE) {
+	 return;
+	}
+	if (s->flags & CHARSET_MERGESPACE) {
+	 if (s->seenspace)
+		return;
+	 s->seenspace = 1;
+	 c = ' '; /* one SPACE char */
+	}
+ }
+ else
+	s->seenspace = 0;
+
+ convert_putc(rock->next, c);
 }
 
-void uni2utf8(struct convert_rock *rock, int c)
+/* Given a Unicode codepoint, emit valid UTF-8 encoded octets */
+static void uni2utf8(struct convert_rock *rock, int c)
 {
+ if (!unicode_isvalid(c))
+	c = U_REPLACEMENT;
+
+ /* UTF-8 can encode code points up to 0x7fffffff, but the currently
+ * defined last valid codepoint is 0x10ffff so we only handle that
+ * range. */
+
 if (c > 0xffff) {
 	convert_putc(rock->next, 0xF0 + ((c >> 18) & 0x07));
 	convert_putc(rock->next, 0x80 + ((c >> 12) & 0x3f));
@@ -482,26 +761,26 @@
 }
 }
 
-void byte2search(struct convert_rock *rock, int c)
+static void byte2search(struct convert_rock *rock, int c)
 {
 struct search_state *s = (struct search_state *)rock->state;
 int i, cur;
 unsigned char b = (unsigned char)c;
 
- if (c == 0xfffd) {
-	c = 'X'; /* searchable by invalid character! */
+ if (c == U_REPLACEMENT) {
+	c = 0xff; /* searchable by invalid character! */
 }
 
 /* check our "in_progress" matches to see if they're still valid */
 for (i = 0, cur = 0; i < s->max_start; i++) {
 	/* no more active offsets */
-	if (s->startsi == -1) 
+	if (s->startsi == -1)
 	 break;
 
 	/* if we've passed one that's not ongoing, copy back */
-	if (cur < i) {
+	if (cur < i)
 	 s->startscur = s->startsi;
-	}
+
 	/* check that the substring is still maching */
 	if (b == s->substrs->offset - s->startsi) {
 	 if (s->offset - s->startsi == s->patlen - 1) {
@@ -510,7 +789,7 @@
 	 }
 	 else {
 		/* keep this one, it's ongoing */
-	 	cur++;
+		cur++;
 	 }
 	}
 }
@@ -519,7 +798,7 @@
 	/* have to treat this one specially! */
 	if (s->patlen == 1)
 	 s->havematch = 1;
-	else 
+	else
 	 s->startscur++ = s->offset;
 }
 /* empty out any others that aren't being kept */
@@ -529,21 +808,592 @@
 s->offset++;
 }
 
-void byte2buffer(struct convert_rock *rock, int c)
+/* Given an octet, append it to a buffer */
+static void byte2buffer(struct convert_rock *rock, int c)
 {
 struct buf *buf = (struct buf *)rock->state;
 
 buf_putc(buf, c & 0xff);
 }
 
+/*
+ * The HTML5 standard mandates that certain Unicode code points
+ * cannot be generated using &#nnn; numerical character references,
+ * and should generate a parse error. This function detects them.
+ */
+static int html_uiserror(int c)
+{
+ static const struct {
+	unsigned int mask, lo, hi;
+ } ranges = {
+	{ ~0U, 0x0001, 0x0008 },
+	{ ~0U, 0x000b, 0x000b },
+	{ ~0U, 0x000e, 0x001f },
+	{ ~0U, 0x007f, 0x009f },
+	{ ~0U, 0xfdd0, 0xfdef },
+	{ 0xffff, 0xfffe, 0xffff }
+ };
+ unsigned int i;
+
+ for (i = 0 ; i < VECTOR_SIZE(ranges) ; i++) {
+	unsigned c2 = (unsigned)c & rangesi.mask;
+	if (c2 >= rangesi.lo && c2 <= rangesi.hi)
+	 return 1;
+ }
+ return 0;
+}
+
+static void html_saw_character(struct convert_rock *rock)
+{
+ struct striphtml_state *s = (struct striphtml_state *)rock->state;
+ const char *ent = buf_cstring(&s->name);
+ int c;
+ static const int compat_chars = {
+	/* Mappings of old numeric character codepoints between 0x80 and
+	 * 0x9f inclusive, defined for backwards compatibility by HTML5,
+	 * to Unicode code points. Note that some of these are mapped
+	 * to codepoints which are mandated to be parse errors. */
+	0x20AC, /* EURO SIGN (€) */
+	0x0081, /* <control> */
+	0x201A, /* SINGLE LOW-9 QUOTATION MARK (‚) */
+	0x0192, /* LATIN SMALL LETTER F WITH HOOK (ƒ) */
+	0x201E, /* DOUBLE LOW-9 QUOTATION MARK („) */
+	0x2026, /* HORIZONTAL ELLIPSIS (…) */
+	0x2020, /* DAGGER (†) */
+	0x2021, /* DOUBLE DAGGER (‡) */
+	0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT (ˆ) */
+	0x2030, /* PER MILLE SIGN (‰) */
+	0x0160, /* LATIN CAPITAL LETTER S WITH CARON (Š) */
+	0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK (‹) */
+	0x0152, /* LATIN CAPITAL LIGATURE OE (Œ) */
+	0x008D, /* <control> */
+	0x017D, /* LATIN CAPITAL LETTER Z WITH CARON (Ž) */
+	0x008F, /* <control> */
+	0x0090, /* <control> */
+	0x2018, /* LEFT SINGLE QUOTATION MARK (‘) */
+	0x2019, /* RIGHT SINGLE QUOTATION MARK (’) */
+	0x201C, /* LEFT DOUBLE QUOTATION MARK (“) */
+	0x201D, /* RIGHT DOUBLE QUOTATION MARK (”) */
+	0x2022, /* BULLET (•) */
+	0x2013, /* EN DASH (–) */
+	0x2014, /* EM DASH (—) */
+	0x02DC, /* SMALL TILDE (˜) */
+	0x2122, /* TRADE MARK SIGN (™) */
+	0x0161, /* LATIN SMALL LETTER S WITH CARON (š) */
+	0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (›) */
+	0x0153, /* LATIN SMALL LIGATURE OE (œ) */
+	0x009D, /* <control> */
+	0x017E, /* LATIN SMALL LETTER Z WITH CARON (ž) */
+	0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS (Ÿ) */
+ };
+
+ if (charset_debug)
+	fprintf(stderr, "html_saw_character(%s)\n", ent);
+
+ if (ent0 == '#') {
+	if (ent1 == 'x' || ent1 == 'X')
+	 c = strtoul(ent+2, NULL, 16);
+	else
+	 c = strtoul(ent+1, NULL, 10);
+	/* no need for format error checking, the lexer did that */
+
+	/* Perform character mapping and validation per
+	 * http://dev.w3.org/html5/spec/tokenization.html#consume-a-character-reference
+	 */
+	if (c == 0)
+	 c = U_REPLACEMENT;
+	else if (c >= 0x80 && c <= 0x9f)
+	 c = compat_charsc-0x80;
+	else if (!unicode_isvalid(c))
+	 c = U_REPLACEMENT;	/* invalid Unicode codepoint */
+
+	if (html_uiserror(c)) {
+	 /* the HTML5 spec says this is a parse error, but it's
+	 * unclear what that means for us; we choose to strip the
+	 * character but could also emit the replacement character. */
+	 return;
+	}
+ }
+ else {
+	c = htmlchar_from_string(ent);
+	if (c == -1) {
+	 c = U_REPLACEMENT;	 /* unknown character */
+	}
+	else if (c > 0xffff) {
+	 /* Hack to handle a small minority of named characters
+	 * which map to a sequence of two Unicode codepoints. */
+	 convert_putc(rock->next, (c>>16) & 0xffff);
+	 convert_putc(rock->next, c & 0xffff);
+	 return;
+	}
+ }
+ convert_putc(rock->next, c);
+}
+
+static const char *html_state_as_string(enum html_state state)
+{
+ switch (state) {
+ case HDATA: return "HDATA";
+ case HTAGOPEN: return "HTAGOPEN";
+ case HENDTAGOPEN: return "HENDTAGOPEN";
+ case HTAGNAME: return "HTAGNAME";
+ case HSCTAG: return "HSCTAG";
+ case HTAGPARAMS: return "HTAGPARAMS";
+ case HCHARACTER: return "HCHARACTER";
+ case HCHARACTER2: return "HCHARACTER2";
+ case HCHARACTERHASH: return "HCHARACTERHASH";
+ case HCHARACTERHEX: return "HCHARACTERHEX";
+ case HCHARACTERDEC: return "HCHARACTERDEC";
+ case HSCRIPTDATA: return "HSCRIPTDATA";
+ case HSCRIPTLT: return "HSCRIPTLT";
+ case HSTYLEDATA: return "HSTYLEDATA";
+ case HSTYLELT: return "HSTYLELT";
+ case HBOGUSCOMM: return "HBOGUSCOMM";
+ case HMUDECOPEN: return "HMUDECOPEN";
+ case HCOMMSTART: return "HCOMMSTART";
+ case HCOMMSTARTDASH: return "HCOMMSTARTDASH";
+ case HCOMM: return "HCOMM";
+ case HCOMMENDDASH: return "HCOMMENDDASH";
+ case HCOMMEND: return "HCOMMEND";
+ case HCOMMENDBANG: return "HCOMMENDBANG";
+ }
+ return "wtf?";
+}
+
+static void html_push(struct striphtml_state *s, enum html_state state)
+{
+ assert(s->depth < (int)(sizeof(s->stack)/sizeof(s->stack0)));
+ if (charset_debug)
+	fprintf(stderr, "html_push(%s)\n", html_state_as_string(state));
+ s->stacks->depth++ = state;
+}
+
+static int html_pop(struct striphtml_state *s)
+{
+ assert(s->depth > 0);
+ if (charset_debug)
+	fprintf(stderr, "html_pop()\n");
+ return s->stack--s->depth;
+}
+
+static void html_go(struct striphtml_state *s, enum html_state state)
+{
+ assert(s->depth > 0);
+ if (charset_debug)
+	fprintf(stderr, "html_go(%s)\n", html_state_as_string(state));
+ s->stacks->depth-1 = state;
+}
+
+static enum html_state html_top(struct striphtml_state *s)
+{
+ assert(s->depth > 0);
+ return s->stacks->depth-1;
+}
+
+static int is_phrasing(char *tag)
+{
+ static const char * const phrasing_tags = {
+	"a", "q", "cite", "em", "strong", "small",
+	"mark", "dfn", "abbr", "time", "progress",
+	"meter", "code", "var", "samp", "kbd",
+	"sub", "sup", "span", "i", "b", "bdo",
+	"ruby", "ins", "del"
+ };
+ static struct hash_table hash = HASH_TABLE_INITIALIZER;
+
+ if (hash.table == NULL) {
+	unsigned int i;
+	construct_hash_table(&hash, VECTOR_SIZE(phrasing_tags), 0);
+	for (i = 0 ; i < VECTOR_SIZE(phrasing_tags) ; i++)
+	 hash_insert(phrasing_tagsi, (void *)1, &hash);
+ }
+
+ return (hash_lookup(lcase(tag), &hash) == (void *)1);
+}
+
+static void html_saw_tag(struct convert_rock *rock)
+{
+ struct striphtml_state *s = (struct striphtml_state *)rock->state;
+ char *tag;
+ enum html_state state = html_top(s);
+
+ buf_cstring(&s->name);
+ tag = s->name.s;
+
+ if (charset_debug)
+	fprintf(stderr, "html_saw_tag() state=%s tag=\"%s\" ends=%s,%s\n",
+		html_state_as_string(state), tag,
+		(s->ends & HBEGIN ? "BEGIN" : "-"),
+		(s->ends & HEND ? "END" : "-"));
+
+ /* gnb:TODO: what are we supposed to do with a nested <script> tag? */
+
+ if (!strcasecmp(tag, "script")) {
+	if (state == HDATA && s->ends == HBEGIN)
+	 html_go(s, HSCRIPTDATA);
+	else if (state == HSCRIPTDATA && s->ends == HEND)
+	 html_go(s, HDATA);
+	/* BEGIN,END pair is doesn't affect state */
+ }
+ else if (!strcasecmp(tag, "style")) {
+	if (state == HDATA && s->ends == HBEGIN)
+	 html_go(s, HSTYLEDATA);
+	else if (state == HSTYLEDATA && s->ends == HEND)
+	 html_go(s, HDATA);
+	/* BEGIN,END pair is doesn't affect state */
+ }
+ else if (!is_phrasing(tag)) {
+	convert_putc(rock->next, ' ');
+ }
+ /* otherwise, no change */
+}
+
+/*
+ * Note we don't use isalnum - the test has to be in US-ASCII always
+ * regardless of the charset of the text or the locale of this process
+ */
+#define html_isalpha(c) \
+ (((c) >= 'a' && (c) <= 'z') || \
+ ((c) >= 'A' && (c) <= 'Z'))
+#define html_isxdigit(c) \
+ (((c) >= '0' && (c) <= '9') || \
+ ((c) >= 'a' && (c) <= 'f') || \
+ ((c) >= 'A' && (c) <= 'F'))
+#define html_isdigit(c) \
+ (((c) >= '0' && (c) <= '9'))
+#define html_isspace(c) \
+ ((c) == ' ' || (c) == '\t' || (c) == '\r' || (c) == '\n')
+
+void striphtml2uni(struct convert_rock *rock, int c)
+{
+ struct striphtml_state *s = (struct striphtml_state *)rock->state;
+
+restart:
+ switch (html_top(s)) {
+ case HDATA:
+	if (c == '<') {
+	 html_push(s, HTAGOPEN);
+	 buf_reset(&s->name);
+	}
+	else if (c == '&') {
+	 html_go(s, HCHARACTER);
+	 buf_reset(&s->name);
+	}
+	else {
+	 convert_putc(rock->next, c);
+	}
+	break;
+
+ case HSCRIPTDATA:	 /* 8.2.4.6 Script data state */
+	if (c == '<') {
+	 html_push(s, HSCRIPTLT);
+	}
+	/* else, strip the character */
+	break;
+
+ case HSCRIPTLT:	 /* 8.2.4.17 Script data less-than sign state */
+	/* TODO: deal with <! inside SCRIPT tags properly per
+	 * http://dev.w3.org/html5/spec/tokenization.html#script-data-less-than-sign-state
+	 */
+	if (c == '/') {
+	 s->ends = HEND;
+	 html_go(s, HTAGNAME);
+	 buf_reset(&s->name);
+	}
+	else {
+	 /* naked <, emit it and restart with current character */
+	 convert_putc(rock->next, c);
+	 html_pop(s);
+	 goto restart;
+	}
+	break;
+
+ case HSTYLEDATA:
+	if (c == '<') {
+	 html_push(s, HSTYLELT);
+	}
+	/* else, strip the character */
+	break;
+
+ case HSTYLELT:
+	if (c == '/') {
+	 s->ends = HEND;
+	 html_go(s, HTAGNAME);
+	 buf_reset(&s->name);
+	}
+	else {
+	 /* naked <, emit it and restart with current character */
+	 convert_putc(rock->next, c);
+	 html_pop(s);
+	 goto restart;
+	}
+	break;
+
+ case HCHARACTER:	/* 8.2.4.2 Character reference in data state */
+	/* This is the "consume a character reference" algorithm
+	 * rewritten to use additional lexical states */
+	if (c == '#') {
+	 buf_putc(&s->name, c);
+	 html_go(s, HCHARACTERHASH);
+	}
+	else if (html_isalpha(c)) {
+	 buf_putc(&s->name, c);
+	 html_go(s, HCHARACTER2);
+	}
+	else {
+	 /* naked & - emit the & and restart */
+	 convert_putc(rock->next, '&');
+	 html_go(s, HDATA);
+	 goto restart;
+	}
+	break;
+
+ case HCHARACTERHASH:
+	/* '&' then '#' */
+	if (c == 'x' || c == 'X') {
+	 buf_putc(&s->name, c);
+	 html_go(s, HCHARACTERHEX);
+	}
+	else if (html_isdigit(c)) {
+	 buf_putc(&s->name, c);
+	 html_go(s, HCHARACTERDEC);
+	}
+	else {
+	 /* naked &# - emit the &# and restart */
+	 convert_putc(rock->next, '&');
+	 convert_putc(rock->next, '#');
+	 html_go(s, HDATA);
+	 goto restart;
+	}
+	break;
+
+ case HCHARACTER2:
+	if (html_isalpha(c)) {
+	 buf_putc(&s->name, c);
+	 /* TODO: we're supposed to look this up
+	 * to see if it's an known character so that
+	 * &notit; is parsed as the 4 chars
+	 * '¬' 'i' 't' ';' */
+	}
+	else {
+	 html_saw_character(rock);
+	 html_go(s, HDATA);
+	 if (c != ';') {
+		/* character reference not correctly terminated -
+		 * restart with the next character */
+		goto restart;
+	 }
+	}
+	break;
+
+ case HCHARACTERHEX:
+	if (html_isxdigit(c)) {
+	 buf_putc(&s->name, c);
+	}
+	else {
+	 html_saw_character(rock);
+	 html_go(s, HDATA);
+	 if (c != ';') {
+		/* character reference not correctly terminated -
+		 * restart with the next character */
+		goto restart;
+	 }
+	}
+	break;
+
+ case HCHARACTERDEC:
+	if (html_isdigit(c)) {
+	 buf_putc(&s->name, c);
+	}
+	else {
+	 html_saw_character(rock);
+	 html_go(s, HDATA);
+	 if (c != ';') {
+		/* character reference not correctly terminated -
+		 * restart with the next character */
+		goto restart;
+	 }
+	}
+	break;
+
+ case HTAGOPEN: /* 8.2.4.8 Tag open state */
+	if (c == '!') {
+	 /* markup declaration open delimiter - let's just assume
+	 * it's a comment */
+	 html_pop(s);
+	 html_go(s, HMUDECOPEN);
+	 buf_reset(&s->name);
+	}
+	else if (c == '/') {
+	 html_go(s, HENDTAGOPEN);
+	}
+	else if (html_isalpha(c)) {
+	 s->ends = HBEGIN;
+	 buf_putc(&s->name, c);
+	 html_go(s, HTAGNAME);
+	}
+	else {
+	 /* apparently a naked <, emit the < and restart */
+	 convert_putc(rock->next, '<');
+	 html_pop(s);
+	 goto restart;
+	}
+	break;
+
+ case HENDTAGOPEN:	/* 8.2.4.9 End tag open state */
+	if (html_isalpha(c)) {
+	 s->ends = HEND;
+	 buf_putc(&s->name, c);
+	 html_go(s, HTAGNAME);
+	}
+	else {
+	 /* error */
+	 html_pop(s);
+	}
+	break;
+
+ case HTAGNAME: /* 8.2.4.10 Tag name state */
+	/* gnb:TODO handle > embedded in "param" */
+	if (html_isspace(c)) {
+	 html_go(s, HTAGPARAMS);
+	}
+	else if (c == '/') {
+	 html_go(s, HSCTAG);
+	}
+	else if (c == '>') {
+	 html_pop(s);
+	 html_saw_tag(rock);
+	}
+	else if (html_isalpha(c)) {
+	 buf_putc(&s->name, c);
+	}
+	else {
+	 /* error */
+	 html_pop(s);
+	}
+	break;
+
+ case HSCTAG: /* 8.2.4.43 Self-closing start tag state */
+	if (c == '>') {
+	 s->ends = HBEGIN|HEND;
+	 html_pop(s);
+	 html_saw_tag(rock);
+	}
+	else {
+	 /* whatever, keep stripping tag parameters */
+	 html_go(s, HTAGPARAMS);
+	}
+	break;
+
+ case HTAGPARAMS:	 /* ignores all text until next '>' */
+	if (c == '>') {
+	 html_pop(s);
+	 html_saw_tag(rock);
+	}
+	else if (c == '/') {
+	 html_go(s, HSCTAG);
+	}
+	break;
+
+ case HBOGUSCOMM:	 /* 8.2.4.44 Bogus comment state */
+	/* strip all text until closing > */
+	if (c == '>') {
+	 html_go(s, HDATA);
+	}
+	break;
+
+ case HMUDECOPEN:	 /* 8.2.4.45 Markup declaration open state */
+	if (c == '-') {
+	 buf_putc(&s->name, c);
+	 if (s->name.len == 2)
+		html_go(s, HCOMMSTART);
+	}
+	else {
+	 /* ignore DOCTYPE or CDATA */
+	 html_go(s, HBOGUSCOMM);
+	 goto restart; /* in case it's a > */
+	}
+	break;
+
+ case HCOMMSTART:	 /* 8.2.4.46 Comment start state */
+	if (c == '-')
+	 html_go(s, HCOMMSTARTDASH);
+	else if (c == '>')
+	 html_go(s, HDATA);	/* very short comment  comment end */
+	else if (c == '!')
+	 html_go(s, HCOMMENDBANG);	/* --! in a comment */
+	else if (c != '-')
+	 html_go(s, HCOMM);	/* -- in the middle of a comment */
+	/* else, --- in comment, strip */
+	break;
+
+ case HCOMMENDBANG:	 /* 8.2.4.51 Comment end bang state */
+	if (c == '-')
+	 html_go(s, HCOMMENDDASH);	/* --!- in comment */
+	else if (c == '>')
+	 html_go(s, HDATA);	/* --!> at end of comment */
+	else
+	 html_go(s, HCOMM);	/* --! in the middle of a comment */
+	break;
+
+ }
+}
+
+static const char *convert_name(struct convert_rock *rock)
+{
+ if (rock->f == b64_2byte) return "b64_2byte";
+ if (rock->f == byte2buffer) return "byte2buffer";
+ if (rock->f == byte2search) return "byte2search";
+ if (rock->f == qp2byte) return "qp2byte";
+ if (rock->f == striphtml2uni) return "striphtml2uni";
+ if (rock->f == unfold2uni) return "unfold2uni";
+ if (rock->f == table2uni) return "table2uni";
+ if (rock->f == uni2searchform) return "uni2searchform";
+ if (rock->f == uni2html) return "uni2html";
+ if (rock->f == uni2utf8) return "uni2utf8";
+ if (rock->f == utf7_2uni) return "utf7_2uni";
+ if (rock->f == utf8_2uni) return "utf8_2uni";
+ return "wtf";
+}
+
 /* convert_rock manipulation routines */
 
-void table_switch(struct convert_rock *rock, int charset_num)
+static void table_switch(struct convert_rock *rock, int charset_num)
 {
 struct table_state *state = (struct table_state *)rock->state;
 
 /* wipe any current state */
- memset(state, 0, sizeof(struct table_state)); 
+ memset(state, 0, sizeof(struct table_state));
 
 /* it's a table based lookup */
 if (chartables_charset_tablecharset_num.table) {
@@ -573,20 +1423,11 @@
 /* Extract a cstring from a buffer. NOTE: caller must free the memory
 * themselves once this is called. Resets the state. If you don't
 * call this function then buffer_free will clean up */
-unsigned char *buffer_cstring(struct convert_rock *rock)
+static char *buffer_cstring(struct convert_rock *rock)
 {
 struct buf *buf = (struct buf *)rock->state;
- unsigned char *res;
-
- /* copy the pointer out */
- res = (unsigned char *)buf_cstring(buf);
-
- /* clean up the buffer so it frees correctly later */
- buf->s = 0;
- buf->len = 0;
- buf->alloc = 0;
 
- return res;
+ return buf_release(buf);
 }
 
 static inline int search_havematch(struct convert_rock *rock)
@@ -597,7 +1438,7 @@
 
 /* conversion cleanup routines */
 
-void basic_free(struct convert_rock *rock) 
+static void basic_free(struct convert_rock *rock)
 {
 if (rock) {
 	if (rock->state) free(rock->state);
@@ -605,7 +1446,7 @@
 }
 }
 
-void search_free(struct convert_rock *rock)
+static void search_free(struct convert_rock *rock)
 {
 if (rock && rock->state) {
 	struct search_state *s = (struct search_state *)rock->state;
@@ -614,7 +1455,8 @@
 basic_free(rock);
 }
 
-void buffer_free(struct convert_rock *rock) {
+static void buffer_free(struct convert_rock *rock)
+{
 if (rock && rock->state) {
 	struct buf *buf = (struct buf *)rock->state;
 	buf_free(buf);
@@ -622,7 +1464,16 @@
 basic_free(rock);
 }
 
-void convert_free(struct convert_rock *rock) {
+static void striphtml_free(struct convert_rock *rock)
+{
+ if (rock && rock->state) {
+	struct striphtml_state *s = (struct striphtml_state *)rock->state;
+	buf_free(&s->name);
+ }
+ basic_free(rock);
+}
+
+static void convert_free(struct convert_rock *rock) {
 struct convert_rock *next;
 while (rock) {
 	next = rock->next;
@@ -636,7 +1487,7 @@
 
 /* converter initialisation routines */
 
-struct convert_rock *qp_init(int isheader, struct convert_rock *next) 
+static struct convert_rock *qp_init(int isheader, struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 struct qp_state *s = xzmalloc(sizeof(struct qp_state));
@@ -647,7 +1498,7 @@
 return rock;
 }
 
-struct convert_rock *b64_init(struct convert_rock *next) 
+static struct convert_rock *b64_init(struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 rock->state = xzmalloc(sizeof(struct b64_state));
@@ -656,26 +1507,30 @@
 return rock;
 }
 
-struct convert_rock *stripnl_init(struct convert_rock *next)
+static struct convert_rock *unfold_init(struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
- rock->f = stripnl2uni;
+ rock->state = xzmalloc(sizeof(struct unfold_state));
+ rock->f = unfold2uni;
 rock->next = next;
 return rock;
 }
 
-struct convert_rock *canon_init(int spacemode, struct convert_rock *next)
+static struct convert_rock *canon_init(int flags, struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 struct canon_state *s = xzmalloc(sizeof(struct canon_state));
- s->spacemode = spacemode;
- rock->f = uni2searchform;
+ s->flags = flags;
+ if ((flags & CHARSET_SNIPPET))
+	rock->f = uni2html;
+ else
+	rock->f = uni2searchform;
 rock->state = s;
 rock->next = next;
 return rock;
 }
 
-struct convert_rock *uni_init(struct convert_rock *next) 
+static struct convert_rock *uni_init(struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 rock->f = uni2utf8;
@@ -683,7 +1538,7 @@
 return rock;
 }
 
-struct convert_rock *table_init(int charset_num, struct convert_rock *next)
+static struct convert_rock *table_init(int charset_num, struct convert_rock *next)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 rock->state = xzmalloc(sizeof(struct table_state));
@@ -692,7 +1547,7 @@
 return rock;
 }
 
-struct convert_rock *search_init(const char *substr, comp_pat *pat) {
+static struct convert_rock *search_init(const char *substr, comp_pat *pat) {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 struct search_state *s = xzmalloc(sizeof(struct search_state));
 struct comp_pat_s *p = (struct comp_pat_s *)pat;
@@ -717,15 +1572,11 @@
 return rock;
 }
 
-struct convert_rock *buffer_init(unsigned char *str, int len)
+static struct convert_rock *buffer_init(void)
 {
 struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
 struct buf *buf = xzmalloc(sizeof(struct buf));
 
- /* fiddling under the hood */
- buf->s = (char *)str;
- buf->alloc = len;
-
 rock->f = byte2buffer;
 rock->cleanup = buffer_free;
 rock->state = (void *)buf;
@@ -733,16 +1584,49 @@
 return rock;
 }
 
+struct convert_rock *striphtml_init(struct convert_rock *next)
+{
+ struct convert_rock *rock = xzmalloc(sizeof(struct convert_rock));
+ struct striphtml_state *s = xzmalloc(sizeof(struct striphtml_state));
+ /* gnb:TODO: if a DOCTYPE is present, sniff it to detect XHTML rules */
+ html_push(s, HDATA);
+ rock->state = (void *)s;
+ rock->f = striphtml2uni;
+ rock->cleanup = striphtml_free;
+ rock->next = next;
+ return rock;
+}
+
+
 /* API */
 
 /*
+ * Return the name of the given character set number, or NULL if
+ * not known.
+ */
+EXPORTED const char *charset_name(charset_index i)
+{
+ return (i >= 0 && i < chartables_num_charsets ?
+	 chartables_charset_tablei.name : "unknown");
+}
+
+/*
 * Lookup the character set 'name'. Returns the character set number
 * or -1 if there is no matching character set.
 */
-int charset_lookupname(const char *name)
+EXPORTED int charset_lookupname(const char *name)
 {
 int i;
 
+ /* translate to canonical name */
+ for (i = 0; charset_aliasesi.name; i++) {
+	if (!strcasecmp(name, charset_aliasesi.name)) {
+	 name = charset_aliasesi.canon_name;
+	 break;
+	}
+ }
+
+ /* look up canonical name */
 for (i = 0; i < chartables_num_charsets; i++) {
 	if (!strcasecmp(name, chartables_charset_tablei.name)) 
 	 return i;
@@ -751,12 +1635,20 @@
 return -1;
 }
 
+static int lookup_buf(const char *buf, int len)
+{
+ char *name = xstrndup(buf, len);
+ int res = charset_lookupname(name);
+ free(name);
+ return res;
+}
+
 /*
 * Convert the string 's' in the character set numbered 'charset'
- * into canonical searching form. Decodes into 'retval', which 
- * must be reallocable and currently at least size 'alloced'.
+ * into canonical searching form. Returns a newly allocated string
+ * which must be free()d by the caller.
 */
-char *charset_convert(const char *s, int charset, char *buf, size_t bufsz)
+EXPORTED char *charset_convert(const char *s, int charset, int flags)
 {
 struct convert_rock *input, *tobuffer;
 char *res;
@@ -767,16 +1659,16 @@
 	return xstrdup("X");
 
 /* set up the conversion path */
- tobuffer = buffer_init((unsigned char *)buf, bufsz);
+ tobuffer = buffer_init();
 input = uni_init(tobuffer);
- input = canon_init(1, input);
+ input = canon_init(flags, input);
 input = table_init(charset, input);
 
 /* do the conversion */
 convert_cat(input, s);
 
 /* extract the result */
- res = (char *)buffer_cstring(tobuffer);
+ res = buffer_cstring(tobuffer);
 
 /* clean up */
 convert_free(input);
@@ -784,8 +1676,14 @@
 return res;
 }
 
+EXPORTED char *charset_utf8_to_searchform(const char *s, int flags)
+{
+ int charset = charset_lookupname("utf-8");
+ return charset_convert(s, charset, flags);
+}
+
 /* Convert from a given charset and encoding into utf8 */
-char *charset_to_utf8(const char *msg_base, size_t len, int charset, int encoding)
+EXPORTED char *charset_to_utf8(const char *msg_base, size_t len, int charset, int encoding)
 {
 struct convert_rock *input, *tobuffer;
 char *res;
@@ -799,7 +1697,7 @@
 	return xstrdup("");
 
 /* set up the conversion path */
- tobuffer = buffer_init(0, 0);
+ tobuffer = buffer_init();
 input = uni_init(tobuffer);
 input = table_init(charset, input);
 
@@ -826,15 +1724,15 @@
 }
 
 convert_catn(input, msg_base, len);
- res = (char *)buffer_cstring(tobuffer);
+ res = buffer_cstring(tobuffer);
 convert_free(input);
 
 return res;
 }
 
-void mimeheader_cat(struct convert_rock *target, const char *s)
+static void mimeheader_cat(struct convert_rock *target, const char *s)
 {
- struct convert_rock *input, *stripnl;
+ struct convert_rock *input, *unfold;
 int eatspace = 0;
 const char *start, *endcharset, *encoding, *end;
 int len;
@@ -847,7 +1745,7 @@
 input = table_init(0, target);
 /* note: we assume the caller of this function has already 
 * determined that all newlines are followed by whitespace */
- stripnl = stripnl_init(input);
+ unfold = unfold_init(input);
 
 start = s;
 while ((start = (const char*) strchr(start, '=')) != 0) {
@@ -876,27 +1774,23 @@
 	if (!eatspace) {
 	 len = start - s - 1;
 	 table_switch(input, 0); /* US_ASCII */
-	 convert_catn(stripnl, s, len);
+	 convert_catn(unfold, s, len);
 	}
 
 	/*
 	 * Get the 1522-word's character set
 	 */
 	start++;
-	for (charset = 0; charset < chartables_num_charsets; charset++) {
-	 if ((int)strlen(chartables_charset_tablecharset.name) == endcharset-start &&
-		!strncasecmp(start, chartables_charset_tablecharset.name, endcharset-start)) {
-		table_switch(input, charset);
-		break;
-	 }
-	}
-
-	if (charset == chartables_num_charsets) {
+	charset = lookup_buf(start, endcharset-start);
+	if (charset < 0) {
 	 /* Unrecognized charset, nothing will match here */
-	 convert_putc(input, 0xfffd); /* unknown character */
+	 convert_putc(input, U_REPLACEMENT); /* unknown character */
 	}
 	else {
 	 struct convert_rock *extract;
+
+	 table_switch(input, charset);
+
 	 /* choose decoder */
 	 if (encoding1 == 'q' || encoding1 == 'Q') {
 		extract = qp_init(1, input);
@@ -919,31 +1813,33 @@
 /* Copy over the tail part of the input string */
 if (*s) {
 	table_switch(input, 0); /* US_ASCII */
-	convert_cat(stripnl, s);
+	convert_cat(unfold, s);
 }
 
 /* just free these ones, the rest can be cleaned up by the sender */
- basic_free(stripnl);
+ basic_free(unfold);
 basic_free(input);
 }
 
 /*
- * Decode MIME strings (per RFC 2047) in 's'. It writes the decoded
- * string to 'retval', calling realloc() as needed. (Thus retval may
- * be NULL.) Returns retval, contining 's' in canonical searching form.
+ * Decode MIME strings (per RFC 2047) in 's'. Returns a newly allocated
+ * string, contining 's' in canonical searching form, which must be
+ * free()d by the caller.
 */
-char *charset_decode_mimeheader(const char *s, char *retval, size_t alloced)
+EXPORTED char *charset_decode_mimeheader(const char *s, int flags)
 {
 struct convert_rock *tobuffer, *input;
 char *res;
 
- tobuffer = buffer_init((unsigned char *)retval, alloced);
+ if (!s) return NULL;
+
+ tobuffer = buffer_init();
 input = uni_init(tobuffer);
- input = canon_init(1, input);
+ input = canon_init(flags, input);
 
 mimeheader_cat(input, s);
 
- res = (char *)buffer_cstring(tobuffer);
+ res = buffer_cstring(tobuffer);
 
 convert_free(input);
 
@@ -951,36 +1847,38 @@
 }
 
 /*
- * Decode MIME strings (per RFC 2047) in 's'. It writes the decoded
- * string to 'retval', calling realloc() as needed. (Thus retval may
- * be NULL.) Returns retval, contining 's' in canonical searching form.
+ * Decode MIME strings (per RFC 2047) in 's'. Returns a newly allocated
+ * string, containing the decoded string, which must be free()d by the
+ * caller.
 */
-char *charset_parse_mimeheader(const char *s)
+EXPORTED char *charset_parse_mimeheader(const char *s)
 {
 struct convert_rock *tobuffer, *input;
 char *res;
 
- tobuffer = buffer_init(0, 0);
+ if (!s) return NULL;
+
+ tobuffer = buffer_init();
 input = uni_init(tobuffer);
 
 mimeheader_cat(input, s);
 
- res = (char *)buffer_cstring(tobuffer);
+ res = buffer_cstring(tobuffer);
 
 convert_free(input);
 
 return res;
 }
 
-int charset_search_mimeheader(const char *substr, comp_pat *pat,
- const char *s, int searchform)
+EXPORTED int charset_search_mimeheader(const char *substr, comp_pat *pat,
+			 const char *s, int flags)
 {
 struct convert_rock *input, *tosearch;
 int res;
 
 tosearch = search_init(substr, pat);
 input = uni_init(tosearch);
- if (searchform) input = canon_init(1, input);
+ input = canon_init(flags, input);
 
 mimeheader_cat(input, s);
 
@@ -997,7 +1895,7 @@
 * deeper analysis of the possible paths through the string, but
 * this is a good absolute maximum, and it just means a few more
 * bytes get allocated... */
-comp_pat *charset_compilepat(const char *s)
+EXPORTED comp_pat *charset_compilepat(const char *s)
 {
 struct comp_pat_s *pat = xzmalloc(sizeof(struct comp_pat_s));
 const char *p = s;
@@ -1013,7 +1911,7 @@
 /*
 * Free the compiled pattern 'pat'
 */
-void charset_freepat(comp_pat *pat)
+EXPORTED void charset_freepat(comp_pat *pat)
 {
 free((struct comp_pat_s *)pat);
 }
@@ -1025,18 +1923,28 @@
 * Uses the to_search target directly. Assumes 's' is already
 * in search normal form (i.e. from a cache file)
 */
-int charset_searchstring(const char *substr, comp_pat *pat,
- const char *s, size_t len)
+EXPORTED int charset_searchstring(const char *substr, comp_pat *pat,
+			 const char *s, size_t len, int flags)
 {
 struct convert_rock *tosearch;
+ struct convert_rock *input;
+ int charset = charset_lookupname("utf-8");
 int res;
 
+ if (!substr0)
+	return 1; /* zero length string always matches */
+
 /* set up the search handler */
 tosearch = search_init(substr, pat);
 
+ /* and the input stream */
+ input = uni_init(tosearch);
+ input = canon_init(flags, input);
+ input = table_init(charset, input);
+
 /* feed the handler */
 while (len-- > 0) {
-	convert_putc(tosearch, (unsigned char)*s++);
+	convert_putc(input, (unsigned char)*s++);
 	if (search_havematch(tosearch)) break; /* shortcut if there's a match */
 }
 
@@ -1044,7 +1952,7 @@
 res = search_havematch(tosearch);
 
 /* clean up */
- search_free(tosearch);
+ convert_free(input);
 
 return res;
 }
@@ -1056,9 +1964,9 @@
 * content transfer encoding of the data, respectively.
 * Returns nonzero iff the string was found.
 */
-int charset_searchfile(const char *substr, comp_pat *pat,
- const char *msg_base, size_t len, int charset, 
- int encoding)
+EXPORTED int charset_searchfile(const char *substr, comp_pat *pat,
+		 const char *msg_base, size_t len,
+		 int charset, int encoding, int flags)
 {
 struct convert_rock *input, *tosearch;
 size_t i;
@@ -1075,7 +1983,7 @@
 /* set up the conversion path */
 tosearch = search_init(substr, pat);
 input = uni_init(tosearch);
- input = canon_init(1, input);
+ input = canon_init(flags, input);
 input = table_init(charset, input);
 
 /* choose encoding extraction if needed */
@@ -1102,7 +2010,7 @@
 
 /* implement the loop here so we can check on the search each time */
 for (i = 0; i < len; i++) {
-	convert_putc(input, msg_basei);
+	convert_putc(input, (unsigned char)msg_basei);
 	if (search_havematch(tosearch)) break;
 }
 
@@ -1114,22 +2022,39 @@
 }
 
 /* This is based on charset_searchfile above. */
-int charset_extractfile(index_search_text_receiver_t receiver,
- void* rock, int uid, const char *msg_base, size_t len, 
- int charset, int encoding)
+EXPORTED int charset_extract(void (*cb)(const struct buf *, void *),
+			 void *rock,
+			 const struct buf *data,
+			 int charset, int encoding,
+			 const char *subtype, int flags)
 {
 struct convert_rock *input, *tobuffer;
 struct buf *out;
 size_t i;
 
+ if (charset_debug)
+	fprintf(stderr, "charset_extract()\n");
+
 /* Initialize character set mapping */
 if (charset < 0 || charset >= chartables_num_charsets) 
 	return 0;
 
 /* set up the conversion path */
- tobuffer = buffer_init(0, 0);
+ tobuffer = buffer_init();
 input = uni_init(tobuffer);
- input = canon_init(1, input);
+ input = canon_init(flags, input);
+
+ if (!strcmpsafe(subtype, "HTML")) {
+	if ((flags & CHARSET_SKIPHTML)) {
+	 /* silently pretend we indexed it, but actually ignore it */
+	 convert_free(input);
+	 return 1;
+	}
+	/* this is text/html data, so we can make ourselves useful by
+	 * stripping html tags, css and js. */
+	input = striphtml_init(input);
+ }
+
 input = table_init(charset, input);
 
 switch (encoding) {
@@ -1156,19 +2081,17 @@
 /* point to the buffer for easy block sending */
 out = (struct buf *)tobuffer->state;
 
- for (i = 0; i < len; i++) {
-	convert_putc(input, msg_basei);
+ for (i = 0; i < data->len; i++) {
+	convert_putc(input, (unsigned char)data->si);
 
 	/* process a block of output every so often */
 	if (buf_len(out) > 4096) {
-	 receiver(uid, SEARCHINDEX_PART_BODY, SEARCHINDEX_CMD_APPENDPART,
-		 out->s, out->len, rock);
+	 cb(out, rock);
 	 buf_reset(out);
 	}
 }
 if (out->len) { /* finish it */
-	receiver(uid, SEARCHINDEX_PART_BODY, SEARCHINDEX_CMD_APPENDPART,
-		 out->s, out->len, rock);
+	cb(out, rock);
 }
 
 convert_free(input);
@@ -1177,29 +2100,35 @@
 }
 
 /*
- * Decode the MIME body part (per RFC 2045) of 'len' bytes located at
- * 'msg_base' having the content transfer 'encoding'. Decodes into
- * 'retval' (if necessary), which must be reallocable and currently at
- * least size 'alloced'. Returns the number of decoded bytes in
- * 'outlen'. 
+ * Decode the MIME body part (per RFC 2045) of @len bytes located at
+ * @msg_base having the content transfer @encoding. Returns a pointer
+ * to decoded bytes. The number of decoded bytes is returned in
+ * *@outlen. Depending on the encoding, a newly allocated buffer may be
+ * written to *@decbuf, which should be free()d by the caller if it not
+ * zero. Note that the return value may point to either @msg_base or
+ * @decbuf, so @decbuf should not be free()d until the return value has
+ * been used.
 */
-char *charset_decode_mimebody(const char *msg_base, size_t len, int encoding,
-			 char **retval, size_t alloced, size_t *outlen)
+EXPORTED const char *charset_decode_mimebody(const char *msg_base, size_t len, int encoding,
+				 char **decbuf, size_t *outlen)
 {
 struct convert_rock *input, *tobuffer;
 
+ *decbuf = NULL;
+ *outlen = 0;
+
 switch (encoding) {
 case ENCODING_NONE:
 	*outlen = len;
-	return (char *) msg_base;
+	return msg_base;
 
 case ENCODING_QP:
-	tobuffer = buffer_init((unsigned char *)*retval, alloced);
+	tobuffer = buffer_init();
 	input = qp_init(0, tobuffer);
 	break;
 
 case ENCODING_BASE64:
-	tobuffer = buffer_init((unsigned char *)*retval, alloced);
+	tobuffer = buffer_init();
 	input = b64_init(tobuffer);
 	break;
 
@@ -1210,26 +2139,22 @@
 
 convert_catn(input, msg_base, len);
 
- /* extract the string from the buffer, messy - but we want to
- * do it without becoming a cstring or being prematurely freed! */
+ /* extract the string from the buffer */
 {
 	struct buf *buf = (struct buf *)tobuffer->state;
-	*retval = buf->s;
 	*outlen = buf->len;
-	buf->s = 0;
-	buf->len = 0;
-	buf->alloc = 0;
+	*decbuf = buf_release(buf);
 }
 
 convert_free(input);
 
- if (!*retval) {
+ if (!*decbuf) {
 	/* didn't get a result - maybe blank input, don't return NULL */
 	*outlen = len;
-	return (char *) msg_base;
+	return msg_base;
 }
 
- return *retval;
+ return *decbuf;
 }
 
 /*
@@ -1246,7 +2171,7 @@
 static char base_64 =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-char *charset_encode_mimebody(const char *msg_base, size_t len,
+EXPORTED char *charset_encode_mimebody(const char *msg_base, size_t len,
 char *retval, size_t *outlen, int *outlines)
 {
 const unsigned char *s;
@@ -1305,3 +2230,41 @@
 return (b64_len ? retval : NULL);
 }
 
+/* returns a buffer which the caller must free */
+EXPORTED char *charset_encode_mimeheader(const char *header, size_t len)
+{
+ struct buf buf = BUF_INITIALIZER;
+ size_t n;
+ int need_quote = 0;
+
+ if (!header) return NULL;
+
+ if (!len) len = strlen(header);
+
+ for (n = 0; n < len; n++) {
+	unsigned char this = headern;
+	if (QPSAFECHARthis || this == ' ') continue;
+	need_quote = 1;
+	break;
+ }
+
+ if (need_quote) {
+	buf_printf(&buf, "=?UTF-8?Q?");
+	for (n = 0; n < len; n++) {
+	 unsigned char this = headern;
+	 if (QPSAFECHARthis) {
+		buf_putc(&buf, (char)this);
+	 }
+	 else {
+		buf_printf(&buf, "=%02X", this);
+	 }
+	}
+	buf_printf(&buf, "?=");
+ }
+ else {
+	buf_setmap(&buf, header, len);
+ }
+
+ return buf_release(&buf);
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/charset.h -> cyrus-imapd-2.5.tar.gz/lib/charset.h Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: charset.h,v 1.24 2010/01/06 17:01:44 murch Exp $
 */
 
 #ifndef INCLUDED_CHARSET_H
@@ -49,80 +47,58 @@
 #define ENCODING_BASE64 2
 #define ENCODING_UNKNOWN 255
 
+#define CHARSET_SKIPDIACRIT (1<<0)
+#define CHARSET_SKIPSPACE (1<<1)
+#define CHARSET_MERGESPACE (1<<2)
+#define CHARSET_SKIPHTML (1<<3)
+#define CHARSET_SNIPPET (1<<4)
+
 #define CHARSET_UNKNOWN_CHARSET (-1)
 
+#include "util.h"
+
 typedef int comp_pat;
 typedef int charset_index;
 
+extern int encoding_lookupname(const char *name);
+extern const char *encoding_name(int);
+
 /* ensure up to MAXTRANSLATION times expansion into buf */
-extern char *charset_convert(const char *s, charset_index charset, char *buf,
- size_t bufsz);
-extern char *charset_decode_mimeheader(const char *s, char *buf, 
- size_t bufsz);
+extern char *charset_convert(const char *s, charset_index charset, int flags);
+extern char *charset_decode_mimeheader(const char *s, int flags);
 extern char *charset_parse_mimeheader(const char *s);
+extern char *charset_utf8_to_searchform(const char *s, int flags);
 
+extern const char *charset_name(charset_index);
 extern charset_index charset_lookupname(const char *name);
 extern comp_pat *charset_compilepat(const char *s);
 extern void charset_freepat(comp_pat *pat);
 extern int charset_searchstring(const char *substr, comp_pat *pat,
- const char *s, size_t len);
+			 const char *s, size_t len, int flags);
 extern int charset_searchfile(const char *substr, comp_pat *pat,
 const char *msg_base, size_t len, 
- charset_index charset, int encoding);
-extern char *charset_decode_mimebody(const char *msg_base, size_t len,
-				 int encoding, char **retval, size_t alloced,
-				 size_t *outlen);
+ charset_index charset, int encoding, int flags);
+extern const char *charset_decode_mimebody(const char *msg_base, size_t len,
+					 int encoding, char **retval,
+					 size_t *outlen);
 extern char *charset_encode_mimebody(const char *msg_base, size_t len,
 				 char *retval, size_t *outlen, 
 				 int *outlines);
 extern char *charset_to_utf8(const char *msg_base, size_t len, charset_index charset, int encoding);
-extern int charset_search_mimeheader(const char *substr, comp_pat *pat, const char *s, int searchform);
-
-/* Definitions for charset_extractfile */
-
-/* These constants are passed into the index_search_text_receiver_t callback to
- tell it which part of the message is being sent down */
-#define SEARCHINDEX_PART_FROM 1
-#define SEARCHINDEX_PART_TO 2
-#define SEARCHINDEX_PART_CC 3
-#define SEARCHINDEX_PART_BCC 4
-#define SEARCHINDEX_PART_SUBJECT 5
-#define SEARCHINDEX_PART_HEADERS 6 /* headers OTHER than the above headers */
-#define SEARCHINDEX_PART_BODY 7
-
-/* These constants tell the index_search_text_receiver_t callback what is happening. */
-#define SEARCHINDEX_CMD_BEGINPART 0x01 /* starting a new part */
-#define SEARCHINDEX_CMD_APPENDPART 0x02 /* recording some text that belongs to the part */
-#define SEARCHINDEX_CMD_ENDPART 0x04 /* done with the part */
-#define SEARCHINDEX_CMD_STUFFPART 0x07 /* All of the above in one invocation */
+extern int charset_search_mimeheader(const char *substr, comp_pat *pat, const char *s, int flags);
 
-/* This function gets called at least once for each part of every message.
- The invocations form a sequence:
- CMD_BEGINPART <part1>
- CMD_APPENDPART <part1, text, text_len> (1 or more times)
- CMD_ENDPART <part1>
- ...
- CMD_BEGINPART <partN>
- CMD_APPENDPART <partN, text, text_len> (1 or more times)
- CMD_ENDPART <partN>
- BEGIN, APPEND and/or END operations on the same part may be combined into one call by
- ORing the 'cmds' flags.
+extern char *charset_encode_mimeheader(const char *header, size_t len);
 
- The parts need not arrive in any particular order, but each part
- can only participate in one BEGIN ... APPEND ... END sequence, and
- the sequences for different parts cannot be interleaved.
-*/
-typedef void index_search_text_receiver_t(int UID, int part, int cmds,
- char const* text, int text_len, void* rock);
+/* Definitions for charset_extract */
 
 /* Extract the body text for the message denoted by 'uid', convert its
- text to the canonical form for searching, and pass the converted
- text down in a series of invocations to the callback function with
- part=SEARCHINDEX_PART_BODY and cmds=CMD_APPENDPART. This is called
- by index_getsearchtextmsg to extract the MIME body parts. */ 
-extern int charset_extractfile(index_search_text_receiver_t receiver,
- void* rock, int uid, const char *msg_base, 
- size_t len, charset_index charset,
- int encoding);
+ text to the canonical form for searching, and pass the converted text
+ down in a series of invocations of the callback 'cb'. This is
+ called by index_getsearchtext to extract the MIME body parts. */
+extern int charset_extract(void (*cb)(const struct buf *text, void *rock),
+			 void *rock,
+			 const struct buf *data,
+			 charset_index charset, int encoding,
+			 const char *subtype, int flags);
 
 #endif /* INCLUDED_CHARSET_H */

cyrus-imapd-2.5.tar.gz/lib/charset/aliases.txt Added

@@ -0,0 +1,64 @@
+# funky names for UTF charsets
+utf8                utf-8
+utf7                utf-7
+unicode-1-1-utf-8   utf8
+
+# Yes, the world does contain a lot of rubbish
+# ways of saying iso-8859-1
+ISO_8859_1          iso-8859-1
+ISO_8859            iso-8859-1
+ISO-8859            iso-8859-1
+8859_1              iso-8859-1
+so-8859-1           iso-8859-1
+x-mac-roman         iso-8859-1
+macintosh           iso-8859-1
+mac                 iso-8859-1
+en_GB               iso-8859-1
+auto                iso-8859-1
+unknown             iso-8859-1
+unknown-8bit        iso-8859-1
+x-unknown           iso-8859-1
+x-user-defined      iso-8859-1
+none                iso-8859-1
+# sort-of - see Filter::Trigraph
+646                 iso-8859-1
+
+# other aliases
+8859_2              iso-8859-2
+x-mac-turkish       iso-8859-9
+greek-ccitt         iso-8859-7
+iso-8859-8-i        iso-8859-8
+ISO8859_15_FDIS     iso-8859-15
+tis-620             iso-8859-11
+ASMO-708            iso-8859-6
+WIN-KOI8            koi8-r
+
+# windows codepages - these are the ones we have
+1250                windows-1250
+cp1250              windows-1250
+win-1250            windows-1250
+
+1251                windows-1251
+cp1251              windows-1251
+win-1251            windows-1251
+
+1252                windows-1252
+cp1252              windows-1252
+win-1252            windows-1252
+
+1255                windows-1255
+cp1255              windows-1255
+win-1255            windows-1255
+
+1256                windows-1256
+cp1256              windows-1256
+win-1256            windows-1256
+
+# stuff from the FastMail Perl mapping that we
+# don't have support for in Cyrus
+#x-gbk               gbk
+#UTS-16              UCS-2BE
+#gb2312              gbk
+#SHIFT_JIS           shiftjis
+#ksc5601             ksc5601-raw
+#ks_c_5601           ksc5601-raw

cyrus-imapd-2.4.17.tar.gz/lib/charset/gb2312.t -> cyrus-imapd-2.5.tar.gz/lib/charset/gb2312.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-2022-jp.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-2022-jp.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-2022-kr.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-2022-kr.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-1.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-1.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-10.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-10.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-11.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-11.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-13.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-13.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-14.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-14.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-15.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-15.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-16.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-16.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-2.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-2.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-3.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-3.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-4.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-4.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-5.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-5.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-6.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-6.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-7.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-7.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-8.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-8.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/iso-8859-9.t -> cyrus-imapd-2.5.tar.gz/lib/charset/iso-8859-9.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/koi8-r.t -> cyrus-imapd-2.5.tar.gz/lib/charset/koi8-r.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/unifix.txt -> cyrus-imapd-2.5.tar.gz/lib/charset/unifix.txt Changed

@@ -37,8 +37,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: unifix.txt,v 1.5 2010/01/06 17:01:49 murch Exp $
 
 # Modifications to Unicode data for better case-insensitive searching
 
@@ -67,210 +65,10 @@
 # Map oe ligature to "oe"
 0153;LATIN SMALL LIGATURE OE;Ll;0;L;006F 0065;;;;N;LATIN SMALL LETTER O E;;0152;;0152
 
-# Ignore combining diacritical marks
-0300;Combining Diacritical Mark;Zs;
-0301;Combining Diacritical Mark;Zs;
-0302;Combining Diacritical Mark;Zs;
-0303;Combining Diacritical Mark;Zs;
-0304;Combining Diacritical Mark;Zs;
-0305;Combining Diacritical Mark;Zs;
-0306;Combining Diacritical Mark;Zs;
-0307;Combining Diacritical Mark;Zs;
-0308;Combining Diacritical Mark;Zs;
-0309;Combining Diacritical Mark;Zs;
-030a;Combining Diacritical Mark;Zs;
-030b;Combining Diacritical Mark;Zs;
-030c;Combining Diacritical Mark;Zs;
-030d;Combining Diacritical Mark;Zs;
-030e;Combining Diacritical Mark;Zs;
-030f;Combining Diacritical Mark;Zs;
-0310;Combining Diacritical Mark;Zs;
-0311;Combining Diacritical Mark;Zs;
-0312;Combining Diacritical Mark;Zs;
-0313;Combining Diacritical Mark;Zs;
-0314;Combining Diacritical Mark;Zs;
-0315;Combining Diacritical Mark;Zs;
-0316;Combining Diacritical Mark;Zs;
-0317;Combining Diacritical Mark;Zs;
-0318;Combining Diacritical Mark;Zs;
-0319;Combining Diacritical Mark;Zs;
-031a;Combining Diacritical Mark;Zs;
-031b;Combining Diacritical Mark;Zs;
-031c;Combining Diacritical Mark;Zs;
-031d;Combining Diacritical Mark;Zs;
-031e;Combining Diacritical Mark;Zs;
-031f;Combining Diacritical Mark;Zs;
-0320;Combining Diacritical Mark;Zs;
-0321;Combining Diacritical Mark;Zs;
-0322;Combining Diacritical Mark;Zs;
-0323;Combining Diacritical Mark;Zs;
-0324;Combining Diacritical Mark;Zs;
-0325;Combining Diacritical Mark;Zs;
-0326;Combining Diacritical Mark;Zs;
-0327;Combining Diacritical Mark;Zs;
-0328;Combining Diacritical Mark;Zs;
-0329;Combining Diacritical Mark;Zs;
-032a;Combining Diacritical Mark;Zs;
-032b;Combining Diacritical Mark;Zs;
-032c;Combining Diacritical Mark;Zs;
-032d;Combining Diacritical Mark;Zs;
-032e;Combining Diacritical Mark;Zs;
-032f;Combining Diacritical Mark;Zs;
-0330;Combining Diacritical Mark;Zs;
-0331;Combining Diacritical Mark;Zs;
-0332;Combining Diacritical Mark;Zs;
-0333;Combining Diacritical Mark;Zs;
-0334;Combining Diacritical Mark;Zs;
-0335;Combining Diacritical Mark;Zs;
-0336;Combining Diacritical Mark;Zs;
-0337;Combining Diacritical Mark;Zs;
-0338;Combining Diacritical Mark;Zs;
-0339;Combining Diacritical Mark;Zs;
-033a;Combining Diacritical Mark;Zs;
-033b;Combining Diacritical Mark;Zs;
-033c;Combining Diacritical Mark;Zs;
-033d;Combining Diacritical Mark;Zs;
-033e;Combining Diacritical Mark;Zs;
-033f;Combining Diacritical Mark;Zs;
-0340;Combining Diacritical Mark;Zs;
-0341;Combining Diacritical Mark;Zs;
-0342;Combining Diacritical Mark;Zs;
-0343;Combining Diacritical Mark;Zs;
-0344;Combining Diacritical Mark;Zs;
-0345;Combining Diacritical Mark;Zs;
-0346;Combining Diacritical Mark;Zs;
-0347;Combining Diacritical Mark;Zs;
-0348;Combining Diacritical Mark;Zs;
-0349;Combining Diacritical Mark;Zs;
-034a;Combining Diacritical Mark;Zs;
-034b;Combining Diacritical Mark;Zs;
-034c;Combining Diacritical Mark;Zs;
-034d;Combining Diacritical Mark;Zs;
-034e;Combining Diacritical Mark;Zs;
-034f;Combining Diacritical Mark;Zs;
-0350;Combining Diacritical Mark;Zs;
-0351;Combining Diacritical Mark;Zs;
-0352;Combining Diacritical Mark;Zs;
-0353;Combining Diacritical Mark;Zs;
-0354;Combining Diacritical Mark;Zs;
-0355;Combining Diacritical Mark;Zs;
-0356;Combining Diacritical Mark;Zs;
-0357;Combining Diacritical Mark;Zs;
-0358;Combining Diacritical Mark;Zs;
-0359;Combining Diacritical Mark;Zs;
-035a;Combining Diacritical Mark;Zs;
-035b;Combining Diacritical Mark;Zs;
-035c;Combining Diacritical Mark;Zs;
-035d;Combining Diacritical Mark;Zs;
-035e;Combining Diacritical Mark;Zs;
-035f;Combining Diacritical Mark;Zs;
-0360;Combining Diacritical Mark;Zs;
-0361;Combining Diacritical Mark;Zs;
-0362;Combining Diacritical Mark;Zs;
-0363;Combining Diacritical Mark;Zs;
-0364;Combining Diacritical Mark;Zs;
-0365;Combining Diacritical Mark;Zs;
-0366;Combining Diacritical Mark;Zs;
-0367;Combining Diacritical Mark;Zs;
-0368;Combining Diacritical Mark;Zs;
-0369;Combining Diacritical Mark;Zs;
-036a;Combining Diacritical Mark;Zs;
-036b;Combining Diacritical Mark;Zs;
-036c;Combining Diacritical Mark;Zs;
-036d;Combining Diacritical Mark;Zs;
-036e;Combining Diacritical Mark;Zs;
-036f;Combining Diacritical Mark;Zs;
-0370;Combining Diacritical Mark;Zs;
-0371;Combining Diacritical Mark;Zs;
-0372;Combining Diacritical Mark;Zs;
-0373;Combining Diacritical Mark;Zs;
-0374;Combining Diacritical Mark;Zs;
-0375;Combining Diacritical Mark;Zs;
-0376;Combining Diacritical Mark;Zs;
-0377;Combining Diacritical Mark;Zs;
-0378;Combining Diacritical Mark;Zs;
-0379;Combining Diacritical Mark;Zs;
-037a;Combining Diacritical Mark;Zs;
-037b;Combining Diacritical Mark;Zs;
-037c;Combining Diacritical Mark;Zs;
-037d;Combining Diacritical Mark;Zs;
-037e;Combining Diacritical Mark;Zs;
-037f;Combining Diacritical Mark;Zs;
-0380;Combining Diacritical Mark;Zs;
-0381;Combining Diacritical Mark;Zs;
-0382;Combining Diacritical Mark;Zs;
-0383;Combining Diacritical Mark;Zs;
-0384;Combining Diacritical Mark;Zs;
-0385;Combining Diacritical Mark;Zs;
-0387;Combining Diacritical Mark;Zs;
-038b;Combining Diacritical Mark;Zs;
-038d;Combining Diacritical Mark;Zs;
-03a2;Combining Diacritical Mark;Zs;
-03cf;Combining Diacritical Mark;Zs;
-03d0;Combining Diacritical Mark;Zs;
-03d1;Combining Diacritical Mark;Zs;
-03d2;Combining Diacritical Mark;Zs;
-03d3;Combining Diacritical Mark;Zs;
-03d4;Combining Diacritical Mark;Zs;
-03d5;Combining Diacritical Mark;Zs;
-03d6;Combining Diacritical Mark;Zs;
-03d7;Combining Diacritical Mark;Zs;
-03d8;Combining Diacritical Mark;Zs;
-03d9;Combining Diacritical Mark;Zs;
-03da;Combining Diacritical Mark;Zs;
-03db;Combining Diacritical Mark;Zs;
-03dc;Combining Diacritical Mark;Zs;
-03dd;Combining Diacritical Mark;Zs;
-03de;Combining Diacritical Mark;Zs;
-03df;Combining Diacritical Mark;Zs;
-03e0;Combining Diacritical Mark;Zs;
-03e1;Combining Diacritical Mark;Zs;
-03e2;Combining Diacritical Mark;Zs;
-03e3;Combining Diacritical Mark;Zs;
-03e4;Combining Diacritical Mark;Zs;
-03e5;Combining Diacritical Mark;Zs;
-03e6;Combining Diacritical Mark;Zs;
-03e7;Combining Diacritical Mark;Zs;
-03e8;Combining Diacritical Mark;Zs;
-03e9;Combining Diacritical Mark;Zs;
-03ea;Combining Diacritical Mark;Zs;
-03eb;Combining Diacritical Mark;Zs;
-03ec;Combining Diacritical Mark;Zs;
-03ed;Combining Diacritical Mark;Zs;
-03ee;Combining Diacritical Mark;Zs;
-03ef;Combining Diacritical Mark;Zs;
-03f0;Combining Diacritical Mark;Zs;
-03f1;Combining Diacritical Mark;Zs;
-03f2;Combining Diacritical Mark;Zs;
-03f3;Combining Diacritical Mark;Zs;
-03f4;Combining Diacritical Mark;Zs;
-03f5;Combining Diacritical Mark;Zs;
-03f6;Combining Diacritical Mark;Zs;
-03f7;Combining Diacritical Mark;Zs;
-03f8;Combining Diacritical Mark;Zs;
-03f9;Combining Diacritical Mark;Zs;
-03fa;Combining Diacritical Mark;Zs;
-03fb;Combining Diacritical Mark;Zs;
-03fc;Combining Diacritical Mark;Zs;
-03fd;Combining Diacritical Mark;Zs;
-03fe;Combining Diacritical Mark;Zs;
-03ff;Combining Diacritical Mark;Zs;
-
-
 # Map Cyrillic ligatures
 04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;041D 0413;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
 04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;0422 0426;;;;N;CYRILLIC SMALL LETTER TE TSE;Abkhasian;04B4;;04B4
 
-# Don't bother expanding Hebrew ligatures
-#05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
-#05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
-#05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
-
 # Map fraction slash to "/"
 2044;FRACTION SLASH;Sm;0;ON;002F;;;;N;;;;;
 
-# Don't bother expanding Arabic ligatures
-#FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;R;;;;;N;;;;;
-#FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;R;;;;;N;;;;;
-#FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;R;;;;;N;;;;;
-

cyrus-imapd-2.4.17.tar.gz/lib/charset/us-ascii.t -> cyrus-imapd-2.5.tar.gz/lib/charset/us-ascii.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/windows-1250.t -> cyrus-imapd-2.5.tar.gz/lib/charset/windows-1250.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/windows-1251.t -> cyrus-imapd-2.5.tar.gz/lib/charset/windows-1251.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/windows-1252.t -> cyrus-imapd-2.5.tar.gz/lib/charset/windows-1252.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/windows-1255.t -> cyrus-imapd-2.5.tar.gz/lib/charset/windows-1255.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/charset/windows-1256.t -> cyrus-imapd-2.5.tar.gz/lib/charset/windows-1256.t Changed

cyrus-imapd-2.4.17.tar.gz/lib/chartable.h -> cyrus-imapd-2.5.tar.gz/lib/chartable.h Changed

cyrus-imapd-2.5.tar.gz/lib/command.c Added

@@ -0,0 +1,270 @@
+/* command.c -- utility functions for running commands
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <syslog.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "imap/imap_err.h"
+#include "xmalloc.h"
+#include "command.h"
+#include "signals.h"
+#include "strarray.h"
+
+static int wait_for_child(const char *argv0, pid_t pid);
+
+EXPORTED int run_command(const char *argv0, ...)
+{
+ va_list va;
+ const char *p;
+ strarray_t argv = STRARRAY_INITIALIZER;
+ pid_t pid;
+ int r = 0;
+
+ strarray_append(&argv, argv0);
+
+ va_start(va, argv0);
+ while ((p = va_arg(va, const char *)))
+	strarray_append(&argv, p);
+ va_end(va);
+
+ pid = fork();
+ if (pid < 0) {
+	syslog(LOG_ERR, "Failed to fork: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ if (!pid) {
+	/* in child */
+	r = execv(argv0, argv.data);
+	syslog(LOG_ERR, "Failed to execute %s: %m", argv0);
+	exit(1);
+ }
+ else {
+	/* in parent */
+	r = wait_for_child(argv0, pid);
+ }
+
+out:
+ strarray_fini(&argv);
+ return r;
+}
+
+#define PIPE_READ	0
+#define PIPE_WRITE	1
+
+EXPORTED int command_popen(struct command **cmdp, const char *mode, const char *argv0, ...)
+{
+ va_list va;
+ const char *p;
+ strarray_t argv = STRARRAY_INITIALIZER;
+ pid_t pid;
+ int r = 0;
+ struct command *cmd;
+ int do_stdin = (strchr(mode, 'w') != NULL);
+ int do_stdout = (strchr(mode, 'r') != NULL);
+ int stdin_pipe2 = { -1, -1 };
+ int stdout_pipe2 = { -1, -1 };
+
+ strarray_append(&argv, argv0);
+
+ va_start(va, argv0);
+ while ((p = va_arg(va, const char *)))
+	strarray_append(&argv, p);
+ va_end(va);
+
+ if (do_stdin) {
+	r = pipe(stdin_pipe);
+	if (r) {
+	 syslog(LOG_ERR, "Failed to pipe(): %m");
+	 r = IMAP_SYS_ERROR;
+	 goto out;
+	}
+ }
+
+ if (do_stdout) {
+	r = pipe(stdout_pipe);
+	if (r) {
+	 syslog(LOG_ERR, "Failed to pipe(): %m");
+	 r = IMAP_SYS_ERROR;
+	 goto out;
+	}
+ }
+
+ pid = fork();
+ if (pid < 0) {
+	syslog(LOG_ERR, "Failed to fork: %m");
+	r = IMAP_SYS_ERROR;
+	goto out;
+ }
+
+ if (!pid) {
+	/* in child */
+	if (do_stdin) {
+	 close(stdin_pipePIPE_WRITE);
+	 dup2(stdin_pipePIPE_READ, STDIN_FILENO);
+	 close(stdin_pipePIPE_READ);
+	}
+	if (do_stdout) {
+	 close(stdout_pipePIPE_READ);
+	 dup2(stdout_pipePIPE_WRITE, STDOUT_FILENO);
+	 close(stdout_pipePIPE_WRITE);
+	}
+
+	r = execv(argv0, argv.data);
+	syslog(LOG_ERR, "Failed to execute %s: %m", argv0);
+	exit(1);
+ }
+
+ /* in parent */
+ cmd = xzmalloc(sizeof(struct command));
+ cmd->argv0 = xstrdup(argv0);
+ cmd->pid = pid;
+ if (do_stdin)
+	cmd->stdin_prot = prot_new(stdin_pipePIPE_WRITE, /*write*/1);
+ if (do_stdout)
+	cmd->stdout_prot = prot_new(stdout_pipePIPE_READ, /*write*/0);
+ *cmdp = cmd;
+
+out:
+ if (stdin_pipePIPE_READ >= 0) close(stdin_pipePIPE_READ);
+ if (stdout_pipePIPE_WRITE >= 0) close(stdout_pipePIPE_WRITE);
+ if (r) {
+	if (stdin_pipePIPE_WRITE >= 0) close(stdin_pipePIPE_WRITE);
+	if (stdout_pipePIPE_READ >= 0) close(stdout_pipePIPE_READ);
+ }
+ strarray_fini(&argv);
+ return r;
+}
+
+EXPORTED int command_pclose(struct command **cmdp)
+{
+ struct command *cmd = (cmdp ? *cmdp : NULL);
+ int r;
+
+ if (!cmd) return 0;
+
+ if (cmd->stdin_prot) {
+	prot_flush(cmd->stdin_prot);
+	close(cmd->stdin_prot->fd);
+	prot_free(cmd->stdin_prot);
+ }
+
+ if (cmd->stdout_prot) {
+	close(cmd->stdout_prot->fd);
+	prot_free(cmd->stdout_prot);
+ }
+
+ r = wait_for_child(cmd->argv0, cmd->pid);
+
+ free(cmd->argv0);
+ free(cmd);
+ *cmdp = NULL;
+
+ return r;
+}
+
+EXPORTED int command_done_stdin(struct command *cmd)
+{
+ int r = 0;
+
+ if (cmd->stdin_prot) {
+	r = prot_flush(cmd->stdin_prot);
+	close(cmd->stdin_prot->fd);
+	prot_free(cmd->stdin_prot);
+	cmd->stdin_prot = NULL;
+ }
+ return r;
+}
+
+static int wait_for_child(const char *argv0, pid_t pid)
+{
+ int r = 0;
+
+ if (pid) {
+	for (;;) {
+	 int status;
+	 pid_t pr = waitpid(pid, &status, 0);
+	 if (pr < 0) {
+		if (errno == EINTR) {
+		 signals_poll();
+		 continue;
+		}
+		else if (errno == ECHILD || errno == ESRCH) {
+		 r = 0;
+		 break; /* someone else reaped the child */
+		}
+		else {
+		 syslog(LOG_ERR, "waitpid() failed: %m");
+		 r = IMAP_SYS_ERROR;
+		 break;
+		}
+	 }
+	 if (WIFEXITED(status)) {
+		r = 0;
+		if (WEXITSTATUS(status)) {
+		 syslog(LOG_ERR, "Program %s (pid %d) exited with status %d",
+			 argv0, (int)pid, WEXITSTATUS(status));
+		 r = IMAP_SYS_ERROR;
+		}
+		break;
+	 }
+	 if (WIFSIGNALED(status)) {
+		syslog(LOG_ERR, "Program %s (pid %d) died with signal %d",
+		 argv0, (int)pid, WTERMSIG(status));
+		r = IMAP_SYS_ERROR;
+		break;
+	 }
+	}
+ }
+
+ return r;
+}

cyrus-imapd-2.5.tar.gz/lib/command.h Added

@@ -0,0 +1,66 @@
+/* command.h -- utility functions to run a command
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Chris Newman
+ * Start Date: 4/6/93
+ */
+
+#ifndef INCLUDED_COMMAND_H
+#define INCLUDED_COMMAND_H
+
+#include <config.h>
+#include <sys/types.h>
+#include <stdarg.h>
+#include "prot.h"
+
+struct command {
+ char *argv0;
+ pid_t pid;
+ struct protstream *stdin_prot;
+ struct protstream *stdout_prot;
+};
+
+extern int run_command(const char *argv0, ...);
+extern int command_popen(struct command **cmdp, const char *mode, const char *argv0, ...);
+extern int command_pclose(struct command **cmdp);
+extern int command_done_stdin(struct command *);
+
+#endif /* INCLUDED_COMMAND_H */

cyrus-imapd-2.4.17.tar.gz/lib/crc32.c -> cyrus-imapd-2.5.tar.gz/lib/crc32.c Changed

@@ -10,14 +10,14 @@
 
 #include <zlib.h>
 
-uint32_t crc32_map(const char *base, unsigned len)
+EXPORTED uint32_t crc32_map(const char *base, unsigned len)
 {
 uint32_t crc = crc32(0L, Z_NULL, 0);
 crc = crc32(crc, (const unsigned char *)base, len);
 return crc;
 }
 
-uint32_t crc32_iovec(struct iovec *iov, int iovcnt)
+EXPORTED uint32_t crc32_iovec(struct iovec *iov, int iovcnt)
 {
 int n;
 uint32_t crc = crc32(0L, Z_NULL, 0);
@@ -144,7 +144,7 @@
 */
 
 
-uint32_t crc32_map(const char *base, unsigned len)
+EXPORTED uint32_t crc32_map(const char *base, unsigned len)
 {
 uint32_t crc = ~0U;
 const uint8_t *p = (const uint8_t *)base;
@@ -155,7 +155,7 @@
 return crc ^ ~0U;
 }
 
-uint32_t crc32_iovec(struct iovec *iov, int iovcnt)
+EXPORTED uint32_t crc32_iovec(struct iovec *iov, int iovcnt)
 {
 uint32_t crc = ~0U;
 int n;
@@ -173,12 +173,12 @@
 
 #endif
 
-uint32_t crc32_buf(struct buf *buf)
+EXPORTED uint32_t crc32_buf(const struct buf *buf)
 {
 return crc32_map(buf->s, buf->len);
 }
 
-uint32_t crc32_cstring(const char *buf)
+EXPORTED uint32_t crc32_cstring(const char *buf)
 {
 return crc32_map(buf, strlen(buf));
 }

cyrus-imapd-2.4.17.tar.gz/lib/crc32.h -> cyrus-imapd-2.5.tar.gz/lib/crc32.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/cyr_lock.h -> cyrus-imapd-2.5.tar.gz/lib/cyr_lock.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lock.h,v 1.9 2010/01/06 17:01:46 murch Exp $
  */
 
 #ifndef INCLUDED_LOCK_H
@@ -57,12 +55,18 @@
 
 extern const char *lock_method_desc;
 
-extern int lock_reopen P((int fd, const char *filename,
-			   struct stat *sbuf, const char **failaction));
+extern int lock_reopen (int fd, const char *filename,
+			struct stat *sbuf, const char **failaction);
+
+extern int lock_setlock (int fd, int ex, int nb, const char *filename);
+extern int lock_unlock (int fd, const char *filename);
 
-extern int lock_blocking P((int fd));
-extern int lock_shared P((int fd));
-extern int lock_nonblocking P((int fd));
-extern int lock_unlock P((int fd));
+/* compatibility defines for the older API */
+#define lock_blocking(fd, fn) \
+    lock_setlock((fd), /*exclusive*/1, /*blocking*/0, (fn))
+#define lock_nonblocking(fd, fn) \
+    lock_setlock((fd), /*exclusive*/1, /*nonblocking*/1, (fn))
+#define lock_shared(fd, fn) \
+    lock_setlock((fd), /*exclusive*/0, /*nonblocking*/0, (fn))
 
 #endif /* INCLUDED_LOCK_H */

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb.c,v 1.14 2010/01/06 17:01:44 murch Exp $
 */
 
 #include <config.h>
@@ -49,7 +47,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <errno.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -57,12 +54,25 @@
 #include <fcntl.h>
 
 #include "cyrusdb.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "libcyr_cfg.h"
-#include "retry.h"
 #include "xmalloc.h"
-
-struct cyrusdb_backend *cyrusdb_backends = {
+#include "xstrlcpy.h"
+
+/* Note that some of these may be undefined symbols
+ * if libcyrus was not built with support for them */
+extern struct cyrusdb_backend cyrusdb_berkeley;
+extern struct cyrusdb_backend cyrusdb_berkeley_nosync;
+extern struct cyrusdb_backend cyrusdb_berkeley_hash;
+extern struct cyrusdb_backend cyrusdb_berkeley_hash_nosync;
+extern struct cyrusdb_backend cyrusdb_flat;
+extern struct cyrusdb_backend cyrusdb_skiplist;
+extern struct cyrusdb_backend cyrusdb_quotalegacy;
+extern struct cyrusdb_backend cyrusdb_sql;
+extern struct cyrusdb_backend cyrusdb_twoskip;
+
+static struct cyrusdb_backend *_backends = {
 #ifdef HAVE_BDB
 &cyrusdb_berkeley,
 &cyrusdb_berkeley_nosync,
@@ -75,144 +85,409 @@
 #if defined HAVE_MYSQL || defined HAVE_PGSQL || defined HAVE_SQLITE
 &cyrusdb_sql,
 #endif
+ &cyrusdb_twoskip,
 NULL };
 
-void cyrusdb_init() 
+#define DEFAULT_BACKEND "twoskip"
+
+struct db {
+ struct dbengine *engine;
+ struct cyrusdb_backend *backend;
+};
+
+static struct cyrusdb_backend *cyrusdb_fromname(const char *name)
+{
+ int i;
+ struct cyrusdb_backend *db = NULL;
+
+ for (i = 0; _backendsi; i++) {
+	if (!strcmp(_backendsi->name, name)) {
+	 db = _backendsi; break;
+	}
+ }
+ if (!db) {
+	char errbuf1024;
+	snprintf(errbuf, sizeof(errbuf),
+		 "cyrusdb backend %s not supported", name);
+	fatal(errbuf, EC_CONFIG);
+ }
+
+ return db;
+}
+
+EXPORTED int cyrusdb_open(const char *backend, const char *fname,
+		 int flags, struct db **ret)
+{
+ const char *realname;
+ struct db *db = xzmalloc(sizeof(struct db));
+ int r;
+
+ if (!backend) backend = DEFAULT_BACKEND; /* not used yet, later */
+ db->backend = cyrusdb_fromname(backend);
+
+ /* This whole thing is a fricking critical section. We don't have the API
+ * in place for a safe rename of a locked database, so the choices are
+ * basically:
+ * a) convert each DB layer to support locked database renames while still
+ * in the transaction. Best, but lots of work.
+ * b) rename and hope... unreliable
+ * c) global lock around this block of code. Safest and least efficient.
+ */
+
+ /* check if it opens normally. Horray */
+ r = db->backend->open(fname, flags, &db->engine);
+ if (r == CYRUSDB_NOTFOUND) goto done; /* no open flags */
+ if (!r) goto done;
+
+ /* magic time - we need to work out if the file was created by a different
+ * backend and convert if possible */
+
+ realname = cyrusdb_detect(fname);
+ if (!realname) {
+	syslog(LOG_ERR, "DBERROR: failed to detect DB type for %s (backend %s) (r was %d)",
+	 fname, backend, r);
+	/* r is still set */
+	goto done;
+ }
+
+ /* different type */
+ if (strcmp(realname, backend)) {
+	if (flags & CYRUSDB_CONVERT) {
+	 r = cyrusdb_convert(fname, fname, realname, backend);
+	 if (r) {
+		syslog(LOG_ERR, "DBERROR: failed to convert %s from %s to %s, maybe someone beat us",
+		 fname, realname, backend);
+	 }
+	 else {
+		syslog(LOG_NOTICE, "cyrusdb: converted %s from %s to %s",
+		 fname, realname, backend);
+	 }
+	}
+	else {
+	 syslog(LOG_NOTICE, "cyrusdb: opening %s with backend %s (requested %s)",
+		 fname, realname, backend);
+	 db->backend = cyrusdb_fromname(realname);
+	}
+ }
+ 
+ r = db->backend->open(fname, flags, &db->engine);
+
+done:
+
+ if (r) free(db);
+ else *ret = db;
+
+ return r;
+}
+
+EXPORTED int cyrusdb_close(struct db *db)
+{
+ int r = db->backend->close(db->engine);
+
+ free(db);
+
+ return r;
+}
+
+EXPORTED int cyrusdb_fetch(struct db *db,
+	 const char *key, size_t keylen,
+	 const char **data, size_t *datalen,
+	 struct txn **mytid)
+{
+ return db->backend->fetch(db->engine, key, keylen,
+			 data, datalen, mytid);
+}
+
+EXPORTED int cyrusdb_fetchlock(struct db *db,
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
+		 struct txn **mytid)
+{
+ return db->backend->fetchlock(db->engine, key, keylen,
+				 data, datalen, mytid);
+}
+
+EXPORTED int cyrusdb_fetchnext(struct db *db,
+		 const char *key, size_t keylen,
+		 const char **found, size_t *foundlen,
+		 const char **data, size_t *datalen,
+		 struct txn **mytid)
+{
+ return db->backend->fetchnext(db->engine, key, keylen,
+				 found, foundlen,
+				 data, datalen, mytid);
+}
+
+EXPORTED int cyrusdb_foreach(struct db *db,
+	 const char *prefix, size_t prefixlen,
+	 foreach_p *p,
+	 foreach_cb *cb, void *rock,
+	 struct txn **tid)
+{
+ return db->backend->foreach(db->engine, prefix, prefixlen,
+				p, cb, rock, tid);
+}
+
+EXPORTED int cyrusdb_create(struct db *db,
+	 const char *key, size_t keylen,
+	 const char *data, size_t datalen,
+	 struct txn **tid)
+{
+ return db->backend->create(db->engine, key, keylen, data, datalen, tid);
+}
+
+EXPORTED int cyrusdb_store(struct db *db,
+	 const char *key, size_t keylen,
+	 const char *data, size_t datalen,
+	 struct txn **tid)
+{
+ return db->backend->store(db->engine, key, keylen, data, datalen, tid);
+}
+
+EXPORTED int cyrusdb_delete(struct db *db,
+	 const char *key, size_t keylen,
+	 struct txn **tid, int force)
+{
+ return db->backend->delete(db->engine, key, keylen, tid, force);
+}
+
+EXPORTED int cyrusdb_commit(struct db *db, struct txn *tid)
+{
+ return db->backend->commit(db->engine, tid);
+}
+
+EXPORTED int cyrusdb_abort(struct db *db, struct txn *tid)
+{
+ return db->backend->abort(db->engine, tid);
+}
+
+EXPORTED int cyrusdb_dump(struct db *db, int detail)
+{
+ if (!db->backend->dump) return 0;
+ return db->backend->dump(db->engine, detail);
+}
+
+EXPORTED int cyrusdb_consistent(struct db *db)
+{
+ if (!db->backend->consistent) return 0;
+ return db->backend->consistent(db->engine);
+}
+
+EXPORTED int cyrusdb_repack(struct db *db)
+{
+ if (!db->backend->repack) return 0;
+ return db->backend->repack(db->engine);
+}
+
+EXPORTED int cyrusdb_compar(struct db *db,
+		 const char *a, int alen,
+		 const char *b, int blen)
+{
+ return db->backend->compar(db->engine, a, alen, b, blen);
+}
+
+/**********************************************/
+
+EXPORTED void cyrusdb_init(void)
 {
 int i, r;
 char dbdir1024;
 const char *confdir = libcyrus_config_getstring(CYRUSOPT_CONFIG_DIR);
 int initflags = libcyrus_config_getint(CYRUSOPT_DB_INIT_FLAGS);
- 
+
 strcpy(dbdir, confdir);
 strcat(dbdir, FNAME_DBDIR);
 
- for(i=0; cyrusdb_backendsi; i++) {
-	r = (cyrusdb_backendsi)->init(dbdir, initflags);
+ for(i=0; _backendsi; i++) {
+	r = (_backendsi)->init(dbdir, initflags);
 	if(r) {
 	 syslog(LOG_ERR, "DBERROR: init() on %s",
-		 cyrusdb_backendsi->name);
+		 _backendsi->name);
 	}
 }
 }
 
-void cyrusdb_done() 
+EXPORTED void cyrusdb_done(void)
 {
 int i;
 
- for(i=0; cyrusdb_backendsi; i++) {
-	(cyrusdb_backendsi)->done();
+ for(i=0; _backendsi; i++) {
+	(_backendsi)->done();
 }
 }
 
-int cyrusdb_copyfile(const char *srcname, const char *dstname)
+EXPORTED int cyrusdb_copyfile(const char *srcname, const char *dstname)
 {
- int srcfd, dstfd;
- struct stat sbuf;
- char buf4096;
- int n;
+ return cyrus_copyfile(srcname, dstname, COPYFILE_NOLINK);
+}
 
- if ((srcfd = open(srcname, O_RDONLY)) < 0) {
-	syslog(LOG_DEBUG, "error opening %s for reading", srcname);
-	return -1;
- }
+struct db_rock {
+ struct db *db;
+ struct txn **tid;
+};
 
- if (fstat(srcfd, &sbuf) < 0) {
-	syslog(LOG_DEBUG, "error fstating %s", srcname);
-	close(srcfd);
-	return -1;
- }
+static int delete_cb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data __attribute__((unused)), 
+		 size_t datalen __attribute__((unused))) 
+{
+ struct db_rock *cr = (struct db_rock *)rock;
+ return cyrusdb_delete(cr->db, key, keylen, cr->tid, 1);
+}
 
- if ((dstfd = open(dstname, O_WRONLY | O_CREAT, sbuf.st_mode)) < 0) {
-	syslog(LOG_DEBUG, "error opening %s for writing (%d)",
-	 dstname, sbuf.st_mode);
-	close(srcfd);
-	return -1;
- }
+static int print_cb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen) 
+{
+ FILE *f = (FILE *)rock;
 
- for (;;) {
-	n = read(srcfd, buf, 4096);
+ /* XXX: improve binary safety */
+ fprintf(f, "%.*s\t%.*s\n", (int)keylen, key, (int)datalen, data);
 
-	if (n < 0) {
-	 if (errno == EINTR)
-		continue;
+ return 0;
+}
 
-	 syslog(LOG_DEBUG, "error reading buf");
-	 close(srcfd);
-	 close(dstfd);
-	 unlink(dstname);
-	 return -1;
-	}
 
-	if (n == 0)
-	 break;
+EXPORTED int cyrusdb_dumpfile(struct db *db,
+			 const char *prefix, size_t prefixlen,
+			 FILE *f,
+			 struct txn **tid)
+{
+ return cyrusdb_foreach(db, prefix, prefixlen, NULL, print_cb, f, tid);
+}
+
+EXPORTED int cyrusdb_truncate(struct db *db,
+			 struct txn **tid)
+{
+ struct db_rock tr;
+
+ tr.db = db;
+ tr.tid = tid;
+
+ return cyrusdb_foreach(db, "", 0, NULL, delete_cb, &tr, tid);
+}
+
+EXPORTED int cyrusdb_undumpfile(struct db *db,
+				FILE *f,
+				struct txn **tid)
+{
+ struct buf line = BUF_INITIALIZER;
+ const char *tab;
+ const char *str;
+ int r = 0;
+
+ while (buf_getline(&line, f)) {
+	/* skip blank lines */
+	if (!line.len) continue;
+	str = buf_cstring(&line);
+	/* skip comments */
+	if (str0 == '#') continue;
+
+	tab = strchr(str, '\t');
+
+	/* deletion (no value) */
+	if (!tab) {
+	 r = cyrusdb_delete(db, str, line.len, tid, 1);
+	 if (r) goto out;
+	}
 
-	if (retry_write(dstfd, buf, n) != n) {
-	 syslog(LOG_DEBUG, "error writing buf (%d)", n);
-	 close(srcfd);
-	 close(dstfd);
-	 unlink(dstname);
-	 return -1;
+	/* store */
+	else {
+	 unsigned klen = (tab - str);
+	 unsigned vlen = line.len - klen - 1; /* TAB */
+	 r = cyrusdb_store(db, str, klen, tab + 1, vlen, tid);
+	 if (r) goto out;
 	}
 }
 
- close(srcfd);
- close(dstfd);
- return 0;
+ out:
+ buf_free(&line);
+ return r;
 }
 
-struct convert_rock {
- struct cyrusdb_backend *backend;
- struct db *db;
- struct txn *tid;
-};
-
 static int converter_cb(void *rock,
-			const char *key, int keylen,
-			const char *data, int datalen) 
+			const char *key, size_t keylen,
+			const char *data, size_t datalen) 
 {
- struct convert_rock *cr = (struct convert_rock *)rock;
- return (cr->backend->store)(cr->db, key, keylen, data, datalen, &cr->tid);
+ struct db_rock *cr = (struct db_rock *)rock;
+ return cyrusdb_store(cr->db, key, keylen, data, datalen, cr->tid);
 }
 
 /* convert (just copy every record) from one database to another in possibly
 a different format. It's up to the surrounding code to copy the
 new database over the original if it wants to */
-void cyrusdb_convert(const char *fromfname, const char *tofname,
-		 struct cyrusdb_backend *frombackend,
-		 struct cyrusdb_backend *tobackend)
+EXPORTED int cyrusdb_convert(const char *fromfname, const char *tofname,
+		 const char *frombackend, const char *tobackend)
 {
- struct db *fromdb, *todb;
- struct convert_rock cr;
+ char *newfname = NULL;
+ struct db *fromdb = NULL;
+ struct db *todb = NULL;
+ struct db_rock cr;
 struct txn *fromtid = NULL;
+ struct txn *totid = NULL;
 int r;
 
- /* open both databases (create todb) */
- r = (frombackend->open)(fromfname, 0, &fromdb);
- if (r != CYRUSDB_OK)
-	fatal("can't open old database", EC_TEMPFAIL);
- r = (tobackend->open)(tofname, CYRUSDB_CREATE, &todb);
- if (r != CYRUSDB_OK)
-	fatal("can't open new database", EC_TEMPFAIL);
+ /* open source database */
+ r = cyrusdb_open(frombackend, fromfname, 0, &fromdb);
+ if (r) goto err;
+
+ /* use a bogus fetch to lock source DB before touching the destination */
+ r = cyrusdb_fetch(fromdb, "_", 1, NULL, NULL, &fromtid);
+ if (r == CYRUSDB_NOTFOUND) r = 0;
+ if (r) goto err;
+
+ /* same file? Create with a new name */
+ if (!strcmp(tofname, fromfname))
+	tofname = newfname = strconcat(fromfname, ".NEW", NULL);
+
+ /* remove any rubbish lying around */
+ unlink(tofname);
+
+ r = cyrusdb_open(tobackend, tofname, CYRUSDB_CREATE, &todb);
+ if (r) goto err;
 
 /* set up the copy rock */
- cr.backend = tobackend;
 cr.db = todb;
- cr.tid = NULL;
+ cr.tid = &totid;
+
+ /* copy each record to the destination DB */
+ cyrusdb_foreach(fromdb, "", 0, NULL, converter_cb, &cr, &fromtid);
+
+ /* commit destination transaction */
+ if (totid) cyrusdb_commit(todb, totid);
+ r = cyrusdb_close(todb);
+ totid = NULL;
+ todb = NULL;
+ if (r) goto err;
+
+ /* created a new filename - so it's a replace-in-place */
+ if (newfname) {
+	r = rename(newfname, fromfname);
+	if (r) goto err;
+ }
 
- /* copy each record to the destination DB (transactional for speed) */
- (frombackend->foreach)(fromdb, "", 0, NULL, converter_cb, &cr, &fromtid);
+ /* and close the source database - nothing should have
+ * written here, so an abort is fine */
+ if (fromtid) cyrusdb_abort(fromdb, fromtid);
+ cyrusdb_close(fromdb);
 
- /* commit both transactions */
- if (fromtid) (frombackend->commit)(fromdb, fromtid);
- if (cr.tid) (tobackend->commit)(todb, cr.tid);
+ free(newfname);
 
- /* and close the DBs */
- (frombackend->close)(fromdb);
- (tobackend->close)(todb);
+ return 0;
+
+err:
+ if (totid) cyrusdb_abort(todb, totid);
+ if (todb) cyrusdb_close(todb);
+ if (fromtid) cyrusdb_abort(fromdb, fromtid);
+ if (fromdb) cyrusdb_close(fromdb);
+
+ unlink(tofname);
+ free(newfname);
+
+ return r;
 }
 
-const char *cyrusdb_detect(const char *fname)
+EXPORTED const char *cyrusdb_detect(const char *fname)
 {
 FILE *f;
 char buf16;
@@ -232,6 +507,9 @@
 if (!strncmp(buf, "\241\002\213\015skiplist file\0\0\0", 16))
 	return "skiplist";
 
+ if (!strncmp(buf, "\241\002\213\015twoskip file\0\0\0\0", 16))
+	return "twoskip";
+
 bdb_magic = *(uint32_t *)(buf+12);
 
 if (bdb_magic == 0x053162) /* BDB BTREE MAGIC */
@@ -244,22 +522,88 @@
 return NULL;
 }
 
-struct cyrusdb_backend *cyrusdb_fromname(const char *name)
+EXPORTED int cyrusdb_sync(const char *backend)
 {
+ struct cyrusdb_backend *db = cyrusdb_fromname(backend);
+ return db->sync();
+}
+
+EXPORTED cyrusdb_archiver *cyrusdb_getarchiver(const char *backend)
+{
+ struct cyrusdb_backend *db = cyrusdb_fromname(backend);
+ return db->archive; /* the function used for archiving */
+}
+
+EXPORTED int cyrusdb_canfetchnext(const char *backend)
+{
+ struct cyrusdb_backend *db = cyrusdb_fromname(backend);
+ return db->fetchnext ? 1 : 0;
+}
+
+/* caller is responsible for calling strarray_free() */
+EXPORTED strarray_t *cyrusdb_backends(void)
+{
+ strarray_t *ret = strarray_new();
 int i;
- struct cyrusdb_backend *db = NULL;
 
- for (i = 0; cyrusdb_backendsi; i++) {
-	if (!strcmp(cyrusdb_backendsi->name, name)) {
-	 db = cyrusdb_backendsi; break;
-	}
+ for (i = 0; _backendsi; i++) {
+	strarray_add(ret, _backendsi->name);
 }
- if (!db) {
-	char errbuf1024;
-	snprintf(errbuf, sizeof(errbuf),
-		 "cyrusdb backend %s not supported", name);
-	fatal(errbuf, EC_CONFIG);
+
+ return ret;
+}
+
+
+/* generic backend implementations */
+
+HIDDEN int cyrusdb_generic_init(const char *dbdir __attribute__((unused)),
+			 int myflags __attribute__((unused)))
+{
+ return 0;
+}
+
+HIDDEN int cyrusdb_generic_done(void)
+{
+ return 0;
+}
+
+HIDDEN int cyrusdb_generic_sync(void)
+{
+ return 0;
+}
+
+HIDDEN int cyrusdb_generic_archive(const strarray_t *fnames,
+			 const char *dirname)
+{
+ char dstname1024, *dp;
+ int length, rest;
+ int i;
+ int r;
+ 
+ strlcpy(dstname, dirname, sizeof(dstname));
+ length = strlen(dstname);
+ dp = dstname + length;
+ rest = sizeof(dstname) - length;
+ 
+ /* archive those files specified by the app */
+ for (i = 0; i < fnames->count; i++) {
+	const char *fname = strarray_nth(fnames, i);
+	syslog(LOG_DEBUG, "archiving database file: %s", fname);
+	strlcpy(dp, strrchr(fname, '/'), rest);
+	r = cyrusdb_copyfile(fname, dstname);
+	if (r) {
+	 syslog(LOG_ERR,
+		 "DBERROR: error archiving database file: %s", fname);
+	 return CYRUSDB_IOERROR;
+	}
 }
 
- return db;
+ return 0;
 }
+
+HIDDEN int cyrusdb_generic_noarchive(const strarray_t *fnames __attribute__((unused)),
+			 const char *dirname __attribute__((unused)))
+{
+ return 0;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb.h -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb.h Changed

@@ -37,13 +37,14 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb.h,v 1.34 2010/01/06 17:01:44 murch Exp $
 */
 
 #ifndef INCLUDED_CYRUSDB_H
 #define INCLUDED_CYRUSDB_H
 
+#include <stdio.h>
+#include "strarray.h"
+
 struct db;
 struct txn;
 
@@ -69,16 +70,22 @@
 
 enum cyrusdb_openflags {
 CYRUSDB_CREATE = 0x01,	/* Create the database if not existant */
- CYRUSDB_MBOXSORT = 0x02	/* Use mailbox sort order ('.' sorts 1st) */
+ CYRUSDB_MBOXSORT = 0x02,	/* Use mailbox sort order ('.' sorts 1st) */
+ CYRUSDB_CONVERT = 0x04	/* Convert to the named format if not already */
 };
 
 typedef int foreach_p(void *rock,
-		 const char *key, int keylen,
-		 const char *data, int datalen);
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen);
 
 typedef int foreach_cb(void *rock,
-		 const char *key, int keylen,
-		 const char *data, int datalen);
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen);
+
+typedef int cyrusdb_archiver(const strarray_t *fnames,
+			 const char *dirname);
+
+struct dbengine;
 
 struct cyrusdb_backend {
 const char *name;
@@ -97,20 +104,19 @@
 
 /* archives this database environment, and specified databases
 * into the specified directory */
- int (*archive)(const char **fnames, const char *dirname);
+ int (*archive)(const strarray_t *fnames, const char *dirname);
 
 /* open the specified database in the global environment */
- int (*open)(const char *fname, int flags, struct db **ret);
+ int (*open)(const char *fname, int flags, struct dbengine **ret);
 
 /* close the specified database */
- int (*close)(struct db *db);
+ int (*close)(struct dbengine *db);
 
 /* what are the overall specifications? */
 /* 'mydb': the database to act on
- 'key': the key to fetch. cyrusdb currently requires this to not have
- any of \t\n\0 in keys
+ 'key': the key to fetch.
 'keylen': length of the key
- 'data': where to put the data (generally won't have \n\0)
+ 'data': where to put the data
 'datalen': how big is the data?
 'mytid': may be NULL, in which case the fetch is not txn protected.
 if mytid != NULL && *mytid == NULL, begins a new txn
@@ -122,15 +128,34 @@
 fetchlock() is identical to fetch() except gives a hint to the
 underlying database that the key/data being fetched will be modified
 soon. it is useless to use fetchlock() without a non-NULL mytid
+
+ If fetch returns successfully, 'data' will be filled in with a
+ non-NULL pointer to an internal buffer. The buffer is not in
+ general terminated with a \0, so you cannot use C string
+ operations on it without first making a copy (xstrndup(), or
+ buf_init_ro() plus buf_cstring(), are easy ways to do this).
+ For a zero length record 'data' will point to a zero length
+ buffer, and will *not* be NULL.
+
+ Both keys and data are binary-safe. In particular the characters
+ \0 \t \r and \n may be used in either keys or data. For flat
+ files this is achieved with an escaping mechanism. The
+ "quotalegacy" backend is designed for special legacy use only
+ and breaks this rule.
 */
- int (*fetch)(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+ int (*fetch)(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid);
- int (*fetchlock)(struct db *mydb, 
-		 const char *key, int keylen,
- 		 const char **data, int *datalen,
+ int (*fetchlock)(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid);
+ int (*fetchnext)(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **foundkey, size_t *foundkeylen,
+		 const char **data, size_t *datalen,
+		 struct txn **mytid);
 
 /* foreach: iterate through entries that start with 'prefix'
 if 'p' is NULL (always true) or returns true, call 'cb'
@@ -144,67 +169,127 @@
 to call other db routines inside of 'cb'. however, the "flat"
 backend is currently are not reentrant in this way
 unless you're using transactions and pass the same transaction
- to all db calls during the life of foreach() */
- int (*foreach)(struct db *mydb,
-		 char *prefix, int prefixlen,
+ to all db calls during the life of foreach()
+
+	The callbacks will never be called with data=NULL. For a zero
+	length record, data will point to a zero length buffer. */
+ int (*foreach)(struct dbengine *mydb,
+		 const char *prefix, size_t prefixlen,
 		 foreach_p *p,
 		 foreach_cb *cb, void *rock, 
 		 struct txn **tid);
 
- /* Place entries in database create will not overwrite existing
- * entries */
- int (*create)(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+ /* Place entries in database. create will not overwrite existing
+ * entries.
+ * Passing data=NULL or datalen=0 places a zero-length record in
+ * the database, which can be fetched back again. */
+ int (*create)(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid);
- int (*store)(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+ int (*store)(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid);
 
 /* Remove entrys from the database */
- int (*delete)(struct db *db, 
-		 const char *key, int keylen,
+ int (*delete)(struct dbengine *db, 
+		 const char *key, size_t keylen,
 		 struct txn **tid,
 		 int force); /* 1 = ignore not found errors */
 
 /* Commit the transaction. When commit() returns, the tid will no longer
 * be valid, regardless of if the commit succeeded or failed */
- int (*commit)(struct db *db, struct txn *tid);
+ int (*commit)(struct dbengine *db, struct txn *tid);
 
 /* Abort the transaction and invalidate the tid */
- int (*abort)(struct db *db, struct txn *tid);
+ int (*abort)(struct dbengine *db, struct txn *tid);
 
- int (*dump)(struct db *db, int detail);
- int (*consistent)(struct db *db);
+ int (*dump)(struct dbengine *db, int detail);
+ int (*consistent)(struct dbengine *db);
+ int (*repack)(struct dbengine *db);
+ int (*compar)(struct dbengine *db, const char *s1, int l1,
+		 const char *s2, int l2);
 };
 
-extern struct cyrusdb_backend *cyrusdb_backends;
+extern int cyrusdb_copyfile(const char *srcname, const char *dstname);
 
-/* Note that some of these may be undefined symbols
- * if libcyrus was not built with support for them */
-extern struct cyrusdb_backend cyrusdb_berkeley;
-extern struct cyrusdb_backend cyrusdb_berkeley_nosync;
-extern struct cyrusdb_backend cyrusdb_berkeley_hash;
-extern struct cyrusdb_backend cyrusdb_berkeley_hash_nosync;
-extern struct cyrusdb_backend cyrusdb_flat;
-extern struct cyrusdb_backend cyrusdb_skiplist;
-extern struct cyrusdb_backend cyrusdb_quotalegacy;
-extern struct cyrusdb_backend cyrusdb_sql;
+extern int cyrusdb_convert(const char *fromfname, const char *tofname,
+			 const char *frombackend, const char *tobackend);
 
-extern int cyrusdb_copyfile(const char *srcname, const char *dstname);
+extern int cyrusdb_dumpfile(struct db *db,
+			 const char *prefix, size_t prefixlen,
+			 FILE *f,
+			 struct txn **tid);
+extern int cyrusdb_truncate(struct db *db,
+			 struct txn **tid);
+extern int cyrusdb_undumpfile(struct db *db,
+			 FILE *f,
+			 struct txn **tid);
 
-extern void cyrusdb_convert(const char *fromfname, const char *tofname,
-			 struct cyrusdb_backend *frombackend,
-			 struct cyrusdb_backend *tobackend);
 
 extern const char *cyrusdb_detect(const char *fname);
 
 /* Start/Stop the backends */
-void cyrusdb_init();
-void cyrusdb_done();
-
-/* Configuration */
-struct cyrusdb_backend *cyrusdb_fromname(const char *name);
+void cyrusdb_init(void);
+void cyrusdb_done(void);
+
+/* direct DB interface */
+extern int cyrusdb_open(const char *backend, const char *fname,
+			int flags, struct db **ret);
+extern int cyrusdb_close(struct db *db);
+extern int cyrusdb_fetch(struct db *db,
+			 const char *key, size_t keylen,
+			 const char **data, size_t *datalen,
+			 struct txn **mytid);
+extern int cyrusdb_fetchlock(struct db *db,
+			 const char *key, size_t keylen,
+			 const char **data, size_t *datalen,
+			 struct txn **mytid);
+extern int cyrusdb_fetchnext(struct db *db,
+			 const char *key, size_t keylen,
+			 const char **found, size_t *foundlen,
+			 const char **data, size_t *datalen,
+			 struct txn **mytid);
+extern int cyrusdb_foreach(struct db *db,
+			 const char *prefix, size_t prefixlen,
+			 foreach_p *p,
+			 foreach_cb *cb, void *rock,
+			 struct txn **tid);
+int cyrusdb_create(struct db *db,
+			 const char *key, size_t keylen,
+			 const char *data, size_t datalen,
+			 struct txn **tid);
+extern int cyrusdb_store(struct db *db,
+			 const char *key, size_t keylen,
+			 const char *data, size_t datalen,
+			 struct txn **tid);
+extern int cyrusdb_delete(struct db *db,
+			 const char *key, size_t keylen,
+			 struct txn **tid, int force);
+extern int cyrusdb_commit(struct db *db, struct txn *tid);
+extern int cyrusdb_abort(struct db *db, struct txn *tid);
+extern int cyrusdb_dump(struct db *db, int detail);
+extern int cyrusdb_consistent(struct db *db);
+extern int cyrusdb_repack(struct db *db);
+extern int cyrusdb_compar(struct db *db,
+			 const char *a, int alen,
+			 const char *b, int blen);
+
+/* somewhat special case, because they don't take a DB */
+
+extern int cyrusdb_sync(const char *backend);
+extern cyrusdb_archiver *cyrusdb_getarchiver(const char *backend);
+
+extern int cyrusdb_canfetchnext(const char *backend);
+
+extern strarray_t *cyrusdb_backends(void);
+
+/* generic implementations */
+int cyrusdb_generic_init(const char *dbdir, int myflags);
+int cyrusdb_generic_done(void);
+int cyrusdb_generic_sync(void);
+int cyrusdb_generic_archive(const strarray_t *fnames, const char *dirname);
+int cyrusdb_generic_noarchive(const strarray_t *fnames, const char *dirname);
 
 #endif /* INCLUDED_CYRUSDB_H */

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb_berkeley.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb_berkeley.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb_berkeley.c,v 1.24 2010/01/06 17:01:45 murch Exp $
 */
 
 #include <config.h>
@@ -58,7 +56,9 @@
 #include "libcyr_cfg.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
+
+#define DATA(d)	 ((d)->data ? (d)->data : "")
+#define DATALEN(d) ((d)->size)
 
 extern void fatal(const char *, int);
 
@@ -97,8 +97,8 @@
 static DB_ENV *dbenv;
 
 /* other routines call this one when they fail */
-static int commit_txn(struct db *db, struct txn *tid);
-static int abort_txn(struct db *db, struct txn *tid);
+static int commit_txn(struct dbengine *db, struct txn *tid);
+static int abort_txn(struct dbengine *db, struct txn *tid);
 
 static void db_panic(DB_ENV *dbenv __attribute__((unused)),
 		 int errno __attribute__((unused)))
@@ -301,11 +301,10 @@
 return 0;
 }
 
-static int myarchive(const char **fnames, const char *dirname)
+static int myarchive(const strarray_t *fnames, const char *dirname)
 {
 int r;
- char **begin, **list;
- const char **fname;
+ char **item, **list;
 char dstname1024, *dp;
 int length, rest;
 
@@ -322,16 +321,16 @@
 	return CYRUSDB_IOERROR;
 }
 if (list != NULL) {
-	for (begin = list; *list != NULL; ++list) {
-	 syslog(LOG_DEBUG, "removing log file: %s", *list);
-	 r = unlink(*list);
+	for (item = list; *item != NULL; ++item) {
+	 syslog(LOG_DEBUG, "removing log file: %s", *item);
+	 r = unlink(*item);
 	 if (r) {
 		syslog(LOG_ERR, "DBERROR: error removing log file: %s",
-		 *list);
+		 *item);
 		return CYRUSDB_IOERROR;
 	 }
 	}
-	free (begin);
+	free (list);
 }
 
 /* Get the list of database files to archive. */
@@ -343,24 +342,21 @@
 	return CYRUSDB_IOERROR;
 }
 if (list != NULL) {
-	for (begin = list; *list != NULL; ++list) {
+	for (item = list; *item != NULL; ++item) {
 	 /* only archive those files specified by the app */
-	 for (fname = fnames; *fname != NULL; ++fname) {
-		if (!strcmp(*list, *fname)) break;
-	 }
-	 if (*fname) {
-		syslog(LOG_DEBUG, "archiving database file: %s", *fname);
-		strlcpy(dp, strrchr(*fname, '/'), rest);
-		r = cyrusdb_copyfile(*fname, dstname);
+	 if (strarray_find(fnames, *item, 0) >= 0) {
+		syslog(LOG_DEBUG, "archiving database file: %s", *item);
+		strlcpy(dp, strrchr(*item, '/'), rest);
+		r = cyrusdb_copyfile(*item, dstname);
 		if (r) {
 		 syslog(LOG_ERR,
 			 "DBERROR: error archiving database file: %s",
-			 *fname);
+			 *item);
 		 return CYRUSDB_IOERROR;
 		}
 	 }
 	}
-	free (begin);
+	free (list);
 }
 
 /* Get the list of log files to archive. */
@@ -371,17 +367,17 @@
 	return CYRUSDB_IOERROR;
 }
 if (list != NULL) {
-	for (begin = list; *list != NULL; ++list) {
-	 syslog(LOG_DEBUG, "archiving log file: %s", *list);
-	 strcpy(dp, strrchr(*list, '/'));
-	 r = cyrusdb_copyfile(*list, dstname);
+	for (item = list; *item != NULL; ++item) {
+	 syslog(LOG_DEBUG, "archiving log file: %s", *item);
+	 strcpy(dp, strrchr(*item, '/'));
+	 r = cyrusdb_copyfile(*item, dstname);
 	 if (r) {
 		syslog(LOG_ERR, "DBERROR: error archiving log file: %s",
-		 *list);
+		 *item);
 		return CYRUSDB_IOERROR;
 	 }
 	}
-	free (begin);
+	free (list);
 }
 
 return 0;
@@ -390,11 +386,11 @@
 static int mbox_compar(DB *db __attribute__((unused)),
 		 const DBT *a, const DBT *b)
 {
- return bsearch_ncompare((const char *) a->data, a->size,
-			 (const char *) b->data, b->size);
+ return bsearch_ncompare_mbox((const char *) a->data, a->size,
+				 (const char *) b->data, b->size);
 }
 
-static int myopen(const char *fname, DBTYPE type, int flags, struct db **ret)
+static int myopen(const char *fname, DBTYPE type, int flags, struct dbengine **ret)
 {
 DB *db = NULL;
 int r;
@@ -428,22 +424,22 @@
 	return CYRUSDB_IOERROR;
 }
 
- *ret = (struct db *) db;
+ *ret = (struct dbengine *) db;
 
 return r;
 }
 
-static int open_btree(const char *fname, int flags, struct db **ret)
+static int open_btree(const char *fname, int flags, struct dbengine **ret)
 {
 return myopen(fname, DB_BTREE, flags, ret);
 }
 
-static int open_hash(const char *fname, int flags, struct db **ret)
+static int open_hash(const char *fname, int flags, struct dbengine **ret)
 {
 return myopen(fname, DB_HASH, flags, ret);
 }
 
-static int myclose(struct db *db)
+static int myclose(struct dbengine *db)
 {
 int r;
 DB *a = (DB *) db;
@@ -460,7 +456,7 @@
 return r;
 }
 
-static int gettid(struct txn **mytid, DB_TXN **tid, char *where)
+static int gettid(struct txn **mytid, DB_TXN **tid, const char *where)
 {
 int r;
 
@@ -488,9 +484,9 @@
 return 0;
 }
 
-static int myfetch(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int myfetch(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid, int flags)
 {
 int r = 0;
@@ -515,8 +511,8 @@
 r = db->get(db, tid, &k, &d, flags);
 switch (r) {
 case 0:
-	if (data) *data = d.data;
-	if (datalen) *datalen = d.size;
+	if (data) *data = DATA(&d);
+	if (datalen) *datalen = DATALEN(&d);
 	break;
 case DB_NOTFOUND:
 	r = CYRUSDB_NOTFOUND;
@@ -538,17 +534,17 @@
 return r;
 }
 
-static int fetch(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetch(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid)
 {
 return myfetch(mydb, key, keylen, data, datalen, mytid, 0);
 }
 
-static int fetchlock(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetchlock(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid)
 {
 return myfetch(mydb, key, keylen, data, datalen, mytid, DB_RMW);
@@ -577,8 +573,8 @@
 
 /* instead of "DB_DBT_REALLOC", we might want DB_DBT_USERMEM and allocate
 this to the maximum length at the beginning. */
-static int foreach(struct db *mydb,
-		 char *prefix, int prefixlen,
+static int foreach(struct dbengine *mydb,
+		 const char *prefix, size_t prefixlen,
 		 foreach_p *goodp,
 		 foreach_cb *cb, void *rock, 
 		 struct txn **mytid)
@@ -612,28 +608,31 @@
 /* find first record */
 if (prefix && *prefix) {
 	/* if (k.data) free(k.data); */
-	k.data = prefix;
+	k.data = (char *)prefix;
 	k.size = prefixlen;
 
 	r = cursor->c_get(cursor, &k, &d, DB_SET_RANGE);
 } else {
 	r = cursor->c_get(cursor, &k, &d, DB_FIRST);
+	prefixlen = 0;
 }
 if (!tid && r == DB_LOCK_DEADLOCK) goto restart;
 	
 /* iterate over all mailboxes matching prefix */
 while (!r) {
 	/* does this match our prefix? */
-	if (prefixlen && memcmp(k.data, prefix, prefixlen)) break;
+	if (prefixlen &&
+	 !(k.size >= prefixlen &&
+	 !memcmp(k.data, prefix, prefixlen))) break;
 
-	if (!goodp || goodp(rock, k.data, k.size, d.data, d.size)) {
+	if (!goodp || goodp(rock, k.data, k.size, DATA(&d), DATALEN(&d))) {
 	 /* we have a winner! */
 
 	 /* close the cursor, so we're not holding locks 
 	 during a callback */
 	 CLOSECURSOR(); cursor = NULL;
 
-	 r = cb(rock, k.data, k.size, d.data, d.size);
+	 r = cb(rock, k.data, k.size, DATA(&d), DATALEN(&d));
 if (r != 0) {
 if (r < 0) {
 syslog(LOG_ERR, "DBERROR: foreach cb() failed");
@@ -725,9 +724,9 @@
 return r;
 }
 
-static int mystore(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int mystore(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **mytid, int putflags, int txnflags)
 {
 int r = 0;
@@ -737,6 +736,8 @@
 
 assert(dbinit && db);
 assert(key && keylen);
+ if (!data)
+	datalen = 0;
 
 r = gettid(mytid, &tid, "mystore");
 if (r) return r;
@@ -806,41 +807,41 @@
 return r;
 }
 
-static int create(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int create(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, DB_NOOVERWRITE, 0);
 }
 
-static int store(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int store(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 0, 0);
 }
 
-static int create_nosync(struct db *db, 
-			 const char *key, int keylen,
-			 const char *data, int datalen,
+static int create_nosync(struct dbengine *db, 
+			 const char *key, size_t keylen,
+			 const char *data, size_t datalen,
 			 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, DB_NOOVERWRITE,
 		 DB_TXN_NOSYNC);
 }
 
-static int store_nosync(struct db *db, 
-			const char *key, int keylen,
-			const char *data, int datalen,
+static int store_nosync(struct dbengine *db, 
+			const char *key, size_t keylen,
+			const char *data, size_t datalen,
 			struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 0, DB_TXN_NOSYNC);
 }
 
-static int mydelete(struct db *mydb, 
-		 const char *key, int keylen,
+static int mydelete(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
 		 struct txn **mytid, int txnflags, int force)
 {
 int r = 0;
@@ -917,21 +918,21 @@
 return r;
 }
 
-static int delete(struct db *db, 
-		 const char *key, int keylen,
+static int delete(struct dbengine *db, 
+		 const char *key, size_t keylen,
 		 struct txn **tid, int force)
 {
 return mydelete(db, key, keylen, tid, 0, force);
 }
 
-static int delete_nosync(struct db *db, 
-			 const char *key, int keylen,
+static int delete_nosync(struct dbengine *db, 
+			 const char *key, size_t keylen,
 			 struct txn **tid, int force)
 {
 return mydelete(db, key, keylen, tid, DB_TXN_NOSYNC, force);
 }
 
-static int mycommit(struct db *db __attribute__((unused)),
+static int mycommit(struct dbengine *db __attribute__((unused)),
 		 struct txn *tid, int txnflags)
 {
 int r;
@@ -960,17 +961,17 @@
 return r;
 }
 
-static int commit_txn(struct db *db, struct txn *tid)
+static int commit_txn(struct dbengine *db, struct txn *tid)
 {
 return mycommit(db, tid, 0);
 }
 
-static int commit_nosync(struct db *db, struct txn *tid)
+static int commit_nosync(struct dbengine *db, struct txn *tid)
 {
 return mycommit(db, tid, DB_TXN_NOSYNC);
 }
 
-static int abort_txn(struct db *db __attribute__((unused)),
+static int abort_txn(struct dbengine *db __attribute__((unused)),
 		 struct txn *tid)
 {
 int r;
@@ -991,7 +992,32 @@
 return 0;
 }
 
-struct cyrusdb_backend cyrusdb_berkeley = 
+static int mycompar(struct dbengine *mydb
+#if ((DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 8)))
+		 ,
+		 const char *a, int alen,
+		 const char *b, int blen)
+{
+ DB *db = (DB *) mydb;
+ int (*funcp)(DB *, const DBT *, const DBT *) = NULL;
+
+ db->get_bt_compare(db, &funcp);
+
+ if (funcp == mbox_compar)
+	return bsearch_ncompare_mbox(a, alen, b, blen);
+ else
+#else
+		 __attribute__((unused)),
+		 const char *a, int alen,
+		 const char *b, int blen)
+{
+#endif
+	return bsearch_ncompare_raw(a, alen, b, blen);
+
+}
+
+
+HIDDEN struct cyrusdb_backend cyrusdb_berkeley =
 {
 "berkeley",			/* name */
 
@@ -1005,6 +1031,8 @@
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &foreach,
 &create,
 &store,
@@ -1014,10 +1042,12 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };
 
-struct cyrusdb_backend cyrusdb_berkeley_nosync = 
+HIDDEN struct cyrusdb_backend cyrusdb_berkeley_nosync =
 {
 "berkeley-nosync",		/* name */
 
@@ -1031,6 +1061,8 @@
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &foreach,
 &create_nosync,
 &store_nosync,
@@ -1040,10 +1072,12 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };
 
-struct cyrusdb_backend cyrusdb_berkeley_hash = 
+HIDDEN struct cyrusdb_backend cyrusdb_berkeley_hash =
 {
 "berkeley-hash",		/* name */
 
@@ -1057,6 +1091,8 @@
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &foreach,
 &create,
 &store,
@@ -1066,10 +1102,12 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };
 
-struct cyrusdb_backend cyrusdb_berkeley_hash_nosync = 
+HIDDEN struct cyrusdb_backend cyrusdb_berkeley_hash_nosync =
 {
 "berkeley-hash-nosync",	/* name */
 
@@ -1083,6 +1121,8 @@
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &foreach,
 &create_nosync,
 &store_nosync,
@@ -1092,5 +1132,7 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb_flat.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb_flat.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb_flat.c,v 1.40 2010/01/06 17:01:45 murch Exp $
 */
 
 #include <config.h>
@@ -59,7 +57,6 @@
 
 #include "assert.h"
 #include "cyrusdb.h"
-#include "exitcodes.h"
 #include "map.h"
 #include "bsearch.h"
 #include "cyr_lock.h"
@@ -71,24 +68,102 @@
 
 /* we have the file locked iff we have an outstanding transaction */
 
-struct db {
+struct dbengine {
 char *fname;
+ struct dbengine *next;
+ int refcount;
 
 int fd;			/* current file open */
 ino_t ino;
 
 const char *base;		/* contents of file */
- unsigned long size;		/* actual size */
- unsigned long len;		/* mapped size */
+ size_t size;		/* actual size */
+ size_t len;		/* mapped size */
+
+ struct buf data;		/* returned storage for fetch */
 };
+#define DATA(db)	((db)->data.s ? (db)->data.s : "")
+#define DATALEN(db)	((db)->data.len)
 
 struct txn {
 char *fnamenew;
 int fd;
 };
 
+static struct dbengine *alldbs;
+
+/*
+ * We choose an escape character which is an invalid UTF-8 encoding and
+ * thus unlikely to appear in the key or data unless they are completely
+ * non-textual.
+ */
+#define ESCAPE	 0xff
+
+static void encode(const char *ps, int len, struct buf *buf)
+{
+ const unsigned char *p = (const unsigned char *)ps;
+
+ buf_reset(buf);
+ /* allocate enough space plus a little slop to cover
+ * escaping a few characters */
+ buf_ensure(buf, len+10);
+
+ for ( ; len > 0 ; len--, p++) {
+	switch (*p) {
+	case '\0':
+	case '\t':
+	case '\r':
+	case '\n':
+	 buf_putc(buf, ESCAPE);
+	 buf_putc(buf, 0x80|(*p));
+	 break;
+	case ESCAPE:
+	 buf_putc(buf, ESCAPE);
+	 buf_putc(buf, ESCAPE);
+	 break;
+	default:
+	 buf_putc(buf, *p);
+	 break;
+	}
+ }
+
+ /* ensure the buf is NUL-terminated; we pass the buf's data to
+ * bsearch_mem(), which expects a C string, several times */
+ buf_cstring(buf);
+}
+
+static void decode(const char *ps, int len, struct buf *buf)
+{
+ const unsigned char *p = (const unsigned char *)ps;
+
+ buf_reset(buf);
+ /* allocate enough space; we don't need slop because
+ * decoding can only shrink the result */
+ buf_ensure(buf, len);
+
+ for ( ; len > 0 ; len--, p++) {
+	if (*p == ESCAPE) {
+	 if (len < 2) {
+		/* invalid encoding, silently ignore */
+		continue;
+	 }
+	 len--;
+	 p++;
+	 if (*p == ESCAPE)
+		buf_putc(buf, ESCAPE);
+	 else
+		buf_putc(buf, (*p) & ~0x80);
+	}
+	else
+	 buf_putc(buf, *p);
+ }
+ /* Note: buf is not NUL-terminated. It happens that neither
+ * skiplist nor berkeley backends guarantee any such thing,
+ * and so code that depends on it is quite broken anyway */
+}
+
 /* other routines call this one when they fail */
-static int abort_txn(struct db *db, struct txn *tid)
+static int abort_txn(struct dbengine *db, struct txn *tid)
 {
 int r = CYRUSDB_OK;
 int rw = 0;
@@ -104,7 +179,7 @@
 }
 
 /* release lock */
- r = lock_unlock(db->fd);
+ r = lock_unlock(db->fd, db->fname);
 if (r == -1) {
 	syslog(LOG_ERR, "IOERROR: unlocking db %s: %m", db->fname);
 	r = CYRUSDB_IOERROR;
@@ -129,14 +204,28 @@
 return 0;
 }
 
-static void free_db(struct db *db)
+static void free_db(struct dbengine *db)
 {
 if (db) {
-	if (db->fname) free(db->fname);
+	free(db->fname);
+	buf_free(&db->data);
 	free(db);
 }
 }
 
+static struct dbengine *find_db(const char *fname)
+{
+ struct dbengine *db;
+
+ for (db = alldbs ; db ; db = db->next) {
+	if (!strcmp(fname, db->fname)) {
+	 db->refcount++;
+	 return db;
+	}
+ }
+ return NULL;
+}
+
 static struct txn *new_txn(void)
 {
 struct txn *ret = (struct txn *) xmalloc(sizeof(struct txn));
@@ -145,65 +234,36 @@
 return ret;
 }
 
-static int init(const char *dbdir __attribute__((unused)),
-		int myflags __attribute__((unused)))
-{
- return 0;
-}
-
-static int done(void)
-{
- return 0;
-}
-
-static int mysync(void)
-{
- return 0;
-}
-
-static int myarchive(const char **fnames, const char *dirname)
-{
- int r, d_length, d_remain;
- const char **fname;
- char dstname1024, *dp;
-
- strlcpy(dstname, dirname, sizeof(dstname));
- d_length = strlen(dstname);
- dp = dstname + d_length;
- d_remain = sizeof(dstname)-d_length;
-
- /* archive those files specified by the app */
- for (fname = fnames; *fname != NULL; ++fname) {
-	syslog(LOG_DEBUG, "archiving database file: %s", *fname);
-	strlcpy(dp, strrchr(*fname, '/'), d_remain);
-	r = cyrusdb_copyfile(*fname, dstname);
-	if (r) {
-	 syslog(LOG_ERR,
-		 "DBERROR: error archiving database file: %s", *fname);
-	 return CYRUSDB_IOERROR;
-	}
- }
 
- return 0;
-}
 
-static int myopen(const char *fname, int flags, struct db **ret)
+static int myopen(const char *fname, int flags, struct dbengine **ret)
 {
- struct db *db = (struct db *) xzmalloc(sizeof(struct db));
+ struct dbengine *db;
 struct stat sbuf;
 
 assert(fname && ret);
 
- db->fd = open(fname, O_RDWR, 0644);
- if (db->fd == -1 && errno == ENOENT && (flags & CYRUSDB_CREATE)) {
-	if (cyrus_mkdir(fname, 0755) == -1) return CYRUSDB_IOERROR;
+ db = find_db(fname);
+ if (db)
+	goto out; /* new reference to existing db */
+
+ db = (struct dbengine *) xzmalloc(sizeof(struct dbengine));
 
+ db->fd = open(fname, O_RDWR, 0644);
+ if (db->fd == -1 && errno == ENOENT) {
+	if (!(flags & CYRUSDB_CREATE)) {
+	 free_db(db);
+	 return CYRUSDB_NOTFOUND;
+	}
+	if (cyrus_mkdir(fname, 0755) == -1) {
+	 free_db(db);
+	 return CYRUSDB_IOERROR;
+	}
 	db->fd = open(fname, O_RDWR | O_CREAT, 0644);
 }
 
 if (db->fd == -1) {
-	int level = (flags & CYRUSDB_CREATE) ? LOG_ERR : LOG_DEBUG;
-	syslog(level, "IOERROR: opening %s: %m", fname);
+	syslog(LOG_ERR, "IOERROR: opening %s: %m", fname);
 	free_db(db);
 	return CYRUSDB_IOERROR;
 }
@@ -221,15 +281,35 @@
 db->size = sbuf.st_size;
 
 db->fname = xstrdup(fname);
+ db->refcount = 1;
+
+ /* prepend to the list */
+ db->next = alldbs;
+ alldbs = db;
 
+out:
 *ret = db;
 return 0;
 }
 
-static int myclose(struct db *db)
+static int myclose(struct dbengine *db)
 {
- assert(db);
+ struct dbengine **prevp;
 
+ assert(db);
+ if (--db->refcount > 0)
+	return 0;
+ /* now we are dropping the last reference */
+
+ /* detach from the list of all dbs */
+ for (prevp = &alldbs ;
+	 *prevp && *prevp != db ;
+	 prevp = &(*prevp)->next)
+	;
+ assert(*prevp == db); /* this struct must be in the list */
+ *prevp = db->next;
+
+ /* clean up the internals */
 map_free(&db->base, &db->len);
 close(db->fd);
 free_db(db);
@@ -237,7 +317,7 @@
 return 0;
 }
 
-static int starttxn_or_refetch(struct db *db, struct txn **mytid)
+static int starttxn_or_refetch(struct dbengine *db, struct txn **mytid)
 {
 int r = 0;
 struct stat sbuf;
@@ -302,14 +382,15 @@
 return 0;
 }
 
-static int myfetch(struct db *db, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int myfetch(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid)
 {
 int r = 0;
 int offset;
 unsigned long len;
+ struct buf keybuf = BUF_INITIALIZER;
 
 assert(db);
 
@@ -319,99 +400,122 @@
 r = starttxn_or_refetch(db, mytid);
 if (r) return r;
 
- offset = bsearch_mem(key, 1, db->base, db->size, 0, &len);
+ encode(key, keylen, &keybuf);
+
+ offset = bsearch_mem_mbox(keybuf.s, db->base, db->size, 0, &len);
+
 if (len) {
-	if (data) *data = db->base + offset + keylen + 1;
-	/* subtract one for \t, and one for the \n */
-	if (data) *datalen = len - keylen - 2;
+	if (data) {
+	 decode(db->base + offset + keybuf.len + 1,
+		 /* subtract one for \t, and one for the \n */
+		 len - keybuf.len - 2,
+		 &db->data);
+	 if (data) *data = DATA(db);
+	 if (datalen) *datalen = DATALEN(db);
+	}
 } else {
 	r = CYRUSDB_NOTFOUND;
 }
 
+ buf_free(&keybuf);
 return r;
 }
 
-static int fetch(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetch(struct dbengine *mydb, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid)
 {
 return myfetch(mydb, key, keylen, data, datalen, mytid);
 }
 
-static int fetchlock(struct db *db, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetchlock(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **mytid)
 {
 return myfetch(db, key, keylen, data, datalen, mytid);
 }
 
-#define GETENTRY(p)			\
- key = p;				\
- data = strchr(key, '\t');		\
- 					\
- if (!data) {			\
- 	/* huh, might be corrupted? */	\
- 	r = CYRUSDB_IOERROR;		\
- 	break;				\
- }					\
- keylen = data - key;		\
- data++; /* skip of the \t */	\
- 					\
- dataend = strchr(data, '\n');	\
- if (!dataend) {			\
- 	/* huh, might be corrupted? */	\
- 	r = CYRUSDB_IOERROR;		\
- 	break;				\
- }					\
- datalen = dataend - data;
-
-static int foreach(struct db *db,
-		 char *prefix, int prefixlen,
+static int getentry(struct dbengine *db, const char *p,
+		 struct buf *keybuf, const char **dataendp)
+{
+ const char *key;
+ int keylen;
+ const char *data;
+ const char *dataend;
+ int datalen;
+
+ key = p;
+ data = strchr(p, '\t');
+ if (!data) {
+	/* huh, might be corrupted? */
+	return CYRUSDB_IOERROR;
+ }
+ keylen = data - key;
+ data++; /* skip the \t */
+ dataend = strchr(data, '\n');
+ if (!dataend) {
+	/* huh, might be corrupted? */
+	return CYRUSDB_IOERROR;
+ }
+ datalen = dataend - data;
+
+ decode(data, datalen, &db->data);
+ decode(key, keylen, keybuf);
+ *dataendp = dataend;
+
+ return 0;
+}
+
+#define GETENTRY(p)				\
+ r = getentry(db, p, &keybuf, &dataend);	\
+ if (r) break;
+
+static int foreach(struct dbengine *db,
+		 const char *prefix, size_t prefixlen,
 		 foreach_p *goodp,
-		 foreach_cb *cb, void *rock, 
+		 foreach_cb *cb, void *rock,
 		 struct txn **mytid)
 {
 int r = CYRUSDB_OK;
 int offset;
 unsigned long len;
 const char *p, *pend;
+ const char *dataend;
 
 /* for use inside the loop, but we need the values to be retained
 * from loop to loop */
- const char *key = NULL;
- size_t keylen = 0;
- const char *data = NULL, *dataend = NULL;
- size_t datalen = 0;
+ struct buf keybuf = BUF_INITIALIZER;
 int dontmove = 0;
 
 /* For when we have a transaction running */
- char *savebuf = NULL;
- size_t savebuflen = 0;
- size_t savebufsize = 0;
+ struct buf savebuf = BUF_INITIALIZER;
 
 /* for the local iteration so that the db can change out from under us */
 const char *dbbase = NULL;
- unsigned long dblen = 0;
+ size_t dblen = 0;
 int dbfd = -1;
 
+ struct buf prefixbuf = BUF_INITIALIZER;
+
 r = starttxn_or_refetch(db, mytid);
 if (r) return r;
 
- if(!mytid) {
+ if (!mytid) {
 	/* No transaction, use the fast method to avoid stomping on our
 	 * memory map if changes happen */
 	dbfd = dup(db->fd);
 	if(dbfd == -1) return CYRUSDB_IOERROR;
-	
+
 	map_refresh(dbfd, 1, &dbbase, &dblen, db->size, db->fname, 0);
 
 	/* drop our read lock on the file, since we don't really care
 	 * if it gets replaced out from under us, our mmap stays on the
 	 * old version */
-	lock_unlock(db->fd);
- } else {
+	lock_unlock(db->fd, db->fname);
+ }
+ else {
 	/* use the same variables as in the no transaction case, just to
 	 * get things set up */
 	dbbase = db->base;
@@ -419,100 +523,85 @@
 }
 
 if (prefix) {
-	char *realprefix;
-	if(prefixprefixlen != '\0') {
-	 realprefix = xmalloc(prefixlen+1);
-	 memcpy(realprefix, prefix, prefixlen);
-	 realprefixprefixlen = '\0';
-	} else {
-	 realprefix = prefix;
-	}
-	offset = bsearch_mem(realprefix, 1, dbbase, db->size, 0, &len);
-
-	if(prefixprefixlen != '\0') free(realprefix);
- } else {
+	encode(prefix, prefixlen, &prefixbuf);
+	offset = bsearch_mem_mbox(prefixbuf.s, dbbase, db->size, 0, &len);
+ }
+ else {
 	offset = 0;
 }
- 
+
 p = dbbase + offset;
 pend = dbbase + db->size;
 
 while (p < pend) {
-	if(!dontmove) {
+	if (!dontmove) {
 	 GETENTRY(p)
 	}
 	else dontmove = 0;
-	
+
 	/* does it still match prefix? */
-	if (keylen < (size_t) prefixlen) break;
-	if (prefixlen && memcmp(key, prefix, prefixlen)) break;
+	if (keybuf.len < (size_t) prefixbuf.len) break;
+	if (prefixbuf.len && memcmp(keybuf.s, prefixbuf.s, prefixbuf.len)) break;
 
-	if (!goodp || goodp(rock, key, keylen, data, datalen)) {
+	if (!goodp || goodp(rock, keybuf.s, keybuf.len, DATA(db), DATALEN(db))) {
 	 unsigned long ino = db->ino;
- 	 unsigned long sz = db->size;
+	 unsigned long sz = db->size;
 
 	 if(mytid) {
 		/* transaction present, this means we do the slow way */
-		if (!savebuf || keylen > savebuflen) {
-		 int dblsize = 2 * savebuflen;
-		 int addsize = keylen + 32;
-		 
-		 savebuflen = (dblsize > addsize) ? dblsize : addsize;
-		 savebuf = xrealloc(savebuf, savebuflen);
-		}
-		memcpy(savebuf, key, keylen);
-		savebufkeylen = '\0';
-		savebufsize = keylen;
+		buf_copy(&savebuf, &keybuf);
 	 }
-	 
+
 	 /* make callback */
-	 r = cb(rock, key, keylen, data, datalen);
+	 r = cb(rock, keybuf.s, keybuf.len, DATA(db), DATALEN(db));
 	 if (r) break;
 
-	 if(mytid) {
+	 if (mytid) {
 		/* reposition? (we made a change) */
 		if (!(ino == db->ino && sz == db->size)) {
 		 /* something changed in the file; reseek */
-		 offset = bsearch_mem(savebuf, 1, db->base, db->size,
-					 0, &len);
+		 buf_cstring(&savebuf);
+		 offset = bsearch_mem_mbox(savebuf.s, db->base, db->size,
+					 0, &len);
 		 p = db->base + offset;
-		 
+
 		 GETENTRY(p);
-		 
+
 		 /* 'key' might not equal 'savebuf'. if it's different,
 		 we want to stay where we are. if it's the same, we
 		 should move on to the next one */
-		 if (savebufsize == keylen &&
-			!memcmp(savebuf, key, savebufsize)) {
+		 if (!buf_cmp(&savebuf, &keybuf)) {
 			p = dataend + 1;
-		 } else {
+		 }
+		 else {
 			/* 'savebuf' got deleted, so we're now pointing at the
 			 right thing */
 			dontmove = 1;
 		 }
-		}	
+		}
 	 }
 	}
 
 	p = dataend + 1;
 }
 
- if(!mytid) {
+ if (!mytid) {
 	/* cleanup the fast method */
 	map_free(&dbbase, &dblen);
 	close(dbfd);
- } else if(savebuf) {
-	free(savebuf);
 }
 
+ buf_free(&savebuf);
+ buf_free(&keybuf);
+ buf_free(&prefixbuf);
 return r;
 }
 
 #undef GETENTRY
 
-static int mystore(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int mystore(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **mytid, int overwrite)
 {
 int r = 0;
@@ -524,7 +613,8 @@
 struct iovec iov10;
 int niov;
 struct stat sbuf;
- char *tmpkey = NULL;
+ struct buf keybuf = BUF_INITIALIZER;
+ struct buf databuf = BUF_INITIALIZER;
 
 /* lock file, if needed */
 if (!mytid || !*mytid) {
@@ -547,21 +637,16 @@
 	}
 }
 
- /* if we need to truncate the key, do so */
- if(keykeylen != '\0') {
-	tmpkey = xmalloc(keylen + 1);
-	memcpy(tmpkey, key, keylen);
-	tmpkeykeylen = '\0';
-	key = tmpkey;
- }
+ encode(key, keylen, &keybuf);
 
 /* find entry, if it exists */
- offset = bsearch_mem(key, 1, db->base, db->size, 0, &len);
+ offset = bsearch_mem_mbox(keybuf.s, db->base, db->size, 0, &len);
 
 /* overwrite? */
 if (len && !overwrite) {
 	if (mytid) abort_txn(db, *mytid);
-	if (tmpkey) free(tmpkey);
+	buf_free(&keybuf);
+	buf_free(&databuf);
 	return CYRUSDB_EXISTS;
 }
 
@@ -578,7 +663,8 @@
 if (r < 0) {
 syslog(LOG_ERR, "opening %s for writing failed: %m", fnamebuf);
 	if (mytid) abort_txn(db, *mytid);
-	if (tmpkey) free(tmpkey);
+	buf_free(&keybuf);
+	buf_free(&databuf);
 	return CYRUSDB_IOERROR;
 }
 
@@ -589,9 +675,10 @@
 
 if (data) {
 	/* new entry */
-	WRITEV_ADD_TO_IOVEC(iov, niov, (char *) key, keylen);
+	encode(data, datalen, &databuf);
+	WRITEV_ADD_TO_IOVEC(iov, niov, keybuf.s, keybuf.len);
 	WRITEV_ADD_TO_IOVEC(iov, niov, "\t", 1);
-	WRITEV_ADD_TO_IOVEC(iov, niov, (char *) data, datalen);
+	WRITEV_ADD_TO_IOVEC(iov, niov, databuf.s, databuf.len);
 	WRITEV_ADD_TO_IOVEC(iov, niov, "\n", 1);
 }
 
@@ -606,6 +693,8 @@
 	syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
 	close(writefd);
 	if (mytid) abort_txn(db, *mytid);
+	buf_free(&keybuf);
+	buf_free(&databuf);
 return CYRUSDB_IOERROR;
 }
 r = 0;
@@ -630,7 +719,8 @@
 	 rename(fnamebuf, db->fname) == -1) {
 	 syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
 	 close(writefd);
-	 if (tmpkey) free(tmpkey);
+	 buf_free(&keybuf);
+	 buf_free(&databuf);
 	 return CYRUSDB_IOERROR;
 	}
 
@@ -638,7 +728,7 @@
 	db->fd = writefd;
 
 	/* release lock */
-	r = lock_unlock(db->fd);
+	r = lock_unlock(db->fd, db->fname);
 	if (r == -1) {
 	 syslog(LOG_ERR, "IOERROR: unlocking db %s: %m", db->fname);
 	 r = CYRUSDB_IOERROR;
@@ -651,35 +741,44 @@
 	db->size = sbuf.st_size;
 }
 
- if(tmpkey) free(tmpkey);
- 
+ buf_free(&keybuf);
+ buf_free(&databuf);
+
 return r;
 }
 
-static int create(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int create(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
+ if (!data) {
+	data = "";
+	datalen = 0;
+ }
 return mystore(db, key, keylen, data, datalen, tid, 0);
 }
 
-static int store(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int store(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
+ if (!data) {
+	data = "";
+	datalen = 0;
+ }
 return mystore(db, key, keylen, data, datalen, tid, 1);
 }
 
-static int delete(struct db *db, 
-		 const char *key, int keylen,
+static int delete(struct dbengine *db, 
+		 const char *key, size_t keylen,
 		 struct txn **mytid, int force __attribute__((unused)))
 {
 return mystore(db, key, keylen, NULL, 0, mytid, 1);
 }
 
-static int commit_txn(struct db *db, struct txn *tid)
+static int commit_txn(struct dbengine *db, struct txn *tid)
 {
 int writefd;
 int r = 0;
@@ -708,7 +807,7 @@
 } else {
 	/* read-only txn */
 	/* release lock */
-	r = lock_unlock(db->fd);
+	r = lock_unlock(db->fd, db->fname);
 	if (r == -1) {
 	 syslog(LOG_ERR, "IOERROR: unlocking db %s: %m", db->fname);
 	 r = CYRUSDB_IOERROR;
@@ -719,20 +818,30 @@
 return r;
 }
 
-struct cyrusdb_backend cyrusdb_flat = 
+/* flat database is always mbox sort order */
+static int mycompar(struct dbengine *db __attribute__((unused)),
+		 const char *a, int alen,
+		 const char *b, int blen)
+{
+ return bsearch_ncompare_mbox(a, alen, b, blen);
+}
+
+EXPORTED struct cyrusdb_backend cyrusdb_flat =
 {
 "flat",			/* name */
 
- &init,
- &done,
- &mysync,
- &myarchive,
+ &cyrusdb_generic_init,
+ &cyrusdb_generic_done,
+ &cyrusdb_generic_sync,
+ &cyrusdb_generic_archive,
 
 &myopen,
 &myclose,
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &foreach,
 &create,
 &store,
@@ -742,5 +851,7 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb_quotalegacy.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb_quotalegacy.c Changed

@@ -38,8 +38,15 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb_quotalegacy.c,v 1.21 2010/01/06 17:01:45 murch Exp $
+ */
+
+/* FILE FORMAT:
+ * used\nlimit\n
+ * where used is a 64 bit unsigned value in bytes
+ * limit is a 32 bit signed value in kilobytes (1024 bytes)
+ * special value: -1 means unlimited quota
+ * then there's some extra rubbish for multiple quotas
+ * and finally there's the dlist file format, which just plain sucks less
 */
 
 #include <config.h>
@@ -82,11 +89,11 @@
 #include "map.h"
 #include "libcyr_cfg.h"
 #include "cyr_lock.h"
-#include "retry.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
 #include "xstrlcat.h"
+#include "strarray.h"
 
 #define FNAME_QUOTADIR "/quota/"
 #define MAX_QUOTA_PATH 4096
@@ -105,12 +112,12 @@
 struct txn {
 hash_table table;	/* hash table of sub-transactions */
 
- int (*proc)(char *, struct subtxn *); /* commit/abort procedure */
+ int (*proc)(const char *, struct subtxn *); /* commit/abort procedure */
 
 int result;		/* final result of the commit/abort */
 };
 
-struct db {
+struct dbengine {
 char *path;
 
 char *data;		/* allocated buffer for fetched data */
@@ -121,7 +128,7 @@
 int (*compar) (const void *s1, const void *s2);
 };
 
-static int abort_txn(struct db *db __attribute__((unused)), struct txn *tid);
+static int abort_txn(struct dbengine *db __attribute__((unused)), struct txn *tid);
 static int compar_qr(const void *v1, const void *v2);
 static int compar_qr_mbox(const void *v1, const void *v2);
 
@@ -190,7 +197,7 @@
 }
 
 /* other routines call this one when they fail */
-static int abort_subtxn(char *fname, struct subtxn *tid)
+static int abort_subtxn(const char *fname, struct subtxn *tid)
 {
 int r = CYRUSDB_OK;
 
@@ -208,7 +215,7 @@
 
 if (tid->fd != -1) {
 	/* release lock */
-	r = lock_unlock(tid->fd);
+	r = lock_unlock(tid->fd, fname);
 	if (r == -1) {
 	 syslog(LOG_ERR, "IOERROR: unlocking %s: %m", fname);
 	 r = CYRUSDB_IOERROR;
@@ -227,7 +234,7 @@
 return r;
 }
 
-static int commit_subtxn(char *fname, struct subtxn *tid)
+static int commit_subtxn(const char *fname, struct subtxn *tid)
 {
 int writefd;
 int r = 0;
@@ -241,7 +248,7 @@
 	if (fsync(writefd) ||
 	 fstat(writefd, &sbuf) == -1 ||
 	 rename(tid->fnamenew, fname) == -1 ||
-	 lock_unlock(writefd) == -1) {
+	 lock_unlock(writefd, fname) == -1) {
 	 syslog(LOG_ERR, "IOERROR: writing %s: %m", tid->fnamenew);
 	 r = CYRUSDB_IOERROR;
 	}
@@ -260,7 +267,7 @@
 
 /* release lock */
 if (tid->fd != -1) {
-	r = lock_unlock(tid->fd);
+	r = lock_unlock(tid->fd, fname);
 	if (r == -1) {
 	 syslog(LOG_ERR, "IOERROR: unlocking %s: %m", fname);
 	 r = CYRUSDB_IOERROR;
@@ -278,7 +285,7 @@
 return r;
 }
 
-static void free_db(struct db *db)
+static void free_db(struct dbengine *db)
 {
 if (db) {
 	if (db->path) free(db->path);
@@ -300,31 +307,9 @@
 return ret;
 }
 
-static int init(const char *dbdir __attribute__((unused)),
-		int myflags __attribute__((unused)))
-{
- return 0;
-}
-
-static int done(void)
-{
- return 0;
-}
-
-static int mysync(void)
-{
- return 0;
-}
-
-static int myarchive(const char **fnames __attribute__((unused)),
-		 const char *dirname __attribute__((unused)))
-{
- return 0;
-}
-
-static int myopen(const char *fname, int flags, struct db **ret)
+static int myopen(const char *fname, int flags, struct dbengine **ret)
 {
- struct db *db = (struct db *) xzmalloc(sizeof(struct db));
+ struct dbengine *db = (struct dbengine *) xzmalloc(sizeof(struct dbengine));
 struct stat sbuf;
 char *p;
 int r;
@@ -357,7 +342,7 @@
 return 0;
 }
 
-static int myclose(struct db *db)
+static int myclose(struct dbengine *db)
 {
 assert(db);
 
@@ -366,14 +351,15 @@
 return 0;
 }
 
-static int myfetch(struct db *db, char *quota_path,
-		 const char **data, int *datalen,
+static int myfetch(struct dbengine *db, char *quota_path,
+		 const char **data, size_t *datalen,
 		 struct txn **tid)
 {
 struct subtxn *mytid = NULL;
 int quota_fd;
 const char *quota_base = 0;
- unsigned long quota_len = 0;
+ size_t quota_len = 0;
+ int r = 0;
 
 assert(db);
 
@@ -419,6 +405,7 @@
 	 if (r == -1) {
 		syslog(LOG_ERR, "IOERROR: %s quota %s: %m", lockfailaction,
 		 quota_path);
+		xclose(quota_fd);
 		return CYRUSDB_IOERROR;
 	 }
 
@@ -429,48 +416,43 @@
 else
 	quota_fd = mytid->fd;
 
+ free(db->data);
+ db->data = NULL;
+
 map_refresh(quota_fd, 1, &quota_base, &quota_len,
 		MAP_UNKNOWN_LEN, quota_path, 0);
 
- if (quota_len) {
-	char *p, *eol;
-
-	db->data = xrealloc(db->data, quota_len);
-	memcpy(db->data, quota_base, quota_len);
-
-	p = db->data;
-	eol = memchr(p, '\n', quota_len - (p - db->data));
-	if (!eol) {
-	 map_free(&quota_base, &quota_len);
-	 return CYRUSDB_IOERROR;
-	}
-	/* convert the separating \n to SP */
-	*eol = ' ';
-
-	p = eol + 1;
-	eol = memchr(p, '\n', quota_len - (p - db->data));
-	if (!eol) {
-	 map_free(&quota_base, &quota_len);
-	 return CYRUSDB_IOERROR;
-	}
-	/* convert the terminating \n to \0 */
-	*eol = '\0';
+ if (!quota_len) {
+	*data = db->data = xstrdup("");
+	*datalen = 0;
+ }
+ else if (quota_basequota_len-1 != '\n') {
+	r = CYRUSDB_IOERROR;
 }
 else {
-	db->data = xstrdup("");
+	*data = db->data = xstrndup(quota_base, quota_len);
+	*datalen = quota_len - 1;
+	db->data*datalen = '\0';
 }
- *data = db->data;
- *datalen = strlen(db->data);
 
 map_free(&quota_base, &quota_len);
 if (!tid) close(quota_fd);
 
+ if (r) return r;
+
+ /* magic old-format conversion */
+ if (db->data0 != '%') {
+	char *eol = strchr(db->data, '\n');
+	/* convert the separating \n to SP */
+	if (eol) *eol = ' ';
+ }
+
 return 0;
 }
 
-static int fetch(struct db *db, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetch(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **tid)
 {
 char quota_pathMAX_QUOTA_PATH+1, *tmpkey = NULL;
@@ -525,17 +507,11 @@
 qr1 = path_to_qr(*((const char **) v1), qrbuf1);
 qr2 = path_to_qr(*((const char **) v2), qrbuf2);
 
- return bsearch_compare(qr1, qr2);
+ return bsearch_compare_mbox(qr1, qr2);
 }
 
-#define PATH_ALLOC 100
-struct qr_path {
- char **path;
- size_t count;
- size_t alloc;
-};
-
-static void scan_qr_dir(char *quota_path, char *prefix, struct qr_path *pathbuf)
+static void scan_qr_dir(char *quota_path, const char *prefix,
+			strarray_t *pathbuf)
 {
 int config_fulldirhash = libcyrus_config_getswitch(CYRUSOPT_FULLDIRHASH);
 int config_virtdomains = libcyrus_config_getswitch(CYRUSOPT_VIRTDOMAINS);
@@ -565,16 +541,9 @@
 		if (!strcmp(next->d_name, ".")
 		 || !strcmp(next->d_name, "..")) continue;
 
-		if (!strncmp(next->d_name, prefix, strlen(prefix))) {
-		 if (pathbuf->count == pathbuf->alloc) {
-			pathbuf->alloc += PATH_ALLOC;
-			pathbuf->path = xrealloc(pathbuf->path,
-						 pathbuf->alloc * sizeof(char *));
-		 }
-		 pathbuf->pathpathbuf->count = xmalloc(MAX_QUOTA_PATH+1);
-		 sprintf(pathbuf->pathpathbuf->count++,
-			 "%s%s", quota_path, next->d_name);
-		}
+		if (!strncmp(next->d_name, prefix, strlen(prefix)))
+		 strarray_appendm(pathbuf,
+				 strconcat(quota_path, next->d_name, (char *)NULL));
 	 }
 
 	 closedir(qrdir);
@@ -588,21 +557,13 @@
 
 	strcpy(endp, "root");
 
-	if (!stat(quota_path, &buf)) {
-	 if (pathbuf->count == pathbuf->alloc) {
-		pathbuf->alloc += PATH_ALLOC;
-		pathbuf->path = xrealloc(pathbuf->path,
-					 pathbuf->alloc * sizeof(char *));
-	 }
-	 pathbuf->pathpathbuf->count = xmalloc(MAX_QUOTA_PATH+1);
-	 sprintf(pathbuf->pathpathbuf->count++,
-		 "%s", quota_path);
-	}
+	if (!stat(quota_path, &buf))
+	 strarray_append(pathbuf, quota_path);
 }
 }
 
-static int foreach(struct db *db,
-		 char *prefix, int prefixlen,
+static int foreach(struct dbengine *db,
+		 const char *prefix, size_t prefixlen,
 		 foreach_p *goodp,
 		 foreach_cb *cb, void *rock, 
 		 struct txn **tid)
@@ -611,8 +572,8 @@
 int config_fulldirhash = libcyrus_config_getswitch(CYRUSOPT_FULLDIRHASH);
 int config_virtdomains = libcyrus_config_getswitch(CYRUSOPT_VIRTDOMAINS);
 char quota_pathMAX_QUOTA_PATH+1;
- struct qr_path pathbuf;
- size_t i;
+ strarray_t pathbuf = STRARRAY_INITIALIZER;
+ int i;
 char *tmpprefix = NULL, *p = NULL;
 
 /* if we need to truncate the prefix, do so */
@@ -628,7 +589,6 @@
 	prefix = p + 1;
 
 /* search for the quotaroots */
- memset(&pathbuf, 0, sizeof(struct qr_path));
 scan_qr_dir(quota_path, prefix, &pathbuf);
 
 if (config_virtdomains && !prefixlen) {
@@ -671,16 +631,17 @@
 if (tid && !*tid) *tid = &db->txn;
 
 /* sort the quotaroots (ignoring paths) */
- qsort(pathbuf.path, pathbuf.count, sizeof(char *), db->compar);
+ if (pathbuf.data)
+	qsort(pathbuf.data, pathbuf.count, sizeof(char *), db->compar);
 
 for (i = 0; i < pathbuf.count; i++) {
 	const char *data, *key;
-	int keylen, datalen;
+	size_t keylen, datalen;
 
-	r = myfetch(db, pathbuf.pathi, &data, &datalen, tid);
+	r = myfetch(db, pathbuf.datai, &data, &datalen, tid);
 	if (r) break;
 
-	key = path_to_qr(pathbuf.pathi, quota_path);
+	key = path_to_qr(pathbuf.datai, quota_path);
 	keylen = strlen(key);
 
 	if (!goodp || goodp(rock, key, keylen, data, datalen)) {
@@ -689,17 +650,15 @@
 	 if (r) break;
 	}
 }
- for (i = 0; i < pathbuf.count; i++)
-	free(pathbuf.pathi);
 
- free(pathbuf.path);
+ strarray_fini(&pathbuf);
 
 return r;
 }
 
-static int mystore(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int mystore(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid, int overwrite)
 {
 char quota_pathMAX_QUOTA_PATH+1, *tmpkey = NULL;
@@ -743,6 +702,7 @@
 	 if (r == -1) {
 		syslog(LOG_ERR, "IOERROR: %s quota %s: %m", lockfailaction,
 		 quota_path);
+		xclose(fd);
 		return CYRUSDB_IOERROR;
 	 }
 	}
@@ -789,7 +749,7 @@
 	 }
 
 	 mytid->fdnew = newfd;
-	 r = lock_blocking(newfd);
+	 r = lock_blocking(newfd, new_quota_path);
 	 if (r) {
 		syslog(LOG_ERR, "IOERROR: locking quota file %s: %m",
 		 new_quota_path);
@@ -803,25 +763,27 @@
 
 	buf = xmalloc(datalen+1);
 	memcpy(buf, data, datalen);
-	/* convert separating SP to \n */
-	p = memchr(buf, ' ', datalen);
-	*p = '\n';
+	if (buf0 != '%') {
+	 /* convert separating SP to \n */
+	 p = memchr(buf, ' ', datalen);
+	 if (p) *p = '\n';
+	}
 	/* add a terminating \n */
 	bufdatalen = '\n';
 
 	lseek(mytid->fdnew, 0, SEEK_SET);
 	n = write(mytid->fdnew, buf, datalen+1);
-	if (n == datalen+1) r1 = ftruncate(mytid->fdnew, datalen+1);
+	if (n == (ssize_t)datalen+1) r1 = ftruncate(mytid->fdnew, datalen+1);
 	free(buf);
 
-	if (n != datalen+1 || r1 == -1) {
+	if (n != (ssize_t)datalen+1 || r1 == -1) {
 	 if (n == -1 || r1 == -1)
 		syslog(LOG_ERR, "IOERROR: writing quota file %s: %m",
 		 new_quota_path);
 	 else
 		syslog(LOG_ERR,
 		 "IOERROR: writing quota file %s: failed to write %d bytes",
-		 new_quota_path, datalen+1);
+		 new_quota_path, (int)datalen+1);
 	 if (tid)
 		abort_txn(db, *tid);
 	 else
@@ -841,30 +803,30 @@
 return r;
 }
 
-static int create(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int create(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 0);
 }
 
-static int store(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int store(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 1);
 }
 
-static int delete(struct db *db, 
-		 const char *key, int keylen,
+static int delete(struct dbengine *db, 
+		 const char *key, size_t keylen,
 		 struct txn **mytid, int force __attribute__((unused)))
 {
 return mystore(db, key, keylen, NULL, 0, mytid, 1);
 }
 
-static void txn_proc(char *fname, void *data, void *rock)
+static void txn_proc(const char *fname, void *data, void *rock)
 {
 struct txn *tid = (struct txn *) rock;
 int r;
@@ -875,7 +837,7 @@
 if (r && !tid->result) tid->result = r;
 }
 
-static int commit_txn(struct db *db __attribute__((unused)), struct txn *tid)
+static int commit_txn(struct dbengine *db __attribute__((unused)), struct txn *tid)
 {
 tid->proc = commit_subtxn;
 tid->result = 0;
@@ -885,7 +847,7 @@
 return tid->result;
 }
 
-static int abort_txn(struct db *db __attribute__((unused)), struct txn *tid)
+static int abort_txn(struct dbengine *db __attribute__((unused)), struct txn *tid)
 {
 tid->proc = abort_subtxn;
 tid->result = 0;
@@ -895,20 +857,33 @@
 return tid->result;
 }
 
-struct cyrusdb_backend cyrusdb_quotalegacy = 
+/* quotalegacy gets compar set at startup, but it's not the same */
+static int mycompar(struct dbengine *db, const char *a, int alen,
+		 const char*b, int blen)
+{
+ if (db->compar == compar_qr_mbox)
+	return bsearch_ncompare_mbox(a, alen, b, blen);
+ else 
+	return bsearch_ncompare_raw(a, alen, b, blen);
+}
+
+
+HIDDEN struct cyrusdb_backend cyrusdb_quotalegacy =
 {
 "quotalegacy",			/* name */
 
- &init,
- &done,
- &mysync,
- &myarchive,
+ &cyrusdb_generic_init,
+ &cyrusdb_generic_done,
+ &cyrusdb_generic_sync,
+ &cyrusdb_generic_noarchive,
 
 &myopen,
 &myclose,
 
 &fetch,
 &fetch,
+ NULL,
+
 &foreach,
 &create,
 &store,
@@ -918,5 +893,7 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb_skiplist.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb_skiplist.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: cyrusdb_skiplist.c,v 1.71 2010/01/06 17:01:45 murch Exp $
 */
 
 /* xxx check retry_xxx for failure */
@@ -70,8 +68,6 @@
 #include "retry.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 
 #define PROB (0.5)
 
@@ -154,14 +150,14 @@
 unsigned logend;			/* where to write to continue this txn */
 };
 
-struct db {
+struct dbengine {
 /* file data */
 char *fname;
 int fd;
 
 const char *map_base;
- unsigned long map_len;	/* mapped size */
- unsigned long map_size;	/* actual size */
+ size_t map_len;	/* mapped size */
+ size_t map_size;	/* actual size */
 ino_t map_ino;
 
 /* header info */
@@ -177,13 +173,14 @@
 int lock_status;
 int is_open;
 struct txn *current_txn;
+ struct timeval starttime;
 
 /* comparator function to use for sorting */
 int (*compar) (const char *s1, int l1, const char *s2, int l2);
 };
 
 struct db_list {
- struct db *db;
+ struct dbengine *db;
 struct db_list *next;
 int refcount;
 };
@@ -199,9 +196,7 @@
 use_osync = 0
 };
 
-static int compare(const char *s1, int l1, const char *s2, int l2);
-
-static void getsyncfd(struct db *db, struct txn *t)
+static void getsyncfd(struct dbengine *db, struct txn *t)
 {
 if (!use_osync) {
 	t->syncfd = db->fd;
@@ -211,7 +206,7 @@
 }
 }
 
-static void closesyncfd(struct db *db __attribute__((unused)),
+static void closesyncfd(struct dbengine *db __attribute__((unused)),
 			struct txn *t)
 {
 /* if we're using fsync, then we don't want to close the file */
@@ -224,15 +219,29 @@
 static int myinit(const char *dbdir, int myflags)
 {
 char sfile1024;
- int fd, r = 0;
+ int fd = -1, r = 0;
 uint32_t net32_time;
- 
+
 snprintf(sfile, sizeof(sfile), "%s/skipstamp", dbdir);
 
 if (myflags & CYRUSDB_RECOVER) {
+	struct stat sbuf;
+	char cleanfile1024;
+
+	snprintf(cleanfile, sizeof(cleanfile), "%s/skipcleanshutdown", dbdir);
+
+	/* if we had a clean shutdown, we don't need to run recovery on
+	 * everything */
+	if (stat(cleanfile, &sbuf) == 0) {
+	 syslog(LOG_NOTICE, "skiplist: clean shutdown detected, starting normally");
+	 unlink(cleanfile);
+	 goto normal;
+	}
+
+	syslog(LOG_NOTICE, "skiplist: clean shutdown file missing, updating recovery stamp");
+
 	/* set the recovery timestamp; all databases earlier than this
 	 time need recovery run when opened */
-
 	global_recovery = time(NULL);
 	fd = open(sfile, O_RDWR | O_CREAT, 0644);
 	if (fd == -1) r = -1;
@@ -240,20 +249,21 @@
 	if (r != -1) r = ftruncate(fd, 0);
 	net32_time = htonl(global_recovery);
 	if (r != -1) r = write(fd, &net32_time, 4);
-	if (r != -1) r = close(fd);
+	xclose(fd);
 
 	if (r == -1) {
 	 syslog(LOG_ERR, "DBERROR: writing %s: %m", sfile);
-	 if (fd != -1) close(fd);
+	 xclose(fd);
 	 return CYRUSDB_IOERROR;
 	}
 } else {
+normal:
 	/* read the global recovery timestamp */
 
 	fd = open(sfile, O_RDONLY, 0644);
 	if (fd == -1) r = -1;
 	if (r != -1) r = read(fd, &net32_time, 4);
-	if (r != -1) r = close(fd);
+	xclose(fd);
 
 	if (r == -1) {
 	 syslog(LOG_ERR, "DBERROR: reading %s, assuming the worst: %m", 
@@ -271,43 +281,6 @@
 return 0;
 }
 
-static int mydone(void)
-{
- return 0;
-}
-
-static int mysync(void)
-{
- return 0;
-}
-
-static int myarchive(const char **fnames, const char *dirname)
-{
- int r;
- const char **fname;
- char dstname1024, *dp;
- int length, rest;
- 
- strlcpy(dstname, dirname, sizeof(dstname));
- length = strlen(dstname);
- dp = dstname + length;
- rest = sizeof(dstname) - length;
- 
- /* archive those files specified by the app */
- for (fname = fnames; *fname != NULL; ++fname) {
-	syslog(LOG_DEBUG, "archiving database file: %s", *fname);
-	strlcpy(dp, strrchr(*fname, '/'), rest);
-	r = cyrusdb_copyfile(*fname, dstname);
-	if (r) {
-	 syslog(LOG_ERR,
-		 "DBERROR: error archiving database file: %s", *fname);
-	 return CYRUSDB_IOERROR;
-	}
- }
-
- return 0;
-}
-
 enum {
 SKIPLIST_VERSION = 1,
 SKIPLIST_VERSION_MINOR = 2,
@@ -334,11 +307,11 @@
 HEADER_SIZE = OFFSET_LASTRECOVERY + 4
 };
 
-static int mycommit(struct db *db, struct txn *tid);
-static int myabort(struct db *db, struct txn *tid);
-static int mycheckpoint(struct db *db, int locked);
-static int myconsistent(struct db *db, struct txn *tid, int locked);
-static int recovery(struct db *db, int flags);
+static int mycommit(struct dbengine *db, struct txn *tid);
+static int myabort(struct dbengine *db, struct txn *tid);
+static int mycheckpoint(struct dbengine *db);
+static int myconsistent(struct dbengine *db, struct txn *tid, int locked);
+static int recovery(struct dbengine *db, int flags);
 
 enum {
 /* Force recovery regardless of timestamp on database */
@@ -385,6 +358,72 @@
 */
 #define FORWARD(ptr, x) (ntohl(*((uint32_t *)(FIRSTPTR(ptr) + 4 * (x)))))
 
+static int is_safe(struct dbengine *db, const char *ptr)
+{
+ if (ptr < db->map_base)
+	return 0;
+ if (ptr >= db->map_base + db->map_size)
+	return 0;
+
+ return 1;
+}
+
+static unsigned LEVEL_safe(struct dbengine *db, const char *ptr)
+{
+ const uint32_t *p, *q;
+
+ assert(TYPE(ptr) == DUMMY || TYPE(ptr) == INORDER || TYPE(ptr) == ADD);
+ if (!is_safe(db, ptr + 12))
+	return 0;
+ if (!is_safe(db, ptr + 12 + KEYLEN(ptr)))
+	return 0;
+ p = q = (uint32_t *) FIRSTPTR(ptr);
+ if (!is_safe(db, (const char *)p))
+	return 0;
+ while (*p != (uint32_t)-1) {
+	p++;
+	if (!is_safe(db, (const char *)p))
+	 return 0;
+ }
+ return (p - q);
+}
+
+/* how big is this record? */
+static unsigned RECSIZE_safe(struct dbengine *db, const char *ptr)
+{
+ int ret = 0;
+ int level;
+ switch (TYPE(ptr)) {
+ case DUMMY:
+ case INORDER:
+ case ADD:
+	level = LEVEL_safe(db, ptr);
+	if (!level) {
+	 syslog(LOG_ERR, "IOERROR: skiplist2 RECSIZE_safe not safe %s, offset %u",
+		 db->fname, (unsigned)(ptr - db->map_base));
+	 return 0;
+	}
+	ret += 4;			/* tag */
+	ret += 4;			/* keylen */
+	ret += ROUNDUP(KEYLEN(ptr)); /* key */
+	ret += 4;			/* datalen */
+	ret += ROUNDUP(DATALEN(ptr)); /* data */
+	ret += 4 * level;	 /* pointers */
+	ret += 4;			/* padding */
+	break;
+
+ case DELETE:
+	ret += 8;
+	break;
+
+ case COMMIT:
+	ret += 4;
+	break;
+ }
+
+ return ret;
+}
+
 /* how many levels does this record have? */
 static unsigned LEVEL(const char *ptr)
 {
@@ -431,7 +470,7 @@
 * *or* is this the beginning of the log, in which case we only need
 * the padding from the last INORDER (or DUMMY) record
 */
-static int SAFE_TO_APPEND(struct db *db)
+static int SAFE_TO_APPEND(struct dbengine *db)
 {
 /* check it's a multiple of 4 */
 if (db->map_size % 4) return 1;
@@ -459,7 +498,7 @@
 return 0;
 }
 
-static int newtxn(struct db *db, struct txn **tidptr)
+static int newtxn(struct dbengine *db, struct txn **tidptr)
 {
 struct txn *tid;
 /* is this file safe to append to?
@@ -488,7 +527,7 @@
 #define PADDING(ptr) (ntohl(*((uint32_t *)((ptr) + RECSIZE(ptr) - 4))))
 
 /* given an open, mapped db, read in the header information */
-static int read_header(struct db *db)
+static int read_header(struct dbengine *db)
 {
 const char *dptr;
 int r;
@@ -567,7 +606,7 @@
 
 /* given an open, mapped db, locked db,
 write the header information */
-static int write_header(struct db *db)
+static int write_header(struct dbengine *db)
 {
 char bufHEADER_SIZE;
 int n;
@@ -595,7 +634,7 @@
 }
 
 /* make sure our mmap() is big enough */
-static int update_lock(struct db *db, struct txn *txn) 
+static int update_lock(struct dbengine *db, struct txn *txn) 
 {
 /* txn->logend is the current size of the file */
 assert (db->is_open && db->lock_status == WRITELOCKED);
@@ -606,7 +645,7 @@
 return 0;
 }
 
-static int write_lock(struct db *db, const char *altname)
+static int write_lock(struct dbengine *db, const char *altname)
 {
 struct stat sbuf;
 const char *lockfailaction;
@@ -623,6 +662,7 @@
 db->map_size = sbuf.st_size;
 db->map_ino = sbuf.st_ino;
 db->lock_status = WRITELOCKED;
+ gettimeofday(&db->starttime, 0);
 
 map_refresh(db->fd, 0, &db->map_base, &db->map_len, sbuf.st_size,
 		fname, 0);
@@ -637,27 +677,27 @@
 return 0;
 }
 
-static int read_lock(struct db *db)
+static int read_lock(struct dbengine *db)
 {
 struct stat sbuf, sbuffile;
 int newfd = -1;
 
 assert(db->lock_status == UNLOCKED);
 for (;;) {
-	if (lock_shared(db->fd) < 0) {
+	if (lock_shared(db->fd, db->fname) < 0) {
 	 syslog(LOG_ERR, "IOERROR: lock_shared %s: %m", db->fname);
 	 return CYRUSDB_IOERROR;
 	}
 
 	if (fstat(db->fd, &sbuf) == -1) {
 	 syslog(LOG_ERR, "IOERROR: fstat %s: %m", db->fname);
-	 lock_unlock(db->fd);
+	 lock_unlock(db->fd, db->fname);
 	 return CYRUSDB_IOERROR;
 	}
 
 	if (stat(db->fname, &sbuffile) == -1) {
 	 syslog(LOG_ERR, "IOERROR: stat %s: %m", db->fname);
-	 lock_unlock(db->fd);
+	 lock_unlock(db->fd, db->fname);
 	 return CYRUSDB_IOERROR;
 	}
 	if (sbuf.st_ino == sbuffile.st_ino) break;
@@ -665,7 +705,7 @@
 	newfd = open(db->fname, O_RDWR, 0644);
 	if (newfd == -1) {
 	 syslog(LOG_ERR, "IOERROR: open %s: %m", db->fname);
-	 lock_unlock(db->fd);
+	 lock_unlock(db->fd, db->fname);
 	 return CYRUSDB_IOERROR;
 	}
 	
@@ -679,6 +719,7 @@
 db->map_size = sbuf.st_size;
 db->map_ino = sbuf.st_ino;
 db->lock_status = READLOCKED;
+ gettimeofday(&db->starttime, 0);
 
 /* printf("%d: read lock: %d\n", getpid(), db->map_ino); */
 
@@ -693,54 +734,75 @@
 return 0;
 }
 
-static int unlock(struct db *db)
+static int unlock(struct dbengine *db)
 {
+ struct timeval endtime;
+ double timediff;
+
 if (db->lock_status == UNLOCKED) {
 	syslog(LOG_NOTICE, "skiplist: unlock while not locked");
 }
- if (lock_unlock(db->fd) < 0) {
+ if (lock_unlock(db->fd, db->fname) < 0) {
 	syslog(LOG_ERR, "IOERROR: lock_unlock %s: %m", db->fname);
 	return CYRUSDB_IOERROR;
 }
 db->lock_status = UNLOCKED;
 
+ gettimeofday(&endtime, 0);
+ timediff = timesub(&db->starttime, &endtime);
+ if (timediff > 1.0) {
+	syslog(LOG_NOTICE, "skiplist: longlock %s for %0.1f seconds",
+	 db->fname, timediff);
+ }
+
 /* printf("%d: unlock: %d\n", getpid(), db->map_ino); */
 
 return 0;
 }
 
-static int lock_or_refresh(struct db *db, struct txn **tidptr)
+static int lock_or_refresh(struct dbengine *db, struct txn **tidptr)
 {
 int r;
 
- assert(db != NULL && tidptr != NULL);
+ assert(db);
 
- if (*tidptr) {
+ if (!tidptr) {
+	/* just grab a readlock */
+	r = read_lock(db);
+	if (r) return r;
+
+	/* start tracking the lock time */
+	gettimeofday(&db->starttime, 0);
+
+	return 0;
+ }
+
+ else if (*tidptr) {
 	/* check that the DB agrees that we're in this transaction */
 	assert(db->current_txn == *tidptr);
 
- 	/* just update the active transaction */
-	update_lock(db, *tidptr);
+	/* just update the active transaction */
+	return update_lock(db, *tidptr);
+ }
 
- } else {
-	/* check that the DB isn't in a transaction */
-	assert(db->current_txn == NULL);
+ /* check that the DB isn't in a transaction */
+ assert(db->current_txn == NULL);
 
-	/* grab a r/w lock */
-	if ((r = write_lock(db, NULL)) < 0) {
-	 return r;
-	}
+ /* grab a r/w lock */
+ r = write_lock(db, NULL);
+ if (r) return r;
 
-	/* start the transaction */
-	if ((r = newtxn(db, tidptr))) {
-	 return r;
-	}
- }
+ /* start the transaction */
+ r = newtxn(db, tidptr);
+ if (r) return r;
+
+ /* start tracking the lock time */
+ gettimeofday(&db->starttime, 0);
 
 return 0;
 }
 
-static int dispose_db(struct db *db)
+static int dispose_db(struct dbengine *db)
 {
 if (!db) return 0;
 
@@ -763,12 +825,33 @@
 return 0;
 }
 
-static int myopen(const char *fname, int flags, struct db **ret)
+/* NOTE: this function compares with the SIGNED CHAR value of
+ * the individual characters. This is a pretty bogus sort order,
+ * but for backwards compatibility reasons we're stuck with it
+ * for skiplist files at least */
+static int compare_signed(const char *s1, int l1, const char *s2, int l2)
+{
+ int min = l1 < l2 ? l1 : l2;
+ int cmp = 0;
+
+ while (min-- > 0 && (cmp = *s1 - *s2) == 0) {
+	s1++;
+	s2++;
+ }
+ if (min >= 0) {
+	return cmp;
+ } else {
+	if (l1 > l2) return 1;
+	else if (l2 > l1) return -1;
+	else return 0;
+ }
+}
+
+static int myopen(const char *fname, int flags, struct dbengine **ret)
 {
- struct db *db;
+ struct dbengine *db;
 struct db_list *list_ent = open_db;
 int r;
- int new = 0;
 
 while (list_ent && strcmp(list_ent->db->fname, fname)) {
 	list_ent = list_ent->next;
@@ -782,10 +865,10 @@
 	return 0;
 }
 
- db = (struct db *) xzmalloc(sizeof(struct db));
+ db = (struct dbengine *) xzmalloc(sizeof(struct dbengine));
 db->fd = -1;
 db->fname = xstrdup(fname);
- db->compar = (flags & CYRUSDB_MBOXSORT) ? bsearch_ncompare : compare;
+ db->compar = (flags & CYRUSDB_MBOXSORT) ? bsearch_ncompare_mbox : compare_signed;
 
 db->fd = open(fname, O_RDWR, 0644);
 if (db->fd == -1 && errno == ENOENT) {
@@ -798,7 +881,6 @@
 	 return CYRUSDB_IOERROR;
 	}
 	db->fd = open(fname, O_RDWR | O_CREAT, 0644);
-	new = 1;
 }
 
 if (db->fd == -1) {
@@ -908,7 +990,7 @@
 return 0;
 }
 
-int myclose(struct db *db)
+static int myclose(struct dbengine *db)
 {
 struct db_list *list_ent = open_db;
 struct db_list *prev = NULL;
@@ -929,29 +1011,11 @@
 return 0;
 }
 
-static int compare(const char *s1, int l1, const char *s2, int l2)
-{
- int min = l1 < l2 ? l1 : l2;
- int cmp = 0;
-
- while (min-- > 0 && (cmp = *s1 - *s2) == 0) {
-	s1++;
-	s2++;
- }
- if (min >= 0) {
-	return cmp;
- } else {
-	if (l1 > l2) return 1;
-	else if (l2 > l1) return -1;
-	else return 0;
- }
-}
-
 /* returns the offset to the node asked for, or the node after it
 if it doesn't exist.
 if previous is set, finds the last node < key */
-static const char *find_node(struct db *db, 
-			 const char *key, int keylen,
+static const char *find_node(struct dbengine *db, 
+			 const char *key, size_t keylen,
 			 unsigned *updateoffsets)
 {
 const char *ptr = db->map_base + DUMMY_OFFSET(db);
@@ -979,10 +1043,10 @@
 return ptr;
 }
 
-int myfetch(struct db *db,
-	 const char *key, int keylen,
-	 const char **data, int *datalen,
-	 struct txn **tidptr)
+static int myfetch(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
+		 struct txn **tidptr)
 {
 const char *ptr;
 int r = 0;
@@ -1034,16 +1098,16 @@
 return r;
 }
 
-static int fetch(struct db *mydb, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetch(struct dbengine *mydb,
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **tidptr)
 {
 return myfetch(mydb, key, keylen, data, datalen, tidptr);
 }
-static int fetchlock(struct db *db, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetchlock(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **tidptr)
 {
 return myfetch(db, key, keylen, data, datalen, tidptr);
@@ -1052,11 +1116,11 @@
 /* foreach allows for subsidary mailbox operations in 'cb'.
 if there is a txn, 'cb' must make use of it.
 */
-int myforeach(struct db *db,
-	 char *prefix, int prefixlen,
-	 foreach_p *goodp,
-	 foreach_cb *cb, void *rock, 
-	 struct txn **tidptr)
+static int myforeach(struct dbengine *db,
+		 const char *prefix, size_t prefixlen,
+		 foreach_p *goodp,
+		 foreach_cb *cb, void *rock,
+		 struct txn **tidptr)
 {
 const char *ptr;
 char *savebuf = NULL;
@@ -1066,7 +1130,6 @@
 int need_unlock = 0;
 
 assert(db != NULL);
- assert(prefixlen >= 0);
 
 /* Hacky workaround:
 *
@@ -1171,7 +1234,7 @@
 return r ? r : cb_r;
 }
 
-unsigned int randlvl(struct db *db)
+static unsigned int randlvl(struct dbengine *db)
 {
 unsigned int lvl = 1;
 
@@ -1184,10 +1247,10 @@
 return lvl;
 }
 
-int mystore(struct db *db, 
-	 const char *key, int keylen,
-	 const char *data, int datalen,
-	 struct txn **tidptr, int overwrite)
+static int mystore(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
+		 struct txn **tidptr, int overwrite)
 {
 const char *ptr;
 uint32_t klen;
@@ -1211,6 +1274,8 @@
 
 assert(db != NULL);
 assert(key && keylen);
+ if (!data)
+	datalen = 0;
 
 /* not keeping the transaction, just create one local to
 * this function */
@@ -1293,7 +1358,9 @@
 			 ROUNDUP(keylen) - keylen);
 }
 WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) &dlen, 4);
- WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) data, datalen);
+ if (datalen) {
+	WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) data, datalen);
+ }
 if (ROUNDUP(datalen) - datalen > 0) {
 	WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) zeropadding,
 			 ROUNDUP(datalen) - datalen);
@@ -1335,25 +1402,25 @@
 return 0;
 }
 
-static int create(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int create(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 0);
 }
 
-static int store(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int store(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
 return mystore(db, key, keylen, data, datalen, tid, 1);
 }
 
-int mydelete(struct db *db, 
-	 const char *key, int keylen,
-	 struct txn **tidptr, int force __attribute__((unused)))
+static int mydelete(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 struct txn **tidptr, int force __attribute__((unused)))
 {
 const char *ptr;
 uint32_t delrectype = htonl(DELETE);
@@ -1430,7 +1497,7 @@
 return 0;
 }
 
-int mycommit(struct db *db, struct txn *tid)
+static int mycommit(struct dbengine *db, struct txn *tid)
 {
 uint32_t commitrectype = htonl(COMMIT);
 int r = 0;
@@ -1482,7 +1549,7 @@
 
 /* consider checkpointing */
 if (!r && tid->logend > (2 * db->logstart + SKIPLIST_MINREWRITE)) {
-	r = mycheckpoint(db, 1);
+	r = mycheckpoint(db);
 }
 
 if (be_paranoid) {
@@ -1514,7 +1581,7 @@
 return r;
 }
 
-int myabort(struct db *db, struct txn *tid)
+static int myabort(struct dbengine *db, struct txn *tid)
 {
 const char *ptr;
 unsigned updateoffsetsSKIPLIST_MAXLEVEL+1;
@@ -1619,7 +1686,7 @@
 
 /* compress 'db'. if 'locked != 0', the database is already R/W locked and
 will be returned as such. */
-static int mycheckpoint(struct db *db, int locked)
+static int mycheckpoint(struct dbengine *db)
 {
 char fname1024;
 int oldfd;
@@ -1631,19 +1698,12 @@
 int r = 0;
 uint32_t iorectype = htonl(INORDER);
 unsigned i;
- time_t start = time(NULL);
+ clock_t start = sclock();
 
- /* grab write lock (could be read but this prevents multiple checkpoints
- simultaneously) */
- if (!locked) {
-	r = write_lock(db, NULL);
-	if (r < 0) return r;
- } else {
-	/* we need the latest and greatest data */
- assert(db->is_open && db->lock_status == WRITELOCKED);
-	map_refresh(db->fd, 0, &db->map_base, &db->map_len, MAP_UNKNOWN_LEN,
-		 db->fname, 0);
- }
+ /* we need the latest and greatest data */
+ assert(db->is_open && db->lock_status == WRITELOCKED);
+ map_refresh(db->fd, 0, &db->map_base, &db->map_len, MAP_UNKNOWN_LEN,
+		db->fname, 0);
 
 /* can't be in a transaction */
 assert(db->current_txn == NULL);
@@ -1660,7 +1720,6 @@
 db->fd = open(fname, O_RDWR | O_CREAT, 0644);
 if (db->fd < 0) {
 	syslog(LOG_ERR, "DBERROR: skiplist checkpoint: open(%s): %m", fname);
-	if (!locked) unlock(db);
 	db->fd = oldfd;
 	return CYRUSDB_IOERROR;
 }
@@ -1669,7 +1728,6 @@
 r = ftruncate(db->fd, 0);
 if (r < 0) {
 	syslog(LOG_ERR, "DBERROR: skiplist checkpoint %s: ftruncate %m", fname);
-	if (!locked) unlock(db);
 	db->fd = oldfd;
 	return CYRUSDB_IOERROR;
 }
@@ -1812,7 +1870,7 @@
 	struct stat sbuf;
 
 	/* remove content of old file so it doesn't sit around using disk */
-	ftruncate(oldfd, 0);
+	r = ftruncate(oldfd, 0);
 
 	/* release old write lock */
 	close(oldfd);
@@ -1835,18 +1893,10 @@
 	return r;
 }
 
- if (!locked) {
-	/* unlock the new db files */
-	unlock(db);
- }
-
- {
-	int diff = time(NULL) - start;
-	syslog(LOG_INFO, 
-	 "skiplist: checkpointed %s (%d record%s, %d bytes) in %d second%s",
-	 db->fname, db->listsize, db->listsize == 1 ? "" : "s", 
-	 db->logstart, diff, diff == 1 ? "" : "s"); 
- }
+ syslog(LOG_INFO,
+	 "skiplist: checkpointed %s (%d record%s, %d bytes) in %2.3f sec",
+	 db->fname, db->listsize, db->listsize == 1 ? "" : "s",
+	 db->logstart, (sclock() - start) / (double) CLOCKS_PER_SEC);
 
 return r;
 }
@@ -1856,7 +1906,7 @@
 if detail == 2, also dump pointers for active records.
 if detail == 3, dump all records/all pointers.
 */
-static int dump(struct db *db, int detail __attribute__((unused)))
+static int dump(struct dbengine *db, int detail __attribute__((unused)))
 {
 const char *ptr, *end;
 unsigned i;
@@ -1914,13 +1964,13 @@
 return 0;
 }
 
-static int consistent(struct db *db)
+static int consistent(struct dbengine *db)
 {
 return myconsistent(db, NULL, 0);
 }
 
 /* perform some basic consistency checks */
-static int myconsistent(struct db *db, struct txn *tid, int locked)
+static int myconsistent(struct dbengine *db, struct txn *tid, int locked)
 {
 const char *ptr;
 uint32_t offset;
@@ -1977,7 +2027,7 @@
 }
 
 /* run recovery on this file */
-static int recovery(struct db *db, int flags)
+static int recovery(struct dbengine *db, int flags)
 {
 const char *ptr, *keyptr;
 unsigned updateoffsetsSKIPLIST_MAXLEVEL+1;
@@ -2171,7 +2221,7 @@
 	q = db->map_base + db->map_size;
 	p = ptr;
 	for (;;) {
- if (RECSIZE(p) <= 0) {
+ if (RECSIZE_safe(db, p) <= 0) {
 /* hmm, we can't trust this transaction */
 		syslog(LOG_ERR,
 		 "DBERROR: skiplist recovery %s: found a RECSIZE of 0, "
@@ -2338,7 +2388,7 @@
 	map_refresh(db->fd, 0, &db->map_base, &db->map_len, db->map_size,
 		 db->fname, 0);
 
-	r = mycheckpoint(db, 1);
+	r = mycheckpoint(db);
 
 	if (r || !(flags & RECOVERY_CALLER_LOCKED)) {
 	 unlock(db);
@@ -2373,11 +2423,11 @@
 	syslog(LOG_NOTICE, 
 	 "skiplist: recovered %s (%d record%s, %ld bytes) in %d second%s",
 	 db->fname, db->listsize, db->listsize == 1 ? "" : "s", 
-	 db->map_size, diff, diff == 1 ? "" : "s"); 
+	 (long unsigned)db->map_size, diff, diff == 1 ? "" : "s"); 
 }
 
 if (!r && need_checkpoint) {
-	r = mycheckpoint(db, 1);
+	r = mycheckpoint(db);
 }
 
 if(r || !(flags & RECOVERY_CALLER_LOCKED)) {
@@ -2387,20 +2437,30 @@
 return r;
 }
 
-struct cyrusdb_backend cyrusdb_skiplist = 
+/* skiplist compar function is set at open */
+static int mycompar(struct dbengine *db, const char *a, int alen,
+		 const char *b, int blen)
+{
+ return db->compar(a, alen, b, blen);
+}
+
+
+EXPORTED struct cyrusdb_backend cyrusdb_skiplist =
 {
 "skiplist",			/* name */
 
 &myinit,
- &mydone,
- &mysync,
- &myarchive,
+ &cyrusdb_generic_done,
+ &cyrusdb_generic_sync,
+ &cyrusdb_generic_archive,
 
 &myopen,
 &myclose,
 
 &fetch,
 &fetchlock,
+ NULL,
+
 &myforeach,
 &create,
 &store,
@@ -2410,5 +2470,7 @@
 &myabort,
 
 &dump,
- &consistent
+ &consistent,
+ &mycheckpoint,
+ &mycompar
 };

cyrus-imapd-2.4.17.tar.gz/lib/cyrusdb_sql.c -> cyrus-imapd-2.5.tar.gz/lib/cyrusdb_sql.c Changed

@@ -39,17 +39,15 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-/* $Id: cyrusdb_sql.c,v 1.3 2010/01/06 17:01:45 murch Exp $ */
-
 #include <config.h>
 
 #include <syslog.h>
-#include <assert.h>
 #include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "assert.h"
+#include "bsearch.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "libcyr_cfg.h"
@@ -59,8 +57,8 @@
 extern void fatal(const char *, int);
 
 typedef int exec_cb(void *rock,
-		 const char *key, int keylen,
-		 const char *data, int datalen);
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen);
 
 typedef struct sql_engine {
 const char *name;
@@ -77,7 +75,7 @@
 void (*sql_close)(void *conn);
 } sql_engine_t;
 
-struct db {
+struct dbengine {
 void *conn; /* connection to database */
 char *table; /* table that we are operating on */
 char *esc_key; /* allocated buffer for escaped key */
@@ -121,6 +119,7 @@
 *to = xrealloc(*to, 2 * fromlen + 1); /* +1 for NUL */
 
 tolen = mysql_real_escape_string(conn, *to, from, fromlen);
+ (void)tolen;
 
 return *to;
 }
@@ -206,26 +205,19 @@
 			 const char *database)
 {
 PGconn *conn = NULL;
- char *conninfo, *p;
+ struct buf conninfo = BUF_INITIALIZER;
 
 /* create the connection info string */
- /* The 64 represents the number of characters taken by
- * the keyword tokens, plus a small pad
- */
- p = conninfo = xzmalloc(64 + sql_len(host) + sql_len(port)
-			 + sql_len(user) + sql_len(password)
-			 + sql_len(database));
-
 /* add each term that exists */
- if (sql_exists(host)) p += sprintf(p, " host='%s'", host);
- if (sql_exists(port)) p += sprintf(p, " port='%s'", port);
- if (sql_exists(user)) p += sprintf(p, " user='%s'", user);
- if (sql_exists(password)) p += sprintf(p, " password='%s'", password);
- if (sql_exists(database)) p += sprintf(p, " dbname='%s'", database);
- p += sprintf(p, " requiressl='%d'", usessl);
+ if (sql_exists(host)) buf_printf(&conninfo, " host='%s'", host);
+ if (sql_exists(port)) buf_printf(&conninfo, " port='%s'", port);
+ if (sql_exists(user)) buf_printf(&conninfo, " user='%s'", user);
+ if (sql_exists(password)) buf_printf(&conninfo, " password='%s'", password);
+ if (sql_exists(database)) buf_printf(&conninfo, " dbname='%s'", database);
+ buf_printf(&conninfo, " requiressl='%d'", usessl);
 
- conn = PQconnectdb(conninfo);
- free(conninfo);
+ conn = PQconnectdb(buf_cstring(&conninfo));
+ buf_free(&conninfo);
 
 if ((PQstatus(conn) != CONNECTION_OK)) {
 	syslog(LOG_ERR, "DBERROR: SQL backend: %s", PQerrorMessage(conn));
@@ -470,18 +462,7 @@
 return 0;
 }
 
-static int mysync(void)
-{
- return 0;
-}
-
-static int myarchive(const char **fnames __attribute__((unused)),
-		 const char *dirname __attribute__((unused)))
-{
- return 0;
-}
-
-static int myopen(const char *fname, int flags, struct db **ret)
+static int myopen(const char *fname, int flags, struct dbengine **ret)
 {
 const char *database, *hostnames, *user, *passwd;
 char *host_ptr, *host, *cur_host, *cur_port;
@@ -489,6 +470,9 @@
 void *conn = NULL;
 char *p, *table, cmd1024;
 
+ assert(fname);
+ assert(ret);
+
 /* make a connection to the database */
 database = libcyrus_config_getstring(CYRUSOPT_SQL_DATABASE);
 hostnames = libcyrus_config_getstring(CYRUSOPT_SQL_HOSTNAMES);
@@ -502,6 +486,9 @@
 /* create a working version of the hostnames */
 host_ptr = hostnames ? xstrdup(hostnames) : NULL;
 
+ /* make sqlite clever */
+ if (!database) database = fname;
+
 cur_host = host = host_ptr;
 while (cur_host != NULL) {
 	host = strchr(host,',');
@@ -548,26 +535,31 @@
 /* check if the table exists */
 /* XXX is this the best way to do this? */
 snprintf(cmd, sizeof(cmd), "SELECT * FROM %s LIMIT 0;", table);
- if (dbengine->sql_exec(conn, cmd, NULL, NULL) &&
-	(flags & CYRUSDB_CREATE)) {
-	/* create the table */
-	snprintf(cmd, sizeof(cmd),
-		 "CREATE TABLE %s (dbkey %s NOT NULL, data %s);",
-		 table, dbengine->binary_type, dbengine->binary_type);
-	if (dbengine->sql_exec(conn, cmd, NULL, NULL)) {
-	 syslog(LOG_ERR, "DBERROR: SQL failed: %s", cmd);
-	 dbengine->sql_close(conn);
-	 return CYRUSDB_INTERNAL;
+ if (dbengine->sql_exec(conn, cmd, NULL, NULL)) {
+	if (flags & CYRUSDB_CREATE) {
+	 /* create the table */
+	 snprintf(cmd, sizeof(cmd),
+		 "CREATE TABLE %s (dbkey %s NOT NULL, data %s);",
+		 table, dbengine->binary_type, dbengine->binary_type);
+	 if (dbengine->sql_exec(conn, cmd, NULL, NULL)) {
+		syslog(LOG_ERR, "DBERROR: SQL failed: %s", cmd);
+		dbengine->sql_close(conn);
+		return CYRUSDB_INTERNAL;
+	 }
+	}
+	else {
+	 return CYRUSDB_NOTFOUND;
 	}
 }
 
- *ret = (struct db *) xzmalloc(sizeof(struct db));
+ *ret = (struct dbengine *) xzmalloc(sizeof(struct dbengine));
 (*ret)->conn = conn;
 (*ret)->table = table;
 
 return 0;
 }
-static int myclose(struct db *db)
+
+static int myclose(struct dbengine *db)
 {
 assert(db);
 
@@ -581,7 +573,7 @@
 return 0;
 }
 
-static struct txn *start_txn(struct db *db)
+static struct txn *start_txn(struct dbengine *db)
 {
 /* start a transaction */
 if (dbengine->sql_begin_txn(db->conn)) {
@@ -601,8 +593,8 @@
 };
 
 static int select_cb(void *rock,
-		 const char *key, int keylen,
-		 const char *data, int datalen)
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen)
 {
 struct select_rock *srock = (struct select_rock *) rock;
 int r = CYRUSDB_OK;
@@ -629,13 +621,13 @@
 
 struct fetch_rock {
 char **data;
- int *datalen;
+ size_t *datalen;
 };
 
 static int fetch_cb(void *rock,
 		 const char *key __attribute__((unused)),
-		 int keylen __attribute__((unused)),
-		 const char *data, int datalen)
+		 size_t keylen __attribute__((unused)),
+		 const char *data, size_t datalen)
 {
 struct fetch_rock *frock = (struct fetch_rock *) rock;
 
@@ -648,16 +640,22 @@
 return 0;
 }
 
-static int fetch(struct db *db, 
-		 const char *key, int keylen,
-		 const char **data, int *datalen,
+static int fetch(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
 		 struct txn **tid)
 {
 char cmd1024, *esc_key;
- struct fetch_rock frock = { &db->data, datalen };
+ size_t len = 0;
+ struct fetch_rock frock = { &db->data, &len };
 struct select_rock srock = { 0, NULL, NULL, &fetch_cb, &frock };
 int r;
 
+ assert(db);
+ assert(key);
+ assert(keylen);
+ if (datalen) assert(data);
+
 if (data) *data = NULL;
 if (datalen) *datalen = 0;
 
@@ -670,9 +668,8 @@
 esc_key = dbengine->sql_escape(db->conn, &db->esc_key, key, keylen);
 snprintf(cmd, sizeof(cmd),
 	 "SELECT * FROM %s WHERE dbkey = '%s';", db->table, esc_key);
- r = dbengine->sql_exec(db->conn, cmd, &select_cb, &srock);
-
 if (esc_key != db->esc_key) free(esc_key);
+ r = dbengine->sql_exec(db->conn, cmd, &select_cb, &srock);
 
 if (r) {
 	syslog(LOG_ERR, "DBERROR: SQL failed %s", cmd);
@@ -683,12 +680,13 @@
 if (!srock.found) return CYRUSDB_NOTFOUND;
 
 if (data) *data = db->data;
+ if (datalen) *datalen = len;
 
 return 0;
 }
 
-static int foreach(struct db *db,
-		 char *prefix, int prefixlen,
+static int foreach(struct dbengine *db,
+		 const char *prefix, size_t prefixlen,
 		 foreach_p *goodp,
 		 foreach_cb *cb, void *rock, 
 		 struct txn **tid)
@@ -697,6 +695,10 @@
 struct select_rock srock = { 0, NULL, goodp, cb, rock };
 int r;
 
+ assert(db);
+ assert(cb);
+ if (prefixlen) assert(prefix);
+
 if (tid) {
 	if (!*tid && !(*tid = start_txn(db))) return CYRUSDB_INTERNAL;
 	srock.tid = *tid;
@@ -709,10 +711,9 @@
 snprintf(cmd, sizeof(cmd),
 	 "SELECT * FROM %s WHERE dbkey LIKE '%s%%' ORDER BY dbkey;",
 	 db->table, esc_key ? esc_key : "");
+ if (esc_key && (esc_key != db->esc_key)) free(esc_key);
 r = dbengine->sql_exec(db->conn, cmd, &select_cb, &srock);
 
- if (esc_key && esc_key != db->esc_key) free(esc_key);
-
 if (r) {
 	syslog(LOG_ERR, "DBERROR: SQL failed %s", cmd);
 	if (tid) dbengine->sql_rollback_txn(db->conn);
@@ -722,19 +723,30 @@
 return 0;
 }
 
-static int mystore(struct db *db, 
+static int mystore(struct dbengine *db, 
 		 const char *key, int keylen,
 		 const char *data, int datalen,
-		 struct txn **tid, int overwrite)
+		 struct txn **tid, int overwrite,
+		 int isdelete)
 {
 char cmd1024, *esc_key;
+ int free_esc_key = 0;
+ const char dummy = 0;
 int r = 0;
 
+ assert(db);
+ assert(key);
+ assert(keylen);
+ if (datalen) assert(data);
+
+ if (!data) data = &dummy;
+
 if (tid && !*tid && !(*tid = start_txn(db))) return CYRUSDB_INTERNAL;
 
 esc_key = dbengine->sql_escape(db->conn, &db->esc_key, key, keylen);
+ free_esc_key = (esc_key != db->esc_key);
 
- if (!data) {
+ if (isdelete) {
 	/* DELETE the entry */
 	snprintf(cmd, sizeof(cmd), "DELETE FROM %s WHERE dbkey = '%s';",
 		 db->table, esc_key);
@@ -753,6 +765,7 @@
 
 	char *esc_data = dbengine->sql_escape(db->conn, &db->esc_data,
 					 data, datalen);
+	int free_esc_data = (esc_data != db->esc_data);
 
 	/* see if we just SELECTed this key in this transaction */
 	if (tid && *tid) {
@@ -792,10 +805,10 @@
 	 r = dbengine->sql_exec(db->conn, cmd, NULL, NULL);
 	}
 
-	if (esc_data != db->esc_data) free(esc_data);
+	if (free_esc_data) free(esc_data);
 }
 
- if (esc_key != db->esc_key) free(esc_key);
+ if (free_esc_key) free(esc_key);
 
 if (r) {
 	syslog(LOG_ERR, "DBERROR: SQL failed: %s", cmd);
@@ -806,31 +819,31 @@
 return 0;
 }
 
-static int create(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int create(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
- return mystore(db, key, keylen, data, datalen, tid, 0);
+ return mystore(db, key, keylen, data, datalen, tid, 0, 0);
 }
 
-static int store(struct db *db, 
-		 const char *key, int keylen,
-		 const char *data, int datalen,
+static int store(struct dbengine *db, 
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
 		 struct txn **tid)
 {
- return mystore(db, key, keylen, data, datalen, tid, 1);
+ return mystore(db, key, keylen, data, datalen, tid, 1, 0);
 }
 
-static int delete(struct db *db, 
-		 const char *key, int keylen,
+static int delete(struct dbengine *db, 
+		 const char *key, size_t keylen,
 		 struct txn **tid,
 		 int force __attribute__((unused)))
 {
- return mystore(db, key, keylen, NULL, 0, tid, 1);
+ return mystore(db, key, keylen, NULL, 0, tid, 1, 1);
 }
 
-static int finish_txn(struct db *db, struct txn *tid, int commit)
+static int finish_txn(struct dbengine *db, struct txn *tid, int commit)
 {
 if (tid) {
 	int rc = commit ? dbengine->sql_commit_txn(db->conn) :
@@ -849,30 +862,48 @@
 return 0;
 }
 
-static int commit_txn(struct db *db, struct txn *tid)
+static int commit_txn(struct dbengine *db, struct txn *tid)
 {
+ assert(db);
+ assert(tid);
+
 return finish_txn(db, tid, 1);
 }
 
-static int abort_txn(struct db *db, struct txn *tid)
+static int abort_txn(struct dbengine *db, struct txn *tid)
 {
+ assert(db);
+ assert(tid);
+
 return finish_txn(db, tid, 0);
 }
 
-struct cyrusdb_backend cyrusdb_sql = 
+/* SQL databases have all sorts of evil collations - we can't
+ * make any assumptions though, so just assume raw */
+static int mycompar(struct dbengine *db __attribute__((unused)),
+		 const char *a, int alen,
+		 const char *b, int blen)
+{
+ (void)db;
+ return bsearch_ncompare_raw(a, alen, b, blen);
+}
+
+HIDDEN struct cyrusdb_backend cyrusdb_sql =
 {
 "sql",			/* name */
 
 &init,
 &done,
- &mysync,
- &myarchive,
+ &cyrusdb_generic_sync,
+ &cyrusdb_generic_noarchive,
 
 &myopen,
 &myclose,
 
 &fetch,
 &fetch,
+ NULL,
+
 &foreach,
 &create,
 &store,
@@ -882,5 +913,7 @@
 &abort_txn,
 
 NULL,
- NULL
+ NULL,
+ NULL,
+ &mycompar
 };

cyrus-imapd-2.5.tar.gz/lib/cyrusdb_twoskip.c Added

@@ -0,0 +1,2366 @@
+/* cyrusdb_twoskip.c - brand new twoskip implementation, not backwards anything
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "assert.h"
+#include "bsearch.h"
+#include "byteorder64.h"
+#include "cyrusdb.h"
+#include "crc32.h"
+#include "libcyr_cfg.h"
+#include "mappedfile.h"
+#include "util.h"
+#include "xmalloc.h"
+
+/*
+ * twoskip disk format.
+ *
+ * GOALS:
+ * a) 64 bit through
+ * b) Fast recovery after crashes
+ * c) integrity checks throughout
+ * d) simple format
+ *
+ * ACHIEVED BY:
+ * a)
+ * - 64 bit offsets for all values
+ * - smaller initial keylen and vallen, but they can
+ * can be extended up to 64 bits as well.
+ * - no timestamps stored in the file.
+ * - XXX - may behave strangely with large files on
+ * 32 bit architectures, particularly if size_t is
+ * not 64 bit.
+ *
+ * b)
+ * - "dirty flag" is always set in the header and
+ * fsynced BEFORE writing anything else.
+ * - a header field for "current size", after which
+ * all changes are considered suspect until commit.
+ * - two "lowest level" offsets, used in alternating
+ * order, so the highest value less than "current_size"
+ * is always the correct pointer - this means we
+ * never lose linkage, so never need to rewrite more
+ * than the affected records during a recovery.
+ * - all data is fsynced BEFORE rewriting the header to
+ * remove the dirty flag.
+ * - As long as the first 64 bytes of the file are
+ * guaranteed to write all together or not at all,
+ * we're crash-safe.
+ *
+ * c)
+ * - every byte in the file is covered by one of the
+ * crc32 values stored throughout.
+ * - header CRC is checked on every header read (open/lock)
+ * - record head CRCs are checked on every record read,
+ * including skiplist traverse.
+ * - record tail CRCs (key/value) are check on every exact
+ * key match result, during traverse for read or write.
+ *
+ * d)
+ * - there are no special commit, inorder, etc records.
+ * just add records and ghost "delete" records to give
+ * somewhere to point to on deletes. These are only
+ * at the lowest level, so don't have a significant
+ * seek impact.
+ * - modular code makes the logic much clearer.
+ */
+
+/*
+ * FORMAT:
+ *
+ * HEADER: 64 bytes
+ * magic: 20 bytes: "4 bytes same as skiplist" "twoskip file\0\0\0\0"
+ * version: 4 bytes
+ * generation: 8 bytes
+ * num_records: 8 bytes
+ * repack_size: 8 bytes
+ * current_size: 8 bytes
+ * flags: 4 bytes
+ * crc32: 4 bytes
+ *
+ * RECORDS:
+ * type 1 byte
+ * level: 1 byte
+ * keylen: 2 bytes
+ * vallen: 4 bytes
+ * <optionally: 64 bit keylen if keylen == UINT16_MAX>
+ * <optionally: 64 bit vallen if vallen == UINT32_MAX>
+ * ptrs: 8 bytes * (level+1)
+ * crc32_head: 4 bytes
+ * crc32_tail: 4 bytes
+ * key: (keylen bytes)
+ * val: (vallen bytes)
+ * padding: enough zeros to round up to an 8 byte multiple
+ *
+ * defined types, in skiplist language are:
+ * '=' -> DUMMY
+ * '+' -> ADD/INORDER
+ * '-' -> DELETE (kind of)
+ * '$' -> COMMIT
+ * but note that delete records behave differently - they're
+ * part of the pointer hierarchy, so that back offsets will
+ * always point somewhere past the 'end' until commit.
+ *
+ * The DUMMY is always MAXLEVEL level, with zero keylen and vallen
+ * The DELETE is always zero level, with zero keylen and vallen
+ * crc32_head is calculated on all bytes before it in the record
+ * crc32_tail is calculated on all bytes after, INCLUDING padding
+ *
+ * The COMMIT is inserted at the end of each transaction, and its
+ * single pointer points back to the start of the transaction.
+ */
+
+/* OPERATION:
+ *
+ * Finding a record works very much like skiplist, but we have
+ * a datastructure, 'struct skiploc', to help find it. There
+ * is one of these embedded directly in the 'struct db', and
+ * it's the only one we ever use.
+ *
+ * skiploc contains two complete sets of offsets - at every
+ * level the offset of the previous record, and the offset of
+ * the next record, in relation to the requested key. If the
+ * key is an exact match, it also contains a copy of the
+ * struct skiprecord. If not, it contains the struct
+ * skiprecord for the previous record at level zero.
+ *
+ * It also contains a 'struct buf' with a copy of the requested
+ * key, which allows for efficient relocation of the position in
+ * the file when nothing is changed.
+ *
+ * So nothing is really changed with finding, except the special
+ * "level zero" alternative pointer. We'll see that in action
+ * later.
+ *
+ * TRANSACTIONS:
+ * 1) before writing anything else, the header is updated with the
+ * DIRTY flag set, and then fdatasync is run.
+ * 2) after all changes, fdatasync is run again.
+ * 3) finally, the header is updated with a new current_size and
+ * the DIRTY flag clear, then fdatasync is run for a third time.
+ *
+ * ADDING A NEW RECORD:
+ * a new record is created with forward locations pointing to the
+ * next pointers in the skiploc. This is appended to the file.
+ * This works for either a create OR replace, since in both cases
+ * the nextlocs are correct. Level zero is set to zero on a new
+ * record.
+ *
+ * If it's not a replace, a "random" level will be chosen for the
+ * record. All update operations below apply only up to this level,
+ * pointers above are unaffected - and continue over the location
+ * of this change.
+ *
+ * For each backloc, the record at that offset is read, and the
+ * forward pointers at each level are replaced with the offset
+ * of the new record. NOTE: see special level zero logic below.
+ *
+ * Again, if this was a replace, the backlocs don't point to the
+ * current record, so it just silently disappears from the lists.
+ *
+ * DELETING A RECORD:
+ * The logic is almost identical to adding, but a delete record
+ * always has a level of zero, with only a single pointer forward
+ * to the next record.
+ *
+ * Because of this, the updates are done up to the level of the
+ * old record instead.
+ *
+ * THE SPECIAL "level zero":
+ * To allow a "fast fsck" after an aborted transaction, rather
+ * than having only a single level 1 pointer, we have two. The
+ * following algorithm is used to select which one to change.
+ *
+ * The definition of "current_size" is the size of the database
+ * at last commit, it does not get updated during a transaction.
+ *
+ * So: when updating level 1 - if either level 1 or level 0 has
+ * a value >= current_size, then that value gets updated again.
+ * otherwise, the lowest value gets replaced with the new value.
+ *
+ * when reading, the highest value is used - except during
+ * recovery when it's the highest value less than current_size,
+ * since any "future" offsets are bogus.
+ *
+ * This means that there is always at least one offset which
+ * points to the "next" record as if the current transaction
+ * had never occured - allowing recovery to find all alive
+ * records without scanning and updating the rest of the file.
+ * This guarantee exists regardless of any ordering of writes
+ * within the transaction, any page could be inconsistent and
+ * the result is still a clean recovery.
+ *
+ * CHECKPOINT:
+ * Over time, a twoskip database accumulates cruft - replaced
+ * records and delete records. Records out of order, slowing
+ * down sequential access. When the size at last repack
+ * is sufficiently smaller than the current size (see the
+ * TUNING constants below) then the file is checkpointed.
+ * A checkpoint is achieved by creating a new file, and
+ * copying all the current records, in order, into it, then
+ * renaming the new file over the old. The "generation"
+ * counter in the header is incremented to tell other users
+ * that offsets into the file are no longer valid. This is
+ * more reliable than just using the inode, because inodes
+ * can be reused.
+ *
+ * LOCATION OPTIMISATION:
+ * If the generation is unchanged AND the size of the file
+ * is unchanged, then all offsets stored in the skiploc are
+ * still valid. This is used to optimise finding the current
+ * key, advancing to the "next" key, and also to optimise
+ * regular fetches that happen to hit either the current key,
+ * the gap immediately after, or the next key. All other
+ * locations cause a full relocate.
+ */
+
+
+/********** TUNING *************/
+
+/* don't bother rewriting if the database has less than this much "new" data */
+#define MINREWRITE 16834
+/* don't bother rewriting if less than this ratio is dirty (50%) */
+#define REWRITE_RATIO 0.5
+/* number of skiplist levels - 31 gives us binary search to 2^32 records.
+ * limited to 255 by file format, but skiplist had 20, and that was enough
+ * for most real uses. 31 is heaps. */
+#define MAXLEVEL 31
+/* should be 0.5 for binary search semantics */
+#define PROB 0.5
+
+/* format specifics */
+#undef VERSION /* defined in config.h */
+#define VERSION 1
+
+/* type aliases */
+#define LLU long long unsigned int
+#define LU long unsigned int
+
+/* record types */
+#define DUMMY '='
+#define RECORD '+'
+#define DELETE '-'
+#define COMMIT '$'
+
+/********** DATA STRUCTURES *************/
+
+/* A single "record" in the twoskip file. This could be a
+ * DUMMY, a KEYRECORD, a VALRECORD or even a DELETE - they
+ * all read and write with the same functions */
+struct skiprecord {
+ /* location on disk (not part of the on-disk format as such) */
+ size_t offset;
+ size_t len;
+
+ /* what are our header fields */
+ uint8_t type;
+ uint8_t level;
+ size_t keylen;
+ size_t vallen;
+
+ /* where to do we go from here? */
+ size_t nextlocMAXLEVEL+1;
+
+ /* what do our integrity checks say? */
+ uint32_t crc32_head;
+ uint32_t crc32_tail;
+
+ /* our key and value */
+ size_t keyoffset;
+ size_t valoffset;
+};
+
+/* a location in the twoskip file. We always have:
+ * record: if "is_exactmatch" this points to the record
+ * with the matching key, otherwise it points to
+ * the 'compar' order previous record.
+ * backloc: the records that point TO this location
+ * at each level. If is_exactmatch, they
+ * point to the record, otherwise they are
+ * the record.
+ * forwardloc: the records pointed to by the record
+ * at 'backloc' at the same level. Kept
+ * here for efficiency
+ * keybuf: a copy of the requested key - we always keep
+ * this so we can re-seek after the file has been
+ * checkpointed under us (say a read-only foreach)
+ *
+ * generation and end can be used to see if anything in
+ * the file may have changed and needs re-reading.
+ */
+struct skiploc {
+ /* requested, may not match actual record */
+ struct buf keybuf;
+ int is_exactmatch;
+
+ /* current or next record */
+ struct skiprecord record;
+
+ /* we need both sets of offsets to cheaply insert */
+ size_t backlocMAXLEVEL+1;
+ size_t forwardlocMAXLEVEL+1;
+
+ /* need a generation so we know if the location is still valid */
+ uint64_t generation;
+ size_t end;
+};
+
+enum {
+ UNLOCKED = 0,
+ READLOCKED = 1,
+ WRITELOCKED = 2,
+};
+
+#define DIRTY (1<<0)
+
+struct txn {
+ /* logstart is where we start changes from on commit, where we truncate
+ to on abort */
+ int num;
+};
+
+struct db_header {
+ /* header info */
+ uint32_t version;
+ uint32_t flags;
+ uint64_t generation;
+ uint64_t num_records;
+ size_t repack_size;
+ size_t current_size;
+};
+
+struct dbengine {
+ /* file data */
+ struct mappedfile *mf;
+
+ struct db_header header;
+ struct skiploc loc;
+
+ /* tracking info */
+ int is_open;
+ size_t end;
+ int txn_num;
+ struct txn *current_txn;
+
+ /* comparator function to use for sorting */
+ int open_flags;
+ int (*compar) (const char *s1, int l1, const char *s2, int l2);
+};
+
+struct db_list {
+ struct dbengine *db;
+ struct db_list *next;
+ int refcount;
+};
+
+#define HEADER_MAGIC ("\241\002\213\015twoskip file\0\0\0\0")
+#define HEADER_MAGIC_SIZE (20)
+
+/* offsets of header files */
+enum {
+ OFFSET_HEADER = 0,
+ OFFSET_VERSION = 20,
+ OFFSET_GENERATION = 24,
+ OFFSET_NUM_RECORDS = 32,
+ OFFSET_REPACK_SIZE = 40,
+ OFFSET_CURRENT_SIZE = 48,
+ OFFSET_FLAGS = 56,
+ OFFSET_CRC32 = 60,
+};
+
+#define HEADER_SIZE 64
+#define DUMMY_OFFSET HEADER_SIZE
+#define MAXRECORDHEAD ((MAXLEVEL + 5)*8)
+
+/* mount a scratch monkey */
+static union skipwritebuf {
+ uint64_t align;
+ char sMAXRECORDHEAD;
+} scratchspace;
+
+static struct db_list *open_twoskip = NULL;
+
+static int mycommit(struct dbengine *db, struct txn *tid);
+static int myabort(struct dbengine *db, struct txn *tid);
+static int mycheckpoint(struct dbengine *db);
+static int myconsistent(struct dbengine *db, struct txn *tid);
+static int recovery(struct dbengine *db);
+static int recovery1(struct dbengine *db, int *count);
+static int recovery2(struct dbengine *db, int *count);
+
+/************** HELPER FUNCTIONS ****************/
+
+#define BASE(db) mappedfile_base((db)->mf)
+#define KEY(db, rec) (BASE(db) + (rec)->keyoffset)
+#define VAL(db, rec) (BASE(db) + (rec)->valoffset)
+#define SIZE(db) mappedfile_size((db)->mf)
+#define FNAME(db) mappedfile_fname((db)->mf)
+
+/* calculate padding size */
+static size_t roundup(size_t record_size, int howfar)
+{
+ if (record_size % howfar)
+	record_size += howfar - (record_size % howfar);
+ return record_size;
+}
+
+/* choose a level appropriately randomly */
+static uint8_t randlvl(uint8_t lvl, uint8_t maxlvl)
+{
+ while (((float) rand() / (float) (RAND_MAX)) < PROB) {
+	lvl++;
+	if (lvl == maxlvl) break;
+ }
+ return lvl;
+}
+
+/************** HEADER ****************/
+
+/* given an open, mapped db, read in the header information */
+static int read_header(struct dbengine *db)
+{
+ uint32_t crc;
+
+ assert(db && db->mf && db->is_open);
+
+ if (SIZE(db) < HEADER_SIZE) {
+	syslog(LOG_ERR,
+	 "twoskip: file not large enough for header: %s", FNAME(db));
+	return CYRUSDB_IOERROR;
+ }
+
+ if (memcmp(BASE(db), HEADER_MAGIC, HEADER_MAGIC_SIZE)) {
+	syslog(LOG_ERR, "twoskip: invalid magic header: %s", FNAME(db));
+	return CYRUSDB_IOERROR;
+ }
+
+ db->header.version
+	= ntohl(*((uint32_t *)(BASE(db) + OFFSET_VERSION)));
+
+ if (db->header.version > VERSION) {
+	syslog(LOG_ERR, "twoskip: version mismatch: %s has version %d",
+	 FNAME(db), db->header.version);
+	return CYRUSDB_IOERROR;
+ }
+
+ db->header.generation
+	= ntohll(*((uint64_t *)(BASE(db) + OFFSET_GENERATION)));
+
+ db->header.num_records
+	= ntohll(*((uint64_t *)(BASE(db) + OFFSET_NUM_RECORDS)));
+
+ db->header.repack_size
+	= ntohll(*((uint64_t *)(BASE(db) + OFFSET_REPACK_SIZE)));
+
+ db->header.current_size
+	= ntohll(*((uint64_t *)(BASE(db) + OFFSET_CURRENT_SIZE)));
+
+ db->header.flags
+	= ntohl(*((uint32_t *)(BASE(db) + OFFSET_FLAGS)));
+
+ crc = ntohl(*((uint32_t *)(BASE(db) + OFFSET_CRC32)));
+
+ if (crc32_map(BASE(db), OFFSET_CRC32) != crc) {
+	syslog(LOG_ERR, "DBERROR: %s: twoskip header CRC failure",
+	 FNAME(db));
+	return CYRUSDB_IOERROR;
+ }
+
+ db->end = db->header.current_size;
+
+ return 0;
+}
+
+/* given an open, mapped, locked db, write the header information */
+static int write_header(struct dbengine *db)
+{
+ char *buf = scratchspace.s;
+ int n;
+
+ /* format one buffer */
+ memcpy(buf, HEADER_MAGIC, HEADER_MAGIC_SIZE);
+ *((uint32_t *)(buf + OFFSET_VERSION)) = htonl(db->header.version);
+ *((uint64_t *)(buf + OFFSET_GENERATION)) = htonll(db->header.generation);
+ *((uint64_t *)(buf + OFFSET_NUM_RECORDS)) = htonll(db->header.num_records);
+ *((uint64_t *)(buf + OFFSET_REPACK_SIZE)) = htonll(db->header.repack_size);
+ *((uint64_t *)(buf + OFFSET_CURRENT_SIZE)) = htonll(db->header.current_size);
+ *((uint32_t *)(buf + OFFSET_FLAGS)) = htonl(db->header.flags);
+ *((uint32_t *)(buf + OFFSET_CRC32)) = htonl(crc32_map(buf, OFFSET_CRC32));
+
+ /* write it out */
+ n = mappedfile_pwrite(db->mf, buf, HEADER_SIZE, 0);
+ if (n < 0) return CYRUSDB_IOERROR;
+
+ return 0;
+}
+
+/* simple wrapper to write with an fsync */
+static int commit_header(struct dbengine *db)
+{
+ int r = write_header(db);
+ if (!r) r = mappedfile_commit(db->mf);
+ return r;
+}
+
+/******************** RECORD *********************/
+
+static int check_tailcrc(struct dbengine *db, struct skiprecord *record)
+{
+ uint32_t crc;
+
+ crc = crc32_map(BASE(db) + record->keyoffset,
+		 roundup(record->keylen + record->vallen, 8));
+ if (crc != record->crc32_tail) {
+	syslog(LOG_ERR, "DBERROR: invalid tail crc %s at %llX",
+	 FNAME(db), (LLU)record->offset);
+	return CYRUSDB_IOERROR;
+ }
+
+ return 0;
+}
+
+/* read a single skiprecord at the given offset */
+static int read_onerecord(struct dbengine *db, size_t offset,
+			 struct skiprecord *record)
+{
+ const char *base;
+ int i;
+
+ memset(record, 0, sizeof(struct skiprecord));
+
+ if (!offset) return 0;
+
+ record->offset = offset;
+ record->len = 24; /* absolute minimum */
+
+ /* need space for at least the header plus some details */
+ if (record->offset + record->len > SIZE(db))
+	goto badsize;
+
+ base = BASE(db) + offset;
+
+ /* read in the record header */
+ record->type = base0;
+ record->level = base1;
+ record->keylen = ntohs(*((uint16_t *)(base + 2)));
+ record->vallen = ntohl(*((uint32_t *)(base + 4)));
+ offset += 8;
+
+ /* make sure we fit */
+ assert(record->level <= MAXLEVEL);
+
+ /* long key */
+ if (record->keylen == UINT16_MAX) {
+	base = BASE(db) + offset;
+	record->keylen = ntohll(*((uint64_t *)base));
+	offset += 8;
+ }
+
+ /* long value */
+ if (record->vallen == UINT32_MAX) {
+	base = BASE(db) + offset;
+	record->vallen = ntohll(*((uint64_t *)base));
+	offset += 8;
+ }
+
+ /* we know the length now */
+ record->len = (offset - record->offset) /* header including lengths */
+		+ 8 * (1 + record->level) /* ptrs */
+		+ 8 /* crc32s */
+		+ roundup(record->keylen + record->vallen, 8); /* keyval */
+
+ if (record->offset + record->len > SIZE(db))
+	goto badsize;
+
+ for (i = 0; i <= record->level; i++) {
+	base = BASE(db) + offset;
+	record->nextloci = ntohll(*((uint64_t *)base));
+	offset += 8;
+ }
+
+ base = BASE(db) + offset;
+ record->crc32_head = ntohl(*((uint32_t *)base));
+ if (crc32_map(BASE(db) + record->offset, (offset - record->offset))
+	!= record->crc32_head)
+	return CYRUSDB_IOERROR;
+
+ record->crc32_tail = ntohl(*((uint32_t *)(base+4)));
+
+ record->keyoffset = offset + 8;
+ record->valoffset = record->keyoffset + record->keylen;
+
+ return 0;
+
+badsize:
+ syslog(LOG_ERR, "twoskip: attempt to read past end of file %s: %08llX > %08llX",
+	 FNAME(db), (LLU)record->offset + record->len, (LLU)SIZE(db));
+ return CYRUSDB_IOERROR;
+}
+
+static int read_skipdelete(struct dbengine *db, size_t offset,
+			 struct skiprecord *record)
+{
+ int r;
+
+ r = read_onerecord(db, offset, record);
+ if (r) return r;
+
+ if (record->type == DELETE)
+	r = read_onerecord(db, record->nextloc0, record);
+
+ return r;
+}
+
+/* prepare the header part of the record (everything except the key, value
+ * and padding). Used for both writes and rewrites. */
+static void prepare_record(struct skiprecord *record, char *buf, size_t *sizep)
+{
+ int len = 8;
+ int i;
+
+ assert(record->level <= MAXLEVEL);
+
+ buf0 = record->type;
+ buf1 = record->level;
+ if (record->keylen < UINT16_MAX) {
+	*((uint16_t *)(buf+2)) = htons(record->keylen);
+ }
+ else {
+	*((uint16_t *)(buf+2)) = htons(UINT16_MAX);
+	*((uint64_t *)(buf+len)) = htonll(record->keylen);
+	len += 8;
+ }
+
+ if (record->vallen < UINT32_MAX) {
+	*((uint32_t *)(buf+4)) = htonl(record->vallen);
+ }
+ else {
+	*((uint32_t *)(buf+4)) = htonl(UINT32_MAX);
+	*((uint64_t *)(buf+len)) = htonll(record->vallen);
+	len += 8;
+ }
+
+ /* got pointers? */
+ for (i = 0; i <= record->level; i++) {
+	*((uint64_t *)(buf+len)) = htonll(record->nextloci);
+	len += 8;
+ }
+
+ /* NOTE: crc32_tail does not change */
+ record->crc32_head = crc32_map(buf, len);
+ *((uint32_t *)(buf+len)) = htonl(record->crc32_head);
+ *((uint32_t *)(buf+len+4)) = htonl(record->crc32_tail);
+ len += 8;
+
+ *sizep = len;
+}
+
+/* only changing the record head, so only rewrite that much */
+static int rewrite_record(struct dbengine *db, struct skiprecord *record)
+{
+ char *buf = scratchspace.s;
+ size_t len;
+ int n;
+
+ /* we must already be in a transaction before updating records */
+ assert(db->header.flags & DIRTY);
+ assert(record->offset);
+
+ prepare_record(record, buf, &len);
+
+ n = mappedfile_pwrite(db->mf, buf, len, record->offset);
+ if (n < 0) return CYRUSDB_IOERROR;
+
+ return 0;
+}
+
+/* you can only write records at the end */
+static int write_record(struct dbengine *db, struct skiprecord *record,
+			const char *key, const char *val)
+{
+ char zeros8 = {0, 0, 0, 0, 0, 0, 0, 0};
+ uint64_t len;
+ size_t iolen = 0;
+ struct iovec io4;
+ int n;
+
+ assert(!record->offset);
+
+ /* we'll put the HEAD on later */
+ io0.iov_base = scratchspace.s;
+ io0.iov_len = 0;
+
+ io1.iov_base = (char *)key;
+ io1.iov_len = record->keylen;
+
+ io2.iov_base = (char *)val;
+ io2.iov_len = record->vallen;
+
+ /* pad to 8 bytes */
+ len = record->vallen + record->keylen;
+ io3.iov_base = zeros;
+ io3.iov_len = roundup(len, 8) - len;
+
+ /* calculate the CRC32 of the tail first */
+ record->crc32_tail = crc32_iovec(io+1, 3);
+
+ /* prepare the record once we know the crc32 of the tail */
+ prepare_record(record, scratchspace.s, &iolen);
+ io0.iov_base = scratchspace.s;
+ io0.iov_len = iolen;
+
+ /* write to the mapped file, getting the offset updated */
+ n = mappedfile_pwritev(db->mf, io, 4, db->end);
+ if (n < 0) return CYRUSDB_IOERROR;
+
+ /* locate the record */
+ record->offset = db->end;
+ record->keyoffset = db->end + io0.iov_len;
+ record->valoffset = record->keyoffset + record->keylen;
+ record->len = n;
+
+ /* and advance the known file size */
+ db->end += n;
+
+ return 0;
+}
+
+/* helper to append a record, starting the transaction by dirtying the
+ * header first if required */
+static int append_record(struct dbengine *db, struct skiprecord *record,
+			 const char *key, const char *val)
+{
+ int r;
+
+ assert(db->current_txn);
+
+ /* dirty the header if not already dirty */
+ if (!(db->header.flags & DIRTY)) {
+	db->header.flags |= DIRTY;
+	r = commit_header(db);
+	if (r) return r;
+ }
+
+ return write_record(db, record, key, val);
+}
+
+/************************** LOCATION MANAGEMENT ***************************/
+
+/* find the next record at a given level, encapsulating the
+ * level 0 magic */
+static size_t _getloc(struct dbengine *db, struct skiprecord *record,
+		 uint8_t level)
+{
+ if (level)
+	return record->nextloclevel + 1;
+
+ /* if one is past, must be the other */
+ if (record->nextloc0 >= db->end)
+	return record->nextloc1;
+ else if (record->nextloc1 >= db->end)
+	return record->nextloc0;
+
+ /* highest remaining */
+ else if (record->nextloc0 > record->nextloc1)
+	return record->nextloc0;
+ else
+	return record->nextloc1;
+}
+
+/* set the next record at a given level, encapsulating the
+ * level 0 magic */
+static void _setloc(struct dbengine *db, struct skiprecord *record,
+		 uint8_t level, size_t offset)
+{
+ if (level) {
+	record->nextloclevel+1 = offset;
+	return;
+ }
+
+ /* level zero is special */
+ /* already this transaction, update this one */
+ if (record->nextloc0 >= db->header.current_size)
+	record->nextloc0 = offset;
+ else if (record->nextloc1 >= db->header.current_size)
+	record->nextloc1 = offset;
+ /* otherwise, update older one */
+ else if (record->nextloc1 > record->nextloc0)
+	record->nextloc0 = offset;
+ else
+	record->nextloc1 = offset;
+}
+
+/* finds a record, either an exact match or the record
+ * immediately before */
+static int relocate(struct dbengine *db)
+{
+ struct skiploc *loc = &db->loc;
+ struct skiprecord newrecord;
+ size_t offset;
+ size_t oldoffset = 0;
+ uint8_t level;
+ uint8_t i;
+ int cmp = -1; /* never found a thing! */
+ int r;
+
+ /* pointer validity */
+ loc->generation = db->header.generation;
+ loc->end = db->end;
+
+ /* start with the dummy */
+ r = read_onerecord(db, DUMMY_OFFSET, &loc->record);
+ loc->is_exactmatch = 0;
+
+ /* initialise pointers */
+ level = loc->record.level;
+ newrecord.offset = 0;
+ loc->backloclevel = loc->record.offset;
+ loc->forwardloclevel = 0;
+
+ /* special case start pointer for efficiency */
+ if (!loc->keybuf.len) {
+	for (i = 0; i < loc->record.level; i++) {
+	 loc->backloci = loc->record.offset;
+	 loc->forwardloci = _getloc(db, &loc->record, i);
+	}
+	return 0;
+ }
+
+ while (level) {
+	offset = _getloc(db, &loc->record, level-1);
+
+	loc->backloclevel-1 = loc->record.offset;
+	loc->forwardloclevel-1 = offset;
+
+	if (offset != oldoffset) {
+	 oldoffset = offset;
+	 r = read_skipdelete(db, offset, &newrecord);
+	 if (r) return r;
+
+	 if (newrecord.offset) {
+		assert(newrecord.level >= level);
+
+		cmp = db->compar(KEY(db, &newrecord), newrecord.keylen,
+				 loc->keybuf.s, loc->keybuf.len);
+
+		/* not there? stay at this level */
+		if (cmp < 0) {
+		 /* move the offset range along */
+		 loc->record = newrecord;
+		 continue;
+		}
+	 }
+	}
+
+	level--;
+ }
+
+ if (cmp == 0) { /* we found it exactly */
+	loc->is_exactmatch = 1;
+	loc->record = newrecord;
+
+	for (i = 0; i < loc->record.level; i++)
+	 loc->forwardloci = _getloc(db, &loc->record, i);
+
+	/* make sure this record is complete */
+	r = check_tailcrc(db, &loc->record);
+
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+/* helper function to find a location, either by using the existing
+ * location if it's close enough, or using the full relocate above */
+static int find_loc(struct dbengine *db, const char *key, size_t keylen)
+{
+ struct skiprecord newrecord;
+ struct skiploc *loc = &db->loc;
+ int cmp, i, r;
+
+ if (key != loc->keybuf.s)
+	buf_setmap(&loc->keybuf, key, keylen);
+ else if (keylen != loc->keybuf.len)
+	buf_truncate(&loc->keybuf, keylen);
+
+ /* can we special case advance? */
+ if (keylen && loc->end == db->end
+ && loc->generation == db->header.generation) {
+	cmp = db->compar(KEY(db, &loc->record), loc->record.keylen,
+			 loc->keybuf.s, loc->keybuf.len);
+	/* same place, and was exact. Otherwise we're going back,
+	 * and the reverse pointers are no longer valid... */
+	if (db->loc.is_exactmatch && cmp == 0) {
+	 return 0;
+	}
+
+	/* we're looking after this record */
+	if (cmp < 0) {
+	 for (i = 0; i < db->loc.record.level; i++)
+		loc->backloci = db->loc.record.offset;
+
+	 /* read the next record */
+	 r = read_skipdelete(db, loc->forwardloc0, &newrecord);
+	 if (r) return r;
+
+	 /* nothing afterwards? */
+	 if (!newrecord.offset) {
+		db->loc.is_exactmatch = 0;
+		return 0;
+	 }
+
+	 /* now where is THIS record? */
+	 cmp = db->compar(KEY(db, &newrecord), newrecord.keylen,
+			 loc->keybuf.s, loc->keybuf.len);
+
+	 /* exact match? */
+	 if (cmp == 0) {
+		db->loc.is_exactmatch = 1;
+		db->loc.record = newrecord;
+
+		for (i = 0; i < newrecord.level; i++)
+		 loc->forwardloci = _getloc(db, &newrecord, i);
+
+		/* make sure this record is complete */
+		r = check_tailcrc(db, &loc->record);
+		if (r) return r;
+
+		return 0;
+	 }
+
+	 /* or in the gap */
+	 if (cmp > 0) {
+		db->loc.is_exactmatch = 0;
+		return 0;
+	 }
+	}
+	/* if we fell out here, it's not a "local" record, just search */
+ }
+
+ return relocate(db);
+}
+
+/* helper function to advance to the "next" record. Used by foreach,
+ * fetchnext, and internal functions */
+static int advance_loc(struct dbengine *db)
+{
+ struct skiploc *loc = &db->loc;
+ uint8_t i;
+ int r;
+
+ /* has another session made changes? Need to re-find the location */
+ if (loc->end != db->end || loc->generation != db->header.generation) {
+	r = relocate(db);
+	if (r) return r;
+ }
+
+ /* update back pointers */
+ for (i = 0; i < loc->record.level; i++)
+	loc->backloci = loc->record.offset;
+
+ /* ADVANCE */
+ r = read_skipdelete(db, loc->forwardloc0, &loc->record);
+ if (r) return r;
+
+ /* reached the end? */
+ if (!loc->record.offset) {
+	buf_reset(&loc->keybuf);
+	return relocate(db);
+ }
+
+ /* update forward pointers */
+ for (i = 0; i < loc->record.level; i++)
+	loc->forwardloci = _getloc(db, &loc->record, i);
+
+ /* keep our location */
+ buf_setmap(&loc->keybuf, KEY(db, &loc->record), loc->record.keylen);
+ loc->is_exactmatch = 1;
+
+ /* make sure this record is complete */
+ r = check_tailcrc(db, &loc->record);
+ if (r) return r;
+
+ return 0;
+}
+
+/* helper function to update all the back records efficiently
+ * after appending a new record, either create or delete. The
+ * caller must set forwardloc correctly for each level it has
+ * changed */
+static int stitch(struct dbengine *db, uint8_t maxlevel, size_t newoffset)
+{
+ struct skiploc *loc = &db->loc;
+ struct skiprecord oldrecord;
+ uint8_t i;
+ int r;
+
+ oldrecord.level = 0;
+ while (oldrecord.level < maxlevel) {
+	uint8_t level = oldrecord.level;
+
+	r = read_onerecord(db, loc->backloclevel, &oldrecord);
+	if (r) return r;
+
+	/* always getting higher */
+	assert(oldrecord.level > level);
+
+	for (i = level; i < maxlevel; i++)
+	 _setloc(db, &oldrecord, i, loc->forwardloci);
+
+	r = rewrite_record(db, &oldrecord);
+	if (r) return r;
+ }
+
+ /* re-read the "current record" */
+ r = read_onerecord(db, newoffset, &loc->record);
+ if (r) return r;
+
+ /* and update the forward locations */
+ for (i = 0; i < loc->record.level; i++)
+	loc->forwardloci = _getloc(db, &loc->record, i);
+
+ return 0;
+}
+
+/* overall "store" function - update the value in the current loc.
+ All new values funnel through here. Check delete_here for
+ deletion. Force is implied here, it gets checked higher. */
+static int store_here(struct dbengine *db, const char *val, size_t vallen)
+{
+ struct skiploc *loc = &db->loc;
+ struct skiprecord newrecord;
+ uint8_t level = 0;
+ uint8_t i;
+ int r;
+
+ if (loc->is_exactmatch) {
+	level = loc->record.level;
+	db->header.num_records--;
+ }
+
+ /* build a new record */
+ memset(&newrecord, 0, sizeof(struct skiprecord));
+ newrecord.type = RECORD;
+ newrecord.level = randlvl(1, MAXLEVEL);
+ newrecord.keylen = loc->keybuf.len;
+ newrecord.vallen = vallen;
+ for (i = 0; i < newrecord.level; i++)
+	newrecord.nextloci+1 = loc->forwardloci;
+ if (newrecord.level > level)
+	level = newrecord.level;
+
+ /* append to the file */
+ r = append_record(db, &newrecord, loc->keybuf.s, val);
+ if (r) return r;
+
+ /* get the nextlevel to point here for all this record's levels */
+ for (i = 0; i < newrecord.level; i++)
+	loc->forwardloci = newrecord.offset;
+
+ /* update all backpointers */
+ r = stitch(db, level, newrecord.offset);
+ if (r) return r;
+
+ /* update header to know details of new record */
+ db->header.num_records++;
+
+ loc->is_exactmatch = 1;
+ loc->end = db->end;
+
+ return 0;
+}
+
+/* delete a record */
+static int delete_here(struct dbengine *db)
+{
+ struct skiploc *loc = &db->loc;
+ struct skiprecord newrecord;
+ struct skiprecord nextrecord;
+ int r;
+
+ if (!loc->is_exactmatch)
+	return CYRUSDB_NOTFOUND;
+
+ db->header.num_records--;
+
+ /* by the magic of zeroing, this even works for zero */
+ r = read_skipdelete(db, loc->forwardloc0, &nextrecord);
+ if (r) return r;
+
+ /* build a delete record */
+ memset(&newrecord, 0, sizeof(struct skiprecord));
+ newrecord.type = DELETE;
+ newrecord.nextloc0 = nextrecord.offset;
+
+ /* append to the file */
+ r = append_record(db, &newrecord, NULL, NULL);
+ if (r) return r;
+
+ /* get the nextlevel to point here */
+ loc->forwardloc0 = newrecord.offset;
+
+ /* update all backpointers right up to the old record's
+ * level, so that they all point past */
+ r = stitch(db, loc->record.level, loc->backloc0);
+ if (r) return r;
+
+ /* update location */
+ loc->is_exactmatch = 0;
+ loc->end = db->end;
+
+ return 0;
+}
+
+/************ DATABASE STRUCT AND TRANSACTION MANAGEMENT **************/
+
+static int db_is_clean(struct dbengine *db)
+{
+ if (db->header.current_size != SIZE(db))
+	return 0;
+
+ if (db->header.flags & DIRTY)
+	return 0;
+
+ return 1;
+}
+
+static int unlock(struct dbengine *db)
+{
+ return mappedfile_unlock(db->mf);
+}
+
+static int write_lock(struct dbengine *db)
+{
+ int r = mappedfile_writelock(db->mf);
+ if (r) return r;
+
+ /* reread header */
+ if (db->is_open) {
+	r = read_header(db);
+	if (r) return r;
+
+	/* recovery checks for consistency */
+	r = recovery(db);
+	if (r) return r;
+ }
+
+ return 0;
+}
+
+static int read_lock(struct dbengine *db)
+{
+ int r = mappedfile_readlock(db->mf);
+ if (r) return r;
+
+ /* reread header */
+ if (db->is_open) {
+	r = read_header(db);
+	if (r) return r;
+
+	/* we just take and keep a write lock if inconsistent,
+	 * the write lock will fix it up */
+	if (!db_is_clean(db)) {
+	 unlock(db);
+	 r = write_lock(db);
+	 if (r) return r;
+	 /* downgrade to a read lock again, since that what
+	 * was requested */
+	 unlock(db);
+	 return read_lock(db);
+	}
+ }
+
+ return 0;
+}
+
+static int newtxn(struct dbengine *db, struct txn **tidptr)
+{
+ int r;
+
+ assert(!db->current_txn);
+ assert(!*tidptr);
+
+ /* grab a r/w lock */
+ r = write_lock(db);
+ if (r) return r;
+
+ /* create the transaction */
+ db->txn_num++;
+ db->current_txn = xmalloc(sizeof(struct txn));
+ db->current_txn->num = db->txn_num;
+
+ /* pass it back out */
+ *tidptr = db->current_txn;
+
+ return 0;
+}
+
+static void dispose_db(struct dbengine *db)
+{
+ if (!db) return;
+
+ if (db->mf) {
+	if (mappedfile_islocked(db->mf))
+	 unlock(db);
+	mappedfile_close(&db->mf);
+ }
+
+ buf_free(&db->loc.keybuf);
+
+ free(db);
+}
+
+/************************************************************/
+
+static int opendb(const char *fname, int flags, struct dbengine **ret)
+{
+ struct dbengine *db;
+ int r;
+ int mappedfile_flags = MAPPEDFILE_RW;
+
+ assert(fname);
+ assert(ret);
+
+ db = (struct dbengine *) xzmalloc(sizeof(struct dbengine));
+
+ if (flags & CYRUSDB_CREATE)
+	mappedfile_flags |= MAPPEDFILE_CREATE;
+
+ db->open_flags = flags & ~CYRUSDB_CREATE;
+ db->compar = (flags & CYRUSDB_MBOXSORT) ? bsearch_ncompare_mbox
+					 : bsearch_ncompare_raw;
+
+ r = mappedfile_open(&db->mf, fname, mappedfile_flags);
+ if (r) {
+	/* convert to CYRUSDB errors*/
+	if (r == -ENOENT) r = CYRUSDB_NOTFOUND;
+	else r = CYRUSDB_IOERROR;
+	goto done;
+ }
+
+ db->is_open = 0;
+
+ /* grab a read lock, only reading the header */
+ r = read_lock(db);
+ if (r) goto done;
+
+ /* if there's any issue which requires fixing, get a write lock */
+ if (0) {
+ retry_write:
+	unlock(db);
+	db->is_open = 0;
+	r = write_lock(db);
+	if (r) goto done;
+ }
+
+ /* if the map size is zero, it's a new file - we need to create an
+ * initial header */
+ if (mappedfile_size(db->mf) == 0) {
+	struct skiprecord dummy;
+
+	if (!mappedfile_iswritelocked(db->mf))
+	 goto retry_write;
+
+	/* create the dummy! */
+	memset(&dummy, 0, sizeof(struct skiprecord));
+	dummy.type = DUMMY;
+	dummy.level = MAXLEVEL;
+
+	/* append dummy after header location */
+	db->end = DUMMY_OFFSET;
+	r = write_record(db, &dummy, NULL, NULL);
+	if (r) {
+	 syslog(LOG_ERR, "DBERROR: writing dummy node for %s: %m",
+		 fname);
+	 goto done;
+	}
+
+	/* create the header */
+	db->header.version = VERSION;
+	db->header.generation = 1;
+	db->header.repack_size = db->end;
+	db->header.current_size = db->end;
+	r = commit_header(db);
+	if (r) {
+	 syslog(LOG_ERR, "DBERROR: writing header for %s: %m",
+		 fname);
+	 goto done;
+	}
+ }
+
+ db->is_open = 1;
+
+ r = read_header(db);
+ if (r) goto done;
+
+ if (!db_is_clean(db)) {
+	if (!mappedfile_iswritelocked(db->mf))
+	 goto retry_write;
+
+	/* recovery will clean the flag once it's committed the fixes */
+	r = recovery(db);
+	if (r) goto done;
+ }
+
+ /* unlock the DB */
+ unlock(db);
+
+ *ret = db;
+
+done:
+ if (r) dispose_db(db);
+ return r;
+}
+
+static int myopen(const char *fname, int flags, struct dbengine **ret)
+{
+ struct db_list *ent;
+ struct dbengine *mydb;
+ int r;
+
+ /* do we already have this DB open? */
+ for (ent = open_twoskip; ent; ent = ent->next) {
+	if (strcmp(FNAME(ent->db), fname)) continue;
+	ent->refcount++;
+	*ret = ent->db;
+	return 0;
+ }
+
+ r = opendb(fname, flags, &mydb);
+ if (r) return r;
+
+ /* track this database in the open list */
+ ent = (struct db_list *) xzmalloc(sizeof(struct db_list));
+ ent->db = mydb;
+ ent->refcount = 1;
+ ent->next = open_twoskip;
+ open_twoskip = ent;
+
+ /* return the open DB */
+ *ret = mydb;
+
+ return 0;
+}
+
+static int myclose(struct dbengine *db)
+{
+ struct db_list *ent = open_twoskip;
+ struct db_list *prev = NULL;
+
+ assert(db);
+
+ /* remove this DB from the open list */
+ while (ent && ent->db != db) {
+	prev = ent;
+	ent = ent->next;
+ }
+ assert(ent);
+
+ if (--ent->refcount <= 0) {
+	if (prev) prev->next = ent->next;
+	else open_twoskip = ent->next;
+	free(ent);
+	if (mappedfile_islocked(db->mf))
+	 syslog(LOG_ERR, "twoskip: %s closed while still locked", FNAME(db));
+	dispose_db(db);
+ }
+
+ return 0;
+}
+
+/*************** EXTERNAL APIS ***********************/
+
+static int myfetch(struct dbengine *db,
+	 const char *key, size_t keylen,
+	 const char **foundkey, size_t *foundkeylen,
+	 const char **data, size_t *datalen,
+	 struct txn **tidptr, int fetchnext)
+{
+ int r = 0;
+
+ assert(db);
+ if (datalen) assert(data);
+
+ if (data) *data = NULL;
+ if (datalen) *datalen = 0;
+
+ /* Hacky workaround:
+ *
+ * If no transaction was passed, but we're in a transaction,
+ * then just do the read within that transaction.
+ */
+ if (!tidptr && db->current_txn)
+	tidptr = &db->current_txn;
+
+ if (tidptr) {
+	if (!*tidptr) {
+	 r = newtxn(db, tidptr);
+	 if (r) return r;
+	}
+ } else {
+	/* grab a r lock */
+	r = read_lock(db);
+	if (r) return r;
+ }
+
+ r = find_loc(db, key, keylen);
+ if (r) goto done;
+
+ if (fetchnext) {
+	r = advance_loc(db);
+	if (r) goto done;
+ }
+
+ if (foundkey) *foundkey = db->loc.keybuf.s;
+ if (foundkeylen) *foundkeylen = db->loc.keybuf.len;
+
+ if (!r && db->loc.is_exactmatch) {
+	if (data) *data = VAL(db, &db->loc.record);
+	if (datalen) *datalen = db->loc.record.vallen;
+ }
+ else {
+	/* we didn't get an exact match */
+	r = CYRUSDB_NOTFOUND;
+ }
+
+done:
+ if (!tidptr) {
+	/* release read lock */
+	int r1;
+	if ((r1 = unlock(db)) < 0) {
+	 return r1;
+	}
+ }
+
+ return r;
+}
+
+/* foreach allows for subsidary mailbox operations in 'cb'.
+ if there is a txn, 'cb' must make use of it.
+*/
+static int myforeach(struct dbengine *db,
+		 const char *prefix, size_t prefixlen,
+		 foreach_p *goodp,
+		 foreach_cb *cb, void *rock,
+		 struct txn **tidptr)
+{
+ int r = 0, cb_r = 0;
+ int need_unlock = 0;
+ const char *val;
+ size_t vallen;
+ struct buf keybuf = BUF_INITIALIZER;
+
+ assert(db);
+ assert(cb);
+ if (prefixlen) assert(prefix);
+
+ /* Hacky workaround:
+ *
+ * If no transaction was passed, but we're in a transaction,
+ * then just do the read within that transaction.
+ */
+ if (!tidptr && db->current_txn)
+	tidptr = &db->current_txn;
+ if (tidptr) {
+	if (!*tidptr) {
+	 r = newtxn(db, tidptr);
+	 if (r) return r;
+	}
+ } else {
+	/* grab a r lock */
+	r = read_lock(db);
+	if (r) return r;
+	need_unlock = 1;
+ }
+
+ r = find_loc(db, prefix, prefixlen);
+ if (r) goto done;
+
+ if (!db->loc.is_exactmatch) {
+	/* advance to the first match */
+	r = advance_loc(db);
+	if (r) goto done;
+ }
+
+ while (db->loc.is_exactmatch) {
+	/* does it match prefix? */
+	if (prefixlen) {
+	 if (db->loc.record.keylen < prefixlen) break;
+	 if (db->compar(KEY(db, &db->loc.record), prefixlen, prefix, prefixlen)) break;
+	}
+
+	val = VAL(db, &db->loc.record);
+	vallen = db->loc.record.vallen;
+
+	if (!goodp || goodp(rock, db->loc.keybuf.s, db->loc.keybuf.len,
+				 val, vallen)) {
+	 if (!tidptr) {
+		/* release read lock */
+		r = unlock(db);
+		if (r) goto done;
+		need_unlock = 0;
+	 }
+
+	 /* take a copy of they key - just in case cb does actions on this database
+	 * and clobbers loc */
+	 buf_copy(&keybuf, &db->loc.keybuf);
+
+	 /* make callback */
+	 cb_r = cb(rock, db->loc.keybuf.s, db->loc.keybuf.len,
+			 val, vallen);
+	 if (cb_r) break;
+
+	 if (!tidptr) {
+		/* grab a r lock */
+		r = read_lock(db);
+		if (r) goto done;
+		need_unlock = 1;
+	 }
+
+	 /* should be cheap if we're already here */
+	 r = find_loc(db, keybuf.s, keybuf.len);
+	 if (r) goto done;
+	}
+
+	/* move to the next one */
+	r = advance_loc(db);
+	if (r) goto done;
+ }
+
+ done:
+
+ buf_free(&keybuf);
+
+ if (need_unlock) {
+	/* release read lock */
+	int r1 = unlock(db);
+	if (r1) return r1;
+ }
+
+ return r ? r : cb_r;
+}
+
+/* helper function for all writes - wraps create and delete and the FORCE
+ * logic for each */
+static int skipwrite(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
+		 int force)
+{
+ int r = find_loc(db, key, keylen);
+ if (r) return r;
+
+ /* could be a delete or a replace */
+ if (db->loc.is_exactmatch) {
+	if (!data) return delete_here(db);
+	if (!force) return CYRUSDB_EXISTS;
+	/* unchanged? Save the IO */
+	if (!db->compar(data, datalen,
+			VAL(db, &db->loc.record),
+			db->loc.record.vallen))
+	 return 0;
+	return store_here(db, data, datalen);
+ }
+
+ /* only create if it's not a delete, obviously */
+ if (data) return store_here(db, data, datalen);
+
+ /* must be a delete - are we forcing? */
+ if (!force) return CYRUSDB_NOTFOUND;
+
+ return 0;
+}
+
+static int mycommit(struct dbengine *db, struct txn *tid)
+{
+ struct skiprecord newrecord;
+ int r = 0;
+
+ assert(db);
+ assert(tid == db->current_txn);
+
+ /* no need to abort if we're not dirty */
+ if (!(db->header.flags & DIRTY))
+	goto done;
+
+ /* build a commit record */
+ memset(&newrecord, 0, sizeof(struct skiprecord));
+ newrecord.type = COMMIT;
+ newrecord.nextloc0 = db->header.current_size;
+
+ /* append to the file */
+ r = append_record(db, &newrecord, NULL, NULL);
+ if (r) goto done;
+
+ /* commit ALL outstanding changes first, before
+ * rewriting the header */
+ r = mappedfile_commit(db->mf);
+ if (r) goto done;
+
+ /* finally, update the header and commit again */
+ db->header.current_size = db->end;
+ db->header.flags &= ~DIRTY;
+ r = commit_header(db);
+
+ done:
+ if (r) {
+	int r2;
+
+	/* error during commit; we must abort */
+	r2 = myabort(db, tid);
+	if (r2) {
+	 syslog(LOG_ERR, "DBERROR: twoskip %s: commit AND abort failed",
+		 FNAME(db));
+	}
+ } else {
+	/* consider checkpointing */
+	int diff = db->header.current_size - db->header.repack_size;
+	if (diff > MINREWRITE &&
+	 ((float)diff / (float)db->header.current_size) > REWRITE_RATIO) {
+	 int r2 = mycheckpoint(db);
+	 if (r2) {
+		syslog(LOG_NOTICE, "twoskip: failed to checkpoint %s: %m",
+		 FNAME(db));
+	 }
+	}
+	else
+	 unlock(db);
+
+	free(tid);
+	db->current_txn = NULL;
+ }
+
+ return r;
+}
+
+static int myabort(struct dbengine *db, struct txn *tid)
+{
+ int r;
+
+ assert(db);
+ assert(tid == db->current_txn);
+
+ /* free the tid */
+ free(tid);
+ db->current_txn = NULL;
+ db->end = db->header.current_size;
+
+ /* recovery will clean up */
+ r = recovery1(db, NULL);
+
+ buf_free(&db->loc.keybuf);
+ memset(&db->loc, 0, sizeof(struct skiploc));
+
+ unlock(db);
+
+ return r;
+}
+
+static int mystore(struct dbengine *db,
+	 const char *key, size_t keylen,
+	 const char *data, size_t datalen,
+	 struct txn **tidptr, int force)
+{
+ struct txn *localtid = NULL;
+ int r = 0;
+ int r2 = 0;
+
+ assert(db);
+ assert(key && keylen);
+
+ /* not keeping the transaction, just create one local to
+ * this function */
+ if (!tidptr) tidptr = &localtid;
+
+ /* make sure we're write locked and up to date */
+ if (!*tidptr) {
+	r = newtxn(db, tidptr);
+	if (r) return r;
+ }
+
+ r = skipwrite(db, key, keylen, data, datalen, force);
+
+ if (r) {
+	r2 = myabort(db, *tidptr);
+	*tidptr = NULL;
+ }
+ else if (localtid) {
+	/* commit the store, which releases the write lock */
+	r = mycommit(db, localtid);
+ }
+
+ return r2 ? r2 : r;
+}
+
+/* compress 'db', closing at the end. Uses foreach to copy into a new
+ * database, then rewrites over the old one */
+
+struct copy_rock {
+ struct dbengine *db;
+ struct txn *tid;
+};
+
+static int copy_cb(void *rock,
+		 const char *key, size_t keylen,
+		 const char *val, size_t vallen)
+{
+ struct copy_rock *cr = (struct copy_rock *)rock;
+
+ return mystore(cr->db, key, keylen, val, vallen, &cr->tid, 0);
+}
+
+static int mycheckpoint(struct dbengine *db)
+{
+ size_t old_size = db->header.current_size;
+ char newfname1024;
+ clock_t start = sclock();
+ struct copy_rock cr;
+ int r = 0;
+
+ r = myconsistent(db, db->current_txn);
+ if (r) {
+	syslog(LOG_ERR, "db %s, inconsistent pre-checkpoint, bailing out",
+	 FNAME(db));
+	unlock(db);
+	return r;
+ }
+
+ /* open fname.NEW */
+ snprintf(newfname, sizeof(newfname), "%s.NEW", FNAME(db));
+ unlink(newfname);
+
+ cr.db = NULL;
+ cr.tid = NULL;
+ r = opendb(newfname, db->open_flags | CYRUSDB_CREATE, &cr.db);
+ if (r) return r;
+
+ r = myforeach(db, NULL, 0, NULL, copy_cb, &cr, &db->current_txn);
+ if (r) goto err;
+
+ r = myconsistent(cr.db, cr.tid);
+ if (r) {
+	syslog(LOG_ERR, "db %s, inconsistent post-checkpoint, bailing out",
+	 FNAME(db));
+	goto err;
+ }
+
+ /* remember the repack size */
+ cr.db->header.repack_size = cr.db->end;
+
+ /* increase the generation count */
+ cr.db->header.generation = db->header.generation + 1;
+
+ r = mycommit(cr.db, cr.tid);
+ if (r) goto err;
+
+ /* move new file to original file name */
+ r = mappedfile_rename(cr.db->mf, FNAME(db));
+ if (r) goto err;
+
+ /* OK, we're commmitted now - clean up */
+ unlock(db);
+
+ /* gotta clean it all up */
+ mappedfile_close(&db->mf);
+ buf_free(&db->loc.keybuf);
+
+ *db = *cr.db;
+ free(cr.db); /* leaked? */
+
+ {
+	syslog(LOG_INFO,
+	 "twoskip: checkpointed %s (%llu record%s, %llu => %llu bytes) in %2.3f seconds",
+	 FNAME(db), (LLU)db->header.num_records,
+	 db->header.num_records == 1 ? "" : "s", (LLU)old_size,
+	 (LLU)(db->header.current_size),
+	 (sclock() - start) / (double) CLOCKS_PER_SEC);
+ }
+
+ return 0;
+
+ err:
+ if (cr.tid) myabort(cr.db, cr.tid);
+ unlink(FNAME(cr.db));
+ dispose_db(cr.db);
+ unlock(db);
+ return CYRUSDB_IOERROR;
+}
+
+
+/* dump the database.
+ if detail == 1, dump all records.
+ if detail == 2, also dump pointers for active records.
+ if detail == 3, dump all records/all pointers.
+*/
+static int dump(struct dbengine *db, int detail __attribute__((unused)))
+{
+ struct skiprecord record;
+ struct buf scratch = BUF_INITIALIZER;
+ size_t offset = DUMMY_OFFSET;
+ int r = 0;
+ int i;
+
+ printf("HEADER: v=%lu fl=%lu num=%llu sz=(%08llX/%08llX)\n",
+	 (LU)db->header.version,
+	 (LU)db->header.flags,
+	 (LLU)db->header.num_records,
+	 (LLU)db->header.current_size,
+	 (LLU)db->header.repack_size);
+
+ while (offset < db->header.current_size) {
+	printf("%08llX ", (LLU)offset);
+
+	r = read_onerecord(db, offset, &record);
+
+	if (r) {
+	 printf("ERROR\n");
+	 break;
+	}
+
+	switch (record.type) {
+	case DELETE:
+	 printf("DELETE ptr=%08llX\n", (LLU)record.nextloc0);
+	 break;
+
+	case COMMIT:
+	 printf("COMMIT start=%08llX\n", (LLU)record.nextloc0);
+	 break;
+
+	case RECORD:
+	case DUMMY:
+	 buf_setmap(&scratch, KEY(db, &record), record.keylen);
+	 buf_replace_char(&scratch, '\0', '-');
+	 printf("%s kl=%llu dl=%llu lvl=%d (%s)\n",
+		 (record.type == RECORD ? "RECORD" : "DUMMY"),
+		 (LLU)record.keylen, (LLU)record.vallen,
+		 record.level, buf_cstring(&scratch));
+	 printf("\t");
+	 for (i = 0; i <= record.level; i++) {
+		printf("%08llX ", (LLU)record.nextloci);
+		if (!(i % 8))
+		 printf("\n\t");
+	 }
+	 printf("\n");
+	 break;
+	}
+
+	offset += record.len;
+ }
+
+ buf_free(&scratch);
+
+ return r;
+}
+
+static int consistent(struct dbengine *db)
+{
+ int r;
+
+ r = read_lock(db);
+ if (r) return r;
+
+ r = myconsistent(db, NULL);
+
+ unlock(db);
+
+ return r;
+}
+
+/* perform some basic consistency checks */
+static int myconsistent(struct dbengine *db, struct txn *tid)
+{
+ struct skiprecord prevrecord;
+ struct skiprecord record;
+ size_t fwdMAXLEVEL;
+ size_t num_records = 0;
+ int r = 0;
+ int cmp;
+ int i;
+
+ assert(db->current_txn == tid); /* could both be null */
+
+ /* read in the dummy */
+ r = read_onerecord(db, DUMMY_OFFSET, &prevrecord);
+ if (r) return r;
+
+ /* set up the location pointers */
+ for (i = 0; i < MAXLEVEL; i++)
+	fwdi = _getloc(db, &prevrecord, i);
+
+ while (fwd0) {
+	r = read_onerecord(db, fwd0, &record);
+	if (r) return r;
+
+	if (record.type == DELETE) {
+	 fwd0 = record.nextloc0;
+	 continue;
+	}
+
+	cmp = db->compar(KEY(db, &record), record.keylen,
+			 KEY(db, &prevrecord), prevrecord.keylen);
+	if (cmp <= 0) {
+	 syslog(LOG_ERR, "DBERROR: twoskip out of order %s: %.*s (%08llX) <= %.*s (%08llX)",
+		 FNAME(db), (int)record.keylen, KEY(db, &record),
+		 (LLU)record.offset,
+		 (int)prevrecord.keylen, KEY(db, &prevrecord),
+		 (LLU)prevrecord.offset);
+	 return CYRUSDB_INTERNAL;
+	}
+
+	for (i = 0; i < record.level; i++) {
+	 /* check the old pointer was to here */
+	 if (fwdi != record.offset) {
+		syslog(LOG_ERR, "DBERROR: twoskip broken linkage %s: %08llX at %d, expected %08llX",
+		 FNAME(db), (LLU)record.offset, i, (LLU)fwdi);
+		return CYRUSDB_INTERNAL;
+	 }
+	 /* and advance to the new pointer */
+	 fwdi = _getloc(db, &record, i);
+	}
+
+	/* keep a copy for comparison purposes */
+	num_records++;
+	prevrecord = record;
+ }
+
+ for (i = 0; i < MAXLEVEL; i++) {
+	if (fwdi) {
+	 syslog(LOG_ERR, "DBERROR: twoskip broken tail %s: %08llX at %d",
+		 FNAME(db), (LLU)fwdi, i);
+	 return CYRUSDB_INTERNAL;
+	}
+ }
+
+ /* we walked the whole file and saw every pointer */
+
+ if (num_records != db->header.num_records) {
+	syslog(LOG_ERR, "DBERROR: twoskip record count mismatch %s: %llu should be %llu",
+	 FNAME(db), (LLU)num_records, (LLU)db->header.num_records);
+	return CYRUSDB_INTERNAL;
+ }
+
+ return 0;
+}
+
+static int _copy_commit(struct dbengine *db, struct dbengine *newdb,
+		 struct skiprecord *commit)
+{
+ struct txn *tid = NULL;
+ struct skiprecord record;
+ const char *val;
+ size_t offset;
+ int r = 0;
+
+ for (offset = commit->nextloc0; offset < commit->offset; offset += record.len) {
+	r = read_onerecord(db, offset, &record);
+	if (r) goto err;
+	switch (record.type) {
+	case DELETE:
+	 val = NULL;
+	 break;
+	case RECORD:
+	 val = VAL(db, &record);
+	 break;
+	default:
+	 r = CYRUSDB_IOERROR;
+	 goto err;
+	}
+
+	/* store into the new DB */
+	r = mystore(newdb, KEY(db, &record), record.keylen, val, record.vallen, &tid, 1);
+	if (r) goto err;
+ }
+
+ if (tid) r = mycommit(newdb, tid);
+ if (r) return r;
+
+ return 0;
+
+err:
+ if (tid) myabort(newdb, tid);
+ return r;
+}
+
+/* recovery2 - the file is really screwed. Basically, we
+ * failed to run recovery. Try reading out records from
+ * the top and applying commits to a new file instead */
+static int recovery2(struct dbengine *db, int *count)
+{
+ uint64_t oldcount = db->header.num_records;
+ struct skiprecord record;
+ struct dbengine *newdb = NULL;
+ char newfname1024;
+ size_t offset;
+ int r = 0;
+
+ /* open fname.NEW */
+ snprintf(newfname, sizeof(newfname), "%s.NEW", FNAME(db));
+ unlink(newfname);
+
+ r = opendb(newfname, db->open_flags | CYRUSDB_CREATE, &newdb);
+ if (r) return r;
+
+ /* increase the generation count */
+ newdb->header.generation = db->header.generation + 1;
+
+ /* start with the dummy */
+ for (offset = DUMMY_OFFSET; offset < SIZE(db); offset += record.len) {
+	r = read_onerecord(db, offset, &record);
+	if (r) {
+	 syslog(LOG_ERR, "DBERROR: %s failed to read at %08llX in recovery2, truncating",
+		 FNAME(db), (LLU)offset);
+	 break;
+	}
+	if (record.type == COMMIT) {
+	 r = _copy_commit(db, newdb, &record);
+	 if (r) {
+		syslog(LOG_ERR, "DBERROR: %s failed to apply commit at %08llX in recovery2, truncating",
+		 FNAME(db), (LLU)offset);
+		break;
+	 }
+	}
+ }
+
+ if (!newdb->header.num_records) {
+	/* no records found - almost certainly bogus, and even if not,
+	 * there's no point recovering a zero record file */
+	syslog(LOG_ERR, "DBERROR: %s no records found in recovery2, aborting",
+	 FNAME(db));
+	r = CYRUSDB_NOTFOUND;
+	goto err;
+ }
+
+ /* regardless, we had a commit during create, and in any _copy_commit, so
+ * rename into place */
+
+ /* move new file to original file name */
+ r = mappedfile_rename(newdb->mf, FNAME(db));
+ if (r) goto err;
+
+ /* OK, we're commmitted now - clean up */
+ unlock(db);
+
+ /* gotta clean it all up */
+ mappedfile_close(&db->mf);
+ buf_free(&db->loc.keybuf);
+
+ *db = *newdb;
+ free(newdb); /* leaked? */
+
+ syslog(LOG_NOTICE, "twoskip: recovery2 %s - rescued %llu of %llu records",
+	 FNAME(db), (LLU)db->header.num_records, (LLU)oldcount);
+
+ if (count) *count = db->header.num_records;
+
+ return 0;
+
+ err:
+ unlink(FNAME(newdb));
+ myclose(newdb);
+ return r;
+}
+
+/* run recovery on this file.
+ * always called with a write lock. */
+static int recovery1(struct dbengine *db, int *count)
+{
+ size_t prevMAXLEVEL+1;
+ size_t nextMAXLEVEL+1;
+ struct skiprecord record;
+ struct skiprecord prevrecord;
+ struct skiprecord fixrecord;
+ size_t nextoffset = 0;
+ uint64_t num_records = 0;
+ int changed = 0;
+ int r = 0;
+ int cmp;
+ int i;
+
+ assert(mappedfile_iswritelocked(db->mf));
+
+ /* no need to run recovery if we're consistent */
+ if (db_is_clean(db))
+	return 0;
+
+ /* we can't recovery a file that's not created yet */
+ assert(db->header.current_size > HEADER_SIZE);
+
+ /* dirty the header if not already dirty */
+ if (!(db->header.flags & DIRTY)) {
+	db->header.flags |= DIRTY;
+	r = commit_header(db);
+	if (r) return r;
+ }
+
+ /* start with the dummy */
+ r = read_onerecord(db, DUMMY_OFFSET, &prevrecord);
+ if (r) return r;
+
+ /* and pointers forwards */
+ for (i = 2; i <= MAXLEVEL; i++) {
+	previ = prevrecord.offset;
+	nexti = prevrecord.nextloci;
+ }
+
+ /* check for broken level - pointers */
+ for (i = 0; i < 2; i++) {
+	if (prevrecord.nextloci >= db->end) {
+	 prevrecord.nextloci = 0;
+	 r = rewrite_record(db, &prevrecord);
+	 changed++;
+	}
+ }
+
+ nextoffset = _getloc(db, &prevrecord, 0);
+
+ while (nextoffset) {
+	r = read_onerecord(db, nextoffset, &record);
+	if (r) return r;
+
+	/* just skip over delele records */
+	if (record.type == DELETE) {
+	 nextoffset = record.nextloc0;
+	 continue;
+	}
+
+	cmp = db->compar(KEY(db, &record), record.keylen,
+			 KEY(db, &prevrecord), prevrecord.keylen);
+	if (cmp <= 0) {
+	 syslog(LOG_ERR, "DBERROR: twoskip out of order %s: %.*s (%08llX) <= %.*s (%08llX)",
+		 FNAME(db), (int)record.keylen, KEY(db, &record),
+		 (LLU)record.offset,
+		 (int)prevrecord.keylen, KEY(db, &prevrecord),
+		 (LLU)prevrecord.offset);
+	 return CYRUSDB_INTERNAL;
+	}
+
+	/* check for old offsets needing fixing */
+	for (i = 2; i <= record.level; i++) {
+	 if (nexti != record.offset) {
+		/* need to fix up the previous record to point here */
+		r = read_onerecord(db, previ, &fixrecord);
+		if (r) return r;
+
+		/* XXX - optimise adjacent same records */
+		fixrecord.nextloci = record.offset;
+		r = rewrite_record(db, &fixrecord);
+		if (r) return r;
+		changed++;
+	 }
+	 previ = record.offset;
+	 nexti = record.nextloci;
+	}
+
+	/* check for broken level - pointers */
+	for (i = 0; i < 2; i++) {
+	 if (record.nextloci >= db->end) {
+		record.nextloci = 0;
+		r = rewrite_record(db, &record);
+		changed++;
+	 }
+	}
+
+	num_records++;
+
+	/* find the next record */
+	nextoffset = _getloc(db, &record, 0);
+
+	prevrecord = record;
+ }
+
+ /* check for remaining offsets needing fixing */
+ for (i = 2; i <= MAXLEVEL; i++) {
+	if (nexti) {
+	 /* need to fix up the previous record to point to the end */
+	 r = read_onerecord(db, previ, &fixrecord);
+	 if (r) return r;
+
+	 /* XXX - optimise, same as above */
+	 fixrecord.nextloci = 0;
+	 r = rewrite_record(db, &fixrecord);
+	 if (r) return r;
+	 changed++;
+	}
+ }
+
+ r = mappedfile_truncate(db->mf, db->header.current_size);
+ if (r) return r;
+
+ r = mappedfile_commit(db->mf);
+ if (r) return r;
+
+ /* clear the dirty flag */
+ db->header.flags &= ~DIRTY;
+ db->header.num_records = num_records;
+ r = commit_header(db);
+ if (r) return r;
+
+ if (count) *count = changed;
+
+ return 0;
+}
+
+static int recovery(struct dbengine *db)
+{
+ clock_t start = sclock();
+ int count = 0;
+ int r;
+
+ /* no need to run recovery if we're consistent */
+ if (db_is_clean(db))
+	return 0;
+
+ r = recovery1(db, &count);
+ if (r) {
+	syslog(LOG_ERR, "DBERROR: recovery1 failed %s, trying recovery2", FNAME(db));
+	count = 0;
+	r = recovery2(db, &count);
+	if (r) return r;
+ }
+
+ {
+	syslog(LOG_INFO,
+	 "twoskip: recovered %s (%llu record%s, %llu bytes) in %2.3f seconds - fixed %d offset%s",
+	 FNAME(db), (LLU)db->header.num_records,
+	 db->header.num_records == 1 ? "" : "s",
+	 (LLU)(db->header.current_size),
+	 (sclock() - start) / (double) CLOCKS_PER_SEC,
+	 count, count == 1 ? "" : "s");
+ }
+
+ return 0;
+}
+
+static int fetch(struct dbengine *mydb,
+		 const char *key, size_t keylen,
+		 const char **data, size_t *datalen,
+		 struct txn **tidptr)
+{
+ assert(key);
+ assert(keylen);
+ return myfetch(mydb, key, keylen, NULL, NULL,
+		 data, datalen, tidptr, 0);
+}
+
+static int fetchnext(struct dbengine *mydb,
+		 const char *key, size_t keylen,
+		 const char **foundkey, size_t *fklen,
+		 const char **data, size_t *datalen,
+		 struct txn **tidptr)
+{
+ return myfetch(mydb, key, keylen, foundkey, fklen,
+		 data, datalen, tidptr, 1);
+}
+
+static int create(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
+		 struct txn **tid)
+{
+ if (datalen) assert(data);
+ return mystore(db, key, keylen, data ? data : "", datalen, tid, 0);
+}
+
+static int store(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 const char *data, size_t datalen,
+		 struct txn **tid)
+{
+ if (datalen) assert(data);
+ return mystore(db, key, keylen, data ? data : "", datalen, tid, 1);
+}
+
+static int delete(struct dbengine *db,
+		 const char *key, size_t keylen,
+		 struct txn **tid, int force)
+{
+ return mystore(db, key, keylen, NULL, 0, tid, force);
+}
+
+/* twoskip compar function is set at open */
+static int mycompar(struct dbengine *db, const char *a, int alen,
+		 const char *b, int blen)
+{
+ return db->compar(a, alen, b, blen);
+}
+
+HIDDEN struct cyrusdb_backend cyrusdb_twoskip =
+{
+ "twoskip",			/* name */
+
+ &cyrusdb_generic_init,
+ &cyrusdb_generic_done,
+ &cyrusdb_generic_sync,
+ &cyrusdb_generic_archive,
+
+ &myopen,
+ &myclose,
+
+ &fetch,
+ &fetch,
+ &fetchnext,
+
+ &myforeach,
+ &create,
+ &store,
+ &delete,
+
+ &mycommit,
+ &myabort,
+
+ &dump,
+ &consistent,
+ &mycheckpoint,
+ &mycompar
+};

cyrus-imapd-2.4.17.tar.gz/lib/exitcodes.h -> cyrus-imapd-2.5.tar.gz/lib/exitcodes.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/ftruncate.c -> cyrus-imapd-2.5.tar.gz/lib/ftruncate.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/gai.h -> cyrus-imapd-2.5.tar.gz/lib/gai.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/getaddrinfo.c -> cyrus-imapd-2.5.tar.gz/lib/getaddrinfo.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/getdtablesize.c -> cyrus-imapd-2.5.tar.gz/lib/getdtablesize.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/getnameinfo.c -> cyrus-imapd-2.5.tar.gz/lib/getnameinfo.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/glob.c -> cyrus-imapd-2.5.tar.gz/lib/glob.c Changed

@@ -39,14 +39,11 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: glob.c,v 1.36 2010/01/06 17:01:45 murch Exp $
- *
 * Author: Chris Newman
 * Start Date: 4/5/93
 */
 
 #include <config.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include "util.h"
@@ -62,15 +59,13 @@
 /* initialize globbing structure
 * This makes the following changes to the input string:
 * 1) '*' added to each end if GLOB_SUBSTRING
- * 2) '%' converted to '?' if no GLOB_HIERARCHIAL
+ * 2) '%' converted to '?' if no GLOB_HIERARCHY
 * 3) '?'s moved to left of '*'
 * 4) '*' eats all '*'s and '%'s connected by any wildcard
 * 5) '%' eats all adjacent '%'s
 */
-glob *glob_init_suppress (str, flags, suppress)
- const char *str;
- int flags;
- const char *suppress;
+EXPORTED glob *glob_init_suppress(const char *str, int flags,
+			 const char *suppress)
 {
 glob *g;
 char *dst;
@@ -187,8 +182,7 @@
 
 /* free a glob structure
 */
-void glob_free (g)
- glob **g;
+EXPORTED void glob_free(glob **g)
 {
 if (*g) free((void *) *g);
 *g = NULL;
@@ -202,11 +196,8 @@
 * set to return value + 1 on partial match, otherwise -1
 * if NULL, partial matches not allowed
 */
-int glob_test (g, ptr, len, min)
- glob* g;
- const char* ptr;
- long int len;
- long int *min;
+EXPORTED int glob_test(glob* g, const char* ptr,
+	 long int len, long int *min)
 {
 const char *gptr, *pend;	/* glob pointer, end of ptr string */
 const char *gstar, *pstar;	/* pointers for '*' patterns */
@@ -441,27 +432,3 @@
 return (*gptr == '\0' && ptr == pend ? ptr - start : -1);
 }
 
-#ifdef TEST_GLOB
-int main (argc, argv)
- int argc;
- char* argv;
-{
- glob *g = glob_init_suppress(argv1, GLOB_INBOXCASE|GLOB_HIERARCHY,
-				 "user.nifty");
- char text1024;
- int len;
- long min;
-
- if (g) {
-	printf("%d/%s/%s\n", g->flags, g->inbox, g->str);
-	while (fgets(text, sizeof (text), stdin) != NULL) {
-	 len = strlen(text) - 1;
-	 textlen = '\0';
-	 min = 0;
-	 while (min >= 0) {
-		printf("%d\n", glob_test(g, text, len, &min));
-	 }
-	}
- }
-}
-#endif /* TEST_GLOB */

cyrus-imapd-2.4.17.tar.gz/lib/glob.h -> cyrus-imapd-2.5.tar.gz/lib/glob.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/gmtoff.h -> cyrus-imapd-2.5.tar.gz/lib/gmtoff.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/gmtoff_gmtime.c -> cyrus-imapd-2.5.tar.gz/lib/gmtoff_gmtime.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/gmtoff_tm.c -> cyrus-imapd-2.5.tar.gz/lib/gmtoff_tm.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/hash.c -> cyrus-imapd-2.5.tar.gz/lib/hash.c Changed

@@ -1,6 +1,4 @@
 /* +++Date last modified: 05-Jul-1997 */
-/* $Id: hash.c,v 1.13 2006/11/30 17:11:22 murch Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -8,10 +6,11 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "assert.h"
 #include "hash.h"
 #include "mpool.h"
+#include "strhash.h"
 #include "xmalloc.h"
-#include "exitcodes.h"
 
 /*
 ** public domain code by Jerry Coffin, with improvements by HenkJan Wolthuis.
@@ -39,13 +38,10 @@
 ** of the table to 0.
 */
 
-hash_table *construct_hash_table(hash_table *table, size_t size, int use_mpool)
+EXPORTED hash_table *construct_hash_table(hash_table *table, size_t size, int use_mpool)
 {
- if(!table)
-	 fatal("construct_hash_table called without a starting table",
-		EC_TEMPFAIL);
- if(!size)
-	 fatal("construct_hash_table called without a size", EC_TEMPFAIL);
+ assert(table);
+ assert(size);
 
 table->size = size;
 
@@ -70,11 +66,11 @@
 
 /*
 ** Insert 'key' into hash table.
-** Returns pointer to old data associated with the key, if any, or
-** NULL if the key wasn't in the table previously.
+** Returns a non-NULL pointer which is either the passed @data pointer
+** or, if there was already an entry for @key, the old data pointer.
 */
 
-void *hash_insert(const char *key, void *data, hash_table *table)
+EXPORTED void *hash_insert(const char *key, void *data, hash_table *table)
 {
 unsigned val = strhash(key) % table->size;
 bucket *ptr, *newptr;
@@ -155,7 +151,7 @@
 ** the key is not in the table.
 */
 
-void *hash_lookup(const char *key, hash_table *table)
+EXPORTED void *hash_lookup(const char *key, hash_table *table)
 {
 unsigned val = strhash(key) % table->size;
 bucket *ptr;
@@ -180,7 +176,7 @@
 */
 /* Warning: use this function judiciously if you are using memory pools,
 * since it will leak memory until you get rid of the entire hash table */
-void *hash_del(char *key, hash_table *table)
+EXPORTED void *hash_del(const char *key, hash_table *table)
 {
 unsigned val = strhash(key) % table->size;
 void *data;
@@ -254,7 +250,7 @@
 ** it.
 */
 
-void free_hash_table(hash_table *table, void (*func)(void *))
+EXPORTED void free_hash_table(hash_table *table, void (*func)(void *))
 {
 unsigned i;
 bucket *ptr, *temp;
@@ -296,7 +292,7 @@
 ** node in the table, passing it the key, the associated data and 'rock'.
 */
 
-void hash_enumerate(hash_table *table, void (*func)(char *, void *, void *),
+EXPORTED void hash_enumerate(hash_table *table, void (*func)(const char *, void *, void *),
 		 void *rock)
 {
 unsigned i;
@@ -317,75 +313,19 @@
 }
 }
 
-
-#ifdef TEST
-
-#include <stdio.h>
-
-void fatal(const char* s, int code)
-{
- fprintf(stderr, "hash: %s\r\n", s);
- exit(code);
-}
-
-void printer(char *string, void *data, void *rock)
+EXPORTED int hash_numrecords(hash_table *table)
 {
- printf("%s: %s\n", string, (char *)data);
+ unsigned i;
+ bucket *temp;
+ int count = 0;
+
+ for (i = 0; i < table->size; i++) {
+	temp = (table->table)i;
+	while (temp) {
+	 count++;
+	 temp = temp->next;
+	}
+ }
+
+ return count;
 }
-
-int main(void)
-{
- hash_table table;
-
- char *strings = {
-	 "1","2","3","4","5","A decently long string",
-	 NULL
- };
-
- char *junk = {
- "The first data",
- "The second data",
- "The third data",
- "The fourth data",
- "The fifth datum",
- "The sixth piece of data"
- };
-
- int i;
- void *j;
-
- construct_hash_table(&table,200,1);
-
- for (i = 0; NULL != stringsi; i++ )
-	 hash_insert(stringsi, junki, &table);
-
- for (i=0;NULL != stringsi;i++)
- {
-	 j = hash_lookup(stringsi, &table);
-	 if (!j)
-	 printf("\nERROR: %s was not in table.",
-		 stringsi);
- }
- 
- for (i=0;NULL != stringsi;i++)
- {
- printf("\n");
- hash_enumerate(&table, printer, NULL);
- if(!hash_del(stringsi,&table))
-		printf("ERROR WITH DELETE of '%s'\n", stringsi);
- }
-
- for (i=0;NULL != stringsi;i++)
- {
- j = hash_lookup(stringsi, &table);
- if (NULL == j)
- printf("\n'%s' is not in table",stringsi);
- else printf("\nERROR: %s was deleted but is still in table.",
- stringsi);
- }
- printf("\n");
- free_hash_table(&table, NULL);
- return 0;
-}
-
-#endif /* TEST */

cyrus-imapd-2.4.17.tar.gz/lib/hash.h -> cyrus-imapd-2.5.tar.gz/lib/hash.h Changed

@@ -1,13 +1,12 @@
 /* +++Date last modified: 05-Jul-1997 */
-/* $Id: hash.h,v 1.9 2003/10/22 18:50:12 rjs3 Exp $ */
-
 #ifndef HASH__H
 #define HASH__H
 
 #include <stddef.h> /* For size_t */
-#include "strhash.h"
 #include "mpool.h"
 
+#define HASH_TABLE_INITIALIZER {0, NULL, NULL}
+
 /*
 ** A hash table consists of an array of these buckets. Each bucket
 ** holds a copy of the key, a pointer to the data associated with the
@@ -66,7 +65,7 @@
 */
 /* Warning: use this function judiciously if you are using memory pools,
 * since it will leak memory until you get rid of the entire hash table */
-void *hash_del(char *key,hash_table *table);
+void *hash_del(const char *key,hash_table *table);
 
 /*
 ** Goes through a hash table and calls the function passed to it
@@ -75,9 +74,13 @@
 ** with it and 'rock'.
 */
 
-void hash_enumerate(hash_table *table,void (*func)(char *,void *,void *),
+void hash_enumerate(hash_table *table,void (*func)(const char *,void *,void *),
 		 void *rock);
 
+/* counts the number of nodes in the hash table */
+
+int hash_numrecords(hash_table *table);
+
 /*
 ** Frees a hash table. For each node that was inserted in the table,
 ** it calls the function whose address it was passed, with a pointer

cyrus-imapd-2.5.tar.gz/lib/hashu64.c Added

@@ -0,0 +1,317 @@
+/* +++Date last modified: 05-Jul-1997 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "assert.h"
+#include "hashu64.h"
+#include "mpool.h"
+#include "xmalloc.h"
+
+/*
+** public domain code by Jerry Coffin, with improvements by HenkJan Wolthuis.
+**
+** Tested with Visual C 1.0 and Borland C 3.1.
+** Compiles without warnings, and seems like it should be pretty
+** portable.
+**
+** Modified for use with libcyrus by Ken Murchison.
+** - prefixed functions with 'hash_' to avoid symbol clashing
+** - use xmalloc() and xstrdup()
+** - cleaned up free_hash_table(), doesn't use enumerate anymore
+** - added 'rock' to hash_enumerate()
+**
+** Further modified by Rob Siemborski.
+** - xmalloc can never return NULL, so don't worry about it
+** - sort the buckets for faster searching
+** - actually, we'll just use a memory pool for this sucker
+** (atleast, in the cases where it is advantageous to do so)
+*/
+
+/* Initialize the hashu64_table to the size asked for. Allocates space
+** for the correct number of pointers and sets them to NULL. If it
+** can't allocate sufficient memory, signals error by setting the size
+** of the table to 0.
+*/
+
+static inline int u64cmp(uint64_t a, uint64_t b)
+{
+ return (a b ? 1 : 0));
+}
+
+EXPORTED hashu64_table *construct_hashu64_table(hashu64_table *table, size_t size, int use_mpool)
+{
+ assert(table);
+ assert(size);
+
+ table->size = size;
+
+ /* Allocate the table -- different for using memory pools and not */
+ if(use_mpool) {
+	 /* Allocate an initial memory pool for 32 byte keys + the hash table
+	 * + the buckets themselves */
+	 table->pool =
+	 new_mpool(size * (32 + sizeof(bucketu64*) + sizeof(bucketu64)));
+	 table->table =
+	 (bucketu64 **)mpool_malloc(table->pool,sizeof(bucketu64 *) * size);
+ } else {
+	 table->pool = NULL;
+	 table->table = xmalloc(sizeof(bucketu64 *) * size);
+ }
+ 
+ /* Allocate the table and initilize it */
+ memset(table->table, 0, sizeof(bucketu64 *) * size);
+
+ return table;
+}
+
+/*
+** Insert 'key' into hashu64 table.
+** Returns a non-NULL pointer which is either the passed @data pointer
+** or, if there was already an entry for @key, the old data pointer.
+*/
+
+EXPORTED void *hashu64_insert(uint64_t key, void *data, hashu64_table *table)
+{
+ unsigned val = key % table->size;
+ bucketu64 *ptr, *newptr;
+ bucketu64 **prev;
+
+ /*
+ ** NULL means this bucket hasn't been used yet. We'll simply
+ ** allocate space for our new bucket and put our data there, with
+ ** the table pointing at it.
+ */
+ if (!((table->table)val))
+ {
+	 if(table->pool) {
+	 (table->table)val =
+		 (bucketu64 *)mpool_malloc(table->pool, sizeof(bucketu64));
+	 (table->table)val -> key = key;
+	 } else {
+	 (table->table)val = (bucketu64 *)xmalloc(sizeof(bucketu64));
+	 (table->table)val -> key = key;
+	 }
+	 (table->table)val -> next = NULL;
+	 (table->table)val -> data = data;
+	 return (table->table)val -> data;
+ }
+
+ /*
+ ** This spot in the table is already in use. See if the current string
+ ** has already been inserted, and if so, increment its count.
+ */
+ for (prev = &((table->table)val), ptr=(table->table)val;
+	 ptr;
+	 prev=&(ptr->next),ptr=ptr->next) {
+	 int cmpresult = u64cmp(key, ptr->key);
+	 if (!cmpresult) {
+	 /* Match! Replace this value and return the old */
+	 void *old_data;
+	 
+	 old_data = ptr->data;
+	 ptr -> data = data;
+	 return old_data;
+	 } else if (cmpresult < 0) {
+	 /* The new key is smaller than the current key--
+	 * insert a node and return this data */
+	 if(table->pool) {
+		 newptr = (bucketu64 *)mpool_malloc(table->pool, sizeof(bucketu64));
+		 newptr->key = key;
+	 } else {
+		 newptr = (bucketu64 *)xmalloc(sizeof(bucketu64));
+		 newptr->key = key;
+	 }
+	 newptr->data = data;
+	 newptr->next = ptr;
+	 *prev = newptr;
+	 return data;
+	 }
+ }
+
+ /*
+ ** This key is the largest one so far. Add it to the end
+ ** of the list (*prev should be correct)
+ */
+ if(table->pool) {
+	 newptr=(bucketu64 *)mpool_malloc(table->pool,sizeof(bucketu64));
+	 newptr->key = key;
+ } else {
+	 newptr=(bucketu64 *)xmalloc(sizeof(bucketu64));
+	 newptr->key = key;
+ }
+ newptr->data = data;
+ newptr->next = NULL;
+ *prev = newptr;
+ return data;
+}
+
+
+/*
+** Look up a key and return the associated data. Returns NULL if
+** the key is not in the table.
+*/
+
+EXPORTED void *hashu64_lookup(uint64_t key, hashu64_table *table)
+{
+ unsigned val = key % table->size;
+ bucketu64 *ptr;
+
+ if (!(table->table)val)
+ return NULL;
+
+ for ( ptr = (table->table)val;NULL != ptr; ptr = ptr->next )
+ {
+	 int cmpresult = u64cmp(key, ptr->key);
+	 if (!cmpresult)
+	 return ptr->data;
+	 else if(cmpresult < 0) /* key < ptr->key -- we passed it */
+	 return NULL;
+ }
+ return NULL;
+}
+
+/*
+** Delete a key from the hashu64 table and return associated
+** data, or NULL if not present.
+*/
+/* Warning: use this function judiciously if you are using memory pools,
+ * since it will leak memory until you get rid of the entire hash table */
+EXPORTED void *hashu64_del(uint64_t key, hashu64_table *table)
+{
+ unsigned val = key % table->size;
+ void *data;
+ bucketu64 *ptr, *last = NULL;
+
+ if (!(table->table)val)
+ return NULL;
+
+ /*
+ ** Traverse the list, keeping track of the previous node in the list.
+ ** When we find the node to delete, we set the previous node's next
+ ** pointer to point to the node after ourself instead. We then delete
+ ** the key from the present node, and return a pointer to the data it
+ ** contains.
+ */
+
+ for (last = NULL, ptr = (table->table)val;
+ NULL != ptr;
+ last = ptr, ptr = ptr->next)
+ {
+	 int cmpresult = u64cmp(key, ptr->key);
+	 if (!cmpresult)
+	 {
+	 if (last != NULL )
+	 {
+		 data = ptr -> data;
+		 last -> next = ptr -> next;
+		 if(!table->pool) {
+		 free(ptr);
+		 }
+		 return data;
+	 }
+	 
+	 /*
+	 ** If 'last' still equals NULL, it means that we need to
+	 ** delete the first node in the list. This simply consists
+	 ** of putting our own 'next' pointer in the array holding
+	 ** the head of the list. We then dispose of the current
+	 ** node as above.
+	 */
+	 
+	 else
+	 {
+		 data = ptr->data;
+		 (table->table)val = ptr->next;
+		 if(!table->pool) {
+		 free(ptr);
+		 }
+		 return data;
+	 }
+	 } else if (cmpresult < 0) {
+	 /* its not here! */
+	 return NULL;
+	 }
+ }
+
+ /*
+ ** If we get here, it means we didn't find the item in the table.
+ ** Signal this by returning NULL.
+ */
+ return NULL;
+}
+
+/*
+** Frees a complete table by iterating over it and freeing each node.
+** the second parameter is the address of a function it will call with a
+** pointer to the data associated with each node. This function is
+** responsible for freeing the data, or doing whatever is needed with
+** it.
+*/
+
+EXPORTED void free_hashu64_table(hashu64_table *table, void (*func)(void *))
+{
+ unsigned i;
+ bucketu64 *ptr, *temp;
+
+ /* If we have a function to free the data, apply it everywhere */
+ /* We also need to traverse this anyway if we aren't using a memory
+ * pool */
+ if(func || !table->pool) {
+	 for (i=0;i<table->size; i++)
+	 {
+	 ptr = (table->table)i;
+	 while (ptr)
+	 {
+		 temp = ptr;
+		 ptr = ptr->next;
+		 if (func)
+		 func(temp->data);
+		 if(!table->pool) {
+		 free(temp);
+		 }
+	 }
+	 }
+ }
+ 
+ /* Free the main structures */
+ if(table->pool) {
+	 free_mpool(table->pool);
+	 table->pool = NULL;
+ } else {
+	 free(table->table);
+ }
+ table->table = NULL;
+ table->size = 0;
+}
+
+/*
+** Simply invokes the function given as the second parameter for each
+** node in the table, passing it the key, the associated data and 'rock'.
+*/
+
+EXPORTED void hashu64_enumerate(hashu64_table *table, 
+				void (*func)(uint64_t, void *, void *),
+				void *rock)
+{
+ unsigned i;
+ bucketu64 *temp, *temp_next;
+
+ for (i=0;i<table->size; i++)
+ {
+ if ((table->table)i != NULL)
+ {
+ for (temp = (table->table)i;
+ NULL != temp;
+ temp = temp_next)
+ {
+			temp_next = temp->next;
+ func(temp -> key, temp->data, rock);
+ }
+ }
+ }
+}
+

cyrus-imapd-2.5.tar.gz/lib/hashu64.h Added

@@ -0,0 +1,93 @@
+/* +++Date last modified: 05-Jul-1997 */
+#ifndef __CYRUS_HASHU64_H__
+#define __CYRUS_HASHU64_H__
+
+#include <stddef.h> /* For size_t */
+
+#define HASHU64_TABLE_INITIALIZER {0, NULL, NULL}
+
+/*
+** A hash table consists of an array of these buckets. Each bucket
+** holds a copy of the key, a pointer to the data associated with the
+** key, and a pointer to the next bucket that collided with this one,
+** if there was one.
+*/
+
+typedef struct bucketu64 {
+ uint64_t key;
+ void *data;
+ struct bucketu64 *next;
+} bucketu64;
+
+/*
+** This is what you actually declare an instance of to create a table.
+** You then call 'construct_table' with the address of this structure,
+** and a guess at the size of the table. Note that more nodes than this
+** can be inserted in the table, but performance degrades as this
+** happens. Performance should still be quite adequate until 2 or 3
+** times as many nodes have been inserted as the table was created with.
+*/
+
+typedef struct hashu64_table {
+ size_t size;
+ bucketu64 **table;
+ struct mpool *pool;
+} hashu64_table;
+
+/*
+** This is used to construct the table. If it doesn't succeed, it sets
+** the table's size to 0, and the pointer to the table to NULL.
+*/
+
+hashu64_table *construct_hashu64_table(hashu64_table *table, size_t size,
+				 int use_mpool);
+
+/*
+** Inserts a pointer to 'data' in the table, with a copy of 'key' as its
+** key. Note that this does NOT make a copy of the
+** associated data.
+*/
+
+void *hashu64_insert(uint64_t key,void *data,hashu64_table *table);
+
+/*
+** Returns a pointer to the data associated with a key. If the key has
+** not been inserted in the table, returns NULL.
+*/
+
+void *hashu64_lookup(uint64_t key,hashu64_table *table);
+
+/*
+** Deletes an entry from the table. Returns a pointer to the data that
+** was associated with the key so the calling code can dispose of it
+** properly.
+*/
+/* Warning: use this function judiciously if you are using memory pools,
+ * since it will leak memory until you get rid of the entire hash table */
+void *hashu64_del(uint64_t key,hashu64_table *table);
+
+/*
+** Goes through a hash table and calls the function passed to it
+** for each node that has been inserted. The function is passed
+** a pointer to the key, a pointer to the data associated
+** with it and 'rock'.
+*/
+
+void hashu64_enumerate(hashu64_table *table,void (*func)(uint64_t ,void *,void *),
+		 void *rock);
+
+/*
+** Frees a hash table. For each node that was inserted in the table,
+** it calls the function whose address it was passed, with a pointer
+** to the data that was in the table. The function is expected to
+** free the data. Typical usage would be:
+** free_table(&table, free);
+** if the data placed in the table was dynamically allocated, or:
+** free_table(&table, NULL);
+** if not. ( If the parameter passed is NULL, it knows not to call
+** any function with the data. )
+*/
+
+void free_hashu64_table(hashu64_table *table, void (*func)(void *));
+
+#endif /* __CYRUS_HASHU64_H__ */

cyrus-imapd-2.5.tar.gz/lib/htmlchar.c Added

@@ -0,0 +1,5097 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: gperf /tmp/compile_st_9xQvtm.gperf */
+/* Computed positions: -k'1-7,10,12,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('' == 91) && ('\\' == 92) && ('' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+/* Automatically generated by compile_st.pl, do not edit */
+#include "htmlchar.h"
+struct htmlchar_desc { const char *name; int value; };
+#include <string.h>
+
+#define TOTAL_KEYWORDS 2125
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 31
+#define MIN_HASH_VALUE 64
+#define MAX_HASH_VALUE 18060
+/* maximum key range = 17997, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register unsigned int len)
+{
+ static const unsigned short asso_values =
+ {
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 5,
+ 5, 20, 0, 10, 45, 18061, 40, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 1595, 575, 4030, 2480, 1300,
+ 1045, 624, 1335, 1355, 75, 210, 165, 600, 800, 120,
+ 1430, 60, 140, 1065, 395, 290, 135, 25, 30, 390,
+ 90, 18061, 0, 18061, 0, 18061, 18061, 3316, 45, 2743,
+ 675, 15, 250, 2210, 3065, 310, 1755, 4806, 5, 970,
+ 40, 1375, 130, 265, 0, 10, 20, 35, 175, 1225,
+ 3598, 4421, 115, 420, 695, 0, 0, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061,
+ 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061, 18061
+ };
+ register int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values(unsigned char)str11;
+ /*FALLTHROUGH*/
+ case 11:
+ case 10:
+ hval += asso_values(unsigned char)str9;
+ /*FALLTHROUGH*/
+ case 9:
+ case 8:
+ case 7:
+ hval += asso_values(unsigned char)str6;
+ /*FALLTHROUGH*/
+ case 6:
+ hval += asso_values(unsigned char)str5;
+ /*FALLTHROUGH*/
+ case 5:
+ hval += asso_values(unsigned char)str4+1;
+ /*FALLTHROUGH*/
+ case 4:
+ hval += asso_values(unsigned char)str3+3;
+ /*FALLTHROUGH*/
+ case 3:
+ hval += asso_values(unsigned char)str2+1;
+ /*FALLTHROUGH*/
+ case 2:
+ hval += asso_values(unsigned char)str1+4;
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values(unsigned char)str0;
+ break;
+ }
+ return hval + asso_values(unsigned char)strlen - 1;
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct htmlchar_desc *
+__htmlchar_lookup (register const char *str, register unsigned int len)
+{
+ static const struct htmlchar_desc wordlist =
+ {
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"rarr", 0x2192},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"larr", 0x2190},
+ {"", 0}, {"", 0}, {"", 0},
+ {"npr", 0x2280},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lat", 0x2AAB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"uarr", 0x2191},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rpar", 0x0029},
+ {"roarr", 0x21FE},
+ {"", 0}, {"", 0},
+ {"not", 0x00AC},
+ {"lpar", 0x0028},
+ {"loarr", 0x21FD},
+ {"rarrtl", 0x21A3},
+ {"", 0},
+ {"bot", 0x22A5},
+ {"spar", 0x2225},
+ {"", 0},
+ {"larrtl", 0x21A2},
+ {"", 0}, {"", 0},
+ {"epar", 0x22D5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"tprime", 0x2034},
+ {"rotimes", 0x2A35},
+ {"", 0}, {"", 0},
+ {"uharr", 0x21BE},
+ {"", 0},
+ {"lotimes", 0x2A34},
+ {"", 0}, {"", 0},
+ {"nharr", 0x21AE},
+ {"", 0},
+ {"ll", 0x226A},
+ {"", 0},
+ {"npar", 0x2226},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eparsl", 0x29E3},
+ {"el", 0x2A99},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bprime", 0x2035},
+ {"", 0},
+ {"par", 0x2225},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nparsl", 0x2AFD20E5},
+ {"", 0},
+ {"els", 0x2A95},
+ {"ensp", 0x2002},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lnap", 0x2A89},
+ {"blk14", 0x2591},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"npart", 0x22020338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Rarr", 0x21A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nparallel", 0x2226},
+ {"blk12", 0x2592},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nldr", 0x2025},
+ {"rlarr", 0x21C4},
+ {"", 0}, {"", 0},
+ {"nlt", 0x226E},
+ {"Larr", 0x219E},
+ {"llarr", 0x21C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"slarr", 0x2190},
+ {"", 0}, {"", 0}, {"", 0},
+ {"varr", 0x2195},
+ {"blk34", 0x2593},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tau", 0x03C4},
+ {"rHar", 0x2964},
+ {"", 0},
+ {"Rarrtl", 0x2916},
+ {"", 0}, {"", 0},
+ {"lHar", 0x2962},
+ {"", 0}, {"", 0}, {"", 0},
+ {"squ", 0x25A1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nlarr", 0x219A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rrarr", 0x21C9},
+ {"", 0}, {"", 0},
+ {"lne", 0x2A87},
+ {"", 0},
+ {"lrarr", 0x21C6},
+ {"rharul", 0x296C},
+ {"", 0}, {"", 0}, {"", 0},
+ {"srarr", 0x2192},
+ {"lharul", 0x296A},
+ {"", 0}, {"", 0},
+ {"uHar", 0x2963},
+ {"erarr", 0x2971},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Or", 0x2A54},
+ {"", 0}, {"", 0},
+ {"rharu", 0x21C0},
+ {"", 0},
+ {"Ll", 0x22D8},
+ {"", 0}, {"", 0},
+ {"lharu", 0x21BC},
+ {"", 0},
+ {"pr", 0x227A},
+ {"nGt", 0x226B20D2},
+ {"", 0},
+ {"nrarr", 0x219B},
+ {"", 0}, {"", 0},
+ {"bne", 0x003D20E5},
+ {"", 0},
+ {"upuparrows", 0x21C8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"emsp14", 0x2005},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"le", 0x2264},
+ {"smt", 0x2AAA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rarrpl", 0x2945},
+ {"ee", 0x2147},
+ {"", 0},
+ {"nvap", 0x224D20D2},
+ {"rbarr", 0x290D},
+ {"larrpl", 0x2939},
+ {"", 0},
+ {"les", 0x2A7D},
+ {"", 0},
+ {"lbarr", 0x290C},
+ {"", 0},
+ {"in", 0x2208},
+ {"", 0},
+ {"Uarr", 0x219F},
+ {"napos", 0x0149},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"emsp13", 0x2004},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ne", 0x2260},
+ {"int", 0x222B},
+ {"", 0}, {"", 0},
+ {"rarrap", 0x2975},
+ {"", 0}, {"", 0},
+ {"epsi", 0x03B5},
+ {"", 0},
+ {"qprime", 0x2057},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"upsi", 0x03C5},
+ {"", 0},
+ {"phmmat", 0x2133},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rbrkslu", 0x2990},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lbrkslu", 0x298D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"searr", 0x2198},
+ {"", 0}, {"", 0},
+ {"lap", 0x2A85},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nedot", 0x22500338},
+ {"", 0}, {"", 0},
+ {"top", 0x22A4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nle", 0x2270},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"emsp", 0x2003},
+ {"nearr", 0x2197},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nap", 0x2249},
+ {"nbsp", 0x00A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Re", 0x211C},
+ {"", 0},
+ {"Vbar", 0x2AEB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"topbot", 0x2336},
+ {"", 0},
+ {"looparrowleft", 0x21AB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prap", 0x2AB7},
+ {"sharp", 0x266F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"seswar", 0x2929},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Verbar", 0x2016},
+ {"", 0}, {"", 0}, {"", 0},
+ {"swarr", 0x2199},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nprcue", 0x22E0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lneq", 0x2A87},
+ {"lneqq", 0x2268},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"loz", 0x25CA},
+ {"", 0},
+ {"nwarr", 0x2196},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"verbar", 0x007C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"there4", 0x2234},
+ {"", 0},
+ {"blacktriangle", 0x25B4},
+ {"", 0},
+ {"rbrke", 0x298C},
+ {"", 0}, {"", 0},
+ {"pre", 0x2AAF},
+ {"", 0},
+ {"lbrke", 0x298B},
+ {"", 0},
+ {"blacktriangleleft", 0x25C2},
+ {"blacktriangleright", 0x25B8},
+ {"prop", 0x221D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"leq", 0x2264},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"emacr", 0x0113},
+ {"", 0},
+ {"LT", 0x003C},
+ {"", 0},
+ {"perp", 0x22A5},
+ {"", 0}, {"", 0},
+ {"blacktriangledown", 0x25BE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"smeparsl", 0x29E4},
+ {"leqq", 0x2266},
+ {"vprop", 0x221D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nles", 0x2A7D0338},
+ {"umacr", 0x016B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Tau", 0x03A4},
+ {"plus", 0x002B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nless", 0x226E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Upsi", 0x03D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"intcal", 0x22BA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nhArr", 0x21CE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"semi", 0x003B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Omacr", 0x014C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"plusdu", 0x2A25},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nleq", 0x2270},
+ {"nleqq", 0x22660338},
+ {"", 0}, {"", 0},
+ {"Vee", 0x22C1},
+ {"", 0},
+ {"fltns", 0x25B1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"frac34", 0x00BE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"frac14", 0x00BC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"plusmn", 0x00B1},
+ {"", 0}, {"", 0},
+ {"darr", 0x2193},
+ {"rnmid", 0x2AEE},
+ {"frac12", 0x00BD},
+ {"", 0},
+ {"dot", 0x02D9},
+ {"", 0}, {"", 0},
+ {"frac35", 0x2157},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"frac15", 0x2155},
+ {"", 0},
+ {"vee", 0x2228},
+ {"", 0}, {"", 0},
+ {"frac45", 0x2158},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"fpartint", 0x2A0D},
+ {"", 0}, {"", 0},
+ {"frac25", 0x2156},
+ {"", 0}, {"", 0},
+ {"lvertneqq", 0x2268FE00},
+ {"", 0},
+ {"frac13", 0x2153},
+ {"", 0}, {"", 0}, {"", 0},
+ {"dharr", 0x21C2},
+ {"blacksquare", 0x25AA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rhard", 0x21C1},
+ {"prurel", 0x22B0},
+ {"", 0}, {"", 0},
+ {"squf", 0x25AA},
+ {"lhard", 0x21BD},
+ {"frac23", 0x2154},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nlArr", 0x21CD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"phone", 0x260E},
+ {"veebar", 0x22BB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"frac38", 0x215C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"frac18", 0x215B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"frac16", 0x2159},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bernou", 0x212C},
+ {"", 0}, {"", 0},
+ {"ropf", 0xD563},
+ {"nrArr", 0x21CF},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lopf", 0xD55D},
+ {"", 0},
+ {"frac78", 0x215E},
+ {"", 0}, {"", 0},
+ {"sopf", 0xD564},
+ {"", 0},
+ {"frac58", 0x215D},
+ {"", 0}, {"", 0},
+ {"eopf", 0xD556},
+ {"", 0}, {"", 0},
+ {"between", 0x226C},
+ {"", 0},
+ {"topf", 0xD565},
+ {"", 0},
+ {"frac56", 0x215A},
+ {"", 0}, {"", 0},
+ {"Wopf", 0xD54E},
+ {"Umacr", 0x016A},
+ {"", 0}, {"", 0},
+ {"Not", 0x2AEC},
+ {"Xopf", 0xD54F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uopf", 0xD566},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nopf", 0xD55F},
+ {"pluse", 0x2A72},
+ {"", 0}, {"", 0},
+ {"llcorner", 0x231E},
+ {"bopf", 0xD553},
+ {"imacr", 0x012B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"nbumpe", 0x224F0338},
+ {"", 0}, {"", 0},
+ {"Qopf", 0x211A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ulcorner", 0x231C},
+ {"Jopf", 0xD541},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dHar", 0x2965},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lrcorner", 0x231F},
+ {"Zopf", 0x2124},
+ {"", 0},
+ {"plankv", 0x210F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ulcorn", 0x231C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"square", 0x25A1},
+ {"", 0}, {"", 0},
+ {"fnof", 0x0192},
+ {"seArr", 0x21D8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zopf", 0xD56B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"urcorner", 0x231D},
+ {"Oopf", 0xD546},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ropar", 0x2986},
+ {"", 0}, {"", 0}, {"", 0},
+ {"popf", 0xD561},
+ {"lopar", 0x2985},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Vopf", 0xD54D},
+ {"neArr", 0x21D7},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ropf", 0x211D},
+ {"", 0},
+ {"urcorn", 0x231D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nbump", 0x224E0338},
+ {"", 0}, {"", 0},
+ {"sol", 0x002F},
+ {"lozf", 0x29EB},
+ {"nhpar", 0x2AF2},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Lopf", 0xD543},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Map", 0x2905},
+ {"vopf", 0xD567},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"napid", 0x224B0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"iprod", 0x2A3C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nis", 0x22FC},
+ {"", 0},
+ {"lnsim", 0x22E6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Kopf", 0xD542},
+ {"", 0},
+ {"GT", 0x003E},
+ {"", 0}, {"", 0},
+ {"solb", 0x29C4},
+ {"swArr", 0x21D9},
+ {"solbar", 0x233F},
+ {"", 0},
+ {"profsurf", 0x2313},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"smashp", 0x2A33},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nwArr", 0x21D6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"fopf", 0xD557},
+ {"eqsim", 0x2242},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uharl", 0x21BF},
+ {"", 0}, {"", 0}, {"", 0},
+ {"qopf", 0xD562},
+ {"thkap", 0x2248},
+ {"", 0},
+ {"simrarr", 0x2972},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lparlt", 0x2993},
+ {"mp", 0x2213},
+ {"ell", 0x2113},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Uopf", 0xD54C},
+ {"rlhar", 0x21CC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rBarr", 0x290F},
+ {"", 0}, {"", 0},
+ {"rlm", 0x200F},
+ {"", 0},
+ {"lBarr", 0x290E},
+ {"varphi", 0x03D5},
+ {"", 0}, {"", 0},
+ {"iopf", 0xD55A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mldr", 0x2026},
+ {"", 0}, {"", 0},
+ {"bnequiv", 0x226120E5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lrhar", 0x21CB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"varsubsetneq", 0x228AFE00},
+ {"varsubsetneqq", 0x2ACBFE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lrm", 0x200E},
+ {"", 0},
+ {"nvsim", 0x223C20D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nlsim", 0x2274},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Yopf", 0xD550},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Topf", 0xD54B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotSubset", 0x228220D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"NotLess", 0x226E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotLessLess", 0x226A0338},
+ {"", 0}, {"", 0},
+ {"imof", 0x22B7},
+ {"", 0},
+ {"ulcrop", 0x230F},
+ {"varsupsetneq", 0x228BFE00},
+ {"varsupsetneqq", 0x2ACCFE00},
+ {"", 0},
+ {"pound", 0x00A3},
+ {"", 0}, {"", 0},
+ {"uml", 0x00A8},
+ {"", 0},
+ {"RBarr", 0x2910},
+ {"", 0},
+ {"NotLessTilde", 0x2274},
+ {"", 0},
+ {"NotLessGreater", 0x2278},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rsqb", 0x005D},
+ {"", 0},
+ {"marker", 0x25AE},
+ {"NotLessEqual", 0x2270},
+ {"", 0},
+ {"lsqb", 0x005B},
+ {"", 0},
+ {"rarrlp", 0x21AC},
+ {"", 0}, {"", 0},
+ {"LessTilde", 0x2272},
+ {"lesseqqgtr", 0x2A8B},
+ {"larrlp", 0x21AB},
+ {"", 0}, {"", 0},
+ {"vBar", 0x2AE8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"parsl", 0x2AFD},
+ {"", 0},
+ {"Xi", 0x039E},
+ {"LessLess", 0x2AA1},
+ {"", 0},
+ {"esdot", 0x2250},
+ {"urcrop", 0x230E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ni", 0x220B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prsim", 0x227E},
+ {"NotSuperset", 0x228320D2},
+ {"", 0}, {"", 0},
+ {"rArr", 0x21D2},
+ {"", 0}, {"", 0}, {"", 0},
+ {"eqvparsl", 0x29E5},
+ {"lArr", 0x21D0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Bernoullis", 0x212C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"pm", 0x00B1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"backprime", 0x2035},
+ {"", 0}, {"", 0},
+ {"wp", 0x2118},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"map", 0x21A6},
+ {"uArr", 0x21D1},
+ {"", 0}, {"", 0},
+ {"NotNestedLessLess", 0x2AA10338},
+ {"", 0}, {"", 0},
+ {"nesim", 0x22420338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rAarr", 0x21DB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lAarr", 0x21DA},
+ {"", 0},
+ {"wr", 0x2240},
+ {"", 0},
+ {"part", 0x2202},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Hat", 0x005E},
+ {"", 0}, {"", 0},
+ {"squarf", 0x25AA},
+ {"pi", 0x03C0},
+ {"Int", 0x222C},
+ {"Bopf", 0xD539},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bnot", 0x2310},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Mopf", 0xD544},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Gopf", 0xD53E},
+ {"", 0},
+ {"epsiv", 0x03F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"opar", 0x29B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsub", 0x2284},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"notin", 0x2209},
+ {"brvbar", 0x00A6},
+ {"", 0},
+ {"rho", 0x03C1},
+ {"dopf", 0xD555},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vArr", 0x21D5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nLt", 0x226A20D2},
+ {"", 0}, {"", 0},
+ {"easter", 0x2A6E},
+ {"nsupset", 0x228320D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsubset", 0x228220D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"erDot", 0x2253},
+ {"", 0},
+ {"or", 0x2228},
+ {"", 0}, {"", 0},
+ {"simne", 0x2246},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eqslantgtr", 0x2A96},
+ {"", 0}, {"", 0},
+ {"olt", 0x29C0},
+ {"bNot", 0x2AED},
+ {"ratio", 0x2236},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"dlcorn", 0x231E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eqslantless", 0x2A95},
+ {"", 0}, {"", 0},
+ {"nsup", 0x2285},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"preceq", 0x2AAF},
+ {"ii", 0x2148},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"olarr", 0x21BA},
+ {"", 0},
+ {"pluscir", 0x2A22},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Pr", 0x2ABB},
+ {"", 0}, {"", 0},
+ {"thorn", 0x00FE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"wedbar", 0x2A5F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"drcorn", 0x231F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"frasl", 0x2044},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotReverseElement", 0x220C},
+ {"rppolint", 0x2A12},
+ {"", 0},
+ {"equiv", 0x2261},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Nopf", 0x2115},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"orarr", 0x21BB},
+ {"rbrace", 0x007D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lbrace", 0x007B},
+ {"", 0},
+ {"Rho", 0x03A1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"flat", 0x266D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rbrksld", 0x298E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sqcaps", 0x2293FE00},
+ {"lbrksld", 0x298F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsqsube", 0x22E2},
+ {"", 0},
+ {"macr", 0x00AF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Vert", 0x2016},
+ {"", 0},
+ {"incare", 0x2105},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"forkv", 0x2AD9},
+ {"", 0}, {"", 0}, {"", 0},
+ {"oror", 0x2A56},
+ {"nsupe", 0x2289},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsube", 0x2288},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"notinvb", 0x22F7},
+ {"", 0},
+ {"real", 0x211C},
+ {"dharl", 0x21C3},
+ {"", 0}, {"", 0}, {"", 0},
+ {"vert", 0x007C},
+ {"", 0}, {"", 0},
+ {"nvrtrie", 0x22B520D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dotplus", 0x2214},
+ {"measuredangle", 0x2221},
+ {"", 0},
+ {"reals", 0x211D},
+ {"", 0}, {"", 0},
+ {"rfr", 0xD52F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lfr", 0xD529},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sfr", 0xD530},
+ {"nsupseteq", 0x2289},
+ {"", 0}, {"", 0},
+ {"nsqsupe", 0x22E3},
+ {"efr", 0xD522},
+ {"nsubseteq", 0x2288},
+ {"", 0}, {"", 0}, {"", 0},
+ {"tfr", 0xD531},
+ {"", 0}, {"", 0},
+ {"barwed", 0x2305},
+ {"", 0},
+ {"Wfr", 0xD51A},
+ {"", 0},
+ {"sqcap", 0x2293},
+ {"", 0}, {"", 0},
+ {"Xfr", 0xD51B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ufr", 0xD532},
+ {"", 0},
+ {"GreaterLess", 0x2277},
+ {"preccurlyeq", 0x227C},
+ {"", 0},
+ {"nfr", 0xD52B},
+ {"mopf", 0xD55E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bfr", 0xD51F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"GreaterTilde", 0x2273},
+ {"", 0},
+ {"GreaterGreater", 0x2AA2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Qfr", 0xD514},
+ {"", 0}, {"", 0},
+ {"GreaterEqual", 0x2265},
+ {"", 0},
+ {"parallel", 0x2225},
+ {"NotDoubleVerticalBar", 0x2226},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"GreaterEqualLess", 0x22DB},
+ {"", 0}, {"", 0},
+ {"Jfr", 0xD50D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"NotNestedGreaterGreater", 0x2AA20338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"roplus", 0x2A2E},
+ {"", 0},
+ {"NotLeftTriangleBar", 0x29CF0338},
+ {"", 0},
+ {"diams", 0x2666},
+ {"loplus", 0x2A2D},
+ {"", 0},
+ {"Zfr", 0x2128},
+ {"", 0},
+ {"NotLeftTriangleEqual", 0x22EC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotLeftTriangle", 0x22EA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Emacr", 0x0112},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zfr", 0xD537},
+ {"Fopf", 0xD53D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ofr", 0xD512},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"equals", 0x003D},
+ {"", 0},
+ {"pfr", 0xD52D},
+ {"", 0}, {"", 0},
+ {"thetav", 0x03D1},
+ {"", 0},
+ {"Vfr", 0xD519},
+ {"Sopf", 0xD54A},
+ {"setmn", 0x2216},
+ {"becaus", 0x2235},
+ {"", 0},
+ {"Rfr", 0x211C},
+ {"", 0}, {"", 0},
+ {"dlcrop", 0x230D},
+ {"", 0},
+ {"die", 0x00A8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mlcp", 0x2ADB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"because", 0x2235},
+ {"", 0}, {"", 0},
+ {"Imacr", 0x012A},
+ {"forall", 0x2200},
+ {"", 0},
+ {"Lfr", 0xD50F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"blacklozenge", 0x29EB},
+ {"emptyset", 0x2205},
+ {"rscr", 0xD4C7},
+ {"", 0},
+ {"period", 0x002E},
+ {"", 0},
+ {"vfr", 0xD533},
+ {"lscr", 0xD4C1},
+ {"", 0}, {"", 0},
+ {"lessdot", 0x22D6},
+ {"", 0},
+ {"sscr", 0xD4C8},
+ {"omacr", 0x014D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"escr", 0x212F},
+ {"", 0},
+ {"drcrop", 0x230C},
+ {"Proportional", 0x221D},
+ {"", 0},
+ {"tscr", 0xD4C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Wscr", 0xD4B2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Xscr", 0xD4B3},
+ {"", 0},
+ {"swnwar", 0x292A},
+ {"", 0}, {"", 0},
+ {"uscr", 0xD4CA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Kfr", 0xD50E},
+ {"nscr", 0xD4C3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bscr", 0xD4B7},
+ {"Proportion", 0x2237},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sim", 0x223C},
+ {"", 0}, {"", 0},
+ {"Square", 0x25A1},
+ {"", 0}, {"", 0},
+ {"Qscr", 0xD4AC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsmid", 0x2224},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Jscr", 0xD4A5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ffr", 0xD523},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dArr", 0x21D3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Zscr", 0xD4B5},
+ {"", 0},
+ {"nltrie", 0x22EC},
+ {"", 0},
+ {"qfr", 0xD52E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"nsupseteqq", 0x2AC60338},
+ {"LessGreater", 0x2276},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nsubseteqq", 0x2AC50338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"zscr", 0xD4CF},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ufr", 0xD518},
+ {"Oscr", 0xD4AA},
+ {"", 0}, {"", 0},
+ {"simplus", 0x2A24},
+ {"", 0},
+ {"wopf", 0xD568},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"pscr", 0xD4C5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Vscr", 0xD4B1},
+ {"", 0},
+ {"nrtrie", 0x22ED},
+ {"", 0},
+ {"ifr", 0xD526},
+ {"Rscr", 0x211B},
+ {"operp", 0x29B9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"profline", 0x2312},
+ {"", 0},
+ {"frown", 0x2322},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"target", 0x2316},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Lscr", 0x2112},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vscr", 0xD4CB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"percnt", 0x0025},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ordf", 0x00AA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Eopf", 0xD53C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Element", 0x2208},
+ {"", 0},
+ {"Kscr", 0xD4A6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Yfr", 0xD51C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Tfr", 0xD517},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Amacr", 0x0100},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Hopf", 0x210D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"shortmid", 0x2223},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"fscr", 0xD4BB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Iopf", 0xD540},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"olcir", 0x29BE},
+ {"nvHarr", 0x2904},
+ {"", 0},
+ {"phi", 0x03C6},
+ {"qscr", 0xD4C6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"therefore", 0x2234},
+ {"Gammad", 0x03DC},
+ {"", 0}, {"", 0}, {"", 0},
+ {"oopf", 0xD560},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nspar", 0x2226},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Uscr", 0xD4B0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"elinters", 0x23E7},
+ {"rect", 0x25AD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"emptyv", 0x2205},
+ {"", 0},
+ {"ord", 0x2A5D},
+ {"sect", 0x00A7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"iscr", 0xD4BE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Popf", 0x2119},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lltri", 0x25FA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"varpi", 0x03D6},
+ {"female", 0x2640},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ssmile", 0x2323},
+ {"", 0},
+ {"And", 0x2A53},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rarrfs", 0x291E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"larrfs", 0x291D},
+ {"", 0}, {"", 0},
+ {"QUOT", 0x0022},
+ {"ultri", 0x25F8},
+ {"topcir", 0x2AF1},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nltri", 0x22EA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lrtri", 0x22BF},
+ {"Barwed", 0x2306},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Yscr", 0xD4B4},
+ {"", 0},
+ {"thinsp", 0x2009},
+ {"", 0},
+ {"setminus", 0x2216},
+ {"Tscr", 0xD4AF},
+ {"nleftrightarrow", 0x21AE},
+ {"", 0},
+ {"rarrsim", 0x2974},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"larrsim", 0x2973},
+ {"Bfr", 0xD505},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gl", 0x2277},
+ {"", 0},
+ {"backsimeq", 0x22CD},
+ {"urtri", 0x25F9},
+ {"permil", 0x2030},
+ {"", 0},
+ {"lnE", 0x2268},
+ {"", 0},
+ {"nrtri", 0x22EB},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Sqrt", 0x221A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lesges", 0x2A93},
+ {"", 0},
+ {"Mfr", 0xD510},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nvlt", 0x003C20D2},
+ {"Wedge", 0x22C0},
+ {"", 0},
+ {"notnivb", 0x22FE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"olcross", 0x29BB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotHumpEqual", 0x224F0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Gfr", 0xD50A},
+ {"ohm", 0x03A9},
+ {"", 0}, {"", 0},
+ {"mstpos", 0x223E},
+ {"", 0}, {"", 0},
+ {"gnap", 0x2A8A},
+ {"", 0},
+ {"nsccue", 0x22E1},
+ {"", 0}, {"", 0},
+ {"siml", 0x2A9D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scap", 0x2AB8},
+ {"", 0}, {"", 0}, {"", 0},
+ {"niv", 0x220B},
+ {"", 0}, {"", 0},
+ {"zeetrf", 0x2128},
+ {"", 0}, {"", 0}, {"", 0},
+ {"notni", 0x220C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Aopf", 0xD538},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ncap", 0x2A43},
+ {"", 0}, {"", 0}, {"", 0},
+ {"dfr", 0xD521},
+ {"looparrowright", 0x21AC},
+ {"vltri", 0x22B2},
+ {"", 0}, {"", 0},
+ {"nLl", 0x22D80338},
+ {"rcub", 0x007D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lcub", 0x007B},
+ {"", 0}, {"", 0},
+ {"Because", 0x2235},
+ {"", 0}, {"", 0},
+ {"prime", 0x2032},
+ {"sstarf", 0x22C6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"primes", 0x2119},
+ {"oS", 0x24C8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"gne", 0x2A88},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mho", 0x2127},
+ {"", 0}, {"", 0},
+ {"llhard", 0x296B},
+ {"", 0},
+ {"sce", 0x2AB0},
+ {"", 0},
+ {"vrtri", 0x22B3},
+ {"", 0},
+ {"epsilon", 0x03B5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ratail", 0x291A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"latail", 0x2919},
+ {"", 0},
+ {"piv", 0x03D6},
+ {"", 0}, {"", 0},
+ {"rcaron", 0x0159},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lcaron", 0x013E},
+ {"upsilon", 0x03C5},
+ {"", 0},
+ {"Bscr", 0x212C},
+ {"", 0},
+ {"scaron", 0x0161},
+ {"", 0},
+ {"nlE", 0x22660338},
+ {"", 0}, {"", 0},
+ {"ecaron", 0x011B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tcaron", 0x0165},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lrhard", 0x296D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ge", 0x2265},
+ {"", 0},
+ {"Mscr", 0x2133},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Darr", 0x21A1},
+ {"", 0},
+ {"ncaron", 0x0148},
+ {"", 0},
+ {"Dot", 0x00A8},
+ {"", 0}, {"", 0},
+ {"elsdot", 0x2A97},
+ {"", 0},
+ {"ges", 0x2A7E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"spades", 0x2660},
+ {"", 0},
+ {"Gscr", 0xD4A2},
+ {"NotSubsetEqual", 0x2288},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Nfr", 0xD511},
+ {"ncup", 0x2A42},
+ {"", 0}, {"", 0}, {"", 0},
+ {"pointint", 0x2A15},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Therefore", 0x2234},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"backepsilon", 0x03F6},
+ {"Im", 0x2111},
+ {"", 0},
+ {"jopf", 0xD55B},
+ {"", 0},
+ {"Zcaron", 0x017D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"spadesuit", 0x2660},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dscr", 0xD4B9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zcaron", 0x017E},
+ {"", 0},
+ {"gap", 0x2A86},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mid", 0x2223},
+ {"", 0}, {"", 0},
+ {"NotSupersetEqual", 0x2289},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"image", 0x2111},
+ {"Rcaron", 0x0158},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prE", 0x2AB3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oast", 0x229B},
+ {"", 0},
+ {"nvrArr", 0x2903},
+ {"lE", 0x2266},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ordm", 0x00BA},
+ {"LessEqualGreater", 0x22DA},
+ {"Lcaron", 0x013D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"twixt", 0x226C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"midast", 0x002A},
+ {"", 0},
+ {"dotminus", 0x2238},
+ {"", 0},
+ {"exist", 0x2203},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vBarv", 0x2AE9},
+ {"", 0},
+ {"nvltrie", 0x22B420D2},
+ {"", 0}, {"", 0},
+ {"eDDot", 0x2A77},
+ {"", 0},
+ {"Pi", 0x03A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"trade", 0x2122},
+ {"lesdot", 0x2A7F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eDot", 0x2251},
+ {"", 0}, {"", 0}, {"", 0},
+ {"precneqq", 0x2AB5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mfr", 0xD52A},
+ {"Nscr", 0xD4A9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gneq", 0x2A88},
+ {"gneqq", 0x2269},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prnap", 0x2AB9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nrarrw", 0x219D0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Upsilon", 0x03A5},
+ {"", 0},
+ {"excl", 0x0021},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bsol", 0x005C},
+ {"", 0}, {"", 0},
+ {"lesssim", 0x2272},
+ {"geq", 0x2265},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"diam", 0x22C4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"geqq", 0x2267},
+ {"", 0},
+ {"mnplus", 0x2213},
+ {"", 0},
+ {"Ffr", 0xD509},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"inodot", 0x0131},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Sfr", 0xD516},
+ {"", 0}, {"", 0},
+ {"ssetmn", 0x2216},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"upharpoonleft", 0x21BF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rarrb", 0x21E5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"larrb", 0x21E4},
+ {"", 0}, {"", 0},
+ {"rfloor", 0x230B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bepsi", 0x03F6},
+ {"lfloor", 0x230A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UpEquilibrium", 0x296E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"plussim", 0x2A26},
+ {"", 0}, {"", 0},
+ {"mapstoleft", 0x21A4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Tcaron", 0x0164},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mscr", 0xD4C2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsucceq", 0x2AB00338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"divide", 0x00F7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"comp", 0x2201},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"orv", 0x2A5B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"napE", 0x2A700338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gvertneqq", 0x2269FE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ShortRightArrow", 0x2192},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Fscr", 0x2131},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"triplus", 0x2A39},
+ {"wfr", 0xD534},
+ {"", 0}, {"", 0},
+ {"vsupne", 0x228BFE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vsubne", 0x228AFE00},
+ {"", 0}, {"", 0},
+ {"Sscr", 0xD4AE},
+ {"", 0},
+ {"diamondsuit", 0x2666},
+ {"", 0},
+ {"mapstoup", 0x21A5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"crarr", 0x21B5},
+ {"commat", 0x0040},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"div", 0x00F7},
+ {"gopf", 0xD558},
+ {"", 0}, {"", 0},
+ {"backsim", 0x223D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"smallsetminus", 0x2216},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Precedes", 0x227A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Efr", 0xD508},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"PlusMinus", 0x00B1},
+ {"rarrbfs", 0x2920},
+ {"dollar", 0x0024},
+ {"precsim", 0x227E},
+ {"", 0}, {"", 0},
+ {"larrbfs", 0x291F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"SquareSupersetEqual", 0x2292},
+ {"disin", 0x22F2},
+ {"", 0},
+ {"SquareSubsetEqual", 0x2291},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"intprod", 0x2A3C},
+ {"clubs", 0x2663},
+ {"SquareSuperset", 0x2290},
+ {"GreaterFullEqual", 0x2267},
+ {"", 0},
+ {"SquareSubset", 0x228F},
+ {"Hfr", 0x210C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"varpropto", 0x221D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"PrecedesSlantEqual", 0x227C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ifr", 0x2111},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"harr", 0x2194},
+ {"efDot", 0x2252},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"late", 0x2AAD},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ofr", 0xD52C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"AMP", 0x0026},
+ {"", 0}, {"", 0},
+ {"horbar", 0x2015},
+ {"", 0}, {"", 0},
+ {"npre", 0x2AAF0338},
+ {"lates", 0x2AADFE00},
+ {"cap", 0x2229},
+ {"eqcolon", 0x2255},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"wscr", 0xD4CC},
+ {"Equal", 0x2A75},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hoarr", 0x21FF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"dcaron", 0x010F},
+ {"", 0},
+ {"bsolhsub", 0x27C8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"udarr", 0x21C5},
+ {"", 0}, {"", 0},
+ {"Pfr", 0xD513},
+ {"", 0}, {"", 0},
+ {"Tab", 0x0009},
+ {"", 0}, {"", 0},
+ {"malt", 0x2720},
+ {"THORN", 0x00DE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rpargt", 0x2994},
+ {"caps", 0x2229FE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"propto", 0x221D},
+ {"", 0}, {"", 0},
+ {"Escr", 0x2130},
+ {"", 0}, {"", 0},
+ {"orslope", 0x2A57},
+ {"", 0},
+ {"lesseqgtr", 0x22DA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gnsim", 0x22E7},
+ {"lagran", 0x2112},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cross", 0x2717},
+ {"nshortmid", 0x2224},
+ {"scsim", 0x227F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"RoundImplies", 0x2970},
+ {"", 0},
+ {"Hscr", 0x210B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Iscr", 0x2110},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"varrho", 0x03F1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ncaron", 0x0147},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oscr", 0x2134},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Dopf", 0xD53B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prod", 0x220F},
+ {"DotDot", 0x20DC},
+ {"", 0}, {"", 0},
+ {"NotTilde", 0x2241},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"thicksim", 0x223C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"barwedge", 0x2305},
+ {"", 0}, {"", 0}, {"", 0},
+ {"diamond", 0x22C4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"equest", 0x225F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"iiint", 0x222D},
+ {"", 0}, {"", 0},
+ {"Afr", 0xD504},
+ {"", 0}, {"", 0}, {"", 0},
+ {"NotTildeFullEqual", 0x2247},
+ {"", 0},
+ {"Pscr", 0xD4AB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vangrt", 0x299C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"plusdo", 0x2214},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lsime", 0x2A8D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bottom", 0x22A5},
+ {"", 0}, {"", 0},
+ {"smte", 0x2AAC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hbar", 0x210F},
+ {"", 0}, {"", 0},
+ {"ENG", 0x014A},
+ {"plusb", 0x229E},
+ {"", 0}, {"", 0},
+ {"simdot", 0x2A6A},
+ {"npolint", 0x2A14},
+ {"", 0}, {"", 0},
+ {"smtes", 0x2AACFE00},
+ {"", 0}, {"", 0},
+ {"SquareIntersection", 0x2293},
+ {"dsol", 0x29F6},
+ {"range", 0x29A5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsime", 0x2244},
+ {"", 0}, {"", 0},
+ {"psi", 0x03C8},
+ {"", 0},
+ {"bsime", 0x22CD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"rceil", 0x2309},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lceil", 0x2308},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"clubsuit", 0x2663},
+ {"REG", 0x00AE},
+ {"radic", 0x221A},
+ {"", 0},
+ {"upsih", 0x03D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Union", 0x22C3},
+ {"", 0}, {"", 0},
+ {"ap", 0x2248},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"maltese", 0x2720},
+ {"precnsim", 0x22E8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rarrc", 0x2933},
+ {"", 0}, {"", 0},
+ {"nesear", 0x2928},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NestedLessLess", 0x226A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gel", 0x22DB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Phi", 0x03A6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hearts", 0x2665},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"jfr", 0xD527},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Ascr", 0xD49C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"HorizontalLine", 0x2500},
+ {"UpArrowBar", 0x2912},
+ {"Uarrocir", 0x2949},
+ {"", 0},
+ {"notindot", 0x22F50338},
+ {"", 0},
+ {"Fouriertrf", 0x2131},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"prec", 0x227A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rationals", 0x211A},
+ {"", 0},
+ {"realine", 0x211B},
+ {"", 0},
+ {"heartsuit", 0x2665},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Scaron", 0x0160},
+ {"", 0}, {"", 0}, {"", 0},
+ {"wedge", 0x2227},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"copf", 0xD554},
+ {"", 0},
+ {"capcap", 0x2A4B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"isins", 0x22F4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"isin", 0x2208},
+ {"mapstodown", 0x21A7},
+ {"", 0},
+ {"lessgtr", 0x2276},
+ {"", 0},
+ {"ape", 0x224A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tint", 0x222D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nvlArr", 0x2902},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lt", 0x003C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nLeftrightarrow", 0x21CE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ThickSpace", 0x205F200A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"iquest", 0x00BF},
+ {"", 0}, {"", 0}, {"", 0},
+ {"apos", 0x0027},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mDDot", 0x223A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"smile", 0x2323},
+ {"", 0}, {"", 0},
+ {"ltdot", 0x22D6},
+ {"lowbar", 0x005F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xodot", 0x2A00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SquareUnion", 0x2294},
+ {"star", 0x2606},
+ {"", 0},
+ {"jscr", 0xD4BF},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xharr", 0x27F7},
+ {"shortparallel", 0x2225},
+ {"", 0}, {"", 0}, {"", 0},
+ {"natur", 0x266E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"utdot", 0x22F0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"capcup", 0x2A47},
+ {"", 0},
+ {"plusacir", 0x2A23},
+ {"", 0},
+ {"imagline", 0x2110},
+ {"", 0},
+ {"bsemi", 0x204F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xotime", 0x2A02},
+ {"", 0},
+ {"cir", 0x25CB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"copysr", 0x2117},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Vdashl", 0x2AE6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Prime", 0x2033},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Del", 0x2207},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"race", 0x223D0331},
+ {"", 0}, {"", 0},
+ {"Epsilon", 0x0395},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rAtail", 0x291C},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Lt", 0x226A},
+ {"lAtail", 0x291B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oline", 0x203E},
+ {"gammad", 0x03DD},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nsupE", 0x2AC60338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsubE", 0x2AC50338},
+ {"Ecaron", 0x011A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nleqslant", 0x2A7D0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xlarr", 0x27F5},
+ {"", 0},
+ {"ofcir", 0x29BF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scpolint", 0x2A13},
+ {"doublebarwedge", 0x2306},
+ {"ddarr", 0x21CA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rangd", 0x2992},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"langd", 0x2991},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hercon", 0x22B9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Equilibrium", 0x21CC},
+ {"", 0}, {"", 0},
+ {"qint", 0x2A0C},
+ {"", 0},
+ {"ominus", 0x2296},
+ {"Omicron", 0x039F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Kappa", 0x039A},
+ {"", 0},
+ {"xrarr", 0x27F6},
+ {"varkappa", 0x03F0},
+ {"", 0}, {"", 0},
+ {"uwangle", 0x29A7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"rtrie", 0x22B5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ltrie", 0x22B4},
+ {"", 0}, {"", 0},
+ {"amacr", 0x0101},
+ {"", 0},
+ {"DoubleLeftTee", 0x2AE4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"EqualTilde", 0x2242},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hopf", 0xD559},
+ {"", 0},
+ {"thksim", 0x223C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"strns", 0x00AF},
+ {"nisd", 0x22FA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gesl", 0x22DBFE00},
+ {"", 0}, {"", 0},
+ {"rtri", 0x25B9},
+ {"triminus", 0x2A3A},
+ {"", 0},
+ {"it", 0x2062},
+ {"isinsv", 0x22F3},
+ {"ltri", 0x25C3},
+ {"", 0}, {"", 0},
+ {"UpTee", 0x22A5},
+ {"nsimeq", 0x2244},
+ {"", 0}, {"", 0}, {"", 0},
+ {"varepsilon", 0x03F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"infin", 0x221E},
+ {"ecolon", 0x2255},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"OverParenthesis", 0x23DC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"utri", 0x25B5},
+ {"", 0},
+ {"sqsupe", 0x2292},
+ {"", 0},
+ {"midcir", 0x2AF0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"uparrow", 0x2191},
+ {"gfr", 0xD524},
+ {"amp", 0x0026},
+ {"", 0},
+ {"sqsupset", 0x2290},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Exists", 0x2203},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UnderBrace", 0x23DF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lescc", 0x2AA8},
+ {"and", 0x2227},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ecir", 0x2256},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ETH", 0x00D0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"parsim", 0x2AF3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rfisht", 0x297D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"tosa", 0x2929},
+ {"lfisht", 0x297C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xmap", 0x27FC},
+ {"cedil", 0x00B8},
+ {"", 0},
+ {"doteq", 0x2250},
+ {"", 0}, {"", 0},
+ {"PrecedesTilde", 0x227E},
+ {"rmoust", 0x23B1},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sqsup", 0x2290},
+ {"lmoust", 0x23B0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"veeeq", 0x225A},
+ {"notinE", 0x22F90338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ufisht", 0x297E},
+ {"", 0},
+ {"lesdotor", 0x2A83},
+ {"TRADE", 0x2122},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bkarow", 0x290D},
+ {"", 0}, {"", 0},
+ {"lsim", 0x2272},
+ {"", 0},
+ {"wedgeq", 0x2259},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"esim", 0x2242},
+ {"udhar", 0x296E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sime", 0x2243},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"osol", 0x2298},
+ {"", 0}, {"", 0},
+ {"harrcir", 0x2948},
+ {"", 0},
+ {"profalar", 0x232E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsim", 0x2241},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bsim", 0x223D},
+ {"times", 0x00D7},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lvnE", 0x2268FE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hamilt", 0x210B},
+ {"", 0},
+ {"leftarrowtail", 0x21A2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gscr", 0x210A},
+ {"para", 0x00B6},
+ {"rangle", 0x27E9},
+ {"ShortUpArrow", 0x2191},
+ {"", 0}, {"", 0},
+ {"aopf", 0xD552},
+ {"langle", 0x27E8},
+ {"", 0}, {"", 0}, {"", 0},
+ {"micro", 0x00B5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Gamma", 0x0393},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotElement", 0x2209},
+ {"", 0}, {"", 0},
+ {"caron", 0x02C7},
+ {"", 0}, {"", 0},
+ {"gesles", 0x2A94},
+ {"", 0},
+ {"vnsup", 0x228320D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"csub", 0x2ACF},
+ {"", 0},
+ {"nvle", 0x226420D2},
+ {"", 0},
+ {"timesb", 0x22A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"mapsto", 0x21A6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rsaquo", 0x203A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lsaquo", 0x2039},
+ {"", 0},
+ {"xhArr", 0x27FA},
+ {"rthree", 0x22CC},
+ {"", 0}, {"", 0},
+ {"Uparrow", 0x21D1},
+ {"", 0},
+ {"lthree", 0x22CB},
+ {"", 0}, {"", 0},
+ {"zigrarr", 0x21DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"searrow", 0x2198},
+ {"", 0},
+ {"Gt", 0x226B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Dfr", 0xD507},
+ {"", 0}, {"", 0}, {"", 0},
+ {"LeftTee", 0x22A3},
+ {"infintie", 0x29DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dotsquare", 0x22A1},
+ {"NotGreater", 0x226F},
+ {"nearrow", 0x2197},
+ {"", 0}, {"", 0},
+ {"toea", 0x2928},
+ {"", 0}, {"", 0},
+ {"NotGreaterGreater", 0x226B0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ShortLeftArrow", 0x2190},
+ {"", 0}, {"", 0},
+ {"csup", 0x2AD0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"NotGreaterSlantEqual", 0x2A7E0338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rx", 0x211E},
+ {"", 0}, {"", 0},
+ {"ltcir", 0x2A79},
+ {"", 0},
+ {"NotGreaterLess", 0x2279},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lesg", 0x22DAFE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotTildeTilde", 0x2249},
+ {"prnE", 0x2AB5},
+ {"NotGreaterFullEqual", 0x22670338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tridot", 0x25EC},
+ {"NotCongruent", 0x2262},
+ {"", 0}, {"", 0}, {"", 0},
+ {"middot", 0x00B7},
+ {"LeftUpVector", 0x21BF},
+ {"", 0}, {"", 0},
+ {"LeftUpVectorBar", 0x2958},
+ {"", 0}, {"", 0},
+ {"dtdot", 0x22F1},
+ {"InvisibleTimes", 0x2062},
+ {"iota", 0x03B9},
+ {"", 0},
+ {"swarrow", 0x2199},
+ {"xlArr", 0x27F8},
+ {"lowast", 0x2217},
+ {"simeq", 0x2243},
+ {"", 0}, {"", 0}, {"", 0},
+ {"racute", 0x0155},
+ {"", 0}, {"", 0},
+ {"npreceq", 0x2AAF0338},
+ {"", 0},
+ {"lacute", 0x013A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sacute", 0x015B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eacute", 0x00E9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nwarrow", 0x2196},
+ {"", 0}, {"", 0},
+ {"beta", 0x03B2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uacute", 0x00FA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xrArr", 0x27F9},
+ {"nacute", 0x0144},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bigoplus", 0x2A01},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lmidot", 0x0140},
+ {"", 0}, {"", 0},
+ {"hArr", 0x21D4},
+ {"", 0}, {"", 0},
+ {"dd", 0x2146},
+ {"", 0},
+ {"Dscr", 0xD49F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"csupe", 0x2AD2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"csube", 0x2AD1},
+ {"", 0},
+ {"Zeta", 0x0396},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xopf", 0xD569},
+ {"", 0}, {"", 0},
+ {"tilde", 0x02DC},
+ {"", 0}, {"", 0},
+ {"Cap", 0x22D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Zacute", 0x0179},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sdot", 0x22C5},
+ {"zeta", 0x03B6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"edot", 0x0117},
+ {"", 0},
+ {"iiiint", 0x2A0C},
+ {"", 0}, {"", 0},
+ {"tdot", 0x20DB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nvgt", 0x003E20D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zacute", 0x017A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Oacute", 0x00D3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sqsupseteq", 0x2292},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nu", 0x03BD},
+ {"Racute", 0x0154},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"eogon", 0x0119},
+ {"cfr", 0xD520},
+ {"dwangle", 0x29A6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxUr", 0x2559},
+ {"", 0}, {"", 0},
+ {"Lacute", 0x0139},
+ {"", 0}, {"", 0}, {"", 0},
+ {"iff", 0x21D4},
+ {"", 0},
+ {"uogon", 0x0173},
+ {"ForAll", 0x2200},
+ {"", 0}, {"", 0},
+ {"Zdot", 0x017B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"coprod", 0x2210},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gEl", 0x2A8C},
+ {"", 0},
+ {"Cross", 0x2A2F},
+ {"NotGreaterEqual", 0x2271},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uuarr", 0x21C8},
+ {"", 0}, {"", 0},
+ {"shy", 0x00AD},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gnE", 0x2269},
+ {"zdot", 0x017C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scE", 0x2AB4},
+ {"", 0}, {"", 0},
+ {"Lmidot", 0x013F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sigmav", 0x03C2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotLessSlantEqual", 0x2A7D0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ast", 0x002A},
+ {"imped", 0x01B5},
+ {"NotGreaterTilde", 0x2275},
+ {"dtri", 0x25BF},
+ {"rsh", 0x21B1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lsh", 0x21B0},
+ {"sqcups", 0x2294FE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"half", 0x00BD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ubreve", 0x016D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"plustwo", 0x2A27},
+ {"divideontimes", 0x22C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"OpenCurlyQuote", 0x2018},
+ {"", 0}, {"", 0}, {"", 0},
+ {"eplus", 0x2A71},
+ {"zwnj", 0x200C},
+ {"", 0},
+ {"bigcap", 0x22C2},
+ {"", 0}, {"", 0}, {"", 0},
+ {"order", 0x2134},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Uacute", 0x00DA},
+ {"bump", 0x224E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uplus", 0x228E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"iacute", 0x00ED},
+ {"scnap", 0x2ABA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"cscr", 0xD4B8},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nsc", 0x2281},
+ {"", 0},
+ {"glE", 0x2A92},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"homtht", 0x223B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sdote", 0x2A66},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sup1", 0x00B9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotPrecedes", 0x2280},
+ {"sup2", 0x00B2},
+ {"dfisht", 0x297F},
+ {"", 0},
+ {"sqcup", 0x2294},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Psi", 0x03A8},
+ {"", 0}, {"", 0},
+ {"sigmaf", 0x03C2},
+ {"", 0}, {"", 0},
+ {"ltrPar", 0x2996},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rhov", 0x03F1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Rsh", 0x21B1},
+ {"", 0},
+ {"simlE", 0x2A9F},
+ {"", 0},
+ {"Star", 0x22C6},
+ {"", 0},
+ {"Yacute", 0x00DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circeq", 0x2257},
+ {"", 0}, {"", 0},
+ {"UpArrow", 0x2191},
+ {"", 0}, {"", 0},
+ {"sup3", 0x00B3},
+ {"", 0}, {"", 0},
+ {"Lsh", 0x21B0},
+ {"", 0}, {"", 0},
+ {"bigcup", 0x22C3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"barvee", 0x22BD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nvinfin", 0x29DE},
+ {"", 0}, {"", 0},
+ {"Uogon", 0x0172},
+ {"bumpe", 0x224F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"upharpoonright", 0x21BE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"iogon", 0x012F},
+ {"iinfin", 0x29DC},
+ {"", 0},
+ {"complement", 0x2201},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ohbar", 0x29B5},
+ {"", 0},
+ {"Tilde", 0x223C},
+ {"chi", 0x03C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sup", 0x2283},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hfr", 0xD525},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ReverseElement", 0x220B},
+ {"", 0}, {"", 0},
+ {"nexist", 0x2204},
+ {"nexists", 0x2204},
+ {"leqslant", 0x2A7D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"prcue", 0x227C},
+ {"", 0}, {"", 0},
+ {"vellip", 0x22EE},
+ {"", 0}, {"", 0},
+ {"egs", 0x2A96},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"theta", 0x03B8},
+ {"gE", 0x2267},
+ {"", 0},
+ {"Copf", 0x2102},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UnionPlus", 0x228E},
+ {"", 0},
+ {"Ubreve", 0x016C},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xi", 0x03BE},
+ {"boxVr", 0x255F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nGtv", 0x226B0338},
+ {"", 0}, {"", 0},
+ {"rarrw", 0x219D},
+ {"", 0},
+ {"cirscir", 0x29C2},
+ {"", 0},
+ {"Intersection", 0x22C2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxHu", 0x2567},
+ {"", 0}, {"", 0},
+ {"ngt", 0x226F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Beta", 0x0392},
+ {"", 0}, {"", 0},
+ {"trisb", 0x29CD},
+ {"smid", 0x2223},
+ {"ngtr", 0x226F},
+ {"rtriltri", 0x29CE},
+ {"", 0},
+ {"ovbar", 0x233D},
+ {"", 0}, {"", 0},
+ {"gesdot", 0x2A80},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LessFullEqual", 0x2266},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nmid", 0x2224},
+ {"", 0},
+ {"nwnear", 0x2927},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rsquor", 0x2019},
+ {"isinv", 0x2208},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lsquor", 0x201A},
+ {"sc", 0x227B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"oint", 0x222E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Dcaron", 0x010E},
+ {"", 0}, {"", 0},
+ {"simg", 0x2A9E},
+ {"", 0}, {"", 0},
+ {"isindot", 0x22F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"hscr", 0xD4BD},
+ {"boxV", 0x2551},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nsce", 0x2AB00338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"leftarrow", 0x2190},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"trie", 0x225C},
+ {"NotHumpDownHump", 0x224E0338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"male", 0x2642},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ccaps", 0x2A4D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supmult", 0x2AC2},
+ {"", 0}, {"", 0},
+ {"models", 0x22A7},
+ {"Implies", 0x21D2},
+ {"Mu", 0x039C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Gdot", 0x0120},
+ {"", 0},
+ {"VDash", 0x22AB},
+ {"", 0},
+ {"LeftArrowBar", 0x21E4},
+ {"", 0}, {"", 0},
+ {"nshortparallel", 0x2226},
+ {"numsp", 0x2007},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"backcong", 0x224C},
+ {"afr", 0xD51E},
+ {"", 0},
+ {"ubrcy", 0x045E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DoubleLeftArrow", 0x21D0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"vartheta", 0x03D1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"compfn", 0x2218},
+ {"", 0}, {"", 0},
+ {"vartriangleright", 0x22B3},
+ {"", 0}, {"", 0}, {"", 0},
+ {"vartriangleleft", 0x22B2},
+ {"", 0}, {"", 0}, {"", 0},
+ {"vDash", 0x22A8},
+ {"", 0}, {"", 0},
+ {"nsucc", 0x2281},
+ {"nge", 0x2271},
+ {"boxDr", 0x2553},
+ {"boxHU", 0x2569},
+ {"omicron", 0x03BF},
+ {"", 0}, {"", 0},
+ {"fork", 0x22D4},
+ {"", 0}, {"", 0},
+ {"raquo", 0x00BB},
+ {"", 0},
+ {"simgE", 0x2AA0},
+ {"", 0}, {"", 0},
+ {"laquo", 0x00AB},
+ {"", 0},
+ {"tbrk", 0x23B4},
+ {"", 0},
+ {"GreaterSlantEqual", 0x2A7E},
+ {"Laplacetrf", 0x2112},
+ {"colone", 0x2254},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supsub", 0x2AD4},
+ {"colon", 0x003A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Diamond", 0x22C4},
+ {"", 0}, {"", 0},
+ {"bbrk", 0x23B5},
+ {"hairsp", 0x200A},
+ {"", 0}, {"", 0},
+ {"Nacute", 0x0143},
+ {"", 0},
+ {"breve", 0x02D8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supset", 0x2283},
+ {"", 0}, {"", 0}, {"", 0},
+ {"quest", 0x003F},
+ {"", 0},
+ {"ccups", 0x2A4C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"asymp", 0x2248},
+ {"", 0}, {"", 0},
+ {"Leftarrow", 0x21D0},
+ {"", 0},
+ {"duarr", 0x21F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Barv", 0x2AE7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Coproduct", 0x2210},
+ {"Gbreve", 0x011E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bemptyv", 0x29B0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"imath", 0x0131},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supne", 0x228B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bbrktbrk", 0x23B6},
+ {"", 0},
+ {"Theta", 0x0398},
+ {"", 0},
+ {"cwint", 0x2231},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ccaron", 0x010D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ascr", 0xD4B6},
+ {"", 0}, {"", 0},
+ {"Nu", 0x039D},
+ {"", 0},
+ {"yopf", 0xD56A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ltlarr", 0x2976},
+ {"ic", 0x2063},
+ {"", 0}, {"", 0},
+ {"trpezium", 0x23E2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxUL", 0x255D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"raemptyv", 0x29B3},
+ {"nges", 0x2A7E0338},
+ {"", 0}, {"", 0}, {"", 0},
+ {"laemptyv", 0x29B4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"eng", 0x014B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"blank", 0x2423},
+ {"bumpeq", 0x224F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lnapprox", 0x2A89},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supsup", 0x2AD6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"af", 0x2061},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Mellintrf", 0x2133},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"realpart", 0x211C},
+ {"", 0},
+ {"Ubrcy", 0x040E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rang", 0x27E9},
+ {"UpperRightArrow", 0x2197},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lang", 0x27E8},
+ {"", 0},
+ {"xfr", 0xD535},
+ {"", 0},
+ {"sbquo", 0x201A},
+ {"", 0}, {"", 0},
+ {"block", 0x2588},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ocir", 0x229A},
+ {"", 0},
+ {"boxHd", 0x2564},
+ {"", 0}, {"", 0},
+ {"Esim", 0x2A73},
+ {"ngeq", 0x2271},
+ {"ngeqq", 0x22670338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"apacir", 0x2A6F},
+ {"", 0}, {"", 0},
+ {"Iota", 0x0399},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nang", 0x222020D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleLeftRightArrow", 0x21D4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"capdot", 0x2A40},
+ {"NotVerticalBar", 0x2224},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bigotimes", 0x2A02},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Sacute", 0x015A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"mu", 0x03BC},
+ {"supseteq", 0x2287},
+ {"supseteqq", 0x2AC6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sum", 0x2211},
+ {"", 0}, {"", 0},
+ {"dbkarow", 0x290F},
+ {"", 0},
+ {"xoplus", 0x2A01},
+ {"", 0}, {"", 0},
+ {"lesdoto", 0x2A81},
+ {"", 0}, {"", 0},
+ {"supsetneq", 0x228B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"sfrown", 0x2322},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotSquareSubsetEqual", 0x22E2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"timesd", 0x2A30},
+ {"", 0}, {"", 0},
+ {"num", 0x0023},
+ {"", 0},
+ {"NotSquareSubset", 0x228F0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxUl", 0x255C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"kappav", 0x03F0},
+ {"", 0},
+ {"Rang", 0x27EB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"EmptySmallSquare", 0x25FB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xsqcup", 0x2A06},
+ {"", 0}, {"", 0},
+ {"bigodot", 0x2A00},
+ {"boxplus", 0x229E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Lang", 0x27EA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nGg", 0x22D90338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xscr", 0xD4CD},
+ {"", 0}, {"", 0},
+ {"TildeTilde", 0x2248},
+ {"", 0},
+ {"xnis", 0x22FB},
+ {"", 0},
+ {"NotEqual", 0x2260},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"COPY", 0x00A9},
+ {"", 0}, {"", 0}, {"", 0},
+ {"NotSquareSupersetEqual", 0x22E3},
+ {"conint", 0x222E},
+ {"", 0},
+ {"prnsim", 0x22E8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotSquareSuperset", 0x22900338},
+ {"", 0}, {"", 0},
+ {"vsupnE", 0x2ACCFE00},
+ {"", 0},
+ {"bsolb", 0x29C5},
+ {"", 0}, {"", 0},
+ {"vsubnE", 0x2ACBFE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"reg", 0x00AE},
+ {"", 0},
+ {"gsime", 0x2A8E},
+ {"cwconint", 0x2232},
+ {"", 0},
+ {"leg", 0x22DA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"roang", 0x27ED},
+ {"", 0}, {"", 0},
+ {"asympeq", 0x224D},
+ {"", 0},
+ {"loang", 0x27EC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"boxVL", 0x2563},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kopf", 0xD55C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"coloneq", 0x2254},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Eacute", 0x00C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ddotseq", 0x2A77},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cent", 0x00A2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circledast", 0x229B},
+ {"apE", 0x2A70},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Breve", 0x02D8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"origof", 0x22B6},
+ {"", 0},
+ {"questeq", 0x225F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gla", 0x2AA5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Iacute", 0x00CD},
+ {"", 0},
+ {"boxUR", 0x255A},
+ {"", 0}, {"", 0},
+ {"LeftArrow", 0x2190},
+ {"OpenCurlyDoubleQuote", 0x201C},
+ {"supsetneqq", 0x2ACC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NegativeMediumSpace", 0x200B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oacute", 0x00F3},
+ {"", 0}, {"", 0}, {"", 0},
+ {"supplus", 0x2AC0},
+ {"", 0},
+ {"LessSlantEqual", 0x2A7D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Edot", 0x0116},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Omega", 0x03A9},
+ {"", 0}, {"", 0},
+ {"rtimes", 0x22CA},
+ {"", 0},
+ {"gamma", 0x03B3},
+ {"", 0},
+ {"exponentiale", 0x2147},
+ {"ltimes", 0x22C9},
+ {"", 0},
+ {"dagger", 0x2020},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circledR", 0x00AE},
+ {"", 0}, {"", 0},
+ {"NotPrecedesSlantEqual", 0x22E0},
+ {"", 0},
+ {"cirfnint", 0x2A10},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Eogon", 0x0118},
+ {"", 0},
+ {"nrarrc", 0x29330338},
+ {"Cfr", 0x212D},
+ {"Idot", 0x0130},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ReverseEquilibrium", 0x21CB},
+ {"", 0}, {"", 0}, {"", 0},
+ {"risingdotseq", 0x2253},
+ {"", 0}, {"", 0},
+ {"shcy", 0x0448},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"awint", 0x2A11},
+ {"", 0}, {"", 0},
+ {"odot", 0x2299},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"euro", 0x20AC},
+ {"", 0},
+ {"downarrow", 0x2193},
+ {"", 0},
+ {"TripleDot", 0x20DB},
+ {"gt", 0x003E},
+ {"", 0},
+ {"Bumpeq", 0x224E},
+ {"", 0}, {"", 0},
+ {"ZeroWidthSpace", 0x200B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ljcy", 0x0459},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxVl", 0x2562},
+ {"", 0},
+ {"demptyv", 0x29B1},
+ {"", 0},
+ {"Iogon", 0x012E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"euml", 0x00EB},
+ {"", 0}, {"", 0},
+ {"doteqdot", 0x2251},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxDL", 0x2557},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"njcy", 0x045A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Otimes", 0x2A37},
+ {"uuml", 0x00FC},
+ {"", 0}, {"", 0},
+ {"gtdot", 0x22D7},
+ {"Sup", 0x22D1},
+ {"", 0},
+ {"ngsim", 0x2275},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"caret", 0x2041},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ApplyFunction", 0x2061},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"isinE", 0x22F9},
+ {"", 0}, {"", 0}, {"", 0},
+ {"MediumSpace", 0x205F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zhcy", 0x0436},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftFloor", 0x230A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tritime", 0x2A3B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Aacute", 0x00C1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"capbrcup", 0x2A49},
+ {"Ouml", 0x00D6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Cscr", 0xD49E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"imagpart", 0x2111},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sext", 0x2736},
+ {"", 0}, {"", 0},
+ {"dblac", 0x02DD},
+ {"", 0}, {"", 0},
+ {"Assign", 0x2254},
+ {"xcap", 0x22C2},
+ {"oplus", 0x2295},
+ {"", 0}, {"", 0},
+ {"iiota", 0x2129},
+ {"", 0}, {"", 0},
+ {"andslope", 0x2A58},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotPrecedesEqual", 0x2AAF0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Sc", 0x2ABC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxH", 0x2550},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ZHcy", 0x0416},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nequiv", 0x2262},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"quot", 0x0022},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"boxVR", 0x2560},
+ {"", 0},
+ {"rtrif", 0x25B8},
+ {"", 0},
+ {"boxDl", 0x2556},
+ {"", 0}, {"", 0},
+ {"ltrif", 0x25C2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Aogon", 0x0104},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"duhar", 0x296F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Chi", 0x03A7},
+ {"", 0},
+ {"nLtv", 0x226A0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"utrif", 0x25B4},
+ {"", 0},
+ {"iocy", 0x0451},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"suplarr", 0x297B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"xcup", 0x22C3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Uuml", 0x00DC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"succeq", 0x2AB0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"yen", 0x00A5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"starf", 0x2605},
+ {"", 0},
+ {"iuml", 0x00EF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"awconint", 0x2233},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"KHcy", 0x0425},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DoubleDot", 0x00A8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Abreve", 0x0102},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"yfr", 0xD536},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gescc", 0x2AA9},
+ {"", 0},
+ {"TScy", 0x0426},
+ {"", 0}, {"", 0}, {"", 0},
+ {"acd", 0x223F},
+ {"andd", 0x2A5C},
+ {"", 0},
+ {"Supset", 0x22D1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eqcirc", 0x2256},
+ {"", 0},
+ {"scnE", 0x2AB6},
+ {"Yuml", 0x0178},
+ {"ntriangleleft", 0x22EA},
+ {"", 0},
+ {"triangle", 0x25B5},
+ {"ogt", 0x29C1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"deg", 0x00B0},
+ {"", 0},
+ {"szlig", 0x00DF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"iexcl", 0x00A1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"triangleleft", 0x25C3},
+ {"", 0},
+ {"omid", 0x29B6},
+ {"ThinSpace", 0x2009},
+ {"drbkarow", 0x2910},
+ {"", 0},
+ {"gesdotol", 0x2A84},
+ {"comma", 0x002C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gsim", 0x2273},
+ {"", 0}, {"", 0},
+ {"DD", 0x2145},
+ {"", 0}, {"", 0},
+ {"gsiml", 0x2A90},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nvge", 0x226520D2},
+ {"", 0}, {"", 0},
+ {"quaternions", 0x210D},
+ {"", 0}, {"", 0},
+ {"boxDR", 0x2554},
+ {"empty", 0x2205},
+ {"", 0}, {"", 0},
+ {"ring", 0x02DA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rsquo", 0x2019},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lsquo", 0x2018},
+ {"gvnE", 0x2269FE00},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"tshcy", 0x045B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"succcurlyeq", 0x227D},
+ {"", 0}, {"", 0},
+ {"yscr", 0xD4CE},
+ {"", 0},
+ {"cirE", 0x29C3},
+ {"", 0},
+ {"NotCupCap", 0x226D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"TildeEqual", 0x2243},
+ {"", 0}, {"", 0}, {"", 0},
+ {"leftleftarrows", 0x21C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"iecy", 0x0435},
+ {"ctdot", 0x22EF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Colone", 0x2A74},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"capand", 0x2A44},
+ {"Colon", 0x2237},
+ {"", 0}, {"", 0},
+ {"angzarr", 0x237C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rcedil", 0x0157},
+ {"sqsube", 0x2291},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lcedil", 0x013C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scedil", 0x015F},
+ {"", 0}, {"", 0},
+ {"boxminus", 0x229F},
+ {"", 0},
+ {"sqsub", 0x228F},
+ {"", 0}, {"", 0},
+ {"sqsubset", 0x228F},
+ {"", 0},
+ {"tcedil", 0x0163},
+ {"puncsp", 0x2008},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dzcy", 0x045F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angrt", 0x221F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ncedil", 0x0146},
+ {"", 0},
+ {"ntrianglelefteq", 0x22EC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"triangleq", 0x225C},
+ {"phiv", 0x03D5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Sum", 0x2211},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gtcir", 0x2A7A},
+ {"", 0}, {"", 0},
+ {"mumap", 0x22B8},
+ {"", 0},
+ {"integers", 0x2124},
+ {"gtrarr", 0x2978},
+ {"djcy", 0x0452},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"orderof", 0x2134},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"trianglelefteq", 0x22B4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ccaron", 0x010C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nleftarrow", 0x219A},
+ {"", 0}, {"", 0},
+ {"NotEqualTilde", 0x22420338},
+ {"fjlig", 0x0066006A},
+ {"delta", 0x03B4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"nprec", 0x2280},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"TSHcy", 0x040B},
+ {"", 0},
+ {"DoubleUpArrow", 0x21D1},
+ {"gacute", 0x01F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kfr", 0xD528},
+ {"YUcy", 0x042E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleVerticalBar", 0x2225},
+ {"Rcedil", 0x0156},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"vnsub", 0x228220D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ijlig", 0x0133},
+ {"Lcedil", 0x013B},
+ {"centerdot", 0x00B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleUpDownArrow", 0x21D5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"angst", 0x00C5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ogon", 0x02DB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"weierp", 0x2118},
+ {"", 0}, {"", 0}, {"", 0},
+ {"fllig", 0xFB02},
+ {"", 0}, {"", 0},
+ {"lEg", 0x2A8B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"PrecedesEqual", 0x2AAF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Kcedil", 0x0136},
+ {"", 0}, {"", 0},
+ {"gdot", 0x0121},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NewLine", 0x000A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"UpperLeftArrow", 0x2196},
+ {"", 0},
+ {"Lleftarrow", 0x21DA},
+ {"", 0}, {"", 0},
+ {"bowtie", 0x22C8},
+ {"jmath", 0x0237},
+ {"", 0},
+ {"LeftDoubleBracket", 0x27E6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"CircleTimes", 0x2297},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftTeeArrow", 0x21A4},
+ {"", 0}, {"", 0},
+ {"DownTee", 0x22A4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxdr", 0x250C},
+ {"", 0},
+ {"LeftVector", 0x21BC},
+ {"", 0},
+ {"ndash", 0x2013},
+ {"circledS", 0x24C8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circ", 0x02C6},
+ {"", 0}, {"", 0},
+ {"angrtvb", 0x22BE},
+ {"", 0}, {"", 0},
+ {"LeftUpDownVector", 0x2951},
+ {"", 0},
+ {"lambda", 0x03BB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"andand", 0x2A55},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kscr", 0xD4C0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rcy", 0x0440},
+ {"LeftTriangleBar", 0x29CF},
+ {"", 0}, {"", 0},
+ {"dtrif", 0x25BE},
+ {"lcy", 0x043B},
+ {"", 0}, {"", 0},
+ {"LeftTriangleEqual", 0x22B4},
+ {"", 0},
+ {"scy", 0x0441},
+ {"LJcy", 0x0409},
+ {"", 0},
+ {"LeftTriangle", 0x22B2},
+ {"sccue", 0x227D},
+ {"ecy", 0x044D},
+ {"", 0}, {"", 0},
+ {"egrave", 0x00E8},
+ {"", 0},
+ {"tcy", 0x0442},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LongLeftArrow", 0x27F5},
+ {"ucy", 0x0443},
+ {"YIcy", 0x0407},
+ {"odsold", 0x29BC},
+ {"ugrave", 0x00F9},
+ {"", 0},
+ {"ncy", 0x043D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bcy", 0x0431},
+ {"", 0},
+ {"gbreve", 0x011F},
+ {"", 0}, {"", 0},
+ {"rdquor", 0x201D},
+ {"Vdash", 0x22A9},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ldquor", 0x201E},
+ {"KJcy", 0x040C},
+ {"", 0},
+ {"cire", 0x2257},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"utilde", 0x0169},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ntilde", 0x00F1},
+ {"bull", 0x2022},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Jcy", 0x0419},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Tcedil", 0x0162},
+ {"", 0}, {"", 0},
+ {"Zcy", 0x0417},
+ {"vdash", 0x22A2},
+ {"Conint", 0x222F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"zcy", 0x0437},
+ {"", 0},
+ {"bumpE", 0x2AAE},
+ {"", 0}, {"", 0},
+ {"Ocy", 0x041E},
+ {"", 0}, {"", 0},
+ {"Ograve", 0x00D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"pcy", 0x043F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Vcy", 0x0412},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Lambda", 0x039B},
+ {"Rcy", 0x0420},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Otilde", 0x00D5},
+ {"", 0},
+ {"CircleMinus", 0x2296},
+ {"", 0}, {"", 0},
+ {"NotTildeEqual", 0x2244},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Product", 0x220F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Lcy", 0x041B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"HilbertSpace", 0x210B},
+ {"", 0}, {"", 0},
+ {"dashv", 0x22A3},
+ {"", 0}, {"", 0},
+ {"vcy", 0x0432},
+ {"", 0}, {"", 0}, {"", 0},
+ {"fallingdotseq", 0x2252},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"NotExists", 0x2204},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"minus", 0x2212},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"thetasym", 0x03D1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Kcy", 0x041A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cirmid", 0x2AEF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sqsubseteq", 0x2291},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nVdash", 0x22AE},
+ {"eta", 0x03B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"eth", 0x00F0},
+ {"", 0},
+ {"longleftarrow", 0x27F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"fcy", 0x0444},
+ {"", 0},
+ {"nvdash", 0x22AC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"omega", 0x03C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"lg", 0x2276},
+ {"", 0},
+ {"SHcy", 0x0428},
+ {"", 0}, {"", 0}, {"", 0},
+ {"minusb", 0x229F},
+ {"", 0},
+ {"natural", 0x266E},
+ {"", 0},
+ {"eg", 0x2A9A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"naturals", 0x2115},
+ {"", 0},
+ {"Ucy", 0x0423},
+ {"tscy", 0x0446},
+ {"", 0},
+ {"Ugrave", 0x00D9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xvee", 0x22C1},
+ {"", 0},
+ {"geqslant", 0x2A7E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supdsub", 0x2AD8},
+ {"icy", 0x0438},
+ {"", 0}, {"", 0},
+ {"igrave", 0x00EC},
+ {"", 0}, {"", 0},
+ {"Gcedil", 0x0122},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Utilde", 0x0168},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"telrec", 0x2315},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supdot", 0x2ABE},
+ {"", 0}, {"", 0}, {"", 0},
+ {"aleph", 0x2135},
+ {"", 0}, {"", 0},
+ {"itilde", 0x0129},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hookleftarrow", 0x21A9},
+ {"", 0}, {"", 0},
+ {"Vvdash", 0x22AA},
+ {"", 0}, {"", 0},
+ {"zwj", 0x200D},
+ {"ReverseUpEquilibrium", 0x296F},
+ {"", 0},
+ {"cacute", 0x0107},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bullet", 0x2022},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ccupssm", 0x2A50},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"grave", 0x0060},
+ {"lozenge", 0x25CA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"notinvc", 0x22F6},
+ {"otimes", 0x2297},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ycy", 0x042B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Tcy", 0x0422},
+ {"Euml", 0x00CB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Longleftarrow", 0x27F8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lgE", 0x2A91},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"HumpEqual", 0x224F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bigsqcup", 0x2A06},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cdot", 0x010B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ngE", 0x22670338},
+ {"", 0},
+ {"acute", 0x00B4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Iuml", 0x00CF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"GJcy", 0x0403},
+ {"ouml", 0x00F6},
+ {"", 0},
+ {"sub", 0x2282},
+ {"sdotb", 0x22A1},
+ {"DotEqual", 0x2250},
+ {"", 0}, {"", 0},
+ {"egsdot", 0x2A98},
+ {"hkswarow", 0x2926},
+ {"TildeFullEqual", 0x2245},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Ncedil", 0x0145},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NestedGreaterGreater", 0x226B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Congruent", 0x2261},
+ {"", 0},
+ {"subrarr", 0x2979},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gimel", 0x2137},
+ {"", 0},
+ {"DownLeftVector", 0x21BD},
+ {"", 0}, {"", 0},
+ {"DownLeftVectorBar", 0x2956},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ltcc", 0x2AA6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"UnderBar", 0x005F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"succneqq", 0x2AB6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleRightTee", 0x22A8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleLongLeftArrow", 0x27F8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleLongLeftRightArrow", 0x27FA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supnE", 0x2ACC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"congdot", 0x2A6D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Bcy", 0x0411},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"supE", 0x2AC6},
+ {"", 0},
+ {"NotSucceeds", 0x2281},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Mcy", 0x041C},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bigwedge", 0x22C0},
+ {"angrtvbd", 0x299D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Succeeds", 0x227B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Gcy", 0x0413},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"DownLeftTeeVector", 0x295E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rmoustache", 0x23B1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lmoustache", 0x23B0},
+ {"NJcy", 0x040A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"complexes", 0x2102},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SucceedsSlantEqual", 0x227D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dcy", 0x0434},
+ {"DoubleDownArrow", 0x21D3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scirc", 0x015D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ecirc", 0x00EA},
+ {"cuepr", 0x22DE},
+ {"Auml", 0x00C4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"cupor", 0x2A45},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Wcirc", 0x0174},
+ {"", 0}, {"", 0}, {"", 0},
+ {"FilledSmallSquare", 0x25FC},
+ {"", 0}, {"", 0}, {"", 0},
+ {"boxdL", 0x2555},
+ {"", 0},
+ {"ucirc", 0x00FB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftUpTeeVector", 0x2960},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"scnsim", 0x22E9},
+ {"", 0}, {"", 0}, {"", 0},
+ {"filig", 0xFB01},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gtrless", 0x2277},
+ {"", 0}, {"", 0}, {"", 0},
+ {"timesbar", 0x2A31},
+ {"YAcy", 0x042F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Jcirc", 0x0134},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Scedil", 0x015E},
+ {"", 0},
+ {"ltquest", 0x2A7B},
+ {"", 0},
+ {"uring", 0x016F},
+ {"gnapprox", 0x2A8A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DownArrowBar", 0x2913},
+ {"", 0}, {"", 0}, {"", 0},
+ {"dzigrarr", 0x27FF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Poincareplane", 0x210C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"submult", 0x2AC1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nabla", 0x2207},
+ {"", 0},
+ {"sigma", 0x03C3},
+ {"", 0},
+ {"Ocirc", 0x00D4},
+ {"", 0},
+ {"curren", 0x00A4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ncy", 0x041D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"boxVH", 0x256C},
+ {"cup", 0x222A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"leftrightsquigarrow", 0x21AD},
+ {"", 0},
+ {"Dagger", 0x2021},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ntilde", 0x00D1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"UpArrowDownArrow", 0x21C5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DoubleLongRightArrow", 0x27F9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"robrk", 0x27E7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lobrk", 0x27E6},
+ {"", 0}, {"", 0}, {"", 0},
+ {"bigstar", 0x2605},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cups", 0x222AFE00},
+ {"", 0},
+ {"subsub", 0x2AD5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Downarrow", 0x21D3},
+ {"succsim", 0x227F},
+ {"", 0},
+ {"mdash", 0x2014},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Gg", 0x22D9},
+ {"", 0}, {"", 0},
+ {"subset", 0x2282},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"approxeq", 0x224A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gesdoto", 0x2A82},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxdl", 0x2510},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"aacute", 0x00E1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"triangledown", 0x25BF},
+ {"", 0}, {"", 0},
+ {"minusdu", 0x2A2A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dscy", 0x0455},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CirclePlus", 0x2295},
+ {"", 0}, {"", 0}, {"", 0},
+ {"subne", 0x228A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ucirc", 0x00DB},
+ {"", 0}, {"", 0},
+ {"VeryThinSpace", 0x200A},
+ {"", 0}, {"", 0},
+ {"mcy", 0x043C},
+ {"Backslash", 0x2216},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"OElig", 0x0152},
+ {"", 0}, {"", 0},
+ {"icirc", 0x00EE},
+ {"", 0},
+ {"rdca", 0x2937},
+ {"EmptyVerySmallSquare", 0x25AB},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ldca", 0x2936},
+ {"hellip", 0x2026},
+ {"NotSucceedsTilde", 0x227F0338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Uring", 0x016E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"notnivc", 0x22FD},
+ {"", 0}, {"", 0},
+ {"DoubleContourIntegral", 0x222F},
+ {"", 0}, {"", 0}, {"", 0},
+ {"supe", 0x2287},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ncongdot", 0x2A6D0338},
+ {"", 0},
+ {"subsup", 0x2AD3},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Fcy", 0x0424},
+ {"", 0}, {"", 0}, {"", 0},
+ {"quatint", 0x2A16},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"aogon", 0x0105},
+ {"", 0},
+ {"Ycirc", 0x0176},
+ {"Scy", 0x0421},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DiacriticalTilde", 0x02DC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nLeftarrow", 0x21CD},
+ {"", 0}, {"", 0},
+ {"rbbrk", 0x2773},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lbbrk", 0x2772},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftDownVector", 0x21C3},
+ {"", 0}, {"", 0},
+ {"LeftDownVectorBar", 0x2959},
+ {"", 0},
+ {"leftthreetimes", 0x22CB},
+ {"curarr", 0x21B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cudarrr", 0x2935},
+ {"", 0},
+ {"OverBar", 0x203E},
+ {"acE", 0x223E0333},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cudarrl", 0x2938},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsd", 0x2221},
+ {"", 0}, {"", 0},
+ {"OverBrace", 0x23DE},
+ {"", 0}, {"", 0}, {"", 0},
+ {"gtlPar", 0x2995},
+ {"", 0},
+ {"boxdR", 0x2552},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"abreve", 0x0103},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subseteq", 0x2286},
+ {"subseteqq", 0x2AC5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"OverBracket", 0x23B4},
+ {"", 0}, {"", 0}, {"", 0},
+ {"cemptyv", 0x29B2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ncong", 0x2247},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bcong", 0x224C},
+ {"andv", 0x2A5A},
+ {"", 0},
+ {"subsetneq", 0x228A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oelig", 0x0153},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"harrw", 0x21AD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ShortDownArrow", 0x2193},
+ {"", 0}, {"", 0},
+ {"NonBreakingSpace", 0x00A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UpTeeArrow", 0x21A5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftDownTeeVector", 0x2961},
+ {"", 0}, {"", 0},
+ {"apid", 0x224B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cupcap", 0x2A46},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"biguplus", 0x2A04},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"MinusPlus", 0x2213},
+ {"", 0}, {"", 0}, {"", 0},
+ {"lessapprox", 0x2A85},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angle", 0x2220},
+ {"", 0}, {"", 0},
+ {"succnsim", 0x22E9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"odash", 0x229D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gjcy", 0x0453},
+ {"", 0},
+ {"Gcirc", 0x011C},
+ {"", 0},
+ {"Ecy", 0x042D},
+ {"", 0}, {"", 0},
+ {"Egrave", 0x00C8},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DiacriticalGrave", 0x0060},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"check", 0x2713},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftArrowRightArrow", 0x21C6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ntgl", 0x2279},
+ {"", 0},
+ {"boxur", 0x2514},
+ {"", 0},
+ {"SmallCircle", 0x2218},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cong", 0x2245},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"succ", 0x227B},
+ {"Icy", 0x0418},
+ {"", 0}, {"", 0},
+ {"Igrave", 0x00CC},
+ {"", 0}, {"", 0},
+ {"varnothing", 0x2205},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cupcup", 0x2A4A},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ocy", 0x043E},
+ {"", 0}, {"", 0},
+ {"ograve", 0x00F2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Itilde", 0x0128},
+ {"pitchfork", 0x22D4},
+ {"", 0}, {"", 0},
+ {"copy", 0x00A9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"otilde", 0x00F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DownArrow", 0x2193},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"rdquo", 0x201D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ldquo", 0x201C},
+ {"Pcy", 0x041F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ntriangleright", 0x22EB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subsetneqq", 0x2ACB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gtrdot", 0x22D7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"IOcy", 0x0401},
+ {"subplus", 0x2ABF},
+ {"", 0},
+ {"bdquo", 0x201E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxVh", 0x256B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"fflig", 0xFB00},
+ {"nVDash", 0x22AF},
+ {"Eta", 0x0397},
+ {"", 0}, {"", 0},
+ {"beth", 0x2136},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ac", 0x223E},
+ {"", 0}, {"", 0}, {"", 0},
+ {"DZcy", 0x040F},
+ {"", 0},
+ {"Sub", 0x22D0},
+ {"", 0},
+ {"notinva", 0x2209},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nvDash", 0x22AD},
+ {"", 0}, {"", 0},
+ {"minusd", 0x2238},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"DScy", 0x0405},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"precapprox", 0x2AB7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Acy", 0x0410},
+ {"", 0}, {"", 0},
+ {"Agrave", 0x00C0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Delta", 0x0394},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftTeeVector", 0x295A},
+ {"", 0}, {"", 0},
+ {"SucceedsTilde", 0x227F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Atilde", 0x00C3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"circledcirc", 0x229A},
+ {"", 0},
+ {"Cacute", 0x0106},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lsimg", 0x2A8F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"NotSucceedsSlantEqual", 0x22E1},
+ {"", 0}, {"", 0},
+ {"IJlig", 0x0132},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"ntrianglerighteq", 0x22ED},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"boxtimes", 0x22A0},
+ {"", 0}, {"", 0},
+ {"kappa", 0x03BA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxHD", 0x2566},
+ {"hyphen", 0x2010},
+ {"", 0},
+ {"Cdot", 0x010A},
+ {"", 0}, {"", 0},
+ {"Cconint", 0x2230},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ngeqslant", 0x2A7E0338},
+ {"", 0},
+ {"Scirc", 0x015C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"wreath", 0x2240},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"jcy", 0x0439},
+ {"IEcy", 0x0415},
+ {"", 0},
+ {"NegativeThinSpace", 0x200B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"chcy", 0x0447},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LowerRightArrow", 0x2198},
+ {"", 0}, {"", 0}, {"", 0},
+ {"downdownarrows", 0x21CA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supsim", 0x2AC8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ntlg", 0x2278},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dash", 0x2010},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ang", 0x2220},
+ {"", 0},
+ {"Sigma", 0x03A3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ddagger", 0x2021},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"varsigma", 0x03C2},
+ {"", 0}, {"", 0},
+ {"NotSucceedsEqual", 0x2AB00338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"wcirc", 0x0175},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Subset", 0x22D0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circleddash", 0x229D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Ecirc", 0x00CA},
+ {"", 0}, {"", 0},
+ {"Dashv", 0x2AE4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CircleDot", 0x2299},
+ {"", 0}, {"", 0}, {"", 0},
+ {"Hcirc", 0x0124},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Icirc", 0x00CE},
+ {"", 0},
+ {"yacute", 0x00FD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bigvee", 0x22C1},
+ {"LongLeftRightArrow", 0x27F7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ocirc", 0x00F4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xdtri", 0x25BD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UnderBracket", 0x23B5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"cularr", 0x21B6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxuL", 0x255B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Cup", 0x22D3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"curlyvee", 0x22CE},
+ {"", 0},
+ {"Superset", 0x2283},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"equivDD", 0x2A78},
+ {"", 0},
+ {"glj", 0x2AA4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxvr", 0x251C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"napprox", 0x2249},
+ {"notniva", 0x220C},
+ {"", 0}, {"", 0},
+ {"gtreqless", 0x22DB},
+ {"ldrdhar", 0x2967},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"leftharpoonup", 0x21BC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lhblk", 0x2584},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gcy", 0x0433},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"uhblk", 0x2580},
+ {"", 0},
+ {"LeftCeiling", 0x2308},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"longleftrightarrow", 0x27F7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Acirc", 0x00C2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DiacriticalAcute", 0x00B4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DifferentialD", 0x2146},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"boxul", 0x2518},
+ {"ContourIntegral", 0x222E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Aring", 0x00C5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DJcy", 0x0402},
+ {"boxv", 0x2502},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cularrp", 0x293D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"bigtriangleup", 0x25B3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"DownTeeArrow", 0x21A7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Oslash", 0x00D8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"Longleftrightarrow", 0x27FA},
+ {"", 0}, {"", 0},
+ {"auml", 0x00E4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"jcirc", 0x0135},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gtreqqless", 0x2A8C},
+ {"ccedil", 0x00E7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"supedot", 0x2AC4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"AElig", 0x00C6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gg", 0x226B},
+ {"Dcy", 0x0414},
+ {"", 0}, {"", 0},
+ {"rightrightarrows", 0x21C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxuR", 0x2558},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Jukcy", 0x0404},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"leftrightharpoons", 0x21CB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"longmapsto", 0x27FC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"RightTee", 0x22A2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UpDownArrow", 0x2195},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"ange", 0x29A4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightTriangleBar", 0x29D0},
+ {"", 0}, {"", 0},
+ {"RightTeeVector", 0x295B},
+ {"", 0},
+ {"expectation", 0x2130},
+ {"", 0},
+ {"RightTriangleEqual", 0x22B5},
+ {"gtcc", 0x2AA7},
+ {"leftharpoondown", 0x21BD},
+ {"RightUpTeeVector", 0x295C},
+ {"", 0},
+ {"RightTriangle", 0x22B3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"intercal", 0x22BA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxhu", 0x2534},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"iukcy", 0x0456},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subdot", 0x2ABD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xwedge", 0x22C0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"downharpoonright", 0x21C2},
+ {"", 0}, {"", 0}, {"", 0},
+ {"downharpoonleft", 0x21C3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"ExponentialE", 0x2147},
+ {"", 0}, {"", 0},
+ {"leftrightarrows", 0x21C6},
+ {"", 0},
+ {"triangleright", 0x25B9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gcirc", 0x011D},
+ {"", 0},
+ {"updownarrow", 0x2195},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"intlarhk", 0x2A17},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"suphsub", 0x2AD7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"boxvL", 0x2561},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bigtriangledown", 0x25BD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"circlearrowright", 0x21BB},
+ {"", 0}, {"", 0}, {"", 0},
+ {"circlearrowleft", 0x21BA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gtrsim", 0x2273},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CenterDot", 0x00B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DoubleRightArrow", 0x21D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxhU", 0x2568},
+ {"gtquest", 0x2A7C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"LongRightArrow", 0x27F6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sung", 0x266A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subnE", 0x2ACB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"curarrm", 0x293C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subE", 0x2AC5},
+ {"", 0},
+ {"cupdot", 0x228D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NegativeVeryThinSpace", 0x200B},
+ {"", 0}, {"", 0}, {"", 0},
+ {"VerticalLine", 0x007C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xuplus", 0x2A04},
+ {"", 0},
+ {"LowerLeftArrow", 0x2199},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"trianglerighteq", 0x22B5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxvl", 0x2524},
+ {"rdldhar", 0x2969},
+ {"", 0}, {"", 0},
+ {"aelig", 0x00E6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Updownarrow", 0x21D5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Hacek", 0x02C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DiacriticalDot", 0x02D9},
+ {"", 0}, {"", 0},
+ {"DiacriticalDoubleAcute", 0x02DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nRightarrow", 0x21CF},
+ {"", 0},
+ {"curlywedge", 0x22CF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxhd", 0x252C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"nrightarrow", 0x219B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rarrhk", 0x21AA},
+ {"", 0},
+ {"CHcy", 0x0427},
+ {"", 0}, {"", 0},
+ {"larrhk", 0x21A9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"HumpDownHump", 0x224E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"LeftVectorBar", 0x2952},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DownArrowUpArrow", 0x21F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"acy", 0x0430},
+ {"", 0}, {"", 0},
+ {"agrave", 0x00E0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"CupCap", 0x224D},
+ {"", 0}, {"", 0}, {"", 0},
+ {"RightFloor", 0x230B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Rrightarrow", 0x21DB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"atilde", 0x00E3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"boxvR", 0x255E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"mcomma", 0x2A29},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xutri", 0x25B3},
+ {"", 0}, {"", 0},
+ {"Alpha", 0x0391},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ccirc", 0x0109},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"hksearow", 0x2925},
+ {"ClockwiseContourIntegral", 0x2232},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"longrightarrow", 0x27F6},
+ {"yacy", 0x044F},
+ {"", 0},
+ {"Cayleys", 0x212D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"PartialD", 0x2202},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"sube", 0x2286},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"yuml", 0x00FF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"amalg", 0x2A3F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"searhk", 0x2925},
+ {"LeftRightArrow", 0x2194},
+ {"hookrightarrow", 0x21AA},
+ {"", 0},
+ {"numero", 0x2116},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"topfork", 0x2ADA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"nearhk", 0x2924},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DownRightTeeVector", 0x295F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"LeftRightVector", 0x294E},
+ {"", 0},
+ {"Longrightarrow", 0x27F9},
+ {"", 0},
+ {"hybull", 0x2043},
+ {"", 0},
+ {"alefsym", 0x2135},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"oslash", 0x00F8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"DownBreve", 0x0311},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CapitalDifferentialD", 0x2145},
+ {"", 0},
+ {"swarhk", 0x2926},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"otimesas", 0x2A36},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"thickapprox", 0x2248},
+ {"", 0}, {"", 0},
+ {"nwarhk", 0x2923},
+ {"", 0}, {"", 0},
+ {"Ccedil", 0x00C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hcirc", 0x0125},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"gtrapprox", 0x2A86},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"VerticalTilde", 0x2240},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ffllig", 0xFB04},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdae", 0x29AC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightVector", 0x21C0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Iukcy", 0x0406},
+ {"", 0}, {"", 0},
+ {"angmsdab", 0x29A9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"khcy", 0x0445},
+ {"", 0}, {"", 0}, {"", 0},
+ {"precnapprox", 0x2AB9},
+ {"", 0},
+ {"DownLeftRightVector", 0x2950},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RuleDelayed", 0x29F4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kjcy", 0x045C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"LeftAngleBracket", 0x27E8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightAngleBracket", 0x27E9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"acirc", 0x00E2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CounterClockwiseContourIntegral", 0x2233},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdaf", 0x29AD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"aring", 0x00E5},
+ {"", 0}, {"", 0}, {"", 0},
+ {"odiv", 0x2A38},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightUpDownVector", 0x294F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"leftrightarrow", 0x2194},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"FilledVerySmallSquare", 0x25AA},
+ {"", 0},
+ {"Integral", 0x222B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"planck", 0x210F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"daleth", 0x2138},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"suphsol", 0x27C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SucceedsEqual", 0x2AB0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rdsh", 0x21B3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ldsh", 0x21B2},
+ {"", 0}, {"", 0},
+ {"approx", 0x2248},
+ {"", 0}, {"", 0}, {"", 0},
+ {"jukcy", 0x0454},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Leftrightarrow", 0x21D4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cuesc", 0x22DF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"xcirc", 0x25EF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lstrok", 0x0142},
+ {"", 0},
+ {"subsim", 0x2AC7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"tstrok", 0x0167},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Jsercy", 0x0408},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"RightVectorBar", 0x2953},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ycy", 0x044B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"yicy", 0x0457},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdad", 0x29AB},
+ {"", 0}, {"", 0},
+ {"Lstrok", 0x0141},
+ {"", 0}, {"", 0},
+ {"NegativeThickSpace", 0x200B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rbrack", 0x005D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"lbrack", 0x005B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kcedil", 0x0137},
+ {"", 0}, {"", 0}, {"", 0},
+ {"ImaginaryI", 0x2148},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"UnderParenthesis", 0x23DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"InvisibleComma", 0x2063},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ffilig", 0xFB03},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Tstrok", 0x0166},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"divonx", 0x22C7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Ccirc", 0x0108},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"NotRightTriangleBar", 0x29D00338},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotRightTriangleEqual", 0x22ED},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NotRightTriangle", 0x22EB},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"kcy", 0x043A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"bigcirc", 0x25EF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"pertenk", 0x2031},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxvH", 0x256A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"luruhar", 0x2966},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"subedot", 0x2AC3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"curlyeqprec", 0x22DE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"dstrok", 0x0111},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cuvee", 0x22CE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"straightepsilon", 0x03F5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxbox", 0x29C9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"ycirc", 0x0177},
+ {"", 0}, {"", 0}, {"", 0},
+ {"vzigzag", 0x299A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"alpha", 0x03B1},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Cedilla", 0x00B8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightleftharpoons", 0x21CC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightTeeArrow", 0x21A6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"hslash", 0x210F},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"planckh", 0x210E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"rightleftarrows", 0x21C4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DDotrahd", 0x2911},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"boxvh", 0x253C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ggg", 0x22D9},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SOFTcy", 0x042C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightthreetimes", 0x22CC},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"boxh", 0x2500},
+ {"", 0}, {"", 0},
+ {"checkmark", 0x2713},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Hstrok", 0x0126},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SupersetEqual", 0x2287},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightsquigarrow", 0x219D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"ruluhar", 0x2968},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdag", 0x29AE},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"udblac", 0x0171},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"jsercy", 0x0458},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"VerticalBar", 0x2223},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"DownRightVector", 0x21C1},
+ {"", 0}, {"", 0},
+ {"DownRightVectorBar", 0x2957},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Odblac", 0x0150},
+ {"", 0},
+ {"VerticalSeparator", 0x2758},
+ {"", 0}, {"", 0}, {"", 0},
+ {"cylcty", 0x232D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"succapprox", 0x2AB8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angsph", 0x2222},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"softcy", 0x044C},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Udblac", 0x0170},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"kgreen", 0x0138},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"digamma", 0x03DD},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"lurdshar", 0x294A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"boxhD", 0x2565},
+ {"", 0}, {"", 0}, {"", 0},
+ {"RightArrow", 0x2192},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"ldrushar", 0x294B},
+ {"", 0},
+ {"twoheadrightarrow", 0x21A0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightArrowLeftArrow", 0x21C4},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CloseCurlyQuote", 0x2019},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdac", 0x29AA},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightDownTeeVector", 0x295D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"SubsetEqual", 0x2286},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"SHCHcy", 0x0429},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightDoubleBracket", 0x27E7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"Dstrok", 0x0110},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightUpVector", 0x21BE},
+ {"", 0}, {"", 0},
+ {"RightUpVectorBar", 0x2954},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdah", 0x29AF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"cupbrcap", 0x2A48},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"multimap", 0x22B8},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"angmsdaa", 0x29A8},
+ {"HARDcy", 0x042A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"odblac", 0x0151},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hstrok", 0x0127},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"twoheadleftarrow", 0x219E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"curlyeqsucc", 0x22DF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"cuwed", 0x22CF},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"CloseCurlyDoubleQuote", 0x201D},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"yucy", 0x044E},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightarrow", 0x2192},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"straightphi", 0x03D5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"Rightarrow", 0x21D2},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"hardcy", 0x044A},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"shchcy", 0x0449},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"succnapprox", 0x2ABA},
+ {"", 0}, {"", 0}, {"", 0},
+ {"RightArrowBar", 0x21E5},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"RightDownVector", 0x21C2},
+ {"", 0}, {"", 0},
+ {"RightDownVectorBar", 0x2955},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"curvearrowleft", 0x21B6},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightharpoondown", 0x21C1},
+ {"", 0}, {"", 0},
+ {"curvearrowright", 0x21B7},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0},
+ {"rightarrowtail", 0x21A3},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"rightharpoonup", 0x21C0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0},
+ {"SuchThat", 0x220B},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0},
+ {"RightCeiling", 0x2309},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"", 0}, {"", 0}, {"", 0}, {"", 0},
+ {"NoBreak", 0x2060}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ register int key = hash (str, len);
+
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlistkey.name;
+
+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && slen == '\0')
+ return &wordlistkey;
+ }
+ }
+ return 0;
+}
+
+int htmlchar_from_string(const char *s)
+{
+ const struct htmlchar_desc *d = __htmlchar_lookup(s, strlen(s));
+ return (d == NULL ? -1 : d->value);
+}
+
+int htmlchar_from_string_len(const char *s, size_t len)
+{
+ const struct htmlchar_desc *d = __htmlchar_lookup(s, len);
+ return (d == NULL ? -1 : d->value);
+}
+

cyrus-imapd-2.5.tar.gz/lib/htmlchar.h Added

cyrus-imapd-2.5.tar.gz/lib/htmlchar.st Added

@@ -0,0 +1,2171 @@
+# htmlchars.st - string table data for HTML5 named characters
+#
+# Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+#  Derived from
+#  http://dev.w3.org/html5/spec/named-character-references.html#named-character-references
+
+table htmlchar
+ent 0x00C1 "Aacute"
+ent 0x00E1 "aacute"
+ent 0x0102 "Abreve"
+ent 0x0103 "abreve"
+ent 0x223F "acd"
+ent 0x223E0333 "acE"
+ent 0x00C2 "Acirc"
+ent 0x00E2 "acirc"
+ent 0x223E "ac"
+ent 0x00B4 "acute"
+ent 0x0410 "Acy"
+ent 0x0430 "acy"
+ent 0x00C6 "AElig"
+ent 0x00E6 "aelig"
+ent 0xD504 "Afr"
+ent 0xD51E "afr"
+ent 0x2061 "af"
+ent 0x00C0 "Agrave"
+ent 0x00E0 "agrave"
+ent 0x2135 "alefsym"
+ent 0x2135 "aleph"
+ent 0x0391 "Alpha"
+ent 0x03B1 "alpha"
+ent 0x0100 "Amacr"
+ent 0x0101 "amacr"
+ent 0x2A3F "amalg"
+ent 0x0026 "amp"
+ent 0x0026 "AMP"
+ent 0x2A55 "andand"
+ent 0x2A5C "andd"
+ent 0x2A58 "andslope"
+ent 0x2227 "and"
+ent 0x2A53 "And"
+ent 0x2A5A "andv"
+ent 0x29A4 "ange"
+ent 0x2220 "angle"
+ent 0x29A8 "angmsdaa"
+ent 0x29A9 "angmsdab"
+ent 0x29AA "angmsdac"
+ent 0x29AB "angmsdad"
+ent 0x29AC "angmsdae"
+ent 0x29AD "angmsdaf"
+ent 0x29AE "angmsdag"
+ent 0x29AF "angmsdah"
+ent 0x2221 "angmsd"
+ent 0x221F "angrt"
+ent 0x299D "angrtvbd"
+ent 0x22BE "angrtvb"
+ent 0x2222 "angsph"
+ent 0x00C5 "angst"
+ent 0x2220 "ang"
+ent 0x237C "angzarr"
+ent 0x0104 "Aogon"
+ent 0x0105 "aogon"
+ent 0xD538 "Aopf"
+ent 0xD552 "aopf"
+ent 0x2A6F "apacir"
+ent 0x224A "ape"
+ent 0x2A70 "apE"
+ent 0x224B "apid"
+ent 0x0027 "apos"
+ent 0x2061 "ApplyFunction"
+ent 0x224A "approxeq"
+ent 0x2248 "approx"
+ent 0x2248 "ap"
+ent 0x00C5 "Aring"
+ent 0x00E5 "aring"
+ent 0xD49C "Ascr"
+ent 0xD4B6 "ascr"
+ent 0x2254 "Assign"
+ent 0x002A "ast"
+ent 0x224D "asympeq"
+ent 0x2248 "asymp"
+ent 0x00C3 "Atilde"
+ent 0x00E3 "atilde"
+ent 0x00C4 "Auml"
+ent 0x00E4 "auml"
+ent 0x2233 "awconint"
+ent 0x2A11 "awint"
+ent 0x224C "backcong"
+ent 0x03F6 "backepsilon"
+ent 0x2035 "backprime"
+ent 0x22CD "backsimeq"
+ent 0x223D "backsim"
+ent 0x2216 "Backslash"
+ent 0x22BD "barvee"
+ent 0x2AE7 "Barv"
+ent 0x2305 "barwedge"
+ent 0x2305 "barwed"
+ent 0x2306 "Barwed"
+ent 0x23B6 "bbrktbrk"
+ent 0x23B5 "bbrk"
+ent 0x224C "bcong"
+ent 0x0411 "Bcy"
+ent 0x0431 "bcy"
+ent 0x201E "bdquo"
+ent 0x2235 "because"
+ent 0x2235 "Because"
+ent 0x2235 "becaus"
+ent 0x29B0 "bemptyv"
+ent 0x03F6 "bepsi"
+ent 0x212C "Bernoullis"
+ent 0x212C "bernou"
+ent 0x0392 "Beta"
+ent 0x03B2 "beta"
+ent 0x2136 "beth"
+ent 0x226C "between"
+ent 0xD505 "Bfr"
+ent 0xD51F "bfr"
+ent 0x22C2 "bigcap"
+ent 0x25EF "bigcirc"
+ent 0x22C3 "bigcup"
+ent 0x2A00 "bigodot"
+ent 0x2A01 "bigoplus"
+ent 0x2A02 "bigotimes"
+ent 0x2A06 "bigsqcup"
+ent 0x2605 "bigstar"
+ent 0x25BD "bigtriangledown"
+ent 0x25B3 "bigtriangleup"
+ent 0x2A04 "biguplus"
+ent 0x22C1 "bigvee"
+ent 0x22C0 "bigwedge"
+ent 0x290D "bkarow"
+ent 0x29EB "blacklozenge"
+ent 0x25AA "blacksquare"
+ent 0x25BE "blacktriangledown"
+ent 0x25C2 "blacktriangleleft"
+ent 0x25B8 "blacktriangleright"
+ent 0x25B4 "blacktriangle"
+ent 0x2423 "blank"
+ent 0x2592 "blk12"
+ent 0x2591 "blk14"
+ent 0x2593 "blk34"
+ent 0x2588 "block"
+ent 0x226120E5 "bnequiv"
+ent 0x003D20E5 "bne"
+ent 0x2310 "bnot"
+ent 0x2AED "bNot"
+ent 0xD539 "Bopf"
+ent 0xD553 "bopf"
+ent 0x22A5 "bottom"
+ent 0x22A5 "bot"
+ent 0x22C8 "bowtie"
+ent 0x29C9 "boxbox"
+ent 0x2510 "boxdl"
+ent 0x2555 "boxdL"
+ent 0x2556 "boxDl"
+ent 0x2557 "boxDL"
+ent 0x250C "boxdr"
+ent 0x2552 "boxdR"
+ent 0x2553 "boxDr"
+ent 0x2554 "boxDR"
+ent 0x252C "boxhd"
+ent 0x2564 "boxHd"
+ent 0x2565 "boxhD"
+ent 0x2566 "boxHD"
+ent 0x2500 "boxh"
+ent 0x2550 "boxH"
+ent 0x2534 "boxhu"
+ent 0x2567 "boxHu"
+ent 0x2568 "boxhU"
+ent 0x2569 "boxHU"
+ent 0x229F "boxminus"
+ent 0x229E "boxplus"
+ent 0x22A0 "boxtimes"
+ent 0x2518 "boxul"
+ent 0x255B "boxuL"
+ent 0x255C "boxUl"
+ent 0x255D "boxUL"
+ent 0x2514 "boxur"
+ent 0x2558 "boxuR"
+ent 0x2559 "boxUr"
+ent 0x255A "boxUR"
+ent 0x253C "boxvh"
+ent 0x256A "boxvH"
+ent 0x256B "boxVh"
+ent 0x256C "boxVH"
+ent 0x2524 "boxvl"
+ent 0x2561 "boxvL"
+ent 0x2562 "boxVl"
+ent 0x2563 "boxVL"
+ent 0x251C "boxvr"
+ent 0x255E "boxvR"
+ent 0x255F "boxVr"
+ent 0x2560 "boxVR"
+ent 0x2502 "boxv"
+ent 0x2551 "boxV"
+ent 0x2035 "bprime"
+ent 0x02D8 "breve"
+ent 0x02D8 "Breve"
+ent 0x00A6 "brvbar"
+ent 0x212C "Bscr"
+ent 0xD4B7 "bscr"
+ent 0x204F "bsemi"
+ent 0x22CD "bsime"
+ent 0x223D "bsim"
+ent 0x29C5 "bsolb"
+ent 0x27C8 "bsolhsub"
+ent 0x005C "bsol"
+ent 0x2022 "bullet"
+ent 0x2022 "bull"
+ent 0x224E "Bumpeq"
+ent 0x224F "bumpeq"
+ent 0x224F "bumpe"
+ent 0x2AAE "bumpE"
+ent 0x224E "bump"
+ent 0x0106 "Cacute"
+ent 0x0107 "cacute"
+ent 0x2A44 "capand"
+ent 0x2A49 "capbrcup"
+ent 0x2A4B "capcap"
+ent 0x2A47 "capcup"
+ent 0x2A40 "capdot"
+ent 0x2145 "CapitalDifferentialD"
+ent 0x2229FE00 "caps"
+ent 0x2229 "cap"
+ent 0x22D2 "Cap"
+ent 0x2041 "caret"
+ent 0x02C7 "caron"
+ent 0x212D "Cayleys"
+ent 0x2A4D "ccaps"
+ent 0x010C "Ccaron"
+ent 0x010D "ccaron"
+ent 0x00C7 "Ccedil"
+ent 0x00E7 "ccedil"
+ent 0x0108 "Ccirc"
+ent 0x0109 "ccirc"
+ent 0x2230 "Cconint"
+ent 0x2A50 "ccupssm"
+ent 0x2A4C "ccups"
+ent 0x010A "Cdot"
+ent 0x010B "cdot"
+ent 0x00B8 "Cedilla"
+ent 0x00B8 "cedil"
+ent 0x29B2 "cemptyv"
+ent 0x00B7 "centerdot"
+ent 0x00B7 "CenterDot"
+ent 0x00A2 "cent"
+ent 0x212D "Cfr"
+ent 0xD520 "cfr"
+ent 0x0427 "CHcy"
+ent 0x0447 "chcy"
+ent 0x2713 "checkmark"
+ent 0x2713 "check"
+ent 0x03A7 "Chi"
+ent 0x03C7 "chi"
+ent 0x2257 "circeq"
+ent 0x21BA "circlearrowleft"
+ent 0x21BB "circlearrowright"
+ent 0x229B "circledast"
+ent 0x229A "circledcirc"
+ent 0x229D "circleddash"
+ent 0x2299 "CircleDot"
+ent 0x00AE "circledR"
+ent 0x24C8 "circledS"
+ent 0x2296 "CircleMinus"
+ent 0x2295 "CirclePlus"
+ent 0x2297 "CircleTimes"
+ent 0x02C6 "circ"
+ent 0x2257 "cire"
+ent 0x29C3 "cirE"
+ent 0x2A10 "cirfnint"
+ent 0x2AEF "cirmid"
+ent 0x29C2 "cirscir"
+ent 0x25CB "cir"
+ent 0x2232 "ClockwiseContourIntegral"
+ent 0x201D "CloseCurlyDoubleQuote"
+ent 0x2019 "CloseCurlyQuote"
+ent 0x2663 "clubs"
+ent 0x2663 "clubsuit"
+ent 0x2254 "coloneq"
+ent 0x2254 "colone"
+ent 0x2A74 "Colone"
+ent 0x003A "colon"
+ent 0x2237 "Colon"
+ent 0x0040 "commat"
+ent 0x002C "comma"
+ent 0x2218 "compfn"
+ent 0x2201 "complement"
+ent 0x2102 "complexes"
+ent 0x2201 "comp"
+ent 0x2A6D "congdot"
+ent 0x2261 "Congruent"
+ent 0x2245 "cong"
+ent 0x222E "conint"
+ent 0x222F "Conint"
+ent 0x222E "ContourIntegral"
+ent 0x2102 "Copf"
+ent 0xD554 "copf"
+ent 0x2210 "coprod"
+ent 0x2210 "Coproduct"
+ent 0x2117 "copysr"
+ent 0x00A9 "copy"
+ent 0x00A9 "COPY"
+ent 0x2233 "CounterClockwiseContourIntegral"
+ent 0x21B5 "crarr"
+ent 0x2717 "cross"
+ent 0x2A2F "Cross"
+ent 0xD49E "Cscr"
+ent 0xD4B8 "cscr"
+ent 0x2AD1 "csube"
+ent 0x2ACF "csub"
+ent 0x2AD2 "csupe"
+ent 0x2AD0 "csup"
+ent 0x22EF "ctdot"
+ent 0x2938 "cudarrl"
+ent 0x2935 "cudarrr"
+ent 0x22DE "cuepr"
+ent 0x22DF "cuesc"
+ent 0x293D "cularrp"
+ent 0x21B6 "cularr"
+ent 0x2A48 "cupbrcap"
+ent 0x224D "CupCap"
+ent 0x2A46 "cupcap"
+ent 0x2A4A "cupcup"
+ent 0x228D "cupdot"
+ent 0x2A45 "cupor"
+ent 0x222AFE00 "cups"
+ent 0x222A "cup"
+ent 0x22D3 "Cup"
+ent 0x293C "curarrm"
+ent 0x21B7 "curarr"
+ent 0x22DE "curlyeqprec"
+ent 0x22DF "curlyeqsucc"
+ent 0x22CE "curlyvee"
+ent 0x22CF "curlywedge"
+ent 0x00A4 "curren"
+ent 0x21B6 "curvearrowleft"
+ent 0x21B7 "curvearrowright"
+ent 0x22CE "cuvee"
+ent 0x22CF "cuwed"
+ent 0x2232 "cwconint"
+ent 0x2231 "cwint"
+ent 0x232D "cylcty"
+ent 0x2020 "dagger"
+ent 0x2021 "Dagger"
+ent 0x2138 "daleth"
+ent 0x2193 "darr"
+ent 0x21A1 "Darr"
+ent 0x21D3 "dArr"
+ent 0x2010 "dash"
+ent 0x22A3 "dashv"
+ent 0x2AE4 "Dashv"
+ent 0x290F "dbkarow"
+ent 0x02DD "dblac"
+ent 0x010E "Dcaron"
+ent 0x010F "dcaron"
+ent 0x0414 "Dcy"
+ent 0x0434 "dcy"
+ent 0x2021 "ddagger"
+ent 0x21CA "ddarr"
+ent 0x2911 "DDotrahd"
+ent 0x2A77 "ddotseq"
+ent 0x2145 "DD"
+ent 0x2146 "dd"
+ent 0x00B0 "deg"
+ent 0x0394 "Delta"
+ent 0x03B4 "delta"
+ent 0x2207 "Del"
+ent 0x29B1 "demptyv"
+ent 0x297F "dfisht"
+ent 0xD507 "Dfr"
+ent 0xD521 "dfr"
+ent 0x21C3 "dharl"
+ent 0x21C2 "dharr"
+ent 0x2965 "dHar"
+ent 0x00B4 "DiacriticalAcute"
+ent 0x02D9 "DiacriticalDot"
+ent 0x02DD "DiacriticalDoubleAcute"
+ent 0x0060 "DiacriticalGrave"
+ent 0x02DC "DiacriticalTilde"
+ent 0x2666 "diamondsuit"
+ent 0x22C4 "diamond"
+ent 0x22C4 "Diamond"
+ent 0x2666 "diams"
+ent 0x22C4 "diam"
+ent 0x00A8 "die"
+ent 0x2146 "DifferentialD"
+ent 0x03DD "digamma"
+ent 0x22F2 "disin"
+ent 0x22C7 "divideontimes"
+ent 0x00F7 "divide"
+ent 0x22C7 "divonx"
+ent 0x00F7 "div"
+ent 0x0402 "DJcy"
+ent 0x0452 "djcy"
+ent 0x231E "dlcorn"
+ent 0x230D "dlcrop"
+ent 0x0024 "dollar"
+ent 0xD53B "Dopf"
+ent 0xD555 "dopf"
+ent 0x20DC "DotDot"
+ent 0x2251 "doteqdot"
+ent 0x2250 "doteq"
+ent 0x2250 "DotEqual"
+ent 0x2238 "dotminus"
+ent 0x2214 "dotplus"
+ent 0x22A1 "dotsquare"
+ent 0x00A8 "Dot"
+ent 0x02D9 "dot"
+ent 0x2306 "doublebarwedge"
+ent 0x222F "DoubleContourIntegral"
+ent 0x00A8 "DoubleDot"
+ent 0x21D3 "DoubleDownArrow"
+ent 0x21D0 "DoubleLeftArrow"
+ent 0x21D4 "DoubleLeftRightArrow"
+ent 0x2AE4 "DoubleLeftTee"
+ent 0x27F8 "DoubleLongLeftArrow"
+ent 0x27FA "DoubleLongLeftRightArrow"
+ent 0x27F9 "DoubleLongRightArrow"
+ent 0x21D2 "DoubleRightArrow"
+ent 0x22A8 "DoubleRightTee"
+ent 0x21D1 "DoubleUpArrow"
+ent 0x21D5 "DoubleUpDownArrow"
+ent 0x2225 "DoubleVerticalBar"
+ent 0x2913 "DownArrowBar"
+ent 0x2193 "downarrow"
+ent 0x2193 "DownArrow"
+ent 0x21D3 "Downarrow"
+ent 0x21F5 "DownArrowUpArrow"
+ent 0x0311 "DownBreve"
+ent 0x21CA "downdownarrows"
+ent 0x21C3 "downharpoonleft"
+ent 0x21C2 "downharpoonright"
+ent 0x2950 "DownLeftRightVector"
+ent 0x295E "DownLeftTeeVector"
+ent 0x2956 "DownLeftVectorBar"
+ent 0x21BD "DownLeftVector"
+ent 0x295F "DownRightTeeVector"
+ent 0x2957 "DownRightVectorBar"
+ent 0x21C1 "DownRightVector"
+ent 0x21A7 "DownTeeArrow"
+ent 0x22A4 "DownTee"
+ent 0x2910 "drbkarow"
+ent 0x231F "drcorn"
+ent 0x230C "drcrop"
+ent 0xD49F "Dscr"
+ent 0xD4B9 "dscr"
+ent 0x0405 "DScy"
+ent 0x0455 "dscy"
+ent 0x29F6 "dsol"
+ent 0x0110 "Dstrok"
+ent 0x0111 "dstrok"
+ent 0x22F1 "dtdot"
+ent 0x25BE "dtrif"
+ent 0x25BF "dtri"
+ent 0x21F5 "duarr"
+ent 0x296F "duhar"
+ent 0x29A6 "dwangle"
+ent 0x040F "DZcy"
+ent 0x045F "dzcy"
+ent 0x27FF "dzigrarr"
+ent 0x00C9 "Eacute"
+ent 0x00E9 "eacute"
+ent 0x2A6E "easter"
+ent 0x011A "Ecaron"
+ent 0x011B "ecaron"
+ent 0x00CA "Ecirc"
+ent 0x00EA "ecirc"
+ent 0x2256 "ecir"
+ent 0x2255 "ecolon"
+ent 0x042D "Ecy"
+ent 0x044D "ecy"
+ent 0x2A77 "eDDot"
+ent 0x0116 "Edot"
+ent 0x0117 "edot"
+ent 0x2251 "eDot"
+ent 0x2147 "ee"
+ent 0x2252 "efDot"
+ent 0xD508 "Efr"
+ent 0xD522 "efr"
+ent 0x00C8 "Egrave"
+ent 0x00E8 "egrave"
+ent 0x2A98 "egsdot"
+ent 0x2A96 "egs"
+ent 0x2A9A "eg"
+ent 0x2208 "Element"
+ent 0x23E7 "elinters"
+ent 0x2113 "ell"
+ent 0x2A97 "elsdot"
+ent 0x2A95 "els"
+ent 0x2A99 "el"
+ent 0x0112 "Emacr"
+ent 0x0113 "emacr"
+ent 0x2205 "emptyset"
+ent 0x25FB "EmptySmallSquare"
+ent 0x2205 "empty"
+ent 0x25AB "EmptyVerySmallSquare"
+ent 0x2205 "emptyv"
+ent 0x2004 "emsp13"
+ent 0x2005 "emsp14"
+ent 0x2003 "emsp"
+ent 0x014A "ENG"
+ent 0x014B "eng"
+ent 0x2002 "ensp"
+ent 0x0118 "Eogon"
+ent 0x0119 "eogon"
+ent 0xD53C "Eopf"
+ent 0xD556 "eopf"
+ent 0x29E3 "eparsl"
+ent 0x22D5 "epar"
+ent 0x2A71 "eplus"
+ent 0x0395 "Epsilon"
+ent 0x03B5 "epsilon"
+ent 0x03B5 "epsi"
+ent 0x03F5 "epsiv"
+ent 0x2256 "eqcirc"
+ent 0x2255 "eqcolon"
+ent 0x2242 "eqsim"
+ent 0x2A96 "eqslantgtr"
+ent 0x2A95 "eqslantless"
+ent 0x003D "equals"
+ent 0x2242 "EqualTilde"
+ent 0x2A75 "Equal"
+ent 0x225F "equest"
+ent 0x21CC "Equilibrium"
+ent 0x2A78 "equivDD"
+ent 0x2261 "equiv"
+ent 0x29E5 "eqvparsl"
+ent 0x2971 "erarr"
+ent 0x2253 "erDot"
+ent 0x212F "escr"
+ent 0x2130 "Escr"
+ent 0x2250 "esdot"
+ent 0x2242 "esim"
+ent 0x2A73 "Esim"
+ent 0x0397 "Eta"
+ent 0x03B7 "eta"
+ent 0x00D0 "ETH"
+ent 0x00F0 "eth"
+ent 0x00CB "Euml"
+ent 0x00EB "euml"
+ent 0x20AC "euro"
+ent 0x0021 "excl"
+ent 0x2203 "Exists"
+ent 0x2203 "exist"
+ent 0x2130 "expectation"
+ent 0x2147 "exponentiale"
+ent 0x2147 "ExponentialE"
+ent 0x2252 "fallingdotseq"
+ent 0x0424 "Fcy"
+ent 0x0444 "fcy"
+ent 0x2640 "female"
+ent 0xFB03 "ffilig"
+ent 0xFB00 "fflig"
+ent 0xFB04 "ffllig"
+ent 0xD509 "Ffr"
+ent 0xD523 "ffr"
+ent 0xFB01 "filig"
+ent 0x25FC "FilledSmallSquare"
+ent 0x25AA "FilledVerySmallSquare"
+ent 0x0066006A "fjlig"
+ent 0x266D "flat"
+ent 0xFB02 "fllig"
+ent 0x25B1 "fltns"
+ent 0x0192 "fnof"
+ent 0xD53D "Fopf"
+ent 0xD557 "fopf"
+ent 0x2200 "forall"
+ent 0x2200 "ForAll"
+ent 0x22D4 "fork"
+ent 0x2AD9 "forkv"
+ent 0x2131 "Fouriertrf"
+ent 0x2A0D "fpartint"
+ent 0x00BD "frac12"
+ent 0x2153 "frac13"
+ent 0x00BC "frac14"
+ent 0x2155 "frac15"
+ent 0x2159 "frac16"
+ent 0x215B "frac18"
+ent 0x2154 "frac23"
+ent 0x2156 "frac25"
+ent 0x00BE "frac34"
+ent 0x2157 "frac35"
+ent 0x215C "frac38"
+ent 0x2158 "frac45"
+ent 0x215A "frac56"
+ent 0x215D "frac58"
+ent 0x215E "frac78"
+ent 0x2044 "frasl"
+ent 0x2322 "frown"
+ent 0x2131 "Fscr"
+ent 0xD4BB "fscr"
+ent 0x01F5 "gacute"
+ent 0x03DC "Gammad"
+ent 0x03DD "gammad"
+ent 0x0393 "Gamma"
+ent 0x03B3 "gamma"
+ent 0x2A86 "gap"
+ent 0x011E "Gbreve"
+ent 0x011F "gbreve"
+ent 0x0122 "Gcedil"
+ent 0x011C "Gcirc"
+ent 0x011D "gcirc"
+ent 0x0413 "Gcy"
+ent 0x0433 "gcy"
+ent 0x0120 "Gdot"
+ent 0x0121 "gdot"
+ent 0x22DB "gel"
+ent 0x2A8C "gEl"
+ent 0x2267 "geqq"
+ent 0x2A7E "geqslant"
+ent 0x2265 "geq"
+ent 0x2AA9 "gescc"
+ent 0x2A84 "gesdotol"
+ent 0x2A82 "gesdoto"
+ent 0x2A80 "gesdot"
+ent 0x2A94 "gesles"
+ent 0x22DBFE00 "gesl"
+ent 0x2A7E "ges"
+ent 0x2265 "ge"
+ent 0x2267 "gE"
+ent 0xD50A "Gfr"
+ent 0xD524 "gfr"
+ent 0x22D9 "ggg"
+ent 0x226B "gg"
+ent 0x22D9 "Gg"
+ent 0x2137 "gimel"
+ent 0x0403 "GJcy"
+ent 0x0453 "gjcy"
+ent 0x2AA5 "gla"
+ent 0x2A92 "glE"
+ent 0x2AA4 "glj"
+ent 0x2277 "gl"
+ent 0x2A8A "gnapprox"
+ent 0x2A8A "gnap"
+ent 0x2269 "gneqq"
+ent 0x2A88 "gneq"
+ent 0x2269 "gnE"
+ent 0x2A88 "gne"
+ent 0x22E7 "gnsim"
+ent 0xD53E "Gopf"
+ent 0xD558 "gopf"
+ent 0x0060 "grave"
+ent 0x22DB "GreaterEqualLess"
+ent 0x2265 "GreaterEqual"
+ent 0x2267 "GreaterFullEqual"
+ent 0x2AA2 "GreaterGreater"
+ent 0x2277 "GreaterLess"
+ent 0x2A7E "GreaterSlantEqual"
+ent 0x2273 "GreaterTilde"
+ent 0x210A "gscr"
+ent 0xD4A2 "Gscr"
+ent 0x2A8E "gsime"
+ent 0x2A90 "gsiml"
+ent 0x2273 "gsim"
+ent 0x2AA7 "gtcc"
+ent 0x2A7A "gtcir"
+ent 0x22D7 "gtdot"
+ent 0x2995 "gtlPar"
+ent 0x2A7C "gtquest"
+ent 0x2A86 "gtrapprox"
+ent 0x2978 "gtrarr"
+ent 0x22D7 "gtrdot"
+ent 0x22DB "gtreqless"
+ent 0x2A8C "gtreqqless"
+ent 0x2277 "gtrless"
+ent 0x2273 "gtrsim"
+ent 0x003E "gt"
+ent 0x003E "GT"
+ent 0x226B "Gt"
+ent 0x2269FE00 "gvertneqq"
+ent 0x2269FE00 "gvnE"
+ent 0x02C7 "Hacek"
+ent 0x200A "hairsp"
+ent 0x00BD "half"
+ent 0x210B "hamilt"
+ent 0x042A "HARDcy"
+ent 0x044A "hardcy"
+ent 0x2948 "harrcir"
+ent 0x2194 "harr"
+ent 0x21D4 "hArr"
+ent 0x21AD "harrw"
+ent 0x005E "Hat"
+ent 0x210F "hbar"
+ent 0x0124 "Hcirc"
+ent 0x0125 "hcirc"
+ent 0x2665 "hearts"
+ent 0x2665 "heartsuit"
+ent 0x2026 "hellip"
+ent 0x22B9 "hercon"
+ent 0x210C "Hfr"
+ent 0xD525 "hfr"
+ent 0x210B "HilbertSpace"
+ent 0x2925 "hksearow"
+ent 0x2926 "hkswarow"
+ent 0x21FF "hoarr"
+ent 0x223B "homtht"
+ent 0x21A9 "hookleftarrow"
+ent 0x21AA "hookrightarrow"
+ent 0x210D "Hopf"
+ent 0xD559 "hopf"
+ent 0x2015 "horbar"
+ent 0x2500 "HorizontalLine"
+ent 0x210B "Hscr"
+ent 0xD4BD "hscr"
+ent 0x210F "hslash"
+ent 0x0126 "Hstrok"
+ent 0x0127 "hstrok"
+ent 0x224E "HumpDownHump"
+ent 0x224F "HumpEqual"
+ent 0x2043 "hybull"
+ent 0x2010 "hyphen"
+ent 0x00CD "Iacute"
+ent 0x00ED "iacute"
+ent 0x00CE "Icirc"
+ent 0x00EE "icirc"
+ent 0x2063 "ic"
+ent 0x0418 "Icy"
+ent 0x0438 "icy"
+ent 0x0130 "Idot"
+ent 0x0415 "IEcy"
+ent 0x0435 "iecy"
+ent 0x00A1 "iexcl"
+ent 0x21D4 "iff"
+ent 0x2111 "Ifr"
+ent 0xD526 "ifr"
+ent 0x00CC "Igrave"
+ent 0x00EC "igrave"
+ent 0x2A0C "iiiint"
+ent 0x222D "iiint"
+ent 0x29DC "iinfin"
+ent 0x2129 "iiota"
+ent 0x2148 "ii"
+ent 0x0132 "IJlig"
+ent 0x0133 "ijlig"
+ent 0x012A "Imacr"
+ent 0x012B "imacr"
+ent 0x2111 "image"
+ent 0x2148 "ImaginaryI"
+ent 0x2110 "imagline"
+ent 0x2111 "imagpart"
+ent 0x0131 "imath"
+ent 0x22B7 "imof"
+ent 0x01B5 "imped"
+ent 0x21D2 "Implies"
+ent 0x2111 "Im"
+ent 0x2105 "incare"
+ent 0x29DD "infintie"
+ent 0x221E "infin"
+ent 0x0131 "inodot"
+ent 0x22BA "intcal"
+ent 0x2124 "integers"
+ent 0x222B "Integral"
+ent 0x22BA "intercal"
+ent 0x22C2 "Intersection"
+ent 0x2A17 "intlarhk"
+ent 0x2A3C "intprod"
+ent 0x222B "int"
+ent 0x222C "Int"
+ent 0x2208 "in"
+ent 0x2063 "InvisibleComma"
+ent 0x2062 "InvisibleTimes"
+ent 0x0401 "IOcy"
+ent 0x0451 "iocy"
+ent 0x012E "Iogon"
+ent 0x012F "iogon"
+ent 0xD540 "Iopf"
+ent 0xD55A "iopf"
+ent 0x0399 "Iota"
+ent 0x03B9 "iota"
+ent 0x2A3C "iprod"
+ent 0x00BF "iquest"
+ent 0x2110 "Iscr"
+ent 0xD4BE "iscr"
+ent 0x22F5 "isindot"
+ent 0x22F9 "isinE"
+ent 0x22F4 "isins"
+ent 0x22F3 "isinsv"
+ent 0x2208 "isin"
+ent 0x2208 "isinv"
+ent 0x0128 "Itilde"
+ent 0x0129 "itilde"
+ent 0x2062 "it"
+ent 0x0406 "Iukcy"
+ent 0x0456 "iukcy"
+ent 0x00CF "Iuml"
+ent 0x00EF "iuml"
+ent 0x0134 "Jcirc"
+ent 0x0135 "jcirc"
+ent 0x0419 "Jcy"
+ent 0x0439 "jcy"
+ent 0xD50D "Jfr"
+ent 0xD527 "jfr"
+ent 0x0237 "jmath"
+ent 0xD541 "Jopf"
+ent 0xD55B "jopf"
+ent 0xD4A5 "Jscr"
+ent 0xD4BF "jscr"
+ent 0x0408 "Jsercy"
+ent 0x0458 "jsercy"
+ent 0x0404 "Jukcy"
+ent 0x0454 "jukcy"
+ent 0x039A "Kappa"
+ent 0x03BA "kappa"
+ent 0x03F0 "kappav"
+ent 0x0136 "Kcedil"
+ent 0x0137 "kcedil"
+ent 0x041A "Kcy"
+ent 0x043A "kcy"
+ent 0xD50E "Kfr"
+ent 0xD528 "kfr"
+ent 0x0138 "kgreen"
+ent 0x0425 "KHcy"
+ent 0x0445 "khcy"
+ent 0x040C "KJcy"
+ent 0x045C "kjcy"
+ent 0xD542 "Kopf"
+ent 0xD55C "kopf"
+ent 0xD4A6 "Kscr"
+ent 0xD4C0 "kscr"
+ent 0x21DA "lAarr"
+ent 0x0139 "Lacute"
+ent 0x013A "lacute"
+ent 0x29B4 "laemptyv"
+ent 0x2112 "lagran"
+ent 0x039B "Lambda"
+ent 0x03BB "lambda"
+ent 0x2991 "langd"
+ent 0x27E8 "langle"
+ent 0x27E8 "lang"
+ent 0x27EA "Lang"
+ent 0x2112 "Laplacetrf"
+ent 0x2A85 "lap"
+ent 0x00AB "laquo"
+ent 0x291F "larrbfs"
+ent 0x21E4 "larrb"
+ent 0x291D "larrfs"
+ent 0x21A9 "larrhk"
+ent 0x21AB "larrlp"
+ent 0x2939 "larrpl"
+ent 0x2973 "larrsim"
+ent 0x21A2 "larrtl"
+ent 0x2190 "larr"
+ent 0x219E "Larr"
+ent 0x21D0 "lArr"
+ent 0x2919 "latail"
+ent 0x291B "lAtail"
+ent 0x2AADFE00 "lates"
+ent 0x2AAD "late"
+ent 0x2AAB "lat"
+ent 0x290C "lbarr"
+ent 0x290E "lBarr"
+ent 0x2772 "lbbrk"
+ent 0x007B "lbrace"
+ent 0x005B "lbrack"
+ent 0x298B "lbrke"
+ent 0x298F "lbrksld"
+ent 0x298D "lbrkslu"
+ent 0x013D "Lcaron"
+ent 0x013E "lcaron"
+ent 0x013B "Lcedil"
+ent 0x013C "lcedil"
+ent 0x2308 "lceil"
+ent 0x007B "lcub"
+ent 0x041B "Lcy"
+ent 0x043B "lcy"
+ent 0x2936 "ldca"
+ent 0x201E "ldquor"
+ent 0x201C "ldquo"
+ent 0x2967 "ldrdhar"
+ent 0x294B "ldrushar"
+ent 0x21B2 "ldsh"
+ent 0x27E8 "LeftAngleBracket"
+ent 0x21E4 "LeftArrowBar"
+ent 0x21C6 "LeftArrowRightArrow"
+ent 0x21A2 "leftarrowtail"
+ent 0x2190 "leftarrow"
+ent 0x2190 "LeftArrow"
+ent 0x21D0 "Leftarrow"
+ent 0x2308 "LeftCeiling"
+ent 0x27E6 "LeftDoubleBracket"
+ent 0x2961 "LeftDownTeeVector"
+ent 0x2959 "LeftDownVectorBar"
+ent 0x21C3 "LeftDownVector"
+ent 0x230A "LeftFloor"
+ent 0x21BD "leftharpoondown"
+ent 0x21BC "leftharpoonup"
+ent 0x21C7 "leftleftarrows"
+ent 0x21C6 "leftrightarrows"
+ent 0x2194 "leftrightarrow"
+ent 0x2194 "LeftRightArrow"
+ent 0x21D4 "Leftrightarrow"
+ent 0x21CB "leftrightharpoons"
+ent 0x21AD "leftrightsquigarrow"
+ent 0x294E "LeftRightVector"
+ent 0x21A4 "LeftTeeArrow"
+ent 0x22A3 "LeftTee"
+ent 0x295A "LeftTeeVector"
+ent 0x22CB "leftthreetimes"
+ent 0x29CF "LeftTriangleBar"
+ent 0x22B4 "LeftTriangleEqual"
+ent 0x22B2 "LeftTriangle"
+ent 0x2951 "LeftUpDownVector"
+ent 0x2960 "LeftUpTeeVector"
+ent 0x2958 "LeftUpVectorBar"
+ent 0x21BF "LeftUpVector"
+ent 0x2952 "LeftVectorBar"
+ent 0x21BC "LeftVector"
+ent 0x22DA "leg"
+ent 0x2A8B "lEg"
+ent 0x2266 "leqq"
+ent 0x2A7D "leqslant"
+ent 0x2264 "leq"
+ent 0x2AA8 "lescc"
+ent 0x2A83 "lesdotor"
+ent 0x2A81 "lesdoto"
+ent 0x2A7F "lesdot"
+ent 0x2A93 "lesges"
+ent 0x22DAFE00 "lesg"
+ent 0x2A85 "lessapprox"
+ent 0x22D6 "lessdot"
+ent 0x22DA "lesseqgtr"
+ent 0x2A8B "lesseqqgtr"
+ent 0x22DA "LessEqualGreater"
+ent 0x2266 "LessFullEqual"
+ent 0x2276 "LessGreater"
+ent 0x2276 "lessgtr"
+ent 0x2AA1 "LessLess"
+ent 0x2272 "lesssim"
+ent 0x2A7D "LessSlantEqual"
+ent 0x2272 "LessTilde"
+ent 0x2A7D "les"
+ent 0x2264 "le"
+ent 0x2266 "lE"
+ent 0x297C "lfisht"
+ent 0x230A "lfloor"
+ent 0xD50F "Lfr"
+ent 0xD529 "lfr"
+ent 0x2A91 "lgE"
+ent 0x2276 "lg"
+ent 0x21BD "lhard"
+ent 0x2962 "lHar"
+ent 0x296A "lharul"
+ent 0x21BC "lharu"
+ent 0x2584 "lhblk"
+ent 0x0409 "LJcy"
+ent 0x0459 "ljcy"
+ent 0x21C7 "llarr"
+ent 0x231E "llcorner"
+ent 0x21DA "Lleftarrow"
+ent 0x296B "llhard"
+ent 0x25FA "lltri"
+ent 0x226A "ll"
+ent 0x22D8 "Ll"
+ent 0x013F "Lmidot"
+ent 0x0140 "lmidot"
+ent 0x23B0 "lmoustache"
+ent 0x23B0 "lmoust"
+ent 0x2A89 "lnapprox"
+ent 0x2A89 "lnap"
+ent 0x2268 "lneqq"
+ent 0x2A87 "lneq"
+ent 0x2268 "lnE"
+ent 0x2A87 "lne"
+ent 0x22E6 "lnsim"
+ent 0x27EC "loang"
+ent 0x21FD "loarr"
+ent 0x27E6 "lobrk"
+ent 0x27F5 "longleftarrow"
+ent 0x27F5 "LongLeftArrow"
+ent 0x27F8 "Longleftarrow"
+ent 0x27F7 "longleftrightarrow"
+ent 0x27F7 "LongLeftRightArrow"
+ent 0x27FA "Longleftrightarrow"
+ent 0x27FC "longmapsto"
+ent 0x27F6 "longrightarrow"
+ent 0x27F6 "LongRightArrow"
+ent 0x27F9 "Longrightarrow"
+ent 0x21AB "looparrowleft"
+ent 0x21AC "looparrowright"
+ent 0x2985 "lopar"
+ent 0xD543 "Lopf"
+ent 0xD55D "lopf"
+ent 0x2A2D "loplus"
+ent 0x2A34 "lotimes"
+ent 0x2217 "lowast"
+ent 0x005F "lowbar"
+ent 0x2199 "LowerLeftArrow"
+ent 0x2198 "LowerRightArrow"
+ent 0x25CA "lozenge"
+ent 0x29EB "lozf"
+ent 0x25CA "loz"
+ent 0x2993 "lparlt"
+ent 0x0028 "lpar"
+ent 0x21C6 "lrarr"
+ent 0x231F "lrcorner"
+ent 0x296D "lrhard"
+ent 0x21CB "lrhar"
+ent 0x200E "lrm"
+ent 0x22BF "lrtri"
+ent 0x2039 "lsaquo"
+ent 0x2112 "Lscr"
+ent 0xD4C1 "lscr"
+ent 0x21B0 "lsh"
+ent 0x21B0 "Lsh"
+ent 0x2A8D "lsime"
+ent 0x2A8F "lsimg"
+ent 0x2272 "lsim"
+ent 0x005B "lsqb"
+ent 0x201A "lsquor"
+ent 0x2018 "lsquo"
+ent 0x0141 "Lstrok"
+ent 0x0142 "lstrok"
+ent 0x2AA6 "ltcc"
+ent 0x2A79 "ltcir"
+ent 0x22D6 "ltdot"
+ent 0x22CB "lthree"
+ent 0x22C9 "ltimes"
+ent 0x2976 "ltlarr"
+ent 0x2A7B "ltquest"
+ent 0x22B4 "ltrie"
+ent 0x25C2 "ltrif"
+ent 0x25C3 "ltri"
+ent 0x2996 "ltrPar"
+ent 0x003C "lt"
+ent 0x003C "LT"
+ent 0x226A "Lt"
+ent 0x294A "lurdshar"
+ent 0x2966 "luruhar"
+ent 0x2268FE00 "lvertneqq"
+ent 0x2268FE00 "lvnE"
+ent 0x00AF "macr"
+ent 0x2642 "male"
+ent 0x2720 "maltese"
+ent 0x2720 "malt"
+ent 0x21A7 "mapstodown"
+ent 0x21A4 "mapstoleft"
+ent 0x21A6 "mapsto"
+ent 0x21A5 "mapstoup"
+ent 0x21A6 "map"
+ent 0x2905 "Map"
+ent 0x25AE "marker"
+ent 0x2A29 "mcomma"
+ent 0x041C "Mcy"
+ent 0x043C "mcy"
+ent 0x2014 "mdash"
+ent 0x223A "mDDot"
+ent 0x2221 "measuredangle"
+ent 0x205F "MediumSpace"
+ent 0x2133 "Mellintrf"
+ent 0xD510 "Mfr"
+ent 0xD52A "mfr"
+ent 0x2127 "mho"
+ent 0x00B5 "micro"
+ent 0x002A "midast"
+ent 0x2AF0 "midcir"
+ent 0x00B7 "middot"
+ent 0x2223 "mid"
+ent 0x229F "minusb"
+ent 0x2238 "minusd"
+ent 0x2A2A "minusdu"
+ent 0x2213 "MinusPlus"
+ent 0x2212 "minus"
+ent 0x2ADB "mlcp"
+ent 0x2026 "mldr"
+ent 0x2213 "mnplus"
+ent 0x22A7 "models"
+ent 0xD544 "Mopf"
+ent 0xD55E "mopf"
+ent 0x2213 "mp"
+ent 0x2133 "Mscr"
+ent 0xD4C2 "mscr"
+ent 0x223E "mstpos"
+ent 0x22B8 "multimap"
+ent 0x22B8 "mumap"
+ent 0x039C "Mu"
+ent 0x03BC "mu"
+ent 0x2207 "nabla"
+ent 0x0143 "Nacute"
+ent 0x0144 "nacute"
+ent 0x222020D2 "nang"
+ent 0x2A700338 "napE"
+ent 0x224B0338 "napid"
+ent 0x0149 "napos"
+ent 0x2249 "napprox"
+ent 0x2249 "nap"
+ent 0x2115 "naturals"
+ent 0x266E "natural"
+ent 0x266E "natur"
+ent 0x00A0 "nbsp"
+ent 0x224F0338 "nbumpe"
+ent 0x224E0338 "nbump"
+ent 0x2A43 "ncap"
+ent 0x0147 "Ncaron"
+ent 0x0148 "ncaron"
+ent 0x0145 "Ncedil"
+ent 0x0146 "ncedil"
+ent 0x2A6D0338 "ncongdot"
+ent 0x2247 "ncong"
+ent 0x2A42 "ncup"
+ent 0x041D "Ncy"
+ent 0x043D "ncy"
+ent 0x2013 "ndash"
+ent 0x2924 "nearhk"
+ent 0x2197 "nearrow"
+ent 0x2197 "nearr"
+ent 0x21D7 "neArr"
+ent 0x22500338 "nedot"
+ent 0x200B "NegativeMediumSpace"
+ent 0x200B "NegativeThickSpace"
+ent 0x200B "NegativeThinSpace"
+ent 0x200B "NegativeVeryThinSpace"
+ent 0x2262 "nequiv"
+ent 0x2928 "nesear"
+ent 0x22420338 "nesim"
+ent 0x226B "NestedGreaterGreater"
+ent 0x226A "NestedLessLess"
+ent 0x2260 "ne"
+ent 0x000A "NewLine"
+ent 0x2204 "nexists"
+ent 0x2204 "nexist"
+ent 0xD511 "Nfr"
+ent 0xD52B "nfr"
+ent 0x22670338 "ngeqq"
+ent 0x2A7E0338 "ngeqslant"
+ent 0x2271 "ngeq"
+ent 0x2A7E0338 "nges"
+ent 0x22670338 "ngE"
+ent 0x2271 "nge"
+ent 0x22D90338 "nGg"
+ent 0x2275 "ngsim"
+ent 0x226F "ngtr"
+ent 0x226B20D2 "nGt"
+ent 0x226F "ngt"
+ent 0x226B0338 "nGtv"
+ent 0x21AE "nharr"
+ent 0x21CE "nhArr"
+ent 0x2AF2 "nhpar"
+ent 0x22FA "nisd"
+ent 0x22FC "nis"
+ent 0x220B "ni"
+ent 0x220B "niv"
+ent 0x040A "NJcy"
+ent 0x045A "njcy"
+ent 0x219A "nlarr"
+ent 0x21CD "nlArr"
+ent 0x2025 "nldr"
+ent 0x219A "nleftarrow"
+ent 0x21CD "nLeftarrow"
+ent 0x21AE "nleftrightarrow"
+ent 0x21CE "nLeftrightarrow"
+ent 0x22660338 "nleqq"
+ent 0x2A7D0338 "nleqslant"
+ent 0x2270 "nleq"
+ent 0x226E "nless"
+ent 0x2A7D0338 "nles"
+ent 0x22660338 "nlE"
+ent 0x2270 "nle"
+ent 0x22D80338 "nLl"
+ent 0x2274 "nlsim"
+ent 0x22EC "nltrie"
+ent 0x22EA "nltri"
+ent 0x226A20D2 "nLt"
+ent 0x226E "nlt"
+ent 0x226A0338 "nLtv"
+ent 0x2224 "nmid"
+ent 0x2060 "NoBreak"
+ent 0x00A0 "NonBreakingSpace"
+ent 0x2115 "Nopf"
+ent 0xD55F "nopf"
+ent 0x2262 "NotCongruent"
+ent 0x226D "NotCupCap"
+ent 0x2226 "NotDoubleVerticalBar"
+ent 0x2209 "NotElement"
+ent 0x22420338 "NotEqualTilde"
+ent 0x2260 "NotEqual"
+ent 0x2204 "NotExists"
+ent 0x2271 "NotGreaterEqual"
+ent 0x22670338 "NotGreaterFullEqual"
+ent 0x226B0338 "NotGreaterGreater"
+ent 0x2279 "NotGreaterLess"
+ent 0x2A7E0338 "NotGreaterSlantEqual"
+ent 0x2275 "NotGreaterTilde"
+ent 0x226F "NotGreater"
+ent 0x224E0338 "NotHumpDownHump"
+ent 0x224F0338 "NotHumpEqual"
+ent 0x22F50338 "notindot"
+ent 0x22F90338 "notinE"
+ent 0x2209 "notin"
+ent 0x2209 "notinva"
+ent 0x22F7 "notinvb"
+ent 0x22F6 "notinvc"
+ent 0x29CF0338 "NotLeftTriangleBar"
+ent 0x22EC "NotLeftTriangleEqual"
+ent 0x22EA "NotLeftTriangle"
+ent 0x2270 "NotLessEqual"
+ent 0x2278 "NotLessGreater"
+ent 0x226A0338 "NotLessLess"
+ent 0x2A7D0338 "NotLessSlantEqual"
+ent 0x2274 "NotLessTilde"
+ent 0x226E "NotLess"
+ent 0x2AA20338 "NotNestedGreaterGreater"
+ent 0x2AA10338 "NotNestedLessLess"
+ent 0x220C "notni"
+ent 0x220C "notniva"
+ent 0x22FE "notnivb"
+ent 0x22FD "notnivc"
+ent 0x2AAF0338 "NotPrecedesEqual"
+ent 0x22E0 "NotPrecedesSlantEqual"
+ent 0x2280 "NotPrecedes"
+ent 0x220C "NotReverseElement"
+ent 0x29D00338 "NotRightTriangleBar"
+ent 0x22ED "NotRightTriangleEqual"
+ent 0x22EB "NotRightTriangle"
+ent 0x22E2 "NotSquareSubsetEqual"
+ent 0x228F0338 "NotSquareSubset"
+ent 0x22E3 "NotSquareSupersetEqual"
+ent 0x22900338 "NotSquareSuperset"
+ent 0x2288 "NotSubsetEqual"
+ent 0x228220D2 "NotSubset"
+ent 0x2AB00338 "NotSucceedsEqual"
+ent 0x22E1 "NotSucceedsSlantEqual"
+ent 0x227F0338 "NotSucceedsTilde"
+ent 0x2281 "NotSucceeds"
+ent 0x2289 "NotSupersetEqual"
+ent 0x228320D2 "NotSuperset"
+ent 0x2244 "NotTildeEqual"
+ent 0x2247 "NotTildeFullEqual"
+ent 0x2249 "NotTildeTilde"
+ent 0x2241 "NotTilde"
+ent 0x00AC "not"
+ent 0x2AEC "Not"
+ent 0x2224 "NotVerticalBar"
+ent 0x2226 "nparallel"
+ent 0x2AFD20E5 "nparsl"
+ent 0x22020338 "npart"
+ent 0x2226 "npar"
+ent 0x2A14 "npolint"
+ent 0x22E0 "nprcue"
+ent 0x2AAF0338 "npreceq"
+ent 0x2280 "nprec"
+ent 0x2AAF0338 "npre"
+ent 0x2280 "npr"
+ent 0x29330338 "nrarrc"
+ent 0x219B "nrarr"
+ent 0x21CF "nrArr"
+ent 0x219D0338 "nrarrw"
+ent 0x219B "nrightarrow"
+ent 0x21CF "nRightarrow"
+ent 0x22ED "nrtrie"
+ent 0x22EB "nrtri"
+ent 0x22E1 "nsccue"
+ent 0x2AB00338 "nsce"
+ent 0xD4A9 "Nscr"
+ent 0xD4C3 "nscr"
+ent 0x2281 "nsc"
+ent 0x2224 "nshortmid"
+ent 0x2226 "nshortparallel"
+ent 0x2244 "nsimeq"
+ent 0x2244 "nsime"
+ent 0x2241 "nsim"
+ent 0x2224 "nsmid"
+ent 0x2226 "nspar"
+ent 0x22E2 "nsqsube"
+ent 0x22E3 "nsqsupe"
+ent 0x2288 "nsube"
+ent 0x2AC50338 "nsubE"
+ent 0x2AC50338 "nsubseteqq"
+ent 0x2288 "nsubseteq"
+ent 0x228220D2 "nsubset"
+ent 0x2284 "nsub"
+ent 0x2AB00338 "nsucceq"
+ent 0x2281 "nsucc"
+ent 0x2289 "nsupe"
+ent 0x2AC60338 "nsupE"
+ent 0x2AC60338 "nsupseteqq"
+ent 0x2289 "nsupseteq"
+ent 0x228320D2 "nsupset"
+ent 0x2285 "nsup"
+ent 0x2279 "ntgl"
+ent 0x00D1 "Ntilde"
+ent 0x00F1 "ntilde"
+ent 0x2278 "ntlg"
+ent 0x22EC "ntrianglelefteq"
+ent 0x22EA "ntriangleleft"
+ent 0x22ED "ntrianglerighteq"
+ent 0x22EB "ntriangleright"
+ent 0x2116 "numero"
+ent 0x2007 "numsp"
+ent 0x0023 "num"
+ent 0x039D "Nu"
+ent 0x03BD "nu"
+ent 0x224D20D2 "nvap"
+ent 0x22AC "nvdash"
+ent 0x22AD "nvDash"
+ent 0x22AE "nVdash"
+ent 0x22AF "nVDash"
+ent 0x226520D2 "nvge"
+ent 0x003E20D2 "nvgt"
+ent 0x2904 "nvHarr"
+ent 0x29DE "nvinfin"
+ent 0x2902 "nvlArr"
+ent 0x226420D2 "nvle"
+ent 0x22B420D2 "nvltrie"
+ent 0x003C20D2 "nvlt"
+ent 0x2903 "nvrArr"
+ent 0x22B520D2 "nvrtrie"
+ent 0x223C20D2 "nvsim"
+ent 0x2923 "nwarhk"
+ent 0x2196 "nwarrow"
+ent 0x2196 "nwarr"
+ent 0x21D6 "nwArr"
+ent 0x2927 "nwnear"
+ent 0x00D3 "Oacute"
+ent 0x00F3 "oacute"
+ent 0x229B "oast"
+ent 0x00D4 "Ocirc"
+ent 0x00F4 "ocirc"
+ent 0x229A "ocir"
+ent 0x041E "Ocy"
+ent 0x043E "ocy"
+ent 0x229D "odash"
+ent 0x0150 "Odblac"
+ent 0x0151 "odblac"
+ent 0x2A38 "odiv"
+ent 0x2299 "odot"
+ent 0x29BC "odsold"
+ent 0x0152 "OElig"
+ent 0x0153 "oelig"
+ent 0x29BF "ofcir"
+ent 0xD512 "Ofr"
+ent 0xD52C "ofr"
+ent 0x02DB "ogon"
+ent 0x00D2 "Ograve"
+ent 0x00F2 "ograve"
+ent 0x29C1 "ogt"
+ent 0x29B5 "ohbar"
+ent 0x03A9 "ohm"
+ent 0x222E "oint"
+ent 0x21BA "olarr"
+ent 0x29BE "olcir"
+ent 0x29BB "olcross"
+ent 0x203E "oline"
+ent 0x29C0 "olt"
+ent 0x014C "Omacr"
+ent 0x014D "omacr"
+ent 0x03A9 "Omega"
+ent 0x03C9 "omega"
+ent 0x039F "Omicron"
+ent 0x03BF "omicron"
+ent 0x29B6 "omid"
+ent 0x2296 "ominus"
+ent 0xD546 "Oopf"
+ent 0xD560 "oopf"
+ent 0x29B7 "opar"
+ent 0x201C "OpenCurlyDoubleQuote"
+ent 0x2018 "OpenCurlyQuote"
+ent 0x29B9 "operp"
+ent 0x2295 "oplus"
+ent 0x21BB "orarr"
+ent 0x2134 "orderof"
+ent 0x2134 "order"
+ent 0x00AA "ordf"
+ent 0x00BA "ordm"
+ent 0x2A5D "ord"
+ent 0x22B6 "origof"
+ent 0x2A56 "oror"
+ent 0x2A57 "orslope"
+ent 0x2228 "or"
+ent 0x2A54 "Or"
+ent 0x2A5B "orv"
+ent 0x2134 "oscr"
+ent 0xD4AA "Oscr"
+ent 0x00D8 "Oslash"
+ent 0x00F8 "oslash"
+ent 0x2298 "osol"
+ent 0x24C8 "oS"
+ent 0x00D5 "Otilde"
+ent 0x00F5 "otilde"
+ent 0x2A36 "otimesas"
+ent 0x2297 "otimes"
+ent 0x2A37 "Otimes"
+ent 0x00D6 "Ouml"
+ent 0x00F6 "ouml"
+ent 0x233D "ovbar"
+ent 0x203E "OverBar"
+ent 0x23DE "OverBrace"
+ent 0x23B4 "OverBracket"
+ent 0x23DC "OverParenthesis"
+ent 0x2225 "parallel"
+ent 0x00B6 "para"
+ent 0x2AF3 "parsim"
+ent 0x2AFD "parsl"
+ent 0x2202 "PartialD"
+ent 0x2202 "part"
+ent 0x2225 "par"
+ent 0x041F "Pcy"
+ent 0x043F "pcy"
+ent 0x0025 "percnt"
+ent 0x002E "period"
+ent 0x2030 "permil"
+ent 0x22A5 "perp"
+ent 0x2031 "pertenk"
+ent 0xD513 "Pfr"
+ent 0xD52D "pfr"
+ent 0x03A6 "Phi"
+ent 0x03C6 "phi"
+ent 0x03D5 "phiv"
+ent 0x2133 "phmmat"
+ent 0x260E "phone"
+ent 0x22D4 "pitchfork"
+ent 0x03A0 "Pi"
+ent 0x03C0 "pi"
+ent 0x03D6 "piv"
+ent 0x210E "planckh"
+ent 0x210F "planck"
+ent 0x210F "plankv"
+ent 0x2A23 "plusacir"
+ent 0x229E "plusb"
+ent 0x2A22 "pluscir"
+ent 0x2214 "plusdo"
+ent 0x2A25 "plusdu"
+ent 0x2A72 "pluse"
+ent 0x00B1 "PlusMinus"
+ent 0x00B1 "plusmn"
+ent 0x2A26 "plussim"
+ent 0x2A27 "plustwo"
+ent 0x002B "plus"
+ent 0x00B1 "pm"
+ent 0x210C "Poincareplane"
+ent 0x2A15 "pointint"
+ent 0x2119 "Popf"
+ent 0xD561 "popf"
+ent 0x00A3 "pound"
+ent 0x2AB7 "prap"
+ent 0x227C "prcue"
+ent 0x2AB7 "precapprox"
+ent 0x227C "preccurlyeq"
+ent 0x2AAF "PrecedesEqual"
+ent 0x227C "PrecedesSlantEqual"
+ent 0x227E "PrecedesTilde"
+ent 0x227A "Precedes"
+ent 0x2AAF "preceq"
+ent 0x2AB9 "precnapprox"
+ent 0x2AB5 "precneqq"
+ent 0x22E8 "precnsim"
+ent 0x227E "precsim"
+ent 0x227A "prec"
+ent 0x2AAF "pre"
+ent 0x2AB3 "prE"
+ent 0x2119 "primes"
+ent 0x2032 "prime"
+ent 0x2033 "Prime"
+ent 0x2AB9 "prnap"
+ent 0x2AB5 "prnE"
+ent 0x22E8 "prnsim"
+ent 0x220F "prod"
+ent 0x220F "Product"
+ent 0x232E "profalar"
+ent 0x2312 "profline"
+ent 0x2313 "profsurf"
+ent 0x221D "Proportional"
+ent 0x2237 "Proportion"
+ent 0x221D "propto"
+ent 0x221D "prop"
+ent 0x227E "prsim"
+ent 0x227A "pr"
+ent 0x2ABB "Pr"
+ent 0x22B0 "prurel"
+ent 0xD4AB "Pscr"
+ent 0xD4C5 "pscr"
+ent 0x03A8 "Psi"
+ent 0x03C8 "psi"
+ent 0x2008 "puncsp"
+ent 0xD514 "Qfr"
+ent 0xD52E "qfr"
+ent 0x2A0C "qint"
+ent 0x211A "Qopf"
+ent 0xD562 "qopf"
+ent 0x2057 "qprime"
+ent 0xD4AC "Qscr"
+ent 0xD4C6 "qscr"
+ent 0x210D "quaternions"
+ent 0x2A16 "quatint"
+ent 0x225F "questeq"
+ent 0x003F "quest"
+ent 0x0022 "quot"
+ent 0x0022 "QUOT"
+ent 0x21DB "rAarr"
+ent 0x223D0331 "race"
+ent 0x0154 "Racute"
+ent 0x0155 "racute"
+ent 0x221A "radic"
+ent 0x29B3 "raemptyv"
+ent 0x2992 "rangd"
+ent 0x29A5 "range"
+ent 0x27E9 "rangle"
+ent 0x27E9 "rang"
+ent 0x27EB "Rang"
+ent 0x00BB "raquo"
+ent 0x2975 "rarrap"
+ent 0x2920 "rarrbfs"
+ent 0x21E5 "rarrb"
+ent 0x2933 "rarrc"
+ent 0x291E "rarrfs"
+ent 0x21AA "rarrhk"
+ent 0x21AC "rarrlp"
+ent 0x2945 "rarrpl"
+ent 0x2974 "rarrsim"
+ent 0x21A3 "rarrtl"
+ent 0x2916 "Rarrtl"
+ent 0x2192 "rarr"
+ent 0x21A0 "Rarr"
+ent 0x21D2 "rArr"
+ent 0x219D "rarrw"
+ent 0x291A "ratail"
+ent 0x291C "rAtail"
+ent 0x211A "rationals"
+ent 0x2236 "ratio"
+ent 0x290D "rbarr"
+ent 0x290F "rBarr"
+ent 0x2910 "RBarr"
+ent 0x2773 "rbbrk"
+ent 0x007D "rbrace"
+ent 0x005D "rbrack"
+ent 0x298C "rbrke"
+ent 0x298E "rbrksld"
+ent 0x2990 "rbrkslu"
+ent 0x0158 "Rcaron"
+ent 0x0159 "rcaron"
+ent 0x0156 "Rcedil"
+ent 0x0157 "rcedil"
+ent 0x2309 "rceil"
+ent 0x007D "rcub"
+ent 0x0420 "Rcy"
+ent 0x0440 "rcy"
+ent 0x2937 "rdca"
+ent 0x2969 "rdldhar"
+ent 0x201D "rdquor"
+ent 0x201D "rdquo"
+ent 0x21B3 "rdsh"
+ent 0x211B "realine"
+ent 0x211C "realpart"
+ent 0x211D "reals"
+ent 0x211C "real"
+ent 0x25AD "rect"
+ent 0x00AE "reg"
+ent 0x00AE "REG"
+ent 0x211C "Re"
+ent 0x220B "ReverseElement"
+ent 0x21CB "ReverseEquilibrium"
+ent 0x296F "ReverseUpEquilibrium"
+ent 0x297D "rfisht"
+ent 0x230B "rfloor"
+ent 0x211C "Rfr"
+ent 0xD52F "rfr"
+ent 0x21C1 "rhard"
+ent 0x2964 "rHar"
+ent 0x296C "rharul"
+ent 0x21C0 "rharu"
+ent 0x03A1 "Rho"
+ent 0x03C1 "rho"
+ent 0x03F1 "rhov"
+ent 0x27E9 "RightAngleBracket"
+ent 0x21E5 "RightArrowBar"
+ent 0x21C4 "RightArrowLeftArrow"
+ent 0x21A3 "rightarrowtail"
+ent 0x2192 "rightarrow"
+ent 0x2192 "RightArrow"
+ent 0x21D2 "Rightarrow"
+ent 0x2309 "RightCeiling"
+ent 0x27E7 "RightDoubleBracket"
+ent 0x295D "RightDownTeeVector"
+ent 0x2955 "RightDownVectorBar"
+ent 0x21C2 "RightDownVector"
+ent 0x230B "RightFloor"
+ent 0x21C1 "rightharpoondown"
+ent 0x21C0 "rightharpoonup"
+ent 0x21C4 "rightleftarrows"
+ent 0x21CC "rightleftharpoons"
+ent 0x21C9 "rightrightarrows"
+ent 0x219D "rightsquigarrow"
+ent 0x21A6 "RightTeeArrow"
+ent 0x22A2 "RightTee"
+ent 0x295B "RightTeeVector"
+ent 0x22CC "rightthreetimes"
+ent 0x29D0 "RightTriangleBar"
+ent 0x22B5 "RightTriangleEqual"
+ent 0x22B3 "RightTriangle"
+ent 0x294F "RightUpDownVector"
+ent 0x295C "RightUpTeeVector"
+ent 0x2954 "RightUpVectorBar"
+ent 0x21BE "RightUpVector"
+ent 0x2953 "RightVectorBar"
+ent 0x21C0 "RightVector"
+ent 0x02DA "ring"
+ent 0x2253 "risingdotseq"
+ent 0x21C4 "rlarr"
+ent 0x21CC "rlhar"
+ent 0x200F "rlm"
+ent 0x23B1 "rmoustache"
+ent 0x23B1 "rmoust"
+ent 0x2AEE "rnmid"
+ent 0x27ED "roang"
+ent 0x21FE "roarr"
+ent 0x27E7 "robrk"
+ent 0x2986 "ropar"
+ent 0x211D "Ropf"
+ent 0xD563 "ropf"
+ent 0x2A2E "roplus"
+ent 0x2A35 "rotimes"
+ent 0x2970 "RoundImplies"
+ent 0x2994 "rpargt"
+ent 0x0029 "rpar"
+ent 0x2A12 "rppolint"
+ent 0x21C9 "rrarr"
+ent 0x21DB "Rrightarrow"
+ent 0x203A "rsaquo"
+ent 0x211B "Rscr"
+ent 0xD4C7 "rscr"
+ent 0x21B1 "rsh"
+ent 0x21B1 "Rsh"
+ent 0x005D "rsqb"
+ent 0x2019 "rsquor"
+ent 0x2019 "rsquo"
+ent 0x22CC "rthree"
+ent 0x22CA "rtimes"
+ent 0x22B5 "rtrie"
+ent 0x25B8 "rtrif"
+ent 0x29CE "rtriltri"
+ent 0x25B9 "rtri"
+ent 0x29F4 "RuleDelayed"
+ent 0x2968 "ruluhar"
+ent 0x211E "rx"
+ent 0x015A "Sacute"
+ent 0x015B "sacute"
+ent 0x201A "sbquo"
+ent 0x2AB8 "scap"
+ent 0x0160 "Scaron"
+ent 0x0161 "scaron"
+ent 0x227D "sccue"
+ent 0x015E "Scedil"
+ent 0x015F "scedil"
+ent 0x2AB0 "sce"
+ent 0x2AB4 "scE"
+ent 0x015C "Scirc"
+ent 0x015D "scirc"
+ent 0x2ABA "scnap"
+ent 0x2AB6 "scnE"
+ent 0x22E9 "scnsim"
+ent 0x2A13 "scpolint"
+ent 0x227F "scsim"
+ent 0x227B "sc"
+ent 0x2ABC "Sc"
+ent 0x0421 "Scy"
+ent 0x0441 "scy"
+ent 0x22A1 "sdotb"
+ent 0x2A66 "sdote"
+ent 0x22C5 "sdot"
+ent 0x2925 "searhk"
+ent 0x2198 "searrow"
+ent 0x2198 "searr"
+ent 0x21D8 "seArr"
+ent 0x00A7 "sect"
+ent 0x003B "semi"
+ent 0x2929 "seswar"
+ent 0x2216 "setminus"
+ent 0x2216 "setmn"
+ent 0x2736 "sext"
+ent 0x2322 "sfrown"
+ent 0xD516 "Sfr"
+ent 0xD530 "sfr"
+ent 0x266F "sharp"
+ent 0x0429 "SHCHcy"
+ent 0x0449 "shchcy"
+ent 0x0428 "SHcy"
+ent 0x0448 "shcy"
+ent 0x2193 "ShortDownArrow"
+ent 0x2190 "ShortLeftArrow"
+ent 0x2223 "shortmid"
+ent 0x2225 "shortparallel"
+ent 0x2192 "ShortRightArrow"
+ent 0x2191 "ShortUpArrow"
+ent 0x00AD "shy"
+ent 0x03C2 "sigmaf"
+ent 0x03A3 "Sigma"
+ent 0x03C3 "sigma"
+ent 0x03C2 "sigmav"
+ent 0x2A6A "simdot"
+ent 0x2243 "simeq"
+ent 0x2243 "sime"
+ent 0x2AA0 "simgE"
+ent 0x2A9E "simg"
+ent 0x2A9F "simlE"
+ent 0x2A9D "siml"
+ent 0x2246 "simne"
+ent 0x2A24 "simplus"
+ent 0x2972 "simrarr"
+ent 0x223C "sim"
+ent 0x2190 "slarr"
+ent 0x2218 "SmallCircle"
+ent 0x2216 "smallsetminus"
+ent 0x2A33 "smashp"
+ent 0x29E4 "smeparsl"
+ent 0x2223 "smid"
+ent 0x2323 "smile"
+ent 0x2AACFE00 "smtes"
+ent 0x2AAC "smte"
+ent 0x2AAA "smt"
+ent 0x042C "SOFTcy"
+ent 0x044C "softcy"
+ent 0x233F "solbar"
+ent 0x29C4 "solb"
+ent 0x002F "sol"
+ent 0xD54A "Sopf"
+ent 0xD564 "sopf"
+ent 0x2660 "spades"
+ent 0x2660 "spadesuit"
+ent 0x2225 "spar"
+ent 0x2293FE00 "sqcaps"
+ent 0x2293 "sqcap"
+ent 0x2294FE00 "sqcups"
+ent 0x2294 "sqcup"
+ent 0x221A "Sqrt"
+ent 0x2291 "sqsube"
+ent 0x2291 "sqsubseteq"
+ent 0x228F "sqsubset"
+ent 0x228F "sqsub"
+ent 0x2292 "sqsupe"
+ent 0x2292 "sqsupseteq"
+ent 0x2290 "sqsupset"
+ent 0x2290 "sqsup"
+ent 0x2293 "SquareIntersection"
+ent 0x2291 "SquareSubsetEqual"
+ent 0x228F "SquareSubset"
+ent 0x2292 "SquareSupersetEqual"
+ent 0x2290 "SquareSuperset"
+ent 0x25A1 "square"
+ent 0x25A1 "Square"
+ent 0x2294 "SquareUnion"
+ent 0x25AA "squarf"
+ent 0x25AA "squf"
+ent 0x25A1 "squ"
+ent 0x2192 "srarr"
+ent 0xD4AE "Sscr"
+ent 0xD4C8 "sscr"
+ent 0x2216 "ssetmn"
+ent 0x2323 "ssmile"
+ent 0x22C6 "sstarf"
+ent 0x2605 "starf"
+ent 0x22C6 "Star"
+ent 0x2606 "star"
+ent 0x03F5 "straightepsilon"
+ent 0x03D5 "straightphi"
+ent 0x00AF "strns"
+ent 0x2ABD "subdot"
+ent 0x2AC3 "subedot"
+ent 0x2286 "sube"
+ent 0x2AC5 "subE"
+ent 0x2AC1 "submult"
+ent 0x228A "subne"
+ent 0x2ACB "subnE"
+ent 0x2ABF "subplus"
+ent 0x2979 "subrarr"
+ent 0x2AC5 "subseteqq"
+ent 0x2286 "subseteq"
+ent 0x2286 "SubsetEqual"
+ent 0x2ACB "subsetneqq"
+ent 0x228A "subsetneq"
+ent 0x2282 "subset"
+ent 0x22D0 "Subset"
+ent 0x2AC7 "subsim"
+ent 0x2AD5 "subsub"
+ent 0x2AD3 "subsup"
+ent 0x2282 "sub"
+ent 0x22D0 "Sub"
+ent 0x2AB8 "succapprox"
+ent 0x227D "succcurlyeq"
+ent 0x2AB0 "SucceedsEqual"
+ent 0x227D "SucceedsSlantEqual"
+ent 0x227F "SucceedsTilde"
+ent 0x227B "Succeeds"
+ent 0x2AB0 "succeq"
+ent 0x2ABA "succnapprox"
+ent 0x2AB6 "succneqq"
+ent 0x22E9 "succnsim"
+ent 0x227F "succsim"
+ent 0x227B "succ"
+ent 0x220B "SuchThat"
+ent 0x2211 "sum"
+ent 0x2211 "Sum"
+ent 0x266A "sung"
+ent 0x00B9 "sup1"
+ent 0x00B2 "sup2"
+ent 0x00B3 "sup3"
+ent 0x2ABE "supdot"
+ent 0x2AD8 "supdsub"
+ent 0x2AC4 "supedot"
+ent 0x2287 "SupersetEqual"
+ent 0x2283 "Superset"
+ent 0x2287 "supe"
+ent 0x2AC6 "supE"
+ent 0x27C9 "suphsol"
+ent 0x2AD7 "suphsub"
+ent 0x297B "suplarr"
+ent 0x2AC2 "supmult"
+ent 0x228B "supne"
+ent 0x2ACC "supnE"
+ent 0x2AC0 "supplus"
+ent 0x2AC6 "supseteqq"
+ent 0x2287 "supseteq"
+ent 0x2ACC "supsetneqq"
+ent 0x228B "supsetneq"
+ent 0x2283 "supset"
+ent 0x22D1 "Supset"
+ent 0x2AC8 "supsim"
+ent 0x2AD4 "supsub"
+ent 0x2AD6 "supsup"
+ent 0x2283 "sup"
+ent 0x22D1 "Sup"
+ent 0x2926 "swarhk"
+ent 0x2199 "swarrow"
+ent 0x2199 "swarr"
+ent 0x21D9 "swArr"
+ent 0x292A "swnwar"
+ent 0x00DF "szlig"
+ent 0x0009 "Tab"
+ent 0x2316 "target"
+ent 0x03A4 "Tau"
+ent 0x03C4 "tau"
+ent 0x23B4 "tbrk"
+ent 0x0164 "Tcaron"
+ent 0x0165 "tcaron"
+ent 0x0162 "Tcedil"
+ent 0x0163 "tcedil"
+ent 0x0422 "Tcy"
+ent 0x0442 "tcy"
+ent 0x20DB "tdot"
+ent 0x2315 "telrec"
+ent 0xD517 "Tfr"
+ent 0xD531 "tfr"
+ent 0x2234 "there4"
+ent 0x2234 "therefore"
+ent 0x2234 "Therefore"
+ent 0x03D1 "thetasym"
+ent 0x0398 "Theta"
+ent 0x03B8 "theta"
+ent 0x03D1 "thetav"
+ent 0x2248 "thickapprox"
+ent 0x223C "thicksim"
+ent 0x205F200A "ThickSpace"
+ent 0x2009 "ThinSpace"
+ent 0x2009 "thinsp"
+ent 0x2248 "thkap"
+ent 0x223C "thksim"
+ent 0x00DE "THORN"
+ent 0x00FE "thorn"
+ent 0x2243 "TildeEqual"
+ent 0x2245 "TildeFullEqual"
+ent 0x2248 "TildeTilde"
+ent 0x02DC "tilde"
+ent 0x223C "Tilde"
+ent 0x2A31 "timesbar"
+ent 0x22A0 "timesb"
+ent 0x2A30 "timesd"
+ent 0x00D7 "times"
+ent 0x222D "tint"
+ent 0x2928 "toea"
+ent 0x2336 "topbot"
+ent 0x2AF1 "topcir"
+ent 0x2ADA "topfork"
+ent 0xD54B "Topf"
+ent 0xD565 "topf"
+ent 0x22A4 "top"
+ent 0x2929 "tosa"
+ent 0x2034 "tprime"
+ent 0x2122 "trade"
+ent 0x2122 "TRADE"
+ent 0x25BF "triangledown"
+ent 0x22B4 "trianglelefteq"
+ent 0x25C3 "triangleleft"
+ent 0x225C "triangleq"
+ent 0x22B5 "trianglerighteq"
+ent 0x25B9 "triangleright"
+ent 0x25B5 "triangle"
+ent 0x25EC "tridot"
+ent 0x225C "trie"
+ent 0x2A3A "triminus"
+ent 0x20DB "TripleDot"
+ent 0x2A39 "triplus"
+ent 0x29CD "trisb"
+ent 0x2A3B "tritime"
+ent 0x23E2 "trpezium"
+ent 0xD4AF "Tscr"
+ent 0xD4C9 "tscr"
+ent 0x0426 "TScy"
+ent 0x0446 "tscy"
+ent 0x040B "TSHcy"
+ent 0x045B "tshcy"
+ent 0x0166 "Tstrok"
+ent 0x0167 "tstrok"
+ent 0x226C "twixt"
+ent 0x219E "twoheadleftarrow"
+ent 0x21A0 "twoheadrightarrow"
+ent 0x00DA "Uacute"
+ent 0x00FA "uacute"
+ent 0x2949 "Uarrocir"
+ent 0x2191 "uarr"
+ent 0x219F "Uarr"
+ent 0x21D1 "uArr"
+ent 0x040E "Ubrcy"
+ent 0x045E "ubrcy"
+ent 0x016C "Ubreve"
+ent 0x016D "ubreve"
+ent 0x00DB "Ucirc"
+ent 0x00FB "ucirc"
+ent 0x0423 "Ucy"
+ent 0x0443 "ucy"
+ent 0x21C5 "udarr"
+ent 0x0170 "Udblac"
+ent 0x0171 "udblac"
+ent 0x296E "udhar"
+ent 0x297E "ufisht"
+ent 0xD518 "Ufr"
+ent 0xD532 "ufr"
+ent 0x00D9 "Ugrave"
+ent 0x00F9 "ugrave"
+ent 0x21BF "uharl"
+ent 0x21BE "uharr"
+ent 0x2963 "uHar"
+ent 0x2580 "uhblk"
+ent 0x231C "ulcorner"
+ent 0x231C "ulcorn"
+ent 0x230F "ulcrop"
+ent 0x25F8 "ultri"
+ent 0x016A "Umacr"
+ent 0x016B "umacr"
+ent 0x00A8 "uml"
+ent 0x005F "UnderBar"
+ent 0x23DF "UnderBrace"
+ent 0x23B5 "UnderBracket"
+ent 0x23DD "UnderParenthesis"
+ent 0x228E "UnionPlus"
+ent 0x22C3 "Union"
+ent 0x0172 "Uogon"
+ent 0x0173 "uogon"
+ent 0xD54C "Uopf"
+ent 0xD566 "uopf"
+ent 0x2912 "UpArrowBar"
+ent 0x21C5 "UpArrowDownArrow"
+ent 0x2191 "uparrow"
+ent 0x2191 "UpArrow"
+ent 0x21D1 "Uparrow"
+ent 0x2195 "updownarrow"
+ent 0x2195 "UpDownArrow"
+ent 0x21D5 "Updownarrow"
+ent 0x296E "UpEquilibrium"
+ent 0x21BF "upharpoonleft"
+ent 0x21BE "upharpoonright"
+ent 0x228E "uplus"
+ent 0x2196 "UpperLeftArrow"
+ent 0x2197 "UpperRightArrow"
+ent 0x03D2 "upsih"
+ent 0x03A5 "Upsilon"
+ent 0x03C5 "upsilon"
+ent 0x03C5 "upsi"
+ent 0x03D2 "Upsi"
+ent 0x21A5 "UpTeeArrow"
+ent 0x22A5 "UpTee"
+ent 0x21C8 "upuparrows"
+ent 0x231D "urcorner"
+ent 0x231D "urcorn"
+ent 0x230E "urcrop"
+ent 0x016E "Uring"
+ent 0x016F "uring"
+ent 0x25F9 "urtri"
+ent 0xD4B0 "Uscr"
+ent 0xD4CA "uscr"
+ent 0x22F0 "utdot"
+ent 0x0168 "Utilde"
+ent 0x0169 "utilde"
+ent 0x25B4 "utrif"
+ent 0x25B5 "utri"
+ent 0x21C8 "uuarr"
+ent 0x00DC "Uuml"
+ent 0x00FC "uuml"
+ent 0x29A7 "uwangle"
+ent 0x299C "vangrt"
+ent 0x03F5 "varepsilon"
+ent 0x03F0 "varkappa"
+ent 0x2205 "varnothing"
+ent 0x03D5 "varphi"
+ent 0x03D6 "varpi"
+ent 0x221D "varpropto"
+ent 0x03F1 "varrho"
+ent 0x2195 "varr"
+ent 0x21D5 "vArr"
+ent 0x03C2 "varsigma"
+ent 0x2ACBFE00 "varsubsetneqq"
+ent 0x228AFE00 "varsubsetneq"
+ent 0x2ACCFE00 "varsupsetneqq"
+ent 0x228BFE00 "varsupsetneq"
+ent 0x03D1 "vartheta"
+ent 0x22B2 "vartriangleleft"
+ent 0x22B3 "vartriangleright"
+ent 0x2AE8 "vBar"
+ent 0x2AEB "Vbar"
+ent 0x2AE9 "vBarv"
+ent 0x0412 "Vcy"
+ent 0x0432 "vcy"
+ent 0x2AE6 "Vdashl"
+ent 0x22A2 "vdash"
+ent 0x22A8 "vDash"
+ent 0x22A9 "Vdash"
+ent 0x22AB "VDash"
+ent 0x22BB "veebar"
+ent 0x225A "veeeq"
+ent 0x2228 "vee"
+ent 0x22C1 "Vee"
+ent 0x22EE "vellip"
+ent 0x007C "verbar"
+ent 0x2016 "Verbar"
+ent 0x2223 "VerticalBar"
+ent 0x007C "VerticalLine"
+ent 0x2758 "VerticalSeparator"
+ent 0x2240 "VerticalTilde"
+ent 0x007C "vert"
+ent 0x2016 "Vert"
+ent 0x200A "VeryThinSpace"
+ent 0xD519 "Vfr"
+ent 0xD533 "vfr"
+ent 0x22B2 "vltri"
+ent 0x228220D2 "vnsub"
+ent 0x228320D2 "vnsup"
+ent 0xD54D "Vopf"
+ent 0xD567 "vopf"
+ent 0x221D "vprop"
+ent 0x22B3 "vrtri"
+ent 0xD4B1 "Vscr"
+ent 0xD4CB "vscr"
+ent 0x228AFE00 "vsubne"
+ent 0x2ACBFE00 "vsubnE"
+ent 0x228BFE00 "vsupne"
+ent 0x2ACCFE00 "vsupnE"
+ent 0x22AA "Vvdash"
+ent 0x299A "vzigzag"
+ent 0x0174 "Wcirc"
+ent 0x0175 "wcirc"
+ent 0x2A5F "wedbar"
+ent 0x2259 "wedgeq"
+ent 0x2227 "wedge"
+ent 0x22C0 "Wedge"
+ent 0x2118 "weierp"
+ent 0xD51A "Wfr"
+ent 0xD534 "wfr"
+ent 0xD54E "Wopf"
+ent 0xD568 "wopf"
+ent 0x2118 "wp"
+ent 0x2240 "wreath"
+ent 0x2240 "wr"
+ent 0xD4B2 "Wscr"
+ent 0xD4CC "wscr"
+ent 0x22C2 "xcap"
+ent 0x25EF "xcirc"
+ent 0x22C3 "xcup"
+ent 0x25BD "xdtri"
+ent 0xD51B "Xfr"
+ent 0xD535 "xfr"
+ent 0x27F7 "xharr"
+ent 0x27FA "xhArr"
+ent 0x039E "Xi"
+ent 0x03BE "xi"
+ent 0x27F5 "xlarr"
+ent 0x27F8 "xlArr"
+ent 0x27FC "xmap"
+ent 0x22FB "xnis"
+ent 0x2A00 "xodot"
+ent 0xD54F "Xopf"
+ent 0xD569 "xopf"
+ent 0x2A01 "xoplus"
+ent 0x2A02 "xotime"
+ent 0x27F6 "xrarr"
+ent 0x27F9 "xrArr"
+ent 0xD4B3 "Xscr"
+ent 0xD4CD "xscr"
+ent 0x2A06 "xsqcup"
+ent 0x2A04 "xuplus"
+ent 0x25B3 "xutri"
+ent 0x22C1 "xvee"
+ent 0x22C0 "xwedge"
+ent 0x00DD "Yacute"
+ent 0x00FD "yacute"
+ent 0x042F "YAcy"
+ent 0x044F "yacy"
+ent 0x0176 "Ycirc"
+ent 0x0177 "ycirc"
+ent 0x042B "Ycy"
+ent 0x044B "ycy"
+ent 0x00A5 "yen"
+ent 0xD51C "Yfr"
+ent 0xD536 "yfr"
+ent 0x0407 "YIcy"
+ent 0x0457 "yicy"
+ent 0xD550 "Yopf"
+ent 0xD56A "yopf"
+ent 0xD4B4 "Yscr"
+ent 0xD4CE "yscr"
+ent 0x042E "YUcy"
+ent 0x044E "yucy"
+ent 0x00FF "yuml"
+ent 0x0178 "Yuml"
+ent 0x0179 "Zacute"
+ent 0x017A "zacute"
+ent 0x017D "Zcaron"
+ent 0x017E "zcaron"
+ent 0x0417 "Zcy"
+ent 0x0437 "zcy"
+ent 0x017B "Zdot"
+ent 0x017C "zdot"
+ent 0x2128 "zeetrf"
+ent 0x200B "ZeroWidthSpace"
+ent 0x0396 "Zeta"
+ent 0x03B6 "zeta"
+ent 0x2128 "Zfr"
+ent 0xD537 "zfr"
+ent 0x0416 "ZHcy"
+ent 0x0436 "zhcy"
+ent 0x21DD "zigrarr"
+ent 0x2124 "Zopf"
+ent 0xD56B "zopf"
+ent 0xD4B5 "Zscr"
+ent 0xD4CF "zscr"
+ent 0x200D "zwj"
+ent 0x200C "zwnj"

cyrus-imapd-2.4.17.tar.gz/lib/imapoptions -> cyrus-imapd-2.5.tar.gz/lib/imapoptions Changed

@@ -29,7 +29,7 @@
 .\" Pittsburgh, PA 15213
 .\" (412) 268-7393, fax: (412) 268-7395
 .\" innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\" acknowledgment:
 .\" "This product includes software developed by Computing Services
@@ -42,8 +42,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: imapoptions,v 1.78 2010/06/28 12:06:43 brong Exp $
 
 .SH NAME
 imapd.conf \- IMAP configuration file
@@ -95,6 +93,12 @@
 
 # OPTIONS
 
+{ "addressbookprefix", "#addressbooks", STRING }
+/* The prefix for the addressbook mailboxes hierarchies. The hierarchy
+ delimiter will be automatically appended. The public addressbook
+ hierarchy will be at the toplevel of the shared namespace. A
+ user's personal calendar hierarchy will be a child of their Inbox. */
+
 { "admins", "", STRING }
 /* The list of userids with administrative rights. Separate each userid
 with a space. Sites using Kerberos authentication may use
@@ -165,7 +169,7 @@
 affect LMTP delivery of messages directly to mailboxes via
 plus-addressing. */
 
-{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist")}
+{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")}
 /* The cyrusdb backend to use for mailbox annotations. */
 
 { "annotation_db_path", NULL, STRING }
@@ -177,6 +181,11 @@
 user on their mailboxes? In a large organization this can cause
 support problems, but it's enabled by default. */
 
+{ "annotation_allow_undefined", 0, SWITCH }
+/* Allow clients to store values for entries which are not
+ * defined either by Cyrus or in the annotations_definitions
+ * file. */
+
 { "annotation_definitions", NULL, STRING }
 /* File containing external (third-party) annotation definitions.
 .PP
@@ -185,36 +194,73 @@
 .IP
 \fIname\fR, \fIscope\fR, \fIattrib-type\fR, \fIproxy-type\fR,
 \fIattrib-names\fR, \fIacl\fR
+.\"
 .IP \fIname\fR 5
-is the hierarchical name as in the draft standard, typically of the
-form /vendor/acme/blurdybloop
+is the hierarchical name as in RFC 5257 or RFC 5464 (in the latter case,
+without the leading \fB/shared\fR or \fB/private\fR). For example,
+/vendor/acme/blurdybloop.
+.\"
 .IP \fIscope\fR 5
-specifies whether the annotation is for the \fBserver\fR or a
-\fBmailbox\fR
+specifies whether the annotation is for the \fBserver\fR, a
+\fBmailbox\fR, or a \fBmessage\fR.
+.\"
 .IP \fIattrib-type\fR 5
-specifies the attribute data type which is one of: \fBstring\fR,
-\fBboolean\fR, \fBint\fR, \fBuint\fR, or \fBcontent-type\fR
+.RS 5
+specifies the attribute data type, which is used only to check the
+string value passed by clients when setting annotations. The
+\fIattrib-type\fR is one of:
+.\"
+.IP \fBstring\fR 5
+any value is accepted.
+.\"
+.IP \fBcontent-type\fR 5
+this obsolete data type, which was useful for early drafts of the standard,
+is accepted but silently translated to \fBstring\fR.
+.\"
+.IP \fBboolean\fR 5
+only the strings "true" or "false" are accepted. Checking is
+case-insensitive but the value is forced to lowercase.
+.\"
+.IP \fBint\fR 5
+integers are accepted.
+.\"
+.IP \fBuint\fR 5
+non-negative integers are accepted.
+.\"
+.RE
+.\"
 .IP \fIproxy-type\fR 5
 specifies whether this attribute is for the \fBbackend\fR or
 \fBproxy\fR servers or both (\fBproxy_and_backend\fR) 
+.\"
 .IP \fIattrib-names\fR 5
 is the space-separated list of available attributes for the
-annotation. Possible attribute names are (where the suffixless \fBfoo\fR
-permits both \fBfoo.priv\fR and \fBfoo.shared\fR): \fBalue\fR,
-\fBvalue.shared\fR, \fBvalue.priv\fR, \fBsize\fR, \fBsize.shared\fR,
-\fBsize.priv\fR, \fBmodifiedsince\fR, \fBmodifiedsince.shared\fR,
-\fBmodifiedsince.priv\fR, \fBcontent-type\fR,
-\fBcontent-type.shared\fR, \fBcontent-type.priv\fR
-.IP \fIacl\fR 5
-is the extra ACL requirements for setting annotations. This is the
-standard IMAP ACL permission bit string format. Particularly useful
-is the \fBa\fR right to require admin privileges. Note that some ACL
-requirements (read and write on the mailbox) are hard-wired in the
-server
+annotation. Possible attribute names are \fBvalue.shared\fR,
+\fBvalue.priv\fR, and \fBvalue\fR (which permits both \fBvalue.priv\fR
+and \fBvalue.shared\fR). The attribute names \fBsize\fR,
+\fBsize.shared\fR, and \fBsize.priv\fR are accepted but ignored; these
+attributes are automatically provided by the server if the corresponding
+\fBvalue\fR attribute is specified. Some obsolete attributes, which were
+defined early drafts of the standard, are accepted and ignored with a
+warning.
+.\"
+.IP \fIextra-permissions\fR 5
+is the extra ACL permission bits required for setting this annotation, in
+standard IMAP ACL permission bit string format. Note that this is
+in addition to the permission bits specified in RFC 5257 and RFC 5464,
+so leaving this field empty is harmless. Note also that there is no way
+to specify that an annotation can only be set by an admin user; in
+particular the \fBa\fP permission bit does not achieve this.
 .PP
 Blank lines and lines beginning with ``#'' are ignored.
 */
 
+{ "annotation_callout", NULL, STRING }
+/* The pathname of a callout to be used to automatically add annotations
+ or flags to a message when it is appended to a mailbox. The path can
+ be either an executable (including a script), or a UNIX domain
+ socket. */
+
 { "auditlog", 0, SWITCH }
 /* Should cyrus output log entries for every action taken on a message
 file or mailboxes list entry? It's noisy so disabled by default, but
@@ -228,6 +274,10 @@
 creating the mailbox INBOX. The user's quota is set to the value
 if it is positive, otherwise the user has unlimited quota. */
 
+{ "autocreatequotamsg", -1, INT }
+/* When users create their own IMAP accounts by creating the mailbox INBOX,
+ their message quota is set to this value. Default value (-1) is unlimited. */
+
 { "berkeley_cachesize", 512, INT }
 /* Size (in kilobytes) of the shared memory buffer pool (cache) used
 by the berkeley environment. The minimum allowed value is 20. The
@@ -247,6 +297,29 @@
 layers of MIME structure. The default of 1000 is much higher
 than any sane message should have. */
 
+{ "caldav_allowscheduling", 1, SWITCH }
+/* If enabled, the server will perform calendar scheduling operations. */
+
+{ "caldav_realm", NULL, STRING }
+/* The realm to present for HTTP authentication of CalDAV resources.
+ If not set (the default), the value of the "servername" option will
+ be used.*/
+
+{ "calendarprefix", "#calendars", STRING }
+/* The prefix for the calendar mailboxes hierarchies. The hierarchy
+ delimiter will be automatically appended. The public calendar
+ hierarchy will be at the toplevel of the shared namespace. A
+ user's personal calendar hierarchy will be a child of their Inbox. */
+
+{ "carddav_realm", NULL, STRING }
+/* The realm to present for HTTP authentication of CardDAV resources.
+ If not set (the default), the value of the "servername" option will
+ be used.*/
+
+{ "chatty", 0, SWITCH }
+/* If yes, syslog tags and commands for every IMAP command, mailboxes
+ for every lmtp connection, every POP3 command, etc */
+
 { "client_timeout", 10, INT }
 /* Number of seconds to wait before returning a timeout failure when
 performing a client connection (e.g., in a murder environment) */
@@ -255,10 +328,83 @@
 /* Time in seconds. Any imap command that takes longer than this
 time is logged. */
 
+{ "createonpost", 0, SWITCH }
+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist,
+ then the INBOX is automatically created by lmtpd. */
+
+{ "autocreateinboxfolders", NULL, STRING }
+/* If a user does not have an INBOX created then the INBOX as well as some INBOX 
+ subfolders are created under two conditions.
+ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value)
+ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes)
+ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that 
+ are automatically created by the server under the previous two situations. */
+
+{ "autosubscribeinboxfolders", NULL, STRING }
+/* A list of folder names, separated by "|", that the users get automatically subscribed to, 
+ when their INBOX is created. These folder names must have been included in the 
+ autocreateinboxfolders option of the imapd.conf. */
+
+{ "autosubscribesharedfolders", NULL, STRING }
+/* A list of shared folders (bulletin boards), separated by "|", that the users get
+ automatically subscribed to, after their INBOX is created. The shared folder must 
+ have been created and the user must have the required permissions to get subscribed 
+ to it. Otherwise, subscribing to the shared folder fails. */
+
+{ "autosubscribe_all_sharedfolders", 0, SWITCH }
+/* If set to yes, the user is automatically subscribed to all shared folders, one has permission
+ to subscribe to. */
+
+{ "autocreate_sieve_script", NULL, STRING }
+/* The full path of a file that contains a sieve script. This script automatically becomes a
+ user's initial default sieve filter script. When this option is not defined, no default 
+ sieve filter is created. The file must be readable by the cyrus daemon. */
+
+{ "autocreate_sieve_compiledscript", NULL, STRING }
+/* The full path of a file that contains a compiled in bytecode sieve script. This script 
+ automatically becomes a user's initial default sieve filter script. If this option is 
+ not specified, or the filename doesn't exist then the script defined by 
+ autocreate_sieve_script is compiled on the fly and installed as the user's default
+ sieve script */
+
+{ "generate_compiled_sieve_script", 0, SWITCH }
+/* If set to yes and no compiled sieve script file exists, the sieve script which is 
+ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript 
+ option points to. In order a compiled script to be generated, autocreate_sieve_script and 
+ autocreate_sieve_compiledscript must have valid values */
+
+{ "autocreate_users", "anyone", STRING }
+/* A space separated list of users and/or groups that are allowed their INBOX to be
+ automatically created. */
+
 { "configdirectory", NULL, STRING }
 /* The pathname of the IMAP configuration directory. This field is
 required. */
 
+{ "conversations", 0, SWITCH }
+/* Enable the XCONVERSATIONS extensions. Extract conversation
+ tracking information from incoming messages and track them
+ in per-user databases. */
+
+{ "conversations_counted_flags", NULL, STRING }
+/* space-separated list of flags for which per-conversation counts
+ will be kept. Note that you need to reconstruct the conversations
+ database with ctl_conversationsdb if you change this option on a
+ running server, or the counts will be wrong. */
+
+{ "conversations_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")}
+/* The cyrusdb backend to use for the per-user conversations database. */
+
+{ "conversations_expire_days", 90, INT }
+/* How long the conversations database keeps the message tracking
+ information needed for receiving new messages in existing
+ conversations, in days. */
+
+{ "dav_realm", NULL, STRING }
+/* The realm to present for HTTP authentication of generic DAV
+ resources (principals). If not set (the default), the value of the
+ "servername" option will be used.*/
+
 { "debug_command", NULL, STRING }
 /* Debug command to be used by processes started with -D option. The string
 is a C format string that gets 3 options: the first is the name of the
@@ -316,7 +462,14 @@
 session. Otherwise, the missing mailbox is treated as empty while
 in use by the client.*/
 
-{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql")}
+{ "dkim_domain", NULL, STRING }
+/* The domain to be reported as doing DKIM signing. */
+
+{ "dkim_selector", NULL, STRING }
+/* Name of the selector subdividing the domain namespace. This
+ specifies the actual key used for DKIM signing within the domain. */
+
+{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")}
 /* The cyrusdb backend to use for the duplicate delivery suppression
 and sieve. */
 
@@ -330,6 +483,36 @@
 as having already been delivered to the mailbox. Records the mailbox
 and message-id/resent-message-id of all successful deliveries. */
 
+{ "event_content_inclusion_mode", "standard", ENUM("standard", "message", "header", "body", "headerbody") }
+/* The mode in which message content may be included with MessageAppend and
+ MessageNew. "standard" mode is the default behavior in which message is
+ included up to a size with the notification. In "message" mode, the message
+ is included and may be truncated to a size. In "header" mode, it includes 
+ headers truncated to a size. In "body" mode, it includes body truncated 
+ to a size. In "headerbody" mode, it includes full headers and body truncated
+ to a size */
+
+{ "event_content_size", 0, INT }
+/* Truncate the message content that may be included with MessageAppend and 
+ MessageNew. Set 0 to include the entire message itself */
+
+{ "event_exclude_flags", NULL, STRING }
+/* Don't send event notification for given IMAP flag(s) */
+
+{ "event_exclude_specialuse", "\\Junk", STRING }
+/* Don't send event notification for folder with given special-use attributes. 
+ Set ALL for any folder */
+
+{ "event_extra_params", "timestamp", BITFIELD("bodyStructure", "clientAddress", "diskUsed", "flagNames", "messageContent", "messageSize", "messages", "modseq", "service", "timestamp", "uidnext", "vnd.cmu.midset", "vnd.cmu.unseenMessages", "vnd.cmu.envelope", "vnd.fastmail.clientId", "vnd.fastmail.sessionId", "vnd.fastmail.convExists", "vnd.fastmail.convUnseen", "vnd.fastmail.cid", "vnd.cmu.mbtype", "vnd.cmu.davFilename", "vnd.cmu.davUid") }
+/* Space-separated list of extra parameters to add to any appropriated event. */ 
+
+{ "event_groups", "message mailbox", BITFIELD("message", "quota", "flags", "access", "mailbox") }
+/* Space-separated list of groups of related events to turn on notification */
+
+{ "event_notifier", NULL, STRING }
+/* Notifyd(8) method to use for "EVENT" notifications which are based on
+ the RFC 5423. If not set, "EVENT" notifications are disabled. */
+
 { "expunge_mode", "default", ENUM("default", "immediate", "delayed") }
 /* The mode in which messages (and their corresponding cache entries)
 are expunged. "default" mode is the default behavior in which the
@@ -388,6 +571,9 @@
 hashing done on configuration directories. This is recommended if
 one partition has a very bushy mailbox tree. */
 
+{ "debug", 0, SWITCH }
+/* If enabled, allow syslog() to pass LOG_DEBUG messages. */
+
 # Commented out - there's no such thing as "hostname_mechs", but we need
 # this for the man page
 # { "hostname_mechs", NULL, STRING }
@@ -402,6 +588,75 @@
 /* The password to use for authentication to the backend server hostname
 (where hostname is the short hostname of the server) - Cyrus Murder */
 
+{ "httpallowcompress", 1, SWITCH }
+/* If enabled, the server will compress response payloads if the client
+ indicates that it can accept them. Note that the compressed data
+ will appear in telemetry logs, leaving only the response headers as
+ human-readable.*/
+
+{ "httpallowcors", NULL, STRING }
+/* A wildmat pattern specifying a list of origin URIs ( scheme "://"
+ host ":" port ) that are allowed to make Cross-Origin Resource
+ Sharing (CORS) requests on the server. By default, CORS requests
+ are disabled.
+.PP
+ Note that the scheme and host should both be lowercase, the port
+ should be omitted if using the default for the scheme (80 for http,
+ 443 for https), and there should be no trailing '/' (e.g.:
+ "http://www.example.com:8080", "https://example.org"). */
+
+{ "httpallowtrace", 0, SWITCH }
+/* Allow use of the TRACE method.
+.PP
+ Note that sensitive data might be disclosed by the response. */
+
+{ "httpallowedurls", NULL, STRING }
+/* Space-separated list of relative URLs (paths) rooted at
+ "httpdocroot" (see below) to be served by httpd. If set, this
+ option will limit served static content to only those paths specified
+ (returning "404 Not Found" to any other client requested URLs).
+ Otherwise, httpd will serve any content found in "httpdocroot".
+.PP
+ Note that any path specified by "rss_feedlist_template" is an
+ exception to this rule.*/
+
+{ "httpcontentmd5", 0, SWITCH }
+/* If enabled, HTTP responses will include a Content-MD5 header for
+ the purpose of providing an end-to-end message integrity check
+ (MIC) of the payload body. Note that enabling this option will
+ use additional CPU to generate the MD5 digest, which may be ignored
+ by clients anyways. */
+
+{ "httpdocroot", NULL, STRING }
+/* If set, http will serve the static content (html/text/jpeg/gif
+ files, etc) rooted at this directory. Otherwise, httpd will not
+ serve any static content. */ 
+
+{ "httpkeepalive", 20, INT }
+/* Set the length of the HTTP server's keepalive heartbeat in seconds.
+ The default is 20. The minimum value is 0, which will disable the
+ keepalive heartbeat. When enabled, if a request takes longer than
+ \fIhttpkeepalive\fR seconds to process, the server will send the client
+ provisional responses every \fIhttpkeepalive\fR seconds until the
+ final response can be sent */
+
+{ "httpmodules", "", BITFIELD("caldav", "carddav", "domainkey", "ischedule", "rss") }
+/* Space-separated list of HTTP modules that will be enabled in
+ httpd(8). This option has no effect on modules that are disabled
+ at compile time due to missing dependencies (e.g. libical). */
+
+{ "httpprettytelemetry", 0, SWITCH }
+/* If enabled, HTTP response payloads including server-generated
+ markup languages (HTML, XML) will utilize line breaks and
+ indentation to promote better human-readability in telemetry logs.
+ Note that enabling this option will increase the amount of data
+ sent across the wire. */
+
+{ "httptimeout", 5, INT }
+/* Set the length of the HTTP server's inactivity autologout timer, 
+ in minutes. The default is 5. The minimum value is 0, which will
+ disable persistent connections. */
+
 { "idlesocket", "{configdirectory}/socket/idle", STRING }
 /* Unix domain socket that idled listens on. */
 
@@ -453,6 +708,9 @@
 "receivedheader" looks at the top most Received header
 or time/mtime otherwise */
 
+{ "iolog", 0, SWITCH }
+/* Should cyrus output I/O log entries */
+
 { "ldap_authz", NULL, STRING }
 /* SASL authorization ID for the LDAP server */
 
@@ -496,6 +754,9 @@
 { "ldap_mech", NULL, STRING }
 /* SASL mechanism for LDAP authentication */
 
+{ "ldap_user_attribute", NULL, STRING }
+/* Specify LDAP attribute to use as canonical user id */
+
 { "ldap_member_attribute", NULL, STRING }
 /* See ldap_member_method. */
 
@@ -596,7 +857,7 @@
 ldap_use_sasl are enabled, ldap_version will be automatically
 set to 3. */
 
-{ "lmtp_downcase_rcpt", 0, SWITCH }
+{ "lmtp_downcase_rcpt", 1, SWITCH }
 /* If enabled, lmtpd will convert the recipient addresses to lowercase
 (up to a '+' character, if present). */
 
@@ -653,6 +914,13 @@
 what you're doing before setting this, but it can apply some default
 annotations like duplicate supression */
 
+{ "mailbox_initial_flags", NULL, STRING }
+/* space-separated list of permanent flags which will be pre-set in every
+ newly created mailbox. If you know you will require particular
+ flag names then this avoids a possible race condition against a client
+ that fills the entire 128 available slots. Default is NULL, which is
+ no flags. Example: $Label1 $Label2 $Label3 NotSpam Spam */
+
 { "mailnotifier", NULL, STRING }
 /* Notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL"
 notifications are disabled. */
@@ -664,6 +932,14 @@
 the lines in the header will be skipped. This is to avoid malformed
 messages causing giant cache records */
 
+{ "maxlogins_per_host", 0, INT }
+/* Maximum number of logged in sessions allowed per host,
+ zero means no limit */
+
+{ "maxlogins_per_user", 0, INT }
+/* Maximum number of logged in sessions allowed per user,
+ zero means no limit */
+
 { "maxmessagesize", 0, INT }
 /* Maximum incoming LMTP message size. If non-zero, lmtpd will reject
 messages larger than \fImaxmessagesize\fR bytes. If set to 0, this
@@ -675,10 +951,10 @@
 { "maxword", 131072, INT }
 /* Maximum size of a single word for the parser. Default 128k */
 
-{ "mboxkey_db", "skiplist", STRINGLIST("berkeley", "skiplist") }
+{ "mboxkey_db", "skiplist", STRINGLIST("berkeley", "skiplist", "twoskip") }
 /* The cyrusdb backend to use for mailbox keys. */
 
-{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")}
 /* The cyrusdb backend to use for the mailbox list. */
 
 { "mboxlist_db_path", NULL, STRING }
@@ -688,11 +964,14 @@
 { "mboxname_lockpath", NULL, STRING }
 /* Path to mailbox name lock files (default $conf/lock) */
 
-{ "metapartition_files", "", BITFIELD("header", "index", "cache", "expunge", "squat") }
+{ "metapartition_files", "", BITFIELD("header", "index", "cache", "expunge", "squat", "annotations", "lock", "archivecache") }
 /* Space-separated list of metadata files to be stored on a
 \fImetapartition\fR rather than in the mailbox directory on a spool
 partition. */
 
+{ "me_secret", NULL, STRING }
+/* messagingengine.com x-sasl-enc secret key */
+
 # Commented out - there's no such thing as "metapartition-name",
 # but we need this for the man page
 # { "metapartition-name", NULL, STRING }
@@ -951,11 +1230,6 @@
 the "shared.blah" folder. By default, an email address of
 "+shared.blah" would be used. */ 
 
-{ "proc_path", NULL, STRING }
-/* Path to proc directory. Default is NULL - must be an absolute path
- if specified. If not specified, the path $confdir/proc/ will be 
- used. */
-
 { "proxy_authname", "proxy", STRING }
 /* The authentication name to use when authenticating to a backend server
 in the Cyrus Murder. */
@@ -1002,7 +1276,7 @@
 /* Unix domain socket that ptloader listens on.
 (defaults to configdir/ptclient/ptsock) */
 
-{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist")}
+{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")}
 /* The cyrusdb backend to use for the pts cache. */
 
 { "ptscache_db_path", NULL, STRING }
@@ -1027,7 +1301,7 @@
 /* This specifies the Class Selector or Differentiated Services Code Point
 designation on IP headers (in the ToS field). */
 
-{ "quota_db", "quotalegacy", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy")}
+{ "quota_db", "quotalegacy", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy", "twoskip")}
 /* The cyrusdb backend to use for quotas. */
 
 { "quota_db_path", NULL, STRING }
@@ -1042,7 +1316,12 @@
 { "quotawarnkb", 0, INT }
 /* The maximum amount of free space (in kB) at which to give a quota
 warning (if this value is 0, or if the quota is smaller than this
- amount, than warnings are always given). */
+ amount, then warnings are always given). */
+
+{ "quotawarnmsg", 0, INT }
+/* The maximum amount of messages at which to give a quota warning
+ (if this value is 0, or if the quota is smaller than this
+ amount, then warnings are always given). */
 
 { "reject8bit", 0, SWITCH }
 /* If enabled, lmtpd rejects messages with 8-bit characters in the
@@ -1064,6 +1343,45 @@
 allowed in envelope tests. When disabled, ANY grammatically correct header
 will be allowed. */
 
+{ "rss_feedlist_template", NULL, STRING }
+/* File containing HTML that will be used as a template for displaying
+ the list of available RSS feeds. A single instance of the variable
+ %RSS_FEEDLIST% should appear in the file, which will be replaced by
+ a nested unordered list of feeds. The toplevel unordered list will
+ be tagged with an id of "feed" (<ul id='feed'>) which can be used
+ by stylesheet(s) in your template. The dynamically created list of
+ feeds based on the HTML template will be accessible at the "/rss"
+ URL on the server. */
+
+{ "rss_feeds", "*", STRING }
+/* A wildmat pattern specifying which mailbox hierarchies should be
+ treated as RSS feeds. Only mailboxes matching the wildmat will
+ have their messages available via RSS. If not set, a default
+ wildmat of "*" (ALL mailboxes) will be used. */
+
+{ "rss_maxage", 0, INT }
+/* Maximum age (in days) of items to display in an RSS channel. If
+ non-zero, httpd will only display items received within the last
+ \fIrss_maxage\fR days. If set to 0, all available items will be
+ displayed (the default). */
+
+{ "rss_maxitems", 0, INT }
+/* Maximum number of items to display in an RSS channel. If non-zero,
+ httpd will display no more than the \fIrss_maxitems\fR most recent
+ items. If set to 0, all available items will be displayed (the
+ default). */
+
+{ "rss_maxsynopsis", 0, INT }
+/* Maximum RSS item synopsis length. If non-zero, httpd will display
+ no more than the first \fIrss_maxsynopsis\fR characters of an
+ item's synopsis. If set to 0, the entire synopsis will be
+ displayed (the default). */
+
+{ "rss_realm", NULL, STRING }
+/* The realm to present for HTTP authentication of RSS feeds. If not
+ set (the default), the value of the "servername" option will be
+ used.*/
+
 # Commented out - used by libsasl
 # { "sasl_auto_transition", 0, SWITCH }
 /* If enabled, the SASL library will automatically create authentication
@@ -1088,7 +1406,50 @@
 /* The mechanism used by the server to verify plaintext passwords. 
 Possible values include "auxprop", "saslauthd", and "pwcheck". */
 
-{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+{ "search_batchsize", 20, INT }
+/* The number of messages to be indexed in one batch (default 20).
+ Note that long batches may delay user commands or mail delivery. */
+
+{ "search_normalisation_max", 1000, INT }
+/* A resource bound for the combinatorial explosion of search expression
+ * tree complexity caused by normalising expressions with many OR nodes.
+ * These can use more CPU time to optimise than they save IO time in scanning
+ * folders. */
+
+{ "search_engine", "none", ENUM("none", "squat", "sphinx", "xapian") }
+/* The indexing engine used to speed up searching. */
+
+{ "search_index_headers", 1, SWITCH }
+/* Whether to index headers other than From, To, Cc, Bcc, and Subject.
+ * Experiment shows that some headers such as Received and DKIM-Signature
+ * can contribute up to 2/3rds of the index size but almost nothing to
+ * the utility of searching. Note that is header indexing is disabled,
+ * headers can still be searched, the searches will just be slower.
+ */
+
+{ "search_indexed_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")}
+/* The cyrusdb backend to use for the search latest indexed uid state. */
+
+{ "search_skipdiacrit", 1, SWITCH }
+/* When searching, should diacriticals be stripped from the search
+ terms. The default is "true", a search for "hav" will match
+ "Håvard". This is not RFC5051 complient, but it backwards
+ compatible, and may be preferred by some sites. */
+
+{ "search_skiphtml", 0, SWITCH }
+/* If enabled, HTML parts of messages are skipped, i.e. not indexed and
+ not searchable. Otherwise, they're indexed. */
+
+{ "search_whitespace", "merge", ENUM("skip", "merge", "keep") }
+/* When searching, how whitespace should be handled. Options are:
+ "skip" (default in 2.3 and earlier series) - where a search for
+ "equi" would match "the quick brown fox". "merge" - the default,
+ where "he qu" would match "the quick brownfox", and "keep",
+ where whitespace must match exactly. The default of "merge" is
+ recommended for most cases - it's a good compromise which
+ keeps words separate. */
+
+{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")}
 /* The cyrusdb backend to use for the seen state. */
 
 { "sendmail", "/usr/lib/sendmail", STRING }
@@ -1125,7 +1486,7 @@
 user's scripts reside on a remote server (in a Murder).
 Otherwise, timsieved will proxy traffic to the remote server. */
 
-{ "sieve_extensions", "fileinto reject vacation imapflags notify envelope relational regex subaddress copy", BITFIELD("fileinto", "reject", "vacation", "imapflags", "notify", "include", "envelope", "body", "relational", "regex", "subaddress", "copy") }
+{ "sieve_extensions", "fileinto reject vacation vacation-seconds imapflags notify envelope relational regex subaddress copy", BITFIELD("fileinto", "reject", "vacation", "vacation-seconds", "imapflags", "notify", "include", "envelope", "body", "relational", "regex", "subaddress", "copy") }
 /* Space-separated list of Sieve extensions allowed to be used in
 sieve scripts, enforced at submission by timsieved(8). Any
 previously installed script will be unaffected by this option and
@@ -1150,6 +1511,14 @@
 /* If enabled, timsieved will emit a capability response after a successful
 SASL authentication, per draft-martin-managesieve-12.txt . */
 
+{ "sieve_vacation_min_response", 259200 /* 3 days */, INT }
+/* Minimum time interval (in seconds) between consecutive vacation responses,
+ per draft-ietf-vacation-seconds.txt . */
+
+{ "sieve_vacation_max_response", 7776000 /* 90 days */, INT }
+/* Maximum time interval (in seconds) between consecutive vacation responses,
+ per draft-ietf-vacation-seconds.txt . */
+
 { "sievedir", "/usr/sieve", STRING }
 /* If sieveusehomedir is false, this directory is searched for Sieve
 scripts. */
@@ -1164,6 +1533,15 @@
 /* If enabled, lmtpd will look for Sieve scripts in user's home
 directories: ~user/.sieve. */
 
+{ "anysievefolder", 0, SWITCH }
+/* It must be "yes" in order to permit the autocreation of any INBOX subfolder 
+ requested by a sieve filter, through the "fileinto" action. (default = no) */
+
+{ "autosievefolders", NULL, STRING }
+/* It is a "|" separated list of subfolders of INBOX that will be automatically created, 
+ if requested by a sieve filter, through the "fileinto" action. (default = null)
+ i.e. autosievefolders: Junk | Spam */
+
 { "singleinstancestore", 1, SWITCH }
 /* If enabled, imapd, lmtpd and nntpd attempt to only write one copy
 of a message per partition and create hard links, resulting in a
@@ -1184,9 +1562,33 @@
 successfully authenticate. Otherwise lmtpd returns permanent failures
 (causing the mail to bounce immediately). */
 
+{ "sortcache_db", "twoskip", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")}
+/* The cyrusdb backend to use for caching sort results (currently only
+ used for xconvmultisort) */
+
+{ "specialuse_extra", NULL, STRING }
+/* Whitespace separated list of extra special-use attributes
+ that can be set on a mailbox. RFC 6154 currently lists
+ what special-use attributes can be set. This allows
+ extending that list in the future or adding your own
+ if needed. */
+
 { "specialusealways", 0, SWITCH }
 /* If enabled, this option causes LIST and LSUB output to always include
- the XLIST "special-use" flags. See "xlist-*'"*/
+ the XLIST "special-use" flags */
+
+{ "sphinx_text_excludes_odd_headers", 0, SWITCH }
+/* If enabled, Sphinx will perform a TEXT search as if it matches
+ FROM, TO, CC, BCC or SUBJECT but not any other headers. This
+ is contrary to the RFC but a more useful behaviour for most
+ users. Default: disabled. */
+
+{ "sphinx_socket", "{configdirectory}/socket/sphinx", STRING }
+/* Unix domain socket that the Sphinx searchd
+ daemons listens on. */
+
+{ "sphinx_pidfile", "/var/run/sphinx.pid", STRING }
+/* File where the Sphinx searchd daemon writes its pid. */
 
 { "sql_database", NULL, STRING }
 /* Name of the database which contains the cyrusdb table(s). */
@@ -1217,7 +1619,7 @@
 allowed to fetch the contents of any valid "urlauth=submit+" IMAP URL:
 use with caution. */ 
 
-{ "subscription_db", "flat", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+{ "subscription_db", "flat", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")}
 /* The cyrusdb backend to use for the subscriptions list. */
 
 { "suppress_capabilities", NULL, STRING }
@@ -1230,7 +1632,7 @@
 { "statuscache", 0, SWITCH }
 /* Enable/disable the imap status cache. */
 
-{ "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist") }
+{ "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip") }
 /* The cyrusdb backend to use for the imap status cache. */
 
 { "statuscache_db_path", NULL, STRING }
@@ -1241,10 +1643,6 @@
 /* The authentication name to use when authenticating to a sync server.
 Prefix with a channel name to only apply for that channel */
 
-{ "sync_compress", 0, SWITCH }
-/* Enable compression on replication traffic.
- Prefix with a channel name to only apply for that channel */
-
 { "sync_host", NULL, STRING }
 /* Name of the host (replica running sync_server(8)) to which
 replication actions will be sent by sync_client(8).
@@ -1264,7 +1662,14 @@
 specified by each "channel". To run these log files, you need to pass
 the -n option to sync_client -r with the channel name. Use this for
 a mesh style replication layout - every machine replicating to every
- other machine. */
+ other machine. You can use "" (the two-character string U+22 U+22)
+ to mean the default sync channel. */
+
+{ "sync_log_unsuppressable_channels", "squatter", STRING }
+/* If specified, the named channels are exempt from the effect of setting
+ sync_log_chain:off, i.e. they are always logged to by the sync_server
+ process. This is only really useful to allow rolling search indexing
+ on a replica. */
 
 { "sync_password", NULL, STRING }
 /* The default password to use when authenticating to a sync server.
@@ -1291,9 +1696,18 @@
 next opportunity. Safer than sending signals to running processes.
 Prefix with a channel name to only apply for that channel */
 
+{ "sync_timeout", 1800, INT }
+/* Number of seconds to wait for a response before returning a timeout
+ failure when talking to a replication peer (client or server). */
+
 { "syslog_prefix", NULL, STRING }
 /* String to be prepended to the process name in syslog entries. */
 
+{ "syslog_facility", NULL, STRING }
+/* Configure a syslog facility. The default is whatever is compiled
+ in. Allowed values are: DAEMON, MAIL, NEWS, USER, and LOCAL0 
+ through to LOCAL7 */
+
 { "tcp_keepalive", 0, SWITCH }
 /* Enable keepalive on TCP connections */
 
@@ -1323,7 +1737,7 @@
 have filenames with the hashed value of the certificates (see
 openssl(XXX)). */
 
-{ "tlscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql")}
+{ "tlscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")}
 /* The cyrusdb backend to use for the TLS cache. */
 
 { "tlscache_db_path", NULL, STRING }
@@ -1353,17 +1767,13 @@
 { "umask", "077", STRING }
 /* The umask value used by various Cyrus IMAP programs. */
 
-{ "userdeny_db", "flat", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql")}
+{ "userdeny_db", "flat", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")}
 /* The cyrusdb backend to use for the user access list. */
 
 { "userdeny_db_path", NULL, STRING }
 /* The absolute path to the userdeny db file. If not specified,
 will be confdir/user_deny.db */
 
-{ "user_folder_limit", 0, INT }
-/* Limit the number of folders a user can create in their INBOX. 
- Set to 0 (default) for no limit. Only affects folders in user. */
-
 { "username_tolower", 1, SWITCH }
 /* Convert usernames to all lowercase before login/authentication. This
 is useful with authentication backends which ignore case during
@@ -1394,24 +1804,17 @@
 interface, otherwise the user is assumed to be in the default
 domain (if set). */
 
-# {"xlist-*", NULL, STRING }
-/* Cyrus 2.4 ONLY - enable special use flags. The valid names
- can be taken from GMail's XLIST documents or RFC 6154.
- Attribute name in the configuration key should be defined in
- lowercase. The attribute value is case sensitive, may contain
- whitespace and must be valid UTF7-IMAP string. It must
- exactly match the name of the subfolder of a user's INBOX.
-
- Example: xlist-drafts: My Drafts
+{ "lmtp_catchall_mailbox", NULL, STRING }
+/* Send mail to mailboxes, which do not exists, to this user. NOTE: This must
+ be an existing local mailbox name. NOT an email address! */
 
- Every user on your server with a 'INBOX.My Drafts' folder will get 
- the special use flag "\Drafts" added. Later versions of Cyrus
- have a much more flexible RFC 6154 compatible system. */
+{ "defaultsearchtier", "", STRING }
+/* Name of the default tier that messages will be indexed to */
 
 /*
 .SH SEE ALSO
 .PP
 \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR,
-\fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
+\fBhttpd(8)\fR, \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR,
 \fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR
 */

cyrus-imapd-2.4.17.tar.gz/lib/imapurl.c -> cyrus-imapd-2.5.tar.gz/lib/imapurl.c Changed

@@ -38,50 +38,21 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: imapurl.c,v 1.18 2010/01/06 17:01:45 murch Exp $
- *
 * derived from chris newman's code
 */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <time.h>
 
 #include "imapurl.h"
 #include "xmalloc.h"
+#include "times.h"
 #include "util.h"
 
-/* hexadecimal lookup table */
-static const char hex = "0123456789ABCDEF";
-
-#define XX 127
-/*
- * Table for decoding hexadecimal in %encoding
- */
-static const char index_hex256 = {
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,XX,XX, XX,XX,XX,XX,
- XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
- XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-};
-#define HEXCHAR(c) (index_hex(unsigned char)(c))
-
 /* URL unsafe printable characters */
 static const char urlunsafe = " \"#%&+:;<=>?@\\^`{|}";
 
@@ -124,10 +95,8 @@
 if (c != '&' || *src == '-') {
 if (c < ' ' || c > '~' || strchr(urlunsafe, c) != NULL) {
 /* hex encode if necessary */
- dst0 = '%';
- dst1 = hexc >> 4;
- dst2 = hexc & 0x0f;
- dst += 3;
+ *dst++ = '%';
+		dst += bin_to_hex(&c, 1, dst, BH_UPPER);
 } else {
 /* encode literally */
 *dst++ = c;
@@ -179,13 +148,12 @@
 utf83 = 0x80 | (ucs4 & 0x3f);
 i = 4;
 }
- /* convert utf8 to hex */
- for (c = 0; c < i; ++c) {
- dst0 = '%';
- dst1 = hexutf8c >> 4;
- dst2 = hexutf8c & 0x0f;
- dst += 3;
- }
+ /* convert utf8 to hex.
+		 * RFC3986 says: For consistency, URI producers and
+		 * normalizers should use uppercase hexadecimal digits
+		 * for all percent-encodings. */
+		 *dst++ = '%';
+		 dst += bin_to_hex(utf8, i, dst, BH_UPPER|BH_SEPARATOR('%'));
 }
 }
 /* skip over trailing '-' in modified UTF-7 encoding */
@@ -200,9 +168,10 @@
 * dst should be about twice the length of src to deal with non-hex
 * coded URLs
 */
-int URLtoMailbox(char *dst, const char *src)
+EXPORTED int URLtoMailbox(char *dst, const char *src)
 {
- unsigned int utf8pos = 0, utf8total, i, c, utf7mode, bitstogo, utf16flag;
+ unsigned char c;
+ unsigned int utf8pos = 0, utf8total, utf7mode, bitstogo, utf16flag;
 unsigned long ucs4 = 0, bitbuf = 0;
 
 utf7mode = 0; /* is the output UTF7 currently in base64 mode? */
@@ -214,12 +183,8 @@
 ++src;
 /* undo hex-encoding */
 if (c == '%' && src0 != '\0' && src1 != '\0') {
-	 c = HEXCHAR(src0);
-	 i = HEXCHAR(src1);
-	 if (c == XX || i == XX)
+	 if (hex_to_bin(src, 2, &c) != 1)
 		return -1;
-	 else
-		c = (char)((c << 4) | i);
 src += 2;
 }
 
@@ -335,18 +300,13 @@
 static int decode_url(char *dst, char *src)
 {
 unsigned char c;
- unsigned char i;
 
 while ((c = (unsigned char)*src) != '\0') {
 ++src;
 /* undo hex-encoding */
 if (c == '%' && src0 != '\0' && src1 != '\0') {
-	 c = HEXCHAR(src0);
-	 i = HEXCHAR(src1);
-	 if (c == XX || i == XX)
+	 if (hex_to_bin(src, 2, &c) != 1)
 		return -1;
-	 else
-		c = (char)((c << 4) | i);
 src += 2;
 }
 *dst++ = (char) c;
@@ -358,13 +318,7 @@
 return 0;
 }
 
-static const int numdays = {
- 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-#define isleap(year) (!((year) % 4) && (((year) % 100) || !((year) % 400)))
-
-int imapurl_fromURL(struct imapurl *url, const char *s)
+EXPORTED int imapurl_fromURL(struct imapurl *url, const char *s)
 {
 char *src;
 int step = 0; /* used to force correct ordering of url parts */
@@ -452,53 +406,13 @@
 		step = 4;
 	 }
 	 else if (step >= 2 && step < 5 && !strncasecmp(src, "expire=", 7)) {
-		struct tm exp;
-		int n, tm_off, leapday;
+		int n;
 
 		src += 7; /* skip expire= */
-
-		/* parse the ISO 8601 date/time */
-		memset(&exp, 0, sizeof(struct tm));
-		n = sscanf(src, "%4d-%2d-%2dT%2d:%2d:%2d", 
-			 &exp.tm_year, &exp.tm_mon, &exp.tm_mday,
-			 &exp.tm_hour, &exp.tm_min, &exp.tm_sec);
-		if (n != 6) return -1;
-
-		src += 19;
-		if (*src == '.') {
-		 /* skip fractional secs */
-		 while (Uisdigit(*(++src)));
-		}
-
-		/* handle offset */
-		switch (*src++) {
-		case 'Z': tm_off = 0; break;
-		case '-': tm_off = -1; break;
-		case '+': tm_off = 1; break;
-		default: return -1;
-		}
-		if (tm_off) {
-		 int tm_houroff, tm_minoff;
-
-		 n = sscanf(src, "%2d:%2d", &tm_houroff, &tm_minoff);
-		 if (n != 2) return -1;
-		 tm_off *= 60 * (60 * tm_houroff + tm_minoff);
-		}
-
-		exp.tm_year -= 1900; /* normalize to years since 1900 */
-		exp.tm_mon--; /* normalize to months since January */
-
-		/* sanity check the date/time (including leap day & second) */
-		leapday = exp.tm_mon == 1 && isleap(exp.tm_year + 1900);
-		if (exp.tm_year < 70 || exp.tm_mon < 0 || exp.tm_mon > 11 ||
-		 exp.tm_mday < 1 ||
-		 exp.tm_mday > (numdaysexp.tm_mon + leapday) ||
-		 exp.tm_hour > 23 || exp.tm_min > 59 || exp.tm_sec > 60) {
+		n = time_from_iso8601(src, &url->urlauth.expire);
+		if (n < 0)
 		 return -1;
-		}
-
-		/* normalize to GMT */
-		url->urlauth.expire = mktime(&exp) - tm_off;
+		src += n;
 		step = 5;
 	 }
 	 else if (step >= 2 && step < 6 && !strncasecmp(src, "urlauth=", 8)) {
@@ -535,18 +449,23 @@
 return 0;
 }
 
-void imapurl_toURL(char *dst, struct imapurl *url)
+EXPORTED void imapurl_toURL(char *dst, struct imapurl *url)
 {
+
+ if (url->server) {
+	dst += sprintf(dst, "imap://");
+	if (url->user) dst += sprintf(dst, "%s", url->user);
+	if (url->auth) dst += sprintf(dst, ";AUTH=%s", url->auth);
+	if (url->user || url->auth)
+	 *dst++ = '@';
+	dst += sprintf(dst, "%s", url->server);
+ }
 if (url->mailbox) {
-	if (url->server) {
-	 dst += sprintf(dst, "imap://");
-	 if (url->auth) dst += sprintf(dst, ";AUTH=%s@", url->auth);
-	 dst += sprintf(dst, "%s", url->server);
-	}
 	*dst++ = '/';
 	MailboxToURL(dst, url->mailbox);
 	dst += strlen(dst);
 }
+
 if (url->uidvalidity)
 	dst += sprintf(dst, ";UIDVALIDITY=%lu", url->uidvalidity);
 if (url->uid) {
@@ -559,8 +478,9 @@
 }
 if (url->urlauth.access) {
 	if (url->urlauth.expire) {
-	 struct tm *exp = (struct tm *) gmtime(&url->urlauth.expire);
-	 dst += strftime(dst, INT_MAX, ";EXPIRE=%Y-%m-%dT%H:%M:%SZ", exp);
+	 strcpy(dst, ";EXPIRE=");
+	 dst += strlen(dst);
+	 dst += time_to_iso8601(url->urlauth.expire, dst, INT_MAX);
 	}
 	dst += sprintf(dst, ";URLAUTH=%s", url->urlauth.access);
 	if (url->urlauth.mech) {

cyrus-imapd-2.4.17.tar.gz/lib/imapurl.h -> cyrus-imapd-2.5.tar.gz/lib/imapurl.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/imclient.c -> cyrus-imapd-2.5.tar.gz/lib/imclient.c Changed

@@ -38,25 +38,17 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imclient.c,v 1.95 2010/01/06 17:01:45 murch Exp $
 */
 
 #include <config.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
-#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -80,8 +72,7 @@
 #include "exitcodes.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
-#include "imparse.h"
+#include "strarray.h"
 #include "imclient.h"
 #include "nonblock.h"
 #include "util.h"
@@ -106,12 +97,6 @@
 void *rock;			/* Callback rock */
 };
 
-struct stringlist 
-{
- char *str;
- struct stringlist *next;
-};
-
 /* Connection data */
 struct imclient {
 /* TCP stream */
@@ -155,7 +140,7 @@
 int callback_alloc;
 struct imclient_callback *callback;
 
- struct stringlist *interact_results;
+ strarray_t interact_results;
 
 sasl_conn_t *saslconn;
 int saslcompleted;
@@ -194,8 +179,6 @@
 static struct imclient_cmdcallback *cmdcallback_freelist;
 
 /* Forward declarations */
-void imclient_write(struct imclient *imclient,
-		 const char *s, size_t len);
 static int imclient_writeastring P((struct imclient *imclient,
 				 const char *str));
 static void imclient_writebase64 P((struct imclient *imclient,
@@ -220,7 +203,7 @@
 * was not found, or -2 if the service name was not found.
 * use sasl callbacks 'cbs'
 */
-int imclient_connect(struct imclient **imclient, 
+EXPORTED int imclient_connect(struct imclient **imclient,
 		 const char *host, 
 		 const char *port, 
 		 sasl_callback_t *cbs)
@@ -262,7 +245,7 @@
 freeaddrinfo(res0);
 (*imclient)->outptr = (*imclient)->outstart = (*imclient)->outbuf;
 (*imclient)->outleft = (*imclient)->maxplain = sizeof((*imclient)->outbuf);
- (*imclient)->interact_results = NULL;
+ strarray_init(&(*imclient)->interact_results);
 imclient_addcallback(*imclient,
 		 "", 0, (imclient_proc_t *) 0, (void *)0,
 		 "OK", CALLBACK_NOLITERAL, (imclient_proc_t *)0, (void *)0,
@@ -300,10 +283,9 @@
 * Close and free the connection 'imclient'
 */
 void
-imclient_close(struct imclient *imclient)
+EXPORTED imclient_close(struct imclient *imclient)
 {
 int i;
- struct stringlist *cur, *cur_next;
 
 assert(imclient);
 
@@ -316,30 +298,26 @@
 for (i = 0; i < imclient->callback_num; i++) {
 	free(imclient->callbacki.keyword);
 }
- if (imclient->callback) free((char *)imclient->callback);
+ if (imclient->callback) free(imclient->callback);
 
- for(cur=imclient->interact_results; cur; cur=cur_next) {
-	cur_next = cur->next;
-	free(cur->str);
-	free(cur);
- }
+ strarray_fini(&imclient->interact_results);
 
- free((char *)imclient);
+ free(imclient);
 }
 
-void imclient_setflags(struct imclient *imclient, int flags)
+EXPORTED void imclient_setflags(struct imclient *imclient, int flags)
 {
 assert(imclient);
 imclient->flags |= flags;
 }
 
-void imclient_clearflags(struct imclient *imclient, int flags)
+EXPORTED void imclient_clearflags(struct imclient *imclient, int flags)
 {
 assert(imclient);
 imclient->flags &= ~flags;
 }
 
-char *
+EXPORTED char *
 imclient_servername(struct imclient *imclient)
 {
 assert(imclient);
@@ -366,12 +344,7 @@
 * may scribble on the text of the untagged data.
 * 
 */
-#ifdef __STDC__
-void imclient_addcallback(struct imclient *imclient, ...)
-#else
-void imclient_addcallback(va_alist)
-va_dcl
-#endif
+EXPORTED void imclient_addcallback(struct imclient *imclient, ...)
 {
 va_list pvar;
 char *keyword;
@@ -379,14 +352,7 @@
 imclient_proc_t *proc;
 void *rock;
 int i;
-#ifdef __STDC__
 va_start(pvar, imclient);
-#else
- struct imclient *imclient;
-
- va_start(pvar);
- imclient = va_arg(pvar, struct imclient *);
-#endif
 
 assert(imclient);
 
@@ -445,15 +411,9 @@
 * which are written as space separated astrings)
 * %B -- (internal use only) base64-encoded data at end of command line
 */ 
-#ifdef __STDC__
-void
-imclient_send(struct imclient *imclient, void (*finishproc)(),
+EXPORTED void
+imclient_send(struct imclient *imclient, imclient_proc_t *finishproc,
 	 void *finishrock, const char *fmt, ...)
-#else
-void
-imclient_send(va_alist)
-va_dcl
-#endif
 {
 va_list pvar;
 struct imclient_cmdcallback *newcmdcallback;
@@ -462,20 +422,7 @@
 int num;
 unsigned unum;
 int abortcommand = 0;
-#ifdef __STDC__
 va_start(pvar, fmt);
-#else
- struct imclient *imclient;
- imclient_proc_t *finishproc;
- void *finishrock;
- char *fmt;
-
- va_start(pvar);
- imclient = va_arg(pvar, struct imclient *);
- finishproc = va_arg(pvar, imclient_proc_t *);
- finishrock = va_arg(pvar, void *);
- fmt = va_arg(pvar, char *);
-#endif
 
 assert(imclient);
 
@@ -975,7 +922,7 @@
 * 'wanttowrite' is filled in with nonzero value iff should
 * select() for write as well.
 */
-void imclient_getselectinfo(struct imclient *imclient, int *fd,
+EXPORTED void imclient_getselectinfo(struct imclient *imclient, int *fd,
 			 int *wanttowrite)
 {
 assert(imclient);
@@ -989,7 +936,7 @@
 /*
 * Process one input or output event on the connection 'imclient'.
 */
-void imclient_processoneevent(struct imclient *imclient)
+EXPORTED void imclient_processoneevent(struct imclient *imclient)
 {
 char bufIMCLIENT_BUFSIZE;
 int n;
@@ -1152,49 +1099,36 @@
 return ret;
 }
 
-void interaction (struct imclient *context, sasl_interact_t *t, char *user)
+static void interaction(struct imclient *context, sasl_interact_t *t, char *user)
 {
- char result1024;
- struct stringlist *cur;
- 
- assert(context);
- assert(t);
-
- cur = malloc(sizeof(struct stringlist));
- if(!cur) {
- t->len=0;
- t->result=NULL;
- return;
- }
+ char result1024;
+ char *str = NULL;
 
- cur->str = NULL;
- cur->next = context->interact_results;
- context->interact_results = cur;
+ assert(context);
+ assert(t);
 
- if ((t->id == SASL_CB_USER || t->id == SASL_CB_AUTHNAME) 
+ if ((t->id == SASL_CB_USER || t->id == SASL_CB_AUTHNAME)
 && user && user0) {
- t->len = strlen(user);
- cur->str = xstrdup(user);
- } else {
- printf("%s: ", t->prompt);
- if (t->id == SASL_CB_PASS) {
-	 char *ptr = cyrus_getpass("");
-	 strlcpy(result, ptr, sizeof(result));
- } else {
-	 if (!fgets(result, sizeof(result)-1, stdin)) return;
-	 resultstrlen(result) - 1 = '\0';
- }
-
- t->len = strlen(result);
- cur->str = (char *) xmalloc(t->len+1);
- memset(cur->str, 0, t->len+1);
- memcpy(cur->str, result, t->len);
- }
+	str = xstrdup(user);
+ } else {
+	printf("%s: ", t->prompt);
+	if (t->id == SASL_CB_PASS) {
+	 char *ptr = cyrus_getpass("");
+	 strlcpy(result, ptr, sizeof(result));
+	} else {
+	 if (!fgets(result, sizeof(result)-1, stdin))
+		return;
+	}
+	str = xstrdup(result);
+ }
 
- t->result = cur->str;
+ assert(str);
+ t->result = str;
+ t->len = strlen(str);
+ strarray_appendm(&context->interact_results, str);
 }
 
-void fillin_interactions(struct imclient *context,
+EXPORTED void fillin_interactions(struct imclient *context,
 			 sasl_interact_t *tlist, char *user)
 {
 assert(context);
@@ -1357,7 +1291,7 @@
 }
 
 /* xxx service is not needed here */
-int imclient_authenticate(struct imclient *imclient, 
+EXPORTED int imclient_authenticate(struct imclient *imclient,
 			 char *mechlist, 
 			 char *service __attribute__((unused)),
 			 char *user,
@@ -1555,7 +1489,6 @@
 
 #define CCERT_BUFSIZ 256
 static char peer_CNCCERT_BUFSIZ;
-static char issuer_CNCCERT_BUFSIZ;
 
 /*
 * Set up the cert things on the server side. We do need both the
@@ -1878,59 +1811,55 @@
 }
 #endif
 
-int tls_start_clienttls(struct imclient *imclient,
+EXPORTED int tls_start_clienttls(struct imclient *imclient,
 			unsigned *layer, char **authid, int fd)
 {
- int sts;
+ int sts;
 SSL_SESSION *session;
 const SSL_CIPHER *cipher;
- X509 *peer;
+ X509 *peer;
 int tls_cipher_usebits = 0;
 int tls_cipher_algbits = 0;
 char *tls_peer_CN = "";
- char *tls_issuer_CN = NULL;
 
- if (imclient->tls_conn == NULL) {
+ if (!imclient->tls_conn)
 	imclient->tls_conn = (SSL *) SSL_new(imclient->tls_ctx);
- }
- if (imclient->tls_conn == NULL) {
+
+ if (!imclient->tls_conn) {
 	printf("Could not allocate 'con' with SSL_new()\n");
 	return -1;
 }
+
 SSL_clear(imclient->tls_conn);
 
 if (!SSL_set_fd(imclient->tls_conn, fd)) {
- printf("SSL_set_fd failed\n");
- return -1;
+	printf("SSL_set_fd failed\n");
+	return -1;
 }
 
- /*SSL_set_read_ahead(imclient->tls_conn, 1);*/
-
 /*
 * This is the actual handshake routine. It will do all the negotiations
 * and will check the client cert etc.
 */
 SSL_set_connect_state(imclient->tls_conn);
 
-
 /*
 * We do have an SSL_set_fd() and now suddenly a BIO_ routine is called?
 * Well there is a BIO below the SSL routines that is automatically
 * created for us, so we can use it for debugging purposes.
 */
- /* if (verbose==1) */
- /* BIO_set_callback(SSL_get_rbio(imclient->tls_conn), bio_dump_cb);*/
 
 /* Dump the negotiation for loglevels 3 and 4 */
 
- if ((sts = SSL_connect(imclient->tls_conn)) <= 0) {
+ sts = SSL_connect(imclient->tls_conn);
+ if (sts <= 0) {
 	printf(" SSL_connect error %d \n", sts); /* xxx get string error? */
 	session = SSL_get_session(imclient->tls_conn);
 	if (session) {
 	 SSL_CTX_remove_session(imclient->tls_ctx, session);
 	 printf(" SSL session removed \n");
 	}
-	if (imclient->tls_conn!=NULL)
+	if (imclient->tls_conn)
 	 SSL_free(imclient->tls_conn);
 	imclient->tls_conn = NULL;
 	return -1;
@@ -1941,43 +1870,36 @@
 * the actual information. We want to save it for later use.
 */
 peer = SSL_get_peer_certificate(imclient->tls_conn);
- if (peer != NULL) {
+ if (peer) {
 	X509_NAME_get_text_by_NID(X509_get_subject_name(peer),
-			 NID_commonName, peer_CN, CCERT_BUFSIZ);
+				 NID_commonName, peer_CN, CCERT_BUFSIZ);
 	tls_peer_CN = peer_CN;
-	X509_NAME_get_text_by_NID(X509_get_issuer_name(peer),
-			 NID_commonName, issuer_CN, CCERT_BUFSIZ);
-	/*	if (verbose==1)
-		printf("subject_CN=%s, issuer_CN=%s\n", peer_CN, issuer_CN);*/
-	tls_issuer_CN = issuer_CN;
-
 }
+
 cipher = SSL_get_current_cipher(imclient->tls_conn);
 tls_cipher_usebits = SSL_CIPHER_get_bits(cipher,
-						 &tls_cipher_algbits);
+					 &tls_cipher_algbits);
 
- if (layer!=NULL)
- *layer = tls_cipher_usebits;
+ if (layer)
+	*layer = tls_cipher_usebits;
 
- if (authid!=NULL)
- *authid = tls_peer_CN;
+ if (authid)
+	*authid = tls_peer_CN;
 
- /* printf("TLS connection established: %s with cipher %s (%d/%d bits)\n",
-	 tls_protocol, tls_cipher_name,
-	 tls_cipher_usebits, tls_cipher_algbits);*/
 return 0;
 }
 #endif /* HAVE_SSL */
 
-int imclient_havetls () {
+EXPORTED int imclient_havetls(void)
+{
 #ifdef HAVE_SSL
- return 1;
+ return 1;
 #else
- return 0;
+ return 0;
 #endif
 }
 
-int imclient_starttls(struct imclient *imclient,
+EXPORTED int imclient_starttls(struct imclient *imclient,
 			 char *cert_file,
 			 char *key_file,
 char *CAfile,

cyrus-imapd-2.4.17.tar.gz/lib/imclient.h -> cyrus-imapd-2.5.tar.gz/lib/imclient.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/imparse.c -> cyrus-imapd-2.5.tar.gz/lib/imparse.c Changed

@@ -38,13 +38,10 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: imparse.c,v 1.15 2010/01/06 17:01:45 murch Exp $
 */
 
 #include <config.h>
 #include <stdio.h>
-#include <ctype.h>
 
 #include "imparse.h"
 #include "util.h"
@@ -55,12 +52,10 @@
 * returns the character following the word, and modifies the pointer at
 * 's' to point after the returned character. Modifies the input buffer.
 */
-int imparse_word(s, retval)
-char **s;
-char **retval;
+EXPORTED int imparse_word(char **s, char **retval)
 {
 int c;
- 
+
 *retval = *s;
 for (;;) {
 	c = *(*s)++;
@@ -80,9 +75,7 @@
 * at the empty string, and modifies 's' to point around the syntax error.
 * Modifies the input buffer.
 */
-int imparse_astring(s, retval)
-char **s;
-char **retval;
+EXPORTED int imparse_astring(char **s, char **retval)
 {
 int c;
 char *d;
@@ -151,14 +144,14 @@
 /*
 * Return nonzero if 's' matches the grammar for an atom
 */
-int imparse_isatom(s)
-const char *s;
+EXPORTED int imparse_isnatom(const char *s, int maxlen)
 {
 int len = 0;
 
 if (!*s) return 0;
 for (; *s; s++) {
 	len++;
+	if (maxlen && len > maxlen) break;
 	if (*s & 0x80 || *s < 0x1f || *s == 0x7f ||
 	 *s == ' ' || *s == '{' || *s == '(' || *s == ')' ||
 	 *s == '\"' || *s == '%' || *s == '*' || *s == '\\') return 0;
@@ -167,10 +160,15 @@
 return 1;
 }
 
+EXPORTED int imparse_isatom(const char *s)
+{
+ return imparse_isnatom(s, 0);
+}
+
 /*
 * Return nonzero if 's' matches the grammar for a sequence
 */
-int imparse_issequence(const char* s)
+EXPORTED int imparse_issequence(const char* s)
 {
 int c;
 int len = 0;
@@ -205,7 +203,7 @@
 /*
 * Return nonzero if 's' matches the grammar for a number
 */
-int imparse_isnumber(const char *s)
+EXPORTED int imparse_isnumber(const char *s)
 {
 if (!*s) return 0;
 for (; *s; s++) {

cyrus-imapd-2.4.17.tar.gz/lib/imparse.h -> cyrus-imapd-2.5.tar.gz/lib/imparse.h Changed

cyrus-imapd-2.5.tar.gz/lib/iostat.c Added

cyrus-imapd-2.5.tar.gz/lib/iostat.h Added

cyrus-imapd-2.4.17.tar.gz/lib/iptostring.c -> cyrus-imapd-2.5.tar.gz/lib/iptostring.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/iptostring.h -> cyrus-imapd-2.5.tar.gz/lib/iptostring.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/libconfig.c -> cyrus-imapd-2.5.tar.gz/lib/libconfig.c Changed

@@ -38,12 +38,11 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: libconfig.c,v 1.26 2010/04/19 19:54:26 murch Exp $
 */
 
 #include <config.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,9 +53,9 @@
 #include <sys/stat.h>
 
 #include "assert.h"
+#include "exitcodes.h"
 #include "hash.h"
 #include "libconfig.h"
-#include "imapopts.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
 #include "xstrlcpy.h"
@@ -69,31 +68,31 @@
 static struct hash_table confighash, includehash;
 
 /* cached configuration variables accessible to the external world */
-const char *config_filename= NULL; /* filename of configuration file */
-const char *config_dir = NULL;		 /* ie /var/imap */
-const char *config_defpartition = NULL; /* /var/spool/imap */
-const char *config_servername= NULL;	 /* gethostname() */
-enum enum_value config_serverinfo;	 /* on */
-const char *config_mupdate_server = NULL;/* NULL */
-const char *config_defdomain = NULL; /* NULL */
-const char *config_ident = NULL; /* the service name */
-int config_hashimapspool;	 /* f */
-enum enum_value config_virtdomains;	 /* f */
-enum enum_value config_mupdate_config;	/* IMAP_ENUM_MUPDATE_CONFIG_STANDARD */
-int config_auditlog;
-unsigned config_maxword;
-unsigned config_maxquoted;
-int config_qosmarking;
-
-/* declared in each binary that uses libconfig */
-extern const int config_need_data;
+EXPORTED const char *config_filename= NULL; /* filename of configuration file */
+EXPORTED const char *config_dir = NULL;		 /* ie /var/imap */
+EXPORTED const char *config_defpartition = NULL; /* /var/spool/imap */
+EXPORTED const char *config_servername= NULL;	 /* gethostname() */
+EXPORTED enum enum_value config_serverinfo;	 /* on */
+EXPORTED const char *config_mupdate_server = NULL;/* NULL */
+EXPORTED const char *config_defdomain = NULL; /* NULL */
+EXPORTED const char *config_ident = NULL; /* the service name */
+EXPORTED int config_hashimapspool;	 /* f */
+EXPORTED enum enum_value config_virtdomains;	 /* f */
+EXPORTED enum enum_value config_mupdate_config;	/* IMAP_ENUM_MUPDATE_CONFIG_STANDARD */
+EXPORTED int config_auditlog;
+EXPORTED int config_iolog;
+EXPORTED unsigned config_maxword;
+EXPORTED unsigned config_maxquoted;
+EXPORTED int config_qosmarking;
+EXPORTED int config_debug;
+
 extern void fatal(const char *fatal_message, int fatal_code)
 __attribute__ ((noreturn));
 
 /* prototype to allow for sane function ordering */
-void config_read_file(const char *filename);
+static void config_read_file(const char *filename);
 
-const char *config_getstring(enum imapopt opt)
+EXPORTED const char *config_getstring(enum imapopt opt)
 {
 assert(opt > IMAPOPT_ZERO && opt < IMAPOPT_LAST);
 assert((imapoptsopt.t == OPT_STRING) ||
@@ -102,7 +101,7 @@
 return imapoptsopt.val.s;
 }
 
-int config_getint(enum imapopt opt)
+EXPORTED int config_getint(enum imapopt opt)
 {
 assert(opt > IMAPOPT_ZERO && opt < IMAPOPT_LAST);
 assert(imapoptsopt.t == OPT_INT);
@@ -116,7 +115,7 @@
 return imapoptsopt.val.i;
 }
 
-int config_getswitch(enum imapopt opt)
+EXPORTED int config_getswitch(enum imapopt opt)
 {
 assert(opt > IMAPOPT_ZERO && opt < IMAPOPT_LAST);
 assert(imapoptsopt.t == OPT_SWITCH);
@@ -130,7 +129,7 @@
 return imapoptsopt.val.b;
 }
 
-enum enum_value config_getenum(enum imapopt opt)
+EXPORTED enum enum_value config_getenum(enum imapopt opt)
 {
 assert(opt > IMAPOPT_ZERO && opt < IMAPOPT_LAST);
 assert(imapoptsopt.t == OPT_ENUM);
@@ -138,7 +137,7 @@
 return imapoptsopt.val.e;
 }
 
-unsigned long config_getbitfield(enum imapopt opt)
+EXPORTED unsigned long config_getbitfield(enum imapopt opt)
 {
 assert(opt > IMAPOPT_ZERO && opt < IMAPOPT_LAST);
 assert(imapoptsopt.t == OPT_BITFIELD);
@@ -146,7 +145,7 @@
 return imapoptsopt.val.x;
 }
 
-const char *config_getoverflowstring(const char *key, const char *def)
+EXPORTED const char *config_getoverflowstring(const char *key, const char *def)
 {
 char buf256;
 char *ret = NULL;
@@ -172,15 +171,15 @@
 return ret ? ret : def;
 }
 
-void config_foreachoverflowstring(void (*func)(const char *, const char *, void *),
+EXPORTED void config_foreachoverflowstring(void (*func)(const char *, const char *, void *),
 				 void *rock)
 {
 if (!config_filename) return;
 
- hash_enumerate(&confighash, (void (*)(char *, void *, void *)) func, rock);
+ hash_enumerate(&confighash, (void (*)(const char *, void *, void *)) func, rock);
 }
 
-const char *config_partitiondir(const char *partition)
+EXPORTED const char *config_partitiondir(const char *partition)
 {
 char buf80;
 
@@ -192,7 +191,7 @@
 return config_getoverflowstring(buf, NULL);
 }
 
-const char *config_metapartitiondir(const char *partition)
+EXPORTED const char *config_metapartitiondir(const char *partition)
 {
 char buf80;
 
@@ -204,6 +203,18 @@
 return config_getoverflowstring(buf, NULL);
 }
 
+EXPORTED const char *config_archivepartitiondir(const char *partition)
+{
+ char buf80;
+
+ if(strlcpy(buf, "archivepartition-", sizeof(buf)) >= sizeof(buf))
+	return 0;
+ if(strlcat(buf, partition, sizeof(buf)) >= sizeof(buf))
+	return 0;
+
+ return config_getoverflowstring(buf, NULL);
+}
+
 static void config_ispartition(const char *key,
 			 const char *val __attribute__((unused)),
 			 void *rock)
@@ -213,6 +224,53 @@
 if (!strncmp("partition-", key, 10)) *found = 1;
 }
 
+/*
+ * Reset the global configuration to a virginal state. This is
+ * only useful for unit tests.
+ */
+EXPORTED void config_reset(void)
+{
+ enum imapopt opt;
+
+ if (!config_filename)
+	return;
+
+ free((char *)config_filename);
+ config_filename = NULL;
+ if (config_servername != config_getstring(IMAPOPT_SERVERNAME))
+	free((char *)config_servername);
+ config_servername = NULL;
+ config_defpartition = NULL;
+ config_mupdate_server = NULL;
+ config_mupdate_config = 0;
+ config_hashimapspool = 0;
+ config_virtdomains = 0;
+ config_defdomain = NULL;
+ config_auditlog = 0;
+ config_serverinfo = 0;
+ config_maxquoted = 0;
+ config_maxword = 0;
+ config_qosmarking = 0;
+ config_debug = 0;
+
+ /* reset all the options */
+ for (opt = IMAPOPT_ZERO; opt < IMAPOPT_LAST; opt++) {
+	if (imapoptsopt.t == OPT_STRING &&
+	 (imapoptsopt.seen ||
+	 (imapoptsopt.def.s &&
+	 !strncasecmp(imapoptsopt.def.s, "{configdirectory}", 17))))
+	 free((char *)imapoptsopt.val.s);
+	memcpy(&imapoptsopt.val,
+	 &imapoptsopt.def,
+	 sizeof(imapoptsopt.val));
+	imapoptsopt.seen = 0;
+ }
+ config_dir = NULL;
+
+ /* free the overflow table */
+ free_hash_table(&confighash, free);
+}
+
 static const unsigned char qos = {
 /* cs0..cs7 */		0x00, 0x20, 0x40, 0x60, 0x80, 0xa0, 0xc0, 0xe0,
 /* af11..af13 */	0x28, 0x30, 0x38,
@@ -222,7 +280,8 @@
 /* ef */		0xb8
 };
 
-void config_read(const char *alt_config)
+
+EXPORTED void config_read(const char *alt_config, const int config_need_data)
 {
 enum imapopt opt = IMAPOPT_ZERO;
 char buf4096;
@@ -291,9 +350,12 @@
 /* Look up default partition */
 config_defpartition = config_getstring(IMAPOPT_DEFAULTPARTITION);
 for (p = (char *)config_defpartition; p && *p; p++) {
-	if (!Uisalnum(*p))
-	 fatal("defaultpartition option contains non-alphanumeric character",
-		EC_CONFIG);
+	if (!Uisalnum(*p)) {
+	 syslog(LOG_ERR, "INVALID defaultpartition: %s",
+		 config_defpartition);
+	 fatal("defaultpartition option contains non-alnum character",
+		 EC_CONFIG);
+	}
 	if (Uisupper(*p)) *p = tolower((unsigned char) *p);
 }
 
@@ -337,6 +399,15 @@
 /* are we auditlogging */
 config_auditlog = config_getswitch(IMAPOPT_AUDITLOG);
 
+ /* are we doing I/O logging */
+ config_iolog = config_getswitch(IMAPOPT_IOLOG);
+ if (config_iolog) {
+ if (access("/proc/self/io", R_OK)) {
+ config_iolog = 0;
+ syslog(LOG_WARNING,"iolog directive need a kernel builded with I/O account");
+ }
+ }
+
 /* look up the hostname and info we should present to the user */
 config_servername = config_getstring(IMAPOPT_SERVERNAME);
 if (!config_servername) {
@@ -351,11 +422,14 @@
 
 ival = config_getenum(IMAPOPT_QOSMARKING);
 config_qosmarking = qosival;
+
+ /* allow debug logging */
+ config_debug = config_getswitch(IMAPOPT_DEBUG);
 }
 
 #define GROWSIZE 4096
 
-void config_read_file(const char *filename)
+static void config_read_file(const char *filename)
 {
 FILE *infile = NULL;
 enum imapopt opt = IMAPOPT_ZERO;

cyrus-imapd-2.4.17.tar.gz/lib/libconfig.h -> cyrus-imapd-2.5.tar.gz/lib/libconfig.h Changed

@@ -38,19 +38,17 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: libconfig.h,v 1.11 2010/04/19 19:54:26 murch Exp $
 */
 
 #ifndef INCLUDED_LIBCONFIG_H
 #define INCLUDED_LIBCONFIG_H
 
-#include "exitcodes.h"
 #include "imapopts.h"
 
 /* these will assert() if they're called on the wrong type of
 option (imapopts.c) */
-extern void config_read(const char *alt_config);
+extern void config_reset(void);
+extern void config_read(const char *alt_config, const int config_need_data);
 extern const char *config_getstring(enum imapopt opt);
 extern int config_getint(enum imapopt opt);
 extern int config_getswitch(enum imapopt opt);
@@ -64,6 +62,7 @@
 void (*func)(const char *, const char *, void *), void *rock);
 extern const char *config_partitiondir(const char *partition);
 extern const char *config_metapartitiondir(const char *partition);
+extern const char *config_archivepartitiondir(const char *partition);
 
 /* cached configuration variables accessable to external world */
 extern const char *config_filename;
@@ -79,9 +78,11 @@
 extern enum enum_value config_virtdomains;
 extern enum enum_value config_mupdate_config;
 extern int config_auditlog;
+extern int config_iolog;
 extern unsigned config_maxquoted;
 extern unsigned config_maxword;
 extern int config_qosmarking;
+extern int config_debug;
 
 /* config requirement flags */
 #define CONFIG_NEED_PARTITION_DATA (1<<0)

cyrus-imapd-2.4.17.tar.gz/lib/libcyr_cfg.c -> cyrus-imapd-2.5.tar.gz/lib/libcyr_cfg.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: libcyr_cfg.c,v 1.18 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -59,7 +57,7 @@
 #define CFGVAL(t,v)	{(void *)(v)}
 #endif
 
-struct cyrusopt_s cyrus_options = {
+static struct cyrusopt_s cyrus_options = {
 { CYRUSOPT_ZERO, { NULL }, CYRUS_OPT_NOTOPT },
 
 { CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
@@ -135,7 +133,7 @@
 CYRUS_OPT_STRING },
 
 { CYRUSOPT_SQL_ENGINE,
- CFGVAL(const char *, "mysql"),
+ CFGVAL(const char *, NULL),
 CYRUS_OPT_STRING },
 
 { CYRUSOPT_SQL_HOSTNAMES,
@@ -161,7 +159,7 @@
 { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
 };
 
-const char *libcyrus_config_getstring(enum cyrus_opt opt)
+HIDDEN const char *libcyrus_config_getstring(enum cyrus_opt opt)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -170,7 +168,7 @@
 return cyrus_optionsopt.val.s;
 }
 
-int libcyrus_config_getint(enum cyrus_opt opt)
+HIDDEN int libcyrus_config_getint(enum cyrus_opt opt)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -183,7 +181,7 @@
 return cyrus_optionsopt.val.i;
 }
 
-int libcyrus_config_getswitch(enum cyrus_opt opt)
+EXPORTED int libcyrus_config_getswitch(enum cyrus_opt opt)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -196,7 +194,7 @@
 return cyrus_optionsopt.val.b;
 }
 
-void libcyrus_config_setstring(enum cyrus_opt opt, const char *val) 
+EXPORTED void libcyrus_config_setstring(enum cyrus_opt opt, const char *val)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -205,7 +203,7 @@
 cyrus_optionsopt.val.s = val;
 }
 
-void libcyrus_config_setint(enum cyrus_opt opt, int val)
+EXPORTED void libcyrus_config_setint(enum cyrus_opt opt, int val)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -214,7 +212,7 @@
 cyrus_optionsopt.val.i = val;
 }
 
-void libcyrus_config_setswitch(enum cyrus_opt opt, int val) 
+EXPORTED void libcyrus_config_setswitch(enum cyrus_opt opt, int val)
 {
 assert(opt > CYRUSOPT_ZERO && opt < CYRUSOPT_LAST);
 assert(cyrus_optionsopt.opt == opt);
@@ -223,12 +221,12 @@
 cyrus_optionsopt.val.b = val;
 }
 
-void libcyrus_init()
+EXPORTED void libcyrus_init(void)
 {
 cyrusdb_init();
 }
 
-void libcyrus_done()
+EXPORTED void libcyrus_done(void)
 {
 cyrusdb_done();
 }

cyrus-imapd-2.4.17.tar.gz/lib/libcyr_cfg.h -> cyrus-imapd-2.5.tar.gz/lib/libcyr_cfg.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/lock_fcntl.c -> cyrus-imapd-2.5.tar.gz/lib/lock_fcntl.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lock_fcntl.c,v 1.18 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -51,7 +49,7 @@
 
 #include "cyr_lock.h"
 
-const char *lock_method_desc = "fcntl";
+EXPORTED const char *lock_method_desc = "fcntl";
 
 /*
 * Block until we obtain an exclusive lock on the file descriptor 'fd',
@@ -67,11 +65,8 @@
 * string naming the action that failed.
 *
 */
-int lock_reopen(fd, filename, sbuf, failaction)
-int fd;
-const char *filename;
-struct stat *sbuf;
-const char **failaction;
+EXPORTED int lock_reopen(int fd, const char *filename,
+			 struct stat *sbuf, const char **failaction)
 {
 int r;
 struct flock fl;
@@ -122,68 +117,28 @@
 }
 
 /*
- * Obtain an exclusive lock on 'fd'.
- * Returns 0 for success, -1 for failure, with errno set to an
- * appropriate error code.
- */
-int lock_blocking(fd)
-int fd;
-{
- int r;
- struct flock fl;
-
- for (;;) {
-	fl.l_type= F_WRLCK;
-	fl.l_whence = SEEK_SET;
-	fl.l_start = 0;
-	fl.l_len = 0;
-	r = fcntl(fd, F_SETLKW, &fl);
-	if (r != -1) return 0;
-	if (errno == EINTR) continue;
-	return -1;
- }
-}
-
-/*
- * Obtain a shared lock on 'fd'.
- * Returns 0 for success, -1 for failure, with errno set to an
- * appropriate error code.
- */
-int lock_shared(fd)
-int fd;
-{
- int r;
- struct flock fl;
-
- for (;;) {
-	fl.l_type= F_RDLCK;
-	fl.l_whence = SEEK_SET;
-	fl.l_start = 0;
-	fl.l_len = 0;
-	r = fcntl(fd, F_SETLKW, &fl);
-	if (r != -1) return 0;
-	if (errno == EINTR) continue;
-	return -1;
- }
-}
-
-/*
- * Attempt to get an exclusive lock on 'fd' without blocking.
+ * Obtain a lock on 'fd'. The lock is exclusive if 'exclusive'
+ * is true, otherwise shared. Normally blocks until a lock is
+ * obtained, but if 'nonblock' is true does not block and instead
+ * fails with errno=EWOUDBLOCK if the lock cannot be obtained.
+ *
 * Returns 0 for success, -1 for failure, with errno set to an
 * appropriate error code.
 */
-int lock_nonblocking(fd)
-int fd;
+EXPORTED int lock_setlock(int fd, int exclusive, int nonblock,
+			 const char *filename __attribute__((unused)))
 {
 int r;
 struct flock fl;
+ int type = (exclusive ? F_WRLCK : F_RDLCK);
+ int cmd = (nonblock ? F_SETLK : F_SETLKW);
 
 for (;;) {
-	fl.l_type= F_WRLCK;
+	fl.l_type= type;
 	fl.l_whence = SEEK_SET;
 	fl.l_start = 0;
 	fl.l_len = 0;
-	r = fcntl(fd, F_SETLK, &fl);
+	r = fcntl(fd, cmd, &fl);
 	if (r != -1) return 0;
 	if (errno == EINTR) continue;
 	return -1;
@@ -193,7 +148,7 @@
 /*
 * Release any lock on 'fd'. Always returns success.
 */
-int lock_unlock(int fd)
+EXPORTED int lock_unlock(int fd, const char *filename __attribute__((unused)))
 { 
 struct flock fl;
 int r;

cyrus-imapd-2.4.17.tar.gz/lib/lock_flock.c -> cyrus-imapd-2.5.tar.gz/lib/lock_flock.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lock_flock.c,v 1.17 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -53,7 +51,7 @@
 
 #include "cyr_lock.h"
 
-const char *lock_method_desc = "flock";
+EXPORTED const char *lock_method_desc = "flock";
 
 /*
 * Block until we obtain an exclusive lock on the file descriptor 'fd',
@@ -69,11 +67,8 @@
 * string naming the action that failed.
 *
 */
-int lock_reopen(fd, filename, sbuf, failaction)
-int fd;
-const char *filename;
-struct stat *sbuf;
-const char **failaction;
+EXPORTED int lock_reopen(int fd, const char *filename,
+			 struct stat *sbuf, const char **failaction)
 {
 int r;
 struct stat sbuffile, sbufspare;
@@ -111,35 +106,23 @@
 }
 
 /*
- * Obtain an exclusive lock on 'fd'.
- * Returns 0 for success, -1 for failure, with errno set to an
- * appropriate error code.
- */
-int lock_blocking(fd)
-int fd;
-{
- int r;
-
- for (;;) {
-	r = flock(fd, LOCK_EX);
-	if (r != -1) return 0;
-	if (errno == EINTR) continue;
-	return -1;
- }
-}
-
-/*
- * Obtain a shared lock on 'fd'.
+ * Obtain a lock on 'fd'. The lock is exclusive if 'exclusive'
+ * is true, otherwise shared. Normally blocks until a lock is
+ * obtained, but if 'nonblock' is true does not block and instead
+ * fails with errno=EWOUDBLOCK if the lock cannot be obtained.
+ *
 * Returns 0 for success, -1 for failure, with errno set to an
 * appropriate error code.
 */
-int lock_shared(fd)
-int fd;
+EXPORTED int lock_setlock(int fd, int exclusive, int nonblock,
+			 const char *filename __attribute__((unused)))
 {
 int r;
+ int op = (exclusive ? LOCK_EX : LOCK_SH);
+ if (nonblock) op |= LOCK_NB;
 
 for (;;) {
-	r = flock(fd, LOCK_SH);
+	r = flock(fd, op);
 	if (r != -1) return 0;
 	if (errno == EINTR) continue;
 	return -1;
@@ -147,36 +130,18 @@
 }
 
 /*
- * Attempt to get an exclusive lock on 'fd' without blocking.
- * Returns 0 for success, -1 for failure, with errno set to an
- * appropriate error code.
+ * Release any lock on 'fd'. Always returns success.
 */
-int lock_nonblocking(fd)
-int fd;
+EXPORTED int lock_unlock(int fd, const char *filename __attribute__((unused)))
 {
 int r;
 
 for (;;) {
-	r = flock(fd, LOCK_EX|LOCK_NB);
+	r = flock(fd, LOCK_UN);
 	if (r != -1) return 0;
 	if (errno == EINTR) continue;
+	/* xxx help! */
 	return -1;
 }
 }
 
-/*
- * Release any lock on 'fd'. Always returns success.
- */
-int lock_unlock(int fd)
-{
- int r;
-
- for (;;) {
- r = flock(fd, LOCK_UN);
- if (r != -1) return 0;
- if (errno == EINTR) continue;
- /* xxx help! */
- return -1;
- }
-}
-

cyrus-imapd-2.4.17.tar.gz/lib/lsort.c -> cyrus-imapd-2.5.tar.gz/lib/lsort.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/lsort.h -> cyrus-imapd-2.5.tar.gz/lib/lsort.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/map.h -> cyrus-imapd-2.5.tar.gz/lib/map.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/map_nommap.c -> cyrus-imapd-2.5.tar.gz/lib/map_nommap.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: map_nommap.c,v 1.25 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -55,20 +53,15 @@
 
 #define SLOP (4*1024)
 
-const char *map_method_desc = "nommap";
+EXPORTED const char *map_method_desc = "nommap";
 
 /*
 * Create/refresh mapping of file
 */
 void
-map_refresh(fd, onceonly, base, len, newlen, name, mboxname)
-int fd;
-int onceonly;
-const char **base;
-unsigned long *len;
-unsigned long newlen;
-const char *name;
-const char *mboxname;
+EXPORTED map_refresh(int fd, int onceonly, const char **base,
+		 size_t *len, size_t newlen, const char *name,
+		 const char *mboxname)
 {
 char *p;
 int n, left;
@@ -84,7 +77,7 @@
 	}
 	newlen = sbuf.st_size;
 }
-	 
+
 /* Need a larger buffer */
 if (*len < newlen) {
 	if (*len) free((char *)*base);
@@ -121,9 +114,7 @@
 * Destroy mapping of file
 */
 void
-map_free(base, len)
-const char **base;
-unsigned long *len;
+EXPORTED map_free(const char **base, size_t *len)
 {
 if (*len) free((char *)*base);
 *base = 0;

cyrus-imapd-2.4.17.tar.gz/lib/map_shared.c -> cyrus-imapd-2.5.tar.gz/lib/map_shared.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: map_shared.c,v 1.23 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -55,23 +53,17 @@
 
 #define SLOP (8*1024)
 
-const char *map_method_desc = "shared";
+EXPORTED const char *map_method_desc = "shared";
 
 /*
 * Create/refresh mapping of file
 */
-void
-map_refresh(fd, onceonly, base, len, newlen, name, mboxname)
-int fd;
-int onceonly;
-const char **base;
-unsigned long *len;
-unsigned long newlen;
-const char *name;
-const char *mboxname;
+EXPORTED void map_refresh(int fd, int onceonly, const char **base,
+		 size_t *len, size_t newlen,
+		 const char *name, const char *mboxname)
 {
 struct stat sbuf;
- char buf80;
+ char buf256;
 
 if (newlen == MAP_UNKNOWN_LEN) {
 	if (fstat(fd, &sbuf) == -1) {
@@ -112,10 +104,7 @@
 /*
 * Destroy mapping of file
 */
-void
-map_free(base, len)
-const char **base;
-unsigned long *len;
+EXPORTED void map_free(const char **base, size_t *len)
 {
 if (*len) munmap((char *)*base, *len);
 *base = 0;

cyrus-imapd-2.4.17.tar.gz/lib/map_stupidshared.c -> cyrus-imapd-2.5.tar.gz/lib/map_stupidshared.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: map_stupidshared.c,v 1.16 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -51,24 +49,26 @@
 
 #include "map.h"
 #include "exitcodes.h"
+#include "xmalloc.h"
+
+EXPORTED const char *map_method_desc = "stupidshared";
 
-const char *map_method_desc = "stupidshared";
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
 
 /*
 * Create/refresh mapping of file
 */
 void
-map_refresh(fd, onceonly, base, len, newlen, name, mboxname)
-int fd;
-int onceonly;
-const char **base;
-unsigned long *len;
-unsigned long newlen;
-const char *name;
-const char *mboxname;
+EXPORTED map_refresh(int fd, int onceonly, const char **base,
+		 size_t *len, size_t newlen, const char *name,
+		 const char *mboxname)
 {
+ (void)onceonly;
 struct stat sbuf;
- char buf80;
+ int flags;
+ char buf256;
 
 if (newlen == MAP_UNKNOWN_LEN) {
 	if (fstat(fd, &sbuf) == -1) {
@@ -79,21 +79,22 @@
 	}
 	newlen = sbuf.st_size;
 }
-	 
+
 /* Already mapped in */
 if (*len >= newlen) return;
 
 if (*len) munmap((char *)*base, *len);
 
- *base = (char *)mmap((caddr_t)0, newlen, PROT_READ, MAP_SHARED
+ flags = MAP_SHARED;
 #ifdef MAP_FILE
-| MAP_FILE
+ flags |= MAP_FILE;
 #endif
 #ifdef MAP_VARIABLE
-| MAP_VARIABLE
+ flags |= MAP_VARIABLE;
 #endif
-			 , fd, 0L);
- if (*base == (char *)-1) {
+
+ *base = (char *)mmap((caddr_t)0, newlen, PROT_READ, flags, fd, 0L);
+ if (*base == (char *)MAP_FAILED) {
 	syslog(LOG_ERR, "IOERROR: mapping %s file%s%s: %m", name,
 	 mboxname ? " for " : "", mboxname ? mboxname : "");
 	snprintf(buf, sizeof(buf), "failed to mmap %s file", name);
@@ -106,9 +107,7 @@
 * Destroy mapping of file
 */
 void
-map_free(base, len)
-const char **base;
-unsigned long *len;
+EXPORTED map_free(const char **base, size_t *len)
 {
 if (*len) munmap((char *)*base, *len);
 *base = 0;

cyrus-imapd-2.5.tar.gz/lib/mappedfile.c Added

@@ -0,0 +1,499 @@
+/* mappedfile - interface to a mmaped, lockable, writable file
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Interface to an mmaped file, including locking.
+ *
+ * Many different modules within Cyrus, including most of the
+ * database engines, wrap an mmaped file with locking semantics,
+ * refreshing the map on re-locking, and writing to a location
+ * within the file.
+ *
+ * This module provides handy wrapper interfaces to each of those
+ * items. NOTE - it doesn't provide a guarantee that the same file
+ * isn't opened twice, stomping all over the locks in the process.
+ * To get that, you need to protect in the caller.
+ *
+ */
+
+
+#include "mappedfile.h"
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
+#include <syslog.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "assert.h"
+#include "cyr_lock.h"
+#include "libcyr_cfg.h"
+#include "map.h"
+#include "retry.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#define MF_UNLOCKED 0
+#define MF_READLOCKED 1
+#define MF_WRITELOCKED 2
+
+struct mappedfile {
+ char *fname;
+
+ /* obviously you will need 64 bit size_t for 64 bit files... */
+ struct buf map_buf;
+ size_t map_size;
+
+ /* the file itself */
+ ino_t map_ino;
+ int fd;
+
+ /* tracking */
+ int lock_status;
+ int dirty;
+ int was_resized;
+ int is_rw;
+};
+
+static void _ensure_mapped(struct mappedfile *mf, size_t offset, int update)
+{
+ /* we may be rewriting inside a file, so don't shrink, only extend */
+ if (update) {
+	if (offset > mf->map_size)
+	 mf->was_resized = 1;
+	else
+	 offset = mf->map_size;
+ }
+
+ /* always give refresh another go, we may be map_nommap */
+ buf_init_mmap(&mf->map_buf, /*onceonly*/0, mf->fd, mf->fname,
+		 offset, /*mboxname*/NULL);
+
+ mf->map_size = offset;
+}
+
+/* NOTE - we don't provide any guarantees that the file isn't open multiple
+ * times. So don't do that. It will mess with your locking no end */
+EXPORTED int mappedfile_open(struct mappedfile **mfp,
+			 const char *fname, int flags)
+{
+ struct mappedfile *mf;
+ struct stat sbuf;
+ int openmode = (flags & MAPPEDFILE_RW) ? O_RDWR : O_RDONLY;
+ int create = (flags & MAPPEDFILE_CREATE) ? 1 : 0;
+ int r;
+
+ assert(fname);
+ assert(!*mfp);
+
+ mf = xzmalloc(sizeof(struct mappedfile));
+ mf->fname = xstrdup(fname);
+ mf->is_rw = (flags & MAPPEDFILE_RW) ? 1 : 0;
+
+ mf->fd = open(mf->fname, openmode, 0644);
+ if (mf->fd < 0 && errno == ENOENT) {
+	if (!create || !mf->is_rw) {
+	 r = -errno;
+	 goto err;
+	}
+	r = cyrus_mkdir(mf->fname, 0755);
+	if (r < 0) {
+	 syslog(LOG_ERR, "IOERROR: cyrus_mkdir %s: %m", mf->fname);
+	 goto err;
+	}
+	mf->fd = open(mf->fname, O_RDWR | O_CREAT, 0644);
+ }
+
+ if (mf->fd == -1) {
+	syslog(LOG_ERR, "IOERROR: open %s: %m", mf->fname);
+	r = -errno;
+	goto err;
+ }
+
+ /* it's zero, but set it anyway */
+ mf->lock_status = MF_UNLOCKED;
+ mf->dirty = 0;
+
+ r = fstat(mf->fd, &sbuf);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: fstat %s: %m", mf->fname);
+	goto err;
+ }
+
+ _ensure_mapped(mf, sbuf.st_size, /*update*/0);
+
+ *mfp = mf;
+
+ return 0;
+
+err:
+ mappedfile_close(&mf);
+ return r;
+}
+
+EXPORTED int mappedfile_close(struct mappedfile **mfp)
+{
+ struct mappedfile *mf = *mfp;
+ int r = 0;
+
+ /* make this safe to call multiple times */
+ if (!mf) return 0;
+
+ assert(mf->lock_status == MF_UNLOCKED);
+ assert(!mf->dirty);
+
+ if (mf->fd >= 0)
+	r = close(mf->fd);
+
+ buf_free(&mf->map_buf);
+ free(mf->fname);
+ free(mf);
+
+ *mfp = NULL;
+
+ return r;
+}
+
+EXPORTED int mappedfile_readlock(struct mappedfile *mf)
+{
+ struct stat sbuf, sbuffile;
+ int newfd = -1;
+
+ assert(mf->lock_status == MF_UNLOCKED);
+ assert(mf->fd != -1);
+ assert(!mf->dirty);
+
+ for (;;) {
+	if (lock_shared(mf->fd, mf->fname) < 0) {
+	 syslog(LOG_ERR, "IOERROR: lock_shared %s: %m", mf->fname);
+	 return -EIO;
+	}
+
+	if (fstat(mf->fd, &sbuf) == -1) {
+	 syslog(LOG_ERR, "IOERROR: fstat %s: %m", mf->fname);
+	 lock_unlock(mf->fd, mf->fname);
+	 return -EIO;
+	}
+
+	if (stat(mf->fname, &sbuffile) == -1) {
+	 syslog(LOG_ERR, "IOERROR: stat %s: %m", mf->fname);
+	 lock_unlock(mf->fd, mf->fname);
+	 return -EIO;
+	}
+	if (sbuf.st_ino == sbuffile.st_ino) break;
+
+	newfd = open(mf->fname, O_RDWR, 0644);
+	if (newfd == -1) {
+	 syslog(LOG_ERR, "IOERROR: open %s: %m", mf->fname);
+	 lock_unlock(mf->fd, mf->fname);
+	 return -EIO;
+	}
+
+	dup2(newfd, mf->fd);
+	close(newfd);
+ }
+
+ mf->lock_status = MF_READLOCKED;
+
+ /* XXX - can we guarantee the fd isn't reused? */
+ if (mf->map_ino != sbuf.st_ino) {
+	buf_free(&mf->map_buf);
+ }
+
+ _ensure_mapped(mf, sbuf.st_size, /*update*/0);
+
+ return 0;
+}
+
+EXPORTED int mappedfile_writelock(struct mappedfile *mf)
+{
+ int r;
+ struct stat sbuf;
+ const char *lockfailaction;
+
+ assert(mf->lock_status == MF_UNLOCKED);
+ assert(mf->fd != -1);
+ assert(mf->is_rw);
+ assert(!mf->dirty);
+
+ r = lock_reopen(mf->fd, mf->fname, &sbuf, &lockfailaction);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: %s %s: %m", lockfailaction, mf->fname);
+	return r;
+ }
+ mf->lock_status = MF_WRITELOCKED;
+
+ /* XXX - can we guarantee the fd isn't reused? */
+ if (mf->map_ino != sbuf.st_ino) {
+	buf_free(&mf->map_buf);
+ }
+
+ _ensure_mapped(mf, sbuf.st_size, /*update*/0);
+
+ return 0;
+}
+
+EXPORTED int mappedfile_unlock(struct mappedfile *mf)
+{
+ int r;
+
+ /* make this safe to call multiple times */
+ if (!mf) return 0;
+ if (mf->lock_status == MF_UNLOCKED) return 0;
+
+ assert(mf->fd != -1);
+ assert(!mf->dirty);
+
+ r = lock_unlock(mf->fd, mf->fname);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: lock_unlock %s: %m", mf->fname);
+	return r;
+ }
+
+ mf->lock_status = MF_UNLOCKED;
+
+ return 0;
+}
+
+EXPORTED int mappedfile_commit(struct mappedfile *mf)
+{
+ assert(mf->fd != -1);
+
+ if (!mf->dirty)
+	return 0; /* nice, nothing to do */
+
+ assert(mf->is_rw);
+
+ if (mf->was_resized) {
+	if (fsync(mf->fd) < 0) {
+	 syslog(LOG_ERR, "IOERROR: %s fsync: %m", mf->fname);
+	 return -EIO;
+	}
+ }
+ else {
+	if (fdatasync(mf->fd) < 0) {
+	 syslog(LOG_ERR, "IOERROR: %s fdatasync: %m", mf->fname);
+	 return -EIO;
+	}
+ }
+
+ mf->dirty = 0;
+ mf->was_resized = 0;
+
+ return 0;
+}
+
+EXPORTED ssize_t mappedfile_pwrite(struct mappedfile *mf,
+				 const char *base, size_t len,
+				 off_t offset)
+{
+ ssize_t written;
+ off_t pos;
+
+ assert(mf->is_rw);
+ assert(mf->fd != -1);
+ assert(base);
+
+ if (!len) return 0; /* nothing to write! */
+
+ /* XXX - memcmp and don't both writing if it matches? */
+
+ mf->dirty++;
+
+ /* locate the file handle */
+ pos = lseek(mf->fd, offset, SEEK_SET);
+ if (pos < 0) {
+	syslog(LOG_ERR, "IOERROR: %s seek to %llX: %m", mf->fname,
+	 (long long unsigned int)offset);
+	return -1;
+ }
+
+ /* write the buffer */
+ written = retry_write(mf->fd, base, len);
+ if (written < 0) {
+	syslog(LOG_ERR, "IOERROR: %s write %llu bytes at %llX: %m",
+	 mf->fname, (long long unsigned int)len,
+	 (long long unsigned int)offset);
+	return -1;
+ }
+
+ _ensure_mapped(mf, pos+written, /*update*/1);
+
+ return written;
+}
+
+EXPORTED ssize_t mappedfile_pwritebuf(struct mappedfile *mf,
+				 const struct buf *buf,
+				 off_t offset)
+{
+ return mappedfile_pwrite(mf, buf->s, buf->len, offset);
+}
+
+EXPORTED ssize_t mappedfile_pwritev(struct mappedfile *mf,
+				 const struct iovec *iov, int nio,
+				 off_t offset)
+{
+ ssize_t written;
+ off_t pos;
+
+ assert(mf->is_rw);
+ assert(mf->fd != -1);
+ assert(iov);
+
+ if (!nio) return 0; /* nothing to write! */
+
+ /* XXX - memcmp and don't both writing if it matches? */
+
+ mf->dirty++;
+
+ /* locate the file handle */
+ pos = lseek(mf->fd, offset, SEEK_SET);
+ if (pos < 0) {
+	syslog(LOG_ERR, "IOERROR: %s seek to %llX: %m", mf->fname,
+	 (long long unsigned int)offset);
+	return -1;
+ }
+
+ /* write the buffer */
+ written = retry_writev(mf->fd, iov, nio);
+ if (written < 0) {
+	size_t len = 0;
+	int i;
+	for (i = 0; i < nio; i++) {
+	 len += iovi.iov_len;
+	}
+	syslog(LOG_ERR, "IOERROR: %s write %llu bytes at %llX: %m",
+	 mf->fname, (long long unsigned int)len,
+	 (long long unsigned int)offset);
+	return -1;
+ }
+
+ _ensure_mapped(mf, pos+written, /*update*/1);
+
+ return written;
+}
+
+EXPORTED int mappedfile_truncate(struct mappedfile *mf, off_t offset)
+{
+ int r;
+
+ assert(mf->is_rw);
+ assert(mf->fd != -1);
+
+ mf->dirty++;
+
+ r = ftruncate(mf->fd, offset);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: ftruncate %s: %m", mf->fname);
+	return r;
+ }
+
+ _ensure_mapped(mf, offset, /*update*/0);
+ mf->was_resized = 1; /* force the fsync */
+
+ return 0;
+}
+
+EXPORTED int mappedfile_rename(struct mappedfile *mf, const char *newname)
+{
+ int r;
+
+ r = rename(mf->fname, newname);
+ if (r < 0) {
+	syslog(LOG_ERR, "IOERROR: rename (%s, %s): %m", mf->fname, newname);
+	return r;
+ }
+
+ free(mf->fname);
+ mf->fname = xstrdup(newname);
+
+ return 0;
+}
+
+
+EXPORTED int mappedfile_islocked(const struct mappedfile *mf)
+{
+ return (mf->lock_status != MF_UNLOCKED);
+}
+
+//FIXME this function is nowhere used
+EXPORTED int mappedfile_isreadlocked(const struct mappedfile *mf)
+{
+ return (mf->lock_status == MF_READLOCKED);
+}
+
+EXPORTED int mappedfile_iswritelocked(const struct mappedfile *mf)
+{
+ return (mf->lock_status == MF_WRITELOCKED);
+}
+
+EXPORTED int mappedfile_iswritable(const struct mappedfile *mf)
+{
+ return !!mf->is_rw;
+}
+
+EXPORTED const char *mappedfile_base(const struct mappedfile *mf)
+{
+ /* XXX - require locked? */
+ return mf->map_buf.s;
+}
+
+EXPORTED size_t mappedfile_size(const struct mappedfile *mf)
+{
+ return mf->map_size;
+}
+
+EXPORTED const struct buf *mappedfile_buf(const struct mappedfile *mf)
+{
+ return &mf->map_buf;
+}
+
+EXPORTED const char *mappedfile_fname(const struct mappedfile *mf)
+{
+ return mf->fname;
+}

cyrus-imapd-2.5.tar.gz/lib/mappedfile.h Added

@@ -0,0 +1,90 @@
+/* mappedfile - interface to a mmaped, lockable, writable file
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _MAPPEDFILE_H
+#define _MAPPEDFILE_H
+
+// includes
+#include "util.h"
+#include <sys/types.h>
+#include <sys/uio.h>
+
+struct mappedfile;
+
+#define MAPPEDFILE_CREATE (1<<0)
+#define MAPPEDFILE_RW (1<<1)
+
+extern int mappedfile_open(struct mappedfile **mfp,
+			 const char *fname, int flags);
+extern int mappedfile_close(struct mappedfile **mfp);
+
+extern int mappedfile_readlock(struct mappedfile *mf);
+extern int mappedfile_writelock(struct mappedfile *mf);
+extern int mappedfile_unlock(struct mappedfile *mf);
+
+extern int mappedfile_commit(struct mappedfile *mf);
+extern ssize_t mappedfile_pwrite(struct mappedfile *mf,
+				 const char *base, size_t len,
+				 off_t offset);
+extern ssize_t mappedfile_pwritebuf(struct mappedfile *mf,
+				 const struct buf *buf,
+				 off_t offset);
+extern ssize_t mappedfile_pwritev(struct mappedfile *mf,
+				 const struct iovec *iov, int nio,
+				 off_t offset);
+extern int mappedfile_truncate(struct mappedfile *mf, off_t offset);
+
+extern int mappedfile_rename(struct mappedfile *mf, const char *newname);
+
+extern int mappedfile_islocked(const struct mappedfile *mf);
+extern int mappedfile_isreadlocked(const struct mappedfile *mf);
+extern int mappedfile_iswritelocked(const struct mappedfile *mf);
+extern int mappedfile_iswritable(const struct mappedfile *mf);
+
+extern const char *mappedfile_base(const struct mappedfile *mf);
+extern size_t mappedfile_size(const struct mappedfile *mf);
+extern const struct buf *mappedfile_buf(const struct mappedfile *mf);
+
+extern const char *mappedfile_fname(const struct mappedfile *mf);
+
+
+#endif /* _MAPPEDFILE_H */

cyrus-imapd-2.5.tar.gz/lib/me.c Added

@@ -0,0 +1,98 @@
+/* Messagingengine.com utility functions */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include "me.h"
+#include "libconfig.h"
+
+static void rc4_encode(int key_len, unsigned char * key_buf, int data_len, unsigned char * data_buf);
+static char * base64_encode (int data_len, unsigned char * data);
+
+EXPORTED const char *me_create_sasl_enc(const char *username)
+{
+ static char padded_sasl256, junk_buf256, key_buf256;
+ int i, junk_len, epoch, key_len, data_len;
+ char *encoded_base64;
+ const char * format;
+
+ epoch = (int)time(0);
+ junk_len = 31 - strlen(username);
+ if (junk_len < 0) junk_len = 0;
+
+ for (i = 0; i < junk_len; i++)
+ junk_bufi = 'A' + (rand() % 26);
+ junk_bufi = '\0';
+
+ padded_sasl255 = '\0';
+ snprintf(padded_sasl, 255, "%02d%s%s", junk_len, junk_buf, username);
+
+ key_buf255 = '\0';
+ format = config_getstring(IMAPOPT_ME_SECRET);
+ snprintf(key_buf, 255, format, epoch, epoch);
+
+ key_len = strlen(key_buf);
+ data_len = strlen(padded_sasl);
+ rc4_encode(key_len, (unsigned char *)key_buf, data_len, (unsigned char *)padded_sasl);
+ encoded_base64 = base64_encode(data_len, (unsigned char *)padded_sasl);
+
+ padded_sasl255 = '\0';
+ snprintf(padded_sasl, 255, "%s %d", encoded_base64, epoch);
+
+ return padded_sasl;
+}
+
+static void rc4_encode(int key_len, unsigned char * key_buf, int data_len, unsigned char * data_buf) {
+ static unsigned char S256;
+ unsigned char tmp;
+ int i = 0, j = 0, l;
+
+ for (i = 0; i < 256; i++) Si = i;
+ for (i = 0; i < 256; i++) {
+ j = (j + Si + key_bufi % key_len) % 256;
+ tmp = Si; Si = Sj; Sj = tmp;
+ }
+ i = 0;
+ for (l = 0; l < data_len; l++) {
+ i = (i + 1) % 256;
+ j = (j + Si) % 256;
+ tmp = Si; Si = Sj; Sj = tmp;
+ data_bufl ^= S(Si + Sj) % 256;
+ }
+}
+
+static char * base64_encode (int data_len, unsigned char * data)
+{
+ static const char base64 =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ static char tobuf512;
+ unsigned char * end = data + (data_len < 500 ? data_len: 500);
+ char *d = tobuf;
+ unsigned char c1, c2, c3;
+
+ while (1) {
+ c1 = *data++;
+ *d++ = base64c1>>2;
+ c2 = *data++;
+ *d++ = base64((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4);
+ if (data > end) break;
+ c3 = *data++;
+ *d++ = base64((c2 & 0xF) << 2) | ((c3 & 0xC0) >> 6);
+ if (data > end) break;
+ *d++ = base64c3 & 0x3F;
+ if (data == end) break;
+ }
+ *d = '\0';
+ return tobuf;
+}
+

cyrus-imapd-2.5.tar.gz/lib/me.h Added

cyrus-imapd-2.5.tar.gz/lib/memmem.c Added

@@ -0,0 +1,72 @@
+/* memmem.c -- replacement memmem() routine
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+/*
+ * Search for a needle 'vm' of length 'mlen' in
+ * haystack 'vb' of length 'len' and return the
+ * pointer to the first occurrence or NULL.
+ * Does not handle mlen=0.
+ */
+void *memmem(const void *vb, size_t len,
+	 const void *vm, size_t mlen)
+{
+ /* use unsigned char* not void* so ptr arithmetic works portably */
+ const unsigned char *b = vb;
+ const unsigned char *end = b+len;
+ const unsigned char *m = vm;
+ const unsigned char *p;
+
+ while (b < end) {
+	p = memchr(b, *m, end-b);
+	if (!p) return NULL;
+	if (p + mlen > end) return NULL;
+	if (!memcmp(p, m, mlen)) return (void *)p;
+	b = p+1;
+ }
+ return NULL;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/memmove.c -> cyrus-imapd-2.5.tar.gz/lib/memmove.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/mkchartable.pl -> cyrus-imapd-2.5.tar.gz/lib/mkchartable.pl Changed

@@ -40,8 +40,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: mkchartable.pl,v 1.4.2.1 2010/02/12 03:38:22 brong Exp $
 
 use strict;
 use warnings;
@@ -50,9 +48,14 @@
 use Getopt::Long;
 
 my @maps;
+my $aliasfile;
 my %codemap;
-GetOptions( 'map|m=s' => \@maps );
+my $output;
 
+GetOptions( 'map|m=s' => \@maps, #strings
+ 'aliases|a=s' => \$aliasfile, #string
+ 'output|o=s' => \$output); #string
+open (OUTPUT, ">$output");
 printheader(\@maps, \@ARGV);
 
 # first we parse the chartable unicode mappings and the fixes
@@ -66,23 +69,24 @@
 mungemap(\%codemap);
 
 # then print out the translation tables
-printmap(\%codemap);
+printmap(\%codemap, $aliasfile);
 
 # XXX - should probably require all files that are
 # mentioned in the lookup table to be specified,
 # or this sucker aintn't gunna compile.
 foreach my $opt (@ARGV) {
- warn "mkchartable: mapping $opt...\n";
+ print "mkchartable: mapping $opt...\n";
 my $table = readcharfile($opt);
 printtable($table, $opt);
 }
 
 printlookup();
+close (OUTPUT);
 
 exit 0;
 
 sub usage {
- warn "usage: mkchartable -m mapfile charsetfile...\n";
+ print "usage: mkchartable -m mapfile -o outputfile charsetfile...\n";
 exit(1);
 }
 
@@ -100,16 +104,22 @@
 
 	my ($hexcode, $name, $category, $combiningclass, $bidicat, 
 	 $decomposition, $decimal, $digit, $numeric, $mirroredchar,
-	 $uni1name, $comment, $upper, $lower, @rest) = split ';', $line;
+	 $uni1name, $comment, $upper, $lower, $title, @rest) = split ';', $line;
 	my $code = hex($hexcode);
 
+	# This is not RFC5051
 	if ($code != 32 and $category =~ m/^Z/) {
 	 $codemap->{$code}{chars} = 32; # space
 	 next;
 	}
 
+	# has a mapping to titlecase
+	$codemap->{$code}{title} = hex($title)
+	 if $title;
+
 	# Compatability mapping, skip over the <type> 
 	while ($decomposition ne '') {
+	 # This is not RFC5051
 	 if ($decomposition =~ s/^<^>*>\s+//) {
 		# Ignore compat mappings to SP followed by combining char 
 		$decomposition = '' if $decomposition =~ m/^0020 /
@@ -120,10 +130,7 @@
 	 }
 	}
 
-	# Lower case equivalent mapping
-	if ($lower) {
-	 $codemap->{$code}{chars} = hex($lower);
-	}
+	$codemap->{$code}{chars} ||= $code;
 }
 }
 
@@ -132,23 +139,21 @@
 sub mungemap {
 my ($codemap) = @_;
 
- my $didchange = 1;
+ my $total = keys %$codemap;
+ my $changed;
 
 # Keep scanning the table until no changes are made
- while ($didchange) {
-	warn "mkchartable: expanding unicode mappings...\n";
-
-	$didchange = 0;
+ do {
+	$changed = 0;
 
- foreach my $code (sort { $a <=> $b } keys %$codemap) {
+	foreach my $code (sort { $a <=> $b } keys %$codemap) {
 	 my @new;
 	 my $chars = $codemap->{$code}{chars};
 
 	 # check if there are any translations for the mapped chars
 	 foreach my $char (@$chars) {
 		if ($codemap->{$char}) {
-		 $didchange = 1;
-	 my $newchars = $codemap->{$char}{chars};
+		 my $newchars = $codemap->{$char}{chars};
 		 push @new, @$newchars;
 		}
 		else {
@@ -162,15 +167,22 @@
 		@new = (32) unless @new;
 	 }
 
+	 # no change
+	 next if ("@new" eq "@$chars");
+
+	 $changed++;
 	 $codemap->{$code}{chars} = \@new;
 	}
- };
 
- warn "mkchartable: building expansion table...\n";
+	print "mkchartable: expanded unicode mappings... ($changed/$total)\n"
+	 if $changed;
+ } while ($changed);
 
- print <<EOF;
+ print "mkchartable: building expansion table...\n";
+
+ print OUTPUT <<EOF;
 /* Table of translations */
-const int chartables_translation_multichar = {
+HIDDEN const int chartables_translation_multichar = {
 0, /* the index of 0 is reserved to mean "no translation" */
 EOF
 
@@ -183,9 +195,9 @@
 	 $maxlen = @$chars if $maxlen < @$chars;
 
 	 # add to the translation table
-	 print " ";
-	 print join(", ", (map { sprintf("0x%04x", $_) } @$chars));
-	 printf ", 0, /* Translation for %04x (offset %d) */\n", $code, $offset;
+	 print OUTPUT " ";
+	 print OUTPUT join(", ", (map { sprintf("0x%04x", $_) } @$chars));
+	 printf OUTPUT ", 0, /* Translation for %04x (offset %d) */\n", $code, $offset;
 
 	 # update tracking
 	 $codemap->{$code}{trans} = $offset;
@@ -193,7 +205,7 @@
 	}
 }
 
- print <<EOF;
+ print OUTPUT <<EOF;
 };
 
 EOF
@@ -204,7 +216,7 @@
 sub printmap {
 my ($codemap) = @_;
 
- warn "mkchartable: building translation table...\n";
+ print "mkchartable: building translation table...\n";
 
 # record which blocks we need mappings for
 my @needblock;
@@ -212,7 +224,7 @@
 	$needblock($code >> 16) & 0xff($code >> 8) & 0xff = 1;
 }
 
- print << "EOF";
+ print OUTPUT << "EOF";
 /* The next two tables are used for doing translations from
 * 24-bit unicode values to canonical form. First look up the
 * code >> 16 (highest order block) in the block16 table to
@@ -228,41 +240,41 @@
 * -ve number: offset into the chartables_translation_multichar
 * table. Read chars until 0 encountered.
 */
-const unsigned char chartables_translation_block16256 = {
+HIDDEN const unsigned char chartables_translation_block16256 = {
 EOF
 
 my $n16 = 0;
 foreach my $block16 (0..255) {
 	if ($needblock$block16) {
-	 printf(" %3d,", $n16++);
+	 printf OUTPUT (" %3d,", $n16++);
 	} else {
-	 printf(" 255,");
+	 printf OUTPUT " 255,";
 	}
- 	print "\n" if ($block16 % 8 == 7);
+ 	print OUTPUT "\n" if ($block16 % 8 == 7);
 }
 
- print <<EOF;
+ print OUTPUT <<EOF;
 };
 
-const unsigned char chartables_translation_block8$n16256 = {
+HIDDEN const unsigned char chartables_translation_block8$n16256 = {
 EOF
 my $n8 = 0;
 foreach my $block16 (0..255) {
 	my $need8 = $needblock$block16;
 	next unless $need8;
-	print " { /* translation for 16 bit offset $block16 */\n ";
+	print OUTPUT " { /* translation for 16 bit offset $block16 */\n ";
 	foreach my $block8 (0..255) {
 	 if ($need8->$block8) {
-		printf(" %3d,", $n8++);
+		printf OUTPUT (" %3d,", $n8++);
 	 } else {
-		printf(" 255,");
+		printf OUTPUT " 255,";
 	 }
- 	 print "\n " if ($block8 % 8 == 7);
+ 	 print OUTPUT "\n " if ($block8 % 8 == 7);
 	}
-	print "},\n";
+	print OUTPUT "},\n";
 }
 
- print <<EOF;
+ print OUTPUT <<EOF;
 };
 
 /* NOTE: Unlike other charset translation tables, the
@@ -271,7 +283,7 @@
 * character to the "canonical form", possibly multiple
 * characters.
 */
-const int chartables_translation$n8256 = {
+HIDDEN const int chartables_translation$n8256 = {
 EOF
 
 foreach my $block16 (0..255) {
@@ -279,24 +291,25 @@
 	next unless $need8;
 	foreach my $block8 (0..255) {
 	 next unless $need8->$block8;
- 	 print " { /* Mapping for unicode chars in block $block16 $block8 */\n ";
+ 	 print OUTPUT " { /* Mapping for unicode chars in block $block16 $block8 */\n ";
 	 foreach my $i (0..255) {
 		my $codepoint = ($block16 << 16) + ($block8 << 8) + $i;
-		if (not $codemap->{$codepoint}) {
-		 printf " 0x%04x,", $codepoint;
+		my $titlepoint = $codemap->{$codepoint}{title} || $codepoint;
+		if (not $codemap->{$titlepoint} or not keys %{$codemap->{$titlepoint}}) {
+		 printf OUTPUT " 0x%04x,", $titlepoint;
 		}
-		elsif ($codemap->{$codepoint}{trans}) {
-		 printf " - %4d,", $codemap->{$codepoint}{trans};
+		elsif ($codemap->{$titlepoint}{trans}) {
+		 printf OUTPUT " - %4d,", $codemap->{$titlepoint}{trans};
 		}
 		else {
-		 printf " 0x%04x,", $codemap->{$codepoint}{chars}0;
+		 printf OUTPUT " 0x%04x,", $codemap->{$titlepoint}{chars}0;
 		}
- 		print "\n " if ($i % 8 == 7);
+ 		print OUTPUT "\n " if ($i % 8 == 7);
 	 }
-	 print "},\n";
+	 print OUTPUT "},\n";
 	}
 }
- printf("};\n\n");
+ printf OUTPUT "};\n\n";
 }
 
 # read a charset table, building intermediate state tables
@@ -425,49 +438,50 @@
 $name =~ s{\..*}{}; # after a dot
 $name =~ s{-}{_}g; # underscores
 
- print "const struct charmap chartables_$name\$num256 = {\n";
+ print OUTPUT "static const struct charmap chartables_$name\$num256 = {\n";
 
 foreach my $table (@$tables) {
 	my $chars = $table->{chars};
-	print " {";
+	print OUTPUT " {";
 	if ($table->{name}) {
-	 print " /* $table->{name} */";
+	 print OUTPUT " /* $table->{name} */";
 	}
-	print "\n";
+	print OUTPUT "\n";
 	foreach my $i (0..255) {
 	 my $char = $chars->$i;
 	 if ($char) {
-		print " { $char->0, $char->1 }, /* $char->2 */\n";
+		print OUTPUT " { $char->0, $char->1 }, /* $char->2 */\n";
 	 }
 	 else {
-		print " { 0xfffd, 0 }, /* no such character */\n";
+		print OUTPUT " { 0xfffd, 0 }, /* no such character */\n";
 	 }
 	}
-	print " },\n";
+	print OUTPUT " },\n";
 }
- print "};\n\n";
+ print OUTPUT "};\n\n";
 }
 
 # print the header of the chartable.c file
 sub printheader {
 my ($maps, $charsets) = @_;
 
- print <<EOF;
+ print OUTPUT <<EOF;
 /* This file is generated by mkchartable.pl with the following arguments
 *
 EOF
 foreach my $map (@$maps) {
 	my $sha1 = getsha1($map);
-	print " * map: $sha1 $map\n";
+	print OUTPUT " * map: $sha1 $map\n";
 }
 foreach my $charset (@$charsets) {
 	my $sha1 = getsha1($charset);
-	print " * charset: $sha1 $charset\n";
+	print OUTPUT " * charset: $sha1 $charset\n";
 }
- print <<EOF;
+ print OUTPUT <<EOF;
 */
 
 #include "chartable.h"
+#include "config.h"
 
 EOF
 }
@@ -475,13 +489,13 @@
 # print the lookup table for charactersets at the end
 # of the chartable.c file.
 sub printlookup {
- print <<EOF;
+ print OUTPUT <<EOF;
 
 /*
 * Mapping of character sets to tables
 */
 
-const struct charset chartables_charset_table = {
+HIDDEN const struct charset chartables_charset_table = {
 { "us-ascii", chartables_us_ascii },	/* US-ASCII must be charset number 0 */
 { "utf-8", 0 }, /* handled directly */
 { "utf-7", 0 }, /* handled directly */
@@ -519,7 +533,29 @@
 * cache files stay with valid information */
 };
 
-const int chartables_num_charsets = (sizeof(chartables_charset_table)/sizeof(*chartables_charset_table));
+HIDDEN const struct charset_alias charset_aliases = {
+EOF
+
+ my %aliases;
+ if ($aliasfile and -f $aliasfile) {
+	open(FH, "<$aliasfile") || die "can't read alias file $aliasfile";
+	while (<FH>) {
+	 next if m/^#/;
+	 next unless m/(\S+)\s+(\S+)/;
+	 $aliases{$1} = $2;
+	}
+	close(FH);
+ }
+
+ foreach my $alias (sort keys %aliases) {
+	print OUTPUT qq { "$alias", "$aliases{$alias}" },\n;
+ }
+
+ print OUTPUT <<EOF;
+ { 0, 0 }
+};
+
+HIDDEN const int chartables_num_charsets = (sizeof(chartables_charset_table)/sizeof(*chartables_charset_table));
 EOF
 }

cyrus-imapd-2.4.17.tar.gz/lib/mkgmtime.c -> cyrus-imapd-2.5.tar.gz/lib/mkgmtime.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/mkgmtime.h -> cyrus-imapd-2.5.tar.gz/lib/mkgmtime.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/mpool.c -> cyrus-imapd-2.5.tar.gz/lib/mpool.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: mpool.c,v 1.19 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
@@ -50,13 +48,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <syslog.h>
-#include <errno.h>
 
-#include "assert.h"
 #include "mpool.h"
 #include "xmalloc.h"
 #include "exitcodes.h"
@@ -88,7 +82,7 @@
 }
 
 /* Create a new pool */
-struct mpool *new_mpool(size_t size) 
+EXPORTED struct mpool *new_mpool(size_t size)
 {
 struct mpool *ret = xmalloc(sizeof(struct mpool));
 
@@ -98,7 +92,7 @@
 }
 
 /* Free a pool */
-void free_mpool(struct mpool *pool) 
+EXPORTED void free_mpool(struct mpool *pool)
 {
 struct mpool_blob *p, *p_next;
 
@@ -129,7 +123,7 @@
 #define ROUNDUP(num) (((num) + 15) & (~((unsigned long) 0x0) ^ 0xF))
 
 /* Allocate from a pool */
-void *mpool_malloc(struct mpool *pool, size_t size) 
+EXPORTED void *mpool_malloc(struct mpool *pool, size_t size)
 {
 void *ret = NULL;
 struct mpool_blob *p;
@@ -171,7 +165,7 @@
 return ret;
 }
 
-char *mpool_strndup(struct mpool *pool, const char *str, size_t n) 
+EXPORTED char *mpool_strndup(struct mpool *pool, const char *str, size_t n)
 {
 char *ret;
 
@@ -185,7 +179,7 @@
 }
 
 
-char *mpool_strdup(struct mpool *pool, const char *str) 
+EXPORTED char *mpool_strdup(struct mpool *pool, const char *str)
 {
 size_t len;

cyrus-imapd-2.4.17.tar.gz/lib/mpool.h -> cyrus-imapd-2.5.tar.gz/lib/mpool.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/nonblock.h -> cyrus-imapd-2.5.tar.gz/lib/nonblock.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/nonblock_fcntl.c -> cyrus-imapd-2.5.tar.gz/lib/nonblock_fcntl.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/nonblock_ioctl.c -> cyrus-imapd-2.5.tar.gz/lib/nonblock_ioctl.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/parseaddr.c -> cyrus-imapd-2.5.tar.gz/lib/parseaddr.c Changed

@@ -38,26 +38,24 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: parseaddr.c,v 1.20 2010/01/06 17:01:46 murch Exp $
 */
 
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
 
 #include "parseaddr.h"
 #include "xmalloc.h"
 #include "util.h"
 
-static char parseaddr_unspecified_domain = "unspecified-domain";
+static const char unknown_user = "unknown-user";
+static const char unspecified_domain = "unspecified-domain";
 
-static void parseaddr_append (struct address ***addrpp, char *name,
-				char *route, char *mailbox, char *domain,
-				char **freemep);
-static int parseaddr_phrase (char **inp, char **phrasep, char *specials);
+static void parseaddr_append(struct address ***addrpp, const char *name,
+			 const char *route, const char *mailbox,
+			 const char *domain, char **freemep);
+static int parseaddr_phrase (char **inp, char **phrasep, const char *specials);
 static int parseaddr_domain (char **inp, char **domainp, char **commmentp);
 static int parseaddr_route (char **inp, char **routep);
 
@@ -65,10 +63,7 @@
 * Parse an address list in 's', appending address structures to
 * the list pointed to by 'addrp'.
 */
-void
-parseaddr_list(str, addrp)
-const char *str;
-struct address **addrp;
+EXPORTED void parseaddr_list(const char *str, struct address **addrp)
 {
 char *s;
 int ingroup = 0;
@@ -150,9 +145,7 @@
 /*
 * Free the address list 'addr'
 */
-void
-parseaddr_free(addr)
-struct address *addr;
+EXPORTED void parseaddr_free(struct address *addr)
 {
 struct address *next;
 
@@ -167,14 +160,9 @@
 /*
 * Helper function to append a new address structure to and address list.
 */
-static void
-parseaddr_append(addrpp, name, route, mailbox, domain, freemep)
-struct address ***addrpp;
-char *name;
-char *route;
-char *mailbox;
-char *domain;
-char **freemep;
+static void parseaddr_append(struct address ***addrpp, const char *name,
+			 const char *route, const char *mailbox,
+			 const char *domain, char **freemep)
 {
 struct address *newaddr;
 
@@ -196,7 +184,7 @@
 newaddr->mailbox = mailbox;
 
 if (domain && !*domain) {
-	domain = parseaddr_unspecified_domain;
+	domain = unspecified_domain;
 }
 newaddr->domain = domain;
 
@@ -234,10 +222,7 @@
 /*
 * Parse an RFC 822 "phrase", stopping at 'specials'
 */
-static int parseaddr_phrase(inp, phrasep, specials)
-char **inp;
-char **phrasep;
-char *specials;
+static int parseaddr_phrase(char **inp, char **phrasep, const char *specials)
 {
 int c;
 char *src = *inp;
@@ -299,10 +284,7 @@
 /*
 * Parse a domain. If 'commentp' is non-nil, parses any trailing comment
 */
-static int parseaddr_domain(inp, domainp, commentp)
-char **inp;
-char **domainp;
-char **commentp;
+static int parseaddr_domain(char **inp, char **domainp, char **commentp)
 {
 int c;
 char *src = *inp;
@@ -352,13 +334,11 @@
 	}
 }
 }
-	
+
 /*
 * Parse a source route (at-domain-list)
 */
-static int parseaddr_route(inp, routep)
-char **inp;
-char **routep;
+static int parseaddr_route(char **inp, char **routep)
 {
 int c;
 char *src = *inp;
@@ -391,3 +371,105 @@
 }
 }
 
+EXPORTED char *address_get_all(const struct address *a, int canon_domain)
+{
+ char *s = NULL;
+
+ if (a->mailbox || a->domain) {
+	const char *m = a->mailbox ? a->mailbox : unknown_user;
+	const char *d = a->domain ? a->domain : unspecified_domain;
+	s = strconcat(m, "@", d, (char *)NULL);
+	if (canon_domain)
+	 lcase(s + strlen(m) + 1);
+ }
+
+ return s;
+}
+
+EXPORTED char *address_get_localpart(const struct address *a)
+{
+ return xstrdupnull(a->mailbox);
+}
+
+EXPORTED char *address_get_domain(const struct address *a, int canon_domain)
+{
+ char *s = NULL;
+
+ if (a->domain) {
+	s = xstrdup(a->domain);
+	if (canon_domain)
+	 lcase(s);
+ }
+
+ return s;
+}
+
+EXPORTED char *address_get_user(const struct address *a)
+{
+ char *s = NULL;
+
+ if (a->mailbox) {
+	char *p = strchr(a->mailbox, '+');
+	int len = p ? p - a->mailbox : (int)strlen(a->mailbox);
+	s = xstrndup(a->mailbox, len);
+ }
+
+ return s;
+}
+
+EXPORTED char *address_get_detail(const struct address *a)
+{
+ char *s = NULL;
+
+ if (a->mailbox) {
+	char *p = strchr(a->mailbox, '+');
+	s = p ? xstrdup(p + 1) : NULL;
+ }
+
+ return s;
+}
+
+/*
+ * Address iterator interface
+ */
+
+EXPORTED void address_itr_init(struct address_itr *ai, const char *str)
+{
+ memset(ai, 0, sizeof(*ai));
+ parseaddr_list(str, &ai->addrlist);
+ ai->anext = ai->addrlist;
+}
+
+EXPORTED const struct address *address_itr_next(struct address_itr *ai)
+{
+ struct address *a;
+ if (ai->anext == NULL)
+	return NULL;
+ a = ai->anext;
+ ai->anext = ai->anext->next;
+ return a;
+}
+
+EXPORTED void address_itr_fini(struct address_itr *ai)
+{
+ parseaddr_free(ai->addrlist);
+ memset(ai, 0, sizeof(*ai));
+}
+
+
+/*
+ * Convenience function to return a single canonicalised address.
+ */
+EXPORTED char *address_canonicalise(const char *str)
+{
+ struct address *addrlist = NULL;
+ char *s = NULL;
+
+ parseaddr_list(str, &addrlist);
+ if (addrlist)
+	s = address_get_all(addrlist, 1);
+ parseaddr_free(addrlist);
+
+ return s;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/parseaddr.h -> cyrus-imapd-2.5.tar.gz/lib/parseaddr.h Changed

@@ -38,32 +38,38 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: parseaddr.h,v 1.10 2010/01/06 17:01:47 murch Exp $
  */
 
 #ifndef INCLUDED_PARSEADDR_H
 #define INCLUDED_PARSEADDR_H
 
-#ifndef P
-#ifdef __STDC__
-#define P(x) x
-#else
-#define P(x) ()
-#endif
-#endif
-
 struct address {
-    char *name;
-    char *route;
-    char *mailbox;
-    char *domain;
+    const char *name;
+    const char *route;
+    const char *mailbox;
+    const char *domain;
     struct address *next;
     char *freeme;		/* If non-nil, free */
 };
 
-extern void parseaddr_list P((const char *s, struct address **addrp));
-extern void parseaddr_free P((struct address *addr));
+struct address_itr {
+    struct address *addrlist;
+    struct address *anext;
+};
+
+extern void parseaddr_list(const char *s, struct address **addrp);
+extern void parseaddr_free(struct address *addr);
+
+extern char *address_get_all(const struct address *, int canon_domain);
+extern char *address_get_localpart(const struct address *);
+extern char *address_get_domain(const struct address *, int canon_domain);
+extern char *address_get_user(const struct address *);
+extern char *address_get_detail(const struct address *);
+
+extern void address_itr_init(struct address_itr *ai, const char *str);
+extern const struct address *address_itr_next(struct address_itr *ai);
+extern void address_itr_fini(struct address_itr *ai);
 
+extern char *address_canonicalise(const char *str);
 
 #endif /* INCLUDED_PARSEADDR_H */

cyrus-imapd-2.5.tar.gz/lib/posix_fadvise.c Added

@@ -0,0 +1,53 @@
+/* posix_fadvise -- Replacement posix_fadvise() function
+ * Does nothing
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <errno.h>
+
+int posix_fadvise(int fd, off_t offset, off_t len, int advice)
+{
+ (void)fd; (void)offset; (void)len; (void)advice;
+ errno = EINVAL;
+ return -1;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/prot.c -> cyrus-imapd-2.5.tar.gz/lib/prot.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: prot.c,v 1.100 2010/06/28 12:06:43 brong Exp $
 */
 
 #include <config.h>
@@ -48,11 +46,7 @@
 #include <string.h>
 #include <syslog.h>
 #include <signal.h>
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -86,7 +80,7 @@
 * Create a new protection stream for file descriptor 'fd'. Stream
 * will be used for writing iff 'write' is nonzero.
 */
-struct protstream *prot_new(int fd, int write)
+EXPORTED struct protstream *prot_new(int fd, int write)
 {
 struct protstream *newstream;
 
@@ -106,15 +100,36 @@
 return newstream;
 }
 
+EXPORTED struct protstream *prot_writebuf(struct buf *buf)
+{
+ struct protstream *newstream;
+
+ newstream = (struct protstream *) xzmalloc(sizeof(struct protstream));
+ /* dodgy, but the alternative is two pointers */
+ newstream->buf = (unsigned char *) 
+	xmalloc(sizeof(char) * (PROT_BUFSIZE));
+ newstream->buf_size = PROT_BUFSIZE;
+ newstream->ptr = newstream->buf;
+ newstream->cnt = PROT_BUFSIZE;
+ newstream->maxplain = PROT_BUFSIZE;
+ newstream->write = 1;
+ newstream->writetobuf = buf;
+ newstream->fd = PROT_NO_FD;
+ newstream->logfd = PROT_NO_FD;
+ newstream->big_buffer = PROT_NO_FD;
+
+ return newstream;
+}
+
 /* Create a protstream which is just an interface to a mapped piece of
 * memory, allowing prot commands to be used to read from it */
-struct protstream *prot_readmap(const char *buf, uint32_t len)
+EXPORTED struct protstream *prot_readmap(const char *base, uint32_t len)
 {
 struct protstream *newstream;
 
 newstream = (struct protstream *) xzmalloc(sizeof(struct protstream));
 /* dodgy, but the alternative is two pointers */
- newstream->ptr = (unsigned char *)buf;
+ newstream->ptr = (unsigned char *)base;
 newstream->cnt = len;
 newstream->fixedsize = 1;
 newstream->fd = PROT_NO_FD;
@@ -127,7 +142,7 @@
 /*
 * Free a protection stream
 */
-int prot_free(struct protstream *s)
+EXPORTED int prot_free(struct protstream *s)
 {
 if (s->error) free(s->error);
 free(s->buf);
@@ -154,13 +169,13 @@
 /*
 * Set the logging file descriptor for stream 's' to be 'fd'.
 */
-int prot_setlog(struct protstream *s, int fd)
+EXPORTED int prot_setlog(struct protstream *s, int fd)
 {
 s->logfd = fd;
 return 0;
 }
 
-int prot_setisclient(struct protstream *s, int val)
+EXPORTED int prot_setisclient(struct protstream *s, int val)
 {
 s->isclient = val;
 return 0;
@@ -172,7 +187,7 @@
 * Turn on TLS for this connection
 */
 
-int prot_settls(struct protstream *s, SSL *tlsconn)
+EXPORTED int prot_settls(struct protstream *s, SSL *tlsconn)
 {
 s->tls_conn = tlsconn;
 
@@ -189,7 +204,7 @@
 /*
 * Decode data sent via a SASL security layer. Returns EOF on error.
 */
-int prot_sasldecode(struct protstream *s, int n)
+static int prot_sasldecode(struct protstream *s, int n)
 {
 int result;
 const char *out;
@@ -228,9 +243,7 @@
 * Turn on SASL for this connection
 */
 
-int prot_setsasl(s, conn)
-struct protstream *s;
-sasl_conn_t *conn;
+EXPORTED int prot_setsasl(struct protstream *s, sasl_conn_t *conn)
 {
 const void *ssfp;
 int result;
@@ -280,7 +293,7 @@
 * Turn off SASL for this connection
 */
 
-void prot_unsetsasl(struct protstream *s)
+EXPORTED void prot_unsetsasl(struct protstream *s)
 {
 s->conn = NULL;
 s->maxplain = PROT_BUFSIZE;
@@ -310,7 +323,7 @@
 * otherwise initialize a decompressor.
 */
 
-int prot_setcompress(struct protstream *s)
+EXPORTED int prot_setcompress(struct protstream *s)
 {
 int zr = Z_OK;
 z_stream *zstrm = (z_stream *) xmalloc(sizeof(z_stream));
@@ -328,12 +341,13 @@
 
 	s->zlevel = Z_DEFAULT_COMPRESSION;
 	zr = deflateInit2(zstrm, s->zlevel, Z_DEFLATED,
-		 -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+		 -MAX_WBITS,		/* raw deflate */
+			 MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);
 }
 else {
 	zstrm->next_in = Z_NULL;
 	zstrm->avail_in = 0;
-	zr = inflateInit2(zstrm, -MAX_WBITS);
+	zr = inflateInit2(zstrm, -MAX_WBITS);	/* raw inflate */
 }
 
 if (zr != Z_OK)
@@ -408,7 +422,7 @@
 * Since we might want to look at the data, we only set a flag and delay
 * any changes to the stream layers until the next prot_write().
 */
-int prot_data_boundary(struct protstream *s)
+EXPORTED int prot_data_boundary(struct protstream *s)
 {
 s->boundary = 1;
 return 0;
@@ -418,7 +432,7 @@
 * Set the read timeout for the stream 's' to 'timeout' seconds.
 * 's' must have been created for reading.
 */
-int prot_settimeout(struct protstream *s, int timeout)
+EXPORTED int prot_settimeout(struct protstream *s, int timeout)
 {
 assert(!s->write);
 
@@ -431,7 +445,7 @@
 * Reset the read timeout_mark for the stream 's'.
 * 'S' must have been created for reading.
 */
-int prot_resettimeout(struct protstream *s)
+EXPORTED int prot_resettimeout(struct protstream *s)
 {
 assert(!s->write);
 
@@ -444,7 +458,7 @@
 * blocking for reading. 's' must have been created for reading,
 * 'flushs' for writing.
 */
-int prot_setflushonread(struct protstream *s, struct protstream *flushs)
+EXPORTED int prot_setflushonread(struct protstream *s, struct protstream *flushs)
 {
 assert(!s->write);
 if(flushs) assert(flushs->write);
@@ -457,7 +471,7 @@
 * Set on stream 's' the callback 'proc' and 'rock'
 * to make the next time we have to wait for input.
 */
-int prot_setreadcallback(struct protstream *s, 
+int prot_setreadcallback(struct protstream *s,
 			 prot_readcallback_t *proc, void *rock)
 {
 assert(!s->write);
@@ -472,7 +486,7 @@
 * argument 'rock' will be called at 'mark' (in seconds) while
 * waiting for input.
 */
-struct prot_waitevent *prot_addwaitevent(struct protstream *s, time_t mark,
+EXPORTED struct prot_waitevent *prot_addwaitevent(struct protstream *s, time_t mark,
 					 prot_waiteventcallback_t *proc,
 					 void *rock)
 {
@@ -503,7 +517,7 @@
 /*
 * Remove 'event' from stream 's'.
 */
-void prot_removewaitevent(struct protstream *s, struct prot_waitevent *event)
+EXPORTED void prot_removewaitevent(struct protstream *s, struct prot_waitevent *event)
 {
 struct prot_waitevent *prev, *cur;
 
@@ -530,7 +544,7 @@
 * error encountered on 's'. If there is no error condition, return a
 * null pointer.
 */
-const char *prot_error(struct protstream *s)
+EXPORTED const char *prot_error(struct protstream *s)
 {
 if(!s) return "bad protstream passed to prot_error";
 else if(s->error) return s->error;
@@ -541,7 +555,7 @@
 /*
 * Rewind the stream 's'. 's' must have been created for reading.
 */
-int prot_rewind(struct protstream *s)
+EXPORTED int prot_rewind(struct protstream *s)
 {
 assert(!s->write);
 
@@ -561,7 +575,7 @@
 * Read data into the empty buffer for the stream 's' and return the
 * first character. Returns EOF on EOF or error.
 */
-int prot_fill(struct protstream *s)
+EXPORTED int prot_fill(struct protstream *s)
 {
 int n;
 unsigned char *ptr;
@@ -628,7 +642,7 @@
 	 FD_SET(s->fd, &rfds);
 
 	 if (!haveinput &&
-		(select(s->fd + 1, &rfds, (fd_set *)0, (fd_set *)0,
+		(signals_select(s->fd + 1, &rfds, (fd_set *)0, (fd_set *)0,
 			&timeout) <= 0)) {
 		if (s->readcallback_proc) {
 		 (*s->readcallback_proc)(s, s->readcallback_rock);
@@ -673,7 +687,7 @@
 		timeout.tv_usec = 0;
 		FD_ZERO(&rfds);
 		FD_SET(s->fd, &rfds);
-		r = select(s->fd + 1, &rfds, (fd_set *)0, (fd_set *)0,
+		r = signals_select(s->fd + 1, &rfds, (fd_set *)0, (fd_set *)0,
 			 &timeout);
 		now = time(NULL);
 	 } while ((r == 0 || (r == -1 && errno == EINTR && !signals_poll())) &&
@@ -697,8 +711,8 @@
 	}
 
 	/* we have data, reset the timeout_mark */
-	s->timeout_mark = time(NULL) + s->read_timeout;
-	
+	prot_resettimeout(s);
+
 	do {
 	 cmdtime_netstart();
 #ifdef HAVE_SSL	 
@@ -773,7 +787,7 @@
 * If 's' is an input stream, discard any pending/buffered data. Otherwise,
 * Write out any buffered data in the stream 's'
 */
-int prot_flush(struct protstream *s) 
+EXPORTED int prot_flush(struct protstream *s)
 {
 if (!s->write) {
 	int c, save_dontblock = s->dontblock;
@@ -953,8 +967,13 @@
 
 /* end protstream setup */
 
+ /* if writing to a buffer, just append the lot. Always works */
+ if (s->writetobuf) {
+	buf_appendmap(s->writetobuf, ptr, left);
+ }
+
 /* If we're doing a blocking write, flush the buffers, bigbuffer first */
- if(!s->dontblock) {
+ else if (!s->dontblock) {
 	if(s->big_buffer != PROT_NO_FD) {
 	 /* Write the bigbuffer */
 	 do {
@@ -1001,7 +1020,10 @@
 		left -= n;
 	 }
 	} while(left);
- } else { /* Nonblocking */
+ }
+
+ /* Nonblocking */
+ else {
 	/* If we've been feeding a bigbuffer, write out from the current
 	 * position as much as we can */
 	if (s->big_buffer != PROT_NO_FD) {
@@ -1134,7 +1156,7 @@
 /*
 * Write to the output stream 's' the 'len' bytes of data at 'buf'
 */
-int prot_write(struct protstream *s, const char *buf, unsigned len)
+EXPORTED int prot_write(struct protstream *s, const char *buf, unsigned len)
 {
 assert(s->write);
 if(s->error || s->eof) return EOF;
@@ -1191,26 +1213,42 @@
 return 0;
 }
 
-int prot_putbuf(struct protstream *s, struct buf *buf)
+EXPORTED int prot_putbuf(struct protstream *s, struct buf *buf)
 {
 return prot_write(s, buf->s, buf->len);
 }
 
+EXPORTED int prot_puts(struct protstream *s, const char *str)
+{
+ return prot_write(s, str, strlen(str));
+}
+
 /*
 * Stripped-down version of printf() that works on protection streams
- * Only understands '%lld', '%llu', '%ld', '%lu', '%d', %u', '%s',
- * '%tu', '%td', '%c', and '%%' in the format string.
+ * Only understands '%lld', '%llu', '%llx', '%ld', '%lu', '%lx',
+ * '%d', %u', '%x', '%s', '%tu', '%td', '%c', and '%%'
+ * in the format string.
 */
-int prot_printf(struct protstream *s, const char *fmt, ...)
+EXPORTED int prot_printf(struct protstream *s, const char *fmt, ...)
 {
 va_list pvar;
+ int r;
+
+ va_start(pvar, fmt);
+ r = prot_vprintf(s, fmt, pvar);
+ va_end(pvar);
+
+ return r;
+}
+
+EXPORTED int prot_vprintf(struct protstream *s, const char *fmt, va_list pvar)
+{
 char *percent, *p;
 long l;
 unsigned long ul;
 int i;
 unsigned u;
 char buf30;
- va_start(pvar, fmt);
 
 assert(s->write);
 
@@ -1235,7 +1273,12 @@
 		prot_write(s, buf, strlen(buf));
 		break;
 
-#ifdef HAVE_LONG_LONG_INT
+	 case 'x':
+		l = va_arg(pvar, long);
+		snprintf(buf, sizeof(buf), "%lx", l);
+		prot_write(s, buf, strlen(buf));
+		break;
+
 case 'l': {
 		long long int ll;
 		unsigned long long int ull;
@@ -1253,12 +1296,17 @@
 		 prot_write(s, buf, strlen(buf));
 		 break;
 
+		case 'x':
+		 ll = va_arg(pvar, long long int);
+		 snprintf(buf, sizeof(buf), "%llx", ll);
+		 prot_write(s, buf, strlen(buf));
+		 break;
+
 	 default:
 		 abort();
 		}
 		break;
 	 }
-#endif
 
 	 default:
 		abort();
@@ -1272,11 +1320,17 @@
 	 break;
 
 	case 'u':
-	 u = va_arg(pvar, int);
+	 u = va_arg(pvar, unsigned);
 	 snprintf(buf, sizeof(buf), "%u", u);
 	 prot_write(s, buf, strlen(buf));
 	 break;
 
+	case 'x':
+	 i = va_arg(pvar, int);
+	 snprintf(buf, sizeof(buf), "%x", i);
+	 prot_write(s, buf, strlen(buf));
+	 break;
+
 	/* according to linux 'man 3 printf' this is supposed to be
 	 * of type "ptrdiff_t", not "size_t" - but don't want to break
 	 * running code! */
@@ -1342,12 +1396,11 @@
 	fmt = percent+1;
 }
 prot_write(s, fmt, strlen(fmt));
- va_end(pvar);
 if (s->error || s->eof) return EOF;
 return 0;
 }
 
-int prot_printliteral(struct protstream *out, const char *s, size_t size)
+EXPORTED int prot_printliteral(struct protstream *out, const char *s, size_t size)
 {
 int r;
 if (out->isclient)
@@ -1358,25 +1411,27 @@
 return prot_write(out, s, size);
 }
 
+#define isQCHAR(c) \
+	(!((c) & 0x80 || *p == '\r' || (c) == '\n' \
+	 || (c) == '\"' || (c) == '%' || (c) == '\\'))
+#define MAXQSTRING 1024
+
 /*
 * Print 's' as a quoted-string or literal (but not an atom)
 */
-int prot_printstring(struct protstream *out, const char *s)
+EXPORTED int prot_printstring(struct protstream *out, const char *s)
 {
 const char *p;
- int len = 0;
 
 if (!s) return prot_printf(out, "NIL");
 
 /* Look for any non-QCHAR characters */
- for (p = s; *p && len < 1024; p++) {
-	len++;
-	if (*p & 0x80 || *p == '\r' || *p == '\n'
-	 || *p == '\"' || *p == '%' || *p == '\\') break;
+ for (p = s; *p && (p-s) < MAXQSTRING; p++) {
+	if (!isQCHAR(*p)) break;
 }
 
 /* if it's too long, literal it */
- if (*p || len >= 1024) {
+ if (*p || (p-s) >= MAXQSTRING) {
 	return prot_printliteral(out, s, strlen(s));
 }
 
@@ -1384,15 +1439,77 @@
 }
 
 /*
+ * Print the @n bytes at @s as a quoted-string or literal.
+ * Handles embedded NULs.
+ */
+EXPORTED int prot_printmap(struct protstream *out, const char *s, size_t n)
+{
+ const char *p;
+ int r;
+
+ if (!s) return prot_printf(out, "NIL");
+
+ /* if it's too long, literal it */
+ if (n >= MAXQSTRING)
+	return prot_printliteral(out, s, n);
+
+ /* Look for NULs or any non-QCHAR characters */
+ for (p = s; (size_t)(p-s) < n; p++) {
+	if (!*p || !isQCHAR(*p))
+	 return prot_printliteral(out, s, n);
+ }
+
+ prot_putc('"', out);
+ r = prot_write(out, s, n);
+ if (r < 0)
+	return r;
+ prot_putc('"', out);
+ return r+2;
+}
+
+/*
+ * Print the @n bytes at @s as an atom, quoted-string or literal.
+ * Handles embedded NULs.
+ */
+EXPORTED int prot_printamap(struct protstream *out, const char *s, size_t n)
+{
+ const char *p;
+ int r;
+
+ if (!s) return prot_printf(out, "NIL");
+
+ if (imparse_isnatom(s, n) && (n != 3 || memcmp(s, "NIL", 3)))
+	return prot_write(out, s, n);
+
+ /* if it's too long, literal it */
+ if (n >= MAXQSTRING)
+	return prot_printliteral(out, s, n);
+
+ /* Look for NULs or any non-QCHAR characters */
+ for (p = s; (size_t)(p-s) < n; p++) {
+	if (!*p || !isQCHAR(*p))
+	 return prot_printliteral(out, s, n);
+ }
+
+ prot_putc('"', out);
+ r = prot_write(out, s, n);
+ if (r < 0)
+	return r;
+ prot_putc('"', out);
+ return r+2;
+}
+
+/*
 * Print 's' as an atom, quoted-string, or literal
 */
-int prot_printastring(struct protstream *out, const char *s)
+EXPORTED int prot_printastring(struct protstream *out, const char *s)
 {
 if (!s) return prot_printf(out, "NIL");
 
 /* special cases for atoms */
 if (!*s) return prot_printf(out, "\"\"");
- if (imparse_isatom(s)) return prot_printf(out, "%s", s);
+ if (imparse_isatom(s) && strcmp(s, "NIL"))
+	return prot_printf(out, "%s", s);
 
 /* not an atom, so pass to printstring */
 return prot_printstring(out, s);
@@ -1402,7 +1519,7 @@
 * Read from the protections stream 's' up to 'size' bytes into the buffer
 * 'buf'. Returns the number of bytes read, or 0 for some error.
 */
-int prot_read(struct protstream *s, char *buf, unsigned size)
+EXPORTED int prot_read(struct protstream *s, char *buf, unsigned size)
 {
 int c;
 
@@ -1427,6 +1544,18 @@
 }
 
 /*
+ * Read from the protections stream 's' up to 'size' bytes, and append them
+ * to the buffer 'buf'. Returns the number of bytes read, or 0 for some error.
+ */
+EXPORTED int prot_readbuf(struct protstream *s, struct buf *buf, unsigned size)
+{
+ buf_ensure(buf, size);
+ size = prot_read(s, buf->s + buf->len, size);
+ buf->len += size;
+ return size;
+}
+
+/*
 * select() for protection streams, read only
 * Also supports selecting on an extra file descriptor
 *
@@ -1434,7 +1563,7 @@
 *
 * Only works for readable protstreams
 */ 
-int prot_select(struct protgroup *readstreams, int extra_read_fd,
+EXPORTED int prot_select(struct protgroup *readstreams, int extra_read_fd,
 		struct protgroup **out, int *extra_read_flag,
 		struct timeval *timeout) 
 {
@@ -1547,7 +1676,7 @@
 	 timeout->tv_usec = 0;
 	}
 
-	if(select(max_fd + 1, &rfds, NULL, NULL, timeout) == -1)
+	if(signals_select(max_fd + 1, &rfds, NULL, NULL, timeout) == -1)
 	 return -1;
 
 	/* Reset now */
@@ -1591,7 +1720,7 @@
 /*
 * Version of fgets() that works with protection streams.
 */
-char *prot_fgets(char *buf, unsigned size, struct protstream *s)
+EXPORTED char *prot_fgets(char *buf, unsigned size, struct protstream *s)
 {
 char *p = buf;
 int c;
@@ -1614,7 +1743,7 @@
 
 /* Handle protgroups */
 /* Create a new protgroup of the given size, or 32 if size is 0 */
-struct protgroup *protgroup_new(size_t size) 
+EXPORTED struct protgroup *protgroup_new(size_t size) 
 {
 struct protgroup *ret = xmalloc(sizeof(struct protgroup));
 
@@ -1639,7 +1768,7 @@
 return dest;
 }
 
-void protgroup_reset(struct protgroup *group) 
+EXPORTED void protgroup_reset(struct protgroup *group)
 {
 if(group) {
 	memset(group->group, 0,
@@ -1648,7 +1777,7 @@
 }
 }
 
-void protgroup_free(struct protgroup *group) 
+EXPORTED void protgroup_free(struct protgroup *group)
 {
 if(group) {
 	assert(group->group);
@@ -1657,7 +1786,7 @@
 }
 }
 
-void protgroup_insert(struct protgroup *group, struct protstream *item) 
+EXPORTED void protgroup_insert(struct protgroup *group, struct protstream *item)
 {
 unsigned i, empty;
 
@@ -1680,7 +1809,7 @@
 group->groupempty = item;
 }
 
-void protgroup_delete(struct protgroup *group, struct protstream *item) 
+EXPORTED void protgroup_delete(struct protgroup *group, struct protstream *item)
 {
 unsigned i;
 
@@ -1702,7 +1831,7 @@
 syslog(LOG_ERR, "protgroup_delete(): can't find protstream in group");
 }
 
-struct protstream *protgroup_getelement(struct protgroup *group,
+EXPORTED struct protstream *protgroup_getelement(struct protgroup *group,
 					size_t element) 
 {
 assert(group);
@@ -1713,7 +1842,7 @@
 return group->groupelement;
 }
 
-int prot_getc(struct protstream *s)
+EXPORTED int prot_getc(struct protstream *s)
 {
 assert(!s->write);
 
@@ -1727,7 +1856,7 @@
 return prot_fill(s);
 }
 
-int prot_ungetc(int c, struct protstream *s)
+EXPORTED int prot_ungetc(int c, struct protstream *s)
 {
 assert(!s->write);
 
@@ -1746,7 +1875,7 @@
 return c;
 }
 
-int prot_putc(int c, struct protstream *s)
+EXPORTED int prot_putc(int c, struct protstream *s)
 {
 assert(s->write);
 assert(s->cnt > 0);

cyrus-imapd-2.4.17.tar.gz/lib/prot.h -> cyrus-imapd-2.5.tar.gz/lib/prot.h Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: prot.h,v 1.48 2010/01/06 17:01:47 murch Exp $
 */
 
 #ifndef INCLUDED_PROT_H
@@ -51,6 +49,7 @@
 #include <stdlib.h>
 
 #include <sasl/sasl.h>
+#include <config.h>
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
@@ -106,9 +105,9 @@
 
 /* Big Buffer Information */
 const char *bigbuf_base; /* Base Pointer */
- unsigned long bigbuf_siz; /* Overall Size of Buffer */
- unsigned long bigbuf_len; /* Length of mapped file */
- unsigned long bigbuf_pos; /* Current Position */
+ size_t bigbuf_siz; /* Overall Size of Buffer */
+ size_t bigbuf_len; /* Length of mapped file */
+ size_t bigbuf_pos; /* Current Position */
 
 /* Status Flags */
 int eof;
@@ -123,6 +122,8 @@
 int read_timeout;
 time_t timeout_mark;
 struct protstream *flushonread;
+ /* hack to write to an in-memory-string */
+ struct buf *writetobuf;
 
 int can_unget;
 int bytes_in;
@@ -183,7 +184,8 @@
 
 /* Allocate/free the protstream structure */
 extern struct protstream *prot_new(int fd, int write);
-extern struct protstream *prot_readmap(const char *buf, uint32_t len);
+extern struct protstream *prot_writebuf(struct buf *buf);
+extern struct protstream *prot_readmap(const char *base, uint32_t len);
 extern int prot_free(struct protstream *s);
 
 /* Set the telemetry logfile for a given protstream */
@@ -230,7 +232,7 @@
 			 struct protstream *flushs);
 
 
-extern int prot_setreadcallback(struct protstream *s,
+int prot_setreadcallback(struct protstream *s,
 				prot_readcallback_t *proc, void *rock);
 extern struct prot_waitevent *prot_addwaitevent(struct protstream *s,
 						time_t mark,
@@ -251,6 +253,8 @@
 /* These are protlayer versions of the specified functions */
 extern int prot_write(struct protstream *s, const char *buf, unsigned len);
 extern int prot_putbuf(struct protstream *s, struct buf *buf);
+extern int prot_puts(struct protstream *s, const char *str);
+extern int prot_vprintf(struct protstream *, const char *, va_list);
 extern int prot_printf(struct protstream *, const char *, ...)
 #ifdef __GNUC__
 __attribute__ ((format (printf, 2, 3)));
@@ -260,8 +264,11 @@
 extern int prot_printliteral(struct protstream *out, const char *s,
 			 size_t size);
 extern int prot_printstring(struct protstream *out, const char *s);
+extern int prot_printmap(struct protstream *out, const char *s, size_t n);
+extern int prot_printamap(struct protstream *out, const char *s, size_t n);
 extern int prot_printastring(struct protstream *out, const char *s);
 extern int prot_read(struct protstream *s, char *buf, unsigned size);
+extern int prot_readbuf(struct protstream *s, struct buf *buf, unsigned size);
 extern char *prot_fgets(char *buf, unsigned size, struct protstream *s);
 
 /* select() for protstreams */

cyrus-imapd-2.5.tar.gz/lib/ptrarray.c Added

@@ -0,0 +1,213 @@
+/* ptrarray.c -- an expanding array of pointers
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Greg Banks
+ * Start Date: 2011/01/11
+ */
+
+#include "ptrarray.h"
+#include <memory.h>
+#include "xmalloc.h"
+
+EXPORTED ptrarray_t *ptrarray_new(void)
+{
+ return xzmalloc(sizeof(ptrarray_t));
+}
+
+EXPORTED void ptrarray_fini(ptrarray_t *pa)
+{
+ if (!pa)
+	return;
+ memset(pa->data, 0, sizeof(void *) * pa->count);
+ free(pa->data);
+ pa->data = NULL;
+ pa->count = 0;
+ pa->alloc = 0;
+}
+
+EXPORTED void ptrarray_free(ptrarray_t *pa)
+{
+ if (!pa)
+	return;
+ ptrarray_fini(pa);
+ free(pa);
+}
+
+/*
+ * Ensure the index @idx exists in the array, if necessary expanding the
+ * array, and if necessary NULL-filling all the intervening elements.
+ * Note that we always ensure an empty slot past the last reported
+ * index, so that we can pass data to execve() or other routines that
+ * assume a NULL terminator.
+ */
+#define QUANTUM	 16
+static void ensure_alloc(ptrarray_t *pa, int newalloc)
+{
+ if (newalloc)
+	newalloc++;
+ if (newalloc <= pa->alloc)
+	return;
+ newalloc = ((newalloc + QUANTUM-1) / QUANTUM) * QUANTUM;
+ pa->data = xrealloc(pa->data, sizeof(void *) * newalloc);
+ memset(pa->data+pa->alloc, 0, sizeof(void *) * (newalloc-pa->alloc));
+ pa->alloc = newalloc;
+}
+
+static inline int adjust_index_ro(const ptrarray_t *pa, int idx)
+{
+ if (idx >= pa->count)
+	return -1;
+ else if (idx < 0)
+	idx += pa->count;
+ return idx;
+}
+
+static inline int adjust_index_rw(ptrarray_t *pa, int idx, int len)
+{
+ if (idx >= pa->count) {
+	ensure_alloc(pa, idx+len);
+ } else if (idx < 0) {
+	idx += pa->count;
+	if (idx >= 0 && len)
+	 ensure_alloc(pa, pa->count+len);
+ } else if (len) {
+	ensure_alloc(pa, pa->count+len);
+ }
+ return idx;
+}
+
+EXPORTED void ptrarray_add(ptrarray_t *pa, void *p)
+{
+ if (ptrarray_find(pa, p, 0) < 0)
+	ptrarray_append(pa, p);
+}
+
+EXPORTED void ptrarray_append(ptrarray_t *pa, void *p)
+{
+ ensure_alloc(pa, pa->count+1);
+ pa->datapa->count++ = p;
+}
+
+EXPORTED void ptrarray_set(ptrarray_t *pa, int idx, void *p)
+{
+ if ((idx = adjust_index_rw(pa, idx, 0)) < 0)
+	return;
+ pa->dataidx = p;
+}
+
+static inline void _ptrarray_insert(ptrarray_t *pa, int idx, void *p)
+{
+ if (idx < pa->count)
+	memmove(pa->data+idx+1, pa->data+idx,
+		sizeof(void *) * (pa->count-idx));
+ pa->dataidx = p;
+ pa->count++;
+}
+
+EXPORTED void ptrarray_insert(ptrarray_t *pa, int idx, void *p)
+{
+ if ((idx = adjust_index_rw(pa, idx, 1)) < 0)
+	return;
+ _ptrarray_insert(pa, idx, p);
+}
+
+EXPORTED void *ptrarray_remove(ptrarray_t *pa, int idx)
+{
+ void *p;
+ if ((idx = adjust_index_ro(pa, idx)) < 0)
+	return NULL;
+ p = pa->dataidx;
+ pa->count--;
+ if (idx < pa->count)
+	memmove(pa->data+idx, pa->data+idx+1,
+		sizeof(void *) * (pa->count-idx));
+ return p;
+}
+
+EXPORTED void ptrarray_truncate(ptrarray_t *pa, int newlen)
+{
+ int i;
+
+ if (newlen == pa->count)
+	return;
+
+ if (newlen > pa->count) {
+	ensure_alloc(pa, newlen);
+ } else {
+	for (i = newlen ; i < pa->count ; i++) {
+	 pa->datai = NULL;
+	}
+ }
+ pa->count = newlen;
+}
+
+EXPORTED void *ptrarray_nth(const ptrarray_t *pa, int idx)
+{
+ if ((idx = adjust_index_ro(pa, idx)) < 0)
+	return NULL;
+ return pa->dataidx;
+}
+
+EXPORTED void **ptrarray_takevf(ptrarray_t *pa)
+{
+ void **d = pa->data;
+ pa->data = NULL;
+ pa->count = pa->alloc = 0;
+ ptrarray_free(pa);
+ return d;
+}
+
+EXPORTED int ptrarray_find(const ptrarray_t *pa, void *match, int starting)
+{
+ int i;
+
+ for (i = starting ; i < pa->count ; i++)
+	if (match == pa->datai)
+	 return i;
+ return -1;
+}
+
+EXPORTED void ptrarray_sort(ptrarray_t *pa,
+			 int (*compare)(const void **, const void **))
+{
+ qsort(pa->data, pa->count, sizeof(void*),
+	 (int (*)(const void *, const void *))compare);
+}

cyrus-imapd-2.5.tar.gz/lib/ptrarray.h Added

@@ -0,0 +1,90 @@
+/* ptrarray.h -- an expanding array of pointers
+ *
+ * Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Greg Banks
+ * Start Date: 2011/01/11
+ */
+
+#ifndef __CYRUS_PTRARRAY_H__
+#define __CYRUS_PTRARRAY_H__
+
+#include <config.h>
+#include <sys/types.h>
+
+typedef struct
+{
+ int count;
+ int alloc;
+ void **data;
+} ptrarray_t;
+
+#define PTRARRAY_INITIALIZER	{ 0, 0, NULL }
+#define ptrarray_init(pa) (memset((pa), 0, sizeof(ptrarray_t)))
+void ptrarray_fini(ptrarray_t *);
+
+ptrarray_t *ptrarray_new(void);
+void ptrarray_free(ptrarray_t *);
+
+void ptrarray_append(ptrarray_t *, void *);
+void ptrarray_add(ptrarray_t *, void *);
+void ptrarray_set(ptrarray_t *, int idx, void *);
+void ptrarray_insert(ptrarray_t *, int idx, void *);
+void *ptrarray_remove(ptrarray_t *, int idx);
+void *ptrarray_nth(const ptrarray_t *pa, int idx);
+void ptrarray_truncate(ptrarray_t *pa, int newlen);
+
+#define ptrarray_shift(pa)	 ptrarray_remove((pa), 0)
+#define ptrarray_unshift(pa, s)	 ptrarray_insert((pa), 0, (s))
+
+#define ptrarray_pop(pa)	 ptrarray_remove((pa), -1)
+#define ptrarray_push(pa, s)	 ptrarray_append((pa), (s))
+
+#define ptrarray_tail(pa)	 ptrarray_nth((pa), -1)
+#define ptrarray_head(pa)	 ptrarray_nth((pa), 0)
+
+void **ptrarray_takevf(ptrarray_t *pa);
+
+int ptrarray_find(const ptrarray_t *pa, void *match,
+		 int starting);
+
+void ptrarray_sort(ptrarray_t *pa, int (*compare)(const void **, const void **));
+
+#endif /* __CYRUS_PTRARRAY_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/retry.c -> cyrus-imapd-2.5.tar.gz/lib/retry.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: retry.c,v 1.27 2010/06/28 12:05:57 brong Exp $
 */
 
 #include <config.h>
@@ -51,20 +49,19 @@
 #endif
 
 #include "retry.h"
+#include "xmalloc.h"
 
 /*
 * Keep calling the read() system call with 'fd', 'buf', and 'nbyte'
 * until all the data is read in or an error occurs.
 */
-int retry_read(int fd, void *buf, size_t nbyte)
+EXPORTED ssize_t retry_read(int fd, void *vbuf, size_t nbyte)
 {
- int n;
- int nread = 0;
-
- if (nbyte == 0) return 0;
-
- for (;;) {
-	n = read(fd, buf, nbyte);
+ size_t nread;
+ char *buf = vbuf;
+ 
+ for (nread = 0; nread < nbyte; ) {
+	ssize_t n = read(fd, buf + nread, nbyte - nread);
 	if (n == 0) {
 	 /* end of file */
 	 return -1;
@@ -76,57 +73,47 @@
 	}
 
 	nread += n;
-
-	if (((size_t) n) >= nbyte) return nread;
-
-	buf += n;
-	nbyte -= n;
 }
+
+ return nread;
 }
 
 /*
 * Keep calling the write() system call with 'fd', 'buf', and 'nbyte'
 * until all the data is written out or an error occurs.
 */
-int retry_write(int fd, const void *buf, size_t nbyte)
+EXPORTED ssize_t retry_write(int fd, const void *vbuf, size_t nbyte)
 {
- int n;
- int written = 0;
+ const char *buf = vbuf;
+ size_t written = 0;
 
 if (nbyte == 0) return 0;
 
- for (;;) {
-	n = write(fd, buf, nbyte);
+ for (written = 0; written < nbyte; ) {
+	ssize_t n = write(fd, buf + written, nbyte - written);
+
 	if (n == -1) {
 	 if (errno == EINTR) continue;
 	 return -1;
 	}
 
 	written += n;
-
-	if (((size_t) n) >= nbyte) return written;
-
-	buf += n;
-	nbyte -= n;
 }
+
+ return written;
 }
 
-	
 /*
 * Keep calling the writev() system call with 'fd', 'iov', and 'iovcnt'
 * until all the data is written out or an error occurs.
 *
 * Now no longer destructive of parameters!
 */
-int
-retry_writev(fd, srciov, iovcnt)
-int fd;
-struct iovec *srciov;
-int iovcnt;
+EXPORTED ssize_t retry_writev(int fd, const struct iovec *srciov, int iovcnt)
 {
- int n;
 int i;
- int written = 0;
+ ssize_t n;
+ size_t written = 0;
 struct iovec *iov, *baseiov;
 static int iov_max =
 #ifdef MAXIOV
@@ -140,6 +127,9 @@
 #endif
 	;
 
+ if (!iovcnt)
+	return 0;
+
 baseiov = iov = (struct iovec *)xmalloc(iovcnt * sizeof(struct iovec));
 for (i = 0; i < iovcnt; i++) {
 	iovi.iov_base = srciovi.iov_base;
@@ -152,7 +142,7 @@
 	 iovcnt--;
 	}
 
-	if (!iovcnt) goto done;
+	if (!iovcnt) break;
 
 	n = writev(fd, iov, iovcnt > iov_max ? iov_max : iovcnt);
 	if (n == -1) {
@@ -161,14 +151,14 @@
 		continue;
 	 }
 	 if (errno == EINTR) continue;
-	 written = -1;
-	 goto done;
+	 free(baseiov);
+	 return -1;
 	}
 
 	written += n;
 
 	for (i = 0; i < iovcnt; i++) {
-	 if (iovi.iov_len > (size_t) n) {
+	 if (iovi.iov_len > (size_t)n) {
 		iovi.iov_base = (char *)iovi.iov_base + n;
 		iovi.iov_len -= n;
 		break;
@@ -177,12 +167,9 @@
 	 iovi.iov_len = 0;
 	}
 
-	if (i == iovcnt) goto done;
+	if (i == iovcnt) break;
 }
 
-done:
 free(baseiov);
 return written;
 }
-
-

cyrus-imapd-2.4.17.tar.gz/lib/retry.h -> cyrus-imapd-2.5.tar.gz/lib/retry.h Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: retry.h,v 1.15 2010/01/06 17:01:47 murch Exp $
 */
 
 #ifndef INCLUDED_RETRY_H
@@ -53,20 +51,19 @@
 #endif
 #endif
 
+#include <sys/types.h>
 #include <sys/uio.h>
-#include "xmalloc.h"
 
-extern int retry_read P((int fd, void *buf, size_t nbyte));
-extern int retry_write P((int fd, const void *buf, size_t nbyte));
-extern int retry_writev P((int fd, struct iovec *iov, int iovcnt));
+extern ssize_t retry_read P((int fd, void *buf, size_t nbyte));
+extern ssize_t retry_write P((int fd, const void *buf, size_t nbyte));
+extern ssize_t retry_writev P((int fd, const struct iovec *iov, int iovcnt));
 
 /* add a buffer 's' of length 'len' to iovec 'iov' */
 #define WRITEV_ADD_TO_IOVEC(iov, num_iov, s, len) \
- do { (iov)(num_iov).iov_base = (s); \
+ do { (iov)(num_iov).iov_base = (char *)(s); \
 (iov)(num_iov)++.iov_len = (len); } while (0)
 
 /* add a string 's' to iovec 'iov' */
 #define WRITEV_ADDSTR_TO_IOVEC(iov, num_iov, s) WRITEV_ADD_TO_IOVEC(iov, num_iov, s, strlen(s))
- 
 
 #endif /* INCLUDED_RETRY_H */

cyrus-imapd-2.5.tar.gz/lib/rfc822tok.c Added

@@ -0,0 +1,189 @@
+/* rfc822tok.c -- RFC822/RFC2822 tokenizer
+ *
+ * Copyright (c) 2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include "rfc822tok.h"
+
+EXPORTED void rfc822tok_init(rfc822tok_t *t, const char *base,
+			 unsigned int len, unsigned int flags)
+{
+ buf_init_ro(&t->buf, base, len);
+ t->ptr = base;
+ t->flags = flags;
+}
+
+EXPORTED void rfc822tok_init_buf(rfc822tok_t *t, const struct buf *b,
+				 unsigned int flags)
+{
+ rfc822tok_init(t, (b ? b->s : NULL), (b ? b->len : 0), flags);
+}
+
+EXPORTED void rfc822tok_fini(rfc822tok_t *t)
+{
+ buf_free(&t->buf);
+}
+
+static inline int is_special(rfc822tok_t *t, int c)
+{
+ /* These specials are defined by RFC2822 */
+ if (strchr("()<>:;@\\,", c))
+	return 1;
+ /* ...except '.' sometimes is and sometimes isn't special */
+ if (c == '.' && (t->flags & RFC822_SPECIAL_DOT))
+	return 1;
+ /* ...and '=' sometimes is and sometimes isn't */
+ if (c == '=' && (t->flags & RFC822_SPECIAL_EQUAL))
+	return 1;
+ return 0;
+}
+
+EXPORTED int rfc822tok_next(rfc822tok_t *t, char **textp)
+{
+ const char *p;
+ const char *end;
+ int comment_depth = 0;
+ static struct buf text = BUF_INITIALIZER;
+ int r;
+
+ buf_reset(&text);
+ if (textp) *textp = NULL;
+ if (!t->buf.len)
+	return EOF;
+
+ end = t->buf.s + t->buf.len;
+ p = t->ptr;
+ if (p >= end)
+	return EOF;
+
+ /* skip any leading whitespace and comments */
+ for ( ; p < end ; p++) {
+	if (comment_depth) {
+	 if (*p == '\\')
+		p++;
+	 else if (*p == ')')
+		comment_depth--;
+	 else if (*p == '(')
+		comment_depth++;
+	}
+	else if (*p == '(') {
+	 comment_depth++;
+	}
+	else if (!isspace(*p)) {
+	 break;
+	}
+ }
+ if (comment_depth) {
+	r = -EINVAL;
+	goto out;
+ }
+ if (p >= end) {
+	r = EOF;
+	goto out;
+ }
+
+ /* RFC2822 specials are single-char tokens */
+ if (is_special(t, *p)) {
+	r = *p++;
+	goto out;
+ }
+
+ if (*p == '"') {
+	/* parse quoted-string per RFC2822 section 3.2.5 */
+	int in_quoted_pair = 0;
+	int in_quoted_string = 1;
+
+	for (p++ ; p < end ; p++) {
+	 if (*p == '\r' && p+1 < end && p1 == '\n') {
+		/* elide CRLF inside a quoted string */
+		p++;
+		/* a close reading of RFC2822 shows that \ is only
+		 * semantically invisible when part of a quoted-pair,
+		 * and CRLF is not part of a quoted-pair; so if we see a
+		 * dangling \ just before CRLF we need to include it in
+		 * the string */
+		if (in_quoted_pair) {
+		 buf_putc(&text, '\\');
+		 in_quoted_pair = 0;
+		}
+		continue;
+	 }
+	 else if (in_quoted_pair) {
+		in_quoted_pair = 0;
+		buf_putc(&text, *p);
+	 }
+	 else if (*p == '\\') {
+		in_quoted_pair = 1;
+		continue;
+	 }
+	 else if (*p == '"') {
+		in_quoted_string = 0;
+		p++;
+		break;
+	 }
+	 else {
+		buf_putc(&text, *p);
+	 }
+	}
+	r = RFC822_QSTRING;
+	if (in_quoted_string || in_quoted_pair)
+	 r = -EINVAL;
+	goto out;
+ }
+
+ /* anything else is an atom */
+ for ( ; p < end ; p++) {
+	if (isspace(*p) || *p == '(' || *p == '"' || is_special(t, *p))
+	 break;
+	buf_putc(&text, *p);
+ }
+ r = RFC822_ATOM;
+
+out:
+ t->ptr = p;
+ if (textp) *textp = text.len ? (char *)buf_cstring(&text) : NULL;
+ return r;
+}
+
+

cyrus-imapd-2.5.tar.gz/lib/rfc822tok.h Added

@@ -0,0 +1,78 @@
+/* rfc822tok.h -- RFC822/RFC2822 tokenizer
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS__RFC822TOK_H__
+#define __CYRUS__RFC822TOK_H__
+
+#include "util.h"
+
+/* definitions for tokens returned */
+#define RFC822_ATOM		256
+#define RFC822_QSTRING		257
+
+typedef struct
+{
+ struct buf buf;
+ const char *ptr;
+#define RFC822_SPECIAL_DOT	(1<<0)
+#define RFC822_SPECIAL_EQUAL	(1<<1)
+ unsigned int flags;
+} rfc822tok_t;
+
+#define RFC822TOK_INITIALIZER \
+ { BUF_INITIALIZER, NULL, 0 }
+
+void rfc822tok_init(rfc822tok_t *, const char *base,
+		 unsigned int len, unsigned int flags);
+void rfc822tok_init_buf(rfc822tok_t *, const struct buf *,
+			unsigned int flags);
+void rfc822tok_fini(rfc822tok_t *);
+
+/* Advance to the next token and return it. Tokens may be several ASCII
+ * characters or the tokens defined above. EOF is returned on end of
+ * the input text, other negative numbers indicate errors. Some tokens
+ * have associated text; if @textp is non-NULL, fill it in with a
+ * pointer to the text in an internal buffer which is valid until the
+ * next call and can be written e.g. for further parsing. */
+int rfc822tok_next(rfc822tok_t *, char **textp);
+
+#endif /* __CYRUS__RFC822TOK_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/signals.c -> cyrus-imapd-2.5.tar.gz/lib/signals.c Changed

@@ -38,35 +38,47 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: signals.c,v 1.15 2008/03/24 17:09:19 murch Exp $
 */
 
 #include <config.h>
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <signal.h>
 #include <syslog.h>
+#include <string.h>
+#include <errno.h>
 
 #include "signals.h"
 #include "xmalloc.h"
 #include "exitcodes.h"
+#include "util.h"
 
-static int gotsignal = 0;
+#ifndef _NSIG
+#define _NSIG 65
+#endif
+static volatile sig_atomic_t gotsignal_NSIG;
+static volatile pid_t killer_pid;
 
-static void sighandler(int sig)
+static void sighandler(int sig, siginfo_t *si,
+		 void *ucontext __attribute__((unused)))
 {
- /* syslog(LOG_DEBUG, "got signal %d", sig); */
- gotsignal = sig;
-}
+ if (sig < 1 || sig >= _NSIG)
+	sig = _NSIG-1;
+ gotsignalsig = 1;
 
-static const int catch = { SIGHUP, SIGINT, 0 };
+ /* remember a process that sent us a fatal signal */
+ if ((sig == SIGINT || sig == SIGQUIT || sig == SIGTERM) &&
+	si &&
+	si->si_code == SI_USER)
+	killer_pid = si->si_pid;
+}
 
-void signals_add_handlers(int alarm)
+EXPORTED void signals_add_handlers(int alarm)
 {
 struct sigaction action;
- int i;
- 
+
+ memset(&action, 0, sizeof(action));
 sigemptyset(&action.sa_mask);
 
 action.sa_flags = 0;
@@ -74,47 +86,208 @@
 action.sa_flags |= SA_RESETHAND;
 #endif
 
- action.sa_handler = sighandler;
+ action.sa_sigaction = sighandler;
+ action.sa_flags |= SA_SIGINFO;
 
 /* SIGALRM used as a syscall timeout, so we don't set SA_RESTART */
 if (alarm && sigaction(SIGALRM, &action, NULL) < 0) {
-	fatal("unable to install signal handler for %d: %m", SIGALRM);
+	fatal("unable to install signal handler for SIGALRM", EC_TEMPFAIL);
 }
 
 /* no restartable SIGQUIT thanks */
- if (sigaction(SIGQUIT, &action, NULL) < 0) {
-	fatal("unable to install signal handler for %d: %m", SIGQUIT);
- }
+ if (sigaction(SIGQUIT, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGQUIT", EC_TEMPFAIL);
+ if (sigaction(SIGINT, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGINT", EC_TEMPFAIL);
+ if (sigaction(SIGTERM, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGTERM", EC_TEMPFAIL);
+ if (sigaction(SIGUSR2, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGTERM", EC_TEMPFAIL);
 
+ signals_reset_sighup_handler(1);
+}
+
+EXPORTED void signals_reset_sighup_handler(int restartable)
+{
+ struct sigaction action;
+
+ memset(&action, 0, sizeof(action));
+ sigemptyset(&action.sa_mask);
+
+ action.sa_flags = 0;
 #ifdef SA_RESTART
- action.sa_flags |= SA_RESTART;
-#endif
- 
- for (i = 0; catchi != 0; i++) {
-	if (catchi != SIGALRM && sigaction(catchi, &action, NULL) < 0) {
-	 fatal("unable to install signal handler for %d: %m", catchi);
-	}
+ if (restartable) {
+	action.sa_flags |= SA_RESTART;
 }
+#endif
+ action.sa_sigaction = sighandler;
+ action.sa_flags |= SA_SIGINFO;
+
+ if (sigaction(SIGHUP, &action, NULL) < 0)
+	fatal("unable to install signal handler for SIGHUP", EC_TEMPFAIL);
 }
 
 static shutdownfn *shutdown_cb = NULL;
+static int signals_in_shutdown = 0;
 
-void signals_set_shutdown(shutdownfn *s)
+EXPORTED void signals_set_shutdown(shutdownfn *s)
 {
 shutdown_cb = s;
 }
 
-int signals_poll(void)
+/* Build a human-readable description of another process from just the
+ * process id. On some platforms this is enough to tell us something
+ * useful about the other process. Returns a new string which must be
+ * free()d by the caller. */
+static char *describe_process(pid_t pid)
 {
- switch (gotsignal) {
- case SIGINT:
- case SIGQUIT:
-	if (shutdown_cb) shutdown_cb(EC_TEMPFAIL);
+#if defined(__linux__)
+ int i;
+ int fd;
+ int n;
+ char buf1024+32;
+ char cmdline1024;
+
+ snprintf(buf, sizeof(buf), "/proc/%d/cmdline", (int)pid);
+ cmdline0 = '\0';
+ fd = open(buf, O_RDONLY, 0);
+ if (fd >= 0) {
+	n = read(fd, cmdline, sizeof(cmdline)-1);
+	if (n > 0) {
+	 if (!cmdlinen-1)
+		n--;	 /* ignore trailing nul */
+	 for (i = 0 ; i < n ; i++) {
+		if (cmdlinei == '\0')
+		 cmdlinei = ' ';
+	 }
+	 cmdlinen = '\0';
+	}
+	close(fd);
+ }
+ if (!cmdline0)
+	strcpy(cmdline, "unknown");
+ snprintf(buf, sizeof(buf), "%d (%s)", (int)pid, cmdline);
+ return xstrdup(buf);
+#else
+ char buf32;
+ snprintf(buf, sizeof(buf), "%d", (int)pid);
+ return xstrdup(buf);
+#endif
+}
+
+static int signals_poll_mask(sigset_t *oldmaskp)
+{
+ int sig;
+
+ if (!signals_in_shutdown &&
+	(gotsignalSIGINT || gotsignalSIGQUIT || gotsignalSIGTERM)) {
+
+	if (killer_pid && killer_pid != getppid()) {
+	 /* whine in syslog if we were sent a graceful shutdown signal
+	 * by anyone other than the master process. */
+	 char *desc = describe_process(killer_pid);
+	 syslog(LOG_NOTICE, "graceful shutdown initiated by "
+			 "unexpected process %s", desc);
+	 free(desc);
+	}
+	else {
+	 syslog(LOG_NOTICE, "graceful shutdown");
+	}
+
+	if (oldmaskp)
+	 sigprocmask(SIG_SETMASK, oldmaskp, NULL);
+	if (shutdown_cb) {
+	 signals_in_shutdown = 1;
+	 shutdown_cb(EC_TEMPFAIL);
+	}
 	else exit(EC_TEMPFAIL);
-	break;
- default:
-	return gotsignal;
-	break;
 }
- return 0; /* compiler warning stupidity */
+ for (sig = 1 ; sig < _NSIG ; sig++) {
+	if (sig == SIGUSR2) continue; /* only ever polled explicitly */
+	if (gotsignalsig)
+	 return sig;
+ }
+ return 0;
+}
+
+EXPORTED int signals_poll(void)
+{
+ return signals_poll_mask(NULL);
+}
+
+/*
+ * Same interface as select() but closes the race between
+ * select() blocking and delivery of some signficant signals
+ * like SIGTERM. This is necessary to ensure clean shutdown
+ * of Cyrus processes.
+ */
+EXPORTED int signals_select(int nfds, fd_set *rfds, fd_set *wfds,
+			 fd_set *efds, struct timeval *tout)
+{
+#if HAVE_PSELECT
+ /* pselect() closes the race between SIGCHLD arriving
+ * and select() sleeping for up to 10 seconds. */
+ struct timespec ts, *tsptr = NULL;
+ sigset_t blocked;
+ sigset_t oldmask;
+ int saved_errno;
+ int r;
+
+ /* temporarily block all the signals we want
+ * to be caught reliably */
+ sigemptyset(&blocked);
+ sigaddset(&blocked, SIGCHLD);
+ sigaddset(&blocked, SIGALRM);
+ sigaddset(&blocked, SIGQUIT);
+ sigaddset(&blocked, SIGINT);
+ sigaddset(&blocked, SIGTERM);
+ sigprocmask(SIG_BLOCK, &blocked, &oldmask);
+
+ /* Those signals will not arrive now. Check to see if any
+ * of them arrived before we blocked them */
+ signals_poll_mask(&oldmask);
+
+ if (tout) {
+	ts.tv_sec = tout->tv_sec;
+	ts.tv_nsec = tout->tv_usec * 1000;
+	tsptr = &ts;
+ }
+
+ /* pselect() allows the restartable signals to arrive */
+ r = pselect(nfds, rfds, wfds, efds, tsptr, &oldmask);
+
+ if (r < 0 && (errno == EAGAIN || errno == EINTR))
+	signals_poll_mask(&oldmask);
+
+ /* restore the old signal mask */
+ saved_errno = errno;
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
+ errno = saved_errno;
+
+ return r;
+#else
+ int r;
+
+ r = select(nfds, rfds, wfds, efds, tout);
+ if (r < 0 && (errno == EAGAIN || errno == EINTR))
+	signals_poll();
+
+ return r;
+#endif
+}
+
+EXPORTED void signals_clear(int sig)
+{
+ if (sig >= 0 && sig < _NSIG)
+	gotsignalsig = 0;
+}
+
+EXPORTED int signals_cancelled()
+{
+ if (gotsignalSIGUSR2) {
+	gotsignalSIGUSR2 = 0;
+	return 1;
+ }
+
+ return 0;
 }

cyrus-imapd-2.4.17.tar.gz/lib/signals.h -> cyrus-imapd-2.5.tar.gz/lib/signals.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/strarray.c -> cyrus-imapd-2.5.tar.gz/lib/strarray.c Changed

@@ -45,15 +45,15 @@
 
 #include "strarray.h"
 #include <memory.h>
-#include "util.h" /* for strcmpsafe et al */
+#include "util.h"
 #include "xmalloc.h"
 
-strarray_t *strarray_new(void)
+EXPORTED strarray_t *strarray_new(void)
 {
 return xzmalloc(sizeof(strarray_t));
 }
 
-void strarray_fini(strarray_t *sa)
+EXPORTED void strarray_fini(strarray_t *sa)
 {
 int i;
 
@@ -69,7 +69,7 @@
 sa->alloc = 0;
 }
 
-void strarray_free(strarray_t *sa)
+EXPORTED void strarray_free(strarray_t *sa)
 {
 if (!sa)
 	return;
@@ -88,7 +88,7 @@
 static void ensure_alloc(strarray_t *sa, int newalloc)
 {
 if (newalloc)
-	newalloc++;
+	newalloc++;	/* allow for the NULL terminator */
 if (newalloc <= sa->alloc)
 	return;
 newalloc = ((newalloc + QUANTUM-1) / QUANTUM) * QUANTUM;
@@ -97,6 +97,17 @@
 sa->alloc = newalloc;
 }
 
+/*
+ * Normalise the index passed by a caller, to a value in the range
+ * 0..count-1, or < 0 for invalid, assuming the function we're
+ * performing does not have the side effect of expanding the array.
+ * Note that doesn't necessarily mean the array is read-only, e.g.
+ * strarray_remove() modifies the array but does not expand the array if
+ * given an index outside the array's current bounds. In Perl style,
+ * negative indexes whose absolute value is less than the length of the
+ * array are treated as counting back from the end, e.g. idx=-1 means
+ * the final element.
+ */
 static inline int adjust_index_ro(const strarray_t *sa, int idx)
 {
 if (idx >= sa->count)
@@ -106,21 +117,31 @@
 return idx;
 }
 
-static inline int adjust_index_rw(strarray_t *sa, int idx, int len)
+/*
+ * Like adjust_index_ro(), with extra complication that the function
+ * we're performing will expand the array if either the adjusted index
+ * points outside the current bounds of the array, or @grow tells us
+ * that we're about to need more space in the array.
+ */
+static inline int adjust_index_rw(strarray_t *sa, int idx, int grow)
 {
 if (idx >= sa->count) {
-	ensure_alloc(sa, idx+len);
+	/* expanding the array as a side effect @idx pointing
+	 * outside the current bounds, plus perhaps @grow */
+	ensure_alloc(sa, idx+grow);
 } else if (idx < 0) {
+	/* adjust Perl-style negative indeces */
 	idx += sa->count;
-	if (idx >= 0 && len)
-	 ensure_alloc(sa, sa->count+len);
- } else if (len) {
-	ensure_alloc(sa, sa->count+len);
+	if (idx >= 0 && grow)
+	 ensure_alloc(sa, sa->count+grow);
+ } else if (grow) {
+	/* expanding the array due to an insert or append */
+	ensure_alloc(sa, sa->count+grow);
 }
 return idx;
 }
 
-strarray_t *strarray_dup(const strarray_t *sa)
+EXPORTED strarray_t *strarray_dup(const strarray_t *sa)
 {
 strarray_t *new = strarray_new();
 int i;
@@ -131,47 +152,55 @@
 return new;
 }
 
-int strarray_append(strarray_t *sa, const char *s)
+EXPORTED int strarray_append(strarray_t *sa, const char *s)
 {
 return strarray_appendm(sa, xstrdup(s));
 }
 
-int strarray_add(strarray_t *sa, const char *s)
+EXPORTED int strarray_add(strarray_t *sa, const char *s)
 {
 int pos = strarray_find(sa, s, 0);
 if (pos < 0) pos = strarray_append(sa, s);
 return pos;
 }
 
-int strarray_add_case(strarray_t *sa, const char *s)
+EXPORTED int strarray_add_case(strarray_t *sa, const char *s)
 {
 int pos = strarray_find_case(sa, s, 0);
 if (pos < 0) pos = strarray_append(sa, s);
 return pos;
 }
 
-int strarray_appendm(strarray_t *sa, char *s)
+EXPORTED int strarray_appendm(strarray_t *sa, char *s)
 {
 int pos = sa->count++;
 ensure_alloc(sa, sa->count);
+ /* coverityvar_deref_op */
 sa->datapos = s;
 return pos;
 }
 
-void strarray_set(strarray_t *sa, int idx, const char *s)
+static void _strarray_set(strarray_t *sa, int idx, char *s)
+{
+ free(sa->dataidx);
+ sa->dataidx = s;
+ /* adjust the count if we just sparsely expanded the array */
+ if (s && idx >= sa->count)
+	sa->count = idx+1;
+}
+
+EXPORTED void strarray_set(strarray_t *sa, int idx, const char *s)
 {
 if ((idx = adjust_index_rw(sa, idx, 0)) < 0)
 	return;
- free(sa->dataidx);
- sa->dataidx = xstrdup(s);
+ _strarray_set(sa, idx, xstrdupnull(s));
 }
 
-void strarray_setm(strarray_t *sa, int idx, char *s)
+EXPORTED void strarray_setm(strarray_t *sa, int idx, char *s)
 {
 if ((idx = adjust_index_rw(sa, idx, 0)) < 0)
 	return;
- free(sa->dataidx);
- sa->dataidx = s;
+ _strarray_set(sa, idx, s);
 }
 
 static inline void _strarray_insert(strarray_t *sa, int idx, char *s)
@@ -183,21 +212,21 @@
 sa->count++;
 }
 
-void strarray_insert(strarray_t *sa, int idx, const char *s)
+EXPORTED void strarray_insert(strarray_t *sa, int idx, const char *s)
 {
 if ((idx = adjust_index_rw(sa, idx, 1)) < 0)
 	return;
 _strarray_insert(sa, idx, xstrdup(s));
 }
 
-void strarray_insertm(strarray_t *sa, int idx, char *s)
+EXPORTED void strarray_insertm(strarray_t *sa, int idx, char *s)
 {
 if ((idx = adjust_index_rw(sa, idx, 1)) < 0)
 	return;
 _strarray_insert(sa, idx, s);
 }
 
-char *strarray_remove(strarray_t *sa, int idx)
+EXPORTED char *strarray_remove(strarray_t *sa, int idx)
 {
 char *s;
 if ((idx = adjust_index_ro(sa, idx)) < 0)
@@ -210,7 +239,7 @@
 return s;
 }
 
-void strarray_remove_all(strarray_t *sa, const char *s)
+EXPORTED void strarray_remove_all(strarray_t *sa, const char *s)
 {
 int i = 0;
 
@@ -222,7 +251,7 @@
 }
 }
 
-void strarray_remove_all_case(strarray_t *sa, const char *s)
+EXPORTED void strarray_remove_all_case(strarray_t *sa, const char *s)
 {
 int i = 0;
 
@@ -234,7 +263,7 @@
 }
 }
 
-void strarray_truncate(strarray_t *sa, int newlen)
+EXPORTED void strarray_truncate(strarray_t *sa, int newlen)
 {
 int i;
 
@@ -252,24 +281,25 @@
 sa->count = newlen;
 }
 
-const char *strarray_nth(const strarray_t *sa, int idx)
+EXPORTED const char *strarray_nth(const strarray_t *sa, int idx)
 {
 if ((idx = adjust_index_ro(sa, idx)) < 0)
 	return NULL;
 return sa->dataidx;
 }
 
-char *strarray_join(const strarray_t *sa, const char *sep)
+EXPORTED char *strarray_join(const strarray_t *sa, const char *sep)
 {
 int seplen = (sep ? strlen(sep) : 0);
 int len = 0;
- int i;
- int first;
+ int i; /* array index */
+ int j; /* index into non-sparse logical subset of the array
+	 * i.e. doesn't count NULLs */
 char *buf, *p;
 
- for (i = 0, first = 1 ; i < sa->count ; i++, first = 0) {
+ for (i = 0, j = 0 ; i < sa->count ; i++) {
 	if (sa->datai)
-	 len += strlen(sa->datai) + (first ? 0 : seplen);
+	 len += strlen(sa->datai) + (j++ ? seplen : 0);
 }
 
 if (!len)
@@ -277,9 +307,9 @@
 len++;	/* room for NUL terminator */
 p = buf = xmalloc(len);
 
- for (i = 0, first = 1 ; i < sa->count ; i++, first = 0) {
+ for (i = 0, j = 0 ; i < sa->count ; i++) {
 	if (sa->datai) {
-	 if (!first && sep) {
+	 if (j++ && sep) {
 		strcpy(p, sep);
 		p += strlen(p);
 	 }
@@ -291,38 +321,45 @@
 return buf;
 }
 
-strarray_t *strarray_splitm(char *buf, const char *sep)
+EXPORTED strarray_t *strarray_splitm(char *buf, const char *sep, int flags)
 {
 strarray_t *sa = strarray_new();
- char *p;
+ char *p, *q;
 
 if (!buf) return sa;
 
 if (!sep)
 	sep = " \t\r\n";
 
- for (p = strtok(buf, sep) ; p ; p = strtok(NULL, sep))
-	strarray_append(sa, p);
+ for (p = strtok(buf, sep) ; p ; p = strtok(NULL, sep)) {
+	if (flags & STRARRAY_TRIM) {
+	 while (Uisspace(*p)) p++;
+	 q = p + strlen(p);
+	 while (q > p && Uisspace(q-1)) q--;
+	 *q = '\0';
+	}
+	if (*p) strarray_append(sa, p);
+ }
 
 free(buf);
 return sa;
 }
 
-strarray_t *strarray_split(const char *line, const char *sep)
+EXPORTED strarray_t *strarray_split(const char *line, const char *sep, int flags)
 {
 if (!line)
 	return strarray_new();
- return strarray_splitm(xstrdup(line), sep);
+ return strarray_splitm(xstrdup(line), sep, flags);
 }
 
-strarray_t *strarray_nsplit(const char *buf, size_t len, const char *sep)
+EXPORTED strarray_t *strarray_nsplit(const char *buf, size_t len, const char *sep, int flags)
 {
 if (!len)
 	return strarray_new();
- return strarray_splitm(xstrndup(buf, len), sep);
+ return strarray_splitm(xstrndup(buf, len), sep, flags);
 }
 
-char **strarray_takevf(strarray_t *sa)
+EXPORTED char **strarray_takevf(strarray_t *sa)
 {
 char **d = sa->data;
 sa->data = NULL;
@@ -331,19 +368,20 @@
 return d;
 }
 
-/* direct from the qsort manpage */
-static int cmpstringp(const void *p1, const void *p2) 
+EXPORTED void strarray_sort(strarray_t *sa, compar_t *cmp)
 {
- /* The actual arguments to this function are "pointers to
- pointers to char", but strcmp(3) arguments are "pointers
- to char", hence the following cast plus dereference */
-
- return strcmpsafe(* (char * const *) p1, * (char * const *) p2);
+ qsort(sa->data, sa->count, sizeof(char *), cmp);
 }
 
-void strarray_sort(strarray_t *sa)
+
+EXPORTED void strarray_uniq(strarray_t *sa)
 {
- qsort(sa->data, sa->count, sizeof(char *), cmpstringp);
+ int i;
+
+ for (i = 1; i < sa->count; i++) {
+	if (!strcmpsafe(sa->datai-1, sa->datai))
+	 free(strarray_remove(sa, i--));
+ }
 }
 
 /* common generic routine for the _find family */
@@ -358,12 +396,34 @@
 return -1;
 }
 
-int strarray_find(const strarray_t *sa, const char *match, int starting)
+EXPORTED int strarray_find(const strarray_t *sa, const char *match, int starting)
 {
 return strarray_findg(sa, match, starting, strcmpsafe);
 }
 
-int strarray_find_case(const strarray_t *sa, const char *match, int starting)
+EXPORTED int strarray_find_case(const strarray_t *sa, const char *match, int starting)
 {
 return strarray_findg(sa, match, starting, strcasecmpsafe);
 }
+
+EXPORTED int strarray_size(const strarray_t *sa)
+{
+ return sa->count;
+}
+
+EXPORTED int strarray_cmp(const strarray_t *a, const strarray_t *b)
+{
+ int as = strarray_size(a);
+ int bs = strarray_size(b);
+ int i;
+
+ /* test size first */
+ if (as != bs) return as - bs;
+
+ for (i = 0; i < as; i++) {
+	int res = strcmpsafe(strarray_nth(a, i), strarray_nth(b, i));
+	if (res) return res;
+ }
+
+ return 0;
+}

cyrus-imapd-2.4.17.tar.gz/lib/strarray.h -> cyrus-imapd-2.5.tar.gz/lib/strarray.h Changed

@@ -46,8 +46,9 @@
 #ifndef __CYRUS_STRARRAY_H__
 #define __CYRUS_STRARRAY_H__
 
-#include <config.h>
+#include <string.h>
 #include <sys/types.h>
+#include "util.h"
 
 typedef struct
 {
@@ -87,11 +88,13 @@
 #define strarray_pushm(sa, s)	 strarray_appendm((sa), (s))
 
 char *strarray_join(const strarray_t *, const char *sep);
-strarray_t *strarray_splitm(char *buf, const char *sep);
-strarray_t *strarray_split(const char *buf, const char *sep);
-strarray_t *strarray_nsplit(const char *buf, size_t len, const char *sep);
+#define STRARRAY_TRIM (1<<0)
+strarray_t *strarray_splitm(char *buf, const char *sep, int flags);
+strarray_t *strarray_split(const char *buf, const char *sep, int flags);
+strarray_t *strarray_nsplit(const char *buf, size_t len, const char *sep, int flags);
 
-void strarray_sort(strarray_t *);
+void strarray_sort(strarray_t *, compar_t *);
+void strarray_uniq(strarray_t *);
 
 char **strarray_takevf(strarray_t *sa);
 
@@ -100,4 +103,8 @@
 int strarray_find_case(const strarray_t *sa, const char *match,
 		 int starting);
 
+int strarray_size(const strarray_t *sa);
+
+int strarray_cmp(const strarray_t *a, const strarray_t *b);
+
 #endif /* __CYRUS_STRARRAY_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/strcasecmp.c -> cyrus-imapd-2.5.tar.gz/lib/strcasecmp.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/strerror.c -> cyrus-imapd-2.5.tar.gz/lib/strerror.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/strhash.c -> cyrus-imapd-2.5.tar.gz/lib/strhash.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/strhash.h -> cyrus-imapd-2.5.tar.gz/lib/strhash.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/stristr.c -> cyrus-imapd-2.5.tar.gz/lib/stristr.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/stristr.h -> cyrus-imapd-2.5.tar.gz/lib/stristr.h Changed

cyrus-imapd-2.5.tar.gz/lib/strsep.c Added

@@ -0,0 +1,68 @@
+/* strsep.c -- replacement strsep() routine
+ *
+ * Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+char *strsep(char **stringp, const char *delim)
+{
+ char *p;
+ char *start;
+
+ if (!stringp) return NULL;
+ start = *stringp;
+ if (!start) return NULL;
+
+ p = strpbrk(start, delim);
+ if (!p) return NULL;
+
+ *p++ = '\0';
+ *stringp = p;
+
+ return start;
+}
+

cyrus-imapd-2.4.17.tar.gz/lib/sysexits.h -> cyrus-imapd-2.5.tar.gz/lib/sysexits.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/test/cyrusdb.c -> cyrus-imapd-2.5.tar.gz/lib/test/cyrusdb.c Changed

@@ -3,7 +3,6 @@
 
 #include "../cyrusdb.h"
 #include "../xmalloc.h"
-#include "../exitcodes.h"
 
 #ifdef BACKEND
 struct cyrusdb_backend *DB = &(BACKEND);
@@ -25,6 +24,8 @@
 	const char *key, int keylen,
 	const char *data, int datalen)
 {
+    (void)rock; (void)key; (void)keylen;
+    (void)data; (void)datalen;
     return 1;
 }
 
@@ -32,6 +33,7 @@
 	   const char *key, int keylen,
 	   const char *data, int datalen)
 {
+    (void)data; (void)datalen;
     char *r = *(char **) rock;
     int newlen;
 
@@ -70,15 +72,15 @@
 	    char *fname = buf + 5;
 
 	    if (db) { /* close it */
-		TRY((DB->close)(db));
+		TRY(cyrusdb_close(db));
 	    }
-	    TRY((DB->open)(fname, 1, &db));
+	    TRY(cyrusdb_open(DB, fname, 1, &db));
 
 	    printf("ok\n");
 	} else if (!db) {
 	    TRY(db == NULL);
 	} else if (!strncasecmp(buf, "close", 5)) {
-	    TRY((DB->close)(db));
+	    TRY(cyrusdb_close(db));
 	    db = NULL;
 	    printf("ok\n");
 	} else if (!strncasecmp(buf, "put ", 4)) {
@@ -86,24 +88,24 @@
 	    char *data = strchr(key, ' ');
 	    if (!data) goto bad;
 	    *data++ = '\0';
-	    TRY(DB->store(db, key, strlen(key), data, strlen(data), (txnp ? &txn : NULL)));
+	    TRY(cyrusdb_store(db, key, strlen(key), data, strlen(data), (txnp ? &txn : NULL)));
 	    printf("ok\n");
 	} else if (!strncasecmp(buf, "del ", 4)) {
 	    char *key = buf + 4;
-	    TRY(DB->delete(db, key, strlen(key), (txnp ? &txn : NULL), 0));
+	    TRY(cyrusdb_delete(db, key, strlen(key), (txnp ? &txn : NULL), 0));
 	    printf("ok\n");
 	} else if (!strncasecmp(buf, "get ", 4)) {
 	    char *key = buf + 4;
 	    const char *data;
 	    int datalen;
-	    TRY(DB->fetch(db, key, strlen(key), &data, &datalen, (txnp ? &txn : NULL)));
+	    TRY(cyrusdb_fetch(db, key, strlen(key), &data, &datalen, (txnp ? &txn : NULL)));
 	    printf("ok {%d} ", datalen);
 	    while (datalen--) printf("%c", *data++);
 	    printf("\n");
 	} else if (!strncasecmp(buf, "list", 4)) {
 	    char *keys = NULL;
 
-	    TRY(DB->foreach(db, NULL, 0, yes, appkey, &keys, (txnp ? &txn : NULL)));
+	    TRY(cyrusdb_foreach(db, NULL, 0, yes, appkey, &keys, (txnp ? &txn : NULL)));
 	    if (keys) {
 		printf("ok {%d} %s", strlen(keys), keys);
 		free(keys);
@@ -112,15 +114,15 @@
 	    }
 	    printf("\n");
 	} else if (!strncasecmp(buf, "dump", 4)) {
-	    if (DB->dump) {
-		TRY(DB->dump(db, 0));
+	    if (cyrusdb_dump) {
+		TRY(cyrusdb_dump(db, 0));
 		printf("ok\n");
 	    } else {
 		printf("no\n");
 	    }
 	} else if (!strncasecmp(buf, "check", 4)) {
-	    if (DB->consistent) {
-		TRY(DB->consistent(db));
+	    if (cyrusdb_consistent) {
+		TRY(cyrusdb_consistent(db));
 		printf("ok\n");
 	    } else {
 		printf("no\n");
@@ -133,12 +135,12 @@
 		txnp = 1;
 	    }
 	} else if (!strncasecmp(buf, "commit", 6)) {
-	    TRY(DB->commit(db, txn));
+	    TRY(cyrusdb_commit(db, txn));
 	    txnp = 0;
 	    txn = NULL;
 	    printf("ok\n");
 	} else if (!strncasecmp(buf, "abort", 5)) {
-	    TRY(DB->abort(db, txn));
+	    TRY(cyrusdb_abort(db, txn));
 	    txnp = 0;
 	    txn = NULL;
 	    printf("ok\n");

cyrus-imapd-2.4.17.tar.gz/lib/test/pool.c -> cyrus-imapd-2.5.tar.gz/lib/test/pool.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/test/rnddb.c -> cyrus-imapd-2.5.tar.gz/lib/test/rnddb.c Changed

@@ -5,7 +5,6 @@
 
 #include "../cyrusdb.h"
 #include "../xmalloc.h"
-#include "../exitcodes.h"
 #include "../assert.h"
 
 #ifdef BACKEND
@@ -44,6 +43,7 @@
 	const char *key, int keylen,
 	const char *data, int datalen)
 {
+    (void)rock; (void)key; (void)keylen; (void)data; (void)datalen;
     count++;
     return 0;
 }
@@ -52,6 +52,7 @@
 	       const char *key, int keylen,
 	       const char *data, int datalen)
 {
+    (void)rock; (void)keylen; (void)data; (void)datalen;
     if (!victim) {
 	if ((rand() % count) == 0) {
 	    victim = xstrdup(key);
@@ -133,10 +134,10 @@
 	srand(atoi(argv2));
     }
 
-    TRY((DB->open)("scratch", &db));
+    TRY(cyrusdb_open(DB, "scratch", &db));
 
-    if (DB->consistent) {
-	TRY(DB->consistent(db));
+    if (cyrusdb_consistent) {
+	TRY(cyrusdb_consistent(db));
     }
 
     if (argc > 3) {
@@ -150,12 +151,12 @@
 	/* generate a random value */
 	val = genrand(10 + (rand() % 100));
 	
-	TRY(DB->store(db, key, strlen(key), val, strlen(val), &txn));
+	TRY(cyrusdb_store(db, key, strlen(key), val, strlen(val), &txn));
       }
 
-      TRY(DB->commit(db, txn));
-      if (DB->consistent) {
-	TRY(DB->consistent(db));
+      TRY(cyrusdb_commit(db, txn));
+      if (cyrusdb_consistent) {
+	TRY(cyrusdb_consistent(db));
       }
     }
 
@@ -185,8 +186,8 @@
 	    val = genrand(10 + (rand() % 100));
 
 	    txn = NULL;
-	    TRY(DB->store(db, key, strlen(key), val, strlen(val), &txn));
-	    TRY(DB->commit(db, txn));
+	    TRY(cyrusdb_store(db, key, strlen(key), val, strlen(val), &txn));
+	    TRY(cyrusdb_commit(db, txn));
 	    gettimeofday(&t2, NULL);
 
 	    ADDDIFF(t_add, t1, t2);
@@ -206,11 +207,11 @@
 	    count = 0;
 	    victim = NULL;
 	    txn = NULL;
-	    TRY(DB->foreach(db, NULL, 0, &countem, NULL, NULL, &txn));
+	    TRY(cyrusdb_foreach(db, NULL, 0, &countem, NULL, NULL, &txn));
 	    
 	    if (count == 0) continue;
 
-	    TRY(DB->foreach(db, NULL, 0, &findvictim, NULL, NULL, &txn));
+	    TRY(cyrusdb_foreach(db, NULL, 0, &findvictim, NULL, NULL, &txn));
 
 	    assert(victim != NULL);
 
@@ -218,10 +219,10 @@
 	    val = genrand(10 + (rand() % 100));
 	    
 	    /* do an add */
-	    TRY(DB->store(db, victim, strlen(victim), val, strlen(val), &txn));
+	    TRY(cyrusdb_store(db, victim, strlen(victim), val, strlen(val), &txn));
 	    free(val);
 
-	    TRY(DB->commit(db, txn));
+	    TRY(cyrusdb_commit(db, txn));
 	    free(victim); victim = NULL;
 
 	    gettimeofday(&t2, NULL);
@@ -240,17 +241,17 @@
 	    count = 0;
 	    victim = NULL;
 	    txn = NULL;
-	    TRY(DB->foreach(db, NULL, 0, &countem, NULL, NULL, &txn));
+	    TRY(cyrusdb_foreach(db, NULL, 0, &countem, NULL, NULL, &txn));
 	    
 	    if (count == 0) continue;
 
-	    TRY(DB->foreach(db, NULL, 0, &findvictim, NULL, NULL, &txn));
+	    TRY(cyrusdb_foreach(db, NULL, 0, &findvictim, NULL, NULL, &txn));
 	    assert(victim != NULL);
 
 	    /* delete it */
-	    TRY(DB->delete(db, victim, strlen(victim), &txn, 0));
+	    TRY(cyrusdb_delete(db, victim, strlen(victim), &txn, 0));
 
-	    TRY(DB->commit(db, txn));
+	    TRY(cyrusdb_commit(db, txn));
 	    free(victim); victim = NULL;
 
 	    gettimeofday(&t2, NULL);
@@ -270,8 +271,8 @@
 	    key = genrand(10 + (rand() % 10));
 
 	    txn = NULL;
-	    TRY(DB->fetch(db, key, strlen(key), &data, &datalen, &txn));
-	    TRY(DB->commit(db, txn));
+	    TRY(cyrusdb_fetch(db, key, strlen(key), &data, &datalen, &txn));
+	    TRY(cyrusdb_commit(db, txn));
 
 	    gettimeofday(&t2, NULL);
 
@@ -285,13 +286,13 @@
 
 #if 0
 	/* run the consistency function, if any */
-	if (DB->consistent) {
-	    TRY(DB->consistent(db));
+	if (cyrusdb_consistent) {
+	    TRY(cyrusdb_consistent(db));
 	}
 #endif
     }
 
-    TRY((DB->close)(db));
+    TRY(cyrusdb_close(db));
     TRY(DB->done());
 
     do_report();

cyrus-imapd-2.4.17.tar.gz/lib/test/testglob2.c -> cyrus-imapd-2.5.tar.gz/lib/test/testglob2.c Changed

cyrus-imapd-2.5.tar.gz/lib/times.c Added

@@ -0,0 +1,853 @@
+/* times.c -- Time/date utilities
+ *
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <memory.h>
+#include <ctype.h>
+
+#include "assert.h"
+#include "times.h"
+#include "util.h"
+#include "gmtoff.h"
+#include "mkgmtime.h"
+
+static const char * const monthname12 = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+static const char * const wday7 = {
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
+
+
+static int monthdays(int year/*since 1900*/, int month/*0-based*/)
+{
+ int leapday;
+ static const int mdays12 = {
+	31, 28, 31, 30, 31, 30,
+	31, 31, 30, 31, 30, 31
+ };
+
+#define isleap(year) (!((year) % 4) && (((year) % 100) || !((year) % 400)))
+ leapday = (month == 1 && isleap(year+1900));
+ return mdaysmonth + leapday;
+#undef isleap
+}
+
+
+/* 'buf' must be at least 80 characters */
+EXPORTED int time_to_rfc822(time_t t, char *buf, size_t len)
+{
+ struct tm *tm;
+ long gmtoff;
+ int gmtnegative = 0;
+
+ assert(buf != NULL);
+
+ tm = localtime(&t);
+ gmtoff = gmtoff_of(tm, t);
+ if (gmtoff < 0) {
+	gmtoff = -gmtoff;
+	gmtnegative = 1;
+ }
+ gmtoff /= 60;
+
+ return snprintf(buf, len, "%s, %02d %s %4d %02d:%02d:%02d %c%.2lu%.2lu",
+	 wdaytm->tm_wday, 
+	 tm->tm_mday, monthnametm->tm_mon, tm->tm_year + 1900,
+	 tm->tm_hour, tm->tm_min, tm->tm_sec,
+	 gmtnegative ? '-' : '+', gmtoff / 60, gmtoff % 60);
+}
+
+
+/*
+ * Skip RFC822 FWS = Folding White Space. This is the white
+ * space that can be inserted harmlessly into structured
+ * RFC822 headers, including splitting them over multiple lines.
+ *
+ * Note that RFC822 isn't entirely clear about whether such
+ * space may be present in date-times, but it's successor
+ * RFC2822 is quite clear and explicit. Note also that
+ * neither RFC allows for (comments) inside a date-time,
+ * so we don't attempt to handle that here.
+ */
+static const char *skip_fws(const char *p)
+{
+ if (!p)
+	return NULL;
+ while (*p && Uisspace(*p)) {
+	/* check for end of an RFC822 header line */
+	if (*p == '\n') {
+	 p++;
+	 if (*p != ' ' && *p != '\t')
+		return NULL;
+	}
+	else
+	 p++;
+ }
+ return (*p ? p : NULL);
+}
+
+static int parse_rfc822(const char *s, time_t *tp, int dayonly)
+{
+ const char *origs = s;
+ struct tm tm;
+ time_t t;
+ char month4;
+ int zone_off = 0;
+
+ if (!s)
+	goto baddate;
+
+ memset(&tm, 0, sizeof(tm));
+
+ s = skip_fws(s);
+ if (!s)
+	goto baddate;
+
+ if (Uisalpha(*s)) {
+	/* Day name -- skip over it */
+	s++;
+	if (!Uisalpha(*s))
+	 goto baddate;
+	s++;
+	if (!Uisalpha(*s))
+	 goto baddate;
+	s++;
+	s = skip_fws(s);
+	if (!s || *s++ != ',')
+	 goto baddate;
+	s = skip_fws(s);
+	if (!s)
+	 goto baddate;
+ }
+
+ if (!Uisdigit(*s))
+	goto baddate;
+ tm.tm_mday = *s++ - '0';
+ if (Uisdigit(*s)) {
+	tm.tm_mday = tm.tm_mday*10 + *s++ - '0';
+ }
+
+ /* Parse month name */
+ s = skip_fws(s);
+ if (!s)
+	goto baddate;
+ month0 = *s++;
+ if (!Uisalpha(month0))
+	goto baddate;
+ month1 = *s++;
+ if (!Uisalpha(month1))
+	goto baddate;
+ month2 = *s++;
+ if (!Uisalpha(month2))
+	goto baddate;
+ month3 = '\0';
+ for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
+	if (!strcasecmp(month, monthnametm.tm_mon)) break;
+ }
+ if (tm.tm_mon == 12)
+	goto baddate;
+
+ /* Parse year */
+ s = skip_fws(s);
+ if (!s || !Uisdigit(*s))
+	goto baddate;
+ tm.tm_year = *s++ - '0';
+ if (!Uisdigit(*s))
+	goto baddate;
+ tm.tm_year = tm.tm_year * 10 + *s++ - '0';
+ if (Uisdigit(*s)) {
+	if (tm.tm_year < 19)
+	 goto baddate;
+	tm.tm_year -= 19;
+	tm.tm_year = tm.tm_year * 10 + *s++ - '0';
+	if (!Uisdigit(*s))
+	 goto baddate;
+	tm.tm_year = tm.tm_year * 10 + *s++ - '0';
+ } else {
+	if (tm.tm_year < 70) {
+	 /* two-digit year, probably after 2000.
+	 * This patent was overturned, right?
+	 */
+	 tm.tm_year += 100;
+	}
+ }
+ if (Uisdigit(*s)) {
+ /* five-digit date */
+ goto baddate;
+ }
+
+ if (tm.tm_mday > monthdays(tm.tm_year, tm.tm_mon))
+	goto baddate;
+
+ s = skip_fws(s);
+ if (s && !dayonly) {
+	/* Parse hour */
+	if (!s || !Uisdigit(*s))
+	 goto badtime;
+	tm.tm_hour = *s++ - '0';
+	if (!Uisdigit(*s))
+	 goto badtime;
+	tm.tm_hour = tm.tm_hour * 10 + *s++ - '0';
+	if (!s || *s++ != ':')
+	 goto badtime;
+
+	/* Parse min */
+	if (!s || !Uisdigit(*s))
+	 goto badtime;
+	tm.tm_min = *s++ - '0';
+	if (!Uisdigit(*s))
+	 goto badtime;
+	tm.tm_min = tm.tm_min * 10 + *s++ - '0';
+
+	if (*s == ':') {
+	 /* Parse sec */
+	 if (!++s || !Uisdigit(*s))
+		goto badtime;
+	 tm.tm_sec = *s++ - '0';
+	 if (!Uisdigit(*s))
+		goto badtime;
+	 tm.tm_sec = tm.tm_sec * 10 + *s++ - '0';
+	}
+
+	s = skip_fws(s);
+	if (s) {
+	 /* Parse timezone offset */
+	 if (*s == '+' || *s == '-') {
+		/* Parse numeric offset */
+		int east = (*s++ == '-');
+
+		if (!s || !Uisdigit(*s))
+		 goto badzone;
+		zone_off = *s++ - '0';
+		if (!s || !Uisdigit(*s))
+		 goto badzone;
+		zone_off = zone_off * 10 + *s++ - '0';
+		if (!s || !Uisdigit(*s))
+		 goto badzone;
+		zone_off = zone_off * 6 + *s++ - '0';
+		if (!s || !Uisdigit(*s))
+		 goto badzone;
+		zone_off = zone_off * 10 + *s++ - '0';
+
+		if (east)
+		 zone_off = -zone_off;
+	 }
+	 else if (Uisalpha(*s)) {
+		char zone4;
+
+		zone0 = *s++;
+		if (!Uisalpha(*s)) {
+		 /* Parse military (single-char) zone */
+		 zone1 = '\0';
+		 lcase(zone);
+		 if (zone0 < 'j')
+			zone_off = (zone0 - 'a' + 1) * 60;
+		 else if (zone0 == 'j')
+			goto badzone;
+		 else if (zone0 <= 'm')
+			zone_off = (zone0 - 'a') * 60;
+		 else if (zone0 < 'z')
+			zone_off = ('m' - zone0) * 60;
+		 else
+			zone_off = 0;
+		}
+		else {
+		 zone1 = *s++;
+		 if (!Uisalpha(*s)) {
+			/* Parse UT (universal time) */
+			zone2 = '\0';
+			lcase(zone);
+			if (strcmp(zone, "ut"))
+			 goto badzone;
+			zone_off = 0;
+		 }
+		 else {
+			/* Parse 3-char time zone */
+			char *p;
+
+			zone2 = *s;
+			zone3 = '\0';
+			lcase(zone);
+			/* GMT (Greenwich mean time) */
+			if (!strcmp(zone, "gmt"))
+			 zone_off = 0;
+
+			/* US time zone */
+			else {
+			 p = strchr("aecmpyhb", zone0);
+			 if (!p || zone2 != 't')
+				goto badzone;
+			 zone_off = (strlen(p) - 12) * 60;
+			 if (zone1 == 'd')
+				zone_off += 60;
+			 else if (zone1 != 's')
+				goto badzone;
+			}
+		 }
+		}
+	 }
+	 else
+ badzone:
+		zone_off = 0;
+	}
+ }
+ else
+ badtime:
+	tm.tm_hour = 12;
+
+ tm.tm_isdst = -1;
+
+ if (!dayonly)
+	t = mkgmtime(&tm);
+ else {
+	assert(zone_off == 0);
+	t = mktime(&tm);
+ }
+ if (t >= 0) {
+	*tp = (t - zone_off * 60);
+	return s - origs;
+ }
+
+ baddate:
+ return -1;
+}
+
+/*
+ * Parse an RFC822 (strictly speaking, RFC2822) date-time
+ * from the @s into a UNIX time_t *@tp. The string @s is
+ * terminated either by a NUL or by an RFC822 end of header
+ * line (CRLF not followed by whitespace); this allows
+ * parsing dates directly out of mapped messages.
+ *
+ * Returns: number of characters consumed from @s or -1 on error.
+ */
+EXPORTED int time_from_rfc822(const char *s, time_t *tp)
+{
+ return parse_rfc822(s, tp, 0);
+}
+
+/*
+ * Parse an RFC822 (strictly speaking, RFC2822) date-time
+ * from the @s into a UNIX time_t *@tp, but parse only the
+ * date portion, ignoring the time and timezone and returning
+ * a time in the server's timezone. This is a godawful hack
+ * designed to support the Cyrus implementation of the
+ * IMAP SEARCH command.
+ *
+ * Returns: number of characters consumed from @s or -1 on error.
+ */
+EXPORTED int day_from_rfc822(const char *s, time_t *tp)
+{
+ return parse_rfc822(s, tp, 1);
+}
+
+/*
+ * Parse an RFC 3339 = ISO 8601 format date-time string.
+ * Returns: number of characters in @s consumed, or -1 on error.
+ */
+EXPORTED int time_from_iso8601(const char *s, time_t *tp)
+{
+ const char *origs = s;
+ struct tm exp;
+ int n, tm_off;
+
+ /* parse the ISO 8601 date/time */
+ /* XXX should use strptime ? */
+ memset(&exp, 0, sizeof(struct tm));
+ n = sscanf(s, "%4d-%2d-%2dT%2d:%2d:%2d", 
+	 &exp.tm_year, &exp.tm_mon, &exp.tm_mday,
+	 &exp.tm_hour, &exp.tm_min, &exp.tm_sec);
+ if (n != 6)
+	return -1;
+
+ s += 19;
+ if (*s == '.') {
+	/* skip fractional secs */
+	while (Uisdigit(*(++s)));
+ }
+
+ /* handle offset */
+ switch (*s++) {
+ case 'Z': tm_off = 0; break;
+ case '-': tm_off = -1; break;
+ case '+': tm_off = 1; break;
+ default: return -1;
+ }
+ if (tm_off) {
+	int tm_houroff, tm_minoff;
+
+	n = sscanf(s, "%2d:%2d", &tm_houroff, &tm_minoff);
+	if (n != 2)
+	 return -1;
+	tm_off *= 60 * (60 * tm_houroff + tm_minoff);
+	s += 5;
+ }
+
+ exp.tm_year -= 1900; /* normalize to years since 1900 */
+ exp.tm_mon--; /* normalize to months since January */
+
+ /* sanity check the date/time (including leap day & second) */
+ if (exp.tm_year < 70 || exp.tm_mon < 0 || exp.tm_mon > 11 ||
+	exp.tm_mday < 1 ||
+	exp.tm_mday > monthdays(exp.tm_year, exp.tm_mon) ||
+	exp.tm_hour > 23 || exp.tm_min > 59 || exp.tm_sec > 60) {
+	return -1;
+ }
+
+ /* normalize to GMT */
+ *tp = mkgmtime(&exp) - tm_off;
+ return s - origs;
+}
+
+static int breakdown_time_to_iso8601(const struct timeval *t, struct tm *tm,
+ enum timeval_precision tv_precision,
+ char *buf, size_t len)
+{
+ long gmtoff = gmtoff_of(tm, t->tv_sec);
+ int gmtnegative = 0;
+ size_t rlen;
+
+ /*assert(date > 0); - it turns out these can happen, annoyingly enough */
+ assert(tm->tm_year >= 69);
+
+ if (gmtoff < 0) {
+	gmtoff = -gmtoff;
+	gmtnegative = 1;
+ }
+ gmtoff /= 60;
+
+ rlen = strftime(buf, len, "%Y-%m-%dT%H:%M:%S", tm);
+ if (rlen > 0) {
+	switch(tv_precision) {
+	case timeval_ms:
+	 rlen += snprintf(buf+rlen, len-rlen, ".%.3lu", t->tv_usec/1000);
+	 break;
+	case timeval_us:
+	 rlen += snprintf(buf+rlen, len-rlen, ".%.6lu", t->tv_usec);
+	 break;
+	case timeval_s:
+	 break;
+	}
+
+	/* UTC can be written "Z" or "+00:00" */
+	if ((gmtoff/60 == gmtoff%60) && (gmtoff/60 == 0))
+	 rlen += snprintf(buf+rlen, len-rlen, "Z");
+	else
+	 rlen += snprintf(buf+rlen, len-rlen, "%c%.2lu:%.2lu",
+	 gmtnegative ? '-' : '+', gmtoff/60, gmtoff%60);
+ }
+
+ return rlen;
+}
+
+/*
+ * Generate an RFC 3339 = ISO 8601 format date-time string in Zulu (UTC).
+ *
+ * Returns: number of characters in @buf generated, or -1 on error.
+ */
+EXPORTED int time_to_iso8601(time_t t, char *buf, size_t len)
+{
+ struct tm *tm = (struct tm *) gmtime(&t);
+ struct timeval tv = { t, 0 };
+
+ return breakdown_time_to_iso8601(&tv, tm, timeval_s, buf, len);
+}
+
+/*
+ * Generate an RFC 3339 = ISO 8601 format date-time string in local time with
+ * offset from UTC and fractions of second.
+ *
+ * Returns: number of characters in @buf generated, or -1 on error.
+ */
+EXPORTED int timeval_to_iso8601(const struct timeval *tv, enum timeval_precision tv_prec,
+ char *buf, size_t len)
+{
+ struct tm *tm = localtime(&(tv->tv_sec));
+ return breakdown_time_to_iso8601(tv, tm, tv_prec, buf, len);
+}
+
+EXPORTED int time_to_rfc3339(time_t t, char *buf, size_t len)
+{
+ struct tm *tm = gmtime(&t);
+
+ return snprintf(buf, len, "%4d-%02d-%02dT%02d:%02d:%02dZ",
+		 tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+		 tm->tm_hour, tm->tm_min, tm->tm_sec);
+}
+
+/*
+ * Convert a time_t date to an IMAP-style date
+ * datebuf needs to be >= 30 bytes.
+ *
+ * Returns: number of characters in @buf generated, or -1 on error.
+ */
+EXPORTED int time_to_rfc3501(time_t date, char *buf, size_t len)
+{
+ struct tm *tm = localtime(&date);
+ long gmtoff = gmtoff_of(tm, date);
+ int gmtnegative = 0;
+
+ /*assert(date > 0); - it turns out these can happen, annoyingly enough */
+ assert(tm->tm_year >= 69);
+
+ if (gmtoff < 0) {
+	gmtoff = -gmtoff;
+	gmtnegative = 1;
+ }
+ gmtoff /= 60;
+ return snprintf(buf, len,
+	 "%2u-%s-%u %.2u:%.2u:%.2u %c%.2lu%.2lu",
+	 tm->tm_mday, monthnametm->tm_mon, tm->tm_year+1900,
+	 tm->tm_hour, tm->tm_min, tm->tm_sec,
+	 gmtnegative ? '-' : '+', gmtoff/60, gmtoff%60);
+}
+
+
+/*
+ * Parse a string in IMAP date-time format (and some more
+ * obscure legacy formats too) to a time_t. Parses both
+ * date and time parts.
+ *
+ * Specific formats accepted are listed below. Note that only
+ * the first two are compliant with RFC3501, the remainder
+ * are legacy formats. Note that the " quotes are not part
+ * of the format, they're just used in this comment to show
+ * where the leading spaces are.
+ *
+ * "dd-mmm-yyyy HH:MM:SS zzzzz"
+ * " d-mmm-yyyy HH:MM:SS zzzzz"
+ * "dd-mmm-yy HH:MM:SS-z"
+ * " d-mmm-yy HH:MM:SS-z"
+ * "dd-mmm-yy HH:MM:SS-zz"
+ * " d-mmm-yy HH:MM:SS-zz"
+ * "dd-mmm-yy HH:MM:SS-zzz"
+ * " d-mmm-yy HH:MM:SS-zzz"
+ *
+ * where:
+ * dd	is the day-of-month between 1 and 31 inclusive.
+ * mmm	is the three-letter abbreviation for the English
+ * month name (case insensitive).
+ * yy	is the 2 digit year, between 00 (the year 1900)
+ *	and 99 (the year 1999) inclusive.
+ * yyyy is the 4 digit year, between 1900 and disaster
+ * (31b time_t wrapping in 2038 is not handled, sorry).
+ * HH	is the hour, zero padded, between 00 and 23 inclusive.
+ * MM 	is the minute, zero padded, between 00 and 59 inclusive.
+ * MM 	is the second, zero padded, between 00 and 60 inclusive
+ * (to account for leap seconds).
+ * z	is a US military style single character time zone.
+ *	 A (Alpha) is +0100 ... I (India) is +0900
+ *	 J (Juliet) is not defined
+ *	 K (Kilo) is +1000 ... M (Mike) is +1200
+ *	 N (November) is -0100 ... Y (Yankee) is -1200
+ *	 Z (Zulu) is UTC
+ * zz	is the case-insensitive string "UT", denoting UTC time.
+ * zzz	is a three-character case insensitive North American
+ *	time zone name, one of the following (listed with the
+ *	UTC offsets and comments):
+ *	 AST	-0400	Atlantic Standard Time
+ *	 ADT	-0300	Atlantic Daylight Time
+ *	 EST	-0500	Eastern Standard Time
+ *	 EDT	-0400	Eastern Daylight Time
+ *	 CST	-0600	Central Standard Time
+ *	 CDT	-0500	Central Daylight Time
+ *	 MST	-0700	Mountain Standard Time
+ *	 MDT	-0600	Mountain Daylight Time
+ *	 PST	-0800	Pacific Standard Time
+ *	 PDT	-0700	Pacific Daylight Time
+ *	 YST	-0900	Yukon Standard Time
+ *			(Obsolete, now AKST = Alaska S.T.)
+ *	 YDT	-0800	Yukon Daylight Time
+ *			(Obsolete, now AKDT = Alaska D.T.)
+ *	 HST	-1000	Hawaiian Standard Time
+ *			(Obsolete, now HAST = Hawaiian/Aleutian S.T.)
+ *	 HDT	-0900	Hawaiian Daylight Time
+ *			(Obsolete, now HADT = Hawaiian/Aleutian D.T.)
+ *	 BST	-1100	Used in American Samoa & Midway Island
+ *			(Obsolete, now SST = Samoa S.T.)
+ *	 BDT	-1000	Nonsensical, standard time is used
+ *			all year around in the SST territories.
+ * zzzzz is an numeric time zone offset in the form +HHMM
+ *	or -HMMM.
+ *
+ * Returns: Number of characters consumed from @s on success,
+ *	 or -1 on error.
+ */
+EXPORTED int time_from_rfc3501(const char *s, time_t *date)
+{
+ const char *origs = s;
+ int c;
+ struct tm tm;
+ int old_format = 0;
+ char month4, zone4, *p;
+ time_t tmp_gmtime;
+ int zone_off; /* timezone offset in minutes */
+
+ memset(&tm, 0, sizeof tm);
+
+ /* Day of month */
+ c = *s++;
+ if (c == ' ')
+	c = '0';
+ else if (!isdigit(c))
+	goto baddate;
+ tm.tm_mday = c - '0';
+
+ c = *s++;
+ if (isdigit(c)) {
+	tm.tm_mday = tm.tm_mday * 10 + c - '0';
+	c = *s++;
+	if (tm.tm_mday <= 0 || tm.tm_mday > 31)
+	 goto baddate;
+ }
+
+ if (c != '-')
+	goto baddate;
+ c = *s++;
+
+ /* Month name */
+ if (!isalpha(c))
+	goto baddate;
+ month0 = c;
+ c = *s++;
+ if (!isalpha(c))
+	goto baddate;
+ month1 = c;
+ c = *s++;
+ if (!isalpha(c))
+	goto baddate;
+ month2 = c;
+ c = *s++;
+ month3 = '\0';
+
+ for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
+	if (!strcasecmp(month, monthnametm.tm_mon))
+	 break;
+ }
+ if (tm.tm_mon == 12)
+	goto baddate;
+
+ if (c != '-')
+	goto baddate;
+ c = *s++;
+
+ /* Year */
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_year = c - '0';
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_year = tm.tm_year * 10 + c - '0';
+ c = *s++;
+ if (isdigit(c)) {
+	if (tm.tm_year < 19)
+	 goto baddate;
+	tm.tm_year -= 19;
+	tm.tm_year = tm.tm_year * 10 + c - '0';
+	c = *s++;
+	if (!isdigit(c))
+	 goto baddate;
+	tm.tm_year = tm.tm_year * 10 + c - '0';
+	c = *s++;
+ }
+ else
+	old_format++;
+
+ if (tm.tm_mday > monthdays(tm.tm_year, tm.tm_mon))
+	goto baddate;
+
+ /* Hour */
+ if (c != ' ')
+	goto baddate;
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_hour = c - '0';
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_hour = tm.tm_hour * 10 + c - '0';
+ c = *s++;
+ if (tm.tm_hour > 23)
+	goto baddate;
+
+ /* Minute */
+ if (c != ':')
+	goto baddate;
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_min = c - '0';
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_min = tm.tm_min * 10 + c - '0';
+ c = *s++;
+ if (tm.tm_min > 59)
+	goto baddate;
+
+ /* Second */
+ if (c != ':')
+	goto baddate;
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_sec = c - '0';
+ c = *s++;
+ if (!isdigit(c))
+	goto baddate;
+ tm.tm_sec = tm.tm_sec * 10 + c - '0';
+ c = *s++;
+ if (tm.tm_min > 60)
+	goto baddate;
+
+ /* Time zone */
+ if (old_format) {
+	if (c != '-')
+	 goto baddate;
+	c = *s++;
+
+	if (!isalpha(c))
+	 goto baddate;
+	zone0 = c;
+	c = *s++;
+
+	if (c == '\0') {
+	 /* Military (single-char) zones */
+	 zone1 = '\0';
+	 lcase(zone);
+	 if (zone0 <= 'i') {
+		zone_off = (zone0 - 'a' + 1)*60;
+	 }
+	 else if (zone0 == 'j') {
+		goto baddate;
+	 }
+	 else if (zone0 <= 'm') {
+		zone_off = (zone0 - 'k' + 10)*60;
+	 }
+	 else if (zone0 < 'z') {
+		zone_off = ('m' - zone0)*60;
+	 }
+	 else /* 'z' */
+		zone_off = 0;
+	}
+	else {
+	 /* UT (universal time) */
+	 zone1 = c;
+	 c = *s++;
+	 if (c == '\0') {
+		zone2 = '\0';
+		lcase(zone);
+		if (!strcmp(zone, "ut"))
+		 goto baddate;
+		zone_off = 0;
+	 }
+	 else {
+		/* 3-char time zone */
+		zone2 = c;
+		c = *s++;
+		if (c != '\0')
+		 goto baddate;
+		zone3 = '\0';
+		lcase(zone);
+		p = strchr("aecmpyhb", zone0);
+		if (c != '\0' || zone2 != 't' || !p)
+		 goto baddate;
+		zone_off = (strlen(p) - 12)*60;
+		if (zone1 == 'd')
+		 zone_off += 60;
+		else if (zone1 != 's')
+		 goto baddate;
+	 }
+	}
+ }
+ else {
+	if (c != ' ')
+	 goto baddate;
+	c = *s++;
+
+	if (c != '+' && c != '-')
+	 goto baddate;
+	zone0 = c;
+
+	c = *s++;
+	if (!isdigit(c))
+	 goto baddate;
+	zone_off = c - '0';
+	c = *s++;
+	if (!isdigit(c))
+	 goto baddate;
+	zone_off = zone_off * 10 + c - '0';
+	c = *s++;
+	if (!isdigit(c))
+	 goto baddate;
+	zone_off = zone_off * 6 + c - '0';
+	c = *s++;
+	if (!isdigit(c))
+	 goto baddate;
+	zone_off = zone_off * 10 + c - '0';
+
+	if (zone0 == '-')
+	 zone_off = -zone_off;
+
+	c = *s++;
+	if (c != '\0')
+	 goto baddate;
+ }
+
+ tm.tm_isdst = -1;
+
+ tmp_gmtime = mkgmtime(&tm);
+ if (tmp_gmtime == -1)
+	goto baddate;
+
+ *date = tmp_gmtime - zone_off*60;
+
+ return s-1 - origs;
+
+baddate:
+ return -1;
+}
+

cyrus-imapd-2.5.tar.gz/lib/times.h Added

@@ -0,0 +1,88 @@
+/* times.h -- Time/date utility routines
+ *
+ * Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __CYRUS__TIME_H__
+#define __CYRUS__TIME_H__
+
+#include <time.h>
+#include <sys/time.h>
+
+/* Factor for converting days to seconds. */
+#define DAY2SEC (24 * 60 * 60)
+
+/* Default precision to print timeval is millisecond (timeval_ms)
+ * change to timeval_us in times.c to print microsecond. */
+enum timeval_precision { timeval_s, timeval_ms, timeval_us };
+
+/*
+ * RFC822 datetime format
+ */
+/* Size in bytes of longest date format
+ * generated by time_to_rfc822(),
+ * not including the nul terminator. */
+#define RFC822_DATETIME_MAX 31
+int time_from_rfc822(const char *s, time_t *tp);
+int day_from_rfc822(const char *s, time_t *tp);
+int time_to_rfc822(time_t t, char *buf, size_t len);
+
+/*
+ * ISO8601 (RFC3339) datetime format
+ */
+int time_from_iso8601(const char *s, time_t *);
+int time_to_iso8601(time_t t, char *buf, size_t len);
+int timeval_to_iso8601(const struct timeval *t, enum timeval_precision tv_prec,
+ char *buf, size_t len);
+
+/*
+ * RFC3501 datetime format
+ */
+/* Size in bytes of longest date format accepted by
+ * time_from_rfc3501(), and generated by time_to_rfc3501(),
+ * not including the nul terminator. */
+#define RFC3501_DATETIME_MAX 26
+int time_to_rfc3501(time_t t, char *buf, size_t len);
+int time_from_rfc3501(const char *s, time_t *tp);
+
+#define RFC3339_DATETIME_MAX 21
+int time_to_rfc3339(time_t t, char *buf, size_t len);
+
+#endif /* __CYRUS__TIME_H__ */

cyrus-imapd-2.5.tar.gz/lib/tok.c Added

@@ -0,0 +1,129 @@
+/* tok.c -- utility for string tokenisation
+ *
+ * Copyright (c) 2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <string.h>
+#include <ctype.h>
+#include "tok.h"
+#include "xmalloc.h"
+
+EXPORTED void tok_init(tok_t *t, const char *str, const char *sep, int flags)
+{
+ tok_initm(t, str ? xstrdup(str) : NULL, sep, flags|TOK_FREEBUFFER);
+}
+
+EXPORTED void tok_initm(tok_t *t, char *str, const char *sep, int flags)
+{
+ memset(t, 0, sizeof(*t));
+ t->buf = str;
+ t->sep = sep;
+ t->flags = flags | _TOK_FIRST;
+}
+
+EXPORTED void tok_fini(tok_t *t)
+{
+ if ((t->flags & TOK_FREEBUFFER))
+	free(t->buf);
+ memset(t, 0, sizeof(*t));
+}
+
+EXPORTED char *tok_next(tok_t *t)
+{
+ const char *sep;
+ char *token;
+
+ /* initialising us with a NULL buffer is harmless */
+ if (!t->buf)
+	return NULL;
+
+ /* use the given separator or the default separator string */
+ sep = (t->sep ? t->sep : " \t\n\r");
+
+ if ((t->flags & TOK_EMPTY)) {
+	if ((t->flags & _TOK_FIRST)) {
+	 t->flags &= ~_TOK_FIRST;
+	 t->state = t->buf;
+	}
+	token = strsep(&t->state, sep);
+ }
+ else {
+	char *buf = NULL;
+
+	if ((t->flags & _TOK_FIRST)) {
+	 /* strtok_r() wants the buffer only the first time */
+	 t->flags &= ~_TOK_FIRST;
+	 buf = t->buf;
+	}
+
+	token = strtok_r(buf, sep, &t->state);
+ }
+
+ if (!token) {
+	/* end of tokens; clean up the tok_t to ensure we don't
+	 * leak any memory even if the caller doesn't call tok_fini() */
+	tok_fini(t);
+	return NULL;
+ }
+
+ /* we have a token, perform any additional munging */
+
+ if ((t->flags & TOK_TRIMLEFT)) {
+	while (*token && isspace(*token))
+	 token++;
+ }
+
+ if ((t->flags & TOK_TRIMRIGHT)) {
+	char *p = token + strlen(token) - 1;
+	while (p >= token && isspace(*p))
+	 *p-- = '\0';
+ }
+
+ t->curr = token;
+ return token;
+}
+
+EXPORTED unsigned int tok_offset(const tok_t *t)
+{
+ if (!t->buf || !t->curr)
+	return 0;
+ return (t->curr - t->buf);
+}

cyrus-imapd-2.5.tar.gz/lib/tok.h Added

@@ -0,0 +1,80 @@
+/* tok.h -- utility for string tokenisation
+ *
+ * Copyright (c) 2011 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Carnegie Mellon University
+ * Center for Technology Transfer and Enterprise Creation
+ * 4615 Forbes Avenue
+ * Suite 302
+ * Pittsburgh, PA 15213
+ * (412) 268-7393, fax: (412) 268-7395
+ * innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Greg Banks
+ * Based on his tok_t class from ggcov.sf.net
+ */
+
+#ifndef __CYRUS_TOK_H__
+#define __CYRUS_TOK_H__
+
+#include <config.h>
+#include <sys/types.h>
+#include "xmalloc.h"
+
+typedef struct
+{
+ char *buf;
+ char *state;
+ const char *sep;
+ char *curr;
+#define _TOK_FIRST	(1<<0)
+#define TOK_TRIMLEFT	(1<<1)	/* trim whitespace from start of tokens */
+#define TOK_TRIMRIGHT	(1<<2)	/* trim whitespace from end of tokens */
+#define TOK_EMPTY	(1<<3)	/* return empty "" tokens if adjacent
+				 * delimiter characters are present */
+#define TOK_FREEBUFFER	(1<<4)	/* tok_t should free() the buffer when done */
+ unsigned int flags;
+} tok_t;
+
+#define TOK_INITIALIZER(str, sep, flags) \
+ { xstrdup((str)), NULL, (sep), NULL, (flags)|_TOK_FIRST|TOK_FREEBUFFER }
+
+void tok_init(tok_t *, const char *buf, const char *sep, int flags);
+void tok_initm(tok_t *, char *buf, const char *sep, int flags);
+void tok_fini(tok_t *);
+
+/* advance to the next token and return it */
+char *tok_next(tok_t *);
+/* return offset into the buffer of the current token, for error messages */
+unsigned int tok_offset(const tok_t *);
+
+#endif /* __CYRUS_TOK_H__ */

cyrus-imapd-2.4.17.tar.gz/lib/util.c -> cyrus-imapd-2.5.tar.gz/lib/util.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: util.c,v 1.40 2010/06/28 12:06:43 brong Exp $
 */
 
 #include <config.h>
@@ -50,11 +48,16 @@
 #include <grp.h>
 #include <limits.h>
 #include <pwd.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#if defined(__linux__) && defined(HAVE_LIBCAP)
+#include <sys/capability.h>
+#include <sys/prctl.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -63,15 +66,39 @@
 #endif
 
 #include <sys/socket.h>
-#include <errno.h>
 
 #include "exitcodes.h"
+#include "map.h"
+#include "retry.h"
 #include "util.h"
+#include "assert.h"
 #include "xmalloc.h"
+#ifdef HAVE_ZLIB
+#include "zlib.h"
+#endif
 
 #define BEAUTYBUFSIZE 4096
 
-const unsigned char convert_to_lowercase256 = {
+static const unsigned char unxdigit128 = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
+ 0x08, 0x09, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+EXPORTED const unsigned char convert_to_lowercase256 = {
 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
@@ -143,7 +170,7 @@
 
 /* convert string to all lower case
 */
-char *lcase(char* str)
+EXPORTED char *lcase(char* str)
 {
 char *scan = str;
 
@@ -157,7 +184,7 @@
 
 /* convert string to all upper case
 */
-char *ucase(char* str)
+EXPORTED char *ucase(char* str)
 {
 char *scan = str;
 
@@ -173,7 +200,7 @@
 * returns pointer to end of dst string.
 * dst must have twice the length of source
 */
-char *beautify_copy(char* dst, const char* src)
+static char *beautify_copy(char* dst, const char* src)
 {
 unsigned char c;
 
@@ -197,9 +224,8 @@
 
 /* clean up control characters in a string while copying it
 * returns pointer to a static buffer containing the cleaned-up version
- * returns NULL on malloc() error
 */
-char *beautify_string(const char* src)
+EXPORTED char *beautify_string(const char* src)
 {
 static char *beautybuf = NULL;
 static int beautysize = 0;
@@ -215,23 +241,26 @@
 	 if (len > beautysize) beautysize = len;
 	 beautybuf = xrealloc(beautybuf, beautysize);
 	}
-	if (!beautybuf) {
-	 beautysize = 0;
-	 return "";
-	}
 }
 (void) beautify_copy(beautybuf, src);
 
- return (beautybuf);
+ return beautybuf;
 }
 
-int strcmpsafe(const char *a, const char *b)
+EXPORTED int strcmpsafe(const char *a, const char *b)
 {
 return strcmp((a == NULL ? "" : a),
 	 (b == NULL ? "" : b));
 }
 
-int strcasecmpsafe(const char *a, const char *b)
+EXPORTED int strncmpsafe(const char *a, const char *b, size_t n)
+{
+ return strncmp((a == NULL ? "" : a),
+		 (b == NULL ? "" : b),
+		 n);
+}
+
+EXPORTED int strcasecmpsafe(const char *a, const char *b)
 {
 return strcasecmp((a == NULL ? "" : a),
 	 (b == NULL ? "" : b));
@@ -266,13 +295,13 @@
 * directory. Stop before the first dot. Caller is responsible
 * for skipping any prefix of the name.
 */
-int dir_hash_c(const char *name, int full)
+EXPORTED int dir_hash_c(const char *name, int full)
 {
 int c;
 
 if (full) {
 	unsigned char *pt;
-	unsigned int n;
+	uint32_t n;
 	enum {
 	 DIR_X = 3,
 	 DIR_Y = 5,
@@ -297,13 +326,20 @@
 return c;
 }
 
-int cyrus_close_sock(int fd) 
+EXPORTED char *dir_hash_b(const char *name, int full, char buf2)
+{
+ buf0 = (char)dir_hash_c(name, full);
+ buf1 = '\0';
+ return buf;
+}
+
+EXPORTED int cyrus_close_sock(int fd)
 {
 shutdown(fd, SHUT_RD);
 return close(fd);
 }
 
-void cyrus_reset_stdio()
+EXPORTED void cyrus_reset_stdio(void)
 {
 int devnull = open("/dev/null", O_RDWR, 0);
 
@@ -326,41 +362,37 @@
 if (devnull > 2) close(devnull);
 }
 
-/* Given a mkstemp(3) pattern for a filename,
- * create the file and return the file descriptor.
+/* Given a directory, create a unique temporary file open for
+ * reading and writing and return the file descriptor.
 *
 * This routine also unlinks the file so it won't appear in the
 * directory listing (but you won't have to worry about cleaning up
 * after it)
 */
-int create_tempfile(const char *path) 
+EXPORTED int create_tempfile(const char *path)
 {
 int fd;
- char pattern2048;
+ char *pattern;
 
- if(snprintf(pattern, sizeof(pattern), "%s/cyrus_tmpfile_XXXXXX",
-		path) >= (int) sizeof(pattern)){
-	fatal("temporary file pathname is too long in prot_flush",
-	 EC_TEMPFAIL);
- }
+ pattern = strconcat(path, "/cyrus_tmpfile_XXXXXX", (char *)NULL);
 
 fd = mkstemp(pattern);
- if(fd == -1) {
-	return -1;
- } else if(unlink(pattern) == -1) {
+ if (fd >= 0 && unlink(pattern) == -1) {
 	close(fd);
-	return -1;
+	fd = -1;
 }
 
+ free(pattern);
 return fd;
 }
 
 /* Create all parent directories for the given path,
 * up to but not including the basename.
 */
-int cyrus_mkdir(const char *path, mode_t mode __attribute__((unused)))
+EXPORTED int cyrus_mkdir(const char *pathname, mode_t mode __attribute__((unused)))
 {
- char *p = (char *) path;
+ char *path = xstrdup(pathname); /* make a copy to write into */
+ char *p = path;
 int save_errno;
 struct stat sbuf;
 
@@ -371,23 +403,183 @@
 	 if (stat(path, &sbuf) == -1) {
 		errno = save_errno;
 		syslog(LOG_ERR, "IOERROR: creating directory %s: %m", path);
+		free(path);
 		return -1;
 	 }
 	}
 	*p = '/';
 }
 
+ free(path);
 return 0;
 }
 
-int become_cyrus(void)
+static int _copyfile_helper(const char *from, const char *to, int flags)
+{
+ int srcfd = -1;
+ int destfd = -1;
+ const char *src_base = 0;
+ size_t src_size = 0;
+ struct stat sbuf;
+ int n;
+ int r = 0;
+ int nolink = flags & COPYFILE_NOLINK;
+
+ /* try to hard link, but don't fail - fall back to regular copy */
+ if (!nolink) {
+	if (link(from, to) == 0) return 0;
+	if (errno == EEXIST) {
+	 if (unlink(to) == -1) {
+		syslog(LOG_ERR, "IOERROR: unlinking to recreate %s: %m", to);
+		return -1;
+	 }
+	 if (link(from, to) == 0) return 0;
+	}
+ }
+
+ srcfd = open(from, O_RDONLY, 0666);
+ if (srcfd == -1) {
+	syslog(LOG_ERR, "IOERROR: opening %s: %m", from);
+	r = -1;
+	goto done;
+ }
+
+ if (fstat(srcfd, &sbuf) == -1) {
+	syslog(LOG_ERR, "IOERROR: fstat on %s: %m", from);
+	r = -1;
+	goto done;
+ }
+
+ if (!sbuf.st_size) {
+	syslog(LOG_ERR, "IOERROR: zero byte file %s: %m", from);
+	r = -1;
+	goto done;
+ }
+
+ destfd = open(to, O_RDWR|O_TRUNC|O_CREAT, 0666);
+ if (destfd == -1) {
+	if (!(flags & COPYFILE_MKDIR))
+	 syslog(LOG_ERR, "IOERROR: creating %s: %m", to);
+	r = -1;
+	goto done;
+ }
+
+ map_refresh(srcfd, 1, &src_base, &src_size, sbuf.st_size, from, 0);
+
+ n = retry_write(destfd, src_base, src_size);
+
+ if (n == -1 || fsync(destfd)) {
+	syslog(LOG_ERR, "IOERROR: writing %s: %m", to);
+	r = -1;
+	unlink(to); /* remove any rubbish we created */
+	goto done;
+ }
+
+done:
+ map_free(&src_base, &src_size);
+
+ if (srcfd != -1) close(srcfd);
+ if (destfd != -1) close(destfd);
+
+ return r;
+}
+
+EXPORTED int cyrus_copyfile(const char *from, const char *to, int flags)
+{
+ int r;
+
+ /* copy over self is an error */
+ if (!strcmp(from, to))
+	return -1;
+
+ r = _copyfile_helper(from, to, flags);
+
+ /* try creating the target directory if requested */
+ if (r && (flags & COPYFILE_MKDIR)) {
+	r = cyrus_mkdir(to, 0755);
+	if (!r) r = _copyfile_helper(from, to, flags & ~COPYFILE_MKDIR);
+ }
+
+ if (!r && (flags & COPYFILE_RENAME)) {
+	/* remove the original file if the copy succeeded */
+	unlink(from);
+ }
+
+ return r;
+}
+
+#if defined(__linux__) && defined(HAVE_LIBCAP)
+EXPORTED int set_caps(int stage, int is_master)
+{
+ cap_t cap = NULL;
+ int r = 0;
+ int e = errno;
+ static const char * const capsets25 = {
+	{ /* !master */
+	 "cap_setuid=ep",	/* BEFORE_SETUID */
+	 "=",		/* AFTER_SETUID */
+	 "=",		/* doesn't happen */
+	 "=",		/* doesn't happen */
+	 "="			/* doesn't happen */
+	}, { /* master */
+	 "cap_net_bind_service=p cap_setuid=ep",	/* BEFORE_SETUID */
+	 "cap_net_bind_service=p",			/* AFTER_SETUID */
+	 "cap_net_bind_service=ep",			/* BEFORE_BIND */
+	 "cap_net_bind_service=p",			/* AFTER_BIND */
+	 "="						/* AFTER_FORK */
+	}
+ };
+
+ cap = cap_from_text(capsets!!is_masterstage);
+ assert(cap != NULL);
+
+ r = cap_set_proc(cap);
+ if (r < 0) {
+	syslog(LOG_ERR, "cannot set caps: %m");
+	goto out;
+ }
+
+ if ((stage == BEFORE_SETUID) || (stage == AFTER_SETUID)) {
+	r = prctl(PR_SET_KEEPCAPS, (stage == BEFORE_SETUID));
+	if (r < 0) {
+	 syslog(LOG_ERR, "cannot set keepcaps flag: %m");
+	 goto out;
+	}
+ }
+
+ out:
+ if (cap) cap_free(cap);
+ errno = e; /* preserve errno so the caller's error reporting is easy */
+
+ return r;
+}
+#else
+EXPORTED int set_caps(int stage __attribute__((unused)),
+		 int is_master __attribute__((unused)))
+{
+ return 0;
+}
+#endif
+
+static int cap_setuid(int uid, int is_master)
+{
+ int r;
+
+ set_caps(BEFORE_SETUID, is_master);
+ r = setuid(uid);
+ set_caps(AFTER_SETUID, is_master);
+
+ return r;
+}
+
+EXPORTED int become_cyrus(int is_master)
 {
 struct passwd *p;
 int newuid, newgid;
 int result;
 static int uid = 0;
 
- if (uid) return setuid(uid);
+ if (uid) return cap_setuid(uid, is_master);
 
 p = getpwnam(CYRUS_USER);
 if (p == NULL) {
@@ -405,6 +597,7 @@
 	newgid == (int)getgid()) {
 	/* already the Cyrus user, stop trying */
 	uid = newuid;
+	set_caps(AFTER_SETUID, is_master);
 	return 0;
 }
 
@@ -420,7 +613,7 @@
 return -1;
 }
 
- result = setuid(newuid);
+ result = cap_setuid(newuid, is_master);
 
 /* Only set static uid if successful, else future calls won't reset gid */
 if (result == 0)
@@ -432,42 +625,86 @@
 static struct timeval cmdtime_start, cmdtime_end, nettime_start, nettime_end;
 static double totaltime, cmdtime, nettime;
 
-double timesub(struct timeval * start, struct timeval * end) {
- return (double)(end->tv_sec - start->tv_sec) +
- (double)(end->tv_usec - start->tv_usec)/1000000.0;
+double timeval_get_double(const struct timeval *tv)
+{
+ return (double)tv->tv_sec + (double)tv->tv_usec/1000000.0;
 }
 
-void cmdtime_settimer(int enable) {
- cmdtime_enabled = enable;
+EXPORTED void timeval_set_double(struct timeval *tv, double d)
+{
+ double sec;
+ double subsec = modf(d, &sec);
+
+ tv->tv_sec = sec;
+ tv->tv_usec = 1000000.0*subsec;
 }
 
-void cmdtime_starttimer() {
- if (!cmdtime_enabled) { return; }
- gettimeofday(&cmdtime_start, 0);
- totaltime = cmdtime = nettime = 0.0;
+EXPORTED void timeval_add_double(struct timeval *tv, double delta)
+{
+ timeval_set_double(tv, timeval_get_double(tv) + delta);
 }
 
-void cmdtime_endtimer(double * pcmdtime, double * pnettime) {
- if (!cmdtime_enabled) { return; }
- gettimeofday(&cmdtime_end, 0);
- totaltime = timesub(&cmdtime_start, &cmdtime_end);
- cmdtime = totaltime - nettime;
- *pcmdtime = cmdtime;
- *pnettime = nettime;
+EXPORTED double timesub(const struct timeval *start, const struct timeval *end)
+{
+ return (double)(end->tv_sec - start->tv_sec) +
+	 (double)(end->tv_usec - start->tv_usec)/1000000.0;
+}
+
+EXPORTED void cmdtime_settimer(int enable)
+{
+ cmdtime_enabled = enable;
 }
 
-void cmdtime_netstart() {
- if (!cmdtime_enabled) { return; }
- gettimeofday(&nettime_start, 0);
+EXPORTED void cmdtime_starttimer(void)
+{
+ if (!cmdtime_enabled)
+	return;
+ gettimeofday(&cmdtime_start, 0);
+ totaltime = cmdtime = nettime = 0.0;
 }
 
-void cmdtime_netend() {
- if (!cmdtime_enabled) { return; }
- gettimeofday(&nettime_end, 0);
- nettime += timesub(&nettime_start, &nettime_end);
+EXPORTED void cmdtime_endtimer(double *pcmdtime, double *pnettime)
+{
+ if (!cmdtime_enabled)
+	return;
+ gettimeofday(&cmdtime_end, 0);
+ totaltime = timesub(&cmdtime_start, &cmdtime_end);
+ cmdtime = totaltime - nettime;
+ *pcmdtime = cmdtime;
+ *pnettime = nettime;
+}
+
+EXPORTED void cmdtime_netstart(void)
+{
+ if (!cmdtime_enabled)
+	return;
+ gettimeofday(&nettime_start, 0);
+}
+
+EXPORTED void cmdtime_netend(void)
+{
+ if (!cmdtime_enabled)
+	return;
+ gettimeofday(&nettime_end, 0);
+ nettime += timesub(&nettime_start, &nettime_end);
+}
+
+/*
+ * Like the system clock() but works in system time
+ * rather than process virtual time. Would be more
+ * useful and sensible if it worked in system monotonic
+ * time using clock_gettime(CLOCK_MONOTONIC) but that
+ * would require linking with -lrt.
+ */
+EXPORTED clock_t sclock(void)
+{
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ return now.tv_sec * CLOCKS_PER_SEC +
+ (now.tv_usec * CLOCKS_PER_SEC) / 1000000;
 }
 
-int parseint32(const char *p, const char **ptr, int32_t *res)
+EXPORTED int parseint32(const char *p, const char **ptr, int32_t *res)
 {
 int32_t result = 0;
 int gotchar = 0;
@@ -490,7 +727,7 @@
 return 0;
 }
 
-int parseuint32(const char *p, const char **ptr, uint32_t *res)
+EXPORTED int parseuint32(const char *p, const char **ptr, uint32_t *res)
 {
 uint32_t result = 0;
 int gotchar = 0;
@@ -513,32 +750,121 @@
 return 0;
 }
 
+EXPORTED int parsenum(const char *p, const char **ptr, int maxlen, bit64 *res)
+{
+ bit64 result = 0;
+ int n;
+ int cval;
+
+ /* ULLONG_MAX == 18446744073709551615ULL 
+ * - and I don't care about those last 5
+ */
+ for (n = 0; !maxlen || n < maxlen; n++) {
+	if (!cyrus_isdigit(pn))
+	 break;
+	if (result > 1844674407370955161ULL)
+	 fatal("num too big", EC_IOERR);
+	cval = pn - '0';
+	result = result * 10 + cval;
+ }
+
+ /* no characters found... */
+ if (!n) return -1;
+
+ if (ptr) *ptr = p + n;
+ if (res) *res = result;
+
+ return 0;
+}
+
+EXPORTED int parsehex(const char *p, const char **ptr, int maxlen, bit64 *res)
+{
+ bit64 result = 0;
+ int n;
+ int cval;
+
+ /* ULLONG_MAX == 18446744073709551615ULL 
+ * - and I don't care about those last 5
+ */
+ for (n = 0; !maxlen || n < maxlen; n++) {
+	if (result > 1844674407370955161ULL)
+	 fatal("num too big", EC_IOERR);
+	cval = unxdigit(int)pn;
+	if (cval == 0xff) break;
+	result = result * 16 + cval;
+ }
+
+ /* no characters found... */
+ if (!n) return -1;
+
+ if (ptr) *ptr = p + n;
+ if (res) *res = result;
+
+ return 0;
+}
+
 /* buffer handling functions */
 
-#define BUF_GROW 1024
-void buf_ensure(struct buf *buf, int n)
+static size_t roundup(size_t size)
+{
+ if (size < 32)
+	return 32;
+ if (size < 64)
+	return 64;
+ if (size < 128)
+	return 128;
+ if (size < 256)
+	return 256;
+ if (size < 512)
+	return 512;
+ return ((size + 1024) & ~1023);
+}
+
+/* this function has a side-effect of always leaving the buffer writable */
+EXPORTED void buf_ensure(struct buf *buf, size_t n)
 {
- int newlen = (buf->len + n + BUF_GROW); /* XXX - size mod logic? */
+ size_t newalloc = roundup(buf->len + n);
 
- if (buf->alloc >= (buf->len + n))
+ /* can't create a zero byte buffer */
+ assert(newalloc);
+
+ /* protect against wrap */
+ assert(newalloc >= buf->len);
+
+ if (buf->alloc >= newalloc)
 	return;
 
 if (buf->alloc) {
-	buf->s = xrealloc(buf->s, newlen);
+	buf->s = xrealloc(buf->s, newalloc);
 }
 else {
-	char *s = xmalloc(newlen);
-	if (buf->len) /* copy on write */
+	char *s = xmalloc(newalloc);
+
+	/* if no allocation, but data exists, it means copy on write.
+	 * grab a copy of what's there now */
+	if (buf->len) {
+	 assert(buf->s);
 	 memcpy(s, buf->s, buf->len);
+	}
+
+	/* can release MMAP now, we've already copied the data out */
+	if (buf->flags & BUF_MMAP) {
+	 const char *base = buf->s;
+	 size_t len = buf->len;
+	 map_free(&base, &len);
+	 buf->flags &= ~BUF_MMAP;
+	}
+
 	buf->s = s;
 }
 
- buf->alloc = newlen;
+ /* either way, our allocated space is now this long */
+ buf->alloc = newalloc;
 }
 
-const char *buf_cstring(struct buf *buf)
+EXPORTED const char *buf_cstring(struct buf *buf)
 {
- if (!(buf->flags & BUF_CSTRING)) {
+ if (!(buf->flags & BUF_CSTRING) || buf->s == NULL) {
 	buf_ensure(buf, 1);
 	buf->sbuf->len = '\0';
 	buf->flags |= BUF_CSTRING;
@@ -547,28 +873,77 @@
 return buf->s;
 }
 
-void buf_getmap(struct buf *buf, const char **base, int *len)
+EXPORTED char *buf_release(struct buf *buf)
+{
+ char *ret = (char *)buf_cstring(buf);
+ buf_init(buf);
+ return ret;
+}
+
+EXPORTED const char *buf_cstringnull(struct buf *buf)
+{
+ if (!buf->s) return NULL;
+ return buf_cstring(buf);
+}
+
+EXPORTED char *buf_releasenull(struct buf *buf)
+{
+ char *ret = (char *)buf_cstringnull(buf);
+ buf_init(buf);
+ return ret;
+}
+
+EXPORTED void buf_getmap(struct buf *buf, const char **base, size_t *len)
 {
 *base = buf->s;
 *len = buf->len;
 }
 
-unsigned buf_len(const struct buf *buf)
+/* fetch a single line a file - terminated with \n ONLY.
+ * buf does not contain the \n.
+ * NOTE: if the final line does not contain a \n we still
+ * return true so that the caller will process the line,
+ * so a file A\nB will return two true responses with bufs
+ * containing "A" and "B" respectively before returning a
+ * false to the third call */
+EXPORTED int buf_getline(struct buf *buf, FILE *fp)
+{
+ int c;
+
+ buf_reset(buf);
+ while ((c = fgetc(fp)) != EOF) {
+	if (c == '\n')
+	 break;
+	buf_putc(buf, c);
+ }
+ /* ensure trailing NULL */
+ buf_cstring(buf);
+
+ /* EOF and no content, we're done */
+ return (!(buf->len == 0 && c == EOF));
+}
+
+EXPORTED size_t buf_len(const struct buf *buf)
 {
 return buf->len;
 }
 
-void buf_reset(struct buf *buf)
+EXPORTED const char *buf_base(const struct buf *buf)
+{
+ return buf->s;
+}
+
+EXPORTED void buf_reset(struct buf *buf)
 {
 buf->len = 0;
 buf->flags &= ~BUF_CSTRING;
 }
 
-void buf_truncate(struct buf *buf, unsigned int len)
+EXPORTED void buf_truncate(struct buf *buf, size_t len)
 {
 if (len > buf->alloc) {
 	/* grow the buffer and zero-fill the new bytes */
-	unsigned int more = len - buf->len;
+	size_t more = len - buf->len;
 	buf_ensure(buf, more);
 	memset(buf->s + buf->len, 0, more);
 }
@@ -576,12 +951,12 @@
 buf->flags &= ~BUF_CSTRING;
 }
 
-void buf_setcstr(struct buf *buf, const char *str)
+EXPORTED void buf_setcstr(struct buf *buf, const char *str)
 {
 buf_setmap(buf, str, strlen(str));
 }
 
-void buf_setmap(struct buf *buf, const char *base, int len)
+EXPORTED void buf_setmap(struct buf *buf, const char *base, size_t len)
 {
 buf_reset(buf);
 if (len) {
@@ -591,28 +966,28 @@
 }
 }
 
-void buf_copy(struct buf *dst, const struct buf *src)
+EXPORTED void buf_copy(struct buf *dst, const struct buf *src)
 {
 buf_setmap(dst, src->s, src->len);
 }
 
-void buf_append(struct buf *dst, const struct buf *src)
+EXPORTED void buf_append(struct buf *dst, const struct buf *src)
 {
 buf_appendmap(dst, src->s, src->len);
 }
 
-void buf_appendcstr(struct buf *buf, const char *str)
+EXPORTED void buf_appendcstr(struct buf *buf, const char *str)
 {
 buf_appendmap(buf, str, strlen(str));
 }
 
-void buf_appendbit32(struct buf *buf, bit32 num)
+EXPORTED void buf_appendbit32(struct buf *buf, bit32 num)
 {
- bit32 nbit32 = htonl(num);
- buf_appendmap(buf, (const char *) &nbit32, sizeof(bit32));
+ bit32 item = htonl(num);
+ buf_appendmap(buf, (char *)&item, 4);
 }
 
-void buf_appendmap(struct buf *buf, const char *base, int len)
+EXPORTED void buf_appendmap(struct buf *buf, const char *base, size_t len)
 {
 if (len) {
 	buf_ensure(buf, len);
@@ -622,16 +997,39 @@
 }
 }
 
-void buf_putc(struct buf *buf, char c)
+/* This is like buf_appendmap() but attempts an optimisation where the
+ * first append to an empty buf results in a read-only pointer to the
+ * data at 'base' instead of a writable copy. */
+EXPORTED void buf_cowappendmap(struct buf *buf, const char *base, unsigned int len)
+{
+ if (!buf->s)
+	buf_init_ro(buf, base, len);
+ else
+	buf_appendmap(buf, base, len);
+}
+
+/* This is like buf_cowappendmap() but takes over the given map 'base',
+ * which is a malloc()ed C string buffer of at least 'len' bytes. */
+EXPORTED void buf_cowappendfree(struct buf *buf, char *base, unsigned int len)
+{
+ if (!buf->s)
+	buf_initm(buf, base, len);
+ else {
+	buf_appendmap(buf, base, len);
+	free(base);
+ }
+}
+
+EXPORTED void buf_putc(struct buf *buf, char c)
 {
 buf_ensure(buf, 1);
 buf->sbuf->len++ = c;
 buf->flags &= ~BUF_CSTRING;
 }
 
-void buf_printf(struct buf *buf, const char *fmt, ...)
+EXPORTED void buf_vprintf(struct buf *buf, const char *fmt, va_list args)
 {
- va_list args;
+ va_list ap;
 int room;
 int n;
 
@@ -640,18 +1038,18 @@
 * needs to overrun the size. */
 buf_ensure(buf, 1024);
 
- room = buf->alloc - buf->len - 1;
- va_start(args, fmt);
- n = vsnprintf(buf->s + buf->len, room+1, fmt, args);
- va_end(args);
+ /* Copy args in case we guess wrong on the size */
+ va_copy(ap, args);
+
+ room = buf->alloc - buf->len;
+ n = vsnprintf(buf->s + buf->len, room, fmt, args);
 
- if (n > room) {
-	/* woops, we guessed wrong...retry */
-	buf_ensure(buf, n-room);
-	va_start(args, fmt);
-	n = vsnprintf(buf->s + buf->len, n+1, fmt, args);
-	va_end(args);
+ if (n >= room) {
+	/* woops, we guessed wrong...retry with enough space */
+	buf_ensure(buf, n+1);
+	n = vsnprintf(buf->s + buf->len, n+1, fmt, ap);
 }
+ va_end(ap);
 
 buf->len += n;
 /* vsnprintf() gave us a trailing NUL, so we may as well remember
@@ -659,52 +1057,194 @@
 buf->flags |= BUF_CSTRING;
 }
 
+EXPORTED void buf_printf(struct buf *buf, const char *fmt, ...)
+{
+ va_list args;
+
+ va_start(args, fmt);
+ buf_vprintf(buf, fmt, args);
+ va_end(args);
+}
+
+static void buf_writable_cstring(struct buf *buf)
+{
+ if ((buf->flags & BUF_CSTRING) && !buf->alloc) {
+	/* has a \0 terminator but not writable: force
+	 * re-allocation of the data and initialisation
+	 * of the terminator */
+	buf->flags &= ~BUF_CSTRING;
+ }
+ buf_cstring(buf);
+ assert(buf->alloc > 0);
+}
+
+static void buf_replace_buf(struct buf *buf,
+			 size_t offset,
+			 size_t length,
+			 const struct buf *replace)
+{
+ if (offset > buf->len) return;
+ if (offset + length > buf->len)
+	length = buf->len - offset;
+
+ /* we need buf to be a writable C string now please */
+ buf_writable_cstring(buf);
+
+ if (replace->len > length) {
+	/* string will need to expand */
+	buf_ensure(buf, replace->len - length);
+ }
+ if (length != replace->len) {
+	/* +1 to copy the NULL to keep cstring semantics */
+	memmove(buf->s + offset + replace->len,
+		buf->s + offset + length,
+		buf->len - offset - length + 1);
+	buf->len += (replace->len - length);
+ }
+ if (replace->len)
+	memcpy(buf->s + offset, replace->s, replace->len);
+}
+
 /**
 * Replace all instances of the string literal @match in @buf
 * with the string @replace, which may be NULL to just remove
 * instances of @match.
 * Returns: the number of substitutions made.
 */
-unsigned int buf_replace_all(struct buf *buf, const char *match,
+EXPORTED int buf_replace_all(struct buf *buf, const char *match,
 			 const char *replace)
 {
- unsigned int n = 0;
+ int n = 0;
 int matchlen = strlen(match);
- int replacelen = (replace ? strlen(replace) : 0);
+ struct buf replace_buf = BUF_INITIALIZER;
+ size_t off;
 char *p;
 
+ buf_init_ro_cstr(&replace_buf, replace);
+
 /* we need buf to be a nul terminated string now please */
 buf_cstring(buf);
 
- p = buf->s;
- while ((p = strstr(p, match))) {
-	if (replacelen > matchlen) {
-	 /* string will need to expand */
-	 int dp = (p - buf->s);
-	 buf_ensure(buf, replacelen - matchlen);
-	 p = buf->s + dp;
-	}
-	if (matchlen != replacelen) {
-	 memmove(p+replacelen, p+matchlen,
-		 buf->len - (p - buf->s) - matchlen + replacelen + 1);
-	 buf->len += (replacelen - matchlen);
+ off = 0;
+ while ((p = strstr(buf->s + off, match))) {
+	off = (p - buf->s);
+	buf_replace_buf(buf, off, matchlen, &replace_buf);
+	n++;
+	off += replace_buf.len;
+ }
+
+ return n;
+}
+
+EXPORTED int buf_replace_char(struct buf *buf, char match, char replace)
+{
+ int n = 0;
+ size_t i;
+
+ /* we need writable, so may as well cstring it */
+ buf_writable_cstring(buf);
+
+ for (i = 0; i < buf->len; i++) {
+	if (buf->si == match) {
+	 buf->si = replace;
+	 n++;
 	}
-	if (replace)
-	 memcpy(p, replace, replacelen);
+ }
+
+ return n;
+}
+
+#ifdef ENABLE_REGEX
+/**
+ * Replace the first instance of the compiled regexp @preg
+ * in @buf with the string @replace, which may be NULL to just
+ * remove an instance of @preg. Does not support capture references
+ * in the replace text.
+ * Returns: the number of substitutions made (0 or 1)
+ */
+EXPORTED int buf_replace_one_re(struct buf *buf, const regex_t *preg,
+				const char *replace)
+{
+ struct buf replace_buf = BUF_INITIALIZER;
+ regmatch_t rm;
+
+ buf_init_ro_cstr(&replace_buf, replace);
+
+ /* we need buf to be a nul terminated string now please */
+ buf_cstring(buf);
+
+ if (!regexec(preg, buf->s, 1, &rm, 0)) {
+	buf_replace_buf(buf, rm.rm_so, rm.rm_eo - rm.rm_so, &replace_buf);
+	return 1;
+ }
+
+ return 0;
+}
+
+/**
+ * Replace all instances of the compiled regexp @preg in @buf
+ * with the string @replace, which may be NULL to just remove
+ * instances of @preg. Does not support capture references
+ * in the replace text.
+ * Returns: the number of substitutions made.
+ */
+EXPORTED int buf_replace_all_re(struct buf *buf, const regex_t *preg,
+				const char *replace)
+{
+ int n = 0;
+ struct buf replace_buf = BUF_INITIALIZER;
+ regmatch_t rm;
+ size_t off;
+
+ buf_init_ro_cstr(&replace_buf, replace);
+
+ /* we need buf to be a nul terminated string now please */
+ buf_cstring(buf);
+
+ off = 0;
+ while (!regexec(preg, buf->s + off, 1, &rm, (off ? REG_NOTBOL : 0))) {
+	buf_replace_buf(buf, off + rm.rm_so, rm.rm_eo - rm.rm_so, &replace_buf);
+	off += rm.rm_so + replace_buf.len;
 	n++;
-	p += replacelen;
 }
 
 return n;
 }
+#endif
+
+EXPORTED void buf_insert(struct buf *dst, unsigned int off, const struct buf *src)
+{
+ buf_replace_buf(dst, off, 0, src);
+}
+
+EXPORTED void buf_insertcstr(struct buf *dst, unsigned int off, const char *str)
+{
+ struct buf str_buf = BUF_INITIALIZER;
+ buf_init_ro_cstr(&str_buf, str);
+ buf_replace_buf(dst, off, 0, &str_buf);
+}
+
+EXPORTED void buf_insertmap(struct buf *dst, unsigned int off,
+			 const char *base, int len)
+{
+ struct buf map_buf = BUF_INITIALIZER;
+ buf_init_ro(&map_buf, base, len);
+ buf_replace_buf(dst, off, 0, &map_buf);
+}
+
+EXPORTED void buf_remove(struct buf *dst, unsigned int off, unsigned int len)
+{
+ struct buf empty_buf = BUF_INITIALIZER;
+ buf_replace_buf(dst, off, len, &empty_buf);
+}
 
 /*
 * Compare two struct bufs bytewise. Returns a number
 * like strcmp(), suitable for sorting e.g. with qsort(),
 */
-int buf_cmp(const struct buf *a, const struct buf *b)
+EXPORTED int buf_cmp(const struct buf *a, const struct buf *b)
 {
- unsigned len = MIN(a->len, b->len);
+ size_t len = MIN(a->len, b->len);
 int r = 0;
 
 if (len)
@@ -720,7 +1260,7 @@
 return r;
 }
 
-void buf_init(struct buf *buf)
+EXPORTED void buf_init(struct buf *buf)
 {
 buf->alloc = 0;
 buf->len = 0;
@@ -733,7 +1273,7 @@
 * setting buf->alloc=0 which indicates CoW is in effect, i.e. the data
 * pointed to needs to be copied should it ever be modified.
 */
-void buf_init_ro(struct buf *buf, const char *base, int len)
+EXPORTED void buf_init_ro(struct buf *buf, const char *base, size_t len)
 {
 buf->alloc = 0;
 buf->len = len;
@@ -741,25 +1281,114 @@
 buf->s = (char *)base;
 }
 
-void buf_free(struct buf *buf)
+/*
+ * Initialise a struct buf to point to writable data at 'base', which
+ * must be a malloc()ed allocation at least 'len' bytes long and is
+ * taken over by the struct buf.
+ */
+EXPORTED void buf_initm(struct buf *buf, char *base, int len)
+{
+ buf->alloc = buf->len = len;
+ buf->flags = 0;
+ buf->s = base;
+}
+
+/*
+ * Initialise a struct buf to point to a read-only C string.
+ */
+EXPORTED void buf_init_ro_cstr(struct buf *buf, const char *str)
+{
+ buf->alloc = 0;
+ buf->len = (str ? strlen(str) : 0);
+ buf->flags = (str ? BUF_CSTRING : 0);
+ buf->s = (char *)str;
+}
+
+/*
+ * Initialise a struct buf to point to a read-only mmap()ing.
+ * This buf is CoW, and if written to the data will be freed
+ * using map_free().
+ */
+EXPORTED void buf_init_mmap(struct buf *buf, int onceonly, int fd,
+			 const char *fname, size_t size, const char *mboxname)
+{
+ buf->flags = BUF_MMAP;
+ map_refresh(fd, onceonly, (const char **)&buf->s, &buf->len,
+		size, fname, mboxname);
+}
+
+static void _buf_free_data(struct buf *buf)
 {
 if (buf->alloc)
 	free(buf->s);
+ else if (buf->flags & BUF_MMAP) {
+	const char *base = buf->s;
+	size_t len = buf->len;
+	map_free(&base, &len);
+ }
+}
+
+EXPORTED void buf_free(struct buf *buf)
+{
+ _buf_free_data(buf);
 buf->alloc = 0;
 buf->s = NULL;
 buf->len = 0;
 buf->flags = 0;
 }
 
-void buf_move(struct buf *dst, struct buf *src)
+EXPORTED void buf_move(struct buf *dst, struct buf *src)
 {
- if (dst->alloc)
-	free(dst->s);
+ _buf_free_data(dst);
 *dst = *src;
 buf_init(src);
 }
 
-char *strconcat(const char *s1, ...)
+EXPORTED int buf_findchar(const struct buf *buf, unsigned int off, int c)
+{
+ const char *p;
+
+ if (off < buf->len && (p = memchr(buf->s + off, c, buf->len - off)))
+	return (p - buf->s);
+ return -1;
+}
+
+/*
+ * Find (the first line in) 'line' in the buffer 'buf'. The found text
+ * will be a complete line, i.e. bounded by either \n newlines or by the
+ * edges of 'buf'. Returns the byte index into 'buf' of the found text,
+ * or -1 if not found.
+ */
+EXPORTED int buf_findline(const struct buf *buf, const char *line)
+{
+ int linelen;
+ const char *p;
+ const char *end = buf->s + buf->len;
+
+ if (!line) return -1;
+
+ /* find the length of the first line in the text at 'line' */
+ p = strchr(line, '\n');
+ linelen = (p ? (size_t)(p - line) : strlen(line));
+ if (linelen == 0) return -1;
+
+ for (p = buf->s ;
+	 (p = (const char *)memmem(p, end-p, line, linelen)) != NULL ;
+	 p++) {
+
+	/* check the found string is at line boundaries */
+	if (p > buf->s && p-1 != '\n')
+	 continue;
+	if ((p+linelen) < end && plinelen != '\n')
+	 continue;
+
+	return (p - buf->s);
+ }
+
+ return -1;
+}
+
+EXPORTED char *strconcat(const char *s1, ...)
 {
 int sz = 1;	/* 1 byte for the trailing NUL */
 const char *s;
@@ -792,3 +1421,218 @@
 
 return buf;
 }
+
+EXPORTED int bin_to_hex(const void *bin, size_t binlen, char *hex, int flags)
+{
+ const unsigned char *v = bin;
+ char *p = hex;
+ size_t i;
+ const char *xd = (flags & BH_UPPER ? "0123456789ABCDEF" : "0123456789abcdef");
+ char sep = _BH_GETSEP(flags);
+
+ for (i = 0; i < binlen; i++, v++) {
+	if (i && sep)
+	 *p++ = sep;
+ *p++ = xd(*v >> 4) & 0xf;
+ *p++ = xd*v & 0xf;
+ }
+ *p = '\0';
+
+ return p-hex;
+}
+
+EXPORTED int hex_to_bin(const char *hex, size_t hexlen, void *bin)
+{
+ unsigned char *v = bin, msn, lsn;
+ const char *p = hex;
+ size_t i;
+
+ if (hex == NULL)
+	return -1;
+ if (hexlen == 0)
+	hexlen = strlen(hex);
+ if (hexlen % 2)
+	return -1;
+ hexlen /= 2;
+
+ for (i = 0 ; i < hexlen ; i++) {
+	msn = unxdigit(*p++) & 0x7f;
+	if (msn == 0xff)
+	 return -1;
+	lsn = unxdigit(*p++) & 0x7f;
+	if (lsn == 0xff)
+	 return -1;
+	*v++ = (msn << 4) | lsn;
+ }
+
+ return (unsigned char *)v - (unsigned char *)bin;
+}
+
+#ifdef HAVE_ZLIB
+
+/* Wrappers for our memory management functions */
+static voidpf zalloc(voidpf opaque __attribute__((unused)),
+		 uInt items, uInt size)
+{
+ return (voidpf) xmalloc(items * size);
+}
+
+static void zfree(voidpf opaque __attribute__((unused)),
+		 voidpf address)
+{
+ free(address);
+}
+
+EXPORTED int buf_inflate(struct buf *src, int scheme)
+{
+ struct buf localbuf = BUF_INITIALIZER;
+ int zr = Z_OK;
+ z_stream *zstrm = (z_stream *) xmalloc(sizeof(z_stream));
+ int windowBits;
+
+ switch (scheme) {
+ case DEFLATE_RAW:
+	windowBits = -MAX_WBITS;	/* raw deflate */
+	break;
+
+ case DEFLATE_GZIP:
+	windowBits = 16+MAX_WBITS;	/* gzip header */
+	break;
+
+ case DEFLATE_ZLIB:
+ default:
+	windowBits = MAX_WBITS;		/* zlib header */
+	break;
+ }
+
+ zstrm->zalloc = zalloc;
+ zstrm->zfree = zfree;
+ zstrm->opaque = Z_NULL;
+
+ zstrm->next_in = Z_NULL;
+ zstrm->avail_in = 0;
+ zr = inflateInit2(zstrm, windowBits);
+ if (zr != Z_OK) goto err;
+
+ /* set up the source */
+ zstrm->next_in = (unsigned char *)src->s;
+ zstrm->avail_in = src->len;
+
+ /* prepare the destination */
+ do {
+	buf_ensure(&localbuf, 4096);
+	/* find the buffer */
+	zstrm->next_out = (unsigned char *)localbuf.s + localbuf.len;
+	zstrm->avail_out = localbuf.alloc - localbuf.len;
+	zr = inflate(zstrm, Z_SYNC_FLUSH);
+	if (!(zr == Z_OK || zr == Z_STREAM_END || zr == Z_BUF_ERROR))
+	 goto err;
+	localbuf.len = localbuf.alloc - zstrm->avail_out;
+ } while (zstrm->avail_out == 0);
+
+ inflateEnd(zstrm);
+ free(zstrm);
+
+ buf_free(src); /* dispose of current buffer */
+ *src = localbuf; /* in place replace */
+ return 0;
+
+ err:
+ free(zstrm);
+ buf_free(&localbuf);
+ return -1;
+}
+
+EXPORTED int buf_deflate(struct buf *src, int compLevel, int scheme)
+{
+ struct buf localbuf = BUF_INITIALIZER;
+ int zr = Z_OK;
+ z_stream *zstrm = (z_stream *) xmalloc(sizeof(z_stream));
+ int windowBits;
+
+ switch (scheme) {
+ case DEFLATE_RAW:
+	windowBits = -MAX_WBITS;	/* raw deflate */
+	break;
+
+ case DEFLATE_GZIP:
+	windowBits = 16+MAX_WBITS;	/* gzip header */
+	break;
+
+ case DEFLATE_ZLIB:
+ default:
+	windowBits = MAX_WBITS;		/* zlib header */
+	break;
+ }
+
+ zstrm->zalloc = zalloc;
+ zstrm->zfree = zfree;
+ zstrm->opaque = Z_NULL;
+
+ zr = deflateInit2(zstrm, compLevel, Z_DEFLATED, windowBits,
+		 MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+ if (zr != Z_OK) goto err;
+
+ /* set up the source */
+ zstrm->next_in = (unsigned char *)src->s;
+ zstrm->avail_in = src->len;
+
+ /* prepare the destination */
+ do {
+	buf_ensure(&localbuf, 4096);
+	/* find the buffer */
+	zstrm->next_out = (unsigned char *)localbuf.s + localbuf.len;
+	zstrm->avail_out = localbuf.alloc - localbuf.len;
+	zr = deflate(zstrm, Z_SYNC_FLUSH);
+	if (!(zr == Z_OK || zr == Z_STREAM_END || zr == Z_BUF_ERROR))
+	 goto err;
+	localbuf.len = localbuf.alloc - zstrm->avail_out;
+ } while (zstrm->avail_out == 0);
+
+ deflateEnd(zstrm);
+ free(zstrm);
+
+ buf_free(src); /* dispose of current buffer */
+ *src = localbuf; /* in place replace */
+ return 0;
+
+ err:
+ free(zstrm);
+ buf_free(&localbuf);
+ return -1;
+}
+
+#endif
+
+/*
+ * Warm up a file, by beginning background readahead. @offset and
+ * @length define a subset of the file to be warmed; @length = 0 means
+ * to the end of the file. Returns a UNIX errno or 0 on success. No
+ * error is reported if the file is missing or the kernel doesn't have
+ * the magic system call.
+ *
+ * Returns zero on success or an error code (system error code).
+ */
+EXPORTED int warmup_file(const char *filename,
+		 off_t offset, off_t length)
+{
+ int fd;
+ int r;
+
+ fd = open(filename, O_RDONLY, 0);
+ if (fd < 0) return errno;
+
+ /* Note, posix_fadvise() returns its error code rather than
+ * setting errno. Unlike every other system call including
+ * others defined in the same standard by the same committee. */
+ r = posix_fadvise(fd, offset, length, POSIX_FADV_WILLNEED);
+
+ /* posix_fadvise(WILLNEED) on Linux will return an EINVAL error
+ * if the file is on tmpfs, even though this effectively means
+ * the file's bytes are all already available in RAM. Duh. */
+ if (r == EINVAL) r = 0;
+
+ close(fd);
+
+ return r;
+}

cyrus-imapd-2.4.17.tar.gz/lib/util.h -> cyrus-imapd-2.5.tar.gz/lib/util.h Changed

@@ -39,8 +39,6 @@
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * $Id: util.h,v 1.28 2010/06/28 12:06:44 brong Exp $
- *
 * Author: Chris Newman
 * Start Date: 4/6/93
 */
@@ -49,9 +47,24 @@
 #define INCLUDED_UTIL_H
 
 #include <config.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdio.h>
+
+#ifdef ENABLE_REGEX
+# ifdef HAVE_PCREPOSIX_H
+# include <pcre.h>
+# include <pcreposix.h>
+# else /* !HAVE_PCREPOSIX_H */
+# ifdef HAVE_RXPOSIX_H
+# include <rxposix.h>
+# else /* !HAVE_RXPOSIX_H */
+# include <regex.h>
+# endif /* HAVE_RXPOSIX_H */
+# endif /* HAVE_PCREPOSIX_H */
+#endif /* ENABLE_REGEX */
 
 #define BIT32_MAX 4294967295U
 
@@ -65,16 +78,12 @@
 #error dont know what to use for bit32
 #endif
 
-#ifdef HAVE_LONG_LONG_INT
+typedef int compar_t(const void *a, const void *b);
+
 typedef unsigned long long int bit64;
 typedef unsigned long long int modseq_t;
 #define MODSEQ_FMT "%llu"
 #define atomodseq_t(s) strtoull(s, NULL, 10)
-#else
-typedef unsigned long int modseq_t;
-#define MODSEQ_FMT "%lu"
-#define atomodseq_t(s) strtoul(s, NULL, 10)
-#endif
 
 #define Uisalnum(c) isalnum((int)((unsigned char)(c)))
 #define Uisalpha(c) isalpha((int)((unsigned char)(c)))
@@ -89,8 +98,12 @@
 extern const unsigned char convert_to_lowercase256;
 extern const unsigned char convert_to_uppercase256;
 
+#ifndef TOUPPER
 #define TOUPPER(c) (convert_to_uppercase(unsigned char)(c))
+#endif
+#ifndef TOLOWER
 #define TOLOWER(c) (convert_to_lowercase(unsigned char)(c))
+#endif
 
 #ifndef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
@@ -99,6 +112,9 @@
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
+/* Calculate the number of entries in a vector */
+#define VECTOR_SIZE(vector) (sizeof(vector)/sizeof(vector0))
+
 typedef struct keyvalue {
 char *key, *value;
 } keyvalue;
@@ -112,14 +128,7 @@
 extern char *ucase (char *str);
 
 /* clean up control characters in a string while copying it
- * returns pointer to end of dst string.
- * dst must have twice the length of source
- */
-extern char *beautify_copy (char *dst, const char *src);
-
-/* clean up control characters in a string while copying it
 * returns pointer to a static buffer containing the cleaned-up version
- * returns NULL on malloc() error
 */
 extern char *beautify_string (const char *src);
 
@@ -129,6 +138,8 @@
 /* Same semantics as strcasecmp() but gracefully handles
 * either or both it's arguments being NULL */
 int strcasecmpsafe(const char *a, const char *b);
+/* ditto strncmp */
+int strncmpsafe(const char *a, const char *b, size_t n);
 
 /* do a binary search in a keyvalue array
 * nelem is the number of keyvalue elements in the kv array
@@ -144,6 +155,12 @@
 * of the name.
 */
 extern int dir_hash_c(const char *name, int full);
+/*
+ * Like dir_hash_c() but builds the result as a single-byte
+ * C string in the provided buffer, and returns the buffer,
+ * which is sometimes more convenient.
+ */
+extern char *dir_hash_b(const char *name, int full, char buf2);
 
 /* 
 * create an unlinked temporary file and return the file descriptor.
@@ -154,72 +171,115 @@
 extern int cyrus_close_sock(int fd);
 
 /* Reset stdin/stdout/stderr */
-extern void cyrus_reset_stdio();
+extern void cyrus_reset_stdio(void);
 
 /* Create all parent directories for the given path,
 * up to but not including the basename.
 */
 extern int cyrus_mkdir(const char *path, mode_t mode);
 
-extern int become_cyrus(void);
+enum {
+ COPYFILE_NOLINK = (1<<0),
+ COPYFILE_MKDIR = (1<<1),
+ COPYFILE_RENAME = (1<<2)
+};
+
+extern int cyrus_copyfile(const char *from, const char *to, int flags);
+
+enum {
+ BEFORE_SETUID,
+ AFTER_SETUID,
+ BEFORE_BIND,
+ AFTER_BIND,
+ AFTER_FORK
+};
+
+extern int set_caps(int stage, int is_master);
+extern int become_cyrus(int is_master);
 
 /* Some systems have very inefficient implementations of isdigit,
 * and we use it in a lot of inner loops
 */
 
 #define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
-extern int parseint32(const char *p, const char **ptr, int32_t *res);
-extern int parseuint32(const char *p, const char **ptr, uint32_t *res);
+int parseint32(const char *p, const char **ptr, int32_t *res);
+int parseuint32(const char *p, const char **ptr, uint32_t *res);
+int parsenum(const char *p, const char **ptr, int maxlen, bit64 *res);
+int parsehex(const char *p, const char **ptr, int maxlen, bit64 *res);
 
 /* Timing related funcs/vars */
 extern void cmdtime_settimer(int enable);
-extern void cmdtime_starttimer();
+extern void cmdtime_starttimer(void);
 extern void cmdtime_endtimer(double * cmdtime, double * nettime);
-extern void cmdtime_netstart();
-extern void cmdtime_netend();
+extern void cmdtime_netstart(void);
+extern void cmdtime_netend(void);
+extern double timeval_get_double(const struct timeval *tv);
+extern void timeval_set_double(struct timeval *tv, double d);
+extern void timeval_add_double(struct timeval *tv, double delta);
+extern double timesub(const struct timeval *start, const struct timeval *end);
 
+extern clock_t sclock(void);
 
-#define BUF_CSTRING 1
+#define BUF_CSTRING (1<<0)
+#define BUF_MMAP (1<<1)
 
 struct buf {
 char *s;
- unsigned len;
- unsigned alloc;
- int flags;
+ size_t len;
+ size_t alloc;
+ unsigned flags;
 };
 #define BUF_INITIALIZER	{ NULL, 0, 0, 0 }
 
 const char *buf_cstring(struct buf *buf);
-void buf_ensure(struct buf *buf, int morebytes);
-void buf_getmap(struct buf *buf, const char **base, int *len);
-unsigned buf_len(const struct buf *buf);
+const char *buf_cstringnull(struct buf *buf);
+char *buf_release(struct buf *buf);
+char *buf_releasenull(struct buf *buf);
+void buf_ensure(struct buf *buf, size_t morebytes);
+void buf_getmap(struct buf *buf, const char **base, size_t *len);
+int buf_getline(struct buf *buf, FILE *fp);
+size_t buf_len(const struct buf *buf);
+const char *buf_base(const struct buf *buf);
 void buf_reset(struct buf *buf);
-void buf_truncate(struct buf *buf, unsigned int len);
+void buf_truncate(struct buf *buf, size_t len);
 void buf_setcstr(struct buf *buf, const char *str);
-void buf_setmap(struct buf *buf, const char *base, int len);
+void buf_setmap(struct buf *buf, const char *base, size_t len);
 void buf_copy(struct buf *dst, const struct buf *src);
 void buf_append(struct buf *dst, const struct buf *src);
 void buf_appendcstr(struct buf *buf, const char *str);
 void buf_appendbit32(struct buf *buf, bit32 num);
-void buf_appendmap(struct buf *buf, const char *base, int len);
+void buf_appendmap(struct buf *buf, const char *base, size_t len);
+void buf_cowappendmap(struct buf *buf, const char *base, unsigned int len);
+void buf_cowappendfree(struct buf *buf, char *base, unsigned int len);
+void buf_insert(struct buf *dst, unsigned int off, const struct buf *src);
+void buf_insertcstr(struct buf *buf, unsigned int off, const char *str);
+void buf_insertmap(struct buf *buf, unsigned int off, const char *base, int len);
 void buf_putc(struct buf *buf, char c);
+void buf_vprintf(struct buf *buf, const char *fmt, va_list args);
 void buf_printf(struct buf *buf, const char *fmt, ...)
- __attribute__((format(printf,2,3)));
-unsigned int buf_replace_all(struct buf *buf, const char *match,
-			 const char *replace);
+	 __attribute__((format(printf,2,3)));
+int buf_replace_all(struct buf *buf, const char *match,
+		 const char *replace);
+int buf_replace_char(struct buf *buf, char match, char replace);
+#ifdef ENABLE_REGEX
+int buf_replace_all_re(struct buf *buf, const regex_t *,
+		 const char *replace);
+int buf_replace_one_re(struct buf *buf, const regex_t *,
+		 const char *replace);
+#endif
+void buf_remove(struct buf *buf, unsigned int off, unsigned int len);
 int buf_cmp(const struct buf *, const struct buf *);
+int buf_findchar(const struct buf *, unsigned int off, int c);
+int buf_findline(const struct buf *buf, const char *line);
 void buf_init(struct buf *buf);
-void buf_init_ro(struct buf *buf, const char *base, int len);
+void buf_init_ro(struct buf *buf, const char *base, size_t len);
+void buf_initm(struct buf *buf, char *base, int len);
+void buf_init_ro_cstr(struct buf *buf, const char *str);
+void buf_init_mmap(struct buf *buf, int onceonly, int fd,
+		 const char *fname, size_t size, const char *mboxname);
 void buf_free(struct buf *buf);
 void buf_move(struct buf *dst, struct buf *src);
 
-/* use getpassphrase on machines which support it */
-#ifdef HAVE_GETPASSPHRASE
-#define cyrus_getpass getpassphrase
-#else
-#define cyrus_getpass getpass
-#endif
-
 /*
 * Given a list of strings, terminated by (char *)NULL,
 * return a newly allocated string containing the
@@ -231,4 +291,59 @@
 */
 char *strconcat(const char *s1, ...);
 
+#define BH_LOWER	 (0)
+#define BH_UPPER	 (1<<8)
+#define _BH_SEP		 (1<<9)
+#define BH_SEPARATOR(c)	 (_BH_SEP|((c)&0x7f))
+#define _BH_GETSEP(flags) (flags & _BH_SEP ? (char)(flags & 0x7f) : '\0')
+int bin_to_hex(const void *bin, size_t binlen, char *hex, int flags);
+int hex_to_bin(const char *hex, size_t hexlen, void *bin);
+
+/* use getpassphrase on machines which support it */
+#ifdef HAVE_GETPASSPHRASE
+#define cyrus_getpass getpassphrase
+#else
+#define cyrus_getpass getpass
+#endif
+
+#ifdef HAVE_ZLIB
+enum {
+ DEFLATE_RAW,
+ DEFLATE_GZIP,
+ DEFLATE_ZLIB
+};
+
+int buf_inflate(struct buf *buf, int scheme);
+int buf_deflate(struct buf *buf, int compLevel, int scheme);
+#endif
+
+/* A wrapper for close() which handles the fd=-1 case cleanly.
+ * The argument may have side effects and must be an lvalue */
+#define xclose(fd) \
+ do { \
+	int *_fdp = &(fd); \
+	if (*_fdp >= 0) { \
+	 close(*_fdp); \
+	 *_fdp = -1; \
+	} \
+ } while(0)
+
+/* A wrapper for strncpy() which ensures that the destination
+ * string is always NUL-terminated. Yes, I know we have an
+ * implementation of the BSD strlcpy() which has this semantic,
+ * but that isn't a highly optimised libc or compiler provided
+ * function like strncpy(), and we can trivially and eficiently
+ * add the NUL termination semantic on top of strncpy(). */
+#define xstrncpy(d, s, n) \
+ do { \
+	char *_d = (d); \
+	size_t _n = (n); \
+	strncpy(_d, (s), _n); \
+	_d_n-1 = '\0'; \
+ } while(0)
+
+/* simple function to request a file gets pre-loaded by the OS */
+int warmup_file(const char *filename, off_t offset, off_t length);
+
 #endif /* INCLUDED_UTIL_H */
+

cyrus-imapd-2.4.17.tar.gz/lib/wildmat.c -> cyrus-imapd-2.5.tar.gz/lib/wildmat.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: wildmat.c,v 1.4 2010/01/06 17:01:47 murch Exp $
 */
 
 /*
@@ -80,8 +78,12 @@
 ** on.
 */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 
+#include "config.h"
+#include "wildmat.h"
+#include "xmalloc.h"
 
 
 #define TRUE			1
@@ -163,7 +165,7 @@
 /*
 ** User-level routine. Returns TRUE or FALSE.
 */
-int wildmat(const char *text, const char *p)
+EXPORTED int wildmat(const char *text, const char *p)
 {
 #ifdef	OPTIMIZE_JUST_STAR
 if (p0 == '*' && p1 == '\0')
@@ -211,3 +213,54 @@
 /* NOTREACHED */
 }
 #endif	/* defined(TEST) */
+
+
+
+EXPORTED struct wildmat *split_wildmats(char *str, const char *prefix)
+{
+ char pattern1024 = "", *p, *c;
+ struct wildmat *wild = NULL;
+ int n = 0;
+
+ if (prefix) snprintf(pattern, sizeof(pattern), "%s.", prefix);
+ p = pattern + strlen(pattern);
+
+ /*
+ * split the list of wildmats
+ *
+ * we split them right to left because this is the order in which
+ * we want to test them (per RFC3977 section 4.2)
+ */
+ do {
+	if ((c = strrchr(str, ',')))
+	 *c++ = '\0';
+	else
+	 c = str;
+
+	if (!(n % 10)) /* alloc some more */
+	 wild = xrealloc(wild, (n + 11) * sizeof(struct wildmat));
+
+	if (*c == '!') wildn.not = 1;		/* not */
+	else if (*c == '@') wildn.not = -1;	/* absolute not (feeding) */
+	else wildn.not = 0;
+
+	strncpy(p, wildn.not ? c + 1 : c, pattern+sizeof(pattern) - p);
+	patternsizeof(pattern)-1 = '\0';
+
+	wildn++.pat = xstrdup(pattern);
+ } while (c != str);
+ wildn.pat = NULL;
+
+ return wild;
+}
+
+EXPORTED void free_wildmats(struct wildmat *wild)
+{
+ struct wildmat *w = wild;
+
+ while (w->pat) {
+	free(w->pat);
+	w++;
+ }
+ free(wild);
+}

cyrus-imapd-2.4.17.tar.gz/lib/wildmat.h -> cyrus-imapd-2.5.tar.gz/lib/wildmat.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/xmalloc.c -> cyrus-imapd-2.5.tar.gz/lib/xmalloc.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: xmalloc.c,v 1.33 2010/01/06 17:01:47 murch Exp $
 */
 
 #include <config.h>
@@ -50,7 +48,7 @@
 
 #include "exitcodes.h"
 
-void* xmalloc(unsigned size)
+EXPORTED void* xmalloc(unsigned size)
 {
 void *ret;
 
@@ -61,7 +59,7 @@
 return 0; /*NOTREACHED*/
 }
 
-void* xzmalloc(unsigned size)
+EXPORTED void* xzmalloc(unsigned size)
 {
 void *ret;
 
@@ -75,7 +73,12 @@
 return 0; /*NOTREACHED*/
 }
 
-void *xrealloc (void* ptr, unsigned size)
+EXPORTED void *xcalloc(unsigned nmemb, unsigned size)
+{
+ return xzmalloc(nmemb * size);
+}
+
+EXPORTED void *xrealloc (void* ptr, unsigned size)
 {
 void *ret;
 
@@ -87,17 +90,36 @@
 return 0; /*NOTREACHED*/
 }
 
-char *xstrdup(const char* str)
+EXPORTED char *xstrdup(const char* str)
 {
 char *p = xmalloc(strlen(str)+1);
 strcpy(p, str);
 return p;
 }
 
-char *xstrndup(const char* str, unsigned len)
+/* return a malloced "" if NULL is passed */
+EXPORTED char *xstrdupsafe(const char *str)
+{
+ return str ? xstrdup(str) : xstrdup("");
+}
+
+/* return NULL if NULL is passed */
+EXPORTED char *xstrdupnull(const char *str)
+{
+ return str ? xstrdup(str) : NULL;
+}
+
+EXPORTED char *xstrndup(const char* str, unsigned len)
 {
 char *p = xmalloc(len+1);
- strncpy(p, str, len);
+ if (len) strncpy(p, str, len);
 plen = '\0';
 return p;
 }
+
+EXPORTED void *xmemdup(const void *ptr, unsigned size)
+{
+ void *p = xmalloc(size);
+ memcpy(p, ptr, size);
+ return p;
+}

cyrus-imapd-2.4.17.tar.gz/lib/xmalloc.h -> cyrus-imapd-2.5.tar.gz/lib/xmalloc.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/xstrlcat.c -> cyrus-imapd-2.5.tar.gz/lib/xstrlcat.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/xstrlcat.h -> cyrus-imapd-2.5.tar.gz/lib/xstrlcat.h Changed

cyrus-imapd-2.4.17.tar.gz/lib/xstrlcpy.c -> cyrus-imapd-2.5.tar.gz/lib/xstrlcpy.c Changed

cyrus-imapd-2.4.17.tar.gz/lib/xstrlcpy.h -> cyrus-imapd-2.5.tar.gz/lib/xstrlcpy.h Changed

cyrus-imapd-2.5.tar.gz/libcyrus.pc.in Added

cyrus-imapd-2.5.tar.gz/libcyrus_min.pc.in Added

cyrus-imapd-2.5.tar.gz/libcyrus_sieve.pc.in Added

cyrus-imapd-2.4.17.tar.gz/man/arbitron.8 -> cyrus-imapd-2.5.tar.gz/man/arbitron.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/chk_cyrus.8 -> cyrus-imapd-2.5.tar.gz/man/chk_cyrus.8 Changed

cyrus-imapd-2.5.tar.gz/man/ctl_conversationsdb.8 Added

@@ -0,0 +1,134 @@
+.\" -*- nroff -*-
+.TH CTL_CONVERSATIONSDB 8 "Project Cyrus" CMU
+.\"
+.\" Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in
+.\" the documentation and/or other materials provided with the
+.\" distribution.
+.\"
+.\" 3. The name "Carnegie Mellon University" must not be used to
+.\" endorse or promote products derived from this software without
+.\" prior written permission. For permission or any legal
+.\" details, please contact
+.\" Carnegie Mellon University
+.\" Center for Technology Transfer and Enterprise Creation
+.\" 4615 Forbes Avenue
+.\" Suite 302
+.\" Pittsburgh, PA 15213
+.\" (412) 268-7393, fax: (412) 268-7395
+.\" innovation@andrew.cmu.edu
+.\" 4. Redistributions of any form whatsoever must retain the following
+.\" acknowledgment:
+.\" "This product includes software developed by Computing Services
+.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+.\"
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.SH NAME
+ctl_conversationsdb \- perform operations on the conversations databases
+.SH SYNOPSIS
+\fBctl_conversationsdb\fP \fB-C\fP \fIconfig-file\fP \fB-d\fR
+\fIuserid\fR > \fItext\fP
+.br
+\fBctl_conversationsdb\fP \fB-C\fP \fIconfig-file\fP \fB-u\fR
+\fIuserid\fR < \fItext\fP
+.br
+\fBctl_conversationsdb\fP \fB-C\fP \fIconfig-file\fP \fB-v\fR 
+ \fB-z\fR | \fB-b\fR | \fB-R\fR \fIuserid\fR
+.br
+\fBctl_conversationsdb\fP \fB-C\fP \fIconfig-file\fP \fB-v\fR 
+ \fB-z\fR | \fB-b\fR | \fB-R\fR \fB-r\fR
+.SH DESCRIPTION
+.B Ctl_conversationsdb
+is used to perform various administrative operations on a
+conversations database and associated information in \fIcyrus.index\fR
+files.
+.PP
+.B Ctl_conversationsdb
+reads its configuration options out of the
+.IR imapd.conf (5)
+file unless specified otherwise by \fB-C\fR.
+The
+.I configdirectory
+option is used to determine the default location of the conversations database.
+.PP
+In the first synopsis, the \fB-d\fP option dumps the contents of a
+conversations database to standard output in an ASCII format. In the
+second synopsis, the resulting \fIfile\fP is fed back in, using the
+\fB-u\fP option to "undump" from standard input. This pair of commands
+is useful for disaster recovery, or for changing the backend used to
+store the conversations database.
+.PP
+The third synopsis is used to reconstruct conversations information
+in various ways for a specific user, and the fourth to reconstruct
+conversations information for all users. See
+.SM OPTIONS
+below for details.
+.SH OPTIONS
+.TP
+.BI \-C\ "config-file"
+Read configuration options from \fIconfig-file\fR.
+.TP
+.B \-d
+Dump the conversations database which corresponds to the user \fIuserid\fR
+to standard output in an ASCII format. The resulting file can be used
+to recreate a database using the \fB-u\fR option.
+.TP
+.B \-u
+"Undumps" the conversations database corresponding to the user \fIuserid\fR,
+i.e. replaces all the entries with data from ASCII records parsed from
+standard input. The output from the \fB-d\fR option can be used as
+input.
+.TP
+.B \-v
+Be more verbose when running.
+.TP
+.B \-r
+Be recursive; apply the main operation to every user. Warning: do not
+combine with \fB-u\fP, it will not do what you expect.
+.TP
+.B \-z
+Remove all conversation information from the conversations database
+for user \fIuserid\fP, and from all the user's mailboxes. The
+information can all be recalculated (eventually) from message headers,
+using the \fB-b\fP option.
+.TP
+.B \-b
+Rebuild all conversation information in the conversations database
+for user \fIuserid\fP, and in all the user's mailboxes, from the header
+information in messages. Does not affect messages which already have
+conversation information.
+.IP
+This is a bulk mode version of what happens
+to each message when it arrives, and can be used to add missing
+conversation information for past messages, e.g. after using \fB-z\fP or
+after upgrading Cyrus from older versions. Note: this operation uses
+information from \fIcyrus.cache\fP files so it does not need to read
+every single message file.
+.TP
+.B \-R
+Recalculate counts of messages stored in existing conversations in the
+conversations database for user \fIuserid\fP. This is a limited subset
+of \fB-b\fP; in particular it does not create conversations or assign
+messages to conversations.
+.SH FILES
+.TP
+.B /etc/imapd.conf
+.SH SEE ALSO
+.PP
+\fBimapd.conf(5)\fR, \fBmaster(8)\fR

cyrus-imapd-2.4.17.tar.gz/man/ctl_cyrusdb.8 -> cyrus-imapd-2.5.tar.gz/man/ctl_cyrusdb.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/ctl_deliver.8 -> cyrus-imapd-2.5.tar.gz/man/ctl_deliver.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/ctl_mboxlist.8 -> cyrus-imapd-2.5.tar.gz/man/ctl_mboxlist.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/cvt_cyrusdb.8 -> cyrus-imapd-2.5.tar.gz/man/cvt_cyrusdb.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/cyr_dbtool.8 -> cyrus-imapd-2.5.tar.gz/man/cyr_dbtool.8 Changed

@@ -26,7 +26,7 @@
 .\" Pittsburgh, PA 15213
 .\" (412) 268-7393, fax: (412) 268-7395
 .\" innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\" acknowledgment:
 .\" "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: cyr_dbtool.8,v 1.5 2010/01/06 17:01:51 murch Exp $
 .SH NAME
 cyr_dbtool \- manage Cyrus databases
 .SH SYNOPSIS
@@ -52,6 +50,12 @@
 
 .B \-n
 
+
+.B \-o
+
+
+.B \-T
+
 <db file> <db backend> <action>
 
 <key>
@@ -73,6 +77,8 @@
 .PP
 .BI consistency
 .PP
+.BI repack
+.PP
 You may omit key or key/value and specify one per line on stdin. Keys are
 terminated by tab or newline, values are terminated by newline.
 .PP
@@ -82,6 +88,9 @@
 The 'consistency' command runs a consistency check on the DB by calling
 'myconsistent' on it.
 .PP
+The 'repack' command will compress the database by removing stale data
+on backends which support it. It's a NOOP otherwise.
+.PP
 .I cyr_dbtool
 reads any applicable configuration options out of the
 .IR imapd.conf (5)
@@ -95,6 +104,14 @@
 .TP
 .BI \-n
 Create the database file if it doesn't already exist.
+.TP
+.BI \-o
+Store all the output in memory and only print it once the transaction
+is completed.
+.TP
+.BI \-T
+Use a transaction to do the action (most especially for 'show') - the
+default used to be transactions.
 .SH FILES
 .TP
 .B /etc/imapd.conf

cyrus-imapd-2.5.tar.gz/man/cyr_deny.8 Added

@@ -0,0 +1,103 @@
+.\" -*- nroff -*-
+.TH CYR_DENY 8 "Project Cyrus" CMU
+.\"
+.\" Copyright (c) 1994-2012 Carnegie Mellon University.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. The name "Carnegie Mellon University" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For permission or any legal
+.\"    details, please contact
+.\"      Carnegie Mellon University
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation@andrew.cmu.edu
+.\" 4. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by Computing Services
+.\"     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+.\"
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.SH NAME
+cyr_deny \- deny users access to Cyrus services
+.SH SYNOPSIS
+.B cyr_deny
+
+.B \-C
+.I config-file
+ 
+.B \-s
+.I services
+ 
+.B \-m
+.I message
+
+.I user
+.br
+.B cyr_deny
+
+.B \-C
+.I config-file
+
+.B -a
+.I user
+.br
+.B cyr_deny
+
+.B \-C
+.I config-file
+
+.B -l
+.SH DESCRIPTION
+.I cyr_deny
+is used to deny individual users access to Cyrus services.  The first
+synopsis denies user \fIuser\fP access to Cyrus services, the second
+synopsis allows access again.  \fBcyr_deny\fP works by adding an entry to
+the Cyrus deny database; the third synopsis lists the entries in
+the database.
+.SH OPTIONS
+.TP
+.BI \-C " config-file"
+Read configuration options from \fIconfig-file\fR.
+.TP
+.B \-a
+Allow access to all services for user \fIuser\fP (remove any entry
+from the deny database).
+.TP
+.BI \-s " services"
+Deny access only to the given \fIservices\fP, which is a comma-separated
+list of wildcard patterns.  The default is "*" which denies access to
+all services.
+.TP
+.B \-l
+List the entries in the deny database.
+.TP
+.BI \-m " message"
+Provide a message which is sent to the user to explain why access is
+being denied.  A default message is used if none is specified.
+.SH FILES
+.TP
+.B /etc/imapd.conf
+.SH SEE ALSO
+.PP
+\fBimapd.conf(5)\fR

cyrus-imapd-2.4.17.tar.gz/man/cyr_df.8 -> cyrus-imapd-2.5.tar.gz/man/cyr_df.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/cyr_expire.8 -> cyrus-imapd-2.5.tar.gz/man/cyr_expire.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: cyr_expire.8,v 1.10 2010/01/06 17:01:51 murch Exp $
 .SH NAME
 cyr_expire \- expire messages and duplicate delivery database entries
 .SH SYNOPSIS
@@ -50,47 +48,86 @@
 .I config-file
 
 
-.BI \-D " delete-days"
+.BI \-A " archive-duration"
 
+
+.BI \-D " delete-duration"
+
+
 .BI \-E " expire-duration"
+
+
+.BI \-X " expunge-duration"
+
 
-.BI \-X " expunge-days"
+.BI \-p " mailbox-prefix"
 
 
-.B \-p " mailbox-prefix"
+.B \-t
 
 
 .B \-v
 
 .SH DESCRIPTION
-.I Cyr_expire
-is used to expire messages and duplicate delivery database entries.
-.I Cyr_expire
-also cleanses mailboxes of partially expunged messages
-(when using the "delayed" expunge mode).
+.PP
+\fBCyr_expire\fR is used to run a number of regular maintenance tasks
+on Cyrus databases, specifically:
+.IP \(bu 2m
+expire messages from mailboxes, and
+.IP \(bu 2m
+expire entries from the duplicate delivery database, and
+.IP \(bu 2m
+cleanse mailboxes of partially expunged messages (when
+using the "delayed" expunge mode), and
+.IP \(bu 2m
+remove deleted mailboxes (when using the "delayed" delete mode), and
+.IP \(bu 2m
+expire entries from conversations databases.
+.PP
 The expiration of messages is controlled by the
 \fB/vendor/cmu/cyrus-imapd/expire\fR mailbox annotation which
 specifies the age (in days) of messages in the given mailbox that
-should be deleted.  Any duplicate delivery database entries which
-correspond to the mailbox are also deleted at the same frequency.
-.br
-.sp
+should be deleted.  A value of 0 means that no expiration is to be
+performed on that mailbox.
+.PP
 The value of the \fB/vendor/cmu/cyrus-imapd/expire\fR annotation is
-inherited by all children of the given mailbox, so an entire mailbox
-tree can be expired by seting a single annotation on the root of that
-tree.  If a mailbox does not have a
+inherited by all children of the mailbox on which it is set, so an entire
+mailbox tree can be configured by setting a single annotation on the
+root of that tree.  If a mailbox does not have a
 \fB/vendor/cmu/cyrus-imapd/expire\fR annotation set on it (or does not
 inherit one), then no messages are expired from the mailbox.
 .PP
-.I Cyr_expire
-reads its configuration options out of the
-.IR imapd.conf (5)
+The annotation can be examined using the \fBinfo\fR command of
+\fBcyradm(1p)\fR, and modified using the \fBmboxconfig\fR and
+\fBsetinfo\fR commands of \fBcyradm(1p)\fR.
+.PP
+Expiration of duplicate delivery database entries for a given mailbox
+is also controlled by the \fB/vendor/cmu/cyrus-imapd/expire\fR annotation
+which applies to that mailbox.  Unlike message expiration, if no
+annotation applies to the mailbox then duplicate database entries are
+expired using the value given to the \fB-E\fR option.
+.PP
+Expiration of conversations database entries occurs if the
+\fBconversations\fP option is present in \fIimapd.conf\fP.  Expiration
+can be disabled using the \fB\-c\fP option.  The period used to
+expire entries is controlled by the \fBconversations_expire_days\fP
+option in \fIimapd.conf\fP.
+.PP
+\fBCyr_expire\fR reads its configuration options out of the \fIimapd.conf\fR(5)
 file unless specified otherwise by \fB-C\fR.
+.PP
+\fBCyr_expire\fR requires at least one of \fB-D -E\fR \fB-X\fR or
+\fB-t\fR to be supplied.
 .SH OPTIONS
 .TP
-.BI \-C " config-file"
+\fB\-C\fI config-file\fR
 Read configuration options from \fIconfig-file\fR.
 .TP
+\fB\-A \fIarchive-duration\fR
+Archive non-flagged messages older than \fIarchive-duration\fR to the
+archive partition, allowing mailbox messages to be split between fast
+storage and slow large storage.  Only does anything if archivepartition-*
+has been set in your config.
 \fB\-D \fIdelete-duration\fR
 Remove previously deleted mailboxes older than \fIdelete-duration\fR
 (when using the "delayed" delete mode).
@@ -110,14 +147,21 @@
 (when using the "delayed" expunge mode).
 Format is the same as delete-duration.
 .TP
-\fB \-x
-Do not expunge messages even if using delayed expunge mode (reduces the
-IO hit considerably, allowing you to run cyr_expire frequently to clean
-up the duplicate database without overloading your server)
+\fB-c\fR
+Do not expire conversation database entries, even if the conversations
+feature is enabled.
+.TP
+\fB\-x\fR
+Do not expunge messages even if using delayed expunge mode.  This reduces IO
+traffic considerably, allowing \fBcyr_expire\fR to be run frequently to clean
+up the duplicate database without overloading the machine.
 .TP
 \fB\-p \fImailbox-prefix\fR
-Only find mailboxes starting with this prefix.  e.g.
-"user.justgotspammedlots"
+Only find mailboxes starting with this prefix,  e.g.
+"user.justgotspammedlots".
+.TP
+\fB\-t\fR
+Remove any user flags which are not used by remaining (not expunged) messages.
 .TP
 .B \-v
 Enable verbose output.
@@ -131,4 +175,4 @@
 .B /etc/imapd.conf
 .SH SEE ALSO
 .PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBmaster(8)\fR, \fBcyradm(1p)\fR

cyrus-imapd-2.5.tar.gz/man/cyr_info.8 Added

@@ -0,0 +1,93 @@
+.\" -*- nroff -*-
+.TH CYR_INFO 8 "Project Cyrus" CMU
+.\"
+.\" Copyright (c) 1994-2009 Carnegie Mellon University.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. The name "Carnegie Mellon University" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For permission or any legal
+.\"    details, please contact
+.\"      Carnegie Mellon University
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation@andrew.cmu.edu
+.\"
+.\" 4. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by Computing Services
+.\"     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+.\"
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.SH NAME
+cyr_info \- general cyrus inspection tool
+.SH SYNOPSIS
+.B cyr_info
+
+.B \-C
+.I alt imapd.conf
+
+
+.B \-M
+.I alt cyrus.conf
+
+command
+.SH DESCRIPTION
+.I Cyr_info
+is a tool for getting information from Cyrus.  The intent is to
+extend this tool with useful commands to make managing and
+configuring Cyrus easier.
+.I Cyr_info
+reads its configuration options out of the
+.IR imapd.conf (5)
+file unless specified otherwise by \fB-C\fR.
+.SH OPTIONS
+.TP
+.BI \-C " file"
+Read configuration options from \fIfile\fR (imapd.conf format).
+.TP
+.BI \-M " file"
+Read service specifications from \fIfile\fR (cyrus.conf format).
+.TP
+.BI \-n " name"
+Read the configuration as if for the service named \fIname\fR.
+.SH COMMANDS
+.TP
+.BI allconf
+print ALL configuration options - including default options
+.TP
+.BI conf
+print only the configuration options which are not the same as
+default (regardless of whether you have specified them or not)
+.TP
+.BI lint
+print only configuration options which are NOT recognised.  This
+command should not print anything.  It uses cyrus.conf to find
+the names of configured services to avoid displaying any known
+configuration options for the named service.
+.TP
+.BI proc
+print all currently connected processes in the proc directory
+.SH FILES
+.B /etc/imapd.conf
+.B /etc/cyrus.conf

cyrus-imapd-2.4.17.tar.gz/man/cyr_synclog.8 -> cyrus-imapd-2.5.tar.gz/man/cyr_synclog.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/cyrus.conf.5 -> cyrus-imapd-2.5.tar.gz/man/cyrus.conf.5 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: cyrus.conf.5,v 1.17 2010/01/06 17:01:51 murch Exp $
 .SH NAME
 cyrus.conf \- Cyrus configuration file
 .SH DESCRIPTION
@@ -69,7 +67,10 @@
 .PP
 where \fIsection\fR is the name of the section, \fIname\fR is the name
 of the entry and \fIarguments\fR is the whitespace-separated list of
-arguments for the entry.
+arguments for the entry.  The \fIname\fR may be any sequence of
+alphabetic and numeric characters, but may not contain punctuation
+such as '-' or '_'.  In the \fBSERVICES\fP section, names must be
+unique.
 .PP
 Blank lines and lines beginning with ``#'' are ignored.
 .SH SECTION DESCRIPTIONS

cyrus-imapd-2.4.17.tar.gz/man/deliver.8 -> cyrus-imapd-2.5.tar.gz/man/deliver.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/fetchnews.8 -> cyrus-imapd-2.5.tar.gz/man/fetchnews.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/fud.8 -> cyrus-imapd-2.5.tar.gz/man/fud.8 Changed

cyrus-imapd-2.5.tar.gz/man/httpd.8 Added

@@ -0,0 +1,129 @@
+.\" -*- nroff -*-
+.TH HTTPD 8 "Project Cyrus" CMU
+.\"
+.\" Copyright (c) 1994-2011 Carnegie Mellon University.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. The name "Carnegie Mellon University" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For permission or any legal
+.\"    details, please contact
+.\"      Carnegie Mellon University
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation@andrew.cmu.edu
+ *
+.\" 4. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by Computing Services
+.\"     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+.\"
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.SH NAME
+httpd \- HTTP server process
+.SH SYNOPSIS
+.B httpd
+
+.B \-C
+.I config-file
+
+
+.B \-U
+.I uses
+
+
+.B \-T
+.I timeout
+
+
+.B \-D
+
+.br
+      
+.B \-s
+
+
+.B \-p
+.I ssf
+
+.SH DESCRIPTION
+.I Httpd
+is a HTTP server.
+It accepts commands on its standard input and responds on its standard output.
+It MUST invoked by
+.IR master (8)
+with those descriptors attached to a remote client connection.
+.PP
+.I Httpd
+reads its configuration options out of the
+.IR imapd.conf (5)
+file unless specified otherwise by \fB-C\fR.
+.PP
+If the directory
+.RI log/ user
+exists under the directory specified in the
+.I configdirectory
+configuration option, then
+.I httpd
+will create protocol telemetry logs for sessions authenticating as
+.IR user .
+The telemetry logs will be stored in the 
+.RI log/ user
+directory with a filename of the
+.I httpd
+process-id.
+.SH OPTIONS
+.TP
+.BI \-C " config-file"
+Read configuration options from \fIconfig-file\fR.
+.TP
+.BI \-U " uses"
+The maximum number of times that the process should be used for new
+connections before shutting down.  The default is 250.
+.TP
+.BI \-T " timeout"
+The number of seconds that the process will wait for a new connection
+before shutting down.  Note that a value of 0 (zero) will disable the
+timeout.  The default is 60.
+.TP
+.BI \-D
+Run external debugger specified in debug_command.
+.TP
+.BI \-s
+Serve HTTP over SSL (https).  All data to and from
+.I httpd
+is encrypted using the Secure Sockets Layer.
+.TP
+.BI \-p " ssf"
+Tell
+.I httpd
+that an external layer exists.  An SSF (security strength factor) of 1
+means an integrity protection layer exists.  Any higher SSF implies
+some form of privacy protection.
+.SH FILES
+.TP
+.B /etc/imapd.conf
+.SH SEE ALSO
+.PP
+\fBimapd.conf(5)\fR, \fBmaster(8)\fR

cyrus-imapd-2.4.17.tar.gz/man/idled.8 -> cyrus-imapd-2.5.tar.gz/man/idled.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/imapd.8 -> cyrus-imapd-2.5.tar.gz/man/imapd.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/imclient.3 -> cyrus-imapd-2.5.tar.gz/man/imclient.3 Changed

cyrus-imapd-2.4.17.tar.gz/man/imtest.1 -> cyrus-imapd-2.5.tar.gz/man/imtest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/installsieve.1 -> cyrus-imapd-2.5.tar.gz/man/installsieve.1 Changed

@@ -26,7 +26,7 @@
 .\" Pittsburgh, PA 15213
 .\" (412) 268-7393, fax: (412) 268-7395
 .\" innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\" acknowledgment:
 .\" "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: installsieve.1,v 1.7 2010/01/06 17:01:51 murch Exp $
 .SH NAME
 installsieve \- user utility for managing sieve scripts
 .SH SYNOPSIS
@@ -52,41 +50,41 @@
 
 .PP
 .SH OPTIONS
-
-.I -v <name>
+.TP
+.BI \-v " name"
 View script with the given name. The script if retrieved sucessfully
 is output to standard output.
-
-.I -l
+.TP
+.B \-l
 List all of the scripts currently on the server. If one of the scripts
 is active a arrow is printed indicating that it is the active script.
-
-.I -p <port>
+.TP
+.BI \-p " port"
 Port to connect to. If left off this defaults to "sieve" as defined in
 /etc/services.
-
-.I -i <file>
+.TP
+.BI \-i " file"
 Install a file onto the server. If a script with the same name already
 exists on the server it is overwritten. Upon sucessfully putting the
-script on the server the script is set active. If <file> has the
+script on the server the script is set active. If \fIfile\fP has the
 extension .script it is chopped when put on the server since sieve
 names may not contain a '.'.
-
-.I -a <name>
-Set <name> as the active script. The list of available names can be
-obtained from the '-l' option..
-
-.I -d <name>
-Delete the sieve script on the server with <name>.
-
-.I -m <mechanism>
-Force installsieve to use <mechanism> for authentication. If not
+.TP
+.BI \-a " name"
+Set \fIname\fP as the active script. The list of available names can be
+obtained from the \fB-l\fP option.
+.TP
+.BI \-d " name"
+Delete the sieve script on the server with \fIname\fP.
+.TP
+.BI \-m " mechanism"
+Force installsieve to use \fImechanism\fP for authentication. If not
 specified the strongest authentication mechanism is chosen.
-
-.I -g <name>
-Get the sieve script with <name> and save it to disk with a ".script"
+.TP
+.BI \-g " name"
+Get the sieve script with \fIname\fP and save it to disk with a ".script"
 extension. If a file with that name already exists it is
 overwritten.
-
-.I -u <user>
+.TP
+.BI \-u " user"
 Userid/Authname to use for authentication; by default, the current user.

cyrus-imapd-2.4.17.tar.gz/man/ipurge.8 -> cyrus-imapd-2.5.tar.gz/man/ipurge.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/krb.equiv.5 -> cyrus-imapd-2.5.tar.gz/man/krb.equiv.5 Changed

cyrus-imapd-2.4.17.tar.gz/man/lmtpd.8 -> cyrus-imapd-2.5.tar.gz/man/lmtpd.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/lmtptest.1 -> cyrus-imapd-2.5.tar.gz/man/lmtptest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/master.8 -> cyrus-imapd-2.5.tar.gz/man/master.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: master.8,v 1.16 2010/01/06 17:01:52 murch Exp $
 .SH NAME
 master \- master Cyrus process
 .SH SYNOPSIS
@@ -126,7 +124,11 @@
 terminal).
 .TP
 .BI \-D
-Don't close stdin/stdout/stderr. Primiarly useful for debugging.
+Don't close stdin/stdout/stderr. Primarily useful for debugging.  Note
+that -d and -D cannot be used together; consider using -L instead.
+.TP
+.BI \-L " logfile"
+Redirect stdout and stderr to the given \fIlogfile\fP.
 .TP
 .BI \-x " snmp agentx socket"
 Address the master agent (most likely snmpd) listens on.
@@ -143,6 +145,17 @@
 SIGHUP.  Services and events may be added, deleted or modified when the
 configuration file is reread.  Any active services removed from the
 configuration file will be allowed to run until completion.
+.PP
+.I Master
+propagates the hangup signal, SIGHUP, to its child service processes, so
+that they stop waiting for incoming connections and exit, allowing them
+to be recycled.  This is useful to make services take into account a new
+version of the
+.IR imapd.conf (5)
+file.  Children that are servicing a client connection when SIGHUP is
+received are allowed to run until the client logouts before being recycled.
+It may take a long time until the client logouts, so a log message is
+generated for processes that have not been recycled whithin 30s.
 .SH NOTES
 The environment variable \fBCYRUS_VERBOSE\fR can be set to log additional
 debugging information. Setting the value to 1 results in base level logging.

cyrus-imapd-2.4.17.tar.gz/man/mbexamine.8 -> cyrus-imapd-2.5.tar.gz/man/mbexamine.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/mbpath.8 -> cyrus-imapd-2.5.tar.gz/man/mbpath.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/mupdatetest.1 -> cyrus-imapd-2.5.tar.gz/man/mupdatetest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/nntpd.8 -> cyrus-imapd-2.5.tar.gz/man/nntpd.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/nntptest.1 -> cyrus-imapd-2.5.tar.gz/man/nntptest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/notifyd.8 -> cyrus-imapd-2.5.tar.gz/man/notifyd.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/pop3d.8 -> cyrus-imapd-2.5.tar.gz/man/pop3d.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/pop3test.1 -> cyrus-imapd-2.5.tar.gz/man/pop3test.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/quota.8 -> cyrus-imapd-2.5.tar.gz/man/quota.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/reconstruct.8 -> cyrus-imapd-2.5.tar.gz/man/reconstruct.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/rmnews.8 -> cyrus-imapd-2.5.tar.gz/man/rmnews.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/sivtest.1 -> cyrus-imapd-2.5.tar.gz/man/sivtest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/smmapd.8 -> cyrus-imapd-2.5.tar.gz/man/smmapd.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/smtptest.1 -> cyrus-imapd-2.5.tar.gz/man/smtptest.1 Changed

cyrus-imapd-2.4.17.tar.gz/man/squatter.8 -> cyrus-imapd-2.5.tar.gz/man/squatter.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: squatter.8,v 1.10 2010/01/06 17:01:52 murch Exp $
 .SH NAME
 squatter \- create SQUAT indexes for mailboxes
 .SH SYNOPSIS
@@ -65,33 +63,114 @@
 .B \-v
 
 .IR mailbox ...
+.br
+.B squatter
+
+.B \-C
+.I config-file
+
+
+.B \-r
+
+
+.B \-s
+
+
+.B \-i
+
+
+.B \-a
+
+
+.B \-v
+
+.B -u
+.IR user ...
+.br
+.B squatter
+
+.B \-C
+.I config-file
+
+
+.B -v
+
+
+.B -s
+
+
+.B -d
+
+
+.B -n
+.I channel
+
+.B -R
+.br
+.B squatter
+
+.B \-C
+.I config-file
+
+
+.B -v
+
+
+.B -s
+
+.B -f
+.I synclogfile
 .SH DESCRIPTION
-.I Squatter
-creates a new SQUAT index for one or more IMAP mailboxes.  The SQUAT
+.B Squatter
+creates a new text index for one or more IMAP mailboxes.  The
 index is a unified index of all of the header and body text of each
-message a given mailbox.  This index is used to significantly reduce
+message in a given mailbox.  This index is used to significantly reduce
 IMAP SEARCH times on a mailbox.
 .PP
-.I Squatter
+The name \fBsquatter\fP is a historical relic from the days when the
+only indexing engine supported by Cyrus was SQUAT.  Today the
+\fIsearch_engine\fP setting in \fIimapd.conf\fP determines which
+search engine is used.
+.PP
+In the first synposis
+.B squatter
 creates an index of ALL messages in the mailbox, not just those since
-the last time that it was run (i.e., it does NOT do incremental
-updates).  Any messages appended to the mailbox after
-.I squatter
+the last time that it was run.  The \fB-i\fP option is used to select
+incremental updates.
+Any messages appended to the mailbox after
+.B squatter
 is run, will NOT be included in the index.  To include new messages in
 the index,
-.I squatter
+.B squatter
 must be run again.
-For large and active mailboxes, it is recommended to run
-.I squatter
+.PP
+In the second synopsis, \fBsquatter\fP runs in rolling mode.  In this mode
+\fBsquatter\fP backgrounds itself and runs as a daemon, listening to a sync
+log channel (chosen using \fB-n\fP option, and set up using the
+\fIsync_log_channels\fP setting in \fIimapd.conf\fP).  Very soon after
+messages are delivered or uploaded to mailboxes \fBsquatter\fP will
+incrementally index the affected mailbox.
+.PP
+Note that incremental updates are very inefficient with the SQUAT
+search engine.
+If using SQUAT for large and active mailboxes, you should run
+.B squatter
 periodically as an EVENT in
-.IR cyrus.conf (5)
-.
+.IR cyrus.conf (5).
+Incremental updates are much more efficient with Sphinx, so if using
+Sphinx you should run \fBsquatter -R\fP as a START in \fIcyrus.conf\fP(5).
+.PP
+In the third synopsis, \fBsquatter\fP reads a single sync log file
+and performs incremental indexing on the mailboxes listed therein.  This is
+sometimes useful for cleaning up after problems with rolling mode.
 .PP
 .B NOTE:
-Messages and mailboxes that have not been indexed CAN still be
-SEARCHed, just not as quickly as those with a SQUAT index.
+Messages and mailboxes that have not been indexed can still be
+SEARCHed, just not as quickly as those with an index.  Also, some
+advanced features of Sphinx like stemming will not work unless
+messages have been indexed.
 .PP
-.I Squatter
+.B Squatter
 reads its configuration options out of the
 .IR imapd.conf (5)
 file unless specified otherwise by \fB-C\fR.
@@ -100,6 +179,49 @@
 .BI \-C " config-file"
 Read configuration options from \fIconfig-file\fR.
 .TP
+.B \-R
+Run in rolling mode; \fBsquatter\fP runs as a daemon listening to
+a sync log channel and continuously incrementally indexing mailboxes.
+See also \fB-d\fP and \fB-n\fP.
+.TP
+.BI \-S " seconds"
+After processing each mailbox, sleep for "seconds" before continuing.
+Can be used to provide some load balancing.  Accepts fractional amounts.
+.TP
+.BI \-T " directory"
+When indexing, work on a temporary copy of the search engine databases
+in \fIdirectory\fP.  That directory would typically be on some very
+fast filesystem, like an SSD or tmpfs.  This option may not work with all
+search engines, but it's only effect is to speed up initial indexing.
+.TP
+.B \-u
+Extra options refer to usernames (e.g. foo@bar.com) rather than mailbox names.
+.TP
+.B \-d
+In rolling mode, don't background and do emit log messages on standard
+error.  Useful for debugging.
+.TP
+.BI \-f " synclogfile"
+Read the \fIsynclogfile\fP and incrementally index all the mailboxes
+listed therein, then exit.
+.TP
+.BI \-n " channel"
+In rolling mode, specify the name of the sync log channel that
+\fBsquatter\fP will listen to.  The default is "squatter".
+.TP
+.B \-o
+In compact mode, if only one source database is selected, just copy it
+to the destination rather than compacting.
+.TP
+.B \-F
+In compact mode, filter the resulting database to only include messages
+which are not expunged in mailboxes with existing name/uidvalidity.
+.TP
+.B \-A
+In compact mode, audit the resulting database to ensure that every
+non-expunged message in all the user's mailboxes which is specified
+by cyrus.indexed.db is present in the xapian database.
+.TP
 .B \-r
 Recursively create indexes for all sub-mailboxes of the mailboxes or
 mailbox prefixes given as arguments.
@@ -109,7 +231,7 @@
 (within a small time delta).
 .TP
 .B \-i
-Incremental updates where squat indexes already exist.
+Incremental updates where indexes already exist.
 .TP
 .B \-a
 Only create indexes for mailboxes which have the shared

cyrus-imapd-2.4.17.tar.gz/man/sync_client.8 -> cyrus-imapd-2.5.tar.gz/man/sync_client.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: sync_client.8,v 1.6 2010/01/06 17:01:52 murch Exp $
 .SH NAME
 sync_client \- client side of the synchronization (replication) engine
 .SH SYNOPSIS
@@ -100,7 +98,7 @@
 .IR objects ...
 
 .SH DESCRIPTION
-.I Sync_client
+.B sync_client
 is the client side of the replication system.  It runs on the client
 (master) system and connects to the target (replica) system and
 generates an appropriate sequence of transactions to synchronize the
@@ -108,7 +106,7 @@
 .SH OPTIONS
 .TP
 .BI \-v
-Verbose mode.
+Verbose mode.  Use twice (-v -v) to log all protocol traffic to stderr.
 .TP
 .BI \-l
 Verbose logging mode.
@@ -118,10 +116,10 @@
 up to 1000 seconds before giving up.
 .TP
 .BI \-z
-Enable compress.
-If you set 'sync_compress' in the imapd.conf or pass -z to sync_client, the
-replication protocol will attempt to enable deflate compression on the
-connection.
+Require compression.
+The replication protocol will always try to enable deflate compression if
+both ends support it.  Set this flag when you want to abort if compression
+is not available.
 .TP
 .BI \-C " config-file"
 Read configuration options from \fIconfig-file\fR.
@@ -135,19 +133,21 @@
 .BI \-f " input-file"
 In mailbox or user replication mode: provides list of users or mailboxes
 to replicate.  In rolling replication mode, specifies an alternate log
-file (sync_client will exit after processing the log file).
+file
+.RB ( sync_client
+will exit after processing the log file).
 .TP
 .BI \-F " shutdown-file"
 Rolling replication checks for this file at the end of each replication
-cycle and shuts down if it is present. Used to request nice clean shutdown
-at first convenient point. The file in question is removed on shutdown.
+cycle and shuts down if it is present. Used to request a nice clean shutdown
+at the first convenient point. The file is removed on shutdown.
 Overrides
 .I sync_shutdown_file
 option in
 .I imapd.conf
 .TP
 .BI \-w " interval"
-Wait this long before starting. Typically used so that we can attach a
+Wait this long before starting. This option is typically used so that we can attach a
 debugger to one end of the replication system or the other.
 .TP
 .BI \-t " timeout"
@@ -165,11 +165,11 @@
 .BI \-r
 Rolling (repeat) replication mode. Pick up a list of actions recorded by
 the
-.B lmtpd(8), imapd(8), popd(8) and nntpd(8)
+.BR lmtpd "(8), " imapd "(8), " popd "(8) and " nntpd (8)
 daemons from the file specified in
-.I sync_log_file.
+.IR sync_log_file .
 Repeat until
-.I sync_shutdwon_file
+.I sync_shutdown_file
 appears.
 .TP
 .BI \-n
@@ -177,8 +177,9 @@
 are specified in
 .I sync_log_channels
 then use one of them.  This option is
-probably best combined with -S to connect to a different server with each
-channel.
+probably best combined with
+.B \-S
+to connect to a different server with each channel.
 .TP
 .BI \-u
 User mode.
@@ -192,12 +193,12 @@
 Sieve mode.
 Remaining arguments are list of users whose Sieve files should be replicated.
 Principally used for debugging purposes: not exposed to
-.B sync_client(8).
+.BR sync_client (8).
 .SH FILES
 .TP
 .B /etc/imapd.conf
 .SH SEE ALSO
 .PP
-\fBsync_server(8)\fR
+\fBsync_server\fR(8)
 .SH AUTHORS
 David Carter (dpc22@cam.ac.uk), Ken Murchison (ken@oceana.com)

cyrus-imapd-2.4.17.tar.gz/man/sync_reset.8 -> cyrus-imapd-2.5.tar.gz/man/sync_reset.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/sync_server.8 -> cyrus-imapd-2.5.tar.gz/man/sync_server.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: sync_server.8,v 1.4 2010/01/06 17:01:52 murch Exp $
 .SH NAME
 sync_server \- server side of the synchronization (replication) engine
 .SH SYNOPSIS
@@ -55,10 +53,10 @@
 
 .SH DESCRIPTION
 
-.I Sync_server
+.B sync_server
 is the server side of the the replication system.  It runs on the
 target (replica) system and listens for connections from
-.I sync_client
+.B sync_client
 which provides instructions for synchronizing the replica system with
 the master system.
 
@@ -69,7 +67,7 @@
 .TP
 .BI \-p " ssf"
 Tell
-.I sync_server
+.B sync_server
 that an external layer exists.  An SSF (security strength factor) of 1
 means an integrity protection layer exists.  Any higher SSF implies
 some form of privacy protection.
@@ -78,6 +76,6 @@
 .B /etc/imapd.conf
 .SH SEE ALSO
 .PP
-\fBsync_client(8)\fR
+\fBsync_client\fR(8)
 .SH AUTHORS
 David Carter (dpc22@cam.ac.uk), Ken Murchison (ken@oceana.com)

cyrus-imapd-2.4.17.tar.gz/man/syncnews.8 -> cyrus-imapd-2.5.tar.gz/man/syncnews.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/timsieved.8 -> cyrus-imapd-2.5.tar.gz/man/timsieved.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/tls_prune.8 -> cyrus-imapd-2.5.tar.gz/man/tls_prune.8 Changed

cyrus-imapd-2.4.17.tar.gz/man/unexpunge.8 -> cyrus-imapd-2.5.tar.gz/man/unexpunge.8 Changed

@@ -26,7 +26,7 @@
 .\"      Pittsburgh, PA  15213
 .\"      (412) 268-7393, fax: (412) 268-7395
 .\"      innovation@andrew.cmu.edu
- *
+.\"
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +39,6 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id: unexpunge.8,v 1.5 2010/01/06 17:01:53 murch Exp $
 .SH NAME
 unexpunge \- restore expunged (but yet unremoved) messages
 .SH SYNOPSIS
@@ -64,6 +62,10 @@
 
 .B \-v
 
+
+.B \-f 
+.I flagname
+
 .I mailbox
 .br
 .B unexpunge
@@ -78,6 +80,10 @@
 
 .B \-v
 
+
+.B \-f
+.I flagname
+
 .I mailbox
 .br
 .B unexpunge
@@ -92,6 +98,10 @@
 
 .B \-v
 
+
+.B \-f
+.I flagname
+
 .IR "mailbox uid" ...
 .SH DESCRIPTION
 .I Unexpunge
@@ -126,6 +136,12 @@
 .B \-d
 Unset the \fI\\Deleted\fR flag on any restored messages.
 .TP
+.BI \-f " flagname"
+Set the user flag 
+.I flagname
+on any restored messages.  This can make it easy to batch operate on
+just the restored messages afterwards.
+.TP
 .B \-v
 Enable verbose output/logging.
 .SH FILES

cyrus-imapd-2.4.17.tar.gz/master/conf/normal.conf -> cyrus-imapd-2.5.tar.gz/master/conf/normal.conf Changed

cyrus-imapd-2.4.17.tar.gz/master/conf/prefork.conf -> cyrus-imapd-2.5.tar.gz/master/conf/prefork.conf Changed

cyrus-imapd-2.4.17.tar.gz/master/cyrusMasterMIB.c -> cyrus-imapd-2.5.tar.gz/master/cyrusMasterMIB.c Changed

cyrus-imapd-2.4.17.tar.gz/master/master.c -> cyrus-imapd-2.5.tar.gz/master/master.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: master.c,v 1.117 2010/04/19 19:54:26 murch Exp $
 */
 
 #include <config.h>
@@ -63,7 +61,6 @@
 #include <sys/stat.h>
 #include <syslog.h>
 #include <netdb.h>
-#include <ctype.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
@@ -71,6 +68,7 @@
 #include <sysexits.h>
 #include <errno.h>
 #include <limits.h>
+#include <math.h>
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
@@ -118,9 +116,9 @@
 #include "cyr_lock.h"
 #include "util.h"
 #include "xmalloc.h"
+#include "strarray.h"
 
 enum {
- become_cyrus_early = 1,
 child_table_size = 10000,
 child_table_inc = 100
 };
@@ -129,29 +127,28 @@
 static int listen_queue_backlog = 32;
 static int pidfd = -1;
 
-static volatile int in_shutdown = 0;
+static int in_shutdown = 0;
 
 const char *MASTER_CONFIG_FILENAME = DEFAULT_MASTER_CONFIG_FILENAME;
 
 #define SERVICE_NONE -1
 #define SERVICE_MAX INT_MAX-10
-#define SERVICENAME(x) ((x) ? x : "unknown")
+#define SERVICEPARAM(x) ((x) ? x : "unknown")
+
+#define MAX_READY_FAILS	 5
 
 struct service *Services = NULL;
-int allocservices = 0;
+static int allocservices = 0;
 int nservices = 0;
 
-/* make libcyrus_min happy */
-int config_need_data = 0;
-
 struct event {
 char *name;
- time_t mark;
+ struct timeval mark;
 time_t period;
- time_t hour;
- time_t min;
+ int hour;
+ int min;
 int periodic;
- char *const *exec;
+ strarray_t *exec;
 struct event *next;
 };
 static struct event *schedule = NULL;
@@ -160,7 +157,7 @@
 SERVICE_STATE_UNKNOWN = 0, /* duh */
 SERVICE_STATE_INIT = 1, /* Service forked - UNUSED */
 SERVICE_STATE_READY = 2, /* Service told us it is ready */
- 				/* or it just forked and has not
+				/* or it just forked and has not
 				 * talked to us yet */
 SERVICE_STATE_BUSY = 3, /* Service told us it is not ready */
 SERVICE_STATE_DEAD = 4 /* We received a sigchld from this service */
@@ -171,144 +168,282 @@
 enum sstate service_state;	/* SERVICE_STATE_* */
 time_t janitor_deadline;	/* cleanup deadline */
 int si;			/* Services index */
+ char *desc;			/* human readable description for logging */
+ struct timeval spawntime;	/* when the centry was allocated */
+ time_t sighuptime;		/* when did we send a SIGHUP */;
 struct centry *next;
 };
 static struct centry *ctablechild_table_size;
-static struct centry *cfreelist;
 
 static int janitor_frequency = 1;	/* Janitor sweeps per second */
 static int janitor_position;		/* Entry to begin at in next sweep */
 static struct timeval janitor_mark;	/* Last time janitor did a sweep */
 
-void limit_fds(rlim_t);
-void schedule_event(struct event *a);
+static void limit_fds(rlim_t);
+static void schedule_event(struct event *a);
+static void child_sighandler_setup(void);
 
-void fatal(const char *msg, int code)
+#if HAVE_PSELECT
+static sigset_t pselect_sigmask;
+#endif
+
+static int myselect(int nfds, fd_set *rfds, fd_set *wfds,
+		 fd_set *efds, struct timeval *tout)
+{
+#if HAVE_PSELECT
+ /* pselect() closes the race between SIGCHLD arriving
+ * and select() sleeping for up to 10 seconds. */
+ struct timespec ts, *tsptr = NULL;
+
+ if (tout) {
+	ts.tv_sec = tout->tv_sec;
+	ts.tv_nsec = tout->tv_usec * 1000;
+	tsptr = &ts;
+ }
+ return pselect(nfds, rfds, wfds, efds, tsptr, &pselect_sigmask);
+#else
+ return select(nfds, rfds, wfds, efds, tout);
+#endif
+}
+
+EXPORTED void fatal(const char *msg, int code)
 {
 syslog(LOG_CRIT, "%s", msg);
 syslog(LOG_NOTICE, "exiting");
 exit(code);
 }
 
-void event_free(struct event *a) 
+static void event_free(struct event *a)
 {
- if(a->exec) free((char**)a->exec);
- if(a->name) free((char*)a->name);
+ if (a->exec) {
+	strarray_free(a->exec);
+	a->exec = NULL;
+ }
+ free(a->name);
 free(a);
 }
 
-void get_prog(char *path, unsigned size, char *const *cmd)
+static void get_prog(char *path, unsigned size, const strarray_t *cmd)
 {
- if (cmd00 == '/') {
+ if (cmd->data00 == '/') {
 	/* master lacks strlcpy, due to no libcyrus */
-	snprintf(path, size, "%s", cmd0);
+	snprintf(path, size, "%s", cmd->data0);
 }
- else snprintf(path, size, "%s/%s", SERVICE_PATH, cmd0);
+ else snprintf(path, size, "%s/%s", SERVICE_DIR, cmd->data0);
 }
 
-void get_statsock(int filedes2)
+static void get_statsock(int filedes2)
 {
 int r, fdflags;
 
 r = pipe(filedes);
- if (r != 0) {
-	fatal("couldn't create status socket: %m", 1);
- }
+ if (r != 0)
+	fatalf(1, "couldn't create status socket: %m");
 
 /* we don't want the master blocking on reads */
 fdflags = fcntl(filedes0, F_GETFL, 0);
- if (fdflags != -1) fdflags = fcntl(filedes0, F_SETFL, 
+ if (fdflags != -1) fdflags = fcntl(filedes0, F_SETFL,
 				 fdflags | O_NONBLOCK);
- if (fdflags == -1) {
-	fatal("unable to set non-blocking: %m", 1);
- }
+ if (fdflags == -1)
+	fatalf(1, "unable to set non-blocking: %m");
 /* we don't want the services to be able to read from it */
 fdflags = fcntl(filedes0, F_GETFD, 0);
- if (fdflags != -1) fdflags = fcntl(filedes0, F_SETFD, 
+ if (fdflags != -1) fdflags = fcntl(filedes0, F_SETFD,
 				 fdflags | FD_CLOEXEC);
- if (fdflags == -1) {
-	fatal("unable to set close-on-exec: %m", 1);
- }
+ if (fdflags == -1)
+	fatalf(1, "unable to set close-on-exec: %m");
 }
 
-/* return a new 'centry', either from the freelist or by malloc'ing it */
-static struct centry *get_centry(void)
+static int cap_bind(int socket, struct sockaddr *addr, socklen_t length)
+{
+ int r;
+
+ set_caps(BEFORE_BIND, /*is_master*/1);
+ r = bind(socket, addr, length);
+ set_caps(AFTER_BIND, /*is_master*/1);
+
+ return r;
+}
+
+/* Return a new 'centry', by malloc'ing it. */
+static struct centry *centry_alloc(void)
 {
 struct centry *t;
 
- if (!cfreelist) {
-	/* create child_table_inc more and add them to the freelist */
-	struct centry *n;
-	int i;
+ t = xzmalloc(sizeof(*t));
+ t->si = SERVICE_NONE;
+ gettimeofday(&t->spawntime, NULL);
+ t->sighuptime = (time_t)-1;
 
-	n = xmalloc(child_table_inc * sizeof(struct centry));
-	cfreelist = n;
-	for (i = 0; i < child_table_inc - 1; i++) {
-	 ni.next = n + (i + 1);
-	}
-	/* i == child_table_inc - 1, last item in block */
-	ni.next = NULL;
+ return t;
+}
+
+static void centry_set_name(struct centry *c, const char *type,
+			 const char *name, const char *path)
+{
+ free(c->desc);
+ if (name && path)
+	c->desc = strconcat("type:", type, " name:", name, " path:", path, NULL);
+ else
+	c->desc = strconcat("type:", type, NULL);
+}
+
+static char *centry_describe(const struct centry *c, pid_t pid)
+{
+ struct buf desc = BUF_INITIALIZER;
+
+ if (!c) {
+	buf_appendcstr(&desc, "unknown process");
 }
+ else {
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	buf_printf(&desc, "process %s age:%.3fs",
+		 c->desc, timesub(&c->spawntime, &now));
+ }
+ buf_printf(&desc, " pid:%d", (int)pid);
+ return buf_release(&desc);
+}
 
- t = cfreelist;
- cfreelist = cfreelist->next;
+/* free a centry */
+static void centry_free(struct centry *c)
+{
+ free(c->desc);
+ free(c);
+}
 
- t->janitor_deadline = 0;
+/* add a centry to the global table of all
+ * centries, using the given pid as the key */
+static void centry_add(struct centry *c, pid_t p)
+{
+ c->pid = p;
+ c->next = ctablep % child_table_size;
+ ctablep % child_table_size = c;
+}
 
- return t;
+/* find a centry in the global table, using the
+ * given pid as the key. Returns NULL if not
+ * found. */
+static struct centry *centry_find(pid_t p)
+{
+ struct centry *c;
+
+ c = ctablep % child_table_size;
+ while (c && c->pid != p)
+	c = c->next;
+ return c;
 }
 
-/* see if 'listen' parameter has both hostname and port, or just port */
-char *parse_listen(char *listen)
+static void centry_set_state(struct centry *c, enum sstate state)
 {
- char *cp;
- char *port = NULL;
-
- if ((cp = strrchr(listen,'')) != NULL) {
- /* ":port" after closing bracket for IP address? */
- if (*cp++ != '\0' && *cp == ':') {
- *cp++ = '\0';
- if (*cp != '\0') {
- port = cp;
- } 
- }
- } else if ((cp = strrchr(listen,':')) != NULL) {
- /* ":port" after hostname? */
- *cp++ = '\0';
- if (*cp != '\0') {
- port = cp;
- }
- }
- return port;
+ c->service_state = state;
+ if (state == SERVICE_STATE_DEAD)
+	c->janitor_deadline = time(NULL) + 2;
 }
 
-char *parse_host(char *listen)
+/*
+ * Parse the "listen" parameter as one of the forms:
+ *
+ * hostname
+ * hostname ':' port
+ * ipv4-address
+ * ipv4-address ':' port
+ * '' ipv4-address ''
+ * '' ipv4-address '' ':' port
+ * '' ipv6-address ''
+ * '' ipv6-address '' ':' port
+ *
+ * Returns 0 on success with one or more of *@hostp and *@portp set
+ * to new strings which must be free()d by the caller, or -1 on error.
+ */
+static int parse_inet_listen(const char *listen,
+			 char **hostp, char **portp)
 {
- char *cp;
+ const char *cp;
+
+ *portp = NULL;
+ *hostp = NULL;
+ if (listen0 == '') {
+	cp = strrchr(listen, '');
+	if (!cp)
+	 return -1;
+	cp++;
+	if (*cp == ':') {
+	 if (!cp1)
+		return -1;
+	 *hostp = xstrndup(listen+1, (cp - listen - 2));
+	 *portp = xstrdup(cp+1);
+	 return 0;
+	}
+	if (!*cp) {
+	 *hostp = xstrndup(listen+1, (cp - listen - 2));
+	 /* no port specified */
+	 return 0;
+	}
+	return -1;
+ }
 
- /* do we have a hostname, or IP number? */
- /* XXX are brackets necessary */
- if (*listen == '') {
- listen++; /* skip first bracket */
- if ((cp = strrchr(listen,'')) != NULL) {
- *cp = '\0';
- }
+ cp = strrchr(listen, ':');
+ if (cp) {
+	if (!cp1)
+	 return -1;
+	*hostp = xstrndup(listen, (cp - listen));
+	*portp = xstrdup(cp+1);
+	return 0;
 }
- return listen;
+
+ /* no host specified */
+ *portp = xstrdup(listen);
+ return 0;
 }
 
-int verify_service_file(char *const *filename)
+static int verify_service_file(const strarray_t *filename)
 {
 char pathPATH_MAX;
 struct stat statbuf;
- 
+
 get_prog(path, sizeof(path), filename);
 if (stat(path, &statbuf)) return 0;
 if (! S_ISREG(statbuf.st_mode)) return 0;
 return statbuf.st_mode & S_IXUSR;
 }
 
-void service_create(struct service *s)
+static void service_forget_exec(struct service *s)
+{
+ if (s->exec) {
+	/* Only free the service info on the primary */
+	if (s->associate == 0) {
+	 strarray_free(s->exec);
+	}
+	s->exec = NULL;
+ }
+}
+
+static struct service *service_add(const struct service *proto)
+{
+ struct service *s;
+
+ if (nservices == allocservices) {
+	if (allocservices > SERVICE_MAX - 5)
+	 fatal("out of service structures, please restart", EX_UNAVAILABLE);
+	Services = xrealloc(Services,
+			 (allocservices+=5) * sizeof(struct service));
+ }
+ s = &Servicesnservices++;
+
+ if (proto)
+	memcpy(s, proto, sizeof(struct service));
+ else {
+	memset(s, 0, sizeof(struct service));
+	s->socket = -1;
+	s->stat0 = -1;
+	s->stat1 = -1;
+ }
+
+ return s;
+}
+
+static void service_create(struct service *s)
 {
 struct service service0, service;
 struct addrinfo hints, *res0, *res;
@@ -322,16 +457,16 @@
 if (s->associate > 0)
 	return;			/* service is already activated */
 
+ if (!s->listen)
+	return;			/* service is a daemon, no listener */
+
 if (!s->name)
 	fatal("Serious software bug found: service_create() called on unnamed service!",
 		EX_SOFTWARE);
 
 if (s->listen0 == '/') { /* unix socket */
 	res0_is_local = 1;
-	res0 = (struct addrinfo *)malloc(sizeof(struct addrinfo));
-	if (!res0)
-	 fatal("out of memory", EX_UNAVAILABLE);
-	memset(res0, 0, sizeof(struct addrinfo));
+	res0 = (struct addrinfo *)xzmalloc(sizeof(struct addrinfo));
 	res0->ai_flags = AI_PASSIVE;
 	res0->ai_family = PF_UNIX;
 	if(!strcmp(s->proto, "tcp")) {
@@ -340,73 +475,65 @@
 	 /* udp */
 	 res0->ai_socktype = SOCK_DGRAM;
 	}
- 	res0->ai_addr = (struct sockaddr *)&sunsock;
- 	res0->ai_addrlen = sizeof(sunsock.sun_family) + strlen(s->listen) + 1;
+	res0->ai_addr = (struct sockaddr *)&sunsock;
+	res0->ai_addrlen = sizeof(sunsock.sun_family) + strlen(s->listen) + 1;
 #ifdef SIN6_LEN
- 	res0->ai_addrlen += sizeof(sunsock.sun_len);
- 	sunsock.sun_len = res0->ai_addrlen;
+	res0->ai_addrlen += sizeof(sunsock.sun_len);
+	sunsock.sun_len = res0->ai_addrlen;
 #endif
 	sunsock.sun_family = AF_UNIX;
 	strcpy(sunsock.sun_path, s->listen);
 	unlink(s->listen);
 } else { /* inet socket */
-	char *listen, *port;
+	char *port;
 	char *listen_addr;
-	
- 	memset(&hints, 0, sizeof(hints));
- 	hints.ai_flags = AI_PASSIVE;
- 	if (!strcmp(s->proto, "tcp")) {
- 	 hints.ai_family = PF_UNSPEC;
- 	 hints.ai_socktype = SOCK_STREAM;
- 	} else if (!strcmp(s->proto, "tcp4")) {
- 	 hints.ai_family = PF_INET;
- 	 hints.ai_socktype = SOCK_STREAM;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_flags = AI_PASSIVE;
+	if (!strcmp(s->proto, "tcp")) {
+	 hints.ai_family = PF_UNSPEC;
+	 hints.ai_socktype = SOCK_STREAM;
+	} else if (!strcmp(s->proto, "tcp4")) {
+	 hints.ai_family = PF_INET;
+	 hints.ai_socktype = SOCK_STREAM;
 #ifdef PF_INET6
- 	} else if (!strcmp(s->proto, "tcp6")) {
- 	 hints.ai_family = PF_INET6;
- 	 hints.ai_socktype = SOCK_STREAM;
+	} else if (!strcmp(s->proto, "tcp6")) {
+	 hints.ai_family = PF_INET6;
+	 hints.ai_socktype = SOCK_STREAM;
 #endif
- 	} else if (!strcmp(s->proto, "udp")) {
- 	 hints.ai_family = PF_UNSPEC;
- 	 hints.ai_socktype = SOCK_DGRAM;
- 	} else if (!strcmp(s->proto, "udp4")) {
- 	 hints.ai_family = PF_INET;
- 	 hints.ai_socktype = SOCK_DGRAM;
-#ifdef PF_INET6 
+	} else if (!strcmp(s->proto, "udp")) {
+	 hints.ai_family = PF_UNSPEC;
+	 hints.ai_socktype = SOCK_DGRAM;
+	} else if (!strcmp(s->proto, "udp4")) {
+	 hints.ai_family = PF_INET;
+	 hints.ai_socktype = SOCK_DGRAM;
+#ifdef PF_INET6
 	} else if (!strcmp(s->proto, "udp6")) {
- 	 hints.ai_family = PF_INET6;
- 	 hints.ai_socktype = SOCK_DGRAM;
+	 hints.ai_family = PF_INET6;
+	 hints.ai_socktype = SOCK_DGRAM;
 #endif
- 	} else {
- 	 syslog(LOG_INFO, "invalid proto '%s', disabling %s",
+	} else {
+	 syslog(LOG_INFO, "invalid proto '%s', disabling %s",
 		 s->proto, s->name);
- 	 s->exec = NULL;
- 	 return;
- 	}
+	 service_forget_exec(s);
+	 return;
+	}
 
-	/* parse_listen() and resolve_host() are destructive,
-	 * so make a work copy of s->listen
-	 */
-	listen = xstrdup(s->listen);
-
- if ((port = parse_listen(listen)) == NULL) {
-	 /* listen IS the port */
-	 port = listen;
-	 listen_addr = NULL;
- } else {
-	 /* listen is now just the address */
-	 listen_addr = parse_host(listen);
-	 if (*listen_addr == '\0')
-		listen_addr = NULL;
- }
+	if (parse_inet_listen(s->listen, &listen_addr, &port) < 0) {
+	 syslog(LOG_ERR, "invalid listen '%s', disabling %s",
+		 s->listen, s->name);
+	 service_forget_exec(s);
+	 return;
+	}
 
 	error = getaddrinfo(listen_addr, port, &hints, &res0);
 
-	free(listen);
+	free(listen_addr);
+	free(port);
 
 	if (error) {
 	 syslog(LOG_INFO, "%s, disabling %s", gai_strerror(error), s->name);
-	 s->exec = NULL;
+	 service_forget_exec(s);
 	 return;
 	}
 }
@@ -414,31 +541,45 @@
 memcpy(&service0, s, sizeof(struct service));
 
 for (res = res0; res; res = res->ai_next) {
-	if (s->socket > 0) {
+	if (s->socket >= 0) {
 	 memcpy(&service, &service0, sizeof(struct service));
 	 s = &service;
 	}
 
+	s->family = res->ai_family;
+	switch (s->family) {
+	case AF_UNIX:	s->familyname = "unix"; break;
+	case AF_INET:	s->familyname = "ipv4"; break;
+	case AF_INET6:	s->familyname = "ipv6"; break;
+	default:	s->familyname = "unknown"; break;
+	}
+
+	if (verbose > 2) {
+	 syslog(LOG_DEBUG, "activating service %s/%s",
+		s->name, s->familyname);
+	}
+
 	s->socket = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 	if (s->socket < 0) {
-	 s->socket = 0;
-	 if (verbose > 2)
-		syslog(LOG_ERR, "unable to open %s socket: %m", s->name);
+	 syslog(LOG_ERR, "unable to open %s/%s socket: %m",
+		s->name, s->familyname);
 	 continue;
 	}
 
 	/* allow reuse of address */
-	r = setsockopt(s->socket, SOL_SOCKET, SO_REUSEADDR, 
+	r = setsockopt(s->socket, SOL_SOCKET, SO_REUSEADDR,
 		 (void *) &on, sizeof(on));
 	if (r < 0) {
-	 syslog(LOG_ERR, "unable to setsocketopt(SO_REUSEADDR): %m");
+	 syslog(LOG_ERR, "unable to setsocketopt(SO_REUSEADDR) service %s/%s: %m",
+		s->name, s->familyname);
 	}
 #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3)
 	if (res->ai_family == AF_INET6) {
 	 r = setsockopt(s->socket, IPPROTO_IPV6, IPV6_V6ONLY,
 			 (void *) &on, sizeof(on));
 	 if (r < 0) {
-		syslog(LOG_ERR, "unable to setsocketopt(IPV6_V6ONLY): %m");
+		syslog(LOG_ERR, "unable to setsocketopt(IPV6_V6ONLY) service %s/%s: %m",
+		 s->name, s->familyname);
 	 }
 	}
 #endif
@@ -448,52 +589,43 @@
 	r = setsockopt(s->socket, SOL_IP, IP_TOS,
 		 (void *) &config_qosmarking, sizeof(config_qosmarking));
 	if (r < 0) {
-	 syslog(LOG_WARNING, "unable to setsocketopt(IP_TOS): %m");
+	 syslog(LOG_WARNING, "unable to setsocketopt(IP_TOS) service %s/%s: %m",
+		s->name, s->familyname);
 	}
 #endif
 
 	oldumask = umask((mode_t) 0); /* for linux */
-	r = bind(s->socket, res->ai_addr, res->ai_addrlen);
+	r = cap_bind(s->socket, res->ai_addr, res->ai_addrlen);
 	umask(oldumask);
 	if (r < 0) {
-	 close(s->socket);
-	 s->socket = 0;
-	 if (verbose > 2)
-		syslog(LOG_ERR, "unable to bind to %s socket: %m", s->name);
+	 syslog(LOG_ERR, "unable to bind to %s/%s socket: %m",
+		s->name, s->familyname);
+	 xclose(s->socket);
 	 continue;
 	}
-	
+
 	if (s->listen0 == '/') { /* unix socket */
 	 /* for DUX, where this isn't the default.
 	 (harmlessly fails on some systems) */
 	 chmod(s->listen, (mode_t) 0777);
 	}
-	
+
 	if ((!strcmp(s->proto, "tcp") || !strcmp(s->proto, "tcp4")
 	 || !strcmp(s->proto, "tcp6"))
 	 && listen(s->socket, listen_queue_backlog) < 0) {
-	 syslog(LOG_ERR, "unable to listen to %s socket: %m", s->name);
-	 close(s->socket);
-	 s->socket = 0;
+	 syslog(LOG_ERR, "unable to listen to %s/%s socket: %m",
+		s->name, s->familyname);
+	 xclose(s->socket);
 	 continue;
 	}
-	
+
 	s->ready_workers = 0;
 	s->associate = nsocket;
-	s->family = res->ai_family;
-	
+
 	get_statsock(s->stat);
-	
-	if (s == &service) {
-	 if (nservices == allocservices) {
-		if (allocservices > SERVICE_MAX - 5)
-		 fatal("out of service structures, please restart", EX_UNAVAILABLE);
-		Services = xrealloc(Services, 
-				 (allocservices+=5) * sizeof(struct service));
-		if (!Services) fatal("out of memory", EX_UNAVAILABLE);
-	 }
-	 memcpy(&Servicesnservices++, s, sizeof(struct service));
-	}
+
+	if (s == &service)
+	 service_add(s);
 	nsocket++;
 }
 if (res0) {
@@ -504,158 +636,210 @@
 }
 if (nsocket <= 0) {
 	syslog(LOG_ERR, "unable to create %s listener socket: %m", s->name);
-	s->exec = NULL;
+	service_forget_exec(s);
 	return;
 }
 }
 
-void run_startup(char **cmd)
+static int decode_wait_status(struct centry *c, pid_t pid, int status)
+{
+ int failed = 0;
+ char *desc = centry_describe(c, pid);
+
+ if (WIFEXITED(status)) {
+	if (!WEXITSTATUS(status)) {
+	 syslog(LOG_DEBUG, "%s exited normally", desc);
+	}
+	else {
+	 syslog(LOG_ERR, "%s exited, status %d",
+		 desc, WEXITSTATUS(status));
+	 failed = 1;
+	}
+ }
+
+ if (WIFSIGNALED(status)) {
+	const char *signame = strsignal(WTERMSIG(status));
+	if (!signame)
+	 signame = "unknown signal";
+#ifdef WCOREDUMP
+	syslog(LOG_ERR, "%s signaled to death by signal %d (%s%s)",
+	 desc, WTERMSIG(status), signame,
+	 WCOREDUMP(status) ? ", core dumped" : "");
+	failed = WCOREDUMP(status) ? 2 : 1;
+#else
+	syslog(LOG_ERR, "%s signaled to death by %s %d",
+	 desc, signame, WTERMSIG(status));
+	failed = 1;
+#endif
+ }
+ free(desc);
+ return failed;
+}
+
+static void run_startup(const char *name, const strarray_t *cmd)
 {
 pid_t pid;
 int status;
+ struct centry *c;
 char pathPATH_MAX;
 
+ get_prog(path, sizeof(path), cmd);
+
 switch (pid = fork()) {
 case -1:
-	syslog(LOG_CRIT, "can't fork process to run startup: %m");
-	fatal("can't run startup", 1);
+	fatalf(1, "can't fork process to run startup: %m");
 	break;
-	
+
 case 0:
 	/* Child - Release our pidfile lock. */
-	if(pidfd != -1) close(pidfd);
+	xclose(pidfd);
 
-	if (become_cyrus() != 0) {
-	 syslog(LOG_ERR, "can't change to the cyrus user: %m");
-	 exit(1);
-	}
+	set_caps(AFTER_FORK, /*is_master*/1);
+
+	child_sighandler_setup();
 
 	limit_fds(256);
 
-	get_prog(path, sizeof(path), cmd);
 	syslog(LOG_DEBUG, "about to exec %s", path);
-	execv(path, cmd);
-	syslog(LOG_ERR, "can't exec %s for startup: %m", path);
-	exit(EX_OSERR);
-	
+	execv(path, cmd->data);
+	fatalf(EX_OSERR, "can't exec %s for startup: %m", path);
+
 default: /* parent */
 	if (waitpid(pid, &status, 0) < 0) {
 	 syslog(LOG_ERR, "waitpid(): %m");
-	} else if (status != 0) {
-	 if (WIFEXITED(status)) {
-		syslog(LOG_ERR, "process %d exited, status %d\n", pid, 
-		 WEXITSTATUS(status));
-	 }
-	 if (WIFSIGNALED(status)) {
-		syslog(LOG_ERR, 
-		 "process %d exited, signaled to death by %d\n",
-		 pid, WTERMSIG(status));
-	 }
+	 return;
 	}
+	c = centry_alloc();
+	centry_set_name(c, "START", name, path);
+	if (decode_wait_status(c, pid, status))
+	 fatal("can't run startup", 1);
+	centry_free(c);
 	break;
 }
 }
 
-void fcntl_unset(int fd, int flag)
+static void fcntl_unset(int fd, int flag)
 {
 int fdflags = fcntl(fd, F_GETFD, 0);
- if (fdflags != -1) fdflags = fcntl(STATUS_FD, F_SETFD, 
+ if (fdflags != -1) fdflags = fcntl(STATUS_FD, F_SETFD,
 				 fdflags & ~flag);
 if (fdflags == -1) {
 	syslog(LOG_ERR, "fcntl(): unable to unset %d: %m", flag);
 }
 }
 
-void spawn_service(const int si)
+static int service_is_fork_limited(struct service *s)
 {
- /* Note that there is logic that depends on this being 2 */
- const int FORKRATE_INTERVAL = 2;
-
- pid_t p;
- int i;
- char pathPATH_MAX;
- static char name_env100, name_env2100;
- struct centry *c;
- struct service * const s = &Servicessi;
- time_t now = time(NULL);
-
- if (!s->name) {
-	fatal("Serious software bug found: spawn_service() called on unnamed service!",
-		EX_SOFTWARE);
- }
-
+/* The longest period for which we will ignore the service */
+#define FORKRATE_INTERVAL 0.4	/* seconds */
+/* How much the forkrate estimator decays, as a proportion, per second */
+#define FORKRATE_ALPHA		0.5	/* per second */
+ struct timeval now;
+ double interval;
+
+ if (!s->maxforkrate)
+	return 0;
+
+ gettimeofday(&now, 0);
+ interval = timesub(&s->last_interval_start, &now);
 /* update our fork rate */
- if(now - s->last_interval_start >= FORKRATE_INTERVAL) {
-	int interval;
-
-	s->forkrate = (s->interval_forks/2) + (s->forkrate/2);
+ if (interval > 0.0) {
+	double f = pow(FORKRATE_ALPHA, interval);
+	s->forkrate = f * s->forkrate +
+		 (1.0-f) * (s->interval_forks/interval);
 	s->interval_forks = 0;
-	s->last_interval_start += FORKRATE_INTERVAL;
-
-	/* if there is an even wider window, however, we need
-	 * to account for a good deal of zeros, we can do this at once */
-	interval = now - s->last_interval_start;
-
-	if(interval > 2) {
-	 int skipped_intervals = interval / FORKRATE_INTERVAL;
-	 /* avoid a > 30 bit right shift) */
-	 if(skipped_intervals > 30) s->forkrate = 0;
-	 else {
-		/* divide by 2^(skipped_intervals).
-		 * this is the logic mentioned in the comment above */
-		s->forkrate >>= skipped_intervals;
-		s->last_interval_start = now;
-	 }
-	}
+	s->last_interval_start = now;
+ }
+ else if (interval < 0.0) {
+	/*
+	 * NTP or similar moved the time-of-day clock backwards more
+	 * than the interval we asked to be delayed for. Given that, we
+	 * have no basis for updating forkrate and must reset our rate
+	 * estimating state. Let's just hope this is a rare event.
+	 */
+	s->interval_forks = 0;
+	s->last_interval_start = now;
+	syslog(LOG_WARNING, "time of day clock went backwards");
 }
 
 /* If we've been busy lately, we will refuse to fork! */
 /* (We schedule a wakeup call for sometime soon though to be
 * sure that we don't wait to do the fork that is required forever! */
- if(s->maxforkrate && s->forkrate >= s->maxforkrate) {
-	struct event *evt = (struct event *) xmalloc(sizeof(struct event));
-
-	memset(evt, 0, sizeof(struct event));
+ if ((unsigned int)s->forkrate >= s->maxforkrate) {
+	struct event *evt = (struct event *) xzmalloc(sizeof(struct event));
 
 	evt->name = xstrdup("forkrate wakeup call");
-	evt->mark = time(NULL) + FORKRATE_INTERVAL;
+	evt->mark = now;
+	timeval_add_double(&evt->mark, FORKRATE_INTERVAL);
+
 	schedule_event(evt);
 
-	return;
+	return 1;
+ }
+ return 0;
+}
+
+static void spawn_service(int si)
+{
+ pid_t p;
+ int i;
+ char pathPATH_MAX;
+ static char name_env100, name_env2100, name_env3100;
+ struct centry *c;
+ struct service *s = &Servicessi;
+
+ if (!s->name) {
+	fatal("Serious software bug found: spawn_service() called on unnamed service!",
+		EX_SOFTWARE);
 }
 
+ if (service_is_fork_limited(s))
+	return;
+
+ get_prog(path, sizeof(path), s->exec);
+
 switch (p = fork()) {
 case -1:
-	syslog(LOG_ERR, "can't fork process to run service %s: %m", s->name);
+	syslog(LOG_ERR, "can't fork process to run service %s/%s: %m",
+	 s->name, s->familyname);
 	break;
 
 case 0:
+	if (verbose > 2) {
+	 syslog(LOG_DEBUG, "forked process to run service %s/%s",
+		s->name, s->familyname);
+	}
+
 	/* Child - Release our pidfile lock. */
-	if(pidfd != -1) close(pidfd);
+	xclose(pidfd);
 
-	if (become_cyrus() != 0) {
-	 syslog(LOG_ERR, "can't change to the cyrus user");
-	 exit(1);
-	}
+	set_caps(AFTER_FORK, /*is_master*/1);
 
-	get_prog(path, sizeof(path), s->exec);
-	if (dup2(s->stat1, STATUS_FD) < 0) {
-	 syslog(LOG_ERR, "can't duplicate status fd: %m");
-	 exit(1);
-	}
-	if (dup2(s->socket, LISTEN_FD) < 0) {
-	 syslog(LOG_ERR, "can't duplicate listener fd: %m");
-	 exit(1);
-	}
+	child_sighandler_setup();
 
-	fcntl_unset(STATUS_FD, FD_CLOEXEC);
-	fcntl_unset(LISTEN_FD, FD_CLOEXEC);
+	if (s->listen) {
+	 if (dup2(s->stat1, STATUS_FD) < 0) {
+		syslog(LOG_ERR, "can't duplicate status fd: %m");
+		exit(1);
+	 }
+	 if (dup2(s->socket, LISTEN_FD) < 0) {
+		syslog(LOG_ERR, "can't duplicate listener fd: %m");
+		exit(1);
+	 }
 
-	/* close all listeners */
-	for (i = 0; i < nservices; i++) {
-	 if (Servicesi.socket > 0) close(Servicesi.socket);
-	 if (Servicesi.stat0 > 0) close(Servicesi.stat0);
-	 if (Servicesi.stat1 > 0) close(Servicesi.stat1);
+	 fcntl_unset(STATUS_FD, FD_CLOEXEC);
+	 fcntl_unset(LISTEN_FD, FD_CLOEXEC);
+
+	 /* close all listeners */
+	 for (i = 0; i < nservices; i++) {
+		xclose(Servicesi.socket);
+		xclose(Servicesi.stat0);
+		xclose(Servicesi.stat1);
+	 }
+	}
+	else {
+	 snprintf(name_env3, sizeof(name_env3), "CYRUS_ISDAEMON=1");
+	 putenv(name_env3);
 	}
 	limit_fds(s->maxfds);
 
@@ -667,7 +851,7 @@
 	snprintf(name_env2, sizeof(name_env2), "CYRUS_ID=%d", s->associate);
 	putenv(name_env2);
 
-	execv(path, s->exec);
+	execv(path, s->exec->data);
 	syslog(LOG_ERR, "couldn't exec %s: %m", path);
 	exit(EX_OSERR);
 
@@ -678,18 +862,17 @@
 	s->nactive++;
 
 	/* add to child table */
-	c = get_centry();
-	c->pid = p;
-	c->service_state = SERVICE_STATE_READY;
+	c = centry_alloc();
+	centry_set_name(c, s->listen ? "SERVICE" : "DAEMON", s->name, path);
 	c->si = si;
-	c->next = ctablep % child_table_size;
-	ctablep % child_table_size = c;
+	centry_set_state(c, SERVICE_STATE_READY);
+	centry_add(c, p);
 	break;
 }
 
 }
 
-void schedule_event(struct event *a)
+static void schedule_event(struct event *a)
 {
 struct event *ptr;
 
@@ -697,13 +880,14 @@
 	fatal("Serious software bug found: schedule_event() called on unnamed event!",
 		EX_SOFTWARE);
 
- if (!schedule || a->mark < schedule->mark) {
+ if (!schedule || timesub(&schedule->mark, &a->mark) < 0.0) {
 	a->next = schedule;
 	schedule = a;
-	
+
 	return;
 }
- for (ptr = schedule; ptr->next && ptr->next->mark <= a->mark; 
+ for (ptr = schedule;
+	 ptr->next && timesub(&a->mark, &ptr->next->mark) <= 0.0;
 	 ptr = ptr->next) ;
 
 /* insert a */
@@ -711,7 +895,7 @@
 ptr->next = a;
 }
 
-void spawn_schedule(time_t now)
+static void spawn_schedule(struct timeval now)
 {
 struct event *a, *b;
 int i;
@@ -721,7 +905,7 @@
 
 a = NULL;
 /* update schedule accordingly */
- while (schedule && schedule->mark <= now) {
+ while (schedule && timesub(&now, &schedule->mark) <= 0.0) {
 	/* delete from schedule, insert into a */
 	struct event *ptr = schedule;
 
@@ -738,6 +922,7 @@
 	/* if a->exec is NULL, we just used the event to wake up,
 	 * so we actually don't need to exec anything at the moment */
 	if(a->exec) {
+	 get_prog(path, sizeof(path), a->exec);
 	 switch (p = fork()) {
 	 case -1:
 		syslog(LOG_CRIT,
@@ -746,67 +931,60 @@
 
 	 case 0:
 		/* Child - Release our pidfile lock. */
-		if(pidfd != -1) close(pidfd);
+		xclose(pidfd);
+
+		set_caps(AFTER_FORK, /*is_master*/1);
 
-		if (become_cyrus() != 0) {
-		 syslog(LOG_ERR, "can't change to the cyrus user");
-		 exit(1);
-		}
-		
 		/* close all listeners */
 		for (i = 0; i < nservices; i++) {
-		 if (Servicesi.socket > 0) close(Servicesi.socket);
-		 if (Servicesi.stat0 > 0) close(Servicesi.stat0);
-		 if (Servicesi.stat1 > 0) close(Servicesi.stat1);
+		 xclose(Servicesi.socket);
+		 xclose(Servicesi.stat0);
+		 xclose(Servicesi.stat1);
 		}
 		limit_fds(256);
-		
-		get_prog(path, sizeof(path), a->exec);
+
 		syslog(LOG_DEBUG, "about to exec %s", path);
-		execv(path, a->exec);
+		execv(path, a->exec->data);
 		syslog(LOG_ERR, "can't exec %s on schedule: %m", path);
 		exit(EX_OSERR);
 		break;
-		
+
 	 default:
 		/* we don't wait for it to complete */
-		
+
 		/* add to child table */
-		c = get_centry();
-		c->pid = p;
-		c->service_state = SERVICE_STATE_READY;
-		c->si = SERVICE_NONE;
-		c->next = ctablep % child_table_size;
-		ctablep % child_table_size = c;
-		
+		c = centry_alloc();
+		centry_set_name(c, "EVENT", a->name, path);
+		centry_set_state(c, SERVICE_STATE_READY);
+		centry_add(c, p);
 		break;
 	 }
 	} /* a->exec */
-	
+
 	/* reschedule as needed */
 	b = a->next;
 	if (a->period) {
 	 if(a->periodic) {
-		a->mark = now + a->period;
+		a->mark = now;
+		a->mark.tv_sec += a->period;
 	 } else {
 		struct tm *tm;
 		int delta;
 		/* Daily Event */
-		while(a->mark <= now) {
-		 a->mark += a->period;
-		}
+		while (timesub(&now, &a->mark) <= 0.0)
+		 a->mark.tv_sec += a->period;
 		/* check for daylight savings fuzz... */
-		tm = localtime(&(a->mark));
+		tm = localtime(&a->mark.tv_sec);
 		if (tm->tm_hour != a->hour || tm->tm_min != a->min) {
 		 /* calculate the same time on the new day */
 		 tm->tm_hour = a->hour;
 		 tm->tm_min = a->min;
-		 delta = mktime(tm) - a->mark;
+		 delta = mktime(tm) - a->mark.tv_sec;
 		 /* bring it within half a period either way */
 		 while (delta > (a->period/2)) delta -= a->period;
 		 while (delta < -(a->period/2)) delta += a->period;
 		 /* update the time */
-		 a->mark += delta;
+		 a->mark.tv_sec += delta;
 		 /* and let us know about the change */
 		 syslog(LOG_NOTICE, "timezone shift for %s - altering schedule by %d seconds", a->name, delta);
 		}
@@ -821,29 +999,22 @@
 }
 }
 
-void reap_child(void)
+static void reap_child(void)
 {
 int status;
 pid_t pid;
 struct centry *c;
 struct service *s;
+ int failed;
 
 while ((pid = waitpid((pid_t) -1, &status, WNOHANG)) > 0) {
-	if (WIFEXITED(status)) {
-	 syslog(LOG_DEBUG, "process %d exited, status %d", pid, 
-		 WEXITSTATUS(status));
-	}
-
-	if (WIFSIGNALED(status)) {
-	 syslog(LOG_ERR, "process %d exited, signaled to death by %d",
-		 pid, WTERMSIG(status));
-	}
 
 	/* account for the child */
-	c = ctablepid % child_table_size;
-	while(c && c->pid != pid) c = c->next;
-	
-	if (c && c->pid == pid) {
+	c = centry_find(pid);
+
+	failed = decode_wait_status(c, pid, status);
+
+	if (c) {
 	 s = ((c->si) != SERVICE_NONE) ? &Servicesc->si : NULL;
 
 	 /* paranoia */
@@ -854,13 +1025,12 @@
 	 case SERVICE_STATE_DEAD:
 		break;
 	 default:
-		syslog(LOG_CRIT, 
-		 "service %s pid %d in ILLEGAL STATE: exited. Serious software bug or memory corruption detected!",
-		 s ? SERVICENAME(s->name) : "unknown", pid);
-		syslog(LOG_DEBUG,
-		 "service %s pid %d in ILLEGAL state: forced to valid UNKNOWN state",
-		 s ? SERVICENAME(s->name) : "unknown", pid);
-		c->service_state = SERVICE_STATE_UNKNOWN;
+		syslog(LOG_CRIT,
+		 "service %s/%s pid %d in ILLEGAL STATE: exited. Serious "
+		 "software bug or memory corruption detected!",
+		 s ? SERVICEPARAM(s->name) : "unknown",
+		 s ? SERVICEPARAM(s->familyname) : "unknown", pid);
+		centry_set_state(c, SERVICE_STATE_UNKNOWN);
 	 }
 	 if (s) {
 	 /* update counters for known services */
@@ -868,53 +1038,66 @@
 		case SERVICE_STATE_READY:
 		 s->nactive--;
 		 s->ready_workers--;
-		 if (!in_shutdown && (WIFSIGNALED(status) ||
-			(WIFEXITED(status) && WEXITSTATUS(status)))) {
-			syslog(LOG_WARNING, 
-			 "service %s pid %d in READY state: terminated abnormally",
-			 SERVICENAME(s->name), pid);
+		 if (!in_shutdown && failed) {
+			syslog(LOG_WARNING,
+			 "service %s/%s pid %d in READY state: "
+			 "terminated abnormally",
+			 SERVICEPARAM(s->name),
+			 SERVICEPARAM(s->familyname), pid);
+			if (++s->nreadyfails >= MAX_READY_FAILS && s->exec) {
+			 syslog(LOG_ERR, "too many failures for "
+				 "service %s/%s, disabling until next SIGHUP",
+				 SERVICEPARAM(s->name),
+				 SERVICEPARAM(s->familyname));
+			 service_forget_exec(s);
+			 xclose(s->socket);
+			}
 		 }
 		 break;
-		 
+
 		case SERVICE_STATE_DEAD:
 		 /* uh? either we got duplicate signals, or we are now MT */
-		 syslog(LOG_WARNING, 
-			 "service %s pid %d in DEAD state: receiving duplicate signals", 
-			 SERVICENAME(s->name), pid);
+		 syslog(LOG_WARNING,
+			 "service %s/%s pid %d in DEAD state: "
+			 "receiving duplicate signals",
+			 SERVICEPARAM(s->name),
+			 SERVICEPARAM(s->familyname), pid);
 		 break;
-		 
+
 		case SERVICE_STATE_BUSY:
 		 s->nactive--;
-		 if (!in_shutdown && (WIFSIGNALED(status) ||
-			(WIFEXITED(status) && WEXITSTATUS(status)))) {
+		 if (!in_shutdown && failed) {
 			syslog(LOG_DEBUG,
-			 "service %s pid %d in BUSY state: terminated abnormally",
-			 SERVICENAME(s->name), pid);
+			 "service %s/%s pid %d in BUSY state: "
+			 "terminated abnormally",
+			 SERVICEPARAM(s->name),
+			 SERVICEPARAM(s->familyname), pid);
 		 }
 		 break;
-		 
+
 		case SERVICE_STATE_UNKNOWN:
 		 s->nactive--;
 		 syslog(LOG_WARNING,
-			 "service %s pid %d in UNKNOWN state: exited",
-			 SERVICENAME(s->name), pid);
+			 "service %s/%s pid %d in UNKNOWN state: exited",
+			 SERVICEPARAM(s->name),
+			 SERVICEPARAM(s->familyname), pid);
 		 break;
 		default:
 		 /* Shouldn't get here */
 		 break;
-		} 
+		}
 	 } else {
-	 	/* children from spawn_schedule (events) or
+		/* children from spawn_schedule (events) or
 		 * children of services removed by reread_conf() */
 		if (c->service_state != SERVICE_STATE_READY) {
 		 syslog(LOG_WARNING,
-			 "unknown service pid %d in state %d: exited (maybe using a service as an event,"
-			 " or a service was removed by SIGHUP?)",
+			 "unknown service pid %d in state %d: exited "
+			 "(maybe using a service as an event, "
+			 "or a service was removed by SIGHUP?)",
 			 pid, c->service_state);
 		}
 	 }
-	 c->service_state = SERVICE_STATE_DEAD;
-	 c->janitor_deadline = time(NULL) + 2;
+	 centry_set_state(c, SERVICE_STATE_DEAD);
 	} else {
 	 /* Are we multithreaded now? we don't know this child */
 	 syslog(LOG_ERR,
@@ -923,185 +1106,218 @@
 	 /* FIXME: is this something we should take lightly? */
 	}
 	if (verbose && c && (c->si != SERVICE_NONE))
-	 syslog(LOG_DEBUG, "service %s now has %d ready workers\n", 
-		 SERVICENAME(Servicesc->si.name),
+	 syslog(LOG_DEBUG, "service %s/%s now has %d ready workers",
+		 SERVICEPARAM(Servicesc->si.name),
+		 SERVICEPARAM(Servicesc->si.familyname),
 		 Servicesc->si.ready_workers);
 }
 }
 
-void init_janitor(void)
+static void init_janitor(struct timeval now)
 {
- struct event *evt = (struct event *) malloc(sizeof(struct event));
- 
- if (!evt) fatal("out of memory", EX_UNAVAILABLE);
- memset(evt, 0, sizeof(struct event));
- 
- gettimeofday(&janitor_mark, NULL);
+ struct event *evt = (struct event *) xzmalloc(sizeof(struct event));
+
+ janitor_mark = now;
 janitor_position = 0;
- 
+
 evt->name = xstrdup("janitor periodic wakeup call");
 evt->period = 10;
 evt->periodic = 1;
- evt->mark = time(NULL) + 2;
+ evt->mark = janitor_mark;
 schedule_event(evt);
 }
 
-void child_janitor(time_t now)
+static void child_janitor(struct timeval now)
 {
 int i;
 struct centry **p;
 struct centry *c;
- struct timeval rightnow;
- 
+
 /* Estimate the number of entries to clean up in this sweep */
- gettimeofday(&rightnow, NULL);
- if (rightnow.tv_sec > janitor_mark.tv_sec + 1) {
+ if (now.tv_sec > janitor_mark.tv_sec + 1) {
 	/* overflow protection */
 	i = child_table_size;
 } else {
 	double n;
-	
-	n = child_table_size * janitor_frequency * 
-	 (double) ((rightnow.tv_sec - janitor_mark.tv_sec) * 1000000 +
-	 rightnow.tv_usec - janitor_mark.tv_usec ) / 1000000;
+
+	n = child_table_size * janitor_frequency * timesub(&janitor_mark, &now);
 	if (n < child_table_size) {
 	 i = n;
 	} else {
 	 i = child_table_size;
 	}
 }
- 
+
 while (i-- > 0) {
 	p = &ctablejanitor_position++;
 	janitor_position = janitor_position % child_table_size;
 	while (*p) {
 	 c = *p;
 	 if (c->service_state == SERVICE_STATE_DEAD) {
-		if (c->janitor_deadline < now) {
+		if (c->janitor_deadline < now.tv_sec) {
 		 *p = c->next;
-		 c->next = cfreelist;
-		 cfreelist = c;
+		 centry_free(c);
 		} else {
 		 p = &((*p)->next);
 		}
 	 } else {
+		time_t delay = (c->sighuptime != (time_t)-1) ?
+		 time(NULL) - c->sighuptime : 0;
+
+		if (delay >= 30) {
+		 /* client not yet logged out ? */
+		 struct service *s = ((c->si) != SERVICE_NONE) ?
+			&Servicesc->si : NULL;
+
+		 syslog(LOG_INFO, "service %s/%s pid %d in state %d has not "
+			"yet been recycled since SIGHUP was sent (%ds ago)",
+			s ? SERVICEPARAM(s->name) : "unknown",
+			s ? SERVICEPARAM(s->familyname) : "unknown",
+			c->pid, c->service_state, (int)delay);
+
+		 /* no need to log it more than once */
+		 c->sighuptime = (time_t)-1;
+		}
 		p = &((*p)->next);
 	 }
 	}
 }
 }
 
-/* Allow a clean shutdown on SIGQUIT */
-void sigquit_handler(int sig __attribute__((unused)))
-{
- struct sigaction action;
-
- /* Ignore SIGQUIT ourselves */
- sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
- action.sa_handler = SIG_IGN;
- if (sigaction(SIGQUIT, &action, (struct sigaction *) 0) < 0) {
-	syslog(LOG_ERR, "sigaction: %m");
- }
+/* Allow a clean shutdown on SIGQUIT, SIGTERM or SIGINT */
+static volatile sig_atomic_t gotsigquit = 0;
 
- /* send our process group a SIGQUIT */
- if (kill(0, SIGQUIT) < 0) {
-	syslog(LOG_ERR, "sigquit_handler: kill(0, SIGQUIT): %m");
- }
+static void sigquit_handler(int sig __attribute__((unused)))
+{
+ gotsigquit = 1;
+}
 
+static void begin_shutdown(void)
+{
 /* Set a flag so main loop knows to shut down when
- all children have exited */
+ all children have exited. Note, we will be called
+ twice as we send SIGTERM to our own process group. */
+ if (in_shutdown)
+	return;
 in_shutdown = 1;
+ syslog(LOG_INFO, "attempting clean shutdown on signal");
+
+#if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
+ /* tell master agent we're exiting */
+ snmp_shutdown("cyrusMaster");
+#endif
 
- syslog(LOG_INFO, "attempting clean shutdown on SIGQUIT");
+ /* send our process group a SIGTERM */
+ if (kill(0, SIGTERM) < 0) {
+	syslog(LOG_ERR, "begin_shutdown: kill(0, SIGTERM): %m");
+ }
 }
 
 static volatile sig_atomic_t gotsigchld = 0;
 
-void sigchld_handler(int sig __attribute__((unused)))
+static void sigchld_handler(int sig __attribute__((unused)))
 {
 gotsigchld = 1;
 }
 
 static volatile int gotsighup = 0;
 
-void sighup_handler(int sig __attribute__((unused)))
+static void sighup_handler(int sig __attribute__((unused)))
 {
 gotsighup = 1;
 }
 
-void sigterm_handler(int sig __attribute__((unused)))
-{
- struct sigaction action;
-
- /* send all the other processes SIGTERM, then exit */
- sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
- action.sa_handler = SIG_IGN;
- if (sigaction(SIGTERM, &action, (struct sigaction *) 0) < 0) {
-	syslog(LOG_ERR, "sigaction: %m");
-	exit(1);
- }
- /* kill my process group */
- if (kill(0, SIGTERM) < 0) {
-	syslog(LOG_ERR, "sigterm_handler: kill(0, SIGTERM): %m");
- }
-
-#if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
- /* tell master agent we're exiting */
- snmp_shutdown("cyrusMaster");
-#endif
-
- syslog(LOG_INFO, "exiting on SIGTERM/SIGINT");
- exit(0);
-}
-
-void sigalrm_handler(int sig __attribute__((unused)))
+static void sigalrm_handler(int sig __attribute__((unused)))
 {
 return;
 }
 
-void sighandler_setup(void)
+static void sighandler_setup(void)
 {
 struct sigaction action;
- 
+ sigset_t siglist;
+
+ memset(&siglist, 0, sizeof(siglist));
+ sigemptyset(&siglist);
+ sigaddset(&siglist, SIGHUP);
+ sigaddset(&siglist, SIGALRM);
+ sigaddset(&siglist, SIGQUIT);
+ sigaddset(&siglist, SIGTERM);
+ sigaddset(&siglist, SIGINT);
+ sigaddset(&siglist, SIGCHLD);
+ sigprocmask(SIG_UNBLOCK, &siglist, NULL);
+
+ memset(&action, 0, sizeof(action));
 sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
 
 action.sa_handler = sighup_handler;
 #ifdef SA_RESTART
 action.sa_flags |= SA_RESTART;
 #endif
- if (sigaction(SIGHUP, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGHUP: %m", 1);
- }
+ if (sigaction(SIGHUP, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGHUP: %m");
 
 action.sa_handler = sigalrm_handler;
- if (sigaction(SIGALRM, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGALRM: %m", 1);
- }
+ if (sigaction(SIGALRM, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGALRM: %m");
 
- /* Allow a clean shutdown on SIGQUIT */
+ /* Allow a clean shutdown on any of SIGQUIT, SIGINT or SIGTERM */
 action.sa_handler = sigquit_handler;
- if (sigaction(SIGQUIT, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGQUIT: %m", 1);
- }
+ if (sigaction(SIGQUIT, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGQUIT: %m");
+ if (sigaction(SIGTERM, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGTERM: %m");
+ if (sigaction(SIGINT, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGINT: %m");
 
- /* Handle SIGTERM and SIGINT the same way -- kill
- * off our children! */
- action.sa_handler = sigterm_handler;
- if (sigaction(SIGTERM, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGTERM: %m", 1);
+ action.sa_flags |= SA_NOCLDSTOP;
+ action.sa_handler = sigchld_handler;
+ if (sigaction(SIGCHLD, &action, NULL) < 0)
+	fatalf(1, "unable to install signal handler for SIGCHLD: %m");
+
+#if HAVE_PSELECT
+ /* block SIGCHLD, and set up pselect_sigmask so SIGCHLD
+ * will be unblocked again inside pselect(). Ditto SIGQUIT. */
+ sigemptyset(&siglist);
+ sigaddset(&siglist, SIGCHLD);
+ sigaddset(&siglist, SIGQUIT);
+ sigaddset(&siglist, SIGINT);
+ sigaddset(&siglist, SIGTERM);
+ sigprocmask(SIG_BLOCK, &siglist, &pselect_sigmask);
+#endif
+}
+
+static void child_sighandler_setup(void)
+{
+#if HAVE_PSELECT
+ /*
+ * We need to explicitly reset our SIGQUIT handler to the default
+ * action. This happens at execv() time, but in the small window
+ * between fork() and execv() any SIGQUIT signal delivered will be
+ * caught, and the gotsigquit flag set, but that flag is then
+ * completely ignored. Ditto SIGINT and SIGTERM.
+ */
+ struct sigaction action;
+
+ memset(&action, 0, sizeof(action));
+ sigemptyset(&action.sa_mask);
+ action.sa_handler = SIG_DFL;
+ if (sigaction(SIGQUIT, &action, NULL) < 0) {
+	syslog(LOG_ERR, "unable to remove signal handler for SIGQUIT: %m");
+	exit(EX_TEMPFAIL);
 }
 if (sigaction(SIGINT, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGINT: %m", 1);
+	syslog(LOG_ERR, "unable to remove signal handler for SIGINT: %m");
+	exit(EX_TEMPFAIL);
 }
-
- action.sa_flags |= SA_NOCLDSTOP;
- action.sa_handler = sigchld_handler;
- if (sigaction(SIGCHLD, &action, NULL) < 0) {
-	fatal("unable to install signal handler for SIGCHLD: %m", 1);
+ if (sigaction(SIGTERM, &action, NULL) < 0) {
+	syslog(LOG_ERR, "unable to remove signal handler for SIGTERM: %m");
+	exit(EX_TEMPFAIL);
 }
+
+ /* Unblock SIGCHLD et al in the child */
+ sigprocmask(SIG_SETMASK, &pselect_sigmask, NULL);
+#endif
 }
 
 /*
@@ -1111,16 +1327,19 @@
 * 1 if no msg available
 * 2 if bad message received (incorrectly sized)
 * -1 on error (errno set)
+ *
+ * TODO: should use retry_read() which has almost the
+ * exact same semantics apart from the return value.
 */
-int read_msg(int fd, struct notify_message *msg)
+static int read_msg(int fd, struct notify_message *msg)
 {
- ssize_t r;
+ ssize_t r = 0;
 size_t off = 0;
 int s = sizeof(struct notify_message);
 
 while (s > 0) {
 do
- r = read(fd, msg + off, s);
+	 r = read(fd, ((char *)msg) + off, s);
 while ((r == -1) && (errno == EINTR));
 if (r <= 0) break;
 s -= r;
@@ -1134,18 +1353,16 @@
 return 0;
 }
 
-void process_msg(const int si, struct notify_message *msg) 
+static void process_msg(int si, struct notify_message *msg)
 {
 struct centry *c;
 /* si must NOT point to an invalid service */
- struct service * const s = &Servicessi;;
+ struct service *s = &Servicessi;
+
+ c = centry_find(msg->service_pid);
 
- /* Search hash table with linked list for pid */
- c = ctablemsg->service_pid % child_table_size;
- while (c && c->pid != msg->service_pid) c = c->next;
- 
 /* Did we find it? */
- if (!c || c->pid != msg->service_pid) {
+ if (!c) {
 	/* If we don't know about the child, that means it has expired from
 	 * the child list, due to large message delivery delays. This is
 	 * indeed possible, although it is rare (Debian bug report).
@@ -1153,31 +1370,30 @@
 	 * Note that this analysis depends on master's single-threaded
 	 * nature */
 	syslog(LOG_WARNING,
-		"service %s pid %d: receiving messages from long dead children",
-	 SERVICENAME(s->name), msg->service_pid);
+		"service %s/%s pid %d: receiving messages from long dead children",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), msg->service_pid);
 	/* re-add child to list */
-	c = get_centry();
+	c = centry_alloc();
+	centry_set_name(c, "ZOMBIE", NULL, NULL);
 	c->si = si;
-	c->pid = msg->service_pid;
-	c->service_state = SERVICE_STATE_DEAD;
-	c->janitor_deadline = time(NULL) + 2;
-	c->next = ctablec->pid % child_table_size;
-	ctablec->pid % child_table_size = c;
+	centry_set_state(c, SERVICE_STATE_DEAD);
+	centry_add(c, msg->service_pid);
 }
- 
+
 /* paranoia */
 if (si != c->si) {
-	syslog(LOG_ERR, 
-	 "service %s pid %d: changing from service %s due to received message",
-	 SERVICENAME(s->name), c->pid,
-	 ((c->si != SERVICE_NONE && Servicesc->si.name) ? Servicesc->si.name : "unknown"));
+	syslog(LOG_ERR,
+	 "service %s/%s pid %d: changing from service %s/%s due to received message",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid,
+	 ((c->si != SERVICE_NONE) ? SERVICEPARAM(Servicesc->si.name) : "unknown"),
+	 ((c->si != SERVICE_NONE) ? SERVICEPARAM(Servicesc->si.familyname) : "unknown"));
 	c->si = si;
 }
 switch (c->service_state) {
 case SERVICE_STATE_UNKNOWN:
-	syslog(LOG_WARNING, 
-	 "service %s pid %d in UNKNOWN state: processing message 0x%x",
-	 SERVICENAME(s->name), c->pid, msg->message);
+	syslog(LOG_WARNING,
+	 "service %s/%s pid %d in UNKNOWN state: processing message 0x%x",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid, msg->message);
 	break;
 case SERVICE_STATE_READY:
 case SERVICE_STATE_BUSY:
@@ -1185,15 +1401,12 @@
 	break;
 default:
 	syslog(LOG_CRIT,
-	 "service %s pid %d in ILLEGAL state: detected. Serious software bug or memory corruption uncloaked while processing message 0x%x from child!",
-	 SERVICENAME(s->name), c->pid, msg->message);
-	syslog(LOG_DEBUG,
-	 "service %s pid %d in ILLEGAL state: forced to valid UNKNOWN state",
-	 SERVICENAME(s->name), c->pid);
-	c->service_state = SERVICE_STATE_UNKNOWN;
+	 "service %s/%s pid %d in ILLEGAL state: detected. Serious software bug or memory corruption uncloaked while processing message 0x%x from child!",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid, msg->message);
+	centry_set_state(c, SERVICE_STATE_UNKNOWN);
 	break;
 }
- 
+
 /* process message, according to state machine */
 switch (msg->message) {
 case MASTER_SERVICE_AVAILABLE:
@@ -1201,25 +1414,25 @@
 	case SERVICE_STATE_READY:
 	 /* duplicate message? */
 	 syslog(LOG_WARNING,
-		 "service %s pid %d in READY state: sent available message but it is already ready",
-		 SERVICENAME(s->name), c->pid);
+		 "service %s/%s pid %d in READY state: sent available message but it is already ready",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
-	 
+
 	case SERVICE_STATE_UNKNOWN:
 	 /* since state is unknwon, error in non-DoS way, i.e.
 	 * we don't increment ready_workers */
 	 syslog(LOG_DEBUG,
-		 "service %s pid %d in UNKNOWN state: now available and in READY state",
-		 SERVICENAME(s->name), c->pid);
-	 c->service_state = SERVICE_STATE_READY;
+		 "service %s/%s pid %d in UNKNOWN state: now available and in READY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
+	 centry_set_state(c, SERVICE_STATE_READY);
 	 break;
-	 
+
 	case SERVICE_STATE_BUSY:
-	 if (verbose) 
+	 if (verbose)
 		syslog(LOG_DEBUG,
-		 "service %s pid %d in BUSY state: now available and in READY state",
-		 SERVICENAME(s->name), c->pid);
-	 c->service_state = SERVICE_STATE_READY;
+		 "service %s/%s pid %d in BUSY state: now available and in READY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
+	 centry_set_state(c, SERVICE_STATE_READY);
 	 s->ready_workers++;
 	 break;
 
@@ -1238,23 +1451,23 @@
 	case SERVICE_STATE_BUSY:
 	 /* duplicate message? */
 	 syslog(LOG_WARNING,
-		 "service %s pid %d in BUSY state: sent unavailable message but it is already busy",
-		 SERVICENAME(s->name), c->pid);
+		 "service %s/%s pid %d in BUSY state: sent unavailable message but it is already busy",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
-	 
+
 	case SERVICE_STATE_UNKNOWN:
 	 syslog(LOG_DEBUG,
-		 "service %s pid %d in UNKNOWN state: now unavailable and in BUSY state",
-		 SERVICENAME(s->name), c->pid);
-	 c->service_state = SERVICE_STATE_BUSY;
+		 "service %s/%s pid %d in UNKNOWN state: now unavailable and in BUSY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
+	 centry_set_state(c, SERVICE_STATE_BUSY);
 	 break;
-	 
+
 	case SERVICE_STATE_READY:
 	 if (verbose)
 		syslog(LOG_DEBUG,
-		 "service %s pid %d in READY state: now unavailable and in BUSY state",
-		 SERVICENAME(s->name), c->pid);
-	 c->service_state = SERVICE_STATE_BUSY;
+		 "service %s/%s pid %d in READY state: now unavailable and in BUSY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
+	 centry_set_state(c, SERVICE_STATE_BUSY);
 	 s->ready_workers--;
 	 break;
 
@@ -1274,27 +1487,28 @@
 	 s->nconnections++;
 	 if (verbose)
 		syslog(LOG_DEBUG,
-		 "service %s pid %d in BUSY state: now serving connection",
-		 SERVICENAME(s->name), c->pid);
+		 "service %s/%s pid %d in BUSY state: now serving connection",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
-	 
+
 	case SERVICE_STATE_UNKNOWN:
 	 s->nconnections++;
-	 c->service_state = SERVICE_STATE_BUSY;
+	 centry_set_state(c, SERVICE_STATE_BUSY);
 	 syslog(LOG_DEBUG,
-		 "service %s pid %d in UNKNOWN state: now in BUSY state and serving connection",
-		 SERVICENAME(s->name), c->pid);
+		 "service %s/%s pid %d in UNKNOWN state: now in BUSY state and serving connection",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
-	 
+
 	case SERVICE_STATE_READY:
-	 syslog(LOG_ERR, 
-		 "service %s pid %d in READY state: reported new connection, forced to BUSY state",
-		 SERVICENAME(s->name), c->pid);
+	 syslog(LOG_ERR,
+		 "service %s/%s pid %d in READY state: reported new connection, forced to BUSY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 /* be resilient on face of a bogon source, so lets err to the side
 	 * of non-denial-of-service */
-	 c->service_state = SERVICE_STATE_BUSY;
+	 centry_set_state(c, SERVICE_STATE_BUSY);
 	 s->nconnections++;
 	 s->ready_workers--;
+	 break;
 
 	case SERVICE_STATE_DEAD:
 	 /* echoes from the past... do the accounting */
@@ -1306,34 +1520,34 @@
 	 break;
 	}
 	break;
-	
+
 case MASTER_SERVICE_CONNECTION_MULTI:
 	switch (c->service_state) {
 	case SERVICE_STATE_READY:
 	 s->nconnections++;
 	 if (verbose)
-		syslog(LOG_DEBUG, 
-		 "service %s pid %d in READY state: serving one more multi-threaded connection",
-		 SERVICENAME(s->name), c->pid);
+		syslog(LOG_DEBUG,
+		 "service %s/%s pid %d in READY state: serving one more multi-threaded connection",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
-	 
+
 	case SERVICE_STATE_BUSY:
-	 syslog(LOG_ERR, 
-		 "service %s pid %d in BUSY state: serving one more multi-threaded connection, forced to READY state",
-		 SERVICENAME(s->name), c->pid);
+	 syslog(LOG_ERR,
+		 "service %s/%s pid %d in BUSY state: serving one more multi-threaded connection, forced to READY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 /* be resilient on face of a bogon source, so lets err to the side
 	 * of non-denial-of-service */
-	 c->service_state = SERVICE_STATE_READY;
+	 centry_set_state(c, SERVICE_STATE_READY);
 	 s->nconnections++;
 	 s->ready_workers++;
 	 break;
-	 
+
 	case SERVICE_STATE_UNKNOWN:
 	 s->nconnections++;
-	 c->service_state = SERVICE_STATE_READY;
+	 centry_set_state(c, SERVICE_STATE_READY);
 	 syslog(LOG_ERR,
-		 "service %s pid %d in UNKNOWN state: serving one more multi-threaded connection, forced to READY state",
-		 SERVICENAME(s->name), c->pid);
+		 "service %s/%s pid %d in UNKNOWN state: serving one more multi-threaded connection, forced to READY state",
+		 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid);
 	 break;
 
 	case SERVICE_STATE_DEAD:
@@ -1346,64 +1560,118 @@
 	 break;
 	}
 	break;
-	
+
 default:
-	syslog(LOG_CRIT, "service %s pid %d: Software bug: unrecognized message 0x%x", 
-	 SERVICENAME(s->name), c->pid, msg->message);
+	syslog(LOG_CRIT, "service %s/%s pid %d: Software bug: unrecognized message 0x%x",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), c->pid, msg->message);
 	break;
 }
 
 if (verbose)
-	syslog(LOG_DEBUG, "service %s now has %d ready workers\n", 
-	 SERVICENAME(s->name), s->ready_workers);
+	syslog(LOG_DEBUG, "service %s/%s now has %d ready workers",
+	 SERVICEPARAM(s->name), SERVICEPARAM(s->familyname), s->ready_workers);
 }
 
-static char **tokenize(char *p)
+static void add_start(const char *name, struct entry *e,
+		 void *rock __attribute__((unused)))
 {
- char **tokens = NULL; /* allocated in increments of 10 */
- int i = 0;
+ const char *cmd = masterconf_getstring(e, "cmd", "");
+ strarray_t *tok;
 
- if (!p || !*p) return NULL; /* sanity check */
- while (*p) {
-	while (*p && Uisspace(*p)) p++; /* skip whitespace */
+ if (!strcmp(cmd,""))
+	fatalf(EX_CONFIG, "unable to find command for %s", name);
 
-	if (!(i % 10)) tokens = xrealloc(tokens, (i+10) * sizeof(char *));
-
-	/* got a token */
-	tokensi++ = p;
-	while (*p && !Uisspace(*p)) p++;
-
-	/* p is whitespace or end of cmd */
-	if (*p) *p++ = '\0';
- }
- /* add a NULL on the end */
- if (!(i % 10)) tokens = xrealloc(tokens, (i+1) * sizeof(char *));
- if (!tokens) return NULL;
- tokensi = NULL;
-
- return tokens;
+ tok = strarray_split(cmd, NULL, 0);
+ run_startup(name, tok);
+ strarray_free(tok);
 }
 
-void add_start(const char *name, struct entry *e,
-	 void *rock __attribute__((unused)))
+static void add_daemon(const char *name, struct entry *e, void *rock)
 {
+ int ignore_err = rock ? 1 : 0;
 char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
- char buf256;
- char **tok;
+ rlim_t maxfds = (rlim_t) masterconf_getint(e, "maxfds", 256);
+ int maxforkrate = masterconf_getint(e, "maxforkrate", 0);
+ int reconfig = 0;
+ int i;
+
+ if (maxforkrate == 0) maxforkrate = 10; /* reasonable safety */
+
+ if (!strcmp(cmd, "")) {
+	char buf256;
+	snprintf(buf, sizeof(buf),
+		 "unable to find command or port for service '%s'", name);
+
+	if (ignore_err) {
+	 syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+	 goto done;
+	}
 
- if (!strcmp(cmd,"")) {
-	snprintf(buf, sizeof(buf), "unable to find command for %s", name);
 	fatal(buf, EX_CONFIG);
 }
 
- tok = tokenize(cmd);
- if (!tok) fatal("out of memory", EX_UNAVAILABLE);
- run_startup(tok);
- free(tok);
+ /* see if we have an existing entry that can be reused */
+ for (i = 0; i < nservices; i++) {
+	/* skip non-primary instances */
+	if (Servicesi.associate > 0)
+	 continue;
+
+	if (!strcmpsafe(Servicesi.name, name) && Servicesi.exec) {
+	 /* we have duplicate service names in the config file */
+	 char buf256;
+	 snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
+
+	 if (ignore_err) {
+		syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+		goto done;
+	 }
+
+	 fatal(buf, EX_CONFIG);
+	}
+
+	/* must have empty/same service name, listen and proto */
+	if (!Servicesi.name || !strcmp(Servicesi.name, name))
+	 break;
+ }
+
+ if (i == nservices) {
+	/* we don't have an existing one, so create a new service */
+	struct service *s = service_add(NULL);
+	gettimeofday(&s->last_interval_start, 0);
+ }
+ else reconfig = 1;
+
+ if (!Servicesi.name) Servicesi.name = xstrdup(name);
+
+ strarray_free(Servicesi.exec);
+ Servicesi.exec = strarray_split(cmd, NULL, 0);
+
+ /* is this daemon actually there? */
+ if (!verify_service_file(Servicesi.exec)) {
+	fatalf(EX_CONFIG,
+		 "cannot find executable for daemon '%s'", name);
+	/* if it is not, we're misconfigured, die. */
+ }
+
+ Servicesi.maxforkrate = maxforkrate;
+ Servicesi.maxfds = maxfds;
+ Servicesi.babysit = 1;
+ Servicesi.max_workers = 1;
+ Servicesi.desired_workers = 1;
+ Servicesi.familyname = "daemon";
+
+ if (verbose > 2)
+	syslog(LOG_DEBUG, "%s: daemon '%s' (%s, %d)",
+	 reconfig ? "reconfig" : "add",
+	 Servicesi.name, cmd,
+	 (int) Servicesi.maxfds);
+
+done:
 free(cmd);
+ return;
 }
 
-void add_service(const char *name, struct entry *e, void *rock)
+static void add_service(const char *name, struct entry *e, void *rock)
 {
 int ignore_err = rock ? 1 : 0;
 char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
@@ -1438,6 +1706,20 @@
 	/* skip non-primary instances */
 	if (Servicesi.associate > 0)
 	 continue;
+
+	if (!strcmpsafe(Servicesi.name, name) && Servicesi.exec) {
+	 /* we have duplicate service names in the config file */
+	 char buf256;
+	 snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
+
+	 if (ignore_err) {
+		syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+		goto done;
+	 }
+
+	 fatal(buf, EX_CONFIG);
+	}
+
 	/* must have empty/same service name, listen and proto */
 	if ((!Servicesi.name || !strcmp(Servicesi.name, name)) &&
 	 (!Servicesi.listen || !strcmp(Servicesi.listen, listen)) &&
@@ -1445,32 +1727,12 @@
 	 break;
 }
 
- /* we have duplicate service names in the config file */
- if ((i < nservices) && Servicesi.exec) {
-	char buf256;
-	snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
-
-	if (ignore_err) {
-	 syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
-	 goto done;
-	}
-
-	fatal(buf, EX_CONFIG);
- }
- 
 if (i == nservices) {
 	/* either we don't have an existing entry or we are changing
 	 * the port parameters, so create a new service
 	 */
-	if (nservices == allocservices) {
-	 if (allocservices > SERVICE_MAX - 5)
-		fatal("out of service structures, please restart", EX_UNAVAILABLE);
-	 Services = xrealloc(Services, 
-			 (allocservices+=5) * sizeof(struct service));
-	}
-	memset(&Servicesnservices++, 0, sizeof(struct service));
-
-	Servicesi.last_interval_start = time(NULL);
+	struct service *s = service_add(NULL);
+	gettimeofday(&s->last_interval_start, 0);
 }
 else if (Servicesi.listen) reconfig = 1;
 
@@ -1482,16 +1744,14 @@
 Servicesi.proto = proto;
 proto = NULL; /* avoid freeing it */
 
- Servicesi.exec = tokenize(cmd);
- if (!Servicesi.exec) fatal("out of memory", EX_UNAVAILABLE);
+ strarray_free(Servicesi.exec);
+ Servicesi.exec = strarray_split(cmd, NULL, 0);
 
 /* is this service actually there? */
 if (!verify_service_file(Servicesi.exec)) {
-	char buf1024;
-	snprintf(buf, sizeof(buf),
+	fatalf(EX_CONFIG,
 		 "cannot find executable for service '%s'", name);
 	/* if it is not, we're misconfigured, die. */
-	fatal(buf, EX_CONFIG);
 }
 
 Servicesi.maxforkrate = maxforkrate;
@@ -1512,7 +1772,7 @@
 	Servicesi.desired_workers = prefork;
 	Servicesi.max_workers = 1;
 }
- 
+
 if (reconfig) {
 	/* reconfiguring an existing service, update any other instances */
 	for (j = 0; j < nservices; j++) {
@@ -1535,8 +1795,6 @@
 	 Servicesi.desired_workers,
 	 Servicesi.max_workers,
 	 (int) Servicesi.maxfds);
- 
- cmd = NULL; /* avoid freeing it */
 
 done:
 free(cmd);
@@ -1546,15 +1804,19 @@
 return;
 }
 
-void add_event(const char *name, struct entry *e, void *rock)
+static void add_event(const char *name, struct entry *e, void *rock)
 {
 int ignore_err = rock ? 1 : 0;
+ /* Note: masterconf_getstring() shares a static buffer with
+ * masterconf_getint() so we *must* strdup here */
 char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
 int period = 60 * masterconf_getint(e, "period", 0);
 int at = masterconf_getint(e, "at", -1), hour, min;
- time_t now = time(NULL);
+ struct timeval now;
 struct event *evt;
 
+ gettimeofday(&now, 0);
+
 if (!strcmp(cmd,"")) {
 	char buf256;
 	snprintf(buf, sizeof(buf),
@@ -1562,17 +1824,18 @@
 
 	if (ignore_err) {
 	 syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+	 free(cmd);
 	 return;
 	}
 
 	fatal(buf, EX_CONFIG);
 }
- 
- evt = (struct event *) xmalloc(sizeof(struct event));
+
+ evt = (struct event *) xzmalloc(sizeof(struct event));
 evt->name = xstrdup(name);
 
 if (at >= 0 && ((hour = at / 100) <= 23) && ((min = at % 100) <= 59)) {
-	struct tm *tm = localtime(&now);
+	struct tm *tm = localtime(&now.tv_sec);
 
 	period = 86400; /* 24 hours */
 	evt->periodic = 0;
@@ -1581,9 +1844,11 @@
 	tm->tm_hour = hour;
 	tm->tm_min = min;
 	tm->tm_sec = 0;
-	if ((evt->mark = mktime(tm)) < now) {
+	evt->mark.tv_sec = mktime(tm);
+	evt->mark.tv_usec = 0;
+	if (timesub(&now, &evt->mark) < 0.0) {
 	 /* already missed it, so schedule for next day */
-	 evt->mark += period;
+	 evt->mark.tv_sec += period;
 	}
 }
 else {
@@ -1592,8 +1857,7 @@
 }
 evt->period = period;
 
- evt->exec = tokenize(cmd);
- if (!evt->exec) fatal("out of memory", EX_UNAVAILABLE);
+ evt->exec = strarray_splitm(cmd, NULL, 0);
 
 schedule_event(evt);
 }
@@ -1607,10 +1871,9 @@
 # define RLIMIT_NUMFDS RLIMIT_OFILE
 # endif
 #endif
-void limit_fds(rlim_t x)
+static void limit_fds(rlim_t x)
 {
 struct rlimit rl;
- int r;
 
 rl.rlim_cur = x;
 rl.rlim_max = x;
@@ -1630,7 +1893,7 @@
 
 
 if (verbose > 1) {
-	r = getrlimit(RLIMIT_NUMFDS, &rl);
+	getrlimit(RLIMIT_NUMFDS, &rl);
 	syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld", rl.rlim_cur,
 	 rl.rlim_max);
 }
@@ -1639,12 +1902,12 @@
 #endif /* HAVE_GETRLIMIT */
 }
 #else
-void limit_fds(rlim_t x)
+static void limit_fds(rlim_t x)
 {
 }
 #endif /* HAVE_SETRLIMIT */
 
-void reread_conf(void)
+static void reread_conf(struct timeval now)
 {
 int i,j;
 struct event *ptr;
@@ -1652,18 +1915,39 @@
 
 /* disable all services -
 they will be re-enabled if they appear in config file */
- for (i = 0; i < nservices; i++) Servicesi.exec = NULL;
+ for (i = 0; i < nservices; i++) service_forget_exec(&Servicesi);
 
 /* read services */
 masterconf_getsection("SERVICES", &add_service, (void*) 1);
+ masterconf_getsection("DAEMON", &add_daemon, (void *)1);
 
 for (i = 0; i < nservices; i++) {
-	if (!Servicesi.exec && Servicesi.socket) {
+	/* Send SIGHUP to all children:
+	 * - for services being added, there are still no children
+	 * - for services being disabled, we need to terminate the children
+	 * - otherwise (remaining services) we want to recycle children
+	 * Note that for services being disabled, it is important to first
+	 * signal them before shutting down their socket.
+	 */
+	for (j = 0 ; j < child_table_size ; j++ ) {
+	 c = ctablej;
+	 while (c != NULL) {
+		if ((c->si == i) &&
+		 (c->service_state != SERVICE_STATE_DEAD)) {
+		 kill(c->pid, SIGHUP);
+		 c->sighuptime = time(NULL);
+		}
+		c = c->next;
+	 }
+	}
+
+	if (!Servicesi.exec && (Servicesi.socket >= 0)) {
 	 /* cleanup newly disabled services */
 
 	 if (verbose > 2)
-		syslog(LOG_DEBUG, "disable: service %s socket %d pipe %d %d",
-		 Servicesi.name, Servicesi.socket,
+		syslog(LOG_DEBUG, "disable: service %s/%s socket %d pipe %d %d",
+		 Servicesi.name, Servicesi.familyname,
+		 Servicesi.socket,
 		 Servicesi.stat0, Servicesi.stat1);
 
 	 /* Only free the service info on the primary */
@@ -1675,32 +1959,18 @@
 	 Servicesi.proto = NULL;
 	 Servicesi.desired_workers = 0;
 
-	 /* send SIGHUP to all children */
-	 for (j = 0 ; j < child_table_size ; j++ ) {
-		c = ctablej;
-		while (c != NULL) {
-		 if ((c->si == i) &&
-			(c->service_state != SERVICE_STATE_DEAD)) {
-			kill(c->pid, SIGHUP);
-		 }
-		 c = c->next;
-		}
-	 }
-
 	 /* close all listeners */
-	 if (Servicesi.socket > 0) {
-		shutdown(Servicesi.socket, SHUT_RDWR);
-		close(Servicesi.socket);
-	 }
-	 Servicesi.socket = 0;
+	 shutdown(Servicesi.socket, SHUT_RDWR);
+	 xclose(Servicesi.socket);
 	}
-	else if (Servicesi.exec && !Servicesi.socket) {
+	else if (Servicesi.exec && (Servicesi.socket < 0)) {
 	 /* initialize new services */
 
 	 service_create(&Servicesi);
 	 if (verbose > 2)
-		syslog(LOG_DEBUG, "init: service %s socket %d pipe %d %d",
-		 Servicesi.name, Servicesi.socket,
+		syslog(LOG_DEBUG, "init: service %s/%s socket %d pipe %d %d",
+		 Servicesi.name, Servicesi.familyname,
+		 Servicesi.socket,
 		 Servicesi.stat0, Servicesi.stat1);
 	}
 }
@@ -1717,7 +1987,7 @@
 masterconf_getsection("EVENTS", &add_event, (void*) 1);
 
 /* reinit child janitor */
- init_janitor();
+ init_janitor(now);
 
 /* send some feedback to admin */
 syslog(LOG_NOTICE,
@@ -1727,38 +1997,38 @@
 
 int main(int argc, char **argv)
 {
- const char *default_pidfile = MASTER_PIDFILE;
- const char *lock_suffix = ".lock";
+ static const char lock_suffix = ".lock";
 
- const char *pidfile = default_pidfile;
+ const char *pidfile = MASTER_PIDFILE;
 char *pidfile_lock = NULL;
 
 int startup_pipe2 = { -1, -1 };
 int pidlock_fd = -1;
 
 int i, opt, close_std = 1, daemon_mode = 0;
- extern int optind;
+ const char *error_log = NULL;
 extern char *optarg;
 
 char *alt_config = NULL;
- 
+
 int fd;
 fd_set rfds;
 char *p = NULL;
+ int r = 0;
 
 #ifdef HAVE_NETSNMP
 char *agentxsocket = NULL;
 int agentxpinginterval = -1;
 #endif
 
- time_t now;
+ struct timeval now;
 
 p = getenv("CYRUS_VERBOSE");
 if (p) verbose = atoi(p) + 1;
 #ifdef HAVE_NETSNMP
- while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:P:x:")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:L:M:p:l:Ddj:P:x:")) != EOF) {
 #else
- while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:L:M:p:l:Ddj:")) != EOF) {
 #endif
 	switch (opt) {
 	case 'C': /* alt imapd.conf file */
@@ -1777,22 +2047,22 @@
 	 break;
 	case 'd':
 	 /* Daemon Mode */
-	 if(!close_std)
-		fatal("Unable to both be debug and daemon mode", EX_CONFIG);
 	 daemon_mode = 1;
 	 break;
 	case 'D':
 	 /* Debug Mode */
-	 if(daemon_mode)
-		fatal("Unable to be both debug and daemon mode", EX_CONFIG);
 	 close_std = 0;
 	 break;
+	case 'L':
+	 /* error log */
+	 error_log = optarg;
+	 break;
 	case 'j':
 	 /* Janitor frequency */
 	 janitor_frequency = atoi(optarg);
 	 if(janitor_frequency < 1)
 		fatal("The janitor period must be at least 1 second", EX_CONFIG);
-	 break; 
+	 break;
 #ifdef HAVE_NETSNMP
 	case 'P': /* snmp AgentXPingInterval */
 	 agentxpinginterval = atoi(optarg);
@@ -1806,25 +2076,29 @@
 	}
 }
 
- masterconf_init("master", alt_config);
+ if (daemon_mode && !close_std)
+	fatal("Unable to be both debug and daemon mode", EX_CONFIG);
 
- /* zero out the children table */
- memset(&ctable, 0, sizeof(struct centry *) * child_table_size);
+ masterconf_init("master", alt_config);
 
- if (close_std) {
- /* close stdin/out/err */
- for (fd = 0; fd < 3; fd++) {
-	close(fd);
-	if (open("/dev/null", O_RDWR, 0) != fd)
-	 fatal("couldn't open /dev/null: %m", 2);
- }
+ if (close_std || error_log) {
+	/* close stdin/out/err */
+	for (fd = 0; fd < 3; fd++) {
+	 const char *file = (error_log && fd > 0 ?
+				error_log : "/dev/null");
+	 int mode = (fd > 0 ? O_WRONLY : O_RDWR) |
+		 (error_log && fd > 0 ? O_CREAT|O_APPEND : 0);
+	 close(fd);
+	 if (open(file, mode, 0666) != fd)
+		fatalf(2, "couldn't open %s: %m", file);
+	}
 }
 
 /* we reserve fds 3 and 4 for children to communicate with us, so they
 better be available. */
 for (fd = 3; fd < 5; fd++) {
 	close(fd);
-	if (dup(0) != fd) fatal("couldn't dup fd 0: %m", 2);
+	if (dup(0) != fd) fatalf(2, "couldn't dup fd 0: %m");
 }
 
 /* Pidfile Algorithm in Daemon Mode. This is a little subtle because
@@ -1846,23 +2120,20 @@
 	/* Daemonize */
 	pid_t pid = -1;
 
-	pidfile_lock = xmalloc(strlen(pidfile) + strlen(lock_suffix) + 1);
+	pidfile_lock = strconcat(pidfile, lock_suffix, (char *)NULL);
 
-	strcpy(pidfile_lock, pidfile);
-	strcat(pidfile_lock, lock_suffix);
-	
 	pidlock_fd = open(pidfile_lock, O_CREAT|O_TRUNC|O_RDWR, 0644);
 	if(pidlock_fd == -1) {
 	 syslog(LOG_ERR, "can't open pidfile lock: %s (%m)", pidfile_lock);
 	 exit(EX_OSERR);
 	} else {
-	 if(lock_nonblocking(pidlock_fd)) {
+	 if(lock_nonblocking(pidlock_fd, pidfile)) {
 		syslog(LOG_ERR, "can't get exclusive lock on %s",
 		 pidfile_lock);
 		exit(EX_TEMPFAIL);
 	 }
 	}
-	
+
 	if(pipe(startup_pipe) == -1) {
 	 syslog(LOG_ERR, "can't create startup pipe (%m)");
 	 exit(EX_OSERR);
@@ -1870,7 +2141,7 @@
 
 	do {
 	 pid = fork();
-	 	 
+
 	 if ((pid == -1) && (errno == EAGAIN)) {
 		syslog(LOG_WARNING, "master fork failed (sleeping): %m");
 		sleep(5);
@@ -1903,12 +2174,11 @@
 	 * and obtain a new process group.
 	 */
 	if (setsid() == -1) {
-	 int r;
 	 int exit_result = EX_OSERR;
-	 
+
 	 /* Tell our parent that we failed. */
 	 r = write(startup_pipe1, &exit_result, sizeof(exit_result));
-	
+
 	 fatal("setsid failure", EX_OSERR);
 	}
 }
@@ -1919,7 +2189,6 @@
 pidfd = open(pidfile, O_CREAT|O_RDWR, 0644);
 if(pidfd == -1) {
 	int exit_result = EX_OSERR;
-	int r;
 
 	/* Tell our parent that we failed. */
 	r = write(startup_pipe1, &exit_result, sizeof(exit_result));
@@ -1929,44 +2198,41 @@
 } else {
 	char buf100;
 
-	if(lock_nonblocking(pidfd)) {
+	if(lock_nonblocking(pidfd, pidfile)) {
 	 int exit_result = EX_OSERR;
-	 int r;
 
 	 /* Tell our parent that we failed. */
 	 r = write(startup_pipe1, &exit_result, sizeof(exit_result));
-	 
+
 	 fatal("cannot get exclusive lock on pidfile (is another master still running?)", EX_OSERR);
 	} else {
 	 int pidfd_flags = fcntl(pidfd, F_GETFD, 0);
 	 if (pidfd_flags != -1)
-		pidfd_flags = fcntl(pidfd, F_SETFD, 
+		pidfd_flags = fcntl(pidfd, F_SETFD,
 				 pidfd_flags | FD_CLOEXEC);
 	 if (pidfd_flags == -1) {
 		int exit_result = EX_OSERR;
-		int r;
-		
+
 		/* Tell our parent that we failed. */
 		r = write(startup_pipe1, &exit_result, sizeof(exit_result));
 
-		fatal("unable to set close-on-exec for pidfile: %m", EX_OSERR);
+		fatalf(EX_OSERR, "unable to set close-on-exec for pidfile: %m");
 	 }
-	 
+
 	 /* Write PID */
 	 snprintf(buf, sizeof(buf), "%lu\n", (unsigned long int)getpid());
 	 if(lseek(pidfd, 0, SEEK_SET) == -1 ||
 	 ftruncate(pidfd, 0) == -1 ||
 	 write(pidfd, buf, strlen(buf)) == -1) {
 		int exit_result = EX_OSERR;
-		int r;
 
 		/* Tell our parent that we failed. */
 		r = write(startup_pipe1, &exit_result, sizeof(exit_result));
 
-		fatal("unable to write to pidfile: %m", EX_OSERR);
+		fatalf(EX_OSERR, "unable to write to pidfile: %m");
 	 }
 	 if (fsync(pidfd))
-		fatal("unable to sync pidfile: %m", EX_OSERR);
+		fatalf(EX_OSERR, "unable to sync pidfile: %m");
 	}
 }
 
@@ -1974,21 +2240,19 @@
 	int exit_result = 0;
 
 	/* success! */
-	if(write(startup_pipe1, &exit_result, sizeof(exit_result)) == -1) {
-	 syslog(LOG_ERR,
+	if (write(startup_pipe1, &exit_result, sizeof(exit_result)) == -1)
+	 fatalf(EX_OSERR,
 		 "could not write success result to startup pipe (%m)");
-	 exit(EX_OSERR);
-	}
 
 	close(startup_pipe1);
-	if(pidlock_fd != -1) close(pidlock_fd);
+	xclose(pidlock_fd);
 }
 
- syslog(LOG_NOTICE, "process started");
+ syslog(LOG_DEBUG, "process started");
 
 #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
 /* initialize SNMP agent */
- 
+
 /* make us a agentx client. */
 #ifdef HAVE_NETSNMP
 netsnmp_enable_subagent();
@@ -2000,7 +2264,7 @@
 NETSNMP_DS_AGENT_AGENTX_PING_INTERVAL, agentxpinginterval);
 
 if (agentxsocket != NULL)
- netsnmp_ds_set_string(NETSNMP_DS_APPLICATION_ID, 
+ netsnmp_ds_set_string(NETSNMP_DS_APPLICATION_ID,
 NETSNMP_DS_AGENT_X_SOCKET, agentxsocket);
 #else
 ds_set_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE, 1);
@@ -2011,12 +2275,20 @@
 
 init_cyrusMasterMIB();
 
- init_snmp("cyrusMaster"); 
+ init_snmp("cyrusMaster");
+#endif
+
+#if defined(__linux__) && defined(HAVE_LIBCAP)
+ if (become_cyrus(/*is_master*/1) != 0) {
+	syslog(LOG_ERR, "can't change to the cyrus user: %m");
+	exit(1);
+ }
 #endif
 
 masterconf_getsection("START", &add_start, NULL);
 masterconf_getsection("SERVICES", &add_service, NULL);
 masterconf_getsection("EVENTS", &add_event, NULL);
+ masterconf_getsection("DAEMON", &add_daemon, NULL);
 
 /* set signal handlers */
 sighandler_setup();
@@ -2025,25 +2297,26 @@
 for (i = 0; i < nservices; i++) {
 	service_create(&Servicesi);
 	if (verbose > 2)
-	 syslog(LOG_DEBUG, "init: service %s socket %d pipe %d %d",
-		 Servicesi.name, Servicesi.socket,
+	 syslog(LOG_DEBUG, "init: service %s/%s socket %d pipe %d %d",
+		 Servicesi.name, Servicesi.familyname,
+		 Servicesi.socket,
 		 Servicesi.stat0, Servicesi.stat1);
 }
 
- if (become_cyrus_early) {
-	if (become_cyrus() != 0) {
-	 syslog(LOG_ERR, "can't change to the cyrus user: %m");
-	 exit(1);
-	}
+#if !defined(__linux__) || !defined(HAVE_LIBCAP)
+ if (become_cyrus(/*is_master*/1) != 0) {
+	syslog(LOG_ERR, "can't change to the cyrus user: %m");
+	exit(1);
 }
+#endif
 
 /* init ctable janitor */
- init_janitor();
- 
+ gettimeofday(&now, 0);
+ init_janitor(now);
+
 /* ok, we're going to start spawning like mad now */
- syslog(LOG_NOTICE, "ready for work");
+ syslog(LOG_DEBUG, "ready for work");
 
- now = time(NULL);
 for (;;) {
 	int r, i, maxfd, total_children = 0;
 	struct timeval tv, *tvptr;
@@ -2051,6 +2324,10 @@
 #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
 	int blockp = 0;
 #endif
+	if (gotsigquit) {
+	 gotsigquit = 0;
+	 begin_shutdown();
+	}
 
 	/* run any scheduled processes */
 	if (!in_shutdown)
@@ -2062,31 +2339,42 @@
 	 gotsigchld = 0;
 	 reap_child();
 	}
-	
+
 	/* do we have any services undermanned? */
 	for (i = 0; i < nservices; i++) {
 	 total_children += Servicesi.nactive;
 	 if (!in_shutdown) {
 		if (Servicesi.exec /* enabled */ &&
 		 (Servicesi.nactive < Servicesi.max_workers) &&
-		 (Servicesi.ready_workers < Servicesi.desired_workers)) {
-		 spawn_service(i);
+		 (Servicesi.ready_workers < Servicesi.desired_workers))
+		{
+		 /* bring us up to desired_workers */
+		 int j = Servicesi.desired_workers - Servicesi.ready_workers;
+
+		 if (verbose) {
+			syslog(LOG_DEBUG, "service %s/%s needs %d more ready workers",
+			 Servicesi.name, Servicesi.familyname, j);
+		 }
+
+		 while (j-- > 0) {
+			spawn_service(i);
+		 }
 		} else if (Servicesi.exec
 			 && Servicesi.babysit
 			 && Servicesi.nactive == 0) {
 		 syslog(LOG_ERR,
-			 "lost all children for service: %s. " \
+			 "lost all children for service: %s/%s. " \
 			 "Applying babysitter.",
-			 Servicesi.name);
+			 Servicesi.name, Servicesi.familyname);
 		 spawn_service(i);
 		} else if (!Servicesi.exec /* disabled */ &&
 			 Servicesi.name /* not yet removed */ &&
 			 Servicesi.nactive == 0) {
 		 if (verbose > 2)
-			syslog(LOG_DEBUG, "remove: service %s pipe %d %d",
-			 Servicesi.name,
+			syslog(LOG_DEBUG, "remove: service %s/%s pipe %d %d",
+			 Servicesi.name, Servicesi.familyname,
 			 Servicesi.stat0, Servicesi.stat1);
- 
+
 		 /* Only free the service info on the primary */
 		 if (Servicesi.associate == 0) {
 			free(Servicesi.name);
@@ -2096,14 +2384,13 @@
 		 Servicesi.nactive = 0;
 		 Servicesi.nconnections = 0;
 		 Servicesi.associate = 0;
- 
-		 if (Servicesi.stat0 > 0) close(Servicesi.stat0);
-		 if (Servicesi.stat1 > 0) close(Servicesi.stat1);
-		 memset(Servicesi.stat, 0, sizeof(Servicesi.stat));
+
+		 xclose(Servicesi.stat0);
+		 xclose(Servicesi.stat1);
 		}
 	 }
 	}
- 
+
 	if (in_shutdown && total_children == 0) {
 	 syslog(LOG_NOTICE, "All children have exited, closing down");
 	 exit(0);
@@ -2112,7 +2399,7 @@
 	if (gotsighup) {
 	 syslog(LOG_NOTICE, "got SIGHUP");
 	 gotsighup = 0;
-	 reread_conf();
+	 reread_conf(now);
 	}
 
 	FD_ZERO(&rfds);
@@ -2123,28 +2410,29 @@
 	 int y = Servicesi.socket;
 
 	 /* messages */
-	 if (x > 0) {
+	 if (x >= 0) {
 		if (verbose > 2)
-		 syslog(LOG_DEBUG, "listening for messages from %s",
-			 Servicesi.name);
+		 syslog(LOG_DEBUG, "listening for messages from %s/%s",
+			 Servicesi.name, Servicesi.familyname);
 		FD_SET(x, &rfds);
 	 }
 	 if (x > maxfd) maxfd = x;
 
 	 /* connections */
-	 if (y > 0 && Servicesi.ready_workers == 0 &&
-		Servicesi.nactive < Servicesi.max_workers) {
+	 if (y >= 0 && Servicesi.ready_workers == 0 &&
+		Servicesi.nactive < Servicesi.max_workers &&
+		!service_is_fork_limited(&Servicesi)) {
 		if (verbose > 2)
-		 syslog(LOG_DEBUG, "listening for connections for %s", 
-			 Servicesi.name);
+		 syslog(LOG_DEBUG, "listening for connections for %s/%s",
+			 Servicesi.name, Servicesi.familyname);
 		FD_SET(y, &rfds);
 		if (y > maxfd) maxfd = y;
 	 }
 
 	 /* paranoia */
 	 if (Servicesi.ready_workers < 0) {
-		syslog(LOG_ERR, "%s has %d workers?!?", Servicesi.name,
-		 Servicesi.ready_workers);
+		syslog(LOG_ERR, "%s/%s has %d workers?!?", Servicesi.name,
+		 Servicesi.familyname, Servicesi.ready_workers);
 	 }
 	}
 	maxfd++;		/* need 1 greater than maxfd */
@@ -2152,10 +2440,15 @@
 	/* how long to wait? - do now so that any scheduled wakeup
 	 * calls get accounted for*/
 	tvptr = NULL;
-	if (schedule) {
-	 if (now < schedule->mark) tv.tv_sec = schedule->mark - now;
-	 else tv.tv_sec = 0;
-	 tv.tv_usec = 0;
+	if (schedule && !in_shutdown) {
+	 double delay = timesub(&now, &schedule->mark);
+	 if (delay > 0.0) {
+		timeval_set_double(&tv, delay);
+	 }
+	 else {
+		tv.tv_sec = 0;
+		tv.tv_usec = 0;
+	 }
 	 tvptr = &tv;
 	}
 
@@ -2164,12 +2457,12 @@
 	snmp_select_info(&maxfd, &rfds, tvptr, &blockp);
 #endif
 	errno = 0;
-	r = select(maxfd, &rfds, NULL, NULL, tvptr);
+	r = myselect(maxfd, &rfds, NULL, NULL, tvptr);
 	if (r == -1 && errno == EAGAIN) continue;
 	if (r == -1 && errno == EINTR) continue;
 	if (r == -1) {
 	 /* uh oh */
-	 fatal("select failed: %m", 1);
+	 fatalf(1, "select failed: %m");
 	}
 
 #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
@@ -2180,9 +2473,8 @@
 	for (i = 0; i < nservices; i++) {
 	 int x = Servicesi.stat0;
 	 int y = Servicesi.socket;
-	 int j;
 
-	 if (FD_ISSET(x, &rfds)) {
+	 if ((x >= 0) && FD_ISSET(x, &rfds)) {
 		while ((r = read_msg(x, &msg)) == 0)
 		 process_msg(i, &msg);
 
@@ -2199,27 +2491,22 @@
 	 }
 
 	 if (!in_shutdown && Servicesi.exec &&
-		Servicesi.nactive < Servicesi.max_workers) {
-		/* bring us up to desired_workers */
-		for (j = Servicesi.ready_workers;
-		 j < Servicesi.desired_workers; 
-		 j++)
-		{
-		 spawn_service(i);
-		}
-
-		if (Servicesi.ready_workers == 0 && 
-		 FD_ISSET(y, &rfds)) {
-		 /* huh, someone wants to talk to us */
-		 spawn_service(i);
-		}
+		Servicesi.nactive < Servicesi.max_workers &&
+		Servicesi.ready_workers == 0 &&
+		y >= 0 && FD_ISSET(y, &rfds))
+	 {
+		/* huh, someone wants to talk to us */
+		spawn_service(i);
 	 }
 	}
-	now = time(NULL);
+	gettimeofday(&now, 0);
 	child_janitor(now);
 
 #ifdef HAVE_NETSNMP
 	run_alarms();
 #endif
 }
+
+ /* never reached */
+ return r;
 }

cyrus-imapd-2.4.17.tar.gz/master/master.h -> cyrus-imapd-2.5.tar.gz/master/master.h Changed

@@ -1,24 +1,24 @@
 #ifndef HAVE_MASTER_H
 #define HAVE_MASTER_H
 
-/* $Id: master.h,v 1.16 2010/01/06 17:01:53 murch Exp $ */
-
 #include <config.h>
 #include <sys/resource.h> /* for rlim_t */
 
 #include "libconfig.h" /* for config_dir and IMAPOPT_SYNC_MACHINEID */
+#include "strarray.h"
 
 /* needed for possible SNMP monitoring */
 struct service {
 char *name;			/* name of service */
 char *listen;		/* port/socket to listen to */
 char *proto;		/* protocol to accept */
- char *const *exec;		/* command (with args) to execute */
+ strarray_t *exec;		/* command (with args) to execute */
 int babysit;		/* babysit this service? */
 
 /* multiple address family support */
 int associate;		/* are we primary or additional instance? */
 int family;			/* address family */
+ const char *familyname;	/* address family name */
 
 /* communication info */
 int socket;			/* client/child communication channel */
@@ -35,15 +35,15 @@
 int nforks;			/* num child processes spawned */
 int nactive;		/* num children servicing clients */
 int nconnections;		/* num connections made to children */
- unsigned int forkrate;	/* rate at which we're spawning children */
+ double forkrate;		/* rate at which we're spawning children */
+ int nreadyfails;		/* number of failures in READY state */
 
 /* fork rate computation */
- time_t last_interval_start;
+ struct timeval last_interval_start;
 unsigned int interval_forks;
 };
 
 extern struct service *Services;
-extern int allocservices;
 extern int nservices;
 
 /*

cyrus-imapd-2.4.17.tar.gz/master/masterconf.c -> cyrus-imapd-2.5.tar.gz/master/masterconf.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: masterconf.c,v 1.16 2010/01/06 17:01:53 murch Exp $
 */
 
 #include <config.h>
@@ -47,14 +45,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sysexits.h>
 
-#include "libconfig.c"
+#include "util.h"
+#include "libconfig.h"
+#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -69,7 +69,20 @@
 char *value;
 };
 
-extern void fatal(const char *buf, int code);
+extern void fatal(const char *buf, int code)
+ __attribute__((noreturn));
+
+void fatalf(int code, const char *fmt, ...)
+{
+ va_list args;
+ char buf2048;
+
+ va_start(args, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, args);
+ va_end(args);
+ fatal(buf, code);
+}
+
 
 int masterconf_init(const char *ident, const char *alt_config)
 {
@@ -81,7 +94,7 @@
 openlog(ident, LOG_PID, SYSLOG_FACILITY);
 
 config_ident = ident;
- config_read(alt_config);
+ config_read(alt_config, 0);
 
 prefix = config_getstring(IMAPOPT_SYSLOG_PREFIX);
 
@@ -99,51 +112,33 @@
 /* don't free the openlog() string! */
 }
 
+ /* drop debug messages locally */
+ if (!config_debug)
+	setlogmask(~LOG_MASK(LOG_DEBUG));
+
 return 0;
 }
 
 struct entry {
- char *line;
+#define MAXARGS	 64
+ int nargs;
+ struct {
+	char *key;
+	char *value;
+ } argsMAXARGS;
 int lineno;
 };
 
-const char *masterconf_getstring(struct entry *e, const char *key, 
+const char *masterconf_getstring(struct entry *e, const char *key,
 				 const char *def)
 {
- char k256;
- static char v256;
 int i;
- char *p;
 
- strcpy(k, key);
- strcat(k, "=");
-
- p = strstr(e->line, k);
- if (p) {
-	p += strlen(k);
-	if (*p == '"') {
-	 p++;
-	 for (i = 0; i < 255; i++) {
-		if (*p == '"') break;
-		vi = *p++;
-	 }
-	 if (*p != '"') {
-		sprintf(k, "configuration file %s: missing \" on line %d",
-			MASTER_CONFIG_FILENAME, e->lineno);
-		fatal(k, EX_CONFIG);
-	 }
-	} else {
-	 /* one word */
-	 for (i = 0; i < 255; i++) {
-		if (Uisspace(*p)) break;
-		vi = *p++;
-	 }
-	}
-	vi = '\0';
-	return v;
- } else {
-	return def;
+ for (i = 0 ; i < e->nargs ; i++) {
+	if (!strcmp(key, e->argsi.key))
+	 return e->argsi.value;
 }
+ return def;
 }
 
 int masterconf_getint(struct entry *e, 
@@ -174,6 +169,57 @@
 return def;
 }
 
+static void split_args(struct entry *e, char *buf)
+{
+ char *p = buf, *q;
+ char *key, *value;
+
+ for (;;) {
+	/* skip whitespace before arg */
+	while (Uisspace(*p))
+	 p++;
+	if (!*p)
+	 return;
+	key = p;
+
+	/* parse the key */
+	for (q = p ; Uisalnum(*q) ; q++)
+	 ;
+	if (*q != '=')
+	 fatalf(EX_CONFIG, "configuration file %s: "
+			 "bad character '%c' in argument on line %d",
+			 MASTER_CONFIG_FILENAME, *q, e->lineno);
+	*q++ = '\0';
+
+	/* parse the value */
+	if (*q == '"') {
+	 /* quoted string */
+	 value = ++q;
+	 q = strchr(q, '"');
+	 if (!q)
+		fatalf(EX_CONFIG, "configuration file %s: missing \" on line %d",
+			MASTER_CONFIG_FILENAME, e->lineno);
+	 *q++ = '\0';
+	}
+	else {
+	 /* simple word */
+	 value = q;
+	 while (*q && !Uisspace(*q))
+		q++;
+	 if (*q)
+		*q++ = '\0';
+	}
+
+	if (e->nargs == MAXARGS)
+		fatalf(EX_CONFIG, "configuration file %s: too many arguments on line %d",
+			MASTER_CONFIG_FILENAME, e->lineno);
+	e->argse->nargs.key = key;
+	e->argse->nargs.value = value;
+	e->nargs++;
+	p = q;
+ }
+}
+
 static void process_section(FILE *f, int *lnptr, 
 			 masterconf_process *func, void *rock)
 {
@@ -190,7 +236,7 @@
 	if (bufstrlen(buf)-1 == '\n') bufstrlen(buf)-1 = '\0';
 	/* remove starting whitespace */
 	for (p = buf; *p && Uisspace(*p); p++);
-	
+
 	/* remove comments */
 	q = strchr(p, '#');
 	if (q) *q = '\0';
@@ -200,12 +246,19 @@
 	if (*p == '}') break;
 
 	for (q = p; Uisalnum(*q); q++) ;
-	if (*q) { *q = '\0'; q++; }
-	
+	if (*q) {
+	 if (q > p && !Uisspace(*q))
+		fatalf(EX_CONFIG, "configuration file %s: "
+				 "bad character '%c' in name on line %d",
+				 MASTER_CONFIG_FILENAME, *q, lineno);
+	 *q++ = '\0';
+	}
+
 	if (q - p > 0) {
 	 /* there's a value on this line */
-	 e.line = q;
+	 memset(&e, 0, sizeof(e));
 	 e.lineno = lineno;
+	 split_args(&e, q);
 	 func(p, &e, rock);
 	}
 
@@ -237,11 +290,9 @@
 if (!infile)
 	infile = fopen(MASTER_CONFIG_FILENAME, "r");
 
- if (!infile) {
-	snprintf(buf, sizeof(buf), "can't open configuration file %s: %s",
-		MASTER_CONFIG_FILENAME, strerror(errno));
-	fatal(buf, EX_CONFIG);
- }
+ if (!infile)
+	fatalf(EX_CONFIG, "can't open configuration file %s: %m",
+		MASTER_CONFIG_FILENAME);
 
 while (fgets(buf, sizeof(buf), infile)) {
 	char *p, *q;

cyrus-imapd-2.4.17.tar.gz/master/masterconf.h -> cyrus-imapd-2.5.tar.gz/master/masterconf.h Changed

cyrus-imapd-2.4.17.tar.gz/master/service-thread.c -> cyrus-imapd-2.5.tar.gz/master/service-thread.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: service-thread.c,v 1.22 2010/01/06 17:01:53 murch Exp $
 */
 
 #include <config.h>
@@ -53,8 +51,6 @@
 #endif
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <syslog.h>
@@ -70,6 +66,7 @@
 #include "service.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "strarray.h"
 #include "signals.h"
 
 extern int optind;
@@ -96,35 +93,37 @@
 int allow_severity = LOG_DEBUG;
 int deny_severity = LOG_ERR;
 
-static void libwrap_init(struct request_info *r, char *service)
+static void libwrap_init(struct request_info *req, char *service)
 {
- request_init(r, RQ_DAEMON, service, 0);
+ request_init(req, RQ_DAEMON, service, 0);
 }
 
-static int libwrap_ask(struct request_info *r, int fd)
+static int libwrap_ask(struct request_info *req, int fd)
 {
+ struct sockaddr_storage sin_storage;
+ struct sockaddr *sin = (struct sockaddr *)&sin_storage;
+ socklen_t sinlen;
 int a;
- struct sockaddr_storage sin;
- socklen_t len = sizeof(sin);
 
 /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
- sin.ss_family = AF_UNIX;
+ sin->sa_family = AF_UNIX;
 
 /* is this a connection from the local host? */
- if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
-	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ sinlen = sizeof(struct sockaddr_storage);
+ if (getpeername(fd, sin, &sinlen) == 0) {
+	if (sin->sa_family == AF_UNIX) {
 	 return 1;
 	}
 }
 
 /* i hope using the sock_* functions are legal; it certainly makes
 this code very easy! */
- request_set(r, RQ_FILE, fd, 0);
- sock_host(r);
+ request_set(req, RQ_FILE, fd, 0);
+ sock_host(req);
 
- a = hosts_access(r);
+ a = hosts_access(req);
 if (!a) {
-	syslog(deny_severity, "refused connection from %s", eval_client(r));
+	syslog(deny_severity, "refused connection from %s", eval_client(req));
 }
 
 return a;
@@ -147,9 +146,7 @@
 
 #endif
 
-extern void cyrus_init(const char *, const char *, unsigned);
-
-#define ARGV_GROW 10
+extern void cyrus_init(const char *, const char *, unsigned, int);
 
 int main(int argc, char **argv, char **envp)
 {
@@ -160,13 +157,12 @@
 int opt;
 char *alt_config = NULL;
 int call_debugger = 0;
- int newargc = 0;
- char **newargv = (char **) xmalloc(ARGV_GROW * sizeof(char *));
+ strarray_t newargv = STRARRAY_INITIALIZER;
 
 opterr = 0; /* disable error reporting,
 		 since we don't know about service-specific options */
 
- newargvnewargc++ = argv0;
+ strarray_append(&newargv, argv0);
 
 while ((opt = getopt(argc, argv, "C:D")) != EOF) {
 	switch (opt) {
@@ -177,27 +173,18 @@
 	 call_debugger = 1;
 	 break;
 	default:
-	 if (!((newargc+1) % ARGV_GROW)) { /* time to alloc more */
-		newargv = (char **) xrealloc(newargv, (newargc + ARGV_GROW) * 
-					 sizeof(char *));
-	 }
-	 newargvnewargc++ = argvoptind-1;
+	 strarray_append(&newargv, argvoptind-1);
 
 	 /* option has an argument */
 	 if (optind < argc && argvoptind0 != '-')
-		newargvnewargc++ = argvoptind++;
+		strarray_append(&newargv, argvoptind++);
 
 	 break;
 	}
 }
 /* grab the remaining arguments */
- for (; optind < argc; optind++) {
-	if (!(newargc % ARGV_GROW)) { /* time to alloc more */
-	 newargv = (char **) xrealloc(newargv, (newargc + ARGV_GROW) * 
-					 sizeof(char *));
-	}
-	newargvnewargc++ = argvoptind;
- }
+ for (; optind < argc; optind++)
+	strarray_append(&newargv, argvoptind);
 
 opterr = 1; /* enable error reporting */
 optind = 1; /* reset the option index for parsing by the service */
@@ -217,7 +204,8 @@
 }
 service = xstrdup(p);
 
- cyrus_init(alt_config, service, 0);
+ extern const int config_need_data;
+ cyrus_init(alt_config, service, 0, config_need_data);
 
 if (call_debugger) {
 	char debugbuf1024;
@@ -253,7 +241,7 @@
 	return 1;
 }
 
- if (service_init(newargc, newargv, envp) != 0) {
+ if (service_init(newargv.count, newargv.data, envp) != 0) {
 	if (MESSAGE_MASTER_ON_EXIT) 
 	 notify_master(STATUS_FD, MASTER_SERVICE_UNAVAILABLE);
 	return 1;
@@ -305,7 +293,7 @@
 
 	use_count++;
 	notify_master(STATUS_FD, MASTER_SERVICE_CONNECTION_MULTI);
-	if (service_main_fd(fd, newargc, newargv, envp) < 0) {
+	if (service_main_fd(fd, newargv.count, newargv.data, envp) < 0) {
 	 break;
 	}
 }

cyrus-imapd-2.4.17.tar.gz/master/service.c -> cyrus-imapd-2.5.tar.gz/master/service.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: service.c,v 1.61 2010/06/28 12:03:54 brong Exp $
 */
 
 #include <config.h>
@@ -53,8 +51,6 @@
 #endif
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <syslog.h>
@@ -73,7 +69,7 @@
 #include "libconfig.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
+#include "strarray.h"
 #include "signals.h"
 
 extern int optind, opterr;
@@ -102,35 +98,37 @@
 int allow_severity = LOG_DEBUG;
 int deny_severity = LOG_ERR;
 
-static void libwrap_init(struct request_info *r, char *service)
+static void libwrap_init(struct request_info *req, char *service)
 {
- request_init(r, RQ_DAEMON, service, 0);
+ request_init(req, RQ_DAEMON, service, 0);
 }
 
-static int libwrap_ask(struct request_info *r, int fd)
+static int libwrap_ask(struct request_info *req, int fd)
 {
+ struct sockaddr_storage sin_storage;
+ struct sockaddr *sin = (struct sockaddr *)&sin_storage;
+ socklen_t sinlen;
 int a;
- struct sockaddr_storage sin;
- socklen_t len = sizeof(sin);
 
 /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
- sin.ss_family = AF_UNIX;
+ sin->sa_family = AF_UNIX;
 
 /* is this a connection from the local host? */
- if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
-	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
+ sinlen = sizeof(struct sockaddr_storage);
+ if (getpeername(fd, sin, &sinlen) == 0) {
+	if (sin->sa_family == AF_UNIX) {
 	 return 1;
 	}
 }
 
 /* i hope using the sock_* functions are legal; it certainly makes
 this code very easy! */
- request_set(r, RQ_FILE, fd, 0);
- sock_host(r);
+ request_set(req, RQ_FILE, fd, 0);
+ sock_host(req);
 
- a = hosts_access(r);
+ a = hosts_access(req);
 if (!a) {
-	syslog(deny_severity, "refused connection from %s", eval_client(r));
+	syslog(deny_severity, "refused connection from %s", eval_client(req));
 }
 
 return a;
@@ -153,7 +151,7 @@
 
 #endif
 
-extern void cyrus_init(const char *, const char *, unsigned);
+extern void cyrus_init(const char *, const char *, unsigned, int);
 
 static int getlockfd(char *service, int id)
 {
@@ -240,7 +238,43 @@
 return 0;
 }
 
-#define ARGV_GROW 10
+static int safe_wait_readable(int fd)
+{
+ fd_set rfds;
+ int r;
+
+ FD_ZERO(&rfds);
+ FD_SET(fd, &rfds);
+
+ /* Waiting for incoming connection, we want to leave as soon as
+ * possible upon SIGHUP. Julien explains:
+ *
+ * The thing is SIGHUP handler is set as restartable, which is a good thing
+ * when we have received a connection and are processing client commands:
+ * we don't want to be interrupted by that signal.
+ *
+ * On the other hand, when we are waiting to receive a new connection, I
+ * needed a way to make the service instance holding the lock react faster.
+ * Without resetting SIGHUP as not restartable, the instance would just
+ * keep on waiting for a new connection (while the other instances -
+ * waiting for the lock - had received and processed the signal right
+ * away).
+ *
+ * Now that we have safe_wait_readable, Linux systems already react faster
+ * because there select/pselect always returns -1/EINTR even if SA_RESTART
+ * is set. But that may not be the case in other OSes (POSIX spec says it
+ * is implementation-defined whether it does restart or return -1/EINTR
+ * when SA_RESTART is set).
+ */
+ signals_reset_sighup_handler(0);
+
+ r = signals_select(fd+1, &rfds, NULL, NULL, NULL);
+
+ /* we don't want to be interrupted by SIGHUP anymore */
+ signals_reset_sighup_handler(1);
+
+ return r;
+}
 
 int main(int argc, char **argv, char **envp)
 {
@@ -255,8 +289,7 @@
 int reuse_timeout = REUSE_TIMEOUT;
 int soctype;
 socklen_t typelen = sizeof(soctype);
- int newargc = 0;
- char **newargv = (char **) xmalloc(ARGV_GROW * sizeof(char *));
+ strarray_t newargv = STRARRAY_INITIALIZER;
 int id;
 char pathPATH_MAX;
 struct stat sbuf;
@@ -267,7 +300,7 @@
 opterr = 0; /* disable error reporting,
 		 since we don't know about service-specific options */
 
- newargvnewargc++ = argv0;
+ strarray_append(&newargv, argv0);
 
 while ((opt = getopt(argc, argv, "C:U:T:D")) != EOF) {
 	if (argvoptind-10 == '-' && strlen(argvoptind-1) > 2) {
@@ -293,27 +326,18 @@
 	 call_debugger = 1;
 	 break;
 	default:
-	 if (!((newargc+1) % ARGV_GROW)) { /* time to alloc more */
-		newargv = (char **) xrealloc(newargv, (newargc + ARGV_GROW) * 
-					 sizeof(char *));
-	 }
-	 newargvnewargc++ = argvoptind-1;
+	 strarray_append(&newargv, argvoptind-1);
 
 	 /* option has an argument */
 	 if (optind < argc && argvoptind0 != '-')
-		newargvnewargc++ = argvoptind++;
+		strarray_append(&newargv, argvoptind++);
 
 	 break;
 	}
 }
 /* grab the remaining arguments */
- for (; optind < argc; optind++) {
-	if (!(newargc % ARGV_GROW)) { /* time to alloc more */
-	 newargv = (char **) xrealloc(newargv, (newargc + ARGV_GROW) * 
-					 sizeof(char *));
-	}
-	newargvnewargc++ = argvoptind;
- }
+ for (; optind < argc; optind++)
+	strarray_append(&newargv, argvoptind);
 
 opterr = 1; /* enable error reporting */
 optind = 1; /* reset the option index for parsing by the service */
@@ -345,7 +369,8 @@
 srand(time(NULL) * getpid());
 reuse_timeout = reuse_timeout + (rand() % reuse_timeout);
 
- cyrus_init(alt_config, service, 0);
+ extern const int config_need_data;
+ cyrus_init(alt_config, service, 0, config_need_data);
 
 if (call_debugger) {
 	char debugbuf1024;
@@ -390,17 +415,17 @@
 	return 1;
 }
 
- if (service_init(newargc, newargv, envp) != 0) {
+ if (service_init(newargv.count, newargv.data, envp) != 0) {
 	if (MESSAGE_MASTER_ON_EXIT) 
 	 notify_master(STATUS_FD, MASTER_SERVICE_UNAVAILABLE);
 	return 1;
 }
 
 /* determine initial process file inode, size and mtime */
- if (newargv00 == '/')
-	strlcpy(path, newargv0, sizeof(path));
+ if (newargv.data00 == '/')
+	strlcpy(path, newargv.data0, sizeof(path));
 else
-	snprintf(path, sizeof(path), "%s/%s", SERVICE_PATH, newargv0);
+	snprintf(path, sizeof(path), "%s/%s", SERVICE_DIR, newargv.data0);
 
 stat(path, &sbuf);
 start_ino= sbuf.st_ino;
@@ -425,7 +450,14 @@
 	fd = -1;
 	while (fd < 0 && !signals_poll()) { /* loop until we succeed */
 	 /* check current process file inode, size and mtime */
-	 stat(path, &sbuf);
+	 int r = stat(path, &sbuf);
+	 if (r < 0) {
+		/* This might happen transiently during a package
+		 * upgrade or permanently after package removal.
+		 * In either case, it's time to die. */
+		syslog(LOG_INFO, "cannot stat process file: %m");
+		break;
+	 }
 	 if (sbuf.st_ino != start_ino || sbuf.st_size != start_size ||
 		sbuf.st_mtime != start_mtime) {
 		syslog(LOG_INFO, "process file has changed");
@@ -434,6 +466,11 @@
 	 }
 
 	 if (soctype == SOCK_STREAM) {
+		/* Wait for the file descriptor to be connected to, in a
+		 * signal-safe manner. This ensures the accept() does
+		 * not block and we don't need to make it signal-safe. */
+		if (safe_wait_readable(LISTEN_FD) < 0)
+		 continue;
 		fd = accept(LISTEN_FD, NULL, NULL);
 		if (fd < 0) {
 		 switch (errno) {
@@ -470,11 +507,14 @@
 		socklen_t fromlen;
 		char ch;
 		int r;
- 
+
+		if (safe_wait_readable(LISTEN_FD) < 0)
+		 continue;
 		fromlen = sizeof(from);
 		r = recvfrom(LISTEN_FD, (void *) &ch, 1, MSG_PEEK,
 			 (struct sockaddr *) &from, &fromlen);
 		if (r == -1) {
+		 if (signals_poll() == SIGHUP) break;
 		 syslog(LOG_ERR, "recvfrom failed: %m");
 		 if (MESSAGE_MASTER_ON_EXIT) 
 			notify_master(STATUS_FD, MASTER_SERVICE_UNAVAILABLE);
@@ -579,7 +619,7 @@
 	
 	notify_master(STATUS_FD, MASTER_SERVICE_CONNECTION);
 	use_count++;
-	service_main(newargc, newargv, envp);
+	service_main(newargv.count, newargv.data, envp);
 	/* if we returned, we can service another client with this process */
 
 	if (signals_poll() || use_count >= max_use) {

cyrus-imapd-2.4.17.tar.gz/master/service.h -> cyrus-imapd-2.5.tar.gz/master/service.h Changed

cyrus-imapd-2.5.tar.gz/mkdebian.pl Added

@@ -0,0 +1,122 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+
+my $num = `git log --pretty=oneline | wc -l`;
+chomp($num);
+
+my $branch = `git branch | grep \\\* | cut -c 3-`;
+chomp($branch);
+
+my $date = `date -R`;
+
+my $basename = "cyrus-$branch";
+my $basedir = $branch eq 'fastmail' ? 'usr/cyrus' : "usr/$basename";
+
+mkdir("debian");
+open(FH, ">debian/changelog");
+print FH <<EOF;
+cyrus-$branch ($num-1) experimental; urgency=low
+
+ * basic package set up
+
+ -- Bron Gondwana <brong\@fastmail.fm> $date
+EOF
+close(FH);
+
+open(FH, ">debian/control");
+print FH <<EOF;
+Source: $basename
+Section: mail
+Priority: extra
+Maintainer: Bron Gondwana <brong\@fastmail.fm>
+Build-Depends: libssl-dev, zlib1g-dev, comerr-dev, libsasl2-dev,
+	libzephyr-dev, libpcre3-dev, autoconf, libxapian-dev,
+	libxml2-dev, libical-dev, libsqlite3-dev,
+	flex, bison, debhelper, libsnmp-dev
+
+Package: $basename
+Architecture: all
+Depends: \${shlibs:Depends}
+Description: Cyrus package for branch $branch at FastMail.FM
+
+Package: $basename-build
+Architecture: all
+Depends: \${shlibs:Depends}
+Description: Cyrus package for branch $branch at FastMail.FM - build files
+EOF
+close(FH);
+
+open(FH, ">debian/copyright");
+print FH "See the upstream files at CMU\n";
+close(FH);
+
+open(FH, ">debian/rules");
+print FH <<EOF;
+#!/usr/bin/make -f
+# debian/rules for alien
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Use v4 compatability mode, so ldconfig gets added to maint scripts.
+export DH_COMPAT=4
+
+PACKAGE=\$(shell dh_listpackages)
+
+build:
+	dh_testdir
+	autoreconf -v -i
+	./configure --without-krb --with-perl=/usr/bin/perl --enable-http --enable-idled --with-extraident=git-$branch-$num --prefix=/$basedir -with-cyrus-prefix=/$basedir --with-zlib --without-snmp --enable-replication --without-bdb --enable-xapian
+	make -j 8 all CFLAGS="-g -fPIC -W -Wall -Werror -fstack-protector-all"
+	make sieve/test
+	touch build
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	rm -f build
+
+binary-indep: build
+
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k -d
+	dh_installdirs
+
+	dh_installdocs
+	dh_installchangelogs
+
+	make install DESTDIR=\$(CURDIR)/debian/$basename
+	/bin/bash ./libtool --mode=install install -o root -m 755 sieve/test \$(PWD)/debian/$basename/$basedir/bin/sieve-test
+	install -o root -m 755 tools/rehash debian/$basename/$basedir/bin/rehash
+	install -o root -m 755 tools/mkimap debian/$basename/$basedir/bin/mkimap
+	install -o root -m 755 tools/translatesieve debian/$basename/$basedir/bin/translatesieve
+	install -o root -m 755 tools/upgradesieve debian/$basename/$basedir/bin/upgradesieve
+
+	# set up source package
+	# no need to actually install the built object files! It's just the source we want
+	mkdir -p debian/$basename-build/usr/src/$basename-build/cyrus
+	find . -maxdepth 1 -mindepth 1 -not -name debian -not -name .git -print0 | \\
+		xargs -0 -r -i cp -a {} debian/$basename-build/usr/src/$basename-build/cyrus/
+	
+	dh_compress
+	dh_makeshlibs
+	dh_installdeb
+	#-dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb -- -z3
+
+binary: binary-arch
+EOF
+close(FH);
+
+chmod(0755, "debian/rules");
+
+print "Debian build environment for branch \"$branch\" set up 
+
+ - run dpkg-buildpackage to build\n";

cyrus-imapd-2.4.17.tar.gz/netnews/inn.diffs -> cyrus-imapd-2.5.tar.gz/netnews/inn.diffs Changed

cyrus-imapd-2.4.17.tar.gz/netnews/macros.h -> cyrus-imapd-2.5.tar.gz/netnews/macros.h Changed

cyrus-imapd-2.4.17.tar.gz/netnews/readconfig.c -> cyrus-imapd-2.5.tar.gz/netnews/readconfig.c Changed

cyrus-imapd-2.4.17.tar.gz/netnews/readconfig.h -> cyrus-imapd-2.5.tar.gz/netnews/readconfig.h Changed

cyrus-imapd-2.4.17.tar.gz/netnews/remotepurge.c -> cyrus-imapd-2.5.tar.gz/netnews/remotepurge.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: remotepurge.c,v 1.21 2010/01/06 17:01:54 murch Exp $
 */
 
 #include <config.h>
@@ -49,7 +47,6 @@
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <ctype.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -64,15 +61,12 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
 #include <syslog.h>
 
 #include <pwd.h>
 
 #include "prot.h"
 
-#include "imparse.h"
 #include "imclient.h"
 #include "util.h"
 #include "xmalloc.h"
@@ -107,27 +101,25 @@
 } uid_list_t;
 
 /* globals for callback functions */
-int days = -1;
+static int days = -1;
 int size = -1;
-int exact = -1;
-int pattern = -1;
 
-int current_mbox_exists = 0;
+static int current_mbox_exists = 0;
 
-int verbose = 0;
+static int verbose = 0;
 static int noop = 0;
-char *username = NULL;
-char *authname = NULL;
-char *realm = NULL;
+static char *username = NULL;
+//char *authname = NULL;
+static char *realm = NULL;
 
-struct imclient *imclient_conn;
+static struct imclient *imclient_conn;
 
 static int cmd_done;
 static char *cmd_resp = NULL;
 
-FILE *configstream;
+static FILE *configstream;
 
-void spew(int level, const char *fmt, ...)
+static void spew(int level, const char *fmt, ...)
 {
 va_list ap;
 char buf1024;
@@ -145,7 +137,7 @@
 }
 
 /* libcyrus makes us define this */
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 if (cmd_resp) {
 	syslog(LOG_ERR, "fatal error: %s (%s)", s, cmd_resp);
@@ -227,6 +219,7 @@
 				struct imclient_reply *reply)
 
 {
+ (void)imclient;
 char *s;
 capabilities_t **caps = (capabilities_t **) rock;
 
@@ -243,6 +236,7 @@
 		void *rock,
 		struct imclient_reply *reply)
 {
+ (void)imclient; (void)rock;
 if (!strcmp(reply->keyword, "OK")) {
 	cmd_done = IMAP_OK;
 } else if (!strcmp(reply->keyword, "NO")) {
@@ -271,7 +265,7 @@
 	 void *rock,
 	 struct imclient_reply *reply);
 
-
+/*
 void print_stats(mbox_stats_t *stats)
 {
 syslog(LOG_INFO, "total messages considered %d deleted %d",
@@ -280,12 +274,14 @@
 printf("deleted messages \t\t %d\n",stats->deleted);
 printf("remaining messages\t\t %d\n\n",stats->total - stats->deleted);
 }
+*/
 
 static void
 callback_exists(struct imclient *imclient,
 	 void *rock,
 	 struct imclient_reply *reply)
 {
+ (void)imclient; (void)rock;
 current_mbox_exists = reply->msgno;
 }
 
@@ -294,6 +290,7 @@
 	 void *rock,
 	 struct imclient_reply *reply)
 {
+ (void)imclient;
 uid_list_t *uids = (uid_list_t *) rock;
 const char *s;
 uint32_t num;
@@ -337,7 +334,7 @@
 else fatal("marking message deleted", EC_TEMPFAIL);
 }
 
-void mark_all_deleted(const char *mbox, uid_list_t *list, mbox_stats_t *stats)
+static void mark_all_deleted(const char *mbox, uid_list_t *list, mbox_stats_t *stats)
 {
 int i;
 char buf1024;
@@ -416,7 +413,7 @@
 }
 
 /* we don't check what comes in on matchlen and maycreate, should we? */
-int purge_me(char *name, time_t when)
+static int purge_me(char *name, time_t when)
 {
 mbox_stats_t stats;
 char search_string200;
@@ -522,7 +519,7 @@
 
 
 
-int purge_all(void)
+static int purge_all(void)
 {
 int num = 0;
 int ret = 0;
@@ -539,7 +536,7 @@
 return 0;
 }
 
-void do_list(char *matchstr)
+static void do_list(char *matchstr)
 {
 imclient_send(imclient_conn, callback_finish, (void *)imclient_conn,
 		 "%a %s %s", "LIST", "*",
@@ -576,7 +573,7 @@
 return str;
 }
 
-void remote_purge(char *configpath, char **matches)
+static void remote_purge(char *configpath, char **matches)
 {
 char *name;
 
@@ -617,7 +614,7 @@
 }
 
 /* didn't give correct parameters; let's exit */
-void usage(void)
+static void usage(void)
 {
 printf("Usage: remotepurge options hostname match1 ... \n");
 printf(" -p port : port to use\n");
@@ -646,7 +643,7 @@
 int minssf = 0;
 char c;
 
- char *tls_keyfile="";
+ char *tls_keyfile="";(void)tls_keyfile;
 char *port = "imap";
 int dotls=0;
 int r;
@@ -695,6 +692,7 @@
 	 break;
 	}
 
+ (void)dotls;(void)mechanism;
 if (optind >= argc) usage();

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_external.c -> cyrus-imapd-2.5.tar.gz/notifyd/notify_external.c Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_log.c -> cyrus-imapd-2.5.tar.gz/notifyd/notify_log.c Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_log.h -> cyrus-imapd-2.5.tar.gz/notifyd/notify_log.h Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_mailto.c -> cyrus-imapd-2.5.tar.gz/notifyd/notify_mailto.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: notify_mailto.c,v 1.15 2010/01/06 17:01:54 murch Exp $
 */
 
 #include <config.h>
@@ -53,10 +51,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "global.h"
+#include "imap/global.h"
 #include "libconfig.h"
-#include "rfc822date.h"
-#include "sieve_interface.h"
+#include "sieve/sieve_interface.h"
+#include "times.h"
 
 static int contains_8bit(const char *msg);
 
@@ -70,11 +68,11 @@
 		 const char *message)
 {
 FILE *sm;
- const char *smbuf10;
- char outmsgid8192;
+ const char *smbuf7;
+ char outmsgid256;
 int sm_stat;
 time_t t;
- char datestr80;
+ char datestrRFC822_DATETIME_MAX+1;
 pid_t sm_pid;
 int fds2;
 
@@ -116,7 +114,7 @@
 
 fprintf(sm, "Message-ID: %s\r\n", outmsgid);
 
- rfc822date_gen(datestr, sizeof(datestr), t);
+ time_to_rfc822(t, datestr, sizeof(datestr));
 fprintf(sm, "Date: %s\r\n", datestr);
 
 fprintf(sm, "X-Sieve: %s\r\n", SIEVE_VERSION);

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_mailto.h -> cyrus-imapd-2.5.tar.gz/notifyd/notify_mailto.h Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_null.c -> cyrus-imapd-2.5.tar.gz/notifyd/notify_null.c Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_null.h -> cyrus-imapd-2.5.tar.gz/notifyd/notify_null.h Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_zephyr.c -> cyrus-imapd-2.5.tar.gz/notifyd/notify_zephyr.c Changed

@@ -38,20 +38,15 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: notify_zephyr.c,v 1.7 2010/01/06 17:01:54 murch Exp $
 */
 
 #include <config.h>
 
-#ifdef HAVE_ZEPHYR
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <netdb.h>
 #include <sys/types.h>
@@ -63,11 +58,16 @@
 #include <syslog.h>
 
 #include "xmalloc.h"
+#include "util.h"
 
 #ifndef MAIL_CLASS
 #define MAIL_CLASS "MAIL"
 #endif
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 256
+#endif
+
 #include "notify_zephyr.h"
 
 char* notify_zephyr(const char *class, const char *priority,
@@ -77,21 +77,21 @@
 {
 ZNotice_t notice;
 int retval;
- char myhost256,mysenderBUFSIZ;
- char *msgbody;
+ char myhostHOST_NAME_MAX, *mysender = NULL;
+ struct buf msgbody = BUF_INITIALIZER;
 char *lines2;
- char *mykrbhost = 0;
+ char *mykrbhost = NULL;
 
- if (!*user) return strdup("NO zephyr recipient not specified");
+ if (!*user) return xstrdup("NO zephyr recipient not specified");
 
 if ((retval = ZInitialize()) != ZERR_NONE) {
 	syslog(LOG_ERR, "IOERROR: cannot initialize zephyr: %m");
-	return strdup("NO cannot initialize zephyr");
+	return xstrdup("NO cannot initialize zephyr");
 }
 
 if (gethostname(myhost,sizeof(myhost)) == -1) {
 	syslog(LOG_ERR, "IOERROR: cannot get hostname: %m");
-	return strdup("NO zephyr cannot get hostname");
+	return xstrdup("NO zephyr cannot get hostname");
 }
 myhostsizeof(myhost)-1 = '\0';
 
@@ -99,25 +99,24 @@
 mykrbhost = krb_get_phost(myhost);
 #endif
 
- lines0 = myhost;
- msgbody = xmalloc(1000 + strlen(message));
- lines1 = msgbody;
-
- strcpy(msgbody,"");
-
 if (*mailbox) {
-	snprintf(msgbody,900, "You have new mail in %s.\n\n", mailbox);
+	buf_printf(&msgbody, "You have new mail in %s.\n\n", mailbox);
 }
 
 if (*message) {
-	strcat(msgbody, message);
-	strcat(msgbody, "\n");
+	buf_appendcstr(&msgbody, message);
+	buf_putc(&msgbody, '\n');
 }
 
- (void) snprintf(mysender, sizeof(mysender), "imap%s%s@%s",
-		 mykrbhost ? "." : "",
-		 mykrbhost ? mykrbhost : "",
-		 ZGetRealm());
+ lines0 = myhost;
+ lines1 = (char *)buf_cstring(&msgbody);
+
+ mysender = strconcat("imap",
+			 mykrbhost ? "." : "",
+			 mykrbhost ? mykrbhost : "",
+			 "@",
+			 ZGetRealm(),
+			 (char *)NULL);
 
 memset((char *)&notice, 0, sizeof(notice));
 notice.z_kind = UNSAFE;
@@ -140,14 +139,13 @@
 	retval = ZSendList(&notice,lines,2,ZNOAUTH);
 }
 
- free(msgbody);
+ buf_free(&msgbody);
+ free(mysender);
 
 if (retval != ZERR_NONE) {
 	syslog(LOG_ERR, "IOERROR: cannot send zephyr notice: %m");
-	return strdup("NO cannot send zephyr notice");
+	return xstrdup("NO cannot send zephyr notice");
 } 
 
- return strdup("OK zephyr notification successful");
+ return xstrdup("OK zephyr notification successful");
 }
-
-#endif /* HAVE_ZEPHYR */

cyrus-imapd-2.4.17.tar.gz/notifyd/notify_zephyr.h -> cyrus-imapd-2.5.tar.gz/notifyd/notify_zephyr.h Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notifyd.c -> cyrus-imapd-2.5.tar.gz/notifyd/notifyd.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: notifyd.c,v 1.22 2010/01/06 17:01:54 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -63,9 +61,10 @@
 #include "notifyd.h"
 
 #include "exitcodes.h"
-#include "global.h"
+#include "imap/global.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "strarray.h"
 
 
 /* global state */
@@ -78,7 +77,7 @@
 
 /* Cleanly shut down and exit */
 void shut_down(int code) __attribute__ ((noreturn));
-void shut_down(int code)
+EXPORTED void shut_down(int code)
 {
 in_shutdown = 1;
 
@@ -88,7 +87,7 @@
 exit(code);
 }
 
-char *fetch_arg(char *head, char* tail)
+static char *fetch_arg(char *head, char* tail)
 {
 char *cp;
 
@@ -98,21 +97,20 @@
 
 #define NOTIFY_MAXSIZE 8192
 
-int do_notify()
+static int do_notify(void)
 {
 struct sockaddr_un sun_data;
 socklen_t sunlen = sizeof(sun_data);
 char bufNOTIFY_MAXSIZE+1, *cp, *tail;
 int r, i;
 char *method, *class, *priority, *user, *mailbox, *message;
- char **options;
+ strarray_t options = STRARRAY_INITIALIZER;
 long nopt;
 char *reply;
 notifymethod_t *nmethod;
 
 while (1) {
 	method = class = priority = user = mailbox = message = reply = NULL;
-	options = NULL;
 	nopt = 0;
 
 	if (signals_poll() == SIGHUP) {
@@ -145,21 +143,14 @@
 	if (cp) nopt = strtol(cp, NULL, 10);
 	if (nopt < 0 || errno == ERANGE) cp = NULL;
 
-	if (cp && nopt) {
-	 options = (char**) xrealloc(options, nopt * sizeof(char*));
-	 if (!options)
-		fatal("xmalloc(): can't allocate options", EC_OSERR);
-	}
-
-	for (i = 0; cp && i < nopt; i++) {
-	 optionsi = (cp = fetch_arg(cp, tail));
-	}
+	for (i = 0; cp && i < nopt; i++)
+	 strarray_appendm(&options, cp = fetch_arg(cp, tail));
 
 	if (cp) message = (cp = fetch_arg(cp, tail));
 
 	if (!message) {
 	 syslog(LOG_ERR, "malformed notify request");
-	 free(options);
+	 strarray_fini(&options);
 	 return 0;
 	}
 
@@ -178,7 +169,7 @@
 
 	if (nmethod->name) {
 	 reply = nmethod->notify(class, priority, user, mailbox,
-				 nopt, options, message);
+				 nopt, options.data, message);
 	}
 #if 0 /* we don't care about responses right now */
 	else {
@@ -190,14 +181,14 @@
 #endif
 
 	free(reply);
-	free(options);
+	strarray_fini(&options);
 }
 
 /* never reached */
 }
 
 
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 static int recurse_code = 0;
 
@@ -212,20 +203,13 @@
 shut_down(code);
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for notifyd!",
-	 EC_SOFTWARE);
-}
-
-void usage(void)
+static void usage(void)
 {
 syslog(LOG_ERR, "usage: notifyd -C <alt_config>");
 exit(EC_USAGE);
 }
 
-int service_init(int argc, char **argv, char **envp __attribute__((unused)))
+EXPORTED int service_init(int argc, char **argv, char **envp __attribute__((unused)))
 {
 int opt;
 char *method = "null";
@@ -256,12 +240,12 @@
 }
 
 /* Called by service API to shut down the service */
-void service_abort(int error)
+EXPORTED void service_abort(int error)
 {
 shut_down(error);
 }
 
-int service_main(int argc __attribute__((unused)),
+EXPORTED int service_main(int argc __attribute__((unused)),
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {

cyrus-imapd-2.4.17.tar.gz/notifyd/notifyd.h -> cyrus-imapd-2.5.tar.gz/notifyd/notifyd.h Changed

cyrus-imapd-2.4.17.tar.gz/notifyd/notifytest.c -> cyrus-imapd-2.5.tar.gz/notifyd/notifytest.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: notifytest.c,v 1.12 2010/01/06 17:01:54 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +47,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <errno.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -62,6 +59,23 @@
 #define MAX_OPT 10
 #define MAXSIZE 8192
 
+
+/* generic fatal() routine for command line utilities
+ it is here, because libcyrus requires a global function fatal */
+EXPORTED void fatal(const char *message, int code)
+{
+ static int recurse_code = 0;
+
+ if (recurse_code) {
+ exit(code);
+ }
+
+ recurse_code = code;
+ fprintf(stderr, "fatal error: %s\n", message);
+ exit(code);
+}
+
+
 static int add_arg(char *buf, int max_size, const char *arg, int *buflen)
 {
 const char *myarg = (arg ? arg : "");

cyrus-imapd-2.5.tar.gz/perl/annotator Added

cyrus-imapd-2.5.tar.gz/perl/annotator/Daemon.pm Added

@@ -0,0 +1,630 @@
+#!/usr/bin/perl -cw
+#
+# Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+use warnings;
+use strict;
+package Cyrus::Annotator::Daemon;
+use base qw(Net::Server);
+# use Data::Dumper;
+use Unix::Syslog qw(:macros);
+use Cyrus::Annotator::Message;
+use File::Path;
+use Encode qw(decode);
+
+our $VERSION = '1.00';
+
+use constant USER => 'cyrus';
+use constant GROUP => 'mail';
+use constant RUNPREFIX => '/var/run/annotatord';
+use constant APPNAME => 'annotatord';
+use constant PIDFILE => RUNPREFIX . '.pid';
+use constant SOCKPATH => RUNPREFIX . '.socket';
+
+# Levels are: LOG_DEBUG (7), LOG_INFO (6), *LOG_NOTICE (5), LOG_WARNING (4), LOG_ERR (3)
+use constant LOG_LEVEL => LOG_INFO;
+
+=head1 NAME
+
+Cyrus::Annotator::Daemon - framework for writing annotator daemons for Cyrus
+
+=head1 SYNOPSIS
+
+ use warnings;
+ use strict;
+ package MyAnnotatorDaemon;
+ use Cyrus::Annotator::Daemon;
+ our @ISA = qw(Cyrus::Annotator::Daemon);
+
+ sub annotate_message
+ {
+ my ($self, $message) = @_;
+
+ $message->set_flag('\Flagged');
+ $message->set_shared_annotation('/comment', 'Hello!!');
+ }
+
+ MyAnnotatorDaemon->run();
+
+=head1 DESCRIPTION
+
+This module provides a framework for writing daemons which can be used
+to add annotations or flags to messages which are delivered into the
+Cyrus mail server.
+
+To use Cyrus::Annotator::Daemon, write a Perl script which creates an
+object derived from it; see the Synposis above. Run this script as
+root, and it will daemonize itself. Then add this line to the
+imapd.conf file
+
+ annotation_callout: /var/run/annotatord.socket
+
+and restart Cyrus.
+
+=head1 METHODS
+
+Cyrus::Annotator::Daemon has the following methods.
+
+=over 4
+=cut
+
+my @default_args = (
+ personality => 'Net::Server',
+ appname => APPNAME,
+
+ user => USER,
+ group => GROUP,
+ pid_file => PIDFILE,
+ background => 1,
+ size_limit => 256,
+
+ syslog_level => LOG_LEVEL,
+ syslog_facility => LOG_LOCAL6,
+ syslog_ident => APPNAME,
+ log_file => 'Sys::Syslog',
+
+ proto => 'unix',
+ port => SOCKPATH . '|SOCK_STREAM|unix'
+);
+
+sub new
+{
+ my ($class, @args) = @_;
+ my $self = $class->SUPER::new(@args);
+
+ return $self;
+}
+
+=item I<run(...options...)>
+
+This class method can be used to create an instance of
+Cyrus::Annotator::Daemon and to run it's main loop. Note that
+Cyrus::Annotator::Daemon derives from Net::Server, and any of that
+module's options can be used.
+
+For example:
+
+ MyAnnotatorDaemon->run(personality => 'Fork');
+
+Cyrus::Annotator::Daemon changes some of the Net::Server defaults,
+including:
+
+=over 4
+
+=item * Logging is to syslog using facility I<local6>.
+
+=item * The network socket is a I<SOCK_STREAM> UNIX domain
+socket bound to I</var/run/annotatord.socket>.
+
+=item * A PID file is written to I</var/run/annotatord.pid>.
+
+=item * The daemon runs in the background, as user I<cyrus> and group I<mail>.
+
+=back
+
+=cut
+
+sub run
+{
+ my ($class, @args) = @_;
+ my %aa = (@default_args, @args);
+ return $class->SUPER::run(%aa);
+}
+
+
+# Can pass a file handle or string
+# Returns two item list of ($ParsedData, $Remainder)
+# All lines must be \r\n terminated
+
+sub _dlist_parse {
+ my $Input = shift;
+ my ($Atom, $CurAtom, $Line, @AtomStack) = (undef, undef);
+ my $AtomRef = \$Atom;
+
+ if (ref($Input)) {
+ $Line = <$Input> || die "No input data: $!";
+ } else {
+ $Line = $Input;
+ }
+
+ # While this is a recursive structure, doing some profiling showed
+ # that this call was taking up quite a bit of time in the application
+ # I was using this module with. Thus I've tried to optimise the code
+ # a bit by turning it into a loop with an explicit stack and keeping
+ # the most common cases quick.
+
+ # Always do this once, and keep doing it while we're within
+ # a bracketed list of items
+ do {
+
+ # Single item? (and any trailing space)
+ if ($Line =~ m/\G(^()\"{}\s+)(?: |\z|(?=\)))/gc) {
+ # Add to current atom. If there's a stack, must be within a bracket
+ if (scalar @AtomStack) {
+ push @$AtomRef, $1 eq 'NIL' ? undef : $1;
+ } else {
+ $$AtomRef = $1 eq 'NIL' ? undef : $1;
+ }
+ }
+
+ # Quoted section? (but non \" end quote and any trailing space)
+ elsif ($Line =~ m/\G"((?:\\.|^")*?)"(?: |\z|(?=\)))/gc) {
+ # Unquote quoted items
+ ($CurAtom = $1) =~ s/\$.)/$1/g;
+ # Add to current atom. If there's a stack, must be within a bracket
+ if (scalar @AtomStack) {
+ push @$AtomRef, $CurAtom;
+ } else {
+ $$AtomRef = $CurAtom;
+ }
+ }
+ 
+ # Bracket?
+ elsif ($Line =~ m/\G\(/gc) {
+ # Begin a new sub-array
+ my $CurAtom = ;
+ # Add to current atom. If there's a stack, must be within a bracket
+ if (scalar @AtomStack) {
+ push @$AtomRef, $CurAtom;
+ } else {
+ $$AtomRef = $CurAtom;
+ }
+
+ # Check for simple response list to fast parse
+ if ($Line =~ m/\G(^()\"{}~\s+(?: ^()\"{}~\s+)*)$ ?/gc) {
+ push @$CurAtom, map { $_ eq 'NIL' ? undef : $_ } split(' ', $1);
+
+ } else {
+ # Add current ref to stack and update
+ push @AtomStack, $AtomRef;
+ $AtomRef = $CurAtom;
+ }
+
+ }
+
+ # End bracket? (and possible trailing space)
+ elsif ($Line =~ m/\G\) ?/gc) {
+ # Close existing sub-array
+ if (!scalar @AtomStack) {
+ die "Unexpected close bracket in IMAP response : '$Line'";
+ }
+ $AtomRef = pop @AtomStack;
+ }
+
+ # Literal or binary literal? (Must end line)
+ elsif ($Line =~ m/\G~?\{(\d+)\}\r\n/gc) {
+ my $Bytes = $1;
+ $CurAtom = undef;
+
+ # Literal is next $Bytes of data, and possible space
+ if (ref($Input)) {
+ read($Input, $CurAtom, $Bytes) || die "No input data";
+ $Line = <$Input>;
+ } else {
+ $CurAtom = substr($Line, pos($Line), $Bytes);
+ pos($Line) += length($CurAtom);
+ }
+ $Line =~ m/\G ?/gc;
+
+ # Add to current atom. If there's a stack, must be within a bracket
+ if (scalar @AtomStack) {
+ push @$AtomRef, $CurAtom;
+ } else {
+ $$AtomRef = $CurAtom;
+ }
+ }
+
+ # End of line?
+ elsif ($Line =~ m/\G(?:\r\n)?$/gc) {
+ # Should not be within brackets
+ if (scalar @AtomStack) {
+ die "Unexpected end of line in IMAP response : '$Line'";
+ }
+ # Otherwise fine, we're about to exit anyway
+ }
+
+ else {
+ die "Error parsing atom in IMAP response : '" . substr($Line, pos($Line), 100) . "'";
+ }
+
+ # Repeat while we're within brackets
+ } while (scalar @AtomStack);
+
+ my $Remainder = substr($Line, pos($Line));
+
+ return ($Atom, $Remainder);
+}
+
+sub _parse_list_to_hash {
+ my $ContentHashList = shift || ;
+ my $Recursive = shift;
+
+ ref($ContentHashList) eq 'ARRAY' || return { };
+
+ my %Res;
+ while (@$ContentHashList) {
+ my ($Param, $Val) = (shift @$ContentHashList, shift @$ContentHashList);
+
+ $Val = _parse_list_to_hash($Val, $Recursive-1)
+ if (ref($Val) && $Recursive);
+
+ $Res{lc($Param)} = $Val;
+ }
+
+ return \%Res;
+}
+
+sub _parse_bodystructure {
+ my ($Bs, $IncludeRaw, $DecodeUTF8, $PartNum, $IsMultipart) = @_;
+ my %Res;
+
+ # If the first item is a reference, then it's a MIME multipart structure
+ if (ref($Bs->0)) {
+
+ # Multipart items are of the form: part 1 part 2 ...
+ # "MIME-Subtype" "Content-Type" "Content-Disposition" "Content-Language"
+
+ # Process each mime sub-part recursively
+ my ($Part, @SubParts);
+ for ($Part = 1; ref($Bs->0); $Part++) {
+ my $SubPartNum = ($PartNum ? $PartNum . "." : "") . $Part;
+ my $Res = _parse_bodystructure(shift(@$Bs), $IncludeRaw, $DecodeUTF8, $SubPartNum, 1);
+ push @SubParts, $Res;
+ }
+
+ # Setup multi-part hash
+ %Res = (
+ 'MIME-Subparts', \@SubParts,
+ 'MIME-Type', 'multipart',
+ 'MIME-Subtype', lc(shift(@$Bs)),
+ 'Content-Type', _parse_list_to_hash(shift(@$Bs)),
+ 'Content-Disposition', _parse_list_to_hash(shift(@$Bs), 1),
+ 'Content-Language', shift(@$Bs),
+ 'Content-Location', shift(@$Bs),
+ # Shouldn't be anything after this. Add as remainder if there is
+ 'Remainder', $Bs
+ );
+ }
+
+ # Otherwise it's a normal MIME entity
+ else {
+
+ # Get the mime type and sub-type
+ my ($MimeType, $MimeSubtype) = (lc(shift(@$Bs)), lc(shift(@$Bs)));
+
+ # Partnum for getting the text part of an entity. Do this
+ # here so recursive call works for any embedded messages
+ $PartNum = $PartNum ? $PartNum . '.1' : '1'
+ if !$IsMultipart;
+
+ # Pull out special fields for 'text' or 'message/rfc822' types
+ if ($MimeType eq 'text') {
+ %Res = (
+ 'Lines', splice(@$Bs, 5, 1)
+ );
+ } elsif ($MimeType eq 'message' && $MimeSubtype eq 'rfc822') {
+
+ # message/rfc822 includes the messages envelope and bodystructure
+ my @MsgParts = splice(@$Bs, 5, 3);
+ %Res = (
+ 'Message-Envelope', _parse_envelope(shift(@MsgParts), $IncludeRaw, $DecodeUTF8),
+ 'Message-Bodystructure', _parse_bodystructure(shift(@MsgParts), $IncludeRaw, $DecodeUTF8, $PartNum),
+ 'Message-Lines', shift(@MsgParts)
+ );
+ }
+
+ # All normal mime-entities have these parts
+ %Res = (
+ %Res,
+ 'MIME-Type', $MimeType,
+ 'MIME-Subtype', $MimeSubtype,
+ 'Content-Type', _parse_list_to_hash(shift(@$Bs)),
+ 'Content-ID', shift(@$Bs),
+ 'Content-Description', shift(@$Bs),
+ 'Content-Transfer-Encoding', shift(@$Bs),
+ 'Size', shift(@$Bs),
+ 'Content-MD5', shift(@$Bs),
+ 'Content-Disposition', _parse_list_to_hash(shift(@$Bs), 1),
+ 'Content-Language', shift(@$Bs),
+ 'Content-Location', shift(@$Bs),
+ # Shouldn't be anything after this. Add as remainder if there is
+ 'Remainder', $Bs
+ );
+
+ # Extra information for the annotation callout - gnb 20110420
+ my $Extra = shift(@$Bs);
+ if ($Extra) {
+ $Extra = _parse_list_to_hash($Extra, 0);
+ # Make casing consistent for users
+ $Res{Offset} = $Extra->{offset};
+ $Res{HeaderSize} = $Extra->{headersize};
+ }
+
+ }
+
+ # Finally set the IMAP body part number and overall mime type
+ $Res{'IMAP-Partnum'} = $PartNum || '';
+ $Res{'MIME-TxtType'} = $Res{'MIME-Type'} . '/' . $Res{'MIME-Subtype'};
+
+ return \%Res;
+}
+
+# Regexps used to determine if header is MIME encoded (we remove . from
+# especials because of dumb ANSI_X3.4-1968 encoding)
+my $RFC2047Token = qr/^\x00-\x1f\<\>\@\,\;\:\"\/\\\?\=\ +/;
+my $NeedDecodeUTF8Regexp = qr/=\?$RFC2047Token\?$RFC2047Token\?^\?*\?=/;
+
+sub _parse_envelope {
+ my ($Env, $IncludeRaw, $DecodeUTF8) = @_;
+
+ # Check envelope assumption
+ scalar(@$Env) == 10
+ || die "IMAPTalk: Wrong number of fields in envelope structure " . Dumper($Env);
+
+ _decode_utf8($Env->1) if $DecodeUTF8 && defined($Env->1) && $Env->1 =~ $NeedDecodeUTF8Regexp;
+
+ # Setup hash directly from envelope structure
+ my %Res = (
+ 'Date', $Env->0,
+ 'Subject', $Env->1,
+ 'From', _parse_email_address($Env->2, $DecodeUTF8),
+ 'Sender', _parse_email_address($Env->3, $DecodeUTF8),
+ 'Reply-To', _parse_email_address($Env->4, $DecodeUTF8),
+ 'To', _parse_email_address($Env->5, $DecodeUTF8),
+ 'Cc', _parse_email_address($Env->6, $DecodeUTF8),
+ 'Bcc', _parse_email_address($Env->7, $DecodeUTF8),
+ ($IncludeRaw ? (
+ 'From-Raw', $Env->2,
+ 'Sender-Raw', $Env->3,
+ 'Reply-To-Raw',$Env->4,
+ 'To-Raw', $Env->5,
+ 'Cc-Raw', $Env->6,
+ 'Bcc-Raw', $Env->7,
+ ) : ()),
+ 'In-Reply-To', $Env->8,
+ 'Message-ID', $Env->9
+ );
+
+ return \%Res;
+}
+
+sub _parse_email_address {
+ my $EmailAddressList = shift || ;
+ my $DecodeUTF8 = shift;
+
+ # Email addresses always come as a list of addresses (possibly in groups)
+ my @EmailGroups = ( undef );
+ foreach my $Adr (@$EmailAddressList) {
+
+ # Check address assumption
+ scalar(@$Adr) == 4
+ || die "IMAPTalk: Wrong number of fields in email address structure " . Dumper($Adr);
+
+ # No hostname is start/end of group
+ if (!defined $Adr->0 && !defined $Adr->3) {
+ push @EmailGroups, $Adr->2 ;
+ next;
+ }
+
+ # Build 'ename@ecorp.com' part
+ my $EmailStr = (defined $Adr->2 ? $Adr->2 : '')
+ . '@' 
+ . (defined $Adr->3 ? $Adr->3 : '');
+ # If the email address has a name, add it at the start and put <> around address
+ if (defined $Adr->0 and $Adr->0 ne '') {
+ _decode_utf8($Adr->0) if $DecodeUTF8 && $Adr->0 =~ $NeedDecodeUTF8Regexp;
+ # Strip any existing \"'s
+ $Adr->0 =~ s/\"//g;
+ $EmailStr = '"' . $Adr->0 . '" <' . $EmailStr . '>';
+ }
+
+ push @{$EmailGroups-1}, $EmailStr;
+ }
+
+ # Join the results with commas between each address, and "groupname: adrs ;" for groups
+ for (@EmailGroups) {
+ my $GroupName = shift @$_;
+ ($_ = undef), next if !defined $GroupName && !@$_;
+ my $EmailAdrs = join ", ", @$_;
+ $_ = defined($GroupName) ? $GroupName . ': ' . $EmailAdrs . ';' : $EmailAdrs;
+ }
+
+ return join " ", grep { defined $_ } @EmailGroups;
+}
+
+sub _decode_utf8 {
+ # Fix dumb, dumb ANSI_X3.4-1968 encoding. It's not actually a valid
+ # charset according to RFC2047, "." is an especial, so Encode ignores it
+ # See http://en.wikipedia.org/wiki/ASCII for other aliases
+ $_0 =~ s/=\?ANSI_X3\.4-(?:1968|1986)\?/=?US-ASCII?/gi;
+ eval { $_0 = decode('MIME-Header', $_0); };
+}
+
+sub _read_args
+{
+ my $Nbytes;
+ my $Data = '';
+
+ for (;;) {
+	$Nbytes = readline STDIN;
+	last unless defined $Nbytes;
+	chomp $Nbytes;
+	$Nbytes = 0 + $Nbytes;
+# 	printf "nbytes=%d\n", $nbytes;
+	last if (!$Nbytes);
+	read STDIN, $Data, $Nbytes, length($Data);
+ }
+
+ return $Data;
+}
+
+sub _format_string
+{
+ my ($s) = @_;
+
+ return "NIL" unless defined $s;
+
+ my $len = length($s);
+
+ if ($len > 1024 || $s =~ m/\\"\012\015\200-\377/) {
+	# don't try to quote this, use a literal
+	return "{$len}\r\n$s";
+ }
+ else {
+	return "\"$s\"";
+ }
+}
+
+sub _emit_results
+{
+ my ($self, $message) = @_;
+ my @results;
+ my $sep = '';
+
+ my ($flags, $annots) = $message->get_changed();
+
+ foreach my $a (@$annots) {
+	my ($entry, $type, $value) = @$a;
+	my $format_val = _format_string($value);
+	push @results, "ANNOTATION ($entry ($type $format_val))";
+ }
+
+ foreach my $f (@$flags) {
+	my ($name, $set) = @$f;
+	my $op = $set ? "+FLAGS" : "-FLAGS";
+	push @results, "$op $name";
+ }
+
+ print "(" . join(' ', @results) . ")\n";
+}
+
+sub process_request
+{
+ my ($self) = @_;
+
+ eval {
+	$self->log(3, "Reading request");
+	my $ArgsString = _read_args();
+	die "Failed to read args" unless $ArgsString;
+
+	my ($ArgsList, $Remainder) = _dlist_parse($ArgsString);
+	die "Failed to parse args $ArgsString" unless $ArgsList;
+
+	my %ArgsHash = @$ArgsList;
+
+	# parse the argshash out here
+	$ArgsHash{BODYSTRUCTURE} = _parse_bodystructure(delete $ArgsHash{BODY});
+
+	my $message = Cyrus::Annotator::Message->new(%ArgsHash);
+
+	$self->annotate_message($message);
+
+	$self->log(3, "Emitting result");
+	$self->_emit_results($message);
+ };
+ if ($@) {
+	$self->log(2, "Caught and ignored error: $@");
+ }
+}
+
+=item I<annotate_message($message)>
+
+You need to provide a method of this name. It will be called whenever
+Cyrus notifies the annotator daemon that a new message is available, and
+may set or clear any flags (system or user flags) or annotations. Note
+that to set any annotations which aren't builtin to Cyrus, you will
+first need to configure them using I<annotation_definitions> option in
+the I<imapd.conf> file.
+
+The I<$message> object is a Cyrus::Annotator::Message which can be
+examined, and on which flags and annotations can be set.
+
+=cut
+
+sub annotate_message
+{
+ my ($self, $message) = @_;
+
+ die "Please define an annotate_message() sub";
+}
+
+sub post_configure
+{
+ my ($self) = @_;
+
+ unlink(SOCKPATH);
+
+ $self->SUPER::post_configure();
+}
+
+=back
+
+=head1 SEE ALSO
+
+I<Net::Server>, B<imapd.conf>(5), I<RFC3501>, I<RFC5257>.
+
+=head1 AUTHOR
+
+Greg Banks E<lt>gnb@fastmail.fmE<gt>.
+
+=cut
+
+1;

cyrus-imapd-2.5.tar.gz/perl/annotator/MANIFEST Added

cyrus-imapd-2.5.tar.gz/perl/annotator/Makefile.PL.in Added

@@ -0,0 +1,60 @@
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer. 
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any other legal
+# details, please contact 
+# Office of Technology Transfer
+# Carnegie Mellon University
+# 5000 Forbes Avenue
+# Pittsburgh, PA 15213-3890
+# (412) 268-4387, fax: (412) 268-7395
+# tech-transfer@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+use ExtUtils::MakeMaker;
+use Config;
+
+WriteMakefile(
+ 'NAME'	=> 'Cyrus::Annotator::Daemon',
+ 'ABSTRACT' => 'Cyrus annotator daemon framework',
+ 'VERSION_FROM' => "@top_srcdir@/perl/annotator/Daemon.pm", # finds $VERSION
+ # This is a disgusting hack to effectively disable the stupid
+ # behaviour of the generated Makefile which moves itself aside
+ # on a 'make clean' instead of on 'make distclean'.
+ 'MAKEFILE_OLD' => 'Makefile',
+);
+
+sub MY::postamble {
+ return <<'EOT';
+
+VPATH=@top_srcdir@/perl/annotator
+
+check:
+
+EOT
+}

cyrus-imapd-2.5.tar.gz/perl/annotator/Message.pm Added

@@ -0,0 +1,503 @@
+#!/usr/bin/perl -cw
+#
+# Copyright (c) 1994-2011 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+use strict;
+use warnings;
+
+package Cyrus::Annotator::Message;
+
+use MIME::Base64 qw(decode_base64);
+use MIME::QuotedPrint qw(decode_qp);
+use Encode qw(decode);
+
+our $VERSION = '1.00';
+
+=head1 NAME
+
+Cyrus::Annotator::Message - representation of a message to annotate
+
+=head1 SYNOPSIS
+
+ use warnings;
+ use strict;
+ package MyAnnotatorDaemon;
+ use base Cyrus::Annotator::Daemon;
+
+ sub annotate_message
+ {
+ my ($message) = @_;
+
+ $message->set_flag('\Flagged');
+ $message->set_shared_annotation('/comment', 'Hello!!');
+ }
+
+ MyAnnotatorDaemon->run();
+
+=head1 DESCRIPTION
+
+This module encapsulates a message which is being processed by the
+annotator daemon.
+
+=head1 METHODS
+
+Cyrus::Annotator::Message has the following methods.
+
+=over 4
+
+=item I<new(%args)>
+
+Takes the following args:
+
+ # required
+ * BODYSTRUCTURE => parsed bodystructure
+
+ # optional (but you need to provide SOMETHING if your code uses any
+ # of the accessors)
+ * GUID => 40 character sha1
+ * HEADER => Mail::Header object with headers pre-parsed
+ * FILENAME => path to rfc822 file
+
+ # totally optional (will be considered empty if not set)
+ * FLAGS => array of already set flags
+ * ANNOTATIONS => array of already set annotations
+
+=cut
+
+sub new {
+ my $class = shift;
+ my %args = @_;
+
+ my %flags;
+ my %annots;
+
+ my $fs = $args{FLAGS} || ;
+ my $as = $args{ANNOTATIONS} || ;
+
+ for my $name (@$fs) {
+	$flags{$name} = {
+	 value => 1,
+	 orig => 1,
+	};
+ }
+
+ while (my $entry = shift @$as) {
+	my $rest = shift @$as;
+	my ($type, $value) = @$rest;
+	$annots{$entry}{$type} = {
+	 value => $value,
+	 orig => $value,
+	};
+ }
+
+ my $self = bless {
+	filename => $args{FILENAME},
+	bodystructure => $args{BODYSTRUCTURE},
+	guid => $args{GUID},
+	header => $args{HEADER},
+	flag => \%flags,
+	annot => \%annots,
+ }, ref($class) || $class;
+}
+
+
+=item I<fh()>
+
+returns a read-only filehandle to the raw (rfc822) representation
+of the full message.
+
+=cut
+
+sub fh {
+ my $self = shift;
+
+ unless ($self->{fh}) {
+	die "Need a filename" unless $self->{filename};
+	require "IO/File.pm";
+	$self->{fh} = IO::File->new($self->{filename}, 'r');
+ }
+
+ # Move back to start of message
+ seek $self->{fh}, 0, 0;
+
+ return $self->{fh};
+}
+
+=item I<decode_part($Part, $Content)>
+
+Given some content, decode it from the part's content
+encoding and charset.
+
+=cut
+
+sub decode_part {
+ my $self = shift;
+ my ($Part, $Content) = @_;
+
+ if (lc $Part->{'Content-Transfer-Encoding'} eq 'base64') {
+	# remove trailing partial value
+	$Content =~ tr{A-Za-z0-9+/=}{}cd;
+	my $extra = length($Content) % 4;
+	if ($extra) {
+	 # warn "stripping $extra chars " . length($Content);
+	 $Content = substr($Content, 0, -$extra);
+	}
+	$Content = decode_base64($Content);
+ }
+ elsif (lc $Part->{'Content-Transfer-Encoding'} eq 'quoted-printable') {
+	# remove trailing partial value
+	$Content =~ s/=.?$//;
+	$Content = decode_qp($Content);
+ }
+
+ my $charset = lc($Part->{'Content-Type'}{charset} || 'iso-8859-1');
+
+ # If no charset is present, it defaults to ascii. But some systems
+ # send 8-bit data. For them, assume iso-8859-1, ascii is a subset anyway
+ $charset = 'iso-8859-1'
+	if $charset eq 'ascii' || $charset eq 'us-ascii';
+
+ # Fix up some bogus formatted iso charsets
+ $charset =~ s/^(iso)\-_?(\d+)\-_(\d+)\-_?\w*/$1-$2-$3/i;
+
+ return eval { decode($charset, $Content) } || decode('iso-8859-1', $Content);
+}
+
+=item I<read_part_content($Part, $nbytes)>
+
+returns the first n bytes of the bodypart passed. This is a section of the
+bodystructure (hashref). If no part is passed, it's the raw message.
+
+If no 'nbytes' is passed, read the entire part.
+
+=cut
+
+sub read_part_content {
+ my $self = shift;
+ my ($Part, $nbytes) = @_;
+
+ unless ($Part) {
+	$Part = $self->bodystructure();
+ }
+
+ my $fh = $self->fh();
+
+ die "No Offset for part"
+	unless defined $Part->{Offset};
+ die "No Size for part"
+	unless defined $Part->{Size};
+
+ if (!defined($nbytes) || $Part->{Size} < $nbytes) {
+	$nbytes = $Part->{Size};
+ }
+
+ seek $fh, $Part->{Offset}, 0
+	or die "Cannot seek: $!";
+
+ my $Content = '';
+
+ # Could be 0 length body, only die on undef (real error)
+ my $r = read($fh, $Content, $nbytes);
+ die "Cannot read: $!" if !defined $r;
+
+ return $self->decode_part($Part, $Content);
+}
+
+=item I<header()>
+
+returns a Mail::Header object containing all the headers of the message.
+
+=cut
+
+sub header {
+ my $self = shift;
+
+ unless ($self->{header}) {
+	require "Mail/Header.pm";
+	$self->{header} = Mail::Header->new($self->fh());
+ }
+
+ return $self->{header};
+}
+
+=item I<bodystructure()>
+
+returns a structure 
+
+is a structure closely based on the IMAP BODYSTRUCTURE, decoded into a
+hash, including recursively all MIME sections. In general, the
+following items are defined for all body structures:
+
+=over 4
+
+=item * MIME-Type
+
+=item * MIME-Subtype
+
+=item * Content-Type
+
+=item * Content-Description
+
+=item * Content-Dispositon
+
+=item * Content-Language
+
+=back
+
+Body structures which have a MIME-Type of 'multipart' contain the
+following items:
+
+=over 4
+
+=item * MIME-Subparts
+
+=back
+
+For body structures B<except> those that have a MIME-Type of
+'multipart', the following are defined:
+
+=over 4
+
+=item * Content-ID
+
+=item * Content-Description
+
+=item * Content-Transfer-Encoding
+
+=item * Content-MD5
+
+=item * Size
+
+=item * Lines
+
+=item * Offset
+
+=item * HeaderSize
+
+=back
+
+=item I<guid()>
+
+returns the hex encoded (40 character) sha1 of the rfc822 representation.
+
+=item I<has_flag($name)>
+
+=item I<set_flag($name)>
+
+=item I<clear_flag($name)>
+
+Check for the boolean value of a flag with $name, set the flag and remove
+the flag respectively.
+
+Note that changes are not immediate. They will be applied by the annotator
+at the end.
+
+For example:
+
+ $message->set_flag("\\Flagged");
+
+=cut
+
+sub bodystructure {
+ my $self = shift;
+ return $self->{bodystructure};
+}
+
+
+sub get_flag {
+ my $self = shift;
+ my ($name) = @_;
+
+ return $self->{flag}{$name}{value};
+}
+
+sub get_flags {
+ my $self = shift;
+ return grep { $self->{flag}{$_}{value} } keys %{$self->{flag}};
+}
+
+sub set_flag_value {
+ my $self = shift;
+ my ($name, $value) = @_;
+ $self->{flag}{$name}{orig} = 0
+	unless exists $self->{flag}{$name}{orig};
+ $self->{flag}{$name}{value} = $value;
+}
+
+sub set_flag {
+ my $self = shift;
+ my ($name) = @_;
+ $self->set_flag_value($name, 1);
+}
+
+sub clear_flag {
+ my $self = shift;
+ my ($name) = @_;
+ $self->set_flag_value($name, 0);
+}
+
+=item I<get_shared_annotation($entry)>
+
+=item I<get_private_annotation($entry)>
+
+=item I<set_shared_annotation($entry, $value)>
+
+=item I<set_private_annotation($entry, $value)>
+
+=item I<clear_shared_annotation($entry)>
+
+=item I<clear_private_annotation($entry)>
+
+Get, set and clear the value of an annotation, either shared or private. The
+"get" accessors return a string with the value. Clear is the same as set
+with $value of the empty string ('').
+
+For example:
+
+ $message->set_shared_annotation('/comment', 'Hello World');
+
+=cut
+
+sub get_annotation {
+ my $self = shift;
+ my ($entry, $type) = @_;
+
+ return $self->{annot}{$entry}{$type}{value};
+}
+
+sub set_annotation {
+ my $self = shift;
+ my ($entry, $type, $value) = @_;
+ $value = '' unless defined $value;
+ $self->{annot}{$entry}{$type}{orig} = ''
+	unless exists $self->{annot}{$entry}{$type}{orig};
+ $self->{annot}{$entry}{$type}{value} = $value;
+}
+
+sub get_shared_annotation {
+ my $self = shift;
+ my ($entry) = @_;
+ return $self->get_annotation($entry, 'value.shared');
+}
+
+sub set_shared_annotation {
+ my $self = shift;
+ my ($entry, $value) = @_;
+ return $self->set_annotation($entry, 'value.shared', $value);
+}
+
+sub clear_shared_annotation {
+ my $self = shift;
+ my ($entry) = @_;
+ return $self->set_annotation($entry, 'value.shared', '');
+}
+
+sub get_private_annotation {
+ my $self = shift;
+ my ($entry) = @_;
+ return $self->get_annotation($entry, 'value.private');
+}
+
+sub set_private_annotation {
+ my $self = shift;
+ my ($entry, $value) = @_;
+ return $self->set_annotation($entry, 'value.private', $value);
+}
+
+sub clear_private_annotation {
+ my $self = shift;
+ my ($entry) = @_;
+ return $self->set_annotation($entry, 'value.private', '');
+}
+
+=item I<get_changed()>
+
+returns two arrayrefs - 'flagname', 'bool' and 'entry', 'type', 'value', e.g.
+
+"\\Flagged", 1, '/comment', 'value.shared', 'Hello World'
+
+=cut
+
+sub get_changed {
+ my $self = shift;
+ my @flags;
+ my @annots;
+
+ foreach my $name (sort keys %{$self->{flag}}) {
+	my $item = $self->{flag}{$name};
+	push @flags, $name, $item->{value}
+	 unless $item->{value} == $item->{orig};
+ }
+
+ foreach my $entry (sort keys %{$self->{annot}}) {
+	foreach my $type (sort keys %{$self->{annot}{$entry}}) {
+	 my $item = $self->{annot}{$entry}{$type};
+	 push @annots, $entry, $type, $item->{value}
+		unless is_eq($item->{value}, $item->{orig});
+	}
+ }
+
+ return (\@flags, \@annots);
+}
+
+sub is_eq {
+ my ($l, $r) = @_;
+ if (defined $l && defined $r) {
+	return $l eq $r;
+ }
+ else {
+	return !defined $l && !defined $r;
+ }
+}
+
+=back
+
+=head1 SEE ALSO
+
+I<RFC3501>, I<RFC5257>.
+
+=head1 AUTHOR
+
+Greg Banks E<lt>gnb@fastmail.fmE<gt>.
+Bron Gondwana E<lt>brong@fastmail.fmE<gt>.
+
+=cut
+
+1;

cyrus-imapd-2.5.tar.gz/perl/annotator/README Added

cyrus-imapd-2.4.17.tar.gz/perl/imap/IMAP.pm -> cyrus-imapd-2.5.tar.gz/perl/imap/IMAP.pm Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/IMAP.xs -> cyrus-imapd-2.5.tar.gz/perl/imap/IMAP.xs Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: IMAP.xs,v 1.29 2010/01/06 17:01:55 murch Exp $
 */
 
 /*
@@ -53,13 +51,12 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include "imclient.h"
-#include "imapurl.h"
-#include "util.h"
-#include "xmalloc.h"
+#include "lib/imclient.h"
+#include "lib/imapurl.h"
+#include "lib/util.h"
+#include "lib/xmalloc.h"
 
 #include "cyrperl.h"
-#include "config.h"
 
 typedef struct xscyrus *Cyrus_IMAP;
 
@@ -215,9 +212,9 @@
 
 /* callbacks we support */
 static const sasl_callback_t sample_callbacksNUM_SUPPORTED_CALLBACKS = {
- { SASL_CB_USER, get_username, NULL }, 
- { SASL_CB_AUTHNAME, get_username, NULL }, 
- { SASL_CB_PASS, get_password, NULL },
+ { SASL_CB_USER, (int (*)(void))get_username, NULL },
+ { SASL_CB_AUTHNAME, (int (*)(void))get_username, NULL },
+ { SASL_CB_PASS, (int (*)(void))get_password, NULL },
 { SASL_CB_LIST_END, NULL, NULL }
 };

cyrus-imapd-2.4.17.tar.gz/perl/imap/IMAP/Admin.pm -> cyrus-imapd-2.5.tar.gz/perl/imap/IMAP/Admin.pm Changed

@@ -37,8 +37,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: Admin.pm,v 1.52 2010/01/06 17:01:55 murch Exp $
 
 package Cyrus::IMAP::Admin;
 use strict;
@@ -789,7 +787,8 @@
 		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
 		 "sharedseen" => "/vendor/cmu/cyrus-imapd/sharedseen",
 		 "sieve" => "/vendor/cmu/cyrus-imapd/sieve",
-		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
+		 "squat" => "/vendor/cmu/cyrus-imapd/squat",
+		 "pop3showafter" => "/vendor/cmu/cyrus-imapd/pop3showafter" );
 
   if(!$self->{support_annotatemore}) {
     $self->{error} = "Remote does not support ANNOTATEMORE.";
@@ -859,7 +858,7 @@
 		 "admin" => "/admin",
 		 "shutdown" => "/vendor/cmu/cyrus-imapd/shutdown",
 		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
-		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
+		 "squat" => "/vendor/cmu/cyrus-imapd/squat");
 
   $entry = $values{$entry} if (exists($values{$entry}));

cyrus-imapd-2.4.17.tar.gz/perl/imap/IMAP/IMSP.pm -> cyrus-imapd-2.5.tar.gz/perl/imap/IMAP/IMSP.pm Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/IMAP/Shell.pm -> cyrus-imapd-2.5.tar.gz/perl/imap/IMAP/Shell.pm Changed

@@ -38,8 +38,6 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: Shell.pm,v 1.44 2010/01/06 17:01:55 murch Exp $
-#
 # A shell framework for Cyrus::IMAP::Admin
 #
 # run(*FH|'FH')
@@ -452,7 +450,8 @@
 	 'password|w=s' => \$pw,
 	 'tlskey|t:s' => \$tlskey,
 	 'notls' => \$notls,
-	 'help|h' => sub { cyradm_usage(); exit(0); }
+	 'help|h' => sub { cyradm_usage(); exit(0); },
+	 'version|v' => sub { cyradm_version(); exit(0); }
 	 );
 if ($server ne '' && @ARGV) {
 die "cyradm: may not specify server both with --server and bare arg\n";
@@ -500,12 +499,19 @@
 --userrc <file> Use user configuration <file>
 --port <port> Connect to server on <port>
 --auth <mechanism> Authenticate with <mechanism>
+ --help This help message
+ --version The version of Cyrus IMAP this utility is a part of
 
 Defaults to interactive mode. Please see man cyradm(1) and the 'help' command
 in the cyradm-shell for details.
 END_OF_HELP
 }
 
+# show cyradm version
+sub cyradm_version {
+ print "version: Cyrus IMAP $VERSION\n";
+}
+
 # help display
 sub do_help {
 my ($fd, $cmd, @list) = @_;
@@ -1461,7 +1467,7 @@
 while (defined ($opt = shift(@argv))) {
 last if $opt eq '--';
 if ($opt =~ /^-/) {
- die "usage: mboxconfig mailbox comment|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation> value\n";
+ die "usage: mboxconfig mailbox comment|expire|news2mail|pop3showafter|sharedseen|sieve|squat|/<explicit annotation> value\n";
 }
 else {
 push(@nargv, $opt);
@@ -1470,7 +1476,7 @@
 }
 push(@nargv, @argv);
 if (@nargv < 2) {
- die "usage: mboxconfig mailbox comment|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation> value\n";
+ die "usage: mboxconfig mailbox comment|expire|news2mail|pop3showafter|sharedseen|sieve|squat|/<explicit annotation> value\n";
 }
 if (!$cyrref || !$$cyrref) {
 die "mboxconfig: no connection to server\n";
@@ -1709,6 +1715,12 @@
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
 
+=item C<pop3showafter>
+
+Sets a time (in RFC3501 format, for example "6-Jan-2011 11:45:32 +1100")
+which specifies a cutoff date such that POP3 fetching of the folder does
+not see messages whose internaldate is before or equal to the date.
+
 =item C<sharedseen>
 
 Enables the use of a shared \Seen flag on messages rather than a

cyrus-imapd-2.5.tar.gz/perl/imap/Makefile.PL.in Added

@@ -0,0 +1,80 @@
+# 
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer. 
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any other legal
+# details, please contact 
+# Office of Technology Transfer
+# Carnegie Mellon University
+# 5000 Forbes Avenue
+# Pittsburgh, PA 15213-3890
+# (412) 268-4387, fax: (412) 268-7395
+# tech-transfer@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+use ExtUtils::MakeMaker;
+use Config;
+
+my $LIB_SASL = "@LIB_SASL@" || "-lsasl2";
+
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+$libs = "-lcyrus";
+
+sub MY::postamble
+{
+ return <<'EOT';
+
+VPATH=@top_srcdir@/perl/imap
+
+cyradm: cyradm.sh
+	@PERL_PREINSTALL@ < $< > $@
+
+check:
+
+EOT
+}
+
+WriteMakefile( 
+ 'NAME'	=> 'Cyrus::IMAP',
+ 'ABSTRACT' => 'Cyrus administrative interface',
+ 'VERSION_FROM' => "@top_srcdir@/perl/imap/IMAP.pm", # finds $VERSION
+ 'macro'	=> {
+		 'IMCLIENT_LIBS' => '',	# hack
+		},
+ 'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
+ 'OBJECT' => 'IMAP.o',
+ 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+ 'LIBS'	=> "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@",
+ 'DEFINE'	=> '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' 
+ 'INC'	=> "@BDB_INC@ -I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", 
+ 'EXE_FILES' => cyradm,
+ # This is a disgusting hack to effectively disable the stupid
+ # behaviour of the generated Makefile which moves itself aside
+ # on a 'make clean' instead of on 'make distclean'.
+ 'MAKEFILE_OLD' => 'Makefile',
+);

cyrus-imapd-2.4.17.tar.gz/perl/imap/README -> cyrus-imapd-2.5.tar.gz/perl/imap/README Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/cyradm.sh -> cyrus-imapd-2.5.tar.gz/perl/imap/cyradm.sh Changed

@@ -1,4 +1,6 @@
 #! /bin/sh
+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+#!perl
 #
 # Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
 #
@@ -39,20 +41,9 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: cyradm.sh,v 1.21 2010/01/06 17:01:55 murch Exp $
 
-INCS=
-SITEARCH="@INSTALLSITEARCH@"
-if -n "$SITEARCH" -a -d "$SITEARCH" ; then
- INCS="-I$SITEARCH"
-fi
-
-case "x$BASH_VERSION" in
-x) exec perl $INCS -MCyrus::IMAP::Shell -e shell -- ${1+"$@"} ;;
-*) exec perl $INCS -MCyrus::IMAP::Shell -e shell -- "$@" ;;
-esac
-echo "$0: how did I get here?" >&2
-exit 1
+use Cyrus::IMAP::Shell;
+shell;
 
 =head1 NAME
 
@@ -228,6 +219,12 @@
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
 
+=item C<pop3showafter>
+
+Sets a time (in RFC3501 format, for example "6-Jan-2011 11:45:32 +1100")
+which specifies a cutoff date such that POP3 fetching of the folder does
+not see messages whose internaldate is before or equal to the date.
+
 =item C<sharedseen>
 
 Enables the use of a shared \Seen flag on messages rather than a
@@ -277,7 +274,7 @@
 option is specified. (This may change; in particular, either automatic
 authentication will be removed or all C<authenticate> options will be added.)
 
-When connected to a server, B<cyradm>'s prompt changes from C<cyradmE<gt>> to
+When connected to a server, the B<cyradm> prompt changes from C<cyradmE<gt>> to
 C<servernameE<gt>>, where I<servername> is the fully qualified domain name
 of the connected server.

cyrus-imapd-2.4.17.tar.gz/perl/imap/cyrperl.h -> cyrus-imapd-2.5.tar.gz/perl/imap/cyrperl.h Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/examples/auditmbox.pl -> cyrus-imapd-2.5.tar.gz/perl/imap/examples/auditmbox.pl Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/examples/imapcollate.pl -> cyrus-imapd-2.5.tar.gz/perl/imap/examples/imapcollate.pl Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/examples/imapdu.pl -> cyrus-imapd-2.5.tar.gz/perl/imap/examples/imapdu.pl Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/examples/test-imsp.pl -> cyrus-imapd-2.5.tar.gz/perl/imap/examples/test-imsp.pl Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/t/01-imclient.t -> cyrus-imapd-2.5.tar.gz/perl/imap/t/01-imclient.t Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/t/02-admin.t -> cyrus-imapd-2.5.tar.gz/perl/imap/t/02-admin.t Changed

cyrus-imapd-2.4.17.tar.gz/perl/imap/xsutil.c -> cyrus-imapd-2.5.tar.gz/perl/imap/xsutil.c Changed

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/codes.h -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/codes.h Changed

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/isieve.c -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/isieve.c Changed

@@ -37,37 +37,26 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: isieve.c,v 1.37 2010/01/06 17:01:56 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <netinet/in.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <sasl/saslutil.h>
+#include <sys/file.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <sasl/sasl.h>
-#include <sasl/saslutil.h>
-
-#include "isieve.h"
-#include "lex.h"
-#include "request.h"
 #include "iptostring.h"
 #include "xmalloc.h"
-#include "util.h"
-
-#include <prot.h>
+#include "perl/sieve/lib/isieve.h"
+#include "perl/sieve/lib/lex.h"
+#include "perl/sieve/lib/request.h"
 
 struct iseive_s {
 char *serverFQDN;
@@ -97,8 +86,8 @@
 sasl_dispose(&obj->conn);
 free(obj->serverFQDN);
 
- if (obj->refer_authinfo) free(obj->refer_authinfo);
- if (obj->refer_callbacks) free(obj->refer_callbacks);
+ free(obj->refer_authinfo);
+ free(obj->refer_callbacks);
 
 prot_free(obj->pin);
 prot_free(obj->pout);
@@ -143,10 +132,7 @@
 return -1;
 }
 
- *obj = (isieve_t *) xmalloc(sizeof(isieve_t));
- if (!*obj) return -1;
-
- memset(*obj, '\0', sizeof(isieve_t));
+ *obj = (isieve_t *) xzmalloc(sizeof(isieve_t));
 
 (*obj)->sock = sock;
 (*obj)->serverFQDN = xstrdup(serverFQDN);
@@ -255,7 +241,7 @@
 
 while (yylex(&state,obj->pin)==STRING)
 {
- char *attr = string_DATAPTR(state.str);
+ char *attr = state.str;
 char *val;
 
 val = NULL;
@@ -266,7 +252,7 @@
 	 {
 	 parseerror("STRING");
 	 }
-	 val = xstrdup(string_DATAPTR(state.str));
+	 val = state.str;
 	 if (yylex(&state,obj->pin)!=EOL)
 	 {
 	 parseerror("EOL1");
@@ -276,7 +262,7 @@
 if (strcasecmp(attr,"SASL")==0)
 {
 	free(cap);
-	cap = val ? xstrdup(val) : NULL;
+	cap = xstrdupnull(val);
 } else if (strcasecmp(attr,"SIEVE")==0) {
 
 } else if (strcasecmp(attr,"IMPLEMENTATION")==0) {
@@ -284,12 +270,9 @@
 } else if (strcasecmp(attr,"STARTTLS")==0) {
 	 /* TODO */
 } else if (val && strncmp(val,"SASL=",5)==0) {
-	 int len = strlen(val);
 	 obj->version = OLD_VERSION;
 	 free(cap);
-	 cap = (char *) xmalloc(len+1);
-	 memset(cap, '\0', len);
-	 memcpy(cap, val+5, len-6);
+	 cap = xstrdup(val+5);
 	 free(val);
 	 return cap;
 } else {
@@ -338,17 +321,17 @@
 {
 lexstate_t state;
 int res;
- int ret;
 size_t len;
- mystring_t *errstr;
+ char *errstr = NULL;
 char *last_send;
+ int r;
 
 /* now let's see what the server said */
 res=yylex(&state, obj->pin);
 *line = NULL;
 if (res!=STRING)
 {
- ret = handle_response(res,obj->version,
+ (void)handle_response(res, obj->version,
 			 obj->pin, &last_send, &errstr);
 
 if (res==TOKEN_OK) {
@@ -360,24 +343,28 @@
 	 len = last_send_len*2+1;
 	 *line = xmalloc(len);
 
-	 sasl_decode64(last_send, last_send_len,
-			 *line, len, linelen);
+	 r = sasl_decode64(last_send, last_send_len,
+				*line, len, linelen);
 
 	 free(last_send);
+	 if (r != SASL_OK)
+		return STAT_NO;
 	 }
 	 return STAT_OK;
 } else { /* server said no or bye*/
 	 /* xxx handle referrals */
-	 *errstrp = string_DATAPTR(errstr);
+	 *errstrp = errstr;
 	 return STAT_NO;
 }
 }
 
- len = state.str->len*2+1;
+ len = strlen(state.str)*2+1;
 *line=(char *) xmalloc(len);
 
- sasl_decode64(string_DATAPTR(state.str), state.str->len,
-		*line, len, linelen);
+ r = sasl_decode64(state.str, strlen(state.str),
+		 *line, len, linelen);
+ if (r != SASL_OK)
+ return STAT_NO;
 
 if (yylex(&state, obj->pin)!=EOL)
 return STAT_NO;
@@ -459,9 +446,9 @@
 
 	/* eat the auth line that confirms that we canceled */
 	if(getauthline(obj,&in,&inlen,errstr) != STAT_NO) {
-	 *errstr = strdup("protocol error");
+	 *errstr = xstrdup("protocol error");
 	} else {
-	 *errstr = strdup(sasl_errstring(saslresult,NULL,NULL));
+	 *errstr = xstrdup(sasl_errstring(saslresult,NULL,NULL));
 	}
 	
 	return saslresult;
@@ -541,7 +528,7 @@
 return SASL_OK;
 }
 
-int do_referral(isieve_t *obj, char *refer_to) 
+static int do_referral(isieve_t *obj, char *refer_to)
 {
 int ret;
 struct servent *serv;
@@ -584,11 +571,11 @@
 
 	 switch (callbacksn.id) {
 	 case SASL_CB_USER:
-		callbacksn.proc = &refer_simple_cb;
+		callbacksn.proc = (int (*)(void))&refer_simple_cb;
 		callbacksn.context = userid ? userid : authid;
 		break;
 	 case SASL_CB_AUTHNAME:
-		callbacksn.proc = &refer_simple_cb;
+		callbacksn.proc = (int (*)(void))&refer_simple_cb;
 		callbacksn.context = authid;
 		break;
 	 default:
@@ -618,7 +605,7 @@
 } else {
 	serv = getservbyname("sieve", "tcp");
 	if (serv == NULL) {
-	 port = 2000;
+	 port = 4190;
 	} else {
 	 port = ntohs(serv->s_port);
 	}
@@ -645,9 +632,9 @@
 
 	if(mtried) {
 	 char *newlist = (char*) xmalloc(strlen(mechlist)+1);
-	 char *mtr = (char*) xstrdup(mtried);
+	 char *mtr = xstrdup(mtried);
 	 char *tmp;
-	 
+
 	 ucase(mtr);
 	 tmp = strstr(mechlist,mtr);
 	 if (tmp) {
@@ -717,7 +704,7 @@
 	if(ret == STAT_OK) {
 	 ret = isieve_put_file(obj, filename, destname, errstr);
 	} else {
-	 *errstr = "referral failed";
+	 *errstr = xstrdup("referral failed");
 	}
 }
 return ret;
@@ -734,7 +721,7 @@
 	if(ret == STAT_OK) {
 	 ret = isieve_put(obj, name, data, len, errstr);
 	} else {
-	 *errstr = "referral failed";
+	 *errstr = xstrdup("referral failed");
 	}
 }
 return ret;
@@ -751,7 +738,7 @@
 	if(ret == STAT_OK) {
 	 ret = isieve_delete(obj, name, errstr);
 	} else {
-	 *errstr = "referral failed";
+	 *errstr = xstrdup("referral failed");
 	}
 }
 return ret;
@@ -780,7 +767,7 @@
 	if(ret == STAT_OK) {
 	 ret = isieve_activate(obj, name, errstr);
 	} else {
-	 *errstr = "referral failed";
+	 *errstr = xstrdup("referral failed");
 	}
 }
 return ret;
@@ -790,7 +777,7 @@
 {
 int ret;
 char *refer_to;
- mystring_t *mystr = NULL;
+ char *mystr = NULL;
 
 ret = getscriptvalue(obj->version,obj->pout, obj->pin,
 			 name, &mystr, &refer_to, errstr);
@@ -801,11 +788,11 @@
 	 ret = isieve_get(obj,name,output,errstr);
 	 return ret;
 	} else {
-	 *errstr = "referral failed";
+	 *errstr = xstrdup("referral failed");
 	}
 }
 
- *output = string_DATAPTR(mystr);
+ *output = mystr;
 
 return ret;
 }

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/isieve.h -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/isieve.h Changed

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/lex.c -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/lex.c Changed

@@ -40,27 +40,24 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lex.c,v 1.11 2010/01/06 17:01:56 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
 
 #include "prot.h"
-
-#include "lex.h"
-
-#include "codes.h"
+#include "xmalloc.h"
+#include "perl/sieve/lib/codes.h"
+#include "perl/sieve/lib/lex.h"
 
 /* current state the lexer is in */
-int lexer_state = LEXER_STATE_NORMAL;
+static int lexer_state = LEXER_STATE_NORMAL;
 
 #define ACAP_MAX_QSTR_LEN 4096
 
@@ -74,7 +71,7 @@
 		ERR();					\
 	 }
 
-int token_lookup(char *str, int len __attribute__((unused)))
+static int token_lookup(const char *str)
 {
 if (strcmp(str,"ok")==0) return TOKEN_OK;
 if (strcmp(str,"no")==0) return TOKEN_NO;
@@ -82,7 +79,16 @@
 if (strcmp(str,"active")==0) return TOKEN_ACTIVE;
 if (strcmp(str,"referral")==0) return TOKEN_REFERRAL;
 if (strcmp(str,"sasl")==0) return TOKEN_SASL;
- 
+ if (strcmp(str,"quota/maxscripts")==0) return RESP_CODE_QUOTA_MAXSCRIPTS;
+ if (strcmp(str,"quota/maxsize")==0) return RESP_CODE_QUOTA_MAXSIZE;
+ if (strcmp(str,"quota")==0) return RESP_CODE_QUOTA;
+ if (strcmp(str,"transition-needed")==0) return RESP_CODE_TRANSITION_NEEDED;
+ if (strcmp(str,"trylater")==0) return RESP_CODE_TRYLATER;
+ if (strcmp(str,"nonexistant")==0) return RESP_CODE_NONEXISTANT;
+ if (strcmp(str,"alreadyexists")==0) return RESP_CODE_ALREADYEXISTS;
+ if (strcmp(str,"warning")==0) return RESP_CODE_WARNINGS;
+ if (strcmp(str,"tag")==0) return RESP_CODE_TAG;
+
 return -1;
 }
 
@@ -98,9 +104,6 @@
 
 int result = SIEVE_OK;
 
- int synchronizing; /* wheather we are in the process of reading a
-			 synchronizing string or not */
-
 struct protstream *stream=(struct protstream *) client;
 
 while (1)
@@ -137,10 +140,7 @@
 case LEXER_STATE_QSTR:
 if (ch == '\"') {
 	/* End of the string */
-	lvalp->str = NULL;
-	result = string_allocate(buff_ptr - buffer, buffer, &lvalp->str);
-	if (result != SIEVE_OK)
-	 ERR_PUSHBACK();
+	lvalp->str = xstrndup(buffer, buff_ptr - buffer);
 	lexer_state=LEXER_STATE_NORMAL;
 	return STRING;
 }
@@ -166,13 +166,10 @@
 
 	if (newcount < count)
 	 ERR_PUSHBACK();	/* overflow */
-	/*
-	 * XXX This should be fatal if non-synchronizing.
-	 */
+
 	count = newcount;
 	break;
 }
- synchronizing = FALSE;
 
 if (ch != '}')
 	ERR_PUSHBACK();
@@ -187,14 +184,10 @@
 if (ch != '\n')
 	ERR_PUSHBACK();
 
- lvalp->str = NULL;
- result = string_allocate(count, NULL, &lvalp->str);
- if (result != SIEVE_OK)
-	ERR_PUSHBACK();
-
+ lvalp->str = (char *)xmalloc(count+1);
 /* there is a literal string on the wire. let's read it */
 {
-	char *it = string_DATAPTR(lvalp->str),
+	char *it = lvalp->str,
 	 *end = it + count;
 
 	while (it < end) {
@@ -252,7 +245,6 @@
 	break;
 case '{':
 	count = 0;
-	synchronizing = TRUE;
 	lexer_state=LEXER_STATE_LITERAL;
 	break;
 case '\r':
@@ -267,13 +259,13 @@
 }
 break;
 case LEXER_STATE_ATOM:
- if (!isalpha((unsigned char) ch)) {
+ if (!(isalpha((unsigned char) ch) || ch == '/')) {
 	int token;
 
-	buffer buff_ptr - buffer = '\0';
+	*buff_ptr = '\0';
 
 	/* We've got the atom. */
-	token = token_lookup((char *) buffer, (int) (buff_ptr - buffer));
+	token = token_lookup(buffer);
 
 	if (token!=-1) {
 	 lexer_state=LEXER_STATE_NORMAL;

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/lex.h -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/lex.h Changed

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/request.c -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/request.c Changed

@@ -41,35 +41,29 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: request.c,v 1.19 2010/01/06 17:01:56 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <sys/file.h>
-#include <errno.h>
-
-#include "request.h"
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
-#include "prot.h"
-#include "lex.h"
 #include "xmalloc.h"
+#include "perl/sieve/lib/request.h"
+#include "perl/sieve/lib/lex.h"
 
 #define BLOCKSIZE 1024
 
-void parseerror(char *str)
+void parseerror(const char *str)
 {
 printf("Bad protocol from MANAGESIEVE server: %s\n", str);
 
@@ -77,7 +71,7 @@
 }
 
 int handle_response(int res,int version,struct protstream *pin, 
-		 char **refer_to, mystring_t **errstr)
+		 char **refer_to, char **errstr)
 { 
 lexstate_t state;
 int r = 0;
@@ -107,7 +101,7 @@
 	 if (yylex(&state, pin)!=STRING)
 		 parseerror("expected string");
 
-	 *refer_to = xstrdup(string_DATAPTR(state.str));
+	 *refer_to = state.str;
 
 	 if (yylex(&state, pin)!=')')
 		 parseerror("expected RPAREN");
@@ -117,7 +111,7 @@
 		 res = yylex(&state, pin);
 	 }
 	 if(res != ')') {
-		 parseerror("expected RPARAN");
+		 parseerror("expected RPAREN");
 	 }
 	 }
 
@@ -147,7 +141,7 @@
 	 res = yylex(&state, pin);
 	 }
 	 if(res != ')') {
-	 parseerror("expected RPARAN");
+	 parseerror("expected RPAREN");
 	 }
 	 
 	 res = yylex(&state, pin);
@@ -178,7 +172,7 @@
 	 if (yylex(&state, pin)!=STRING)
 		 parseerror("expected string");
 
-	 *refer_to = xstrdup(string_DATAPTR(state.str));
+	 *refer_to = xstrdup(state.str);
 
 	 if (yylex(&state, pin)!=')')
 		 parseerror("expected RPAREN");
@@ -206,13 +200,13 @@
 }
 
 int deleteascript(int version, struct protstream *pout, 
-		 struct protstream *pin, char *name,
+		 struct protstream *pin, const char *name,
 		 char **refer_to, char **errstrp)
 {
 lexstate_t state;
 int res;
 int ret;
- mystring_t *errstr;
+ char *errstr = NULL;
 
 prot_printf(pout,"DELETESCRIPT \"%s\"\r\n",name);
 prot_flush(pout); 
@@ -224,9 +218,9 @@
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret!=0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "Deleting script: %s",string_DATAPTR(errstr));
+ *errstrp = strconcat("Deleting script: ",
+			 errstr,
+			 (char *)NULL);
 return -1;
 }
 
@@ -239,7 +233,7 @@
 {
 int res;
 int ret;
- mystring_t *errstr=NULL;
+ char *errstr=NULL;
 lexstate_t state;
 
 prot_printf(pout, "PUTSCRIPT \"%s\" ",scriptname);
@@ -260,9 +254,9 @@
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret!=0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "Putting script: %s",string_DATAPTR(errstr));
+ *errstrp = strconcat("Putting script: ",
+			 errstr,
+			 (char *)NULL);
 return -1;
 }
 
@@ -305,7 +299,7 @@
 int cnt;
 int res;
 int ret;
- mystring_t *errstr=NULL;
+ char *errstr=NULL;
 lexstate_t state;
 char *sievename;
 
@@ -314,11 +308,7 @@
 result=stat(filename,&filestats);
 
 if (result!=0) {
- if (errno == ENOENT) {
-	 *errstrp = "no such file";
- } else {
-	 *errstrp = "file i/o error";
- }
+ *errstrp = xstrdup(strerror(errno));
 return -1;
 }
 
@@ -328,9 +318,8 @@
 
 if (stream==NULL)
 {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "put script: internal error: couldn't open temporary file");
+ *errstrp = xstrdup(
+	"put script: internal error: couldn't open temporary file");
 return -1;
 }
 
@@ -353,8 +342,7 @@
 
 n = fread(buf, 1, BLOCKSIZE, stream);
 if (!n) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, "put script: failed to finish reading");
+ *errstrp = xstrdup("put script: failed to finish reading");
 fclose(stream);
 free(sievename);
 return -1;
@@ -380,9 +368,9 @@
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret!=0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "put script: %s", string_DATAPTR(errstr));
+ *errstrp = strconcat("put script: ",
+			 errstr,
+			 (char *)NULL);
 return -1;
 }
 
@@ -390,7 +378,7 @@
 }
 
 
-
+/*
 int showlist(int version, struct protstream *pout, struct protstream *pin,
 	 char **refer_to)
 {
@@ -408,7 +396,7 @@
 
 if ((res=yylex(&state, pin))==STRING)
 {
- char *str=string_DATAPTR(state.str);
+ char *str=state.str;
 
 if (yylex(&state, pin)==' ')
 {
@@ -420,7 +408,7 @@
 	 printf(" %s <- Active Sieve Script\n",str);	 
 } else {
 
-	 /* in old version we had that '*' means active script thing */
+	 // in old version we had that '*' means active script thing
 	 if (version == OLD_VERSION) {
 
 	 if (strstrlen(str)-1=='*') {
@@ -430,8 +418,8 @@
 		 printf(" %s\n",str);	 	 
 	 }
 
-	 } else { /* NEW_VERSION */
-	 /* assume it's a EOL */
+	 } else { // NEW_VERSION
+	 // assume it's a EOL
 	 printf(" %s\n",str);	 	 
 	 }
 }
@@ -442,13 +430,11 @@
 	
 	end=1;
 }
-
-
- 
 } while (end==0);
 
 return ret;
 }
+*/
 
 int list_wcb(int version, struct protstream *pout, 
 	 struct protstream *pin,isieve_listcb_t *cb ,void *rock,
@@ -466,7 +452,7 @@
 
 if ((res=yylex(&state, pin))==STRING)
 {
- char *str=string_DATAPTR(state.str);
+ char *str=state.str;
 
 if (yylex(&state, pin)==' ')
 {
@@ -511,7 +497,7 @@
 lexstate_t state;
 int res;
 int ret;
- mystring_t *errstr=NULL;
+ char *errstr=NULL;
 
 /* tell server we want "name" to be the active script */
 prot_printf(pout, "SETACTIVE \"%s\"\r\n",name);
@@ -526,22 +512,25 @@
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret != 0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "Setting script active: %s",string_DATAPTR(errstr));
+ *errstrp = strconcat("Setting script active: ",
+			 errstr,
+			 (char *)NULL);
 return -1;
 }
 return 0;
 }
 
-static int viewafile(mystring_t *data, char *name __attribute__((unused)))
+#if 0
+static int viewafile(const char *data, char *name __attribute__((unused)))
 {
- printf("%s\r\n", string_DATAPTR(data));
+ printf("%s\r\n", data);
 
 return 0;
 }
+#endif
 
-static int writefile(mystring_t *data, char *name, char **errstrp)
+#if 0
+static int writefile(const char *data, const char *name, char **errstrp)
 {
 FILE *stream;
 
@@ -554,25 +543,29 @@
 free(scrname);
 
 if (stream==NULL) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127,
-	 "writefile: unable to open %s for writing", name);
+ *errstrp = strconcat(
+		 "writefile: unable to open ",
+		 name,
+		 " for writing",
+		 (char *)NULL);
 return -1;
 }
 
- fwrite(string_DATAPTR(data), 1, data->len, stream);
+ fwrite(data, 1, strlen(data), stream);
 
 fclose(stream);
 
 return 0;
 }
+#endif
 
+/*
 int getscript(int version, struct protstream *pout, 
-	 struct protstream *pin,char *name, int save,
+	 struct protstream *pin, const char *name, int save,
 	 char **refer_to, char **errstrp)
 {
 int res;
- mystring_t *errstr=NULL;
+ char *errstr=NULL;
 lexstate_t state;
 int ret = 0;
 
@@ -597,26 +590,24 @@
 
 ret = handle_response(res, version, pin, refer_to, &errstr);
 
- /* if command failed */
+ // if command failed
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret!=0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "Getting script: %s",string_DATAPTR(errstr));
+ *errstrp = errstr;
 }
 
 return ret;
 }
-
+*/
 
 int getscriptvalue(int version, struct protstream *pout, 
-		 struct protstream *pin,char *name, mystring_t **data, 
+		 struct protstream *pin, char *name, char **data,
 		 char **refer_to, char **errstrp)
 {
 int res;
 int ret;
- mystring_t *errstr=NULL;
+ char *errstr=NULL;
 lexstate_t state;
 
 prot_printf(pout,"GETSCRIPT \"%s\"\r\n",name);
@@ -640,9 +631,7 @@
 if(ret == -2 && *refer_to) {
 return -2;
 } else if (ret!=0) {
- *errstrp = malloc(128);
- snprintf(*errstrp, 127, 
-	 "Getting script: %s",string_DATAPTR(errstr));
+ *errstrp = errstr;
 return -1;
 }

cyrus-imapd-2.4.17.tar.gz/perl/sieve/lib/request.h -> cyrus-imapd-2.5.tar.gz/perl/sieve/lib/request.h Changed

@@ -41,14 +41,12 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: request.h,v 1.9 2010/01/06 17:01:56 murch Exp $
  */
 #ifndef _REQUEST_H_
 #define _REQUEST_H_
 
-#include "mystring.h"
-#include "isieve.h"
+#include "util.h"
+#include "perl/sieve/lib/isieve.h"
 
 /* old and new versions of the protocol */
 #define OLD_VERSION  4
@@ -56,10 +54,10 @@
 #define ACAP_VERSION 6
 
 int handle_response(int res,int version,struct protstream *pin,
-		    char **refer_to, mystring_t **errstr);
+		    char **refer_to, char **errstr);
 
 int deleteascript(int version,struct protstream *pout, struct protstream *pin,
-		  char *name, char **refer_to, char **errstr);
+		  const char *name, char **refer_to, char **errstr);
 
 int installafile(int version,struct protstream *pout, struct protstream *pin,
 		 char *filename, char *destname,
@@ -69,8 +67,8 @@
 		char *scriptname, char *data, int len, 
 		char **refer_to, char **errstr);
 
-int showlist(int version, struct protstream *pout, struct protstream *pin,
-	     char **refer_to);
+//int showlist(int version, struct protstream *pout, struct protstream *pin,
+//	     char **refer_to);
 
 int list_wcb(int version, struct protstream *pout, struct protstream *pin,
 	     isieve_listcb_t *cb , void *rock, char **refer_to);
@@ -83,14 +81,14 @@
  * Getscript. Save {0,1} wheather to save to disk or display on screen
  */
 
-int getscript(int version, struct protstream *pout, struct protstream *pin,
-	      char *name, int save, char **refer_to, char **errstr);
+//int getscript(int version, struct protstream *pout, struct protstream *pin,
+//	      const char *name, int save, char **refer_to, char **errstr);
 
 int getscriptvalue(int version,struct protstream *pout, struct protstream *pin,
-		   char *name, mystring_t **data, char **refer_to, 
+		   char *name, char **data, char **refer_to,
 		   char **errstr);
 
-void parseerror(char *str);
+void parseerror(const char *str);
 
 
 #endif

cyrus-imapd-2.5.tar.gz/perl/sieve/managesieve/.gitignore Added

cyrus-imapd-2.5.tar.gz/perl/sieve/managesieve/Makefile.PL.in Added

@@ -0,0 +1,75 @@
+#
+# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+use ExtUtils::MakeMaker;
+use Config;
+
+my $LIB_SASL = "@LIB_SASL@" || "-lsasl2";
+
+$libs = "-lcyrus";
+
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+ 'NAME'	=> 'Cyrus::SIEVE::managesieve',
+ 'ABSTRACT' => 'Cyrus Sieve management interface',
+ 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+ 'MYEXTLIB' => '../lib/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+ 'LIBS'	=> "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@",
+ 'CCFLAGS'	=> '@COV_CFLAGS@',
+ 'DEFINE'	=> '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' 
+ 'INC'	=> "@BDB_INC@ -I@top_srcdir@/lib -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
+ 'OBJECT' => 'managesieve.o',
+ 'LD'	=> $Config{ld} . ' @COV_LDFLAGS@',
+ # This is a disgusting hack to effectively disable the stupid
+ # behaviour of the generated Makefile which moves itself aside
+ # on a 'make clean' instead of on 'make distclean'.
+ 'MAKEFILE_OLD' => 'Makefile',
+);
+
+sub MY::postamble {
+ return <<'EOT';
+
+VPATH=@top_srcdir@/perl/sieve/managesieve
+
+check:
+
+EOT
+}

cyrus-imapd-2.4.17.tar.gz/perl/sieve/managesieve/managesieve.h -> cyrus-imapd-2.5.tar.gz/perl/sieve/managesieve/managesieve.h Changed

cyrus-imapd-2.4.17.tar.gz/perl/sieve/managesieve/managesieve.pm -> cyrus-imapd-2.5.tar.gz/perl/sieve/managesieve/managesieve.pm Changed

@@ -38,8 +38,6 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: managesieve.pm,v 1.10 2010/01/06 17:01:56 murch Exp $
-#
 package Cyrus::SIEVE::managesieve;
 
 use strict;
@@ -101,26 +99,131 @@
 
 =head1 NAME
 
-Cyrus::SIEVE::managesieve - Perl extension for blah blah blah
+Cyrus::SIEVE::managesieve - Perl client for the SIEVE protocol
 
 =head1 SYNOPSIS
 
 use Cyrus::SIEVE::managesieve;
- blah blah blah
 
 =head1 DESCRIPTION
 
-Call sieve_get_handle to get a handle for further calls.
-sieve_get_error will return a string representing the last error, if any.
+This is a Perl module which provides a client for the SIEVE protocol.
+It supports SASL authentication and communication encryption, using the
+Cyrus SASL infrastructure.
+
+It provides the following functions.
+
+=over
+
+=item sieve_get_handle($servername, &username_cb, &authname_cb, &password_cb, &realm_cb)
+
+Creates and returns a new Sieve object which can be used for communicating
+with the SIEVE server. The server is connected to and a login sequence
+is performed, using some combination of the given callbacks to fetch
+from the calling program any data needed for authentication.
+
+The I<servername> may take any of the forms
+
+=over
+
+=item I<hostname>
+
+=item I<hostname>:I<port>
+
+=item I<ipv4address>
+
+=item I<ipv4address>:I<port>
+
+=item I<ipv6address>
+
+=item I<ipv6address>:I<port>
+
+=back
+
+If not explicitly specified in the I<servername>, the port defaults to
+the port named "sieve" in the client machine's service database (for
+example the C</etc/services> files), or 4190.
+
+All the callbacks are called with the following arguments
+
+$string = callback($which, $prompt);
+
+where I<which> is one of the strings C<"username">, C<"authname">,
+C<"getpass">, or C<"realm"> respectively, and I<prompt> is a
+human-readable English language prompt string for the user's benefit.
+Each callback should return a string containing the required
+information.
+
+The function will return I<undef> on error, use
+I<sieve_get_global_error> to get a description of the error.
+
+
+=item sieve_get_error($sieveobj)
+
+Returns a human-readable English language string describing the last
+error encountered on the object I<$sieveobj>.
 
-Blah blah blah.
+=item sieve_get_global_error()
+
+Returns a human-readable English language string describing the last
+error encountered while creating a Sieve object.
+
+=item sieve_logout($sieveobj)
+
+Log out from the SIEVE server. The I<$sieveobj> will become unusable.
+
+=item sieve_put_file($sieveobj, $filename)
+
+Installs a SIEVE script contained in a local file named by I<$filename>
+to the server. The name of the script on the server will be the
+basename of I<$filename>. Returns zero on success and non-zero on
+failure.
+
+=item sieve_put_file_withdest($sieveobj, $filename, $destname)
+
+Like I<sieve_put_file> but also specifies the name of the file on the
+server. Any directory part of I<$destname> is ignored.
+
+=item sieve_put($sieveobj obj, $name, $data)
+
+Installs a SIEVE script contained in the scalar $data to the server,
+with the script name I<$name>. Returns zero on success and non-zero on
+failure.
+
+=item sieve_delete($sieveobj obj, $name)
+
+Removes a SIEVE script from the server. Returns zero on success and
+non-zero on failure.
+
+=item sieve_list($sieveobj obj, &callback)
+
+Lists existing SIEVE scripts on the server. The I<&callback> returns no
+value and is called once for each script on the server, with arguments
+
+callback($name, $is_active)
+
+I<sieve_list> returns zero on success and non-zero on failure.
+
+=item sieve_activate($sieveobj, $name)
+
+Makes the script named I<$name> the active script on the server. Only
+one script is active at a time; activating a script de-activates any
+others. Returns zero on success and non-zero on failure.
+
+=item sieve_get($sieveobj, $name, $output)
+
+Retrieves the SIEVE script named <$name> from the server, and stores it
+in the scalar I<$output>. Returns zero on success and non-zero on
+failure.
+
+=back
 
 =head1 AUTHOR
 
 T. Martin, tmartin@andrew.cmu.edu
- 
+
 =head1 SEE ALSO
 
-perl(1).
+RFC5804, A Protocol for Remotely Managing Sieve Scripts.
 
 =cut

cyrus-imapd-2.4.17.tar.gz/perl/sieve/managesieve/managesieve.xs -> cyrus-imapd-2.5.tar.gz/perl/sieve/managesieve/managesieve.xs Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: managesieve.xs,v 1.30 2010/01/06 17:01:56 murch Exp $
 */
 
 #ifdef __cplusplus
@@ -51,14 +49,12 @@
 }
 #endif
 
-#include "managesieve.h"
-
-#include <netinet/in.h>
 #include <netdb.h>
-#include <sys/socket.h>
-#include <sys/file.h>
 #include <netinet/in.h>
-#include <netdb.h>
+#include <sys/file.h>
+#include <sys/socket.h>
+
+#include "managesieve.h"
 
 typedef struct xscyrus *Sieveobj;
 static char *globalerr = NULL;
@@ -73,111 +69,101 @@
 exit(-1);
 }
 
-static int
-perlsieve_getpass(conn, context, id, psecret)
-	sasl_conn_t *conn;
-	void *context;
-	int id;
- sasl_secret_t **psecret;
+static int perlsieve_getpass(sasl_conn_t *conn, void *context,
+			 int id, sasl_secret_t **psecret)
 {
- int count;
- dSP ;
- char *tmp;
- SV * func = (SV *) context;
-
- ENTER ;
- SAVETMPS;
- PUSHMARK(sp) ;
-
- XPUSHs(sv_2mortal(newSVpv("password", 0)));
-	XPUSHs(sv_2mortal(newSVpv("Please enter your password", 0)));
-
- PUTBACK ;
- count = perl_call_sv(func, G_SCALAR);
- SPAGAIN ;
- if (count != 1)
- croak("Big trouble\n") ;
- tmp = POPp;
-
- /* copy result */
- *psecret = malloc(sizeof(sasl_secret_t) + strlen(tmp) + 2);
- if (!*psecret) return SASL_NOMEM;
- strcpy((char *) (*psecret)->data ,tmp);
- (*psecret)->len = strlen(tmp);
-
- PUTBACK ;
- FREETMPS ;
- LEAVE ;
-
- PUTBACK ;
-
- return SASL_OK;
+ int count;
+ dSP ;
+ char *tmp;
+ SV * func = (SV *) context;
+
+ ENTER ;
+ SAVETMPS;
+ PUSHMARK(sp) ;
+
+ XPUSHs(sv_2mortal(newSVpv("password", 0)));
+ XPUSHs(sv_2mortal(newSVpv("Please enter your password", 0)));
+
+ PUTBACK ;
+ count = perl_call_sv(func, G_SCALAR);
+ SPAGAIN ;
+ if (count != 1)
+	croak("Big trouble\n") ;
+ tmp = POPp;
+
+ /* copy result */
+ *psecret = xmalloc(sizeof(sasl_secret_t) + strlen(tmp) + 2);
+ strcpy((char *) (*psecret)->data ,tmp);
+ (*psecret)->len = strlen(tmp);
+
+ PUTBACK ;
+ FREETMPS ;
+ LEAVE ;
+
+ PUTBACK ;
+
+ return SASL_OK;
 }
 
-static int
-perlsieve_simple(context, id, result, len)
-	void *context;
- int id;
-	unsigned char **result;
- unsigned *len;
+static int perlsieve_simple(void *context, int id,
+			 unsigned char **result, unsigned *len)
 {
- int count;
- dSP ;
- char *tmp;
- SV * func = (SV *) context;
-
- ENTER ;
- SAVETMPS;
- PUSHMARK(sp) ;
-	if (id == SASL_CB_USER) {
-	 XPUSHs(sv_2mortal(newSVpv("username", 0)));
-		XPUSHs(sv_2mortal(newSVpv("Please enter your username", 0)));
-	} else if (id == SASL_CB_AUTHNAME) {
-	 XPUSHs(sv_2mortal(newSVpv("authname", 0)));
-		XPUSHs(sv_2mortal(newSVpv("Please enter your authentication name", 0)));
-	} else if (id == SASL_CB_GETREALM) {
-	 XPUSHs(sv_2mortal(newSVpv("realm", 0)));
-		XPUSHs(sv_2mortal(newSVpv("Please enter your realm", 0)));
-	} else {
-	 croak("Bad callback\n");
-		return SASL_FAIL;
-	}
+ int count;
+ dSP ;
+ char *tmp;
+ SV * func = (SV *) context;
+
+ ENTER ;
+ SAVETMPS;
+ PUSHMARK(sp) ;
+ if (id == SASL_CB_USER) {
+	 XPUSHs(sv_2mortal(newSVpv("username", 0)));
+	 XPUSHs(sv_2mortal(newSVpv("Please enter your username", 0)));
+ } else if (id == SASL_CB_AUTHNAME) {
+	 XPUSHs(sv_2mortal(newSVpv("authname", 0)));
+	 XPUSHs(sv_2mortal(newSVpv("Please enter your authentication name", 0)));
+ } else if (id == SASL_CB_GETREALM) {
+	 XPUSHs(sv_2mortal(newSVpv("realm", 0)));
+	 XPUSHs(sv_2mortal(newSVpv("Please enter your realm", 0)));
+ } else {
+	 croak("Bad callback\n");
+	 return SASL_FAIL;
+ }
 
- PUTBACK ;
- count = perl_call_sv(func, G_SCALAR);
- SPAGAIN ;
- if (count != 1)
- croak("Big trouble\n") ;
- tmp = POPp;
+ PUTBACK ;
+ count = perl_call_sv(func, G_SCALAR);
+ SPAGAIN ;
+ if (count != 1)
+	croak("Big trouble\n") ;
+ tmp = POPp;
 
- /* copy result */
- *result = malloc(strlen(tmp) + 2);
- if (!*result) return SASL_NOMEM;
- strcpy((char *) *result, tmp);
- if (len) *len = strlen((char *) *result);
+ /* copy result */
+ *result = xmalloc(strlen(tmp) + 2);
+ strcpy((char *) *result, tmp);
+ if (len) *len = strlen((char *) *result);
 
- PUTBACK ;
- FREETMPS ;
- LEAVE ;
+ PUTBACK ;
+ FREETMPS ;
+ LEAVE ;
 
- PUTBACK ;
+ PUTBACK ;
 
- return SASL_OK;
+ return SASL_OK;
 }
 
 
 static void *
 call_listcb(unsigned char *name, int isactive, void *rock)
 {
- dSP ;
- PUSHMARK(sp) ;
- XPUSHs(sv_2mortal(newSVpv((const char *) name, 0)));
- XPUSHs(sv_2mortal(newSViv(isactive)));
- PUTBACK ;
-
- /* call perl func */
- perl_call_sv((SV *)rock, G_DISCARD) ;
-	return NULL;
+ dSP ;
+ PUSHMARK(sp) ;
+ XPUSHs(sv_2mortal(newSVpv((const char *) name, 0)));
+ XPUSHs(sv_2mortal(newSViv(isactive)));
+ PUTBACK ;
+
+ /* call perl func */
+ perl_call_sv((SV *)rock, G_DISCARD) ;
+ return NULL;
 }
 
 
@@ -187,148 +173,142 @@
 
 
 Sieveobj
-sieve_get_handle(servername, username_cb, authname_cb, password_cb, realm_cb)
- char *servername
- SV *username_cb
- SV *authname_cb
- SV *password_cb
- SV *realm_cb
+sieve_get_handle(char *servername, SV *username_cb, SV *authname_cb, SV *password_cb, SV *realm_cb)
 
 PREINIT:
- Sieveobj ret = NULL;
- sasl_callback_t *callbacks;
- int port;
- int r;
- struct servent *serv;
- char *mechlist=NULL,*mlist=NULL;
- const char *mtried;
- isieve_t *obj;
- char *p;
- sasl_ssf_t ssf;
+ Sieveobj ret = NULL;
+ sasl_callback_t *callbacks;
+ int port;
+ int r;
+ struct servent *serv;
+ char *mechlist=NULL,*mlist=NULL;
+ const char *mtried;
+ isieve_t *obj;
+ char *p;
+ sasl_ssf_t ssf;
 
 CODE:
 
- /* xxx this gets leaked! */
- callbacks = safemalloc(5 * sizeof(sasl_callback_t));
-
- callbacks0.id = SASL_CB_USER;
- callbacks0.proc = &perlsieve_simple;
- callbacks0.context = username_cb;
- callbacks1.id = SASL_CB_AUTHNAME;
- callbacks1.proc = &perlsieve_simple;
- callbacks1.context = authname_cb;
- callbacks2.id = SASL_CB_GETREALM;
- callbacks2.proc = &perlsieve_simple;
- callbacks2.context = realm_cb;
- callbacks3.id = SASL_CB_PASS;
- callbacks3.proc = &perlsieve_getpass;
- callbacks3.context = password_cb;
- callbacks4.id = SASL_CB_LIST_END;
-
- /* see if we have server:port (or IPv6, etc)*/
- p = servername;
- if (*servername == '') {
- if ((p = strrchr(servername + 1, '')) != NULL) {
-	 *p++ = '\0';
-	 servername++;			/* skip first bracket */
- } else
-	 p = servername;
- }
- if ((p = strchr(p, ':'))) {
- *p++ = '\0';
- port = atoi(p);
- } else {
- /* map port -> num */
- serv = getservbyname("sieve", "tcp");
- if (serv == NULL) {
-	 port = 2000;
- } else {
-	 port = ntohs(serv->s_port);
- }
- }
-
- if (init_net(servername, port, &obj)) {
- globalerr = "network initialization failed";
- XSRETURN_UNDEF;
- }
-
- if (init_sasl(obj, 128, callbacks)) {
- globalerr = "sasl initialization failed";
- XSRETURN_UNDEF;
- }
- 
- ret = malloc(sizeof(struct xscyrus));
- ret->class = safemalloc(20);
- strcpy(ret->class,"managesieve");
- ret->isieve = obj;
- ret->errstr = NULL;
- 
- mechlist=read_capability(obj);
- if(!mechlist) {
-	globalerr = "sasl mech list empty";
+ /* xxx this gets leaked! */
+ callbacks = safemalloc(5 * sizeof(sasl_callback_t));
+
+ callbacks0.id = SASL_CB_USER;
+ callbacks0.proc = (int (*)(void))&perlsieve_simple;
+ callbacks0.context = username_cb;
+ callbacks1.id = SASL_CB_AUTHNAME;
+ callbacks1.proc = (int (*)(void))&perlsieve_simple;
+ callbacks1.context = authname_cb;
+ callbacks2.id = SASL_CB_GETREALM;
+ callbacks2.proc = (int (*)(void))&perlsieve_simple;
+ callbacks2.context = realm_cb;
+ callbacks3.id = SASL_CB_PASS;
+ callbacks3.proc = (int (*)(void))&perlsieve_getpass;
+ callbacks3.context = password_cb;
+ callbacks4.id = SASL_CB_LIST_END;
+
+ /* see if we have server:port (or IPv6, etc)*/
+ p = servername;
+ if (*servername == '') {
+	if ((p = strrchr(servername + 1, '')) != NULL) {
+	 *p++ = '\0';
+	 servername++;			/* skip first bracket */
+	} else
+	 p = servername;
+ }
+ if ((p = strchr(p, ':'))) {
+	*p++ = '\0';
+	port = atoi(p);
+ } else {
+	/* map port -> num */
+	serv = getservbyname("sieve", "tcp");
+	if (serv == NULL) {
+	 port = 4190;
+	} else {
+	 port = ntohs(serv->s_port);
+	}
+ }
+
+ if (init_net(servername, port, &obj)) {
+	globalerr = "network initialization failed";
 	XSRETURN_UNDEF;
- }
+ }
 
- mlist = (char*) xstrdup(mechlist);
- if(!mlist) {
-	globalerr = "could not allocate memory for mech list";
+ if (init_sasl(obj, 128, callbacks)) {
+	globalerr = "sasl initialization failed";
+	sieve_free_net(obj);
 	XSRETURN_UNDEF;
- }
+ }
+
+ ret = xmalloc(sizeof(struct xscyrus));
+ ret->class = safemalloc(20);
+ strcpy(ret->class,"managesieve");
+ ret->isieve = obj;
+ ret->errstr = NULL;
 
- /* loop through all the mechanisms */
- do {
- mtried = NULL;
- r = auth_sasl(mlist, obj, &mtried, &ssf, &globalerr);
+ mechlist=read_capability(obj);
+ if (!mechlist) {
+	globalerr = "sasl mech list empty";
+	free(ret);
+	XSRETURN_UNDEF;
+ }
 
- if(r) init_sasl(obj, 128, callbacks);
+ mlist = (char*) xstrdup(mechlist);
 
- if(mtried) {
-	char *newlist = (char*) xmalloc(strlen(mlist)+1);
-	char *mtr = (char*) xstrdup(mtried);
-	char *tmp;
+ /* loop through all the mechanisms */
+ do {
+	mtried = NULL;
+	r = auth_sasl(mlist, obj, &mtried, &ssf, &globalerr);
 
-	ucase(mtr);
-	tmp = strstr(mlist,mtr);
-	*tmp ='\0';
-	strcpy(newlist, mlist);
-	tmp++;
+	if (r) init_sasl(obj, 128, callbacks);
 
-	tmp = strchr(tmp,' ');
- if (tmp) {
-	 strcat(newlist,tmp);
-	}
+	if (mtried) {
+	 char *newlist = (char*) xmalloc(strlen(mlist)+1);
+	 char *mtr = (char*) xstrdup(mtried);
+	 char *tmp;
 
-	free(mtr);
-	free(mlist);
-	mlist = newlist;
- }
- } while (r && mtried);
+	 ucase(mtr);
+	 tmp = strstr(mlist,mtr);
+	 *tmp ='\0';
+	 strcpy(newlist, mlist);
+	 tmp++;
 
- if(r) {
+	 tmp = strchr(tmp,' ');
+	 if (tmp) {
+		strcat(newlist,tmp);
+	 }
+
+	 free(mtr);
+	 free(mlist);
+	 mlist = newlist;
+	}
+ } while (r && mtried);
+
+ if (r) {
 	/* we failed */
 	safefree(ret->class);
 	free(ret);
+	free(mechlist);
 	XSRETURN_UNDEF;
- }
+ }
 
- if (ssf) {
- /* SASL security layer negotiated --
+ if (ssf) {
+	/* SASL security layer negotiated --
 	 check if SASL mech list changed */
- if (detect_mitm(obj, mechlist)) {
+	if (detect_mitm(obj, mechlist)) {
 	 globalerr = "possible MITM attack: "
 		"list of available SASL mechamisms changed";
+	 free(ret);
 	 free(mechlist);
 	 XSRETURN_UNDEF;
 	}
- }
- free(mechlist);
+ }
+ free(mechlist);
 
- ST(0) = sv_newmortal();
- sv_setref_pv(ST(0), ret->class, (void *) ret);
+ ST(0) = sv_newmortal();
+ sv_setref_pv(ST(0), ret->class, (void *) ret);
 
 char *
-sieve_get_error(obj)
- Sieveobj obj
+sieve_get_error(Sieveobj obj)
 CODE:
 RETVAL = obj->errstr;
 OUTPUT:
@@ -342,58 +322,42 @@
 RETVAL
 
 int
-sieve_logout(obj)
- Sieveobj obj
+sieve_logout(Sieveobj obj)
 CODE:
-	/* xxx this leaves the object unusable */
-	isieve_logout(&(obj->isieve));
-	XSRETURN_UNDEF;
+ /* xxx this leaves the object unusable */
+ isieve_logout(&(obj->isieve));
+ XSRETURN_UNDEF;
 
 int
-sieve_put_file(obj, filename)
- Sieveobj obj
- char *filename
+sieve_put_file(Sieveobj obj, char *filename)
 CODE:
 RETVAL = isieve_put_file(obj->isieve, filename, NULL, &obj->errstr);
 OUTPUT:
 RETVAL
 
 int
-sieve_put_file_withdest(obj, filename, destname)
- Sieveobj obj
- char *filename
- char *destname
+sieve_put_file_withdest(Sieveobj obj, char *filename, char *destname)
 CODE:
 RETVAL = isieve_put_file(obj->isieve, filename, destname, &obj->errstr);
 OUTPUT:
 RETVAL
 
 int
-sieve_put(obj,name,data)
- Sieveobj obj
- char *name
- char *data
-
+sieve_put(Sieveobj obj, char *name, char *data)
 CODE:
 RETVAL = isieve_put(obj->isieve, name, data, strlen(data), &obj->errstr);
 OUTPUT:
 RETVAL
 
 int
-sieve_delete(obj,name)
- Sieveobj obj
- char *name
-
+sieve_delete(Sieveobj obj, char *name)
 CODE:
 RETVAL = isieve_delete(obj->isieve, name, &obj->errstr);
 OUTPUT:
 RETVAL
 
 int
-sieve_list(obj,cb)
- Sieveobj obj
- SV *cb
-
+sieve_list(Sieveobj obj, SV *cb)
 CODE:
 RETVAL = isieve_list(obj->isieve, (isieve_listcb_t *) &call_listcb,
 			 cb, &obj->errstr);
@@ -401,24 +365,17 @@
 RETVAL
 
 int
-sieve_activate(obj,name)
- Sieveobj obj
- char *name
-
+sieve_activate(Sieveobj obj, char *name)
 CODE:
 RETVAL = isieve_activate(obj->isieve, name, &obj->errstr);
 OUTPUT:
 RETVAL
 
 int
-sieve_get(obj,name,output)
- Sieveobj obj
- char *name
- char *output
-
+sieve_get(Sieveobj obj, char *name, char *output)
 CODE:
- RETVAL = isieve_get(obj->isieve, name, &output, &obj->errstr); 
+ RETVAL = isieve_get(obj->isieve, name, &output, &obj->errstr);
 
 OUTPUT:
- RETVAL
- output
+ RETVAL
+ output

cyrus-imapd-2.4.17.tar.gz/perl/sieve/scripts/installsieve.pl -> cyrus-imapd-2.5.tar.gz/perl/sieve/scripts/installsieve.pl Changed

@@ -41,8 +41,6 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: installsieve.pl,v 1.9 2010/01/06 17:01:57 murch Exp $
-#
 use Cyrus::SIEVE::managesieve;
 use Getopt::Long;
 
@@ -119,6 +117,13 @@
   print "\n";
 }
 
+sub error {
+    my ($obj, $msg) = @_;
+    my $errstr = sieve_get_error($obj);
+    print STDERR "$msg\n$errstr";
+    exit(1);
+}
+
 #main code
 my $obj = sieve_get_handle($acapserver,"prompt","prompt","prompt","prompt");
 
@@ -128,24 +133,24 @@
 
 if (defined $installs) {
   $ret = sieve_put_file($obj, $installs);
-  if ($ret != 0) { print "upload failed\n"; }
+  if ($ret != 0) { error($obj, "upload failed"); }
 }
 
 if (defined $deletes) {
   $ret = sieve_delete($obj, $deletes);
-  if ($ret != 0) { print "delete failed\n"; }
+  if ($ret != 0) { error($obj, "delete failed"); }
 }
 
 if (defined $activates) {
   $ret = sieve_activate($obj, $activates);
-  if ($ret != 0) { print "activate failed\n"; }
+  if ($ret != 0) { error($obj, "activate failed"); }
 }
 
 if (defined $gets) {
     $str = "";
     $ret = sieve_get($obj, $gets, $str);
     if ($ret != 0) { 
-	print "get failed\n"; 
+	error($obj, "get failed");
     } else {
 	open (OUTPUT,">$gets") || die "Unable to open $gets";
 	print OUTPUT $str;
@@ -156,7 +161,7 @@
     $str = "";
     $ret = sieve_get($obj, $views, $str);
     if ($ret != 0) { 
-	print "get failed\n"; 
+	error($obj, "get failed");
     } else {
 	# view
 	print $str;
@@ -165,5 +170,5 @@
 
 if (defined $list) {
   $ret = sieve_list($obj, "list_cb");  
-  if ($ret != 0) { print "List command failed\n"; }
+  if ($ret != 0) { error("List command failed"); }
 }

cyrus-imapd-2.4.17.tar.gz/perl/sieve/scripts/sieveshell.pl -> cyrus-imapd-2.5.tar.gz/perl/sieve/scripts/sieveshell.pl Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/README -> cyrus-imapd-2.5.tar.gz/ptclient/README Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/afskrb.c -> cyrus-imapd-2.5.tar.gz/ptclient/afskrb.c Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/ldap.c -> cyrus-imapd-2.5.tar.gz/ptclient/ldap.c Changed

@@ -38,10 +38,9 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ldap.c,v 1.17 2010/01/06 17:01:57 murch Exp $
 */
 
+#include <syslog.h>
 #include <config.h>
 #include "ptloader.h"
 #include "exitcodes.h"
@@ -49,6 +48,7 @@
 
 #ifdef HAVE_LDAP
 
+#include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -68,7 +68,7 @@
 #include <lber.h>
 
 /* libimap */
-#include "global.h"
+#include "imap/global.h"
 
 /* libconfig */
 #include "libconfig.h"
@@ -91,7 +91,7 @@
 * This may not be restrictive enough.
 * Here are the reasons for the restrictions:
 *
- * &	forbidden because of MUTF-7. (This could be fixed.)
+ * & forbidden because of MUTF-7. (This could be fixed.)
 * : forbidden because it's special in /etc/passwd
 * / forbidden because it can't be used in a mailbox name
 * * % forbidden because they're IMAP magic in the LIST/LSUB commands
@@ -158,6 +158,7 @@
 const char *tls_cert;
 const char *tls_key;
 int member_method;
+ const char *user_attribute;
 const char *member_attribute;
 const char *member_filter;
 const char *member_base;
@@ -182,41 +183,41 @@
 static t_ptsm *ptsm = NULL;
 
 static int ptsmodule_interact(
-	LDAP *ld, 
-	unsigned flags __attribute__((unused)), 
-	void *def, 
-	void *inter)
+ LDAP *ld,
+ unsigned flags __attribute__((unused)),
+ void *def,
+ void *inter)
 {
-	sasl_interact_t *in = inter;
-	const char *p;
-	t_ptsm *ptsmdef = def;
-
-	for (;in->id != SASL_CB_LIST_END;in++) {
-		p = NULL;
-		switch(in->id) {
-			case SASL_CB_AUTHNAME:
-				if (ISSET(ptsmdef->id))
-					p = ptsmdef->id;
-				break;
-			case SASL_CB_USER:
-				if (ISSET(ptsmdef->authz))
-					p = ptsmdef->authz;
-				break;
-			case SASL_CB_GETREALM:
-				if (ISSET(ptsmdef->realm))
-					p = ptsmdef->realm;
-				break; 
-			case SASL_CB_PASS:
-				if (ISSET(ptsmdef->password))
-					p = ptsmdef->password;
-				break;
-		}
+ sasl_interact_t *in = inter;
+ const char *p;
+ t_ptsm *ptsmdef = def;
+
+ for (;in->id != SASL_CB_LIST_END;in++) {
+ p = NULL;
+ switch(in->id) {
+ case SASL_CB_AUTHNAME:
+ if (ISSET(ptsmdef->id))
+ p = ptsmdef->id;
+ break;
+ case SASL_CB_USER:
+ if (ISSET(ptsmdef->authz))
+ p = ptsmdef->authz;
+ break;
+ case SASL_CB_GETREALM:
+ if (ISSET(ptsmdef->realm))
+ p = ptsmdef->realm;
+ break;
+ case SASL_CB_PASS:
+ if (ISSET(ptsmdef->password))
+ p = ptsmdef->password;
+ break;
+ }
 
-		in->result = p ? p : "";
-		in->len = strlen(in->result);
-	}
+ in->result = p ? p : "";
+ in->len = strlen(in->result);
+ }
 
-	return LDAP_SUCCESS;
+ return LDAP_SUCCESS;
 }
 
 /*
@@ -259,11 +260,11 @@
 switch (allowedchars*(unsigned char*) p) {
 case 0:
 return NULL;
- 
+
 case 2:
 sawalpha = 1;
 /* FALL THROUGH */
- 
+
 default:
 ;
 }
@@ -351,7 +352,8 @@
 
 	rc = ldap_set_option(ptsm->ld, LDAP_OPT_NETWORK_TIMEOUT, &(ptsm->timeout));
 	if (rc != LDAP_OPT_SUCCESS) {
-		syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", ptsm->timeout.tv_sec, ptsm->timeout.tv_usec);
+		syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%06d.",
+		 (long)ptsm->timeout.tv_sec, (int)ptsm->timeout.tv_usec);
 	}
 
 	rc = ldap_set_option(ptsm->ld, LDAP_OPT_TIMELIMIT, &(ptsm->time_limit));
@@ -425,14 +427,14 @@
 ldap_unbind(ptsm->ld);
 ptsm->ld = NULL;
 return (rc == LDAP_SERVER_DOWN ? PTSM_RETRY : PTSM_FAIL);
-	}
+ }
 
-	return PTSM_OK;
+ return PTSM_OK;
 }
 
 /* API */
 
-static void myinit(void) 
+static void myinit(void)
 {
 const char *p = NULL;
 
@@ -444,7 +446,7 @@
 fatal("xmalloc() failed", EC_CONFIG);
 }
 
- ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ? 
+ ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ?
 config_getstring(IMAPOPT_LDAP_URI) : config_getstring(IMAPOPT_LDAP_SERVERS));
 ptsm->version = (config_getint(IMAPOPT_LDAP_VERSION) == 2 ? LDAP_VERSION2 : LDAP_VERSION3);
 ptsm->timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
@@ -473,15 +475,15 @@
 }
 ptsm->bind_dn = config_getstring(IMAPOPT_LDAP_BIND_DN);
 ptsm->sasl = config_getswitch(IMAPOPT_LDAP_SASL);
- ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ? 
+ ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ?
 config_getstring(IMAPOPT_LDAP_ID) : config_getstring(IMAPOPT_LDAP_SASL_AUTHC));
- ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ? 
+ ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ?
 config_getstring(IMAPOPT_LDAP_AUTHZ) : config_getstring(IMAPOPT_LDAP_SASL_AUTHZ));
- ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ? 
+ ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ?
 config_getstring(IMAPOPT_LDAP_MECH) : config_getstring(IMAPOPT_LDAP_SASL_MECH));
- ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ? 
+ ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ?
 config_getstring(IMAPOPT_LDAP_REALM) : config_getstring(IMAPOPT_LDAP_SASL_REALM));
- ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ? 
+ ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ?
 config_getstring(IMAPOPT_LDAP_PASSWORD) : config_getstring(IMAPOPT_LDAP_SASL_PASSWORD));
 ptsm->start_tls = config_getswitch(IMAPOPT_LDAP_START_TLS);
 ptsm->tls_check_peer = config_getswitch(IMAPOPT_LDAP_TLS_CHECK_PEER);
@@ -508,6 +510,8 @@
 ptsm->member_base = config_getstring(IMAPOPT_LDAP_MEMBER_BASE);
 ptsm->member_attribute = (config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) ?
 config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE));
+ ptsm->user_attribute = (config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) ?
+ config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE));
 p = config_getstring(IMAPOPT_LDAP_GROUP_SCOPE);
 if (!strcasecmp(p, "one")) {
 ptsm->group_scope = LDAP_SCOPE_ONELEVEL;
@@ -521,10 +525,10 @@
 ptsm->filter = config_getstring(IMAPOPT_LDAP_FILTER);
 ptsm->base = config_getstring(IMAPOPT_LDAP_BASE);
 
-	if (ptsm->version != LDAP_VERSION3 && 
-	 (ptsm->sasl ||
-	 ptsm->start_tls))
-	 ptsm->version = LDAP_VERSION3;
+ if (ptsm->version != LDAP_VERSION3 &&
+ (ptsm->sasl ||
+ ptsm->start_tls))
+ ptsm->version = LDAP_VERSION3;
 
 ptsm->ld = NULL;
 }
@@ -533,98 +537,98 @@
 * Note: calling function must free memory.
 */
 static int ptsmodule_escape(
-	const char *s, 
-	const unsigned int n, 
-	char **result) 
+ const char *s,
+ const unsigned int n,
+ char **result)
 {
-	char *buf;
-	char *end, *ptr, *temp;
+ char *buf;
+ char *end, *ptr, *temp;
 
-	if (n > strlen(s)) // Sanity check, just in case
-		return PTSM_FAIL;
+ if (n > strlen(s)) // Sanity check, just in case
+ return PTSM_FAIL;
 
-	buf = xmalloc(n * 5 + 1);
-	if (buf == NULL) {
-		return PTSM_NOMEM;
-	}
+ buf = xmalloc(n * 5 + 1);
+ if (buf == NULL) {
+ return PTSM_NOMEM;
+ }
 
-	buf0 = '\0';
-	ptr = (char *)s;
-	end = ptr + n;
-
-	while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
-
-		if (temp>ptr)
-			strncat(buf, ptr, temp-ptr);
-
-		switch (*temp) {
-			case '*':
-				strcat(buf, "\\2a");
-				break;
-			case '(':
-				strcat(buf, "\\28");
-				break;
-			case ')':
-				strcat(buf, "\\29");
-				break;
-			case '\\':
-				strcat(buf, "\\5c");
-				break;
-			case '\0':
-				strcat(buf, "\\00");
-				break;
-		}
-		ptr=temp+1;
-	}
-	if (ptr<end)
-		strncat(buf, ptr, end-ptr);
+ buf0 = '\0';
+ ptr = (char *)s;
+ end = ptr + n;
+
+ while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
+
+ if (temp>ptr)
+ strncat(buf, ptr, temp-ptr);
+
+ switch (*temp) {
+ case '*':
+ strcat(buf, "\\2a");
+ break;
+ case '(':
+ strcat(buf, "\\28");
+ break;
+ case ')':
+ strcat(buf, "\\29");
+ break;
+ case '\\':
+ strcat(buf, "\\5c");
+ break;
+ case '\0':
+ strcat(buf, "\\00");
+ break;
+ }
+ ptr=temp+1;
+ }
+ if (ptr<end)
+ strncat(buf, ptr, end-ptr);
 
-	*result = buf;
+ *result = buf;
 
-	return PTSM_OK;
+ return PTSM_OK;
 }
 
 static int ptsmodule_tokenize_domains(
-	const char *d, 
-	int n, 
-	char **result)
+ const char *d,
+ int n,
+ char **result)
 {
-	char *s, *s1;
-	char *lasts;
-	int nt, i, rc;
+ char *s, *s1;
+ char *lasts;
+ int nt, i, rc;
 
-	*result = NULL;
+ *result = NULL;
 
-	if (d == NULL || n < 1 || n > 9)
-		return PTSM_FAIL;
+ if (d == NULL || n < 1 || n > 9)
+ return PTSM_FAIL;
 
-	s = strdup(d);
-	if (s == NULL)
-		return PTSM_NOMEM;
+ s = strdup(d);
+ if (s == NULL)
+ return PTSM_NOMEM;
 
-	for( nt=0, s1=s; *s1; s1++ )
-		if( *s1 == '.' ) nt++;
-	nt++;
+ for( nt=0, s1=s; *s1; s1++ )
+ if( *s1 == '.' ) nt++;
+ nt++;
 
-	if (n > nt) {
-		free(s);
-		return PTSM_FAIL;
-	}
+ if (n > nt) {
+ free(s);
+ return PTSM_FAIL;
+ }
 
-	i = nt - n;
-	s1 = (char *)strtok_r(s, ".", &lasts);
-	while(s1) {
-		if (i == 0) {
-			rc = ptsmodule_escape(s1, strlen(s1), result);
-			free(s);
-			return rc;
-		}
-		s1 = (char *)strtok_r(NULL, ".", &lasts);
-		i--;
-	}
+ i = nt - n;
+ s1 = (char *)strtok_r(s, ".", &lasts);
+ while(s1) {
+ if (i == 0) {
+ rc = ptsmodule_escape(s1, strlen(s1), result);
+ free(s);
+ return rc;
+ }
+ s1 = (char *)strtok_r(NULL, ".", &lasts);
+ i--;
+ }
 
-	free(s);
-	return PTSM_FAIL;
+ free(s);
+ return PTSM_FAIL;
 }
 
 #define PTSM_MAX(a,b) (a>b?a:b)
@@ -642,137 +646,137 @@
 * Note: calling function must free memory.
 */
 static int ptsmodule_expand_tokens(
-	const char *pattern,
-	const char *username, 
-	const char *dn,
-	char **result) 
+ const char *pattern,
+ const char *username,
+ const char *dn,
+ char **result)
 {
-	char *buf; 
-	char *end, *ptr, *temp;
-	char *ebuf, *user;
-	char *domain;
-	int rc;
-
-	/* to permit multiple occurences of username and/or realm in filter */
-	/* and avoid memory overflow in filter build eg: (|(uid=%u)(userid=%u)) */
-	int percents, user_len, dn_len, maxparamlength;
-	
-	if (pattern == NULL) {
-		syslog(LOG_ERR, "filter pattern not setup");
-		return PTSM_FAIL;
-	}
+ char *buf;
+ char *end, *ptr, *temp;
+ char *ebuf, *user;
+ char *domain;
+ int rc;
 
-	/* find the longest param of username and realm, 
-	 do not worry about domain because it is always shorter 
-	 then username */
-	user_len=username ? strlen(username) : 0;
-	dn_len=dn ? strlen(dn) : 0;
+ /* to permit multiple occurences of username and/or realm in filter */
+ /* and avoid memory overflow in filter build eg: (|(uid=%u)(userid=%u)) */
+ int percents, user_len, dn_len, maxparamlength;
 
-	maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
+ if (pattern == NULL) {
+ syslog(LOG_ERR, "filter pattern not setup");
+ return PTSM_FAIL;
+ }
 
-	/* find the number of occurences of percent sign in filter */
-	for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
-		if( *buf == '%' ) percents++;
-	}
+ /* find the longest param of username and realm,
+ do not worry about domain because it is always shorter
+ then username */
+ user_len=username ? strlen(username) : 0;
+ dn_len=dn ? strlen(dn) : 0;
+
+ maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
+
+ /* find the number of occurences of percent sign in filter */
+ for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
+ if( *buf == '%' ) percents++;
+ }
 
-	/* percents * 3 * maxparamlength because we need to account for
+ /* percents * 3 * maxparamlength because we need to account for
 * an entirely-escaped worst-case-length parameter */
-	buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
-	if(buf == NULL)
-		return PTSM_NOMEM;
-	buf0 = '\0';
-	
-	ptr = (char *)pattern;
-	end = ptr + strlen(ptr);
+ buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
+ if(buf == NULL)
+ return PTSM_NOMEM;
+ buf0 = '\0';
 
-	while ((temp=strchr(ptr,'%'))!=NULL ) {
+ ptr = (char *)pattern;
+ end = ptr + strlen(ptr);
 
-		if ((temp-ptr) > 0)
-			strncat(buf, ptr, temp-ptr);
+ while ((temp=strchr(ptr,'%'))!=NULL ) {
 
-		if ((temp+1) >= end) {
-			syslog(LOG_DEBUG, "Incomplete lookup substitution format");
-			break;
-		}
+ if ((temp-ptr) > 0)
+ strncat(buf, ptr, temp-ptr);
 
-		switch (*(temp+1)) {
-			case '%':
-				strncat(buf,temp+1,1);
-				break;
-			case 'u':
-				if (ISSET(username)) {
-					rc=ptsmodule_escape(username, strlen(username), &ebuf);
-					if (rc == PTSM_OK) {
-						strcat(buf,ebuf);
-						free(ebuf);
-					}
-				} else
-					syslog(LOG_DEBUG, "Username not available.");
-				break;
-			case 'U':
-				if (ISSET(username)) {
-					
-					user = strchr(username, '@');
-					rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
-					if (rc == PTSM_OK) {
-						strcat(buf,ebuf);
-						free(ebuf);
-					}
-				} else
-					syslog(LOG_DEBUG, "Username not available.");
-				break;
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
-					rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
-					if (rc == PTSM_OK) {
-						strcat(buf,ebuf);
-						free(ebuf);
-					}
-				} else
-					syslog(LOG_DEBUG, "Domain tokens not available.");
-				break;
-			case 'R':
-			case 'd':
-				if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
-					rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
-					if (rc == PTSM_OK) {
-						if (*(temp+1) == 'R')
-							strcat(buf,"@");
-						strcat(buf,ebuf);
-						free(ebuf);
-					}
-					break;
-				} 
-				break;
-			case 'D':
-				if (ISSET(dn)) {
-					rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
-					if (rc == PTSM_OK) {
-						strcat(buf,ebuf);
-						free(ebuf);
-					}
-				} else
-					syslog(LOG_DEBUG, "dn not available.");
-				break;
-			default:
-				break;
-		}
-		ptr=temp+2;
-	}
-	if (temp<end)
-		strcat(buf, ptr);
+ if ((temp+1) >= end) {
+ syslog(LOG_DEBUG, "Incomplete lookup substitution format");
+ break;
+ }
+
+ switch (*(temp+1)) {
+ case '%':
+ strncat(buf,temp+1,1);
+ break;
+ case 'u':
+ if (ISSET(username)) {
+ rc=ptsmodule_escape(username, strlen(username), &ebuf);
+ if (rc == PTSM_OK) {
+ strcat(buf,ebuf);
+ free(ebuf);
+ }
+ } else
+ syslog(LOG_DEBUG, "Username not available.");
+ break;
+ case 'U':
+ if (ISSET(username)) {
+
+ user = strchr(username, '@');
+ rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
+ if (rc == PTSM_OK) {
+ strcat(buf,ebuf);
+ free(ebuf);
+ }
+ } else
+ syslog(LOG_DEBUG, "Username not available.");
+ break;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
+ rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
+ if (rc == PTSM_OK) {
+ strcat(buf,ebuf);
+ free(ebuf);
+ }
+ } else
+ syslog(LOG_DEBUG, "Domain tokens not available.");
+ break;
+ case 'R':
+ case 'd':
+ if (ISSET(username) && (domain = strchr(username, '@')) && domain1!='\0') {
+ rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
+ if (rc == PTSM_OK) {
+ if (*(temp+1) == 'R')
+ strcat(buf,"@");
+ strcat(buf,ebuf);
+ free(ebuf);
+ }
+ break;
+ }
+ break;
+ case 'D':
+ if (ISSET(dn)) {
+ rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
+ if (rc == PTSM_OK) {
+ strcat(buf,ebuf);
+ free(ebuf);
+ }
+ } else
+ syslog(LOG_DEBUG, "dn not available.");
+ break;
+ default:
+ break;
+ }
+ ptr=temp+2;
+ }
+ if (temp<end)
+ strcat(buf, ptr);
 
-	*result = buf;
+ *result = buf;
 
-	return PTSM_OK;
+ return PTSM_OK;
 }
 
 
@@ -790,7 +794,7 @@
 char *authzid;
 #endif
 char *base = NULL, *filter = NULL;
- char *attrs = {NULL};
+ char *attrs = {LDAP_NO_ATTRS,NULL}; //do not return all attrs!
 LDAPMessage *res;
 LDAPMessage *entry;
 char *attr, **vals;
@@ -859,14 +863,14 @@
 return PTSM_FAIL;
 }
 
-	/*
-	 * We don't want to return the *first* entry found, we want to return
-	 * the *only* entry found.
-	 */
-	if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
-	 if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
-		*ret = ldap_get_dn(ptsm->ld, entry);
-	}
+ /*
+ * We don't want to return the *first* entry found, we want to return
+ * the *only* entry found.
+ */
+ if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
+ if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
+ *ret = ldap_get_dn(ptsm->ld, entry);
+ }
 
 ldap_msgfree(res);
 res = NULL;
@@ -879,16 +883,17 @@
 static int ptsmodule_make_authstate_attribute(
 const char *canon_id,
 size_t size,
- const char **reply, 
+ const char **reply,
 int *dsize,
- struct auth_state **newstate) 
+ struct auth_state **newstate)
 {
 char *dn = NULL;
 LDAPMessage *res = NULL;
 LDAPMessage *entry = NULL;
 char **vals = NULL;
+ char **rdn = NULL;
 int rc;
- char *attrs = {(char *)ptsm->member_attribute,NULL};
+ char *attrs = {(char *)ptsm->member_attribute,(char *)ptsm->user_attribute,NULL};
 
 rc = ptsmodule_connect();
 if (rc != PTSM_OK) {
@@ -915,37 +920,69 @@
 }
 
 if ((entry = ldap_first_entry(ptsm->ld, res)) != NULL) {
-	int i, numvals;
-
-	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-	if (vals != NULL) {
-	 numvals = ldap_count_values( vals );
-
-	 *dsize = sizeof(struct auth_state) +
-		 (numvals * sizeof(struct auth_ident));
-	 *newstate = xmalloc(*dsize);
-	 if (*newstate == NULL) {
-		*reply = "no memory";
-		rc = PTSM_FAIL;
-		goto done;
-	 }
-	 (*newstate)->ngroups = numvals;
-
-	 for (i = 0; i < numvals; i++) {
-		int j;
-		strcpy((*newstate)->groupsi.id, "group:");
-		for(j =0; j < strlen(valsi); j++) {
-		 if(Uisupper(valsij))
-		 valsij=tolower(valsij);
-		}
-		strlcat((*newstate)->groupsi.id, valsi, 
-		 sizeof((*newstate)->groupsi.id));
-		(*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
-	 }
+ int i, numvals;
 
-	 ldap_value_free(vals);
-	 vals = NULL;
-	}
+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
+ if (vals != NULL) {
+ numvals = ldap_count_values( vals );
+
+ *dsize = sizeof(struct auth_state) +
+ (numvals * sizeof(struct auth_ident));
+ *newstate = xmalloc(*dsize);
+ if (*newstate == NULL) {
+ *reply = "no memory";
+ rc = PTSM_FAIL;
+ goto done;
+ }
+
+ (*newstate)->ngroups = numvals;
+ (*newstate)->userid.id0 = '\0';
+ for (i = 0; i < numvals; i++) {
+ int j;
+ strcpy((*newstate)->groupsi.id, "group:");
+ rdn = ldap_explode_rdn(valsi,1);
+ for (j = 0; j < strlen(rdn0); j++) {
+ if (Uisupper(rdn0j))
+ rdn0j=tolower(rdn0j);
+ }
+ strlcat((*newstate)->groupsi.id, rdn0,
+ sizeof((*newstate)->groupsi.id));
+ (*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
+ }
+
+ ldap_value_free(rdn);
+ ldap_value_free(vals);
+ vals = NULL;
+ }
+
+ if ((char *)ptsm->user_attribute) {
+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->user_attribute);
+ if (vals != NULL) {
+ numvals = ldap_count_values( vals );
+
+ if (numvals==1) {
+ if(!*newstate) {
+ *dsize = sizeof(struct auth_state);
+ *newstate = xmalloc(*dsize);
+
+ if (*newstate == NULL) {
+ *reply = "no memory";
+ rc = PTSM_FAIL;
+ goto done;
+ }
+
+ (*newstate)->ngroups = 0;
+ }
+
+ size=strlen(vals0);
+ strcpy((*newstate)->userid.id, ptsmodule_canonifyid(vals0,size));
+ (*newstate)->userid.hash = strhash((*newstate)->userid.id);
+ }
+
+ ldap_value_free(vals);
+ vals = NULL;
+ }
+ }
 }
 
 if(!*newstate) {
@@ -957,11 +994,14 @@
 goto done;
 }
 (*newstate)->ngroups = 0;
+ (*newstate)->userid.id0 = '\0';
 }
- 
+
 /* fill in the rest of our new state structure */
- strcpy((*newstate)->userid.id, canon_id);
- (*newstate)->userid.hash = strhash(canon_id);
+ if ((*newstate)->userid.id0=='\0') {
+ strcpy((*newstate)->userid.id, canon_id);
+ (*newstate)->userid.hash = strhash(canon_id);
+ }
 (*newstate)->mark = time(0);
 
 rc = PTSM_OK;
@@ -981,9 +1021,9 @@
 static int ptsmodule_make_authstate_filter(
 const char *canon_id,
 size_t size,
- const char **reply, 
+ const char **reply,
 int *dsize,
- struct auth_state **newstate) 
+ struct auth_state **newstate)
 {
 char *base = NULL, *filter = NULL;
 int rc;
@@ -1053,32 +1093,32 @@
 for (i = 0, entry = ldap_first_entry(ptsm->ld, res); entry != NULL;
 i++, entry = ldap_next_entry(ptsm->ld, entry)) {
 
-	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-	if (vals == NULL)
-	 continue;
+ vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
+ if (vals == NULL)
+ continue;
 
-	if ( ldap_count_values( vals ) != 1 ) {
-	 *reply = "too many values";
-	 rc = PTSM_FAIL;
-	 ldap_value_free(vals);
-	 vals = NULL;
-	 goto done;
-	}
+ if ( ldap_count_values( vals ) != 1 ) {
+ *reply = "too many values";
+ rc = PTSM_FAIL;
+ ldap_value_free(vals);
+ vals = NULL;
+ goto done;
+ }
 
-	strcpy((*newstate)->groupsi.id, "group:");
+ strcpy((*newstate)->groupsi.id, "group:");
 
-	int j;
-	for(j =0; j < strlen(vals0); j++) {
-	 if(Uisupper(vals0j))
-	 vals0j=tolower(vals0j);
-	}
+ int j;
+ for(j =0; j < strlen(vals0); j++) {
+ if(Uisupper(vals0j))
+ vals0j=tolower(vals0j);
+ }
 
-	strlcat((*newstate)->groupsi.id, vals0, 
-	 sizeof((*newstate)->groupsi.id));
-	(*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
+ strlcat((*newstate)->groupsi.id, vals0,
+ sizeof((*newstate)->groupsi.id));
+ (*newstate)->groupsi.hash = strhash((*newstate)->groupsi.id);
 
-	ldap_value_free(vals);
-	vals = NULL;
+ ldap_value_free(vals);
+ vals = NULL;
 }
 
 rc = PTSM_OK;
@@ -1100,9 +1140,9 @@
 static int ptsmodule_make_authstate_group(
 const char *canon_id,
 size_t size,
- const char **reply, 
+ const char **reply,
 int *dsize,
- struct auth_state **newstate) 
+ struct auth_state **newstate)
 {
 char *base = NULL, *filter = NULL;
 int rc;
@@ -1184,8 +1224,8 @@
 static struct auth_state *myauthstate(
 const char *identifier,
 size_t size,
- const char **reply, 
- int *dsize) 
+ const char **reply,
+ int *dsize)
 {
 const char *canon_id;
 struct auth_state *newstate = NULL;
@@ -1224,23 +1264,23 @@
 
 static void myinit(void)
 {
-	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
+ fatal("PTS module (ldap) not compiled in", EC_CONFIG);
 }
 
 static struct auth_state *myauthstate(
 const char *identifier __attribute__((unused)),
 size_t size __attribute__((unused)),
- const char **reply __attribute__((unused)), 
- int *dsize __attribute__((unused))) 
+ const char **reply __attribute__((unused)),
+ int *dsize __attribute__((unused)))
 {
-	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
+ fatal("PTS module (ldap) not compiled in", EC_CONFIG);
 }
 
 #endif /* HAVE_LDAP */
 
-struct pts_module pts_ldap = 
+struct pts_module pts_ldap =
 {
- "ldap",		/* name */
+ "ldap", /* name */
 
 &myinit,
 &myauthstate,

cyrus-imapd-2.4.17.tar.gz/ptclient/ptdump.c -> cyrus-imapd-2.5.tar.gz/ptclient/ptdump.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ptdump.c,v 1.16 2010/01/06 17:01:57 murch Exp $
 */
 
 #include <config.h>
@@ -48,15 +46,13 @@
 
 #include "auth_pts.h"
 #include "cyrusdb.h"
-#include "global.h"
+#include "imap/global.h"
 #include "libconfig.h"
 
-int config_need_data = 0;
-
 static int dump_cb(void *rockp __attribute__((unused)),
-		 const char *key, int keylen,
+		 const char *key, size_t keylen,
 		 const char *data,
-		 int datalen __attribute__((unused))) 
+		 size_t datalen __attribute__((unused)))
 {
 struct auth_state *authstate = (struct auth_state *)data;
 int i;
@@ -96,12 +92,12 @@
 	}
 }
 
- cyrus_init(alt_config, "ptdump", 0);
+ cyrus_init(alt_config, "ptdump", 0, 0);
 
 /* open database */
 strcpy(fnamebuf, config_dir);
 strcat(fnamebuf, PTS_DBFIL);
- r = (config_ptscache_db->open)(fnamebuf, CYRUSDB_CREATE, &ptdb);
+ r = cyrusdb_open(config_ptscache_db, fnamebuf, CYRUSDB_CREATE, &ptdb);
 if(r != CYRUSDB_OK) {
 	fprintf(stderr,"error opening %s (%s)", fnamebuf,
 	 cyrusdb_strerror(r));
@@ -109,9 +105,9 @@
 }
 
 /* iterate through db, wiping expired entries */
- config_ptscache_db->foreach(ptdb, "", 0, NULL, dump_cb, ptdb, NULL);
+ cyrusdb_foreach(ptdb, "", 0, NULL, dump_cb, ptdb, NULL);
 
- (config_ptscache_db->close)(ptdb);
+ cyrusdb_close(ptdb);
 
 cyrus_done();

cyrus-imapd-2.4.17.tar.gz/ptclient/ptexpire.c -> cyrus-imapd-2.5.tar.gz/ptclient/ptexpire.c Changed

@@ -37,8 +37,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ptexpire.c,v 1.23 2010/01/06 17:01:57 murch Exp $
 */
 
 /* This program purges old entries from the database. It holds an exclusive
@@ -62,28 +60,25 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <syslog.h>
 
 #include "auth_pts.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
-#include "global.h"
+#include "imap/global.h"
 #include "libconfig.h"
-#include "cyr_lock.h"
 #include "xmalloc.h"
-
-static char rcsid = "$Id: ptexpire.c,v 1.23 2010/01/06 17:01:57 murch Exp $";
+#include "xversion.h"
 
 /* global */
 time_t timenow;
 time_t expire_time = (3*60*60); /* 3 Hours */
 
-int config_need_data = 0;
-
 static int expire_p(void *rockp __attribute__((unused)),
 		 const char *key __attribute__((unused)),
-		 int keylen __attribute__((unused)),
+		 size_t keylen __attribute__((unused)),
 		 const char *data,
-		 int datalen __attribute__((unused)))
+		 size_t datalen __attribute__((unused)))
 {
 struct auth_state *authstate = (struct auth_state *)data;
 if (authstate->mark + expire_time < timenow) {
@@ -93,15 +88,15 @@
 }
 
 static int expire_cb(void *rockp,
-		 const char *key, int keylen,
+		 const char *key, size_t keylen,
 		 const char *data __attribute__((unused)),
-		 int datalen __attribute__((unused))) 
+		 size_t datalen __attribute__((unused)))
 {
 /* We only get called when we want to delete it */
 syslog(LOG_DEBUG, "deleteing entry for %s", key);
 
 /* xxx maybe we should use transactions for this */
- config_ptscache_db->delete((struct db *)rockp, key, keylen, NULL, 0);
+ cyrusdb_delete((struct db *)rockp, key, keylen, NULL, 0);
 return 0;
 }
 
@@ -114,7 +109,7 @@
 int r;
 char *alt_config = NULL;
 
- if ((geteuid()) == 0 && (become_cyrus() != 0)) {
+ if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
 }
 
@@ -140,17 +135,17 @@
 	}
 }
 
- cyrus_init(alt_config, "ptexpire", 0);
+ cyrus_init(alt_config, "ptexpire", 0, 0);
 
 timenow = time(0);
 syslog(LOG_INFO, "Expiring entries older than %d seconds (currently %d)",
-	 expire_time, timenow);
- syslog(LOG_DEBUG, "%s", rcsid);
+	 (int)expire_time, (int)timenow);
+ syslog(LOG_DEBUG, "%s", "ptexpire.c,v " _CYRUS_VERSION " " CYRUS_GITVERSION);
 
 /* open database */
 strcpy(fnamebuf, config_dir);
 strcat(fnamebuf, PTS_DBFIL);
- r = (config_ptscache_db->open)(fnamebuf, CYRUSDB_CREATE, &ptdb);
+ r = cyrusdb_open(config_ptscache_db, fnamebuf, CYRUSDB_CREATE, &ptdb);
 if(r != CYRUSDB_OK) {
 	syslog(LOG_ERR, "error opening %s (%s)", fnamebuf,
 	 cyrusdb_strerror(r));
@@ -158,9 +153,9 @@
 }
 
 /* iterate through db, wiping expired entries */
- config_ptscache_db->foreach(ptdb, "", 0, expire_p, expire_cb, ptdb, NULL);
+ cyrusdb_foreach(ptdb, "", 0, expire_p, expire_cb, ptdb, NULL);
 
- (config_ptscache_db->close)(ptdb);
+ cyrusdb_close(ptdb);
 
 cyrus_done();

cyrus-imapd-2.4.17.tar.gz/ptclient/ptextract.c -> cyrus-imapd-2.5.tar.gz/ptclient/ptextract.c Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/ptloader.c -> cyrus-imapd-2.5.tar.gz/ptclient/ptloader.c Changed

@@ -38,16 +38,15 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ptloader.c,v 1.50 2010/01/06 17:01:58 murch Exp $
 */
 
 #include <config.h>
 
+#include <signal.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -59,13 +58,12 @@
 #include "auth_pts.h"
 #include "cyrusdb.h"
 #include "exitcodes.h"
-#include "hash.h"
-#include "global.h"
+#include "imap/global.h"
 #include "libconfig.h"
-#include "cyr_lock.h"
 #include "retry.h"
 #include "xmalloc.h"
 #include "ptloader.h"
+#include "xversion.h"
 
 struct pts_module *pts_modules = {
 #ifdef HAVE_LDAP
@@ -141,7 +139,7 @@
 /* set signal handlers */
 signal(SIGPIPE, SIG_IGN);
 
- syslog(LOG_NOTICE, "starting: $Id: ptloader.c,v 1.50 2010/01/06 17:01:58 murch Exp $");
+ syslog(LOG_NOTICE, "starting: ptloader.c,v " _CYRUS_VERSION " " CYRUS_GITVERSION);
 
 while ((opt = getopt(argc, argv, "d:")) != EOF) {
 	switch (opt) {
@@ -160,7 +158,7 @@
 
 strcpy(fnamebuf, config_dir);
 strcat(fnamebuf, PTS_DBFIL);
- r = (DB->open)(fnamebuf, CYRUSDB_CREATE, &ptsdb);
+ r = cyrusdb_open(DB, fnamebuf, CYRUSDB_CREATE, &ptsdb);
 if (r != 0) {
 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fnamebuf,
 	 cyrusdb_strerror(ret));
@@ -177,17 +175,13 @@
 {
 int r;
 
- r = (DB->close)(ptsdb);
+ r = cyrusdb_close(ptsdb);
 if (r) {
 	syslog(LOG_ERR, "DBERROR: error closing ptsdb: %s",
 	 cyrusdb_strerror(r));
 }
 
- r = DB->done();
- if (r) {
-	syslog(LOG_ERR, "DBERROR: error exiting application: %s",
-	 cyrusdb_strerror(r));
- }
+ cyrusdb_done();
 
 exit(error);
 }
@@ -213,7 +207,7 @@
 
 if (size > PTS_DB_KEYSIZE) {
 	syslog(LOG_ERR, "size sent %d is greater than buffer size %d", 
-	 size, PTS_DB_KEYSIZE);
+	 (int)size, PTS_DB_KEYSIZE);
 	reply = "Error: invalid request size";
 	goto sendreply;
 }
@@ -226,7 +220,7 @@
 
 memset(&user, 0, sizeof(user));
 if (read(c, &user, size) < 0) {
- syslog(LOG_ERR, "socket(user; size = %d): %m", size);
+	syslog(LOG_ERR, "socket(user; size = %d): %m", (int)size);
 reply = "Error reading request (user)";
 goto sendreply;
 }
@@ -239,7 +233,8 @@
 
 if(newstate) {
 	/* Success! */
-	rc = DB->store(ptsdb, user, size, (void *)newstate, dsize, NULL);
+	rc = cyrusdb_store(ptsdb, user, size, (void *)newstate, dsize, NULL);
+	(void)rc;
 free(newstate);
 	
 	/* and we're done */
@@ -260,18 +255,12 @@
 return 0;
 }
 
-/* we need to have this function here 'cause libcyrus.a 
+/* we need to have this function here 'cause libcyrus.la
 * makes calls to this function. 
 */
-void fatal(const char *msg, int exitcode)
+EXPORTED void fatal(const char *msg, int exitcode)
 {
 syslog(LOG_ERR, "%s", msg);
 exit(exitcode);
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for PTLOADER!",
-	 EC_SOFTWARE);
-}

cyrus-imapd-2.4.17.tar.gz/ptclient/ptloader.h -> cyrus-imapd-2.5.tar.gz/ptclient/ptloader.h Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/test.c -> cyrus-imapd-2.5.tar.gz/ptclient/test.c Changed

cyrus-imapd-2.4.17.tar.gz/ptclient/test2.c -> cyrus-imapd-2.5.tar.gz/ptclient/test2.c Changed

cyrus-imapd-2.4.17.tar.gz/sieve/AUTHORS -> cyrus-imapd-2.5.tar.gz/sieve/AUTHORS Changed

cyrus-imapd-2.4.17.tar.gz/sieve/COPYING -> cyrus-imapd-2.5.tar.gz/sieve/COPYING Changed

cyrus-imapd-2.4.17.tar.gz/sieve/NEWS -> cyrus-imapd-2.5.tar.gz/sieve/NEWS Changed

cyrus-imapd-2.4.17.tar.gz/sieve/README -> cyrus-imapd-2.5.tar.gz/sieve/README Changed

cyrus-imapd-2.4.17.tar.gz/sieve/addr-lex.l -> cyrus-imapd-2.5.tar.gz/sieve/addr-lex.l Changed

@@ -41,26 +41,21 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: addr-lex.l,v 1.12 2010/01/06 17:01:58 murch Exp $
 */
 
-#include "addr.h"
-#include <stdlib.h>
-#include <string.h>
-
-#undef YY_INPUT
-#define YY_INPUT(b, r, ms) (r = addrinput(b, ms))
+#include "sieve/sieve_interface.h"
+#include "sieve/addr.h"
 
-int addrinput(char *buf, size_t max_size);
-void addrerror(const char *);
+void addrerror(void*, const char *);
 
 static int ncom;	/* number of open comments */
+#define YY_DECL int addrlex(YYSTYPE* addrlval __attribute__((unused)), void* parse_script)
 %}
 
 %option noyywrap
 %option nounput
-%option prefix="addr"
+%option noinput
+%option prefix="addr" outfile="lex.yy.c"
 
 %x QSTRING DOMAINLIT COMMENT
 
@@ -69,7 +64,7 @@
 \"				{ BEGIN QSTRING; return yytext0; }
 \				{ BEGIN DOMAINLIT; return yytext0; }
 $				{ ncom = 1; BEGIN COMMENT; }
-$				{ addrerror("address parse error, "
+\)				{ addrerror(parse_script, "address parse error, "
 					 "unexpected `')'' "
 					 "(unbalanced comment)");
 				 yyterminate(); }
@@ -82,13 +77,13 @@
 <QSTRING>(^\n\r"\\|\\.)*	return QTEXT;
 <QSTRING>\"			{ BEGIN INITIAL; return yytext0; }
 <QSTRING><<EOF>>		{ BEGIN INITIAL;
-				 addrerror("address parse error, expecting `'\"'' (unterminated string)");
+				 addrerror(parse_script, "address parse error, expecting `'\"'' (unterminated string)");
 				 yyterminate(); }
 
 <DOMAINLIT>(^\\\n\r\\|\\.)*	return DTEXT;
 <DOMAINLIT>\			{ BEGIN INITIAL; return yytext0; }
 <DOMAINLIT><<EOF>>		{ BEGIN INITIAL;
-				 addrerror("address parse error, expecting `''' (unterminated domain literal)");
+				 addrerror(parse_script, "address parse error, expecting `''' (unterminated domain literal)");
 				 yyterminate(); }
 
 
@@ -97,23 +92,9 @@
 <COMMENT>$			ncom++;
 <COMMENT>$			{ ncom--; if (ncom == 0) BEGIN INITIAL; }
 <COMMENT><<EOF>>		{ BEGIN INITIAL;
-				 addrerror("address parse error, "
+				 addrerror(parse_script, "address parse error, "
 					 "expecting `')'' "
 					 "(unterminated comment)");
 				 yyterminate(); }
 
 %%
-
-/* take input from address string provided by sieve parser */
-int addrinput(char *buf, size_t max_size)
-{
- extern char *addrptr;	/* current position in address string */
- size_t n;			/* number of characters to read from string */
-
- n = strlen(addrptr) < max_size ? strlen(addrptr) : max_size;
- if (n > 0) {
-	memcpy(buf, addrptr, n);
-	addrptr += n;
- }
- return n;
-}

cyrus-imapd-2.4.17.tar.gz/sieve/addr.y -> cyrus-imapd-2.5.tar.gz/sieve/addr.y Changed

@@ -41,8 +41,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: addr.y,v 1.15 2010/01/06 17:01:58 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -52,15 +50,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "addr.h"
-#include "script.h"
-#include "xmalloc.h"
+#include "sieve/script.h"
+#include "sieve/addr.h"
 #include "xstrlcpy.h"
 
 #define ADDRERR_SIZE 500
 
-int yyerror(const char *msg);
-extern int yylex(void);
+void yyerror(sieve_script_t*, const char *);
+extern int addrlex(YYSTYPE*, sieve_script_t*);
 
 #define YYERROR_VERBOSE /* i want better error messages! */
 
@@ -71,6 +68,10 @@
 
 %token ATOM QTEXT DTEXT
 %name-prefix="addr"
+%defines
+%parse-param {sieve_script_t *parse_script}
+%lex-param {sieve_script_t *parse_script}
+%pure_parser
 %%
 sieve_address: addrspec			/* simple address */
 	| phrase '<' addrspec '>'	/* name & addr-spec */
@@ -111,10 +112,7 @@
 %%
 
 /* copy address error message into buffer provided by sieve parser */
-int yyerror(const char *s)
+void yyerror(sieve_script_t *parse_script, const char *s)
 {
- extern char addrerrADDRERR_SIZE;
- 
- strlcpy(addrerr, s, ADDRERR_SIZE);
- return 0;
+ strlcpy(parse_script->addrerr, s, ADDRERR_SIZE);
 }

cyrus-imapd-2.4.17.tar.gz/sieve/bc_dump.c -> cyrus-imapd-2.5.tar.gz/sieve/bc_dump.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bc_dump.c,v 1.6 2010/01/06 17:01:58 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -50,14 +48,6 @@
 #include "sieve_interface.h"
 #include "bytecode.h"
 
- 
-struct bytecode_info 
-{
- bytecode_t *data;/* pointer to almost-flat bytecode */
- size_t scriptend; /* used by emit code to know final length of bytecode */
- size_t reallen; /* allocated length of 'data' */
-};
-
 #if DUMPCODE
 
 /*this would work a lot better if we actually could tell how many levels deep in if statements we were. currently it doesn't know*/
@@ -65,8 +55,12 @@
 static void print_spaces(int n)
 {
 int temp_n=0;
- while(temp_n++ < (n))
+ while(temp_n++ < (n)) {
 	putchar(' ');
+	putchar(' ');
+	putchar(' ');
+	putchar(' ');
+ }
 }
 
 
@@ -77,7 +71,7 @@
 int i;
 
 for(i=0; i<numstr; i++) {
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" {%d}",d->data++ip.len);
 	printf("%s\n",d->data++ip.str);
 }
@@ -88,13 +82,13 @@
 static int dump_test(bytecode_info_t *d, int ip, int level);
 
 /* Dump a testlist. Return the last address used by the list */
-static int dump_tl(bytecode_info_t *d, int ip, int level) 
+static int dump_tl(bytecode_info_t *d, int ip, int level)
 {
 int numtest = d->dataip.listlen;
 int i;
 
 for(i=0; i<numtest; i++) {
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" (until %d)\n", d->data++ip.jump);
 	ip = dump_test(d, ++ip, level);
 }
@@ -105,7 +99,7 @@
 /* Dump a test, return the last address used by the test */
 static int dump_test(bytecode_info_t *d, int ip, int level ) {
 
- print_spaces(level*4);
+ print_spaces(level);
 switch(d->dataip.op) {
 case BC_TRUE:
 	printf("%d: TRUE\n",ip);
@@ -119,7 +113,7 @@
 	printf("%d: NOT TEST(\n",ip++);
 	/* printf(" (until %d)\n", d->dataip++.jump);*/
 	ip = dump_test(d,ip, level);
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" )\n");
 	break;
 
@@ -135,25 +129,20 @@
 	break;
 
 case BC_ALLOF:
-	printf("%d: ALLOF (\n",ip++);
+ case BC_ANYOF:
+	printf("%d: %s (\n",ip,
+	 d->dataip++.op == BC_ALLOF ? "ALLOF" : "ANYOF");
 	ip = dump_tl(d,ip,level);
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(")\n");
 	break;
 
- case BC_ANYOF:
-	printf("%d: ANYOF (\n",ip++);
-	ip = dump_tl(d,ip, level);
-	 print_spaces(level*4);
-	printf(")\n");
-	break;
-	 
 case BC_HEADER:
 	printf("%d: HEADER (\n",ip++);
-	print_spaces(level*4);
+	print_spaces(level);
 	if (d->dataip.value == B_COUNT || d->dataip.value == B_VALUE)
 	{
-	 printf(" MATCH:%d RELATION:%d COMP:%d HEADERS:\n", 
+	 printf(" MATCH:%d RELATION:%d COMP:%d HEADERS:\n",
 		 d->dataip.value, d->dataip+1.value,d->dataip+2.value);
 	} else {
 	 printf(" MATCH:%d COMP:%d HEADERS:\n",d->dataip.value, d->dataip+2.value);
@@ -161,19 +150,19 @@
 	ip+=3;
 	ip = dump_sl(d,ip,level);
 	ip++;
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" DATA:\n");
 	ip = dump_sl(d,ip,level);
 	break;
 	
 case BC_ADDRESS:
 case BC_ENVELOPE:
-	printf("%d: %s (\n",ip++,
-	 d->dataip.op == BC_ADDRESS ? "ADDRESS" : "ENVELOPE");
-	print_spaces(level*4);
+	printf("%d: %s (\n",ip,
+	 d->dataip++.op == BC_ADDRESS ? "ADDRESS" : "ENVELOPE");
+	print_spaces(level);
 	if (d->dataip.value == B_COUNT || d->dataip.value == B_VALUE)
 	{
-	 printf(" MATCH:%d RELATION: %d COMP: %d TYPE: %d HEADERS:\n", 
+	 printf(" MATCH:%d RELATION:%d COMP: %d TYPE: %d HEADERS:\n",
 		 d->dataip.value, d->dataip+1.value, d->dataip+2.value, d->dataip+3.value);
 	} else {
 	 printf(" MATCH:%d COMP:%d TYPE:%d HEADERS:\n",
@@ -181,14 +170,14 @@
 	}
 	ip+=4;
 	ip = dump_sl(d,ip,level); ip++;
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" DATA:\n");
 	ip = dump_sl(d,ip,level);
 	break;
 
 case BC_BODY:
 	printf("%d: BODY (\n",ip++);
-	print_spaces(level*4);
+	print_spaces(level);
 	if (d->dataip.value == B_COUNT || d->dataip.value == B_VALUE)
 	{
 	 printf(" MATCH:%d RELATION: %d COMP: %d TRANSFORM: %d OFFSET: %d CONTENT-TYPES:\n", 
@@ -201,7 +190,7 @@
 	}
 	ip+=5;
 	ip = dump_sl(d,ip,level); ip++;
-	print_spaces(level*4);
+	print_spaces(level);
 	printf(" DATA:\n");
 	ip = dump_sl(d,ip,level);
 	break;
@@ -220,9 +209,9 @@
 printf("Dumping almost flattened bytecode\n\n");
 
 if(!d) return;
- 
+
 for(i=0; i<d->scriptend; i++) {
-	print_spaces(level*4);
+	print_spaces(level);
 	switch(d->datai.op) {
 	case B_REJECT:
 	 printf("%d: REJECT {%d}%s\n",i,
@@ -314,15 +303,16 @@
 	 i+=3;
 	 break;
 
+	case B_VACATION_ORIG:
 	case B_VACATION:
 	 printf("%d:VACATION\n",i);
 	 i++;
 	 i=dump_sl(d,i,level);
-	 printf("SUBJ({%d}%s) MESG({%d}%s)\n DAYS(%d) MIME(%d)\n"
+	 printf("SUBJ({%d}%s) MESG({%d}%s)\n SECONDS(%d) MIME(%d)\n"
 		 " FROM({%d}%s) HANDLE({%d}%s)\n",
 		 d->datai+1.len, (d->datai+1.len == -1 ? "nil" : d->datai+2.str),
 		 d->datai+3.len, (d->datai+3.len == -1 ? "nil" : d->datai+4.str),
-		 d->datai+5.value, d->datai+6.value,
+		 d->datai+5.value * (d->datai.op == B_VACATION ? 1 : (24 * 60 * 60 /* 1 day */)), d->datai+6.value,
 		 d->datai+7.len, (d->datai+7.len == -1 ? "nil" : d->datai+8.str),
 		 d->datai+9.len, (d->datai+9.len == -1 ? "nil" : d->datai+10.str));
 	 i+=10;
@@ -336,8 +326,11 @@
 	 break;
 
 	case B_INCLUDE:
-	 printf("%d: INCLUDE LOCATION:%d {%d}%s\n",i,
-		 d->datai+1.value,d->datai+2.len,d->datai+3.str);
+	 printf("%d: INCLUDE ONCE:%s OPTIONAL:%s LOCATION:%s {%d}%s\n",i,
+		 d->datai+1.value & 64 ? "yes" : "no",
+		 d->datai+1.value & 128 ? "yes" : "no",
+		 (d->datai+1.value & 63) == B_GLOBAL ? "global" : "local",
+		 d->datai+2.len,d->datai+3.str);
 	 i+=3;
 	 break;

cyrus-imapd-2.4.17.tar.gz/sieve/bc_emit.c -> cyrus-imapd-2.5.tar.gz/sieve/bc_emit.c Changed

@@ -40,15 +40,12 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bc_emit.c,v 1.5 2010/01/06 17:01:58 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include "xmalloc.h"
 #include "sieve_interface.h"
 
 
@@ -68,15 +65,7 @@
 int y=htonl(x);
 return (write(fd, &y, sizeof(int)));
 }
- 
- 
 
-struct bytecode_info 
-{
- bytecode_t *data;/* pointer to almost-flat bytecode */
- size_t scriptend; /* used by emit code to know final length of bytecode */
- size_t reallen; /* allocated length of 'data' */
-};
 
 /* Pad null bytes onto the end of the string we just wrote */
 /* returns -1 on failure or number of bytes written on success */
@@ -669,7 +658,7 @@
 	 	 break;
 	case B_VACATION:
 	 /* Address list, Subject String, Message String,
-	 Days (word), Mime (word), From String, Handle String */
+	 Seconds (word), Mime (word), From String, Handle String */
 	 
 	 /*new code-this might be broken*/
 	 ret = bc_stringlist_emit(fd, &codep, bc);
@@ -705,7 +694,7 @@
 		}
 		
 	 }
-	 /* Days*/
+	 /* Seconds*/
 	 if(write_int(fd,bc->datacodep.value) == -1)
 		return -1;
 	 codep++;
@@ -747,9 +736,9 @@
 	 
 	 break;
 	case B_INCLUDE:
-	 /* Location (word), Filename String */ 
+	 /* Location + (Once<<6) + (Optional<<7) (word), Filename String */
 
-	 /* Location */
+	 /* Location + (Once<<6) + (Optional<<7) */
 	 if(write_int(fd, bc->datacodep.value) == -1)
 		return -1;
 	 filelen += sizeof(int);
@@ -788,7 +777,7 @@
 }
 
 /* spew the bytecode to disk */
-int sieve_emit_bytecode(int fd, bytecode_info_t *bc) 
+EXPORTED int sieve_emit_bytecode(int fd, bytecode_info_t *bc)
 {
 /* First output version number (4 bytes) */
 int data = BYTECODE_VERSION;

cyrus-imapd-2.4.17.tar.gz/sieve/bc_eval.c -> cyrus-imapd-2.5.tar.gz/sieve/bc_eval.c Changed

@@ -38,8 +38,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bc_eval.c,v 1.19.2.2 2010/02/12 03:41:11 brong Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -50,21 +48,17 @@
 #include "interp.h"
 #include "message.h"
 #include "script.h"
+#include "parseaddr.h"
 
 #include "bytecode.h"
 
 #include "charset.h"
-#include "hash.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "util.h"
+#include "times.h"
 
 #include <string.h>
-#include <ctype.h>
-
-#define SCOUNT_SIZE 20
-char scountSCOUNT_SIZE;
 
 /**************************************************************************/
 /**************************************************************************/
@@ -78,7 +72,7 @@
 /* Given a bytecode_input_t at the beginning of a string (the len block),
 * return the string, the length, and the bytecode index of the NEXT
 * item */
-int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len) 
+EXPORTED int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len) 
 {
 int local_len = ntohl(bcpos.value);
 
@@ -174,16 +168,18 @@
 
 /* loop through each TO header */
 for (l = 0; bodyl != NULL && !found; l++) {
-	void *data = NULL, *marker = NULL;
-	char *addr;
-	
-	parse_address(bodyl, &data, &marker);
+	struct address_itr ai;
+	const struct address *a;
+
+	address_itr_init(&ai, bodyl);
 
 	/* loop through each address in the header */
-	while (!found &&
-	 ((addr = get_address(ADDRESS_ALL,&data, &marker, 1))!= NULL)) {
+	while (!found && (a = address_itr_next(&ai)) != NULL) {
+	 char *addr = address_get_all(a, 0);
+	 if (!addr) addr = xstrdup("");
 
 	 if (!strcasecmp(addr, myaddr)) {
+		free(addr);
 		found = xstrdup(myaddr);
 		break;
 	 }
@@ -192,179 +188,157 @@
 
 	 for(x=0; x<numaddresses; x++)
 	 {
-		void *altdata = NULL, *altmarker = NULL;
 		char *altaddr;
 		const char *str;
 
 		curra = unwrap_string(bc, curra, &str, NULL);
 		
 		/* is this address one of my addresses? */
- 		parse_address(str, &altdata, &altmarker);
-
-		altaddr = get_address(ADDRESS_ALL, &altdata, &altmarker, 1);
+		altaddr = address_canonicalise(str);
 
 		if (!strcasecmp(addr,altaddr)) {
+		 free(altaddr);
 		 found=xstrdup(str);
 		 break;
 		}
-
-		free_address(&altdata, &altmarker);
+		free(altaddr);
 	 }
-
+	 free(addr);
 	}
-	free_address(&data, &marker);
+	address_itr_fini(&ai);
 }
 
 return found;
 }
 
-static char *list_fields = {
- "list-id",
- "list-help",
- "list-subscribe",
- "list-unsubscribe",
- "list-post",
- "list-owner",
- "list-archive",
- NULL
-};
- 
 /* Determine if we should respond to a vacation message */
 static int shouldRespond(void * m, sieve_interp_t *interp,
 			 int numaddresses, bytecode_input_t* bc,
 			 int i, char **from, char **to)
 {
 const char **body;
- char buf128;
 char *myaddr = NULL;
- int l = SIEVE_OK, j;
- void *data = NULL, *marker = NULL;
- char *tmp;
+ int l = SIEVE_DONE, j;
 int curra, x;
 char *found = NULL;
 char *reply_to = NULL;
- 
+ static const char * const list_fields = {
+	"list-id",
+	"list-help",
+	"list-subscribe",
+	"list-unsubscribe",
+	"list-post",
+	"list-owner",
+	"list-archive",
+	NULL
+ };
+
 /* Implementations SHOULD NOT respond to any message that contains a
 "List-Id" RFC2919, "List-Help", "List-Subscribe", "List-
 Unsubscribe", "List-Post", "List-Owner" or "List-Archive" RFC2369
 header field. */
 for (j = 0; list_fieldsj; j++) {
-	strcpy(buf, list_fieldsj);
-	if (interp->getheader(m, buf, &body) == SIEVE_OK) {
-	 l = SIEVE_DONE;
-	 break;
-	}
+	if (interp->getheader(m, list_fieldsj, &body) == SIEVE_OK)
+	 goto out;
 }
 
 /* Implementations SHOULD NOT respond to any message that has an
 "Auto-submitted" header field with a value other than "no".
 This header field is described in RFC3834. */
- strcpy(buf, "auto-submitted");
- if (interp->getheader(m, buf, &body) == SIEVE_OK) {
+ if (interp->getheader(m, "auto-submitted", &body) == SIEVE_OK) {
 	/* we don't deal with comments, etc. here */
 	/* skip leading white-space */
 	while (*body0 && Uisspace(*body0)) body0++;
-	if (strcasecmp(body0, "no")) l = SIEVE_DONE;
+	if (strcasecmp(body0, "no"))
+	 goto out;
 }
 
 /* is there a Precedence keyword of "junk | bulk | list"? */
 /* XXX non-standard header, but worth checking */
- strcpy(buf, "precedence");
- if (interp->getheader(m, buf, &body) == SIEVE_OK) {
+ if (interp->getheader(m, "precedence", &body) == SIEVE_OK) {
 	/* we don't deal with comments, etc. here */
 	/* skip leading white-space */
 	while (*body0 && Uisspace(*body0)) body0++;
 	if (!strcasecmp(body0, "junk") ||
 	 !strcasecmp(body0, "bulk") ||
 	 !strcasecmp(body0, "list"))
-	 l = SIEVE_DONE;
+	 goto out;
 }
 
 /* Note: the domain-part of all addresses are canonicalized */
 /* grab my address from the envelope */
- if (l == SIEVE_OK) {
-	strcpy(buf, "to");
-	l = interp->getenvelope(m, buf, &body);
-	
-	if (body0) { 
-	 parse_address(body0, &data, &marker);
-	 tmp = get_address(ADDRESS_ALL, &data, &marker, 1);
-	 myaddr = (tmp != NULL) ? xstrdup(tmp) : NULL;
-	 free_address(&data, &marker);
-	} 
- } 
- 
- if (l == SIEVE_OK) {
-	strcpy(buf, "from");
-	l = interp->getenvelope(m, buf, &body);
+ l = interp->getenvelope(m, "to", &body);
+ if (l != SIEVE_OK)
+	goto out;
+ l = SIEVE_DONE;
+ if (!body0)
+	goto out;
+ myaddr = address_canonicalise(body0);
+
+ l = interp->getenvelope(m, "from", &body);
+ if (l != SIEVE_OK)
+	goto out;
+ l = SIEVE_DONE;
+ if (!body0)
+	goto out;
+ /* we have to parse this address & decide whether we
+ want to respond to it */
+ reply_to = address_canonicalise(body0);
+
+ /* first, is there a reply-to address? */
+ if (reply_to == NULL)
+	goto out;
+
+ /* is it from me? */
+ if (myaddr && !strcmp(myaddr, reply_to))
+	goto out;
+
+ /* ok, is it any of the other addresses i've
+ specified? */
+ curra=i;
+ for(x=0; x<numaddresses; x++) {
+	const char *address;
+
+	curra = unwrap_string(bc, curra, &address, NULL);
+
+	if (!strcmp(address, reply_to))
+	 goto out;
 }
- if (l == SIEVE_OK && body0) {
-	/* we have to parse this address & decide whether we
-	 want to respond to it */
-	parse_address(body0, &data, &marker);
-	tmp = get_address(ADDRESS_ALL, &data, &marker, 1);
-	reply_to = (tmp != NULL) ? xstrdup(tmp) : NULL;
-	free_address(&data, &marker);
-
-	/* first, is there a reply-to address? */
-	if (reply_to == NULL) {
-	 l = SIEVE_DONE;
-	}
- 
-	/* first, is it from me? */
-	if (l == SIEVE_OK && myaddr && !strcmp(myaddr, reply_to)) {
-	 l = SIEVE_DONE;
-	}
- 
-	/* ok, is it any of the other addresses i've
-	 specified? */
-	if (l == SIEVE_OK)
-	{
-	 curra=i;
-	 for(x=0; x<numaddresses; x++) {
-		const char *address;
 
-		curra = unwrap_string(bc, curra, &address, NULL);
-		
-		if (!strcmp(address, reply_to))
-		 l = SIEVE_DONE;
-	 }
-	}
- 
-	/* ok, is it a system address? */
-	if (l == SIEVE_OK && sysaddr(reply_to)) {
-	 l = SIEVE_DONE;
-	}
- }
+ /* ok, is it a system address? */
+ if (sysaddr(reply_to))
+	goto out;
+
+ /* ok, we're willing to respond to the sender.
+ but is this message to me? that is, is my address
+ in the Resent-To, Resent-Cc or Resent-Bcc fields? */
+ if (interp->getheader(m, "to", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses, bc, i, body);
+ if (!found && interp->getheader(m, "cc", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses, bc, i, body);
+ if (!found && interp->getheader(m, "bcc", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses, bc, i, body);
+ if (!found && interp->getheader(m, "resent-to", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses ,bc, i, body);
+ if (!found && interp->getheader(m, "resent-cc", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses, bc, i, body);
+ if (!found && interp->getheader(m, "resent-bcc", &body) == SIEVE_OK)
+	found = look_for_me(myaddr, numaddresses, bc, i, body);
+ if (found)
+	l = SIEVE_OK;
+
+ /* ok, ok, if we got here maybe we should reply */
+out:
+ free(myaddr);
 if (l == SIEVE_OK) {
-	/* ok, we're willing to respond to the sender.
-	 but is this message to me? that is, is my address
-	 in the Resent-To, Resent-Cc or Resent-Bcc fields? */
-	if (strcpy(buf, "to"), 
-	 interp->getheader(m, buf, &body) == SIEVE_OK)
-	 found = look_for_me(myaddr, numaddresses ,bc, i, body);
-	if (!found && (strcpy(buf, "cc"),
-		 (interp->getheader(m, buf, &body) == SIEVE_OK)))
-	 found = look_for_me(myaddr, numaddresses, bc, i, body);
-	if (!found && (strcpy(buf, "bcc"),
-		 (interp->getheader(m, buf, &body) == SIEVE_OK)))
-	 found = look_for_me(myaddr, numaddresses, bc, i, body);
-	if (!found && (strcpy(buf, "resent-to"), 
-		 (interp->getheader(m, buf, &body) == SIEVE_OK)))
-	 found = look_for_me(myaddr, numaddresses ,bc, i, body);
-	if (!found && (strcpy(buf, "resent-cc"),
-		 (interp->getheader(m, buf, &body) == SIEVE_OK)))
-	 found = look_for_me(myaddr, numaddresses, bc, i, body);
-	if (!found && (strcpy(buf, "resent-bcc"),
-		 (interp->getheader(m, buf, &body) == SIEVE_OK)))
-	 found = look_for_me(myaddr, numaddresses, bc, i, body);
-	if (!found)
-	 l = SIEVE_DONE;
+	*from = found;
+	*to = reply_to;
 }
- /* ok, ok, if we got here maybe we should reply */
- if (myaddr) free(myaddr);
- *from = found;
- *to = reply_to;
+ else {
+	free(found);
+	free(reply_to);
+ }
+
 return l;
 }
 
@@ -381,7 +355,9 @@
 comparator_t * comp=NULL;
 void * comprock=NULL;
 int op= ntohl(bci.op);
- 
+ #define SCOUNT_SIZE 20
+ char scountSCOUNT_SIZE;
+
 switch(op)
 {
 case BC_FALSE:
@@ -488,10 +464,9 @@
 case BC_ENVELOPE:/*8*/
 {
 	const char ** val;
-	void * data=NULL;
-	void * marker=NULL;
-	char * addr;
-	int addrpart=ADDRESS_ALL;/* XXX correct default behavior?*/
+	struct address_itr ai;
+	const struct address *a;
+	char *addr;
 
 	int headersi=i+5;/* the i value for the begining of the headers */
 	int datai=(ntohl(bcheadersi+1.value)/4);
@@ -531,26 +506,6 @@
 	 res = SIEVE_RUN_ERROR;
 	 break;
 	}
-	
-	/*find the part of the address that we want*/
-	switch(apart)
-	{
-	case B_ALL:
-	 addrpart = ADDRESS_ALL; break;
-	case B_LOCALPART:
-	 addrpart = ADDRESS_LOCALPART; break;
-	case B_DOMAIN:
-	 addrpart = ADDRESS_DOMAIN; break;
-	case B_USER:
-	 addrpart = ADDRESS_USER; break;
-	case B_DETAIL:
-	 addrpart = ADDRESS_DETAIL; break;
-	default:
-	 /* this shouldn't happen with correcct bytecode */
-	 res = SIEVE_RUN_ERROR;
-	}
-
-	if(res == SIEVE_RUN_ERROR) break;
 
 	/*loop through all the headers*/
 	currh=headersi+2;
@@ -586,15 +541,38 @@
 		printf("about to parse %s\n", valy);
 #endif
 		 
-		if (parse_address(valy, &data, &marker)!=SIEVE_OK) 
-		 return 0;
-		 
-		while (!res &&
-		 (addr = get_address(addrpart, &data, &marker, 0))) {
+		address_itr_init(&ai, valy);
+
+		while (!res && (a = address_itr_next(&ai)) != NULL) {
 #if VERBOSE
 		 printf("working addr %s\n", (addr ? addr : "nil"));
 #endif
-			
+		 /*find the part of the address that we want*/
+		 switch(apart)
+		 {
+		 case B_ALL:
+			addr = address_get_all(a, /*canon_domain*/0);
+			break;
+		 case B_LOCALPART:
+			addr = address_get_localpart(a);
+			break;
+		 case B_DOMAIN:
+			addr = address_get_domain(a, /*canon_domain*/0);
+			break;
+		 case B_USER:
+			addr = address_get_user(a);
+			break;
+		 case B_DETAIL:
+			addr = address_get_detail(a);
+			break;
+		 default:
+			/* this shouldn't happen with correct bytecode */
+			res = SIEVE_RUN_ERROR;
+			goto envelope_err;
+		 }
+
+		 if (!addr) addr = xstrdup("");
+
 		 if (match == B_COUNT) {
 			count++;
 		 } else {
@@ -611,6 +589,7 @@
 						 errbuf, sizeof(errbuf));
 				if (!reg) {
 				 /* Oops */
+				 free(addr);
 				 res=-1;
 				 goto alldone;
 				}
@@ -628,9 +607,10 @@
 			 }
 			} /* For each data */
 		 }
+		 free(addr);
 		} /* For each address */
 
-		free_address(&data, &marker);
+		address_itr_fini(&ai);
 	 }/* For each message header */
 	 
 #if VERBOSE
@@ -656,6 +636,7 @@
 	/* Update IP */
 	i=(ntohl(bcdatai+1.value)/4);
 	
+envelope_err:
 	break;
 }
 case BC_HEADER:/*9*/
@@ -920,7 +901,7 @@
 /* The entrypoint for bytecode evaluation */
 int sieve_eval_bc(sieve_execute_t *exe, int is_incl, sieve_interp_t *i,
 		 void *sc, void *m,
-		 sieve_imapflags_t * imapflags, action_list_t *actions,
+		 strarray_t *imapflags, action_list_t *actions,
 		 notify_list_t *notify_list, const char **errmsg) 
 {
 const char *data;
@@ -1271,6 +1252,7 @@
 	 
 	 break;
 	}
+	case B_VACATION_ORIG:
 	case B_VACATION:
 	{
 	 int respond;
@@ -1278,7 +1260,7 @@
 	 char *toaddr = NULL; /* relative to message we send */
 	 const char *handle = NULL;
 	 const char *message = NULL;
-	 int days, mime;
+	 int seconds, mime;
 	 char buf128;
 	 char subject1024;
 	 int x;
@@ -1315,7 +1297,10 @@
 
 		ip = unwrap_string(bc, ip, &message, NULL);
 
-		days = ntohl(bcip.value);
+		seconds = ntohl(bcip.value);
+		if (op == B_VACATION_ORIG) {
+		 seconds *= DAY2SEC;
+		}
 		mime = ntohl(bcip+1.value);
 
 		ip+=2;
@@ -1338,7 +1323,7 @@
 		}
 
 		res = do_vacation(actions, toaddr, fromaddr, xstrdup(subject),
-				 message, days, mime, handle);
+				 message, seconds, mime, handle);
 
 		if (res == SIEVE_RUN_ERROR)
 		 *errmsg = "Vacation can not be used with Reject or Vacation";
@@ -1368,29 +1353,41 @@
 	case B_JUMP:/*16*/
 	 ip= ntohl(bcip+1.jump);
 	 break;
-	 
+
 	case B_INCLUDE:/*17*/
 	{
-	 int isglobal = (ntohl(bcip+1.value) == B_GLOBAL);
+	 int isglobal = (ntohl(bcip+1.value) & 63) == B_GLOBAL;
+	 int once = ntohl(bcip+1.value) & 64 ? 1 : 0;
+	 int isoptional = ntohl(bcip+1.value) & 128 ? 1 : 0;
 	 char fpath4096;
 
 	 ip = unwrap_string(bc, ip+2, &data, NULL);
 
 	 res = i->getinclude(sc, data, isglobal, fpath, sizeof(fpath));
-	 if (res != SIEVE_OK)
-		*errmsg = "Include can not find script";
-
-	 if (!res) {
-		res = sieve_script_load(fpath, &exe);
-		if (res != SIEVE_OK)
-		*errmsg = "Include can not load script";
+	 if (res != SIEVE_OK) {
+		if (isoptional == 0)
+		 *errmsg = "Include can not find script";
+		else
+		 res = SIEVE_OK;
+	 break;
+	 }
+	 res = sieve_script_load(fpath, &exe);
+	 if (res == SIEVE_SCRIPT_RELOADED) {
+		if (once == 1) {
+		 res = SIEVE_OK;
+		 break;
+		}
+	 } else if (res != SIEVE_OK) { /* SIEVE_FAIL */
+		if (isoptional == 0)
+		 *errmsg = "Include can not load script";
+		else
+		 res = SIEVE_OK;
+		break;
 	 }
 
-	 if (!res)
-		res = sieve_eval_bc(exe, 1, i,
-				 sc, m, imapflags, actions,
-				 notify_list, errmsg);
-
+	 res = sieve_eval_bc(exe, 1, i,
+				sc, m, imapflags, actions,
+				notify_list, errmsg);
 	 break;
 	}
 
@@ -1413,5 +1410,5 @@
 done:
 bc_cur->is_executing = 0;
 
- return res; 
+ return res;
 }

cyrus-imapd-2.4.17.tar.gz/sieve/bc_generate.c -> cyrus-imapd-2.5.tar.gz/sieve/bc_generate.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bc_generate.c,v 1.6 2010/01/06 17:01:58 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -52,22 +50,14 @@
 
 #include "script.h"
 #include "tree.h"
-#include "sieve.h"
+#include "sieve/sieve.h"
 
 #include "bytecode.h"
 
-#include <assert.h>
+#include "assert.h"
 #include <string.h>
 
 
-
-struct bytecode_info 
-{
- bytecode_t *data;/* pointer to almost-flat bytecode */
- size_t scriptend; /* used by emit code to know final length of bytecode */
- size_t reallen; /* allocated length of 'data' */
-};
-
 static int bc_test_generate(int codep, bytecode_info_t *retval, test_t *t);
 
 /* returns false if the request can't be satisfied, true if it can. */
@@ -100,31 +90,34 @@
 /* given a location and a string list, compile it into almost-flat form.
 * <list len> <string len><string ptr><string len><string ptr> etc... */
 static int bc_stringlist_generate(int codep, bytecode_info_t *retval,
-				 stringlist_t *sl) 
+				 strarray_t *sa)
 {
 int len_codep = codep;
 int strcount = 0;
- stringlist_t *cur;
- 
+ int i;
+
 codep++;
 
 /* Bounds check the string list length */
 if(!atleast(retval,codep+1)) 
 	return -1;
 
- for(cur=sl; cur; cur=cur->next) 
- {
-	strcount++;
-	assert((cur->s)!=NULL);
-	
-	/* Bounds check for each string before we allocate it */
-	if(!atleast(retval,codep+2)) 
-	 return -1;
+ if (sa) {
+	for (i = 0 ; i < sa->count ; i++) {
+	 char *s = sa->datai;
+
+	 strcount++;
+	 assert(s!=NULL);
+
+	 /* Bounds check for each string before we allocate it */
+	 if(!atleast(retval,codep+2)) 
+		return -1;
 
-	retval->datacodep++.len = strlen(cur->s);
-	retval->datacodep++.str = cur->s;
+	 retval->datacodep++.len = strlen(s);
+	 retval->datacodep++.str = s;
+	}
 }
- 
+
 retval->datalen_codep.listlen = strcount;
 return codep;
 }
@@ -432,53 +425,57 @@
 static int bc_action_generate(int codep, bytecode_info_t *retval,
 			 commandlist_t *c) 
 {
- int jumploc,baseloc;
+ int jumploc;
 
- if(!retval) return -1;
- if (c==NULL)
- {
-	if(!atleast(retval,codep+1)) return -1;
+ if (!retval)
+	return -1;
+
+ if (c == NULL) {
+	if (!atleast(retval, codep+1)) return -1;
 	retval->datacodep++.op = B_NULL;
 }
- else
- {
+ else {
 	do {
 	 switch(c->type) {
 	 case STOP:
 		/* STOP (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_STOP;
 		break;
+
 	 case DISCARD:
 		/* DISCARD (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_DISCARD;
 		break;
+
 	 case KEEP:
 		/* KEEP (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_KEEP;
 		break;
+
 	 case MARK:
 		/* MARK (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_MARK;
 		break;
+
 	 case UNMARK:
 		/* UNMARK (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_UNMARK;
 		break;
 
 	 case RETURN:
 		/* RETURN (no arguments) */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_RETURN;
 		break;
 
 	 case DENOTIFY:
 		/* DENOTIFY */
-		if(!atleast(retval,codep+6)) return -1;
+		if (!atleast(retval, codep+6)) return -1;
 		retval->datacodep++.op = B_DENOTIFY;
 		switch(c->u.d.priority) {
 		case LOW:
@@ -519,69 +516,73 @@
 		}
 		codep = bc_relation_generate(codep, retval, c->u.d.relation);
 	
-		if(c->u.d.pattern)
-		{
+		if(c->u.d.pattern) {
 		 retval->datacodep++.len = strlen(c->u.d.pattern);
 		 retval->datacodep++.str = c->u.d.pattern;
-		} else {
+		}
+		else {
 		 retval->datacodep++.len = -1;
 		 retval->datacodep++.str = NULL;
 		}
 
 		break;
+
 	 case REJCT:
 		/* REJECT (STRING: len + dataptr) */
-		if(!atleast(retval,codep+3)) return -1;
+		if (!atleast(retval, codep+3)) return -1;
 		retval->datacodep++.op = B_REJECT;
 		retval->datacodep++.len = strlen(c->u.str);
 		retval->datacodep++.str = c->u.str;
 		break;
+
 	 case FILEINTO:
 		/* FILEINTO
 		 VALUE copy
 		 STRING folder
 		*/
-		if(!atleast(retval,codep+4)) return -1;
+		if (!atleast(retval, codep+4)) return -1;
 		retval->datacodep++.op = B_FILEINTO;
 		retval->datacodep++.value = c->u.f.copy;
 		retval->datacodep++.len = strlen(c->u.f.folder);
 		retval->datacodep++.str = c->u.f.folder;
 		break;
+
 	 case REDIRECT:
 		/* REDIRECT
 		 VALUE copy
 		 STRING address
 		*/
-		if(!atleast(retval,codep+4)) return -1;
+		if (!atleast(retval, codep+4)) return -1;
 		retval->datacodep++.op = B_REDIRECT;
 		retval->datacodep++.value = c->u.r.copy;
 		retval->datacodep++.len = strlen(c->u.r.address);
 		retval->datacodep++.str = c->u.r.address;
 		break;
+
 	 case ADDFLAG:
 		/* ADDFLAG stringlist */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_ADDFLAG;
 		codep = bc_stringlist_generate(codep,retval,c->u.sl);
-
-		if(codep == -1) return -1;
+		if (codep == -1) return -1;
 		break;
+
 	 case SETFLAG:
 		/* SETFLAG stringlist */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_SETFLAG;
 		codep = bc_stringlist_generate(codep,retval,c->u.sl);
-
-		if(codep == -1) return -1;
+		if (codep == -1) return -1;
 		break;
+
 	 case REMOVEFLAG:
 		/* REMOVEFLAG stringlist */
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_REMOVEFLAG;
 		codep = bc_stringlist_generate(codep,retval,c->u.sl);
-
-		if(codep == -1) return -1;
+		if (codep == -1) return -1;
 		break;
+
 	 case NOTIFY:
 		/* NOTIFY 
 		 (STRING: len + dataptr)
@@ -592,7 +593,7 @@
 		 method/id /options list/priority/message 
 		*/
 			
-		if(!atleast(retval,codep+5)) return -1;
+		if (!atleast(retval, codep+5)) return -1;
 		retval->datacodep++.op = B_NOTIFY;
 		
 		retval->datacodep++.len = strlen(c->u.n.method);
@@ -610,9 +611,9 @@
 		}
 		
 		codep = bc_stringlist_generate(codep,retval,c->u.n.options);
-		if(codep == -1) return -1;
+		if (codep == -1) return -1;
 
-		if(!atleast(retval,codep+3)) return -1;
+		if (!atleast(retval, codep+3)) return -1;
 
 		switch(c->u.n.priority) {
 		case LOW:
@@ -634,90 +635,98 @@
 		retval->datacodep++.len = strlen(c->u.n.message);
 		retval->datacodep++.str = c->u.n.message;
 		break;
+
 	 case VACATION:
 		/* VACATION
 		 STRINGLIST addresses
 		 STRING subject (if len is -1, then subject was NULL)
 		 STRING message (again, len == -1 means message was NULL)
-		 VALUE days
+		 VALUE seconds
 		 VALUE mime
 		 STRING from (if len is -1, then from was NULL)
 		 STRING handle (again, len == -1 means handle was NULL)
 		*/
 
-		if(!atleast(retval,codep+1)) return -1;
+		if (!atleast(retval, codep+1)) return -1;
 		retval->datacodep++.op = B_VACATION;
-	 
+
 		codep = bc_stringlist_generate(codep,retval,c->u.v.addresses);
 		if (codep == -1) return -1;
 
-		if (!atleast(retval,codep+2)) return -1;
-		if(c->u.v.subject) {
+		if (!atleast(retval, codep+2)) return -1;
+		if (c->u.v.subject) {
 		 retval->datacodep++.len = strlen(c->u.v.subject);
 		 retval->datacodep++.str = c->u.v.subject;
-		} else {
+		}
+		else {
 		 retval->datacodep++.len = -1;
 		 retval->datacodep++.str = NULL;
 		}
 
-		if (!atleast(retval,codep+2)) return -1;
-		if(c->u.v.message) {
+		if (!atleast(retval, codep+2)) return -1;
+		if (c->u.v.message) {
 		 retval->datacodep++.len = strlen(c->u.v.message);
 		 retval->datacodep++.str = c->u.v.message;
-		} else {
+		}
+		else {
 		 retval->datacodep++.len = -1;
 		 retval->datacodep++.str = NULL;
 		}
 
-		if (!atleast(retval,codep+2)) return -1;
-		retval->datacodep++.value = c->u.v.days;
+		if (!atleast(retval, codep+2)) return -1;
+		retval->datacodep++.value = c->u.v.seconds;
 		retval->datacodep++.value = c->u.v.mime;
 	 
-		if (!atleast(retval,codep+2)) return -1;
-		if(c->u.v.from) {
+		if (!atleast(retval, codep+2)) return -1;
+		if (c->u.v.from) {
 		 retval->datacodep++.len = strlen(c->u.v.from);
 		 retval->datacodep++.str = c->u.v.from;
-		} else {
+		}
+		else {
 		 retval->datacodep++.len = -1;
 		 retval->datacodep++.str = NULL;
 		}
 
-		if (!atleast(retval,codep+2)) return -1;
-		if(c->u.v.handle) {
+		if (!atleast(retval, codep+2)) return -1;
+		if (c->u.v.handle) {
 		 retval->datacodep++.len = strlen(c->u.v.handle);
 		 retval->datacodep++.str = c->u.v.handle;
-		} else {
+		}
+		else {
 		 retval->datacodep++.len = -1;
 		 retval->datacodep++.str = NULL;
 		}
 
-
-		if(codep == -1) return -1;
+		if (codep == -1) return -1;
 		break;
+
 	 case INCLUDE:
 		/* INCLUDE
-		 VALUE location
+		 VALUE location + (once << 6) + (optional << 7)
 		 STRING filename */
-		if(!atleast(retval,codep+4)) return -1;
+		if (!atleast(retval, codep+4)) return -1;
 		retval->datacodep++.op = B_INCLUDE;
 
 		switch(c->u.inc.location) {
 		case PERSONAL:
-		 retval->datacodep++.value = B_PERSONAL;
+		 retval->datacodep.value = B_PERSONAL;
 		 break;
 		case GLOBAL:
-		 retval->datacodep++.value = B_GLOBAL;
+		 retval->datacodep.value = B_GLOBAL;
 		 break;
 		default:
 		 return -1;
 		}
-		
+
+		retval->datacodep++.value |= (c->u.inc.once << 6)
+					 | (c->u.inc.optional << 7);
 		retval->datacodep++.len = strlen(c->u.inc.script);
 		retval->datacodep++.str = c->u.inc.script;
 		break;
+
 	 case IF:
 	 {
-		int jumpVal; 	 
+		int jumpVal;
 		/* IF
 		 (int: begin then block)
 		 (int: end then block/begin else block)
@@ -726,46 +735,41 @@
 		 (then block)
 		 (else block)(optional)
 		*/
-		baseloc = codep;
-	 
+
 		/* Allocate operator + jump table offsets */
-		if(!atleast(retval,codep+4)) return -1;
-		
+		if (!atleast(retval, codep+4)) return -1;
+
 		jumploc = codep+4;
 		retval->datacodep++.op = B_IF;
-		 
+ 
 		/* begining of then code */
-		jumpVal= bc_test_generate(jumploc,retval,c->u.i.t);
-		if(jumpVal == -1) 
+		jumpVal = bc_test_generate(jumploc,retval,c->u.i.t);
+		if (jumpVal == -1) 
 		 return -1;
 		else {
 		 retval->datacodep.jump = jumpVal;
 		 codep++;
 		}
-	 
+ 
 		/* find then code and offset to else code,
 		 * we want to write this code starting at the offset we
 		 * just found */
-	
-		jumpVal= bc_action_generate(jumpVal,retval, c->u.i.do_then);
-		if(jumpVal == -1) 
+
+		jumpVal = bc_action_generate(jumpVal,retval, c->u.i.do_then);
+		if (jumpVal == -1) 
 		 return -1;
 		else 
 		 retval->datacodep.jump = jumpVal;
-		
+
 		codep++;
 		/* write else code if its there*/
-		if(c->u.i.do_else) {
-	
-		 jumpVal= bc_action_generate(jumpVal,retval, c->u.i.do_else);
-		 if(jumpVal == -1) 
-		 {
+		if (c->u.i.do_else) {
+		 jumpVal = bc_action_generate(jumpVal,retval, c->u.i.do_else);
+		 if(jumpVal == -1)
 			return -1;
-		 } else 
-		 {
+		 else
 			retval->datacodep.jump = jumpVal;
-		 }
-		 
+
 		 /* Update code pointer to end of else code */
 		 codep = retval->datacodep.jump;
 		} else {
@@ -774,28 +778,31 @@
 		 /* Update code pointer to end of then code */
 		 codep = retval->datacodep-1.jump;
 		}
-	 
-		break;
+
 	 }
+		break;
+
 	 default:
 		/* no such action known */
 		return -1;
 	 }
-	 
+
 	 /* generate from next command */
 	 c = c->next;
 	} while(c);
 }
- /*scriptend may be updated before the end, but it will be updated at the end, which is what matters.*/
- retval->scriptend=codep;
+
+ /* scriptend may be updated before the end, but it will be
+ * updated at the end, which is what matters. */
+ retval->scriptend = codep;
+
 return codep;
- 
 }
 
 
 
 /* Entry point to the bytecode emitter module */	
-int sieve_generate_bytecode(bytecode_info_t **retval, sieve_script_t *s) 
+EXPORTED int sieve_generate_bytecode(bytecode_info_t **retval, sieve_script_t *s)
 {
 commandlist_t *c;
 
@@ -816,11 +823,10 @@
 }
 
 
-void sieve_free_bytecode(bytecode_info_t **p) 
+EXPORTED void sieve_free_bytecode(bytecode_info_t **p)
 {
 if(!p || !*p) return;
 if((*p)->data) free((*p)->data);
 free(*p);
 *p = NULL;
 }
-

cyrus-imapd-2.4.17.tar.gz/sieve/bytecode.h -> cyrus-imapd-2.5.tar.gz/sieve/bytecode.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: bytecode.h,v 1.6 2010/01/06 17:01:59 murch Exp $
  */
 
 #ifndef SIEVE_BYTECODE_H
@@ -70,6 +68,13 @@
     char *str;
 } bytecode_t;
 
+struct bytecode_info
+{
+    bytecode_t *data;/* pointer to almost-flat bytecode */
+    size_t scriptend; /* used by emit code to know final length of bytecode */
+    size_t reallen; /* allocated length of 'data' */
+};
+
 /* For sanity during input on 64-bit platforms.
  * str should only be accessed as (char *)&str, but given the use of
  * unwrap_string, this should be OK */
@@ -96,8 +101,10 @@
  * version 0x03 scripts implemented short-circuiting of testlists (recompile)
  * version 0x04 scripts implemented BODY, INCLUDE and COPY extensions
  * version 0x05 scripts implemented updated VACATION (:from and :handle)
+ * version 0x06 scripts implemented updated VACATION (:seconds)
+ * version 0x07 scripts implemented updated INCLUDE (:once and :optional)
  */
-#define BYTECODE_VERSION 0x05
+#define BYTECODE_VERSION 0x07
 #define BYTECODE_MIN_VERSION 0x03 /* minimum supported version */
 #define BYTECODE_MAGIC "CyrSBytecode"
 #define BYTECODE_MAGIC_LEN 12 /* Should be multiple of 4 */
@@ -127,7 +134,7 @@
     B_NOTIFY,		/* require notify */
     B_DENOTIFY,		/* require notify */
 
-    B_VACATION,		/* require vacation */
+    B_VACATION_ORIG,	/* legacy vacation w/o support for :seconds */
     B_NULL,
     B_JUMP,
 
@@ -135,7 +142,9 @@
     B_RETURN,		/* require include */
 
     B_FILEINTO,		/* require fileinto */
-    B_REDIRECT
+    B_REDIRECT,
+
+    B_VACATION,		/* require vacation */
 };
 
 enum bytecode_comps {

cyrus-imapd-2.4.17.tar.gz/sieve/comparator.c -> cyrus-imapd-2.5.tar.gz/sieve/comparator.c Changed

cyrus-imapd-2.4.17.tar.gz/sieve/comparator.h -> cyrus-imapd-2.5.tar.gz/sieve/comparator.h Changed

cyrus-imapd-2.4.17.tar.gz/sieve/interp.c -> cyrus-imapd-2.5.tar.gz/sieve/interp.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: interp.c,v 1.27 2010/01/06 17:01:59 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -56,11 +54,12 @@
 #include "sieve_interface.h"
 #include "interp.h"
 #include "libconfig.h"
+#include "times.h"
 
 #define EXT_LEN 4096
 
 /* build a sieve interpretor */
-int sieve_interp_alloc(sieve_interp_t **interp, void *interp_context)
+EXPORTED sieve_interp_t *sieve_interp_alloc(void *interp_context)
 {
 sieve_interp_t *i;
 static int initonce;
@@ -70,11 +69,7 @@
 	initonce = 1;
 }
 
- *interp = NULL;
 i = (sieve_interp_t *) xmalloc(sizeof(sieve_interp_t));
- if (i == NULL) {
-	return SIEVE_NOMEM;
- }
 
 i->redirect = i->discard = i->reject = i->fileinto = i->keep = NULL;
 i->getsize = NULL;
@@ -89,171 +84,161 @@
 
 i->interp_context = interp_context;
 i->err = NULL;
+ i->lastitem = NULL;
+ i->extensions0 = '\0';
 
- *interp = i;
- return SIEVE_OK;
+ return i;
 }
 
-const char *sieve_listextensions(sieve_interp_t *i)
+EXPORTED const char *sieve_listextensions(sieve_interp_t *i)
 {
- static int done = 0;
- static char extensionsEXT_LEN = "";
-
- if (!done++) {
+ if (i->extensions0 == '\0') {
 	unsigned long config_sieve_extensions =
 	 config_getbitfield(IMAPOPT_SIEVE_EXTENSIONS);
 
 	/* add comparators */
-	strlcat(extensions, "comparator-i;ascii-numeric", EXT_LEN);
+	strlcat(i->extensions, "comparator-i;ascii-numeric", EXT_LEN);
 
 	/* add actions */
 	if (i->fileinto &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_FILEINTO))
-	 strlcat(extensions, " fileinto", EXT_LEN);
+	 strlcat(i->extensions, " fileinto", EXT_LEN);
 	if (i->reject &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_REJECT))
-	 strlcat(extensions, " reject", EXT_LEN);
+	 strlcat(i->extensions, " reject", EXT_LEN);
 	if (i->vacation &&
+	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_VACATION_SECONDS))
+	 strlcat(i->extensions, " vacation vacation-seconds", EXT_LEN);
+	else if (i->vacation &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_VACATION))
-	 strlcat(extensions, " vacation", EXT_LEN);
+	 strlcat(i->extensions, " vacation", EXT_LEN);
 	if (i->markflags &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_IMAPFLAGS))
-	 strlcat(extensions, " imapflags", EXT_LEN);
+	 strlcat(i->extensions, " imapflags", EXT_LEN);
 	if (i->notify &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_NOTIFY))
-	 strlcat(extensions, " notify", EXT_LEN);
+	 strlcat(i->extensions, " notify", EXT_LEN);
 	if (i->getinclude &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_INCLUDE))
-	 strlcat(extensions, " include", EXT_LEN);
+	 strlcat(i->extensions, " include", EXT_LEN);
 
 	/* add tests */
 	if (i->getenvelope &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_ENVELOPE))
-	 strlcat(extensions, " envelope", EXT_LEN);
+	 strlcat(i->extensions, " envelope", EXT_LEN);
 	if (i->getbody &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_BODY))
-	 strlcat(extensions, " body", EXT_LEN);
+	 strlcat(i->extensions, " body", EXT_LEN);
 
 	/* add match-types */
 	if (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_RELATIONAL)
-	 strlcat(extensions, " relational", EXT_LEN);
+	 strlcat(i->extensions, " relational", EXT_LEN);
 #ifdef ENABLE_REGEX
 	if (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_REGEX)
-	 strlcat(extensions, " regex", EXT_LEN);
+	 strlcat(i->extensions, " regex", EXT_LEN);
 #endif
 
 	/* add misc extensions */
 	if (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_SUBADDRESS)
-	 strlcat(extensions, " subaddress", EXT_LEN);
+	 strlcat(i->extensions, " subaddress", EXT_LEN);
 	if (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_COPY)
-	 strlcat(extensions, " copy", EXT_LEN);
+	 strlcat(i->extensions, " copy", EXT_LEN);
 }
 
- return extensions;
+ return i->extensions;
 }
 
-int sieve_interp_free(sieve_interp_t **interp)
+EXPORTED int sieve_interp_free(sieve_interp_t **interp)
 {
- free(*interp);
- 
+ if (*interp) {
+	free((*interp)->lastitem);
+	free(*interp);
+	*interp = NULL;
+ }
+
 return SIEVE_OK;
 }
 
 /* add the callbacks */
-int sieve_register_redirect(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_redirect(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->redirect = f;
-
- return SIEVE_OK;
 }
 
-int sieve_register_discard(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_discard(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->discard = f;
-
- return SIEVE_OK;
 }
 
-int sieve_register_reject(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_reject(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->reject = f;
-
- return SIEVE_OK;
 }
 
-int sieve_register_fileinto(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_fileinto(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->fileinto = f;
-
- return SIEVE_OK;
 }
 
-int sieve_register_keep(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_keep(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->keep = f;
- 
- return SIEVE_OK;
 }
 
-static char *default_markflags = { "\\flagged" };
-static sieve_imapflags_t default_mark = { default_markflags, 1 };
-
-int sieve_register_imapflags(sieve_interp_t *interp, sieve_imapflags_t *mark)
+EXPORTED void sieve_register_imapflags(sieve_interp_t *interp, const strarray_t *mark)
 {
- interp->markflags =
-	(mark && mark->flag && mark->nflags) ? mark : &default_mark;
+ static strarray_t default_mark = STRARRAY_INITIALIZER;
 
- return SIEVE_OK;
+ if (!default_mark.count)
+	strarray_append(&default_mark, "\\flagged");
+
+ interp->markflags =
+	(mark && mark->data && mark->count) ? mark : &default_mark;
 }
 
-int sieve_register_notify(sieve_interp_t *interp, sieve_callback *f)
+EXPORTED void sieve_register_notify(sieve_interp_t *interp, sieve_callback *f)
 {
 interp->notify = f;
- 
- return SIEVE_OK;
 }
 
 /* add the callbacks for messages. again, undefined if used after
 sieve_script_parse */
-int sieve_register_size(sieve_interp_t *interp, sieve_get_size *f)
+EXPORTED void sieve_register_size(sieve_interp_t *interp, sieve_get_size *f)
 {
 interp->getsize = f;
- return SIEVE_OK;
 }
 
-int sieve_register_header(sieve_interp_t *interp, sieve_get_header *f)
+EXPORTED void sieve_register_header(sieve_interp_t *interp, sieve_get_header *f)
 {
 interp->getheader = f;
- return SIEVE_OK;
 }
 
-int sieve_register_envelope(sieve_interp_t *interp, sieve_get_envelope *f)
+EXPORTED void sieve_register_envelope(sieve_interp_t *interp, sieve_get_envelope *f)
 {
 interp->getenvelope = f;
- return SIEVE_OK;
 }
 
-int sieve_register_include(sieve_interp_t *interp, sieve_get_include *f)
+EXPORTED void sieve_register_include(sieve_interp_t *interp, sieve_get_include *f)
 {
 interp->getinclude = f;
- return SIEVE_OK;
 }
 
-int sieve_register_body(sieve_interp_t *interp, sieve_get_body *f)
+EXPORTED void sieve_register_body(sieve_interp_t *interp, sieve_get_body *f)
 {
 interp->getbody = f;
- return SIEVE_OK;
 }
 
-int sieve_register_vacation(sieve_interp_t *interp, sieve_vacation_t *v)
+EXPORTED int sieve_register_vacation(sieve_interp_t *interp, sieve_vacation_t *v)
 {
 if (!interp->getenvelope) {
 	return SIEVE_NOT_FINALIZED; /* we need envelope for vacation! */
 }
 
- if (v->min_response == 0) v->min_response = 3;
- if (v->max_response == 0) v->max_response = 90;
- if (v->min_response < 0 || v->max_response < 7 || !v->autorespond
+ if (v->min_response == 0)
+	v->min_response = config_getint(IMAPOPT_SIEVE_VACATION_MIN_RESPONSE);
+ if (v->max_response == 0)
+	v->max_response = config_getint(IMAPOPT_SIEVE_VACATION_MAX_RESPONSE);
+ if (v->min_response < 0 || v->max_response < 7 * DAY2SEC || !v->autorespond
 	|| !v->send_response) {
 	return SIEVE_FAIL;
 }
@@ -262,16 +247,14 @@
 return SIEVE_OK;
 }
 
-int sieve_register_parse_error(sieve_interp_t *interp, sieve_parse_error *f)
+EXPORTED void sieve_register_parse_error(sieve_interp_t *interp, sieve_parse_error *f)
 {
 interp->err = f;
- return SIEVE_OK;
 }
 
-int sieve_register_execute_error(sieve_interp_t *interp, sieve_execute_error *f)
+EXPORTED void sieve_register_execute_error(sieve_interp_t *interp, sieve_execute_error *f)
 {
 interp->execute_err = f;
- return SIEVE_OK;
 }
 
 int interp_verify(sieve_interp_t *i)

cyrus-imapd-2.4.17.tar.gz/sieve/interp.h -> cyrus-imapd-2.5.tar.gz/sieve/interp.h Changed

cyrus-imapd-2.4.17.tar.gz/sieve/message.c -> cyrus-imapd-2.5.tar.gz/sieve/message.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message.c,v 1.35 2010/01/06 17:01:59 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -48,22 +46,13 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <string.h>
 
 #include "md5.h"
 #include "sieve_interface.h"
 #include "interp.h"
 #include "message.h"
-#include "parseaddr.h"
 #include "xmalloc.h"
-#include "xstrlcpy.h"
-#include "xstrlcat.h"
 #include "util.h"
 
 /* reject message m with message msg
@@ -109,7 +98,7 @@
 * incompatible with: reject
 */
 int do_fileinto(action_list_t *a, const char *mbox, int cancel_keep,
-		sieve_imapflags_t *imapflags)
+		strarray_t *imapflags)
 {
 action_list_t *b = NULL;
 
@@ -168,7 +157,7 @@
 *
 * incompatible with: reject
 */
-int do_keep(action_list_t *a, sieve_imapflags_t *imapflags)
+int do_keep(action_list_t *a, strarray_t *imapflags)
 {
 action_list_t *b = NULL;
 
@@ -236,7 +225,7 @@
 }
 
 int do_vacation(action_list_t *a, char *addr, char *fromaddr,
-		char *subj, const char *msg, int days,
+		char *subj, const char *msg, int seconds,
 		int mime, const char *handle)
 {
 action_list_t *b = NULL;
@@ -265,7 +254,7 @@
 	makehash(a->u.vac.autoresp.hash, addr, handle, NULL);
 else
 	makehash(a->u.vac.autoresp.hash, addr, fromaddr, msg);
- a->u.vac.autoresp.days = days;
+ a->u.vac.autoresp.seconds = seconds;
 a->next = NULL;
 b->next = a;
 return 0;
@@ -462,119 +451,6 @@
 return 0;
 }
 
-
-
-/* given a header, extract an address out of it. if marker points to NULL,
- extract the first address. otherwise, it's an index into the header to
- say where to start extracting */
-struct addr_marker {
- struct address *where;
- char *freeme;
-};
-
-int parse_address(const char *header, void **data, void **marker)
-{
- struct addr_marker *am = (struct addr_marker *) *marker;
-
- parseaddr_list(header, (struct address **) data);
- am = (void *) xmalloc(sizeof(struct addr_marker));
- am->where = *data;
- am->freeme = NULL;
- *marker = am;
- return SIEVE_OK;
-}
-
-char *get_address(address_part_t addrpart,
-		 void **data __attribute__((unused)),
-		 void **marker,
-		 int canon_domain)
-{
- char *ret = NULL;
- struct address *a;
- struct addr_marker *am = *marker;
-
- a = am->where;
- if (am->freeme) {
-	free(am->freeme);
-	am->freeme = NULL;
- }
-
- if (a == NULL) {
-	ret = NULL;
- } else {
-	if (canon_domain && a->domain)
-	 lcase(a->domain);
-
-	switch (addrpart) { 
-	case ADDRESS_ALL:
-#define U_DOMAIN "unspecified-domain"
-#define U_USER "unknown-user"
-	 if (a->mailbox || a->domain) {
-		char *m = a->mailbox ? a->mailbox : U_USER;
-		char *d = a->domain ? a->domain : U_DOMAIN;
-		am->freeme = (char *) xmalloc(strlen(m) + strlen(d) + 2);
-
-		sprintf(am->freeme, "%s@%s", m, d);
-		ret = am->freeme;
-	 } else {
-		ret = NULL;
-	 }
-	 break;
-
-	case ADDRESS_LOCALPART:
-	 ret = a->mailbox;
-	 break;
-	 
-	case ADDRESS_DOMAIN:
-	 ret = a->domain;
-	 break;
-
-	case ADDRESS_USER:
-	 if (a->mailbox) {
-		char *p = strchr(a->mailbox, '+');
-		int len = p ? p - a->mailbox : (int)strlen(a->mailbox);
-
-		am->freeme = (char *) xmalloc(len + 1);
-		strncpy(am->freeme, a->mailbox, len);
-		am->freemelen = '\0';
-		ret = am->freeme;
-	 } else {
-		ret = NULL;
-	 }
-	 break;
-
-	case ADDRESS_DETAIL:
-	 if (a->mailbox)
-	 {	 
-		char *p = strchr(a->mailbox, '+');
-		ret = (p ? p + 1 : NULL);
-	 }
-	 else
-	 {
-		ret = NULL;
-	 }
-	 break;
-	}
-	a = a->next;
-	am->where = a;
- }
- *marker = am;
- return ret;
-}
-
-int free_address(void **data, void **marker)
-{
- struct addr_marker *am = (struct addr_marker *) *marker;
-
- if (*data)
-	parseaddr_free((struct address *) *data);
- *data = NULL;
- if (am->freeme) free(am->freeme);
- free(am);
- *marker = NULL;
- return SIEVE_OK;
-}
-
 notify_list_t *new_notify_list(void) 
 {
 notify_list_t *ret = xmalloc(sizeof(notify_list_t));

cyrus-imapd-2.4.17.tar.gz/sieve/message.h -> cyrus-imapd-2.5.tar.gz/sieve/message.h Changed

@@ -39,15 +39,13 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: message.h,v 1.20 2010/01/06 17:01:59 murch Exp $
  */
 
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
 #include "sieve_interface.h"	/* for action contexts */
-#include "tree.h"		/* for stringlist_t */
+#include "tree.h"
 
 typedef struct Action action_list_t;
 
@@ -111,19 +109,6 @@
     struct notify_list_s *next;
 } notify_list_t;
 
-/* header parsing */
-typedef enum {
-    ADDRESS_ALL,
-    ADDRESS_LOCALPART,
-    ADDRESS_DOMAIN,
-    ADDRESS_USER,
-    ADDRESS_DETAIL
-} address_part_t;
-
-int parse_address(const char *header, void **data, void **marker);
-char *get_address(address_part_t addrpart, void **data, void **marker,
-		  int canon_domain);
-int free_address(void **data, void **marker);
 notify_list_t *new_notify_list(void);
 void free_notify_list(notify_list_t *n);
 
@@ -132,12 +117,12 @@
  * action list */
 int do_reject(action_list_t *m, const char *msg);
 int do_fileinto(action_list_t *m, const char *mbox, int cancel_keep,
-		sieve_imapflags_t *imapflags);
+		strarray_t *imapflags);
 int do_redirect(action_list_t *m, const char *addr, int cancel_keep);
-int do_keep(action_list_t *m, sieve_imapflags_t *imapflags);
+int do_keep(action_list_t *m, strarray_t *imapflags);
 int do_discard(action_list_t *m);
 int do_vacation(action_list_t *m, char *addr, char *fromaddr,
-		char *subj, const char *msg, int days, int mime,
+		char *subj, const char *msg, int seconds, int mime,
 		const char *handle);
 int do_setflag(action_list_t *m, const char *flag);
 int do_addflag(action_list_t *m, const char *flag);

cyrus-imapd-2.4.17.tar.gz/sieve/script.c -> cyrus-imapd-2.5.tar.gz/sieve/script.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: script.c,v 1.71.2.1 2010/02/12 03:40:51 brong Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -49,15 +47,13 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
+#include "assert.h"
 #include "charset.h"
-#include "hash.h"
 #include "xmalloc.h"
 
 #include "sieve_interface.h"
@@ -65,11 +61,16 @@
 #include "script.h"
 #include "tree.h"
 #include "map.h"
-#include "sieve.h"
+#include "util.h"
+#include "sieve/sieve.h"
 #include "message.h"
 #include "bytecode.h"
 #include "libconfig.h"
 
+/* generated by the yacc script */
+int sieveparse(sieve_script_t *script);
+void sieverestart (FILE *input_file);
+
 #define ERR_BUF_SIZE 1024
 
 /* does this interpretor support this requirement? */
@@ -118,8 +119,20 @@
 	} else {
 	 return 0;
 	}
+ } else if (!strcmp("vacation-seconds", req)) {
+	if (s->interp.vacation &&
+	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_VACATION_SECONDS)) {
+	 /* Note that "vacation-seconds" implies "vacation", and a script
+	 * with "vacation-seconds" in a "require" list MAY omit "vacation"
+	 * from that list. */
+	 s->support.vacation = 1;
+	 s->support.vacation_seconds = 1;
+	 return 1;
+	} else {
+	 return 0;
+	}
 } else if (!strcmp("imapflags", req)) {
-	if (s->interp.markflags->flag &&
+	if (s->interp.markflags->count &&
 	 (config_sieve_extensions & IMAP_ENUM_SIEVE_EXTENSIONS_IMAPFLAGS)) {
 	 s->support.imapflags = 1;
 	 return 1;
@@ -172,12 +185,11 @@
 }
 
 /* given an interpretor and a script, produce an executable script */
-int sieve_script_parse(sieve_interp_t *interp, FILE *script,
+EXPORTED int sieve_script_parse(sieve_interp_t *interp, FILE *script,
 		 void *script_context, sieve_script_t **ret)
 {
 sieve_script_t *s;
 int res = SIEVE_OK;
- extern int yylineno;
 
 res = interp_verify(interp);
 if (res != SIEVE_OK) {
@@ -192,13 +204,16 @@
 
 s->err = 0;
 
- yylineno = 1;		/* reset line number */
- s->cmds = sieve_parse(s, script);
- if (s->err > 0) {
-	if (s->cmds) {
-	 free_tree(s->cmds);
-	}
+ sieverestart(script);
+ s->cmds = NULL;
+ extern int sievelineno;
+ sievelineno = 1;		/* reset line number */
+ if (sieveparse(s)) {
+	free_tree(s->cmds);
 	s->cmds = NULL;
+ }
+ if (s->err > 0) {
+	sieve_script_free(&s);
 	res = SIEVE_PARSE_ERROR;
 }
 
@@ -206,36 +221,21 @@
 return res;
 }
 
-static void free_imapflags(sieve_imapflags_t *imapflags)
-{
- while (imapflags->nflags)
-	free(imapflags->flag--imapflags->nflags);
- free(imapflags->flag);
- 
- imapflags->flag = NULL;
-}
- 
-int sieve_script_free(sieve_script_t **s)
+EXPORTED void sieve_script_free(sieve_script_t **s)
 {
 if (*s) {
-	if ((*s)->cmds) {
+	if ((*s)->cmds)
 	 free_tree((*s)->cmds);
-	}
 	free(*s);
+	*s = NULL;
 }
-
- return SIEVE_OK;
 }
 
-#define GROW_AMOUNT 100
-
 static void add_header(sieve_interp_t *i, int isenv, char *header, 
-		 void *message_context, char **out, 
-		 int *outlen, int *outalloc)
+		 void *message_context, struct buf *out)
 {
 const char **h;
 char *decoded_header;
- int addlen;
 /* get header value */
 if (isenv)
 	i->getenvelope(message_context, header, &h);	
@@ -246,36 +246,18 @@
 	return;
 
 decoded_header = charset_parse_mimeheader(h0);
-
- addlen = strlen(decoded_header) + 1;
-
- /* realloc if necessary */
- if ( (*outlen) + addlen >= *outalloc)
- {
-	*outalloc = (*outlen) + addlen + GROW_AMOUNT;
-	*out = xrealloc(*out, *outalloc);
- }
-
- /* add header value */
- strcat(*out, decoded_header);
-
+ buf_appendcstr(out, decoded_header);
 free(decoded_header);
-
- *outlen += addlen;
 }
 
 static int build_notify_message(sieve_interp_t *i,
 				const char *msg, 
-				void *message_context, char **out, int *outlen)
+				void *message_context,
+				struct buf *out)
 {
- int allocsize = GROW_AMOUNT;
 const char *c;
 size_t n;
 
- *out = xmalloc(GROW_AMOUNT);
- *outlen = 0;
- (*out)0='\0';
-
 if (msg == NULL) return SIEVE_OK;
 
 /* construct the message */
@@ -283,15 +265,15 @@
 while (*c) {
 	/* expand variables */
 	if (!strncasecmp(c, "$from$", 6)) {
-	 add_header(i, 0 ,"From", message_context, out, outlen, &allocsize);
+	 add_header(i, 0 ,"From", message_context, out);
 	 c += 6;
 	}
 	else if (!strncasecmp(c, "$env-from$", 10)) {
-	 add_header(i, 1, "From", message_context, out, outlen, &allocsize);
+	 add_header(i, 1, "From", message_context, out);
 	 c += 10;
 	}
 	else if (!strncasecmp(c, "$subject$", 9)) {
-	 add_header(i, 0, "Subject", message_context, out, outlen, &allocsize);
+	 add_header(i, 0, "Subject", message_context, out);
 	 c += 9;
 	}
 	else if (i->getbody &&
@@ -310,20 +292,9 @@
 
 	 /* we only use the first text part */
 	 if (parts && parts0 && parts0->decoded_body) {
-		const char *content = parts0->decoded_body;
-		int size = strlen(content);
-
-		if (n == 0 || n > (size_t)size) n = size;
-
-		/* realloc if necessary */
-		if ( (*outlen) + n+1 >= (size_t)allocsize) {
-		 allocsize = (*outlen) + n+1 + GROW_AMOUNT;
-		 *out = xrealloc(*out, allocsize);
-		}
-		/* copy the plaintext */
-		strncat(*out, content, n);
-		(*out)*outlen+n='\0';
-		(*outlen) += n;
+		size_t size = strlen(parts0->decoded_body);
+		if (n && size > n) size = n;
+		buf_appendmap(out, parts0->decoded_body, size);
 	 }
 
 	 /* free the results */
@@ -337,81 +308,55 @@
 	else {
 	 /* find length of plaintext up to next potential variable */
 	 n = strcspn(c+1, "$") + 1; /* skip opening '$' */
-	 /* realloc if necessary */
-	 if ( (*outlen) + n+1 >= (size_t)allocsize) {
-		allocsize = (*outlen) + n+1 + GROW_AMOUNT;
-		*out = xrealloc(*out, allocsize);
-	 }
-	 /* copy the plaintext */
-	 strncat(*out, c, n);
-	 (*out)*outlen+n='\0';
-	 (*outlen) += n;
+	 buf_appendmap(out, c, n);
 	 c += n;
 	}
 }
 
+ buf_cstring(out);
 return SIEVE_OK;
 }
 
-static int sieve_addflag(sieve_imapflags_t *imapflags, const char *flag)
+static int sieve_addflag(strarray_t *imapflags, const char *flag)
 {
 int n;
 /* search for flag already in list */
- for (n = 0; n < imapflags->nflags; n++) {
-	if (!strcmp(imapflags->flagn, flag))
+ for (n = 0; n < imapflags->count; n++) {
+	if (!strcmp(imapflags->datan, flag))
 	 break;
 }
- 
+
 /* add flag to list, iff not in list */
- if (n == imapflags->nflags) {
-	imapflags->nflags++;
-	imapflags->flag =
-	 (char **) xrealloc((char *)imapflags->flag,
-			 imapflags->nflags*sizeof(char *));
-	imapflags->flagimapflags->nflags-1 = xstrdup(flag);
- }
- 
+ if (n == imapflags->count)
+	strarray_append(imapflags, flag);
+
 return SIEVE_OK;
 }
 
-static int sieve_removeflag(sieve_imapflags_t *imapflags, const char *flag)
+static int sieve_removeflag(strarray_t *imapflags, const char *flag)
 {
 int n;
 /* search for flag already in list */
- for (n = 0; n < imapflags->nflags; n++) {
- if (!strcmp(imapflags->flagn, flag))
+ for (n = 0; n < imapflags->count; n++) {
+ if (!strcmp(imapflags->datan, flag))
 	break;
 }
- 
+
 /* remove flag from list, iff in list */
- if (n < imapflags->nflags) 
- {
-	free(imapflags->flagn);
-	imapflags->nflags--;
-	
-	for (; n < imapflags->nflags; n++)
-	 imapflags->flagn = imapflags->flagn+1;
-	
-	if (imapflags->nflags)
-	 {imapflags->flag =
-	 (char **) xrealloc((char *)imapflags->flag,
-				imapflags->nflags*sizeof(char *));}
-	else
-	 {free(imapflags->flag);
-	 imapflags->flag=NULL;}
- }
- 
+ if (n < imapflags->count)
+	free(strarray_remove(imapflags, n));
+
 return SIEVE_OK;
 }
 
 static int send_notify_callback(sieve_interp_t *interp,
 				void *message_context, 
 				void * script_context, notify_list_t *notify, 
-				char *actions_string, const char **errmsg)
+				char *actions_string __attribute__((unused)),
+				const char **errmsg)
 {
 sieve_notify_context_t nc;
- char *out_msg, *build_msg;
- int out_msglen; 
+ struct buf out = BUF_INITIALIZER;
 int ret;
 
 assert(notify->isactive);
@@ -429,18 +374,12 @@
 if(!strcmp("$env-from$",*nc.options))
 interp->getenvelope(message_context, "From", &nc.options);
 
- build_notify_message(interp, notify->message, message_context, 
-			 &out_msg, &out_msglen);
+ build_notify_message(interp, notify->message, message_context,
+			 &out);
+ buf_appendcstr(&out, "\n\n");
+ /* buf_appendcstr(&out, actions_string); */
 
- build_msg = xmalloc(out_msglen + strlen(actions_string) + 30);
-
- strcpy(build_msg, out_msg);
- strcat(build_msg, "\n\n");
- strcat(build_msg, actions_string);
-
- nc.message = build_msg;
-
- free(out_msg);
+ nc.message = buf_cstring(&out);
 
 ret = interp->notify(&nc,
 			 interp->interp_context,
@@ -448,7 +387,7 @@
 			 message_context,
 			 errmsg); 
 
- free(build_msg);
+ buf_free(&out);
 
 return ret;
 }
@@ -457,6 +396,8 @@
 {
 switch(action)
 	{
+	case ACTION_NULL: return "NULL";
+	case ACTION_NONE: return "None";
 	case ACTION_REJECT: return "Reject";
 	case ACTION_FILEINTO: return "Fileinto";
 	case ACTION_KEEP: return "Keep";
@@ -497,7 +438,7 @@
 *****************************************************************************/
 
 /* Load a compiled script */
-int sieve_script_load(const char *fname, sieve_execute_t **ret) 
+EXPORTED int sieve_script_load(const char *fname, sieve_execute_t **ret) 
 {
 struct stat sbuf;
 sieve_execute_t *ex;
@@ -555,25 +496,33 @@
 	/* add buffer to list */
 	bc->next = ex->bc_list;
 	ex->bc_list = bc;
- }
 
- ex->bc_cur = bc;
- *ret = ex;
- return SIEVE_OK;
+	ex->bc_cur = bc;
+	*ret = ex;
+	return SIEVE_OK;
+ } else {
+	// script was loaded in the past
+	ex->bc_cur = bc;
+	*ret = ex;
+	return SIEVE_SCRIPT_RELOADED;
+ }
 }
 
 
 
-int sieve_script_unload(sieve_execute_t **s) 
+EXPORTED int sieve_script_unload(sieve_execute_t **s)
 {
 if(s && *s) {
 	sieve_bytecode_t *bc = (*s)->bc_list;
+	sieve_bytecode_t *nextbc;
 
 	/* free each bytecode buffer in the linked list */
 	while (bc) {
 	 map_free(&(bc->data), &(bc->len));
 	 close(bc->fd);
-	 bc = bc->next;
+	 nextbc = bc->next;
+	 free(bc);
+	 bc = nextbc;
 	}
 	free(*s);
 	*s = NULL;
@@ -591,7 +540,7 @@
 			 sieve_interp_t *interp,
 			 void *script_context,
 			 void *message_context,
-			 sieve_imapflags_t * imapflags,
+			 strarray_t *imapflags,
 			 action_list_t *actions,
 			 notify_list_t *notify_list,
 			 /* notify_action_t *notify_action,*/
@@ -648,15 +597,23 @@
 
 }
 
- if ((ret != SIEVE_OK) && interp->err) {
+ if ((ret != SIEVE_OK) && interp->execute_err) {
 	char bufERR_BUF_SIZE;
 	if (lastaction == -1) /* we never executed an action */
 	 snprintf(buf, ERR_BUF_SIZE,
 		 "%s", errmsg ? errmsg : sieve_errstr(ret));
-	else
-	 snprintf(buf, ERR_BUF_SIZE,
-		 "%s: %s", action_to_string(lastaction),
-		 errmsg ? errmsg : sieve_errstr(ret));
+	else {
+	 if (interp->lastitem) {
+		snprintf(buf, ERR_BUF_SIZE, "%s (%s): %s", 
+			 action_to_string(lastaction), interp->lastitem,
+			 errmsg ? errmsg : sieve_errstr(ret));
+	 }
+	 else {
+		snprintf(buf, ERR_BUF_SIZE, "%s: %s",
+			 action_to_string(lastaction),
+			 errmsg ? errmsg : sieve_errstr(ret));
+	 }
+	}
 
 	ret |= interp->execute_err(buf, interp->interp_context,
 				 script_context, message_context);
@@ -694,7 +651,7 @@
 static int do_action_list(sieve_interp_t *interp,
 			 void *script_context,
 			 void *message_context,
-			 sieve_imapflags_t *imapflags,
+			 strarray_t *imapflags,
 			 action_list_t *actions,
 			 notify_list_t *notify_list,
 			 /* notify_action_t *notify_action,*/
@@ -723,6 +680,8 @@
 				 script_context,
 				 message_context,
 				 &errmsg);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.rej.msg);
 	 
 	 if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
@@ -738,6 +697,8 @@
 				 script_context,
 				 message_context,
 				 &errmsg);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.fil.mailbox);
 
 	 if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
@@ -752,6 +713,8 @@
 			 script_context,
 			 message_context,
 			 &errmsg);
+	 free(interp->lastitem);
+	 interp->lastitem = NULL;
 	 if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
 			 ACTIONS_STRING_LEN-strlen(actions_string),
@@ -765,6 +728,8 @@
 				 script_context,
 				 message_context,
 				 &errmsg);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.red.addr);
 	 if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
 			 ACTIONS_STRING_LEN-strlen(actions_string),
@@ -776,6 +741,8 @@
 				 script_context,
 				 message_context,
 				 &errmsg);
+	 free(interp->lastitem);
+	 interp->lastitem = NULL;
 	 if (ret == SIEVE_OK)
 		snprintf(actions_string+strlen(actions_string),
 			 ACTIONS_STRING_LEN-strlen(actions_string),
@@ -793,6 +760,8 @@
 						 script_context,
 						 message_context,
 						 &errmsg);
+		free(interp->lastitem);
+		interp->lastitem = NULL;
 
 		if (ret == SIEVE_OK) {
 		 /* send the response */
@@ -820,35 +789,45 @@
 
 
 	case ACTION_SETFLAG:
-	 free_imapflags(imapflags);
+	 strarray_fini(imapflags);
 	 ret = sieve_addflag(imapflags, a->u.fla.flag);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.fla.flag);
 	 break;
 	case ACTION_ADDFLAG:
 	 ret = sieve_addflag(imapflags, a->u.fla.flag);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.fla.flag);
 	 break;
 	case ACTION_REMOVEFLAG:
 	 ret = sieve_removeflag(imapflags, a->u.fla.flag);
+	 free(interp->lastitem);
+	 interp->lastitem = xstrdup(a->u.fla.flag);
 	 break;
 	case ACTION_MARK:
 	 {
-		int n = interp->markflags->nflags;
+		int n = interp->markflags->count;
 
 		ret = SIEVE_OK;
 		while (n && ret == SIEVE_OK) {
 		 ret = sieve_addflag(imapflags,
-					interp->markflags->flag--n);
+					interp->markflags->data--n);
 		}
+		free(interp->lastitem);
+		interp->lastitem = NULL;
 		break;
 	 }
 	case ACTION_UNMARK:
 	 {
 	 
-		int n = interp->markflags->nflags;
+		int n = interp->markflags->count;
 		ret = SIEVE_OK;
 		while (n && ret == SIEVE_OK) {
 		 ret = sieve_removeflag(imapflags,
-					 interp->markflags->flag--n);
+					 interp->markflags->data--n);
 		}
+		free(interp->lastitem);
+		interp->lastitem = NULL;
 		break;
 	 }
 
@@ -877,10 +856,10 @@
 /* execute some bytecode */
 int sieve_eval_bc(sieve_execute_t *exe, int is_incl, sieve_interp_t *i,
 		 void *sc, void *m,
-		 sieve_imapflags_t * imapflags, action_list_t *actions,
+		 const strarray_t * , action_list_t *actions,
 		 notify_list_t *notify_list, const char **errmsg);
 
-int sieve_execute_bytecode(sieve_execute_t *exe, sieve_interp_t *interp,
+EXPORTED int sieve_execute_bytecode(sieve_execute_t *exe, sieve_interp_t *interp,
 			 void *script_context, void *message_context) 
 {
 action_list_t *actions = NULL;
@@ -890,13 +869,10 @@
 int ret;
 char actions_stringACTIONS_STRING_LEN = "";
 const char *errmsg = NULL;
- sieve_imapflags_t imapflags;
+ strarray_t imapflags = STRARRAY_INITIALIZER;
 
 if (!interp) return SIEVE_FAIL;
 
- imapflags.flag = NULL; 
- imapflags.nflags = 0;
- 
 if (interp->notify) {
 	notify_list = new_notify_list();
 	if (notify_list == NULL) {
@@ -933,5 +909,7 @@
 	}
 }
 
+ strarray_fini(&imapflags);
+
 return ret;
 }

cyrus-imapd-2.4.17.tar.gz/sieve/script.h -> cyrus-imapd-2.5.tar.gz/sieve/script.h Changed

@@ -39,8 +39,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: script.h,v 1.14 2010/01/06 17:01:59 murch Exp $
  */
 
 #ifndef SIEVE_SCRIPT_H
@@ -70,12 +68,15 @@
 	int i_ascii_numeric: 1;
 	int include        : 1;
 	int copy           : 1;
+	int vacation_seconds: 1;
     } support;
 
     void *script_context;
     commandlist_t *cmds;
 
     int err;
+    char addrerr500; /* buffer for address parser error messages */
+    char sieveerr1024;
 };
 
 typedef struct sieve_bytecode sieve_bytecode_t;
@@ -83,7 +84,7 @@
 struct sieve_bytecode {
     ino_t inode;		/* used to prevent mmapping the same script */
     const char *data;
-    unsigned long len;
+    size_t len;
     int fd;
 
     int is_executing;		/* used to prevent recursive INCLUDEs */
@@ -96,8 +97,6 @@
     sieve_bytecode_t *bc_cur;	/* currently active bytecode buffer */
 };
 
-/* generated by the yacc script */
-commandlist_t *sieve_parse(sieve_script_t *script, FILE *f);
 int script_require(sieve_script_t *s, char *req);
 
 #endif

cyrus-imapd-2.4.17.tar.gz/sieve/sieve-lex.l -> cyrus-imapd-2.5.tar.gz/sieve/sieve-lex.l Changed

@@ -40,32 +40,32 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieve-lex.l,v 1.24 2010/01/06 17:01:59 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <string.h> /* for strdup */
 #include "xmalloc.h"
 
-#include "tree.h"
-#include "sieve.h"
+#include "sieve/tree.h"
+#include "sieve/sieve_interface.h"
+#include "sieve/sieve.h"
 
 #define YY_NO_INPUT
+#define YY_DECL int yylex(YYSTYPE *yylval, sieve_script_t *parse_script)
 
 static int tonum(char *c);
 static char *chkstr(char *);
 static char *mlbuf;
 static int mlbufsz, mlcur;
-extern int yyerror(char *);
+extern void sieveerror(sieve_script_t *, char *);
 %}
 
 %option yylineno
 %option noyywrap
 %option nounput
+%option prefix="sieve" outfile="lex.yy.c"
 
 ws		 \t+
 ident		a-zA-Z_a-zA-Z_0-9*
@@ -77,33 +77,33 @@
 %%
 <MULTILINE>^\.{CRLF}	{ BEGIN INITIAL; 
 if (mlbuf) mlbufmlcur = '\0';
- yylval.sval = chkstr(mlbuf); return STRING; }
+ yylval->sval = chkstr(mlbuf); return STRING; }
 <MULTILINE>^\.\. { /* dot stuffing! we want one . */ yyless(1); }
-<MULTILINE>(.|\n) { if (mlcur == mlbufsz) 
+<MULTILINE>(.|\n) { if (mlcur == mlbufsz)
 			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
 		 mlbufmlcur++ = yytext0; }
-<MULTILINE><<EOF>> { yyerror("unexpected end of file in string"); 
-		 BEGIN INITIAL;
+<MULTILINE><<EOF>> { BEGIN INITIAL;
+		 sieveerror(parse_script, "unexpected end of file in string");
 		 if (mlbuf) free(mlbuf);
 		 yyterminate(); }
 <QSTRING>\" { BEGIN INITIAL;
 if (mlbuf) mlbufmlcur = '\0';
-		 yylval.sval = chkstr(mlbuf); return STRING; }
-<QSTRING>\\. { if (mlcur == mlbufsz) 
+		 yylval->sval = chkstr(mlbuf); return STRING; }
+<QSTRING>\\. { if (mlcur == mlbufsz)
 			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
 		 mlbufmlcur++ = yytext1; }
-<QSTRING>(.|\n) { if (mlcur == mlbufsz) 
+<QSTRING>(.|\n) { if (mlcur == mlbufsz)
 			mlbuf = xrealloc(mlbuf, 1 + (mlbufsz+=1024));
 		 mlbufmlcur++ = yytext0; }
-<QSTRING><<EOF>> { yyerror("unexpected end of file in string");
-		 BEGIN INITIAL;
+<QSTRING><<EOF>> { sieveerror(parse_script, "unexpected end of file in string");
 		 if (mlbuf) free(mlbuf);
+		 BEGIN INITIAL;
 		 yyterminate(); }
 <INITIAL>text:{ws}?(#.*)?{CRLF}	{ BEGIN MULTILINE;
 			 mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
 <INITIAL>\" { BEGIN QSTRING;
 mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
-<INITIAL>0-9+KMGkmg?	{ yylval.nval = tonum(yytext); return NUMBER; }
+<INITIAL>0-9+KMGkmg?	{ yylval->nval = tonum(yytext); return NUMBER; }
 <INITIAL>if		return IF;
 <INITIAL>elsif		return ELSIF;
 <INITIAL>else		return ELSE;
@@ -141,6 +141,7 @@
 <INITIAL>:message	return MESSAGE;
 <INITIAL>vacation	return VACATION;
 <INITIAL>:days		return DAYS;
+<INITIAL>:seconds	return SECONDS;
 <INITIAL>:addresses	return ADDRESSES;
 <INITIAL>:subject	return SUBJECT;
 <INITIAL>:from		return FROM;
@@ -166,6 +167,8 @@
 <INITIAL>include	return INCLUDE;
 <INITIAL>:personal	return PERSONAL;
 <INITIAL>:global	return GLOBAL;
+<INITIAL>:optional	return OPTIONAL;
+<INITIAL>:once		return ONCE;
 <INITIAL>return		return RETURN;
 <INITIAL>:copy		return COPY;
 <INITIAL> \t\n\r ;	/* ignore whitespace */

cyrus-imapd-2.4.17.tar.gz/sieve/sieve.y -> cyrus-imapd-2.5.tar.gz/sieve/sieve.y Changed

@@ -40,8 +40,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieve.y,v 1.45.2.1 2010/02/12 03:41:11 brong Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -51,28 +49,31 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <ctype.h>
 #include "xmalloc.h"
-#include "comparator.h"
-#include "interp.h"
-#include "script.h"
-#include "tree.h"
+#include "sieve/comparator.h"
+#include "sieve/interp.h"
+#include "sieve/script.h"
+#include "sieve/tree.h"
 
-#include "../lib/imapurl.h"
-#include "../lib/util.h"
-#include "../lib/imparse.h"
-#include "../lib/libconfig.h"
+#include "imapurl.h"
+#include "util.h"
+#include "imparse.h"
+#include "libconfig.h"
+#include "times.h"
 
 #define ERR_BUF_SIZE 1024
 
-char errbufERR_BUF_SIZE;
+/* definitions */
+extern int addrparse(sieve_script_t*);
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+extern YY_BUFFER_STATE addr_scan_string(const char*);
+extern void addr_delete_buffer(YY_BUFFER_STATE);
 
- /* definitions */
- extern int addrparse(void);
+extern int sievelineno;
 
 struct vtags {
- int days;
- stringlist_t *addresses;
+ int seconds;
+ strarray_t *addresses;
 char *subject;
 char *from;
 char *handle;
@@ -95,7 +96,7 @@
 struct btags {
 int transform;
 int offset;
- stringlist_t *content_types;
+ strarray_t *content_types;
 char *comparator;
 int comptag;
 int relation;
@@ -104,7 +105,7 @@
 struct ntags {
 char *method;
 char *id;
- stringlist_t *options;
+ strarray_t *options;
 int priority;
 char *message;
 };
@@ -116,19 +117,24 @@
 int priority;
 };
 
-static commandlist_t *ret;
-static sieve_script_t *parse_script;
-static char *check_reqs(stringlist_t *sl);
+struct itags {
+ int location;
+ int once;
+ int optional;
+};
+
+static char *check_reqs(sieve_script_t *script, strarray_t *sl);
 static test_t *build_address(int t, struct aetags *ae,
-			 stringlist_t *sl, stringlist_t *pl);
+			 strarray_t *sl, strarray_t *pl);
 static test_t *build_header(int t, struct htags *h,
-			 stringlist_t *sl, stringlist_t *pl);
-static test_t *build_body(int t, struct btags *b, stringlist_t *pl);
+			 strarray_t *sl, strarray_t *pl);
+static test_t *build_body(int t, struct btags *b, strarray_t *pl);
 static commandlist_t *build_vacation(int t, struct vtags *h, char *s);
 static commandlist_t *build_notify(int t, struct ntags *n);
 static commandlist_t *build_denotify(int t, struct dtags *n);
 static commandlist_t *build_fileinto(int t, int c, char *f);
 static commandlist_t *build_redirect(int t, int c, char *a);
+static commandlist_t *build_include(int, struct itags *, char*);
 static struct aetags *new_aetags(void);
 static struct aetags *canon_aetags(struct aetags *ae);
 static void free_aetags(struct aetags *ae);
@@ -139,7 +145,7 @@
 static struct btags *canon_btags(struct btags *b);
 static void free_btags(struct btags *b);
 static struct vtags *new_vtags(void);
-static struct vtags *canon_vtags(struct vtags *v);
+static struct vtags *canon_vtags(sieve_script_t *script, struct vtags *v);
 static void free_vtags(struct vtags *v);
 static struct ntags *new_ntags(void);
 static struct ntags *canon_ntags(struct ntags *n);
@@ -147,24 +153,25 @@
 static struct dtags *new_dtags(void);
 static struct dtags *canon_dtags(struct dtags *d);
 static void free_dtags(struct dtags *d);
-
-static int verify_stringlist(stringlist_t *sl, int (*verify)(char *));
-static int verify_mailbox(char *s);
-static int verify_address(char *s);
-static int verify_header(char *s);
-static int verify_addrheader(char *s);
-static int verify_envelope(char *s);
-static int verify_flag(char *s);
-static int verify_relat(char *s);
+static struct itags *new_itags(void);
+
+static int verify_stringlist(sieve_script_t*, strarray_t *sl, int (*verify)(sieve_script_t*, char *));
+static int verify_mailbox(sieve_script_t*, char *s);
+static int verify_address(sieve_script_t*, char *s);
+static int verify_header(sieve_script_t*, char *s);
+static int verify_addrheader(sieve_script_t*, char *s);
+static int verify_envelope(sieve_script_t*, char *s);
+static int verify_flag(sieve_script_t*, char *s);
+static int verify_relat(sieve_script_t*, char *s);
 #ifdef ENABLE_REGEX
-static int verify_regex(char *s, int cflags);
-static int verify_regexs(stringlist_t *sl, char *comp);
+static int verify_regex(sieve_script_t*, char *s, int cflags);
+static int verify_regexs(sieve_script_t*,const strarray_t *sl, char *comp);
 #endif
-static int verify_utf8(char *s);
+static int verify_utf8(sieve_script_t*, char *s);
 
-int yyerror(const char *msg);
-extern int yylex(void);
-extern void yyrestart(FILE *f);
+void yyerror(sieve_script_t*, const char *msg);
+extern int yylex(void*, sieve_script_t*);
+extern void sieverestart(FILE *f);
 
 #define YYERROR_VERBOSE /* i want better error messages! */
 
@@ -176,7 +183,7 @@
 %union {
 int nval;
 char *sval;
- stringlist_t *sl;
+ strarray_t *sl;
 test_t *test;
 testlist_t *testl;
 commandlist_t *cl;
@@ -186,6 +193,7 @@
 struct btags *btag;
 struct ntags *ntag;
 struct dtags *dtag;
+ struct itags *itag;
 }
 
 %token <nval> NUMBER
@@ -199,15 +207,15 @@
 %token GT GE LT LE EQ NE
 %token ALL LOCALPART DOMAIN USER DETAIL
 %token RAW TEXT CONTENT
-%token DAYS ADDRESSES SUBJECT FROM HANDLE MIME
+%token DAYS ADDRESSES SUBJECT FROM HANDLE MIME SECONDS
 %token METHOD ID OPTIONS LOW NORMAL HIGH ANY MESSAGE
-%token INCLUDE PERSONAL GLOBAL RETURN
+%token INCLUDE PERSONAL GLOBAL RETURN OPTIONAL ONCE
 %token COPY
 
 %type <cl> commands command action elsif block
 %type <sl> stringlist strings
 %type <test> test
-%type <nval> comptag relcomp sizetag addrparttag addrorenv location copy
+%type <nval> comptag relcomp sizetag addrparttag addrorenv copy
 %type <testl> testlist tests
 %type <htag> htags
 %type <aetag> aetags
@@ -215,21 +223,29 @@
 %type <vtag> vtags
 %type <ntag> ntags
 %type <dtag> dtags
+%type <itag> itags
 %type <nval> priority
 
+%name-prefix="sieve"
+%defines
+%destructor { free_tree($$); } commands command action elsif block
+
+%parse-param{sieve_script_t *parse_script}
+%lex-param{sieve_script_t *parse_script}
+%pure_parser
 %%
 
-start: reqs			{ ret = NULL; }
-	| reqs commands		{ ret = $2; }
+start: reqs			{ parse_script->cmds = NULL; }
+	| reqs commands		{ parse_script->cmds = $2; }
 	;
 
 reqs: /* empty */
 	| require reqs
 	;
 
-require: REQUIRE stringlist ';'	{ char *err = check_reqs($2);
+require: REQUIRE stringlist ';'	{ char *err = check_reqs(parse_script, $2);
 if (err) {
-				 yyerror(err);
+				 yyerror(parse_script, err);
 				 free(err);
 				 YYERROR; 
 } }
@@ -250,23 +266,23 @@
 	;
 
 action: REJCT STRING { if (!parse_script->support.reject) {
-				 yyerror("reject MUST be enabled with \"require\"");
+				 yyerror(parse_script, "reject MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
-				 if (!verify_utf8($2)) {
+				 if (!verify_utf8(parse_script, $2)) {
 				 YYERROR; /* vu should call yyerror() */
 				 }
 				 $$ = new_command(REJCT);
 				 $$->u.str = $2; }
 	| FILEINTO copy STRING	 { if (!parse_script->support.fileinto) {
-				 yyerror("fileinto MUST be enabled with \"require\"");
+				 yyerror(parse_script, "fileinto MUST be enabled with \"require\"");
 	 YYERROR;
 }
-				 if (!verify_mailbox($3)) {
+				 if (!verify_mailbox(parse_script, $3)) {
 				 YYERROR; /* vm should call yyerror() */
 				 }
 	 $$ = build_fileinto(FILEINTO, $2, $3); }
-	| REDIRECT copy STRING { if (!verify_address($3)) {
+	| REDIRECT copy STRING { if (!verify_address(parse_script, $3)) {
 				 YYERROR; /* va should call yyerror() */
 				 }
 	 $$ = build_redirect(REDIRECT, $2, $3); }
@@ -274,54 +290,54 @@
 	| STOP			 { $$ = new_command(STOP); }
 	| DISCARD		 { $$ = new_command(DISCARD); }
 	| VACATION vtags STRING { if (!parse_script->support.vacation) {
-				 yyerror("vacation MUST be enabled with \"require\"");
+				 yyerror(parse_script, "vacation MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
-				 if (($2->mime == -1) && !verify_utf8($3)) {
+				 if (($2->mime == -1) && !verify_utf8(parse_script, $3)) {
 				 YYERROR; /* vu should call yyerror() */
 				 }
 				 $$ = build_vacation(VACATION,
-					 canon_vtags($2), $3); }
+					 canon_vtags(parse_script, $2), $3); }
 | SETFLAG stringlist { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
+ yyerror(parse_script, "imapflags MUST be enabled with \"require\"");
 YYERROR;
 }
- if (!verify_stringlist($2, verify_flag)) {
+ if (!verify_stringlist(parse_script, $2, verify_flag)) {
 YYERROR; /* vf should call yyerror() */
 }
 $$ = new_command(SETFLAG);
 $$->u.sl = $2; }
 | ADDFLAG stringlist { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
+ yyerror(parse_script, "imapflags MUST be enabled with \"require\"");
 YYERROR;
 }
- if (!verify_stringlist($2, verify_flag)) {
+ if (!verify_stringlist(parse_script, $2, verify_flag)) {
 YYERROR; /* vf should call yyerror() */
 }
 $$ = new_command(ADDFLAG);
 $$->u.sl = $2; }
 | REMOVEFLAG stringlist { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
+ yyerror(parse_script, "imapflags MUST be enabled with \"require\"");
 YYERROR;
 }
- if (!verify_stringlist($2, verify_flag)) {
+ if (!verify_stringlist(parse_script, $2, verify_flag)) {
 YYERROR; /* vf should call yyerror() */
 }
 $$ = new_command(REMOVEFLAG);
 $$->u.sl = $2; }
 | MARK { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
+ yyerror(parse_script, "imapflags MUST be enabled with \"require\"");
 YYERROR;
 }
 $$ = new_command(MARK); }
 | UNMARK { if (!parse_script->support.imapflags) {
- yyerror("imapflags MUST be enabled with \"require\"");
+ yyerror(parse_script, "imapflags MUST be enabled with \"require\"");
 YYERROR;
 }
 $$ = new_command(UNMARK); }
 
 | NOTIFY ntags { if (!parse_script->support.notify) {
-				 yyerror("notify MUST be enabled with \"require\"");
+				 yyerror(parse_script, "notify MUST be enabled with \"require\"");
 				 $$ = new_command(NOTIFY); 
 				 YYERROR;
 	 			 } else {
@@ -329,65 +345,75 @@
 				 canon_ntags($2));
 				 } }
 | DENOTIFY dtags { if (!parse_script->support.notify) {
- yyerror("notify MUST be enabled with \"require\"");
+ yyerror(parse_script, "notify MUST be enabled with \"require\"");
 				 $$ = new_command(DENOTIFY);
 				 YYERROR;
 				 } else {
 					$$ = build_denotify(DENOTIFY, canon_dtags($2));
 					if ($$ == NULL) { 
-			yyerror("unable to find a compatible comparator");
+			yyerror(parse_script, "unable to find a compatible comparator");
 			YYERROR; } } }
 
-	 | INCLUDE location STRING { if (!parse_script->support.include) {
-				 yyerror("include MUST be enabled with \"require\"");
+	 | INCLUDE itags STRING { if (!parse_script->support.include) {
+				 yyerror(parse_script, "include MUST be enabled with \"require\"");
 	 YYERROR;
 }
-	 $$ = new_command(INCLUDE);
-				 $$->u.inc.location = $2;
 				 int i;
-				 for (i=0; $3i != '\0'; i++)
+				 for (i = 0; $3i != '\0'; i++) {
 				 if ($3i == '/') {
-				 yyerror("included script name must not contain slash"); YYERROR;
+				 yyerror(parse_script, "included script name must not contain slash"); YYERROR;
 				 break;
 				 }
-				 $$->u.inc.script = $3; }
+				 }
+				 $$ = build_include(INCLUDE, $2, $3);
+				 }
 | RETURN		 { if (!parse_script->support.include) {
- yyerror("include MUST be enabled with \"require\"");
+ yyerror(parse_script, "include MUST be enabled with \"require\"");
 YYERROR;
 }
 $$ = new_command(RETURN); }
 	;
 
-location: /* empty */		 { $$ = PERSONAL; }
-	| PERSONAL		 { $$ = PERSONAL; }
-	| GLOBAL		 { $$ = GLOBAL; }
+itags: /* empty */		 { $$ = new_itags(); }
+	| itags PERSONAL	 { if ($$->location != -1) {
+				 yyerror(parse_script, "duplicate location (:personal or :global)"); YYERROR; }
+				 else { $$->location = PERSONAL; }}
+	| itags GLOBAL	 { if ($$->location != -1) {
+				 yyerror(parse_script, "duplicate location (:personal or :global)"); YYERROR; }
+				 else { $$->location = GLOBAL; }}
+	| itags ONCE		 { if ($$->once != -1) {
+				 yyerror(parse_script, "duplicate :once"); YYERROR; }
+				 else { $$->once = 1; }}
+	| itags OPTIONAL	{ if ($$->optional != -1) {
+				 yyerror(parse_script, "duplicate :optional"); YYERROR; }
+				 else { $$->optional = 1; }}
 	;
 
 ntags: /* empty */		 { $$ = new_ntags(); }
 	| ntags ID STRING	 { if ($$->id != NULL) { 
-					yyerror("duplicate :method"); YYERROR; }
+					yyerror(parse_script, "duplicate :method"); YYERROR; }
 				 else { $$->id = $3; } }
 	| ntags METHOD STRING	 { if ($$->method != NULL) { 
-					yyerror("duplicate :method"); YYERROR; }
+					yyerror(parse_script, "duplicate :method"); YYERROR; }
 				 else { $$->method = $3; } }
 	| ntags OPTIONS stringlist { if ($$->options != NULL) { 
-					yyerror("duplicate :options"); YYERROR; }
+					yyerror(parse_script, "duplicate :options"); YYERROR; }
 				 else { $$->options = $3; } }
 | ntags priority	 { if ($$->priority != -1) { 
- yyerror("duplicate :priority"); YYERROR; }
+ yyerror(parse_script, "duplicate :priority"); YYERROR; }
 else { $$->priority = $2; } }
 	| ntags MESSAGE STRING	 { if ($$->message != NULL) { 
-					yyerror("duplicate :message"); YYERROR; }
+					yyerror(parse_script, "duplicate :message"); YYERROR; }
 				 else { $$->message = $3; } }
 	;
 
 dtags: /* empty */		 { $$ = new_dtags(); }
 	| dtags priority	 { if ($$->priority != -1) { 
-				yyerror("duplicate priority level"); YYERROR; }
+				yyerror(parse_script, "duplicate priority level"); YYERROR; }
 				 else { $$->priority = $2; } }
 	| dtags comptag STRING 	 { if ($$->comptag != -1)
 	 { 
-					 yyerror("duplicate comparator type tag"); YYERROR;
+					 yyerror(parse_script, "duplicate comparator type tag"); YYERROR;
 				 }
 	 $$->comptag = $2;
 #ifdef ENABLE_REGEX
@@ -395,16 +421,16 @@
 				 {
 				 int cflags = REG_EXTENDED |
 					 REG_NOSUB | REG_ICASE;
-				 if (!verify_regex($3, cflags)) { YYERROR; }
+				 if (!verify_regex(parse_script, $3, cflags)) { YYERROR; }
 				 }
 #endif
 				 $$->pattern = $3;
 	 }
 	| dtags relcomp STRING { $$ = $1;
 				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2;
-				 $$->relation = verify_relat($3);
+				 $$->relation = verify_relat(parse_script, $3);
 				 if ($$->relation==-1) 
 				 {YYERROR; /*vr called yyerror()*/ }
 				 } }
@@ -416,47 +442,63 @@
 ;
 
 vtags: /* empty */		 { $$ = new_vtags(); }
-	| vtags DAYS NUMBER	 { if ($$->days != -1) { 
-					yyerror("duplicate :days"); YYERROR; }
-				 else { $$->days = $3; } }
-	| vtags ADDRESSES stringlist { if ($$->addresses != NULL) { 
-					yyerror("duplicate :addresses"); 
+	| vtags DAYS NUMBER	 { if ($$->seconds != -1) {
+					yyerror(parse_script, "duplicate :days or :seconds"); YYERROR; }
+				 else { $$->seconds = $3 * DAY2SEC; } }
+	| vtags SECONDS NUMBER	 { if (!parse_script->support.vacation_seconds) {
+				 yyerror(parse_script, "vacation-seconds not required");
+				 YYERROR;
+				 }
+				 if ($$->seconds != -1) {
+					yyerror(parse_script, "duplicate :days or :seconds"); YYERROR; }
+				 else { $$->seconds = $3; } }
+	| vtags ADDRESSES stringlist { if ($$->addresses != NULL) {
+					yyerror(parse_script, "duplicate :addresses");
 					YYERROR;
-				 } else if (!verify_stringlist($3,
+				 } else if (!verify_stringlist(parse_script, $3,
 							verify_address)) {
 					 YYERROR;
 				 } else {
 					 $$->addresses = $3; } }
 	| vtags SUBJECT STRING	 { if ($$->subject != NULL) { 
-					yyerror("duplicate :subject"); 
+					yyerror(parse_script, "duplicate :subject");
 					YYERROR;
-				 } else if (!verify_utf8($3)) {
+				 } else if (!verify_utf8(parse_script, $3)) {
 				 YYERROR; /* vu should call yyerror() */
 				 } else { $$->subject = $3; } }
 	| vtags FROM STRING	 { if ($$->from != NULL) { 
-					yyerror("duplicate :from"); 
+					yyerror(parse_script, "duplicate :from");
 					YYERROR;
-				 } else if (!verify_address($3)) {
+				 } else if (!verify_address(parse_script, $3)) {
 				 YYERROR; /* vu should call yyerror() */
 				 } else { $$->from = $3; } }
 	| vtags HANDLE STRING	 { if ($$->handle != NULL) { 
-					yyerror("duplicate :handle"); 
+					yyerror(parse_script, "duplicate :handle");
 					YYERROR;
-				 } else if (!verify_utf8($3)) {
+				 } else if (!verify_utf8(parse_script, $3)) {
 				 YYERROR; /* vu should call yyerror() */
 				 } else { $$->handle = $3; } }
 	| vtags MIME		 { if ($$->mime != -1) { 
-					yyerror("duplicate :mime"); 
+					yyerror(parse_script, "duplicate :mime");
 					YYERROR; }
 				 else { $$->mime = MIME; } }
 	;
 
-stringlist: '' strings '' { $$ = sl_reverse($2); }
-	| STRING		 { $$ = new_sl($1, NULL); }
+stringlist: '' strings '' { $$ = $2; }
+	| STRING		 {
+				 $$ = strarray_new();
+				 strarray_appendm($$, $1);
+				 }
 	;
 
-strings: STRING			 { $$ = new_sl($1, NULL); }
-	| strings ',' STRING	 { $$ = new_sl($3, $1); }
+strings: STRING			 {
+				 $$ = strarray_new();
+				 strarray_appendm($$, $1);
+				 }
+	| strings ',' STRING	 {
+				 $$ = $1;
+				 strarray_appendm($$, $3);
+				 }
 	;
 
 block: '{' commands '}'		 { $$ = $2; }
@@ -470,10 +512,10 @@
 	| STRUE			 { $$ = new_test(STRUE); }
 	| HEADER htags stringlist stringlist
 				 {
-				 if (!verify_stringlist($3, verify_header)) {
+				 if (!verify_stringlist(parse_script, $3, verify_header)) {
 					 YYERROR; /* vh should call yyerror() */
 				 }
-				 if (!verify_stringlist($4, verify_utf8)) {
+				 if (!verify_stringlist(parse_script, $4, verify_utf8)) {
 					 YYERROR; /* vu should call yyerror() */
 				 }
 				 
@@ -481,13 +523,13 @@
 #ifdef ENABLE_REGEX
 				 if ($2->comptag == REGEX)
 				 {
-					 if (!(verify_regexs($4, $2->comparator)))
+					 if (!(verify_regexs(parse_script, $4, $2->comparator)))
 					 { YYERROR; }
 				 }
 #endif
 				 $$ = build_header(HEADER, $2, $3, $4);
 				 if ($$ == NULL) { 
-					 yyerror("unable to find a compatible comparator");
+					 yyerror(parse_script, "unable to find a compatible comparator");
 					 YYERROR; } 
 				 }
 
@@ -495,33 +537,33 @@
 | addrorenv aetags stringlist stringlist
 				 { 
 				 if (($1 == ADDRESS) &&
-					 !verify_stringlist($3, verify_addrheader))
+					 !verify_stringlist(parse_script, $3, verify_addrheader))
 					 { YYERROR; }
 				 else if (($1 == ENVELOPE) &&
-					 !verify_stringlist($3, verify_envelope))
+					 !verify_stringlist(parse_script, $3, verify_envelope))
 					 { YYERROR; }
 				 $2 = canon_aetags($2);
 #ifdef ENABLE_REGEX
 				 if ($2->comptag == REGEX)
 				 {
-					 if (!( verify_regexs($4, $2->comparator)))
+					 if (!( verify_regexs(parse_script, $4, $2->comparator)))
 					 { YYERROR; }
 				 }
 #endif
 				 $$ = build_address($1, $2, $3, $4);
 				 if ($$ == NULL) { 
-					 yyerror("unable to find a compatible comparator");
+					 yyerror(parse_script, "unable to find a compatible comparator");
 					 YYERROR; } 
 				 }
 
 	| BODY btags stringlist
 				 {
 				 if (!parse_script->support.body) {
- yyerror("body MUST be enabled with \"require\"");
+ yyerror(parse_script, "body MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 					
-				 if (!verify_stringlist($3, verify_utf8)) {
+				 if (!verify_stringlist(parse_script, $3, verify_utf8)) {
 					 YYERROR; /* vu should call yyerror() */
 				 }
 				 
@@ -529,13 +571,13 @@
 #ifdef ENABLE_REGEX
 				 if ($2->comptag == REGEX)
 				 {
-					 if (!(verify_regexs($3, $2->comparator)))
+					 if (!(verify_regexs(parse_script, $3, $2->comparator)))
 					 { YYERROR; }
 				 }
 #endif
 				 $$ = build_body(BODY, $2, $3);
 				 if ($$ == NULL) { 
-					 yyerror("unable to find a compatible comparator");
+					 yyerror(parse_script, "unable to find a compatible comparator");
 					 YYERROR; } 
 				 }
 
@@ -548,7 +590,7 @@
 
 addrorenv: ADDRESS		 { $$ = ADDRESS; }
 	| ENVELOPE		 {if (!parse_script->support.envelope)
-	 {yyerror("envelope MUST be enabled with \"require\""); YYERROR;}
+	 {yyerror(parse_script, "envelope MUST be enabled with \"require\""); YYERROR;}
 	 else{$$ = ENVELOPE; }
 	 }
 
@@ -556,28 +598,28 @@
 
 aetags: /* empty */ { $$ = new_aetags(); }
 | aetags addrparttag	 { $$ = $1;
-				 if ($$->addrtag != -1) { 
-			yyerror("duplicate or conflicting address part tag");
+				 if ($$->addrtag != -1) {
+			yyerror(parse_script, "duplicate or conflicting address part tag");
 			YYERROR; }
 				 else { $$->addrtag = $2; } }
 	| aetags comptag { $$ = $1;
-				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+				 if ($$->comptag != -1) {
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2; } }
 	| aetags relcomp STRING{ $$ = $1;
-				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+				 if ($$->comptag != -1) {
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2;
-				 $$->relation = verify_relat($3);
-				 if ($$->relation==-1) 
+				 $$->relation = verify_relat(parse_script, $3);
+				 if ($$->relation==-1)
 				 {YYERROR; /*vr called yyerror()*/ }
 				 } }
 | aetags COMPARATOR STRING { $$ = $1;
-	if ($$->comparator != NULL) { 
-			yyerror("duplicate comparator tag"); YYERROR; }
+				 if ($$->comparator != NULL) {
+				 yyerror(parse_script, "duplicate comparator tag"); YYERROR; }
 				 else if (!strcmp($3, "i;ascii-numeric") &&
 					 !parse_script->support.i_ascii_numeric) {
-			yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\"");
+			yyerror(parse_script, "comparator-i;ascii-numeric MUST be enabled with \"require\"");
 			YYERROR; }
 				 else { $$->comparator = $3; } }
 	;
@@ -585,22 +627,22 @@
 htags: /* empty */		 { $$ = new_htags(); }
 	| htags comptag		 { $$ = $1;
 				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2; } }
 	| htags relcomp STRING { $$ = $1;
 				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2;
-				 $$->relation = verify_relat($3);
+				 $$->relation = verify_relat(parse_script, $3);
 				 if ($$->relation==-1) 
 				 {YYERROR; /*vr called yyerror()*/ }
 				 } }
 	| htags COMPARATOR STRING { $$ = $1;
 				 if ($$->comparator != NULL) { 
-			 yyerror("duplicate comparator tag"); YYERROR; }
+			 yyerror(parse_script, "duplicate comparator tag"); YYERROR; }
 				 else if (!strcmp($3, "i;ascii-numeric") &&
 					 !parse_script->support.i_ascii_numeric) { 
-			 yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
+			 yyerror(parse_script, "comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
 				 else { 
 				 $$->comparator = $3; } }
 ;
@@ -608,17 +650,17 @@
 btags: /* empty */		 { $$ = new_btags(); }
 | btags RAW	 	 { $$ = $1;
 				 if ($$->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
+			yyerror(parse_script, "duplicate or conflicting transform tag");
 			YYERROR; }
 				 else { $$->transform = RAW; } }
 | btags TEXT	 	 { $$ = $1;
 				 if ($$->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
+			yyerror(parse_script, "duplicate or conflicting transform tag");
 			YYERROR; }
 				 else { $$->transform = TEXT; } }
 | btags CONTENT stringlist { $$ = $1;
 				 if ($$->transform != -1) {
-			yyerror("duplicate or conflicting transform tag");
+			yyerror(parse_script, "duplicate or conflicting transform tag");
 			YYERROR; }
 				 else {
 				 $$->transform = CONTENT;
@@ -626,22 +668,22 @@
 				 } }
 	| btags comptag		 { $$ = $1;
 				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2; } }
 	| btags relcomp STRING { $$ = $1;
 				 if ($$->comptag != -1) { 
-			yyerror("duplicate comparator type tag"); YYERROR; }
+			yyerror(parse_script, "duplicate comparator type tag"); YYERROR; }
 				 else { $$->comptag = $2;
-				 $$->relation = verify_relat($3);
+				 $$->relation = verify_relat(parse_script, $3);
 				 if ($$->relation==-1) 
 				 {YYERROR; /*vr called yyerror()*/ }
 				 } }
 	| btags COMPARATOR STRING { $$ = $1;
 				 if ($$->comparator != NULL) { 
-			 yyerror("duplicate comparator tag"); YYERROR; }
+			 yyerror(parse_script, "duplicate comparator tag"); YYERROR; }
 				 else if (!strcmp($3, "i;ascii-numeric") &&
 					 !parse_script->support.i_ascii_numeric) { 
-			 yyerror("comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
+			 yyerror(parse_script, "comparator-i;ascii-numeric MUST be enabled with \"require\""); YYERROR; }
 				 else { 
 				 $$->comparator = $3; } }
 ;
@@ -651,12 +693,12 @@
 	| LOCALPART		 { $$ = LOCALPART; }
 	| DOMAIN { $$ = DOMAIN; }
 	| USER { if (!parse_script->support.subaddress) {
-				 yyerror("subaddress MUST be enabled with \"require\"");
+				 yyerror(parse_script, "subaddress MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 				 $$ = USER; } 
 	| DETAIL { if (!parse_script->support.subaddress) {
-				 yyerror("subaddress MUST be enabled with \"require\"");
+				 yyerror(parse_script, "subaddress MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 				 $$ = DETAIL; }
@@ -665,19 +707,19 @@
 	| CONTAINS		 { $$ = CONTAINS; }
 	| MATCHES		 { $$ = MATCHES; }
 	| REGEX			 { if (!parse_script->support.regex) {
-				 yyerror("regex MUST be enabled with \"require\"");
+				 yyerror(parse_script, "regex MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 				 $$ = REGEX; }
 	;
 
 relcomp: COUNT			 { if (!parse_script->support.relational) {
-				 yyerror("relational MUST be enabled with \"require\"");
+				 yyerror(parse_script, "relational MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 				 $$ = COUNT; }
 	| VALUE			 { if (!parse_script->support.relational) {
-				 yyerror("relational MUST be enabled with \"require\"");
+				 yyerror(parse_script, "relational MUST be enabled with \"require\"");
 				 YYERROR;
 				 }
 				 $$ = VALUE; }
@@ -690,7 +732,7 @@
 
 copy: /* empty */		 { $$ = 0; }
 	| COPY			 { if (!parse_script->support.copy) {
-				 yyerror("copy MUST be enabled with \"require\"");
+				 yyerror(parse_script, "copy MUST be enabled with \"require\"");
 	 YYERROR;
 }
 				 $$ = COPY; }
@@ -704,70 +746,44 @@
 	;
 
 %%
-commandlist_t *sieve_parse(sieve_script_t *script, FILE *f)
+void yyerror(sieve_script_t *parse_script, const char *msg)
 {
- commandlist_t *t;
-
- parse_script = script;
- yyrestart(f);
- if (yyparse()) {
-	t = NULL;
- } else {
-	t = ret;
- }
- ret = NULL;
- return t;
-}
-
-int yyerror(const char *msg)
-{
- extern int yylineno;
- int ret;
-
 parse_script->err++;
 if (parse_script->interp.err) {
-	ret = parse_script->interp.err(yylineno, msg, 
-				 parse_script->interp.interp_context,
-				 parse_script->script_context);
+	parse_script->interp.err(sievelineno, msg, 
+				 parse_script->interp.interp_context,
+				 parse_script->script_context);
 }
-
- return 0;
 }
 
-static char *check_reqs(stringlist_t *sl)
+static char *check_reqs(sieve_script_t *parse_script, strarray_t *sa)
 {
- stringlist_t *s;
- char *err = NULL, *p, sep = ':';
- size_t alloc = 0;
- 
- while (sl != NULL) {
-	s = sl;
-	sl = sl->next;
-
-	if (!script_require(parse_script, s->s)) {
-	 if (!err) {
-		alloc = 100;
-		p = err = xmalloc(alloc);
-		p += sprintf(p, "Unsupported feature(s) in \"require\"");
-	 }
-	 else if ((size_t) (p - err + strlen(s->s) + 5) > alloc) {
-		alloc += 100;
-		err = xrealloc(err, alloc);
-		p = err + strlen(err);
-	 }
-
-	 p += sprintf(p, "%c \"%s\"", sep, s->s);
-	 sep = ',';
+ char *s;
+ struct buf errs = BUF_INITIALIZER;
+ char *res;
+
+ while ((s = strarray_shift(sa))) {
+	if (!script_require(parse_script, s)) {
+	 if (!errs.len)
+		buf_printf(&errs, "Unsupported feature(s) in \"require\": \"%s\"", s);
+	 else
+		buf_printf(&errs, ", \"%s\"", s);
 	}
-
-	free(s->s);
 	free(s);
 }
- return err;
+ strarray_free(sa);
+
+ res = buf_release(&errs);
+ if (!res0) {
+	free(res);
+	return NULL;
+ }
+
+ return res;
 }
 
 static test_t *build_address(int t, struct aetags *ae,
-			 stringlist_t *sl, stringlist_t *pl)
+			 strarray_t *sl, strarray_t *pl)
 {
 test_t *ret = new_test(t);	/* can be either ADDRESS or ENVELOPE */
 
@@ -787,7 +803,7 @@
 }
 
 static test_t *build_header(int t, struct htags *h,
-			 stringlist_t *sl, stringlist_t *pl)
+			 strarray_t *sl, strarray_t *pl)
 {
 test_t *ret = new_test(t);	/* can be HEADER */
 
@@ -804,7 +820,7 @@
 return ret;
 }
 
-static test_t *build_body(int t, struct btags *b, stringlist_t *pl)
+static test_t *build_body(int t, struct btags *b, strarray_t *pl)
 {
 test_t *ret = new_test(t);	/* can be BODY */
 
@@ -833,7 +849,7 @@
 	ret->u.v.subject = v->subject; v->subject = NULL;
 	ret->u.v.from = v->from; v->from = NULL;
 	ret->u.v.handle = v->handle; v->handle = NULL;
-	ret->u.v.days = v->days;
+	ret->u.v.seconds = v->seconds;
 	ret->u.v.mime = v->mime;
 	ret->u.v.addresses = v->addresses; v->addresses = NULL;
 	free_vtags(v);
@@ -907,6 +923,26 @@
 return ret;
 }
 
+static commandlist_t *build_include(int t, struct itags *i, char* script)
+{
+ commandlist_t *ret = new_command(t);
+
+ assert(t == INCLUDE);
+
+ if (i->location == -1) i->location = PERSONAL;
+ if (i->once == -1) i->once = 0;
+ if (i->optional == -1) i->optional = 0;
+
+ if (ret) {
+	ret->u.inc.location = i->location;
+	ret->u.inc.once = i->once;
+	ret->u.inc.optional = i->optional;
+	ret->u.inc.script = script;
+	free(i);
+ }
+ return ret;
+}
+
 static struct aetags *new_aetags(void)
 {
 struct aetags *r = (struct aetags *) xmalloc(sizeof(struct aetags));
@@ -974,10 +1010,11 @@
 {
 if (b->transform == -1) { b->transform = TEXT; }
 if (b->content_types == NULL) {
+	b->content_types = strarray_new();
 	if (b->transform == RAW) {
-	 b->content_types = new_sl(xstrdup(""), NULL);
+	 strarray_append(b->content_types, "");
 	} else {
-	 b->content_types = new_sl(xstrdup("text"), NULL);
+	 strarray_append(b->content_types, "text");
 	}
 }
 if (b->offset == -1) { b->offset = 0; }
@@ -988,7 +1025,7 @@
 
 static void free_btags(struct btags *b)
 {
- if (b->content_types) { free_sl(b->content_types); }
+ if (b->content_types) { strarray_free(b->content_types); }
 free(b->comparator);
 free(b);
 }
@@ -997,7 +1034,7 @@
 {
 struct vtags *r = (struct vtags *) xmalloc(sizeof(struct vtags));
 
- r->days = -1;
+ r->seconds = -1;
 r->addresses = NULL;
 r->subject = NULL;
 r->from = NULL;
@@ -1007,15 +1044,15 @@
 return r;
 }
 
-static struct vtags *canon_vtags(struct vtags *v)
+static struct vtags *canon_vtags(sieve_script_t *parse_script, struct vtags *v)
 {
 assert(parse_script->interp.vacation != NULL);
 
- if (v->days == -1) { v->days = 7; }
- if (v->days < parse_script->interp.vacation->min_response) 
- { v->days = parse_script->interp.vacation->min_response; }
- if (v->days > parse_script->interp.vacation->max_response)
- { v->days = parse_script->interp.vacation->max_response; }
+ if (v->seconds == -1) { v->seconds = 7 * DAY2SEC; }
+ if (v->seconds < parse_script->interp.vacation->min_response)
+ { v->seconds = parse_script->interp.vacation->min_response; }
+ if (v->seconds > parse_script->interp.vacation->max_response)
+ { v->seconds = parse_script->interp.vacation->max_response; }
 if (v->mime == -1) { v->mime = 0; }
 
 return v;
@@ -1023,13 +1060,23 @@
 
 static void free_vtags(struct vtags *v)
 {
- if (v->addresses) { free_sl(v->addresses); }
+ if (v->addresses) { strarray_free(v->addresses); }
 if (v->subject) { free(v->subject); }
 if (v->from) { free(v->from); }
 if (v->handle) { free(v->handle); }
 free(v);
 }
 
+static struct itags *new_itags() {
+ struct itags *r = (struct itags *) xmalloc(sizeof(struct itags));
+
+ r->once = -1;
+ r->location = -1;
+ r->optional = -1;
+
+ return r;
+}
+
 static struct ntags *new_ntags(void)
 {
 struct ntags *r = (struct ntags *) xmalloc(sizeof(struct ntags));
@@ -1061,7 +1108,7 @@
 {
 if (n->method) { free(n->method); }
 if (n->id) { free(n->id); }
- if (n->options) { free_sl(n->options); }
+ if (n->options) { strarray_free(n->options); }
 if (n->message) { free(n->message); }
 free(n);
 }
@@ -1082,37 +1129,40 @@
 free(d);
 }
 
-static int verify_stringlist(stringlist_t *sl, int (*verify)(char *))
+static int verify_stringlist(sieve_script_t *parse_script, strarray_t *sa, int (*verify)(sieve_script_t*, char *))
 {
- for (; sl != NULL && verify(sl->s); sl = sl->next) ;
- return (sl == NULL);
-}
+ int i;
 
-char *addrptr;		/* pointer to address string for address lexer */
-char addrerr500;	/* buffer for address parser error messages */
+ for (i = 0 ; i < sa->count ; i++)
+	if (!verify(parse_script, sa->datai))
+	 return 0;
+ return 1;
+}
 
-static int verify_address(char *s)
+static int verify_address(sieve_script_t *parse_script, char *s)
 {
- addrptr = s;
- addrerr0 = '\0';	/* paranoia */
- if (addrparse()) {
-	snprintf(errbuf, ERR_BUF_SIZE, 
-		 "address '%s': %s", s, addrerr);
-	yyerror(errbuf);
+ parse_script->addrerr0 = '\0';	/* paranoia */
+ YY_BUFFER_STATE buffer = addr_scan_string(s);
+ if (addrparse(parse_script)) {
+	snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
+		 "address '%s': %s", s, parse_script->addrerr);
+	yyerror(parse_script, parse_script->sieveerr);
+	addr_delete_buffer(buffer);
 	return 0;
 }
+ addr_delete_buffer(buffer);
 return 1;
 }
 
-static int verify_mailbox(char *s)
+static int verify_mailbox(sieve_script_t *parse_script, char *s)
 {
- if (!verify_utf8(s)) return 0;
+ if (!verify_utf8(parse_script, s)) return 0;
 
 /* xxx if not a mailbox, call yyerror */
 return 1;
 }
 
-static int verify_header(char *hdr)
+static int verify_header(sieve_script_t *parse_script, char *hdr)
 {
 char *h = hdr;
 
@@ -1123,9 +1173,9 @@
 	 ; controls, SP, and
 	 ; ":". */
 	if (!((*h >= 33 && *h <= 57) || (*h >= 59 && *h <= 126))) {
-	 snprintf(errbuf, ERR_BUF_SIZE,
+	 snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 		 "header '%s': not a valid header", hdr);
-	 yyerror(errbuf);
+	 yyerror(parse_script, parse_script->sieveerr);
 	 return 0;
 	}
 	h++;
@@ -1133,7 +1183,7 @@
 return 1;
 }
 
-static int verify_addrheader(char *hdr)
+static int verify_addrheader(sieve_script_t *parse_script, char *hdr)
 {
 const char **h, *hdrs = {
 	"from", "sender", "reply-to",	/* RFC2822 originator fields */
@@ -1148,19 +1198,19 @@
 };
 
 if (!config_getswitch(IMAPOPT_RFC3028_STRICT))
-	return verify_header(hdr);
+ return verify_header(parse_script, hdr);
 
 for (lcase(hdr), h = hdrs; *h; h++) {
 	if (!strcmp(*h, hdr)) return 1;
 }
 
- snprintf(errbuf, ERR_BUF_SIZE,
+ snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 	 "header '%s': not a valid header for an address test", hdr);
- yyerror(errbuf);
+ yyerror(parse_script, parse_script->sieveerr);
 return 0;
 }
 
-static int verify_envelope(char *env)
+static int verify_envelope(sieve_script_t *parse_script, char *env)
 {
 lcase(env);
 if (!config_getswitch(IMAPOPT_RFC3028_STRICT) ||
@@ -1168,13 +1218,13 @@
 	return 1;
 }
 
- snprintf(errbuf, ERR_BUF_SIZE,
+ snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 	 "env-part '%s': not a valid part for an envelope test", env);
- yyerror(errbuf);
+ yyerror(parse_script, parse_script->sieveerr);
 return 0;
 }
 
-static int verify_relat(char *r)
+static int verify_relat(sieve_script_t *parse_script, char *r)
 {/* this really should have been a token to begin with.*/
 	lcase(r);
 	if (!strcmp(r, "gt")) {return GT;}
@@ -1184,9 +1234,9 @@
 	else if (!strcmp(r, "ne")) {return NE;}
 	else if (!strcmp(r, "eq")) {return EQ;}
 	else{
-	 snprintf(errbuf, ERR_BUF_SIZE,
+	 snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 		 "flag '%s': not a valid relational operation", r);
-	 yyerror(errbuf);
+	 yyerror(parse_script, parse_script->sieveerr);
 	 return -1;
 	}
 	
@@ -1195,31 +1245,31 @@
 
 
 
-static int verify_flag(char *f)
+static int verify_flag(sieve_script_t *parse_script, char *f)
 {
 if (f0 == '\\') {
 	lcase(f);
 	if (strcmp(f, "\\seen") && strcmp(f, "\\answered") &&
 	 strcmp(f, "\\flagged") && strcmp(f, "\\draft") &&
 	 strcmp(f, "\\deleted")) {
-	 snprintf(errbuf, ERR_BUF_SIZE,
+	 snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 		 "flag '%s': not a system flag", f);
-	 yyerror(errbuf);
+	 yyerror(parse_script, parse_script->sieveerr);
 	 return 0;
 	}
 	return 1;
 }
 if (!imparse_isatom(f)) {
-	snprintf(errbuf, ERR_BUF_SIZE,
+	snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 		 "flag '%s': not a valid keyword", f);
-	yyerror(errbuf);
+	yyerror(parse_script, parse_script->sieveerr);
 	return 0;
 }
 return 1;
 }
 
 #ifdef ENABLE_REGEX
-static int verify_regex(char *s, int cflags)
+static int verify_regex(sieve_script_t *parse_script, char *s, int cflags)
 {
 int ret;
 regex_t *reg = (regex_t *) xmalloc(sizeof(regex_t));
@@ -1230,8 +1280,8 @@
 #endif
 
 if ((ret = regcomp(reg, s, cflags)) != 0) {
-	(void) regerror(ret, reg, errbuf, ERR_BUF_SIZE);
-	yyerror(errbuf);
+	(void) regerror(ret, reg, parse_script->sieveerr, ERR_BUF_SIZE);
+	yyerror(parse_script, parse_script->sieveerr);
 	free(reg);
 	return 0;
 }
@@ -1239,25 +1289,20 @@
 return 1;
 }
 
-static int verify_regexs(stringlist_t *sl, char *comp)
+static int verify_regexs(sieve_script_t *parse_script, const strarray_t *sa, char *comp)
 {
- stringlist_t *sl2;
+ int i;
 int cflags = REG_EXTENDED | REG_NOSUB;
- 
 
 if (!strcmp(comp, "i;ascii-casemap")) {
 	cflags |= REG_ICASE;
 }
 
- for (sl2 = sl; sl2 != NULL; sl2 = sl2->next) {
-	if ((verify_regex(sl2->s, cflags)) == 0) {
-	 break;
-	}
- }
- if (sl2 == NULL) {
-	return 1;
+ for (i = 0 ; i < sa->count ; i++) {
+	if ((verify_regex(parse_script, sa->datai, cflags)) == 0)
+	 return 0;
 }
- return 0;
+ return 1;
 }
 #endif
 
@@ -1272,7 +1317,7 @@
 * detect characters that have not been assigned and therefore do not
 * exist.
 */
-static int verify_utf8(char *s)
+static int verify_utf8(sieve_script_t *parse_script, char *s)
 {
 const char *buf = s;
 const char *endbuf = s + strlen(s);
@@ -1344,9 +1389,9 @@
 }
 
 if ((buf != endbuf) || trailing) {
-	snprintf(errbuf, ERR_BUF_SIZE,
+	snprintf(parse_script->sieveerr, ERR_BUF_SIZE,
 		 "string '%s': not valid utf8", s);
-	yyerror(errbuf);
+	yyerror(parse_script, parse_script->sieveerr);
 	return 0;
 }

cyrus-imapd-2.4.17.tar.gz/sieve/sieve_err.et -> cyrus-imapd-2.5.tar.gz/sieve/sieve_err.et Changed

cyrus-imapd-2.4.17.tar.gz/sieve/sieve_interface.h -> cyrus-imapd-2.5.tar.gz/sieve/sieve_interface.h Changed

@@ -38,8 +38,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieve_interface.h,v 1.23.2.1 2010/02/12 03:40:51 brong Exp $
  */
 
 #ifndef SIEVE_H
@@ -52,7 +50,8 @@
 /* error codes */
 #define SIEVE_OK (0)
 
-#include "sieve_err.h"
+#include "strarray.h"
+#include "sieve/sieve_err.h"
 
 /* external sieve types */
 typedef struct sieve_interp sieve_interp_t;
@@ -83,8 +82,8 @@
 			   sieve_bodypart_t ***parts);
 
 typedef struct sieve_vacation {
-    int min_response;		/* 0 -> defaults to 3 */
-    int max_response;		/* 0 -> defaults to 90 */
+    int min_response;		/* 0 -> defaults to 3 days */
+    int max_response;		/* 0 -> defaults to 90 days */
 
     /* given a hash, say whether we've already responded to it in the last
        days days.  return SIEVE_OK if we SHOULD autorespond (have not already)
@@ -95,10 +94,8 @@
     sieve_callback *send_response;
 } sieve_vacation_t;
 
-typedef struct sieve_imapflags {
-    char **flag;		/* NULL -> defaults to \flagged */
-    int nflags;
-} sieve_imapflags_t;
+
+/* sieve_imapflags: NULL -> defaults to \flagged */
 
 typedef struct sieve_redirect_context {
     const char *addr;
@@ -110,11 +107,11 @@
 
 typedef struct sieve_fileinto_context {
     const char *mailbox;
-    sieve_imapflags_t *imapflags;
+    strarray_t *imapflags;
 } sieve_fileinto_context_t;
 
 typedef struct sieve_keep_context {
-    sieve_imapflags_t *imapflags;
+    strarray_t *imapflags;
 } sieve_keep_context_t;
 
 typedef struct sieve_notify_context {
@@ -128,7 +125,7 @@
 
 typedef struct sieve_autorespond_context {
     unsigned char hashSIEVE_HASHLEN;
-    int days;
+    int seconds;
 } sieve_autorespond_context_t;
 
 typedef struct sieve_send_response_context {
@@ -140,36 +137,36 @@
 } sieve_send_response_context_t;
 
 /* build a sieve interpretor */
-int sieve_interp_alloc(sieve_interp_t **interp, void *interp_context);
+sieve_interp_t *sieve_interp_alloc(void *interp_context);
 int sieve_interp_free(sieve_interp_t **interp);
 
 /* add the callbacks for actions. undefined behavior results if these
    are called after sieve_script_parse is called! */
-int sieve_register_redirect(sieve_interp_t *interp, sieve_callback *f);
-int sieve_register_discard(sieve_interp_t *interp, sieve_callback *f);
-int sieve_register_reject(sieve_interp_t *interp, sieve_callback *f);
-int sieve_register_fileinto(sieve_interp_t *interp, sieve_callback *f);
-int sieve_register_keep(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_redirect(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_discard(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_reject(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_fileinto(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_keep(sieve_interp_t *interp, sieve_callback *f);
 int sieve_register_vacation(sieve_interp_t *interp, sieve_vacation_t *v);
-int sieve_register_imapflags(sieve_interp_t *interp, sieve_imapflags_t *mark);
-int sieve_register_notify(sieve_interp_t *interp, sieve_callback *f);
-int sieve_register_include(sieve_interp_t *interp, sieve_get_include *f);
+void sieve_register_imapflags(sieve_interp_t *interp, const strarray_t *mark);
+void sieve_register_notify(sieve_interp_t *interp, sieve_callback *f);
+void sieve_register_include(sieve_interp_t *interp, sieve_get_include *f);
 
 /* add the callbacks for messages. again, undefined if used after
    sieve_script_parse */
-int sieve_register_size(sieve_interp_t *interp, sieve_get_size *f);
-int sieve_register_header(sieve_interp_t *interp, sieve_get_header *f);
-int sieve_register_envelope(sieve_interp_t *interp, sieve_get_envelope *f);
-int sieve_register_body(sieve_interp_t *interp, sieve_get_body *f);
+void sieve_register_size(sieve_interp_t *interp, sieve_get_size *f);
+void sieve_register_header(sieve_interp_t *interp, sieve_get_header *f);
+void sieve_register_envelope(sieve_interp_t *interp, sieve_get_envelope *f);
+void sieve_register_body(sieve_interp_t *interp, sieve_get_body *f);
 
 typedef int sieve_parse_error(int lineno, const char *msg, 
 			      void *interp_context,
 			      void *script_context);
-int sieve_register_parse_error(sieve_interp_t *interp, sieve_parse_error *f);
+void sieve_register_parse_error(sieve_interp_t *interp, sieve_parse_error *f);
 
 typedef int sieve_execute_error(const char *msg, void *interp_context,
 				void *script_context, void *message_context);
-int sieve_register_execute_error(sieve_interp_t *interp, 
+void sieve_register_execute_error(sieve_interp_t *interp, 
 				 sieve_execute_error *f);
  
 /* given an interpretor and a script, produce an executable script */
@@ -183,7 +180,7 @@
 int sieve_script_unload(sieve_execute_t **s);
 
 /* Free a sieve_script_t */
-int sieve_script_free(sieve_script_t **s);
+void sieve_script_free(sieve_script_t **s);
 
 /* execute bytecode on a message */
 int sieve_execute_bytecode(sieve_execute_t *script, sieve_interp_t *interp,

cyrus-imapd-2.4.17.tar.gz/sieve/sievec.c -> cyrus-imapd-2.5.tar.gz/sieve/sievec.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sievec.c,v 1.10 2010/01/06 17:01:59 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -54,6 +52,8 @@
 #include "xmalloc.h"
 
 #include "script.h"
+#include "util.h"
+#include "assert.h"
 #include <string.h> 
 #include <stdlib.h>
 #include <sys/file.h>
@@ -63,10 +63,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-/* config.c stuff */
-const int config_need_data = 0;
-
-int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
 
 #define TIMSIEVE_FAIL -1
 #define TIMSIEVE_OK 0
@@ -103,7 +100,7 @@
 }
 
 /* Load configuration file. */
- config_read(alt_config);
+ config_read(alt_config, 0);
 
 if(is_script_parsable(instream, &err, &s) == TIMSIEVE_FAIL) {
 	if(err) {
@@ -147,7 +144,7 @@
 {
 fatal("stub function called", 0);
 }
-sieve_vacation_t vacation = {
+static sieve_vacation_t vacation = {
 0,				/* min response */
 0,				/* max response */
 (sieve_callback *) &foo,	/* autorespond() */
@@ -167,18 +164,12 @@
 static int mysieve_error(int lineno, const char *msg,
 			 void *i __attribute__((unused)), void *s)
 {
- char buf1024;
- char **errstr = (char **) s;
-
- snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
- *errstr = xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
- syslog(LOG_DEBUG, "%s", buf);
- strcat(*errstr, buf);
-
+ struct buf *errors = (struct buf *)s;
+ buf_printf(errors, "line %d: %s\r\n", lineno, msg);
 return SIEVE_OK;
 }
 
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 { 
 fprintf(stderr, "Fatal error: %s (%d)\r\n", s, code);
 
@@ -187,104 +178,43 @@
 /* end the boilerplate */
 
 /* returns TRUE or FALSE */
-int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
 {
 sieve_interp_t *i;
 sieve_script_t *s;
+ struct buf errors = BUF_INITIALIZER;
 int res;
- 
- res = sieve_interp_alloc(&i, NULL);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_interp_alloc() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
-
- res = sieve_register_redirect(i, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_redirect() returns %d\n", res);
-	goto done;
- }
- res = sieve_register_discard(i, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_discard() returns %d\n", res);
-	goto done;
- }
- res = sieve_register_reject(i, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_reject() returns %d\n", res);
-	goto done;
- }
- res = sieve_register_fileinto(i, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_fileinto() returns %d\n", res);
-	goto done;
- }
- res = sieve_register_keep(i, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_keep() returns %d\n", res);
-	goto done;
- }
 
- res = sieve_register_imapflags(i, NULL);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_imapflags() returns %d\n", res);
-	goto done;
- }
+ i = sieve_interp_alloc(NULL);
+ assert(i != NULL);
+
+ sieve_register_redirect(i, (sieve_callback *) &foo);
+ sieve_register_discard(i, (sieve_callback *) &foo);
+ sieve_register_reject(i, (sieve_callback *) &foo);
+ sieve_register_fileinto(i, (sieve_callback *) &foo);
+ sieve_register_keep(i, (sieve_callback *) &foo);
+ sieve_register_imapflags(i, NULL);
+ sieve_register_size(i, (sieve_get_size *) &foo);
+ sieve_register_header(i, (sieve_get_header *) &foo);
+ sieve_register_envelope(i, (sieve_get_envelope *) &foo);
+ sieve_register_body(i, (sieve_get_body *) &foo);
+ sieve_register_include(i, (sieve_get_include *) &foo);
 
- res = sieve_register_size(i, (sieve_get_size *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_size() returns %d\n", res);
-	goto done;
- }
- 
- res = sieve_register_header(i, (sieve_get_header *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_header() returns %d\n", res);
-	goto done;
- }
- 
- res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_envelope() returns %d\n", res);
-	goto done;
- }
- 
- res = sieve_register_body(i, (sieve_get_body *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_body() returns %d\n", res);
-	goto done;
- }
- 
- res = sieve_register_include(i, (sieve_get_include *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_include() returns %d\n", res);
-	goto done;
- }
- 
 res = sieve_register_vacation(i, &vacation);
 if (res != SIEVE_OK) {
 	syslog(LOG_ERR, "sieve_register_vacation() returns %d\n", res);
 	goto done;
 }
 
- res = sieve_register_notify(i, &sieve_notify);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_notify() returns %d\n", res);
-	goto done;
- }
-
- res = sieve_register_parse_error(i, &mysieve_error);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_parse_error() returns %d\n", res);
-	goto done;
- }
+ sieve_register_notify(i, &sieve_notify);
+ sieve_register_parse_error(i, &mysieve_error);
 
 rewind(stream);
 
- *errstr = (char *) xmalloc(20 * sizeof(char));
- strcpy(*errstr, "script errors:\r\n");
+ buf_appendcstr(&errors, "script errors:\r\n");
+ *errstr = NULL;
 
- res = sieve_script_parse(i, stream, errstr, &s);
+ res = sieve_script_parse(i, stream, &errors, &s);
 
 if (res == SIEVE_OK) {
 	if(ret) {
@@ -292,9 +222,12 @@
 	} else {
 	 sieve_script_free(&s);
 	}
-	free(*errstr);
-	*errstr = NULL;
 }
+ else {
+	sieve_script_free(&s);
+	*errstr = buf_release(&errors);
+ }
+ buf_free(&errors);
 
 done:
 /* free interpreter */

cyrus-imapd-2.4.17.tar.gz/sieve/sieved.c -> cyrus-imapd-2.5.tar.gz/sieve/sieved.c Changed

@@ -39,8 +39,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: sieved.c,v 1.10 2010/01/06 17:01:59 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -63,9 +61,6 @@
 
 #include "map.h"
 
-/* config.c stuff */
-const int config_need_data = 0;
-
 static void dump2(bytecode_input_t *d, int len);
 static int dump2_test(bytecode_input_t * d, int i);
 
@@ -73,7 +68,7 @@
 int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len);
 
 /*this is called by xmalloc*/
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 { 
 fprintf(stderr, "Fatal error: %s (%d)\r\n", s, code);
 
@@ -84,7 +79,7 @@
 { 
 const char * data=NULL;
 struct stat sbuf;
- unsigned long len=0;
+ size_t len=0;
 
 if (fstat(fd, &sbuf) == -1) {
 	fprintf(stderr, "IOERROR: fstating sieve script: %m");
@@ -124,7 +119,7 @@
 
 len=load(script_fd,&bc);
 close(script_fd);
- 
+
 if (bc) {
 	dump2(bc, len );
 	exit(0);
@@ -356,11 +351,13 @@
 
 for(i++; i<bc_len;) 
 {
+	int op;
 	int copy = 0;
 
 	printf("%d: ",i);
 
-	switch(ntohl(di++.op)) {
+	op = ntohl(di++.op);
+	switch (op) {
 	 
 	case B_STOP:/*0*/
 	 printf("STOP\n");
@@ -459,7 +456,8 @@
 
 	 break;
 
-	case B_VACATION:/*14*/
+	case B_VACATION_ORIG:/*14*/
+	case B_VACATION:/*22*/
 	 printf("VACATION\n");
 	 /*add address list here!*/
 	 i=write_list(ntohl(di.len),i+1,d);
@@ -472,7 +470,7 @@
 
 	 printf("%d MESG({%d}%s) \n", i, len, (!data ? "nil" : data));
 
-	 printf("DAYS(%d) MIME(%d)\n", ntohl(di.value), ntohl(di+1.value));
+	 printf("SECONDS(%d) MIME(%d)\n", ntohl(di.value) * (op == B_VACATION ? 1: 24 * 60 * 60 /* 1 day */), ntohl(di+1.value));
 	 i+=2;
 
 	 if (version >= 0x05) {
@@ -496,10 +494,13 @@
 
 	case B_INCLUDE:/*17*/
 	 printf("INCLUDE ");
-	 switch (ntohl(di.value)) {
+	 switch (ntohl(di.value) & 63) {
 	 case B_PERSONAL: printf("Personal"); break;
 	 case B_GLOBAL: printf("Global"); break;
 	 }
+	 printf(" once:%s optional:%s",
+		ntohl(di.value) & 64 ? "yes" : "no",
+		ntohl(di.value) & 128 ? "yes" : "no");
 	 i = unwrap_string(d, i+1, &data, &len);
 	 printf(" {%d}%s\n", len, data);
 	 break;

cyrus-imapd-2.4.17.tar.gz/sieve/test.c -> cyrus-imapd-2.5.tar.gz/sieve/test.c Changed

@@ -1,6 +1,6 @@
 /*NEW
 
- * test.c -- tester for libsieve
+ * test.c -- tester for libcyrus_sieve
 * Larry Greenfield
 *
 * usage: "test message script"
@@ -44,8 +44,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: test.c,v 1.31 2010/01/06 17:02:00 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -56,66 +54,39 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include "assert.h"
 #include "sieve_interface.h"
 #include "bytecode.h"
 #include "comparator.h"
 #include "tree.h"
-#include "sieve.h"
+#include "sieve/sieve.h"
 #include "imap/message.h"
 #include "util.h"
+#include "xmalloc.h"
 #include "xstrlcat.h"
 #include "xstrlcpy.h"
+#include "hash.h"
+#include "times.h"
 
-/* XXX so we can link against imap/message.o */
-unsigned mailbox_cached_header_inline(const char *text __attribute__((unused)))
-{ return BIT32_MAX; }
-void message_guid_generate(struct message_guid *guid __attribute__((unused)),
-			 const char *msg_base __attribute__((unused)),
-			 unsigned long msg_len __attribute__((unused)))
-{ return; }
-void message_guid_copy(struct message_guid *dst __attribute__((unused)),
-		 struct message_guid *src __attribute__((unused)))
-{ return; }
-int message_guid_isnull(struct message_guid *guid __attribute__((unused)))
-{ return 0; }
-
-#define HEADERCACHESIZE 1019
-
-typedef struct Header {
- char *name;
- int ncontents;
- char *contents1;
-} header_t;
+static char vacation_answer;
 
-typedef struct message_data {
+typedef struct {
 char *name;
 FILE *data;
 int size;
 struct message_content content;
 
 int cache_full;
- header_t *cacheHEADERCACHESIZE;
+ struct hash_table cache;
+ strarray_t *env_from;
+ strarray_t *env_to;
 } message_data_t;
 
-int hashheader(char *header)
-{
- int x = 0;
- /* any CHAR except ' ', :, or a ctrl char */
- for (; !Uiscntrl(*header) && (*header != ' ') && (*header != ':'); 
-	 header++) {
-	x *= 256;
-	x += *header;
-	x %= HEADERCACHESIZE;
- }
- return x;
-}
-
 /* take a list of headers, pull the first one out and return it in
 name and contents.
 
@@ -128,12 +99,15 @@
 HDR_CONTENT
 } state;
 
-int parseheader(FILE *f, char **headname, char **contents) {
+static int parseheader(FILE *f, char **headname, char **contents)
+{
 char c;
- char name80, body1024;
- int off = 0;
+ static struct buf name = BUF_INITIALIZER;
+ static struct buf body = BUF_INITIALIZER;
 state s = HDR_NAME_START;
 
+ buf_reset(&name);
+ buf_reset(&body);
 
 /* there are two ways out of this loop, both via gotos:
 either we successfully read a character (got_header)
@@ -147,23 +121,22 @@
 	 }
 	 if (!isalpha(c))
 		goto ph_error;
-	 name0 = tolower(c);
-	 off = 1;
+	 buf_putc(&name, TOLOWER(c));
 	 s = HDR_NAME;
 	 break;
 
 	case HDR_NAME:
 	 if (c == ' ' || c == '\t' || c == ':') {
-		nameoff = '\0';
+		buf_cstring(&name);
 		s = (c == ':' ? HDR_CONTENT_START : COLON);
 		break;
 	 }
 	 if (iscntrl(c)) {
 		goto ph_error;
 	 }
-	 nameoff++ = tolower(c);
+	 buf_putc(&name, TOLOWER(c));
 	 break;
-	
+
 	case COLON:
 	 if (c == ':') {
 		s = HDR_CONTENT_START;
@@ -175,7 +148,7 @@
 	case HDR_CONTENT_START:
 	 if (c == ' ' || c == '\t') /* eat the whitespace */
 		break;
-	 off = 0;
+	 buf_reset(&body);
 	 s = HDR_CONTENT;
 	 /* falls through! */
 	case HDR_CONTENT:
@@ -190,7 +163,7 @@
 		}
 		if (c != ' ' && c != '\t') {
 		 /* this is the end of the header */
-		 bodyoff = '\0';
+		 buf_cstring(&body);
 		 ungetc(c, f);
 		 goto got_header;
 		}
@@ -203,7 +176,7 @@
 		 */
 	 }
 	 /* just an ordinary character */
-	 bodyoff++ = c;
+	 buf_putc(&body, c);
 	 break;
 	}
 }
@@ -217,76 +190,58 @@
 return -1;
 
 got_header:
- if (headname != NULL) *headname = strdup(name);
- if (contents != NULL) *contents = strdup(body);
+ if (headname != NULL) *headname = xstrdup(name.s);
+ if (contents != NULL) *contents = xstrdup(body.s);
 
 return 0;
 }
 
-void fill_cache(message_data_t *m)
+static void fill_cache(message_data_t *m)
 {
 rewind(m->data);
 
 /* let's fill that header cache */
 for (;;) {
 	char *name, *body;
-	int cl, clinit;
+	strarray_t *contents;
 
 	if (parseheader(m->data, &name, &body) < 0) {
 	 break;
 	}
 	/* put it in the hash table */
-	clinit = cl = hashheader(name);
-	while (m->cachecl != NULL && strcmp(name, m->cachecl->name)) {
-	 cl++;		/* resolve collisions linearly */
-	 cl %= HEADERCACHESIZE;
-	 if (cl == clinit) break; /* gone all the way around, so bail */
-	}
-
-	/* found where to put it, so insert it into a list */
-	if (m->cachecl) {
-	 /* add this body on */
-
-	 m->cachecl->contentsm->cachecl->ncontents++ = body;
-
-	 /* whoops, won't have room for the null at the end! */
-	 if (!(m->cachecl->ncontents % 8)) {
-		/* increase the size */
-		m->cachecl = (header_t *)
-		 realloc(m->cachecl,sizeof(header_t) +
-			 ((8 + m->cachecl->ncontents) * sizeof(char *)));
-		if (m->cachecl == NULL) {
-		 fprintf(stderr, "realloc() returned NULL\n");
-		 exit(1);
-		}
-	 }
-
-	} else {
-	 /* create a new entry in the hash table */
-	 m->cachecl = (header_t *) malloc(sizeof(header_t) + 
-					 8 * sizeof(char*));
-	 if (m->cachecl == NULL) {
-		fprintf(stderr, "malloc() returned NULL\n");
-		exit(1);
-	 }
-	 m->cachecl->name = name;
-	 m->cachecl->contents0 = body;
-	 m->cachecl->ncontents = 1;
-	}
-
-	/* we always want a NULL at the end */
-	m->cachecl->contentsm->cachecl->ncontents = NULL;
+	contents = (strarray_t *)hash_lookup(name, &m->cache);
+	if (!contents)
+	 contents = hash_insert(name, strarray_new(), &m->cache);
+	strarray_appendm(contents, body);
+	free(name);
 }
 
 m->cache_full = 1;
 }
 
+/* we use the temp field in message_data to avoid having to malloc memory
+ to return, and we also can't expose our the receipients to the message */
+static int getenvelope(void *mc, const char *field, const char ***contents)
+{
+ message_data_t *m = (message_data_t *)mc;
+
+ if (!strcasecmp(field, "from")) {
+	*contents = (const char **)m->env_from->data;
+	return SIEVE_OK;
+ } else if (!strcasecmp(field, "to")) {
+	*contents = (const char **)m->env_to->data;
+	return SIEVE_OK;
+ } else {
+	*contents = NULL;
+	return SIEVE_FAIL;
+ }
+}
+
 /* gets the header "head" from msg. */
-int getheader(void *v, const char *phead, const char ***body)
+static int getheader(void *v, const char *phead, const char ***body)
 {
 message_data_t *m = (message_data_t *) v;
- int cl, clinit;
- char *h;
+ strarray_t *contents;
 char *head;
 
 *body = NULL;
@@ -296,27 +251,13 @@
 }
 
 /* copy header parameter so we can mangle it */
- head = malloc(strlen(phead)+1);
- if (!head) return SIEVE_FAIL;
- strcpy(head, phead);
-
- h = head;
- while (*h != '\0') {
-	*h = tolower(*h);
-	h++;
- }
+ head = xstrdup(phead);
+ lcase(head);
 
 /* check the cache */
- clinit = cl = hashheader(head);
- while (m->cachecl != NULL) {
-	if (!strcmp(head, m->cachecl->name)) {
-	 *body = (const char **) m->cachecl->contents;
-	 break;
-	}
-	cl++; /* try next hash bin */
-	cl %= HEADERCACHESIZE;
-	if (cl == clinit) break; /* gone all the way around */
- }
+ contents = (strarray_t *)hash_lookup(head, &m->cache);
+ if (contents)
+	*body = (const char **) contents->data;
 
 free(head);
 
@@ -327,52 +268,39 @@
 }
 }
 
-message_data_t *new_msg(FILE *msg, int size, char *name)
+static message_data_t *new_msg(FILE *msg, int size, const char *name)
 {
- int i;
 message_data_t *m;
 
- m = (message_data_t *) malloc(sizeof(message_data_t));
- if (m == NULL) {
-	fprintf(stderr, "malloc() returned NULL\n");
-	exit(1);
- }
+ m = xmalloc(sizeof(message_data_t));
 m->data = msg;
 m->size = size;
- m->name = name;
+ m->name = xstrdup(name);
 m->content.base = NULL;
 m->content.len = 0;
 m->content.body = NULL;
- for (i = 0; i < HEADERCACHESIZE; i++) {
-	m->cachei = NULL;
- }
+ construct_hash_table(&m->cache, 1000, 0);
 m->cache_full = 0;
 
 return m;
 }
 
-int getsize(void *mc, int *size)
+static void free_msg(message_data_t *m)
 {
- message_data_t *m = (message_data_t *) mc;
-
- *size = m->size;
- return SIEVE_OK;
+ free_hash_table(&m->cache, (void(*)(void*))strarray_free);
+ free(m->name);
+ free(m);
 }
 
-int getenvelope(void *v __attribute__((unused)),
-		const char *head, const char ***body)
+static int getsize(void *mc, int *size)
 {
- static const char *buf2;
-
- if (buf0 == NULL) { buf0 = malloc(sizeof(char) * 256); buf1 = NULL; }
- printf("Envelope body of '%s'? ", head);
- scanf("%s", (char*) buf0);
- *body = buf;
+ message_data_t *m = (message_data_t *) mc;
 
+ *size = m->size;
 return SIEVE_OK;
 }
 
-int getbody(void *mc, const char **content_types, sieve_bodypart_t ***parts)
+static int getbody(void *mc, const char **content_types, sieve_bodypart_t ***parts)
 {
 message_data_t *m = (message_data_t *) mc;
 int r = 0;
@@ -390,10 +318,10 @@
 return (!r ? SIEVE_OK : SIEVE_FAIL);
 }
 
-int getinclude(void *sc __attribute__((unused)),
-	 const char *script,
-	 int isglobal __attribute__((unused)),
-	 char *fpath, size_t size)
+static int getinclude(void *sc __attribute__((unused)),
+		 const char *script,
+		 int isglobal __attribute__((unused)),
+		 char *fpath, size_t size)
 {
 strlcpy(fpath, script, size);
 strlcat(fpath, ".bc", size);
@@ -401,8 +329,8 @@
 return SIEVE_OK;
 }
 
-int redirect(void *ac, void *ic, void *sc __attribute__((unused)),
-	 void *mc, const char **errmsg __attribute__((unused)))
+static int redirect(void *ac, void *ic, void *sc __attribute__((unused)),
+		 void *mc, const char **errmsg __attribute__((unused)))
 {
 sieve_redirect_context_t *rc = (sieve_redirect_context_t *) ac;
 message_data_t *m = (message_data_t *) mc;
@@ -413,9 +341,9 @@
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-int discard(void *ac __attribute__((unused)),
-	 void *ic, void *sc __attribute__((unused)),
-	 void *mc, const char **errmsg __attribute__((unused)))
+static int discard(void *ac __attribute__((unused)),
+		 void *ic, void *sc __attribute__((unused)),
+		 void *mc, const char **errmsg __attribute__((unused)))
 {
 message_data_t *m = (message_data_t *) mc;
 int *force_fail = (int*) ic;
@@ -425,8 +353,8 @@
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-int reject(void *ac, void *ic, void *sc __attribute__((unused)),
-	 void *mc, const char **errmsg __attribute__((unused)))
+static int reject(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc, const char **errmsg __attribute__((unused)))
 {
 sieve_reject_context_t *rc = (sieve_reject_context_t *) ac;
 message_data_t *m = (message_data_t *) mc;
@@ -437,8 +365,8 @@
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-int fileinto(void *ac, void *ic, void *sc __attribute__((unused)),
-	 void *mc, const char **errmsg __attribute__((unused)))
+static int fileinto(void *ac, void *ic, void *sc __attribute__((unused)),
+		 void *mc, const char **errmsg __attribute__((unused)))
 {
 sieve_fileinto_context_t *fc = (sieve_fileinto_context_t *) ac;
 message_data_t *m = (message_data_t *) mc;
@@ -446,39 +374,39 @@
 
 printf("filing message '%s' into '%s'\n", m->name, fc->mailbox);
 
- if (fc->imapflags->flag) {
-	int n;
-	printf("\twith flags");
-	for (n = 0; n < fc->imapflags->nflags; n++)
-	 printf(" '%s'", fc->imapflags->flagn);
-	printf("\n");
+ if (fc->imapflags->count) {
+	char *s = strarray_join(fc->imapflags, "' '");
+	if (s) {
+	 printf("\twith flags '%s'\n", s);
+	 free(s);
+	}
 }
 
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-int keep(void *ac, void *ic, void *sc __attribute__((unused)),
-	 void *mc, const char **errmsg __attribute__((unused)))
+static int keep(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc, const char **errmsg __attribute__((unused)))
 {
 sieve_keep_context_t *kc = (sieve_keep_context_t *) ac;
 message_data_t *m = (message_data_t *) mc;
 int *force_fail = (int*) ic;
 
 printf("keeping message '%s'\n", m->name);
- if (kc->imapflags->flag) {
-	int n;
-	printf("\twith flags");
-	for (n = 0; n < kc->imapflags->nflags; n++)
-	 printf(" '%s'", kc->imapflags->flagn);
-	printf("\n");
+ if (kc->imapflags->count) {
+	char *s = strarray_join(kc->imapflags, "' '");
+	if (s) {
+	 printf("\twith flags '%s'\n", s);
+	 free(s);
+	}
 }
 
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-int notify(void *ac, void *ic, void *sc __attribute__((unused)),
-	 void *mc __attribute__((unused)),
-	 const char **errmsg __attribute__((unused)))
+static int notify(void *ac, void *ic, void *sc __attribute__((unused)),
+	 void *mc __attribute__((unused)),
+	 const char **errmsg __attribute__((unused)))
 {
 sieve_notify_context_t *nc = (sieve_notify_context_t *) ac;
 int *force_fail = (int*) ic;
@@ -501,49 +429,58 @@
 
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
- 
-int mysieve_error(int lineno, const char *msg, void *i __attribute__((unused)),
-		 void *s __attribute__((unused)))
+
+static int mysieve_error(int lineno, const char *msg,
+			 void *i __attribute__((unused)),
+		 void *s __attribute__((unused)))
 {
 fprintf(stderr, "line %d: %s\r\n", lineno, msg);
 
 return SIEVE_OK;
 }
 
-int mysieve_execute_error(const char *msg, void *i __attribute__((unused)),
-			 void *s __attribute__((unused)),
-			 void *m __attribute__((unused)))
+static int mysieve_execute_error(const char *msg,
+				 void *i __attribute__((unused)),
+			 void *s __attribute__((unused)),
+			 void *m __attribute__((unused)))
 {
 fprintf(stderr, "%s\r\n", msg);
- 
+
 return SIEVE_OK;
 }
 
 
-int autorespond(void *ac, void *ic __attribute__((unused)),
-		void *sc __attribute__((unused)),
-		void *mc __attribute__((unused)),
-		const char **errmsg __attribute__((unused)))
+static int autorespond(void *ac, void *ic __attribute__((unused)),
+		 void *sc __attribute__((unused)),
+		 void *mc __attribute__((unused)),
+		 const char **errmsg __attribute__((unused)))
 {
 sieve_autorespond_context_t *arc = (sieve_autorespond_context_t *) ac;
 char yn;
 int i;
 
+ if (vacation_answer)
+	yn = vacation_answer;
+ else {
 printf("Have I already responded to '");
 for (i = 0; i < SIEVE_HASHLEN; i++) {
 	printf("%x", arc->hashi);
 }
- printf("' in %d days? ", arc->days);
+ if (arc->seconds % DAY2SEC)
+	printf("' in %d seconds? ", arc->seconds);
+ else
+	printf("' in %d days? ", arc->seconds / DAY2SEC);
 scanf(" %c", &yn);
+ }
 
- if (tolower(yn) == 'y') return SIEVE_DONE;
- if (tolower(yn) == 'n') return SIEVE_OK;
+ if (TOLOWER(yn) == 'y') return SIEVE_DONE;
+ if (TOLOWER(yn) == 'n') return SIEVE_OK;
 
 return SIEVE_FAIL;
 }
 
-int send_response(void *ac, void *ic, void *sc __attribute__((unused)),
-		 void *mc, const char **errmsg __attribute__((unused)))
+static int send_response(void *ac, void *ic, void *sc __attribute__((unused)),
+			 void *mc, const char **errmsg __attribute__((unused)))
 {
 sieve_send_response_context_t *src = (sieve_send_response_context_t *) ac;
 message_data_t *m = (message_data_t *) mc;
@@ -555,338 +492,83 @@
 return (*force_fail ? SIEVE_FAIL : SIEVE_OK);
 }
 
-sieve_vacation_t vacation = {
+static sieve_vacation_t vacation = {
 0,				/* min response */
 0,				/* max response */
 &autorespond,		/* autorespond() */
 &send_response		/* send_response() */
 };
 
-char *markflags = { "\\flagged" };
-sieve_imapflags_t mark = { markflags, 1 };
-
-struct testcase {
- int comp; 
- int mode;
- const char *pat;
- const char *text;
- int result;
-};
-
-struct testcase tc =
-{ { B_OCTET, B_IS, "", "", 1 },
- { B_OCTET, B_IS, "a", "", 0 },
- { B_OCTET, B_IS, "", "a", 0 },
- { B_OCTET, B_IS, "a", "a", 1 },
- { B_OCTET, B_IS, "a", "A", 0 },
-
- { B_ASCIICASEMAP, B_IS, "", "", 1 },
- { B_ASCIICASEMAP, B_IS, "a", "", 0 },
- { B_ASCIICASEMAP, B_IS, "", "a", 0 },
- { B_ASCIICASEMAP, B_IS, "a", "a", 1 },
- { B_ASCIICASEMAP, B_IS, "a", "A", 1 },
-
- { B_ASCIINUMERIC, B_IS, "123", "123", 1 },
- { B_ASCIINUMERIC, B_IS, "123", "-123", 0 },
- { B_ASCIINUMERIC, B_IS, "abc", "123", 0 },
- { B_ASCIINUMERIC, B_IS, "abc", "abc", 1 },
- { B_ASCIINUMERIC, B_IS, "12345678900", "3755744308", 0 }, /* test for 32bit overflow */
- { B_ASCIINUMERIC, B_IS, "1567", "1567pounds", 1 },
- { B_ASCIINUMERIC, B_IS, "", "", 1 },
- { B_ASCIINUMERIC, B_IS, "123456789", "567", 0 },
- { B_ASCIINUMERIC, B_IS, "567", "123456789", 0 },
- { B_ASCIINUMERIC, B_IS, "123456789", "00000123456789", 1 },
- { B_ASCIINUMERIC, B_IS, "102", "1024", 0 },
- { B_ASCIINUMERIC, B_IS, "1567M", "1567 arg", 1 },
-
- { B_OCTET, B_CONTAINS, "", "", 1 },
- { B_OCTET, B_CONTAINS, "", "a", 1 },
- { B_OCTET, B_CONTAINS, "a", "", 0 },
- { B_OCTET, B_CONTAINS, "a", "a", 1 },
- { B_OCTET, B_CONTAINS, "a", "ab", 1 },
- { B_OCTET, B_CONTAINS, "a", "ba", 1 },
- { B_OCTET, B_CONTAINS, "a", "aba", 1 },
- { B_OCTET, B_CONTAINS, "a", "bab", 1 },
- { B_OCTET, B_CONTAINS, "a", "bb", 0 },
- { B_OCTET, B_CONTAINS, "a", "bbb", 0 },
-
- { B_OCTET, B_MATCHES, "", "", 1 },
- { B_OCTET, B_MATCHES, "", "a", 0 },
- { B_OCTET, B_MATCHES, "a", "", 0 },
- { B_OCTET, B_MATCHES, "a", "a", 1 },
- { B_OCTET, B_MATCHES, "a", "ab", 0 },
- { B_OCTET, B_MATCHES, "a", "ba", 0 },
- { B_OCTET, B_MATCHES, "a", "aba", 0 },
- { B_OCTET, B_MATCHES, "a", "bab", 0 },
- { B_OCTET, B_MATCHES, "a", "bb", 0 },
- { B_OCTET, B_MATCHES, "a", "bbb", 0 },
-
- { B_OCTET, B_MATCHES, "*", "", 1 },
- { B_OCTET, B_MATCHES, "*", "a", 1 },
- { B_OCTET, B_MATCHES, "*a*", "", 0 },
- { B_OCTET, B_MATCHES, "*a*", "a", 1 },
- { B_OCTET, B_MATCHES, "*a*", "ab", 1 },
- { B_OCTET, B_MATCHES, "*a*", "ba", 1 },
- { B_OCTET, B_MATCHES, "*a*", "aba", 1 },
- { B_OCTET, B_MATCHES, "*a*", "bab", 1 },
- { B_OCTET, B_MATCHES, "*a*", "bb", 0 },
- { B_OCTET, B_MATCHES, "*a*", "bbb", 0 },
-
- { B_OCTET, B_MATCHES, "*a", "", 0 },
- { B_OCTET, B_MATCHES, "*a", "a", 1 },
- { B_OCTET, B_MATCHES, "*a", "ab", 0 },
- { B_OCTET, B_MATCHES, "*a", "ba", 1 },
- { B_OCTET, B_MATCHES, "*a", "aba", 1 },
- { B_OCTET, B_MATCHES, "*a", "bab", 0 },
- { B_OCTET, B_MATCHES, "*a", "bb", 0 },
- { B_OCTET, B_MATCHES, "*a", "bbb", 0 },
-
- { B_OCTET, B_MATCHES, "a*", "", 0 },
- { B_OCTET, B_MATCHES, "a*", "a", 1 },
- { B_OCTET, B_MATCHES, "a*", "ab", 1 },
- { B_OCTET, B_MATCHES, "a*", "ba", 0 },
- { B_OCTET, B_MATCHES, "a*", "aba", 1 },
- { B_OCTET, B_MATCHES, "a*", "bab", 0 },
- { B_OCTET, B_MATCHES, "a*", "bb", 0 },
- { B_OCTET, B_MATCHES, "a*", "bbb", 0 },
-
- { B_OCTET, B_MATCHES, "a*b", "", 0 },
- { B_OCTET, B_MATCHES, "a*b", "a", 0 },
- { B_OCTET, B_MATCHES, "a*b", "ab", 1 },
- { B_OCTET, B_MATCHES, "a*b", "ba", 0 },
- { B_OCTET, B_MATCHES, "a*b", "aba", 0 },
- { B_OCTET, B_MATCHES, "a*b", "bab", 0 },
- { B_OCTET, B_MATCHES, "a*b", "bb", 0 },
- { B_OCTET, B_MATCHES, "a*b", "bbb", 0 },
- { B_OCTET, B_MATCHES, "a*b", "abbb", 1 },
- { B_OCTET, B_MATCHES, "a*b", "acb", 1 },
- { B_OCTET, B_MATCHES, "a*b", "acbc", 0 },
-
- { B_OCTET, B_MATCHES, "a?b", "", 0 },
- { B_OCTET, B_MATCHES, "a?b", "a", 0 },
- { B_OCTET, B_MATCHES, "a?b", "ab", 0 },
- { B_OCTET, B_MATCHES, "a?b", "ba", 0 },
- { B_OCTET, B_MATCHES, "a?b", "aba", 0 },
- { B_OCTET, B_MATCHES, "a?b", "bab", 0 },
- { B_OCTET, B_MATCHES, "a?b", "bb", 0 },
- { B_OCTET, B_MATCHES, "a?b", "bbb", 0 },
- { B_OCTET, B_MATCHES, "a?b", "abbb", 0 },
- { B_OCTET, B_MATCHES, "a?b", "acb", 1 },
- { B_OCTET, B_MATCHES, "a?b", "acbc", 0 },
-
- { B_OCTET, B_MATCHES, "a*?b", "", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "a", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "ab", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "ba", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "aba", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "bab", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "bb", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "bbb", 0 },
- { B_OCTET, B_MATCHES, "a*?b", "abbb", 1 },
- { B_OCTET, B_MATCHES, "a*?b", "acb", 1 },
- { B_OCTET, B_MATCHES, "a*?b", "acbc", 0 },
-
- { B_OCTET, B_MATCHES, "a?*b", "", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "a", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "ab", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "ba", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "aba", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "bab", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "bb", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "bbb", 0 },
- { B_OCTET, B_MATCHES, "a?*b", "abbb", 1 },
- { B_OCTET, B_MATCHES, "a?*b", "acb", 1 },
- { B_OCTET, B_MATCHES, "a?*b", "acbc", 0 },
-
- { B_OCTET, B_MATCHES, "a*?*b", "", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "a", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "ab", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "ba", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "aba", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "bab", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "bb", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "bbb", 0 },
- { B_OCTET, B_MATCHES, "a*?*b", "abbb", 1 },
- { B_OCTET, B_MATCHES, "a*?*b", "acb", 1 },
- { B_OCTET, B_MATCHES, "a*?*b?", "acbc", 1 },
-
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "a", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "ab", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "ba", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "aba", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "bab", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "bb", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "bbb", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "abbb", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "acb", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "acbc", 0 },
-
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "A", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "Ab", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "BA", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "ABA", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "BAb", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "BB", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "BBB", 0 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "aBBB", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "ACB", 1 },
- { B_ASCIICASEMAP, B_MATCHES, "a*b", "ACBC", 0 },
-
- { 0, 0, NULL, NULL, 0 } };
-
-static int test_comparator(void)
+static int usage(const char *argv0) __attribute__((noreturn));
+static int usage(const char *argv0)
 {
- struct testcase *t;
- int didfail = 0;
-
- for (t = tc; t->comp != 0; t++) {
-	void *comprock = NULL;
-	comparator_t *c = lookup_comp(t->comp, t->mode, -1, &comprock);
-	int res;
-	char *comp, *mode;
-
-	if (t->comp == B_OCTET) comp = "i;octet";
-	else if (t->comp == B_ASCIICASEMAP) comp = "i;ascii-casemap";
-	else if (t->comp == B_ASCIINUMERIC) comp = "i;ascii-numeric";
-	else comp = "<unknown comp>";
-
-	if (t->mode == B_IS) mode = "IS";
-	else if (t->mode == B_CONTAINS) mode = "CONTAINS";
-	else if (t->mode == B_MATCHES) mode = "MATCHES";
-	else if (t->mode == B_REGEX) mode = "REGEX";
-	else mode = "<unknown mode>";
-	
-	if (!c) {
-	 printf("FAIL: can't find a comparator %s/%s\n", 
-		 comp, mode);
-	 didfail++;
-	 continue;
-	}
-	res = c(t->text, strlen(t->text), t->pat, comprock);
-	if (res != t->result) {
-	 printf("FAIL: %s/%s(%s, %s) = %d, not %d\n", 
-		 comp, mode, t->pat, t->text, res, t->result);
-	 didfail++;
-	}
- }
- if (didfail) {
-	fprintf(stderr, "failed %d tests\n", didfail);
-	exit(1);
- } else {
-	exit(0);
- }
+ fprintf(stderr, "usage:\n");
+ fprintf(stderr, "%s -v script\n", argv0);
+ fprintf(stderr, "%s opts message script\n", argv0);
+ fprintf(stderr, "\n");
+ fprintf(stderr, " -e envelope_from\n");
+ fprintf(stderr, " -t envelope_to\n");
+ fprintf(stderr, " -r y|n - have sent vacation response already? (if required)\n");
+ exit(1);
 }
 
-int config_need_data = 0;
-
 int main(int argc, char *argv)
 {
 sieve_interp_t *i;
 sieve_execute_t *exe = NULL;
- message_data_t *m;
+ message_data_t *m = NULL;
 char *script = NULL, *message = NULL;
- int c, force_fail = 0, usage_error = 0;
- /* (crom cvs update) FILE *f;
- */
+ int c, force_fail = 0;
 int fd, res;
 struct stat sbuf;
+ static strarray_t mark = STRARRAY_INITIALIZER;
+ static strarray_t e_from = STRARRAY_INITIALIZER;
+ static strarray_t e_to = STRARRAY_INITIALIZER;
 
- while ((c = getopt(argc, argv, "v:cf")) != EOF)
+ while ((c = getopt(argc, argv, "v:fe:t:r:")) != EOF)
 	switch (c) {
 	case 'v':
 	 script = optarg;
 	 break;
-	case 'c':
-	 test_comparator();
-	 /* test_comparator exits for us */
-	 break;
 	case 'f':
 	 force_fail = 1;
 	 break;
+	case 'e':
+	 strarray_append(&e_from, optarg);
+	 break;
+	case 't':
+	 strarray_append(&e_to, optarg);
+	 break;
+	case 'r':
+	 vacation_answer = optarg0;
+	 break;
 	default:
-	 usage_error = 1;
+	 usage(argv0);
 	 break;
 	}
 
 if (!script) {
 	if ((argc - optind) < 2)
-	 usage_error = 1;
+	 usage(argv0);
 	else {
 	 message = argvoptind;
 	 script = argvoptind+1;
 	}
 }
 
- if (usage_error) {
-	fprintf(stderr, "usage:\n");
-	fprintf(stderr, "%s message script\n", argv0);
-	fprintf(stderr, "%s -v script\n", argv0);
-	exit(1);
- }
+ i = sieve_interp_alloc(&force_fail);
+ assert(i != NULL);
 
- res = sieve_interp_alloc(&i, &force_fail);
- if (res != SIEVE_OK) {
-	printf("sieve_interp_alloc() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_redirect(i, &redirect);
- if (res != SIEVE_OK) {
-	printf("sieve_register_redirect() returns %d\n", res);
-	exit(1);
- }
- res = sieve_register_discard(i, &discard);
- if (res != SIEVE_OK) {
-	printf("sieve_register_discard() returns %d\n", res);
-	exit(1);
- }
- res = sieve_register_reject(i, &reject);
- if (res != SIEVE_OK) {
-	printf("sieve_register_reject() returns %d\n", res);
-	exit(1);
- }
- res = sieve_register_fileinto(i, &fileinto);
- if (res != SIEVE_OK) {
-	printf("sieve_register_fileinto() returns %d\n", res);
-	exit(1);
- }
- res = sieve_register_keep(i, &keep);
- if (res != SIEVE_OK) {
-	printf("sieve_register_keep() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_size(i, &getsize);
- if (res != SIEVE_OK) {
-	printf("sieve_register_size() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_header(i, &getheader);
- if (res != SIEVE_OK) {
-	printf("sieve_register_header() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_envelope(i, &getenvelope);
- if (res != SIEVE_OK) {
-	printf("sieve_register_envelope() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_body(i, &getbody);
- if (res != SIEVE_OK) {
-	printf("sieve_register_body() returns %d\n", res);
-	exit(1);
- }
-
- res = sieve_register_include(i, &getinclude);
- if (res != SIEVE_OK) {
-	printf("sieve_register_include() returns %d\n", res);
-	exit(1);
- }
+ sieve_register_redirect(i, redirect);
+ sieve_register_discard(i, discard);
+ sieve_register_reject(i, reject);
+ sieve_register_fileinto(i, fileinto);
+ sieve_register_keep(i, keep);
+ sieve_register_size(i, getsize);
+ sieve_register_header(i, getheader);
+ sieve_register_envelope(i, getenvelope);
+ sieve_register_body(i, getbody);
+ sieve_register_include(i, getinclude);
 
 res = sieve_register_vacation(i, &vacation);
 if (res != SIEVE_OK) {
@@ -894,30 +576,12 @@
 	exit(1);
 }
 
- res = sieve_register_imapflags(i, &mark);
-
- if (res != SIEVE_OK) {
-	printf("sieve_register_imapflags() returns %d\n", res);
-	exit(1);
- }
+ strarray_append(&mark, "\\flagged");
+ sieve_register_imapflags(i, &mark);
 
- res = sieve_register_notify(i, &notify);
- if (res != SIEVE_OK) {
-	printf("sieve_register_notify() returns %d\n", res);
-	exit(1);
- }
- 
- res = sieve_register_parse_error(i, &mysieve_error);
- if (res != SIEVE_OK) {
-	printf("sieve_register_parse_error() returns %d\n", res);
-	exit(1);
- }
- 
- res = sieve_register_execute_error(i, &mysieve_execute_error);
- if (res != SIEVE_OK) {
-	printf("sieve_register_execute_error() returns %d\n", res);
- exit(1);
- } 
+ sieve_register_notify(i, notify);
+ sieve_register_parse_error(i, mysieve_error);
+ sieve_register_execute_error(i, mysieve_execute_error);
 
 res = sieve_script_load(script, &exe);
 if (res != SIEVE_OK) {
@@ -941,12 +605,15 @@
 	 exit(1);
 	}
 
+	m->env_from = &e_from;
+	m->env_to = &e_to;
+
 	res = sieve_execute_bytecode(exe, i, NULL, m);
 	if (res != SIEVE_OK) {
 	 printf("sieve_execute_bytecode() returns %d\n", res);
 	 exit(1);
 	}
-	
+
 	fclose(f);
 	close(fd);
 }
@@ -962,10 +629,14 @@
 	exit(1);
 }
 
+ if (m)
+	free_msg(m);
+
 return 0;
 }
 
-void fatal(char* message, int rc) {
+EXPORTED void fatal(const char* message, int rc)
+{
 fprintf(stderr, "fatal error: %s\n", message);
 exit(rc);
 }

cyrus-imapd-2.4.17.tar.gz/sieve/tests/actionExtensions/uberExtensionActionScript.key -> cyrus-imapd-2.5.tar.gz/sieve/tests/actionExtensions/uberExtensionActionScript.key Changed

cyrus-imapd-2.4.17.tar.gz/sieve/tests/actionExtensions/uberExtensionActionScript.s -> cyrus-imapd-2.5.tar.gz/sieve/tests/actionExtensions/uberExtensionActionScript.s Changed

cyrus-imapd-2.4.17.tar.gz/sieve/tree.c -> cyrus-imapd-2.5.tar.gz/sieve/tree.c Changed

@@ -39,8 +39,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: tree.c,v 1.16 2010/01/06 17:02:00 murch Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -51,29 +49,8 @@
 #include "xmalloc.h"
 
 #include "tree.h"
-#include "sieve.h"
-
-stringlist_t *new_sl(char *s, stringlist_t *n)
-{
-    stringlist_t *p = (stringlist_t *) xmalloc(sizeof(stringlist_t));
-    p->s = s;
-    p->next = n;
-    return p;
-}
-
-stringlist_t *sl_reverse(stringlist_t *l)
-{
-    stringlist_t *prev = NULL;
-    stringlist_t *next;
-    stringlist_t *cur = l;
-    while (cur) {
-	next = cur->next;
-	cur->next = prev;
-	prev = cur;
-	cur = next;
-    }
-    return prev;
-}
+#include "sieve/sieve_interface.h"
+#include "sieve/sieve.h"
 
 tag_t *new_tag(int type, char *s)
 {
@@ -125,21 +102,6 @@
     return p;
 }
 
-void free_sl(stringlist_t *sl) 
-{
-    stringlist_t *sl2;
-    
-    while (sl != NULL) {
-	sl2 = sl->next;
-
-	if (sl->s) free(sl->s);
-
-	free(sl);
-	sl = sl2;
-    }
-}
-
-
 void free_test(test_t *t);
 
 static void free_tl(testlist_t *tl)
@@ -167,7 +129,7 @@
 	break;
 
     case EXISTS:
-	free_sl(t->u.sl);
+	strarray_free(t->u.sl);
 	break;
 
     case SIZE:
@@ -176,19 +138,22 @@
 	break;
 
     case HEADER:
-	free_sl(t->u.h.sl);
-	free_sl(t->u.h.pl);
-	
+	free(t->u.h.comparator);
+	strarray_free(t->u.h.sl);
+	strarray_free(t->u.h.pl);
 	break;
 
     case ADDRESS:
-	free_sl(t->u.ae.sl);
-	free_sl(t->u.ae.pl);
+    case ENVELOPE:
+	free(t->u.ae.comparator);
+	strarray_free(t->u.ae.sl);
+	strarray_free(t->u.ae.pl);
 	break;
 
     case BODY:
-	free_sl(t->u.b.content_types);
-	free_sl(t->u.b.pl);
+	free(t->u.b.comparator);
+	strarray_free(t->u.b.content_types);
+	strarray_free(t->u.b.pl);
 	break;
 
     case NOT:
@@ -230,14 +195,14 @@
 
 	case VACATION:
 	    if (cl->u.v.subject) free(cl->u.v.subject);
-	    if (cl->u.v.addresses) free_sl(cl->u.v.addresses);
+	    if (cl->u.v.addresses) strarray_free(cl->u.v.addresses);
 	    if (cl->u.v.message) free(cl->u.v.message);
 	    break;
 	    
 	case SETFLAG:
 	case ADDFLAG:
 	case REMOVEFLAG:
-	    free_sl(cl->u.sl);
+	    strarray_free(cl->u.sl);
 	    break;
 
 	case KEEP:
@@ -249,7 +214,7 @@
 	case NOTIFY:
 	    if (cl->u.n.method) free(cl->u.n.method);
 	    if (cl->u.n.id) free(cl->u.n.id);
-	    if (cl->u.n.options) free_sl(cl->u.n.options);
+	    if (cl->u.n.options) strarray_free(cl->u.n.options);
 	    if (cl->u.n.message) free(cl->u.n.message);
 	    break;

cyrus-imapd-2.4.17.tar.gz/sieve/tree.h -> cyrus-imapd-2.5.tar.gz/sieve/tree.h Changed

@@ -39,29 +39,21 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: tree.h,v 1.13 2010/01/06 17:02:00 murch Exp $
  */
 
 #ifndef TREE_H
 #define TREE_H
 
 #include "comparator.h"
+#include "strarray.h"
 
 /* abstract syntax tree for sieve */
-typedef struct Stringlist stringlist_t;
 typedef struct Commandlist commandlist_t;
 typedef struct Test test_t;
 typedef struct Testlist testlist_t;
 typedef struct Tag tag_t;
 typedef struct Taglist taglist_t;
 
-struct Stringlist {
-    char *s;
-    stringlist_t *next;
-};
-
- 
 struct Tag {
     int type;
     char *arg;
@@ -76,22 +68,22 @@
     int type;
     union {
 	testlist_t *tl; /* anyof, allof */
-	stringlist_t *sl; /* exists */
+	strarray_t *sl; /* exists */
 	struct { /* it's a header test */
 	    int comptag;
 	    char * comparator;
 	    int relation;
 	    void *comprock;
-	    stringlist_t *sl;
-	    stringlist_t *pl;
+	    strarray_t *sl;
+	    strarray_t *pl;
 	} h;
 	struct { /* it's an address or envelope test */
 	    int comptag;
 	    char * comparator;
 	    int relation; 
 	    void *comprock;
-	    stringlist_t *sl;
-	    stringlist_t *pl;
+	    strarray_t *sl;
+	    strarray_t *pl;
             int addrpart;
 	} ae; 
 	struct { /* it's a body test */
@@ -101,8 +93,8 @@
 	    void *comprock;
 	    int transform;
 	    int offset;
-	    stringlist_t *content_types;
-	    stringlist_t *pl;
+	    strarray_t *content_types;
+	    strarray_t *pl;
 	} b; 
 	test_t *t; /* not */
 	struct { /* size */
@@ -121,7 +113,7 @@
     int type;
     union {
         char *str;
-	stringlist_t *sl; /* the parameters */
+	strarray_t *sl; /* the parameters */
 	struct { /* it's an if statement */
 	    test_t *t;
 	    commandlist_t *do_then;
@@ -129,12 +121,14 @@
 	} i;
 	struct { /* it's an include action */
 	    int location;
+	    int once;
+	    int optional;
 	    char *script;
 	} inc;
 	struct { /* it's a fileinto action */
 	    char *folder;
 	    int copy;
-	    /* add stringlist_t for imap4flags */
+	    /* add strarray_t for imap4flags */
 	} f;
 	struct { /* it's a redirect action */
 	    char *address;
@@ -142,8 +136,8 @@
 	} r;
 	struct { /* it's a vacation action */
 	    char *subject;
-	    int days;
-	    stringlist_t *addresses;
+	    int seconds;
+	    strarray_t *addresses;
 	    char *message;
 	    char *from;
 	    char *handle;
@@ -152,7 +146,7 @@
 	struct { /* it's a notify action */
 	    char *method;
 	    char *id;
-	    stringlist_t *options;
+	    strarray_t *options;
 	    int priority;
 	    char *message;
 	} n;
@@ -167,8 +161,6 @@
     struct Commandlist *next;
 };
 
-stringlist_t *new_sl(char *s, stringlist_t *n);
-stringlist_t *sl_reverse(stringlist_t *l);
 tag_t *new_tag(int type, char *s);
 taglist_t *new_taglist(tag_t *t, taglist_t *n);
 test_t *new_test(int type);
@@ -176,7 +168,6 @@
 commandlist_t *new_command(int type);
 commandlist_t *new_if(test_t *t, commandlist_t *y, commandlist_t *n);
 
-void free_sl(stringlist_t *sl);
 void free_test(test_t *t);
 void free_tree(commandlist_t *cl);

cyrus-imapd-2.4.17.tar.gz/snmp/snmpgen -> cyrus-imapd-2.5.tar.gz/snmp/snmpgen Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/TODO -> cyrus-imapd-2.5.tar.gz/timsieved/TODO Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/actions.c -> cyrus-imapd-2.5.tar.gz/timsieved/actions.c Changed

@@ -39,45 +39,36 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: actions.c,v 1.48 2010/01/06 17:02:01 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/stat.h>
+#include <dirent.h>
 #include <errno.h>
-#include <stdlib.h>
+#include <fcntl.h>
 #include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <syslog.h>
-#include <dirent.h>
-#include <ctype.h>
 #include <unistd.h>
-#include <string.h>
-#include <retry.h>
 
-#include "prot.h"
-#include "tls.h"
-#include "util.h"
-#include "global.h"
 #include "libconfig.h"
 #include "xmalloc.h"
 #include "xstrlcat.h"
 #include "xstrlcpy.h"
-#include "sieve_interface.h"
-
-#include "codes.h"
-#include "actions.h"
-#include "scripttest.h"
-
-#include "sync_log.h"
+#include "imap/global.h"
+#include "imap/sync_log.h"
+#include "imap/tls.h"
+#include "imap/version.h"
+#include "timsieved/actions.h"
+#include "timsieved/codes.h"
+#include "timsieved/scripttest.h"
 
 /* after a user has authentication, our current directory is their Sieve 
 directory! */
@@ -160,15 +151,15 @@
 *
 */
 
-static int scriptname_valid(mystring_t *name)
+static int scriptname_valid(const struct buf *name)
 {
- int lup;
+ unsigned int lup;
 char *ptr;
 
 /* must be at least one character long */
 if (name->len < 1) return TIMSIEVE_FAIL;
 
- ptr=string_DATAPTR(name);
+ ptr = name->s;
 
 for (lup=0;lup<name->len;lup++)
 {
@@ -213,7 +204,7 @@
 return TIMSIEVE_OK;
 }
 
-int getscript(struct protstream *conn, mystring_t *name)
+int getscript(struct protstream *conn, const struct buf *name)
 {
 FILE *stream;
 struct stat filestats;	/* returned by stat */
@@ -231,7 +222,7 @@
 }
 
 
- snprintf(path, 1023, "%s.script", string_DATAPTR(name));
+ snprintf(path, 1023, "%s.script", name->s);
 
 result = stat(path, &filestats);
 if (result != 0) {
@@ -312,13 +303,13 @@
 
 
 /* save name as a sieve script */
-int putscript(struct protstream *conn, mystring_t *name, mystring_t *data,
-	 int verify_only)
+int putscript(struct protstream *conn, const struct buf *name,
+	 const struct buf *data, int verify_only)
 {
 FILE *stream;
- char *dataptr;
+ const char *dataptr;
 char *errstr;
- int i;
+ unsigned int i;
 int last_was_r = 0;
 int result;
 char path1024, p21024;
@@ -340,7 +331,7 @@
 /* see if this would put the user over quota */
 maxscripts = config_getint(IMAPOPT_SIEVE_MAXSCRIPTS);
 
- if (countscripts(string_DATAPTR(name))+1 > maxscripts)
+ if (countscripts(name->s)+1 > maxscripts)
 {
 	 prot_printf(conn,
 		 "NO (QUOTA/MAXSCRIPTS) \"You are only allowed %d scripts on this server\"\r\n",
@@ -348,7 +339,7 @@
 	 return TIMSIEVE_FAIL;
 }
 
- snprintf(path, 1023, "%s.script.NEW", string_DATAPTR(name));
+ snprintf(path, 1023, "%s.script.NEW", name->s);
 
 stream = fopen(path, "w+");
 }
@@ -360,7 +351,7 @@
 return TIMSIEVE_NOEXIST;
 }
 
- dataptr = string_DATAPTR(data);
+ dataptr = data->s;
 
 /* copy data to file - replacing any lone \r or \n with the
 * \r\n pair so notify messages are SMTP compatible */ 
@@ -386,14 +377,14 @@
 result = is_script_parsable(stream, &errstr, &s);
 
 if (result != TIMSIEVE_OK) {
- if (errstr && *errstr) { 
-	 prot_printf(conn, "NO {" SIZE_T_FMT "}\r\n%s\r\n",
-		 strlen(errstr), errstr);
-	 free(errstr);
+ if (errstr && *errstr) {
+	 prot_printf(conn, "NO ");
+	 prot_printstring(conn, errstr);
+	 prot_printf(conn, "\r\n");
 } else {
-	 if (errstr) free(errstr);
 	 prot_printf(conn, "NO \"parse failed\"\r\n");
 }
+ free(errstr);
 fclose(stream);
 unlink(path);
 return result;
@@ -415,7 +406,7 @@
 }
 
 /* Now, open the new file */
- snprintf(bc_path, 1023, "%s.bc.NEW", string_DATAPTR(name));
+ snprintf(bc_path, 1023, "%s.bc.NEW", name->s);
 fd = open(bc_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
 if(fd < 0) {
 	 unlink(path);
@@ -442,8 +433,8 @@
 close(fd);
 
 /* Now, rename! */
- snprintf(p2, 1023, "%s.script", string_DATAPTR(name));
- snprintf(bc_p2, 1023, "%s.bc", string_DATAPTR(name));
+ snprintf(p2, 1023, "%s.script", name->s);
+ snprintf(bc_p2, 1023, "%s.bc", name->s);
 rename(path, p2);
 rename(bc_path, bc_p2);
 
@@ -460,6 +451,12 @@
 static int deleteactive(struct protstream *conn)
 {
 if (unlink("defaultbc") != 0) {
+	if (errno == ENOENT) {
+	 /* RFC 5804, 2.8 SETACTIVE Command:
+	 * Disabling an active script when there is no script active is
+	 * not an error and MUST result in an OK reply. */
+	 return TIMSIEVE_OK;
+	}
 	prot_printf(conn,"NO \"Unable to unlink active script\"\r\n");
 	return TIMSIEVE_FAIL;
 }
@@ -474,15 +471,20 @@
 {
 char filename1024;
 char activelink1024;
+ ssize_t link_len;
 
 snprintf(filename, 1023, "%s.bc", name);
 memset(activelink, 0, sizeof(activelink));
- if ((readlink("defaultbc", activelink, sizeof(activelink)-1) < 0) && 
-	(errno != ENOENT)) 
+
+ link_len = readlink("defaultbc", activelink, sizeof(activelink)-1);
+ if (link_len == -1)
 {
-	syslog(LOG_ERR, "readlink(defaultbc): %m");
+	if (errno != ENOENT)
+	 syslog(LOG_ERR, "readlink(defaultbc): %m");
+
 	return FALSE;
 }
+ activelinklink_len = '\0';
 
 if (!strcmp(filename, activelink)) {
 	return TRUE;
@@ -492,7 +494,7 @@
 }
 
 /* delete a sieve script */
-int deletescript(struct protstream *conn, mystring_t *name)
+int deletescript(struct protstream *conn, const struct buf *name)
 {
 int result;
 char path1024;
@@ -504,9 +506,9 @@
 return result;
 }
 
- snprintf(path, 1023, "%s.script", string_DATAPTR(name));
+ snprintf(path, 1023, "%s.script", name->s);
 
- if (isactive(string_DATAPTR(name))) {
+ if (isactive(name->s)) {
 prot_printf(conn, "NO (ACTIVE) \"Active script cannot be deleted\"\r\n");
 return TIMSIEVE_FAIL;
 }
@@ -515,13 +517,13 @@
 
 if (result != 0) {
 if (result == ENOENT)
- prot_printf(conn, "NO (NONEXISTENT) \"Script %s does not exist.\"\r\n", string_DATAPTR(name));
+	 prot_printf(conn, "NO (NONEXISTENT) \"Script %s does not exist.\"\r\n", name->s);
 else
 prot_printf(conn,"NO \"Error deleting script\"\r\n");
 return TIMSIEVE_FAIL;
 }
 
- snprintf(path, 1023, "%s.bc", string_DATAPTR(name));
+ snprintf(path, 1023, "%s.bc", name->s);
 
 result = unlink(path);
 
@@ -558,12 +560,9 @@
 	{
 	 if (strcmp(dir->d_name + (length - 7), ".script")==0)
 	 {
-		char *namewo=(char *) xmalloc(length-6);
-
-		memcpy(namewo, dir->d_name, length-7);
-		namewolength-7='\0';
+		char *namewo = xstrndup(dir->d_name, length-7);
 
-		if (isactive(namewo)==TRUE)
+		if (isactive(namewo))
 		 prot_printf(conn,"\"%s\" ACTIVE\r\n", namewo);
 		else
 		 prot_printf(conn,"\"%s\"\r\n", namewo);
@@ -576,7 +575,7 @@
 closedir(dp);
 
 prot_printf(conn,"OK\r\n");
-
+ 
 return TIMSIEVE_OK;
 }
 
@@ -601,13 +600,13 @@
 
 /* set the sieve script 'name' to be the active script */
 
-int setactive(struct protstream *conn, mystring_t *name)
+int setactive(struct protstream *conn, const struct buf *name)
 {
 int result;
 char filename1024;
 
 /* if string name is empty, disable active script */
- if (!strlen(string_DATAPTR(name))) {
+ if (!name->len) {
 	if (deleteactive(conn) != TIMSIEVE_OK)
 	 return TIMSIEVE_FAIL;
 
@@ -622,20 +621,20 @@
 	return result;
 }
 
- if (exists(string_DATAPTR(name))==FALSE)
+ if (exists(name->s)==FALSE)
 {
 	prot_printf(conn,"NO (NONEXISTENT) \"Script does not exist\"\r\n");
 	return TIMSIEVE_NOEXIST;
 }
 
 /* if script already is the active one just say ok */
- if (isactive(string_DATAPTR(name))==TRUE) {
+ if (isactive(name->s)==TRUE) {
 	prot_printf(conn,"OK\r\n");
-	return TIMSIEVE_OK; 
+	return TIMSIEVE_OK;
 }
 
 /* get the name of the active sieve script */
- snprintf(filename, sizeof(filename), "%s.bc", string_DATAPTR(name));
+ snprintf(filename, sizeof(filename), "%s.bc", name->s);
 
 /* ok we want to do this atomically so let's
 - make <activesieve>.NEW as a hard link
@@ -661,7 +660,7 @@
 return TIMSIEVE_OK;
 }
 
-int cmd_havespace(struct protstream *conn, mystring_t *sieve_name, unsigned long num)
+int cmd_havespace(struct protstream *conn, const struct buf *sieve_name, unsigned long num)
 {
 int result;
 int maxscripts;
@@ -690,7 +689,7 @@
 /* see if this would put the user over quota */
 maxscripts = config_getint(IMAPOPT_SIEVE_MAXSCRIPTS);
 
- if (countscripts(string_DATAPTR(sieve_name))+1 > maxscripts)
+ if (countscripts(sieve_name->s)+1 > maxscripts)
 {
 	prot_printf(conn,
 		 "NO (QUOTA/MAXSCRIPTS) \"You are only allowed %d scripts on this server\"\r\n",

cyrus-imapd-2.4.17.tar.gz/timsieved/actions.h -> cyrus-imapd-2.5.tar.gz/timsieved/actions.h Changed

@@ -40,8 +40,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: actions.h,v 1.14 2010/01/06 17:02:01 murch Exp $
  */
 
 #ifndef _ACTIONS_H_
@@ -49,7 +47,7 @@
 
 
 #include "prot.h"
-#include "mystring.h"
+#include "util.h"
 
 /*
  * Get the list of capabilities
@@ -60,33 +58,33 @@
 		 int starttls_done, int authenticated, sasl_ssf_t sasl_ssf);
 
 /*
- * Get a sieve scripe with name "name" and output it's contents
+ * Get a sieve script with name "name" and output it's contents
  *
  */
 
-int getscript(struct protstream *conn, mystring_t *name);
+int getscript(struct protstream *conn, const struct buf *name);
 
 /*
  * Put a scripts in the server with 'name' whose contents should be 'data'
  *
  */
 
-int putscript(struct protstream *conn, mystring_t *name, mystring_t *data,
-	      int verify_only);
+int putscript(struct protstream *conn, const struct buf *name,
+	      const struct buf *data, int verify_only);
 
 /*
  * Delete the script with name 'name'
  *
  */
 
-int deletescript(struct protstream *conn, mystring_t *name);
+int deletescript(struct protstream *conn, const struct buf *name);
 
 /*
  * Is there space for this script?
  *
  */
 
-int cmd_havespace(struct protstream *sieved_out, mystring_t *sieve_name, unsigned long num);
+int cmd_havespace(struct protstream *sieved_out, const struct buf *sieve_name, unsigned long num);
 
 /*
  * List all the scripts for the user. place a '*' next to the active one
@@ -101,7 +99,7 @@
  *
  */
 
-int setactive(struct protstream *conn, mystring_t *name);
+int setactive(struct protstream *conn, const struct buf *name);
 
 /*
  * Initialize
@@ -117,6 +115,4 @@
 
 int actions_setuser(const char *userid);
 
-
-
 #endif

cyrus-imapd-2.4.17.tar.gz/timsieved/codes.h -> cyrus-imapd-2.5.tar.gz/timsieved/codes.h Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/lex.c -> cyrus-imapd-2.5.tar.gz/timsieved/lex.c Changed

@@ -40,29 +40,25 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lex.c,v 1.30 2010/01/06 17:02:01 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
 
-#include "tls.h"
-#include "lex.h"
-#include "codes.h"
-#include "actions.h"
 #include "libconfig.h"
-#include "global.h"
-#include "util.h"
 #include "xmalloc.h"
+#include "imap/global.h"
+#include "imap/tls.h"
+#include "timsieved/codes.h"
+#include "timsieved/lex.h"
 
-static int token_lookup (char *str, int len __attribute__((unused)))
+static int token_lookup(const char *str)
 {
 switch (*str) {
 case 'a':
@@ -71,6 +67,7 @@
 
 case 'c':
 	if (strcmp(str, "capability")==0) return CAPABILITY;
+	if (strcmp(str, "checkscript")==0) return CHECKSCRIPT;
 	break;
 
 case 'd':
@@ -98,6 +95,10 @@
 	if (strcmp(str, "putscript")==0) return PUTSCRIPT;
 	break;
 
+ case 'r':
+	if (strcmp(str, "renamescript")==0) return RENAMESCRIPT;
+	break;
+
 case 's':
 	if (strcmp(str, "setactive")==0) return SETACTIVE;
 	if (strcmp(str, "starttls")==0 && tls_enabled())
@@ -115,6 +116,8 @@
 
 /* current state the lexer is in */
 static int lexer_state = LEXER_STATE_NORMAL;
+static unsigned long maxscriptsize=0;
+static char *buffer;
 
 #define ERR() {								\
 		lexer_state=LEXER_STATE_RECOVER; \
@@ -131,9 +134,6 @@
 lexer_state = LEXER_STATE_RECOVER;
 }
 
-static unsigned long maxscriptsize=0;
-static char *buffer;
-
 int lex_init(void)
 {
 maxscriptsize = config_getint(IMAPOPT_SIEVE_MAXSCRIPTSIZE);
@@ -148,7 +148,7 @@
 * if outstr is NULL it isn't filled in
 */
 
-int timlex(mystring_t **outstr, unsigned long *outnum, struct protstream *stream)
+int timlex(struct buf *outstr, unsigned long *outnum, struct protstream *stream)
 {
 
 int ch;
@@ -204,14 +204,11 @@
 case LEXER_STATE_QSTR:
 if (ch == '\"') {
 	/* End of the string */
-	if (outstr!=NULL)
-	{
-	 *outstr = NULL;
-	 result = string_allocate(buff_ptr - buffer, buffer, outstr);
-	 if (result != TIMSIEVE_OK)
-	 ERR_PUSHBACK();
-	}
 	 /*} */
+	if (outstr) {
+	 buf_appendmap(outstr, buffer, buff_ptr-buffer);
+	 buf_cstring(outstr);
+	}
 	lexer_state=LEXER_STATE_NORMAL;
 	return STRING;
 }
@@ -275,23 +272,15 @@
 	 ERR();
 }
 
- if (outstr!=NULL)
- {
-	*outstr = NULL;
-	result = string_allocate(count, NULL, outstr);
-	if (result != TIMSIEVE_OK)
-	 ERR_PUSHBACK();
- }
-
 /* there is a literal string on the wire. let's read it */
- if (outstr!=NULL) {
-	char *it = string_DATAPTR(*outstr),
-	 *end = it + count;
-
-	while (it < end) {
-	 *it=prot_getc(stream);
-	 it++;
-	}
+ if (outstr) {
+	 for (;count > 0;count--) {
+	 ch = prot_getc(stream);
+	 if (ch == EOF)
+		 break;
+	 buf_putc(outstr, ch);
+	 }
+	 buf_cstring(outstr);
 } else {
 	/* just read the chars and throw them away */
 	unsigned long lup;
@@ -361,10 +350,10 @@
 if (!Uisalpha(ch)) {
 	int token;
 
-	bufferbuff_ptr - buffer = '\0';
+	*buff_ptr = '\0';
 
 	/* We've got the atom. */
-	token = token_lookup((char *) buffer, (int) (buff_ptr - buffer));
+	token = token_lookup(buffer);
 
 	if (token!=-1) {
 	 lexer_state=LEXER_STATE_NORMAL;
@@ -384,5 +373,3 @@
 
 /* never reached */
 }
-
-

cyrus-imapd-2.4.17.tar.gz/timsieved/lex.h -> cyrus-imapd-2.5.tar.gz/timsieved/lex.h Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/parser.c -> cyrus-imapd-2.5.tar.gz/timsieved/parser.c Changed

@@ -40,8 +40,6 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: parser.c,v 1.55 2010/01/06 17:02:01 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -54,35 +52,35 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
 #include <string.h>
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
 
-
+#include "assert.h"
+#include "exitcodes.h"
 #include "libconfig.h"
-#include "global.h"
-#include "auth.h"
-#include "backend.h"
-#include "mboxname.h"
-#include "mboxlist.h"
 #include "xmalloc.h"
 #include "xstrlcpy.h"
-#include "prot.h"
-#include "tls.h"
-#include "lex.h"
-#include "actions.h"
-#include "exitcodes.h"
-#include "telemetry.h"
 
-extern char sieved_clienthost250;
+#include "imap/backend.h"
+#include "imap/global.h"
+#include "imap/mboxlist.h"
+#include "imap/mboxname.h"
+#include "imap/telemetry.h"
+#include "imap/tls.h"
+
+#include "timsieved/actions.h"
+#include "timsieved/codes.h"
+#include "timsieved/lex.h"
+
+extern const char *sieved_clienthost;
 extern int sieved_domainfromip;
 extern int sieved_userisadmin;
 
 /* xxx these are both leaked, but we only handle one connection at a
 * time... */
 extern sasl_conn_t *sieved_saslconn; /* the sasl connection context */
-const char *referral_host = NULL;
+static const char *referral_host = NULL;
 
 int authenticated = 0;
 int verify_only = 0;
@@ -103,7 +101,7 @@
 static void cmd_logout(struct protstream *sieved_out,
 		 struct protstream *sieved_in);
 static int cmd_authenticate(struct protstream *sieved_out, struct protstream *sieved_in,
-			 mystring_t *mechanism_name, mystring_t *initial_challenge, const char **errmsg);
+			 const char *mech, const struct buf *initial_challenge, const char **errmsg);
 static void cmd_unauthenticate(struct protstream *sieved_out,
 			 struct protstream *sieved_in);
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in);
@@ -124,18 +122,19 @@
 }
 
 static struct protocol_t sieve_protocol =
-{ "sieve", SIEVE_SERVICE_NAME,
- { 1, "OK" },
- { "CAPABILITY", NULL, "OK", NULL,
- { { "\"SASL\" ", CAPA_AUTH },
- { "\"STARTTLS\"", CAPA_STARTTLS },
- { NULL, 0 } } },
- { "STARTTLS", "OK", "NO", 1 },
- { "AUTHENTICATE", USHRT_MAX, 1, "OK", "NO", NULL, "*",
- &sieve_parsesuccess, AUTO_CAPA_AUTH_SSF },
- { NULL, NULL, NULL },
- { NULL, NULL, NULL },
- { "LOGOUT", NULL, "OK" }
+{ "sieve", SIEVE_SERVICE_NAME, TYPE_STD,
+ { { { 1, "OK" },
+ { "CAPABILITY", NULL, "OK", NULL,
+	CAPAF_ONE_PER_LINE|CAPAF_QUOTE_WORDS,
+	{ { "SASL", CAPA_AUTH },
+	 { "STARTTLS", CAPA_STARTTLS },
+	 { NULL, 0 } } },
+ { "STARTTLS", "OK", "NO", 1 },
+ { "AUTHENTICATE", USHRT_MAX, 1, "OK", "NO", NULL, "*",
+	&sieve_parsesuccess, AUTO_CAPA_AUTH_SSF },
+ { NULL, NULL, NULL },
+ { NULL, NULL, NULL },
+ { "LOGOUT", NULL, "OK" } } }
 };
 
 /* Returns TRUE if we are done */
@@ -144,10 +143,10 @@
 int token = EOL;
 const char *error_msg = "Generic Error";
 
- mystring_t *mechanism_name = NULL;
- mystring_t *initial_challenge = NULL;
- mystring_t *sieve_name = NULL;
- mystring_t *sieve_data = NULL;
+ struct buf mechanism_name = BUF_INITIALIZER;
+ struct buf initial_challenge = BUF_INITIALIZER;
+ struct buf sieve_name = BUF_INITIALIZER;
+ struct buf sieve_data = BUF_INITIALIZER;
 unsigned long num;
 int ret = FALSE;
 
@@ -157,7 +156,7 @@
 
 if (!authenticated && (token > 255) && (token!=AUTHENTICATE) &&
 (token!=LOGOUT) && (token!=CAPABILITY) &&
- (token!=NOOP) &&
+ (token!=NOOP) && (token!=CHECKSCRIPT) &&
 (!tls_enabled() || (token!=STARTTLS)))
 {
 error_msg = "Authenticate first";
@@ -167,7 +166,8 @@
 goto error;
 }
 
- if (verify_only && (token > 255) && (token!=PUTSCRIPT) && (token!=LOGOUT))
+ if (verify_only && (token > 255) && (token!=CHECKSCRIPT)
+ && (token!=PUTSCRIPT) && (token!=LOGOUT))
 {
 error_msg = "Script verification only";
 if (token!=EOL)
@@ -181,6 +181,7 @@
 case EOF:
 /* timlex() will return EOF when the remote disconnects badly */
 syslog(LOG_WARNING, "Lost connection to client -- exiting");
+ prot_printf(sieved_out, "BYE \"Shutdown TCP timeout\"\r\n");
 ret = TRUE;
 goto done;
 break;
@@ -226,8 +227,8 @@
 
 if (authenticated)
 	prot_printf(sieved_out, "NO \"Already authenticated\"\r\n");
- else if (cmd_authenticate(sieved_out, sieved_in, mechanism_name,
-			 initial_challenge, &error_msg)==FALSE)
+ else if (cmd_authenticate(sieved_out, sieved_in, mechanism_name.s,
+			 &initial_challenge, &error_msg)==FALSE)
 {
 	error_msg = "Authentication Error";
 	goto error;
@@ -254,6 +255,31 @@
 		 sasl_ssf);
 break;
 
+ case CHECKSCRIPT:
+ if (timlex(NULL, NULL, sieved_in)!=SPACE)
+ {
+ error_msg = "SPACE must occur after CHECKSCRIPT";
+ goto error;
+ }
+
+ if (timlex(&sieve_data, NULL, sieved_in)!=STRING)
+ {
+ error_msg = "Expected script content as second parameter";
+ goto error;
+ }
+
+ if (timlex(NULL, NULL, sieved_in)!=EOL)
+ {
+ error_msg = "Expected EOL";
+ goto error;
+ }
+
+ /* f stands for "f"aked name, it could be any valid script name */
+ buf_reset(&sieve_name);
+ buf_appendcstr(&sieve_name, "f");
+ putscript(sieved_out, &sieve_name, &sieve_data, /* verify_only */ 1);
+ break;
+
 case HAVESPACE:
 if (timlex(NULL, NULL, sieved_in)!=SPACE)
 {
@@ -269,7 +295,7 @@
 
 if (timlex(NULL, NULL, sieved_in)!=SPACE)
 {
-	 error_msg = "Expected SPACE";
+	 error_msg = "Expected SPACE after SCRIPTNAME";
 	 goto error;
 }
 
@@ -288,7 +314,7 @@
 if(referral_host)
 	 goto do_referral;
 
- cmd_havespace(sieved_out, sieve_name, num);
+ cmd_havespace(sieved_out, &sieve_name, num);
 
 break;
 
@@ -332,7 +358,7 @@
 if(referral_host)
 	goto do_referral;
 
- getscript(sieved_out, sieve_name);
+ getscript(sieved_out, &sieve_name);
 
 break;
 
@@ -371,7 +397,7 @@
 if(referral_host)
 	goto do_referral;
 
- putscript(sieved_out, sieve_name, sieve_data, verify_only);
+ putscript(sieved_out, &sieve_name, &sieve_data, verify_only);
 
 break;
 
@@ -397,7 +423,7 @@
 if(referral_host)
 	goto do_referral;
 
- setactive(sieved_out, sieve_name);
+ setactive(sieved_out, &sieve_name);
 
 break;
 
@@ -423,7 +449,7 @@
 if(referral_host)
 	goto do_referral;
 
- deletescript(sieved_out, sieve_name);
+ deletescript(sieved_out, &sieve_name);
 
 break;
 
@@ -463,7 +489,6 @@
 case NOOP:
 
 token = timlex(NULL, NULL, sieved_in);
- mystring_t *noop_param = NULL;
 if (token != EOL)
 {
 /* optional string parameter */
@@ -473,10 +498,9 @@
 	goto error;
 }
 
- if (timlex(&noop_param, NULL, sieved_in)!=STRING)
+ if (timlex(&sieve_name, NULL, sieved_in)!=STRING)
 {
 	error_msg = "Expected string";
-	free(noop_param);
 	goto error;
 }
 
@@ -486,18 +510,13 @@
 if (token != EOL)
 {
 error_msg = "Expected EOL";
- free(noop_param);
 goto error;
 }
 
- if (noop_param != NULL) {
- int temp;
- char* dataptr = string_DATAPTR(noop_param);
- prot_printf(sieved_out, "OK (TAG {%d}\r\n", noop_param->len);
- for (temp = 0; temp < noop_param->len; temp++)
- prot_putc(dataptrtemp, sieved_out);
+ if (sieve_name.len) {
+ prot_printf(sieved_out, "OK (TAG ");
+ prot_printliteral(sieved_out, sieve_name.s, sieve_name.len);
 prot_printf(sieved_out, ") \"Done\"\r\n");
- free(noop_param);
 } else
 prot_printf(sieved_out, "OK \"Done\"\r\n");
 break;
@@ -520,10 +539,10 @@
 
 done: 
 /* free memory */
- free(mechanism_name);
- free(initial_challenge);
- free(sieve_name);
- free(sieve_data);
+ buf_free(&mechanism_name);
+ buf_free(&initial_challenge);
+ buf_free(&sieve_name);
+ buf_free(&sieve_data);
 
 prot_flush(sieved_out);
 
@@ -532,10 +551,10 @@
 error:
 
 /* free memory */
- free(mechanism_name);
- free(initial_challenge);
- free(sieve_name);
- free(sieve_data);
+ buf_free(&mechanism_name);
+ buf_free(&initial_challenge);
+ buf_free(&sieve_name);
+ buf_free(&sieve_data);
 
 prot_printf(sieved_out, "NO \"%s\"\r\n",error_msg);
 prot_flush(sieved_out);
@@ -587,34 +606,32 @@
 
 static int cmd_authenticate(struct protstream *sieved_out,
 			 struct protstream *sieved_in,
-			 mystring_t *mechanism_name,
-			 mystring_t *initial_challenge, 
+			 const char *mech,
+			 const struct buf *initial_challenge,
 			 const char **errmsg)
 {
 
 int sasl_result;
-
- char *mech = string_DATAPTR(mechanism_name);
-
- mystring_t *clientinstr=NULL;
 char *clientin = NULL;
 unsigned int clientinlen = 0;
 
 const char *serverout=NULL;
 unsigned int serveroutlen;
 const void *canon_user, *val;
- char *username;
+ char *username = NULL;
 int ret = TRUE;
+ mbentry_t *mbentry = NULL;
 
- clientinstr = initial_challenge;
- if (clientinstr!=NULL)
+ assert(initial_challenge);
+ if (initial_challenge->s)
 {
- clientin=(char *) malloc(clientinstr->len*2);
+ /* a value was provided on the wire, possibly of zero length */
+ clientin = xmalloc(initial_challenge->len*2);
 
- if (clientinstr->len) {
-	 sasl_result=sasl_decode64(string_DATAPTR(clientinstr), 
-				 clientinstr->len,
-				 clientin, clientinstr->len*2,
+ if (initial_challenge->len) {
+	 sasl_result=sasl_decode64(initial_challenge->s,
+				 initial_challenge->len,
+				 clientin, initial_challenge->len*2,
 				 &clientinlen);
 } else {
 	 clientinlen = 0;
@@ -626,12 +643,7 @@
 	*errmsg="error base64 decoding string";
 	syslog(LOG_NOTICE, "badlogin: %s %s %s",
 	 sieved_clienthost, mech, "error base64 decoding string");
-
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		EC_TEMPFAIL);
-
-	return FALSE;
+	goto reset;
 }
 }
 
@@ -643,7 +655,7 @@
 {
 int token1;
 int token2;
- mystring_t *str, *blahstr;
+ struct buf str = BUF_INITIALIZER, blahstr = BUF_INITIALIZER;
 char *inbase64;
 unsigned int inbase64len;
 
@@ -656,42 +668,35 @@
 prot_printf(sieved_out, "{%d}\r\n",inbase64len);
 prot_write(sieved_out,inbase64,inbase64len);
 prot_printf(sieved_out,"\r\n");
+ free(inbase64);
 
 token1 = timlex(&str, NULL, sieved_in);
 
 if (token1==STRING)
 {
- clientin=(char *) malloc(str->len*2);
+ free(clientin);
+ clientin = xmalloc(str.len*2);
 
- if (str->len) {
-	 sasl_result=sasl_decode64(string_DATAPTR(str), str->len,
-				 clientin, str->len*2, &clientinlen);
+ if (str.len) {
+	 sasl_result=sasl_decode64(str.s, str.len,
+				 clientin, str.len*2, &clientinlen);
 } else {
 	 clientinlen = 0;
 	 sasl_result = SASL_OK;
 }
+ buf_free(&str);
 
 if (sasl_result!=SASL_OK)
 {
 	*errmsg="error base64 decoding string";
 	syslog(LOG_NOTICE, "badlogin: %s %s %s",
 	 sieved_clienthost, mech, "error base64 decoding string");
+	goto reset;
+ }
 
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		EC_TEMPFAIL);
-
-	return FALSE;
- } 
- 
 } else {
 *errmsg="Expected STRING-xxx1";
-
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		EC_TEMPFAIL);
-
- return FALSE;
+ goto reset;
 }
 
 token2 = timlex(&blahstr, NULL, sieved_in);
@@ -707,12 +712,7 @@
 *errmsg = "expected a STRING followed by an EOL";
 syslog(LOG_NOTICE, "badlogin: %s %s %s",
 	 sieved_clienthost, mech, "expected string");
-
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		EC_TEMPFAIL);
-
- return FALSE;
+ goto reset;
 }
 
 }
@@ -725,12 +725,7 @@
 *errmsg = (const char *) sasl_errstring(sasl_result,NULL,NULL);
 syslog(LOG_NOTICE, "badlogin: %s %s %s",
 	 sieved_clienthost, mech, *errmsg);
-
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		EC_TEMPFAIL);
-
- return FALSE;
+ goto reset;
 }
 
 /* get the userid from SASL */
@@ -740,12 +735,7 @@
 *errmsg = "Internal SASL error";
 syslog(LOG_ERR, "SASL: sasl_getprop SASL_USERNAME: %s",
 	 sasl_errstring(sasl_result, NULL, NULL));
-
- if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	fatal("could not reset the sasl_conn_t after failure",
-	 EC_TEMPFAIL);
-
- return FALSE;
+ goto reset;
 }
 username = xstrdup((const char *) canon_user);
 
@@ -755,7 +745,6 @@
 /* Check for a remote mailbox (should we setup a redirect?) */
 struct namespace sieved_namespace;
 char inboxnameMAX_MAILBOX_BUFFER;
- struct mboxlist_entry mbentry;
 int r;
 
 /* Set namespace */
@@ -777,16 +766,10 @@
 if(r && !sieved_userisadmin) {
 	 /* lookup error */
 	 syslog(LOG_ERR, "%s", error_message(r));
-
-	 if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		 EC_TEMPFAIL);
-
-	 ret = FALSE;
-	 goto cleanup;
+	 goto reset;
 }
 
- if(mbentry.mbtype & MBTYPE_REMOTE) {
+ if (mbentry && mbentry->mbtype & MBTYPE_REMOTE) {
 	 /* It's a remote mailbox */
 	 if (config_getswitch(IMAPOPT_SIEVE_ALLOWREFERRALS)) {
 	 /* We want to set up a referral */
@@ -804,13 +787,7 @@
 		 *errmsg = "Internal SASL error";
 		 syslog(LOG_ERR, "SASL: sasl_getprop SASL_AUTHUSER: %s",
 			 sasl_errstring(sasl_result, NULL, NULL));
-
-		 if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-			 fatal("could not reset the sasl_conn_t after failure",
-				EC_TEMPFAIL);
-
-		 ret = FALSE;
-		 goto cleanup;
+		 goto reset;
 		 }
 		 authname = xstrdup((const char *) canon_user);
 
@@ -819,26 +796,21 @@
 
 		 referral_host =
 		 (char*) xmalloc(strlen(authname)+1+strlen(username)+1+
-				 strlen(mbentry.partition)+1);
+				 strlen(mbentry->server)+1);
 		 sprintf((char*) referral_host, "%s;%s@%s",
-			 authname, username, mbentry.partition);
+			 authname, username, mbentry->server);
 
 		 free(authname);
 	 }
 	 else
-		 referral_host = xstrdup(mbentry.partition);
+		 referral_host = xstrdup(mbentry->server);
 	 }
 	 else {
 	 /* We want to set up a connection to the backend for proxying */
 	 const char *statusline = NULL;
-	 char *c;
-
-	 /* xxx hide the fact that we are storing partitions */
-	 c = strchr(mbentry.partition, '!');
-	 if(c) *c = '\0';
 
-	 backend = backend_connect(NULL, mbentry.partition, &sieve_protocol,
-					username, NULL, &statusline);
+	 backend = backend_connect(NULL, mbentry->server, &sieve_protocol,
+					username, NULL, &statusline, -1);
 
 	 if (!backend) {
 		 syslog(LOG_ERR, "couldn't authenticate to backend server");
@@ -853,13 +825,7 @@
 } else if (actions_setuser(username) != TIMSIEVE_OK) {
 	 *errmsg = "internal error";
 	 syslog(LOG_ERR, "error in actions_setuser()");
-
-	 if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
-	 fatal("could not reset the sasl_conn_t after failure",
-		 EC_TEMPFAIL);
-
-	 ret = FALSE;
-	 goto cleanup;
+	 goto reset;
 }
 }
 
@@ -899,12 +865,21 @@
 
 /* Create telemetry log */
 sieved_logfd = telemetry_log(username, sieved_in, sieved_out, 0);
- 
- cleanup:
+
+cleanup:
 /* free memory */
+ mboxlist_entry_free(&mbentry);
 free(username);
+ free(clientin);
 
 return ret;
+
+reset:
+ if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK)
+ fatal("could not reset the sasl_conn_t after failure",
+	 EC_TEMPFAIL);
+ ret = FALSE;
+ goto cleanup;
 }
 
 #ifdef HAVE_SSL

cyrus-imapd-2.4.17.tar.gz/timsieved/parser.h -> cyrus-imapd-2.5.tar.gz/timsieved/parser.h Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/scripttest.c -> cyrus-imapd-2.5.tar.gz/timsieved/scripttest.c Changed

@@ -39,32 +39,30 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: scripttest.c,v 1.26 2010/01/06 17:02:01 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
-#include "sieve_interface.h"
-#include "scripttest.h"
+#include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
 
-#include "codes.h"
-
+#include "assert.h"
+#include "util.h"
 #include "xmalloc.h"
-#include <string.h>
-#include <stdlib.h>
+
+#include "timsieved/codes.h"
+#include "timsieved/scripttest.h"
 
 /* to make larry's stupid functions happy :) */ 
-void foo(void)
+static void foo(void)
 {
 fatal("stub function called", 0);
 }
 
 
-sieve_vacation_t vacation = {
+static sieve_vacation_t vacation = {
 0,				/* min response */
 0,				/* max response */
 (sieve_callback *) &foo,	/* autorespond() */
@@ -81,17 +79,11 @@
 return SIEVE_FAIL;
 }
 
-int mysieve_error(int lineno, const char *msg,
+static int mysieve_error(int lineno, const char *msg,
 		 void *i __attribute__((unused)), void *s)
 {
- char buf1024;
- char **errstr = (char **) s;
-
- snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
- *errstr = xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
- syslog(LOG_DEBUG, "%s", buf);
- strcat(*errstr, buf);
-
+ struct buf *errors = (struct buf *)s;
+ buf_printf(errors, "line %d: %s\r\n", lineno, msg);
 return SIEVE_OK;
 }
 
@@ -99,92 +91,30 @@
 int build_sieve_interp(void)
 {
 int res;
- 
- res = sieve_interp_alloc(&interp, NULL);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_interp_alloc() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
 
- res = sieve_register_redirect(interp, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_redirect() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- res = sieve_register_discard(interp, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_discard() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- res = sieve_register_reject(interp, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_reject() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- res = sieve_register_fileinto(interp, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_fileinto() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- res = sieve_register_keep(interp, (sieve_callback *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_keep() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
+ interp = sieve_interp_alloc(NULL);
+ assert(interp != NULL);
+
+ sieve_register_redirect(interp, (sieve_callback *) &foo);
+ sieve_register_discard(interp, (sieve_callback *) &foo);
+ sieve_register_reject(interp, (sieve_callback *) &foo);
+ sieve_register_fileinto(interp, (sieve_callback *) &foo);
+ sieve_register_keep(interp, (sieve_callback *) &foo);
+ sieve_register_imapflags(interp, NULL);
+ sieve_register_size(interp, (sieve_get_size *) &foo);
+ sieve_register_header(interp, (sieve_get_header *) &foo);
+ sieve_register_envelope(interp, (sieve_get_envelope *) &foo);
+ sieve_register_body(interp, (sieve_get_body *) &foo);
+ sieve_register_include(interp, (sieve_get_include *) &foo);
 
- res = sieve_register_imapflags(interp, NULL);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_imapflags() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
-
- res = sieve_register_size(interp, (sieve_get_size *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_size() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- 
- res = sieve_register_header(interp, (sieve_get_header *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_header() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- 
- res = sieve_register_envelope(interp, (sieve_get_envelope *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_envelope() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- 
- res = sieve_register_body(interp, (sieve_get_body *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_body() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- 
- res = sieve_register_include(interp, (sieve_get_include *) &foo);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_include() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
- 
 res = sieve_register_vacation(interp, &vacation);
 if (res != SIEVE_OK) {
 	syslog(LOG_ERR, "sieve_register_vacation() returns %d\n", res);
 	return TIMSIEVE_FAIL;
 }
 
- res = sieve_register_notify(interp, &sieve_notify);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_notify() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
-
- res = sieve_register_parse_error(interp, &mysieve_error);
- if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_parse_error() returns %d\n", res);
-	return TIMSIEVE_FAIL;
- }
+ sieve_register_notify(interp, &sieve_notify);
+ sieve_register_parse_error(interp, &mysieve_error);
 
 return TIMSIEVE_OK;
 }
@@ -194,13 +124,14 @@
 {
 sieve_script_t *s;
 int res;
- 
+ struct buf errors = BUF_INITIALIZER;
+
 rewind(stream);
 
- *errstr = (char *) xmalloc(20 * sizeof(char));
- strcpy(*errstr, "script errors:\r\n");
+ buf_appendcstr(&errors, "script errors:\r\n");
+ *errstr = NULL;
 
- res = sieve_script_parse(interp, stream, errstr, &s);
+ res = sieve_script_parse(interp, stream, &errors, &s);
 
 if (res == SIEVE_OK) {
 	if(ret) {
@@ -208,9 +139,11 @@
 	} else {
 	 sieve_script_free(&s);
 	}
-	free(*errstr);
-	*errstr = NULL;
 }
-
+ else {
+	sieve_script_free(&s);
+	*errstr = buf_release(&errors);
+ }
+ buf_free(&errors);
 return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
 }

cyrus-imapd-2.4.17.tar.gz/timsieved/scripttest.h -> cyrus-imapd-2.5.tar.gz/timsieved/scripttest.h Changed

cyrus-imapd-2.4.17.tar.gz/timsieved/timsieved.c -> cyrus-imapd-2.5.tar.gz/timsieved/timsieved.c Changed

@@ -40,60 +40,42 @@
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: timsieved.c,v 1.65 2010/01/06 17:02:01 murch Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <arpa/inet.h>
+#include <dirent.h>
+#include <limits.h>
+#include <netdb.h>
+#include <netinet/in.h>
 #include <sasl/sasl.h> /* yay! sasl */
-
+#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <string.h>
 #include <sys/param.h>
-#include <syslog.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <netdb.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <sys/stat.h>
+#include <syslog.h>
 #include <unistd.h>
-#include <signal.h>
-#include <string.h>
-
-#include "sieve_interface.h"
 
-#include "prot.h"
+#include "auth.h"
+#include "exitcodes.h"
 #include "libconfig.h"
 #include "xmalloc.h"
-#include "exitcodes.h"
-#include "iptostring.h"
-#include "global.h"
-#include "codes.h"
-#include "actions.h"
-#include "parser.h"
-#include "lex.h"
-#include "mystring.h"
-
-#include "auth.h"
-#include "acl.h"
-#include "backend.h"
-#include "mboxlist.h"
-#include "proxy.h"
-#include "util.h"
-#include "xstrlcat.h"
-#include "xstrlcpy.h"
-
-#include "scripttest.h"
-
-#include "sync_log.h"
+#include "imap/backend.h"
+#include "imap/global.h"
+#include "imap/mboxlist.h"
+#include "imap/proxy.h"
+#include "imap/sync_log.h"
+#include "timsieved/actions.h"
+#include "timsieved/codes.h"
+#include "timsieved/parser.h"
+#include "timsieved/scripttest.h"
+#include "timsieved/lex.h"
 
 /* global state */
 const int config_need_data = 0;
@@ -108,10 +90,7 @@
 
 sasl_conn_t *sieved_saslconn; /* the sasl connection context */
 
-struct auth_state *sieved_authstate = 0;
-
-struct sockaddr_storage sieved_localaddr;
-struct sockaddr_storage sieved_remoteaddr;
+static struct auth_state *sieved_authstate = 0;
 
 int sieved_timeout;
 struct protstream *sieved_out;
@@ -119,8 +98,7 @@
 
 int sieved_logfd = -1;
 
-int sieved_haveaddr = 0;
-char sieved_clienthostNI_MAXHOST*2+1 = "local";
+const char *sieved_clienthost = "local";
 
 int sieved_userisadmin;
 int sieved_domainfromip = 0;
@@ -176,7 +154,7 @@
 exit(code);
 }
 
-void cmdloop()
+static void cmdloop(void)
 {
 int ret = FALSE;
 
@@ -209,14 +187,7 @@
 shut_down(0);
 }
 
-void printstring(const char *s __attribute__((unused)))
-{
- /* needed to link against annotate.o */
- fatal("printstring() executed, but its not used for timsieved!",
-	 EC_SOFTWARE);
-}
-
-void fatal(const char *s, int code)
+EXPORTED void fatal(const char *s, int code)
 {
 static int recurse_code = 0;
 
@@ -239,7 +210,7 @@
 { SASL_CB_LIST_END, NULL, NULL }
 };
 
-int service_init(int argc __attribute__((unused)),
+EXPORTED int service_init(int argc __attribute__((unused)),
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
@@ -255,20 +226,17 @@
 }
 
 /* Called by service API to shut down the service */
-void service_abort(int error)
+EXPORTED void service_abort(int error)
 {
 shut_down(error);
 }
 
-int service_main(int argc __attribute__((unused)),
+EXPORTED int service_main(int argc __attribute__((unused)),
 		 char **argv __attribute__((unused)),
 		 char **envp __attribute__((unused)))
 {
- socklen_t salen;
- char remoteip60, localip60;
+ const char *remoteip, *localip;
 sasl_security_properties_t *secprops = NULL;
- char hbufNI_MAXHOST;
- int niflags;
 
 sync_log_init();
 
@@ -287,32 +255,7 @@
 if (geteuid() == 0) fatal("must run as the Cyrus user", -6);
 
 /* Find out name of client host */
- salen = sizeof(sieved_remoteaddr);
- if (getpeername(0, (struct sockaddr *)&sieved_remoteaddr, &salen) == 0 &&
-	(sieved_remoteaddr.ss_family == AF_INET ||
-	 sieved_remoteaddr.ss_family == AF_INET6)) {
-	if (getnameinfo((struct sockaddr *)&sieved_remoteaddr, salen,
-			hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-	 strncpy(sieved_clienthost, hbuf, sizeof(hbuf));
-	} else {
-	 sieved_clienthost0 = '\0';
-	}
-	niflags = NI_NUMERICHOST;
-#ifdef NI_WITHSCOPEID
-	if (((struct sockaddr *)&sieved_remoteaddr)->sa_family == AF_INET6)
-	 niflags |= NI_WITHSCOPEID;
-#endif
-	if (getnameinfo((struct sockaddr *)&sieved_remoteaddr, salen, hbuf,
-			sizeof(hbuf), NULL, 0, niflags) != 0)
-	 strlcpy(hbuf, "unknown", sizeof(hbuf));
-	strlcat(sieved_clienthost, "", sizeof(sieved_clienthost));
-	strlcat(sieved_clienthost, hbuf, sizeof(sieved_clienthost));
-	strlcat(sieved_clienthost, "", sizeof(sieved_clienthost));
-	salen = sizeof(sieved_localaddr);
-	if(getsockname(0, (struct sockaddr *)&sieved_localaddr, &salen) == 0) {
-	 sieved_haveaddr = 1;
-	}
- }
+ sieved_clienthost = get_clienthost(0, &localip, &remoteip);
 
 /* other params should be filled in */
 if (sasl_server_new(SIEVE_SERVICE_NAME, config_servername, NULL,
@@ -320,13 +263,11 @@
 			&sieved_saslconn) != SASL_OK)
 	fatal("SASL failed initializing: sasl_server_new()", -1); 
 
- if(iptostring((struct sockaddr *)&sieved_remoteaddr,
-		 salen, remoteip, 60) == 0) {
+ if (remoteip) {
 	sasl_setprop(sieved_saslconn, SASL_IPREMOTEPORT, remoteip);
 	saslprops.ipremoteport = xstrdup(remoteip);
 }
- if(iptostring((struct sockaddr *)&sieved_localaddr,
-		 salen, localip, 60) == 0) {
+ if (localip) {
 	sasl_setprop(sieved_saslconn, SASL_IPLOCALPORT, localip);
 	saslprops.iplocalport = xstrdup(localip);
 }

cyrus-imapd-2.5.tar.gz/tools/compile_st.pl Added

@@ -0,0 +1,316 @@
+#!/usr/bin/perl
+#
+# compile_st.pl - compile string table into .h and .c files
+#
+# Copyright (c) 1994-2010 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+use strict;
+use warnings;
+use File::Temp qw/ tempfile /;
+
+my $c_flag = 0;
+my $h_flag = 0;
+my $infile;
+
+sub usage()
+{
+ print STDERR "Usage: compile_st.pl -c input.st | gperf > output.c\n";
+ print STDERR " compile_st.pl -h input.st > output.h\n";
+ exit 1;
+}
+
+while (my $a = shift)
+{
+ if ($a eq "-c")
+ {
+	$c_flag = 1;
+ }
+ elsif ($a eq "-h")
+ {
+	$h_flag = 1;
+ }
+ elsif ($a eq "--help")
+ {
+	usage();
+ }
+ elsif ($a =~ m/^-/)
+ {
+	usage();
+ }
+ else
+ {
+	usage()
+	 if defined $infile;
+	$infile = $a;
+ }
+}
+
+usage()
+ unless defined $infile;
+
+die "Please specify exactly one of -c or -h"
+ unless ($c_flag + $h_flag == 1);
+
+# variables containing the logical contents of the string table file
+my @gperf_directives = (
+ "includes",
+ "compare-strncmp",
+ "language=ANSI-C",
+ "readonly-tables",
+ "struct-type"
+);
+my $name;
+my $unknown;
+my $next_unknown = -1;
+my $next_known = 0;
+my @entries;
+my $nliterals = 0;
+my $nenums = 0;
+my $type;
+
+#
+# Slurp the .st stringtab file into variables.
+#
+
+open ST,'<',$infile
+ or die "Cannot open $infile for reading: $!";
+while (<ST>)
+{
+ chomp;
+ next if m/^\s*#/;	 # skip comments
+ next if m/^\s*$/;	 # skip empty lines
+ my @a = split;
+
+ if ($a0 eq "%ignore-case" && scalar(@a) == 1)
+ {
+	push(@gperf_directives, "ignore-case");
+ }
+ elsif ($a0 =~ m/^%/)
+ {
+	die "Unrecognised gperf declaration \"$_\"";
+ }
+ elsif ($a0 eq "table")
+ {
+	die "Wrong number of arguments for \"table\""
+	 unless scalar(@a) == 2;
+	$name = $a1;
+ }
+ elsif ($a0 eq "ent")
+ {
+	my $enum;
+	my $literal;
+	my $string;
+	my $value;
+
+	($enum) = ($a1 =~ m/^(A-Za-z_A-Za-z_0-9*)$/);
+	if (!defined $enum)
+	{
+	 ($literal) = ($a1 =~ m/^(0-9+|0x0-9a-fA-F+)$/);
+	}
+	die "Bad syntax for \"ent\" at or near \"$_\""
+	 unless (defined $enum || defined $literal);
+
+	if (defined $a2)
+	{
+	 ($string) = m/^\s*ent\s+\S+\s+"(^"+)"\s*$/;
+	 die "Bad syntax for \"ent\" at or near \"$_\""
+		unless defined $string;
+	}
+
+	if (!defined $string)
+	{
+	 $value = $next_unknown;
+	 $next_unknown--;
+	 $unknown = $enum
+		unless defined $unknown;
+	}
+	else
+	{
+	 $value = $next_known;
+	 $next_known++;
+	}
+
+	push(@entries, {
+	 enum => $enum,
+	 literal => $literal,
+	 value => $value,
+	 string => $string
+	});
+	$nenums++ if defined $enum;
+	$nliterals++ if defined $literal;
+ }
+ else
+ {
+	die "Unrecognised keyword at or near \"$_\"";
+ }
+}
+close ST;
+
+die "No table name defined in $infile"
+ unless defined $name;
+die "No string entries defined"
+ unless scalar(@entries) > 0;
+$unknown = "-1"
+ unless defined $unknown;
+$type = ($nenums ? "enum $name" : "int");
+
+# Emit the C header file is requested
+if ($h_flag)
+{
+ printf "/* Automatically generated by compile_st.pl, do not edit */\n";
+ printf "#ifndef __STRING_TABLE_%s_H_\n", $name;
+ printf "#define __STRING_TABLE_%s_H_ 1\n", $name;
+ printf "\n";
+ printf "#include <string.h>\n";
+ printf "\n";
+
+ if ($nenums)
+ {
+	printf "enum %s {\n", $name;
+	foreach my $e (@entries)
+	{
+	 next if !defined $e->{enum};
+	 printf " %s", $e->{enum};
+	 printf "=%d", $e->{value}
+		if defined $e->{value};
+	 printf ",\n"
+	}
+	printf "};\n";
+ }
+
+ printf "extern %s %s_from_string(const char *s);\n", $type, $name;
+ printf "extern %s %s_from_string_len(const char *s, size_t len);\n", $type, $name;
+ if (!$nliterals)
+ {
+	printf "extern const char *%s_to_string(%s v);\n", $name, $type;
+ }
+
+ printf "\n";
+ printf "#endif /* __STRING_TABLE_%s_H_ */\n", $name;
+}
+
+# Emit the gperf source file if requested
+if ($c_flag)
+{
+ my ($fh, $filename) = tempfile('compile_st_XXXXXX', TMPDIR => 1, SUFFIX => '.gperf');
+
+ printf $fh "%%define lookup-function-name __%s_lookup\n", $name;
+ foreach my $d (@gperf_directives)
+ {
+	printf $fh "%%%s\n", $d;
+ }
+
+ printf $fh "%%{\n";
+ printf $fh "/* Automatically generated by compile_st.pl, do not edit */\n";
+ printf $fh "#include \"%s.h\"\n", $name;
+ printf $fh "%%}\n";
+
+ printf $fh "struct %s_desc { const char *name; %s value; };\n", $name, $type;
+ printf $fh "%%%%\n";
+
+ foreach my $e (@entries)
+ {
+	next unless defined $e->{string};
+	if (defined $e->{enum})
+	{
+	 printf $fh "%s, %s\n", $e->{string}, $e->{enum};
+	}
+	elsif (defined $e->{literal})
+	{
+	 printf $fh "%s, %s\n", $e->{string}, $e->{literal};
+	}
+ }
+
+ printf $fh "%%%%\n";
+
+ printf $fh "%s %s_from_string(const char *s)\n", $type, $name;
+ printf $fh "{\n";
+ printf $fh " const struct %s_desc *d = __%s_lookup(s, strlen(s));\n", $name, $name;
+ printf $fh " return (d == NULL ? %s : d->value);\n", $unknown;
+ printf $fh "}\n";
+ printf $fh "\n";
+ printf $fh "%s %s_from_string_len(const char *s, size_t len)\n", $type, $name;
+ printf $fh "{\n";
+ printf $fh " const struct %s_desc *d = __%s_lookup(s, len);\n", $name, $name;
+ printf $fh " return (d == NULL ? %s : d->value);\n", $unknown;
+ printf $fh "}\n";
+ printf $fh "\n";
+ if (!$nliterals)
+ {
+	printf $fh "const char *%s_to_string(%s v)\n", $name, $type;
+	printf $fh "{\n";
+	printf $fh " static const char * const strs = {\n";
+	foreach my $e (@entries)
+	{
+	 next unless defined $e->{string};
+	 printf $fh "\t\"%s\", /* %s */\n", $e->{string}, $e->{enum};
+	}
+	printf $fh " };\n";
+	printf $fh " return (v >= 0 && v < (int)(sizeof(strs)/sizeof(strs0)) ? strsv : NULL);\n";
+	printf $fh "}\n";
+ }
+
+ close $fh;
+
+ my @cmd = ( 'gperf', $filename );
+ open GPERF,'-|',@cmd
+	or die "Couldn't run gperf";
+
+ # Post-process to fix warnings due to missing
+ # initializers in the wordlist.
+ my $s = 0;
+ while (<GPERF>)
+ {
+	chomp;
+
+	next if m/^#line/;
+	s/{""}/{"", 0}/g if ($s);
+	$s = 1 if m/wordlist/;
+	$s = 0 if ($s && m/};/);
+
+	print "$_\n";
+ }
+
+ close GPERF;
+
+ unlink($filename);
+}
+

cyrus-imapd-2.4.17.tar.gz/tools/config2header -> cyrus-imapd-2.5.tar.gz/tools/config2header Changed

@@ -38,8 +38,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: config2header,v 1.17 2010/01/06 17:02:01 murch Exp $
 
 exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 #!perl -w
@@ -122,14 +120,13 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include "imapopts.h"
 
-struct imapopt_s imapopts =
+EXPORTED struct imapopt_s imapopts =
 {
- { IMAPOPT_ZERO, "", 0, OPT_NOTOPT, { NULL }, { { NULL, IMAP_ENUM_ZERO } } },
+ { IMAPOPT_ZERO, "", 0, OPT_NOTOPT, { NULL }, { NULL }, { { NULL, IMAP_ENUM_ZERO } } },
 EOF
 ;
 
@@ -164,6 +161,7 @@
 	 # strip quotes from default value
 	 $def = substr($2, 1, -1);
 	 $e = "IMAP_ENUM_" . uc($opt) . "_" . uc($def);
+	 $e =~ s/^0-9A-Z_a-z/_/g;
 	 $def = $use_gcc_extension
 			? "(union config_value)((enum enum_value) $e)"
 			: "{(void *)($e)}";
@@ -171,6 +169,7 @@
 	 # output the enum_options
 	 foreach $v (@values) {
 		$e = "IMAP_ENUM_" . uc($opt) . "_" . uc($v);
+		$e =~ s/^0-9A-Z_a-z/_/g;
 		$enums .= " { \"$v\" , $e },\n ";
 
 		# if this is the first enum value, normalize to zero
@@ -214,7 +213,9 @@
 	 @values = split(' ', $def);
 	 $e = "";
 	 foreach $v (@values) {
-		$e .= "IMAP_ENUM_" . uc($opt) . "_" . uc($v) . "\n\t\t\t | ";
+		my $ev = "IMAP_ENUM_" . uc($opt) . "_" . uc($v);
+		$ev =~ s/^0-9A-Z_a-z/_/g;
+		$e .= "$ev\n\t\t\t | ";
 	 }
 	 $e .= "0";
 	 $def = $use_gcc_extension
@@ -225,6 +226,7 @@
 	 @values = eval $4;
 	 foreach $v (@values) {
 		$e = "IMAP_ENUM_" . uc($opt) . "_" . uc($v);
+		$e =~ s/^0-9A-Z_a-z/_/g;
 		$enums .= " { \"$v\" , $e },\n ";
 
 		# add the corresponding bit value
@@ -245,7 +247,7 @@
 	}
 
 	print CFILE " { IMAPOPT_", uc($opt), ", \"$1\", 0, OPT_$3,\n",
-	" $def,\n {$enums { NULL, IMAP_ENUM_ZERO } } },\n";
+	" $def,\n $def,\n {$enums { NULL, IMAP_ENUM_ZERO } } },\n";
 } else {
 	#chomp;
 	#print "rejected '$_'\n";
@@ -295,6 +297,7 @@
 int seen;
 const enum opttype t;
 union config_value val;
+ const union config_value def;
 EOF
 ;
 
@@ -310,7 +313,7 @@
 ;
 
 print CFILE <<EOF
- { IMAPOPT_LAST, NULL, 0, OPT_NOTOPT, { NULL }, { { NULL, IMAP_ENUM_ZERO } } }
+ { IMAPOPT_LAST, NULL, 0, OPT_NOTOPT, { NULL }, { NULL }, { { NULL, IMAP_ENUM_ZERO } } }
 };
 
 /* c code goes here */

cyrus-imapd-2.4.17.tar.gz/tools/config2man -> cyrus-imapd-2.5.tar.gz/tools/config2man Changed

@@ -38,8 +38,6 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# $Id: config2man,v 1.6 2010/01/06 17:02:01 murch Exp $
 
 exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 #!perl -w
@@ -79,6 +77,7 @@
 my $mode = 0;
 my $save = "";
 my $enums = "";
+my $opt;
 
 my $blank = "";
 my $version = "\$Revision: 1.6 $blank";
@@ -91,7 +90,7 @@
 	# look for { option, default, type enums }; don't output until we
 	# hit a comment
 	if (m|{\s*\"(.*?)\"\s*,\s*\"?(.*?)\"?\s*,\s*(.*?)\s*($.*$)?\s*}|) {
-	 my $opt = $1;
+	 $opt = $1;
 	 my $def = $2 eq "NULL" ? "<none>" : $2;
 	 if ($def eq "") { $def = "<empty string>" }
 	 $save = ".IP \"\\fB$1:\\fR $def\" 5\n";
@@ -103,12 +102,14 @@
 	 print $save; $save = "";
 	 print "$1\n";
 	 if ($enums) { print_values($enums); }
+	 $opt = undef;
 	}
 
 	# look for /* to shift into passthrough mode; print current
 	# cached option header if any
 	elsif (m|/\*\s*(.*)|) {
 	 print $save; $save = "";
+	 if (defined $opt) { print ".RS 5\n"; }
 	 print $1;
 	 print "\n"; # add LF so lines don't run together
 	 $mode = 1;
@@ -124,6 +125,8 @@
 	 print "\n";
 	 if ($enums) { print_values($enums); }
 	 $mode = 0; # back to search mode
+	 if (defined $opt) { print ".RE\n"; }
+	 $opt = undef;
 	} elsif (m|\s*(.*)\s*|) {
 	 print "$1\n";
 	}

cyrus-imapd-2.4.17.tar.gz/tools/dohash -> cyrus-imapd-2.5.tar.gz/tools/dohash Changed

cyrus-imapd-2.5.tar.gz/tools/fixsearchpath.pl Added

@@ -0,0 +1,119 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+use strict;
+use warnings;
+use Config;
+
+sub normalise {
+ my $s = shift;
+ $s =~ s/\/+$//;
+ return $s;
+}
+
+sub quote {
+ my $s = shift;
+ return "'$s'";
+}
+
+sub usage {
+ die "Usage: $0 cyrus_prefix cyrus_bindir";
+}
+
+my $cyrus_prefix = normalise(shift || usage);
+my $cyrus_bindir = normalise(shift || usage);
+my $perl_prefix = normalise($Config{prefix});
+
+# These directories are listed in the reverse of the order that we want
+# them searched, assuming that we will emit multiple "use lib"
+# directives each of which *prepends* its argument to @INC.
+my @dirvars = (
+ { dir => 'installvendorlib', prefix => 'vendorprefix' },
+ { dir => 'installvendorarch', prefix => 'vendorprefix' },
+ { dir => 'installsitelib', prefix => 'siteprefix' },
+ { dir => 'installsitearch', prefix => 'siteprefix' },
+);
+
+my $boilerplate = << 'EOT'
+## Boilerplate added by Cyrus fixsearchpath.pl
+my $__cyrus_destdir = '';
+BEGIN {
+ if ($0 =~ m/\//) {
+	my $d = $0;
+EOT
+;
+$boilerplate .= "	my \$bindir = " . quote($cyrus_bindir) . ";\n";
+$boilerplate .= << 'EOT'
+	# remove the filename, $d is now the installed bindir
+	$d =~ s/\/^\/+$//;
+	# check if the path ends in the configured bindir
+	my $len = length($d)-length($bindir);
+	if (substr($d, $len) eq $bindir) {
+	 # if so then the installed destdir is what remains
+	 $__cyrus_destdir = substr($d, 0, $len);
+	}
+ }
+};
+EOT
+;
+
+foreach my $dv (@dirvars) {
+ my $dir = $Config{$dv->{dir}};
+ if ($cyrus_prefix ne $perl_prefix) {
+	# Expect to be installed into a non-default location
+	# because Cyrus was built with a non-default --prefix
+	my $install_prefix = normalise($Config{$dv->{prefix}});
+	$dir = $cyrus_prefix . substr($dir, length($install_prefix))
+ }
+ $boilerplate .= 'use lib $__cyrus_destdir . ' . quote($dir) . ";\n";
+}
+$boilerplate .= "##\n\n";
+
+# Filter stdin to stdout
+while (<STDIN>)
+{
+ if (defined $boilerplate && m/^use\s/) {
+	print $boilerplate;
+	$boilerplate = undef;
+ }
+ print $_;
+}

cyrus-imapd-2.5.tar.gz/tools/jenkins-build.sh Added

@@ -0,0 +1,224 @@
+#!/bin/bash
+#
+# Copyright (c) 1994-2012 Carnegie Mellon University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+# endorse or promote products derived from this software without
+# prior written permission. For permission or any legal
+# details, please contact
+# Carnegie Mellon University
+# Center for Technology Transfer and Enterprise Creation
+# 4615 Forbes Avenue
+# Suite 302
+# Pittsburgh, PA 15213
+# (412) 268-7393, fax: (412) 268-7395
+# innovation@andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+# acknowledgment:
+# "This product includes software developed by Computing Services
+# at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#
+# Script to configure and build Cyrus from a new git checkout,
+# and run some tests. Designed to be used from the Jenkins CI
+# server as a build script.
+#
+
+function fatal()
+{
+ echo "$0: $*" 1>&2
+ exit 1
+}
+
+## Ensure $PATH is right
+PATH=/usr/bin:/bin:/usr/sbin:/usr/local/bin:$PATH
+
+echo "==================== CYRUS IMAPD ===================="
+
+if -n "$JENKINS_HOME" -a -n "$BUILD_ID" -a -n "$WORKSPACE" ; then
+ echo "Invoked from Jenkins"
+ CYRUS_SRC="$WORKSPACE/imapd"
+ CYRUS_INST="$WORKSPACE/inst"
+ CASSANDANE_SRC="$WORKSPACE/cassandane"
+ # We want new files to be group-writable
+ # so that the Cassandane tests running
+ # as user 'cyrus' can write them
+ umask 002
+else
+ -n "$CYRUS_YES_I_KNOW_WHAT_IM_DOING" || \
+	fatal "Do not run $0 manually, use autoreconf -vi ; ./configure ; make"
+ echo "Invoked manually"
+ echo "(assumed, as one of \$JENKINS_HOME \$BUILD_ID or \$WORKSPACE is missing)"
+ BUILD_ID=build$(date +%Y%m%dT%H%M%S)
+ WORKSPACE=$(cd .. ; /bin/pwd)
+ CYRUS_SRC=$(/bin/pwd)
+ CYRUS_INST=$(cd ../inst ; /bin/pwd)
+ CASSANDANE_SRC=$(cd ../cassandane ; /bin/pwd)
+fi
+
+echo "Build ID is $BUILD_ID"
+echo "Workspace is $WORKSPACE"
+echo " - Cyrus IMAPD source in $CYRUS_SRC"
+echo " - Temporary Cyrus IMAPD installation will be in $CYRUS_INST"
+echo " - Cassandane test suite expected in $CASSANDANE_SRC"
+
+TGGCOV=$(which tggcov 2>/dev/null)
+HISTCOV=$(which git-history-coverage 2>/dev/null)
+if -n "$TGGCOV" -a -x "$TGGCOV" ; then
+ echo "Found coverage tools, enabling coverage"
+ echo " - tggcov: $TGGCOV"
+ echo " - git-history-coverage: $HISTCOV"
+ COVERAGE=--enable-coverage
+else
+ echo "No coverage tools found, disabling coverage"
+ echo "(ggcov may be downloaded from ggcov.sourceforge.net)"
+fi
+
+
+
+COPTIMISEFLAGS="-O0"
+CONFIGURE_ARGS="\
+ --prefix=/usr/cyrus \
+ --with-cyrus-prefix=/usr/cyrus \
+ --with-ldap \
+ --with-openssl \
+ --disable-event-notification \
+ --enable-sieve \
+ --enable-idled \
+ --enable-nntp \
+ --enable-murder \
+ --enable-replication \
+ --enable-unit-tests \
+ --enable-maintainer-mode \
+ $COVERAGE \
+ "
+
+NCPUS=$(grep '^processor' /proc/cpuinfo | wc -l)
+ $NCPUS -ge 1 || fatal "Can't get number of CPUs"
+
+ -d "$CYRUS_SRC" || fatal "$CYRUS_SRC: no such directory"
+cd "$CYRUS_SRC" || fatal "$CYRUS_SRC: cannot cd"
+ -d .git || fatal "$CYRUS_SRC: not a git repository"
+nfiles=$(git ls-files|wc -l)
+ $nfiles -gt 0 || fatal "$CYRUS_SRC: cannot list git controlled files"
+
+BRANCH=$(git branch | sed -n -e 's/^\* \t\+//p')
+ -n "$BRANCH" || fatal "Can't get git branch"
+ "$BRANCH" != "(no branch)" || fatal "Not on any git branch"
+COMMIT=$(git log --pretty='format:%h' HEAD^..HEAD|head -1)
+ -n "$COMMIT" || fatal "Can't get git top commit"
+echo "Building on git branch $BRANCH, top commit $COMMIT"
+CONFIGURE_ARGS="--with-extraident=$BRANCH-$COMMIT $CONFIGURE_ARGS"
+
+set -x
+git ls-files -o
+git status
+
+
+# do the whole autotools dance
+ -f Makefile && make maintainer-clean
+autoreconf -i -f -v || fatal "Can't run autoreconf"
+ -f configure || fatal "autoconf did not produce a configure script"
+CFLAGS="-g -W -Wall -Wextra" ./configure $CONFIGURE_ARGS || fatal "Cannot run configure"
+ -f config.status || fatal "configure did not produce a config.status script"
+# Tweak makefiles for optimisation flags
+perl -p -i.orig -e 's/^(CFLAGS\s*=\s*.*)\s+-O2/\1 '"$COPTIMISEFLAGS"'/' $mf $(find . -name Makefile)
+
+# Finally the actual build
+make -j$NCPUS all || fatal "Can't make all"
+
+# Run CUnit based unit tests
+# -n "$COVERAGE" && find . -name '*.gcda' -exec rm '{}' \;
+make CUFORMAT=junit check || fatal "Can't make check"
+
+# Do a temporary install for Cassandane
+ -d $CYRUS_INST.old && rm -rf $CYRUS_INST.old
+ -d $CYRUS_INST && mv -f $CYRUS_INST $CYRUS_INST.old
+mkdir -p $CYRUS_INST || fatal "$CYRUS_INST: can't mkdir"
+make DESTDIR=$CYRUS_INST install || fatal "Can't install"
+
+exitcode=0
+
+# Run Cassandane tests
+if -d $CASSANDANE_SRC ; then
+
+## Not needed anymore, user cyrus is in group tomcat
+# if -n "$COVERAGE" ; then
+# 	chmod 666 $(find . -type f -name '*.gcda')
+# fi
+
+ # Shoot down any leftover processes - Cassandane sometimes
+ # leaks these under mysterious circumstances. Sadly this means
+ # we cannot run two autobuilds in parallel, oh well :(
+ # The -n is to prevent sudo going interactive.
+ sudo -n /usr/bin/killall -u cyrus
+
+ # TODO: factor this out into a shell function
+ cd "$CASSANDANE_SRC" || fatal "$CASSANDANE_SRC: cannot cd"
+ -d .git || fatal "$CASSANDANE_SRC: not a git repository"
+ nfiles=$(git ls-files|wc -l)
+ $nfiles -gt 0 || fatal "$CASSANDANE_SRC: cannot list git controlled files"
+
+ git ls-files -o
+ git status
+
+ make || fatal "Can't make in cassandane/";
+
+ # Build cassandane.ini
+ sed -e 's|^##destdir =.*$|destdir = '$CYRUS_INST'|' \
+ -e 's|^##pwcheck = .*$|pwcheck = sasldb|' \
+	< cassandane.ini.example \
+	> cassandane.ini
+
+ rm -rf reports.old
+ mv -f reports reports.old
+ mkdir -m 0777 reports || fatal "Can't mkdir reports"
+
+ ./testrunner.pl --cleanup -f xml -v > cass.errs 2>&1 || exitcode=1
+
+ -x jenkins-xml-summary.pl && ./jenkins-xml-summary.pl ${BUILD_URL:+--build-url=$BUILD_URL}
+
+ # Shoot down leftover processes again
+ ps -u cyrus
+ sudo -n /usr/bin/killall -u cyrus
+
+ cd "$CYRUS_SRC"
+fi
+
+# Report on coverage
+# -n "$COVERAGE" && $TGGCOV --report=summary_all -r . 2>/dev/null
+ -n "$COVERAGE" && $TGGCOV --report=cobertura -r . 2>/dev/null > coverage.xml
+
+# The first line in this file is like
+# Changes in branch origin/for-upstream, between $SHA and $SHA
+if -n "$JENKINS_HOME" ; then
+revlist=$(perl \
+ -n \
+ -e 's/^Changes .*between (:xdigit:{40}) and (:xdigit:{40})/\1..\2/; print; exit 0;' \
+ $WORKSPACE/../builds/$BUILD_ID/changelog.xml \
+ 2>/dev/null)
+ -n "$revlist" && $HISTCOV $revlist 2>/dev/null
+fi
+
+exit $exitcode

cyrus-imapd-2.4.17.tar.gz/tools/masssievec -> cyrus-imapd-2.5.tar.gz/tools/masssievec Changed

cyrus-imapd-2.4.17.tar.gz/tools/migrate-metadata -> cyrus-imapd-2.5.tar.gz/tools/migrate-metadata Changed

cyrus-imapd-2.4.17.tar.gz/tools/mkimap -> cyrus-imapd-2.5.tar.gz/tools/mkimap Changed

cyrus-imapd-2.4.17.tar.gz/tools/mknewsgroups -> cyrus-imapd-2.5.tar.gz/tools/mknewsgroups Changed

cyrus-imapd-2.4.17.tar.gz/tools/translatesieve -> cyrus-imapd-2.5.tar.gz/tools/translatesieve Changed

cyrus-imapd-2.4.17.tar.gz/tools/undohash -> cyrus-imapd-2.5.tar.gz/tools/undohash Changed

cyrus-imapd-2.4.17.tar.gz/tools/upgradesieve -> cyrus-imapd-2.5.tar.gz/tools/upgradesieve Changed

cyrus-imapd.dsc Changed

@@ -2,9 +2,9 @@
 Source: cyrus-imapd
 Binary: cyrus-imapd
 Architecture: any
-Version: 2.4.17-8
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Version: 2.5~dev2014011701-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.cyrusimap.org/
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.kolabsys.com/apt/cyrus-imapd/
@@ -21,19 +21,23 @@
 groff,
 heimdal-dev,
 libdb5.1-dev | libdb-dev,
+ libjansson-dev,
 libkvm-dev kfreebsd-amd64,
 libkvm-dev kfreebsd-i386,
 libldap2-dev,
 libpam0g-dev,
+ libpcre3-dev,
 libsasl2-dev (>= 2.1.9),
 libsnmp-dev | libsnmp9-dev,
 libssl-dev,
+ libtool,
 libwrap0-dev,
+ libxapian-dev,
 libzephyr-dev,
 lsb-base,
 perl,
+ pkg-config,
 po-debconf,
- quilt,
 tcl-dev | tcl8.3-dev,
 transfig,
 xutils-dev | xutils,
@@ -41,5 +45,5 @@
 Package-List: 
 cyrus-imapd deb mail extra
 Files: 
- 00000000000000000000000000000000 0 cyrus-imapd-2.4.17.tar.gz
+ 00000000000000000000000000000000 0 cyrus-imapd-2.5.tar.gz
 00000000000000000000000000000000 0 debian.tar.gz

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -17,8 +17,6 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/quilt/quilt.make
-
 # Extra version information to add to Cyrus IMAPd ID
 DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: $.*-$/\1/p')
 EXTRA_IDENT:="Debian-$(DEBVERSION)"
@@ -48,7 +46,7 @@
 	CONFFLAGS += --enable-warnings-are-errors
 endif
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -57,23 +55,24 @@
 
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	cp /usr/share/misc/config.sub config.sub
-	cp /usr/share/misc/config.guess config.guess
-	touch configure.in && touch aclocal.m4 && touch configure
-	autoheader || :
 	aclocal -I cmulocal
-	autoreconf -v -f
+	libtoolize --install
+	autoheader
+	automake --add-missing || autoreconf -v && automake --add-missing
+	autoreconf -v
+
 	#
 	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
 	# DBENGINE AT THE TOP OF THIS MAKEFILE!
 	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+		--enable-event-notification \
 		--enable-idled \
 		--enable-gssapi --with-gss_impl=heimdal \
 		--enable-listext \
 		--enable-murder \
 		--enable-nntp \
 		--enable-replication \
-		--with-extraident=$(EXTRA_IDENT) \
+		--enable-xapian \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--libexecdir=/usr/sbin \
@@ -86,15 +85,16 @@
 		--localstatedir=/var/lib/imap \
 		--mandir=/usr/share/man \
 		--with-auth=pts \
+		--with-com_err="" \
 		--with-cyrus-prefix=/usr/lib/cyrus-imapd \
+		--with-cyrus-group=mail \
+		--with-cyrus-user=cyrus \
+		--with-extraident=$(EXTRA_IDENT) \
 		--with-ldap=/usr \
 		--with-lock=fcntl \
 		--with-perl=/usr/bin/perl \
 		--with-openssl=/usr \
 		--with-sasl=/usr \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err="" \
 		--with-pidfile=/var/run/cyrus-master.pid \
 		--with-service-path=/usr/lib/cyrus-imapd \
 		--with-syslogfacility=MAIL \
@@ -108,7 +108,6 @@
 	grep with\ options config.status \
 	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
 		>> debian/README.configure-options
-	sed -i 's/ -lsensors//' master/Makefile
 	touch configure-stamp
 
 build-arch: build-arch-stamp

debian.series Changed

debian.tar.gz/cyrus-imapd.install Changed

@@ -2,54 +2,56 @@
 etc/imapd.annotations.conf
 etc/imapd.conf
 usr/bin/*
-usr/sbin/cyrus-makedirs
-/usr/lib/cyrus-imapd/arbitron
-/usr/lib/cyrus-imapd/chk_cyrus
-/usr/lib/cyrus-imapd/ctl_cyrusdb
-/usr/lib/cyrus-imapd/ctl_deliver
-/usr/lib/cyrus-imapd/ctl_mboxlist
-/usr/lib/cyrus-imapd/cvt_cyrusdb
-/usr/lib/cyrus-imapd/cyr_dbtool
-/usr/lib/cyrus-imapd/cyr_df
-/usr/lib/cyrus-imapd/cyrdump
-/usr/lib/cyrus-imapd/cyr_expire
-/usr/lib/cyrus-imapd/cyr_sequence
-/usr/lib/cyrus-imapd/cyr_synclog
-/usr/lib/cyrus-imapd/cyr_userseen
-/usr/lib/cyrus-imapd/cyrus-master
-/usr/lib/cyrus-imapd/deliver
-/usr/lib/cyrus-imapd/fud
-/usr/lib/cyrus-imapd/idled
-/usr/lib/cyrus-imapd/imapd
-/usr/lib/cyrus-imapd/ipurge
-/usr/lib/cyrus-imapd/lmtpd
-/usr/lib/cyrus-imapd/lmtpproxyd
-/usr/lib/cyrus-imapd/mbexamine
-/usr/lib/cyrus-imapd/mbpath
-/usr/lib/cyrus-imapd/mupdate
-/usr/lib/cyrus-imapd/nntpd
-/usr/lib/cyrus-imapd/notifyd
-/usr/lib/cyrus-imapd/pop3d
-/usr/lib/cyrus-imapd/proxyd
-/usr/lib/cyrus-imapd/ptdump
-/usr/lib/cyrus-imapd/ptexpire
-/usr/lib/cyrus-imapd/ptloader
-/usr/lib/cyrus-imapd/quota
-/usr/lib/cyrus-imapd/reconstruct
-/usr/lib/cyrus-imapd/sievec
-/usr/lib/cyrus-imapd/sieved
-/usr/lib/cyrus-imapd/smmapd
-/usr/lib/cyrus-imapd/squatter
-/usr/lib/cyrus-imapd/sync_client
-/usr/lib/cyrus-imapd/sync_reset
-/usr/lib/cyrus-imapd/sync_server
-/usr/lib/cyrus-imapd/timsieved
-/usr/lib/cyrus-imapd/tls_prune
-/usr/lib/cyrus-imapd/unexpunge
+usr/lib*/*.so
+usr/lib*/*.so.*
+usr/lib/cyrus-imapd/arbitron
+usr/lib/cyrus-imapd/chk_cyrus
+usr/lib/cyrus-imapd/ctl_cyrusdb
+usr/lib/cyrus-imapd/ctl_deliver
+usr/lib/cyrus-imapd/ctl_mboxlist
+usr/lib/cyrus-imapd/cvt_cyrusdb
+usr/lib/cyrus-imapd/cyr_dbtool
+usr/lib/cyrus-imapd/cyr_df
+usr/lib/cyrus-imapd/cyrdump
+usr/lib/cyrus-imapd/cyr_expire
+usr/lib/cyrus-imapd/cyr_sequence
+usr/lib/cyrus-imapd/cyr_synclog
+usr/lib/cyrus-imapd/cyr_userseen
+usr/lib/cyrus-imapd/cyrus-master
+usr/lib/cyrus-imapd/deliver
+usr/lib/cyrus-imapd/fud
+usr/lib/cyrus-imapd/idled
+usr/lib/cyrus-imapd/imapd
+usr/lib/cyrus-imapd/ipurge
+usr/lib/cyrus-imapd/lmtpd
+usr/lib/cyrus-imapd/lmtpproxyd
+usr/lib/cyrus-imapd/mbexamine
+usr/lib/cyrus-imapd/mbpath
+usr/lib/cyrus-imapd/mupdate
+usr/lib/cyrus-imapd/nntpd
+usr/lib/cyrus-imapd/notifyd
+usr/lib/cyrus-imapd/pop3d
+usr/lib/cyrus-imapd/proxyd
+usr/lib/cyrus-imapd/ptdump
+usr/lib/cyrus-imapd/ptexpire
+usr/lib/cyrus-imapd/ptloader
+usr/lib/cyrus-imapd/quota
+usr/lib/cyrus-imapd/reconstruct
+usr/lib/cyrus-imapd/sievec
+usr/lib/cyrus-imapd/sieved
+usr/lib/cyrus-imapd/smmapd
+usr/lib/cyrus-imapd/squatter
+usr/lib/cyrus-imapd/sync_client
+usr/lib/cyrus-imapd/sync_reset
+usr/lib/cyrus-imapd/sync_server
+usr/lib/cyrus-imapd/timsieved
+usr/lib/cyrus-imapd/tls_prune
+usr/lib/cyrus-imapd/unexpunge
 usr/lib/perl*
 usr/sbin/*
 usr/share/icons/*
 usr/share/man/man1/*
+usr/share/man/man3/*
 usr/share/man/man8/*
 usr/share/perl*
 usr/share/snmp

Changes of Revision 39